diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..de54e4a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+# Build and Release Folders
+bin-debug/
+bin-release/
+[Oo]bj/
+[Bb]in/
+
+# Other files and folders
+.settings/
+
+# Executables
+*.swf
+*.air
+*.ipa
+# *.apk
+*.idea
+
+# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
+# should NOT be excluded as they contain compiler settings and other important
+# information for Eclipse / Flash Builder.
+
+.hbuilderx/
+
+node_modules/
+.vscode/
+
+unpackage/
\ No newline at end of file
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..4da8f26
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,175 @@
+<script>
+	import login from "@/utils/login";
+	// #ifdef MP-WEIXIN
+	const PlayerManager = require('@/utils/playerManager')
+	const playletPlugin = requirePlugin('playlet-plugin')
+	// #endif
+	export default {
+		data() {
+			return {
+				playerManagerList: [],
+			}
+		},
+		onLaunch: function(e) {
+			uni.getLocation({
+
+			})
+			let that = this;
+			if (e.query.invite) {
+				uni.setStorageSync('invite_number', e.query.invite);
+			}
+			if (e.query.fxpid && e.query.fxpid > 0) {
+				uni.setStorageSync('fxpid', e.query.fxpid);
+			}
+			if (e.invite) {
+				uni.setStorageSync('invite_number', e.invite)
+			}
+			if (e.fxpid && e.fxpid > 0) {
+				uni.setStorageSync('fxpid', e.fxpid)
+			}
+			const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
+			if (extConfig.appid) {
+				this.$config.appId = extConfig.appid;
+			}
+			// #ifdef MP-WEIXIN
+			// 扫描小程序二维码使用
+			this.getScence(e.query.scene)
+			this.$nextTick(() => {
+				playletPlugin.onPageLoad(this.onPlayerLoad.bind(this))
+			})
+			// wx.setVisualEffectOnCapture({
+			//   visualEffect: 'hidden',
+			//   success: (res) => {
+			//     console.log(res)
+			//   },
+			//   fail: (err) => {
+			//     console.log(err)
+			//   },
+			//   complete: (res) => {
+			//     console.log(res)
+			//   }
+			// })
+			let info = uni.getStorageSync("userinfo");
+			let token = info ? info.token : '';
+			if (token) {
+				login.wxLogin();
+			}
+			// #endif
+			//跨屏幕防止ios录频
+			// if (/ios/i.test(wx.getSystemInfoSync().system) && wx.getScreenRecordingState) {
+			//   // res.state的值有两种情况 on(正在录屏) | off(没有开始录屏)
+			//   wx.getScreenRecordingState({
+			//     success: res => {
+			//       if (res.state != 'off') {
+			//         // that.setData({
+			//         // 	isShow: false //这里我对页面进行了遮挡处理
+			//         // })
+			//       } else {
+			//         // that.setData({
+			//         // 	isShow: true
+			//         // })
+			//       }
+			//     }
+			//   })
+			// }
+			// 在当前页面点击录频
+			// if (/ios/i.test(wx.getSystemInfoSync().system) && wx.onScreenRecordingStateChanged) {
+			//   //	res.state的值有两种情况 start(开始录屏) | stop(结束录屏)
+			//   wx.onScreenRecordingStateChanged(res => {
+			//     if (res.state == 'start') {
+			//       that.setData({
+			//         isShow: false //这里我对页面进行了遮挡处理
+			//       })
+			//
+			//     } else {
+			//       that.setData({
+			//         isShow: true
+			//       })
+			//     }
+			//   })
+			// }
+			// 	小程序新版本检测
+			uni.getUpdateManager().onCheckForUpdate(function(res) {
+				// 请求完新版本信息的回调
+				if (res.hasUpdate) {
+					uni.showModal({
+						title: '更新提示',
+						content: '新版本已经准备好，是否重启应用？',
+						success: function(res) {
+							if (res.confirm) {
+								// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+								uni.getUpdateManager().applyUpdate()
+							}
+						}
+					})
+				}
+			})
+
+			uni.getSystemInfo({
+				success: function(res) {
+					if (res.statusBarHeight == 0) {
+						res.statusBarHeight = 30;
+					}
+					// menuButtonInfo.statusBarHeight = res.statusBarHeight;
+					// res.menuButtonInfo = menuButtonInfo;
+					// uni.setStorageSync("setGetSystemInfo", res);
+				}
+			})
+
+
+		},
+		onShow: function() {
+			console.log('App Show')
+		},
+		onHide: function() {
+			console.log('App Hide')
+		},
+		methods: {
+			//获取扫描小程序二维码
+			getScence(scene) {
+				const sceneParams = {};
+				const params = decodeURIComponent(scene).split('&');
+				for (const param of params) {
+					const [key, value] = param.split('=');
+					sceneParams[key] = value;
+				}
+				if (sceneParams.invite) {
+					uni.setStorageSync("invite_number", sceneParams.invite)
+				}
+			},
+			onPlayerLoad(info) {
+				let destroyedIndex = -1
+				for (let i = 0; i < this.playerManagerList.length; i++) {
+					if (this.playerManagerList[i].isDestroy && this.playerManagerList[i].isDestroy()) {
+						destroyedIndex = i
+						break
+					}
+				}
+				if (destroyedIndex >= 0) {
+					this.playerManagerList.splice(destroyedIndex, 1)
+				}
+				const playerManager = new PlayerManager()
+				playerManager._onPlayerLoad(info)
+				this.playerManagerList.push(playerManager)
+				console.log('this.playerManagerList', this.playerManagerList.length)
+			},
+		}
+
+
+
+
+
+
+
+	}
+</script>
+
+<style>
+	@import url("@/utils/default.css");
+
+	view {
+		box-sizing: border-box;
+	}
+
+	/*每个页面公共css */
+</style>
\ No newline at end of file
diff --git a/components/charge-dialog/charge-dialog.vue b/components/charge-dialog/charge-dialog.vue
new file mode 100644
index 0000000..9167a12
--- /dev/null
+++ b/components/charge-dialog/charge-dialog.vue
@@ -0,0 +1,736 @@
+<template>
+	<view class="pay_box">
+		<view class="noRecharge" v-if="is_check && system=='ios'">
+			根据相关规范ios暂不可用此功能，请使用android手机体验
+		</view>
+		<view class="recharge" v-else>
+			<view class="header_top">
+				<text style="font-size: 32rpx;">解锁后可继续观看</text>
+				<image @tap="close_pay_box" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/fanhui.png"
+					style="width: 36rpx;height: 36rpx;"></image>
+			</view>
+			<view class="vider_juji">
+				<text style="font-size: 24rpx;">{{ videoSynopsis.name }} · 第{{ serialNo }}集</text>
+				<text style="font-size: 24rpx;color: #333333;">本剧共{{ videoSynopsis.sum }}集</text>
+			</view>
+			<view class="vider_juji">
+				<text style="font-size: 24rpx;">解锁本集需要： {{ videoSynopsis.beans }}金豆</text>
+			</view>
+			<view class="other_recharge">
+				<text style="font-size: 28rpx;">金豆充值</text>
+				<text style="font-size: 28rpx;color: #333333;font-weight: bold;">我的金豆:{{ userInfo.beans || 0 }}</text>
+			</view>
+			<view class="vipCarBox" v-if="payListGroupId==1">
+				<view :class="[
+							'vipCarItem',
+							{'vipCarFirst':item.pay_type == 1},
+							{'vipCarSecond': item.pay_type == 2},
+							{'vipCarThird':item.pay_type == 3},
+							{'vipCarFourth':item.pay_type == 4},
+							] " v-for="item in list_pay" :key="item.id" @click="getSelectItemId(item)">
+					<text class="icon" v-if="item.pay_tab">{{ item.pay_tab }}</text>
+					<view class="moneyLine">
+						<view class="money">￥{{ item.pay_money }}</view>
+						<view class="beanBtn" v-if="item.pay_give_num && item.pay_type == 2">赠{{ item.pay_give_num }}金豆
+						</view>
+						<view class="moneyInfoBtn" v-if="item.pay_type == 4">解锁全集</view>
+					</view>
+					<text class="depict" v-if="item.pay_give_num && item.pay_type == 2">
+						{{ item.pay_num }}金豆+{{ item.pay_give_num }}豆
+					</text>
+          <text class="depict" v-if="!item.pay_give_num && item.pay_type == 2">
+            {{ item.pay_num }}金豆
+          </text>
+					<view class="explainText" v-if="item.pay_type != 2">
+						<text v-if="item.pay_type == 1" style="color: #333333;">全部影片免费观看</text>
+						<text v-if="item.pay_type == 3" style="color: #FF6900;">本剧订阅全集</text>
+						<text v-if="item.pay_type == 4" style="color: #ffffff;">邀请好友拼团享返利</text>
+					</view>
+					<view class="choiceNum" v-if="item.menber_sel">{{ item.menber_sel }}%用户选择</view>
+				</view>
+			</view>
+
+
+			<view class="vipCarBox vipCarBoxSecond" v-else>
+				<view
+					:class="['vipCarItem',{'border':item.is_red==1},{'der':item.pay_give_num == 0},{'one':item.pay_type == 1},{'vipCarFourth':item.pay_type == 4}]"
+					v-for="item in list_pay" :key="item.id" @click="getSelectItemId(item)">
+					<text class="rightIcon" v-if="item.pay_tab">{{ item.pay_tab }}</text>
+					<view class="VipCardContent">
+						<view :class="['carMoney',{'redColor':item.is_red==1}]">
+							<text>{{ item.pay_money }}</text>
+							元
+						</view>
+						<view class="carMoneyExplain" v-if="item.pay_give_money>0">多送{{ item.pay_give_money }}元</view>
+						<!--            <view v-else :class="item.pay_type == 4?'carMoneyExplainText':'carMoneyExplain'">{{item.pay_type == 4?'解锁全集':' '}}</view>-->
+						<view v-else class="carMoneyExplain"></view>
+					</view>
+					<view :class="['vipCarFooter',{'footerRedColor':item.is_red!=1}]">
+						{{ item.remark ? item.remark : '' }}
+					</view>
+					<image v-if="item.is_finger" class="hands"
+						src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/hands.gif" mode=""></image>
+				</view>
+			</view>
+			<view class="explainList">
+				<text class="explainItem"> 充值代表接受
+					<text class="explainText" @click="goAgreement(1)">《充值/退款协议》</text>
+					和
+					<text class="explainText" @click="goAgreement(2)">《会员服务协议》</text>
+				</text>
+				<text class="explainItem"> 本小程序共有{{ allVideoNum }}部剧正在热播</text>
+			</view>
+
+
+			<uni-popup ref="back_ref" type="center">
+				<view class="teamPupCont">
+					<view class="closeIcon" @click="closePup">
+						<uni-icons type="closeempty" size="16" color="#ffffff"></uni-icons>
+					</view>
+					<view class="textBox">
+						<view class="textLine">用户只能发起一次邀请</view>
+						<view class="textLine">有效时间为24小时</view>
+						<view class="textLine">分享好友拼团，拼成退差价</view>
+					</view>
+					<button open-type="share" class="inviteBtn">立即邀请</button>
+				</view>
+			</uni-popup>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	import {
+		httpRequest
+	} from '@/utils/request'
+	import PAY from '@/utils/pay'
+	const playletPlugin = requirePlugin('playlet-plugin')
+	export default {
+		name: "payDom",
+		props: {
+			playerId: {
+				type: String,
+				default: '',
+			},
+			srcAppid: {
+				type: String,
+				default: '',
+			},
+			dramaId: {
+				type: String,
+				default: '',
+			},
+			serialNo: {
+				type: Number,
+				default: 0,
+			},
+			extParam: {
+				type: String,
+				default: '',
+			}
+
+		},
+		data() {
+			return {
+				_isInitChargeDialog: false,
+				list_pay: [],
+				payListGroupId: 1,
+				userInfo: {},
+				videoSynopsis: {},
+				vid: "",
+				mid: '',
+				system: "",
+				payItemData: {},
+				g_order_id: "",
+				is_check: false,
+				allVideoNum: 0
+			}
+		},
+		watch: {
+			serialNo(newValue, oldvalue) {
+				console.log('ready get pay list')
+				this.is_check = uni.getStorageSync('config').is_check == 1 ? true : false;
+				this.userInfo = uni.getStorageSync('userinfo');
+				this.system = uni.getSystemInfoSync().osName;
+        this.initChargeDialog();
+				this.getVideoData();
+				this.getAllVideoNum();
+        this.getPayList();
+			},
+			playerId(newValue, oldvalue) {
+				console.log('this.initChargeDialog', newValue)
+			}
+		},
+
+		methods: {
+			goAgreement(num) {
+				const pm = this.getPlayerManager()
+				pm.navigateTo({
+					url: '/pagesA/agreement/agreement?id=' + num
+				})
+			},
+			initChargeDialog() {
+				if (!this.playerId) return
+				if (this._isInitChargeDialog) return
+				this._isInitChargeDialog = true;
+				this.g_order_id = uni.getStorageSync('g_order_id');
+				const pm = this.getPlayerManager()
+				if (pm) {
+					let extparams = pm.getInfo().extParam;
+					if (extparams) {
+						if (extparams.indexOf('%') < 0) {
+							this.vid = JSON.parse(extparams).vid;
+						} else {
+							this.vid = JSON.parse(decodeURIComponent(extparams)).vid
+						}
+						console.log('ChargeDialog res', extparams)
+					}
+
+					// console.log(this.pm.getInfo())
+					// 注册弹窗显示事件
+					pm.onShowChargeDialog(this.onShowChargeDialog.bind(this))
+					// 注册弹窗隐藏事件
+					pm.onHideChargeDialog(this.onHideChargeDialog.bind(this))
+
+				}
+			},
+			getPlayerManager() {
+				return playletPlugin.PlayletManager.getPageManager(this.playerId);
+			},
+			onShowChargeDialog() {
+        console.log('onShowChargeDialog bbs')
+				this.getPayList();
+			},
+			onHideChargeDialog() {
+				// this.$refs.back_ref.close();
+			},
+      close_pay_box(){
+        const pm = this.getPlayerManager()
+        pm.hideChargeDialog();
+      },
+			getAllVideoNum() {
+				httpRequest({
+					url: "/api/video/videoCount",
+					method: "GET"
+				}).then(res => {
+					this.allVideoNum = res.data.count
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+			// 视频信息
+			getVideoData() {
+				let that = this;
+				httpRequest({
+					url: "/api/video/dramaIdToVideoId",
+					method: "GET",
+					data: {
+						drama_id: this.dramaId,
+						no: this.serialNo
+					}
+				}).then(res => {
+					that.videoSynopsis = res.data;
+					that.vid = res.data.drama_vid
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+			//充值方式
+			getPayList() {
+				httpRequest({
+					url: "/api/beans/payList",
+					method: "GET",
+					data: {
+						gid: uni.getStorageSync('g_order_id') || '',
+						vs_id: uni.getStorageSync('vs_id_code'),
+						token: this.userInfo.token,
+						video_list_id: this.vid
+					}
+				}).then(res => {
+          if(res.code == 1){
+            this.payListGroupId = uni.getStorageSync('config').pay_tpl;
+            // this.payListGroupId = 2;
+            this.list_pay = res.data
+          }else if(res.code ==50){
+            this.is_check = true;
+          }
+
+        }).catch(err => {
+					console.log(err)
+				})
+			},
+			getSelectItemId(item) {
+				let that = this;
+				httpRequest({
+					url: "/api/video/dramaIdToVideoId",
+					method: "GET",
+					data: {
+						drama_id: that.dramaId,
+						no: that.serialNo
+					}
+				}).then(res => {
+					that.mid = res.data.id;
+					that.selectPayItem(item)
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+
+
+			selectPayItem(item) {
+				let that = this,
+					pms = that.getPlayerManager();
+				this.payItemData = item;
+				let gid = "",
+					gvid = uni.getStorageSync('g_order_vid');
+				if (gvid) {
+					if (gvid == that.vid) {
+						gid = uni.getStorageSync('g_order_id') || ''
+					}
+				}
+				if (this.system == 'android') {
+					wx.login({
+						success(login) {
+							let upData = {
+								new: 1,
+								id: item.id,
+								pay_type: 5,
+								code: login.code,
+								token: that.userInfo.token,
+								uid: that.userInfo.id,
+								vid: that.mid,
+								ad_code: uni.getStorageSync('get_ad_code'),
+								gid: gid,
+							}
+							PAY.pays.serverCreatOrder(upData).then(resa => {
+								PAY.pays.wxAppletAndroidPay(resa.data.data).then(payRes => {
+									let payParam = {
+										status: 'paySuccess',
+										serialNo: that.serialNo,
+										gOrderId: "",
+										vid: that.vid,
+										oid: resa.data.oid
+									}
+									if (that.payItemData.pay_type == 4) {
+										// that.$refs.back_ref.open('center');
+										that.payEnd(payParam)
+									} else {
+										pms.emitCustomEvent('chargeEnd', payParam)
+									}
+								}).catch(payErr => {
+									console.log(payErr)
+								})
+							})
+						}
+					})
+				} else {
+					let upData = {
+						new: 1,
+						id: item.id,
+						sum: 1,
+						buytype: "微信",
+						pricebuy: item.pay_money,
+						token: that.userInfo.token,
+						uid: that.userInfo.id,
+						vid: that.mid,
+						wxlx: "wxxcx",
+						openid: uni.getStorageSync("openid"),
+						gid: gid,
+					};
+					PAY.pays.wxIosCreatOrder(upData).then(resa => {
+						PAY.pays.wxAppletIosPay(resa.data.data).then(payRes => {
+							let payParam = {
+								status: 'paySuccess',
+								serialNo: that.serialNo,
+								gOrderId: "",
+								vid: that.vid,
+								oid: resa.data.oid
+							}
+							if (that.payItemData.pay_type == 4) {
+								// that.$refs.back_ref.open('center');
+								that.payEnd(payParam)
+							} else {
+								pms.emitCustomEvent('chargeEnd', payParam)
+							}
+						}).catch(payErr => {
+							console.log('ios pay err', payErr)
+						})
+					}).catch(err => {
+						console.log('creat ios order err', err)
+					})
+				}
+			},
+			payEnd(payParam) {
+				let that = this;
+				console.log("payEnd getOrderId", payParam)
+				console.log(that.vid)
+
+				httpRequest({
+					url: "/api/order/getGroupOrderId",
+					method: "POST",
+					data: {
+						vid: that.vid
+					}
+				}).then(res => {
+					console.log("payEnd getOrderId Success", res)
+					let pms = that.getPlayerManager();
+					payParam.gOrderId = res.data.gid;
+					pms.emitCustomEvent('chargeEnd', payParam)
+				})
+			},
+
+			// wxxcx_xuni(data) {
+			//   console.log(data)
+			//   let that = this,
+			//       pms = that.getPlayerManager();
+			//   uni.requestVirtualPayment({
+			//     signData: JSON.stringify({
+			//       buyQuantity: data.signData.buyQuantity,
+			//       currencyType: data.signData.currencyType,
+			//       env: data.signData.env,
+			//       goodsPrice: data.signData.goodsPrice,
+			//       offerId: data.signData.offerId,
+			//       outTradeNo: data.signData.outTradeNo,
+			//       platform: data.signData.platform,
+			//       productId: data.signData.productId,
+			//       attach: data.signData.attach,
+			//     }),
+			//     paySig: data.paySig,
+			//     signature: data.signature,
+			//     mode: 'short_series_coin',
+			//     success(res) {
+			//       let payParam = {
+			//         status: 'paySuccess',
+			//         serialNo: that.serialNo,
+			//         gOrderId: "",
+			//         vid: that.vid,
+			//         oid: data.oid
+			//       }
+			//       if (that.payItemData.pay_type == 4) {
+			//         // that.$refs.back_ref.open('center');
+			//         that.payEnd(payParam)
+			//       } else {
+			//         pms.emitCustomEvent('chargeEnd', payParam)
+			//       }
+			//     },
+			//     fail({errMsg, errCode}) {
+			//       console.log(errMsg, errCode, data.signature)
+			//     },
+			//   })
+			// },
+			// wxxcx(data) {
+			//   let that = this,
+			//       pms = that.getPlayerManager();
+			//   uni.requestPayment({
+			//     "provider": 'wxpay',
+			//     "appId": data.appId,
+			//     "timeStamp": data.timeStamp + '',
+			//     "nonceStr": data.nonceStr,
+			//     "package": data.package,
+			//     "signType": 'MD5',
+			//     "paySign": data.sign,
+			//     success: function (res1) {
+			//       let payParam = {
+			//         status: 'paySuccess',
+			//         serialNo: that.serialNo,
+			//         gOrderId: "",
+			//         vid: that.vid,
+			//         oid: data.oid
+			//       }
+			//       if (that.payItemData.pay_type == 4) {
+			//         // that.$refs.back_ref.open('center');
+			//
+			//         that.payEnd(payParam)
+			//       } else {
+			//         pms.emitCustomEvent('chargeEnd', payParam)
+			//       }
+			//       console.log('success:' + JSON.stringify(res1));
+			//     },
+			//     fail: function (err1) {
+			//       console.log('fail:' + JSON.stringify(err1));
+			//     }
+			//   });
+			// },
+
+
+			closePup() {
+				// this.$refs.back_ref.close();
+			}
+
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.noRecharge {
+		font-size: 40rpx;
+		line-height: 200rpx;
+		text-align: center;
+		color: #333333;
+	}
+
+	.pay_box {
+		width: 750rpx;
+		background: #ffffff;
+		border-radius: 28rpx 28rpx 0 0;
+	}
+
+	.header_top {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx 24rpx 12rpx 24rpx;
+	}
+
+	.vider_juji {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 24rpx;
+	}
+
+	.other_recharge {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 24rpx;
+		margin-top: 40rpx;
+	}
+
+	.vipCarBox {
+		padding: 26rpx;
+		align-items: center;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		flex-direction: row;
+	}
+
+	.vipCarItem {
+		width: 336rpx;
+		height: 200rpx;
+		border-radius: 12rpx;
+		margin-bottom: 24rpx;
+	}
+
+	.vipCarFirst {
+		background-image: linear-gradient(to right, #FF9A54, #FF3C3C);
+	}
+
+	.vipCarSecond {
+		background-image: linear-gradient(to right, #FF9A54, #FF3C3C);
+	}
+
+	.vipCarThird {
+		background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/taoc2.png');
+		background-size: 100% 100%;
+	}
+
+	.vipCarFourth {
+		background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/dingyue_a.png');
+		background-size: 100% 100%;
+	}
+
+	.icon {
+		position: absolute;
+		color: #333333;
+		font-size: 20rpx;
+		font-weight: 500;
+		line-height: 35rpx;
+		padding: 0 20rpx;
+		border-radius: 0rpx 0rpx 16rpx 0rpx;
+		background: linear-gradient(180deg, #FFFFFF 0%, #FFC833 100%);
+	}
+
+	.vipCarThird .icon {
+		background: linear-gradient(180deg, #FF8F8F 0%, #FF3333 100%);
+		color: #ffffff;
+	}
+
+	.vipCarFourth .icon {
+		background: linear-gradient(90deg, #FFBC48 0%, #FF5D41 100%);
+		color: #ffffff;
+	}
+
+	.moneyLine {
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+		justify-content: space-between;
+		padding: 0 20rpx;
+		margin-top: 45rpx;
+	}
+
+	.vipCarFourth .moneyLine {
+		color: #FF300A;
+		padding-left: 20rpx;
+	}
+
+	.money {
+		font-size: 32rpx;
+		color: #ffffff;
+	}
+
+	.vipCarFourth .money {
+		color: #FF300A;
+	}
+
+	.vipCarThird .money {
+		color: #333333;
+	}
+
+	.beanBtn {
+		text-align: center;
+		font-weight: 500;
+		font-size: 22rpx;
+		color: #333333;
+		line-height: 48rpx;
+		padding: 0 20rpx;
+		background: linear-gradient(180deg, #FFF2D1 0%, #FFC323 100%);
+		border-radius: 24rpx;
+	}
+
+	.depict {
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 44rpx;
+		padding: 10rpx 20rpx;
+	}
+
+	.explainText {
+		margin-top: 26rpx;
+		padding-left: 20rpx;
+
+	}
+
+	.explainText text {
+		font-size: 28rpx;
+		font-weight: 600;
+	}
+
+	.choiceNum {
+		text-align: right;
+		font-size: 22rpx;
+		font-weight: 500;
+		color: #FFCA3A;
+		line-height: 32rpx;
+		padding-right: 20rpx;
+	}
+
+	// 新版
+	.vipCarBoxSecond {
+		background: #eeeeee;
+	}
+
+	.VipCardContent {
+		padding: 40rpx 0;
+	}
+
+	.vipCarBoxSecond .vipCarItem {
+		background: #ffffff;
+		border-radius: 12rpx;
+
+	}
+
+	.vipCarBoxSecond .border {
+		border: 6rpx solid #dc3a35;
+		background: #f6e2af;
+	}
+
+	.rightIcon {
+		position: absolute;
+		right: 0;
+		top: -20rpx;
+		line-height: 40rpx;
+		color: #ffffff;
+		font-size: 24rpx;
+		padding: 0 15rpx;
+		border-radius: 0 12rpx 0 12rpx;
+		background: #dc3a35;
+		max-width: 336rpx;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.carMoney {
+		text-align: center;
+		font-size: 26rpx;
+		font-weight: bold;
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.carMoney text {
+		font-size: 32rpx;
+		font-weight: bold;
+	}
+
+	.carMoneyExplain {
+		color: #666666;
+		text-align: center;
+		line-height: 30rpx;
+		height: 30rpx;
+		font-size: 28rpx;
+	}
+
+	.vipCarFooter {
+		line-height: 45rpx;
+		background: #dc3a35;
+		color: #ffffff;
+		text-align: center;
+		font-size: 26rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.redColor {
+		color: #dc3a35;
+	}
+
+	.footerRedColor {
+		line-height: 50rpx;
+		background: #fde6e6;
+		color: #dc3a35;
+		text-align: center;
+		font-size: 26rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		border-radius: 0 0 12rpx 12rpx;
+	}
+
+	.hands {
+		position: absolute;
+		right: -10px;
+		bottom: 0rpx;
+		width: 90rpx;
+		height: 90rpx;
+		z-index: 300;
+		transform: rotate(-15deg);
+	}
+
+	.explainList {
+		padding: 40rpx 0 20rpx 30rpx;
+		line-height: 30rpx;
+
+		.explainItem {
+			font-size: 22rpx;
+
+			.explainText {
+				color: #0a5ab6;
+				padding: 0 10rpx;
+				font-size: 22rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/fanxiao-sign/sigin-in.vue b/components/fanxiao-sign/sigin-in.vue
new file mode 100644
index 0000000..70e1f23
--- /dev/null
+++ b/components/fanxiao-sign/sigin-in.vue
@@ -0,0 +1,253 @@
+<template>
+	<view style="position: relative;">
+		<view class="sign_conent_box">
+			<view class="sign_conent">
+				<view class="sign_conent_title">
+					<text class="zitiyangshi">你已连续签到</text>
+					<span class="sign_conent_title_span zitiyangshi">{{qdjl}}</span>
+					<text class="zitiyangshi">天</text>
+				</view>
+				<view class="ft12 mt10" style="color: #999;">签到领金豆，新剧抢先看。连续签到7天领惊喜礼包</view>
+				<view class="sign_list_aligns"
+					style="background-color: #fff;padding: 30rpx;margin-top: 48rpx;border-radius: 10rpx;">
+					<scroll-view class="scroll-view_H" scroll-x="true" show-scrollbar='false'>
+						<view class="scroll_view_items" v-for="(item, index) in sign_list" :key="index">
+							<!--  -->
+							<view class="scroll_view_itemsv">
+								<view class="scroll_view_item">
+									<view class="scroll_view_item_img_box">
+										<view v-if="item.xz==2"
+											style="width: 80rpx;height: 104rpx;background: linear-gradient(360deg, #64C700 0%, #85ED1C 100%);text-align: center;border-radius: 8rpx;">
+											<image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/jindou.png"
+												style="width: 54rpx;height: 56rpx;margin-top: 10rpx;"></image>
+											<view
+												style="color: #fff;font-size: 30rpx;position: absolute;top: 56rpx;left: 10rpx;">
+												+{{item.beans}}</view>
+										</view>
+										<!-- <image v-if="item.xz==2" :src="statics.xuanzhong" class="scroll_view_item_img" mode=""></image> -->
+										<!-- <image v-if="item.xz==1" :src="statics.yuanq" class="scroll_view_item_img" mode=""></image> -->
+										<!-- <view v-if="item.xz==1" class="scroll_view_item_top">{{ item.discount }}</view> -->
+										<view v-if="item.xz==1"
+											style="width: 80rpx;height: 104rpx;background-color: #F4F4F4;text-align: center;border-radius: 8rpx;">
+                      <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/jindou.png"
+												style="width: 54rpx;height: 56rpx;margin-top: 10rpx;"></image>
+											<view
+												style="color: #999999;font-size: 30rpx;position: absolute;top: 56rpx;left: 10rpx;">
+												+{{item.beans}}</view>
+										</view>
+									</view>
+									<view class="scroll_view_item_tips" style="margin-top: 60rpx;">{{ item.day }}</view>
+
+								</view>
+
+							</view>
+						</view>
+					</scroll-view>
+
+					<view class="sign_conent_btn" style="margin-top: 20rpx;" @click="cksigin()">今日签到</view>
+				</view>
+
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			sign_list: {},
+			qdjl: 0,
+			tdsy: 0,
+		},
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			cksigin() {
+				if (uni.getStorageSync("userinfo")) {
+					let this_ = this
+          this_.$httpRequest({
+            url:"/api/user/qingdao",
+            method:"GET",
+            data:{
+              tdsy: this_.tdsy
+            }
+          }).then(res=>{
+            uni.showModal({
+              title: '温馨提示',
+              content: res.msg,
+              showCancel: false,
+              success: modelRes => {
+                if (res.code == 1) {
+                  this_.$emit('cksigin')
+                }
+              }
+            });
+          }).catch(err=>{
+            console.log(err)
+          })
+				} else {
+					uni.showModal({
+						title: '温馨提示',
+						content: '请先登录',
+						showCancel: true,
+						confirmText: "登录",
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/login/login'
+								})
+							} else if (res.cancel) {
+								//uni.navigateBack();						
+							}
+						}
+					});
+				}
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	// @font-face {
+	// 	font-family: "MyFont";
+	
+	// }
+
+	.zitiyangshi {
+		font-family: 'MyFont';
+		font-size: 36rpx;
+	}
+
+	::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+		color: transparent;
+	}
+
+	uni-scroll-view .uni-scroll-view::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+		color: transparent;
+	}
+
+	.sign_conent_box {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 30upx;
+
+		.sign_conent {
+			width: 686upx;
+			// background: white;
+			// border-radius: 20upx;
+			padding: 0upx 0upx;
+			box-sizing: border-box;
+
+			.sign_conent_title {
+				width: 100%;
+				font-size: 36upx;
+				font-weight: bold;
+				color: #333333;
+
+				.sign_conent_title_span {
+					color: #64C700 !important;
+					font-size: 48rpx;
+					margin-left: 12rpx;
+					margin-right: 12rpx;
+				}
+			}
+
+			.sign_list_aligns {
+				width: 100%;
+				padding: 30upx 0 30upx 0;
+				box-sizing: border-box;
+
+				.scroll-view_H {
+					width: 100%;
+					display: flex;
+					white-space: nowrap;
+
+					.scroll_view_items {
+						display: inline-block;
+					}
+
+					.scroll_view_itemsv {
+						display: flex;
+					}
+
+					.scroll_view_item {
+						.scroll_view_item_img_box {
+							width: 100upx;
+							height: 30upx;
+							position: relative;
+
+							.scroll_view_item_top {
+								font-size: 24upx;
+								color: #bfbfbf;
+								// font-weight: bold;
+								position: absolute;
+								top: 14upx;
+								width: 100%;
+								text-align: center;
+								z-index: 1;
+							}
+
+							.scroll_view_item_bottom {
+								font-size: 12upx;
+								color: #ffe29d;
+								position: absolute;
+								bottom: 18upx;
+								left: 42upx;
+								z-index: 2;
+							}
+						}
+
+						.scroll_view_item_tips {
+							width: 60upx;
+							text-align: center;
+							font-size: 24upx;
+							padding-top: 40upx;
+							color: #333333;
+						}
+
+						.scroll_view_item_img {
+							width: 60upx;
+							height: 60upx;
+							position: absolute;
+							top: 0;
+							left: 0;
+							z-index: 0;
+						}
+					}
+
+					.scroll_xian {
+						width: 40upx;
+						height: 4upx;
+						background: #bfbfbf;
+						margin-top: 30upx;
+					}
+				}
+			}
+
+			.sign_conent_btn {
+				width: 100%;
+				border-radius: 45upx;
+				background: linear-gradient(#ACFD28 0%, #0AD89D 100%);
+				color: #ffffff;
+				text-align: center;
+				padding: 22upx 0;
+				font-size: 32upx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/home/banner.vue b/components/home/banner.vue
new file mode 100644
index 0000000..b93238b
--- /dev/null
+++ b/components/home/banner.vue
@@ -0,0 +1,49 @@
+<template>
+	<view>
+		<swiper class="home-swiper-banner" indicator-color="rgba(255, 255, 255, 0.3)" indicator-active-color="#FFFFFF" :indicator-dots="true" :autoplay="true" :interval="3000" :duration="500">
+			<swiper-item v-for="(item,index) in banners" :key="index"  @tap="detail(item.link,0)">
+				<image :src="item.src" mode="aspectFill" style="border-radius: 16rpx"></image>
+			</swiper-item>
+			
+		</swiper> 
+	</view>
+</template>
+
+<script>
+	export default{
+		props: ['banners'],
+		data(){
+			return {
+				banners1:[],
+			}
+		},
+			
+		methods:{
+			detail(url,mid) {
+				console.log('ok')
+				console.log(url)
+				var fxpid = 1
+				if (uni.getStorageSync("userinfo")) {
+					fxpid = uni.getStorageSync("userinfo").id
+				}
+				
+				uni.navigateTo({
+					url: '/'+url + '?mid=' + mid + '&fxpid=' + fxpid
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	 .home-swiper-banner{
+		height: 350rpx;
+		box-shadow: 0rpx 4rpx 32rpx 0rpx rgba(0, 0, 0, 0.04);
+		border-radius: 10rpx;
+		overflow: hidden;
+	}
+	.home-swiper-banner image{
+		width: 100%;
+		height: 350rpx;
+	}
+</style>
diff --git a/components/home/default.vue b/components/home/default.vue
new file mode 100644
index 0000000..dc65502
--- /dev/null
+++ b/components/home/default.vue
@@ -0,0 +1,149 @@
+<template>
+	<view>
+		<!-- style="margin-bottom: 80upx;" -->
+		<view class="pd16_15">
+			<view class="flex alcenter space" style="margin-bottom: 30upx;">
+				<view class="flex alcenter">
+					<image style="width: 28rpx;height: 28rpx;"
+						src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/star.png"></image>
+					<text class="ft16 ftw600 cl-main ml15">最新热播</text>
+				</view>
+				<navigator url="/pages/client/tuan/search">
+					<view class="ft14 cl-notice">大家都在看的热播好剧</view>
+				</navigator>
+			</view>
+			<view class="flex " style="overflow-x: auto; flex-wrap: wrap;">
+				<!-- 		<block v-for="(value,key) in datasa" :key="key">
+				<view class=" pb10 mb15 videoItem"  @click="detail(value.id,0)">
+					<image class="integral-mall-goods" mode="scaleToFill" :src="value.img"></image>
+				<view class="  ft14 ftw500  text-over cl-main">{{ value.name }}</view>
+				<view class=" ft10 ftw500  cl-999 text-over cl-main">{{ value.text }}</view>
+				</view>
+				</block> -->
+
+				<block v-for="(value,key) in datasa" :key="key">
+					<view class=" pb10 defaultItem" style="width:207rpx; display: inline-block; border-radius:20rpx;"
+						@click="detail(value)">
+						<image class="integral-mall-goods" mode="scaleToFill" :src="value.img"></image>
+						<view class="  ft14 ftw500  text-over cl-main">{{ value.name }}</view>
+						<view class=" ft10 ftw500  cl-999 text-over cl-main">{{ value.text }}</view>
+					</view>
+				</block>
+
+			</view>
+		</view>
+		<!-- <view class="home-main" style="height: 50upx;">
+			<com-copyright></com-copyright>
+		</view> -->
+
+		<dialog-couponshareget @loginAct="showLoginCouponShareGet" v-if="showCouponShareGet"
+			@closed="showCouponShareGet = false"></dialog-couponshareget>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: ['datasa'],
+		data() {
+			return {
+				isLogin: false,
+				showBirthday: false,
+				showLogin: false,
+				showQrcode: false,
+				showCouponShareGet: false,
+			}
+		},
+
+		created() {
+
+			// uni.setNavigationBarTitle({
+			//     title: '夜趣小视频'
+			// });
+
+			// setTimeout(()=>{
+			// 	this.showCouponShareGet = true;	
+			// },1000);
+		},
+		methods: {
+			//'/pages/client/tuan/detail?id='+value.id
+			detail(data) {
+				uni.navigateTo({
+					url: '/pagesA/player/detailPlayer?vid=' + data.id + '&mid=' + 0
+				})
+			},
+			showLoginAct() {
+				this.showLogin = true;
+			},
+			showLoginCouponShareGet() {
+				this.showLogin = true;
+			},
+			loginYes() {
+
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.home-header {
+		height: 304rpx;
+		width: 100%;
+		position: relative;
+		background: #363B4D;
+		border-radius: 0rpx 0rpx 48rpx 48rpx;
+	}
+
+	.home-main {
+		width: 100%;
+		position: relative;
+		margin-top: -156rpx;
+		padding: 0 30rpx;
+	}
+
+	.home-mendian {
+		width: 100%;
+		height: 84rpx;
+		background: rgba(255, 255, 255, 0.1);
+		border-radius: 42rpx;
+	}
+
+	.tuan-product-l {
+		width: 320rpx;
+		height: 240rpx;
+		border-radius: 16rpx;
+		background: #F2F2F2;
+	}
+
+	.videoItem {
+		width: 330rpx;
+		position: relative;
+
+	}
+
+	.integral-mall-goods {
+		width: 330rpx;
+		background: #F2F2F2;
+		border-radius: 16upx;
+	}
+
+
+	.integral-mall-goods {
+		min-width: 206rpx;
+		width: 100%;
+		height: 280rpx;
+		background: #F2F2F2;
+		border-radius: 16upx;
+	}
+
+	.tuan-product-r {
+		width: calc(100% - 320rpx);
+	}
+
+	.defaultItem {
+		margin-right: 30rpx;
+	}
+
+	.defaultItem:nth-of-type(3n) {
+		margin-right: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/components/home/grid.vue b/components/home/grid.vue
new file mode 100644
index 0000000..bbfb125
--- /dev/null
+++ b/components/home/grid.vue
@@ -0,0 +1,211 @@
+<template>
+	<view class="flex alcenter space">
+		
+		<button v-if="getGridOne!=null  && getGridOne.model=='share'" open-type="share" class="grid-left-box">
+			<view class="main pd16_15">
+				<view class="ft16 ftw600 cl-default">{{getGridOne.name}}</view>
+				<view class="mt4 ft12" :style="{color:tempColor}">{{getGridOne.desc}}</view>
+				<view class="btn-go" :style="{background:tempColor}">GO<text class="iconfont iconicon_arrow_small ft12"></text></view>
+			</view>
+			<image class="left-bg" :src="statics.gridLeft"></image>
+			<image class="left-icon" :src="getGridOne.icon"></image>
+		</button>
+		<view v-if="getGridOne!=null  && getGridOne.model!='share'" :data-model="getGridOne.model" @click="linkTo" class="grid-left-box">
+			<view class="main pd16_15">
+				<view class="ft16 ftw600 cl-default">{{getGridOne.name}}</view>
+				<view class="mt4 ft12" :style="{color:tempColor}">{{getGridOne.desc}}</view>
+				<view class="btn-go" :style="{background:tempColor}">GO<text class="iconfont iconicon_arrow_small ft12"></text></view>
+			</view>
+			<image class="left-bg" :src="statics.gridLeft"></image>
+			<image class="left-icon" :src="getGridOne.icon"></image>
+		</view>
+		<view>
+			<button v-if="getGridTwo!=null  && getGridTwo.model=='share'" open-type="share" class="grid-right-box">
+				<view class="main pd16_15">
+					<view class="ft16 ftw600 cl-default">{{getGridTwo.name}}</view>
+					<view class="mt4 ft12" :style="{color:tempColor}">{{getGridTwo.desc}}</view>
+					<view class="btn-go" :style="{background:tempColor}">GO<text class="iconfont iconicon_arrow_small ft12"></text></view>
+				</view>
+				<image class="right-bg" :src="statics.gridRight"></image>
+				<image class="right-icon" :src="getGridTwo.icon"></image>
+			</button>
+			<view  v-if="getGridTwo!=null  && getGridTwo.model!='share'"  :data-model="getGridTwo.model" @click="linkTo" class="grid-right-box">
+				<view class="main pd16_15">
+					<view class="ft16 ftw600 cl-default">{{getGridTwo.name}}</view>
+					<view class="mt4 ft12" :style="{color:tempColor}">{{getGridTwo.desc}}</view>
+					<view class="btn-go" :style="{background:tempColor}">GO<text class="iconfont iconicon_arrow_small ft12"></text></view>
+				</view>
+				<image class="right-bg" :src="statics.gridRight"></image>
+				<image class="right-icon" :src="getGridTwo.icon"></image>
+			</view>
+			<view class="mt15">
+				<button v-if="getGridThree!=null  && getGridThree.model=='share'" open-type="share" class="grid-right-box">
+					<view class="main pd16_15">
+						<view class="ft16 ftw600 cl-default">{{getGridThree.name}}</view>
+						<view class="mt4 ft12" :style="{color:tempColor}">{{getGridThree.desc}}</view>
+						<view class="btn-go" :style="{background:tempColor}">GO<text class="iconfont iconicon_arrow_small ft12"></text></view>
+					</view>
+					<image class="right-bg" :src="statics.gridRight"></image>
+					<image class="right-icon" :src="getGridThree.icon"></image>
+				</button>
+				<view  v-if="getGridThree!=null  && getGridThree.model!='share'"  :data-model="getGridThree.model" @click="linkTo"   class="grid-right-box">
+					<view class="main pd16_15">
+						<view class="ft16 ftw600 cl-default">{{getGridThree.name}}</view>
+						<view class="mt4 ft12" :style="{color:tempColor}">{{getGridThree.desc}}</view>
+						<view class="btn-go" :style="{background:tempColor}">GO<text class="iconfont iconicon_arrow_small ft12"></text></view>
+					</view>
+					<image class="right-bg" :src="statics.gridRight"></image>
+					<image class="right-icon" :src="getGridThree.icon"></image>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return {
+				gridData:[
+					{name:'VIP特惠',desc:'尊享会员折上折',model:'tuan',icon:this.$config.staticUrl +'vipcard_home_tehui@2x.png',show:1},
+					{name:'领优惠券',desc:'领券更省钱',model:'coupon',icon:this.$config.staticUrl +'vipcard_home_coupon@2x.png',show:1},
+					{name:'邀请好友',desc:'越邀请，越优惠',model:'share',icon:this.$config.staticUrl +'vipcard_home_invite@2x.png',show:0},
+					{name:'积分商城',desc:'小积分兑豪礼',model:'integral',icon:this.$config.staticUrl +'vipcard_home_integralmall@2x.png',show:1},
+					{name:'开通次卡',desc:'省钱升级必备',model:'card',icon:this.$config.staticUrl +'vipcard_home_cika@2x.png',show:0},
+				]
+			}
+		},
+		computed:{
+			getGridDatas(){
+				let arr  = new Array;
+				for(var a  in this.gridData){
+					if(this.gridData[a].show == 1){
+						arr.push(this.gridData[a]);
+					}
+				}
+				return arr;
+			},
+			getGridOne(){
+				return this.getGridDatas[0] ? this.getGridDatas[0] : null;
+			},
+			getGridTwo(){
+				return this.getGridDatas[1] ? this.getGridDatas[1] : null;
+			},
+			getGridThree(){
+				return this.getGridDatas[2] ? this.getGridDatas[2] : null;
+			}
+		},
+		methods:{
+			linkTo(e){
+				let model = e.currentTarget.dataset.model;
+				let url = '';
+				switch(model){
+					case 'coupon':
+						url = '/pages/client/coupon/index';
+					break;
+					case 'integral':
+						url = '/pages/client/integral/index';
+					break;
+					case 'card':
+						url = '/pages/client/card/index';
+					break;
+					case 'tuan':
+						url = '/pages/client/tuan/index';
+					break;
+				}
+				if(url == '') return;
+				uni.navigateTo({
+					url:url
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.grid-left-box{
+		width: 330rpx;
+		height: 430rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 4rpx 32rpx 0rpx rgba(0, 0, 0, 0.04);
+		border-radius: 32rpx;
+		position: relative;
+		overflow: hidden;
+		margin: 0;
+		padding: 0;
+		line-height: 1;
+		text-align: left;
+	}
+	.grid-right-box{
+		width: 330rpx;
+		height: 200rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 4rpx 32rpx 0rpx rgba(0, 0, 0, 0.04);
+		border-radius: 32rpx;
+		position: relative;
+		overflow: hidden;
+		margin: 0;
+		padding: 0;
+		line-height: 1;
+		text-align: left;
+	}
+	.grid-left-box .main,.grid-right-box .main{
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: 3;
+	}
+	.grid-left-box .left-bg{
+		width: 100%;
+		height: 140rpx;
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		z-index: 1;
+	}
+	.grid-left-box .left-icon{
+		width: 200rpx;
+		height: 200rpx;
+		position: absolute;
+		right: 0;
+		bottom: 0;
+		z-index: 2;
+	}
+	.grid-right-box .right-icon{
+		width: 120rpx;
+		height: 120rpx;
+		position: absolute;
+		right: 0;
+		bottom: 0;
+		z-index: 2;
+	}
+	.grid-right-box .right-bg{
+		width: 100%;
+		height: 74rpx;
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		z-index: 1;
+	}
+	.btn-go{
+		display: block;
+		width: 92rpx;
+		height: 40rpx;
+		border-radius: 20rpx;
+		text-align: center;
+		margin-top: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 28rpx;
+		font-weight: 600;
+		color: #FFFFFF;
+		font-style:italic;
+	}
+	.btn-go text{
+		font-weight: 400;
+		margin-left: 8rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/home/jqjs.vue b/components/home/jqjs.vue
new file mode 100644
index 0000000..5f2f19a
--- /dev/null
+++ b/components/home/jqjs.vue
@@ -0,0 +1,138 @@
+<template>
+	<view>
+		<view class="pd16_15" style="margin-bottom: 80upx;">	
+			<view class="" style="">
+				<block v-for="(value,key) in datasa" :key="key">
+				<view @click="detail(value.id,0)" style="" class="flex alcenter mb16 showStyle">
+					<image mode="aspectFill" class="tuan-product-l" :src="value.img"></image>
+					<!-- <view class="btn-mini" style="position: absolute; top: 40upx; left: 280upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx;" :style="getBtnStyle">{{value.lxname}}</view> -->
+					<view class="tuan-product-r pl15">
+						<view class="ft16 ftw600 cl-main text-over1">{{value.name}}</view>
+						<view class="mt5">
+							<text class="ft14 cl-main text-over4" style="line-height: 50upx;">{{value.story}}</text>
+						</view>
+						<!-- <view class="mt16 flex space alcenter">
+							<view class="ft14 cl-notice">{{value.mname}}</view>
+							<view class="btn-vip-adviser ml15">继续观看</view>
+						</view> -->
+					</view>
+				</view>
+				</block>
+			</view>
+		</view>
+		<view class="home-main" style="height: 50upx;">
+			<!-- <com-copyright></com-copyright> -->
+		</view>
+		
+<!--		<dialog-couponshareget @loginAct="showLoginCouponShareGet" v-if="showCouponShareGet" @closed="showCouponShareGet = false"></dialog-couponshareget>-->
+	</view>
+</template>
+
+<script>
+	export default{
+		props: ['datasa'],
+		data(){
+			return {
+				isLogin:false,
+				showBirthday:false,
+				showLogin:false,
+				showQrcode:false,
+				showCouponShareGet:false,
+			}
+		},
+
+		created(){
+			
+			// uni.setNavigationBarTitle({
+			//     title: '夜趣小视频'
+			// });
+			
+			// setTimeout(()=>{
+			// 	this.showCouponShareGet = true;	
+			// },1000);
+		},
+		methods:{
+			//'/pages/client/tuan/detail?id='+value.id
+			detail(vid,mid){
+				uni.navigateTo({
+					url:'/pages/client/tuan/detail?vid='+vid+'&mid='+mid
+				})
+			},
+			showLoginAct(){
+				this.showLogin = true;
+			},
+			showLoginCouponShareGet(){
+				this.showLogin = true;
+			},
+			loginYes(){
+				
+			}
+		}
+	}
+</script>
+
+<style>
+	.showStyle::before{
+		content:'';
+		position:'absolute';
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		background-color: rgba(31, 33, 41, 0.4);
+		z-index:-1;
+		backdrop-filter:blur(80px);
+	}
+	.showStyle{
+		position: relative; 
+	}
+	.home-header{
+		height: 304rpx;
+		width: 100%;
+		position: relative;
+		background: #363B4D;
+		border-radius: 0rpx 0rpx 48rpx 48rpx;
+	}
+	.home-main{
+		width: 100%;
+		position: relative;
+		margin-top: -156rpx;
+		padding: 0 30rpx;
+	}
+	.home-mendian{
+		width: 100%;
+		height: 84rpx;
+		background:rgba(255,255,255,0.1);
+		border-radius: 42rpx;
+	}
+
+	.tuan-product-l{
+		width: 200rpx;
+		height: 260rpx;
+		border-radius: 16rpx;
+		background: #F2F2F2;
+	}
+	.tuan-product-r{
+		width: calc(100% - 200rpx);
+		height:260rpx;
+	}
+	.btn-vip-adviser{
+		width: 200rpx;
+		height: 60rpx;
+		border-radius: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 28rpx;
+		/* font-weight: 600; */
+		background: #FF6600;
+		color:#FFFFFF;
+	}
+	.integral-mall-goods{
+		width: 100%;
+		height: 280rpx;
+		background: #F2F2F2;
+		border-radius: 16upx;
+	}
+	
+</style>
diff --git a/components/home/vipcard.vue b/components/home/vipcard.vue
new file mode 100644
index 0000000..51565b6
--- /dev/null
+++ b/components/home/vipcard.vue
@@ -0,0 +1,180 @@
+<template>
+	<view>
+		<view v-if="userinfo.isLogin" class="box pd16_15">
+			 <navigator url="/pages/client/vipcard/index">	
+				 <view class="home-vip-tag-box">
+					 <image class="bg" v-if="userinfo.group_id == 1" :src="statics.vipbg"></image>
+					 <image  class="bg" v-else :src="statics.vipBgHas"></image>
+					 <view v-if="userinfo.group_id == 1" class="main plr15 flex alcenter space">
+						 <view class="tag-no-vip">普通用户</view>
+						 <view class="flex alcenter">
+							 <text class="ft12 cl-default mr15 ftw500">升级VIP，省更多钱</text>
+							 <image class="right-icon" :src="statics.rightIcon"></image>
+						 </view>
+					 </view>
+					 
+					 <view v-else class="main plr15 flex alcenter space">
+						 <view class="tag-has-vip flex alcenter center">
+							 <image class="vip-level-icon" :src="statics.vipLevelImg[0]"></image>
+							 <text class="vip-level-means">VIP会员</text>
+						 </view>
+						 <view class="flex alcenter">
+							 <view v-if="userinfo.dqts<0" class="ft12 cl-default mr15 ftw500">您好！尊敬的VIP<br>您的会员已经到期{{-userinfo.dqts}}天</view>
+							 <view v-if="userinfo.dqts>=0" class="ft12 cl-default mr15 ftw500">您好！尊敬的VIP<br>您的会员{{userinfo.dqts}}天后到期</view>
+							 <image class="right-icon" :src="statics.rightIcon"></image>
+						 </view>
+					 </view>
+				 </view>
+			 </navigator>
+			 <view class="mt24 flex space">
+				 <view class="col3 text-center">
+					 <navigator url="/pages/client/vipcard/moneylog">
+					 <view class="cl-notice ft12">余额</view>
+					 <view class="mt8 ft20 ftw600 cl-default">{{userinfo.money}}</view>
+					 </navigator>
+				 </view>
+				 
+				 <view class="col3 text-center" style="display: none;">
+					 <!-- <navigator url="/pages/client/coupon/mine/index"> -->
+					 <view class="cl-notice ft12">优惠券</view>
+					 <view class="mt8 ft20 ftw600 cl-default">0</view>
+					<!-- </navigator> -->
+				 </view>
+				 
+				 <view class="col3 text-center">
+					 <navigator url="/pages/client/vipcard/integrallog">
+						 <view class="cl-notice ft12">积分</view>
+						 <view class="mt8 ft20 ftw600 cl-default">{{userinfo.score}}</view>
+					 </navigator>
+				 </view>
+			 </view>
+			 
+			 <view class="flex space alcenter  mt24" style="padding-bottom: 16rpx;">
+				 <view class="flex alcenter">
+					 <navigator url="/pages/client/vipcard/recharge">
+						<view class="btn-vip-money" :style="getBtnStyle">充值</view>
+					 </navigator>
+					 <navigator v-if="userinfo.zstx>0" url="/pages/client/member/tx">
+						<view class="btn-vip-adviser ml15" :style="getBtnPlanStyle">提现</view>
+					 </navigator>
+				 </view>
+				 <!-- #ifdef MP-WEIXIN -->
+				 <view @click="showQrcodeAct" v-if="userinfo.config.iskq==1" class="vip-qrcode-tag" :style="getBtnStyle">
+				 		<!-- <text class="iconfont iconbtn_card_ma-copy ft20 cl-w"></text> -->
+						<image style="width: 50upx; height: 50upx;" src="/static/share-fill.png"></image>
+				 </view>
+				 <!-- #endif -->
+				 <!-- #ifndef MP-WEIXIN -->
+				 <view @click="wdfxm" v-if="userinfo.config.iskq==1" class="vip-qrcode-tag" :style="getBtnStyle">
+					 <text class="iconfont iconbtn_card_ma-copy ft20 cl-w"></text>
+				 </view>
+				 <!-- #endif -->
+			 </view>
+		</view>
+		<view v-else class="box pd24_15">
+			<view class="text-center ft14 cl-info2">您还没登录，登录后即可体验VIP会员</view>
+			<view class="flex center mt24">
+				<button class="btn-mid" @click="loginAct" :style="getBtnStyle">立即登录</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		props: ['userinfo'],
+		data(){
+			return {
+				isLogin:true,
+				vipLevel:0,//普通用户
+			}
+		},
+		methods:{
+			loginAct(){
+				this.$emit('loginAct');
+			},
+			showQrcodeAct(){
+				this.$emit('qrcode');
+			},
+			wdfxm(){
+				uni.navigateTo({
+					url:'/pages/client/member/qrshare'
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.home-vip-tag-box{
+		height: 100rpx;
+		width: 100%;
+		position: relative;
+		overflow: hidden;
+		border-radius: 8rpx;
+	}
+	.home-vip-tag-box .main{
+		width: 100%;
+		height: 100rpx;
+		position: absolute;
+		z-index: 2;
+		left: 0;
+		top: 0;
+	}
+	.home-vip-tag-box .bg{
+		width: 100%;
+		height: 100rpx;
+	}
+	.tag-no-vip{
+		width: 128rpx;
+		height: 40rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		font-size: 24rpx;
+		font-weight: 600;
+		color:#8A8D99;
+		text-align: center;
+		line-height: 40rpx;
+	}
+	.tag-has-vip{
+		width: 200rpx;
+		height: 40rpx;
+		background: linear-gradient(180deg, #333333 0%, #000000 100%);
+		border-radius: 20rpx;
+	}
+	.tag-has-vip .vip-level-icon{
+		width: 36rpx;
+		height: 36rpx;
+	}
+	.tag-has-vip .vip-level-means{
+		font-size: 24rpx;
+		margin-left: 8rpx;
+		font-weight: 500;
+		background: linear-gradient(180deg, #F2DCA9 0%, #C79556 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+	}
+	.home-vip-tag-box .main .right-icon{
+		width: 40rpx;
+		height: 40rpx;
+	}
+	.vip-qrcode-tag{
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.btn-vip-money,.btn-vip-adviser{
+		width: 208rpx;
+		height: 80rpx;
+		border-radius: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 28rpx;
+		font-weight: 600;
+		color:#FFFFFF;
+	}
+</style>
diff --git a/components/redeemVIP.vue b/components/redeemVIP.vue
new file mode 100644
index 0000000..fa922bf
--- /dev/null
+++ b/components/redeemVIP.vue
@@ -0,0 +1,106 @@
+<template>
+  <uni-popup type="center" ref="redeemVip">
+    <view class="vipBox">
+      <view class="vipTitle">VIP激活</view>
+      <view class="vipContent">
+        <input type="text" class="ipt" placeholder="请输入卡密" v-model="vipCode">
+        <!--      <input type="text" class="ipt" placeholder="请输入密码" v-model="vipPass">-->
+      </view>
+      <view class="vipFooter">
+        <view class="vipConfirmBtn footerBtn" @click="submitCard">确定</view>
+        <view class="vipCancelBtn footerBtn" @click="closeRedeem">取消</view>
+      </view>
+    </view>
+  </uni-popup>
+</template>
+
+<script>
+export default {
+  name: "depositPup",
+  data() {
+    return {
+      vipCode: '',
+      vipPass: ''
+    }
+  },
+  methods: {
+    submitCard(){
+      let that = this;
+      uni.request({
+        url: that.configs.webUrl + '/api/Cryptocard/exchangeCard',
+        method: 'get',
+        data: {
+          dense: this.vipCode,
+          vipPass: this.vipPass
+        },
+        success: (res) => {
+          console.log(res)
+          if(res.data.code == 1){
+            this.$emit('redeemVip',res.data.data)
+            this.closeRedeem()
+          }else{
+            uni.showToast()
+          }
+        }
+      })
+
+    },
+    showRedeem() {
+      this.$refs.redeemVip.open('center')
+    },
+    closeRedeem() {
+      this.$refs.redeemVip.close()
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+.vipBox{
+  width: 600rpx;
+  border-radius: 15rpx;
+  background-color: #fff;
+  padding: 20rpx 0;
+}
+.vipTitle{
+  line-height: 60rpx;
+  font-size: 32rpx;
+  color: #333;
+  text-align: center;
+}
+.vipContent{
+  padding: 20rpx;
+}
+.ipt{
+  height: 70rpx;
+  line-height: 70rpx;
+  padding-left: 15rpx;
+  font-size: 30rpx;
+  border: 1rpx solid #eeeeee;
+  margin-top: 30rpx;
+  border-radius: 10rpx;
+}
+.vipFooter{
+  display: flex;
+  align-items: center;
+  justify-content:space-around;
+  padding: 20rpx 0;
+  margin: 0 30rpx;
+}
+.footerBtn{
+  width: 200rpx;
+  line-height: 70rpx;
+  font-size: 28rpx;
+  text-align: center;
+  border-radius: 10rpx;
+}
+.vipConfirmBtn{
+  background-color: #00C657;
+  color: #FFFFFF;
+}
+.vipCancelBtn{
+  background-color: #eeeeee;
+}
+
+</style>
\ No newline at end of file
diff --git a/components/select/video.vue b/components/select/video.vue
new file mode 100644
index 0000000..5d4c3fa
--- /dev/null
+++ b/components/select/video.vue
@@ -0,0 +1,401 @@
+<template>
+  <view class="compontents">
+    <uni-popup ref="choiceNumPup" type="bottom" :safe-area="fales">
+      <view class="choiceNumPupConts" v-if="selectType=='1'">
+        <view class="firstSelectHeader">
+          <text> 当前播放第{{ playVideoInfo.weigh }}个视频</text>
+          <uni-icons type="down" size="20" color="#999999" @click="hideChoicePup"></uni-icons>
+        </view>
+        <scroll-view scroll-y class="videoScroll">
+          <view class="firstList">
+            <view class="firstItem" v-for="videos in videoListData" :key="videos.id" @click="clickItem(videos)">
+              <image class="videoCover" :src="videos.img" mode="widthFix"></image>
+              <view class="videoCont">
+                <text class="videoNum">{{ videos.name }}</text>
+                <view class="videoNameBox">
+                  <text class="videoName"> {{ videos.title }}</text>
+                  <image class="lock" v-if="videos.pays=='1'" mode="scaleToFill" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/2.png"></image>
+                </view>
+                <text class="videoInfo"> {{ videos.msg }}</text>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <view class="choiceNumPupConts" v-if="selectType=='2'">
+        <view class="choiceTItle">
+          <text class="videoName">{{ videoInfo.name }}
+           <!-- <text class="videoNameSecond">更新至({{ videoInfo.sum }})</text> -->
+          </text>
+          <view class="schoiceClose" @click="hideChoicePup">
+            <uni-icons type="closeempty" size="20" color="#999999"></uni-icons>
+          </view>
+        </view>
+        <scroll-view scroll-x="true" class="pageLine">
+          <text :class="['pageItem',{'pageItemCheck': index+1 == page.currentPage}]"
+                v-for="(item,index) in pageList" :key="index" @click="changePage(index)"
+          >{{ item }}
+          </text>
+        </scroll-view>
+        <scroll-view scroll-y class="choiceScroll">
+          <view class="videoList">
+            <view :class="['videoItem',{'videoItemCheck': videos.playing}]" @click="clickItem(videos)"
+                  v-for="videos in videoListData" :key="videos.id">
+              <view class="tag" v-if="videos.pays==1">
+                <image class="lock" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/white_lock_icon.png" mode="scaleToFill"></image>
+              </view>
+              <image v-if="videos.playing && videos.pays==2" class="playGif" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/player.gif"
+                     mode="scaleToFill"></image>
+              <text v-else class="videoNumber">{{ videos.numText }}</text>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </uni-popup>
+  </view>
+</template>
+
+<script>
+
+import {httpRequest} from "@/utils/request";
+export default {
+  props: {
+    playVideoInfo: {
+      type: Object,
+      default: ()=>{
+		  return new Object
+	  }
+    },
+    videoInfo: {
+      type: Object,
+      default: ()=>{
+		  return new Object
+	  }
+    }
+  },
+  data() {
+    return {
+      videoListData: [],
+      pageList: [],
+      videoDel: {},
+      userInfo: {},
+      page: {
+        pageSize: 25,
+        currentPage: 1,
+        allPage: 1,
+        totalNum: 0
+      },
+      selectType: '2'
+    }
+  },
+  mounted() {
+    this.userInfo = uni.getStorageSync('userinfo');
+    // this.videoDel = Object.assign({},{},this.videoInfo);
+  },
+  methods: {
+    clickItem(item) {
+      this.$emit('choiceVideoItem', item)
+      this.hideChoicePup()
+    },
+    showChoicePup() {
+      this.getVideoList();
+      this.$refs.choiceNumPup.open()
+    },
+    hideChoicePup() {
+      this.$refs.choiceNumPup.close()
+    },
+    creatFirstPaging(ResData) {
+      let that = this;
+      ResData.data.forEach((item, index) => {
+        item.ranking_num = Number(index);
+      })
+      if (that.page.currentPage == 1) {
+        that.page.totalNum = ResData.total;
+        that.videoListData = ResData.data
+      } else {
+        that.videoListData = that.videoListData.concat(ResData.data)
+      }
+      that.page.currentPage += 1;
+    },
+
+    creatSecondPaging(ResData) {
+      let that = this;
+      ResData.data.forEach((item, index) => {
+        item.ranking_num = (that.page.currentPage - 1) * that.page.pageSize + index;
+        item.numText = (that.page.currentPage - 1) * that.page.pageSize + index + 1;
+        if (item.id == that.playVideoInfo.id) {
+          item.playing = true;
+        } else {
+          item.playing = false;
+        }
+      })
+      that.videoListData = ResData.data;
+      that.page.totalNum = ResData.total;
+      if (that.page.currentPage == 1) {
+        that.videoDel = ResData.videodata;
+        let pageItemLength = Math.ceil(Number(ResData.total) / that.page.pageSize),
+            listData = [];
+        for (let i = 1; i <= pageItemLength; i++) {
+          if (i == 1) {
+            listData.push(`${i} - ${that.page.pageSize}`)
+          } else {
+            if (i == pageItemLength) {
+              listData.push(`${(i - 1) * that.page.pageSize + 1} - ${ResData.total}`)
+            } else {
+              listData.push(`${(i - 1) * that.page.pageSize + 1} - ${i * that.page.pageSize}`)
+            }
+
+          }
+        }
+        that.pageList = listData;
+      }
+    },
+    getVideoList() {
+      let that = this;
+      httpRequest({
+        url: "/api/video/videoinfo",
+        method: "GET",
+        data: {
+          uid: that.userInfo.id,
+          token: that.userInfo.token,
+          page: that.page.currentPage,
+          limit: that.page.pageSize,
+          vid: that.videoInfo.id,
+          vs_id: ""
+        },
+      }).then(res=>{
+        if (that.selectType == '1') {
+          that.creatFirstPaging(res)
+        } else {
+          that.creatSecondPaging(res)
+        }
+      }).catch(err=>{
+        console.log(err)
+      })
+    },
+    changePage(val) {
+      console.log(val)
+      if (val + 1 != this.page.currentPage) {
+        this.page.currentPage = val + 1;
+        this.getVideoList();
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.choiceNumPupConts {
+  width: 750rpx;
+  border-radius: 24rpx 24rpx 0rpx 0rpx;
+  padding: 36rpx 40rpx 0 40rpx;
+  background-color: #212122;
+}
+
+.firstSelectHeader {
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  font-size: 36rpx;
+  color: rgba(255, 255, 255, 0.87);
+}
+.videoScroll{
+  height: 600rpx;
+}
+.firstList{
+  padding-top: 40rpx;
+}
+.firstItem {
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  position: relative;
+  margin-bottom: 30rpx;
+  .videoCover {
+    width: 160rpx;
+    height: 180rpx;
+    border-radius: 10rpx;
+  }
+  .videoCont{
+    padding-left: 15rpx;
+    .videoNum{
+      font-size: 36rpx;
+      color: #FFFFFF;
+      font-weight: bold;
+    }
+    .lock {
+      width: 50rpx;
+      height: 50rpx;
+      margin-left: 15rpx;
+    }
+    .videoNameBox{
+      display: flex;
+      align-items: center;
+      flex-direction: row;
+    }
+
+    .videoName {
+      font-size: 16px;
+      color: #FFFFFF;
+      margin-top: 5px;
+      overflow: hidden;
+    }
+
+    .videoInfo {
+      font-size: 16px;
+      color: #FFFFFF;
+      margin-top: 5px;
+      overflow: hidden;
+      opacity: 0.6;
+    }
+  }
+
+}
+
+
+.choiceTItle {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+
+  .videoName {
+    font-weight: 500;
+    font-size: 36rpx;
+    color: rgba(255, 255, 255, 0.87);
+  }
+
+  .videoNameSecond {
+    font-weight: 400;
+    font-size: 28rpx;
+    color: rgba(255, 255, 255, 0.36);
+    padding-left: 24rpx;
+  }
+
+  .schoiceClose {
+    padding: 10rpx;
+    border-radius: 8rpx;
+  }
+}
+
+.pageLine {
+
+  /* #ifdef MP-TOUTIAO || MP-WEIXIN || H5 */
+  display: block;
+  min-width: 100%;
+  width: auto;
+  /* #endif */
+
+  /* #ifdef APP */
+  width: 750rpx;
+  display: flex;
+  flex-direction: row;
+  /* #endif */
+
+  margin-top: 20rpx;
+  padding-left: 40rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  overflow-x: auto;
+  height: 60rpx;
+
+  .pageItem {
+    /* #ifdef MP-TOUTIAO || MP-WEIXIN || H5 */
+    display: inline-block;
+    /* #endif */
+    /* #ifdef APP */
+    width: 140rpx;
+    /* #endif */
+    padding: 0 26rpx;
+    line-height: 48rpx;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: rgba(255, 255, 255, 0.36);
+    margin-right: 20rpx;
+  }
+
+  .pageItemCheck {
+
+    position: relative;
+    color: #09D89E;
+  }
+
+  .pageItemCheck::before {
+    content: ' ';
+    width: 40rpx;
+    height: 4px;
+    border-radius: 5rpx;
+    background: #09D89E;
+    position: absolute;
+    bottom: -10rpx;
+    left: 40rpx;
+  }
+}
+
+.choiceScroll {
+
+  height: 600rpx;
+  padding-top: 40rpx;
+
+  .videoList {
+    display: flex;
+    align-items: center;
+    justify-content: left;
+    flex-direction: row;
+    flex-wrap: wrap;
+  }
+
+  .videoItem {
+    width: 120rpx;
+    height: 100rpx;
+    background: #404040;
+    border-radius: 12rpx;
+    text-align: center;
+    position: relative;
+    margin-right: 15rpx;
+    margin-bottom: 20rpx;
+
+    .tag {
+      position: absolute;
+      top: 0;
+      right: 0;
+      background: #09D89E;
+      width: 30rpx;
+      text-align: center;
+      border-radius: 0rpx 12rpx 0rpx 12rpx;
+
+      .lock {
+        width: 20rpx;
+        height: 20rpx;
+        vertical-align: middle;
+        margin: 0 auto;
+      }
+    }
+
+    .videoNumber {
+      line-height: 100rpx;
+      text-align: center;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: rgba(255, 255, 255, 0.87);
+
+    }
+  }
+
+  .videoItemCheck {
+    width: calc(20% - 24rpx);
+    height: 96rpx;
+    border: 2rpx solid #404040;
+    background: #121212;
+    border-radius: 12rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .playGif {
+      width: 80rpx;
+      height: 80rpx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..c3ff205
--- /dev/null
+++ b/index.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title></title>
+    <!--preload-links-->
+    <!--app-context-->
+  </head>
+  <body>
+    <div id="app"><!--app-html--></div>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..91af636
--- /dev/null
+++ b/main.js
@@ -0,0 +1,30 @@
+import Vue from 'vue'
+import App from './App'
+import {httpRequest} from "./utils/request.js"
+
+Vue.prototype.$httpRequest = httpRequest;
+
+import config from "@/utils/config";
+Vue.prototype.$config = config;
+Vue.config.productionTip = false;
+
+App.mpType = 'app'
+
+const app = new Vue({
+  ...App
+})
+// #ifdef MP-WEIXIN
+import chargeDialog from 'components/charge-dialog/charge-dialog.vue'
+Vue.component("charge-dialog", chargeDialog);
+// #endif
+app.$mount()
+
+// #ifdef VUE3
+import { createSSRApp } from 'vue'
+export function createApp() {
+  const app = createSSRApp(App)
+  return {
+    app
+  }
+}
+// #endif
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..b4ed9c5
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,120 @@
+{
+    "name" : "吆喝",
+    "appid" : "__UNI__1235802",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "OAuth" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "minSdkVersion" : ""
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wx0663114d527513ac",
+                        "UniversalLinks" : ""
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx6de5fc276420b278",
+        "setting" : {
+            "urlCheck" : false,
+            "postcss" : true,
+            "minified" : true,
+            "es6" : true
+        },
+        "optimization" : {
+            "subPackages" : true
+        },
+        "usingComponents" : true,
+        "requiredBackgroundModes" : [ "audio" ],
+        "permission" : {},
+        "plugins" : {
+            "playlet-plugin" : {
+                "version" : "latest",
+                "provider" : "wx94a6522b1d640c3b",
+                "genericsImplementation" : {
+                    "playlet" : {
+                        "charge-dialog" : "/components/charge-dialog/charge-dialog"
+                    }
+                }
+            }
+        }
+    },
+    "h5" : {
+        "devServer" : {
+            "disableHostCheck" : true,
+            "proxy" : {
+                "/api" : {
+                    "target" : "https://wx.yaohe.hnjrdzkj.xyz/",
+                    //数据请求的接口网址
+                    "changeOrigin" : true,
+                    //是否开启跨域
+                    "pathRewrite" : {
+                        "^/api" : ""
+                    }
+                }
+            }
+        },
+        "router" : {
+            "base" : "/h5/"
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..0f24dce
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,340 @@
+{
+	"pages": [
+		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/tabs/home",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#000000",
+				"navigationBarTextStyle": "black",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/tabs/recommend",
+			"style": {
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false,
+				"usingComponents": {
+				  "drama-feed-list": "plugin://playlet-plugin/drama-feed-list"
+				}
+			}
+		},
+		{
+			"path": "pages/tabs/bingeWatch",
+			"style": {
+				"navigationBarTitleText": "追剧",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/tabs/my",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/client/tuan/detail",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/client/tuan/search",
+			"style": {
+				"navigationBarTitleText": "搜索",
+				"enablePullDownRefresh": false
+			}
+		}
+	],
+	"subpackages": [{
+		"root": "pagesA",
+		"pages": [{
+				"path": "player/detailPlayer",
+				"style": {
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "agreement/agreement",
+				"style": {
+					"navigationBarTitleText": "协议",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "myCenter/recharge",
+				"style": {
+					"navigationStyle": "custom",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "myCenter/wallet/bill",
+			"style": {
+				"navigationBarTitleText": "金豆明细",
+				"enablePullDownRefresh": false
+			}
+			},
+			{
+				"path": "myCenter/wallet/earning",
+				"style": {
+					"navigationStyle": "custom",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "myCenter/watchHistory",
+				"style": {
+					"navigationBarTitleText": "观看历史",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "myCenter/bingeWatch",
+				"style": {
+					"navigationBarTitleText": "我的追剧",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "myCenter/myLike",
+				"style": {
+					"navigationBarTitleText": "我的喜欢",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "servers/callServer",
+				"style": {
+					"navigationBarTitleText": "联系客服",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "servers/servesQR",
+				"style": {
+					"navigationBarTitleText": "客服二维码",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "myCenter/settings/set",
+				"style": {
+					"navigationBarTitleText": "编辑资料",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "myCenter/settings/userName",
+				"style": {
+					"navigationBarTitleText": "修改昵称",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "myCenter/settings/mobile",
+				"style": {
+					"navigationBarTitleText": "修改手机号",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "login/register",
+				"style": {
+					"navigationBarTitleText": "注册",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "login/login",
+				"style": {
+					"navigationBarTitleText": "登录",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "login/forget",
+				"style": {
+					"navigationBarTitleText": "找回密码",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "player/ranking",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "player/free",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "player/news",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "myCenter/wallet/webPay",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "integral/integralShop",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "integral/Exclusive",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "integral/ItemDetails",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "integral/commodityOrder",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "integral/completeorder",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "integral/address",
+				"style": {
+					"navigationBarTitleText": "地址管理",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "integral/pointsdetail",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "integral/Order",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "integral/newaddress",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#F7F8F9"
+				}
+			},{
+				"path": "VIP/VIP",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+			}
+
+		]
+	}],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#F5F6FA"
+	},
+	"tabBar": {
+		"color": "#B3BBBF",
+		"selectedColor": "#333333",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [
+			// {
+			// 	"pagePath": "pages/client/video",
+			// 	"iconPath": "static/tabImg/yzy_sc.png",
+			// 	"selectedIconPath": "static/tabImg/yzy_scs.png",
+			// 	"text": "视频"
+			// },
+
+			// {
+			// 	"pagePath": "pages/client/video/video",
+			// 	"iconPath": "static/tabImg/yzy_sc.png",
+			// 	"selectedIconPath": "static/tabImg/yzy_scs.png",
+			// 	"text": "追剧"
+			// },
+			{
+				"pagePath": "pages/tabs/home",
+				"iconPath": "static/tabbar/home.png",
+				"selectedIconPath": "static/tabbar/home_active.png",
+				"text": "小剧场"
+			},
+			{
+				"pagePath": "pages/tabs/recommend",
+				"iconPath": "static/tabbar/message.png",
+				"selectedIconPath": "static/tabbar/message_active.png",
+				"text": "推荐"
+			},
+			{
+				"pagePath": "pages/tabs/bingeWatch",
+				"iconPath": "static/tabbar/history.png",
+				"selectedIconPath": "static/tabbar/history_active.png",
+				"text": "追剧"
+			},
+			{
+				"pagePath": "pages/tabs/my",
+				"iconPath": "static/tabbar/my.png",
+				"selectedIconPath": "static/tabbar/my_active.png",
+				"text": "我的"
+			}
+		]
+	},
+	"easycom": {
+		"autoscan": true,
+		"custom": {
+			//      "com-(.*)": "@/components/common/$1.vue",
+			//      "show-(.*)": "@/components/show/$1.vue",
+			//      "countdown-(.*)": "@/components/countdown/$1.vue",
+			//      "sub-(.*)": "@/components/sub/$1.vue",
+			//      "dialog-(.*)": "@/components/dialog/$1.vue",
+			//      "select-(.*)": "@/components/select/$1.vue",
+			"home-(.*)": "@/components/home/$1.vue"
+			//      "order-(.*)": "@/pages/client/components/order/$1.vue"
+		}
+	}
+}
\ No newline at end of file
diff --git a/pages/client/tuan/detail.vue b/pages/client/tuan/detail.vue
new file mode 100644
index 0000000..e69c534
--- /dev/null
+++ b/pages/client/tuan/detail.vue
@@ -0,0 +1,108 @@
+<template>
+  <view class="pages">
+    <!--<view>此页面用于兼容老项目 后期会删除</view>-->
+  </view>
+</template>
+
+<script>
+import login from "@/utils/login";
+
+export default {
+  data() {
+    return {
+      userInfo: {}
+
+    };
+  },
+  onLoad(e) {
+    console.log('detail page data')
+    console.log(e);
+    let userInfo = uni.getStorageSync("userinfo");
+    if (userInfo.id) {
+      if (e.adv_id && e.code) {
+        this.bindUser(e)
+      } else {
+        this.goPlayer(e)
+      }
+    } else {
+      login.wxLogin().then(res => {
+        if (e.adv_id && e.code) {
+          this.bindUser(e)
+        } else {
+          this.goPlayer(e)
+        }
+      }).catch(err=>{
+        console.log(err)
+      })
+    }
+  },
+  methods: {
+    bindUser(data) {
+      let that = this;
+      let upData = {
+        ad_id: data.code || '',
+        advertiser_id: data.advertiser_id || '',
+        clue_id: data.clue_id || '',
+        clue_token: data.clue_token || '',
+        click_id: data.clickid || '',
+        vid: data.vid || '',
+        mid: data.mid || '',
+        type: data.inventory || '',
+        vs_id: data.vs_id || '',
+      }
+      console.log('bind user data')
+      console.log(upData)
+      that.$httpRequest({
+        url: '/api/user/callbackBinding',
+        data: upData,
+        methods: "GET",
+        isLoading: true,
+      }).then(res => {
+        uni.setStorageSync('get_ad_code', res.data.code);
+        that.getVideoNum(data)
+      }).catch(err => {
+        console.log('bind user err');
+        console.log(err);
+      })
+    },
+
+    getVideoNum(data){
+      let that = this;
+      that.$httpRequest({
+        url: '/api/video/getPushDataInfo',
+        data: {
+          vs_id: data.vs_id || '',
+        },
+        methods: "GET",
+        isLoading: true,
+      }).then(res => {
+        data.num = res.data.weigh?res.data.weigh: 0
+        that.goPlayer(data)
+      }).catch(err => {
+        console.log('bind user err');
+        console.log(err);
+      })
+    },
+
+    goPlayer(e) {
+      let freeData = '';
+      if (e.start_free) {
+        freeData = `&start_free=${e.start_free}&end_free=${e.end_free}`
+      }
+      let link = `vid= ${e.vid}&mid=${e.mid}&fxpid=${e.fxpid}&num=${e.num}${freeData}`
+      uni.reLaunch({
+        url: '/pagesA/player/detailPlayer?'+link,
+        success: (res)=>{
+          console.log(res)
+        },fail:(err)=>{
+          console.log(err)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/pages/client/tuan/search.vue b/pages/client/tuan/search.vue
new file mode 100644
index 0000000..9c89c6c
--- /dev/null
+++ b/pages/client/tuan/search.vue
@@ -0,0 +1,237 @@
+<template>
+  <view>
+    <!-- <sub-tabnav :tabs="tabs" @change="changeIndex" :selectIndex="selectIndex" :scrollTop="scrollTop"></sub-tabnav> -->
+    <!-- #ifdef MP-WEIXIN -->
+    <view class="searchBox">
+      <uni-search-bar @confirm="search"
+                      :focus="false"
+                      placeholder="请输入搜索内容"
+                      v-model="searchValue"
+                      @focus="focus"
+                      @cancel="cancel">
+      </uni-search-bar>
+    </view>
+    <!-- #endif -->
+    <view class="bannerBox">
+      <home-banner :banners="banners"></home-banner>
+    </view>
+    <view class="flex space videoList">
+      <block v-for="(value,key) in listData" :key="key">
+        <view class="box pb10 mb15" style="width:47%; border-radius:20rpx;" @click="detail(value.id,0)">
+          <image class="integral-mall-goods" mode="aspectFill" :src="value.img"></image>
+          <view class="mt8 plr10 ft14 ftw400 text-center text-over cl-main">{{ value.name }}</view>
+        </view>
+      </block>
+    </view>
+    <uni-load-more :status="status"/>
+    <view style="width: 100%; height: 30upx;"></view>
+  </view>
+</template>
+
+<script>
+export default {
+
+  data() {
+    return {
+      banners: [],
+      isLogin: true,
+      showLogin: false,
+      datasa: [],
+      dataconfig: [],
+      searchValue: '',
+      pages:{
+        currentPage:1,
+        pageSize: 20,
+        isNextPage: true,
+      },
+      total: 0,
+      pageSize: 10,
+
+
+      type: '',
+      keytext: '',
+      listData: [],
+      last_id: 0,
+      reload: true,
+      status: 'more',
+
+    }
+  },
+  onLoad(e) {
+    //console.log(111)
+    if (e.selectIndex) {
+      this.selectIndex = e.selectIndex
+    }
+    this.status = 'more';
+    this.getList();
+    this.banners = uni.getStorageSync("config").banner
+  },
+  onPageScroll(e) {
+    this.scrollTop = e.scrollTop;
+  },
+  onReachBottom() {
+    this.status = 'more';
+    this.getList();
+  },
+  //监听搜索框文本变化
+  onNavigationBarSearchInputChanged(e) {
+    let text = e.text;
+    if (text) {
+      this.keytext = text;
+    }
+    console.log(text)
+  },
+  //监听点击搜索按钮事件
+  onNavigationBarSearchInputConfirmed(e) {
+    // #ifdef APP-PLUS
+    plus.key.hideSoftKeybord();
+    // #endif
+    var this_ = this
+    let text = e.text;
+    if (!text) {
+      uni.showModal({
+        title: '',
+        content: "请输入搜索内容",
+        showCancel: false,
+        confirmText: "确定",
+        confirmColor: "#e19503",
+        success: function (res) {
+          this_.keytext = '';
+          this_.getList(0)
+        }
+      });
+      return;
+    } else {
+      this.keytext = text;
+      this.listData = [];
+      this.pages.currentPage = 1;
+      this.pages.isNextPage = true;
+      this.getList()
+    }
+
+  },
+  methods: {
+    detail(vid, mid) {
+      var fxpid = 1
+      if (uni.getStorageSync("userinfo")) {
+        fxpid = uni.getStorageSync("userinfo").id
+      }
+      uni.navigateTo({
+        url: '/pagesA/player/detailPlayer?vid=' + vid + '&mid=' + mid + '&fxpid=' + fxpid
+      })
+    },
+
+    getList() {
+      let that= this;
+      if (that.pages.isNextPage) {
+        that.status = 'loading';
+        that.$httpRequest({
+          url: "/api/video/wdxh",
+          methods: "GET",
+          data: {
+            limit: that.pages.pageSize,
+            page: that.pages.currentPage,
+            lx:that.selectIndex,
+            keytext:that.keytext
+          }
+        }).then(res => {
+          that.status = '';
+          if (that.pages.pageSize == 1) {
+            that.listData = res;
+          } else if (res.rows.length > 0) {
+            that.listData = that.listData.concat(res.rows);
+          } else {
+            that.status = 'noMore';
+            that.pages.isNextPage = false;
+          }
+          that.pages.currentPage += 1;
+        }).catch(err => {
+          that.status = '';
+          console.log(err)
+        })
+      }
+    },
+    search(res) {
+      this.listData = [];
+      this.pages.currentPage = 1;
+      this.pages.isNextPage = true;
+      this.keytext = res.value;
+      this.getList()
+    },
+
+    cancel(res) {
+      this.keytext = '';
+      this.pages.currentPage = 1;
+      this.pages.isNextPage = true;
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style  scoped>
+.searchBox {
+  background: #ffffff;
+}
+
+.bannerBox {
+  margin: 10upx 30upx 0 30upx;
+  box-shadow: 0px 4px 20px 0px rgba(0, 0, 0, 0.04);
+}
+.videoList{
+  display:flex; flex-wrap:wrap; padding: 30upx 30upx 0px 30upx;
+}
+.integral-mall-goods {
+  width: 100%;
+  background: #F2F2F2;
+  border-radius: 16upx;
+}
+
+.user-not-vip {
+  width: 100%;
+  height: 80rpx;
+  background: #FDF6EC;
+  border-radius: 40rpx;
+  border: 2rpx solid #EFC381;
+  text-align: center;
+  line-height: 76rpx;
+  font-size: 24rpx;
+  color: #000000;
+  font-weight: bold;
+}
+
+
+.tuan-product-l {
+  width: 320rpx;
+  height: 240rpx;
+  border-radius: 16rpx;
+  background: #F2F2F2;
+}
+
+.tuan-product-r {
+  width: calc(100% - 320rpx);
+}
+
+.search-result {
+  padding-top: 10px;
+  padding-bottom: 20px;
+  text-align: center;
+}
+
+.search-result-text {
+  text-align: center;
+  font-size: 14px;
+  color: #666;
+}
+
+.example-body {
+  /* #ifndef APP-NVUE */
+  display: block;
+  /* #endif */
+  padding: 0px;
+}
+
+.uni-mt-10 {
+  margin-top: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/tabs/bingeWatch.vue b/pages/tabs/bingeWatch.vue
new file mode 100644
index 0000000..41f1ace
--- /dev/null
+++ b/pages/tabs/bingeWatch.vue
@@ -0,0 +1,335 @@
+<template>
+  <view class="pageHeader">
+    <!-- 标题栏和状态栏占位符 -->
+    <!-- <view class="titleNview-placing"> </view> -->
+    <image class="pageBg" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/zhuiju_bg.png"></image>
+    <siginIn :sign_list="sign_list" :qdjl="qdjl" :tdsy="tdsy" @cksigin="cksigin" @click="getsigin"></siginIn>
+    <view class="pd16_15 mt16" style="position: relative;">
+      <view class="pd16_15 videoListBox">
+        <view>
+          <view class="flex alcenter space">
+            <view class="flex alcenter">
+              <view
+                  class="videoListHeader"></view>
+              <text class="ft16 ftw600 cl-main">最近观看</text>
+            </view>
+            <navigator url="/pagesA/myCenter/watchHistory">
+              <view class="ft14 cl-notice">更多</view>
+            </navigator>
+          </view>
+          <view class="mt16 flex space" style="justify-content: start;">
+            <block v-for="(value,key) in newsa" :key="key" v-if="key<3">
+              <view class="box pb10 listItem"
+                    @click="detail(value.vid,value.mid)">
+                <image class="integral-mall-goods" mode="aspectFill" :src="value.img"></image>
+                <view class="mt8 plr10 ft14 ftw400 text-center text-over cl-main">{{ value.vname }}</view>
+              </view>
+            </block>
+
+          </view>
+        </view>
+        <view class="mt24">
+          <view class="flex alcenter space">
+            <view class="flex alcenter">
+              <!-- <image style="width: 40rpx;height: 40rpx;" :src="statics.zhuico[0]"></image> -->
+              <view class="videoListHeader"></view>
+              <text class="ft16 ftw600 cl-main">我的追剧</text>
+            </view>
+            <navigator url="/pagesA/myCenter/bingeWatch">
+              <view class="ft14 cl-notice">更多</view>
+            </navigator>
+          </view>
+          <view class="mt16">
+            <block v-for="(value,key) in record" :key="key" v-if="key<3">
+              <view @click="detail(value.vid,value.mid)" style="position: relative;" class="flex alcenter mb16">
+                <image mode="aspectFill" class="tuan-product-l" :src="value.img"></image>
+                <!-- <view class="btn-mini" style="position: absolute; top: 40upx; left: 280upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx;" :style="getBtnStyle">{{value.lxname}}</view> -->
+                <view class="tuan-product-r pl15">
+                  <view class="ft16 ftw600 cl-main text-over2">{{ value.vname }}</view>
+                  <view class="mt16">
+                    <text class="ft14 cl-orange" style="color: #31CA02;">{{ value.dqname }}</text>
+                  </view>
+                  <view class="mt16 flex space alcenter">
+                    <view class="ft14 cl-notice">{{ value.mname }}</view>
+                    <view class="btn-vip-adviser_bg">
+                      <view class="btn-vip-adviser ml15">继续观看</view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </block>
+          </view>
+        </view>
+      </view>
+
+    </view>
+  </view>
+</template>
+<script>
+import siginIn from '@/components/fanxiao-sign/sigin-in.vue';
+
+export default {
+  components: {
+    siginIn
+  },
+  data() {
+    return {
+      qdjl: 0,
+      tdsy: 0,
+      banners: [],
+      newsa: [],
+      record: [],
+      sign_list: []
+    }
+  },
+
+  onShow() {
+    this.getList();
+  },
+  methods: {
+    cksigin() {
+      this.getList();
+    },
+    getList() {
+      let that = this;
+      that.$httpRequest({
+        url: "/api/video/zuiju",
+        method: "GET",
+        data: {}
+      }).then(res => {
+        that.newsa = res.new
+        that.record = res.record
+        that.sign_list = res.getweek
+        that.qdjl = res.qdjl
+        that.tdsy = res.tdsy
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+
+    detail(vid, mid) {
+      var fxpid = 1
+      if (uni.getStorageSync("userinfo")) {
+        fxpid = uni.getStorageSync("userinfo").id
+      }
+      uni.navigateTo({
+        url: '/pagesA/player/detailPlayer?vid=' + vid + '&mid=' + mid + '&fxpid=' + fxpid
+      })
+    },
+    linkTo(e) {
+      if (this.isLogin == false) {
+        this.showLogin = true;
+      } else {
+        let link = e.currentTarget.dataset.link;
+        uni.navigateTo({
+          url: link
+        })
+      }
+    },
+
+    exchange(e) {
+      if (this.isLogin == false) {
+        this.showLogin = true;
+      } else {
+        let id = e.currentTarget.dataset.id;
+        uni.navigateTo({
+          url: '/pages/client/integral/exchange?id=' + id
+        })
+      }
+    },
+  },
+}
+</script>
+
+<style scoped>
+.pageHeader {
+  padding-top: 80rpx;
+  background-color: #ffffff;
+  height: 100%;
+}
+
+.pageBg {
+  width: 750rpx;
+  height: 1472rpx;
+  position: absolute;
+    background-color: #ffffff;
+  top: 0;
+}
+
+.videoListBox {
+  box-shadow: 0px 0px 20upx 0px rgba(0, 0, 0, 0.2);
+  border-radius: 20upx;
+  background-color: #fff;
+}
+
+.videoListHeader {
+  width: 8rpx;
+  height: 24rpx;
+  background-image: linear-gradient(#B4FF23, #09D89E);
+  margin-right: 12rpx;
+}
+.listItem{
+  width:31%; position: relative; border-radius:20rpx;margin-right: 30rpx;
+}
+
+.home-header {
+  height: 300rpx;
+  width: 100%;
+  position: relative;
+  border-radius: 0rpx 0rpx 48rpx 48rpx;
+}
+
+.home-main {
+  width: 100%;
+  position: relative;
+  margin-top: -156rpx;
+  padding: 0 30rpx;
+}
+
+.home-mendian {
+  width: 100%;
+  height: 84rpx;
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 42rpx;
+}
+
+.integral-mall-header {
+  position: relative;
+  height: 320rpx;
+}
+
+.integral-mall-header .bg {
+  width: 100%;
+  height: 320rpx;
+}
+
+.integral-mall-header .main {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 320rpx;
+}
+
+.swiper-integral {
+  height: 32rpx;
+  width: 100%;
+}
+
+.integral-mall-main {
+  position: relative;
+  /* margin-top: -104rpx; */
+}
+
+.integal-mall-menu {
+  width: 100%;
+  height: 190rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+}
+
+.integral-tuan-l {
+  width: 100%;
+  height: 280rpx;
+  background: #f2f2f2;
+  border-radius: 16rpx;
+}
+
+
+.integral-mall-coupon {
+  background: #FFFFFF;
+  position: relative;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+
+.integral-mall-coupon .top {
+  padding: 0rpx 0rpx 24rpx 0rpx;
+  border-bottom: 2rpx dashed #FEC675;
+}
+
+.integral-mall-coupon .y-l, .integral-mall-coupon .y-r {
+  width: 20rpx;
+  height: 20rpx;
+  border-radius: 10rpx;
+  background: #F5F6FA;
+  position: absolute;
+  z-index: 2;
+  top: 284rpx;
+}
+
+.integral-mall-coupon .y-l {
+  left: -10rpx;
+}
+
+.integral-mall-coupon .y-r {
+  right: -10rpx;
+}
+
+.integral-mall-coupon .coupon-value {
+  width: 100%;
+}
+
+.integral-mall-coupon .coupon-value image {
+  width: 100%;
+}
+
+.integral-mall-coupon .coupon-value .num {
+  width: 100%;
+  height: 64rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.integral-mall-goods {
+  width: 100%;
+  height: 280rpx;
+  background: #F2F2F2;
+  border-radius: 16upx;
+}
+
+.titleNview-placing {
+  height: var(--status-bar-height);
+  padding-top: 44px;
+  box-sizing: content-box;
+}
+
+.tuan-product-l {
+  width: 150rpx;
+  height: 200rpx;
+  border-radius: 16rpx;
+  background: #F2F2F2;
+}
+
+.tuan-product-r {
+  width: calc(100% - 150rpx);
+}
+
+.btn-vip-adviser_bg {
+  width: 155rpx;
+  height: 65rpx;
+  border-radius: 12rpx;
+  background-image: linear-gradient(#ACFD28, #0AD89D);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #09D89E;
+}
+
+.btn-vip-adviser {
+  width: 150rpx;
+  height: 60rpx;
+  border-radius: 12rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 28rpx;
+  /* font-weight: 600; */
+  background: #FFF;
+  margin: 0;
+}
+</style>
\ No newline at end of file
diff --git a/pages/tabs/home.vue b/pages/tabs/home.vue
new file mode 100644
index 0000000..a85312c
--- /dev/null
+++ b/pages/tabs/home.vue
@@ -0,0 +1,520 @@
+<template>
+	<view class="pagesContent">
+		<view class="titleNview-placing"></view>
+		<view class="homeTab">
+			<view class="homeTabBox">
+				<view class="homeTabContent">
+					<view :class="tabIndex === item.id ? 'homeTabItem active' : 'homeTabItem'"
+						v-for="(item, index) in tabData" :key="index" @click="tabIndex = item.id">{{ item.name }}
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view v-if="tabIndex==1" style="margin-top: 20rpx;">
+			<view class="home-header pd0_15 mt10">
+				<view class="home-mendian flex alcenter space plr15 cl-w9" style="display: none;">
+					<navigator style="width: calc(100% - 80rpx);" url="/pages/client/tuan/ss">
+						<view class="flex alcenter" style="width: calc(100% - 80rpx);">
+							<text class="iconfont  iconsousuo ft14 mr10"></text>
+							<text class="text-over ft14" style="width: calc(100% - 60rpx);">请输入搜索内容</text>
+						</view>
+					</navigator>
+				</view>
+				<view class="">
+					<home-banner :banners="banners"></home-banner>
+				</view>
+			</view>
+			<view class="integral-mall-main plr15" style="margin-top: 30rpx;">
+				<view class="integal-mall-menu flex pt10 pb10">
+					<view v-if="config.site.shop_type == 1" class="col2 text-center" @click="linkTo"
+						data-link="/pagesA/integral/integralShop">
+						<view>
+							<image style="width: 72rpx; height: 72rpx;"
+								src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/integral.png">
+							</image>
+						</view>
+						<view class="ft12 ftw500">积分商城</view>
+					</view>
+
+					<view class="col2 text-center" @click="linkTo" data-link="/pagesA/player/ranking">
+						<view>
+							<image style="width: 72rpx; height: 72rpx;"
+								src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/Ranking.png">
+							</image>
+						</view>
+						<view class="ft12 ftw500">排行</view>
+					</view>
+
+					<view class="col2 text-center" @click="linkTo" data-link="/pagesA/myCenter/bingeWatch">
+						<view>
+							<image style="width: 72rpx; height: 72rpx;"
+								src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/chase.png"></image>
+						</view>
+						<view class="ft12 ftw500">追剧</view>
+					</view>
+
+
+
+					<view class="col2 text-center" @click="linkTo" data-link="/pagesA/player/news">
+						<view>
+							<image style="width: 72rpx; height: 72rpx;"
+								src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/Latest.png"></image>
+						</view>
+						<view class="ft12 ftw500">最新</view>
+					</view>
+					<!-- /pages/client/integral/role -->
+
+					<!--					<view class="col2 text-center" @click="linkTo" data-link="/pagesA/player/free">-->
+					<!--						<view>-->
+					<!--							<image style="width: 72rpx; height: 72rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/Free.png"></image>-->
+					<!--						</view>-->
+					<!--						<view class="ft12 ftw500">免费</view>-->
+					<!--					</view>-->
+				</view>
+
+
+				<view class="mt24" v-if="hotdata[1]">
+					<view class="flex alcenter space">
+						<view class="flex alcenter">
+							<text class="ft16 ftw600 cl-main ml15" style="margin-left: 0;margin-right: 8rpx;">热门短剧
+							</text>
+						</view>
+						<view @click="huanyihuan()" class="ft14 cl-notice flex alcenter">
+							<image style="width: 28rpx;height: 28rpx;"
+								src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/swapwith.png">
+							</image>
+							换一换
+						</view>
+					</view>
+
+					<view class="mt16 flex space" style="justify-content: start;">
+						<block v-for="(value,key) in hotdata" :key="key" v-if="key>=hyh && key<hyh+3">
+							<view class=" pb10"
+								style="width:30%; position: relative; border-radius:20rpx;margin-right: 30rpx;"
+								@click="detail(value)">
+								<image class="integral-mall-goods" mode="scaleToFill" :src="value.img"></image>
+								<view class="  ft14 ftw500  text-over cl-main">{{ value.name }}</view>
+								<view class=" ft10 cl-999 ftw500  text-over cl-main">{{ value.text }}</view>
+
+
+							</view>
+						</block>
+					</view>
+				</view>
+
+				<view class="mt24" v-if="givedata[3]">
+					<view class="flex alcenter space">
+						<view class="flex alcenter">
+							<image style="width: 28rpx;height: 28rpx;"
+								src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/paihang.png">
+							</image>
+							<text class="ft16 ftw600 cl-main">排行榜</text>
+						</view>
+						<view class="ft14 cl-notice">每周热剧TOP3</view>
+
+					</view>
+					<view class="mt16 flex space">
+
+						<block v-for="(value,key) in givedata" :key="key" v-if="key<3">
+							<view class="integral-mall-coupon" style="width: 30%; margin-right: 30rpx;"
+								@click="detail(value)">
+								<view class="top">
+									<view class="flex center">
+										<view class="coupon-value">
+											<image class="integral-tuan-l" style="height: 280upx;" mode="scaleToFill"
+												:src="value.img"></image>
+											<view class="  ft14 ftw500  text-over cl-main">{{ value.name }}</view>
+											<view class=" ft10 cl-999 ftw500  text-over cl-main">{{ value.text }}</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</block>
+
+					</view>
+				</view>
+
+
+				<view class="mt24" v-if="freedata[1]">
+					<view class="flex alcenter space">
+						<view class="flex alcenter">
+							<text class="ft16 ftw600 cl-main" style="margin-left: 20rpx;margin-right: 8rpx;">最新热播</text>
+						</view>
+						<view @click="huanyihuan()" class="ft14 cl-notice">大家都在看的热播好剧</view>
+					</view>
+
+					<view class="mt16 scrollView">
+						<block v-for="(value,key) in freedata" :key="key">
+							<view class=" pb10"
+								style="width:207rpx; display: inline-block; border-radius:20rpx;margin-right: 30rpx;"
+								@click="detail(value)">
+								<image class="integral-mall-goods" mode="scaleToFill" :src="value.img"></image>
+								<view class="  ft14 ftw500  text-over cl-main">{{ value.name }}</view>
+								<view class=" ft10 ftw500  cl-999 text-over cl-main">{{ value.text }}</view>
+							</view>
+						</block>
+					</view>
+				</view>
+
+			</view>
+			<home-default :datasa="datasa"></home-default>
+		</view>
+
+
+		<view v-if="tabIndex==2">
+			<home-jqjs :datasa="listjq"></home-jqjs>
+		</view>
+		<view v-if="tabIndex==3" class="flex space pd10_15" style="display:flex; flex-wrap:wrap;">
+			<block v-for="(value,key) in listbz" :key="key">
+				<view style="width: 49%; margin-bottom: 20upx;">
+					<image style="height: 500upx; width: 100%; border-radius: 18upx;" mode="aspectFill"
+						:src="value.img"></image>
+				</view>
+			</block>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	import login from "@/utils/login";
+
+	export default {
+		data() {
+			return {
+				config: null,
+				tabData: [{
+						name: '推荐短剧',
+						id: 1
+					},
+					{
+						name: '剧情介绍',
+						id: 2
+					},
+					{
+						name: '剧情壁纸',
+						id: 3
+					}
+				],
+				banners: [],
+				tabIndex: 1,
+				listbz: [],
+				listjq: [],
+				datasa: [],
+				hotdata: [],
+				givedata: [],
+				freedata: [],
+				hyh: 0,
+				pages: {
+					allPages: 1,
+					currentPage: 1,
+					pageSize: 15
+				}
+			};
+		},
+		onLoad(e) {
+			// #ifdef MP-WEIXIN
+			if (!uni.getStorageSync("userinfo").token) {
+				login.wxLogin()
+			}
+			// #endif
+		},
+		onShow() {
+			this.pages.allPages = 1;
+			this.pages.currentPage = 1;
+			this.getPageData();
+			this.getVideoList();
+		},
+		onReachBottom() {
+			if (this.pages.allPages >= this.pages.currentPage) {
+				this.getVideoList()
+			}
+		},
+		methods: {
+			huanyihuan() {
+				if (this.hyh < 12) {
+					this.hyh = this.hyh + 3
+				}
+				if (this.hyh >= 12) {
+					this.hyh = 0
+				}
+			},
+			getPageData() {
+				let that = this;
+				that.$httpRequest({
+					url: '/api/video/indexdata',
+					method: 'GET',
+					data: {},
+					isLoading: true,
+				}).then(res => {
+					if (res.config.name) {
+						uni.setNavigationBarTitle({
+							title: res.config.name
+						});
+					}
+					uni.setStorageSync("config", res.config)
+					this.config = res.config;
+					this.banners = res.config.banner
+					this.listbz = res.listbz
+					this.listjq = res.listjq
+					// this.datasa = res.new
+					this.hotdata = res.hotdata
+					this.givedata = res.givedata
+					this.freedata = res.freedata;
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+
+			getVideoList() {
+				let that = this;
+				that.$httpRequest({
+					url: '/api/video/lists',
+					method: 'GET',
+					data: {
+						page: that.pages.currentPage,
+						limit: that.pages.pageSize
+					},
+					isLoading: true,
+				}).then(res => {
+					if (res.rows.length > 0) {
+						if (that.pages.currentPage === 1) {
+							that.datasa = res.rows;
+							that.pages.allPages = Math.ceil(res.total / that.pages.pageSize)
+						} else {
+							that.datasa = that.datasa.concat(res.rows);
+						}
+						this.pages.currentPage += 1;
+					}
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+
+
+
+			detail(item) {
+				console.log('go item detail')
+				console.log(item);
+				var fxpid = 1
+				if (uni.getStorageSync("userinfo")) {
+					fxpid = uni.getStorageSync("userinfo").id
+				}
+				uni.navigateTo({
+					url: '/pagesA/player/detailPlayer?vid=' + item.id + '&mid=0' + '&fxpid=' + fxpid +
+						"&start_free=" + item.wechat_start + "&end_free=" + item.wechat_end
+				})
+			},
+			linkTo(e) {
+				let link = e.currentTarget.dataset.link;
+				uni.navigateTo({
+					url: link
+				})
+			},
+
+			def() {
+				let that = this;
+				that.$httpRequest({
+					url: "",
+					method: "GET",
+					data: {}
+				}).then(res => {
+
+				}).catch(err => {
+					console.log(err)
+				})
+			}
+
+
+
+		},
+		onShareAppMessage() {},
+		// onShareTimeline(){},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.pagesContent {
+		// background-image: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/index_bg.png);
+		background-image: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/home_bg.png);
+		background-size: 750rpx 642rpx;
+		background-repeat: no-repeat;
+		background-color: #F2F5F8;
+		min-height: 100vh;
+		min-width: 100vw;
+	}
+
+	.titleNview-placing {
+		height: var(--status-bar-height);
+		padding-top: 68rpx;
+		box-sizing: content-box;
+	}
+
+	.homeTab {
+		height: 80rpx;
+		padding: 14rpx 30rpx 0rpx 32rpx;
+	}
+
+	.homeTabBox {
+		height: 60rpx;
+		overflow: hidden;
+
+		.homeTabContent {
+			height: 70rpx;
+			overflow: hidden;
+			overflow-y: auto;
+
+			.homeTabItem {
+				line-height: 60rpx;
+				font-size: 28rpx;
+				font-weight: 600;
+				margin-right: 60rpx;
+				display: inline-block;
+			}
+
+			.active {
+				color: #FF6600;
+			}
+		}
+	}
+
+	.home-header {
+		/* height: 300rpx; */
+		width: 100%;
+		// position: relative;
+		border-radius: 0rpx 0rpx 48rpx 48rpx;
+	}
+
+	.home-main {
+		width: 100%;
+		position: relative;
+		margin-top: -156rpx;
+		padding: 0 30rpx;
+	}
+
+	.home-mendian {
+		width: 100%;
+		height: 84rpx;
+		background: rgba(255, 255, 255, 0.1);
+		border-radius: 42rpx;
+	}
+
+	.integral-mall-header {
+		position: relative;
+		height: 320rpx;
+	}
+
+	.integral-mall-header .bg {
+		width: 100%;
+		height: 320rpx;
+	}
+
+	.integral-mall-header .main {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 320rpx;
+	}
+
+	.swiper-integral {
+		height: 32rpx;
+		width: 100%;
+	}
+
+	.integral-mall-main {
+		position: relative;
+		/* margin-top: -104rpx; */
+	}
+
+	.integal-mall-menu {
+		width: 100%;
+		// height: 190rpx;
+		// background: #FFFFFF;
+		border-radius: 20rpx;
+	}
+
+	.integral-tuan-l {
+		width: 100%;
+		height: 280rpx;
+		background: #f2f2f2;
+		border-radius: 16rpx;
+	}
+
+
+	.integral-mall-coupon {
+		// background: #FFFFFF;
+		position: relative;
+		border-radius: 16rpx;
+		overflow: hidden;
+	}
+
+	.integral-mall-coupon .top {
+		padding: 0rpx 0rpx 24rpx 0rpx;
+		// border-bottom: 2rpx dashed #FEC675;
+	}
+
+	.integral-mall-coupon .y-l,
+	.integral-mall-coupon .y-r {
+		width: 20rpx;
+		height: 20rpx;
+		border-radius: 10rpx;
+		background: #F5F6FA;
+		position: absolute;
+		z-index: 2;
+		top: 284rpx;
+	}
+
+	.integral-mall-coupon .y-l {
+		left: -10rpx;
+	}
+
+	.integral-mall-coupon .y-r {
+		right: -10rpx;
+	}
+
+	.integral-mall-coupon .coupon-value {
+		width: 100%;
+	}
+
+	.integral-mall-coupon .coupon-value image {
+		width: 100%;
+	}
+
+	.integral-mall-coupon .coupon-value .num {
+		width: 100%;
+		height: 64rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		left: 0;
+		top: 0;
+	}
+
+	.integral-mall-goods {
+		min-width: 206rpx;
+		width: 100%;
+		height: 280rpx;
+		background: #F2F2F2;
+		border-radius: 16upx;
+	}
+
+	.titleNview-placing {
+		height: var(--status-bar-height);
+		padding-top: 68rpx;
+		box-sizing: content-box;
+	}
+
+	.scrollView {
+		display: flex;
+		align-items: center;
+		flex-wrap: nowrap;
+		min-width: 100%;
+		overflow: hidden;
+		overflow-x: auto;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabs/my.vue b/pages/tabs/my.vue
new file mode 100644
index 0000000..c58f698
--- /dev/null
+++ b/pages/tabs/my.vue
@@ -0,0 +1,640 @@
+<template>
+	<view>
+		<view class="pageBg">
+			<view class="userHeader" @click="goUsers">
+				<view class="userCont">
+					<image class="userImg" :src="userInfo.avatar" mode="aspectFit" ></image>
+					<view class="userDel">
+						<view class="userName"><text>{{ userInfo.nickname || '暂未登录' }}</text></view>
+						<view class="userId"><text
+								v-if="userInfo.id">ID:</text><text>{{ userInfo.id || '点击登录 享受更多会员特惠' }}</text></view>
+					</view>
+				</view>
+				<uni-icons type="right" size="16px" color="#999999"></uni-icons>
+			</view>
+
+
+			<!-- 			<view class="moneyBanner">
+				<view>
+					<view class="moneyLeft">
+						<view>
+							<image class="beansIcon" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/jindou1.png">
+							</image>
+							<text class="beansNum" @click="goBill">我的金豆：{{ userInfo.beans || '0' }}</text>
+						</view>
+						<view class="unlock">获得金豆可解锁更多剧情</view>
+					</view>
+					<view class="moneyRight" @click="rechargeapi"> 去充值</view>
+				</view>
+			</view> -->
+<!-- 
+			<view class="vipbox">
+				<view class="vipimg">
+					<image style="height: 156rpx;width: 678rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/vip_bg.png" mode=""></image>
+					<view class="viptext">
+						<view class="title" >开通VIP</view>
+						<view class="text">开通后解锁更多剧情</view>
+					</view>
+					<view class="vipgo" @click="liberalvip()">
+						<image style="width: 196rpx;height: 72rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/vip_go.png" mode="">
+							<view class="liberal">立即开通</view>
+						</image>
+					</view>
+				</view>
+			</view> -->
+
+
+			<view class="tabBarList" style="margin-top: 40rpx;">
+				<view class="barBox">
+					<view class="barItem" @click="rechargeapi">
+						<image class="barIcon" style="width: 72rpx;height: 72rpx;"
+							src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/qianbao.png" mode="scaleToFill">
+						</image>
+						<view class="barName">金豆充值</view>
+					</view>
+					<view class="barItem" @click="goEarning" v-if="config.site.shop_type == 1">
+						<image class="barIcon" style="width: 72rpx;height: 72rpx;"
+							src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/qianbao.png" mode="scaleToFill">
+						</image>
+						<view class="barName">积分商城</view>
+					</view>
+					<view class="barItem" @click="shareapi">
+						<image class="barIcon" style="width: 72rpx;height: 72rpx;"
+							src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/erweima.png" mode="scaleToFill">
+						</image>
+						<view class="barName">客服二维码</view>
+					</view>
+					<!-- #ifdef APP-PLUS || H5 -->
+					<view class="barItem" @click="shareapp">
+						<image class="barIcon" style="width: 72rpx;height: 72rpx;"
+							src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/fenx.png" mode="scaleToFill"></image>
+						<view class="barName"> 分享</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef MP-WEIXIN -->
+					<view class="barItem wxShareBtn">
+						<button open-type="share" class="wxShareBtn">
+							<image class="barIcon" style="width: 72rpx;height: 72rpx;"
+								src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/fenx.png" mode="scaleToFill">
+							</image>
+							<view class="barName"> 分享</view>
+						</button>
+
+					</view>
+					<!-- #endif -->
+					<!--          <view class="barItem" @click="showVip">-->
+					<!--            <view class="vipBox">-->
+					<!--              <image class="VIPIcon" src="@/static/VIP.png" mode="scaleToFill"></image>-->
+					<!--            </view>-->
+					<!--            <view class="barName"> VIP兑换</view>-->
+					<!--          </view>-->
+				</view>
+			</view>
+		</view>
+
+		<!-- 	<view style="width: 100%; height: 30upx;"></view>
+    <home-vipcard :userinfo="userinfo" @loginAct="showLoginAct" @qrcode="showQrcode = true"></home-vipcard> -->
+		<view class="mt24" style="padding: 0 30rpx;">
+			<home-banner :banners="banners"></home-banner>
+		</view>
+		<view class="userFooterList">
+			<view class="userFooterItem" v-for="(item,index) in getMenus" :key="index" @click="memberLinkTo(item.link)">
+				<image class="fimg" :src="item.icon" mode="scaleToFill"></image>
+				<text class="fname">{{ item.name }}</text>
+			</view>
+		</view>
+		<!-- <com-footer model="member"></com-footer> -->
+		<redeem ref="vipPup"></redeem>
+	</view>
+</template>
+
+<script>
+	import redeem from "@/components/redeemVIP.vue"; //vip卡密兑换
+
+	export default {
+		components: {
+			redeem
+		},
+		data() {
+			return {
+				config:uni.getStorageSync('config'),
+				isLogin: false,
+				showLogin: false,
+				isBirthday: true,
+				showBirthday: false,
+				showQrcode: false,
+				userInfo: {},
+				banners: [],
+				vipLevel: 0,
+				configUrl: this.$config.webUrl,
+				memberMenus: [{
+						name: '观看历史',
+						type: 'link',
+						model: '',
+						link: '/pagesA/myCenter/watchHistory',
+						icon: this.$config.staticUrl + 'vipcard_icon_my_card@2x.png',
+						show: 1
+					},
+					{
+						name: '我的追剧',
+						type: 'link',
+						model: '',
+						link: '/pagesA/myCenter/bingeWatch',
+						icon: this.$config.staticUrl + 'vipcard_icon_my_order@2x.png',
+						show: 1
+					},
+					{
+						name: '我的喜欢',
+						type: 'link',
+						model: '',
+						link: '/pagesA/myCenter/myLike',
+						icon: this.$config.staticUrl + 'vipcard_love.png?v=1',
+						show: 1
+					},
+					{
+						name: '收货地址',
+						type: 'link',
+						model: '',
+						link: '/pages/client/member/address',
+						icon: this.$config.staticUrl + 'vipcard_icon_my_address@2x.png',
+						show: 0
+					},
+					{
+						name: '官方商城',
+						type: 'link',
+						model: '',
+						link: '/pages/client/shop',
+						icon: this.$config.staticUrl + 'vipcard_icon_my_integral@2x.png',
+						show: 0
+					},
+					{
+						name: '联系客服',
+						type: 'link',
+						model: '',
+						link: '/pagesA/servers/callServer',
+						icon: this.$config.staticUrl + 'vipcard_icon_my_advise@2x.png',
+						show: 1
+					},
+					{name:'我的团队',type:'link',model:'',link:'/pages/client/member/myTeam',icon:this.$config.staticUrl + 'vipcard_icon_my_invite@2x.png',show:3},
+					//{name:'我的邀请码',type:'link',model:'',link:'/pages/client/member/qrshare',icon:this.$config.staticUrl + 'vipcard_icon_my_invite@2x.png',show:3},
+					// {name:'分销订单',type:'link',model:'',link:'/pages/client/vipcard/fxlog',icon:this.$config.staticUrl + 'vipcard_icon_my_integral@2x.png',show:3},
+				],
+			}
+		},
+		computed: {
+			getMenus() {
+				let arr = new Array;
+				for (var a in this.memberMenus) {
+					if (this.memberMenus[a].show == 1 || (this.iskq == 1 && this.memberMenus[a].show == 3)) {
+						arr.push(this.memberMenus[a]);
+					}
+				}
+				return arr;
+			}
+		},
+		onLoad(option) {
+			this.userInfo = uni.getStorageSync("userinfo")
+		},
+		onShow() {
+			this.config=uni.getStorageSync('config');
+			if (uni.getStorageSync("userinfo").token) {
+				this.ongrzlTap();
+			}
+			this.banners = uni.getStorageSync("config").banner
+		},
+		onShareAppMessage: function(res) {
+			// #ifdef MP-WEIXIN
+			var href = `/pages/tabs/my?fxpid=${this.uid}&invite=${this.userInfo.invite}`
+			let that = this;
+			const obj = {
+				title: "发送给好友",
+				imageUrl: '',
+				path: href,
+				success: function(res) {
+					console.log(res, "转发成功")
+				},
+				fail: function(res) {
+					wx.showToast({
+						title: '发送失败',
+						icon: 'none'
+					})
+				}
+			}
+			return obj
+			// #endif
+			// #ifdef H5
+
+			uni.setClipboardData({
+				data: this.$config.webUrl + `/h5/?fxpid=${this.uid}&invite=${this.userInfo.invite}`,
+				complete() {
+					uni.showToast({
+						title: "分享连接已复制到剪贴板"
+					})
+				}
+			})
+			// #endif
+		},
+
+		methods: {
+			goBill() { //消费明细
+				uni.navigateTo({ //钱包
+					url: 'pagesA/myCenter/recharge'
+				})
+			},
+			goEarning() { //收益
+				uni.navigateTo({
+					// url: '/pagesA/myCenter/wallet/earning',
+					url: '/pagesA/integral/integralShop'
+				})
+			},
+			shareapp() {
+				console.log('2222', this.userInfo.invite)
+				// #ifdef H5
+				let invite = this.userInfo.invite ? this.userInfo.invite : "";
+				uni.setClipboardData({
+					data: this.configs.webUrl + `/h5/#/?fxpid=${this.uid}&invite=${invite}`,
+					complete() {
+						uni.showToast({
+							title: "分享连接已复制到剪贴板"
+						})
+					}
+				})
+				// #endif
+				// #ifdef MP-WEIXIN
+				uni.share({
+					provider: 'weixin',
+					type: 0,
+					title: '玛薇剧场',
+					imageUrl: 'https://wx.yaohe.hnjrdzkj.xyz/h5/img/share.png',
+					path: `pages/tabs/my?invite=${this.userInfo.invite}`,
+					success(res) {
+
+					},
+					fail(res) {
+
+					}
+				})
+				// #endif
+			},
+			rechargeapi() {
+				uni.navigateTo({
+					url: '/pagesA/myCenter/recharge'
+				})
+			},
+			shareapi() {
+				uni.navigateTo({
+					url: '/pagesA/servers/servesQR'
+				})
+			},
+			goUsers() {
+				if (this.userInfo.token) {
+					uni.navigateTo({
+						url: '/pagesA/myCenter/settings/set'
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pagesA/login/login'
+					})
+				}
+
+			},
+			ongrzlTap() {
+				let that = this;
+				that.$httpRequest({
+					url: "/api/user/index",
+					method: "GET",
+					data: {}
+				}).then(res => {
+					if (res.code == 1) {
+						that.userInfo = res.data;
+						uni.setStorageSync("userinfo", res.data);
+						uni.setStorageSync("config", res.data.config);
+					}
+				}).catch(err => {
+					console.log(err)
+				})
+
+			},
+
+			memberLinkTo(e) {
+				// uni.navigateTo({
+				// 	url: e
+				// })
+				if (this.userInfo.token) {
+					uni.navigateTo({
+						url: e
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pagesA/login/login'
+					})
+				}
+
+				// let index = parseInt(e.currentTarget.dataset.index);
+				// if (!this.userInfo.token && this.getMenus[index].model != 'integral') {
+				//   this.showLogin = true;
+				// } else {
+				//   if (this.getMenus[index].link != '') {
+				//     if (this.getMenus[index].model == 'integral') {
+				//       uni.redirectTo({
+				//         url: this.getMenus[index].link
+				//       })
+				//     } else {
+				//       uni.navigateTo({
+				//         url: this.getMenus[index].link
+				//       })
+				//     }
+				//   }
+				// }
+			},
+			birthdayAct() {
+				if (this.isBirthday) {
+					uni.navigateTo({
+						url: '/pages/client/member/birthday'
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/client/member/info'
+					})
+				}
+			},
+			showLoginAct() {
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			},
+			showVip() {
+				this.$refs.vipPup.showRedeem()
+			},
+			
+
+			liberalvip(){
+			uni.navigateTo({
+				url: '/pagesA/VIP/VIP'
+			})
+			},
+
+
+
+		}
+	}
+</script>
+
+<style scoped>
+	.pageBg {
+		background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/mybgc.png');
+		/* background-image: url(@/static/my/my_bg.png); */
+		background-repeat: no-repeat;
+		background-size: 750rpx 440rpx;
+		width: 750rpx;
+		/* height: 705rpx; */
+		padding-top: 120rpx;
+		padding-left: 32rpx;
+		padding-right: 32rpx;
+		position: relative;
+		background-color: #F8F8F8;
+	}
+
+
+
+	.userHeader {
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+		justify-content: space-between;
+		padding: 0 32rpx;
+
+	}
+
+	.userCont {
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.userDel {
+		margin-left: 20rpx;
+	}
+
+	.userImg {
+		height: 80rpx;
+		width: 80rpx;
+		border-radius: 50%;
+		border: 6rpx solid #FFFFFF;
+		background: #FFFFFF;
+		box-shadow: 0rpx 24rpx 48rpx 0rpx rgba(197, 202, 219, 0.3);
+	}
+
+	.userName {
+		font-size: 32rpx;
+		color: #2E2F33;
+	}
+
+	.userId {
+		color: #AEB2C1;
+		font-size: 24rpx;
+		margin-top: 12rpx;
+	}
+
+
+	.vipIcon {
+		margin-left: 20rpx;
+		width: 82rpx;
+		height: 33rpx;
+		vertical-align: middle;
+	}
+
+	.moneyBanner {
+		background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/myjian.png');
+		background-size: 686rpx 188rpx;
+		width: 686rpx;
+		height: 188rpx;
+		margin-top: 44rpx;
+		padding: 50rpx 56rpx;
+		color: #fff;
+	}
+
+	.moneyLeft,
+	.moneyRight {
+		display: inline-block;
+	}
+
+	.beansIcon {
+		width: 44rpx;
+		height: 44rpx;
+		vertical-align: middle;
+	}
+
+	.beansNum {
+		font-size: 32rpx;
+		font-weight: 600;
+	}
+
+	.unlock {
+		font-size: 22rpx;
+		color: #999;
+	}
+
+	/* 	.moneyRight {
+		display: inline-block;
+		width: 172rpx;
+		height: 72rpx;
+		background: linear-gradient(180deg, #FFFB25 0%, #00CB92 100%);
+		border-radius: 38rpx;
+		border-image: linear-gradient(180deg, rgba(251, 250, 38, 1), rgba(178, 255, 194, 1)) 2 2;
+		float: right;
+		font-size: 32rpx;
+		color: #fff;
+		text-align: center;
+		line-height: 72rpx;
+		font-weight: 600;
+	} */
+
+	.tabBarList {
+		height: 180rpx;
+		width: 678rpx;
+		color: #fff;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.barBox {
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		flex: 1;
+	}
+
+	.barItem {
+		/* flex: 1; */
+		text-align: center;
+	}
+
+	.vipBox {
+		width: 86rpx;
+		height: 86rpx;
+		margin: 0 auto;
+		background: linear-gradient(to bottom, #fa6f02, #FFFFFF);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 38rpx;
+	}
+
+	.VIPIcon {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.wxShareBtn {
+		background: none;
+		border: none;
+		margin: 0;
+		padding: 0;
+	}
+
+	.wxShareBtn .barName {
+		line-height: 30rpx;
+		margin-top: -20rpx;
+
+	}
+
+	.barIcon {
+		width: 88rpx;
+		height: 88rpx;
+	}
+
+	.barName {
+		font-size: 28rpx;
+		color: #000;
+		text-align: center;
+	}
+
+	.userFooterList {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-around;
+		flex-wrap: wrap;
+		margin-top: 60rpx;
+	}
+
+	.userFooterItem {
+		width: calc(50% - 76rpx);
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+		justify-content: center;
+		height: 100rpx;
+		margin-bottom: 30rpx;
+		background-color: #fff;
+		border-radius: 12rpx;
+	}
+
+	.fimg {
+		width: 64rpx;
+		height: 64rpx;
+	}
+
+	.fname {
+		font-size: 28rpx;
+		padding-left: 30rpx;
+	}
+
+
+	.vipbox {
+		margin-top: 46rpx;
+		position: relative;
+		margin-bottom: 24rpx;
+	}
+
+	.viptext {
+		position: absolute;
+		top: 38rpx;
+		left: 128rpx;
+	}
+
+	.title {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+		line-height: 44rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.text {
+		font-family: PingFang-SC, PingFang-SC;
+		font-weight: 500;
+		font-size: 22rpx;
+		color: #9EA9CD;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+
+	.vipgo {
+		position: absolute;
+		top: 50rpx;
+		left: 428rpx;
+	}
+
+	.liberal {
+		position: absolute;
+		top: 16rpx;
+		left: 40rpx;
+
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #FFFFFF;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabs/recommend.vue b/pages/tabs/recommend.vue
new file mode 100644
index 0000000..abda90d
--- /dev/null
+++ b/pages/tabs/recommend.vue
@@ -0,0 +1,356 @@
+<template>
+  <view class="pages">
+
+<!--    <swiper class="swiper" :current="swiperCurrent" :indicator-dots="false" :autoplay="false" :vertical="true"-->
+<!--            :duration="50" @change="currentChange" :style="{height:winHeight} ">-->
+<!--      <swiper-item class="swiperItem" v-for="(videoItem,videoIndex) in videoListData" :key="videoItem._id">-->
+
+<!--        <view class="swiperItemContent">-->
+<!--          <view class="payVideo" v-if="videoIndex == swiperCurrent">-->
+<!--            &lt;!&ndash; #ifdef APP || H5 &ndash;&gt;-->
+<!--            <video  class="video"-->
+<!--                    v-if="videoItem.src"-->
+<!--                    :id="videoItem._id"-->
+<!--                    :poster="videoItem.img"-->
+<!--                    :autoplay="true"-->
+<!--                    object-fit="contain"-->
+<!--                    @ended="videoPlayerEnded"-->
+<!--                    @loadedmetadata="loadedmetadata"-->
+<!--                    :src="videoItem.src"></video>-->
+<!--            &lt;!&ndash; #endif &ndash;&gt;-->
+<!--            &lt;!&ndash; #ifdef MP-WEIXIN &ndash;&gt;-->
+<!--            <video  class="video"-->
+<!--                    v-if="videoItem.media_link"-->
+<!--                    :id="videoItem._id"-->
+<!--                    :poster="videoItem.img"-->
+<!--                    :autoplay="true"-->
+<!--                    object-fit="contain"-->
+<!--                    @ended="videoPlayerEnded"-->
+<!--                    @loadedmetadata="loadedmetadata"-->
+<!--                    :src="videoItem.media_link"></video>-->
+<!--            &lt;!&ndash; #endif &ndash;&gt;-->
+<!--          </view>-->
+<!--          <view class="rightBtnList" v-if="videoIndex == swiperCurrent && videoItem.pays == 2">-->
+<!--            <view class="btnItem" @click="userChangeLike(videoItem)" v-if="userInfo.id">-->
+<!--              <image class="videoBtnImg" v-if="videoItem.like=='2'" src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/aixinRed.png"-->
+<!--                     mode="scaleToFill"></image>-->
+<!--              <image class="videoBtnImg" v-else src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/aixin.png"-->
+<!--                     mode="scaleToFill"></image>-->
+<!--              <view class="btnText">{{videoItem.like_n>0?videoItem.like_n:'0'}}</view>-->
+<!--            </view>-->
+<!--            <view class="btnItem" @click="userChangeStar(videoItem)" v-if="userInfo.id">-->
+<!--              <image class="videoBtnImg" v-if="playVideoDetail.iszj=='2'" src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/scRed.png"-->
+<!--                     mode="scaleToFill"></image>-->
+<!--              <image class="videoBtnImg" v-else src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/sc.png"-->
+<!--                     mode="scaleToFill"></image>-->
+<!--              <view class="btnTextRed" v-if="playVideoDetail.iszj=='2'">已追</view>-->
+<!--              <view class="btnText" v-else>追剧</view>-->
+<!--            </view>-->
+<!--            &lt;!&ndash; #ifdef H5 &ndash;&gt;-->
+<!--            <view class="btnItem" @click="copyShareLink(videoItem)" v-if="userInfo.id">-->
+<!--              <image class="videoBtnImg" src="https://wxtietong.hnjrdzkj.xyz/static/wechat/icon/video_share_icon.png" mode=""></image>-->
+<!--              <view class="btnText">分享</view>-->
+<!--            </view>-->
+<!--            &lt;!&ndash; #endif &ndash;&gt;-->
+<!--          </view>-->
+<!--          <view class="videoFooter" v-if="videoIndex == swiperCurrent && playVideoDetail.id" @click="showChoice">-->
+<!--            <view class="videoName">-->
+<!--              <image class="footerTv" src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/video.png" mode="scaleToFill"></image>-->
+<!--              <text class="footerTvText">{{playVideoDetail.name}} · 当前第1集/全{{playVideoDetail.sum}}集</text>-->
+<!--            </view>-->
+<!--            <view class="choiceVideo">-->
+<!--              <text class="choiceVideoTexts">选集</text>-->
+<!--              <uni-icons size="12" type="right" color="#ffffff"></uni-icons>-->
+<!--            </view>-->
+<!--          </view>-->
+<!--        </view>-->
+<!--      </swiper-item>-->
+
+<!--    </swiper>-->
+
+    <drama-feed-list
+        id="drama-feed-list"
+        autoplay
+        @watchFullDrama="goPlayer"
+    ></drama-feed-list>
+<!--    <selectVideo ref="choiceVideoPup" @choiceVideoItem="changePlaying" :play-video-info="playVideoDetail"-->
+<!--                 :video-info="videoInfo">-->
+<!--    </selectVideo>-->
+  </view>
+</template>
+
+<script>
+import selectVideo from "@/components/select/video.vue"
+import {httpRequest} from "@/utils/request";
+export default {
+  components: {
+    selectVideo
+  },
+  data() {
+    return {
+      page: {
+        pageSize: 50,
+        currentPage: 1,
+        isNextPage: true,
+      },
+      userInfo: {},
+      swiperCurrent: 0,
+      playVideoDetail: {}, //
+      videoListData: [], //剧集列表
+      videoInfo: {},
+      swiperData: [], //
+      videoId: '',
+      imageUrl: "",
+      searchBarTop:0,
+      searchBarHeight:0,
+      winHeight: '800px',
+      pupHeight: "400px",
+      onPlayVideo: null,
+      appid:""
+    };
+  },
+
+  onLoad(e) {
+    this.appid = this.$config.mini_appid;
+    this.userinfo = uni.getStorageSync("userinfo");
+    this.getPageDefault();
+  },
+  onShow() {
+    this.page={
+      pageSize: 50,
+      currentPage: 1,
+      isNextPage: true,
+    }
+    this.videoListData=[];
+    // this.getVideoList()
+  },
+
+
+  methods: {
+
+    // 获取页面宽高数据& 系统信息
+    getPageDefault() {
+      console.log(this.system, uni.getSystemInfoSync())
+      // #ifdef MP-WEIXIN || MP-TOUTIAO
+      let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+      this.searchBarTop = menuButtonInfo.top;
+      this.searchBarHeight = menuButtonInfo.height;
+      // #endif
+      this.winHeight = uni.getWindowInfo().windowHeight+"px";
+      console.log(uni.getWindowInfo().windowHeight+"px")
+      this.pupHeight =( uni.getWindowInfo().windowHeight - 40 )+ "px";
+      uni.getSystemInfo({
+        success: res => {
+          this.safeArea = res.safeAreaInsets.bottom;
+        }
+      })
+    },
+    goPlayer(item) {
+      let that = this;
+      that.$httpRequest({
+        url: "/api/video/dramaIdToVideoId",
+        method: "GET",
+        data: {
+          drama_id: item.detail.dramaId,
+          no: 1
+        }
+      }).then(res => {
+        console.log(res)
+        // uni.navigateTo({url: "/pages/video/videoDetail?id="+res.data.data.drama_vid})
+        uni.navigateTo({url:'/pagesA/player/detailPlayer?vid='+res.data.drama_vid+'&mid='+res.data.id})
+      }).catch(err => {
+        console.log(err)
+      })
+
+
+
+      // uni.navigateTo({url:'/pagesA/player/detailPlayer?vid='+this.videoInfo.id+'&fxpid='+val.fxpid+'&mid='+val.mid+'&num='+val.weigh})
+    },
+
+
+  },
+
+};
+</script>
+
+<style scoped lang="scss">
+.pages {
+  background: #000000;
+  height: 100vh;
+}
+
+
+.header {
+  width: 750rpx;
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  justify-content: space-between;
+  position: absolute;
+  top: 0;
+  z-index: 99;
+}
+
+.swiper {
+  width: 750rpx;
+  flex: 1;
+}
+.swiperItem{
+  flex: 1;
+}
+.swiperItemContent {
+  position: relative;
+  width: 750rpx;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.payVideo {
+  width: 750rpx;
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  .video {
+    width: 750rpx;
+    flex: 1;
+  }
+}
+
+
+
+.rightBtnList {
+  position: absolute;
+  right: 34rpx;
+  top: 600rpx;
+  width: 100rpx;
+  text-align: center;
+  z-index: 99;
+  .btnItem {
+    margin-top: 40rpx;
+    /* #ifdef MP-WEIXIN || H5 */
+    background: none;
+    /* #endif */
+    text-align: center;
+    .videoBtnImg {
+      width: 64rpx;
+      height: 64rpx;
+      margin: 0 auto;
+    }
+
+    .btnText {
+      color: #FFFFFF;
+      text-align: center;
+      font-weight: bold;
+      font-size: 24rpx;
+    }
+
+    .btnTextRed {
+      color: red;
+    }
+
+    .wxClickBtn {
+      /* #ifdef MP-WEIXIN || H5 */
+      border: none;
+      background: none;
+      /* #endif */
+      width: 100rpx;
+      opacity: 0;
+      height: 100rpx;
+      position: relative;
+      top: -100rpx;
+      left: 0;
+    }
+  }
+}
+
+
+.choiceTitleLine {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 40rpx;
+
+  .appText {
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #333333;
+  }
+
+  .schoiceClose {
+    padding: 10rpx;
+    border-radius: 8rpx;
+    background: #f6f6f6;
+  }
+}
+
+.videoFooter {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding-left: 40rpx;
+  line-height: 70rpx;
+
+  font-size: 22rpx;
+  color: #FFFFFF;
+  /* #ifdef MP-WEIXIN */
+    height: 80rpx;
+  /* #endif */
+  /* #ifdef H5 */
+  height: 90px;
+  padding-bottom: 50px;
+  /* #endif */
+  /* #ifdef APP */
+  height: 50px;
+  /* #endif */
+  .videoName {
+    display: flex;
+    flex-direction: row;
+
+    .footerTv {
+      width: 40rpx;
+      height: 26rpx;
+      margin-top: 6rpx;
+      margin-right: 10px;
+    }
+
+    .footerTvText {
+      font-weight: 500;
+      font-size: 22rpx;
+      color: #FFFFFF;
+      line-height: 32rpx;
+      border-bottom: 2rpx solid #ffffff;
+      max-width: 600rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+
+    }
+  }
+
+  .choiceVideo {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding-right: 20rpx;
+
+    .choiceVideoTexts {
+      font-size: 22rpx;
+      line-height: 70rpx;
+      color: #FFFFFF;
+    }
+
+    .footerChoice {
+      width: 34rpx;
+      height: 32rpx;
+      margin-top: 20rpx;
+    }
+  }
+
+
+}
+
+
+</style>
\ No newline at end of file
diff --git a/pagesA/VIP/VIP.vue b/pagesA/VIP/VIP.vue
new file mode 100644
index 0000000..8af01c7
--- /dev/null
+++ b/pagesA/VIP/VIP.vue
@@ -0,0 +1,925 @@
+<template>
+	<view class="content">
+		<view class="tab_box">
+			<view class="tab_icon" @click="back">
+				<uni-icons type="back" color="#fff" size="30"></uni-icons>
+			</view>
+			<view class="tab_name">
+				会员中心
+			</view>
+			<view style="width: 30px;">
+
+			</view>
+		</view>
+		<view class="vip_tabber">
+
+			<swiper class="swiper" previous-margin="60rpx" next-margin="40rpx" :autoplay="false"
+				@change="swiper_change">
+				<swiper-item v-for="(item, index) in tabber_vip" :key="index">
+					<view class="vip_image" :style="'background-image: url(' + item.imgurl.image + ');'">
+						<view class="vip_top_left"
+							:style="'background-image: url(' + item.imgurl.imagelft + ');color:' + item.imgurl.color + ';'">
+							{{
+				item.pay_name }}
+						</view>
+						<view class="price">
+							<text class="text1" :style="'color:' + item.imgurl.txt_color + ';'">￥</text>
+							<text class="text2"
+								:style="'color:' + item.imgurl.txt_color + ';'">{{ item.pay_money }}</text>
+						</view>
+						<text class="vip_text" :style="'color:' + item.imgurl.color + ';'">{{ item.pay_tab }}</text>
+					</view>
+				</swiper-item>
+			</swiper>
+
+		</view>
+
+		<view class="tabber_box">
+			<view class="vip_tag_tabber">
+				<view class="tag_list" v-for="(item, index) in tag_tabList" :key="index">
+					<!-- <transition name="fade"> -->
+					<image :src="item.images" v-if="tag_index == index"
+						:class="tag_index == 0 || tag_index == 3 ? 'tag0' : 'tag'"></image>
+
+					<view class="item" v-else>
+
+						<view class="item_tag"></view>
+					</view>
+					<!-- </transition> -->
+				</view>
+			</view>
+
+			<view class="tag_tab_text">
+				<text v-for="(item, index) in tag_tabList" :key="index"
+					:class="tag_index == index ? 'text1' : 'text2'">{{ item.name }}</text>
+			</view>
+
+		</view>
+
+		<view class="main">
+			<view class="main_box">
+				<view class="main_title">
+					<image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/left_vip.png"></image>
+					<text>会员特权</text>
+					<image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/right_vip.png"></image>
+				</view>
+				<view class="privilege_box">
+					<view class="privilege_list" v-for="(item, index) in equitylist" :key="index">
+						<view class="privilege_image">
+							<image :src="item.image"></image>
+						</view>
+						<view class="privilege_name">
+							{{ item.name }}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="main_content">
+				<scroll-view scroll-y="true" style="height: 340rpx;">
+					<view class="privilege">
+						<view class="privilege_title">
+							<view class="title_left"></view>
+							<view class="title_name">会员特权</view>
+							<view class="title_right"></view>
+						</view>
+					</view>
+					<view class="text-group_3 flex-col">
+						<text class="text_5">购买会员有什么优势？</text>
+						<view class="paragraph_1">1、全剧无广告:免除广告的激励视频</view>
+						<view class="paragraph_1">2、新剧抢先看:最新免费短剧抢先看!</view>
+						<view class="paragraph_1">3、新剧抢先看:最新免费短剧抢先看!</view>
+						<view class="paragraph_1">4、新剧抢先看:最新免费短剧抢先看!</view>
+						<view class="paragraph_1">5、新剧抢先看:最新免费短剧抢先看!</view>
+					</view>
+
+				</scroll-view>
+			</view>
+		</view>
+
+
+		<view class="btn_box">
+			<view class="pay_text" @click="huiyuanxieyi">
+				<text class="text1">支付即表示同意：</text>
+				<text class="text2">《会员服务协议》</text>
+			</view>
+			<!-- @click="payment" -->
+			<view class="btn_class" @click="changeClick">
+				<view class="btn_text">
+					<text class="text1">¥{{ present.pay_money }}</text>
+					<text class="text2">开通会员</text>
+				</view>
+			</view>
+		</view>
+		<uni-popup ref="popup" type="bottom" border-radius="10px 10px 0 0">
+			<scroll-view scroll-y="true" class="scroll-Y">
+				<!-- @scrolltolower="lower" @scroll="scroll":scroll-top="scrollTop" @scrolltoupper="upper"-->
+				<view style="padding: 34rpx 24rpx;border-radius: 12rpx 12rpx 0 0; background: #fff;">
+					<view v-html="tishi"></view>
+				</view>
+			</scroll-view>
+		</uni-popup>
+
+		<uni-popup ref="payselect" type="bottom" :safe-area="false">
+			<view class="popupbox">
+				<view class="popuptop">
+					<view class="popuptop_lft">支付</view>
+					<view class="popuptop_right" @click="paymentCancel">取消</view>
+				</view>
+				<!-- 				<view class="methodsList">
+					<view class="methodItem" v-for="method in payMethodList" :key="method.type"
+						@click="changeMethod(method)">
+						<view class="payCont">
+							<image class="payIcon" :src="method.img" mode="heightFix"></image>
+							<view class="payText">{{method.title}}</view>
+						</view>
+						<view class="payCheck">
+							<image class="checkRadio" v-if="payMethodCheck.type == method.type"
+								src="/static/icon/radio_check_icon.png" mode="scaleToFill"></image>
+							<view class="defaultDom" v-else></view>
+						</view>
+					</view>
+				</view> -->
+				<radio-group @change="changeType">
+					<view class="pt16 pb16 flex alcenter space">
+						<view class="flex alcenter">
+							<text class="iconfont iconicon_pay_balance ft32 cl-green"></text>
+							<text class="ml15 ft14 ftw500 " style="color: #fff;">微信支付</text>
+						</view>
+						<view>
+							<radio value="weixin" :checked="payType ==  'weixin'" />
+						</view>
+					</view>
+					<view class="bd-line"></view>
+				</radio-group>
+
+				<view class="paymoney">{{present.pay_money}}</view>
+				<view class="paysFooter">
+					<view class="payBtn" @click="okTap">去支付</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import PAY from "@/utils/pay";
+	export default {
+		data() {
+			return {
+				tabber_vip: [],
+				present: {},
+				tag_tabList: [{
+						name: '周卡会员',
+						imgdata: {
+							image: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/weeks_vip.png',
+							imagelft: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/weeks_lefttop.png',
+							color: "#3B3761",
+							txt_color: "#3B3761",
+						},
+						images: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/tag_tab0.png'
+					},
+					{
+						name: '月卡会员',
+						imgdata: {
+							image: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/month_vip.png',
+							imagelft: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/month_lefttop.png',
+							color: "#E6A058",
+							txt_color: "#240A00",
+						},
+						images: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/tag_tab.png'
+					},
+					{
+						name: '季卡会员',
+						imgdata: {
+							image: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/season_vip.png',
+							imagelft: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/season_lefttop.png',
+							color: "#30597A",
+							txt_color: "#30597A",
+						},
+						images: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/tag_tab.png'
+					},
+					{
+						name: '年卡会员',
+						imgdata: {
+							image: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/years_vip.png',
+							imagelft: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/years_lefttop.png',
+							color: "#FFFFFF",
+							txt_color: "#FFDB8A",
+						},
+						images: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/tag_tab1.png'
+					}
+				],
+				tag_index: 0,
+				tishi: '',
+				equitylist: [],
+				privilegeList: [{
+						name: '新剧抢先看',
+						image: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/Fast.png'
+					},
+					{
+						name: '会员免广告',
+						image: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/exempt.png'
+					},
+					{
+						name: '全站免费看',
+						image: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/video.png'
+					},
+					{
+						name: '专属客服',
+						image: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/artificial.png'
+					}
+				],
+				weeksprivilegeList: [{
+						name: '全站免费看',
+						image: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/video.png'
+					},
+					{
+						name: '会员免广告',
+						image: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/exempt.png'
+					},
+					{
+						name: '7*18H客服',
+						image: 'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/artificial.png'
+					}
+				],
+				osName: "",
+				language: "en",
+				payMethodList: [],
+				payMethodCheck: {},
+				payType: 'weixin',
+
+				//支付
+				buyType: '微信',
+				wxlx: 'wxh5',
+				openid: "",
+				userInfo: "",
+				system: ""
+
+
+			};
+		},
+		onShow() {
+			this.vipList()
+			this.equitylist = this.weeksprivilegeList
+		},
+		onLoad() {
+			this.system = uni.getSystemInfoSync().osName
+			//#ifdef MP-WEIXIN
+			this.wxlx = 'wxxcx'
+			this.openid = uni.getStorageSync("openid")
+			console.log(this.openid);
+			this.userInfo = uni.getStorageSync("userinfo");
+			//#endif
+		},
+		mounted() {
+
+		},
+		methods: {
+			back() {
+				uni.navigateBack(1)
+			},
+			changeMethod(item) {
+				console.log(item)
+				this.payMethodCheck = item;
+			},
+			//取消支付
+			paymentCancel() {
+				this.$refs.payselect.close()
+			},
+
+			vipList() {
+				this.$httpRequest({
+					isLoading: true,
+					url: '/api/beans/vipList',
+					method: "GET",
+					data: {}
+				}).then(res => {
+					res.data.forEach(item => {
+						if (item.pay_type == 1) {
+							this.tabber_vip.push(item)
+
+						}
+					})
+					this.tabber_vip[0].imgurl = this.tag_tabList[0].imgdata
+					this.tabber_vip[1].imgurl = this.tag_tabList[1].imgdata
+					this.tabber_vip[2].imgurl = this.tag_tabList[2].imgdata
+					this.tabber_vip[3].imgurl = this.tag_tabList[3].imgdata
+					console.log(this.tabber_vip);
+
+					this.present = this.tabber_vip[0]
+					this.payCheckItem = this.tabber_vip[0]
+				}).catch(eer => {
+					console.log('fail' + JSON.stringify(eer));
+				})
+			},
+			huiyuanxieyi() {
+				console.log('000000')
+				this.$httpRequest({
+					url: '/api/index/noticeInfo',
+					method: "GET",
+					data: {
+						id: 7
+					},
+				}).then(res => {
+					this.tishi = res.data.data.content
+					this.$refs.popup.open()
+				}).catch(eer => {
+					console.log('fail' + JSON.stringify(data));
+				})
+			},
+			swiper_change(e) {
+				this.payCheckItem = this.tabber_vip[e.target.current]
+				this.present = this.tabber_vip[e.target.current]
+				if (this.present.pay_name == "周卡会员") {
+					this.equitylist = this.weeksprivilegeList
+				} else {
+					this.equitylist = this.privilegeList
+				}
+				this.tag_index = e.target.current;
+			},
+
+
+
+			okTap() {
+				var that = this
+				let defaultData = {
+					sum: 1,
+					buyType: that.buyType,
+					pricebuy: that.present.pay_money,
+					token: uni.getStorageSync("userinfo").token,
+					uid: uni.getStorageSync("userinfo").id,
+					wxlx: that.wxlx,
+					id: that.id,
+					openid: that.openid,
+					info: [],
+				};
+				// #ifdef MP-WEIXIN
+				this.weiChartPay(defaultData)
+				// #endif
+				// #ifdef H5
+				this.H5Pay();
+				// #endif
+			},
+
+			weiChartPay(defaultData) {
+
+				var that = this
+				if (this.system == 'android') {
+					uni.login({
+						timeout: 10000,
+						provider: 'weixin', //如果是uniapp，在这里需要标明平台的类型，支持的参数请查阅uniapp官网的uni.login()文档
+						success: (res) => {
+							PAY.pays.serverCreatOrder({
+								id: that.payCheckItem.id,
+								pay_type: 1,
+								code: res.code,
+								ad_code: uni.getStorageSync('get_ad_code'),
+										openid: that.openid,
+							}).then(creatRes => {
+								console.log('creat order success', creatRes)
+								return
+								PAY.pays.wxAppletAndroidPay(creatRes.data).then(payRes => {
+									console.log('pay order success', payRes)
+									that.getUserDel()
+								})
+							}).catch(err => {
+								console.log(err)
+							})
+
+						},
+					})
+				} else {
+					PAY.pays.wxIosCreatOrder({
+						sum: defaultData.sum,
+						buytype: defaultData.buyType,
+						pricebuy: defaultData.pricebuy,
+						token: defaultData.token,
+						uid: defaultData.uid,
+						wxlx: defaultData.wxlx,
+						id: defaultData.id,
+						openid: defaultData.openid,
+						info: defaultData.info,
+						ad_code: uni.getStorageSync('get_ad_code')
+					}).then(res => {
+						if (res.code == 1) {
+							PAY.pays.wxAppletIosPay(res.data).then(payRes => {
+								console.log('pay order success', payRes)
+								that.getUserDel()
+							})
+						}
+					}).catch(err => {
+						console.log(err)
+					})
+				}
+			},
+
+			H5Pay() {
+				let that = this;
+				that.$httpRequest({
+					url: "/api/pay/payInfo",
+					method: "GET",
+					data: {
+						id: that.id,
+						pay_type: 21,
+						token: uni.getStorageSync("userinfo").token,
+						uid: uni.getStorageSync("userinfo").id,
+						ad_code: uni.getStorageSync('get_ad_code')
+					}
+				}).then(res => {
+					console.log(res)
+					// #ifdef H5
+					window.open(res.data.return_url, "_self")
+					// #endif
+					// #ifdef APP
+					uni.navigateTo({
+						url: "/pagesA/myCenter/wallet/webPay?url=" + encodeURIComponent(res.data
+							.return_url)
+					})
+					// #endif
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+
+
+			getPayList() {
+				this.$httpRequest({
+					url: "/api/beans/payList",
+					method: "GET"
+				}).then(res => {
+					if (res.code == 1) {
+						if (res.data.length > 0) {
+							let lists = [];
+							res.data.forEach((item) => {
+								if (item.pay_type != 3) {
+									lists.push(item)
+								}
+							})
+							this.list = lists
+						}
+					} else if (res.data.code == 50) {
+						this.is_check = true;
+					} else {
+						console.log(res)
+					}
+
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+
+
+			changeClick(item) {
+				this.$refs.payselect.open()
+			},
+
+
+
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.content {
+		width: 100vw;
+		height: 100vh;
+		background-color: #272733;
+	}
+
+	.tab_box {
+		display: flex;
+		justify-content: space-between;
+		padding: 40px 32rpx 32rpx;
+	}
+
+	.tab_icon {}
+
+	.tab_name {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
+
+	.swiper {
+		width: 100vw;
+		height: 304rpx;
+	}
+
+	.vip_tabber {
+		// display: flex;
+		// align-items: center;
+	}
+
+	.vip_image {
+		width: 630rpx;
+		height: 304rpx;
+		background-size: 630rpx 304rpx;
+		display: inline-block;
+		position: relative;
+
+		.vip_top_left {
+			width: 120rpx;
+			height: 40rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background-size: 120rpx 40rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+			font-size: 22rpx;
+		}
+
+		.price {
+			position: absolute;
+			top: 76rpx;
+			left: 42rpx;
+
+			.text1 {
+				font-size: 56rpx;
+			}
+
+			.text2 {
+				font-size: 80rpx;
+				font-weight: bold;
+			}
+		}
+
+		.vip_text {
+			position: absolute;
+			font-size: 22rpx;
+			left: 50rpx;
+			top: 242rpx;
+		}
+	}
+
+	.tag_tab_text {
+		width: 450rpx;
+		margin: 0 auto;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		flex-direction: row;
+		margin-top: 10rpx;
+
+		.text1 {
+			color: #e7e6ec;
+			font-size: 24rpx;
+		}
+
+		.text2 {
+			color: #a2a0aa;
+			font-size: 24rpx;
+		}
+	}
+
+	.vip_tag_tabber {
+		width: 418rpx;
+		height: 8rpx;
+		background-image: linear-gradient(to right, #3c3c43, #3c3c43);
+		background-size: 400rpx 8rpx;
+		background-position: center;
+		background-repeat: no-repeat;
+		margin: 0 auto;
+		margin-top: 38rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.tag_list {
+			display: flex;
+			align-items: center;
+
+			// justify-content: space-between;
+			.tag0 {
+				width: 58rpx;
+				height: 24rpx;
+			}
+
+			.tag {
+				width: 96rpx;
+				height: 24rpx;
+			}
+		}
+
+		.tag_list:nth-child(2) {
+			width: 96rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.item_tag {
+				width: 12rpx;
+				height: 12rpx;
+				background-color: #a2a0aa;
+				border-radius: 50%;
+			}
+		}
+
+		.tag_list:nth-child(3) {
+			width: 96rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.item_tag {
+				width: 12rpx;
+				height: 12rpx;
+				background-color: #a2a0aa;
+				border-radius: 50%;
+			}
+		}
+
+		.tag_list:first-child {
+			/* Your styles here */
+			width: 58rpx;
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+
+			.item_tag {
+				width: 12rpx;
+				height: 12rpx;
+				background-color: #a2a0aa;
+				border-radius: 50%;
+			}
+		}
+
+		.tag_list:last-child {
+			/* Your styles here */
+			width: 58rpx;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+
+			.item_tag {
+				width: 12rpx;
+				height: 12rpx;
+				background-color: #a2a0aa;
+				border-radius: 50%;
+			}
+		}
+	}
+
+	.main {
+		margin-top: 28rpx;
+
+		.main_box {
+			width: 702rpx;
+			padding: 32rpx 0;
+			box-sizing: border-box;
+			background: #34343b;
+			border-radius: 16rpx;
+			margin: 0 auto;
+
+			.main_title {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				image {
+					width: 68rpx;
+					height: 12rpx;
+				}
+
+				text {
+					font-size: 32rpx;
+					color: #f5cfbd;
+					font-weight: bold;
+					margin-left: 20rpx;
+					margin-right: 20rpx;
+				}
+			}
+		}
+
+		.main_content {
+			padding: 28rpx 24rpx 0 24rpx;
+
+			view {
+				color: #a2a0aa;
+			}
+		}
+
+		.main_list {
+			display: grid;
+			grid-template-columns: repeat(4, 1fr);
+			/* 创建三列 */
+			grid-gap: 10px;
+			/* 设置列之间的间距 */
+			padding: 0 32rpx;
+			box-sizing: border-box;
+
+			.main_item {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				margin-top: 26rpx;
+
+				image {
+					width: 76rpx;
+					height: 76rpx;
+					border-radius: 50%;
+					margin-bottom: 6rpx;
+				}
+
+				text {
+					font-size: 24rpx;
+					color: #a2a0aa;
+				}
+			}
+		}
+	}
+
+	.btn_box {
+		width: 750rpx;
+		height: 190rpx;
+		background: #3c3c43;
+		border-radius: 24rpx 24rpx 0rpx 0rpx;
+		overflow: hidden;
+		position: absolute;
+		bottom: 0;
+
+		.pay_text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 14rpx;
+
+			.text1 {
+				font-size: 22rpx;
+				color: rgba(255, 255, 255, 0.8);
+			}
+
+			.text2 {
+				font-size: 22rpx;
+				color: rgba(255, 200, 160, 1);
+			}
+		}
+
+		.btn_class {
+			width: 664rpx;
+			height: 80rpx;
+			background: linear-gradient(90deg, #ffe1c5 0%, #ffc69c 100%);
+			border-radius: 12rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin: 0 auto;
+			margin-top: 24rpx;
+
+			.btn_text {
+				display: flex;
+				align-items: center;
+
+				.text1 {
+					font-size: 32rpx;
+					color: rgba(236, 23, 56, 1);
+					font-weight: bold;
+					margin-right: 14rpx;
+				}
+
+				.text2 {
+					font-size: 32rpx;
+					color: rgba(39, 39, 51, 1);
+					font-weight: bold;
+				}
+			}
+		}
+	}
+
+	.scroll-Y {
+		max-height: 1200rpx;
+	}
+
+	.privilege_box {
+		display: flex;
+		padding-bottom: 34rpx;
+		padding-top: 20rpx;
+
+		.privilege_list {
+			text-align: center;
+			padding: 0 30rpx;
+
+			.privilege_image {
+				text-align: center;
+
+				image {
+					width: 76rpx;
+					height: 76rpx;
+				}
+			}
+
+			.privilege_name {
+				color: #A2A0AA;
+				margin-top: 6rpx;
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #A2A0AA;
+				line-height: 34rpx;
+			}
+
+			.privilege_txt {
+				font-size: 22rpx;
+				color: #898995;
+				margin-top: 4rpx;
+			}
+		}
+	}
+
+
+
+	.popupbox {
+		background-color: #1C1C1D;
+		padding: 0 32rpx;
+
+		.methodsList {
+			border-radius: 12rpx;
+			overflow: hidden;
+
+			.methodItem {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				height: 140rpx;
+				padding: 0 36rpx;
+				border-bottom: 2rpx solid #363636;
+
+				.payCont {
+					display: flex;
+					align-items: center;
+				}
+
+				.payIcon {
+					width: 138rpx;
+					height: 60rpx;
+				}
+
+				.payText {
+					font-weight: 500;
+					font-size: 28rpx;
+					color: rgba(255, 255, 255, 0.87);
+					padding-left: 12rpx;
+				}
+
+				.defaultDom {
+					border: 2rpx solid #77777C;
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+				}
+
+				.checkRadio {
+					width: 36rpx;
+					height: 36rpx;
+				}
+			}
+		}
+
+		.paymoney {
+			font-weight: 500;
+			font-size: 40rpx;
+			color: #DDAF8F;
+			text-align: center;
+			margin: 40rpx 0 46rpx 0;
+		}
+
+		.popuptop {
+			display: flex;
+			justify-content: space-between;
+			padding-top: 22rpx;
+			padding-bottom: 40rpx;
+
+			.popuptop_lft {
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #FFFFFF;
+			}
+
+			.popuptop_right {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: rgba(255, 255, 255, 0.6);
+			}
+		}
+
+	}
+
+	.paysFooter {
+		margin-top: 48rpx;
+		padding-bottom: 60rpx;
+
+		.payBtn {
+			width: 440rpx;
+			line-height: 80rpx;
+			background: #E83A57;
+			border-radius: 12rpx;
+			margin: 0 auto;
+			text-align: center;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: rgba(255, 255, 255, 0.87);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/agreement/agreement.vue b/pagesA/agreement/agreement.vue
new file mode 100644
index 0000000..69e4010
--- /dev/null
+++ b/pagesA/agreement/agreement.vue
@@ -0,0 +1,47 @@
+<template>
+  <view class="page">
+    <view class="content" v-html="agreementText"></view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      agreementId:"",
+      agreementText:""
+    };
+  },
+  onLoad(e) {
+    //1:充值规则 2:会员服务协议
+    this.agreementId = e.id
+  },
+  mounted() {
+    this.getDetail();
+  },
+  methods:{
+    getDetail(){
+      this.$httpRequest({
+        url:"/api/common/articleInfo",
+        methods:"GET",
+        data:{
+          id:this.agreementId,
+        }
+      }).then(res=>{
+        if(res.code ==1){
+          this.agreementText = res.data.msg
+        }
+      }).catch(err=>{
+        console.log(err)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content{
+  padding:  20rpx;
+  font-size: 30rpx;
+}
+</style>
diff --git a/pagesA/components/addresspopup.vue b/pagesA/components/addresspopup.vue
new file mode 100644
index 0000000..5d5f8b1
--- /dev/null
+++ b/pagesA/components/addresspopup.vue
@@ -0,0 +1,92 @@
+<template>
+	<uni-popup ref="address" type="bottom" :safe-area="fales">
+		<view class="content">
+			<view class="ml20 ft16 ftw500 flex" style="height: 80rpx; line-height: 80rpx;">
+				<view>更换地址</view>
+				<view @click="quxiao" style="margin-left: auto;padding-right: 30rpx; " class="ft14 ftw500 cl-999">取消</view>
+			</view>
+			<view class="ml20 mr15">
+				<scroll-view scroll-y class="" style="height: 240px;margin-bottom: 4rpx;">
+					<view class="pt10 pb10  item" style="padding-left: 10rpx;" :class="{'itemtype':quantity.id == item.id}" v-for="(item,index) in datalist" :key="index" @click="selectdata(item)">
+						<view class="flex alcenter">
+							<text class="ft14 ftw500 cl-333">{{item.accept_name}}</text>
+							<text class="ft14 ftw500 cl-333 pl20">{{item.show_mobile}}</text>
+						</view>
+						<view class="ft14 ftw500 cl-999" style="margin-top: 12rpx;">
+							{{item.accept_province}}{{item.accept_city}}{{item.accept_exp_area}}{{item.accept_address}}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="button" style="padding: 20rpx 0;"  @click="determine">确定</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				quantity: "",
+				datalist: []
+			}
+		},
+		methods: {
+			addressshop(data) {
+				this.getlist()
+				console.log(data);
+				this.quantity = data
+			},
+			quxiao() {
+				this.$refs.address.close()
+			},
+			getlist() {
+				this.$httpRequest({
+					url: '/api/delivery/address/list',
+					data: this.data,
+					methods: "POST",
+				}).then(res => {
+					if (res.code == 1) {
+						this.datalist = res.data.list
+						this.$refs.address.open()
+					}
+				}).catch(err => {
+					console.log('bind user err');
+					console.log(err);
+				})
+			},
+			selectdata(item) {
+				console.log(item);
+				this.quantity = item
+			},
+			determine(){
+				this.quxiao()
+			this.$emit("replacement",this.quantity)
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.content {
+		background-color: #fff;
+		height: 680rpx;
+		border-radius: 24rpx 24rpx 0rpx 0rpx;
+	}
+	.button {
+		margin: 0 30rpx;
+		height: 80rpx;
+		/* width: 312rpx; */
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		border-radius: 40rpx;
+		text-align: center;
+		color: #FFFFFF;
+	}
+	.item{
+		border: 2rpx solid transparent;
+	}
+	.itemtype{
+			border: 2rpx solid #09d89e;
+			border-radius: 14rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/components/advertising.vue b/pagesA/components/advertising.vue
new file mode 100644
index 0000000..48fd93b
--- /dev/null
+++ b/pagesA/components/advertising.vue
@@ -0,0 +1,121 @@
+<template>
+	<uni-popup type="center" ref="pointsyes">
+		<view class="Content">
+			<image style="width: 44rpx;height: 44rpx; margin-left: auto; margin-bottom: 28rpx;"
+				src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/Shutdown.png" mode="" @click="quxiao"></image>
+			<view class="advertisingbg">
+				<!-- <image style="width: 620rpx;height: 728rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/advertising_bg.png" mode=""> -->
+				</image>
+				<view class="boxs">
+					<view class="watch">观看广告可解锁本剧集</view>
+					<view class="buyvip" @click="liberalvip">买VIP会员全场免广告</view>
+				</view>
+
+			</view>
+
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				quantity: ""
+			}
+		},
+		methods: {
+			pointsyesshop() {
+				this.$refs.pointsyes.open()
+			},
+			quxiao() {
+				this.$refs.pointsyes.close()
+			},
+			liberalvip(){
+				this.quxiao()
+			uni.navigateTo({
+				url: '/pagesA/VIP/VIP'
+			})
+			},
+		}
+	}
+</script>
+
+<style>
+	.Content {
+		display: flex;
+		flex-direction: column;
+		width: 620rpx;
+	}
+
+	.pointsyesbox {
+		width: 100%;
+		height: 600rpx;
+		background-color: #fff;
+		/* text-align: center; */
+		padding: 24rpx;
+		display: flex;
+		flex-direction: column;
+		border-radius: 24rpx 24rpx 0rpx 0rpx;
+	}
+
+	.uni-input {
+		width: 680rpx;
+		height: 88rpx;
+		border-radius: 12rpx;
+		border: 2rpx solid #D8D8D8;
+		padding-left: 36rpx;
+	}
+
+	.input {
+		height: 88rpx;
+	}
+
+	.practices {
+		height: 80rpx;
+		width: 100%;
+		border-radius: 40rpx;
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		text-align: center;
+		line-height: 80rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
+
+	.advertisingbg {
+		position: relative;
+		background-image: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/advertising_bg.png);
+		background-repeat: no-repeat;
+		background-size: 100% 728rpx;
+		width: 620rpx;
+		height: 728rpx;
+	}
+
+	.boxs {
+		margin: 488rpx 42rpx;
+		margin-bottom: 0;
+	}
+
+	.watch {
+		width: 100%;
+		height: 88rpx;
+		border-radius: 44rpx;
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		text-align: center;
+		line-height: 80rpx;
+		color: #FFFFFF;
+
+	}
+
+	.buyvip {
+		width: 100%;
+		height: 88rpx;
+		border-radius: 44rpx;
+		border: 3rpx solid #09D89E;
+		text-align: center;
+		line-height: 80rpx;
+		color: #09D89E;
+		margin-top: 28rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/components/changeSpeed/changeSpeed.vue b/pagesA/components/changeSpeed/changeSpeed.vue
new file mode 100644
index 0000000..1043c83
--- /dev/null
+++ b/pagesA/components/changeSpeed/changeSpeed.vue
@@ -0,0 +1,126 @@
+
+
+
+<template>
+  <uni-popup ref="share" type="bottom">
+    <view class="shareCont">
+      <view class="shareHeader">
+        <text class="shareTitle">倍速</text>
+        <text class="shareClose" @click="closeShare">取消</text>
+      </view>
+      <view class="speedList">
+       <text :class="['speedItem',{'speedItemCheck': item.num==checkSpeedNum}]"
+             v-for="(item,index) in speedList"
+             :key="index"
+             @click="changeSpeed(item.num)"
+       >{{item.text}}</text>
+      </view>
+    </view>
+  </uni-popup>
+</template>
+<script>
+
+
+export default {
+  name: "changeSpeed",
+  props:{
+    speedNum:{
+      type:Number,
+      default:1
+    }
+  },
+  mounted() {
+    this.checkSpeedNum = this.speedNum
+  },
+  data() {
+    return {
+      checkSpeedNum:1,
+      speedList:[
+        {num:0.5,text:'0.5倍速'},
+        {num:0.8,text:'0.8倍速'},
+        {num:1,text:'1倍速'},
+        {num:1.25,text:'1.25倍速'},
+        {num:1.5,text:'1.5倍速'},
+        {num:2,text:'2.0倍速'},
+      ]
+    };
+  },
+
+  methods: {
+    closeChangeSpeed() {
+      this.$refs.share.close();
+    },
+    showChangeSpeed() {
+      this.$refs.share.open();
+    },
+    changeSpeed(num) {
+      if(this.checkSpeedNum!==num){
+        this.checkSpeedNum = num
+        this.$emit('changeSpeed',num);
+        this.closeChangeSpeed();
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.shareCont{
+  background-color: #FFFFFF;
+  width: 750rpx;
+  padding: 34rpx;
+  border-radius: 34rpx 34rpx 0 0;
+}
+.shareHeader{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-direction: row;
+}
+.shareTitle{
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #333333;
+  line-height: 44rpx;
+}
+.shareClose{
+  font-weight: 500;
+  font-size: 28rpx;
+  color: #666666;
+  line-height: 44rpx;
+}
+.speedList{
+  padding: 60rpx 0 130rpx 0 ;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex-wrap: wrap;
+}
+.shareIcon{
+  width: 100rpx;
+  height: 100rpx;
+}
+.speedItem{
+  padding: 12rpx 24rpx;
+  line-height: 64rpx;
+  background: #F7F8F9;
+  border-radius: 12rpx;
+  text-align: center;
+  font-weight: 500;
+  font-size: 26rpx;
+  color: #333333;
+  margin-right: 24rpx;
+  margin-bottom: 24rpx;
+}
+.speedItemCheck{
+  padding: 12rpx 24rpx;
+  line-height: 64rpx;
+  background: #f44813;
+  border-radius: 12rpx;
+  text-align: center;
+  font-weight: 500;
+  font-size: 26rpx;
+  color: #ffffff;
+  margin-right: 24rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/components/integralArticles.vue b/pagesA/components/integralArticles.vue
new file mode 100644
index 0000000..a0413c9
--- /dev/null
+++ b/pagesA/components/integralArticles.vue
@@ -0,0 +1,64 @@
+<template>
+	<view class="content" style="margin: 0 25rpx;">
+		<view class="contenttop flex center pb16" style="background-color: #fff;">
+			<image style="width: 60rpx; height: 60rpx;margin-right: 22rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/left.png" mode=""></image>
+			<view class="">积分好礼</view>
+			<image style="width: 60rpx; height: 60rpx; margin-left: 22rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/right.png" mode=""></image>
+		</view>
+		<view class=" flex wrap" style="justify-content: space-around;">
+
+			<view style="margin-bottom: 32rpx;" @click="navdetails(item)" v-for="(item,index) in Commodity"
+				:key="index">
+				<image style="width: 292rpx;height: 292rpx; border-radius: 24rpx;" :src="item.cimage" mode="">
+				</image>
+				<view class="">
+					<view class="ft14 ftw500" style="color: #333;">{{item.name}}</view>
+					<view class="flex alcenter space" style="margin-top: 6rpx;">
+						<view class="ft14 ftw600 flex alcenter" style="color: #FFA100;">{{item.price}}
+							<image style="width: 32rpx;height: 32rpx; margin-left: 10rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/code.png"
+								mode=""></image>
+
+						</view>
+						<view class="ft10 ftw500 cl-999">已兑:{{item.sale_num}}</view>
+					</view>
+				</view>
+			</view>
+         <view class="" style="width: 292rpx;"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "integralArticles",
+		props: {
+			Commodity: {
+				type: Array,
+				default: []
+			}
+		},
+		data() {
+			return {
+				navdetails(item) {
+					uni.navigateTo({ //专享
+						url: '/pagesA/integral/ItemDetails?id=' + item.goods_id
+					})
+				}
+			};
+		},
+	}
+</script>
+
+<style scoped>
+	.content {
+		width: 700rpx;
+		background-color: #fff;
+		border-radius: 24rpx 24rpx 0rpx 0rpx;
+		margin: 0 25rpx;
+		padding: 24rpx 0;
+	}
+
+	.box {
+		display: flex;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/components/integralTrade.vue b/pagesA/components/integralTrade.vue
new file mode 100644
index 0000000..167a52f
--- /dev/null
+++ b/pagesA/components/integralTrade.vue
@@ -0,0 +1,153 @@
+<template>
+	<uni-popup type="bottom" ref="pointsyes" @maskClick="quxiao" :safe-area="false">
+		<view class="pointsyesbox">
+			<view class="flex" style="margin-bottom: 24rpx;justify-content: space-between;">
+				<view class="ft16 ftw500 cl-333">积分兑换金豆</view>
+				<view class="ft14 ftw500 cl-999" @click="quxiao">取消</view>
+			</view>
+			<view class="ft14 ftw500 cl-333">当前积分：<text style="color: #FFA100;">{{score}}</text></view>
+			<view class="uni-input" style="margin-top: 32rpx; margin-bottom: 12rpx;">
+				<input type="number" class="input" adjust-position @input="listeninginput" v-model="quantity"
+					placeholder="请输入积分数量" />
+			</view>
+			<view class="ft12 ftw500 cl-999" style="margin-bottom: 56rpx;">{{datas.jfdhsm}}</view>
+			<view class="ftw500 mb16" style="text-align: center; color: #FFA100;"> <text
+					style="font-size: 48rpx;">{{exchange || 0}}</text> <text style="font-size: 28rpx;">金豆</text> </view>
+			<view class="practices" @click="tijiao">提交</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				quantity: "",
+				score: "",
+				datas: "",
+
+			}
+		},
+		computed:{
+			exchange(){
+				return  Math.floor((this.quantity * this.datas.jfdh) * 100) / 100 || 0;
+			}
+		},
+		methods: {
+			pointsyesshop() {
+				this.getuser()
+				this.$refs.pointsyes.open()
+			},
+			quxiao() {
+				this.quantity = ""
+				this.$refs.pointsyes.close()
+
+			},
+			//获取 用户积分
+			getuser() {
+				this.$httpRequest({
+					url: '/api/user/index',
+					methods: "POST",
+				}).then(res => {
+					console.log(res.data.score);
+					this.score = res.data.score
+					this.datas = res.data.config.site
+				}).catch(err => {})
+			},
+			listeninginput(e) {
+				console.log(e);
+				if (e.detail.value >= this.score) {
+					e.detail.value = this.score
+					console.log(123);
+
+					console.log(this.quantity);
+					console.log(this.score);
+					this.$forceUpdate()
+				}
+
+			},
+			listeninginput(e) {
+				const o = e.detail.value
+				const inputRule = /[^\d]/g
+				this.$nextTick(() => {
+					this.cargoNo = o.replace(inputRule, '');
+					if (this.cargoNo == '') {
+						return
+					} else {
+						//执行对应代码	
+						if (e.detail.value >= this.score) {
+							this.quantity = this.score
+						}
+					}
+				})
+			},
+			tijiao() {
+				// this.quantity = parseInt(this.exchange) / this.datas.jfdh
+				// this.exchange = (this.quantity * this.datas.jfdh).toFixed(2)
+				if (this.quantity <= this.score) {
+					this.$httpRequest({
+						url: '/api/user/duihuan',
+						data: {
+							sum: this.quantity
+						},
+						methods: "POST",
+					}).then(res => {
+						console.log(res);
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						})
+						this.$emit('success');
+						this.getuser();
+					}).catch(err => {})
+				} else {
+					uni.showToast({
+						title: '兑换积分大于拥有积分',
+						icon: 'none',
+						duration: 3000
+					})
+				}
+			}
+
+
+		}
+	}
+</script>
+
+<style>
+	.pointsyesbox {
+		width: 100%;
+		height: 600rpx;
+		background-color: #fff;
+		/* text-align: center; */
+		padding: 24rpx;
+		display: flex;
+		flex-direction: column;
+		border-radius: 24rpx 24rpx 0rpx 0rpx;
+	}
+
+	.uni-input {
+		width: 680rpx;
+		height: 88rpx;
+		border-radius: 12rpx;
+		border: 2rpx solid #D8D8D8;
+		padding-left: 36rpx;
+	}
+
+	.input {
+		height: 88rpx;
+	}
+
+	.practices {
+		height: 80rpx;
+		width: 100%;
+		border-radius: 40rpx;
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		text-align: center;
+		line-height: 80rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/components/pick-regions/pick-regions.vue b/pagesA/components/pick-regions/pick-regions.vue
new file mode 100644
index 0000000..a5f2d45
--- /dev/null
+++ b/pagesA/components/pick-regions/pick-regions.vue
@@ -0,0 +1,137 @@
+<template>
+    <picker mode="multiSelector" 
+            :value="multiIndex" 
+            :range="multiArray" 
+            @change="handleValueChange"
+            @columnchange="handleColumnChange">
+        <slot></slot>
+    </picker>
+</template>
+
+<script>
+    const CHINA_REGIONS = require('./regions.json')
+	export default {
+        props:{
+            defaultRegions:{
+                type:Array,
+                default(){
+                    return []
+                }
+            },
+            defaultRegionCode:{
+                type:String
+            },
+            defaultRegion:[String,Array]
+        },
+		data() {
+			return {
+                cityArr:CHINA_REGIONS[0].childs,
+                districtArr:CHINA_REGIONS[0].childs[0].childs,
+                multiIndex: [0, 0, 0],
+                isInitMultiArray:true,
+			}
+		},
+        watch:{
+            defaultRegion:{
+                handler(region,oldRegion){
+                    if(Array.isArray(region)){
+                        // 避免传的是字面量的时候重复触发
+                        oldRegion = oldRegion || []
+                        if(region.join('')!==oldRegion.join('')){
+                            this.handleDefaultRegion(region)
+                        }
+                    }else if(region&&region.length == 6){
+                        this.handleDefaultRegion(region)
+                    }else{
+                        console.warn('defaultRegion非有效格式')
+                    }
+                },
+                immediate:true,
+            }
+        },
+        computed:{
+            multiArray(){
+                return this.pickedArr.map(arr=>arr.map(item=>item.name))
+            },
+            pickedArr(){
+                // 进行初始化
+                if(this.isInitMultiArray){
+                    return [
+                        CHINA_REGIONS,
+                        CHINA_REGIONS[0].childs,
+                        CHINA_REGIONS[0].childs[0].childs
+                    ]
+                }
+                return [CHINA_REGIONS,this.cityArr,this.districtArr];
+            }
+        },
+		methods: {
+            handleColumnChange(e){
+                // console.log(e);
+                this.isInitMultiArray = false;
+                const that = this;
+                let col = e.detail.column;
+                let row = e.detail.value;
+                that.multiIndex[col] = row;
+                try{
+                    switch(col){
+                        case 0:
+                            if(CHINA_REGIONS[that.multiIndex[0]].childs.length==0){
+                                that.cityArr = that.districtArr = [CHINA_REGIONS[that.multiIndex[0]]]
+                                break;
+                            }
+                            that.cityArr = CHINA_REGIONS[that.multiIndex[0]].childs
+                            that.districtArr = CHINA_REGIONS[that.multiIndex[0]].childs[that.multiIndex[1]].childs
+                            break;
+                        case 1:
+                            that.districtArr = CHINA_REGIONS[that.multiIndex[0]].childs[that.multiIndex[1]].childs
+                            break;
+                        case 2:
+                            break;
+                    }
+                }catch(e){
+                    // console.log(e);
+                    that.districtArr = CHINA_REGIONS[that.multiIndex[0]].childs[0].childs
+                }
+                
+            },
+            handleValueChange(e){
+                // 结构赋值
+                let [index0,index1,index2] = e.detail.value;
+                let [arr0,arr1,arr2] = this.pickedArr;
+                let address = [arr0[index0],arr1[index1],arr2[index2]];
+                // console.log(address);
+                this.$emit('getRegion',address)
+            },
+            handleDefaultRegion(region){
+                const isCode = !Array.isArray(region)
+                this.isInitMultiArray = false;
+                let children = CHINA_REGIONS
+                for(let i=0;i<3;i++){
+                    for(let j=0;j<children.length;j++){
+                       let condition = isCode?children[j].code==region.slice(0,(i+1)*2):children[j].name.includes(region[i]);
+                       if(condition){
+                           // 匹配成功进行赋值
+                           // console.log(i,j,children.length-1);
+                           children = children[j].childs;
+                           if(i==0){
+                               this.cityArr = children
+                           }else if(i==1){
+                               this.districtArr = children
+                           }
+                           this.$set(this.multiIndex,i,j)
+                           // console.log(this.multiIndex);
+                           break;
+                       }else{
+                           // 首次匹配失败就用默认的初始化
+                           // console.log(i,j,children.length-1);
+                           if(i==0 && j==(children.length-1)){
+                               this.isInitMultiArray = true;
+                           }
+                       }
+                    }
+                }
+            }
+		},
+	}
+</script>
diff --git a/pagesA/components/pick-regions/regions.json b/pagesA/components/pick-regions/regions.json
new file mode 100644
index 0000000..310abee
--- /dev/null
+++ b/pagesA/components/pick-regions/regions.json
@@ -0,0 +1 @@
+[{"code":"11","name":"北京市","childs":[{"code":"1101","name":"市辖区","childs":[{"code":"110101","name":"东城区"},{"code":"110102","name":"西城区"},{"code":"110105","name":"朝阳区"},{"code":"110106","name":"丰台区"},{"code":"110107","name":"石景山区"},{"code":"110108","name":"海淀区"},{"code":"110109","name":"门头沟区"},{"code":"110111","name":"房山区"},{"code":"110112","name":"通州区"},{"code":"110113","name":"顺义区"},{"code":"110114","name":"昌平区"},{"code":"110115","name":"大兴区"},{"code":"110116","name":"怀柔区"},{"code":"110117","name":"平谷区"},{"code":"110118","name":"密云区"},{"code":"110119","name":"延庆区"}]}]},{"code":"12","name":"天津市","childs":[{"code":"1201","name":"市辖区","childs":[{"code":"120101","name":"和平区"},{"code":"120102","name":"河东区"},{"code":"120103","name":"河西区"},{"code":"120104","name":"南开区"},{"code":"120105","name":"河北区"},{"code":"120106","name":"红桥区"},{"code":"120110","name":"东丽区"},{"code":"120111","name":"西青区"},{"code":"120112","name":"津南区"},{"code":"120113","name":"北辰区"},{"code":"120114","name":"武清区"},{"code":"120115","name":"宝坻区"},{"code":"120116","name":"滨海新区"},{"code":"120117","name":"宁河区"},{"code":"120118","name":"静海区"},{"code":"120119","name":"蓟州区"}]}]},{"code":"13","name":"河北省","childs":[{"code":"1301","name":"石家庄市","childs":[{"code":"130102","name":"长安区"},{"code":"130104","name":"桥西区"},{"code":"130105","name":"新华区"},{"code":"130107","name":"井陉矿区"},{"code":"130108","name":"裕华区"},{"code":"130109","name":"藁城区"},{"code":"130110","name":"鹿泉区"},{"code":"130111","name":"栾城区"},{"code":"130121","name":"井陉县"},{"code":"130123","name":"正定县"},{"code":"130125","name":"行唐县"},{"code":"130126","name":"灵寿县"},{"code":"130127","name":"高邑县"},{"code":"130128","name":"深泽县"},{"code":"130129","name":"赞皇县"},{"code":"130130","name":"无极县"},{"code":"130131","name":"平山县"},{"code":"130132","name":"元氏县"},{"code":"130133","name":"赵县"},{"code":"130183","name":"晋州市"},{"code":"130184","name":"新乐市"}]},{"code":"1302","name":"唐山市","childs":[{"code":"130202","name":"路南区"},{"code":"130203","name":"路北区"},{"code":"130204","name":"古冶区"},{"code":"130205","name":"开平区"},{"code":"130207","name":"丰南区"},{"code":"130208","name":"丰润区"},{"code":"130209","name":"曹妃甸区"},{"code":"130223","name":"滦县"},{"code":"130224","name":"滦南县"},{"code":"130225","name":"乐亭县"},{"code":"130227","name":"迁西县"},{"code":"130229","name":"玉田县"},{"code":"130281","name":"遵化市"},{"code":"130283","name":"迁安市"}]},{"code":"1303","name":"秦皇岛市","childs":[{"code":"130302","name":"海港区"},{"code":"130303","name":"山海关区"},{"code":"130304","name":"北戴河区"},{"code":"130306","name":"抚宁区"},{"code":"130321","name":"青龙满族自治县"},{"code":"130322","name":"昌黎县"},{"code":"130324","name":"卢龙县"}]},{"code":"1304","name":"邯郸市","childs":[{"code":"130402","name":"邯山区"},{"code":"130403","name":"丛台区"},{"code":"130404","name":"复兴区"},{"code":"130406","name":"峰峰矿区"},{"code":"130421","name":"邯郸县"},{"code":"130423","name":"临漳县"},{"code":"130424","name":"成安县"},{"code":"130425","name":"大名县"},{"code":"130426","name":"涉县"},{"code":"130427","name":"磁县"},{"code":"130428","name":"肥乡县"},{"code":"130429","name":"永年县"},{"code":"130430","name":"邱县"},{"code":"130431","name":"鸡泽县"},{"code":"130432","name":"广平县"},{"code":"130433","name":"馆陶县"},{"code":"130434","name":"魏县"},{"code":"130435","name":"曲周县"},{"code":"130481","name":"武安市"}]},{"code":"1305","name":"邢台市","childs":[{"code":"130502","name":"桥东区"},{"code":"130503","name":"桥西区"},{"code":"130521","name":"邢台县"},{"code":"130522","name":"临城县"},{"code":"130523","name":"内丘县"},{"code":"130524","name":"柏乡县"},{"code":"130525","name":"隆尧县"},{"code":"130526","name":"任县"},{"code":"130527","name":"南和县"},{"code":"130528","name":"宁晋县"},{"code":"130529","name":"巨鹿县"},{"code":"130530","name":"新河县"},{"code":"130531","name":"广宗县"},{"code":"130532","name":"平乡县"},{"code":"130533","name":"威县"},{"code":"130534","name":"清河县"},{"code":"130535","name":"临西县"},{"code":"130581","name":"南宫市"},{"code":"130582","name":"沙河市"}]},{"code":"1306","name":"保定市","childs":[{"code":"130602","name":"竞秀区"},{"code":"130606","name":"莲池区"},{"code":"130607","name":"满城区"},{"code":"130608","name":"清苑区"},{"code":"130609","name":"徐水区"},{"code":"130623","name":"涞水县"},{"code":"130624","name":"阜平县"},{"code":"130626","name":"定兴县"},{"code":"130627","name":"唐县"},{"code":"130628","name":"高阳县"},{"code":"130629","name":"容城县"},{"code":"130630","name":"涞源县"},{"code":"130631","name":"望都县"},{"code":"130632","name":"安新县"},{"code":"130633","name":"易县"},{"code":"130634","name":"曲阳县"},{"code":"130635","name":"蠡县"},{"code":"130636","name":"顺平县"},{"code":"130637","name":"博野县"},{"code":"130638","name":"雄县"},{"code":"130681","name":"涿州市"},{"code":"130683","name":"安国市"},{"code":"130684","name":"高碑店市"}]},{"code":"1307","name":"张家口市","childs":[{"code":"130702","name":"桥东区"},{"code":"130703","name":"桥西区"},{"code":"130705","name":"宣化区"},{"code":"130706","name":"下花园区"},{"code":"130708","name":"万全区"},{"code":"130709","name":"崇礼区"},{"code":"130722","name":"张北县"},{"code":"130723","name":"康保县"},{"code":"130724","name":"沽源县"},{"code":"130725","name":"尚义县"},{"code":"130726","name":"蔚县"},{"code":"130727","name":"阳原县"},{"code":"130728","name":"怀安县"},{"code":"130730","name":"怀来县"},{"code":"130731","name":"涿鹿县"},{"code":"130732","name":"赤城县"}]},{"code":"1308","name":"承德市","childs":[{"code":"130802","name":"双桥区"},{"code":"130803","name":"双滦区"},{"code":"130804","name":"鹰手营子矿区"},{"code":"130821","name":"承德县"},{"code":"130822","name":"兴隆县"},{"code":"130823","name":"平泉县"},{"code":"130824","name":"滦平县"},{"code":"130825","name":"隆化县"},{"code":"130826","name":"丰宁满族自治县"},{"code":"130827","name":"宽城满族自治县"},{"code":"130828","name":"围场满族蒙古族自治县"}]},{"code":"1309","name":"沧州市","childs":[{"code":"130902","name":"新华区"},{"code":"130903","name":"运河区"},{"code":"130921","name":"沧县"},{"code":"130922","name":"青县"},{"code":"130923","name":"东光县"},{"code":"130924","name":"海兴县"},{"code":"130925","name":"盐山县"},{"code":"130926","name":"肃宁县"},{"code":"130927","name":"南皮县"},{"code":"130928","name":"吴桥县"},{"code":"130929","name":"献县"},{"code":"130930","name":"孟村回族自治县"},{"code":"130981","name":"泊头市"},{"code":"130982","name":"任丘市"},{"code":"130983","name":"黄骅市"},{"code":"130984","name":"河间市"}]},{"code":"1310","name":"廊坊市","childs":[{"code":"131002","name":"安次区"},{"code":"131003","name":"广阳区"},{"code":"131022","name":"固安县"},{"code":"131023","name":"永清县"},{"code":"131024","name":"香河县"},{"code":"131025","name":"大城县"},{"code":"131026","name":"文安县"},{"code":"131028","name":"大厂回族自治县"},{"code":"131081","name":"霸州市"},{"code":"131082","name":"三河市"}]},{"code":"1311","name":"衡水市","childs":[{"code":"131102","name":"桃城区"},{"code":"131103","name":"冀州区"},{"code":"131121","name":"枣强县"},{"code":"131122","name":"武邑县"},{"code":"131123","name":"武强县"},{"code":"131124","name":"饶阳县"},{"code":"131125","name":"安平县"},{"code":"131126","name":"故城县"},{"code":"131127","name":"景县"},{"code":"131128","name":"阜城县"},{"code":"131182","name":"深州市"}]},{"code":"1390","name":"省直辖县级行政区划","childs":[{"code":"139001","name":"定州市"},{"code":"139002","name":"辛集市"}]}]},{"code":"14","name":"山西省","childs":[{"code":"1401","name":"太原市","childs":[{"code":"140105","name":"小店区"},{"code":"140106","name":"迎泽区"},{"code":"140107","name":"杏花岭区"},{"code":"140108","name":"尖草坪区"},{"code":"140109","name":"万柏林区"},{"code":"140110","name":"晋源区"},{"code":"140121","name":"清徐县"},{"code":"140122","name":"阳曲县"},{"code":"140123","name":"娄烦县"},{"code":"140181","name":"古交市"}]},{"code":"1402","name":"大同市","childs":[{"code":"140202","name":"城区"},{"code":"140203","name":"矿区"},{"code":"140211","name":"南郊区"},{"code":"140212","name":"新荣区"},{"code":"140221","name":"阳高县"},{"code":"140222","name":"天镇县"},{"code":"140223","name":"广灵县"},{"code":"140224","name":"灵丘县"},{"code":"140225","name":"浑源县"},{"code":"140226","name":"左云县"},{"code":"140227","name":"大同县"}]},{"code":"1403","name":"阳泉市","childs":[{"code":"140302","name":"城区"},{"code":"140303","name":"矿区"},{"code":"140311","name":"郊区"},{"code":"140321","name":"平定县"},{"code":"140322","name":"盂县"}]},{"code":"1404","name":"长治市","childs":[{"code":"140402","name":"城区"},{"code":"140411","name":"郊区"},{"code":"140421","name":"长治县"},{"code":"140423","name":"襄垣县"},{"code":"140424","name":"屯留县"},{"code":"140425","name":"平顺县"},{"code":"140426","name":"黎城县"},{"code":"140427","name":"壶关县"},{"code":"140428","name":"长子县"},{"code":"140429","name":"武乡县"},{"code":"140430","name":"沁县"},{"code":"140431","name":"沁源县"},{"code":"140481","name":"潞城市"}]},{"code":"1405","name":"晋城市","childs":[{"code":"140502","name":"城区"},{"code":"140521","name":"沁水县"},{"code":"140522","name":"阳城县"},{"code":"140524","name":"陵川县"},{"code":"140525","name":"泽州县"},{"code":"140581","name":"高平市"}]},{"code":"1406","name":"朔州市","childs":[{"code":"140602","name":"朔城区"},{"code":"140603","name":"平鲁区"},{"code":"140621","name":"山阴县"},{"code":"140622","name":"应县"},{"code":"140623","name":"右玉县"},{"code":"140624","name":"怀仁县"}]},{"code":"1407","name":"晋中市","childs":[{"code":"140702","name":"榆次区"},{"code":"140721","name":"榆社县"},{"code":"140722","name":"左权县"},{"code":"140723","name":"和顺县"},{"code":"140724","name":"昔阳县"},{"code":"140725","name":"寿阳县"},{"code":"140726","name":"太谷县"},{"code":"140727","name":"祁县"},{"code":"140728","name":"平遥县"},{"code":"140729","name":"灵石县"},{"code":"140781","name":"介休市"}]},{"code":"1408","name":"运城市","childs":[{"code":"140802","name":"盐湖区"},{"code":"140821","name":"临猗县"},{"code":"140822","name":"万荣县"},{"code":"140823","name":"闻喜县"},{"code":"140824","name":"稷山县"},{"code":"140825","name":"新绛县"},{"code":"140826","name":"绛县"},{"code":"140827","name":"垣曲县"},{"code":"140828","name":"夏县"},{"code":"140829","name":"平陆县"},{"code":"140830","name":"芮城县"},{"code":"140881","name":"永济市"},{"code":"140882","name":"河津市"}]},{"code":"1409","name":"忻州市","childs":[{"code":"140902","name":"忻府区"},{"code":"140921","name":"定襄县"},{"code":"140922","name":"五台县"},{"code":"140923","name":"代县"},{"code":"140924","name":"繁峙县"},{"code":"140925","name":"宁武县"},{"code":"140926","name":"静乐县"},{"code":"140927","name":"神池县"},{"code":"140928","name":"五寨县"},{"code":"140929","name":"岢岚县"},{"code":"140930","name":"河曲县"},{"code":"140931","name":"保德县"},{"code":"140932","name":"偏关县"},{"code":"140981","name":"原平市"}]},{"code":"1410","name":"临汾市","childs":[{"code":"141002","name":"尧都区"},{"code":"141021","name":"曲沃县"},{"code":"141022","name":"翼城县"},{"code":"141023","name":"襄汾县"},{"code":"141024","name":"洪洞县"},{"code":"141025","name":"古县"},{"code":"141026","name":"安泽县"},{"code":"141027","name":"浮山县"},{"code":"141028","name":"吉县"},{"code":"141029","name":"乡宁县"},{"code":"141030","name":"大宁县"},{"code":"141031","name":"隰县"},{"code":"141032","name":"永和县"},{"code":"141033","name":"蒲县"},{"code":"141034","name":"汾西县"},{"code":"141081","name":"侯马市"},{"code":"141082","name":"霍州市"}]},{"code":"1411","name":"吕梁市","childs":[{"code":"141102","name":"离石区"},{"code":"141121","name":"文水县"},{"code":"141122","name":"交城县"},{"code":"141123","name":"兴县"},{"code":"141124","name":"临县"},{"code":"141125","name":"柳林县"},{"code":"141126","name":"石楼县"},{"code":"141127","name":"岚县"},{"code":"141128","name":"方山县"},{"code":"141129","name":"中阳县"},{"code":"141130","name":"交口县"},{"code":"141181","name":"孝义市"},{"code":"141182","name":"汾阳市"}]}]},{"code":"15","name":"内蒙古自治区","childs":[{"code":"1501","name":"呼和浩特市","childs":[{"code":"150102","name":"新城区"},{"code":"150103","name":"回民区"},{"code":"150104","name":"玉泉区"},{"code":"150105","name":"赛罕区"},{"code":"150121","name":"土默特左旗"},{"code":"150122","name":"托克托县"},{"code":"150123","name":"和林格尔县"},{"code":"150124","name":"清水河县"},{"code":"150125","name":"武川县"}]},{"code":"1502","name":"包头市","childs":[{"code":"150202","name":"东河区"},{"code":"150203","name":"昆都仑区"},{"code":"150204","name":"青山区"},{"code":"150205","name":"石拐区"},{"code":"150206","name":"白云鄂博矿区"},{"code":"150207","name":"九原区"},{"code":"150221","name":"土默特右旗"},{"code":"150222","name":"固阳县"},{"code":"150223","name":"达尔罕茂明安联合旗"}]},{"code":"1503","name":"乌海市","childs":[{"code":"150302","name":"海勃湾区"},{"code":"150303","name":"海南区"},{"code":"150304","name":"乌达区"}]},{"code":"1504","name":"赤峰市","childs":[{"code":"150402","name":"红山区"},{"code":"150403","name":"元宝山区"},{"code":"150404","name":"松山区"},{"code":"150421","name":"阿鲁科尔沁旗"},{"code":"150422","name":"巴林左旗"},{"code":"150423","name":"巴林右旗"},{"code":"150424","name":"林西县"},{"code":"150425","name":"克什克腾旗"},{"code":"150426","name":"翁牛特旗"},{"code":"150428","name":"喀喇沁旗"},{"code":"150429","name":"宁城县"},{"code":"150430","name":"敖汉旗"}]},{"code":"1505","name":"通辽市","childs":[{"code":"150502","name":"科尔沁区"},{"code":"150521","name":"科尔沁左翼中旗"},{"code":"150522","name":"科尔沁左翼后旗"},{"code":"150523","name":"开鲁县"},{"code":"150524","name":"库伦旗"},{"code":"150525","name":"奈曼旗"},{"code":"150526","name":"扎鲁特旗"},{"code":"150581","name":"霍林郭勒市"}]},{"code":"1506","name":"鄂尔多斯市","childs":[{"code":"150602","name":"东胜区"},{"code":"150603","name":"康巴什区"},{"code":"150621","name":"达拉特旗"},{"code":"150622","name":"准格尔旗"},{"code":"150623","name":"鄂托克前旗"},{"code":"150624","name":"鄂托克旗"},{"code":"150625","name":"杭锦旗"},{"code":"150626","name":"乌审旗"},{"code":"150627","name":"伊金霍洛旗"}]},{"code":"1507","name":"呼伦贝尔市","childs":[{"code":"150702","name":"海拉尔区"},{"code":"150703","name":"扎赉诺尔区"},{"code":"150721","name":"阿荣旗"},{"code":"150722","name":"莫力达瓦达斡尔族自治旗"},{"code":"150723","name":"鄂伦春自治旗"},{"code":"150724","name":"鄂温克族自治旗"},{"code":"150725","name":"陈巴尔虎旗"},{"code":"150726","name":"新巴尔虎左旗"},{"code":"150727","name":"新巴尔虎右旗"},{"code":"150781","name":"满洲里市"},{"code":"150782","name":"牙克石市"},{"code":"150783","name":"扎兰屯市"},{"code":"150784","name":"额尔古纳市"},{"code":"150785","name":"根河市"}]},{"code":"1508","name":"巴彦淖尔市","childs":[{"code":"150802","name":"临河区"},{"code":"150821","name":"五原县"},{"code":"150822","name":"磴口县"},{"code":"150823","name":"乌拉特前旗"},{"code":"150824","name":"乌拉特中旗"},{"code":"150825","name":"乌拉特后旗"},{"code":"150826","name":"杭锦后旗"}]},{"code":"1509","name":"乌兰察布市","childs":[{"code":"150902","name":"集宁区"},{"code":"150921","name":"卓资县"},{"code":"150922","name":"化德县"},{"code":"150923","name":"商都县"},{"code":"150924","name":"兴和县"},{"code":"150925","name":"凉城县"},{"code":"150926","name":"察哈尔右翼前旗"},{"code":"150927","name":"察哈尔右翼中旗"},{"code":"150928","name":"察哈尔右翼后旗"},{"code":"150929","name":"四子王旗"},{"code":"150981","name":"丰镇市"}]},{"code":"1522","name":"兴安盟","childs":[{"code":"152201","name":"乌兰浩特市"},{"code":"152202","name":"阿尔山市"},{"code":"152221","name":"科尔沁右翼前旗"},{"code":"152222","name":"科尔沁右翼中旗"},{"code":"152223","name":"扎赉特旗"},{"code":"152224","name":"突泉县"}]},{"code":"1525","name":"锡林郭勒盟","childs":[{"code":"152501","name":"二连浩特市"},{"code":"152502","name":"锡林浩特市"},{"code":"152522","name":"阿巴嘎旗"},{"code":"152523","name":"苏尼特左旗"},{"code":"152524","name":"苏尼特右旗"},{"code":"152525","name":"东乌珠穆沁旗"},{"code":"152526","name":"西乌珠穆沁旗"},{"code":"152527","name":"太仆寺旗"},{"code":"152528","name":"镶黄旗"},{"code":"152529","name":"正镶白旗"},{"code":"152530","name":"正蓝旗"},{"code":"152531","name":"多伦县"}]},{"code":"1529","name":"阿拉善盟","childs":[{"code":"152921","name":"阿拉善左旗"},{"code":"152922","name":"阿拉善右旗"},{"code":"152923","name":"额济纳旗"}]}]},{"code":"21","name":"辽宁省","childs":[{"code":"2101","name":"沈阳市","childs":[{"code":"210102","name":"和平区"},{"code":"210103","name":"沈河区"},{"code":"210104","name":"大东区"},{"code":"210105","name":"皇姑区"},{"code":"210106","name":"铁西区"},{"code":"210111","name":"苏家屯区"},{"code":"210112","name":"浑南区"},{"code":"210113","name":"沈北新区"},{"code":"210114","name":"于洪区"},{"code":"210115","name":"辽中区"},{"code":"210123","name":"康平县"},{"code":"210124","name":"法库县"},{"code":"210181","name":"新民市"}]},{"code":"2102","name":"大连市","childs":[{"code":"210202","name":"中山区"},{"code":"210203","name":"西岗区"},{"code":"210204","name":"沙河口区"},{"code":"210211","name":"甘井子区"},{"code":"210212","name":"旅顺口区"},{"code":"210213","name":"金州区"},{"code":"210214","name":"普兰店区"},{"code":"210224","name":"长海县"},{"code":"210281","name":"瓦房店市"},{"code":"210283","name":"庄河市"}]},{"code":"2103","name":"鞍山市","childs":[{"code":"210302","name":"铁东区"},{"code":"210303","name":"铁西区"},{"code":"210304","name":"立山区"},{"code":"210311","name":"千山区"},{"code":"210321","name":"台安县"},{"code":"210323","name":"岫岩满族自治县"},{"code":"210381","name":"海城市"}]},{"code":"2104","name":"抚顺市","childs":[{"code":"210402","name":"新抚区"},{"code":"210403","name":"东洲区"},{"code":"210404","name":"望花区"},{"code":"210411","name":"顺城区"},{"code":"210421","name":"抚顺县"},{"code":"210422","name":"新宾满族自治县"},{"code":"210423","name":"清原满族自治县"}]},{"code":"2105","name":"本溪市","childs":[{"code":"210502","name":"平山区"},{"code":"210503","name":"溪湖区"},{"code":"210504","name":"明山区"},{"code":"210505","name":"南芬区"},{"code":"210521","name":"本溪满族自治县"},{"code":"210522","name":"桓仁满族自治县"}]},{"code":"2106","name":"丹东市","childs":[{"code":"210602","name":"元宝区"},{"code":"210603","name":"振兴区"},{"code":"210604","name":"振安区"},{"code":"210624","name":"宽甸满族自治县"},{"code":"210681","name":"东港市"},{"code":"210682","name":"凤城市"}]},{"code":"2107","name":"锦州市","childs":[{"code":"210702","name":"古塔区"},{"code":"210703","name":"凌河区"},{"code":"210711","name":"太和区"},{"code":"210726","name":"黑山县"},{"code":"210727","name":"义县"},{"code":"210781","name":"凌海市"},{"code":"210782","name":"北镇市"}]},{"code":"2108","name":"营口市","childs":[{"code":"210802","name":"站前区"},{"code":"210803","name":"西市区"},{"code":"210804","name":"鲅鱼圈区"},{"code":"210811","name":"老边区"},{"code":"210881","name":"盖州市"},{"code":"210882","name":"大石桥市"}]},{"code":"2109","name":"阜新市","childs":[{"code":"210902","name":"海州区"},{"code":"210903","name":"新邱区"},{"code":"210904","name":"太平区"},{"code":"210905","name":"清河门区"},{"code":"210911","name":"细河区"},{"code":"210921","name":"阜新蒙古族自治县"},{"code":"210922","name":"彰武县"}]},{"code":"2110","name":"辽阳市","childs":[{"code":"211002","name":"白塔区"},{"code":"211003","name":"文圣区"},{"code":"211004","name":"宏伟区"},{"code":"211005","name":"弓长岭区"},{"code":"211011","name":"太子河区"},{"code":"211021","name":"辽阳县"},{"code":"211081","name":"灯塔市"}]},{"code":"2111","name":"盘锦市","childs":[{"code":"211102","name":"双台子区"},{"code":"211103","name":"兴隆台区"},{"code":"211104","name":"大洼区"},{"code":"211122","name":"盘山县"}]},{"code":"2112","name":"铁岭市","childs":[{"code":"211202","name":"银州区"},{"code":"211204","name":"清河区"},{"code":"211221","name":"铁岭县"},{"code":"211223","name":"西丰县"},{"code":"211224","name":"昌图县"},{"code":"211281","name":"调兵山市"},{"code":"211282","name":"开原市"}]},{"code":"2113","name":"朝阳市","childs":[{"code":"211302","name":"双塔区"},{"code":"211303","name":"龙城区"},{"code":"211321","name":"朝阳县"},{"code":"211322","name":"建平县"},{"code":"211324","name":"喀喇沁左翼蒙古族自治县"},{"code":"211381","name":"北票市"},{"code":"211382","name":"凌源市"}]},{"code":"2114","name":"葫芦岛市","childs":[{"code":"211402","name":"连山区"},{"code":"211403","name":"龙港区"},{"code":"211404","name":"南票区"},{"code":"211421","name":"绥中县"},{"code":"211422","name":"建昌县"},{"code":"211481","name":"兴城市"}]}]},{"code":"22","name":"吉林省","childs":[{"code":"2201","name":"长春市","childs":[{"code":"220102","name":"南关区"},{"code":"220103","name":"宽城区"},{"code":"220104","name":"朝阳区"},{"code":"220105","name":"二道区"},{"code":"220106","name":"绿园区"},{"code":"220112","name":"双阳区"},{"code":"220113","name":"九台区"},{"code":"220122","name":"农安县"},{"code":"220182","name":"榆树市"},{"code":"220183","name":"德惠市"}]},{"code":"2202","name":"吉林市","childs":[{"code":"220202","name":"昌邑区"},{"code":"220203","name":"龙潭区"},{"code":"220204","name":"船营区"},{"code":"220211","name":"丰满区"},{"code":"220221","name":"永吉县"},{"code":"220281","name":"蛟河市"},{"code":"220282","name":"桦甸市"},{"code":"220283","name":"舒兰市"},{"code":"220284","name":"磐石市"}]},{"code":"2203","name":"四平市","childs":[{"code":"220302","name":"铁西区"},{"code":"220303","name":"铁东区"},{"code":"220322","name":"梨树县"},{"code":"220323","name":"伊通满族自治县"},{"code":"220381","name":"公主岭市"},{"code":"220382","name":"双辽市"}]},{"code":"2204","name":"辽源市","childs":[{"code":"220402","name":"龙山区"},{"code":"220403","name":"西安区"},{"code":"220421","name":"东丰县"},{"code":"220422","name":"东辽县"}]},{"code":"2205","name":"通化市","childs":[{"code":"220502","name":"东昌区"},{"code":"220503","name":"二道江区"},{"code":"220521","name":"通化县"},{"code":"220523","name":"辉南县"},{"code":"220524","name":"柳河县"},{"code":"220581","name":"梅河口市"},{"code":"220582","name":"集安市"}]},{"code":"2206","name":"白山市","childs":[{"code":"220602","name":"浑江区"},{"code":"220605","name":"江源区"},{"code":"220621","name":"抚松县"},{"code":"220622","name":"靖宇县"},{"code":"220623","name":"长白朝鲜族自治县"},{"code":"220681","name":"临江市"}]},{"code":"2207","name":"松原市","childs":[{"code":"220702","name":"宁江区"},{"code":"220721","name":"前郭尔罗斯蒙古族自治县"},{"code":"220722","name":"长岭县"},{"code":"220723","name":"乾安县"},{"code":"220781","name":"扶余市"}]},{"code":"2208","name":"白城市","childs":[{"code":"220802","name":"洮北区"},{"code":"220821","name":"镇赉县"},{"code":"220822","name":"通榆县"},{"code":"220881","name":"洮南市"},{"code":"220882","name":"大安市"}]},{"code":"2224","name":"延边朝鲜族自治州","childs":[{"code":"222401","name":"延吉市"},{"code":"222402","name":"图们市"},{"code":"222403","name":"敦化市"},{"code":"222404","name":"珲春市"},{"code":"222405","name":"龙井市"},{"code":"222406","name":"和龙市"},{"code":"222424","name":"汪清县"},{"code":"222426","name":"安图县"}]}]},{"code":"23","name":"黑龙江省","childs":[{"code":"2301","name":"哈尔滨市","childs":[{"code":"230102","name":"道里区"},{"code":"230103","name":"南岗区"},{"code":"230104","name":"道外区"},{"code":"230108","name":"平房区"},{"code":"230109","name":"松北区"},{"code":"230110","name":"香坊区"},{"code":"230111","name":"呼兰区"},{"code":"230112","name":"阿城区"},{"code":"230113","name":"双城区"},{"code":"230123","name":"依兰县"},{"code":"230124","name":"方正县"},{"code":"230125","name":"宾县"},{"code":"230126","name":"巴彦县"},{"code":"230127","name":"木兰县"},{"code":"230128","name":"通河县"},{"code":"230129","name":"延寿县"},{"code":"230183","name":"尚志市"},{"code":"230184","name":"五常市"}]},{"code":"2302","name":"齐齐哈尔市","childs":[{"code":"230202","name":"龙沙区"},{"code":"230203","name":"建华区"},{"code":"230204","name":"铁锋区"},{"code":"230205","name":"昂昂溪区"},{"code":"230206","name":"富拉尔基区"},{"code":"230207","name":"碾子山区"},{"code":"230208","name":"梅里斯达斡尔族区"},{"code":"230221","name":"龙江县"},{"code":"230223","name":"依安县"},{"code":"230224","name":"泰来县"},{"code":"230225","name":"甘南县"},{"code":"230227","name":"富裕县"},{"code":"230229","name":"克山县"},{"code":"230230","name":"克东县"},{"code":"230231","name":"拜泉县"},{"code":"230281","name":"讷河市"}]},{"code":"2303","name":"鸡西市","childs":[{"code":"230302","name":"鸡冠区"},{"code":"230303","name":"恒山区"},{"code":"230304","name":"滴道区"},{"code":"230305","name":"梨树区"},{"code":"230306","name":"城子河区"},{"code":"230307","name":"麻山区"},{"code":"230321","name":"鸡东县"},{"code":"230381","name":"虎林市"},{"code":"230382","name":"密山市"}]},{"code":"2304","name":"鹤岗市","childs":[{"code":"230402","name":"向阳区"},{"code":"230403","name":"工农区"},{"code":"230404","name":"南山区"},{"code":"230405","name":"兴安区"},{"code":"230406","name":"东山区"},{"code":"230407","name":"兴山区"},{"code":"230421","name":"萝北县"},{"code":"230422","name":"绥滨县"}]},{"code":"2305","name":"双鸭山市","childs":[{"code":"230502","name":"尖山区"},{"code":"230503","name":"岭东区"},{"code":"230505","name":"四方台区"},{"code":"230506","name":"宝山区"},{"code":"230521","name":"集贤县"},{"code":"230522","name":"友谊县"},{"code":"230523","name":"宝清县"},{"code":"230524","name":"饶河县"}]},{"code":"2306","name":"大庆市","childs":[{"code":"230602","name":"萨尔图区"},{"code":"230603","name":"龙凤区"},{"code":"230604","name":"让胡路区"},{"code":"230605","name":"红岗区"},{"code":"230606","name":"大同区"},{"code":"230621","name":"肇州县"},{"code":"230622","name":"肇源县"},{"code":"230623","name":"林甸县"},{"code":"230624","name":"杜尔伯特蒙古族自治县"}]},{"code":"2307","name":"伊春市","childs":[{"code":"230702","name":"伊春区"},{"code":"230703","name":"南岔区"},{"code":"230704","name":"友好区"},{"code":"230705","name":"西林区"},{"code":"230706","name":"翠峦区"},{"code":"230707","name":"新青区"},{"code":"230708","name":"美溪区"},{"code":"230709","name":"金山屯区"},{"code":"230710","name":"五营区"},{"code":"230711","name":"乌马河区"},{"code":"230712","name":"汤旺河区"},{"code":"230713","name":"带岭区"},{"code":"230714","name":"乌伊岭区"},{"code":"230715","name":"红星区"},{"code":"230716","name":"上甘岭区"},{"code":"230722","name":"嘉荫县"},{"code":"230781","name":"铁力市"}]},{"code":"2308","name":"佳木斯市","childs":[{"code":"230803","name":"向阳区"},{"code":"230804","name":"前进区"},{"code":"230805","name":"东风区"},{"code":"230811","name":"郊区"},{"code":"230822","name":"桦南县"},{"code":"230826","name":"桦川县"},{"code":"230828","name":"汤原县"},{"code":"230881","name":"同江市"},{"code":"230882","name":"富锦市"},{"code":"230883","name":"抚远市"}]},{"code":"2309","name":"七台河市","childs":[{"code":"230902","name":"新兴区"},{"code":"230903","name":"桃山区"},{"code":"230904","name":"茄子河区"},{"code":"230921","name":"勃利县"}]},{"code":"2310","name":"牡丹江市","childs":[{"code":"231002","name":"东安区"},{"code":"231003","name":"阳明区"},{"code":"231004","name":"爱民区"},{"code":"231005","name":"西安区"},{"code":"231025","name":"林口县"},{"code":"231081","name":"绥芬河市"},{"code":"231083","name":"海林市"},{"code":"231084","name":"宁安市"},{"code":"231085","name":"穆棱市"},{"code":"231086","name":"东宁市"}]},{"code":"2311","name":"黑河市","childs":[{"code":"231102","name":"爱辉区"},{"code":"231121","name":"嫩江县"},{"code":"231123","name":"逊克县"},{"code":"231124","name":"孙吴县"},{"code":"231181","name":"北安市"},{"code":"231182","name":"五大连池市"}]},{"code":"2312","name":"绥化市","childs":[{"code":"231202","name":"北林区"},{"code":"231221","name":"望奎县"},{"code":"231222","name":"兰西县"},{"code":"231223","name":"青冈县"},{"code":"231224","name":"庆安县"},{"code":"231225","name":"明水县"},{"code":"231226","name":"绥棱县"},{"code":"231281","name":"安达市"},{"code":"231282","name":"肇东市"},{"code":"231283","name":"海伦市"}]},{"code":"2327","name":"大兴安岭地区","childs":[{"code":"232721","name":"呼玛县"},{"code":"232722","name":"塔河县"},{"code":"232723","name":"漠河县"}]}]},{"code":"31","name":"上海市","childs":[{"code":"3101","name":"市辖区","childs":[{"code":"310101","name":"黄浦区"},{"code":"310104","name":"徐汇区"},{"code":"310105","name":"长宁区"},{"code":"310106","name":"静安区"},{"code":"310107","name":"普陀区"},{"code":"310109","name":"虹口区"},{"code":"310110","name":"杨浦区"},{"code":"310112","name":"闵行区"},{"code":"310113","name":"宝山区"},{"code":"310114","name":"嘉定区"},{"code":"310115","name":"浦东新区"},{"code":"310116","name":"金山区"},{"code":"310117","name":"松江区"},{"code":"310118","name":"青浦区"},{"code":"310120","name":"奉贤区"},{"code":"310151","name":"崇明区"}]}]},{"code":"32","name":"江苏省","childs":[{"code":"3201","name":"南京市","childs":[{"code":"320102","name":"玄武区"},{"code":"320104","name":"秦淮区"},{"code":"320105","name":"建邺区"},{"code":"320106","name":"鼓楼区"},{"code":"320111","name":"浦口区"},{"code":"320113","name":"栖霞区"},{"code":"320114","name":"雨花台区"},{"code":"320115","name":"江宁区"},{"code":"320116","name":"六合区"},{"code":"320117","name":"溧水区"},{"code":"320118","name":"高淳区"}]},{"code":"3202","name":"无锡市","childs":[{"code":"320205","name":"锡山区"},{"code":"320206","name":"惠山区"},{"code":"320211","name":"滨湖区"},{"code":"320213","name":"梁溪区"},{"code":"320214","name":"新吴区"},{"code":"320281","name":"江阴市"},{"code":"320282","name":"宜兴市"}]},{"code":"3203","name":"徐州市","childs":[{"code":"320302","name":"鼓楼区"},{"code":"320303","name":"云龙区"},{"code":"320305","name":"贾汪区"},{"code":"320311","name":"泉山区"},{"code":"320312","name":"铜山区"},{"code":"320321","name":"丰县"},{"code":"320322","name":"沛县"},{"code":"320324","name":"睢宁县"},{"code":"320381","name":"新沂市"},{"code":"320382","name":"邳州市"}]},{"code":"3204","name":"常州市","childs":[{"code":"320402","name":"天宁区"},{"code":"320404","name":"钟楼区"},{"code":"320411","name":"新北区"},{"code":"320412","name":"武进区"},{"code":"320413","name":"金坛区"},{"code":"320481","name":"溧阳市"}]},{"code":"3205","name":"苏州市","childs":[{"code":"320505","name":"虎丘区"},{"code":"320506","name":"吴中区"},{"code":"320507","name":"相城区"},{"code":"320508","name":"姑苏区"},{"code":"320509","name":"吴江区"},{"code":"320581","name":"常熟市"},{"code":"320582","name":"张家港市"},{"code":"320583","name":"昆山市"},{"code":"320585","name":"太仓市"}]},{"code":"3206","name":"南通市","childs":[{"code":"320602","name":"崇川区"},{"code":"320611","name":"港闸区"},{"code":"320612","name":"通州区"},{"code":"320621","name":"海安县"},{"code":"320623","name":"如东县"},{"code":"320681","name":"启东市"},{"code":"320682","name":"如皋市"},{"code":"320684","name":"海门市"}]},{"code":"3207","name":"连云港市","childs":[{"code":"320703","name":"连云区"},{"code":"320706","name":"海州区"},{"code":"320707","name":"赣榆区"},{"code":"320722","name":"东海县"},{"code":"320723","name":"灌云县"},{"code":"320724","name":"灌南县"}]},{"code":"3208","name":"淮安市","childs":[{"code":"320803","name":"淮安区"},{"code":"320804","name":"淮阴区"},{"code":"320812","name":"清江浦区"},{"code":"320813","name":"洪泽区"},{"code":"320826","name":"涟水县"},{"code":"320830","name":"盱眙县"},{"code":"320831","name":"金湖县"}]},{"code":"3209","name":"盐城市","childs":[{"code":"320902","name":"亭湖区"},{"code":"320903","name":"盐都区"},{"code":"320904","name":"大丰区"},{"code":"320921","name":"响水县"},{"code":"320922","name":"滨海县"},{"code":"320923","name":"阜宁县"},{"code":"320924","name":"射阳县"},{"code":"320925","name":"建湖县"},{"code":"320981","name":"东台市"}]},{"code":"3210","name":"扬州市","childs":[{"code":"321002","name":"广陵区"},{"code":"321003","name":"邗江区"},{"code":"321012","name":"江都区"},{"code":"321023","name":"宝应县"},{"code":"321081","name":"仪征市"},{"code":"321084","name":"高邮市"}]},{"code":"3211","name":"镇江市","childs":[{"code":"321102","name":"京口区"},{"code":"321111","name":"润州区"},{"code":"321112","name":"丹徒区"},{"code":"321181","name":"丹阳市"},{"code":"321182","name":"扬中市"},{"code":"321183","name":"句容市"}]},{"code":"3212","name":"泰州市","childs":[{"code":"321202","name":"海陵区"},{"code":"321203","name":"高港区"},{"code":"321204","name":"姜堰区"},{"code":"321281","name":"兴化市"},{"code":"321282","name":"靖江市"},{"code":"321283","name":"泰兴市"}]},{"code":"3213","name":"宿迁市","childs":[{"code":"321302","name":"宿城区"},{"code":"321311","name":"宿豫区"},{"code":"321322","name":"沭阳县"},{"code":"321323","name":"泗阳县"},{"code":"321324","name":"泗洪县"}]}]},{"code":"33","name":"浙江省","childs":[{"code":"3301","name":"杭州市","childs":[{"code":"330102","name":"上城区"},{"code":"330103","name":"下城区"},{"code":"330104","name":"江干区"},{"code":"330105","name":"拱墅区"},{"code":"330106","name":"西湖区"},{"code":"330108","name":"滨江区"},{"code":"330109","name":"萧山区"},{"code":"330110","name":"余杭区"},{"code":"330111","name":"富阳区"},{"code":"330122","name":"桐庐县"},{"code":"330127","name":"淳安县"},{"code":"330182","name":"建德市"},{"code":"330185","name":"临安市"}]},{"code":"3302","name":"宁波市","childs":[{"code":"330203","name":"海曙区"},{"code":"330204","name":"江东区"},{"code":"330205","name":"江北区"},{"code":"330206","name":"北仑区"},{"code":"330211","name":"镇海区"},{"code":"330212","name":"鄞州区"},{"code":"330225","name":"象山县"},{"code":"330226","name":"宁海县"},{"code":"330281","name":"余姚市"},{"code":"330282","name":"慈溪市"},{"code":"330283","name":"奉化市"}]},{"code":"3303","name":"温州市","childs":[{"code":"330302","name":"鹿城区"},{"code":"330303","name":"龙湾区"},{"code":"330304","name":"瓯海区"},{"code":"330305","name":"洞头区"},{"code":"330324","name":"永嘉县"},{"code":"330326","name":"平阳县"},{"code":"330327","name":"苍南县"},{"code":"330328","name":"文成县"},{"code":"330329","name":"泰顺县"},{"code":"330381","name":"瑞安市"},{"code":"330382","name":"乐清市"}]},{"code":"3304","name":"嘉兴市","childs":[{"code":"330402","name":"南湖区"},{"code":"330411","name":"秀洲区"},{"code":"330421","name":"嘉善县"},{"code":"330424","name":"海盐县"},{"code":"330481","name":"海宁市"},{"code":"330482","name":"平湖市"},{"code":"330483","name":"桐乡市"}]},{"code":"3305","name":"湖州市","childs":[{"code":"330502","name":"吴兴区"},{"code":"330503","name":"南浔区"},{"code":"330521","name":"德清县"},{"code":"330522","name":"长兴县"},{"code":"330523","name":"安吉县"}]},{"code":"3306","name":"绍兴市","childs":[{"code":"330602","name":"越城区"},{"code":"330603","name":"柯桥区"},{"code":"330604","name":"上虞区"},{"code":"330624","name":"新昌县"},{"code":"330681","name":"诸暨市"},{"code":"330683","name":"嵊州市"}]},{"code":"3307","name":"金华市","childs":[{"code":"330702","name":"婺城区"},{"code":"330703","name":"金东区"},{"code":"330723","name":"武义县"},{"code":"330726","name":"浦江县"},{"code":"330727","name":"磐安县"},{"code":"330781","name":"兰溪市"},{"code":"330782","name":"义乌市"},{"code":"330783","name":"东阳市"},{"code":"330784","name":"永康市"}]},{"code":"3308","name":"衢州市","childs":[{"code":"330802","name":"柯城区"},{"code":"330803","name":"衢江区"},{"code":"330822","name":"常山县"},{"code":"330824","name":"开化县"},{"code":"330825","name":"龙游县"},{"code":"330881","name":"江山市"}]},{"code":"3309","name":"舟山市","childs":[{"code":"330902","name":"定海区"},{"code":"330903","name":"普陀区"},{"code":"330921","name":"岱山县"},{"code":"330922","name":"嵊泗县"}]},{"code":"3310","name":"台州市","childs":[{"code":"331002","name":"椒江区"},{"code":"331003","name":"黄岩区"},{"code":"331004","name":"路桥区"},{"code":"331021","name":"玉环县"},{"code":"331022","name":"三门县"},{"code":"331023","name":"天台县"},{"code":"331024","name":"仙居县"},{"code":"331081","name":"温岭市"},{"code":"331082","name":"临海市"}]},{"code":"3311","name":"丽水市","childs":[{"code":"331102","name":"莲都区"},{"code":"331121","name":"青田县"},{"code":"331122","name":"缙云县"},{"code":"331123","name":"遂昌县"},{"code":"331124","name":"松阳县"},{"code":"331125","name":"云和县"},{"code":"331126","name":"庆元县"},{"code":"331127","name":"景宁畲族自治县"},{"code":"331181","name":"龙泉市"}]}]},{"code":"34","name":"安徽省","childs":[{"code":"3401","name":"合肥市","childs":[{"code":"340102","name":"瑶海区"},{"code":"340103","name":"庐阳区"},{"code":"340104","name":"蜀山区"},{"code":"340111","name":"包河区"},{"code":"340121","name":"长丰县"},{"code":"340122","name":"肥东县"},{"code":"340123","name":"肥西县"},{"code":"340124","name":"庐江县"},{"code":"340181","name":"巢湖市"}]},{"code":"3402","name":"芜湖市","childs":[{"code":"340202","name":"镜湖区"},{"code":"340203","name":"弋江区"},{"code":"340207","name":"鸠江区"},{"code":"340208","name":"三山区"},{"code":"340221","name":"芜湖县"},{"code":"340222","name":"繁昌县"},{"code":"340223","name":"南陵县"},{"code":"340225","name":"无为县"}]},{"code":"3403","name":"蚌埠市","childs":[{"code":"340302","name":"龙子湖区"},{"code":"340303","name":"蚌山区"},{"code":"340304","name":"禹会区"},{"code":"340311","name":"淮上区"},{"code":"340321","name":"怀远县"},{"code":"340322","name":"五河县"},{"code":"340323","name":"固镇县"}]},{"code":"3404","name":"淮南市","childs":[{"code":"340402","name":"大通区"},{"code":"340403","name":"田家庵区"},{"code":"340404","name":"谢家集区"},{"code":"340405","name":"八公山区"},{"code":"340406","name":"潘集区"},{"code":"340421","name":"凤台县"},{"code":"340422","name":"寿县"}]},{"code":"3405","name":"马鞍山市","childs":[{"code":"340503","name":"花山区"},{"code":"340504","name":"雨山区"},{"code":"340506","name":"博望区"},{"code":"340521","name":"当涂县"},{"code":"340522","name":"含山县"},{"code":"340523","name":"和县"}]},{"code":"3406","name":"淮北市","childs":[{"code":"340602","name":"杜集区"},{"code":"340603","name":"相山区"},{"code":"340604","name":"烈山区"},{"code":"340621","name":"濉溪县"}]},{"code":"3407","name":"铜陵市","childs":[{"code":"340705","name":"铜官区"},{"code":"340706","name":"义安区"},{"code":"340711","name":"郊区"},{"code":"340722","name":"枞阳县"}]},{"code":"3408","name":"安庆市","childs":[{"code":"340802","name":"迎江区"},{"code":"340803","name":"大观区"},{"code":"340811","name":"宜秀区"},{"code":"340822","name":"怀宁县"},{"code":"340824","name":"潜山县"},{"code":"340825","name":"太湖县"},{"code":"340826","name":"宿松县"},{"code":"340827","name":"望江县"},{"code":"340828","name":"岳西县"},{"code":"340881","name":"桐城市"}]},{"code":"3410","name":"黄山市","childs":[{"code":"341002","name":"屯溪区"},{"code":"341003","name":"黄山区"},{"code":"341004","name":"徽州区"},{"code":"341021","name":"歙县"},{"code":"341022","name":"休宁县"},{"code":"341023","name":"黟县"},{"code":"341024","name":"祁门县"}]},{"code":"3411","name":"滁州市","childs":[{"code":"341102","name":"琅琊区"},{"code":"341103","name":"南谯区"},{"code":"341122","name":"来安县"},{"code":"341124","name":"全椒县"},{"code":"341125","name":"定远县"},{"code":"341126","name":"凤阳县"},{"code":"341181","name":"天长市"},{"code":"341182","name":"明光市"}]},{"code":"3412","name":"阜阳市","childs":[{"code":"341202","name":"颍州区"},{"code":"341203","name":"颍东区"},{"code":"341204","name":"颍泉区"},{"code":"341221","name":"临泉县"},{"code":"341222","name":"太和县"},{"code":"341225","name":"阜南县"},{"code":"341226","name":"颍上县"},{"code":"341282","name":"界首市"}]},{"code":"3413","name":"宿州市","childs":[{"code":"341302","name":"埇桥区"},{"code":"341321","name":"砀山县"},{"code":"341322","name":"萧县"},{"code":"341323","name":"灵璧县"},{"code":"341324","name":"泗县"}]},{"code":"3415","name":"六安市","childs":[{"code":"341502","name":"金安区"},{"code":"341503","name":"裕安区"},{"code":"341504","name":"叶集区"},{"code":"341522","name":"霍邱县"},{"code":"341523","name":"舒城县"},{"code":"341524","name":"金寨县"},{"code":"341525","name":"霍山县"}]},{"code":"3416","name":"亳州市","childs":[{"code":"341602","name":"谯城区"},{"code":"341621","name":"涡阳县"},{"code":"341622","name":"蒙城县"},{"code":"341623","name":"利辛县"}]},{"code":"3417","name":"池州市","childs":[{"code":"341702","name":"贵池区"},{"code":"341721","name":"东至县"},{"code":"341722","name":"石台县"},{"code":"341723","name":"青阳县"}]},{"code":"3418","name":"宣城市","childs":[{"code":"341802","name":"宣州区"},{"code":"341821","name":"郎溪县"},{"code":"341822","name":"广德县"},{"code":"341823","name":"泾县"},{"code":"341824","name":"绩溪县"},{"code":"341825","name":"旌德县"},{"code":"341881","name":"宁国市"}]}]},{"code":"35","name":"福建省","childs":[{"code":"3501","name":"福州市","childs":[{"code":"350102","name":"鼓楼区"},{"code":"350103","name":"台江区"},{"code":"350104","name":"仓山区"},{"code":"350105","name":"马尾区"},{"code":"350111","name":"晋安区"},{"code":"350121","name":"闽侯县"},{"code":"350122","name":"连江县"},{"code":"350123","name":"罗源县"},{"code":"350124","name":"闽清县"},{"code":"350125","name":"永泰县"},{"code":"350128","name":"平潭县"},{"code":"350181","name":"福清市"},{"code":"350182","name":"长乐市"}]},{"code":"3502","name":"厦门市","childs":[{"code":"350203","name":"思明区"},{"code":"350205","name":"海沧区"},{"code":"350206","name":"湖里区"},{"code":"350211","name":"集美区"},{"code":"350212","name":"同安区"},{"code":"350213","name":"翔安区"}]},{"code":"3503","name":"莆田市","childs":[{"code":"350302","name":"城厢区"},{"code":"350303","name":"涵江区"},{"code":"350304","name":"荔城区"},{"code":"350305","name":"秀屿区"},{"code":"350322","name":"仙游县"}]},{"code":"3504","name":"三明市","childs":[{"code":"350402","name":"梅列区"},{"code":"350403","name":"三元区"},{"code":"350421","name":"明溪县"},{"code":"350423","name":"清流县"},{"code":"350424","name":"宁化县"},{"code":"350425","name":"大田县"},{"code":"350426","name":"尤溪县"},{"code":"350427","name":"沙县"},{"code":"350428","name":"将乐县"},{"code":"350429","name":"泰宁县"},{"code":"350430","name":"建宁县"},{"code":"350481","name":"永安市"}]},{"code":"3505","name":"泉州市","childs":[{"code":"350502","name":"鲤城区"},{"code":"350503","name":"丰泽区"},{"code":"350504","name":"洛江区"},{"code":"350505","name":"泉港区"},{"code":"350521","name":"惠安县"},{"code":"350524","name":"安溪县"},{"code":"350525","name":"永春县"},{"code":"350526","name":"德化县"},{"code":"350527","name":"金门县"},{"code":"350581","name":"石狮市"},{"code":"350582","name":"晋江市"},{"code":"350583","name":"南安市"}]},{"code":"3506","name":"漳州市","childs":[{"code":"350602","name":"芗城区"},{"code":"350603","name":"龙文区"},{"code":"350622","name":"云霄县"},{"code":"350623","name":"漳浦县"},{"code":"350624","name":"诏安县"},{"code":"350625","name":"长泰县"},{"code":"350626","name":"东山县"},{"code":"350627","name":"南靖县"},{"code":"350628","name":"平和县"},{"code":"350629","name":"华安县"},{"code":"350681","name":"龙海市"}]},{"code":"3507","name":"南平市","childs":[{"code":"350702","name":"延平区"},{"code":"350703","name":"建阳区"},{"code":"350721","name":"顺昌县"},{"code":"350722","name":"浦城县"},{"code":"350723","name":"光泽县"},{"code":"350724","name":"松溪县"},{"code":"350725","name":"政和县"},{"code":"350781","name":"邵武市"},{"code":"350782","name":"武夷山市"},{"code":"350783","name":"建瓯市"}]},{"code":"3508","name":"龙岩市","childs":[{"code":"350802","name":"新罗区"},{"code":"350803","name":"永定区"},{"code":"350821","name":"长汀县"},{"code":"350823","name":"上杭县"},{"code":"350824","name":"武平县"},{"code":"350825","name":"连城县"},{"code":"350881","name":"漳平市"}]},{"code":"3509","name":"宁德市","childs":[{"code":"350902","name":"蕉城区"},{"code":"350921","name":"霞浦县"},{"code":"350922","name":"古田县"},{"code":"350923","name":"屏南县"},{"code":"350924","name":"寿宁县"},{"code":"350925","name":"周宁县"},{"code":"350926","name":"柘荣县"},{"code":"350981","name":"福安市"},{"code":"350982","name":"福鼎市"}]}]},{"code":"36","name":"江西省","childs":[{"code":"3601","name":"南昌市","childs":[{"code":"360102","name":"东湖区"},{"code":"360103","name":"西湖区"},{"code":"360104","name":"青云谱区"},{"code":"360105","name":"湾里区"},{"code":"360111","name":"青山湖区"},{"code":"360112","name":"新建区"},{"code":"360121","name":"南昌县"},{"code":"360123","name":"安义县"},{"code":"360124","name":"进贤县"}]},{"code":"3602","name":"景德镇市","childs":[{"code":"360202","name":"昌江区"},{"code":"360203","name":"珠山区"},{"code":"360222","name":"浮梁县"},{"code":"360281","name":"乐平市"}]},{"code":"3603","name":"萍乡市","childs":[{"code":"360302","name":"安源区"},{"code":"360313","name":"湘东区"},{"code":"360321","name":"莲花县"},{"code":"360322","name":"上栗县"},{"code":"360323","name":"芦溪县"}]},{"code":"3604","name":"九江市","childs":[{"code":"360402","name":"濂溪区"},{"code":"360403","name":"浔阳区"},{"code":"360421","name":"九江县"},{"code":"360423","name":"武宁县"},{"code":"360424","name":"修水县"},{"code":"360425","name":"永修县"},{"code":"360426","name":"德安县"},{"code":"360428","name":"都昌县"},{"code":"360429","name":"湖口县"},{"code":"360430","name":"彭泽县"},{"code":"360481","name":"瑞昌市"},{"code":"360482","name":"共青城市"},{"code":"360483","name":"庐山市"}]},{"code":"3605","name":"新余市","childs":[{"code":"360502","name":"渝水区"},{"code":"360521","name":"分宜县"}]},{"code":"3606","name":"鹰潭市","childs":[{"code":"360602","name":"月湖区"},{"code":"360622","name":"余江县"},{"code":"360681","name":"贵溪市"}]},{"code":"3607","name":"赣州市","childs":[{"code":"360702","name":"章贡区"},{"code":"360703","name":"南康区"},{"code":"360721","name":"赣县"},{"code":"360722","name":"信丰县"},{"code":"360723","name":"大余县"},{"code":"360724","name":"上犹县"},{"code":"360725","name":"崇义县"},{"code":"360726","name":"安远县"},{"code":"360727","name":"龙南县"},{"code":"360728","name":"定南县"},{"code":"360729","name":"全南县"},{"code":"360730","name":"宁都县"},{"code":"360731","name":"于都县"},{"code":"360732","name":"兴国县"},{"code":"360733","name":"会昌县"},{"code":"360734","name":"寻乌县"},{"code":"360735","name":"石城县"},{"code":"360781","name":"瑞金市"}]},{"code":"3608","name":"吉安市","childs":[{"code":"360802","name":"吉州区"},{"code":"360803","name":"青原区"},{"code":"360821","name":"吉安县"},{"code":"360822","name":"吉水县"},{"code":"360823","name":"峡江县"},{"code":"360824","name":"新干县"},{"code":"360825","name":"永丰县"},{"code":"360826","name":"泰和县"},{"code":"360827","name":"遂川县"},{"code":"360828","name":"万安县"},{"code":"360829","name":"安福县"},{"code":"360830","name":"永新县"},{"code":"360881","name":"井冈山市"}]},{"code":"3609","name":"宜春市","childs":[{"code":"360902","name":"袁州区"},{"code":"360921","name":"奉新县"},{"code":"360922","name":"万载县"},{"code":"360923","name":"上高县"},{"code":"360924","name":"宜丰县"},{"code":"360925","name":"靖安县"},{"code":"360926","name":"铜鼓县"},{"code":"360981","name":"丰城市"},{"code":"360982","name":"樟树市"},{"code":"360983","name":"高安市"}]},{"code":"3610","name":"抚州市","childs":[{"code":"361002","name":"临川区"},{"code":"361021","name":"南城县"},{"code":"361022","name":"黎川县"},{"code":"361023","name":"南丰县"},{"code":"361024","name":"崇仁县"},{"code":"361025","name":"乐安县"},{"code":"361026","name":"宜黄县"},{"code":"361027","name":"金溪县"},{"code":"361028","name":"资溪县"},{"code":"361029","name":"东乡县"},{"code":"361030","name":"广昌县"}]},{"code":"3611","name":"上饶市","childs":[{"code":"361102","name":"信州区"},{"code":"361103","name":"广丰区"},{"code":"361121","name":"上饶县"},{"code":"361123","name":"玉山县"},{"code":"361124","name":"铅山县"},{"code":"361125","name":"横峰县"},{"code":"361126","name":"弋阳县"},{"code":"361127","name":"余干县"},{"code":"361128","name":"鄱阳县"},{"code":"361129","name":"万年县"},{"code":"361130","name":"婺源县"},{"code":"361181","name":"德兴市"}]}]},{"code":"37","name":"山东省","childs":[{"code":"3701","name":"济南市","childs":[{"code":"370102","name":"历下区"},{"code":"370103","name":"市中区"},{"code":"370104","name":"槐荫区"},{"code":"370105","name":"天桥区"},{"code":"370112","name":"历城区"},{"code":"370113","name":"长清区"},{"code":"370124","name":"平阴县"},{"code":"370125","name":"济阳县"},{"code":"370126","name":"商河县"},{"code":"370181","name":"章丘市"}]},{"code":"3702","name":"青岛市","childs":[{"code":"370202","name":"市南区"},{"code":"370203","name":"市北区"},{"code":"370211","name":"黄岛区"},{"code":"370212","name":"崂山区"},{"code":"370213","name":"李沧区"},{"code":"370214","name":"城阳区"},{"code":"370281","name":"胶州市"},{"code":"370282","name":"即墨市"},{"code":"370283","name":"平度市"},{"code":"370285","name":"莱西市"}]},{"code":"3703","name":"淄博市","childs":[{"code":"370302","name":"淄川区"},{"code":"370303","name":"张店区"},{"code":"370304","name":"博山区"},{"code":"370305","name":"临淄区"},{"code":"370306","name":"周村区"},{"code":"370321","name":"桓台县"},{"code":"370322","name":"高青县"},{"code":"370323","name":"沂源县"}]},{"code":"3704","name":"枣庄市","childs":[{"code":"370402","name":"市中区"},{"code":"370403","name":"薛城区"},{"code":"370404","name":"峄城区"},{"code":"370405","name":"台儿庄区"},{"code":"370406","name":"山亭区"},{"code":"370481","name":"滕州市"}]},{"code":"3705","name":"东营市","childs":[{"code":"370502","name":"东营区"},{"code":"370503","name":"河口区"},{"code":"370505","name":"垦利区"},{"code":"370522","name":"利津县"},{"code":"370523","name":"广饶县"}]},{"code":"3706","name":"烟台市","childs":[{"code":"370602","name":"芝罘区"},{"code":"370611","name":"福山区"},{"code":"370612","name":"牟平区"},{"code":"370613","name":"莱山区"},{"code":"370634","name":"长岛县"},{"code":"370681","name":"龙口市"},{"code":"370682","name":"莱阳市"},{"code":"370683","name":"莱州市"},{"code":"370684","name":"蓬莱市"},{"code":"370685","name":"招远市"},{"code":"370686","name":"栖霞市"},{"code":"370687","name":"海阳市"}]},{"code":"3707","name":"潍坊市","childs":[{"code":"370702","name":"潍城区"},{"code":"370703","name":"寒亭区"},{"code":"370704","name":"坊子区"},{"code":"370705","name":"奎文区"},{"code":"370724","name":"临朐县"},{"code":"370725","name":"昌乐县"},{"code":"370781","name":"青州市"},{"code":"370782","name":"诸城市"},{"code":"370783","name":"寿光市"},{"code":"370784","name":"安丘市"},{"code":"370785","name":"高密市"},{"code":"370786","name":"昌邑市"}]},{"code":"3708","name":"济宁市","childs":[{"code":"370811","name":"任城区"},{"code":"370812","name":"兖州区"},{"code":"370826","name":"微山县"},{"code":"370827","name":"鱼台县"},{"code":"370828","name":"金乡县"},{"code":"370829","name":"嘉祥县"},{"code":"370830","name":"汶上县"},{"code":"370831","name":"泗水县"},{"code":"370832","name":"梁山县"},{"code":"370881","name":"曲阜市"},{"code":"370883","name":"邹城市"}]},{"code":"3709","name":"泰安市","childs":[{"code":"370902","name":"泰山区"},{"code":"370911","name":"岱岳区"},{"code":"370921","name":"宁阳县"},{"code":"370923","name":"东平县"},{"code":"370982","name":"新泰市"},{"code":"370983","name":"肥城市"}]},{"code":"3710","name":"威海市","childs":[{"code":"371002","name":"环翠区"},{"code":"371003","name":"文登区"},{"code":"371082","name":"荣成市"},{"code":"371083","name":"乳山市"}]},{"code":"3711","name":"日照市","childs":[{"code":"371102","name":"东港区"},{"code":"371103","name":"岚山区"},{"code":"371121","name":"五莲县"},{"code":"371122","name":"莒县"}]},{"code":"3712","name":"莱芜市","childs":[{"code":"371202","name":"莱城区"},{"code":"371203","name":"钢城区"}]},{"code":"3713","name":"临沂市","childs":[{"code":"371302","name":"兰山区"},{"code":"371311","name":"罗庄区"},{"code":"371312","name":"河东区"},{"code":"371321","name":"沂南县"},{"code":"371322","name":"郯城县"},{"code":"371323","name":"沂水县"},{"code":"371324","name":"兰陵县"},{"code":"371325","name":"费县"},{"code":"371326","name":"平邑县"},{"code":"371327","name":"莒南县"},{"code":"371328","name":"蒙阴县"},{"code":"371329","name":"临沭县"}]},{"code":"3714","name":"德州市","childs":[{"code":"371402","name":"德城区"},{"code":"371403","name":"陵城区"},{"code":"371422","name":"宁津县"},{"code":"371423","name":"庆云县"},{"code":"371424","name":"临邑县"},{"code":"371425","name":"齐河县"},{"code":"371426","name":"平原县"},{"code":"371427","name":"夏津县"},{"code":"371428","name":"武城县"},{"code":"371481","name":"乐陵市"},{"code":"371482","name":"禹城市"}]},{"code":"3715","name":"聊城市","childs":[{"code":"371502","name":"东昌府区"},{"code":"371521","name":"阳谷县"},{"code":"371522","name":"莘县"},{"code":"371523","name":"茌平县"},{"code":"371524","name":"东阿县"},{"code":"371525","name":"冠县"},{"code":"371526","name":"高唐县"},{"code":"371581","name":"临清市"}]},{"code":"3716","name":"滨州市","childs":[{"code":"371602","name":"滨城区"},{"code":"371603","name":"沾化区"},{"code":"371621","name":"惠民县"},{"code":"371622","name":"阳信县"},{"code":"371623","name":"无棣县"},{"code":"371625","name":"博兴县"},{"code":"371626","name":"邹平县"}]},{"code":"3717","name":"菏泽市","childs":[{"code":"371702","name":"牡丹区"},{"code":"371703","name":"定陶区"},{"code":"371721","name":"曹县"},{"code":"371722","name":"单县"},{"code":"371723","name":"成武县"},{"code":"371724","name":"巨野县"},{"code":"371725","name":"郓城县"},{"code":"371726","name":"鄄城县"},{"code":"371728","name":"东明县"}]}]},{"code":"41","name":"河南省","childs":[{"code":"4101","name":"郑州市","childs":[{"code":"410102","name":"中原区"},{"code":"410103","name":"二七区"},{"code":"410104","name":"管城回族区"},{"code":"410105","name":"金水区"},{"code":"410106","name":"上街区"},{"code":"410108","name":"惠济区"},{"code":"410122","name":"中牟县"},{"code":"410181","name":"巩义市"},{"code":"410182","name":"荥阳市"},{"code":"410183","name":"新密市"},{"code":"410184","name":"新郑市"},{"code":"410185","name":"登封市"}]},{"code":"4102","name":"开封市","childs":[{"code":"410202","name":"龙亭区"},{"code":"410203","name":"顺河回族区"},{"code":"410204","name":"鼓楼区"},{"code":"410205","name":"禹王台区"},{"code":"410211","name":"金明区"},{"code":"410212","name":"祥符区"},{"code":"410221","name":"杞县"},{"code":"410222","name":"通许县"},{"code":"410223","name":"尉氏县"},{"code":"410225","name":"兰考县"}]},{"code":"4103","name":"洛阳市","childs":[{"code":"410302","name":"老城区"},{"code":"410303","name":"西工区"},{"code":"410304","name":"瀍河回族区"},{"code":"410305","name":"涧西区"},{"code":"410306","name":"吉利区"},{"code":"410311","name":"洛龙区"},{"code":"410322","name":"孟津县"},{"code":"410323","name":"新安县"},{"code":"410324","name":"栾川县"},{"code":"410325","name":"嵩县"},{"code":"410326","name":"汝阳县"},{"code":"410327","name":"宜阳县"},{"code":"410328","name":"洛宁县"},{"code":"410329","name":"伊川县"},{"code":"410381","name":"偃师市"}]},{"code":"4104","name":"平顶山市","childs":[{"code":"410402","name":"新华区"},{"code":"410403","name":"卫东区"},{"code":"410404","name":"石龙区"},{"code":"410411","name":"湛河区"},{"code":"410421","name":"宝丰县"},{"code":"410422","name":"叶县"},{"code":"410423","name":"鲁山县"},{"code":"410425","name":"郏县"},{"code":"410481","name":"舞钢市"},{"code":"410482","name":"汝州市"}]},{"code":"4105","name":"安阳市","childs":[{"code":"410502","name":"文峰区"},{"code":"410503","name":"北关区"},{"code":"410505","name":"殷都区"},{"code":"410506","name":"龙安区"},{"code":"410522","name":"安阳县"},{"code":"410523","name":"汤阴县"},{"code":"410526","name":"滑县"},{"code":"410527","name":"内黄县"},{"code":"410581","name":"林州市"}]},{"code":"4106","name":"鹤壁市","childs":[{"code":"410602","name":"鹤山区"},{"code":"410603","name":"山城区"},{"code":"410611","name":"淇滨区"},{"code":"410621","name":"浚县"},{"code":"410622","name":"淇县"}]},{"code":"4107","name":"新乡市","childs":[{"code":"410702","name":"红旗区"},{"code":"410703","name":"卫滨区"},{"code":"410704","name":"凤泉区"},{"code":"410711","name":"牧野区"},{"code":"410721","name":"新乡县"},{"code":"410724","name":"获嘉县"},{"code":"410725","name":"原阳县"},{"code":"410726","name":"延津县"},{"code":"410727","name":"封丘县"},{"code":"410728","name":"长垣县"},{"code":"410781","name":"卫辉市"},{"code":"410782","name":"辉县市"}]},{"code":"4108","name":"焦作市","childs":[{"code":"410802","name":"解放区"},{"code":"410803","name":"中站区"},{"code":"410804","name":"马村区"},{"code":"410811","name":"山阳区"},{"code":"410821","name":"修武县"},{"code":"410822","name":"博爱县"},{"code":"410823","name":"武陟县"},{"code":"410825","name":"温县"},{"code":"410882","name":"沁阳市"},{"code":"410883","name":"孟州市"}]},{"code":"4109","name":"濮阳市","childs":[{"code":"410902","name":"华龙区"},{"code":"410922","name":"清丰县"},{"code":"410923","name":"南乐县"},{"code":"410926","name":"范县"},{"code":"410927","name":"台前县"},{"code":"410928","name":"濮阳县"}]},{"code":"4110","name":"许昌市","childs":[{"code":"411002","name":"魏都区"},{"code":"411023","name":"许昌县"},{"code":"411024","name":"鄢陵县"},{"code":"411025","name":"襄城县"},{"code":"411081","name":"禹州市"},{"code":"411082","name":"长葛市"}]},{"code":"4111","name":"漯河市","childs":[{"code":"411102","name":"源汇区"},{"code":"411103","name":"郾城区"},{"code":"411104","name":"召陵区"},{"code":"411121","name":"舞阳县"},{"code":"411122","name":"临颍县"}]},{"code":"4112","name":"三门峡市","childs":[{"code":"411202","name":"湖滨区"},{"code":"411203","name":"陕州区"},{"code":"411221","name":"渑池县"},{"code":"411224","name":"卢氏县"},{"code":"411281","name":"义马市"},{"code":"411282","name":"灵宝市"}]},{"code":"4113","name":"南阳市","childs":[{"code":"411302","name":"宛城区"},{"code":"411303","name":"卧龙区"},{"code":"411321","name":"南召县"},{"code":"411322","name":"方城县"},{"code":"411323","name":"西峡县"},{"code":"411324","name":"镇平县"},{"code":"411325","name":"内乡县"},{"code":"411326","name":"淅川县"},{"code":"411327","name":"社旗县"},{"code":"411328","name":"唐河县"},{"code":"411329","name":"新野县"},{"code":"411330","name":"桐柏县"},{"code":"411381","name":"邓州市"}]},{"code":"4114","name":"商丘市","childs":[{"code":"411402","name":"梁园区"},{"code":"411403","name":"睢阳区"},{"code":"411421","name":"民权县"},{"code":"411422","name":"睢县"},{"code":"411423","name":"宁陵县"},{"code":"411424","name":"柘城县"},{"code":"411425","name":"虞城县"},{"code":"411426","name":"夏邑县"},{"code":"411481","name":"永城市"}]},{"code":"4115","name":"信阳市","childs":[{"code":"411502","name":"浉河区"},{"code":"411503","name":"平桥区"},{"code":"411521","name":"罗山县"},{"code":"411522","name":"光山县"},{"code":"411523","name":"新县"},{"code":"411524","name":"商城县"},{"code":"411525","name":"固始县"},{"code":"411526","name":"潢川县"},{"code":"411527","name":"淮滨县"},{"code":"411528","name":"息县"}]},{"code":"4116","name":"周口市","childs":[{"code":"411602","name":"川汇区"},{"code":"411621","name":"扶沟县"},{"code":"411622","name":"西华县"},{"code":"411623","name":"商水县"},{"code":"411624","name":"沈丘县"},{"code":"411625","name":"郸城县"},{"code":"411626","name":"淮阳县"},{"code":"411627","name":"太康县"},{"code":"411628","name":"鹿邑县"},{"code":"411681","name":"项城市"}]},{"code":"4117","name":"驻马店市","childs":[{"code":"411702","name":"驿城区"},{"code":"411721","name":"西平县"},{"code":"411722","name":"上蔡县"},{"code":"411723","name":"平舆县"},{"code":"411724","name":"正阳县"},{"code":"411725","name":"确山县"},{"code":"411726","name":"泌阳县"},{"code":"411727","name":"汝南县"},{"code":"411728","name":"遂平县"},{"code":"411729","name":"新蔡县"}]},{"code":"4190","name":"省直辖县级行政区划","childs":[{"code":"419001","name":"济源市"}]}]},{"code":"42","name":"湖北省","childs":[{"code":"4201","name":"武汉市","childs":[{"code":"420102","name":"江岸区"},{"code":"420103","name":"江汉区"},{"code":"420104","name":"硚口区"},{"code":"420105","name":"汉阳区"},{"code":"420106","name":"武昌区"},{"code":"420107","name":"青山区"},{"code":"420111","name":"洪山区"},{"code":"420112","name":"东西湖区"},{"code":"420113","name":"汉南区"},{"code":"420114","name":"蔡甸区"},{"code":"420115","name":"江夏区"},{"code":"420116","name":"黄陂区"},{"code":"420117","name":"新洲区"}]},{"code":"4202","name":"黄石市","childs":[{"code":"420202","name":"黄石港区"},{"code":"420203","name":"西塞山区"},{"code":"420204","name":"下陆区"},{"code":"420205","name":"铁山区"},{"code":"420222","name":"阳新县"},{"code":"420281","name":"大冶市"}]},{"code":"4203","name":"十堰市","childs":[{"code":"420302","name":"茅箭区"},{"code":"420303","name":"张湾区"},{"code":"420304","name":"郧阳区"},{"code":"420322","name":"郧西县"},{"code":"420323","name":"竹山县"},{"code":"420324","name":"竹溪县"},{"code":"420325","name":"房县"},{"code":"420381","name":"丹江口市"}]},{"code":"4205","name":"宜昌市","childs":[{"code":"420502","name":"西陵区"},{"code":"420503","name":"伍家岗区"},{"code":"420504","name":"点军区"},{"code":"420505","name":"猇亭区"},{"code":"420506","name":"夷陵区"},{"code":"420525","name":"远安县"},{"code":"420526","name":"兴山县"},{"code":"420527","name":"秭归县"},{"code":"420528","name":"长阳土家族自治县"},{"code":"420529","name":"五峰土家族自治县"},{"code":"420581","name":"宜都市"},{"code":"420582","name":"当阳市"},{"code":"420583","name":"枝江市"}]},{"code":"4206","name":"襄阳市","childs":[{"code":"420602","name":"襄城区"},{"code":"420606","name":"樊城区"},{"code":"420607","name":"襄州区"},{"code":"420624","name":"南漳县"},{"code":"420625","name":"谷城县"},{"code":"420626","name":"保康县"},{"code":"420682","name":"老河口市"},{"code":"420683","name":"枣阳市"},{"code":"420684","name":"宜城市"}]},{"code":"4207","name":"鄂州市","childs":[{"code":"420702","name":"梁子湖区"},{"code":"420703","name":"华容区"},{"code":"420704","name":"鄂城区"}]},{"code":"4208","name":"荆门市","childs":[{"code":"420802","name":"东宝区"},{"code":"420804","name":"掇刀区"},{"code":"420821","name":"京山县"},{"code":"420822","name":"沙洋县"},{"code":"420881","name":"钟祥市"}]},{"code":"4209","name":"孝感市","childs":[{"code":"420902","name":"孝南区"},{"code":"420921","name":"孝昌县"},{"code":"420922","name":"大悟县"},{"code":"420923","name":"云梦县"},{"code":"420981","name":"应城市"},{"code":"420982","name":"安陆市"},{"code":"420984","name":"汉川市"}]},{"code":"4210","name":"荆州市","childs":[{"code":"421002","name":"沙市区"},{"code":"421003","name":"荆州区"},{"code":"421022","name":"公安县"},{"code":"421023","name":"监利县"},{"code":"421024","name":"江陵县"},{"code":"421081","name":"石首市"},{"code":"421083","name":"洪湖市"},{"code":"421087","name":"松滋市"}]},{"code":"4211","name":"黄冈市","childs":[{"code":"421102","name":"黄州区"},{"code":"421121","name":"团风县"},{"code":"421122","name":"红安县"},{"code":"421123","name":"罗田县"},{"code":"421124","name":"英山县"},{"code":"421125","name":"浠水县"},{"code":"421126","name":"蕲春县"},{"code":"421127","name":"黄梅县"},{"code":"421181","name":"麻城市"},{"code":"421182","name":"武穴市"}]},{"code":"4212","name":"咸宁市","childs":[{"code":"421202","name":"咸安区"},{"code":"421221","name":"嘉鱼县"},{"code":"421222","name":"通城县"},{"code":"421223","name":"崇阳县"},{"code":"421224","name":"通山县"},{"code":"421281","name":"赤壁市"}]},{"code":"4213","name":"随州市","childs":[{"code":"421303","name":"曾都区"},{"code":"421321","name":"随县"},{"code":"421381","name":"广水市"}]},{"code":"4228","name":"恩施土家族苗族自治州","childs":[{"code":"422801","name":"恩施市"},{"code":"422802","name":"利川市"},{"code":"422822","name":"建始县"},{"code":"422823","name":"巴东县"},{"code":"422825","name":"宣恩县"},{"code":"422826","name":"咸丰县"},{"code":"422827","name":"来凤县"},{"code":"422828","name":"鹤峰县"}]},{"code":"4290","name":"省直辖县级行政区划","childs":[{"code":"429004","name":"仙桃市"},{"code":"429005","name":"潜江市"},{"code":"429006","name":"天门市"},{"code":"429021","name":"神农架林区"}]}]},{"code":"43","name":"湖南省","childs":[{"code":"4301","name":"长沙市","childs":[{"code":"430102","name":"芙蓉区"},{"code":"430103","name":"天心区"},{"code":"430104","name":"岳麓区"},{"code":"430105","name":"开福区"},{"code":"430111","name":"雨花区"},{"code":"430112","name":"望城区"},{"code":"430121","name":"长沙县"},{"code":"430124","name":"宁乡县"},{"code":"430181","name":"浏阳市"}]},{"code":"4302","name":"株洲市","childs":[{"code":"430202","name":"荷塘区"},{"code":"430203","name":"芦淞区"},{"code":"430204","name":"石峰区"},{"code":"430211","name":"天元区"},{"code":"430221","name":"株洲县"},{"code":"430223","name":"攸县"},{"code":"430224","name":"茶陵县"},{"code":"430225","name":"炎陵县"},{"code":"430281","name":"醴陵市"}]},{"code":"4303","name":"湘潭市","childs":[{"code":"430302","name":"雨湖区"},{"code":"430304","name":"岳塘区"},{"code":"430321","name":"湘潭县"},{"code":"430381","name":"湘乡市"},{"code":"430382","name":"韶山市"}]},{"code":"4304","name":"衡阳市","childs":[{"code":"430405","name":"珠晖区"},{"code":"430406","name":"雁峰区"},{"code":"430407","name":"石鼓区"},{"code":"430408","name":"蒸湘区"},{"code":"430412","name":"南岳区"},{"code":"430421","name":"衡阳县"},{"code":"430422","name":"衡南县"},{"code":"430423","name":"衡山县"},{"code":"430424","name":"衡东县"},{"code":"430426","name":"祁东县"},{"code":"430481","name":"耒阳市"},{"code":"430482","name":"常宁市"}]},{"code":"4305","name":"邵阳市","childs":[{"code":"430502","name":"双清区"},{"code":"430503","name":"大祥区"},{"code":"430511","name":"北塔区"},{"code":"430521","name":"邵东县"},{"code":"430522","name":"新邵县"},{"code":"430523","name":"邵阳县"},{"code":"430524","name":"隆回县"},{"code":"430525","name":"洞口县"},{"code":"430527","name":"绥宁县"},{"code":"430528","name":"新宁县"},{"code":"430529","name":"城步苗族自治县"},{"code":"430581","name":"武冈市"}]},{"code":"4306","name":"岳阳市","childs":[{"code":"430602","name":"岳阳楼区"},{"code":"430603","name":"云溪区"},{"code":"430611","name":"君山区"},{"code":"430621","name":"岳阳县"},{"code":"430623","name":"华容县"},{"code":"430624","name":"湘阴县"},{"code":"430626","name":"平江县"},{"code":"430681","name":"汨罗市"},{"code":"430682","name":"临湘市"}]},{"code":"4307","name":"常德市","childs":[{"code":"430702","name":"武陵区"},{"code":"430703","name":"鼎城区"},{"code":"430721","name":"安乡县"},{"code":"430722","name":"汉寿县"},{"code":"430723","name":"澧县"},{"code":"430724","name":"临澧县"},{"code":"430725","name":"桃源县"},{"code":"430726","name":"石门县"},{"code":"430781","name":"津市市"}]},{"code":"4308","name":"张家界市","childs":[{"code":"430802","name":"永定区"},{"code":"430811","name":"武陵源区"},{"code":"430821","name":"慈利县"},{"code":"430822","name":"桑植县"}]},{"code":"4309","name":"益阳市","childs":[{"code":"430902","name":"资阳区"},{"code":"430903","name":"赫山区"},{"code":"430921","name":"南县"},{"code":"430922","name":"桃江县"},{"code":"430923","name":"安化县"},{"code":"430981","name":"沅江市"}]},{"code":"4310","name":"郴州市","childs":[{"code":"431002","name":"北湖区"},{"code":"431003","name":"苏仙区"},{"code":"431021","name":"桂阳县"},{"code":"431022","name":"宜章县"},{"code":"431023","name":"永兴县"},{"code":"431024","name":"嘉禾县"},{"code":"431025","name":"临武县"},{"code":"431026","name":"汝城县"},{"code":"431027","name":"桂东县"},{"code":"431028","name":"安仁县"},{"code":"431081","name":"资兴市"}]},{"code":"4311","name":"永州市","childs":[{"code":"431102","name":"零陵区"},{"code":"431103","name":"冷水滩区"},{"code":"431121","name":"祁阳县"},{"code":"431122","name":"东安县"},{"code":"431123","name":"双牌县"},{"code":"431124","name":"道县"},{"code":"431125","name":"江永县"},{"code":"431126","name":"宁远县"},{"code":"431127","name":"蓝山县"},{"code":"431128","name":"新田县"},{"code":"431129","name":"江华瑶族自治县"}]},{"code":"4312","name":"怀化市","childs":[{"code":"431202","name":"鹤城区"},{"code":"431221","name":"中方县"},{"code":"431222","name":"沅陵县"},{"code":"431223","name":"辰溪县"},{"code":"431224","name":"溆浦县"},{"code":"431225","name":"会同县"},{"code":"431226","name":"麻阳苗族自治县"},{"code":"431227","name":"新晃侗族自治县"},{"code":"431228","name":"芷江侗族自治县"},{"code":"431229","name":"靖州苗族侗族自治县"},{"code":"431230","name":"通道侗族自治县"},{"code":"431281","name":"洪江市"}]},{"code":"4313","name":"娄底市","childs":[{"code":"431302","name":"娄星区"},{"code":"431321","name":"双峰县"},{"code":"431322","name":"新化县"},{"code":"431381","name":"冷水江市"},{"code":"431382","name":"涟源市"}]},{"code":"4331","name":"湘西土家族苗族自治州","childs":[{"code":"433101","name":"吉首市"},{"code":"433122","name":"泸溪县"},{"code":"433123","name":"凤凰县"},{"code":"433124","name":"花垣县"},{"code":"433125","name":"保靖县"},{"code":"433126","name":"古丈县"},{"code":"433127","name":"永顺县"},{"code":"433130","name":"龙山县"}]}]},{"code":"44","name":"广东省","childs":[{"code":"4401","name":"广州市","childs":[{"code":"440103","name":"荔湾区"},{"code":"440104","name":"越秀区"},{"code":"440105","name":"海珠区"},{"code":"440106","name":"天河区"},{"code":"440111","name":"白云区"},{"code":"440112","name":"黄埔区"},{"code":"440113","name":"番禺区"},{"code":"440114","name":"花都区"},{"code":"440115","name":"南沙区"},{"code":"440117","name":"从化区"},{"code":"440118","name":"增城区"}]},{"code":"4402","name":"韶关市","childs":[{"code":"440203","name":"武江区"},{"code":"440204","name":"浈江区"},{"code":"440205","name":"曲江区"},{"code":"440222","name":"始兴县"},{"code":"440224","name":"仁化县"},{"code":"440229","name":"翁源县"},{"code":"440232","name":"乳源瑶族自治县"},{"code":"440233","name":"新丰县"},{"code":"440281","name":"乐昌市"},{"code":"440282","name":"南雄市"}]},{"code":"4403","name":"深圳市","childs":[{"code":"440303","name":"罗湖区"},{"code":"440304","name":"福田区"},{"code":"440305","name":"南山区"},{"code":"440306","name":"宝安区"},{"code":"440307","name":"龙岗区"},{"code":"440308","name":"盐田区"}]},{"code":"4404","name":"珠海市","childs":[{"code":"440402","name":"香洲区"},{"code":"440403","name":"斗门区"},{"code":"440404","name":"金湾区"}]},{"code":"4405","name":"汕头市","childs":[{"code":"440507","name":"龙湖区"},{"code":"440511","name":"金平区"},{"code":"440512","name":"濠江区"},{"code":"440513","name":"潮阳区"},{"code":"440514","name":"潮南区"},{"code":"440515","name":"澄海区"},{"code":"440523","name":"南澳县"}]},{"code":"4406","name":"佛山市","childs":[{"code":"440604","name":"禅城区"},{"code":"440605","name":"南海区"},{"code":"440606","name":"顺德区"},{"code":"440607","name":"三水区"},{"code":"440608","name":"高明区"}]},{"code":"4407","name":"江门市","childs":[{"code":"440703","name":"蓬江区"},{"code":"440704","name":"江海区"},{"code":"440705","name":"新会区"},{"code":"440781","name":"台山市"},{"code":"440783","name":"开平市"},{"code":"440784","name":"鹤山市"},{"code":"440785","name":"恩平市"}]},{"code":"4408","name":"湛江市","childs":[{"code":"440802","name":"赤坎区"},{"code":"440803","name":"霞山区"},{"code":"440804","name":"坡头区"},{"code":"440811","name":"麻章区"},{"code":"440823","name":"遂溪县"},{"code":"440825","name":"徐闻县"},{"code":"440881","name":"廉江市"},{"code":"440882","name":"雷州市"},{"code":"440883","name":"吴川市"}]},{"code":"4409","name":"茂名市","childs":[{"code":"440902","name":"茂南区"},{"code":"440904","name":"电白区"},{"code":"440981","name":"高州市"},{"code":"440982","name":"化州市"},{"code":"440983","name":"信宜市"}]},{"code":"4412","name":"肇庆市","childs":[{"code":"441202","name":"端州区"},{"code":"441203","name":"鼎湖区"},{"code":"441204","name":"高要区"},{"code":"441223","name":"广宁县"},{"code":"441224","name":"怀集县"},{"code":"441225","name":"封开县"},{"code":"441226","name":"德庆县"},{"code":"441284","name":"四会市"}]},{"code":"4413","name":"惠州市","childs":[{"code":"441302","name":"惠城区"},{"code":"441303","name":"惠阳区"},{"code":"441322","name":"博罗县"},{"code":"441323","name":"惠东县"},{"code":"441324","name":"龙门县"}]},{"code":"4414","name":"梅州市","childs":[{"code":"441402","name":"梅江区"},{"code":"441403","name":"梅县区"},{"code":"441422","name":"大埔县"},{"code":"441423","name":"丰顺县"},{"code":"441424","name":"五华县"},{"code":"441426","name":"平远县"},{"code":"441427","name":"蕉岭县"},{"code":"441481","name":"兴宁市"}]},{"code":"4415","name":"汕尾市","childs":[{"code":"441502","name":"城区"},{"code":"441521","name":"海丰县"},{"code":"441523","name":"陆河县"},{"code":"441581","name":"陆丰市"}]},{"code":"4416","name":"河源市","childs":[{"code":"441602","name":"源城区"},{"code":"441621","name":"紫金县"},{"code":"441622","name":"龙川县"},{"code":"441623","name":"连平县"},{"code":"441624","name":"和平县"},{"code":"441625","name":"东源县"}]},{"code":"4417","name":"阳江市","childs":[{"code":"441702","name":"江城区"},{"code":"441704","name":"阳东区"},{"code":"441721","name":"阳西县"},{"code":"441781","name":"阳春市"}]},{"code":"4418","name":"清远市","childs":[{"code":"441802","name":"清城区"},{"code":"441803","name":"清新区"},{"code":"441821","name":"佛冈县"},{"code":"441823","name":"阳山县"},{"code":"441825","name":"连山壮族瑶族自治县"},{"code":"441826","name":"连南瑶族自治县"},{"code":"441881","name":"英德市"},{"code":"441882","name":"连州市"}]},{"code":"441900","name":"东莞市","childs":[{"code":"441900003","name":"东城街道办事处"},{"code":"441900004","name":"南城街道办事处"},{"code":"441900005","name":"万江街道办事处"},{"code":"441900006","name":"莞城街道办事处"},{"code":"441900101","name":"石碣镇"},{"code":"441900102","name":"石龙镇"},{"code":"441900103","name":"茶山镇"},{"code":"441900104","name":"石排镇"},{"code":"441900105","name":"企石镇"},{"code":"441900106","name":"横沥镇"},{"code":"441900107","name":"桥头镇"},{"code":"441900108","name":"谢岗镇"},{"code":"441900109","name":"东坑镇"},{"code":"441900110","name":"常平镇"},{"code":"441900111","name":"寮步镇"},{"code":"441900112","name":"樟木头镇"},{"code":"441900113","name":"大朗镇"},{"code":"441900114","name":"黄江镇"},{"code":"441900115","name":"清溪镇"},{"code":"441900116","name":"塘厦镇"},{"code":"441900117","name":"凤岗镇"},{"code":"441900118","name":"大岭山镇"},{"code":"441900119","name":"长安镇"},{"code":"441900121","name":"虎门镇"},{"code":"441900122","name":"厚街镇"},{"code":"441900123","name":"沙田镇"},{"code":"441900124","name":"道滘镇"},{"code":"441900125","name":"洪梅镇"},{"code":"441900126","name":"麻涌镇"},{"code":"441900127","name":"望牛墩镇"},{"code":"441900128","name":"中堂镇"},{"code":"441900129","name":"高埗镇"},{"code":"441900401","name":"松山湖管委会"},{"code":"441900402","name":"虎门港管委会"},{"code":"441900403","name":"东莞生态园"}]},{"code":"442000","name":"中山市","childs":[{"code":"442000001","name":"石岐区街道办事处"},{"code":"442000002","name":"东区街道办事处"},{"code":"442000003","name":"火炬开发区街道办事处"},{"code":"442000004","name":"西区街道办事处"},{"code":"442000005","name":"南区街道办事处"},{"code":"442000006","name":"五桂山街道办事处"},{"code":"442000100","name":"小榄镇"},{"code":"442000101","name":"黄圃镇"},{"code":"442000102","name":"民众镇"},{"code":"442000103","name":"东凤镇"},{"code":"442000104","name":"东升镇"},{"code":"442000105","name":"古镇镇"},{"code":"442000106","name":"沙溪镇"},{"code":"442000107","name":"坦洲镇"},{"code":"442000108","name":"港口镇"},{"code":"442000109","name":"三角镇"},{"code":"442000110","name":"横栏镇"},{"code":"442000111","name":"南头镇"},{"code":"442000112","name":"阜沙镇"},{"code":"442000113","name":"南朗镇"},{"code":"442000114","name":"三乡镇"},{"code":"442000115","name":"板芙镇"},{"code":"442000116","name":"大涌镇"},{"code":"442000117","name":"神湾镇"}]},{"code":"4451","name":"潮州市","childs":[{"code":"445102","name":"湘桥区"},{"code":"445103","name":"潮安区"},{"code":"445122","name":"饶平县"}]},{"code":"4452","name":"揭阳市","childs":[{"code":"445202","name":"榕城区"},{"code":"445203","name":"揭东区"},{"code":"445222","name":"揭西县"},{"code":"445224","name":"惠来县"},{"code":"445281","name":"普宁市"}]},{"code":"4453","name":"云浮市","childs":[{"code":"445302","name":"云城区"},{"code":"445303","name":"云安区"},{"code":"445321","name":"新兴县"},{"code":"445322","name":"郁南县"},{"code":"445381","name":"罗定市"}]}]},{"code":"45","name":"广西壮族自治区","childs":[{"code":"4501","name":"南宁市","childs":[{"code":"450102","name":"兴宁区"},{"code":"450103","name":"青秀区"},{"code":"450105","name":"江南区"},{"code":"450107","name":"西乡塘区"},{"code":"450108","name":"良庆区"},{"code":"450109","name":"邕宁区"},{"code":"450110","name":"武鸣区"},{"code":"450123","name":"隆安县"},{"code":"450124","name":"马山县"},{"code":"450125","name":"上林县"},{"code":"450126","name":"宾阳县"},{"code":"450127","name":"横县"}]},{"code":"4502","name":"柳州市","childs":[{"code":"450202","name":"城中区"},{"code":"450203","name":"鱼峰区"},{"code":"450204","name":"柳南区"},{"code":"450205","name":"柳北区"},{"code":"450206","name":"柳江区"},{"code":"450222","name":"柳城县"},{"code":"450223","name":"鹿寨县"},{"code":"450224","name":"融安县"},{"code":"450225","name":"融水苗族自治县"},{"code":"450226","name":"三江侗族自治县"}]},{"code":"4503","name":"桂林市","childs":[{"code":"450302","name":"秀峰区"},{"code":"450303","name":"叠彩区"},{"code":"450304","name":"象山区"},{"code":"450305","name":"七星区"},{"code":"450311","name":"雁山区"},{"code":"450312","name":"临桂区"},{"code":"450321","name":"阳朔县"},{"code":"450323","name":"灵川县"},{"code":"450324","name":"全州县"},{"code":"450325","name":"兴安县"},{"code":"450326","name":"永福县"},{"code":"450327","name":"灌阳县"},{"code":"450328","name":"龙胜各族自治县"},{"code":"450329","name":"资源县"},{"code":"450330","name":"平乐县"},{"code":"450331","name":"荔浦县"},{"code":"450332","name":"恭城瑶族自治县"}]},{"code":"4504","name":"梧州市","childs":[{"code":"450403","name":"万秀区"},{"code":"450405","name":"长洲区"},{"code":"450406","name":"龙圩区"},{"code":"450421","name":"苍梧县"},{"code":"450422","name":"藤县"},{"code":"450423","name":"蒙山县"},{"code":"450481","name":"岑溪市"}]},{"code":"4505","name":"北海市","childs":[{"code":"450502","name":"海城区"},{"code":"450503","name":"银海区"},{"code":"450512","name":"铁山港区"},{"code":"450521","name":"合浦县"}]},{"code":"4506","name":"防城港市","childs":[{"code":"450602","name":"港口区"},{"code":"450603","name":"防城区"},{"code":"450621","name":"上思县"},{"code":"450681","name":"东兴市"}]},{"code":"4507","name":"钦州市","childs":[{"code":"450702","name":"钦南区"},{"code":"450703","name":"钦北区"},{"code":"450721","name":"灵山县"},{"code":"450722","name":"浦北县"}]},{"code":"4508","name":"贵港市","childs":[{"code":"450802","name":"港北区"},{"code":"450803","name":"港南区"},{"code":"450804","name":"覃塘区"},{"code":"450821","name":"平南县"},{"code":"450881","name":"桂平市"}]},{"code":"4509","name":"玉林市","childs":[{"code":"450902","name":"玉州区"},{"code":"450903","name":"福绵区"},{"code":"450921","name":"容县"},{"code":"450922","name":"陆川县"},{"code":"450923","name":"博白县"},{"code":"450924","name":"兴业县"},{"code":"450981","name":"北流市"}]},{"code":"4510","name":"百色市","childs":[{"code":"451002","name":"右江区"},{"code":"451021","name":"田阳县"},{"code":"451022","name":"田东县"},{"code":"451023","name":"平果县"},{"code":"451024","name":"德保县"},{"code":"451026","name":"那坡县"},{"code":"451027","name":"凌云县"},{"code":"451028","name":"乐业县"},{"code":"451029","name":"田林县"},{"code":"451030","name":"西林县"},{"code":"451031","name":"隆林各族自治县"},{"code":"451081","name":"靖西市"}]},{"code":"4511","name":"贺州市","childs":[{"code":"451102","name":"八步区"},{"code":"451103","name":"平桂区"},{"code":"451121","name":"昭平县"},{"code":"451122","name":"钟山县"},{"code":"451123","name":"富川瑶族自治县"}]},{"code":"4512","name":"河池市","childs":[{"code":"451202","name":"金城江区"},{"code":"451221","name":"南丹县"},{"code":"451222","name":"天峨县"},{"code":"451223","name":"凤山县"},{"code":"451224","name":"东兰县"},{"code":"451225","name":"罗城仫佬族自治县"},{"code":"451226","name":"环江毛南族自治县"},{"code":"451227","name":"巴马瑶族自治县"},{"code":"451228","name":"都安瑶族自治县"},{"code":"451229","name":"大化瑶族自治县"},{"code":"451281","name":"宜州市"}]},{"code":"4513","name":"来宾市","childs":[{"code":"451302","name":"兴宾区"},{"code":"451321","name":"忻城县"},{"code":"451322","name":"象州县"},{"code":"451323","name":"武宣县"},{"code":"451324","name":"金秀瑶族自治县"},{"code":"451381","name":"合山市"}]},{"code":"4514","name":"崇左市","childs":[{"code":"451402","name":"江州区"},{"code":"451421","name":"扶绥县"},{"code":"451422","name":"宁明县"},{"code":"451423","name":"龙州县"},{"code":"451424","name":"大新县"},{"code":"451425","name":"天等县"},{"code":"451481","name":"凭祥市"}]}]},{"code":"46","name":"海南省","childs":[{"code":"4601","name":"海口市","childs":[{"code":"460105","name":"秀英区"},{"code":"460106","name":"龙华区"},{"code":"460107","name":"琼山区"},{"code":"460108","name":"美兰区"}]},{"code":"4602","name":"三亚市","childs":[{"code":"460202","name":"海棠区"},{"code":"460203","name":"吉阳区"},{"code":"460204","name":"天涯区"},{"code":"460205","name":"崖州区"}]},{"code":"4603","name":"三沙市","childs":[{"code":"460321","name":"西沙群岛"},{"code":"460322","name":"南沙群岛"},{"code":"460323","name":"中沙群岛的岛礁及其海域"}]},{"code":"460400","name":"儋州市","childs":[{"code":"460400100","name":"那大镇"},{"code":"460400101","name":"和庆镇"},{"code":"460400102","name":"南丰镇"},{"code":"460400103","name":"大成镇"},{"code":"460400104","name":"雅星镇"},{"code":"460400105","name":"兰洋镇"},{"code":"460400106","name":"光村镇"},{"code":"460400107","name":"木棠镇"},{"code":"460400108","name":"海头镇"},{"code":"460400109","name":"峨蔓镇"},{"code":"460400110","name":"三都镇"},{"code":"460400111","name":"王五镇"},{"code":"460400112","name":"白马井镇"},{"code":"460400113","name":"中和镇"},{"code":"460400114","name":"排浦镇"},{"code":"460400115","name":"东成镇"},{"code":"460400116","name":"新州镇"},{"code":"460400400","name":"国营西培农场"},{"code":"460400404","name":"国营西联农场"},{"code":"460400405","name":"国营蓝洋农场"},{"code":"460400407","name":"国营八一农场"},{"code":"460400499","name":"洋浦经济开发区"},{"code":"460400500","name":"华南热作学院"}]},{"code":"4690","name":"省直辖县级行政区划","childs":[{"code":"469001","name":"五指山市"},{"code":"469002","name":"琼海市"},{"code":"469005","name":"文昌市"},{"code":"469006","name":"万宁市"},{"code":"469007","name":"东方市"},{"code":"469021","name":"定安县"},{"code":"469022","name":"屯昌县"},{"code":"469023","name":"澄迈县"},{"code":"469024","name":"临高县"},{"code":"469025","name":"白沙黎族自治县"},{"code":"469026","name":"昌江黎族自治县"},{"code":"469027","name":"乐东黎族自治县"},{"code":"469028","name":"陵水黎族自治县"},{"code":"469029","name":"保亭黎族苗族自治县"},{"code":"469030","name":"琼中黎族苗族自治县"}]}]},{"code":"50","name":"重庆市","childs":[{"code":"5001","name":"市辖区","childs":[{"code":"500101","name":"万州区"},{"code":"500102","name":"涪陵区"},{"code":"500103","name":"渝中区"},{"code":"500104","name":"大渡口区"},{"code":"500105","name":"江北区"},{"code":"500106","name":"沙坪坝区"},{"code":"500107","name":"九龙坡区"},{"code":"500108","name":"南岸区"},{"code":"500109","name":"北碚区"},{"code":"500110","name":"綦江区"},{"code":"500111","name":"大足区"},{"code":"500112","name":"渝北区"},{"code":"500113","name":"巴南区"},{"code":"500114","name":"黔江区"},{"code":"500115","name":"长寿区"},{"code":"500116","name":"江津区"},{"code":"500117","name":"合川区"},{"code":"500118","name":"永川区"},{"code":"500119","name":"南川区"},{"code":"500120","name":"璧山区"},{"code":"500151","name":"铜梁区"},{"code":"500152","name":"潼南区"},{"code":"500153","name":"荣昌区"},{"code":"500154","name":"开州区"}]},{"code":"5002","name":"县","childs":[{"code":"500228","name":"梁平县"},{"code":"500229","name":"城口县"},{"code":"500230","name":"丰都县"},{"code":"500231","name":"垫江县"},{"code":"500232","name":"武隆县"},{"code":"500233","name":"忠县"},{"code":"500235","name":"云阳县"},{"code":"500236","name":"奉节县"},{"code":"500237","name":"巫山县"},{"code":"500238","name":"巫溪县"},{"code":"500240","name":"石柱土家族自治县"},{"code":"500241","name":"秀山土家族苗族自治县"},{"code":"500242","name":"酉阳土家族苗族自治县"},{"code":"500243","name":"彭水苗族土家族自治县"}]}]},{"code":"51","name":"四川省","childs":[{"code":"5101","name":"成都市","childs":[{"code":"510104","name":"锦江区"},{"code":"510105","name":"青羊区"},{"code":"510106","name":"金牛区"},{"code":"510107","name":"武侯区"},{"code":"510108","name":"成华区"},{"code":"510112","name":"龙泉驿区"},{"code":"510113","name":"青白江区"},{"code":"510114","name":"新都区"},{"code":"510115","name":"温江区"},{"code":"510116","name":"双流区"},{"code":"510121","name":"金堂县"},{"code":"510124","name":"郫县"},{"code":"510129","name":"大邑县"},{"code":"510131","name":"蒲江县"},{"code":"510132","name":"新津县"},{"code":"510181","name":"都江堰市"},{"code":"510182","name":"彭州市"},{"code":"510183","name":"邛崃市"},{"code":"510184","name":"崇州市"},{"code":"510185","name":"简阳市"}]},{"code":"5103","name":"自贡市","childs":[{"code":"510302","name":"自流井区"},{"code":"510303","name":"贡井区"},{"code":"510304","name":"大安区"},{"code":"510311","name":"沿滩区"},{"code":"510321","name":"荣县"},{"code":"510322","name":"富顺县"}]},{"code":"5104","name":"攀枝花市","childs":[{"code":"510402","name":"东区"},{"code":"510403","name":"西区"},{"code":"510411","name":"仁和区"},{"code":"510421","name":"米易县"},{"code":"510422","name":"盐边县"}]},{"code":"5105","name":"泸州市","childs":[{"code":"510502","name":"江阳区"},{"code":"510503","name":"纳溪区"},{"code":"510504","name":"龙马潭区"},{"code":"510521","name":"泸县"},{"code":"510522","name":"合江县"},{"code":"510524","name":"叙永县"},{"code":"510525","name":"古蔺县"}]},{"code":"5106","name":"德阳市","childs":[{"code":"510603","name":"旌阳区"},{"code":"510623","name":"中江县"},{"code":"510626","name":"罗江县"},{"code":"510681","name":"广汉市"},{"code":"510682","name":"什邡市"},{"code":"510683","name":"绵竹市"}]},{"code":"5107","name":"绵阳市","childs":[{"code":"510703","name":"涪城区"},{"code":"510704","name":"游仙区"},{"code":"510705","name":"安州区"},{"code":"510722","name":"三台县"},{"code":"510723","name":"盐亭县"},{"code":"510725","name":"梓潼县"},{"code":"510726","name":"北川羌族自治县"},{"code":"510727","name":"平武县"},{"code":"510781","name":"江油市"}]},{"code":"5108","name":"广元市","childs":[{"code":"510802","name":"利州区"},{"code":"510811","name":"昭化区"},{"code":"510812","name":"朝天区"},{"code":"510821","name":"旺苍县"},{"code":"510822","name":"青川县"},{"code":"510823","name":"剑阁县"},{"code":"510824","name":"苍溪县"}]},{"code":"5109","name":"遂宁市","childs":[{"code":"510903","name":"船山区"},{"code":"510904","name":"安居区"},{"code":"510921","name":"蓬溪县"},{"code":"510922","name":"射洪县"},{"code":"510923","name":"大英县"}]},{"code":"5110","name":"内江市","childs":[{"code":"511002","name":"市中区"},{"code":"511011","name":"东兴区"},{"code":"511024","name":"威远县"},{"code":"511025","name":"资中县"},{"code":"511028","name":"隆昌县"}]},{"code":"5111","name":"乐山市","childs":[{"code":"511102","name":"市中区"},{"code":"511111","name":"沙湾区"},{"code":"511112","name":"五通桥区"},{"code":"511113","name":"金口河区"},{"code":"511123","name":"犍为县"},{"code":"511124","name":"井研县"},{"code":"511126","name":"夹江县"},{"code":"511129","name":"沐川县"},{"code":"511132","name":"峨边彝族自治县"},{"code":"511133","name":"马边彝族自治县"},{"code":"511181","name":"峨眉山市"}]},{"code":"5113","name":"南充市","childs":[{"code":"511302","name":"顺庆区"},{"code":"511303","name":"高坪区"},{"code":"511304","name":"嘉陵区"},{"code":"511321","name":"南部县"},{"code":"511322","name":"营山县"},{"code":"511323","name":"蓬安县"},{"code":"511324","name":"仪陇县"},{"code":"511325","name":"西充县"},{"code":"511381","name":"阆中市"}]},{"code":"5114","name":"眉山市","childs":[{"code":"511402","name":"东坡区"},{"code":"511403","name":"彭山区"},{"code":"511421","name":"仁寿县"},{"code":"511423","name":"洪雅县"},{"code":"511424","name":"丹棱县"},{"code":"511425","name":"青神县"}]},{"code":"5115","name":"宜宾市","childs":[{"code":"511502","name":"翠屏区"},{"code":"511503","name":"南溪区"},{"code":"511521","name":"宜宾县"},{"code":"511523","name":"江安县"},{"code":"511524","name":"长宁县"},{"code":"511525","name":"高县"},{"code":"511526","name":"珙县"},{"code":"511527","name":"筠连县"},{"code":"511528","name":"兴文县"},{"code":"511529","name":"屏山县"}]},{"code":"5116","name":"广安市","childs":[{"code":"511602","name":"广安区"},{"code":"511603","name":"前锋区"},{"code":"511621","name":"岳池县"},{"code":"511622","name":"武胜县"},{"code":"511623","name":"邻水县"},{"code":"511681","name":"华蓥市"}]},{"code":"5117","name":"达州市","childs":[{"code":"511702","name":"通川区"},{"code":"511703","name":"达川区"},{"code":"511722","name":"宣汉县"},{"code":"511723","name":"开江县"},{"code":"511724","name":"大竹县"},{"code":"511725","name":"渠县"},{"code":"511781","name":"万源市"}]},{"code":"5118","name":"雅安市","childs":[{"code":"511802","name":"雨城区"},{"code":"511803","name":"名山区"},{"code":"511822","name":"荥经县"},{"code":"511823","name":"汉源县"},{"code":"511824","name":"石棉县"},{"code":"511825","name":"天全县"},{"code":"511826","name":"芦山县"},{"code":"511827","name":"宝兴县"}]},{"code":"5119","name":"巴中市","childs":[{"code":"511902","name":"巴州区"},{"code":"511903","name":"恩阳区"},{"code":"511921","name":"通江县"},{"code":"511922","name":"南江县"},{"code":"511923","name":"平昌县"}]},{"code":"5120","name":"资阳市","childs":[{"code":"512002","name":"雁江区"},{"code":"512021","name":"安岳县"},{"code":"512022","name":"乐至县"}]},{"code":"5132","name":"阿坝藏族羌族自治州","childs":[{"code":"513201","name":"马尔康市"},{"code":"513221","name":"汶川县"},{"code":"513222","name":"理县"},{"code":"513223","name":"茂县"},{"code":"513224","name":"松潘县"},{"code":"513225","name":"九寨沟县"},{"code":"513226","name":"金川县"},{"code":"513227","name":"小金县"},{"code":"513228","name":"黑水县"},{"code":"513230","name":"壤塘县"},{"code":"513231","name":"阿坝县"},{"code":"513232","name":"若尔盖县"},{"code":"513233","name":"红原县"}]},{"code":"5133","name":"甘孜藏族自治州","childs":[{"code":"513301","name":"康定市"},{"code":"513322","name":"泸定县"},{"code":"513323","name":"丹巴县"},{"code":"513324","name":"九龙县"},{"code":"513325","name":"雅江县"},{"code":"513326","name":"道孚县"},{"code":"513327","name":"炉霍县"},{"code":"513328","name":"甘孜县"},{"code":"513329","name":"新龙县"},{"code":"513330","name":"德格县"},{"code":"513331","name":"白玉县"},{"code":"513332","name":"石渠县"},{"code":"513333","name":"色达县"},{"code":"513334","name":"理塘县"},{"code":"513335","name":"巴塘县"},{"code":"513336","name":"乡城县"},{"code":"513337","name":"稻城县"},{"code":"513338","name":"得荣县"}]},{"code":"5134","name":"凉山彝族自治州","childs":[{"code":"513401","name":"西昌市"},{"code":"513422","name":"木里藏族自治县"},{"code":"513423","name":"盐源县"},{"code":"513424","name":"德昌县"},{"code":"513425","name":"会理县"},{"code":"513426","name":"会东县"},{"code":"513427","name":"宁南县"},{"code":"513428","name":"普格县"},{"code":"513429","name":"布拖县"},{"code":"513430","name":"金阳县"},{"code":"513431","name":"昭觉县"},{"code":"513432","name":"喜德县"},{"code":"513433","name":"冕宁县"},{"code":"513434","name":"越西县"},{"code":"513435","name":"甘洛县"},{"code":"513436","name":"美姑县"},{"code":"513437","name":"雷波县"}]}]},{"code":"52","name":"贵州省","childs":[{"code":"5201","name":"贵阳市","childs":[{"code":"520102","name":"南明区"},{"code":"520103","name":"云岩区"},{"code":"520111","name":"花溪区"},{"code":"520112","name":"乌当区"},{"code":"520113","name":"白云区"},{"code":"520115","name":"观山湖区"},{"code":"520121","name":"开阳县"},{"code":"520122","name":"息烽县"},{"code":"520123","name":"修文县"},{"code":"520181","name":"清镇市"}]},{"code":"5202","name":"六盘水市","childs":[{"code":"520201","name":"钟山区"},{"code":"520203","name":"六枝特区"},{"code":"520221","name":"水城县"},{"code":"520222","name":"盘县"}]},{"code":"5203","name":"遵义市","childs":[{"code":"520302","name":"红花岗区"},{"code":"520303","name":"汇川区"},{"code":"520304","name":"播州区"},{"code":"520322","name":"桐梓县"},{"code":"520323","name":"绥阳县"},{"code":"520324","name":"正安县"},{"code":"520325","name":"道真仡佬族苗族自治县"},{"code":"520326","name":"务川仡佬族苗族自治县"},{"code":"520327","name":"凤冈县"},{"code":"520328","name":"湄潭县"},{"code":"520329","name":"余庆县"},{"code":"520330","name":"习水县"},{"code":"520381","name":"赤水市"},{"code":"520382","name":"仁怀市"}]},{"code":"5204","name":"安顺市","childs":[{"code":"520402","name":"西秀区"},{"code":"520403","name":"平坝区"},{"code":"520422","name":"普定县"},{"code":"520423","name":"镇宁布依族苗族自治县"},{"code":"520424","name":"关岭布依族苗族自治县"},{"code":"520425","name":"紫云苗族布依族自治县"}]},{"code":"5205","name":"毕节市","childs":[{"code":"520502","name":"七星关区"},{"code":"520521","name":"大方县"},{"code":"520522","name":"黔西县"},{"code":"520523","name":"金沙县"},{"code":"520524","name":"织金县"},{"code":"520525","name":"纳雍县"},{"code":"520526","name":"威宁彝族回族苗族自治县"},{"code":"520527","name":"赫章县"}]},{"code":"5206","name":"铜仁市","childs":[{"code":"520602","name":"碧江区"},{"code":"520603","name":"万山区"},{"code":"520621","name":"江口县"},{"code":"520622","name":"玉屏侗族自治县"},{"code":"520623","name":"石阡县"},{"code":"520624","name":"思南县"},{"code":"520625","name":"印江土家族苗族自治县"},{"code":"520626","name":"德江县"},{"code":"520627","name":"沿河土家族自治县"},{"code":"520628","name":"松桃苗族自治县"}]},{"code":"5223","name":"黔西南布依族苗族自治州","childs":[{"code":"522301","name":"兴义市"},{"code":"522322","name":"兴仁县"},{"code":"522323","name":"普安县"},{"code":"522324","name":"晴隆县"},{"code":"522325","name":"贞丰县"},{"code":"522326","name":"望谟县"},{"code":"522327","name":"册亨县"},{"code":"522328","name":"安龙县"}]},{"code":"5226","name":"黔东南苗族侗族自治州","childs":[{"code":"522601","name":"凯里市"},{"code":"522622","name":"黄平县"},{"code":"522623","name":"施秉县"},{"code":"522624","name":"三穗县"},{"code":"522625","name":"镇远县"},{"code":"522626","name":"岑巩县"},{"code":"522627","name":"天柱县"},{"code":"522628","name":"锦屏县"},{"code":"522629","name":"剑河县"},{"code":"522630","name":"台江县"},{"code":"522631","name":"黎平县"},{"code":"522632","name":"榕江县"},{"code":"522633","name":"从江县"},{"code":"522634","name":"雷山县"},{"code":"522635","name":"麻江县"},{"code":"522636","name":"丹寨县"}]},{"code":"5227","name":"黔南布依族苗族自治州","childs":[{"code":"522701","name":"都匀市"},{"code":"522702","name":"福泉市"},{"code":"522722","name":"荔波县"},{"code":"522723","name":"贵定县"},{"code":"522725","name":"瓮安县"},{"code":"522726","name":"独山县"},{"code":"522727","name":"平塘县"},{"code":"522728","name":"罗甸县"},{"code":"522729","name":"长顺县"},{"code":"522730","name":"龙里县"},{"code":"522731","name":"惠水县"},{"code":"522732","name":"三都水族自治县"}]}]},{"code":"53","name":"云南省","childs":[{"code":"5301","name":"昆明市","childs":[{"code":"530102","name":"五华区"},{"code":"530103","name":"盘龙区"},{"code":"530111","name":"官渡区"},{"code":"530112","name":"西山区"},{"code":"530113","name":"东川区"},{"code":"530114","name":"呈贡区"},{"code":"530122","name":"晋宁县"},{"code":"530124","name":"富民县"},{"code":"530125","name":"宜良县"},{"code":"530126","name":"石林彝族自治县"},{"code":"530127","name":"嵩明县"},{"code":"530128","name":"禄劝彝族苗族自治县"},{"code":"530129","name":"寻甸回族彝族自治县"},{"code":"530181","name":"安宁市"}]},{"code":"5303","name":"曲靖市","childs":[{"code":"530302","name":"麒麟区"},{"code":"530303","name":"沾益区"},{"code":"530321","name":"马龙县"},{"code":"530322","name":"陆良县"},{"code":"530323","name":"师宗县"},{"code":"530324","name":"罗平县"},{"code":"530325","name":"富源县"},{"code":"530326","name":"会泽县"},{"code":"530381","name":"宣威市"}]},{"code":"5304","name":"玉溪市","childs":[{"code":"530402","name":"红塔区"},{"code":"530403","name":"江川区"},{"code":"530422","name":"澄江县"},{"code":"530423","name":"通海县"},{"code":"530424","name":"华宁县"},{"code":"530425","name":"易门县"},{"code":"530426","name":"峨山彝族自治县"},{"code":"530427","name":"新平彝族傣族自治县"},{"code":"530428","name":"元江哈尼族彝族傣族自治县"}]},{"code":"5305","name":"保山市","childs":[{"code":"530502","name":"隆阳区"},{"code":"530521","name":"施甸县"},{"code":"530523","name":"龙陵县"},{"code":"530524","name":"昌宁县"},{"code":"530581","name":"腾冲市"}]},{"code":"5306","name":"昭通市","childs":[{"code":"530602","name":"昭阳区"},{"code":"530621","name":"鲁甸县"},{"code":"530622","name":"巧家县"},{"code":"530623","name":"盐津县"},{"code":"530624","name":"大关县"},{"code":"530625","name":"永善县"},{"code":"530626","name":"绥江县"},{"code":"530627","name":"镇雄县"},{"code":"530628","name":"彝良县"},{"code":"530629","name":"威信县"},{"code":"530630","name":"水富县"}]},{"code":"5307","name":"丽江市","childs":[{"code":"530702","name":"古城区"},{"code":"530721","name":"玉龙纳西族自治县"},{"code":"530722","name":"永胜县"},{"code":"530723","name":"华坪县"},{"code":"530724","name":"宁蒗彝族自治县"}]},{"code":"5308","name":"普洱市","childs":[{"code":"530802","name":"思茅区"},{"code":"530821","name":"宁洱哈尼族彝族自治县"},{"code":"530822","name":"墨江哈尼族自治县"},{"code":"530823","name":"景东彝族自治县"},{"code":"530824","name":"景谷傣族彝族自治县"},{"code":"530825","name":"镇沅彝族哈尼族拉祜族自治县"},{"code":"530826","name":"江城哈尼族彝族自治县"},{"code":"530827","name":"孟连傣族拉祜族佤族自治县"},{"code":"530828","name":"澜沧拉祜族自治县"},{"code":"530829","name":"西盟佤族自治县"}]},{"code":"5309","name":"临沧市","childs":[{"code":"530902","name":"临翔区"},{"code":"530921","name":"凤庆县"},{"code":"530922","name":"云县"},{"code":"530923","name":"永德县"},{"code":"530924","name":"镇康县"},{"code":"530925","name":"双江拉祜族佤族布朗族傣族自治县"},{"code":"530926","name":"耿马傣族佤族自治县"},{"code":"530927","name":"沧源佤族自治县"}]},{"code":"5323","name":"楚雄彝族自治州","childs":[{"code":"532301","name":"楚雄市"},{"code":"532322","name":"双柏县"},{"code":"532323","name":"牟定县"},{"code":"532324","name":"南华县"},{"code":"532325","name":"姚安县"},{"code":"532326","name":"大姚县"},{"code":"532327","name":"永仁县"},{"code":"532328","name":"元谋县"},{"code":"532329","name":"武定县"},{"code":"532331","name":"禄丰县"}]},{"code":"5325","name":"红河哈尼族彝族自治州","childs":[{"code":"532501","name":"个旧市"},{"code":"532502","name":"开远市"},{"code":"532503","name":"蒙自市"},{"code":"532504","name":"弥勒市"},{"code":"532523","name":"屏边苗族自治县"},{"code":"532524","name":"建水县"},{"code":"532525","name":"石屏县"},{"code":"532527","name":"泸西县"},{"code":"532528","name":"元阳县"},{"code":"532529","name":"红河县"},{"code":"532530","name":"金平苗族瑶族傣族自治县"},{"code":"532531","name":"绿春县"},{"code":"532532","name":"河口瑶族自治县"}]},{"code":"5326","name":"文山壮族苗族自治州","childs":[{"code":"532601","name":"文山市"},{"code":"532622","name":"砚山县"},{"code":"532623","name":"西畴县"},{"code":"532624","name":"麻栗坡县"},{"code":"532625","name":"马关县"},{"code":"532626","name":"丘北县"},{"code":"532627","name":"广南县"},{"code":"532628","name":"富宁县"}]},{"code":"5328","name":"西双版纳傣族自治州","childs":[{"code":"532801","name":"景洪市"},{"code":"532822","name":"勐海县"},{"code":"532823","name":"勐腊县"}]},{"code":"5329","name":"大理白族自治州","childs":[{"code":"532901","name":"大理市"},{"code":"532922","name":"漾濞彝族自治县"},{"code":"532923","name":"祥云县"},{"code":"532924","name":"宾川县"},{"code":"532925","name":"弥渡县"},{"code":"532926","name":"南涧彝族自治县"},{"code":"532927","name":"巍山彝族回族自治县"},{"code":"532928","name":"永平县"},{"code":"532929","name":"云龙县"},{"code":"532930","name":"洱源县"},{"code":"532931","name":"剑川县"},{"code":"532932","name":"鹤庆县"}]},{"code":"5331","name":"德宏傣族景颇族自治州","childs":[{"code":"533102","name":"瑞丽市"},{"code":"533103","name":"芒市"},{"code":"533122","name":"梁河县"},{"code":"533123","name":"盈江县"},{"code":"533124","name":"陇川县"}]},{"code":"5333","name":"怒江傈僳族自治州","childs":[{"code":"533301","name":"泸水市"},{"code":"533323","name":"福贡县"},{"code":"533324","name":"贡山独龙族怒族自治县"},{"code":"533325","name":"兰坪白族普米族自治县"}]},{"code":"5334","name":"迪庆藏族自治州","childs":[{"code":"533401","name":"香格里拉市"},{"code":"533422","name":"德钦县"},{"code":"533423","name":"维西傈僳族自治县"}]}]},{"code":"54","name":"西藏自治区","childs":[{"code":"5401","name":"拉萨市","childs":[{"code":"540102","name":"城关区"},{"code":"540103","name":"堆龙德庆区"},{"code":"540121","name":"林周县"},{"code":"540122","name":"当雄县"},{"code":"540123","name":"尼木县"},{"code":"540124","name":"曲水县"},{"code":"540126","name":"达孜县"},{"code":"540127","name":"墨竹工卡县"}]},{"code":"5402","name":"日喀则市","childs":[{"code":"540202","name":"桑珠孜区"},{"code":"540221","name":"南木林县"},{"code":"540222","name":"江孜县"},{"code":"540223","name":"定日县"},{"code":"540224","name":"萨迦县"},{"code":"540225","name":"拉孜县"},{"code":"540226","name":"昂仁县"},{"code":"540227","name":"谢通门县"},{"code":"540228","name":"白朗县"},{"code":"540229","name":"仁布县"},{"code":"540230","name":"康马县"},{"code":"540231","name":"定结县"},{"code":"540232","name":"仲巴县"},{"code":"540233","name":"亚东县"},{"code":"540234","name":"吉隆县"},{"code":"540235","name":"聂拉木县"},{"code":"540236","name":"萨嘎县"},{"code":"540237","name":"岗巴县"}]},{"code":"5403","name":"昌都市","childs":[{"code":"540302","name":"卡若区"},{"code":"540321","name":"江达县"},{"code":"540322","name":"贡觉县"},{"code":"540323","name":"类乌齐县"},{"code":"540324","name":"丁青县"},{"code":"540325","name":"察雅县"},{"code":"540326","name":"八宿县"},{"code":"540327","name":"左贡县"},{"code":"540328","name":"芒康县"},{"code":"540329","name":"洛隆县"},{"code":"540330","name":"边坝县"}]},{"code":"5404","name":"林芝市","childs":[{"code":"540402","name":"巴宜区"},{"code":"540421","name":"工布江达县"},{"code":"540422","name":"米林县"},{"code":"540423","name":"墨脱县"},{"code":"540424","name":"波密县"},{"code":"540425","name":"察隅县"},{"code":"540426","name":"朗县"}]},{"code":"5405","name":"山南市","childs":[{"code":"540502","name":"乃东区"},{"code":"540521","name":"扎囊县"},{"code":"540522","name":"贡嘎县"},{"code":"540523","name":"桑日县"},{"code":"540524","name":"琼结县"},{"code":"540525","name":"曲松县"},{"code":"540526","name":"措美县"},{"code":"540527","name":"洛扎县"},{"code":"540528","name":"加查县"},{"code":"540529","name":"隆子县"},{"code":"540530","name":"错那县"},{"code":"540531","name":"浪卡子县"}]},{"code":"5424","name":"那曲地区","childs":[{"code":"542421","name":"那曲县"},{"code":"542422","name":"嘉黎县"},{"code":"542423","name":"比如县"},{"code":"542424","name":"聂荣县"},{"code":"542425","name":"安多县"},{"code":"542426","name":"申扎县"},{"code":"542427","name":"索县"},{"code":"542428","name":"班戈县"},{"code":"542429","name":"巴青县"},{"code":"542430","name":"尼玛县"},{"code":"542431","name":"双湖县"}]},{"code":"5425","name":"阿里地区","childs":[{"code":"542521","name":"普兰县"},{"code":"542522","name":"札达县"},{"code":"542523","name":"噶尔县"},{"code":"542524","name":"日土县"},{"code":"542525","name":"革吉县"},{"code":"542526","name":"改则县"},{"code":"542527","name":"措勤县"}]}]},{"code":"61","name":"陕西省","childs":[{"code":"6101","name":"西安市","childs":[{"code":"610102","name":"新城区"},{"code":"610103","name":"碑林区"},{"code":"610104","name":"莲湖区"},{"code":"610111","name":"灞桥区"},{"code":"610112","name":"未央区"},{"code":"610113","name":"雁塔区"},{"code":"610114","name":"阎良区"},{"code":"610115","name":"临潼区"},{"code":"610116","name":"长安区"},{"code":"610117","name":"高陵区"},{"code":"610122","name":"蓝田县"},{"code":"610124","name":"周至县"},{"code":"610125","name":"户县"}]},{"code":"6102","name":"铜川市","childs":[{"code":"610202","name":"王益区"},{"code":"610203","name":"印台区"},{"code":"610204","name":"耀州区"},{"code":"610222","name":"宜君县"}]},{"code":"6103","name":"宝鸡市","childs":[{"code":"610302","name":"渭滨区"},{"code":"610303","name":"金台区"},{"code":"610304","name":"陈仓区"},{"code":"610322","name":"凤翔县"},{"code":"610323","name":"岐山县"},{"code":"610324","name":"扶风县"},{"code":"610326","name":"眉县"},{"code":"610327","name":"陇县"},{"code":"610328","name":"千阳县"},{"code":"610329","name":"麟游县"},{"code":"610330","name":"凤县"},{"code":"610331","name":"太白县"}]},{"code":"6104","name":"咸阳市","childs":[{"code":"610402","name":"秦都区"},{"code":"610403","name":"杨陵区"},{"code":"610404","name":"渭城区"},{"code":"610422","name":"三原县"},{"code":"610423","name":"泾阳县"},{"code":"610424","name":"乾县"},{"code":"610425","name":"礼泉县"},{"code":"610426","name":"永寿县"},{"code":"610427","name":"彬县"},{"code":"610428","name":"长武县"},{"code":"610429","name":"旬邑县"},{"code":"610430","name":"淳化县"},{"code":"610431","name":"武功县"},{"code":"610481","name":"兴平市"}]},{"code":"6105","name":"渭南市","childs":[{"code":"610502","name":"临渭区"},{"code":"610503","name":"华州区"},{"code":"610522","name":"潼关县"},{"code":"610523","name":"大荔县"},{"code":"610524","name":"合阳县"},{"code":"610525","name":"澄城县"},{"code":"610526","name":"蒲城县"},{"code":"610527","name":"白水县"},{"code":"610528","name":"富平县"},{"code":"610581","name":"韩城市"},{"code":"610582","name":"华阴市"}]},{"code":"6106","name":"延安市","childs":[{"code":"610602","name":"宝塔区"},{"code":"610603","name":"安塞区"},{"code":"610621","name":"延长县"},{"code":"610622","name":"延川县"},{"code":"610623","name":"子长县"},{"code":"610625","name":"志丹县"},{"code":"610626","name":"吴起县"},{"code":"610627","name":"甘泉县"},{"code":"610628","name":"富县"},{"code":"610629","name":"洛川县"},{"code":"610630","name":"宜川县"},{"code":"610631","name":"黄龙县"},{"code":"610632","name":"黄陵县"}]},{"code":"6107","name":"汉中市","childs":[{"code":"610702","name":"汉台区"},{"code":"610721","name":"南郑县"},{"code":"610722","name":"城固县"},{"code":"610723","name":"洋县"},{"code":"610724","name":"西乡县"},{"code":"610725","name":"勉县"},{"code":"610726","name":"宁强县"},{"code":"610727","name":"略阳县"},{"code":"610728","name":"镇巴县"},{"code":"610729","name":"留坝县"},{"code":"610730","name":"佛坪县"}]},{"code":"6108","name":"榆林市","childs":[{"code":"610802","name":"榆阳区"},{"code":"610803","name":"横山区"},{"code":"610821","name":"神木县"},{"code":"610822","name":"府谷县"},{"code":"610824","name":"靖边县"},{"code":"610825","name":"定边县"},{"code":"610826","name":"绥德县"},{"code":"610827","name":"米脂县"},{"code":"610828","name":"佳县"},{"code":"610829","name":"吴堡县"},{"code":"610830","name":"清涧县"},{"code":"610831","name":"子洲县"}]},{"code":"6109","name":"安康市","childs":[{"code":"610902","name":"汉滨区"},{"code":"610921","name":"汉阴县"},{"code":"610922","name":"石泉县"},{"code":"610923","name":"宁陕县"},{"code":"610924","name":"紫阳县"},{"code":"610925","name":"岚皋县"},{"code":"610926","name":"平利县"},{"code":"610927","name":"镇坪县"},{"code":"610928","name":"旬阳县"},{"code":"610929","name":"白河县"}]},{"code":"6110","name":"商洛市","childs":[{"code":"611002","name":"商州区"},{"code":"611021","name":"洛南县"},{"code":"611022","name":"丹凤县"},{"code":"611023","name":"商南县"},{"code":"611024","name":"山阳县"},{"code":"611025","name":"镇安县"},{"code":"611026","name":"柞水县"}]}]},{"code":"62","name":"甘肃省","childs":[{"code":"6201","name":"兰州市","childs":[{"code":"620102","name":"城关区"},{"code":"620103","name":"七里河区"},{"code":"620104","name":"西固区"},{"code":"620105","name":"安宁区"},{"code":"620111","name":"红古区"},{"code":"620121","name":"永登县"},{"code":"620122","name":"皋兰县"},{"code":"620123","name":"榆中县"}]},{"code":"620201","name":"嘉峪关市","childs":[{"code":"620201100","name":"新城镇"},{"code":"620201101","name":"峪泉镇"},{"code":"620201102","name":"文殊镇"},{"code":"620201401","name":"雄关区"},{"code":"620201402","name":"镜铁区"},{"code":"620201403","name":"长城区"}]},{"code":"6203","name":"金昌市","childs":[{"code":"620302","name":"金川区"},{"code":"620321","name":"永昌县"}]},{"code":"6204","name":"白银市","childs":[{"code":"620402","name":"白银区"},{"code":"620403","name":"平川区"},{"code":"620421","name":"靖远县"},{"code":"620422","name":"会宁县"},{"code":"620423","name":"景泰县"}]},{"code":"6205","name":"天水市","childs":[{"code":"620502","name":"秦州区"},{"code":"620503","name":"麦积区"},{"code":"620521","name":"清水县"},{"code":"620522","name":"秦安县"},{"code":"620523","name":"甘谷县"},{"code":"620524","name":"武山县"},{"code":"620525","name":"张家川回族自治县"}]},{"code":"6206","name":"武威市","childs":[{"code":"620602","name":"凉州区"},{"code":"620621","name":"民勤县"},{"code":"620622","name":"古浪县"},{"code":"620623","name":"天祝藏族自治县"}]},{"code":"6207","name":"张掖市","childs":[{"code":"620702","name":"甘州区"},{"code":"620721","name":"肃南裕固族自治县"},{"code":"620722","name":"民乐县"},{"code":"620723","name":"临泽县"},{"code":"620724","name":"高台县"},{"code":"620725","name":"山丹县"}]},{"code":"6208","name":"平凉市","childs":[{"code":"620802","name":"崆峒区"},{"code":"620821","name":"泾川县"},{"code":"620822","name":"灵台县"},{"code":"620823","name":"崇信县"},{"code":"620824","name":"华亭县"},{"code":"620825","name":"庄浪县"},{"code":"620826","name":"静宁县"}]},{"code":"6209","name":"酒泉市","childs":[{"code":"620902","name":"肃州区"},{"code":"620921","name":"金塔县"},{"code":"620922","name":"瓜州县"},{"code":"620923","name":"肃北蒙古族自治县"},{"code":"620924","name":"阿克塞哈萨克族自治县"},{"code":"620981","name":"玉门市"},{"code":"620982","name":"敦煌市"}]},{"code":"6210","name":"庆阳市","childs":[{"code":"621002","name":"西峰区"},{"code":"621021","name":"庆城县"},{"code":"621022","name":"环县"},{"code":"621023","name":"华池县"},{"code":"621024","name":"合水县"},{"code":"621025","name":"正宁县"},{"code":"621026","name":"宁县"},{"code":"621027","name":"镇原县"}]},{"code":"6211","name":"定西市","childs":[{"code":"621102","name":"安定区"},{"code":"621121","name":"通渭县"},{"code":"621122","name":"陇西县"},{"code":"621123","name":"渭源县"},{"code":"621124","name":"临洮县"},{"code":"621125","name":"漳县"},{"code":"621126","name":"岷县"}]},{"code":"6212","name":"陇南市","childs":[{"code":"621202","name":"武都区"},{"code":"621221","name":"成县"},{"code":"621222","name":"文县"},{"code":"621223","name":"宕昌县"},{"code":"621224","name":"康县"},{"code":"621225","name":"西和县"},{"code":"621226","name":"礼县"},{"code":"621227","name":"徽县"},{"code":"621228","name":"两当县"}]},{"code":"6229","name":"临夏回族自治州","childs":[{"code":"622901","name":"临夏市"},{"code":"622921","name":"临夏县"},{"code":"622922","name":"康乐县"},{"code":"622923","name":"永靖县"},{"code":"622924","name":"广河县"},{"code":"622925","name":"和政县"},{"code":"622926","name":"东乡族自治县"},{"code":"622927","name":"积石山保安族东乡族撒拉族自治县"}]},{"code":"6230","name":"甘南藏族自治州","childs":[{"code":"623001","name":"合作市"},{"code":"623021","name":"临潭县"},{"code":"623022","name":"卓尼县"},{"code":"623023","name":"舟曲县"},{"code":"623024","name":"迭部县"},{"code":"623025","name":"玛曲县"},{"code":"623026","name":"碌曲县"},{"code":"623027","name":"夏河县"}]}]},{"code":"63","name":"青海省","childs":[{"code":"6301","name":"西宁市","childs":[{"code":"630102","name":"城东区"},{"code":"630103","name":"城中区"},{"code":"630104","name":"城西区"},{"code":"630105","name":"城北区"},{"code":"630121","name":"大通回族土族自治县"},{"code":"630122","name":"湟中县"},{"code":"630123","name":"湟源县"}]},{"code":"6302","name":"海东市","childs":[{"code":"630202","name":"乐都区"},{"code":"630203","name":"平安区"},{"code":"630222","name":"民和回族土族自治县"},{"code":"630223","name":"互助土族自治县"},{"code":"630224","name":"化隆回族自治县"},{"code":"630225","name":"循化撒拉族自治县"}]},{"code":"6322","name":"海北藏族自治州","childs":[{"code":"632221","name":"门源回族自治县"},{"code":"632222","name":"祁连县"},{"code":"632223","name":"海晏县"},{"code":"632224","name":"刚察县"}]},{"code":"6323","name":"黄南藏族自治州","childs":[{"code":"632321","name":"同仁县"},{"code":"632322","name":"尖扎县"},{"code":"632323","name":"泽库县"},{"code":"632324","name":"河南蒙古族自治县"}]},{"code":"6325","name":"海南藏族自治州","childs":[{"code":"632521","name":"共和县"},{"code":"632522","name":"同德县"},{"code":"632523","name":"贵德县"},{"code":"632524","name":"兴海县"},{"code":"632525","name":"贵南县"}]},{"code":"6326","name":"果洛藏族自治州","childs":[{"code":"632621","name":"玛沁县"},{"code":"632622","name":"班玛县"},{"code":"632623","name":"甘德县"},{"code":"632624","name":"达日县"},{"code":"632625","name":"久治县"},{"code":"632626","name":"玛多县"}]},{"code":"6327","name":"玉树藏族自治州","childs":[{"code":"632701","name":"玉树市"},{"code":"632722","name":"杂多县"},{"code":"632723","name":"称多县"},{"code":"632724","name":"治多县"},{"code":"632725","name":"囊谦县"},{"code":"632726","name":"曲麻莱县"}]},{"code":"6328","name":"海西蒙古族藏族自治州","childs":[{"code":"632801","name":"格尔木市"},{"code":"632802","name":"德令哈市"},{"code":"632821","name":"乌兰县"},{"code":"632822","name":"都兰县"},{"code":"632823","name":"天峻县"}]}]},{"code":"64","name":"宁夏回族自治区","childs":[{"code":"6401","name":"银川市","childs":[{"code":"640104","name":"兴庆区"},{"code":"640105","name":"西夏区"},{"code":"640106","name":"金凤区"},{"code":"640121","name":"永宁县"},{"code":"640122","name":"贺兰县"},{"code":"640181","name":"灵武市"}]},{"code":"6402","name":"石嘴山市","childs":[{"code":"640202","name":"大武口区"},{"code":"640205","name":"惠农区"},{"code":"640221","name":"平罗县"}]},{"code":"6403","name":"吴忠市","childs":[{"code":"640302","name":"利通区"},{"code":"640303","name":"红寺堡区"},{"code":"640323","name":"盐池县"},{"code":"640324","name":"同心县"},{"code":"640381","name":"青铜峡市"}]},{"code":"6404","name":"固原市","childs":[{"code":"640402","name":"原州区"},{"code":"640422","name":"西吉县"},{"code":"640423","name":"隆德县"},{"code":"640424","name":"泾源县"},{"code":"640425","name":"彭阳县"}]},{"code":"6405","name":"中卫市","childs":[{"code":"640502","name":"沙坡头区"},{"code":"640521","name":"中宁县"},{"code":"640522","name":"海原县"}]}]},{"code":"65","name":"新疆维吾尔自治区","childs":[{"code":"6501","name":"乌鲁木齐市","childs":[{"code":"650102","name":"天山区"},{"code":"650103","name":"沙依巴克区"},{"code":"650104","name":"新市区"},{"code":"650105","name":"水磨沟区"},{"code":"650106","name":"头屯河区"},{"code":"650107","name":"达坂城区"},{"code":"650109","name":"米东区"},{"code":"650121","name":"乌鲁木齐县"}]},{"code":"6502","name":"克拉玛依市","childs":[{"code":"650202","name":"独山子区"},{"code":"650203","name":"克拉玛依区"},{"code":"650204","name":"白碱滩区"},{"code":"650205","name":"乌尔禾区"}]},{"code":"6504","name":"吐鲁番市","childs":[{"code":"650402","name":"高昌区"},{"code":"650421","name":"鄯善县"},{"code":"650422","name":"托克逊县"}]},{"code":"6505","name":"哈密市","childs":[{"code":"650502","name":"伊州区"},{"code":"650521","name":"巴里坤哈萨克自治县"},{"code":"650522","name":"伊吾县"}]},{"code":"6523","name":"昌吉回族自治州","childs":[{"code":"652301","name":"昌吉市"},{"code":"652302","name":"阜康市"},{"code":"652323","name":"呼图壁县"},{"code":"652324","name":"玛纳斯县"},{"code":"652325","name":"奇台县"},{"code":"652327","name":"吉木萨尔县"},{"code":"652328","name":"木垒哈萨克自治县"}]},{"code":"6527","name":"博尔塔拉蒙古自治州","childs":[{"code":"652701","name":"博乐市"},{"code":"652702","name":"阿拉山口市"},{"code":"652722","name":"精河县"},{"code":"652723","name":"温泉县"}]},{"code":"6528","name":"巴音郭楞蒙古自治州","childs":[{"code":"652801","name":"库尔勒市"},{"code":"652822","name":"轮台县"},{"code":"652823","name":"尉犁县"},{"code":"652824","name":"若羌县"},{"code":"652825","name":"且末县"},{"code":"652826","name":"焉耆回族自治县"},{"code":"652827","name":"和静县"},{"code":"652828","name":"和硕县"},{"code":"652829","name":"博湖县"}]},{"code":"6529","name":"阿克苏地区","childs":[{"code":"652901","name":"阿克苏市"},{"code":"652922","name":"温宿县"},{"code":"652923","name":"库车县"},{"code":"652924","name":"沙雅县"},{"code":"652925","name":"新和县"},{"code":"652926","name":"拜城县"},{"code":"652927","name":"乌什县"},{"code":"652928","name":"阿瓦提县"},{"code":"652929","name":"柯坪县"}]},{"code":"6530","name":"克孜勒苏柯尔克孜自治州","childs":[{"code":"653001","name":"阿图什市"},{"code":"653022","name":"阿克陶县"},{"code":"653023","name":"阿合奇县"},{"code":"653024","name":"乌恰县"}]},{"code":"6531","name":"喀什地区","childs":[{"code":"653101","name":"喀什市"},{"code":"653121","name":"疏附县"},{"code":"653122","name":"疏勒县"},{"code":"653123","name":"英吉沙县"},{"code":"653124","name":"泽普县"},{"code":"653125","name":"莎车县"},{"code":"653126","name":"叶城县"},{"code":"653127","name":"麦盖提县"},{"code":"653128","name":"岳普湖县"},{"code":"653129","name":"伽师县"},{"code":"653130","name":"巴楚县"},{"code":"653131","name":"塔什库尔干塔吉克自治县"}]},{"code":"6532","name":"和田地区","childs":[{"code":"653201","name":"和田市"},{"code":"653221","name":"和田县"},{"code":"653222","name":"墨玉县"},{"code":"653223","name":"皮山县"},{"code":"653224","name":"洛浦县"},{"code":"653225","name":"策勒县"},{"code":"653226","name":"于田县"},{"code":"653227","name":"民丰县"}]},{"code":"6540","name":"伊犁哈萨克自治州","childs":[{"code":"654002","name":"伊宁市"},{"code":"654003","name":"奎屯市"},{"code":"654004","name":"霍尔果斯市"},{"code":"654021","name":"伊宁县"},{"code":"654022","name":"察布查尔锡伯自治县"},{"code":"654023","name":"霍城县"},{"code":"654024","name":"巩留县"},{"code":"654025","name":"新源县"},{"code":"654026","name":"昭苏县"},{"code":"654027","name":"特克斯县"},{"code":"654028","name":"尼勒克县"}]},{"code":"6542","name":"塔城地区","childs":[{"code":"654201","name":"塔城市"},{"code":"654202","name":"乌苏市"},{"code":"654221","name":"额敏县"},{"code":"654223","name":"沙湾县"},{"code":"654224","name":"托里县"},{"code":"654225","name":"裕民县"},{"code":"654226","name":"和布克赛尔蒙古自治县"}]},{"code":"6543","name":"阿勒泰地区","childs":[{"code":"654301","name":"阿勒泰市"},{"code":"654321","name":"布尔津县"},{"code":"654322","name":"富蕴县"},{"code":"654323","name":"福海县"},{"code":"654324","name":"哈巴河县"},{"code":"654325","name":"青河县"},{"code":"654326","name":"吉木乃县"}]},{"code":"6590","name":"自治区直辖县级行政区划","childs":[{"code":"659001","name":"石河子市"},{"code":"659002","name":"阿拉尔市"},{"code":"659003","name":"图木舒克市"},{"code":"659004","name":"五家渠市"},{"code":"659006","name":"铁门关市"}]}]},{"code":"71","name":"台湾省","childs":[]},{"code":"81","name":"香港特别行政区","childs":[]},{"code":"82","name":"澳门特别行政区","childs":[]}]
\ No newline at end of file
diff --git a/pagesA/components/recharge/rechargePup.vue b/pagesA/components/recharge/rechargePup.vue
new file mode 100644
index 0000000..7950f10
--- /dev/null
+++ b/pagesA/components/recharge/rechargePup.vue
@@ -0,0 +1,449 @@
+<template>
+  <uni-popup type="bottom" ref="videoRecharge" :mask-click='false'>
+    <view class="pay_box">
+      <view class="header_top">
+        <text style="font-size: 32rpx;">购买解锁后可继续观看</text>
+        <uni-icons type='closeempty' size="18" @tap="hideRechargePup" color="#bababa"></uni-icons>
+      </view>
+      <view class="vider_juji">
+        <text style="font-size: 24rpx;">{{ videoInfo.name }} · 第{{ playVideoInfo.weigh }}集</text>
+        <text style="font-size: 24rpx;color: #333333;">已更新至{{ videoInfo.sum }}集</text>
+      </view>
+      <view class="vider_juji">
+        <text style="font-size: 24rpx;">购买本集需要： {{ playVideoInfo.beans }}金豆</text>
+      </view>
+      <view class="other_recharge">
+        <text style="font-size: 28rpx;">金豆充值</text>
+        <text style="font-size: 28rpx;color: #333333;font-weight: bold;">我的金豆:{{ userBeans }}</text>
+      </view>
+
+
+      <view class="vipCarBox" v-if="payListGroupId==1">
+        <view :class="[
+			   						'vipCarItem',
+			   						{'vipCarThird':item.pay_type == 1},
+			   						{'vipCarFirst': item.pay_type == 2},
+			   						{'vipCarFourth':item.pay_type == 3},
+			   						] " v-for="item in list_pay" :key="item.id" @click="purchase(item)">
+
+
+          <text class="icon" v-if="item.pay_tab">{{ item.pay_tab }}</text>
+          <view class="moneyLine">
+            <text class="money">￥{{ item.pay_money }}</text>
+            <text class="beanBtn" v-if="item.pay_give_num && item.pay_type == 2">赠{{ item.pay_num }}金豆 </text>
+          </view>
+          <text class="depict" v-if="item.pay_give_num && item.pay_type == 2">
+            {{item.pay_num}}金豆+{{item.pay_give_num}}豆
+          </text>
+          <text class="depict" v-if="!item.pay_give_num && item.pay_type == 2">
+            {{item.pay_num}}金豆
+          </text>
+          <view class="explainText" v-if="item.pay_type != 2">
+            <text class="explainTextt" v-if="item.pay_type == 1" style="color: #333333;">全部影片免费观看</text>
+            <text class="explainTextt" v-if="item.pay_type == 1 && item.remark" style="color: #333333;">{{ item.remark }}</text>
+            <text class="explainTextt" v-if="item.pay_type == 3" style="color: #FF6900;">本剧订阅全集</text>
+          </view>
+          <view class="choiceNum" v-if="item.menber_sel">{{ item.menber_sel }}%用户选择</view>
+        </view>
+      </view>
+
+      <view class="vipCarBox vipCarBoxSecond" v-else>
+        <view
+            :class="['vipCarItem',{'border':item.is_red==1}]"
+            v-for="item in list_pay" :key="item.id" @click="purchase(item)">
+
+          <text class="rightIcon" v-if="item.pay_tab">{{ item.pay_tab }}</text>
+          <view class="VipCardContent">
+            <view :class="['carMoney',{'redColor':item.is_red==1}]">
+              <text class="cardMoneyText">{{ item.pay_money }}</text>
+              元
+            </view>
+            <text class="carMoneyExplain" v-if="item.pay_give_money>0">多送{{ item.pay_give_money }}元</text>
+            <text v-else class="carMoneyExplain"></text>
+          </view>
+          <view :class="['vipCarFooter',{'footerRedColor':item.is_red!=1}]">{{ item.remark ? item.remark : '' }}
+          </view>
+          <image v-if="item.is_finger" class="hands"
+                 src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/hands.gif"
+                 mode=""></image>
+        </view>
+
+      </view>
+    </view>
+  </uni-popup>
+</template>
+
+<script>
+
+import configs from "@/utils/config";
+import PAY from '@/utils/pay'
+export default {
+  name: "rechargePup",
+  props: {
+    userBeans: {
+      type: Number,
+      default: 0
+    },
+    playVideoInfo: {
+      type: Object,
+      default: {}
+    },
+    videoInfo: {
+      type: Object,
+      default: {}
+    }
+  },
+  data() {
+    return {
+      payListGroupId: 1,
+      list_pay: [],
+      checkItem:{},
+      oid:"",
+    }
+  },
+  methods: {
+    showRechargePup() {
+      let that = this;
+      uni.request({
+        url: configs.webUrl + '/api/beans/payList',
+        data: {
+          vs_id: uni.getStorageSync('vs_id_code'),
+          token: uni.getStorageSync("userinfo").token,
+          video_list_id: this.videoInfo.id || 0
+        },
+        success: listRes => {
+          console.log(listRes.data.data)
+          that.list_pay = listRes.data.data
+          that.$refs.videoRecharge.open()
+        }, fail: (err) => {
+          uni.showToast({title: err.msg, icon: "none", duration: 2000})
+        }
+      })
+    },
+    hideRechargePup() {
+      this.$refs.videoRecharge.close()
+    },
+    purchase(item){
+      let that = this;
+      PAY.pays.lakalaPay({
+        id:item.id,
+        vid: that.playVideoInfo.id,
+        pay_type:  21,
+        token: uni.getStorageSync("userinfo").token,
+        uid: uni.getStorageSync("userinfo").id,
+        ad_code: uni.getStorageSync('get_ad_code')
+      }).then(res=>{
+        console.log(res)
+        if(res.code ==1){
+          // #ifdef H5
+          console.log('h5 open')
+          window.open(res.data.return_url, "_self")
+          // #endif
+          // #ifdef APP
+          uni.navigateTo({
+            url:"/pagesA/myCenter/wallet/webPay?url="+encodeURIComponent(res.data.return_url)
+          })
+          // #endif
+        }
+      }).catch(err=>{
+        console.log(err)
+      })
+    },
+
+
+
+
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.pay_box {
+  background: #ffffff;
+  padding-top: 30rpx;
+  border-radius: 30rpx 30rpx 0 0;
+}
+
+.header_top {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 30rpx 24rpx 20rpx 24rpx;
+}
+
+.imBtn {
+  width: 140rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  position: absolute;
+  top: 40rpx;
+  right: 100rpx;
+  background: #eeeeee;
+}
+
+.vider_juji {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 24rpx;
+}
+
+.other_recharge {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 24rpx;
+  margin-top: 40rpx;
+}
+
+
+.vipCarBox {
+  padding: 26rpx;
+  align-items: center;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  flex-direction: row;
+}
+
+.vipCarItem {
+  width: 336rpx;
+  height: 200rpx;
+  border-radius: 12rpx;
+  margin-bottom: 24rpx;
+}
+
+.vipCarFirst {
+  background-image: linear-gradient(to right, #FF9A54, #FF3C3C);
+}
+
+.vipCarSecond {
+  background-image: linear-gradient(to right, #FF9A54, #FF3C3C);
+}
+
+.vipCarThird {
+  background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/taoc2.png');
+  background-size: 100% 100%;
+}
+
+.vipCarFourth {
+  background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/dingyue_a.png');
+  background-size: 100% 100%;
+}
+
+.icon {
+  position: absolute;
+  color: #333333;
+  font-size: 20rpx;
+  font-weight: 500;
+  line-height: 35rpx;
+  padding: 0 20rpx;
+  border-radius: 0rpx 0rpx 16rpx 0rpx;
+  background: linear-gradient(180deg, #FFFFFF 0%, #FFC833 100%);
+}
+
+.vipCarThird .icon {
+  background: linear-gradient(180deg, #FF8F8F 0%, #FF3333 100%);
+  color: #ffffff;
+}
+
+.vipCarFourth .icon {
+  background: linear-gradient(90deg, #FFBC48 0%, #FF5D41 100%);
+  color: #ffffff;
+}
+
+.moneyLine {
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 0 20rpx;
+  margin-top: 45rpx;
+}
+
+.vipCarFourth .moneyLine {
+  color: #FF300A;
+  padding-left: 20rpx;
+}
+
+.money {
+  font-size: 32rpx;
+  color: #ffffff;
+}
+
+.vipCarFourth .money {
+  color: #FF300A;
+}
+
+.vipCarThird .money {
+  color: #333333;
+}
+
+.beanBtn {
+  text-align: center;
+  font-weight: 500;
+  font-size: 22rpx;
+  color: #333333;
+  line-height: 48rpx;
+  padding: 0 20rpx;
+  background: linear-gradient(180deg, #FFF2D1 0%, #FFC323 100%);
+  border-radius: 24rpx;
+}
+
+.depict {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #FFFFFF;
+  line-height: 44rpx;
+  padding: 10rpx 20rpx;
+}
+
+.explainText {
+  margin-top: 26rpx;
+  padding-left: 20rpx;
+
+}
+
+.explainText .explainTextt {
+  font-size: 28rpx;
+  font-weight: 600;
+}
+
+.choiceNum {
+  text-align: right;
+  font-size: 22rpx;
+  font-weight: 500;
+  color: #FFCA3A;
+  line-height: 32rpx;
+  padding-top: 10rpx;
+  padding-right: 20rpx;
+}
+
+// 新版
+.vipCarBoxSecond {
+  background: #eeeeee;
+}
+
+.VipCardContent {
+  padding: 30rpx 0 20rpx 0;
+}
+
+.vipCarBoxSecond .vipCarItem {
+  background: #ffffff;
+  border-radius: 12rpx;
+
+}
+
+.vipCarBoxSecond .border {
+  // border: 6rpx solid #dc3a35;
+  background-image: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/dingyue_a.png);
+  background-size: cover;
+}
+
+.vipCarBoxSecond .one {
+
+  .vipCarFooter {
+    color: #FFFFFF;
+  }
+
+  .carMoney {
+    color: #FFFFFF;
+  }
+
+  background-image: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/pay1.png);
+  background-size: cover;
+}
+
+.rightIcon {
+  position: absolute;
+  right: 0;
+  top: -10rpx;
+  line-height: 40rpx;
+  color: #ffffff;
+  font-size: 30rpx;
+  padding: 0 15rpx;
+  border-radius: 0 16rpx 0 16rpx;
+  background: rgb(253, 172, 18);
+  max-width: 336rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.carMoney {
+  text-align: center;
+  font-size: 26rpx;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  justify-content: center;
+}
+
+.carMoney .cardMoneyText {
+  font-size: 32rpx;
+  font-weight: bold;
+}
+
+.carMoneyExplain {
+  color: red;
+  text-align: center;
+  line-height: 30rpx;
+  height: 30rpx;
+  font-size: 28rpx;
+}
+
+//底部信息
+.vipCarFooter {
+  line-height: 45rpx;
+  // background-color: #dc3a35;
+  color: #000000;
+  text-align: center;
+  font-size: 26rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.redColor {
+  color: #000000;
+}
+
+//普通底部
+.footerRedColor {
+  line-height: 50rpx;
+  // background-color: #fde6e6;
+  color: #000000;
+  text-align: center;
+  font-size: 26rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  border-radius: 0 0 12rpx 12rpx;
+}
+
+.hands {
+  position: absolute;
+  right: -10px;
+  bottom: 0rpx;
+  width: 90rpx;
+  height: 90rpx;
+  z-index: 300;
+  transform: rotate(-15deg);
+}
+
+
+.explain {
+  padding-left: 20rpx;
+}
+
+.explainText {
+  line-height: 35rpx;
+  font-size: 24rpx;
+  color: #bbbbbb;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/components/share/share.vue b/pagesA/components/share/share.vue
new file mode 100644
index 0000000..856de81
--- /dev/null
+++ b/pagesA/components/share/share.vue
@@ -0,0 +1,123 @@
+
+
+<template>
+  <uni-popup ref="share" type="bottom">
+    <view class="shareCont">
+      <view class="shareHeader">
+        <text class="shareTitle">分享到</text>
+        <text class="shareClose" @click="closeShare">取消</text>
+      </view>
+      <view class="shareList">
+        <view class="shareItem" @click="shareApp('WXSceneTimeline')">
+          <image src="../../../static/wechart.png" mode="widthFix" class="shareIcon" />
+          <text class="shareText">朋友圈</text>
+        </view>
+        <view class="shareItem" @click="shareApp('WXSceneSession')">
+          <image src="../../../static/wechart.png" mode="widthFix" class="shareIcon" />
+          <text class="shareText">微信好友</text>
+        </view>
+      </view>
+    </view>
+  </uni-popup>
+</template>
+<script>
+
+
+export default {
+  name: "share",
+  props:{
+    videoInfo:{
+      type:Object,
+      default:function(){
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      userInfo:{},
+    };
+  },
+  mounted() {
+    this.userInfo = uni.getStorageSync('userInfo')
+  },
+  methods: {
+    closeShare() {
+      this.$refs.share.close();
+    },
+    showSharePup() {
+      this.$refs.share.open();
+    },
+    shareApp(type) {
+      let that = this;
+        uni.share({
+          provider: 'weixin',
+          scene: type,
+          type: 0,
+          imageUrl:that.videoInfo.coverImg, //此处图片可以更换
+          title:  "柠檬短剧",
+          summary:`我正在看 ${this.videoInfo.name} 超好看，一起来看看吧`,
+          href:"https://baogu.hnjrdzkj.xyz/h5/#/pages/promotion/promotion?id="+this.userInfo.id,
+          success: res => {
+            console.log(JSON.stringify(res));
+          },
+          fail(err) {
+            console.log(err)
+          }
+        });
+
+
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.shareCont{
+  background-color: #FFFFFF;
+  width: 750rpx;
+  padding: 34rpx;
+  border-radius: 34rpx 34rpx 0 0;
+}
+.shareHeader{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-direction: row;
+}
+.shareTitle{
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #333333;
+  line-height: 44rpx;
+}
+.shareClose{
+  font-weight: 500;
+  font-size: 28rpx;
+  color: #666666;
+  line-height: 44rpx;
+}
+.shareList{
+  padding: 60rpx 0 130rpx 0 ;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-around;
+}
+.shareIcon{
+  width: 100rpx;
+  height: 100rpx;
+}
+.shareText{
+  text-align: center;
+  font-weight: 500;
+  font-size: 24rpx;
+  color: #333333;
+  line-height: 34rpx;
+  padding-top: 12rpx;
+}
+.shareItem{
+	display: flex;
+	flex-direction: column;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/components/ti_xian.vue b/pagesA/components/ti_xian.vue
new file mode 100644
index 0000000..806ac58
--- /dev/null
+++ b/pagesA/components/ti_xian.vue
@@ -0,0 +1,192 @@
+<template>
+  <view>
+    <view class="czmain">
+      <view class="cztop">
+        <view class="czxx">提现方式：{{ type }}</view>
+        <view class="czyebox">
+          <!-- <view style="font-size: 36upx; text-align: center;">当前余额 ￥{{urerdata.money}}</view> -->
+          <view>提现金额</view>
+          <input type="digit" focus class="czye" v-model="money" placeholder="请输入提现金额"/>
+          <view>提现姓名</view>
+          <input type="text" class="czye1" v-model="name" placeholder="请输入提现姓名"/>
+          <view>提现账号</view>
+          <input type="text" class="czye1" v-model="cord" placeholder="请输入提现账号"/>
+          <!-- <view style="margin-top: 10upx; font-size: 28upx; color: #ff0000;">备注：{{configsa.txbz}}</view> -->
+          <view class="uni-btn-v uni-common-mt">
+            <button class="onstep" @click="submit">提交</button>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      loading: false,
+      money: '',
+      name: '',
+      cord: '',
+      type: '支付宝',
+      dbled: true,
+      urerdata: [],
+      configsa: [],
+      providerList: []
+    }
+  },
+  methods: {
+    submit(){
+      let that = this;
+      that.$httpRequest({
+        url: '/api/user/tx',
+        method: 'GET',
+        data: {
+          money: this.money,
+          name: this.name,
+          cord: this.cord,
+          type: this.type,
+        }
+      }).then(res => {
+        if (res.code == 1) {
+          this.$emit("successClose")
+          uni.showToast({title:res.msg,icon:'none',duration:2000})
+        }
+      })
+
+    },
+
+
+  },
+
+}
+</script>
+
+<style>
+page {
+  background: #f9f9f9;
+}
+
+.cztop {
+  position: relative;
+}
+
+.czxx {
+  top: 10px;
+  font-size: 32upx;
+  margin-left: 50upx;
+  color: #3a3a3a;
+  font-family: iconfont;
+  line-height: 80upx;
+}
+
+.czyebox {
+  padding: 20upx 50upx;
+}
+
+.czyebox > view:first-child {
+  font-size: 32upx;
+  color: #3a3a3a;
+  line-height: 50px;
+}
+
+.czye {
+  width: 100%;
+  border-bottom: 1upx solid #e5e5e5;
+  font-size: 36upx;
+  font-weight: bold;
+  color: #3a3a3a;
+  position: relative;
+  padding-left: 20px;
+  height: 40px;
+  line-height: 40px;
+}
+
+.czye:after {
+  position: absolute;
+  top: -2px;
+  left: 0;
+  content: '￥';
+  color: #3a3a3a;
+  font-size: 18px;
+}
+
+.czye1 {
+  width: 100%;
+  border-bottom: 1upx solid #e5e5e5;
+  font-size: 32upx;
+  color: #3a3a3a;
+  position: relative;
+  height: 40px;
+  line-height: 40px;
+}
+
+.onstep {
+  margin-top: 40upx;
+  background: #007AFF !important;
+}
+
+.czmain {
+  width: 94%;
+  margin: 10px auto;
+  overflow: hidden;
+  background: #fff;
+  border-radius: 16upx;
+  padding-bottom: 20px;
+  -webkit-box-shadow: 0 0 20px rgba(0, 0, 0, 0.08);
+  box-shadow: 0 0 20px rgba(0, 0, 0, 0.08);
+}
+
+.icon-alipay {
+  background: #fbfbfb;
+  padding-bottom: 20upx;
+}
+
+.icon-alipay > view:first-child {
+  margin-top: 10px;
+  font-size: 32upx;
+  padding-left: 0upx;
+  color: #3a3a3a;
+  font-family: iconfont;
+  position: relative;
+  line-height: 30px;
+}
+
+.icon-alipay:before {
+  content: "\e636";
+  margin-top: 25upx;
+  margin-right: 10upx;
+  color: #007AFF;
+}
+
+.cztype > view:first-child:after {
+  position: absolute;
+  content: "\e66c";
+  top: 0;
+  left: 0;
+  font-size: 26px;
+  color: #05c160;
+}
+
+
+.rmbLogo {
+  font-size: 40upx;
+}
+
+button {
+  background-color: #007aff;
+  color: #ffffff;
+}
+
+.uni-h1.uni-center {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: flex-end;
+}
+
+.ipaPayBtn {
+  margin-top: 30upx;
+}
+</style>
diff --git a/pagesA/integral/Exclusive.vue b/pagesA/integral/Exclusive.vue
new file mode 100644
index 0000000..2a29364
--- /dev/null
+++ b/pagesA/integral/Exclusive.vue
@@ -0,0 +1,71 @@
+<template>
+	<view class="articles">
+		<integral-articles :Commodity="listData"></integral-articles>
+	</view>
+</template>
+
+<script>
+	import integralArticles from "@/pagesA/components/integralArticles.vue"
+	export default {
+		components: {
+			integralArticles
+		},
+		data() {
+			return {
+				list: [],
+				listData: [],
+				pages: {
+					currentPage: 1,
+					pageSize: 10,
+					allPage: 1,
+				},
+			}
+		},
+		onLoad(options) {
+			uni.setNavigationBarTitle({
+				title: options.name
+			})
+			this.Commodity = this.list
+			this.getgoods()
+		},
+		methods: {
+			//获取 商品
+			getgoods() {
+				let that = this;
+				that.$httpRequest({
+					url: '/api/delivery/goods/list',
+					methods: "POST",
+					data: {
+						page: that.pages.currentPage,
+						limit: that.pages.pageSize,
+					},
+				}).then(res => {
+					if (res.code == 1) {
+						if (that.pages.currentPage == 1) {
+							that.listData = res.data.list;
+							that.pages.allPage = Math.ceil(res.data.total / that.pages.pageSize);
+						} else {
+							that.listData.push(...res.data.list)
+						}
+						this.pages.currentPage++;
+					}
+					// this.score = res.data.score
+					// that.pages.allPage = Math.ceil(res.data.total / that.pages.pageSize);
+				}).catch(err => {
+
+				})
+			}
+		},
+		onReachBottom() {
+			if (this.pages.currentPage <= this.pages.allPage) {
+				this.getgoods();
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.articles {
+		margin-top: 32rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/integral/ItemDetails.vue b/pagesA/integral/ItemDetails.vue
new file mode 100644
index 0000000..92271f9
--- /dev/null
+++ b/pagesA/integral/ItemDetails.vue
@@ -0,0 +1,236 @@
+<template>
+	<view class="pagesContent">
+		<view class="navBack">
+			<uni-icons class="backIcon" type="left" size="24" color="#333" @click="navBack"></uni-icons>
+			商品详情
+		</view>
+
+		<view class="Content">
+			<!-- 轮播图 -->
+			<view>
+				<swiper class="home-swiper-banner" style="height: 750rpx;" indicator-color="rgba(255, 255, 255, 0.3)"
+					indicator-active-color="#FFFFFF" :indicator-dots="true" :autoplay="true" :interval="3000"
+					:duration="500">
+					<swiper-item v-for="(item,index) in detailsdata.cimages" :key="index" @tap="detail(item.link,0)">
+						<image style="width: 100%;height: 750rpx;" :src="item" mode="aspectFill">
+						</image>
+					</swiper-item>
+				</swiper>
+			</view>
+			<!-- 商品信息 -->
+			<view class="commodity flex alcenter">
+				<view class="flex ml15 alcenter">
+					<view class="mr20">
+						<text class="ft24 ftw500">{{detailsdata.price}}</text>
+						<text class="ft14 ftw500">积分</text>
+					</view>
+					<text class="ftw500"
+						style="padding: 4rpx 28rpx; color: #FFC4CF; font-size: 22rpx;background-color: #FF3E62; border-radius: 20rpx;">兑换{{detailsdata.sale_num}}</text>
+				</view>
+				<view class="ftw500" style="margin-right: 56rpx;font-size: 52rpx;text-align: center;">
+					<view class="">{{score}}</view>
+					<view class="ft12 ftw500" style="color: #969CD7;">当前积分</view>
+				</view>
+			</view>
+			<view class="informationbox">
+				<view class="name text-over">{{detailsdata.name}}</view>
+				
+				<!-- <view class="specifications ">
+					<view class="">规格：12354</view>
+					<uni-icons type="right" size="12" color="#333" style="margin-right: 24rpx;"></uni-icons>
+				</view> -->
+				<view class="specifications ">
+					<view class="">库存：{{detailsdata.stock_num}}</view>
+					<uni-icons type="right" size="12" color="#333" style="margin-right: 24rpx;"></uni-icons>
+				</view>
+				
+				<!-- 底部 照片 -->
+				<view class="imgsbxo">
+					<view class="imgtop flex alcenter center">
+						<view class="imgtop_left"></view>
+						<text>商品详情</text>
+						<view class="imgtop_right"></view>
+					</view>
+					<view class="" style="font-size: 0;" v-for="(item,index) in detailsdata.cimages">
+						<image style="width: 100%;" :src="item" mode="aspectFill">
+						</image>
+					</view>
+				</view>
+			</view>
+
+			<view class="bottom_button">
+				<view class="exchange" @click="clickexchange(detailsdata.id)">立即兑换</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				banners: [{}, {}, {}, {}, {}],
+				
+				score:"",
+				detailsdata:{}
+			}
+		},
+		onLoad(e) {
+			console.log('e', e.id)
+			// this.shanchu(7)
+			this.getuser()
+			//实际
+			this.shanchu(e.id)
+
+		},
+		methods: {
+			shanchu(id) {
+				this.$httpRequest({
+					url: '/api/delivery/goods/info',
+					methods: "POST",
+					data: {
+						goods_id: id
+					},
+				}).then(res => {
+					if(res.code == 1){
+						this.detailsdata = res.data
+						console.log(this.detailsdata);
+					}
+				}).catch(err => {
+
+				})
+			},
+			//获取 用户积分
+			getuser() {
+				this.$httpRequest({
+					url: '/api/user/index',
+					methods: "POST",
+				}).then(res => {
+					console.log(res.data.score);
+					this.score = res.data.score
+				}).catch(err => {})
+			},
+
+			navBack() {
+				uni.navigateBack(1);
+			},
+			clickexchange(id) {
+				uni.navigateTo({
+					url: '/pagesA/integral/commodityOrder?id=' + id
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.pagesContent {
+		/* position: relative; */
+		background-color: #F7F8F9;
+	padding-top: 58rpx;
+	}
+
+	.navBack {
+		font-size: 32rpx;
+		color: #333333;
+		font-weight: 600;
+		text-align: center;
+		height: 160rpx;
+		line-height: 160rpx;
+		position: relative;
+		z-index: 1;
+	}
+
+	.backIcon {
+		position: absolute;
+		left: 16rpx;
+		top: 0rpx;
+	}
+
+	.Content {
+		position: absolute;
+		left: 0rpx;
+		top: 0rpx;
+		width: 100%;
+	}
+
+	.commodity {
+		background: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/commodity_bg.png);
+
+		background-repeat: no-repeat;
+		background-size: 750rpx 136rpx;
+		height: 136rpx;
+		margin-top: -16rpx;
+		z-index: 1;
+		position: relative;
+		color: #ffffff;
+		justify-content: space-between;
+	}
+
+	.informationbox {
+		margin-bottom: 160rpx;
+	}
+
+	.name {
+		width: 100%;
+		height: 100rpx;
+		line-height: 100rpx;
+		background-color: #fff;
+		padding-left: 34rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.specifications {
+		height: 100rpx;
+		line-height: 100rpx;
+		background-color: #fff;
+		padding-left: 34rpx;
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+	}
+
+	.imgsbxo {}
+
+	.imgtop {
+		height: 100rpx;
+		line-height: 100rpx;
+		background-color: #fff;
+	}
+
+	.imgtop_left {
+		width: 100rpx;
+		height: 10rpx;
+		margin-right: 20rpx;
+		background: linear-gradient(90deg, rgba(28, 28, 29, 0) 0%, #D8D8D8 100%);
+	}
+
+	.imgtop_right {
+		width: 100rpx;
+		height: 10rpx;
+		margin-left: 20rpx;
+		background: linear-gradient(270deg, rgba(28, 28, 29, 0) 0%, #D8D8D8 100%);
+	}
+
+	.bottom_button {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 160rpx;
+		z-index: 1;
+		background: #ffffff;
+	}
+
+	.exchange {
+		margin: 16rpx 28rpx 0 28rpx;
+		height: 80rpx;
+		background-color: #FFD8A9;
+		border-radius: 40rpx;
+		text-align: center;
+		line-height: 80rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #333333;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/integral/Order.vue b/pagesA/integral/Order.vue
new file mode 100644
index 0000000..fad63e4
--- /dev/null
+++ b/pagesA/integral/Order.vue
@@ -0,0 +1,356 @@
+<template>
+	<view class="pagesContent">
+		<view class="navBack">
+			<uni-icons class="backIcon" type="left" size="24" color="#333333" @click="navBack"></uni-icons>
+			我的订单
+		</view>
+
+		<view class="content">
+			<view class="typeTab">
+				<view :class="['typeItem',{'typeCheck':typeCheck==-1}]" @click="changeType(-1)">全部</view>
+				<view :class="['typeItem',{'typeCheck':typeCheck==0}]" @click="changeType(0)">待付款</view>
+				<view :class="['typeItem',{'typeCheck':typeCheck==1}]" @click="changeType(1)">待发货</view>
+				<view :class="['typeItem',{'typeCheck':typeCheck==2}]" @click="changeType(2)">待收货</view>
+				<view :class="['typeItem',{'typeCheck':typeCheck==3}]" @click="changeType(3)">已完成</view>
+				<!-- 		<view :class="['typeItem',{'typeCheck':typeCheck==4}]" @click="changeType(4)">已取消</view>
+				<view :class="['typeItem',{'typeCheck':typeCheck==5}]" @click="changeType(5)">已退款</view> -->
+			</view>
+
+			<view class="myList">
+				<view class="lineItem" v-for="(item,index) in listData" :key="item.id">
+					<view class="lineInfo box">
+						<view class="lineName">
+							<view class="ft12 ftw500 cl-999">下单时间:{{item.addtime}}</view>
+							<view class="ft12 ftw500 " style="color: #EF1857;" v-if="item.status == 0">待付款</view>
+							<view class="ft12 ftw500  cl-333" v-else-if="item.status == 1">待发货</view>
+							<view class="ft12 ftw500  cl-333" v-else-if="item.status == 2">待收货</view>
+							<view class="ft12 ftw500  cl-999" v-else-if="item.status == 3">已完成</view>
+							<view class="ft12 ftw500  cl-999" v-else-if="item.status == 4">已取消</view>
+							<view class="ft12 ftw500  cl-999" v-else-if="item.status == 5">已退款</view>
+						</view>
+						<view class="lineDescribe flex">
+							<image style="width: 176rpx;height: 176rpx;border-radius: 14rpx;" :src="item.cimage"
+								mode="">
+							</image>
+							<view class="ml10 flex"
+								style="width: 456rpx; flex-direction: column;justify-content: space-around">
+								<view class="text-over2 ftw500 cl-333" style="font-size: 30rpx;">{{item.goods_name}}
+								</view>
+								<view class="flex alcenter" style="justify-content: space-between">
+									<view class="" style="color: #EF1857;">
+										<text class="ftw500 cl-333" style="font-size: 24rpx;">实付款:</text>
+										<text class="ft20 ftw500">{{item.total_price}}</text>
+										<text class="ft14 ftw500" style="margin-left: 12rpx;">积分</text>
+									</view>
+									<view class="clE075" @click="goOrder(item,index)" v-if="item.status == 0">去付款</view>
+									<view class="clfff" @click="clickexchange" v-else-if="item.status == 1">联系客服</view>
+									<view class="clfff" @click="goOrder(item,index)" v-else-if="item.status == 2">查看订单
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<uni-load-more :status="status" :content-text="contentText" />
+		</view>
+		<uni-popup type="center" ref="pointsyes">
+			<view class="pointsyesbox">
+				<view class="ft16" style="margin-top: 30rpx;">
+					<text>客服电话：</text>
+					<text>{{serviceInfo.service_mobile}}</text>
+					<image style="width: 28rpx;height: 28rpx;padding-left: 14rpx;"
+						src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/copy.png" mode="" @click="copy(serviceInfo.service_mobile)">
+					</image>
+				</view>
+				<view class="button" style="margin-top: 92rpx;padding: 20rpx 0;" @click="navorder">确定</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				remark: "",
+				typeCheck: -1,
+				listData: [],
+				pages: {
+					currentPage: 1,
+					pageSize: 10,
+					allPage: 1,
+				},
+				status: 'more',
+				contentText: {
+					contentdown: "上拉显示更多",
+					contentrefresh: "正在加载...",
+					contentnomore: "没有更多数据了"
+				},
+				serviceInfo: {}
+			}
+		},
+		onLoad() {
+			this.status = 'more';
+			this.changeType(-1)
+			this.getserviceInfo()
+		},
+		onReachBottom() {
+			if (this.pages.currentPage <= this.pages.allPage) {
+				this.getorder()
+				this.status = 'more';
+			}
+		},
+		methods: {
+			navBack() {
+				uni.navigateBack(1);
+			},
+			//切换
+			changeType(item) {
+				this.pages.currentPage = 1
+				this.pages.allPage = 1
+				this.typeCheck = item
+				this.getorder()
+			},
+			getorder() {
+				this.status = 'loading';
+				this.$httpRequest({
+					url: '/api/delivery/order/list',
+					methods: "POST",
+					data: {
+						page: this.pages.currentPage,
+						limit: this.pages.pageSize,
+						status: this.typeCheck
+					},
+				}).then(res => {
+					if (res.code == 1) {
+						this.status = ''
+						if (this.pages.currentPage == 1) {
+							this.listData = res.data.list;
+							this.pages.allPage = Math.ceil(res.data.total / this.pages.pageSize);
+						} else if (res.data.list.length > 0) {
+							this.listData.push(...res.data.list)
+							console.log(this.listData);
+						} else {
+							this.status = 'noMore';
+							this.pages.isNextPage = 1;
+						}
+						this.pages.currentPage++;
+					}
+				}).catch(err => {
+					this.status = '';
+				})
+			},
+
+			getserviceInfo() { //app信息拿取电话
+				this.$httpRequest({
+					url: "/api/user/serviceInfo",
+					method: "GET"
+				}).then(res => {
+
+					this.serviceInfo = res.data;
+					console.log(this.serviceInfo);
+				})
+			},
+
+			goOrder(item, index) {
+				console.log(item, index);
+				uni.navigateTo({ //订单
+					url: '/pagesA/integral/completeorder?id=' + this.listData[index].order_id
+				})
+			},
+
+			clickexchange() {
+				this.$refs.pointsyes.open()
+			},
+			copy(value) {
+				uni.setClipboardData({
+					data: value, //要被复制的内容
+				});
+			},
+			navorder() {
+				this.$refs.pointsyes.close()
+			},
+
+
+
+		}
+	}
+</script>
+
+<style scoped>
+	.pagesContent {
+		background: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/order_bg.png);
+		padding-top: 58rpx;
+		background-repeat: no-repeat;
+		background-size: 750rpx 356rpx;
+		background-color: #Ffffff;
+		min-height: 100vh;
+
+	}
+
+	.navBack {
+		font-size: 32rpx;
+		color: #333333;
+		font-weight: 600;
+		text-align: center;
+		height: 120rpx;
+		line-height: 120rpx;
+		position: relative;
+		z-index: 1;
+	}
+
+	.backIcon {
+		position: absolute;
+		left: 16rpx;
+		top: 0rpx;
+	}
+
+	.content {
+		padding: 0 26rpx;
+		/* background-color: #Ffffff; */
+	}
+
+	.typeTab {
+
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-bottom: 32rpx;
+
+
+	}
+
+	.typeItem {
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #333333;
+		line-height: 40rpx;
+		margin: 0 30rpx;
+	}
+
+	.typeCheck {
+		color: #333333;
+		position: relative;
+	}
+
+	.typeCheck:before {
+		content: ' ';
+		position: absolute;
+		width: 48rpx;
+		height: 4rpx;
+		background-color: #333333;
+		bottom: -8rpx;
+		left: calc(50% - 30rpx);
+	}
+
+
+	.lineImg {
+		width: 192rpx;
+		height: 240rpx;
+		border-radius: 8rpx;
+	}
+
+	.lineName {
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #333333;
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 2rpx solid #F7F8F9;
+		padding: 24rpx;
+	}
+
+	.lineDescribe {
+		padding: 20rpx;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #999999;
+
+	}
+
+	.lineNum {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #EF1857;
+		line-height: 44rpx;
+	}
+
+	.lineItem {
+		display: flex;
+		padding-bottom: 24rpx;
+		justify-content: space-between;
+	}
+
+	.noListData {
+		position: absolute;
+		top: 40vh;
+		width: 100%;
+		text-align: center;
+		font-size: 0;
+	}
+
+	.noImg {
+		width: 314rpx;
+		height: 228rpx;
+	}
+
+	.noText {
+		font-weight: 500;
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.24);
+		line-height: 40rpx;
+		text-align: center;
+		padding-top: 20rpx;
+	}
+
+	.lineInfo {
+		height: 300rpx;
+	}
+
+	.clE075 {
+		width: 148rpx;
+		height: 60rpx;
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		border-radius: 30rpx;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #FFFFFF;
+		text-align: center;
+		line-height: 60rpx;
+	}
+
+	.clfff {
+		width: 148rpx;
+		height: 60rpx;
+		border: 2rpx solid #D8D8D8;
+		border-radius: 30rpx;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #333333;
+		text-align: center;
+		line-height: 60rpx;
+	}
+
+	.pointsyesbox {
+		width: 500rpx;
+		height: 300rpx;
+		background-color: #fff;
+		border-radius: 24rpx;
+		text-align: center;
+		padding: 24rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.button {
+		height: 80rpx;
+		width: 312rpx;
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		border-radius: 40rpx;
+		text-align: center;
+		color: #FFFFFF;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/integral/address.vue b/pagesA/integral/address.vue
new file mode 100644
index 0000000..3694692
--- /dev/null
+++ b/pagesA/integral/address.vue
@@ -0,0 +1,102 @@
+<template>
+	<view class="pagesContent">
+		<view class="content">
+			<view class="ml20 mr15 pt15">
+				<view class="mb20" v-for="(item,index) in datalist" :key="index" >
+					<view class="flex alcenter">
+						<text class="ft14 ftw500 cl-333">{{item.accept_name}}</text>
+						<text class="ft14 ftw500 cl-333 pl20">{{item.show_mobile}}</text>
+						<uni-icons type="right" size="18" color="#333333" style="margin-left: auto;" @click="clicknewaddress(2,item)"></uni-icons>
+					</view>
+					<view class="ft14 ftw500 cl-999" style="margin-top: 12rpx;">{{item.accept_province}}{{item.accept_city}}{{item.accept_exp_area}}{{item.accept_address}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="bottom_button ">
+			<view class="practices button" @click="clicknewaddress(1,'')">新增地址</view>
+		</view>
+	</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				datalist: []
+			}
+		},
+		onLoad() {
+			
+		},
+		onShow() {
+				this.getlist()
+		},
+		mounted() {
+		},
+		methods: {
+			clicknewaddress(index, item) {
+				uni.navigateTo({
+					url: '/pagesA/integral/newaddress?type=' + index + "&data=" + JSON.stringify(item)
+				})
+			},
+			getlist() {
+				this.$httpRequest({
+					url: '/api/delivery/address/list',
+					data: this.data,
+					methods: "POST",
+				}).then(res => {
+					console.log(res);
+					if (res.code == 1) {
+						this.datalist = res.data.list
+					}
+				}).catch(err => {
+					console.log('bind user err');
+					console.log(err);
+				})
+			},
+
+
+
+
+		},
+	}
+</script>
+
+<style scoped>
+	.pagesContent {
+		background-color: #fff;
+		height: 100vh;
+
+	}
+
+	.content {
+		background-color: #fff;
+		padding-bottom: 160rpx;
+	}
+
+	.bottom_button {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 160rpx;
+		z-index: 1;
+		background: #ffffff;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.practices {
+		height: 80rpx;
+		width: 100%;
+		border-radius: 40rpx;
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		text-align: center;
+		line-height: 80rpx;
+		margin: 14rpx 80rpx 0 80rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/integral/commodityOrder.vue b/pagesA/integral/commodityOrder.vue
new file mode 100644
index 0000000..0df4dd4
--- /dev/null
+++ b/pagesA/integral/commodityOrder.vue
@@ -0,0 +1,286 @@
+<template>
+	<view class="pagesContent">
+		<view class="navBack">
+			<uni-icons class="backIcon" type="left" size="24" color="#333333" @click="navBack"></uni-icons>
+			填写订单
+		</view>
+
+		<view class="content">
+			<!-- 地址 -->
+			<view class="addressbox box pt16 pb16" >
+				<view class="flex alcenter">
+					<image style="width: 40rpx; height: 40rpx;margin-left: 12rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/address.png"
+						mode="" @tap.stop="shopaddress"></image>
+					<text class="ft14 ftw500 cl-333" style="padding-left: 18rpx;" @tap.stop="shopaddress">{{address.accept_name}}</text>
+					<text class="ft14 ftw500 cl-333 pl20" @tap.stop="shopaddress">{{address.accept_mobile}}</text>
+					<uni-icons type="right" size="18" color="#333333" style="margin-left: auto;" @tap="navaddress"></uni-icons>
+				</view>
+				<view v-if="address.accept_province || address.accept_city || address.accept_exp_area || address.accept_address" class="ft14 ftw500 cl-999" style="margin-left: 70rpx;margin-top: 12rpx;" @tap.stop="shopaddress">
+					{{address.accept_province}}{{address.accept_city}}{{address.accept_exp_area}}{{address.accept_address}}
+				</view>
+				<view v-else class="ft14 ftw500 cl-999" style="margin-left: 70rpx;margin-top: 12rpx;" @tap.stop="shopaddress">
+					<text>请填写收货地址</text>
+				</view>
+			</view>
+			
+			<!-- 商品信息 -->
+			<view class="messagebox box flex">
+				<image style="width: 176rpx;height: 176rpx;border-radius: 14rpx;" :src="detailsdata.cimage" mode="">
+				</image>
+				<view class="ml10 flex" style="width: 456rpx; flex-direction: column;justify-content: space-around">
+					<view class="text-over2 ftw500 cl-333" style="font-size: 30rpx;">{{detailsdata.name}}</view>
+					<view class="" style="color: #EF1857;">
+						<text class="ft20 ftw500">{{detailsdata.price}}</text>
+						<text class="ft14 ftw500" style="margin-left: 12rpx;">积分</text>
+					</view>
+				</view>
+			</view>
+			<!-- 商品信息选择 -->
+			<view class="message_select box ">
+				<view class="flex ml15 mr15" style="justify-content: space-between">
+					<view class="ft14 ftw5000 cl-333">商品总价</view>
+					<view class="ft14 ftw5000 cl-333">{{detailsdata.price}}积分</view>
+				</view>
+				<view class=" " style="width: 100%;height: 2rpx; background-color: #F7F8F9;margin: 36rpx 0;"></view>
+				<view class="flex ml15 mr15" style="justify-content: space-between">
+					<view class="ft14 ftw5000 cl-333">总运费</view>
+					<view class="ft14 ftw5000 " style="color: #EF1857;">免运费</view>
+				</view>
+			</view>
+
+			<view class=" box " style="height: 100rpx;line-height: 100rpx;">
+				<view class="flex ml15 mr15 alcenter" style="justify-content: space-between">
+					<view class="ft14 ftw5000 cl-333">使用积分</view>
+					<image style="width: 28rpx;height: 28rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/select_icon.png" mode=""></image>
+				</view>
+			</view>
+
+			<view class="box " style="height: 100rpx;line-height: 100rpx;width: 100%;">
+				<view class="flex ml15 mr15 alcenter" style="justify-content: space-between">
+					<view class="ft14 ftw5000 cl-333" style="width: 50%;">备注</view>
+					<input class="uni-input" v-model="remark" placeholder="请输入内容" style="text-align: right;" />
+				</view>
+			</view>
+		</view>
+
+		<view class="bottom_button ">
+			<view style="height: 88rpx;display: flex;justify-content: space-between;width: 100%;align-items: baseline">
+				<view class="" style="height: 80rpx;">
+					<text class="ftw5000 ft14 cl-999" style="margin-left: 34rpx;margin-right: 20rpx;">共1件</text>
+					<text class="ftw5000 ft14 cl-999">合计：</text>
+					<text class="ftw5000 ft16 " style="color: #EF1857;">{{detailsdata.price}}</text>
+					<text class="ftw5000 ft14 " style="color: #EF1857;">积分</text>
+				</view>
+				<view class="exchange button" @click="clickexchange">提交订单</view>
+			</view>
+		</view>
+
+		<!-- 		<uni-popup type="center" ref="pointsyes">
+			<view class="pointsyesbox">
+				<view class="ft24">积分扣除成功</view>
+				<view class="button" style="margin-top: 92rpx;padding: 20rpx 0;" @click="navorder">确定</view>
+			</view>
+		</uni-popup> -->
+         <addresspopup ref="addresspopup" @replacement="replacement"></addresspopup>
+
+	</view>
+</template>
+
+<script>
+		import addresspopup from "@/pagesA/components/addresspopup.vue";
+	export default {
+		components: {
+			addresspopup
+		},
+		data() {
+			return {
+				remark: "",
+				detailsdata: {},
+				address: {}
+			}
+		},
+		onLoad(e) {
+			this.shanchu(e.id)
+		},
+		onShow(){
+			this.getlist()
+		},
+		methods: {
+			navBack() {
+				uni.navigateBack(1);
+			},
+			shanchu(id) {
+				this.$httpRequest({
+					url: '/api/delivery/goods/info',
+					methods: "POST",
+					data: {
+						goods_id: id
+					},
+				}).then(res => {
+					if (res.code == 1) {
+						this.detailsdata = res.data
+						console.log(this.detailsdata);
+					}
+				}).catch(err => {
+
+				})
+			},
+			//获取快递地址
+			getlist() {
+				this.$httpRequest({
+					url: '/api/delivery/address/list',
+					data: this.data,
+					methods: "POST",
+				}).then(res => {
+					if (res.code == 1) {
+						for (var i = 0; i < res.data.list.length; i++) {
+							res.data.list[i].is_default = 0
+							if (res.data.list[i].is_default == 1) {
+								this.address = res.data.list[i]
+								return
+							} else if (i + 1 == res.data.list.length) {
+								this.address = res.data.list[0]
+							}
+						}
+					}
+				}).catch(err => {
+					console.log('bind user err');
+					console.log(err);
+				})
+			},
+          shopaddress(){
+			  if(!this.address.accept_province || !this.address.accept_city || !this.address.accept_exp_area || !this.address.accept_address){
+				  this.navaddress();
+				  return;
+			  }
+			  this.$refs.addresspopup.addressshop(this.address)
+		  },
+
+			clickexchange() {
+				this.$httpRequest({
+					url: '/api/delivery/order/create',
+					data: {
+						goods_id: this.detailsdata.id,
+						address_id: this.address.id,
+						buy_num: 1,
+						remark: this.remark
+					},
+					methods: "POST",
+				}).then(res => {
+					uni.navigateTo({ //订单
+						url: '/pagesA/integral/completeorder?id=' + res.data.order_id
+					})
+				}).catch(err => {
+					console.log('bind user err');
+					console.log(err);
+				})
+				return
+				this.$refs.pointsyes.open()
+			},
+
+			navaddress() {
+				uni.navigateTo({ //地址
+					url: '/pagesA/integral/address'
+				})
+			},
+			replacement(data){
+				this.address = data
+			}
+
+		}
+	}
+</script>
+
+<style scoped>
+	.pagesContent {
+		background: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/order_bg.png);
+		padding-top: 54rpx;
+		background-repeat: no-repeat;
+		background-size: 750rpx 356rpx;
+		height: 356rpx;
+		background-color: #F7F8F9;
+
+	}
+
+	.navBack {
+		font-size: 32rpx;
+		color: #333333;
+		font-weight: 600;
+		text-align: center;
+		height: 120rpx;
+		line-height: 120rpx;
+		position: relative;
+		z-index: 1;
+	}
+
+	.backIcon {
+		position: absolute;
+		left: 16rpx;
+		top: 0rpx;
+	}
+
+	.content {
+		margin: 0 26rpx;
+	}
+
+	.addressbox {
+		height: 160rpx;
+		padding-right: 28rpx;
+	}
+
+	.messagebox {
+		padding: 22rpx 24rpx;
+	}
+
+	.message_select {
+		padding: 40rpx 0;
+	}
+
+	.bottom_button {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 160rpx;
+		z-index: 1;
+		background: #ffffff;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.exchange {
+		margin: 16rpx 28rpx 0 28rpx;
+		line-height: 80rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+
+	}
+
+	.button {
+		height: 80rpx;
+		width: 312rpx;
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		border-radius: 40rpx;
+		text-align: center;
+		color: #FFFFFF;
+	}
+
+	.pointsyesbox {
+		width: 500rpx;
+		height: 300rpx;
+		background-color: #fff;
+		border-radius: 24rpx;
+		text-align: center;
+		padding: 24rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+	}
+
+
+
+	.box {
+		margin-bottom: 24rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/integral/completeorder.vue b/pagesA/integral/completeorder.vue
new file mode 100644
index 0000000..3f02167
--- /dev/null
+++ b/pagesA/integral/completeorder.vue
@@ -0,0 +1,394 @@
+<template>
+	<view class="pagesContent">
+		<view class="navBack">
+			<uni-icons class="backIcon" type="left" size="24" color="#333333" @click="navBack"></uni-icons>
+			订单详情
+		</view>
+		<view class="">
+			<view class="flex alcenter ml15 mb10" v-if="orderdata.status == 0">
+				<image style="width: 72rpx;height: 72rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/payment_.png" mode="">
+				</image>
+				<text class="ml10 ft22 ftw600 cl-333">待付款</text>
+			</view>
+
+			<view class="flex alcenter ml15 mb10" v-else-if="orderdata.status == 1">
+				<image style="width: 72rpx;height: 72rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/distribution.png" mode="">
+				</image>
+				<text class="ml10 ft22 ftw600 cl-333">待发货</text>
+			</view>
+
+			<view class="flex alcenter ml15 mb10 " v-else-if="orderdata.status == 2">
+				<image style="width: 72rpx;height: 72rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/deliver_goods.png" mode="">
+				</image>
+				<text class="ml10 ft22 ftw600 cl-333">已发货</text>
+			</view>
+
+			<view class="flex alcenter ml15 mb10" v-else-if="orderdata.status == 3">
+				<image style="width: 72rpx;height: 72rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/Successful.png" mode="">
+				</image>
+				<text class="ml10 ft22 ftw600 cl-333">已完成</text>
+			</view>
+
+			<view class="flex alcenter ml15 mb10" v-else-if="orderdata.status == 4">
+				<image style="width: 72rpx;height: 72rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/Successful.png" mode="">
+				</image>
+				<text class="ml10 ft22 ftw600 cl-333">已取消</text>
+			</view>
+
+			<view class="flex alcenter ml15 mb10" v-else-if="orderdata.status == 5">
+				<image style="width: 72rpx;height: 72rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/Successful.png" mode="">
+				</image>
+				<text class="ml10 ft22 ftw600 cl-333">已退款</text>
+			</view>
+
+			<view class="flex alcenter ml15 mb10" v-else-if="orderdata.status == 26">
+				<image style="width: 72rpx;height: 72rpx;" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/Successful.png" mode="">
+				</image>
+				<text class="ml10 ft22 ftw600 cl-333">兑换成功</text>
+			</view>
+
+		</view>
+
+		<view class="content">
+			<!-- 地址 -->
+			<view class="addressbox box pt16 pb16">
+				<view class="flex alcenter">
+					<image style="width: 40rpx; height: 40rpx;margin-left: 12rpx;"
+						src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/address.png" mode=""></image>
+					<text class="ft14 ftw500 cl-333" style="padding-left: 18rpx;">{{orderdata.accept_name}}</text>
+					<text class="ft14 ftw500 cl-333 pl20">{{orderdata.accept_mobile}}</text>
+					<uni-icons type="right" size="18" color="#333333" style="margin-left: auto;"></uni-icons>
+				</view>
+				<view class="ft14 ftw500 cl-999" style="margin-left: 70rpx;margin-top: 12rpx;">
+					{{orderdata.accept_province}}{{orderdata.accept_city}}{{orderdata.accept_exp_area}}{{orderdata.accept_address}}
+				</view>
+			</view>
+			<!-- 商品信息 -->
+			<view class="messagebox box flex">
+				<view class=""></view>
+				<image style="width: 176rpx;height: 176rpx;border-radius: 14rpx;" :src="orderdata.cimage" mode="">
+				</image>
+				<view class="ml10 flex" style="width: 456rpx; flex-direction: column;justify-content: space-around">
+					<view class="text-over2 ftw500 cl-333" style="font-size: 30rpx;">{{orderdata.goods_name}}</view>
+					<view class="" style="color: #EF1857;">
+						<text class="ft20 ftw500">{{orderdata.total_amount}}</text>
+						<text class="ft14 ftw500" style="margin-left: 12rpx;">积分</text>
+					</view>
+				</view>
+			</view>
+			<!-- 商品信息选择 -->
+			<view class="message_select box ">
+				<view class="boxitem">
+					<view class="ft14 ftw5000 cl-333">商品总价</view>
+					<view class="ft14 ftw5000 " style="color: #EF1857;">{{orderdata.total_amount}}积分</view>
+				</view>
+
+				<view class="boxitem">
+					<view class="ft14 ftw5000 cl-333">总运费</view>
+					<view class="ft14 ftw5000 cl-333">{{orderdata.delivery_fee == 0.00 ? '免费': orderdata.delivery_fee }}
+					</view>
+				</view>
+				<view class="boxitem " v-if="orderdata.express_no !==''">
+					<view class="ft14 ftw5000 cl-333">物流单号</view>
+					<view class="ft14 ftw5000 cl-333 alcenter flex" style="line-height: 30rpx;">
+						<view class="" style="width: 380rpx; word-wrap:break-word;text-align: right;">
+							{{orderdata.express_no}}
+						</view>
+						<image style="width: 28rpx;height: 28rpx;padding-left: 14rpx;"
+							src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/copy.png" mode="" @click="copy(orderdata.express_no)">
+						</image>
+					</view>
+				</view>
+				<view class="boxitem" v-if="orderdata.order_no !==''">
+					<view class="ft14 ftw5000 cl-333">订单编号</view>
+					<view class="ft14 ftw5000 cl-333 alcenter">{{orderdata.order_no}}
+						<image style="width: 28rpx;height: 28rpx;padding-left: 14rpx;"
+							src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/copy.png" mode="" @click="copy(orderdata.order_no)"></image>
+					</view>
+
+				</view>
+				<view class="boxitem">
+					<view class="ft14 ftw5000 cl-333">支付方式</view>
+					<view class="ft14 ftw5000 cl-333">积分</view>
+				</view>
+				<view class="boxitem" v-if="orderdata.addtime !==''">
+					<view class="ft14 ftw5000 cl-333">下单时间</view>
+					<view class="ft14 ftw5000 cl-333">{{orderdata.addtime}}</view>
+				</view>
+				<view class="boxitem" v-if="orderdata.addtime !==''">
+					<view class="ft14 ftw5000 cl-333">备注</view>
+					<view class="ft14 ftw5000 cl-333">{{orderdata.remark}}</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="bottom_button ">
+
+			<view class="bottom_button" v-if="orderdata.is_pay == 1 && orderdata.status == 2">
+				<view class="exchange practice" style="height: 80rpx;" @click="clickexchange">联系客服</view>
+				<view class="exchange button" @click="queren">确认收货</view>
+			</view>
+
+
+			<view class="bottom_button" v-else-if="orderdata.is_pay == 0">
+				<view class="exchange practice" style="height: 80rpx;" @click="clickexchange">联系客服</view>
+				<view class="exchange button" @click="getdeliveryOrder">立即兑换</view>
+			</view>
+			<view class="practices" @click="clickexchange" v-else-if="orderdata.is_pay == 1">联系客服</view>
+		</view>
+
+		<uni-popup type="center" ref="pointsyes">
+			<view class="pointsyesbox">
+				<view class="ft16" style="margin-top: 30rpx;">
+					<text>客服电话：</text>
+					<text>{{serviceInfo.service_mobile}}</text>
+					<image style="width: 28rpx;height: 28rpx;padding-left: 14rpx;"
+						src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/copy.png" mode="" @click="copy(serviceInfo.service_mobile)">
+					</image>
+				</view>
+				<view class="button" style="margin-top: 92rpx;padding: 20rpx 0;" @click="navorder">确定</view>
+			</view>
+		</uni-popup>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				remark: "",
+				id: "",
+				orderdata: {},
+				serviceInfo: {}
+			}
+		},
+		onLoad(e) {
+			console.log(e);
+			this.id = e.id
+			this.getorderinfo()
+			this.getserviceInfo()
+		},
+		methods: {
+			navBack() {
+				uni.navigateBack(1);
+			},
+			//获取订单详情
+			getorderinfo() {
+				this.$httpRequest({
+					url: '/api/delivery/order/info',
+					methods: "POST",
+					data: {
+						order_id: this.id,
+
+					},
+				}).then(res => {
+					if (res.code == 1) {
+						console.log(res);
+						this.orderdata = res.data.info
+					}
+				}).catch(err => {
+
+				})
+			},
+			//支付订单
+			getdeliveryOrder() {
+				this.$httpRequest({
+					url: '/api/pay/deliveryOrder',
+					methods: "POST",
+					data: {
+						order_id: this.id,
+					},
+				}).then(res => {
+					
+					if (res.code == 1) {
+						uni.showToast({
+							title: "商品兑换成功",
+							icon: 'none',
+							duration: 3000
+						})
+						this.getorderinfo()
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						})
+					}
+				}).catch(err => {
+
+				})
+			},
+
+			getserviceInfo() { //app信息拿取电话
+				this.$httpRequest({
+					url: "/api/user/serviceInfo",
+					method: "GET"
+				}).then(res => {
+					this.serviceInfo = res.data;
+				})
+			},
+			queren() {
+				this.$httpRequest({
+					url: "/api/delivery/order/receive",
+					method: "POST",
+					data: {
+						order_id: this.id,
+					},
+				}).then(res => {
+					if (res.code == 1) {
+						uni.showToast({
+							title: "已确认收货",
+							icon: 'none',
+							duration: 3000
+						})
+						this.getorderinfo()
+					}
+				})
+			},
+
+			clickexchange() {
+				this.$refs.pointsyes.open()
+			},
+
+			navorder() {
+				this.$refs.pointsyes.close()
+			},
+
+			navaddress() {
+				uni.navigateTo({ //订单
+					url: '/pagesA/integral/address'
+				})
+			},
+
+			copy(value) {
+				uni.setClipboardData({
+					data: value, //要被复制的内容
+				});
+
+
+			}
+
+		}
+	}
+</script>
+
+<style scoped>
+	.pagesContent {
+		background: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/order_bg.png);
+	padding-top: 58rpx;
+		background-repeat: no-repeat;
+		background-size: 750rpx 356rpx;
+		/* height: 356rpx; */
+		background-color: #F7F8F9;
+		padding-bottom: 160rpx;
+	}
+
+	.navBack {
+		font-size: 32rpx;
+		color: #333333;
+		font-weight: 600;
+		text-align: center;
+		height: 120rpx;
+		line-height: 120rpx;
+		position: relative;
+		z-index: 1;
+	}
+
+	.backIcon {
+		position: absolute;
+		left: 16rpx;
+		top: 0rpx;
+	}
+
+	.content {
+		margin: 0 26rpx;
+	}
+
+	.addressbox {
+		height: 160rpx;
+		padding-right: 28rpx;
+	}
+
+	.messagebox {
+		padding: 22rpx 24rpx;
+	}
+
+	.message_select {}
+
+	.bottom_button {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 160rpx;
+		z-index: 1;
+		background: #ffffff;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.exchange {
+		margin: 16rpx 28rpx 0 28rpx;
+		line-height: 80rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+
+	}
+
+	.button {
+		height: 80rpx;
+		width: 312rpx;
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		border-radius: 40rpx;
+		text-align: center;
+		color: #FFFFFF;
+	}
+
+	.pointsyesbox {
+		width: 500rpx;
+		height: 300rpx;
+		background-color: #fff;
+		border-radius: 24rpx;
+		text-align: center;
+		padding: 24rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.practice {
+		height: 80rpx;
+		width: 312rpx;
+		border-radius: 40rpx;
+		text-align: center;
+		color: #000000;
+		border: 2rpx solid #D8D8D8;
+	}
+
+	.practices {
+		height: 80rpx;
+		width: 100%;
+		border-radius: 40rpx;
+
+		border: 2rpx solid #D8D8D8;
+		text-align: center;
+		line-height: 80rpx;
+		margin: 14rpx 80rpx 0 80rpx;
+	}
+
+	.boxitem {
+		display: flex;
+		height: 120rpx;
+		line-height: 120rpx;
+		justify-content: space-between;
+		padding: 0 30rpx;
+		border-bottom: 2rpx solid #F7F8F9;
+	}
+
+
+	.box {
+		margin-bottom: 24rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/integral/integralShop.vue b/pagesA/integral/integralShop.vue
new file mode 100644
index 0000000..65727ec
--- /dev/null
+++ b/pagesA/integral/integralShop.vue
@@ -0,0 +1,223 @@
+<template>
+	<view class="page">
+		<view class="navBack">
+			<uni-icons class="backIcon" type="left" size="24" color="#ffffff" @click="navBack"></uni-icons>
+			积分商城
+		</view>
+		<view class="integralbox">
+			<view class="integral_top">
+				<view class="ftw500" style="font-size: 72rpx;color: #333;">{{score}}</view>
+				<view class="ftw500 ft12" style="color: #846666;">当前积分</view>
+			</view>
+
+			<view class="integral_bottom">
+				<view class="flex wrap">
+					<view class="integral_itme flex alcenter plr15" style="flex-direction: column"
+						@click="navpointsdetail">
+						<image class="barIcon" style="width: 64rpx;height: 64rpx;"
+							src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/js.png" mode="scaleToFill">
+						</image>
+						<view class="">积分明细</view>
+					</view>
+					<view class="integral_itme flex alcenter plr15" style="flex-direction: column" @click="navOrder">
+						<image class="barIcon" style="width: 64rpx;height: 64rpx;"
+							src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/jsdd.png" mode="scaleToFill">
+						</image>
+						<view class="">订单记录</view>
+					</view>
+				</view>
+
+				<view class="exchange" @click="shopjing">
+					<view class="">兑换金豆</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="exclusive mt12 mb16" @click="exclusive">
+			<view class="exclusiveitem flex alcenter space">
+				<view class="">恒泰业主专享</view>
+				<image style="width: 20rpx;height: 20rpx;" src="https://yaohe666.com/static/jf/right_ionc.png" mode=""></image>
+			</view>
+		</view>
+
+		<view class="articles">
+			<integral-articles :Commodity="listData"></integral-articles>
+		</view>
+		<integralTrade ref="integral" @success="getuser"> </integralTrade>
+
+	</view>
+</template>
+
+<script>
+	import integralArticles from "@/pagesA/components/integralArticles.vue"
+	import integralTrade from "@/pagesA/components/integralTrade.vue"
+	export default {
+		components: {
+			integralArticles,
+			integralTrade
+		},
+		data() {
+			return {
+				listData: [],
+				Commodity: [],
+				score:"",
+				pages: {
+					currentPage: 1,
+					pageSize: 10,
+					allPage: 1,
+				},
+			}
+		},
+		mounted() {
+			this.Commodity = this.list
+			this.getgoods()
+		},
+		onShow(){
+			this.getuser()
+		},
+		methods: {
+			navBack() {
+				uni.navigateBack(1);
+			},
+			exclusive() {
+				uni.navigateTo({ //专享
+					url: '/pagesA/integral/Exclusive?name=' + "恒泰业主专享"
+				})
+			},
+			navpointsdetail() { //明细
+				uni.navigateTo({
+					url: '/pagesA/integral/pointsdetail'
+				})
+			},
+			navOrder() { //订单
+				uni.navigateTo({
+					url: '/pagesA/integral/Order'
+				})
+			},
+			shopjing() {
+				this.$refs.integral.pointsyesshop()
+			},
+           //获取 用户积分
+			getuser() {
+				this.$httpRequest({
+					url: '/api/user/index',
+					methods: "POST",
+				}).then(res => {
+					console.log(res.data.score);
+					this.score = res.data.score
+				}).catch(err => {
+				})
+			},
+			//获取 商品
+			getgoods(){
+			let that = this;
+				that.$httpRequest({
+					url: '/api/delivery/goods/list',
+					methods: "POST",
+					data: {
+						page: that.pages.currentPage,
+						limit: that.pages.pageSize,
+					},
+				}).then(res => {
+					if(res.code == 1){
+						if (that.pages.currentPage == 1) {
+							that.listData = res.data.list;
+							that.pages.allPage = Math.ceil(res.data.total / that.pages.pageSize);
+						} else {
+							that.listData.push(...res.data.list)
+						}
+						this.pages.currentPage++;
+					}
+				}).catch(err => {
+				
+				})
+			}
+			
+
+
+
+
+		},
+		onReachBottom() {
+		if (this.pages.currentPage <= this.pages.allPage) {
+			this.getgoods();
+		}
+		}
+
+	}
+</script>
+
+<style scoped>
+	.page {
+		background-image: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/jf_bg.png);
+		background-size: 100% 389rpx;
+		height: 389rpx;
+		padding-top: 44rpx;
+		background-color: #F7F8F9;
+	}
+
+	.navBack {
+		font-size: 32rpx;
+		color: #ffffff;
+		font-weight: 600;
+		text-align: center;
+		height: 128rpx;
+		line-height: 128rpx;
+		position: relative;
+	}
+
+	.backIcon {
+		position: absolute;
+		left: 16rpx;
+		top: 0rpx;
+	}
+
+	.integralbox {
+		background-image: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/jb_bg1.png);
+		background-repeat: no-repeat;
+		background-size: 700rpx 392rpx;
+		margin: 0 25rpx;
+		height: 389rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
+
+	.integral_top {
+		margin-top: 36rpx;
+		margin-left: 88rpx;
+	}
+
+	.integral_bottom {
+		display: flex;
+		align-items: flex-end;
+		justify-content: space-between;
+		margin-bottom: 32rpx;
+	}
+
+	.exchange {
+		width: 240rpx;
+		height: 80rpx;
+		background: linear-gradient(90deg, #FFA100 0%, #FFD11E 100%);
+		border-radius: 40rpx;
+		text-align: center;
+		line-height: 80rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+		margin-right: 34rpx;
+	}
+
+	.exclusiveitem {
+		margin: 0 25rpx;
+		width: 700rpx;
+		height: 100rpx;
+		padding: 0 24rpx 0 32rpx;
+		background: linear-gradient(158deg, #FFF7EA 0%, #FFFFFF 100%);
+		border-radius: 24rpx;
+	}
+
+	.articles {
+		/* margin: 0 25rpx; */
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/integral/newaddress.vue b/pagesA/integral/newaddress.vue
new file mode 100644
index 0000000..6c4dbd2
--- /dev/null
+++ b/pagesA/integral/newaddress.vue
@@ -0,0 +1,253 @@
+<template>
+	<view class="pagesContent">
+		<view class="message_select box ">
+			<view class="boxitem">
+				<view class="ft14 ftw5000 cl-333">收货人</view>
+				<input class="uni-input" style="width: 440rpx;" v-model="data.accept_name" placeholder="请输入收货人姓名" />
+			</view>
+
+			<view class="boxitem">
+				<view class="ft14 ftw5000 cl-333">手机号</view>
+				<input class="uni-input" style="width: 440rpx;" type="number" maxlength="11"  v-model="data.accept_mobile" placeholder="请输入手机号码" />
+			</view>
+			<view class="boxitem">
+				<view class="ft14 ftw5000 cl-333">所在地区</view>
+				<pick-regions :defaultRegion="defaultRegionCode" @getRegion="handleGetRegion">
+					<view class="flex alcenter" style="width: 440rpx; justify-content: space-between;color: grey;">
+
+						<text v-if="data.accept_province==''">请选择省、市、区</text>
+						<text v-else
+							style="color: #191919; line-height: 30rpx;">{{data.accept_province}},{{data.accept_city}},{{data.accept_exp_area}}</text>
+
+						<uni-icons class="backIcon" type="right" size="18" color="#333333"></uni-icons>
+					</view>
+				</pick-regions>
+			</view>
+
+
+			<view class="boxitem">
+				<view class="ft14 ftw5000 cl-333">详细地址</view>
+				<input class="uni-input" style="width: 440rpx;" v-model="data.accept_address" placeholder="请输入详细地址" />
+			</view>
+
+			<view class="boxitem">
+				<view class="ft14 ftw5000 cl-333">设置默认地址</view>
+				<switch :checked="checkeddata" @change="switch1Change" />
+			</view>
+		</view>
+		<view class="bottom_button " v-if="type == 1">
+			<view class="practices button" @click="baocun">保存</view>
+		</view>
+		<view class="bottom_button" v-else>
+			<view class="baocun1 button" @click="shanchu">删除</view>
+			<view class="baocun2 button" @click="xiugai">修改</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pickRegions from '@/pagesA/components/pick-regions/pick-regions.vue'
+	export default {
+		components: {
+			pickRegions
+		},
+		data() {
+			return {
+				data: {
+					accept_name: "",
+					accept_mobile: "",
+					accept_province: "",
+					accept_city: "",
+					accept_exp_area: "",
+					accept_address: "",
+					is_default: 0,
+				},
+				defaultRegionCode: '100000',
+				type: 1,
+				ids: "",
+				checkeddata: true
+
+			}
+		},
+		onLoad(e) {
+			let data = JSON.parse(e.data)
+
+
+			if (data.is_default == 1) {
+				this.checkeddata = true
+			} else {
+				this.checkeddata = false
+			}
+			if (e.type == 1) {
+				this.type == 1
+				uni.setNavigationBarTitle({
+					title: "新增地址"
+				})
+			} else {
+				this.type = 2
+				uni.setNavigationBarTitle({
+					title: "修改地址"
+				})
+
+				this.ids = data.id
+				this.data.accept_name = data.accept_name
+				this.data.accept_mobile = data.accept_mobile
+				this.data.accept_province = data.accept_province
+				this.data.accept_city = data.accept_city
+				this.data.accept_exp_area = data.accept_exp_area
+				this.data.accept_address = data.accept_address
+				this.data.is_default = data.is_default
+			}
+		},
+		methods: {
+			switch1Change(e) {
+				if (e.detail.value) {
+					this.data.is_default = 1
+					this.checkeddata = e.detail.value
+
+				} else {
+					this.data.is_default = 0
+					this.checkeddata = e.detail.value
+				}
+			},
+			// 获取选择的地区
+			handleGetRegion(region) {
+				this.data.accept_province = region[0].name
+				this.data.accept_city = region[1].name
+				this.data.accept_exp_area = region[2].name
+			},
+			baocun() {
+				this.$httpRequest({
+					url: '/api/delivery/address/add',
+					data: this.data,
+					methods: "POST",
+				}).then(res => {
+					if (res.code == 1) {
+						uni.showToast({
+							title: "创建成功",
+							icon: 'none',
+							duration: 1500
+						})
+						uni.navigateBack(1);
+					}
+				}).catch(err => {
+					console.log('bind user err');
+					console.log(err);
+				})
+			},
+			shanchu() {
+				this.$httpRequest({
+					url: '/api/delivery/address/del',
+					data: {
+						id: this.ids
+					},
+					methods: "POST",
+				}).then(res => {
+					if (res.code == 1) {
+						uni.showToast({
+							title: "删除成功",
+							icon: 'none',
+							duration: 1500
+						})
+						uni.navigateBack(1)
+					}
+				}).catch(err => {
+					console.log('bind user err');
+					console.log(err);
+				})
+			},
+			xiugai() {
+				this.data.id = this.ids
+				this.$httpRequest({
+					url: '/api/delivery/address/edit',
+					data: this.data,
+					methods: "POST",
+				}).then(res => {
+					if (res.code == 1) {
+						uni.showToast({
+							title: "修改成功",
+							icon: 'none',
+							duration: 1500
+						})
+					}
+				}).catch(err => {
+					console.log('bind user err');
+					console.log(err);
+				})
+
+
+
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.pagesContent {}
+
+	.message_select {
+		margin: 25rpx;
+		width: 700rpx;
+	}
+
+	.boxitem {
+		display: flex;
+		height: 120rpx;
+		line-height: 120rpx;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 30rpx;
+		border-bottom: 2rpx solid #F7F8F9;
+	}
+
+	.bottom_button {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 160rpx;
+		z-index: 1;
+		background: #ffffff;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.practices {
+		height: 80rpx;
+		width: 100%;
+		border-radius: 40rpx;
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		text-align: center;
+		line-height: 80rpx;
+		margin: 14rpx 80rpx 0 80rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
+
+	.baocun1 {
+		height: 80rpx;
+		width: 45%;
+		border-radius: 40rpx;
+		border: 2rpx solid #D8D8D8;
+		text-align: center;
+		line-height: 80rpx;
+		margin: 14rpx 40rpx 0 40rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #000000;
+	}
+
+	.baocun2 {
+		height: 80rpx;
+		width: 45%;
+		border-radius: 40rpx;
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		text-align: center;
+		line-height: 80rpx;
+		margin: 14rpx 40rpx 0 40rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/integral/pointsdetail.vue b/pagesA/integral/pointsdetail.vue
new file mode 100644
index 0000000..098abb5
--- /dev/null
+++ b/pagesA/integral/pointsdetail.vue
@@ -0,0 +1,260 @@
+<template>
+	<view class="pagesContent">
+		<view class="navBack">
+			<uni-icons class="backIcon" type="left" size="24" color="#333333" @click="navBack"></uni-icons>
+			积分明细
+		</view>
+		<view class="box flex alcenter"
+			style="height: 120rpx; margin: 0 26rpx; width: 700rpx;justify-content: space-between">
+			<view class="flex alcenter" style="margin-left: 36rpx;">
+				<text class="ft14 ftw500" style="color: #666666;">积分余额：</text>
+				<text class="ft24 ftw600 cl-333">{{score}}</text>
+			</view>
+			<view class="ft14 ftw500" style="margin-right: 36rpx; border: 2rpx solid #09D89E;width: 172rpx;
+height: 60rpx; text-align: center; line-height: 60rpx; color: #09D89E;border-radius: 12rpx;" @click="shopjing">兑换金豆
+			</view>
+		</view>
+		<view class="content">
+			<view class="typeTab">
+				<view :class="['typeItem',{'typeCheck':typeCheck==2}]" @click="changeType(2)">收入明细</view>
+				<view :class="['typeItem',{'typeCheck':typeCheck==1}]" @click="changeType(1)">支出明细</view>
+			</view>
+
+			<view class="myList">
+				<view class="lineItem" v-for="(item,index) in listData" :key="item.id">
+					<view class="lineInfo">
+						<view class="lineName">{{item.memo}}</view>
+						<view class="lineDescribe">{{item.createtime}}</view>
+					</view>
+					<view class="lineNum">{{item.score}}</view>
+				</view>
+			</view>
+			<uni-load-more :status="status" :content-text="contentText" />
+		</view>
+		<integralTrade ref="integral"> </integralTrade>
+	</view>
+</template>
+
+<script>
+	import integralTrade from "@/pagesA/components/integralTrade.vue"
+	export default {
+		components: {
+			integralTrade
+		},
+		data() {
+			return {
+				remark: "",
+				typeCheck: 2,
+				listData: [],
+				pages: {
+					currentPage: 1,
+					pageSize: 10,
+					allPage: 1,
+				},
+				status: 'more',
+				contentText: {
+					contentdown: "上拉显示更多",
+					contentrefresh: "正在加载...",
+					contentnomore: "没有更多数据了"
+				},
+				score:"",
+			}
+		},
+		onLoad() {
+			this.status = 'more';
+			this.changeType(2)
+			this.getuser()
+		},
+		onReachBottom() {
+			if (this.pages.currentPage <= this.pages.allPage) {
+				this.getuserscoreinfo()
+				this.status = 'more';
+			}
+		},
+		methods: {
+			navBack() {
+				uni.navigateBack(1);
+			},
+			changeType(item) {
+				this.typeCheck = item
+				this.getuserscoreinfo()
+			},
+			getuserscoreinfo() {
+				this.status = 'loading';
+				this.$httpRequest({
+					url: '/api/user/userscoreinfo',
+					methods: "POST",
+					data: {
+						page: this.pages.currentPage,
+						limit: this.pages.pageSize,
+						type: this.typeCheck
+					},
+				}).then(res => {
+						this.status = ''
+						if (this.pages.currentPage == 1) {
+							this.listData = res.rows;
+							this.pages.allPage = Math.ceil(res.data.total / this.pages.pageSize);
+						} else if (res.rows.length > 0) {
+							this.listData.push(...res.rows)
+						} else {
+							this.status = 'noMore';
+							this.pages.isNextPage = 1;
+						}
+						this.pages.currentPage++;
+				}).catch(err => {
+					this.status = '';
+				})
+			},
+			//获取 用户积分
+			getuser() {
+				this.$httpRequest({
+					url: '/api/user/index',
+					methods: "POST",
+				}).then(res => {
+					console.log(res.data.score);
+					this.score = res.data.score
+				}).catch(err => {})
+			},
+
+			shopjing() {
+				this.$refs.integral.pointsyesshop()
+			}
+
+
+
+
+		}
+	}
+</script>
+
+<style scoped>
+	.pagesContent {
+		background: url(https://wx.yaohe.hnjrdzkj.xyz/static/wechat/shop/wechat/static/order_bg.png);
+	padding-top: 58rpx;
+		background-repeat: no-repeat;
+		background-size: 750rpx 356rpx;
+		background-color: #Ffffff;
+		min-height: 100vh;
+
+	}
+
+	.navBack {
+		font-size: 32rpx;
+		color: #333333;
+		font-weight: 600;
+		text-align: center;
+		height: 120rpx;
+		line-height: 120rpx;
+		position: relative;
+		z-index: 1;
+	}
+
+	.backIcon {
+		position: absolute;
+		left: 16rpx;
+		top: 0rpx;
+	}
+
+	.content {
+		padding: 0 26rpx;
+		/* background-color: #Ffffff; */
+	}
+
+	.typeTab {
+		padding: 0 42rpx;
+		padding-top: 80rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+
+
+	}
+
+	.typeItem {
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #999999;
+		line-height: 40rpx;
+		margin-right: 70rpx;
+	}
+
+	.typeCheck {
+		color: #333333;
+		position: relative;
+	}
+
+	.typeCheck:before {
+		content: ' ';
+		position: absolute;
+		width: 48rpx;
+		height: 4px;
+		background-color: #333333;
+		bottom: -16rpx;
+		left: calc(50% - 30rpx);
+	}
+
+
+	.lineImg {
+		width: 192rpx;
+		height: 240rpx;
+		border-radius: 8rpx;
+	}
+
+	.lineName {
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #333333;
+		line-height: 48rpx;
+
+	}
+
+	.lineDescribe {
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #999999;
+		line-height: 34rpx;
+	}
+
+	.lineNum {
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #EF1857;
+		line-height: 44rpx;
+	}
+
+	.lineItem {
+		display: flex;
+		padding-top: 24rpx;
+		padding-bottom: 30rpx;
+		justify-content: space-between;
+		border-bottom: 2rpx solid #F7F8F9;
+		align-items: center;
+
+	}
+
+	.noListData {
+		position: absolute;
+		top: 40vh;
+		width: 100%;
+		text-align: center;
+		font-size: 0;
+
+
+
+	}
+
+	.noImg {
+		width: 314rpx;
+		height: 228rpx;
+	}
+
+	.noText {
+		font-weight: 500;
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.24);
+		line-height: 40rpx;
+		text-align: center;
+		padding-top: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/login/forget.vue b/pagesA/login/forget.vue
new file mode 100644
index 0000000..6da28b7
--- /dev/null
+++ b/pagesA/login/forget.vue
@@ -0,0 +1,226 @@
+<template>
+  <view class="content">
+    <view class="list">
+      <view class="tishi">若您忘记了密码，可在此重新设置新密码。</view>
+      <view class="list-call">
+        <image class="img" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/1.png"></image>
+        <input class="sl-input" type="number" v-model="phone" maxlength="11" placeholder="请输入手机号" />
+      </view>
+      <view class="list-call">
+        <image class="img" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/2.png"></image>
+        <input class="sl-input" type="text" v-model="password" maxlength="32" placeholder="请输入新密码" :password="!showPassword" />
+        <image class="img" :src="showPassword?'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/op.png':'https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/cl.png'" @tap="display"></image>
+      </view>
+      <view class="list-call">
+        <image class="img" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/3.png"></image>
+        <input class="sl-input" type="number" v-model="code" maxlength="4" placeholder="验证码" />
+        <view class="yzm" :class="{ yzms: second>0 }" @tap="getcode">{{yanzhengma}}</view>
+      </view>
+    </view>
+    <view class="button-login" hover-class="button-hover" @tap="bindLogin()">修改密码 </view>
+
+  </view>
+</template>
+
+<script>
+var _this, js;
+export default {
+  data() {
+    return {
+      phone: '',
+      second: 0,
+      code: "",
+      showPassword: false,
+      password: '',
+      codeInterVal:null
+    }
+  },
+  onLoad() {
+    _this = this;
+  },
+  computed: {
+    yanzhengma() {
+      if (this.second == 0) {
+        return '获取验证码';
+      } else {
+        if (this.second < 10) {
+          return '重新获取0' + this.second;
+        } else {
+          return '重新获取' + this.second;
+        }
+      }
+    }
+  },
+  onUnload() {
+    this.clear()
+  },
+  methods: {
+    display() {
+      this.showPassword = !this.showPassword
+    },
+    clear(){
+      clearInterval(js)
+      js = null
+      this.second = 0
+    },
+    getcode() {
+      let _this = this;
+      if (this.phone.length != 11) {
+        uni.showToast({
+          icon: 'none',
+          title: '手机号不正确'
+        });
+        return;
+      }
+      if (this.second > 0) {
+        return;
+      }
+      _this.second = 60;
+      this.codeInterVal = setInterval(function () {
+        _this.second--;
+        if (_this.second == 0) {
+          clearInterval(_this.codeInterVal)
+        }
+      }, 1000)
+      _this.$httpRequest({
+        url:"/api/sms/index",
+        data:{
+          phone:_this.phone
+        }
+      }).then(res=>{
+        uni.showToast({title: res.msg, icon: "none"});
+      }).catch(err=>{
+        console.log(err)
+      })
+
+    },
+    bindLogin() {
+      if (this.phone.length != 11) {
+        uni.showToast({
+          icon: 'none',
+          title: '手机号不正确'
+        });
+        return;
+      }
+      if (this.password.length < 6) {
+        uni.showToast({
+          icon: 'none',
+          title: '密码不正确'
+        });
+        return;
+      }
+      if (this.code.length != 4) {
+        uni.showToast({
+          icon: 'none',
+          title: '验证码不正确'
+        });
+        return;
+      }
+      _this.zc();
+
+    },
+    zc() {
+      let _this = this;
+      let data = {
+        mobile: this.phone,
+        newpassword: this.password,
+        captcha: this.code,
+      };
+      _this.$httpRequest({
+        url:"/api/user/resetpwd",
+        data:data
+      }).then(res=>{
+        if(res.code ==1){
+          uni.navigateBack();
+        }else{
+          uni.showToast({title: res.msg, icon: "none"});
+        }
+      }).catch(err=>{
+        console.log(err)
+      })
+
+    },
+  }
+}
+</script>
+
+<style>
+.content {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+.tishi {
+  color: #999999;
+  font-size: 28rpx;
+  line-height: 50rpx;
+  margin-bottom: 50rpx;
+}
+
+.list {
+  display: flex;
+  flex-direction: column;
+  padding-top: 50rpx;
+  padding-left: 70rpx;
+  padding-right: 70rpx;
+}
+
+.list-call {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 100rpx;
+  color: #333333;
+  border-bottom: 0.5px solid #e2e2e2;
+}
+
+.list-call .img {
+  width: 40rpx;
+  height: 40rpx;
+}
+
+.list-call .sl-input {
+  flex: 1;
+  text-align: left;
+  font-size: 32rpx;
+  margin-left: 16rpx;
+}
+
+.button-login {
+  color: #FFFFFF;
+  font-size: 34rpx;
+  width: 470rpx;
+  height: 100rpx;
+  background: linear-gradient(-90deg, rgba(63, 205, 235, 1), rgba(188, 226, 158, 1));
+  box-shadow: 0rpx 0rpx 13rpx 0rpx rgba(164, 217, 228, 0.2);
+  border-radius: 50rpx;
+  line-height: 100rpx;
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 100rpx;
+}
+
+.button-hover {
+  background: linear-gradient(-90deg, rgba(63, 205, 235, 0.8), rgba(188, 226, 158, 0.8));
+}
+
+.yzm {
+  color: #FF7D13;
+  font-size: 24rpx;
+  line-height: 64rpx;
+  padding-left: 10rpx;
+  padding-right: 10rpx;
+  width: auto;
+  height: 64rpx;
+  border: 1rpx solid rgba(255, 131, 30, 1);
+  border-radius: 50rpx;
+}
+
+.yzms {
+  color: #999999 !important;
+  border: 1rpx solid #999999;
+}
+</style>
diff --git a/pagesA/login/login.vue b/pagesA/login/login.vue
new file mode 100644
index 0000000..b1e537c
--- /dev/null
+++ b/pagesA/login/login.vue
@@ -0,0 +1,276 @@
+<template>
+	<view class="content" v-if="idfd==1">
+		<view class="header">
+			<image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/logo.png"></image>
+		</view>
+
+		<view class="list">
+			<view class="list-call">
+				<image class="img" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/1.png"></image>
+				<input class="sl-input" v-model="mobile" type="number" maxlength="11" placeholder="输入手机号" />
+			</view>
+			<view class="list-call">
+				<image class="img" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/2.png"></image>
+				<input class="sl-input" v-model="password" type="text" maxlength="32" placeholder="输入密码"
+					password="true" />
+			</view>
+		</view>
+		<view class="button-login" hover-class="button-hover" @tap="bindLogin()">
+			<text style="font-size: 40upx;">登录</text>
+		</view>
+		<!-- #ifdef H5 || APP-->
+		<view class="register">
+			<view @click="goRegister">立即注册</view>
+			<view @click="goPassWord">忘记密码</view>
+		</view>
+		<!-- #endif -->
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- <view class="list" style="margin-top: 10px; color: #666; font-size: 14px;text-align: center;">openid：{{openid}}</view> -->
+		<button class="button-login" @click="getUserInfo1()"
+			style="margin-top: 35rpx; font-size: 26upx; color: #fff; height: 80rpx; line-height: 80rpx;">获取微信授权
+		</button>
+		<view class="agreenment">
+			<navigator url="reg" open-type="navigate" @click="goRegister">注册账户</navigator>
+		</view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				mobile: '',
+				password: '',
+				openid: '',
+				unionid: '',
+				userinfowx: '',
+				idfd: 1,
+				fxpid: 0,
+			};
+		},
+		onLoad(e) {
+			console.log('查看分享也=-------', e)
+			if (e.fxpid) {
+				this.fxpid = e.fxpid
+				uni.setStorageSync('invite_number', e.invite)
+				if (e.fxpid > 0) {
+					uni.setStorage({
+						key: 'fxpid',
+						data: e.fxpid
+					})
+				}
+			}
+		},
+
+		methods: {
+
+			goRegister() {
+				uni.navigateTo({
+					url: "/pagesA/login/register"
+				})
+			},
+			goPassWord() {
+				uni.navigateTo({
+					url: "/pagesA/login/forget"
+				})
+			},
+			bindLogin() {
+				let that = this
+				if (!this.mobile) {
+					uni.showToast({
+						title: '手机号不能为空',
+						icon: "none"
+					});
+					this.userfocus = true
+					return false;
+				}
+				if (!this.password) {
+					uni.showToast({
+						title: '密码不能为空',
+						icon: "none"
+					});
+					this.paswfocus = true
+					return false;
+				}
+				let data = {
+					'account': this.mobile,
+					'password': this.password
+				};
+				if (this.openid) {
+					data.openid = this.openid;
+				}
+				that.$httpRequest({
+					url: "/api/user/login",
+					method: "GET",
+					data: data
+				}).then(res => {
+					if (res.code == 1) {
+						uni.setStorageSync('userinfo', res.data.userinfo);
+						uni.setStorageSync('config', res.data.config);
+						uni.showModal({
+							title: "提示",
+							content: res.msg,
+							showCancel: false,
+							confirmText: "确定",
+							success: function(res) {
+								if (res.confirm) {
+									uni.navigateBack();
+								}
+							}
+						});
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "none",
+							duration: 2000
+						})
+					}
+
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+			getUserInfo() {
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+						console.log(loginRes.authResult);
+						// 获取用户信息
+						uni.getUserInfo({
+							provider: 'weixin',
+							success: function(infoRes) {
+								console.log('用户昵称为：' + infoRes.userInfo.nickName);
+								console.log(infoRes);
+							}
+						});
+					}
+				});
+			}
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+
+	.header {
+		width: 161rpx;
+		height: 161rpx;
+		background: rgba(63, 205, 235, 1);
+		box-shadow: 0rpx 12rpx 13rpx 0rpx rgba(63, 205, 235, 0.47);
+		border-radius: 50%;
+		margin-top: 30rpx;
+		margin-left: auto;
+		margin-right: auto;
+	}
+
+	.header image {
+		width: 161rpx;
+		height: 161rpx;
+		border-radius: 50%;
+	}
+
+	.list {
+		display: flex;
+		flex-direction: column;
+		padding-top: 50rpx;
+		padding-left: 70rpx;
+		padding-right: 70rpx;
+	}
+
+	.list-call {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		height: 100rpx;
+		color: #333333;
+		border-bottom: 0.5px solid #e2e2e2;
+	}
+
+	.list-call .img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.list-call .sl-input {
+		flex: 1;
+		text-align: left;
+		font-size: 32rpx;
+		margin-left: 16rpx;
+	}
+
+	.button-login {
+		color: #FFFFFF;
+		font-size: 34rpx;
+		width: 470rpx;
+		height: 100rpx;
+		background: linear-gradient(-90deg, rgba(75, 196, 93, 1), rgba(188, 226, 158, 1));
+		box-shadow: 0rpx 0rpx 13rpx 0rpx rgba(164, 217, 228, 0.2);
+		border-radius: 50rpx;
+		line-height: 100rpx;
+		text-align: center;
+		margin-left: auto;
+		margin-right: auto;
+		margin-top: 100rpx;
+	}
+
+	.button-login1 {
+		color: #FFFFFF;
+		font-size: 34rpx;
+		width: 470rpx;
+		height: 80rpx;
+		background: linear-gradient(-90deg, rgba(75, 196, 93, 1), rgba(188, 226, 158, 1));
+		box-shadow: 0rpx 0rpx 13rpx 0rpx rgba(164, 217, 228, 0.2);
+		border-radius: 50rpx;
+		line-height: 80rpx;
+		text-align: center;
+		margin-left: auto;
+		margin-right: auto;
+		margin-top: 30rpx;
+		color: #fff;
+	}
+
+	.button-hover {
+		background: linear-gradient(-90deg, rgba(63, 205, 235, 0.8), rgba(188, 226, 158, 0.8));
+	}
+
+	.agreenment {
+		display: flex;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		font-size: 30rpx;
+		margin-top: 80rpx;
+		color: #FFA800;
+		text-align: center;
+		height: 40rpx;
+		line-height: 40rpx;
+	}
+
+	.agreenment text {
+		font-size: 24rpx;
+		margin-left: 15rpx;
+		margin-right: 15rpx;
+	}
+
+	.register {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.register view {
+		text-align: center;
+		color: #C79556;
+		font-size: 32rpx;
+		line-height: 100rpx;
+		margin: 0 40rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/login/register.vue b/pagesA/login/register.vue
new file mode 100644
index 0000000..12f58f5
--- /dev/null
+++ b/pagesA/login/register.vue
@@ -0,0 +1,297 @@
+<template>
+  <view class="content">
+    <view class="header">
+      <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/logo.png"></image>
+    </view>
+
+    <view class="list">
+      <view class="list-call">
+        <image class="img" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/1.png"></image>
+        <input class="sl-input" v-model="phone" type="number" maxlength="11" placeholder="手机号"/>
+      </view>
+      <view class="list-call">
+        <image class="img" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/2.png"></image>
+        <input class="sl-input" v-model="password" type="text" maxlength="32" placeholder="登录密码"
+               :password="!showPassword"/>
+        <image class="img" :src="showPassword?'/static/shilu-login/op.png':'/static/shilu-login/cl.png'"
+               @tap="display"></image>
+      </view>
+      <view class="list-call">
+        <image class="img" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/3.png"></image>
+        <input class="sl-input" v-model="code" type="number" maxlength="4" placeholder="验证码"/>
+        <view class="yzm" :class="{ yzms: second>0 }" @tap="getcode">{{ yanzhengma }}</view>
+      </view>
+      <view class="list-call" v-if="iskq==1">
+        <image class="img" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/shilu-login/4.png"></image>
+        <input class="sl-input" v-model="invitation" type="text" maxlength="12" placeholder="邀请码 没有留空"/>
+      </view>
+
+    </view>
+
+    <view class="button-login" hover-class="button-hover" @tap="bindLogin">
+      <text style="font-size: 40upx;">注册</text>
+    </view>
+
+    <!-- <view class="agreement">
+       <image @tap="agreementSuccess"
+              :src="agreement==true?'/static/shilu-login/ty1.png':'/static/shilu-login/ty0.png'"></image>
+       <text @tap="agreementSuccess"> 同意</text>
+       <navigator open-type="navigate">《软件用户协议》</navigator>
+     </view> -->
+  </view>
+</template>
+
+<script>
+import pay from "@/utils/pay";
+
+var _this, js;
+export default {
+  onLoad(e) {
+    if (e.uid) {
+      this.invitation = e.uid
+    } else {
+      var fxpid = uni.getStorageSync("fxpid")
+      if (fxpid) {
+        this.invitation = fxpid
+      }
+    }
+
+  },
+  onUnload() {
+    clearInterval(js)
+    this.second = 0;
+  },
+  data() {
+    return {
+      phone: '',
+      password: '',
+      code: '',
+      invitation: '',
+      agreement: true,
+      showPassword: false,
+      second: 0,
+      iskq: 0,
+      codeInterVal:null,
+    };
+  },
+  computed: {
+    yanzhengma() {
+      if (this.second == 0) {
+        return '获取验证码';
+      } else {
+        if (this.second < 10) {
+          return '重新获取0' + this.second;
+        } else {
+          return '重新获取' + this.second;
+        }
+      }
+    }
+  },
+  methods: {
+
+    display() {
+      this.showPassword = !this.showPassword
+    },
+    agreementSuccess() {
+      this.agreement = !this.agreement;
+    },
+    getcode() {
+      let _this = this;
+      if (this.phone.length != 11) {
+        uni.showToast({
+          icon: 'none',
+          title: '手机号不正确'
+        });
+        return;
+      }
+      if (this.second > 0) {
+        return;
+      }
+      this.second = 60;
+      //请求业务
+      this.codeInterVal = setInterval(function () {
+        _this.second--;
+        if (_this.second == 0) {
+          clearInterval(_this.codeInterVal)
+        }
+      }, 1000)
+      _this.$httpRequest({
+        url:"/api/sms/index",
+        data:{
+          phone:_this.phone
+        }
+      }).then(res=>{
+        uni.showToast({title: res.msg, icon: "none"});
+      }).catch(err=>{
+        console.log(err)
+      })
+    },
+    bindLogin() {
+      if (this.agreement == false) {
+        uni.showToast({
+          icon: 'none',
+          title: '请先阅读《软件用户协议》'
+        });
+        return;
+      }
+      if (this.phone.length != 11) {
+        uni.showToast({
+          icon: 'none',
+          title: '手机号不正确'
+        });
+        return;
+      }
+      if (this.password.length < 6) {
+        uni.showToast({
+          icon: 'none',
+          title: '密码不正确'
+        });
+        return;
+      }
+      if (this.code.length != 4) {
+        uni.showToast({
+          icon: 'none',
+          title: '验证码不正确'
+        });
+        return;
+      }
+
+      this.zc();
+    },
+    zc() {
+      let _this = this;
+      _this.$httpRequest({
+        url:"/api/user/reg",
+        method:"GET",
+        data:{
+          mobile:this.phone,
+          username:this.phone,
+          password:this.password,
+          pid:this.invitation,
+          code:this.code
+        },
+      }).then(res=>{
+        if(res.code ==1){
+          uni.redirectTo({
+            url:"/pagesA/login/login"
+          });
+        }else{
+          uni.showToast({title: res.msg, icon: "none"});
+        }
+        console.log(res)
+      }).catch(err=>{
+        console.log(err)
+      })
+    },
+  }
+}
+</script>
+
+<style>
+.content {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+.header {
+  width: 161rpx;
+  height: 161rpx;
+  background: rgba(63, 205, 235, 1);
+  box-shadow: 0rpx 12rpx 13rpx 0rpx rgba(63, 205, 235, 0.47);
+  border-radius: 50%;
+  margin-top: 30rpx;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.header image {
+  width: 161rpx;
+  height: 161rpx;
+  border-radius: 50%;
+}
+
+.list {
+  display: flex;
+  flex-direction: column;
+  padding-top: 50rpx;
+  padding-left: 70rpx;
+  padding-right: 70rpx;
+}
+
+.list-call {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 100rpx;
+  color: #333333;
+  border-bottom: 0.5px solid #e2e2e2;
+}
+
+.list-call .img {
+  width: 40rpx;
+  height: 40rpx;
+}
+
+.list-call .sl-input {
+  flex: 1;
+  text-align: left;
+  font-size: 32rpx;
+  margin-left: 16rpx;
+}
+
+.yzm {
+  color: #FF7D13;
+  font-size: 24rpx;
+  line-height: 64rpx;
+  padding-left: 10rpx;
+  padding-right: 10rpx;
+  width: auto;
+  height: 64rpx;
+  border: 1rpx solid #FFA800;
+  border-radius: 50rpx;
+}
+
+.yzms {
+  color: #999999 !important;
+  border: 1rpx solid #999999;
+}
+
+.button-login {
+  color: #FFFFFF;
+  font-size: 34rpx;
+  width: 470rpx;
+  height: 100rpx;
+  line-height: 100rpx;
+  background: linear-gradient(-90deg, rgba(75, 196, 93, 1), rgba(188, 226, 158, 1));
+  box-shadow: 0rpx 0rpx 13rpx 0rpx rgba(164, 217, 228, 0.2);
+  border-radius: 50rpx;
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 100rpx;
+}
+
+.button-hover {
+  background: linear-gradient(-90deg, rgba(63, 205, 235, 0.8), rgba(188, 226, 158, 0.8));
+}
+
+.agreement {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  font-size: 30rpx;
+  margin-top: 80rpx;
+  color: #FFA800;
+  text-align: center;
+  height: 40rpx;
+  line-height: 40rpx;
+}
+
+.agreement image {
+  width: 40rpx;
+  height: 40rpx;
+}
+</style>
diff --git a/pagesA/myCenter/bingeWatch.vue b/pagesA/myCenter/bingeWatch.vue
new file mode 100644
index 0000000..2d3d67d
--- /dev/null
+++ b/pagesA/myCenter/bingeWatch.vue
@@ -0,0 +1,134 @@
+<template>
+  <view>
+
+    <!-- <view style="margin:10upx 30upx 0 30upx;box-shadow: 0px 4px 20px 0px rgba(0,0,0,0.04);">
+      <home-banner :banners="banners"></home-banner>
+    </view> -->
+    <view class="" style="padding: 30upx 30upx 0px 30upx;">
+      <block v-for="(value,key) in listData" :key="key">
+        <view @click="detail(value.vid,value.mid)" style="position: relative;" class="flex alcenter mb16">
+          <image mode="aspectFill" class="tuan-product-l" :src="value.img"></image>
+          <!-- <view class="btn-mini" style="position: absolute; top: 40upx; left: 280upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx;" :style="getBtnStyle">{{value.lxname}}</view> -->
+          <view class="tuan-product-r pl15">
+            <view class="ft16 ftw600 cl-main text-over2">{{value.vname}}</view>
+            <view class="mt16">
+              <text class="ft14 cl-orange"  style="color: #09D89E;">{{value.dqname}}</text>
+            </view>
+            <view class="mt16 flex space alcenter">
+              <view class="ft14 cl-notice">{{value.mname}}</view>
+              <view class="btn-vip-adviser ml15">继续观看</view>
+            </view>
+          </view>
+        </view>
+      </block>
+    </view>
+    <uni-load-more :status="status"  />
+    <view style="width: 100%; height: 30rpx;"></view>
+
+  </view>
+</template>
+
+<script>
+export default {
+  data(){
+    return {
+      banners:[],
+      searchValue:'',
+      pages:{
+        currentPage:1,
+        pageSize:20,
+        isNextPage:true
+      },
+      tabs:[
+        {name:'全部'},
+        {name:'视频'},
+        {name:'音频'},
+        {name:'小说'},
+        {name:'壁纸'},
+      ],
+      selectIndex:0,
+      scrollTop:0,
+      type:'',
+
+      listData: [],
+      status: 'more',
+
+    }
+  },
+  onLoad(e){
+    //console.log(111)
+    if(e.selectIndex){
+      this.selectIndex=e.selectIndex*1
+    }
+    this.status = 'more';
+    this.getList();
+    this.banners=uni.getStorageSync("config").banner
+  },
+
+  onReachBottom() {
+    this.status = 'more';
+    this.getList();
+  },
+
+  methods:{
+    detail(vid,mid){
+      uni.navigateTo({
+        url:'/pagesA/player/detailPlayer?vid='+vid+'&mid='+mid
+      })
+    },
+    getList() {
+      let that = this;
+      if (that.pages.isNextPage) {
+        that.status = 'loading';
+        that.$httpRequest({
+          url: "/api/video/recordlist",
+          methods: "GET",
+          data: {
+            limit: that.pages.pageSize,
+            page: that.pages.currentPage
+          }
+        }).then(res => {
+          that.status = '';
+          if (that.pages.currentPage == 1) {
+            that.listData = res.rows;
+          } else if (res.rows.length > 0) {
+            that.listData = that.listData.concat(res.rows);
+          } else {
+            that.status = 'noMore';
+            that.pages.isNextPage = false;
+          }
+          that.pages.currentPage += 1;
+        }).catch(err => {
+          that.status = '';
+          console.log(err)
+        })
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+.tuan-product-l{
+  width: 150rpx;
+  height: 200rpx;
+  border-radius: 16rpx;
+  background: #F2F2F2;
+}
+.tuan-product-r{
+  width: calc(100% - 150rpx);
+}
+.btn-vip-adviser{
+  width: 150rpx;
+  height: 60rpx;
+  border-radius: 20rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 28rpx;
+  /* font-weight: 600; */
+ border-radius: 12rpx;
+ border: 2rpx solid #09D89E;
+ color: #09D89E;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/myCenter/myLike.vue b/pagesA/myCenter/myLike.vue
new file mode 100644
index 0000000..b18be3d
--- /dev/null
+++ b/pagesA/myCenter/myLike.vue
@@ -0,0 +1,163 @@
+<template>
+	<view>
+		<view class="flex" style="display:flex; flex-wrap:wrap; padding: 30upx 30upx 0px 30upx;">
+			<block v-for="(value,key) in listData" :key="key">
+				<view class="mb15" style="width:31%; border-radius:20rpx;margin-right: 14rpx;"
+					@click="detail(value.vid,value.mid)">
+					<!-- <view class="btn-mini" style="position: absolute; top: 20upx; right: 20upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx; z-index: 1;" :style="getBtnStyle">{{value.lxname}}</view> -->
+					<image class="integral-mall-goods" mode="aspectFill" :src="value.img"></image>
+					<view class="pr10 ft14 ftw400 text-over cl-main">{{value.vname}}</view>
+					<view class="pr10 ft12 ftw500 text-over cl-999">观看至 {{value.mid}} 集</view>
+				</view>
+			</block>
+		</view>
+		<uni-load-more :status="status" :content-text="contentText" />
+		<view style="width: 100%; height: 30upx;"></view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				banners: [],
+				searchValue: '',
+				pages: {
+					currentPage: 1,
+					pageSize: 20,
+					isNextPage: true
+				},
+				tabs: [{
+						name: '全部'
+					},
+					{
+						name: '视频'
+					},
+					{
+						name: '音频'
+					},
+					{
+						name: '小说'
+					},
+					{
+						name: '壁纸'
+					},
+				],
+				selectIndex: 0,
+				scrollTop: 0,
+				type: '',
+
+				listData: [],
+				status: 'more',
+				contentText: {
+					contentdown: "上拉显示更多",
+					contentrefresh: "正在加载...",
+					contentnomore: "没有更多数据了"
+				},
+
+			}
+		},
+		onLoad(e) {
+			//console.log(111)
+			if (e.selectIndex) {
+				this.selectIndex = e.selectIndex * 1
+			}
+			this.status = 'more';
+			this.getList();
+			this.banners = uni.getStorageSync("config").banner
+		},
+
+		onReachBottom() {
+			this.status = 'more';
+			this.getList();
+		},
+
+		methods: {
+			detail(vid, mid) {
+				uni.navigateTo({
+					url: '/pagesA/player/detailPlayer?vid=' + vid + '&mid=' + mid
+				})
+			},
+			getList() {
+				let that = this;
+				if (that.pages.isNextPage) {
+					that.status = 'loading';
+					that.$httpRequest({
+						url: "/api/video/wdxh",
+						methods: "GET",
+						data: {
+							limit: that.pages.pageSize,
+							page: that.pages.currentPage
+						}
+					}).then(res => {
+						that.status = '';
+						if (that.pages.currentPage == 1) {
+							that.listData = res.rows;
+						} else if (res.rows.length > 0) {
+							that.listData = that.listData.concat(res.rows);
+						} else {
+							that.status = 'noMore';
+							that.pages.isNextPage = false;
+						}
+						that.pages.currentPage += 1;
+					}).catch(err => {
+						that.status = '';
+						console.log(err)
+					})
+				}
+			},
+		}
+	}
+</script>
+
+
+<style scoped>
+	.integral-mall-goods {
+		width: 100%;
+		height: 280rpx;
+		background: #F2F2F2;
+		border-radius: 16upx;
+	}
+
+	.user-not-vip {
+		width: 100%;
+		height: 80rpx;
+		background: #FDF6EC;
+		border-radius: 40rpx;
+		border: 2rpx solid #EFC381;
+		text-align: center;
+		line-height: 76rpx;
+		font-size: 24rpx;
+		color: #000000;
+		font-weight: bold;
+	}
+
+
+	.tuan-product-l {
+		width: 320rpx;
+		height: 240rpx;
+		border-radius: 16rpx;
+		background: #F2F2F2;
+	}
+
+	.tuan-product-r {
+		width: calc(100% - 320rpx);
+	}
+
+	.search-result {
+		padding-top: 10px;
+		padding-bottom: 20px;
+		text-align: center;
+	}
+
+	.search-result-text {
+		text-align: center;
+		font-size: 14px;
+		color: #666;
+	}
+
+	.uni-mt-10 {
+		margin-top: 10px;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/myCenter/recharge.vue b/pagesA/myCenter/recharge.vue
new file mode 100644
index 0000000..6e4f7e8
--- /dev/null
+++ b/pagesA/myCenter/recharge.vue
@@ -0,0 +1,661 @@
+<template>
+	<view class="pagesContent">
+		<view class="pagesHeader">
+			<view class="navBack">
+				<uni-icons class="backIcon" type="left" size="24" color="#ffffff" @click="navBack"></uni-icons>
+				金豆充值
+			</view>
+
+			<view class="flex cl-w" style="flex-direction: column;padding-left: 58rpx;">
+				<view class="flex alcenter">
+					<text style="font-weight: bold;font-size: 72rpx;color: #FFFFFF;float: left;">{{ userdata.beans }}</text>
+					<uni-icons style="margin-left: 80rpx;" type="right" size="24" color="#ffffff"
+						@click="goBill"></uni-icons>
+				</view>
+				
+
+				<text class="ft16 ftw500" style="float: left;margin-top: 22rpx;">我的金豆</text>
+			</view>
+		</view>
+
+
+
+
+		<view
+			style="margin-top: -36rpx;padding: 36rpx 36rpx;background-color: #fff;border-radius: 28rpx 28rpx 0rpx 0rpx;">
+			<view class="ftw500 ft14 cl-333" style="margin-bottom: 24rpx;">充值金额</view>
+			<view class="vipCarBox" v-if="payListGroupId==1">
+				<view :class="[
+				'vipCarItem',
+				{'vipCarThird':item.pay_type == 1},
+				{'vipCarFirst': item.pay_type == 2},
+				{'vipCarFourth':item.pay_type == 3 },
+				] " v-for="item in list" :key="item.id" @click="purchase(item)">
+					<text class="icon" v-if="item.pay_tab > 0">特惠</text>
+					<view class="moneyLine">
+						<view class="money" v-if="system=='ios' && is_check"> </view>
+						<view class="money" v-else>￥{{ item.pay_money }}</view>
+						<view class="beanBtn" v-if="item.pay_give_num && item.pay_type == 2">赠{{ item.send_integral }}积分
+						</view>
+					</view>
+					<view class="depict" v-if="item.pay_give_num && item.pay_type == 2">
+						{{ item.pay_num }}金豆+{{ item.pay_give_num }}豆
+					</view>
+					<view class="depict" v-if="!item.pay_give_num && item.pay_type == 2">
+						{{ item.pay_num }}金豆
+					</view>
+					<view class="explainText" v-if="item.pay_type != 2">
+						<text v-if="item.pay_type == 1" style="color: #333333;">全部影片免费观看</text>
+						<text v-if="item.pay_type == 3" style="color: #FF6900;">本剧订阅全集</text>
+					</view>
+					<view class="choiceNum" v-if="item.menber_sel">{{ item.menber_sel }}%用户选择</view>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="system=='ios' && is_check"></view>
+		<view class="agreement" v-else>
+			<view class="ft12 ftw500 cl-999">充值说明：</view>
+			<view class=" ftw500 cl-999" style="font-size: 22rpx;">虚拟商品购买后不可退换，青少年请在家长的陪同下充值</view>
+		</view>
+
+
+
+
+		<view v-if="show"
+			style="background-color: rgba(0,0,0, 0.5);width: 750rpx;height: 100vh;z-index: 99;position: absolute;bottom: 0;left: 0;opacity：.5;"
+			@click="show=false"></view>
+		<view v-if="show" style="width: 750rpx;background: #F8F8F9;position: absolute;bottom: 0;left: 0;z-index: 999;">
+			<view style="background-color: #fff;padding: 30rpx;">
+				<view class="flex alcenter space">
+					<text class="ft14 cl-info2">需支付</text>
+					<text class="ft16 cl-main ftw600 cl-orange">¥{{ pricebuy }}</text>
+				</view>
+			</view>
+			<view class="box mt16 pd16_15">
+				<view class="ft16 pb16 ftw600 cl-main">支付方式</view>
+				<view class="bd-line mt16"></view>
+				<radio-group @change="changeType">
+					<view class="pt16 pb16 flex alcenter space">
+						<view class="flex alcenter">
+							<text class="iconfont iconicon_pay_balance ft32 cl-green"></text>
+							<text class="ml15 ft14 ftw500 cl-main">微信支付</text>
+						</view>
+						<view>
+							<radio value="weixin" :checked="payType ==  'weixin'" />
+						</view>
+					</view>
+					<view class="bd-line"></view>
+
+				</radio-group>
+			</view>
+			<view class="form-footer-h">
+				<view class="form-footer form-footer-h">
+					<view class="form-footer-main pd10_15" v-if="system=='ios' && is_check">
+						<button class="btn-big">请使用android手机体验</button>
+					</view>
+					<view class="form-footer-main pd10_15" v-else>
+						<button v-if="mid>0" class="btn-big" @click="okTap">支付
+							¥{{ pricebuy }}
+						</button>
+						<button v-else class="btn-big" @click="okTap">支付 ¥{{ pricebuy }}</button>
+					</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import PAY from "@/utils/pay";
+	export default {
+		data() {
+			return {
+				show: false,
+				list: [],
+				userdata: {},
+				// payType:'微信',
+				payType: 'weixin',
+				num: 1,
+				coupon_id: 0,
+				buydata: [],
+				buyType: '微信',
+				dataList: Object,
+				money: 0,
+				mid: 0,
+				openid: '',
+				pricebuy: 0,
+				wxlx: 'wxh5',
+				coupons: [{
+						coupon_id: 1,
+						num: 20
+					},
+					{
+						coupon_id: 2,
+						num: 30
+					},
+					{
+						coupon_id: 3,
+						num: 40
+					},
+				],
+				id: '',
+				jine: '',
+				system: '',
+				payListGroupId: 1,
+				userInfo: {},
+				allVideoNum: 1,
+				is_check: false
+			}
+		},
+		onLoad() {
+
+			this.system = uni.getSystemInfoSync().osName
+			//#ifdef MP-WEIXIN
+			this.wxlx = 'wxxcx'
+			this.openid = uni.getStorageSync("openid")
+			this.userInfo = uni.getStorageSync("userinfo");
+			//#endif
+			//#ifdef H5
+			var ua = window.navigator.userAgent.toLowerCase();
+			if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+				this.wxlx = 'wxgzh';
+			}
+			//#endif
+		},
+		onShow() {
+			this.is_check = uni.getStorageSync('config').is_check == 1 ? true : false;
+		},
+		mounted() {
+			this.payListGroupId = uni.getStorageSync("config").pay_tpl;
+			this.payListGroupId = 1
+			this.getAllVideoNum();
+			this.getPayList()
+			this.getUserDel()
+		},
+		methods: {
+			okTap() {
+				var that = this
+				let defaultData = {
+					sum: 1,
+					buyType: that.buyType,
+					pricebuy: that.pricebuy,
+					token: uni.getStorageSync("userinfo").token,
+					uid: uni.getStorageSync("userinfo").id,
+					wxlx: that.wxlx,
+					id: that.id,
+					openid: that.openid,
+					info: [],
+				};
+				// #ifdef MP-WEIXIN
+				this.weiChartPay(defaultData)
+				// #endif
+				// #ifdef H5
+				this.H5Pay();
+				// #endif
+			},
+			weiChartPay(defaultData) {
+				var that = this
+				if (this.system == 'android') {
+					uni.login({
+						timeout: 10000,
+						provider: 'weixin', //如果是uniapp，在这里需要标明平台的类型，支持的参数请查阅uniapp官网的uni.login()文档
+						success: (res) => {
+							PAY.pays.serverCreatOrder({
+								id: that.id,
+								pay_type: 5,
+								code: res.code,
+								ad_code: uni.getStorageSync('get_ad_code'),
+								openid: that.openid,
+							}).then(creatRes => {
+								console.log('creat order success', creatRes)
+								PAY.pays.wxAppletAndroidPay(creatRes.data).then(payRes => {
+									console.log('pay order success', payRes)
+									that.getUserDel()
+									uni.showToast({
+										icon:'none',
+										title: '支付成功'
+									});
+									this.show = false;
+									uni.navigateBack();
+								})
+							}).catch(err => {
+								console.log(err)
+							})
+
+						},
+					})
+				} else {
+					PAY.pays.wxIosCreatOrder({
+						sum: defaultData.sum,
+						buytype: defaultData.buyType,
+						pricebuy: defaultData.pricebuy,
+						token: defaultData.token,
+						uid: defaultData.uid,
+						wxlx: defaultData.wxlx,
+						id: defaultData.id,
+						openid: defaultData.openid,
+						info: defaultData.info,
+						ad_code: uni.getStorageSync('get_ad_code')
+					}).then(res => {
+						if (res.code == 1) {
+							PAY.pays.wxAppletIosPay(res.data).then(payRes => {
+								console.log('pay order success', payRes)
+								that.getUserDel()
+							})
+						}
+					}).catch(err => {
+						console.log(err)
+					})
+				}
+			},
+			H5Pay() {
+				let that = this;
+				that.$httpRequest({
+					url: "/api/pay/payInfo",
+					method: "GET",
+					data: {
+						id: that.id,
+						pay_type: 21,
+						token: uni.getStorageSync("userinfo").token,
+						uid: uni.getStorageSync("userinfo").id,
+						ad_code: uni.getStorageSync('get_ad_code')
+					}
+				}).then(res => {
+					console.log(res)
+					// #ifdef H5
+					window.open(res.data.return_url, "_self")
+					// #endif
+					// #ifdef APP
+					uni.navigateTo({
+						url: "/pagesA/myCenter/wallet/webPay?url=" + encodeURIComponent(res.data
+							.return_url)
+					})
+					// #endif
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+
+			goBill() { //消费明细
+				uni.navigateTo({ //钱包
+					url: '/pagesA/myCenter/wallet/bill'
+				})
+			},
+
+
+			changeType(e) {
+				this.payType = e.detail.value;
+				if (e.detail.value == 'money') {
+					this.buyType = '余额';
+				}
+				if (e.detail.value == 'weixin') {
+					this.buyType = '微信';
+				}
+			},
+			purchase(e) {
+				this.id = e.id
+				// #ifdef MP-WEIXIN
+				if (this.system == 'ios' && this.is_check) {} else {
+					this.pricebuy = e.pay_money
+					this.show = true
+				}
+				// #endif
+
+				// #ifdef H5
+				this.H5Pay()
+				// #endif
+			},
+			getUserDel() {
+				this.$httpRequest({
+					url: "/api/user/index",
+					method: "GET"
+				}).then(res => {
+					this.userdata = res.data;
+					uni.setStorageSync('userinfo', res.data);
+					uni.setStorageSync('config', res.data.config)
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+			getPayList() {
+				this.$httpRequest({
+					url: "/api/beans/payList",
+					method: "GET"
+				}).then(res => {
+					if (res.code == 1) {
+						if (res.data.length > 0) {
+							let lists = [];
+							res.data.forEach((item) => {
+								if (item.pay_type != 3) {
+									lists.push(item)
+								}
+							})
+							this.list = lists
+						}
+					} else if (res.data.code == 50) {
+						this.is_check = true;
+					} else {
+						console.log(res)
+					}
+
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+			navBack() {
+				uni.navigateBack(1);
+			},
+			goAgreement(e) {
+				uni.navigateTo({
+					url: '/pagesA/agreement/agreement?id=' + e
+				})
+			},
+			getAllVideoNum() {
+				this.$httpRequest({
+					url: "/api/video/videoCount",
+					method: "GET"
+				}).then(res => {
+					this.allVideoNum = res.data.count
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.pagesContent {
+		height: 100vh;
+		background-color: #fff;
+
+	}
+
+	.pagesHeader {
+		background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/chongz.png');
+		background-size: 750rpx 360rpx;
+		background-repeat: no-repeat;
+		width: 750rpx;
+		height: 360rpx;
+		padding-top: 58rpx;
+
+	}
+
+	.navBack {
+		font-size: 32rpx;
+		color: #ffffff;
+		font-weight: 600;
+		text-align: center;
+		height: 100rpx;
+		line-height: 100rpx;
+		position: relative;
+	}
+
+	.backIcon {
+		position: absolute;
+		left: 16rpx;
+		top: 0rpx;
+	}
+
+
+	.explain {
+		padding: 0 26rpx;
+	}
+
+	.explainTitle {
+		line-height: 40rpx;
+		font-size: 28rpx;
+		color: #333333;
+	}
+
+
+
+	.vipCarBox {
+
+		align-items: center;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		flex-direction: row;
+		margin-bottom: 20rpx;
+	}
+
+	.vipCarItem {
+		width: 336rpx;
+		height: 200rpx;
+		border-radius: 12rpx;
+		margin-bottom: 24rpx;
+		position: relative;
+	}
+
+	.vipCarFirst {
+		background-image: linear-gradient(to right, #FF9A54, #FF3C3C);
+	}
+
+	.vipCarSecond {
+		background-image: linear-gradient(to right, #FF9A54, #FF3C3C);
+	}
+
+	.vipCarThird {
+		background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/taoc2.png');
+		background-size: 100% 100%;
+	}
+
+	.vipCarFourth {
+		background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/dingyue_a.png');
+		background-size: 100% 100%;
+		color: ;
+	}
+
+	.icon {
+		position: absolute;
+		color: #333333;
+		font-size: 20rpx;
+		font-weight: 500;
+		line-height: 35rpx;
+		padding: 0 20rpx;
+		border-radius: 0rpx 0rpx 16rpx 0rpx;
+		background: linear-gradient(180deg, #FFFFFF 0%, #FFC833 100%);
+	}
+
+	.vipCarThird .icon {
+		background: linear-gradient(90deg, #FFBC48 0%, #FF5D41 100%);
+		color: #ffffff;
+	}
+
+	.vipCarFourth .icon {
+		background: linear-gradient(90deg, #FFBC48 0%, #FF5D41 100%);
+		color: #ffffff;
+	}
+
+	.moneyLine {
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+		justify-content: space-between;
+		padding: 0 20rpx;
+		margin-top: 45rpx;
+	}
+
+	.vipCarFourth .moneyLine {
+		color: #FF300A;
+		padding-left: 20rpx;
+	}
+
+	.money {
+		font-size: 32rpx;
+		color: #ffffff;
+	}
+
+	.vipCarFourth .money {
+		color: #333333;
+	}
+
+	.vipCarFourth .depict {
+		color: #333333;
+	}
+
+	.vipCarThird .money {
+		color: #333333;
+	}
+
+	.beanBtn {
+		text-align: center;
+		font-weight: 500;
+		font-size: 22rpx;
+		color: #333333;
+		line-height: 48rpx;
+		padding: 0 16rpx;
+		background: linear-gradient(180deg, #FFF2D1 0%, #FFC323 100%);
+		border-radius: 24rpx;
+	}
+
+	.depict {
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 44rpx;
+		padding: 10rpx 20rpx;
+	}
+
+	.explainText {
+		margin-top: 26rpx;
+		padding-left: 20rpx;
+
+	}
+
+	.explainText text {
+		font-size: 28rpx;
+		font-weight: 600;
+	}
+
+	.choiceNum {
+		text-align: right;
+		font-size: 22rpx;
+		font-weight: 500;
+		color: #FFCA3A;
+		line-height: 32rpx;
+		padding-right: 20rpx;
+	}
+
+	/*新版*/
+
+	.VipCardContent {
+		padding: 40rpx 0;
+	}
+
+	.vipCarBoxSecond .vipCarItem {
+		background-color: #ffffff;
+		border-radius: 12rpx;
+
+	}
+
+	.vipCarBoxSecond .border {
+		border: 6rpx solid #dc3a35;
+		background-color: #f6e2af;
+	}
+
+	.rightIcon {
+		position: absolute;
+		right: 0;
+		top: -20rpx;
+		line-height: 40rpx;
+		color: #ffffff;
+		font-size: 30rpx;
+		padding: 0 15rpx;
+		border-radius: 0 12rpx 0 12rpx;
+		background-color: #dc3a35;
+		max-width: 336rpx;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.carMoney {
+		text-align: center;
+		font-size: 26rpx;
+		font-weight: bold;
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.carMoney text {
+		font-size: 32rpx;
+		font-weight: bold;
+	}
+
+	.carMoneyExplain {
+		color: #666666;
+		text-align: center;
+		line-height: 30rpx;
+		font-size: 28rpx;
+		height: 30rpx;
+	}
+
+	.vipCarFooter {
+		line-height: 45rpx;
+		background-color: #dc3a35;
+		color: #ffffff;
+		text-align: center;
+		font-size: 26rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.redColor {
+		color: #dc3a35;
+	}
+
+	.footerRedColor {
+		line-height: 50rpx;
+		background-color: #fde6e6;
+		color: #dc3a35;
+		text-align: center;
+		font-size: 26rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		border-radius: 0 0 12rpx 12rpx;
+	}
+
+	.hands {
+		position: absolute;
+		right: -10px;
+		bottom: 0rpx;
+		width: 90rpx;
+		height: 90rpx;
+		z-index: 300;
+		transform: rotate(-15deg);
+	}
+
+	.agreement {
+		position: fixed;
+		bottom: 10px;
+		width: 100%;
+		line-height: 40rpx;
+		font-size: 28rpx;
+		margin-left: 36rpx;
+		background-color: #fff;
+	}
+
+	.agreementItem {
+		color: #0a5ab6;
+		padding: 0 10rpx;
+		font-size: 28rpx;
+		font-size: 28rpx;
+	}
+
+	.explainItem {
+		line-height: 40rpx;
+		font-size: 24rpx;
+		color: #999999;
+	}
+
+	.btn-big {
+		background-color: #07c160;
+		color: #FFFFFF;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/myCenter/settings/mobile.vue b/pagesA/myCenter/settings/mobile.vue
new file mode 100644
index 0000000..0f8ecec
--- /dev/null
+++ b/pagesA/myCenter/settings/mobile.vue
@@ -0,0 +1,180 @@
+<template>
+	<view class="form">
+		<view class="box">
+			<view class="formItem">
+				<view class="label">新手机号</view>
+				<view class="ipt">
+					<input class="uni-input" type="phone" @input="changePhone" placeholder="请输入手机号"
+						:value="inputValue" />
+				</view>
+			</view>
+			<view class="formItem">
+				<view class="label">验证码</view>
+				<view class="ipt">
+					<input class="uni-input" type="text" @input="changeCode" placeholder="请输入验证码" :value="code" />
+				</view>
+				<view class="getCodeBtn" @click="getCode">{{btnText}}</view>
+			</view>
+		</view>
+		<button class="onname" :style="{'background':dbled?'#999':'#08d89b'}" :disabled="dbled" type="primary"
+			@click="upPhone()">确认修改</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				inputValue: "",
+				isUp: false,
+				btnText: "获取验证码",
+				interV: null,
+				time: 60,
+				isGetCode: false,
+				code: ""
+			}
+		},
+		onLoad(options) {
+			this.inputValue = options.mobile
+		},
+		methods: {
+			changePhone(e) {
+				this.inputValue = e.detail.value
+			},
+			changeCode(e) {
+				this.code = e.detail.value;
+			},
+
+			upPhone() {
+				let that = this;
+				if (!/^1[3456789]\d{9}$/.test(that.inputValue)) {
+					uni.showToast({
+						title: "手机号有误"
+					})
+					return
+				}
+				if (!that.isUp) {
+					that.isUp = true;
+					that.$httpRequest({
+						url: "/api/user/changemobile",
+						method: "POST",
+						data: {
+							mobile: that.inputValue,
+							captcha: this.captcha
+						}
+					}).then(res => {
+						if (res.code == 1) {
+							uni.showToast({
+								title: "修改成功",
+								icon: "none",
+								duration: 1500
+							});
+						}
+					})
+				} else {
+					uni.showToast({
+						title: "请勿频繁提交"
+					})
+				}
+
+			},
+
+			getCode() {
+				if (!this.isGetCode) {
+					this.isGetCode = true;
+					console.log(this.inputValue);
+
+					if (/^1[3456789]\d{9}$/.test(this.inputValue)) {
+						this.interV = setInterval(() => {
+							this.time--;
+							this.btnText = this.time + '秒后重新获取'
+							if (this.time <= 0) {
+								this.isGetCode = false;
+								this.btnText == "获取验证码";
+								this.time = 60;
+							}
+						}, 1000)
+						
+						uni.request({
+							url: this.configs.webUrl + '/api/sms/index',
+							data: {
+								phone: this.inputValue
+							},
+							success() {
+								uni.showToast({
+									title: "发送成功",
+									icon: "none",
+									duration: 1500
+								})
+							},
+							fail() {
+
+							}
+						})
+
+					} else {
+						uni.showToast({
+							title: "手机号有误",
+							icon: "none",
+							duration: 1500
+						})
+						this.isGetCode = false;
+					}
+				} else {}
+			},
+
+
+
+
+		},
+		beforeDestroy() {
+			clearInterval(this.interV)
+		}
+	}
+</script>
+
+<style scoped>
+	.form {
+		margin: 20rpx;
+
+	}
+
+	.formItem {
+		display: flex;
+		height: 120rpx;
+		align-items: center;
+		border: 2rpx solid #F8F8F8;
+	}
+
+	.label {
+		width: 260rpx;
+		font-size: 32rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		margin-left: 36rpx;
+	}
+
+	.ipt {
+		width: 100%;
+
+	}
+
+	.ipt input {
+		height: 80rpx;
+		line-height: 80rpx;
+		font-size: 30rpx;
+	}
+
+	.getCodeBtn {
+		font-size: 26rpx;
+		padding: 15rpx 0;
+		min-width: 220rpx;
+		text-align: center;
+
+		border-radius: 15rpx;
+	}
+
+	.onname {
+		margin-top: 50rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/myCenter/settings/set.vue b/pagesA/myCenter/settings/set.vue
new file mode 100644
index 0000000..ce31ca0
--- /dev/null
+++ b/pagesA/myCenter/settings/set.vue
@@ -0,0 +1,361 @@
+<template>
+	<view class="container">
+
+		<view class="list-cell b-b avatar" style="border-radius: 16rpx 16rpx 0 0;" @click="clk(0)">
+			<text class="cell-tit">头像</text>
+			<image :src="imgUrl+ userInfo.avatar" mode=""></image>
+			<uni-icons type="arrowright" size="20" color="#999"></uni-icons>
+		</view>
+		<view class="list-cell" hover-class="cell-hover" :hover-stay-time="50">
+			<text class="cell-tit">昵称</text>
+			<input class="uni-input" style="width: 440rpx; text-align: right;" v-model="userInfo.nickname"
+				placeholder="请输入昵称" />
+			<uni-icons type="arrowright" size="20" color="#999"></uni-icons>
+		</view>
+
+		<view class="list-cell" @tap="sex" hover-class="cell-hover" :hover-stay-time="50">
+			<text class="cell-tit">性别</text>
+			<text class="cell-tip">{{ userInfo.gender ? '女':'男'}}</text>
+			<uni-icons type="arrowright" size="20" color="#999"></uni-icons>
+		</view>
+
+		<view class="list-cell" style="border-radius: 0 0 16rpx 16rpx;" @tap="onTime" hover-class="cell-hover"
+			:hover-stay-time="50">
+			<text class="cell-tit">生日</text>
+			<text class="cell-tip">{{userInfo.dtime}}</text>
+			<uni-icons type="arrowright" size="20" color="#999"></uni-icons>
+		</view>
+
+		<view class="list-cell  m-t b-b" style="border-radius: 16rpx;"
+			@click="navTo('/pagesA/myCenter/settings/mobile?mobile='+userInfo.mobile)" hover-class="cell-hover"
+			:hover-stay-time="50">
+			<text class="cell-tit">手机号</text>
+			<text class="cell-tip">{{userInfo.mobile}}</text>
+			<uni-icons type="arrowright" size="20" color="#999"></uni-icons>
+		</view>
+
+		<view class="practices button" @click="sexgender">保存</view>
+
+		<!--生日-->
+		<uv-datetime-picker ref="datetimePicker" :formatter="formatter" mode="date" @confirm="dialogTime">
+		</uv-datetime-picker>
+
+	</view>
+</template>
+
+<script>
+	let sex = ['男', '女'];
+	export default {
+		data() {
+			return {
+				urls: '',
+				sexsi: '',
+				array: [],
+				ageid: 0,
+				listgrzl: [],
+				msg: false,
+				imgUrl: this.$config.webUrl,
+				userInfo: {},
+				configUrl: this.$config.webUrl,
+			};
+		},
+		computed: {
+			sexType() {
+				return sex[this.sexsi];
+			},
+		},
+		onShow() {
+			this.getUsers();
+			if (this.msg) {
+				uni.showToast({
+					title: '保存成功',
+					icon: "none"
+				});
+				this.msg = false;
+			}
+		},
+		methods: {
+			getUsers() {
+				let that = this;
+				that.$httpRequest({
+					url: "/api/user/index",
+					method: "GET"
+				}).then(res => {
+					that.userInfo.avatar = res.data.avatar;
+					that.userInfo.nickname = res.data.nickname
+					that.userInfo.gender = res.data.gender
+					that.userInfo.dtime = res.data.birthday
+					that.userInfo.mobile = res.data.mobile
+					this.$forceUpdate()
+					console.log(that.userInfo);
+					uni.setStorageSync('userinfo', res.data);
+					uni.setStorageSync('config', res.data.config)
+				})
+
+			},
+			unlockChange(e) {
+				console.log(e.detail.value)
+				let that = this;
+				that.$httpRequest({
+					url: "/api/user/userAutoPlay",
+					method: "GET",
+					data: {
+						type: e.detail.value ? 1 : 0
+					}
+				}).then(res => {
+					if (res.code === 1) {
+						that.userInfo.auto_unlock = e.detail.value ? 1 : 0;
+						uni.removeStorageSync('userinfo')
+						uni.setStorageSync('userinfo', that.userInfo)
+					}
+				})
+			},
+
+			navTo(url) {
+				console.log(url)
+				uni.navigateTo({
+					url: url,
+					success: (res) => {
+						console.log(res)
+					},
+					fail: (err) => {
+						console.log(err)
+					}
+				})
+			},
+			navsTo(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+
+			//选择性别
+			sex() {
+				uni.showActionSheet({
+					itemList: sex,
+					success: (res) => {
+						console.log(res);
+						this.userInfo.gender = res.tapIndex
+						this.$forceUpdate()
+					}
+				});
+			},
+
+			sexgender() {
+				console.log(this.userInfo.avatar);
+				this.$httpRequest({
+					url: "/api/user/edituser",
+					method: "GET",
+					data: {
+						sex: this.userInfo.gender,
+						nickname: this.userInfo.nickname,
+						org: this.userInfo.dtime,
+						avatar: this.userInfo.avatar,
+					}
+				}).then(res => {
+					uni.showToast({
+						title: "修改成功",
+						duration: 2000,
+						icon: 'none'
+					});
+					this.getUsers();
+				})
+			},
+			doBefore() {
+				console.log('doBefore');
+			},
+			clk(index) {
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original', 'compressed'],
+					sourceType: ['album', 'camera'],
+					success: (r) => {
+						this.doUpload(r)
+					}
+				})
+			},
+			doUpload(rsp) {
+				let that = this;
+				uni.showLoading({
+					title: '加载中'
+				});
+				uni.uploadFile({
+					url: this.$config.webUrl + '/api/user/avatar?token=' + uni.getStorageSync("userinfo")
+						.token, //仅为示例，非真实的接口地址
+					file: rsp.tempFiles[0].path || rsp.tempFiles[0],
+					filePath: rsp.tempFiles[0].path || rsp.tempFiles[0],
+					name: "file",
+					dataType: "json",
+					formData: {
+						token: uni.getStorageSync("userinfo").token,
+						uid: uni.getStorageSync("userinfo").id,
+						file: rsp.tempFiles[0].path || rsp.tempFiles[0]
+					},
+					success: (uploadFileRes) => {
+
+						var dataarr = JSON.parse(uploadFileRes.data);
+						if (dataarr.code == 1) {
+							console.log(dataarr.data.url)
+							let userinfo = uni.getStorageSync('userinfo');
+							this.userInfo.avatar = dataarr.data.url;
+							console.log(this.userInfo.avatar);
+							this.getUsers()
+
+
+							uni.removeStorage('userinfo')
+							uni.setStorageSync('userinfo', userinfo)
+							uni.showToast({
+								title: "修改成功"
+							})
+
+						} else {
+							uni.showToast({
+								title: dataarr.msg
+							})
+						}
+					},
+
+				});
+			},
+			//修改生日
+			onTime() {
+				this.$refs.datetimePicker.open();
+			},
+			formatter(type, value) {
+				if (type === 'year') {
+					return `${value}年`
+				}
+				if (type === 'month') {
+					return `${value}月`
+				}
+				if (type === 'day') {
+					return `${value}日`
+				}
+				return value
+			},
+			dialogTime(e) {
+				this.userInfo.dtime = this.timestampToDate(e.value)
+				this.$forceUpdate()
+			},
+			timestampToDate(timestamp) {
+				var date = new Date(timestamp); // 转换为Date对象
+				var year = date.getFullYear(); // 获取年份
+				var month = ('0' + (date.getMonth() + 1)).slice(-2); // 获取月份，转为两位数
+				var day = ('0' + date.getDate()).slice(-2); // 获取日，转为两位数
+				return year + '-' + month + '-' + day; // 拼接字符串返回
+			},
+		},
+
+	}
+</script>
+
+<style lang='scss' scoped>
+	.yyt-ellipsis {
+		display: inline-block;
+		overflow: hidden; //超出的文本隐藏
+		text-overflow: ellipsis; //溢出用省略号显示
+		white-space: nowrap; //溢出不换
+	}
+
+	.container {
+		padding: 20rpx;
+		background: #F7F8F9;
+	}
+
+	.avatar {
+		padding-top: 40upx !important;
+		padding-bottom: 40upx !important;
+	}
+
+	.agess {
+		position: absolute;
+		z-index: 2;
+		top: 0px;
+		right: 0px;
+		height: 100%;
+		line-height: 38px;
+		padding-left: 200px;
+		padding-right: 36px !important;
+		background: transparent;
+	}
+
+	.avatar .cell-tit {
+		font-weight: bold !important;
+
+	}
+
+	.avatar image {
+		position: absolute;
+		top: 50%;
+		right: 36px;
+		width: 88upx;
+		height: 88upx;
+		border-radius: 50%;
+		margin-top: -44upx;
+		z-index: 1
+	}
+
+	.list-cell {
+		display: flex;
+		padding: 20upx;
+		line-height: 60upx;
+		position: relative;
+		background: #fff;
+		justify-content: center;
+		align-items: center;
+		border-bottom: 1rpx solid #eeeeee;
+
+		&.log-out-btn {
+			margin-top: 40upx;
+
+			.cell-tit {
+				color: $uni-color-primary;
+				text-align: center;
+				margin-right: 0;
+			}
+		}
+
+		&.cell-hover {
+			background: #fafafa;
+		}
+
+		&.b-b:after {
+			left: 30upx;
+		}
+
+		&.m-t {
+			margin-top: 16upx;
+		}
+
+		.cell-more {
+			align-self: baseline;
+
+			margin-left: 10upx;
+		}
+
+		.cell-tit {
+			flex: 1;
+
+			margin-right: 10upx;
+		}
+
+		.cell-tip {}
+
+		switch {
+			transform: translateX(16upx) scale(.84);
+		}
+	}
+
+	.practices {
+		height: 80rpx;
+		width: 100%;
+		border-radius: 40rpx;
+		background: linear-gradient(123deg, #00E075 0%, #09D89E 100%);
+		text-align: center;
+		line-height: 80rpx;
+		margin-top: 200rpx;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/myCenter/settings/userName.vue b/pagesA/myCenter/settings/userName.vue
new file mode 100644
index 0000000..d6c4849
--- /dev/null
+++ b/pagesA/myCenter/settings/userName.vue
@@ -0,0 +1,119 @@
+<template>
+  <view>
+    <view class="uni-form-item uni-column">
+      <view class="with-fun" style="padding: 20upx;">
+        <input class="uni-input" type="text" confirm-type="done" focus :placeholder="name" placeholder-style="color:#666"  @input="onKeyInput" :value="inputValue" />
+      </view>
+    </view>
+    <button class="onname" :style="{'background':dbled?'#999':'#E17503'}" :disabled="dbled"  type="primary" @tap="onOKname()">确 认</button>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      inputValue: '',
+      dbled:true,
+      name:'',
+      ty:''
+    }
+  },
+  onLoad(options){
+    //接收传值,id里面放的是标题，因为测试数据并没写id
+    let ty = options.ty;
+    let name = options.name;
+    let v = options.v;
+    this.ty=ty;
+    this.name='请修改'+name;
+    uni.setNavigationBarTitle({
+      title: '修改'+name
+    });
+    if(v=='null'){
+      this.inputValue='';
+    }else{
+      this.inputValue=v;
+    }
+  },
+  onBackPress() {
+    console.log('ok')
+  },
+  methods: {
+    onKeyInput(event){
+      this.inputValue = event.target.value
+      let lens = event.target.value
+      if(lens.length){
+        this.dbled=false
+      }else{
+        this.dbled=true
+      }
+    },
+    onOKname() {
+      let that = this;
+      that.$httpRequest({
+        url:"/api/user/edituser",
+        method:"GET",
+        data:{
+          [this.ty]: this.inputValue
+        }
+      }).then(res=>{
+        uni.showToast({title: '修改成功',icon:"none",duration:2000})
+      }).catch(err=>{
+
+      })
+
+    }
+
+
+
+
+  }
+}
+</script>
+
+<style scoped>
+.title {
+  padding: 10upx 25upx;
+}
+.with-fun{
+  background: #f8f8f8;
+  position: relative;
+}
+.with-fun:after{
+  position: absolute;
+  content: $name;
+  height: 50px;
+  line-height: 50px;
+  top: 0px;
+  left: 20px;
+  font-size: 32upx;
+}
+.uni-input{
+  height: 50px;
+  line-height: 50px;
+  font-size: 32upx;
+  background: #f8f8f8;
+
+  color: #666;
+}
+.uni-icon-clear,
+.uni-icon-eye {
+  color: #999;
+}
+.onname{
+  width: 94%;
+  margin: 20upx auto;
+  background: -webkit-linear-gradient(left top, #E49315 , #E17503); /* Safari 5.1 - 6.0 */
+  background: -o-linear-gradient(bottom right, #E49315, #E17503); /* Opera 11.1 - 12.0 */
+  background: -moz-linear-gradient(bottom right, #E49315,#E17503); /* Firefox 3.6 - 15 */
+  background: linear-gradient(to bottom right, #E49315 , #E17503); /* 标准的语法（必须放在最后） */
+}
+.onnames{
+  width: 94%;
+  margin: 20upx auto;
+  background: -webkit-linear-gradient(left top, #f1f1f1 , #f9f9f9); /* Safari 5.1 - 6.0 */
+  background: -o-linear-gradient(bottom right, #f1f1f1, #f9f9f9); /* Opera 11.1 - 12.0 */
+  background: -moz-linear-gradient(bottom right, #f1f1f1,#f9f9f9); /* Firefox 3.6 - 15 */
+  background: linear-gradient(to bottom right, #f1f1f1 , #f9f9f9); /* 标准的语法（必须放在最后） */
+}
+</style>
diff --git a/pagesA/myCenter/wallet/bill.vue b/pagesA/myCenter/wallet/bill.vue
new file mode 100644
index 0000000..2cfb2e2
--- /dev/null
+++ b/pagesA/myCenter/wallet/bill.vue
@@ -0,0 +1,170 @@
+<template>
+  <view class="pagesContent">
+      <view class="beansList">
+        <view class="beansItem box" v-for="item in listData" :key="item.id">
+          <view class="beansLeft">
+            <view class="remark">{{ item.remark }}</view>
+            <view class="time">{{ item.createtime }}</view>
+          </view>
+          <view :class="item.jzt == '-'?'right black':'right yellow'">
+            {{ item.jzt }}{{ item.beans }}
+          </view>
+        </view>
+      </view>
+    <uni-load-more :status="status"/>
+  </view>
+
+</template>
+
+<script>
+export default {
+
+  data() {
+    return {
+      listData: [],
+      status: 'more',
+      userInfo: {},
+      pages: {
+        pageSize: 20,
+        currentPage: 1,
+        isNextPage: true
+      }
+
+    }
+  },
+  onReachBottom() {
+    this.status = 'more';
+    if (this.pages.isNextPage) {
+      this.getList();
+    }
+  },
+  onLoad() {
+    this.userInfo = uni.getStorageSync('userinfo')
+    this.getList();
+  },
+  methods: {
+    navBack() {
+      uni.navigateBack(1);
+    },
+
+    getList() {
+      let that = this;
+      if (that.pages.isNextPage) {
+        that.status = 'loading';
+        that.$httpRequest({
+          url: "/api/user/userBeansInfo",
+          methods: "GET",
+          data: {
+            limit: that.pages.pageSize,
+            page: that.pages.currentPage
+          }
+        }).then(res => {
+          that.status = '';
+          if(res.rows.length>0 || res.data.length>0){
+            if (that.pages.currentPage == 1) {
+              that.listData = res.data || res.rows;
+            } else{
+              that.listData = that.listData.concat(res.data || res.rows);
+            }
+            that.pages.currentPage += 1;
+          }else{
+            that.status = 'noMore';
+            that.pages.isNextPage = false;
+          }
+        }).catch(err => {
+          that.status = '';
+          console.log(err)
+        })
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+.pagesContent {
+  background-color: #F7F8F9;
+  min-height: 100vh;
+  padding: 26rpx;
+}
+
+.pageHeader {
+  background: linear-gradient(to right, #F1FFE9, #FFFFF4);
+  height: 408rpx;
+  padding: 0 24rpx;
+  padding-top: 42rpx;
+}
+
+.navBack {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 600;
+  text-align: center;
+  height: 160rpx;
+  line-height: 160rpx;
+  position: relative;
+}
+
+.backIcon {
+  position: absolute;
+  left: 0rpx;
+  top: 0rpx;
+}
+
+.beans {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 600;
+  margin-top: 24rpx;
+}
+
+.beansNum {
+  margin-top: 24rpx;
+  font-size: 80rpx;
+  color: #333;
+  font-weight: 600;
+}
+
+.beansCont {
+  padding: 40rpx 24rpx;
+}
+
+.beansListHeader {
+  color: #333333;
+  font-size: 32rpx;
+  font-weight: 600;
+}
+
+.beansItem {
+  padding: 24rpx 34rpx;
+  border-bottom: 1rpx solid #F8F8F8;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+justify-content: space-between;
+  margin-bottom: 24rpx;
+  border-radius: 12rpx;
+  
+}
+
+.remark {
+  font-size: 28rpx;
+  color: #333;
+  font-weight: 600;
+}
+
+.time {
+  color: #999999;
+  font-size: 24rpx;
+  margin-top: 8rpx;
+}
+.right{
+  font-size: 28rpx;font-weight: 600;
+}
+.black{
+  color: #333;
+}
+.yellow{
+  color: #F98B1E;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/myCenter/wallet/earning.vue b/pagesA/myCenter/wallet/earning.vue
new file mode 100644
index 0000000..e1407fd
--- /dev/null
+++ b/pagesA/myCenter/wallet/earning.vue
@@ -0,0 +1,217 @@
+<template>
+  <view class="pagesContent">
+    <view class="pageHeader">
+      <view class="navBack">
+        <uni-icons class="backIcon" type="left" size="24" color="#333" @click="navBack"></uni-icons>
+        我的收益
+      </view>
+      <view class="beans">余额</view>
+      <view class="withDraw" @click="showWithDraw" v-if="balanceBtn"> 提现 </view>
+      <view class="beansNum"> {{ userInfo.beans }}</view>
+    </view>
+    <view class="beansCont">
+      <view class="beansListHeader"> 收益明细</view>
+      <view class="beansList">
+        <view class="beansItem" v-for="item in listData" :key="item.id">
+          <view class="beansLeft">
+            <view class="remark">{{ item.memo }} （{{ item.come_nickname }}
+              {{ item.come_id ? '  ID:' + item.come_id : '' }}）
+            </view>
+            <view class="time">{{ item.createtime }}</view>
+          </view>
+          <view :class="item.jzt == '-'?'right black':'right yellow'">
+            {{ item.jzt }}{{ item.money }}
+          </view>
+        </view>
+      </view>
+
+    </view>
+    <uni-popup ref="popup_ti_xian" type="bottom">
+      <tixianForm @success-close="hideWithDraw"></tixianForm>
+    </uni-popup>
+    <uni-load-more :status="status"/>
+  </view>
+
+</template>
+
+<script>
+import tixianForm from '@/pagesA/components/ti_xian.vue'
+export default {
+  components: {
+    tixianForm
+  },
+  data() {
+    return {
+      listData: [],
+      status: 'more',
+      userInfo: {},
+      balanceBtn:true,
+      pages: {
+        pageSize: 20,
+        currentPage: 1,
+        isNextPage: true
+      }
+
+    }
+  },
+  onReachBottom() {
+    this.status = 'more';
+    if (this.pages.isNextPage) {
+      this.getList();
+    }
+  },
+  onLoad() {
+    this.userInfo = uni.getStorageSync('userinfo')
+    this.balanceBtn = uni.getStorageSync("config").mini_chek =="1"?true:false;
+    this.getList();
+  },
+  methods: {
+    navBack() {
+      uni.navigateBack(1);
+    },
+    showWithDraw() {
+      this.$refs.popup_ti_xian.open()
+    },
+    hideWithDraw(){
+      console.log("close");
+      this.$refs.popup_ti_xian.close();
+    },
+    getList() {
+      let that = this;
+      if (that.pages.isNextPage) {
+        that.status = 'loading';
+        that.$httpRequest({
+          url: "/api/user/userBeansInfo",
+          methods: "GET",
+          data: {
+            limit: that.pages.pageSize,
+            page: that.pages.currentPage
+          }
+        }).then(res => {
+          that.status = '';
+          if (res.data.code == 1) {
+            if (that.pages.pageSize == 1) {
+              that.listData = res.data;
+            } else if (res.data.rows.length > 0) {
+              that.listData = that.listData.concat(res.data.rows);
+            } else {
+              that.status = 'noMore';
+              that.pages.isNextPage = false;
+            }
+            that.pages.currentPage += 1;
+          } else {
+          }
+        }).catch(err => {
+          that.status = '';
+          console.log(err)
+        })
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+.pagesContent {
+  background-color: #FFFFFF;
+  min-height: 100vh;
+}
+
+.pageHeader {
+  background: linear-gradient(to right, #F1FFE9, #FFFFF4);
+  height: 408rpx;
+  padding: 0 24rpx;
+  padding-top: 42rpx;
+  position: relative;
+}
+
+.navBack {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 600;
+  text-align: center;
+  height: 160rpx;
+  line-height: 160rpx;
+  position: relative;
+}
+
+.backIcon {
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.beans {
+  font-size: 32rpx;
+  color: #333333;
+  font-weight: 600;
+  margin-top: 24rpx;
+}
+
+.withDraw {
+  width: 172rpx;
+  height: 68rpx;
+  background-color: #85ED1C;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  color: #333;
+  font-weight: 500;
+  text-align: center;
+  line-height: 68rpx;
+  position: absolute;
+  top: 200rpx;
+  right: 20rpx;
+  margin-top: 22rpx;
+}
+
+.beansNum {
+  margin-top: 24rpx;
+  font-size: 80rpx;
+  color: #333;
+  font-weight: 600;
+}
+
+.beansCont {
+  padding: 40rpx 24rpx;
+}
+
+.beansListHeader {
+  color: #333333;
+  font-size: 32rpx;
+  font-weight: 600;
+}
+
+.beansItem {
+  padding: 24rpx 0;
+  border-bottom: 1rpx solid #F8F8F8;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-around;
+}
+
+.remark {
+  font-size: 28rpx;
+  color: #333;
+  font-weight: 600;
+}
+
+.time {
+  color: #999999;
+  font-size: 24rpx;
+  margin-top: 8rpx;
+}
+
+.right {
+  font-size: 28rpx;
+  font-weight: 600;
+}
+
+.black {
+  color: #333;
+}
+
+.yellow {
+  color: #F98B1E;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/myCenter/wallet/webPay.vue b/pagesA/myCenter/wallet/webPay.vue
new file mode 100644
index 0000000..3dceab9
--- /dev/null
+++ b/pagesA/myCenter/wallet/webPay.vue
@@ -0,0 +1,25 @@
+<template>
+  <view class="pages">
+    <web-view :src="urls"></web-view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      urls:""
+    };
+  },
+  onLoad(e) {
+    console.log(e.url)
+    this.urls = decodeURIComponent( e.url);
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.pages {
+  height: 100vh;
+}
+</style>
diff --git a/pagesA/myCenter/watchHistory.vue b/pagesA/myCenter/watchHistory.vue
new file mode 100644
index 0000000..d63c206
--- /dev/null
+++ b/pagesA/myCenter/watchHistory.vue
@@ -0,0 +1,153 @@
+<template>
+	<view>
+		<view class="flex" style="display:flex; flex-wrap:wrap; padding: 30upx 30upx 0px 30upx;">
+			<block v-for="(value,key) in listData" :key="key">
+				<view class="mb15" style="width:31%; border-radius:20rpx;margin-right: 14rpx;"
+					@click="detail(value.vid,value.mid)">
+					<!-- <view class="btn-mini" style="position: absolute; top: 20upx; right: 20upx; border-radius: 10upx;font-size: 18upx;width: 60upx; height: 36upx; z-index: 1;" :style="getBtnStyle">{{value.lxname}}</view> -->
+					<image class="integral-mall-goods" mode="aspectFill" :src="value.img"></image>
+					<view class="pr10 ft14 ftw400 text-over cl-main">{{value.vname}}</view>
+					<view class="pr10 ft12 ftw500 text-over cl-999">观看至 {{value.mid}} 集</view>
+				</view>
+			</block>
+		</view>
+		<uni-load-more :status="status" :content-text="contentText" />
+		<view style="width: 100%; height: 30upx;"></view>
+
+	</view>
+</template>
+
+<script>
+export default {
+  data(){
+    return {
+      banners:[],
+      searchValue:'',
+      pages:{
+        currentPage:1,
+        pageSize:20,
+        isNextPage:true
+      },
+      tabs:[
+        {name:'全部'},
+        {name:'视频'},
+        {name:'音频'},
+        {name:'小说'},
+        {name:'壁纸'},
+      ],
+      selectIndex:0,
+      scrollTop:0,
+      type:'',
+
+      listData: [],
+      status: 'more',
+	  contentText: {
+	  	contentdown: "上拉显示更多",
+	  	contentrefresh: "正在加载...",
+	  	contentnomore: "没有更多数据了"
+	  },
+
+    }
+  },
+  onLoad(e){
+    //console.log(111)
+    if(e.selectIndex){
+      this.selectIndex=e.selectIndex*1
+    }
+    this.status = 'more';
+    this.getList();
+    this.banners=uni.getStorageSync("config").banner
+  },
+
+  onReachBottom() {
+    this.status = 'more';
+    this.getList();
+  },
+
+  methods:{
+    detail(vid,mid){
+      uni.navigateTo({
+        url:'/pagesA/player/detailPlayer?vid='+vid+'&mid='+mid
+      })
+    },
+    getList() {
+      let that = this;
+      if (that.pages.isNextPage) {
+        that.status = 'loading';
+        that.$httpRequest({
+          url: "/api/video/videolog",
+          methods: "GET",
+          data: {
+            limit: that.pages.pageSize,
+            page: that.pages.currentPage
+          }
+        }).then(res => {
+          that.status = '';
+          if (that.pages.currentPage == 1) {
+            that.listData = res.rows;
+          } else if (res.rows.length > 0) {
+            that.listData = that.listData.concat(res.rows);
+          } else {
+            that.status = 'noMore';
+            that.pages.isNextPage = false;
+          }
+          that.pages.currentPage += 1;
+        }).catch(err => {
+          that.status = '';
+          console.log(err)
+        })
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+	.integral-mall-goods {
+		width: 100%;
+		height: 280rpx;
+		background: #F2F2F2;
+		border-radius: 16upx;
+	}
+
+	.user-not-vip {
+		width: 100%;
+		height: 80rpx;
+		background: #FDF6EC;
+		border-radius: 40rpx;
+		border: 2rpx solid #EFC381;
+		text-align: center;
+		line-height: 76rpx;
+		font-size: 24rpx;
+		color: #000000;
+		font-weight: bold;
+	}
+
+
+	.tuan-product-l {
+		width: 320rpx;
+		height: 240rpx;
+		border-radius: 16rpx;
+		background: #F2F2F2;
+	}
+
+	.tuan-product-r {
+		width: calc(100% - 320rpx);
+	}
+
+	.search-result {
+		padding-top: 10px;
+		padding-bottom: 20px;
+		text-align: center;
+	}
+
+	.search-result-text {
+		text-align: center;
+		font-size: 14px;
+		color: #666;
+	}
+
+	.uni-mt-10 {
+		margin-top: 10px;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesA/player/detailPlayer.nvue b/pagesA/player/detailPlayer.nvue
new file mode 100644
index 0000000..6cd0561
--- /dev/null
+++ b/pagesA/player/detailPlayer.nvue
@@ -0,0 +1,970 @@
+<template>
+  <view class="pages">
+    <!-- #ifdef MP-WEIXIN || MP-TOUTIAO  -->
+    <view class="header" :style="{marginTop:searchBarTop + 'px',height:searchBarHeight + 'px'}">
+      <view style="height: 45px;display: flex;width: 100%;padding-left: 15rpx; " @tap.stop="back_load">
+        <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/on_back.png"
+               style="width: 44rpx;height: 44rpx;"></image>
+      </view>
+    </view>
+    <!-- #endif -->
+    <!-- #ifdef H5 -->
+    <view class="header">
+      <view style="height: 45px;display: flex;width: 100%;padding-top: 10px; " @tap.stop="back_load">
+        <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/on_back.png"
+               style="width: 44rpx;height: 44rpx;"></image>
+      </view>
+    </view>
+    <!-- #endif -->
+    <swiper class="swiper" :current="swiperCurrent" :indicator-dots="false" :autoplay="false" :vertical="true"
+            :duration="50" @change="currentChange" :style="{height:winHeight} ">
+      <swiper-item class="swiperItem" v-for="(videoItem,videoIndex) in videoListData" :key="videoItem._id">
+
+        <view class="swiperItemContent" style="color: #ffffff;">
+          <view class="payVideo" v-if="videoIndex == swiperCurrent &&  videoItem.pays == '2'">
+
+            <!-- #ifdef APP || H5-->
+            <video class="video"
+                   :id="videoItem._id"
+                   :src="videoItem.src"
+                   :autoplay="true"
+                   object-fit="contain"
+                   @ended="videoPlayerEnded"
+                   @loadedmetadata="loadedmetadata"
+            ></video>
+            <!-- #endif -->
+
+          </view>
+          <view class="noPayVideo" v-if="videoItem.pays == 1">
+            <image class="videoCove" :src="imageUrl+videoItem.img" mode="aspectFit"></image>
+            <view class="adBox" v-if="videoInfo.paytype=='1'">
+<!--              广告解锁-->
+            </view>
+            <view v-else-if="videoInfo.paytype=='2'" @click="goUpVip">
+              <button>开通会员继续观看</button>
+            </view>
+            <view v-else></view>
+          </view>
+
+          <view class="rightBtnList" v-if="videoIndex == swiperCurrent && videoItem.pays == 2">
+            <view class="btnItem" @click="userChangeLike(videoItem)" v-if="userInfo.id">
+              <image class="videoBtnImg" v-if="videoItem.like=='2'"
+                     src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/aixinRed.png"
+                     mode="scaleToFill"></image>
+              <image class="videoBtnImg" v-else src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/aixin.png"
+                     mode="scaleToFill"></image>
+              <text class="btnText">{{videoItem.like_n>0?videoItem.like_n:'0'}}</text>
+            </view>
+            <view class="btnItem" @click="userChangeStar(videoItem)" v-if="userInfo.id">
+              <image class="videoBtnImg" v-if="videoInfo.iszj=='2'"
+                     src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/scRed.png"
+                     mode="scaleToFill"></image>
+              <image class="videoBtnImg" v-else src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/sc.png"
+                     mode="scaleToFill"></image>
+              <!--              <text class="btnText" >{{videoItem.like_n>0?videoItem.iszj_n : '0'}}</text>-->
+              <text class="btnTextRed" v-if="videoInfo.iszj=='2'">已追</text>
+              <text class="btnText" v-else>追剧</text>
+            </view>
+
+            <!-- #ifdef H5 -->
+            <view class="btnItem" @click="copyShareLink(videoItem)" v-if="userInfo.id">
+              <image class="videoBtnImg" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/icon/video_share_icon.png"
+                     mode=""></image>
+              <text class="btnText">分享</text>
+            </view>
+            <!-- #endif -->
+          </view>
+          <view class="videoFooter" v-if="videoIndex == swiperCurrent && videoInfo.id" @click="showChoice">
+            <view class="videoName">
+              <image class="footerTv" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/video.png" mode="scaleToFill"></image>
+              <text class="footerTvText">{{videoInfo.name}} · 当前第{{videoItem.weigh}}集/全{{videoInfo.sum}}集</text>
+            </view>
+            <view class="choiceVideo">
+              <text class="choiceVideoTexts">选集</text>
+              <uni-icons size="12" type="right" color="#ffffff"></uni-icons>
+            </view>
+          </view>
+        </view>
+      </swiper-item>
+
+    </swiper>
+
+    <recharge ref="rechargePups"
+              :userBeans="userBeansNum"
+              :play-video-info="playVideoDetail"
+              :video-info="videoInfo"
+              :pageHeight="pupHeight"
+              @rechargeSuccess="rechargeSuccess"
+    ></recharge>
+    <selectVideo ref="choiceVideoPup" @choiceVideoItem="changePlaying" :play-video-info="playVideoDetail"
+                 :video-info="videoInfo">
+    </selectVideo>
+
+
+  </view>
+</template>
+
+<script>
+
+import selectVideo from "@/components/select/video.vue"
+import recharge from "@/pagesA/components/recharge/rechargePup.vue"
+import {httpRequest} from "@/utils/request";
+import PAY from "@/utils/pay"
+// #ifdef MP-WEIXIN
+import login from "@/utils/login";
+// #endif
+
+export default {
+  components: {
+    selectVideo,
+    recharge
+  },
+  data() {
+    return {
+      page: {
+        pageSize: 50,
+        currentPage: 1,
+        isNextPage: true,
+      },
+      userInfo: {},
+      swiperCurrent: 0,
+      playVideoDetail: {}, //
+      videoInfo: {}, //短剧简介
+      videoListData: [{
+        beans: Number,
+        fjname: String,
+        href: String,
+        id: Number,
+        img: String,
+        isplay: Boolean,
+        isvip: Number,
+        iszj: Number,
+        iszj_n: Number,
+        like: Number,
+        like_n: Number,
+        lx: Number,
+        mid: Number,
+        name: String,
+        pays: Number,
+        pid: Number,
+        price: String,
+        src: String,
+        state: String,
+        sum: Number,
+        videourl: String,
+        vipprice: String,
+        weigh: Number,
+      }], //剧集列表
+      swiperData: [], //
+      userBeansNum: 0,
+      videoId: '',
+      imageUrl: "",
+      winHeight: '800px',
+      pupHeight: "400px",
+      onPlayVideo: null,
+    };
+  },
+
+
+  onLoad(e) {
+    console.log(e)
+    this.userinfo = uni.getStorageSync("userinfo");
+    this.getPageDefault();
+    this.checkQueryData(e);
+    if (this.userinfo.token) {
+      this.openid = uni.getStorageSync("openid");
+      if (e.adv_id && e.code) {
+        this.bindUser(e).then(res => {
+          console.log('bind user success')
+          // #ifdef APP || H5
+          this.get_user_info()
+          this.getVideoList()
+          // #endif
+          // #ifdef MP-WEIXIN
+          this.getWechartVideoDel(e)
+          // #endif
+        }).catch(err => {
+          console.log('bind user catch')
+          console.log(err)
+        })
+      } else {
+        // #ifdef APP || H5
+        this.get_user_info()
+        this.getVideoList()
+        // #endif
+        // #ifdef MP-WEIXIN
+        this.getWechartVideoDel(e)
+        // #endif
+
+      }
+    } else {
+      // #ifdef MP-WEIXIN
+      login.wxLogin().then(res => {
+        this.openid = uni.getStorageSync("openid");
+        if (e.adv_id && e.code) {
+          this.bindUser(e).then(res => {
+            console.log('bind user success')
+            // #ifdef MP-WEIXIN
+            this.getWechartVideoDel(e)
+            // #endif
+          }).catch(err => {
+            console.log('bind user catch')
+            console.log(err)
+          })
+        } else {
+          // #ifdef MP-WEIXIN
+          this.getWechartVideoDel(e)
+          // #endif
+        }
+      })
+      // #endif
+      // #ifdef APP || H5
+      uni.showModal({
+        title: '提示',
+        content: "请登录后再进行操作",
+        confirmText: "确定",
+        cancelText: '取消',
+        success: (res) => {
+          if (res.confirm) {
+            let nowPage = getCurrentPages();
+            let pageNum = nowPage.length - 1;
+            console.log(nowPage)
+            uni.setStorageSync('loginPage', nowPage[pageNum].route)
+            uni.navigateTo({url: "/pagesA/login/login"})
+          }
+        }
+      })
+      // #endif
+    }
+  },
+
+
+  methods: {
+
+    // 获取页面宽高数据& 系统信息
+    getPageDefault() {
+      console.log(this.system, uni.getSystemInfoSync())
+      // #ifdef MP-WEIXIN || MP-TOUTIAO
+      let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+      this.searchBarTop = menuButtonInfo.top;
+      this.searchBarHeight = menuButtonInfo.height;
+      // #endif
+
+
+      console.log(uni.getWindowInfo().windowHeight + "px")
+      this.winHeight = uni.getWindowInfo().windowHeight + "px";
+      this.pupHeight = (uni.getWindowInfo().windowHeight - 40) + "px";
+      uni.getSystemInfo({
+        success: res => {
+          this.safeArea = res.safeAreaInsets.bottom;
+        }
+      })
+    },
+    checkQueryData(e) {
+      if (e.start_free) {
+        this.free_start = Number(e.start_free)
+        this.free_end = Number(e.end_free)
+        if (Number(e.start_free) > 0) {
+          this.isAttention = true;
+        }
+      }
+      if (e.fxpid) {
+        if (e.fxpid > 0) {
+          uni.setStorageSync('fxpid',  e.fxpid )
+        }
+      }
+      if (e.vid) {
+        this.videoId = e.vid;
+      }
+      if (e.mid) {
+        this.mid = e.mid
+      }
+      console.log(this.free_start, this.free_end, this.isAttention)
+    },
+    // 绑定推荐
+    bindUser(data) {
+      let that = this
+      return new Promise((resolve, reject) => {
+        uni.setStorageSync('vs_id_code', data.vs_id);
+        let upData = {
+          uid: uni.getStorageSync("userinfo").id,
+          ad_id: data.code,
+          advertiser_id: data.advertiser_id,
+          clue_id: data.clue_id,
+          clue_token: data.clue_token,
+          click_id: data.clickid,
+          vid: data.vid,
+          mid: data.mid,
+          type: data.inventory,
+          vs_id: data.vs_id,
+          token: uni.getStorageSync("userinfo").token
+        }
+        console.log(upData)
+
+        httpRequest({
+          url: '/api/user/callbackBinding',
+          data: upData,
+          methods: "GET"
+
+        }).then(res => {
+          uni.setStorageSync('get_ad_code', res.data.code);
+          resolve(res)
+        }).catch(err => {
+          reject(err)
+        })
+      })
+    },
+    // 获取播放器信息
+    getWechartVideoDel(data) {
+      let that = this
+      httpRequest({
+        url: '/api/video/videoIdToDramaId',
+        data: {
+          vid: data.vid,
+        },
+        methods: "GET"
+      }).then(videoRes => {
+        console.log(videoRes)
+        let fxpid = uni.getStorageSync("userinfo").id,
+            invite = uni.getStorageSync("userinfo").invite || '';
+        let param = JSON.stringify({
+          vid: data.vid,
+          mid: data.mid || 0,
+          fxpid: fxpid,
+          invite: invite
+        })
+        if(data.vs_id){
+          httpRequest({
+            url: '/api/video/getPushDataInfo',
+            data: {
+              vs_id: data.vs_id || '',
+            },
+            methods: "GET",
+            isLoading: true,
+          }).then(advRes => {
+            let nums = advRes.data.weigh?advRes.data.weigh: 0
+            uni.redirectTo({
+              url: `plugin-private://wx94a6522b1d640c3b/pages/playlet/playlet?dramaId=${videoRes.data.drama_id}&srcAppid=${videoRes.data.appid?videoRes.data.appid:that.$config.mini_appid}&serialNo=${nums?nums:1}&extParam=${param}`
+            })
+          }).catch(advErr => {
+            console.log('get activity err');
+            console.log(advErr);
+          })
+        }else{
+          uni.redirectTo({
+            url: `plugin-private://wx94a6522b1d640c3b/pages/playlet/playlet?dramaId=${videoRes.data.drama_id}&srcAppid=${videoRes.data.appid?videoRes.data.appid:that.$config.mini_appid}&serialNo=${data.num?data.num:1}&extParam=${param}`
+          })
+        }
+        console.log(videoRes.data.appid?that.$config.mini_appid:videoRes.data.appid)
+      }).catch(videoErr=>{
+        console.log('get video id error')
+        console.log(videoErr)
+      })
+
+    },
+
+    // //获取个人信息
+    get_user_info() {
+      let that = this;
+      httpRequest({
+        url: '/api/user/index'
+      }).then(res => {
+        if (res.code == 1) {
+          uni.removeStorageSync("userinfo")
+          uni.setStorageSync('userinfo', res.data);
+          that.userInfo = res.data;
+          that.userBeansNum = res.data.beans;
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+
+    },
+    share() {
+      var href = '/pagesA/player/detailPlayer?vid=' + this.videoId + '&fxpid=' + this.userInfo.id + '&mid=0'
+      // #ifdef H5
+      uni.setClipboardData({
+        data: this.urls + '/h5/#' + href,
+        complete() {
+          uni.showToast({
+            title: "分享连接已复制到剪贴板"
+          })
+        }
+      })
+      // #endif
+      // #ifndef H5
+      uni.share({
+        provider: "weixin",
+        scene: "WXSenceTimeline",
+        type: 0,
+        href: href,
+        title: '分享标题',
+        summary: '分享总结',
+        imageUrl: '',
+        success: function (res) {
+          console.log("success:" + JSON.stringify(res));
+        },
+        fail: function (err) {
+          console.log("fail:" + JSON.stringify(err));
+        }
+      })
+      // #endif
+    },
+    currentChange(val) {
+      console.log("swiper_chanage");
+      let that = this;
+      let isNext = false;
+      if (val.detail.current > that.swiperCurrent) {
+        // 下一集s
+        isNext = true;
+      }
+      // 是否即将到达当前页最后两条，为最后两条时获取下一页数据
+      if (that.videoListData.length <= that.swiperCurrent + 3 && that.page.isNextPage) {
+        that.getVideoList();
+      }
+      that.swiperCurrent = val.detail.current;
+      that.playVideoDetail = that.videoListData[that.swiperCurrent];
+      // 检查当前集是否支付，未支付触发支付
+      that.checkIsPaying();
+    },
+
+    //从列表选择第几集时
+    changePlaying(val) {
+      console.log('change Playing video', val)
+      let that = this;
+      console.log(val.ranking_num)
+      if (that.videoListData.length - 1 < val.ranking_num) {
+        //   当前视频列表数据不包含选中的数据
+        that.getVideoList(true, val.ranking_num - 1)
+      } else {
+        that.swiperCurrent = val.ranking_num;
+        console.log('选集', that.videoListData)
+      }
+    },
+
+    getVideoList(isSync, num) {
+      let that = this
+      if (that.page.isNextPage) {
+        console.log('get video List',)
+        httpRequest({
+          url: '/api/video/videoinfo',
+          data: {
+            page: that.page.currentPage,
+            limit: that.page.pageSize,
+            vid: that.videoId,
+          },
+          isLoading:true,
+        }).then(res => {
+          console.log(res)
+          if (res.total < that.page.pageSize * that.page.currentPage) {
+            that.page.isNextPage = false;
+          }
+          if (that.page.currentPage == 1) {
+            res.videodata.iszj = res.data[0].iszj;
+            that.videoInfo = res.videodata;
+            uni.setNavigationBarTitle({title: res.videodata.name})
+            res.data.forEach(item => {
+              item._id = 'ks_' + item.id;
+            })
+            that.videoListData = res.data;
+            that.playVideoDetail = res.data[0];
+            that.checkIsPaying();
+
+          } else {
+            that.videoListData = that.videoListData.concat(res.data)
+          }
+          that.page.currentPage += 1;
+          if (isSync && that.videoListData.length > num + 1) {
+            // 等页面更新完调用，否则可能swiper还未加载
+            that.$nextTick(() => {
+              that.swiperCurrent = num;
+              console.log(that.swiperCurrent);
+              // 触发 swiperCurrent改变之后会获取选中集的路径，在此获取下一集的内容
+            })
+          } else if (isSync && that.videoListData.length < num + 1) {
+            that.getVideoList(isSync, num);
+          } else {
+          }
+        }).catch(err => {
+          console.log(err)
+        })
+      }
+    },
+
+    checkIsPaying() {
+      console.log('check is can paying')
+      // 未支付
+      let that = this;
+      if (that.playVideoDetail.pays == 1) {
+        // 检查金豆余额是否足够支付
+        if (that.userBeansNum >= that.playVideoDetail.beans) {
+          // 用户是否开启自动金豆支付
+          if (that.userInfo.type) { //1自动扣费 2手动支付
+            // 金豆支付
+            that.beansPaying();
+          } else {
+            // 弹出支付询问弹窗
+            uni.showModal({
+              title: '提示',
+              content: '是否支付' + that.playVideoDetail.beans + '金豆观看视频',
+              success: function (res) {
+                if (res.confirm) {
+                  that.beansPaying();
+                } else if (res.cancel) {
+                  console.log('用户点击取消');
+                }
+              }
+            })
+          }
+
+        } else {
+          // 金豆余额不足显示充值
+		  		  console.log(123);
+          this.$refs.rechargePups.showRechargePup();
+
+        }
+      } else if (!that.playVideoDetail.src) {
+        that.getVideoSrc()
+      } else {
+        that.$nextTick(() => {
+          // that.onPlayVideo = uni.createVideoContext(that.videoListData[that.swiperCurrent]._id, that);
+          // console.log('check end play videos ')
+          // that.onPlayVideo.play();
+        })
+        if (this.userInfo.id) {
+          that.upPlayNum();
+        }
+      }
+    },
+    beansPaying() {
+      let that = this;
+      let upData = {
+        buytype: "金豆",
+        beans: that.playVideoDetail.beans,
+        id: that.playVideoDetail.id,
+        smid: that.playVideoDetail.id,
+        wxlx: "wxxcx",
+        uid: that.userInfo.id,
+        token: that.userInfo.token,
+        sum: 1,
+        ad_code: uni.getStorageSync('get_ad_code'),
+        pricebuy: that.playVideoDetail.isvip == 2 ? that.playVideoDetail.vippriceq : that.playVideoDetail.priceq,
+        openid: uni.getStorageSync('openid'),
+        lx: 2,//1全集购买 2单集购买
+      }
+
+      PAY.pays.beansPay(upData).then(res => {
+        if (res.data.code == 1) {
+          that.videoListData[that.swiperCurrent].pays = 2;
+          that.userBeansNum -= that.playVideoDetail.beans;
+          // that.onPlayVideo = uni.createVideoContext(that.videoListData[that.swiperCurrent]._id, that);
+          console.log('buy success play videos')
+          // that.onPlayVideo.play();
+          //   更新播放
+          that.upPlayNum();
+        } else if (res.data.code == 0 && res.data.msg == 'msg: "金豆不足"') {
+			  console.log(123);
+          this.$refs.rechargePups.showRechargePup();
+		
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+
+    rechargeSuccess(order) {
+      if (order.oid) {
+        this.page = {
+          pageSize: 80,
+          currentPage: 1,
+          isNextPage: true,
+        };
+        this.getVideoList(true, this.swiperCurrent, order.oid)
+      }
+    },
+    // 获取视频的src
+    getVideoSrc() {
+      let that = this;
+      httpRequest({
+        url: '/api/video/memberUnlockVideo',
+        method: "GET",
+        data: {
+          smid: that.playVideoDetail.id,
+          vid: that.videoInfo.id,
+        },
+        isLoading: true,
+      }).then(res => {
+        if (res.code == 1) {
+          this.videoListData[this.swiperCurrent].src = res.data.src
+          this.$nextTick(() => {
+            that.onPlayVideo = uni.createVideoContext(that.playVideoDetail._id, that);
+            // that.onPlayVideo.play();
+          })
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+    videoPalyerErr(err) {
+      console.log('tou tiao player err', err)
+    },
+
+    videoPlayerEnded() {
+      if (this.swiperCurrent == this.videoListData.length - 1) {
+        this.swiperCurrent = 0;
+      } else {
+        this.swiperCurrent = this.swiperCurrent + 1;
+      }
+    },
+    loadedmetadata() {
+      console.log("loadedmetadata end")
+      // #ifdef H5
+      setTimeout(() => {
+        this.onPlayVideo.play();
+        uni.hideLoading()
+      }, 500)
+      // #endif
+
+    },
+
+    upPlayNum() { //更新播放记录
+      let that = this
+      if (uni.getStorageSync("userinfo")) {
+        httpRequest({
+          url: '/api/video/bfjl',
+          method: "GET",
+          data: {
+            vid: that.videoInfo.id,
+            mid: that.playVideoDetail.id,
+            uid: that.userInfo.id
+          },
+        }).then(res => {
+          console.log('up play end')
+        })
+      }
+    },
+    // 修改
+    userChangeStar() {
+      let that = this;
+      httpRequest({
+        url: '/api/user/videorecord',
+        method: "GET",
+        data: {
+          uid: that.userInfo.id,
+          vid: that.videoId,
+          mid: that.playVideoDetail.id,
+          ad_code: uni.getStorageSync('get_ad_code')
+        },
+      }).then(res => {
+        that.videoInfo.iszj = that.videoInfo.iszj == 1 ? 2 : 1
+        uni.showToast({
+          icon: 'none',
+          title: res.msg
+        })
+      })
+
+    },
+    // 修改喜欢状态
+    userChangeLike() {
+      let that = this;
+      httpRequest({
+        url: '/api/user/tapLove',
+        method: "GET",
+        data: {
+          vid: that.videoId,
+          mid: that.playVideoDetail.id
+        },
+      }).then(res => {
+        that.playVideoDetail.like = that.playVideoDetail.like == 1 ? 2 : 1
+        let likeNUm = that.playVideoDetail.like_n
+        that.playVideoDetail.like_n = that.playVideoDetail.like == 1 ? likeNUm - 1 : likeNUm + 1
+      })
+
+    },
+
+    //返回
+    back_load() {
+      let that = this;
+      if (this.playVideoDetail.iszj == 1) {
+        uni.showModal({
+          title: '提示',
+          content: '是否将此剧加入追剧列表？',
+          success: function (res) {
+            if (res.confirm) {
+              that.userChangeStar()
+            } else if (res.cancel) {
+              uni.switchTab({
+                url: '/pages/tabs/home'
+              })
+            }
+          }
+        })
+      } else {
+        uni.switchTab({
+          url: '/pages/tabs/home'
+        })
+      }
+    },
+    showChoice() {
+      this.$refs.choiceVideoPup.showChoicePup()
+    },
+	
+    goUpVip(){
+
+
+    }
+
+  },
+  onShareAppMessage: function (res) {
+    let that = this;
+    // #ifdef MP-WEIXIN || MP-TOUTIAO
+    let invite = this.userinfo.invite ? this.userinfo.invite : "";
+    let video = that.originList[that.originIndex];
+    var href = '/pagesA/player/detailPlayer?vid=' + this.videoId + '&fxpid=' + this.userInfo.id + '&mid=0' + '&invite=' +
+        invite + '&tt_album_id=' + video.album_id + '&tt_episode_id=' + video.episode_id
+    const obj = {
+      title: that.title_text,
+      imageUrl: '',
+      path: href,
+      success: function (res) {
+        console.log(res, "转发成功")
+      },
+      fail: function (res) {
+        wx.showToast({
+          title: '发送失败',
+          icon: 'none'
+        })
+      }
+    }
+    return obj
+    // #endif
+  },
+
+};
+</script>
+
+<style scoped lang="scss">
+.pages {
+  background-color: #000000;
+
+  /* #ifdef MP-TOUTIAO */
+  //height: 100vh;
+  /* #endif */
+}
+
+
+.header {
+  width: 750rpx;
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  justify-content: space-between;
+  position: absolute;
+  top: 0;
+  z-index: 99;
+}
+
+.swiper {
+  /* #ifdef APP */
+  width: 750rpx;
+  flex: 1;
+  /* #endif */
+  /* #ifdef  MP-WEIXIN ||MP-TOUTIAO ||H5 */
+  width: 750rpx;
+  /* #endif */
+
+}
+
+/* #ifdef APP */
+.swiperItem {
+  flex: 1;
+}
+
+/* #endif */
+.swiperItemContent {
+  position: relative;
+  width: 750rpx;
+  /* #ifdef APP */
+  flex: 1;
+  /* #endif */
+  /* #ifdef  MP-WEIXIN ||MP-TOUTIAO ||H5 */
+  height: 100%;
+  /* #endif */
+
+}
+
+.payVideo {
+  width: 750rpx;
+  /* #ifdef  MP-WEIXIN ||MP-TOUTIAO ||H5 */
+  height: calc(100vh - 100rpx);
+  /* #endif */
+  /* #ifdef APP */
+  flex: 1;
+  /* #endif */
+  .video {
+    width: 750rpx;
+    /* #ifdef  MP-WEIXIN ||MP-TOUTIAO ||H5 */
+    height: calc(100vh - 100rpx);
+    /* #endif */
+    /* #ifdef APP */
+    flex: 1;
+    /* #endif */
+  }
+
+}
+
+.noPayVideo {
+  width: 750rpx;
+  /* #ifdef  MP-WEIXIN ||MP-TOUTIAO ||H5 */
+  height: 100%;
+  /* #endif */
+  /* #ifdef APP */
+  flex: 1;
+
+  /* #endif */
+  .videoCove {
+    width: 800rpx;
+    /* #ifdef  MP-WEIXIN ||MP-TOUTIAO ||H5 */
+    height: calc(100% - 70rpx);
+    /* #endif */
+    /* #ifdef APP */
+    flex: 1;
+    /* #endif */
+  }
+}
+
+.rightBtnList {
+  position: absolute;
+  right: 34rpx;
+  bottom: 600rpx;
+  width: 100rpx;
+  text-align: center;
+  z-index: 99;
+
+  .btnItem {
+    margin-top: 40rpx;
+    /* #ifdef MP-WEIXIN || MP-TOUTIAO ||H5 */
+    background: none;
+    /* #endif */
+    .videoBtnImg {
+      width: 64rpx;
+      height: 64rpx;
+      /* #ifdef MP-WEIXIN || H5 */
+      margin: 0 auto;
+      /* #endif */
+      /* #ifdef APP */
+      margin-left: 16rpx;
+      /* #endif */
+    }
+
+    .btnText {
+      color: #FFFFFF;
+      text-align: center;
+      font-weight: bold;
+      font-size: 24rpx;
+    }
+
+    .btnTextRed {
+      color: red;
+      text-align: center;
+      font-weight: bold;
+      font-size: 24rpx;
+    }
+
+    /* #ifdef MP-WEIXIN || MP-TOUTIAO ||H5 */
+    .wxClickBtn {
+      border: none;
+      background: none;
+      width: 100rpx;
+      opacity: 0;
+      height: 100rpx;
+      position: relative;
+      top: -100rpx;
+      left: 0;
+    }
+
+    /* #endif */
+  }
+}
+
+
+.choiceTitleLine {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 40rpx;
+
+  .appText {
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #333333;
+  }
+
+  .schoiceClose {
+    padding: 10rpx;
+    border-radius: 8rpx;
+    background: #f6f6f6;
+  }
+}
+
+.videoFooter {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding-left: 40rpx;
+  line-height: 70rpx;
+  height: 80rpx;
+  font-size: 22rpx;
+  color: #FFFFFF;
+
+  .videoName {
+    display: flex;
+    flex-direction: row;
+
+    .footerTv {
+      width: 40rpx;
+      height: 26rpx;
+      margin-top: 6rpx;
+      margin-right: 20rpx;
+    }
+
+    .footerTvText {
+      font-weight: 500;
+      font-size: 22rpx;
+      color: #FFFFFF;
+      line-height: 32rpx;
+      border-bottom: 2rpx solid #ffffff;
+      max-width: 600rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+
+    }
+  }
+
+  .choiceVideo {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding-right: 20rpx;
+
+    .choiceVideoTexts {
+      font-size: 22rpx;
+      line-height: 70rpx;
+      color: #FFFFFF;
+    }
+
+    .footerChoice {
+      width: 34rpx;
+      height: 32rpx;
+      margin-top: 20rpx;
+    }
+  }
+
+
+}
+
+
+</style>
\ No newline at end of file
diff --git a/pagesA/player/detailPlayer.vue b/pagesA/player/detailPlayer.vue
new file mode 100644
index 0000000..a6c5c4c
--- /dev/null
+++ b/pagesA/player/detailPlayer.vue
@@ -0,0 +1,913 @@
+<template>
+  <view class="pages">
+    <!-- #ifdef MP-WEIXIN -->
+    <view class="header" :style="{marginTop:searchBarTop + 'px',height:searchBarHeight + 'px'}">
+      <view style="height: 45px;display: flex;width: 100%;padding-left: 15rpx; " @tap.stop="back_load">
+        <image src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/on_back.png" style="width: 44rpx;height: 44rpx;"></image>
+      </view>
+    </view>
+    <!-- #endif -->
+    <!-- #ifdef H5 -->
+    <view class="header">
+      <view style="height: 45px;display: flex;width: 100%;padding-top: 10px; " @tap.stop="back_load">
+        <image src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/on_back.png" style="width: 44rpx;height: 44rpx;"></image>
+      </view>
+    </view>
+    <!-- #endif -->
+    <swiper class="swiper" :current="swiperCurrent" :indicator-dots="false" :autoplay="false" :vertical="true"
+            :duration="50" @change="currentChange" :style="{height:winHeight} ">
+      <swiper-item class="swiperItem" v-for="(videoItem,videoIndex) in videoListData" :key="videoItem._id">
+
+        <view class="swiperItemContent" style="color: #ffffff;">
+          <view class="payVideo" v-if="videoIndex == swiperCurrent &&  videoItem.pays == '2'">
+            <!-- #ifdef MP-WEIXIN -->
+            <video-player class="video"
+                          :album-id="videoItem.album_id"
+                          :cloud-type="1"
+                          :autoplay="true"
+                          :episode-id="videoItem.episode_id"
+                          :controls="true"
+                          :loop="false"
+                          :enable-progress-gesture="false"
+                          @ended="videoPlayerEnded"
+                          :show-fullscreen-btn='false'
+                          @loadedmetadata="loadedmetadata"
+                          @error="videoPalyerErr">
+            </video-player>
+            <!-- #endif -->
+            <!-- #ifdef APP || H5-->
+            <video  class="video"
+                    :id="videoItem._id"
+                    :poster="videoItem.img"
+                    :autoplay="true"
+                    object-fit="contain"
+                    @ended="videoPlayerEnded"
+                    @loadedmetadata="loadedmetadata"
+                    :src="videoItem.src"></video>
+            <!-- #endif -->
+          </view>
+          <view class="noPayVideo" v-if="videoItem.pays == 1">
+            <image class="videoCove" :src="imageUrl+videoItem.img" mode="aspectFit"></image>
+          </view>
+
+          <view class="rightBtnList" v-if="videoIndex == swiperCurrent && videoItem.pays == 2">
+            <view class="btnItem" @click="userChangeLike(videoItem)" v-if="userInfo.id">
+              <image class="videoBtnImg" v-if="videoItem.like=='2'" src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/aixinRed.png"
+                     mode="scaleToFill"></image>
+              <image class="videoBtnImg" v-else src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/aixin.png"
+                     mode="scaleToFill"></image>
+              <view class="btnText">{{videoItem.like_n>0?videoItem.like_n:'0'}}</view>
+            </view>
+            <view class="btnItem" @click="userChangeStar(videoItem)" v-if="userInfo.id">
+              <image class="videoBtnImg" v-if="videoInfo.iszj=='2'" src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/scRed.png"
+                     mode="scaleToFill"></image>
+              <image class="videoBtnImg" v-else src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/sc.png"
+                     mode="scaleToFill"></image>
+              <!--              <text class="btnText" >{{videoItem.like_n>0?videoItem.iszj_n : '0'}}</text>-->
+              <view class=" btnTextRed" v-if="videoInfo.iszj=='2'">已追</view>
+              <view class="btnText" v-else>追剧</view>
+            </view>
+
+            <!-- #ifdef H5 -->
+            <view class="btnItem" @click="copyShareLink(videoItem)" v-if="userInfo.id">
+              <image class="videoBtnImg" src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/icon/share-fill.png" mode=""></image>
+              <view class="btnText">分享</view>
+            </view>
+            <!-- #endif -->
+          </view>
+          <view class="videoFooter" v-if="videoIndex == swiperCurrent && videoInfo.id" @click="showChoice">
+            <view class="videoName">
+              <image class="footerTv" src="https://wxtietong.hnjrdzkj.xyz/static/wechat/static/video.png" mode="scaleToFill"></image>
+              <text class="footerTvText">{{videoInfo.name}} · 当前第{{videoItem.weigh}}集/全{{videoInfo.sum}}集</text>
+            </view>
+            <view class="choiceVideo">
+              <text class="choiceVideoTexts">选集</text>
+              <uni-icons size="12" type="right" color="#ffffff"></uni-icons>
+            </view>
+          </view>
+        </view>
+      </swiper-item>
+
+    </swiper>
+
+    <recharge ref="rechargePups"
+              :userBeans="userBeansNum"
+              :play-video-info="playVideoDetail"
+              :video-info="videoInfo"
+              :pageHeight="pupHeight"
+              @rechargeSuccess="rechargeSuccess"
+    ></recharge>
+    <selectVideo ref="choiceVideoPup" @choiceVideoItem="changePlaying" :play-video-info="playVideoDetail"
+                 :video-info="videoInfo">
+    </selectVideo>
+
+
+  </view>
+</template>
+
+<script>
+
+import selectVideo from "@/components/select/video.vue"
+import recharge from "@/pagesA/components/recharge/rechargePup.vue"
+import PAY from "@/utils/pay"
+import login from "@/utils/login";
+import config from "@/utils/config";
+export default {
+  components: {
+    selectVideo,
+    recharge
+  },
+  data() {
+    return {
+      page: {
+        pageSize: 50,
+        currentPage: 1,
+        isNextPage: true,
+      },
+      userInfo: {},
+      swiperCurrent: 0,
+      playVideoDetail: {}, //
+      videoInfo: {}, //短剧简介
+      videoListData: [{
+        beans: Number,
+        fjname: String,
+        href: String,
+        id: Number,
+        img: String,
+        isplay: Boolean,
+        isvip: Number,
+        iszj: Number,
+        iszj_n: Number,
+        like: Number,
+        like_n: Number,
+        lx: Number,
+        mid: Number,
+        name: String,
+        pays: Number,
+        pid: Number,
+        price: String,
+        src: String,
+        state: String,
+        sum: Number,
+        videourl: String,
+        vipprice: String,
+        weigh: Number,
+      }], //剧集列表
+      swiperData: [], //
+      userBeansNum: 0,
+      videoId: '',
+      imageUrl: "",
+      searchBarTop:0,
+      searchBarHeight:0,
+      winHeight: '800px',
+      pupHeight: "400px",
+      onPlayVideo: null,
+    };
+  },
+
+
+  onLoad(e) {
+    console.log(e)
+    this.userinfo = uni.getStorageSync("userinfo");
+    this.getPageDefault();
+    this.checkQueryData(e);
+    if (this.userinfo.token) {
+      this.openid = uni.getStorageSync("openid");
+      if (e.adv_id && e.code) {
+        this.bindUser(e).then(res => {
+          console.log('bind user success')
+          // #ifdef APP || H5
+          this.get_user_info()
+          this.getVideoList()
+          // #endif
+          // #ifdef MP-WEIXIN
+          this.getWechartVideoDel(e)
+          // #endif
+        }).catch(err => {
+          console.log('bind user catch')
+          console.log(err)
+        })
+      } else {
+        // #ifdef APP || H5
+        this.get_user_info()
+        this.getVideoList()
+        // #endif
+        // #ifdef MP-WEIXIN
+        this.getWechartVideoDel(e)
+        // #endif
+
+      }
+    } else {
+      // #ifdef MP-WEIXIN
+      login.wxLogin().then(res=>{
+        this.openid = uni.getStorageSync("openid");
+        if (e.adv_id && e.code) {
+          this.bindUser(e).then(res => {
+            console.log('bind user success')
+            this.getWechartVideoDel(e)
+          }).catch(err => {
+            console.log('bind user catch')
+            console.log(err)
+          })
+        } else {
+          this.getWechartVideoDel(e)
+        }
+      })
+      // #endif
+      // #ifdef H5 ||APP
+      uni.showModal({
+        title: '提示',
+        content: '您还未登录，请先登录',
+        success: function (res) {
+          if (res.confirm) {
+            uni.navigateTo({
+              url: '/pagesA/login/login'
+            })
+          } else if (res.cancel) {
+            uni.switchTab({url: '/pages/tabs/home'})
+          }
+        }
+      })
+      // #endif
+
+    }
+  },
+
+
+  methods: {
+
+    // 获取页面宽高数据& 系统信息
+    getPageDefault() {
+      console.log(this.system, uni.getSystemInfoSync())
+      // #ifdef MP-WEIXIN
+      let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+      this.searchBarTop = menuButtonInfo.top;
+      this.searchBarHeight = menuButtonInfo.height;
+      this.wxlx = 'wxxcx'
+      // #endif
+
+      //#ifdef H5
+      var ua = window.navigator.userAgent.toLowerCase();
+      if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+        this.wxlx = 'wxgzh';
+      }
+      //#endif
+      this.winHeight = uni.getWindowInfo().windowHeight+"px";
+      console.log(uni.getWindowInfo().windowHeight+"px")
+      this.pupHeight =( uni.getWindowInfo().windowHeight - 40 )+ "px";
+      uni.setStorage({
+        key: 'isbuy',
+        data: 1
+      })
+      uni.getSystemInfo({
+        success: res => {
+          this.safeArea = res.safeAreaInsets.bottom;
+        }
+      })
+    },
+    checkQueryData(e) {
+      if (e.start_free) {
+        this.free_start = Number(e.start_free)
+        this.free_end = Number(e.end_free)
+        if (Number(e.start_free) > 0) {
+          this.isAttention = true;
+        }
+      }
+      if (e.fxpid) {
+        if (e.fxpid > 0) {
+          uni.setStorage({
+            key: 'fxpid',
+            data: e.fxpid
+          })
+        }
+      }
+      if (e.vid) {
+        this.videoId = e.vid;
+      }
+      if (e.mid) {
+        this.mid = e.mid
+      }
+      console.log(this.free_start, this.free_end, this.isAttention)
+    },
+    // 绑定推荐
+    bindUser(data) {
+      let that = this
+      return new Promise((resolve, reject) => {
+        uni.setStorageSync('vs_id_code', data.vs_id);
+        let upData = {
+          uid: uni.getStorageSync("userinfo").id,
+          ad_id: data.code,
+          advertiser_id: data.advertiser_id,
+          clue_id: data.clue_id,
+          clue_token: data.clue_token,
+          click_id: data.clickid,
+          vid: data.vid,
+          mid: data.mid,
+          type: data.inventory,
+          vs_id: data.vs_id,
+          token: uni.getStorageSync("userinfo").token
+        }
+
+        that.$httpRequest({
+          url: '/api/user/callbackBinding',
+          data: upData,
+          methods:"GET"
+
+        }).then(res=>{
+          uni.setStorageSync('get_ad_code', res.data.code);
+          resolve(res)
+        }).catch(err=>{
+          reject(err)
+        })
+      })
+    },
+    // 获取播放器信息
+    getWechartVideoDel(data) {
+      let that = this
+      that.$httpRequest({
+        url: '/api/video/videoIdToDramaId',
+        data: {
+          vid: data.vid,
+        },
+        methods:"GET"
+      }).then(videoRes=>{
+        console.log(videoRes)
+        let fxpid = uni.getStorageSync("userinfo").id,
+            invite = uni.getStorageSync("userinfo").invite || '';
+        let param = JSON.stringify({
+          vid: data.vid,
+          mid: data.mid || 0,
+          fxpid: fxpid,
+          invite: invite
+        })
+        // 获取活动指定的是那一集并跳转到指定剧集
+        if(data.vs_id){
+          that.$httpRequest({
+            url: '/api/video/getPushDataInfo',
+            data: {
+              vs_id: data.vs_id || '',
+            },
+            methods: "GET",
+            isLoading: true,
+          }).then(advRes => {
+            let nums = advRes.data.weigh?advRes.data.weigh: 0
+            uni.redirectTo({
+              url: `plugin-private://wx94a6522b1d640c3b/pages/playlet/playlet?dramaId=${videoRes.data.drama_id}&srcAppid=${videoRes.data.appid?videoRes.data.appid:that.$config.mini_appid}&serialNo=${nums?nums:1}&extParam=${param}`
+            })
+          }).catch(advErr => {
+            console.log('get activity err');
+            console.log(advErr);
+          })
+        }else{
+          uni.redirectTo({
+            url: `plugin-private://wx94a6522b1d640c3b/pages/playlet/playlet?dramaId=${videoRes.data.drama_id}&srcAppid=${videoRes.data.appid?videoRes.data.appid:that.$config.mini_appid}&serialNo=${data.num?data.num:1}&extParam=${param}`
+          })
+        }
+        console.log(videoRes.data.appid?that.$config.mini_appid:videoRes.data.appid)
+      }).catch(videoErr=>{
+        console.log('get video id error')
+        console.log(videoErr)
+      })
+
+    },
+
+    // //获取个人信息
+    get_user_info() {
+      let that = this;
+      that.$httpRequest({
+        url:'/api/user/index'
+      }).then(res=>{
+        if (res.code == 1) {
+          uni.removeStorageSync("userinfo")
+          uni.setStorageSync('userinfo', res.data);
+          that.userInfo = res.data;
+          that.userBeansNum = res.data.beans;
+        }
+      }).catch(err=>{
+        console.log(err)
+      })
+    },
+    copyShareLink() {
+      var href = '/pagesA/player/detailPlayer?vid=' + this.videoId + '&fxpid=' + this.userInfo.id + '&mid=0'
+      // #ifdef H5
+      uni.setClipboardData({
+        data: config.webUrl + '/h5/#' + href,
+        complete() {
+          uni.showToast({
+            title: "分享连接已复制到剪贴板"
+          })
+        }
+      })
+      // #endif
+      // #ifndef H5
+      uni.share({
+        provider: "weixin",
+        scene: "WXSenceTimeline",
+        type: 0,
+        href: href,
+        title: '分享标题',
+        summary: '分享总结',
+        imageUrl: '',
+        success: function (res) {
+          console.log("success:" + JSON.stringify(res));
+        },
+        fail: function (err) {
+          console.log("fail:" + JSON.stringify(err));
+        }
+      })
+      // #endif
+    },
+    currentChange(val) {
+      console.log("swiper_chanage");
+      let that = this;
+      let isNext = false;
+      if (val.detail.current > that.swiperCurrent) {
+        // 下一集s
+        isNext = true;
+      }
+      // 是否即将到达当前页最后两条，为最后两条时获取下一页数据
+      if (that.videoListData.length <= that.swiperCurrent + 3 && that.page.isNextPage) {
+        that.getVideoList();
+      }
+      that.swiperCurrent = val.detail.current;
+      that.playVideoDetail = that.videoListData[that.swiperCurrent];
+      // 检查当前集是否支付，未支付触发支付
+      that.checkIsPaying();
+    },
+
+    //从列表选择第几集时
+    changePlaying(val) {
+      console.log('change Playing video', val)
+      let that = this;
+      console.log(val.ranking_num)
+      if (that.videoListData.length - 1 < val.ranking_num) {
+        //   当前视频列表数据不包含选中的数据
+        that.getVideoList(true, val.ranking_num - 1)
+      } else {
+        that.swiperCurrent = val.ranking_num;
+        console.log('选集', that.videoListData)
+      }
+    },
+
+    getVideoList(isSync, num) {
+      let that = this
+      if (that.page.isNextPage) {
+        console.log('get video List',)
+        that.$httpRequest({
+          url:'/api/video/videoinfo',
+          data:{
+            page: that.page.currentPage,
+            limit: that.page.pageSize,
+            vid: that.videoId,
+          }
+        }).then(res=>{
+          if (res.total < that.page.pageSize * that.page.currentPage) {
+            that.page.isNextPage = false;
+          }
+          if (that.page.currentPage == 1) {
+            res.videodata.iszj = res.data[0].iszj;
+            that.videoInfo = res.videodata;
+            uni.setNavigationBarTitle({title: res.videodata.name})
+            res.data.forEach(item => {
+              item._id = 'ks_' + item.id;
+            })
+            that.videoListData = res.data;
+            that.playVideoDetail = res.data[0];
+            that.checkIsPaying();
+
+          } else {
+            that.videoListData = that.videoListData.concat(res.data)
+          }
+          that.page.currentPage += 1;
+          if (isSync && that.videoListData.length > num + 1) {
+            // 等页面更新完调用，否则可能swiper还未加载
+            that.$nextTick(() => {
+              that.swiperCurrent = num;
+              console.log(that.swiperCurrent);
+              // 触发 swiperCurrent改变之后会获取选中集的路径，在此获取下一集的内容
+            })
+          } else if (isSync && that.videoListData.length < num + 1) {
+            that.getVideoList(isSync, num);
+          } else {
+          }
+        }).catch(err=>{
+          console.log(err)
+        })
+      }
+    },
+
+    checkIsPaying() {
+      console.log('check is can paying')
+      // 未支付
+      let that = this;
+      if (that.playVideoDetail.pays == 1) {
+        // 检查金豆余额是否足够支付
+        if (that.userBeansNum >= that.playVideoDetail.beans) {
+          // 用户是否开启自动金豆支付
+          if(that.userInfo.type){ //1自动扣费 2手动支付
+            // 金豆支付
+            that.beansPaying();
+          }else{
+            // 弹出支付询问弹窗
+            uni.showModal({
+              title: '提示',
+              content: '是否支付' + that.playVideoDetail.beans + '金豆观看视频',
+              success: function (res) {
+                if (res.confirm) {
+                  that.beansPaying();
+                } else if (res.cancel) {
+                  console.log('用户点击取消');
+                }
+              }
+            })
+          }
+
+        } else {
+          // 金豆余额不足显示充值
+          this.$refs.rechargePups.showRechargePup();
+        }
+      } else if (!that.playVideoDetail.src) {
+        that.getVideoSrc()
+      } else {
+        that.$nextTick(() => {
+          that.onPlayVideo = uni.createVideoContext(that.videoListData[that.swiperCurrent]._id, that);
+          console.log('check end play videos ')
+          that.onPlayVideo.play();
+        })
+        if (this.userInfo.id) {
+          that.upPlayNum();
+        }
+      }
+    },
+    beansPaying(){
+      let that = this;
+      let upData = {
+        buytype: "金豆",
+        beans: that.playVideoDetail.beans,
+        id: that.playVideoDetail.id,
+        smid: that.playVideoDetail.id,
+        wxlx:"wxxcx",
+        uid: that.userInfo.id,
+        token: that.userInfo.token,
+        sum: 1,
+        ad_code: uni.getStorageSync('get_ad_code'),
+        pricebuy: that.playVideoDetail.isvip == 2 ? that.playVideoDetail.vippriceq : that.playVideoDetail.priceq,
+        openid: uni.getStorageSync('openid'),
+        lx: 2,//1全集购买 2单集购买
+      }
+
+      PAY.pays.beansPay(upData).then(res => {
+        if (res.data.code == 1) {
+          that.videoListData[that.swiperCurrent].pays = 2;
+          that.userBeansNum -= that.playVideoDetail.beans;
+          // that.onPlayVideo = uni.createVideoContext(that.videoListData[that.swiperCurrent]._id, that);
+          console.log('buy success play videos')
+          // that.onPlayVideo.play();
+          //   更新播放
+          that.upPlayNum();
+        }else if(res.data.code ==0 && res.data.msg =='msg: "金豆不足"'){
+          this.$refs.rechargePups.showRechargePup();
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+
+
+    rechargeSuccess(order) {
+      if (order.oid) {
+        this.page = {
+          pageSize: 80,
+          currentPage: 1,
+          isNextPage: true,
+        };
+        this.getVideoList(true, this.swiperCurrent, order.oid)
+      }
+    },
+    // 获取视频的src
+    getVideoSrc() {
+      let that = this;
+      that.$httpRequest({
+        url:'/api/video/memberUnlockVideo',
+        method: "GET",
+        data:{
+          smid: that.playVideoDetail.id,
+          vid: that.videoInfo.id,
+        },
+        isLoading: true,
+      }).then(res=>{
+        if (res.code == 1) {
+          uni.showLoading()
+          this.videoListData[this.swiperCurrent].src = res.data.src
+          this.$nextTick(() => {
+            that.onPlayVideo = uni.createVideoContext(that.playVideoDetail._id, that);
+            that.onPlayVideo.play();
+          })
+        }
+      }).catch(err=>{
+        console.log(err)
+      })
+    },
+    videoPalyerErr(err) {
+      console.log('tou tiao player err', err)
+    },
+
+    videoPlayerEnded() {
+      if (this.swiperCurrent == this.videoListData.length - 1) {
+        this.swiperCurrent = 0;
+      } else {
+        this.swiperCurrent = this.swiperCurrent + 1;
+      }
+    },
+    loadedmetadata() {
+      console.log("loadedmetadata end")
+      // #ifdef H5
+      setTimeout(() => {
+        this.onPlayVideo.play();
+        uni.hideLoading()
+      }, 500)
+      // #endif
+
+    },
+
+    upPlayNum() { //更新播放记录
+      let that = this
+      if (uni.getStorageSync("userinfo")) {
+        that.$httpRequest({
+          url:'/api/video/bfjl',
+          method: "GET",
+          data:{
+            vid: that.videoInfo.id,
+            mid: that.playVideoDetail.id,
+            uid: that.userInfo.id
+          },
+        }).then(res=>{
+          console.log('up play end')
+        })
+      }
+    },
+    // 修改
+    userChangeStar() {
+      let that = this;
+      that.$httpRequest({
+        url:'/api/user/videorecord',
+        method: "GET",
+        data:{
+          uid: that.userInfo.id,
+          vid: that.videoId,
+          mid: that.playVideoDetail.id,
+          ad_code: uni.getStorageSync('get_ad_code')
+        },
+      }).then(res=>{
+        that.videoInfo.iszj = that.videoInfo.iszj == 1 ? 2 : 1
+        uni.showToast({
+          icon: 'none',
+          title: res.msg
+        })
+      })
+
+    },
+    // 修改喜欢状态
+    userChangeLike() {
+      let that = this;
+      that.$httpRequest({
+        url:'/api/user/tapLove',
+        method: "GET",
+        data:{
+          vid: that.videoId,
+          mid: that.playVideoDetail.id
+        },
+      }).then(res=>{
+        that.playVideoDetail.like = that.playVideoDetail.like == 1 ? 2 : 1
+        let likeNUm = that.playVideoDetail.like_n
+        that.playVideoDetail.like_n = that.playVideoDetail.like == 1 ? likeNUm - 1 : likeNUm + 1
+      })
+
+    },
+
+    //返回
+    back_load() {
+      let that = this;
+      if (this.playVideoDetail.iszj == 1) {
+        uni.showModal({
+          title: '提示',
+          content: '是否将此剧加入追剧列表？',
+          success: function (res) {
+            if (res.confirm) {
+              that.userChangeStar()
+            } else if (res.cancel) {
+              uni.switchTab({
+                url: '/pages/tabs/home'
+              })
+            }
+          }
+        })
+      } else {
+        uni.switchTab({
+          url: '/pages/tabs/home'
+        })
+      }
+    },
+    showChoice() {
+      this.$refs.choiceVideoPup.showChoicePup()
+    }
+
+  },
+  onShareAppMessage: function (res) {
+    let that = this;
+    // #ifdef MP-WEIXIN || MP-TOUTIAO
+    let invite = this.userinfo.invite ? this.userinfo.invite : "";
+    let video = that.originList[that.originIndex];
+    var href = '/pagesA/player/detailPlayer?vid=' + this.videoId + '&fxpid=' + this.userinfo.id + '&mid=0' + '&invite=' +
+        invite + '&tt_album_id=' + video.album_id + '&tt_episode_id=' + video.episode_id
+    const obj = {
+      title: that.title_text,
+      imageUrl: '',
+      path: href,
+      success: function (res) {
+        console.log(res, "转发成功")
+      },
+      fail: function (res) {
+        wx.showToast({
+          title: '发送失败',
+          icon: 'none'
+        })
+      }
+    }
+    return obj
+    // #endif
+  },
+
+};
+</script>
+
+<style scoped lang="scss">
+.pages {
+  background-color: #000000;
+  height: 100vh;
+}
+
+
+.header {
+  width: 750rpx;
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  justify-content: space-between;
+  position: absolute;
+  top: 0;
+  z-index: 99;
+}
+
+.swiper {
+  width: 750rpx;
+}
+
+.swiperItemContent {
+  position: relative;
+  width: 750rpx;
+  height: 100%;
+}
+
+.payVideo {
+  width: 750rpx;
+  height: calc(100vh - 100rpx);
+  .video {
+    width: 750rpx;
+    height: calc(100vh - 100rpx);
+  }
+
+}
+
+.noPayVideo {
+  width: 750rpx;
+  height: 100%;
+  .videoCove {
+    width: 800rpx;
+    height: calc(100% - 70rpx);
+  }
+}
+
+.rightBtnList {
+  position: absolute;
+  right: 34rpx;
+  top: calc(50% - 200rpx);
+  width: 100rpx;
+  text-align: center;
+  z-index: 99;
+
+  .btnItem {
+    margin-top: 40rpx;
+    background: none;
+    text-align: center;
+    .videoBtnImg {
+      width: 64rpx;
+      height: 64rpx;
+      margin: 0 auto;
+    }
+
+    .btnText {
+      color: #FFFFFF;
+      text-align: center;
+      font-weight: bold;
+      font-size: 24rpx;
+    }
+
+    .btnTextRed {
+      color: red;
+    }
+
+    .wxClickBtn {
+      border: none;
+      background: none;
+      width: 100rpx;
+      opacity: 0;
+      height: 100rpx;
+      position: relative;
+      top: -100rpx;
+      left: 0;
+    }
+  }
+}
+
+
+.choiceTitleLine {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 40rpx;
+
+  .appText {
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #333333;
+  }
+
+  .schoiceClose {
+    padding: 10rpx;
+    border-radius: 8rpx;
+    background: #f6f6f6;
+  }
+}
+
+.videoFooter {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding-left: 40rpx;
+  line-height: 70rpx;
+  height: 80rpx;
+  font-size: 22rpx;
+  color: #FFFFFF;
+  .footerTv {
+    width: 40rpx;
+    height: 26rpx;
+    margin-top: 6rpx;
+    margin-right: 20rpx;
+  }
+
+  .videoName {
+    display: flex;
+    flex-direction: row;
+
+
+    .footerTvText {
+      font-weight: 500;
+      font-size: 22rpx;
+      color: #FFFFFF;
+      line-height: 32rpx;
+      border-bottom: 2rpx solid #ffffff;
+      max-width: 600rpx;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+
+    }
+  }
+
+  .choiceVideo {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding-right: 20rpx;
+
+    .choiceVideoTexts {
+      font-size: 22rpx;
+      line-height: 70rpx;
+      color: #FFFFFF;
+    }
+
+    .footerChoice {
+      width: 34rpx;
+      height: 32rpx;
+      margin-top: 20rpx;
+    }
+  }
+
+
+}
+
+
+</style>
\ No newline at end of file
diff --git a/pagesA/player/free.vue b/pagesA/player/free.vue
new file mode 100644
index 0000000..033a22d
--- /dev/null
+++ b/pagesA/player/free.vue
@@ -0,0 +1,174 @@
+<template>
+  <view class="pageFree">
+    <view class="pageHeader">
+      <view class="native" @click="pageBack">
+        <!-- <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/page_back.png"></image> -->
+        <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/page_back.png"></image>
+      </view>
+      <view class="headerText">免费短剧</view>
+      <view class="texts">你想看的都在这里～</view>
+    </view>
+    <view class="videoBox">
+      <view class="videoList">
+        <view class="videoItem" @click="detail(item.id,0)" v-for="(item,index) in pageListData" :key="item.id">
+          <image class="videoImg" :src="item.img"></image>
+          <view class="videoName">{{item.name}}</view>
+          <view class="videoText">{{item.story}}</view>
+        </view>
+      </view>
+    </view>
+    <uni-load-more :status="status" :content-text="contentText" />
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      keytext: '',
+      pageData: {
+        currentPage: 1,
+        page: 1,
+        pageSize: 15,
+      },
+      contentText: {
+        contentdown: '上拉加载更多',
+        contentrefresh: '加载中',
+        contentnomore: '没有数据了'
+      },
+      pageListData: [],
+    }
+  },
+  mounted() {
+    this.getListData();
+  },
+
+  onReachBottom() {
+    if (this.pageData.currentPage >= this.pageData.page) {
+      this.getListData();
+    }
+
+  },
+  methods: {
+    pageBack() {
+      uni.navigateBack();
+    },
+    getListData() {
+      let that = this;
+      that.$httpRequest({
+        url: '/api/video/lists',
+        data: {
+          lx: "2",
+          limit: this.pageData.pageSize,
+        },
+      }).then(res=>{
+        if(this.pageData.page ==1){
+          if(res.rows.length>0){
+            this.pageListData = res.rows;
+            this.currentPage = Math.ceil(res.total/this.pageData.pageSize);
+          }else{
+            this.contentText.contentdown='没有数据'
+          }
+
+        }else{
+          this.pageListData =  this.pageListData.concat(res.rows);
+        }
+        this.pageData.page += 1;
+      }).catch(err=>{
+        console.log(err)
+      })
+    },
+    detail(vid, mid) {
+      var fxpid = 1
+      if (uni.getStorageSync("userinfo")) {
+        fxpid = uni.getStorageSync("userinfo").id
+      }
+      uni.navigateTo({
+        url: '/pages/client/tuan/detail?vid=' + vid + '&mid=' + mid + '&fxpid=' + fxpid
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+
+.pageHeader {
+  height: 285rpx;
+  width: 100%;
+  background-image: url("https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/banners.png");
+  background-repeat: no-repeat;
+  background-size: cover;
+
+}
+
+.native {
+  padding-top: 100rpx;
+  padding-left: 20rpx;
+}
+
+.native image {
+  width: 40rpx;
+  height: 40rpx;
+}
+
+.headerText {
+  font-family: 'MyFont';
+  font-size: 42rpx;
+  padding-left: 55rpx;
+  padding-top: 20rpx;
+}
+
+.texts {
+  font-size: 24rpx;
+  padding-left: 55rpx;
+}
+
+.videoBox {
+  background-color: #ffffff;
+  border-radius: 28rpx 28rpx 0 0;
+  margin-top: -30rpx;
+  padding: 20rpx;
+}
+
+.videoList {
+  display: flex;
+  align-items: center;
+  /* justify-content: space-around; */
+  flex-wrap: wrap;
+}
+
+.videoItem {
+  width: 33.3333%;
+  padding-bottom: 20rpx;
+  padding-right: 30rpx;
+}
+
+.videoImg {
+  height: 280rpx;
+  width: 100%;
+  border-radius: 12rpx;
+}
+
+.videoName {
+  color: #333333;
+  font-size: 24rpx;
+  font-weight: 500;
+  line-height: 45rpx;
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.videoText {
+  color: #999999;
+  line-height: 35rpx;
+  font-size: 22rpx;
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+</style>
\ No newline at end of file
diff --git a/pagesA/player/news.vue b/pagesA/player/news.vue
new file mode 100644
index 0000000..4904584
--- /dev/null
+++ b/pagesA/player/news.vue
@@ -0,0 +1,165 @@
+<template>
+	<view class="pageFree">
+		<view class="pageHeader">
+			<view class="native" @click="pageBack">
+				<!-- <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/page_back.png"></image> -->
+				<image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/page_back.png"></image>
+			</view>
+			<view class="headerText">最新短剧</view>
+			<view class="texts">你想看的都在这里～</view>
+		</view>
+		<view class="videoBox">
+			<view class="videoList">
+				<view class="videoItem"  @click="detail(item.id,0)" v-for="(item,index) in pageListData" :key="item.id">
+					<image class="videoImg" :src="item.img"></image>
+					<view class="videoName">{{item.name}}</view>
+					<view class="videoText">{{item.story}}</view>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="status" :content-text="contentText" />
+	</view>
+</template>
+
+<script >
+	export default {
+
+		data(){
+			return{
+				keytext:'',
+				pageData:{
+					currentPage:1,
+					page:1,
+					pageSize:15,
+				},
+				contentText: {
+					contentdown: '上拉加载更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有数据了'
+				},
+				pageListData:[],
+			}
+		},
+		mounted() {
+			this.getListData();
+		},
+			
+		onReachBottom() {
+			if(this.pageData.currentPage>=this.pageData.page){
+				this.getListData();
+			}
+			
+		},
+		methods:{
+			pageBack(){
+				uni.navigateBack();
+			},
+			getListData(){
+        let that = this;
+        that.$httpRequest({
+          url: '/api/video/lists',
+          data: {
+            limit:this.pageData.pageSize,
+          },
+        }).then(res=>{
+          if(this.pageData.page ==1){
+            if(res.rows.length>0){
+              this.pageListData = res.rows;
+              this.currentPage = Math.ceil(res.total/this.pageData.pageSize);
+            }else{
+              this.contentText.contentdown='没有数据'
+            }
+          }else{
+            this.pageListData =  this.pageListData.concat(res.rows);
+          }
+         this.pageData.page+=1;
+        })
+			},
+			detail(vid,mid){
+				var fxpid=1
+				if(uni.getStorageSync("userinfo")){
+					 fxpid=uni.getStorageSync("userinfo").id
+				}
+				uni.navigateTo({
+					url:'/pages/client/tuan/detail?vid='+vid+'&mid='+mid+'&fxpid='+fxpid
+				})
+			},
+		}
+	}
+	
+</script>
+
+<style scoped>
+	@font-face {
+		font-family: "MyFont";
+		src: url('https://wx.yaohe.hnjrdzkj.xyz/assets/fonts/ZiTiaoZiChangGuDan-Shan-ChaoHei.ttf');
+	}
+  .pageHeader {
+    height: 285rpx;
+    width: 100%;
+    background-image: url("https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/banners.png");
+    background-repeat: no-repeat;
+    background-size: cover;
+  }
+
+  .native {
+    padding-top: 100rpx;
+    padding-left: 20rpx;
+  }
+	.native image{
+		width: 40rpx;
+		height: 40rpx;
+	}
+	.headerText{
+		font-family: 'MyFont';
+		font-size: 42rpx;
+		padding-left: 55rpx;
+		padding-top: 20rpx;
+	}
+	.texts{
+		font-size: 24rpx;
+		padding-left: 55rpx;
+	}
+	.videoBox{
+		background-color: #ffffff;
+		border-radius: 28rpx 28rpx 0 0;
+		margin-top: -30rpx;
+		padding: 20rpx;
+	}
+	.videoList{
+		display: flex;
+		align-items: center;
+		/* justify-content: space-around; */
+		flex-wrap: wrap;
+	}
+	.videoItem{
+		width: 33.3333%;
+		padding-bottom: 20rpx;
+		padding-right: 30rpx;
+	}
+	.videoImg{
+		height: 280rpx;
+		width: 100%;
+		border-radius: 12rpx;
+	}
+	.videoName{
+		color: #333333;
+		font-size: 24rpx;
+		font-weight: 500;
+		line-height: 45rpx;
+		width: 100%;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	.videoText{
+		color: #999999;
+		line-height: 35rpx;
+		font-size: 22rpx;
+		width: 100%;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pagesA/player/ranking.vue b/pagesA/player/ranking.vue
new file mode 100644
index 0000000..f4d46c0
--- /dev/null
+++ b/pagesA/player/ranking.vue
@@ -0,0 +1,206 @@
+<template>
+  <view class="pageFree">
+    <view class="pageHeader">
+      <view class="native" @click="pageBack">
+        <!-- <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/page_back.png"></image> -->
+        <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/page_back.png"></image>
+      </view>
+      <view class="headerText">短剧排行榜</view>
+      <view class="texts">TOP前50部网络短剧～</view>
+    </view>
+    <view class="videoBox">
+      <view class="videoList">
+        <view class="videoItem"  @click="detail(item.id,0)" v-for="(item,index) in pageListData" :key="item.id">
+          <view class="videoImg">
+            <image v-if="index =='0'" mode="scaleToFill" class="iconRank" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/first.png"></image>
+            <image  v-if="index =='1'" mode="scaleToFill" class="iconRank" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/second.png"></image>
+            <image  v-if="index =='2'" mode="scaleToFill" class="iconRank" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/third.png"></image>
+            <image  v-if="index =='3'" mode="scaleToFill" class="iconRank" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/fourth.png"></image>
+            <image  v-if="index =='4'" mode="scaleToFill" class="iconRank" src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/fifth.png"></image>
+            <image class="videoBanner" mode="scaleToFill" :src="item.img"></image>
+          </view>
+          <view class="content">
+            <view class="videoHeader">
+              <view class="videoName">{{item.name}}</view>
+              <view class="isLove">
+                <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/aixinRed.png"></image>
+              </view>
+            </view>
+            <view class="videoText">{{item.story}}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <uni-load-more :status="status" :content-text="contentText" />
+  </view>
+</template>
+
+<script >
+export default {
+  data(){
+    return{
+      keytext:'',
+      pageData:{
+        currentPage:1,
+        page:1,
+        pageSize:15,
+      },
+      contentText: {
+        contentdown: '上拉加载更多',
+        contentrefresh: '加载中',
+        contentnomore: '没有数据了'
+      },
+      pageListData:[],
+    }
+  },
+  mounted() {
+    this.getListData();
+  },
+
+  onReachBottom() {
+    if(this.pageData.currentPage>=this.pageData.page){
+      this.getListData();
+    }
+
+  },
+  methods:{
+    pageBack(){
+      uni.navigateBack();
+    },
+    getListData(){
+      let that = this;
+      that.$httpRequest({
+        url:"/api/video/lists",
+        data:{
+          limit:this.pageData.pageSize,
+          lx:'3'
+        }
+      }).then(res=>{
+        if(this.pageData.page ==1){
+          if(res.rows.length>0){
+            this.pageListData = res.rows;
+            this.currentPage = Math.ceil(res.total/this.pageData.pageSize);
+          }else{
+            this.contentText.contentdown='没有数据'
+          }
+
+        }else{
+          this.pageListData =  this.pageListData.concat(res.rows);
+        }
+      })
+    },
+    detail(vid,mid){
+      var fxpid=1
+      if(uni.getStorageSync("userinfo")){
+        fxpid=uni.getStorageSync("userinfo").id
+        uni.navigateTo({
+          url:'/pages/client/tuan/detail?vid='+vid+'&mid='+mid+'&fxpid='+fxpid
+        })
+      }else{
+
+      }
+
+    },
+  }
+}
+
+</script>
+
+<style scoped>
+
+.pageHeader {
+  height: 285rpx;
+  width: 100%;
+  background-image: url("https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/banners.png");
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+
+.native {
+  padding-top: 100rpx;
+  padding-left: 20rpx;
+}
+.native image{
+  width: 40rpx;
+  height: 40rpx;
+}
+.headerText{
+  font-family: 'MyFont';
+  font-size: 42rpx;
+  padding-left: 55rpx;
+  padding-top: 20rpx;
+}
+.texts{
+  font-size: 24rpx;
+  padding-left: 55rpx;
+}
+.videoBox{
+  background-color: #ffffff;
+  border-radius: 28rpx 28rpx 0 0;
+  margin-top: -30rpx;
+  padding: 20rpx;
+}
+.videoList{
+
+}
+.videoItem{
+  display: flex;
+  margin-bottom: 24rpx;
+}
+.content{
+  flex: 1;
+  padding-left: 20rpx;
+  position: relative;
+}
+.videoImg{
+  position: relative;
+  height: 256rpx;
+  width: 216rpx;
+}
+.iconRank{
+  position: absolute;
+  width: 58rpx;
+  height: 68rpx;
+  left: 10rpx;
+}
+.videoBanner{
+  height: 256rpx;
+  width: 216rpx;
+  border-radius: 12rpx;
+}
+.videoHeader{
+  display: flex;
+}
+
+.videoName{
+  flex: 1;
+  color: #333333;
+  font-size: 32rpx;
+  font-weight: 500;
+  line-height: 60rpx;
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.isLove{
+  width: 40rpx;
+  height: 60rpx;
+  text-align: right;
+  line-height: 60rpx;
+  text-align: center;
+}
+.isLove image{
+  width: 32rpx;
+  height: 32rpx;
+  vertical-align: middle;
+}
+.videoText{
+  color: #999999;
+  line-height: 35rpx;
+  font-size: 24rpx;
+
+}
+
+
+</style>
\ No newline at end of file
diff --git a/pagesA/servers/callServer.vue b/pagesA/servers/callServer.vue
new file mode 100644
index 0000000..0317422
--- /dev/null
+++ b/pagesA/servers/callServer.vue
@@ -0,0 +1,139 @@
+<template>
+  <view class="pd16_15">
+    <view class="box noshadow pd16_15">
+      <view class="flex alcenter">
+        <image class="adviser-face-big" :src="serviceInfo.avatar"></image>
+        <view style="width: calc(100% - 160rpx);" class=" pl15">
+          <view class="ft16 cl-main ftw600">{{serviceInfo.service_nickname}}</view>
+          <view class="flex alcenter mt8">
+            <view class="flex alcenter cl-notice">
+              <text class="iconfont iconicon_weixin ft14"></text>
+              <text class="ft14 ml5">{{serviceInfo.service_wx}}</text>
+            </view>
+            <view @click="onddtel(weixin)" class="copy-tag ml10" >复制</view>
+          </view>
+          <view class="flex alcenter space mt8">
+            <view class="flex alcenter cl-notice">
+              <text class="iconfont iconicon_call ft14"></text>
+              <text class="ft14 ml5">{{serviceInfo.service_mobile}}</text>
+            </view>
+            <uni-icons @click="ontel" color="#00C657" type="phone-filled" size="20" ></uni-icons>
+          </view>
+        </view>
+      </view>
+      <!-- <view class="mt24">
+        <navigator url="/pages/client/vipcard/adviserchange">
+        <button class="btn-mid plan" style="width: 100%;" :style="getBtnPlanStyle">
+          <text class="iconfont iconicon_huan mr10"></text>更换顾问
+        </button>
+        </navigator>
+      </view> -->
+    </view>
+
+    <view class="box noshadow pd16_15 mt16">
+      <textarea v-model="content" placeholder="我有问题要跟顾问反馈:" placeholder-class="cl-notice" class="ft14" style="height: 300rpx; width: 100%;" :maxlength="300"></textarea>
+      <view class="mt12 text-right ft12 cl-notice">
+        {{content.length}}/300
+      </view>
+    </view>
+    <view class="mt16">
+      <button @tap="btn_load" class="btn-big" >立即提交</button>
+    </view>
+  </view>
+</template>
+
+<script>
+export default{
+  data(){
+    return {
+      content:'',
+      weixin:'',
+      serviceInfo:'',
+      image_url:''
+    }
+  },
+  onShow() {
+    this.tel= uni.getStorageSync("config").tels
+    this.weixin= uni.getStorageSync("config").weixin
+    this.get_serviceInfo()
+    this.image_url = this.$config.webUrl
+  },
+  methods:{
+    btn_load(){
+      let that = this;
+      that.$httpRequest({
+        url:"/api/user/userFeedback",
+        method:"GET",
+        data:{
+          feedback:that.content
+        }
+      }).then(res=>{
+        if(res.code ==1){
+          this.content = ''
+        }
+        uni.showToast({
+          title: data.data.msg,
+          icon: 'none'
+        });
+      })
+    },
+    get_serviceInfo(){
+      let that = this;
+      that.$httpRequest({
+        url:"/api/user/serviceInfo",
+        method:"GET"
+      }).then(res=>{
+        this.serviceInfo = res.data;
+      })
+    },
+    ontel(){
+      console.log(this.serviceInfo.service_mobile)
+      uni.makePhoneCall({
+        phoneNumber: this.serviceInfo.service_mobile, //仅为示例
+        fail(res) {
+          console.log(res)
+        }
+      });
+    },
+    onddtel(tel){
+      uni.setClipboardData({
+        data: tel,
+        success() {
+          uni.showToast({title:"复制成功"})
+        },
+        fail(res) {
+          console.log(res)
+          uni.showToast({title:"复制失败",icon:"none",duration:1500})
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style>
+.adviser-face-big{
+  width: 160rpx;
+  height: 160rpx;
+  border-radius: 80rpx;
+  background: #FFFFFF;
+}
+.copy-tag{
+  width: 96rpx;
+  height: 40rpx;
+  background-color: #00C657;
+  color:#FFFFFF;
+  font-size: 24rpx;
+  text-align: center;
+  line-height: 40rpx;
+  border-radius: 20rpx;
+}
+.iconicon_bottom_call{
+  color: #00C657;
+}
+.btn-big{
+  background-color: #00C657;
+  color: #FFFFFF;
+}
+
+</style>
\ No newline at end of file
diff --git a/pagesA/servers/servesQR.vue b/pagesA/servers/servesQR.vue
new file mode 100644
index 0000000..4f4c2e8
--- /dev/null
+++ b/pagesA/servers/servesQR.vue
@@ -0,0 +1,160 @@
+<template>
+  <view class="bgc-body" style="width: 750rpx;
+		height: 100vh;
+		background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/kefbgc.png');
+		background-size: 750rpx 100vh;
+		padding: 47rpx;">
+    <view>
+      <view style="width: 656rpx;    display: flex;">
+        <view style="display: flex;
+    align-items: center;
+    margin: 0 auto;">
+          <image :src="touxing"
+                 style="width: 136rpx;height: 136rpx;border-radius: 50%;border: 3rpx solid #FFFFFF;margin-right: 24rpx;">
+          </image>
+          <view>
+            <view style="font-size: 46rpx;color: #fff;font-weight: 600;">
+              扫码添加客服微信
+            </view>
+            <view style="font-size: 30rpx;color: #fff;margin-top: 15rpx;">
+              有问题请联系客服
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view style="margin-top: 40rpx;">
+      <!-- <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/erweim.png" style="width: 656rpx;height: 760rpx;"></image> -->
+      <view
+          style="background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/erweim.png');background-size: 656rpx 760rpx;width: 656rpx;height: 760rpx;">
+        <image :src="erweim" style="width: 372rpx;height: 372rpx;margin-left: 142rpx;margin-top: 100rpx;">
+        </image>
+      </view>
+      <view style="position: relative;">
+        <!-- <image src="https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/ann.png" style=""></image> -->
+        <view style="
+				background-image: url('https://wx.yaohe.hnjrdzkj.xyz/static/wechat/static/ann.png');
+				background-size: 374rpx 142rpx;
+				width: 374rpx;
+				height: 142rpx;
+				color: #fff;
+				font-size: 34rpx;
+				text-align: center;
+				line-height: 102rpx;
+				position: absolute;
+				top: -170rpx;
+				left: 127rpx;" @click="saveImg">保存二维码
+        </view>
+      </view>
+    </view>
+    <view style="color: #fff;font-size: 28rpx;padding-left: 136rpx;margin-top: 15rpx;">
+      1.保存上方二维码添加客服微信
+    </view>
+    <view style="color: #fff;font-size: 28rpx;padding-left: 136rpx;">
+      2.添加客服微信咨询问题
+    </view>
+    <view style="color: #fff;font-size: 28rpx;padding-left: 136rpx;">
+      3.工作时间：9:00-18:00
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      touxing: '',
+      erweim: ''
+    }
+  },
+  mounted() {
+    this.ermadata()
+  },
+  methods: {
+    ermadata() {
+      this.$httpRequest({
+        url:'/api/user/serviceInfo',
+        method:"GET",
+        data: {},
+      }).then(res=>{
+        this.touxing = res.data.avatar
+        this.erweim = res.data.qr
+      })
+    },
+    saveImg() {
+      let that = this;
+      // 向用户发起授权请求
+      uni.authorize({
+        scope: 'scope.writePhotosAlbum',
+        success: () => {
+          // 已授权
+          that.downLoadImg();
+        },
+        fail: () => {
+          // 拒绝授权，获取当前设置
+          uni.getSetting({
+            success: (result) => {
+              if (!result.authSetting['scope.writePhotosAlbum']) {
+                that.isAuth()
+              }
+            }
+          });
+        }
+      })
+    },
+    downLoadImg() {
+      //下载图片资源至本地，返回文件的本地临时路径
+      uni.showLoading()
+      uni.downloadFile({
+        url: this.erweim,
+        success: (res) => {
+          uni.hideLoading()
+          if (res.statusCode === 200) {
+            //保存图片至相册
+            uni.saveImageToPhotosAlbum({
+              filePath: res.tempFilePath,
+              success: function () {
+                uni.showToast({
+                  title: "保存成功",
+                  icon: "none"
+                });
+              },
+              fail: function () {
+                uni.hideLoading()
+                uni.showToast({
+                  title: "保存失败，请稍后重试",
+                  icon: "none"
+                });
+              }
+            });
+          }
+        }
+      })
+    },
+    //引导用户开启权限
+    isAuth() {
+      uni.showModal({
+        content: '由于您还没有允许保存图片到您相册里,无法进行保存,请点击确定允许授权',
+        success: (res) => {
+          if (res.confirm) {
+            uni.openSetting({
+              success: (result) => {
+                console.log(result.authSetting);
+              }
+            });
+          }
+        }
+      });
+    },
+    houtui() {
+      uni.navigateBack({ //返回上一个页面
+        delta: 1
+      });
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
new file mode 100644
index 0000000..84e1562
--- /dev/null
+++ b/project.config.json
@@ -0,0 +1,23 @@
+{
+  "appid": "wx0663114d527513ac",
+  "compileType": "miniprogram",
+  "libVersion": "3.6.1",
+  "miniprogramRoot": "unpackage/dist/dev/mp-weixin/",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
+  "srcMiniprogramRoot": "unpackage/dist/dev/mp-weixin/"
+}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
new file mode 100644
index 0000000..07517e3
--- /dev/null
+++ b/project.private.config.json
@@ -0,0 +1,7 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "jr_drama_weixin",
+  "setting": {
+    "compileHotReLoad": true
+  }
+}
\ No newline at end of file
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 0000000..156eb72
Binary files /dev/null and b/static/logo.png differ
diff --git a/static/tabbar/history.png b/static/tabbar/history.png
new file mode 100644
index 0000000..b1a30e5
Binary files /dev/null and b/static/tabbar/history.png differ
diff --git a/static/tabbar/history_active.png b/static/tabbar/history_active.png
new file mode 100644
index 0000000..caed26c
Binary files /dev/null and b/static/tabbar/history_active.png differ
diff --git a/static/tabbar/home.png b/static/tabbar/home.png
new file mode 100644
index 0000000..33d3c9c
Binary files /dev/null and b/static/tabbar/home.png differ
diff --git a/static/tabbar/home_active.png b/static/tabbar/home_active.png
new file mode 100644
index 0000000..6466d91
Binary files /dev/null and b/static/tabbar/home_active.png differ
diff --git a/static/tabbar/message.png b/static/tabbar/message.png
new file mode 100644
index 0000000..de36176
Binary files /dev/null and b/static/tabbar/message.png differ
diff --git a/static/tabbar/message_active.png b/static/tabbar/message_active.png
new file mode 100644
index 0000000..bb7b634
Binary files /dev/null and b/static/tabbar/message_active.png differ
diff --git a/static/tabbar/my.png b/static/tabbar/my.png
new file mode 100644
index 0000000..8a649a8
Binary files /dev/null and b/static/tabbar/my.png differ
diff --git a/static/tabbar/my_active.png b/static/tabbar/my_active.png
new file mode 100644
index 0000000..e2fc74f
Binary files /dev/null and b/static/tabbar/my_active.png differ
diff --git a/static/wechart.png b/static/wechart.png
new file mode 100644
index 0000000..35315d3
Binary files /dev/null and b/static/wechart.png differ
diff --git a/static/wechat/static/tag_tab.png b/static/wechat/static/tag_tab.png
new file mode 100644
index 0000000..179326e
Binary files /dev/null and b/static/wechat/static/tag_tab.png differ
diff --git a/static/wechat/static/tag_tab0.png b/static/wechat/static/tag_tab0.png
new file mode 100644
index 0000000..6ac4f62
Binary files /dev/null and b/static/wechat/static/tag_tab0.png differ
diff --git a/static/wechat/static/tag_tab1.png b/static/wechat/static/tag_tab1.png
new file mode 100644
index 0000000..a5a867c
Binary files /dev/null and b/static/wechat/static/tag_tab1.png differ
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..b9249e9
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,76 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color:#333;//基本色
+$uni-text-color-inverse:#fff;//反色
+$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable:#c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color:#ffffff;
+$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color:#c8c7cc;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm:12px;
+$uni-font-size-base:14px;
+$uni-font-size-lg:16px;
+
+/* 图片尺寸 */
+$uni-img-size-sm:20px;
+$uni-img-size-base:26px;
+$uni-img-size-lg:40px;
+
+/* Border Radius */
+$uni-border-radius-sm: 2px;
+$uni-border-radius-base: 3px;
+$uni-border-radius-lg: 6px;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 5px;
+$uni-spacing-row-base: 10px;
+$uni-spacing-row-lg: 15px;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 4px;
+$uni-spacing-col-base: 8px;
+$uni-spacing-col-lg: 12px;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2C405A; // 文章标题颜色
+$uni-font-size-title:20px;
+$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-font-size-subtitle:26px;
+$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-font-size-paragraph:15px;
diff --git a/uni_modules/uni-data-picker/changelog.md b/uni_modules/uni-data-picker/changelog.md
new file mode 100644
index 0000000..e095788
--- /dev/null
+++ b/uni_modules/uni-data-picker/changelog.md
@@ -0,0 +1,79 @@
+## 2.0.1（2024-08-22）
+- 修复 uni-app-x v-model 没有更新传入值的 bug
+## 2.0.0（2023-12-11）
+- 新增 支持 uni-app-x
+## 1.1.2（2023-04-11）
+- 修复 更改 modelValue 报错的 bug
+- 修复 v-for 未使用 key 值控制台 warning
+## 1.1.1（2023-02-21）
+- 修复代码合并时引发 value 属性为空时不渲染数据的问题
+## 1.1.0（2023-02-15）
+- 修复 localdata 不支持动态更新的bug
+## 1.0.9（2023-02-15）
+- 修复 localdata 不支持动态更新的bug
+## 1.0.8（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 1.0.7（2022-07-06）
+- 优化 pc端图标位置不正确的问题
+## 1.0.6（2022-07-05）
+- 优化 显示样式
+## 1.0.5（2022-07-04）
+- 修复 uni-data-picker 在 uni-forms-item 中宽度不正确的bug
+## 1.0.4（2022-04-19）
+- 修复 字节小程序 本地数据无法选择下一级的Bug
+## 1.0.3（2022-02-25）
+- 修复 nvue 不支持的 v-show 的 bug
+## 1.0.2（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
+## 1.0.1（2021-11-23）
+- 修复 由上个版本引发的map、v-model等属性不生效的bug
+## 1.0.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-data-picker](https://uniapp.dcloud.io/component/uniui/uni-data-picker)
+## 0.4.9（2021-10-28）
+- 修复 VUE2 v-model 概率无效的 bug
+## 0.4.8（2021-10-27）
+- 修复 v-model 概率无效的 bug
+## 0.4.7（2021-10-25）
+- 新增 属性 spaceInfo 服务空间配置 HBuilderX 3.2.11+
+- 修复 树型 uniCloud 数据类型为 int 时报错的 bug
+## 0.4.6（2021-10-19）
+- 修复 非 VUE3 v-model 为 0 时无法选中的 bug
+## 0.4.5（2021-09-26）
+- 新增 清除已选项的功能（通过 clearIcon 属性配置是否显示按钮），同时提供 clear 方法以供调用，二者等效
+- 修复 readonly 为 true 时报错的 bug
+## 0.4.4（2021-09-26）
+- 修复 上一版本造成的 map 属性失效的 bug
+- 新增 ellipsis 属性，支持配置 tab 选项长度过长时是否自动省略
+## 0.4.3（2021-09-24）
+- 修复 某些情况下级联未触发的 bug
+## 0.4.2（2021-09-23）
+- 新增 提供 show 和 hide 方法，开发者可以通过 ref 调用
+- 新增 选项内容过长自动添加省略号
+## 0.4.1（2021-09-15）
+- 新增 map 属性 字段映射，将 text/value 映射到数据中的其他字段
+## 0.4.0（2021-07-13）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.3.5（2021-06-04）
+- 修复 无法加载云端数据的问题
+## 0.3.4（2021-05-28）
+- 修复 v-model 无效问题
+- 修复 loaddata 为空数据组时加载时间过长问题
+- 修复 上个版本引出的本地数据无法选择带有 children 的 2 级节点
+## 0.3.3（2021-05-12）
+- 新增 组件示例地址
+## 0.3.2（2021-04-22）
+- 修复 非树形数据有 where 属性查询报错的问题
+## 0.3.1（2021-04-15）
+- 修复 本地数据概率无法回显时问题
+## 0.3.0（2021-04-07）
+- 新增 支持云端非树形表结构数据
+- 修复 根节点 parent_field 字段等于 null 时选择界面错乱问题
+## 0.2.0（2021-03-15）
+- 修复 nodeclick、popupopened、popupclosed 事件无法触发的问题
+## 0.1.9（2021-03-09）
+- 修复 微信小程序某些情况下无法选择的问题
+## 0.1.8（2021-02-05）
+- 优化 部分样式在 nvue 上的兼容表现
+## 0.1.7（2021-02-05）
+- 调整为 uni_modules 目录规范
diff --git a/uni_modules/uni-data-picker/components/uni-data-picker/keypress.js b/uni_modules/uni-data-picker/components/uni-data-picker/keypress.js
new file mode 100644
index 0000000..6ef26a2
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/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-data-picker/components/uni-data-picker/uni-data-picker.uvue b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue
new file mode 100644
index 0000000..dcbfd5f
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.uvue
@@ -0,0 +1,381 @@
+<template>
+  <view class="uni-data-tree">
+    <view class="uni-data-tree-input" @click="handleInput">
+      <slot :data="selectedPaths" :error="error">
+        <view class="input-value" :class="{'input-value-border': border}">
+          <text v-if="error!=null" class="error-text">{{error!.errMsg}}</text>
+          <scroll-view v-if="selectedPaths.length" class="selected-path" scroll-x="true">
+            <view class="selected-list">
+              <template v-for="(item, index) in selectedPaths">
+                <text class="text-color">{{item[mappingTextName]}}</text>
+                <text v-if="index<selectedPaths.length-1" class="input-split-line">{{split}}</text>
+              </template>
+            </view>
+          </scroll-view>
+          <text v-else-if="error==null&&!loading" class="placeholder">{{placeholder}}</text>
+          <view v-if="!readonly" class="arrow-area">
+            <view class="input-arrow"></view>
+          </view>
+        </view>
+      </slot>
+      <view v-if="loading && !isOpened" class="selected-loading">
+        <slot name="picker-loading" :loading="loading"></slot>
+      </view>
+    </view>
+    <view class="uni-data-tree-cover" v-if="isOpened" @click="handleClose"></view>
+    <view class="uni-data-tree-dialog" v-if="isOpened">
+      <view class="uni-popper__arrow"></view>
+      <view class="dialog-caption">
+        <view class="dialog-title-view">
+          <text class="dialog-title">{{popupTitle}}</text>
+        </view>
+        <view class="dialog-close" @click="handleClose">
+          <view class="dialog-close-plus" data-id="close"></view>
+          <view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+        </view>
+      </view>
+      <view ref="pickerView" class="uni-data-pickerview">
+        <view v-if="error!=null" class="error">
+          <text class="error-text">{{error!.errMsg}}</text>
+        </view>
+        <scroll-view v-if="!isCloudDataList" :scroll-x="true">
+          <view class="selected-node-list">
+            <template v-for="(item, index) in selectedNodes">
+              <text class="selected-node-item" :class="{'selected-node-item-active':index==selectedIndex}"
+                @click="onTabSelect(index)">
+                {{item[mappingTextName]}}
+              </text>
+            </template>
+          </view>
+        </scroll-view>
+        <list-view class="list-view" :scroll-y="true">
+          <list-item class="list-item" v-for="(item, _) in currentDataList" @click="onNodeClick(item)">
+            <text class="item-text" :class="{'item-text-disabled': item['disable']}">{{item[mappingTextName]}}</text>
+            <text class="check" v-if="item[mappingValueName] == selectedNodes[selectedIndex][mappingValueName]"></text>
+          </list-item>
+        </list-view>
+        <view class="loading-cover" v-if="loading">
+          <slot name="pickerview-loading" :loading="loading"></slot>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import { dataPicker } from "../uni-data-pickerview/uni-data-picker.uts"
+
+  /**
+   * DataPicker 级联选择
+   * @description 支持单列、和多列级联选择。列数没有限制，如果屏幕显示不全，顶部tab区域会左右滚动。
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=3796
+   * @property {String} popup-title 弹出窗口标题
+   * @property {Array} localdata 本地数据，参考
+   * @property {Boolean} border = [true|false] 是否有边框
+   * @property {Boolean} readonly = [true|false] 是否仅读
+   * @property {Boolean} preload = [true|false] 是否预加载数据
+   * @value true 开启预加载数据，点击弹出窗口后显示已加载数据
+   * @value false 关闭预加载数据，点击弹出窗口后开始加载数据
+   * @property {Boolean} step-searh = [true|false] 是否分布查询
+   * @value true 启用分布查询，仅查询当前选中节点
+   * @value false 关闭分布查询，一次查询出所有数据
+   * @property {String|DBFieldString} self-field 分布查询当前字段名称
+   * @property {String|DBFieldString} parent-field 分布查询父字段名称
+   * @property {String|DBCollectionString} collection 表名
+   * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+   * @property {String} orderby 排序字段及正序倒叙设置
+   * @property {String|JQLString} where 查询条件
+   * @event {Function} popupshow 弹出的选择窗口打开时触发此事件
+   * @event {Function} popuphide 弹出的选择窗口关闭时触发此事件
+   */
+  export default {
+    name: 'UniDataPicker',
+    emits: ['popupopened', 'popupclosed', 'nodeclick', 'change', 'input', 'update:modelValue', 'inputclick'],
+    mixins: [dataPicker],
+    props: {
+      popupTitle: {
+        type: String,
+        default: '请选择'
+      },
+      placeholder: {
+        type: String,
+        default: '请选择'
+      },
+      heightMobile: {
+        type: String,
+        default: ''
+      },
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      clearIcon: {
+        type: Boolean,
+        default: true
+      },
+      border: {
+        type: Boolean,
+        default: true
+      },
+      split: {
+        type: String,
+        default: '/'
+      },
+      ellipsis: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+        isOpened: false
+      }
+    },
+    computed: {
+      isShowClearIcon() : boolean {
+        if (this.readonly) {
+          return false
+        }
+
+        if (this.clearIcon && this.selectedPaths.length > 0) {
+          return true
+        }
+
+        return false
+      }
+    },
+    created() {
+      this.load()
+    },
+    methods: {
+      clear() {
+      },
+      load() {
+        if (this.isLocalData) {
+          this.loadLocalData()
+        } else if (this.isCloudDataList || this.isCloudDataTree) {
+          this.loadCloudDataPath()
+        }
+      },
+      show() {
+        this.isOpened = true
+        this.$emit('popupopened')
+        if (!this.hasCloudTreeData) {
+          this.loadData()
+        }
+      },
+      hide() {
+        this.isOpened = false
+        this.$emit('popupclosed')
+      },
+      handleInput() {
+        if (this.readonly) {
+          this.$emit('inputclick')
+        } else {
+          this.show()
+        }
+      },
+      handleClose() {
+        this.hide()
+      },
+      onFinish() {
+        this.selectedPaths = this.getChangeNodes()
+        this.$emit('update:modelValue', this.selectedPaths)
+        this.$emit('change', this.selectedPaths)
+        this.hide()
+      }
+    }
+  }
+</script>
+
+<style>
+  @import url("../uni-data-pickerview/uni-data-pickerview.css");
+
+  .uni-data-tree {
+    position: relative;
+  }
+
+  .uni-data-tree-input {
+    position: relative;
+  }
+
+  .selected-loading {
+    display: flex;
+    justify-content: center;
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+  }
+
+  .error-text {
+    flex: 1;
+    font-size: 12px;
+    color: #DD524D;
+  }
+
+  .input-value {
+    flex-direction: row;
+    align-items: center;
+    flex-wrap: nowrap;
+    padding: 5px 5px;
+    padding-right: 5px;
+    overflow: hidden;
+    min-height: 28px;
+  }
+
+  .input-value-border {
+    border: 1px solid #e5e5e5;
+    border-radius: 5px;
+  }
+
+  .selected-path {
+    flex: 1;
+    flex-direction: row;
+    overflow: hidden;
+  }
+
+  .load-more {
+    width: 40px;
+  }
+
+  .selected-list {
+    flex-direction: row;
+    flex-wrap: nowrap;
+  }
+
+  .selected-item {
+    flex-direction: row;
+    flex-wrap: nowrap;
+  }
+
+  .text-color {
+    font-size: 14px;
+    color: #333;
+  }
+
+  .placeholder {
+    color: grey;
+    font-size: 14px;
+  }
+
+  .input-split-line {
+    opacity: .5;
+    margin-left: 1px;
+    margin-right: 1px;
+  }
+
+  .arrow-area {
+    position: relative;
+    padding: 0 12px;
+    margin-left: auto;
+    justify-content: center;
+    transform: rotate(-45deg);
+    transform-origin: center;
+  }
+
+  .input-arrow {
+    width: 8px;
+    height: 8px;
+    border-left: 2px solid #999;
+    border-bottom: 2px solid #999;
+  }
+
+  .uni-data-tree-cover {
+    position: fixed;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, .4);
+    flex-direction: column;
+    z-index: 100;
+  }
+
+  .uni-data-tree-dialog {
+    position: fixed;
+    left: 0;
+    top: 20%;
+    right: 0;
+    bottom: 0;
+    background-color: #FFFFFF;
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+    flex-direction: column;
+    z-index: 102;
+    overflow: hidden;
+  }
+
+  .dialog-caption {
+    position: relative;
+    flex-direction: row;
+  }
+
+  .dialog-title-view {
+    flex: 1;
+  }
+
+  .dialog-title {
+    align-self: center;
+    padding: 0 10px;
+    line-height: 44px;
+  }
+
+  .dialog-close {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    flex-direction: row;
+    align-items: center;
+    padding: 0 15px;
+  }
+
+  .dialog-close-plus {
+    width: 16px;
+    height: 2px;
+    background-color: #666;
+    border-radius: 2px;
+    transform: rotate(45deg);
+  }
+
+  .dialog-close-rotate {
+    position: absolute;
+    transform: rotate(-45deg);
+  }
+
+  .uni-data-pickerview {
+    flex: 1;
+  }
+
+  .icon-clear {
+    display: flex;
+    align-items: center;
+  }
+
+  /* #ifdef H5 */
+  @media all and (min-width: 768px) {
+    .uni-data-tree-cover {
+      background-color: transparent;
+    }
+
+    .uni-data-tree-dialog {
+      position: absolute;
+      top: 55px;
+      height: auto;
+      min-height: 400px;
+      max-height: 50vh;
+      background-color: #fff;
+      border: 1px solid #EBEEF5;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+      border-radius: 4px;
+      overflow: unset;
+    }
+
+    .dialog-caption {
+      display: none;
+    }
+  }
+  /* #endif */
+</style>
diff --git a/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
new file mode 100644
index 0000000..179a4e0
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
@@ -0,0 +1,551 @@
+<template>
+  <view class="uni-data-tree">
+    <view class="uni-data-tree-input" @click="handleInput">
+      <slot :options="options" :data="inputSelected" :error="errorMessage">
+        <view class="input-value" :class="{'input-value-border': border}">
+          <text v-if="errorMessage" class="selected-area error-text">{{errorMessage}}</text>
+          <view v-else-if="loading && !isOpened" class="selected-area">
+            <uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
+          </view>
+          <scroll-view v-else-if="inputSelected.length" class="selected-area" scroll-x="true">
+            <view class="selected-list">
+              <view class="selected-item" v-for="(item,index) in inputSelected" :key="index">
+                <text class="text-color">{{item.text}}</text><text v-if="index<inputSelected.length-1"
+                  class="input-split-line">{{split}}</text>
+              </view>
+            </view>
+          </scroll-view>
+          <text v-else class="selected-area placeholder">{{placeholder}}</text>
+          <view v-if="clearIcon && !readonly && inputSelected.length" class="icon-clear" @click.stop="clear">
+            <uni-icons type="clear" color="#c0c4cc" size="24"></uni-icons>
+          </view>
+          <view class="arrow-area" v-if="(!clearIcon || !inputSelected.length) && !readonly ">
+            <view class="input-arrow"></view>
+          </view>
+        </view>
+      </slot>
+    </view>
+    <view class="uni-data-tree-cover" v-if="isOpened" @click="handleClose"></view>
+    <view class="uni-data-tree-dialog" v-if="isOpened">
+      <view class="uni-popper__arrow"></view>
+      <view class="dialog-caption">
+        <view class="title-area">
+          <text class="dialog-title">{{popupTitle}}</text>
+        </view>
+        <view class="dialog-close" @click="handleClose">
+          <view class="dialog-close-plus" data-id="close"></view>
+          <view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+        </view>
+      </view>
+      <data-picker-view class="picker-view" ref="pickerView" v-model="dataValue" :localdata="localdata"
+        :preload="preload" :collection="collection" :field="field" :orderby="orderby" :where="where"
+        :step-searh="stepSearh" :self-field="selfField" :parent-field="parentField" :managed-mode="true" :map="map"
+        :ellipsis="ellipsis" @change="onchange" @datachange="ondatachange" @nodeclick="onnodeclick">
+      </data-picker-view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import dataPicker from "../uni-data-pickerview/uni-data-picker.js"
+  import DataPickerView from "../uni-data-pickerview/uni-data-pickerview.vue"
+
+  /**
+   * DataPicker 级联选择
+   * @description 支持单列、和多列级联选择。列数没有限制，如果屏幕显示不全，顶部tab区域会左右滚动。
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=3796
+   * @property {String} popup-title 弹出窗口标题
+   * @property {Array} localdata 本地数据，参考
+   * @property {Boolean} border = [true|false] 是否有边框
+   * @property {Boolean} readonly = [true|false] 是否仅读
+   * @property {Boolean} preload = [true|false] 是否预加载数据
+   * @value true 开启预加载数据，点击弹出窗口后显示已加载数据
+   * @value false 关闭预加载数据，点击弹出窗口后开始加载数据
+   * @property {Boolean} step-searh = [true|false] 是否分布查询
+   * @value true 启用分布查询，仅查询当前选中节点
+   * @value false 关闭分布查询，一次查询出所有数据
+   * @property {String|DBFieldString} self-field 分布查询当前字段名称
+   * @property {String|DBFieldString} parent-field 分布查询父字段名称
+   * @property {String|DBCollectionString} collection 表名
+   * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+   * @property {String} orderby 排序字段及正序倒叙设置
+   * @property {String|JQLString} where 查询条件
+   * @event {Function} popupshow 弹出的选择窗口打开时触发此事件
+   * @event {Function} popuphide 弹出的选择窗口关闭时触发此事件
+   */
+  export default {
+    name: 'UniDataPicker',
+    emits: ['popupopened', 'popupclosed', 'nodeclick', 'input', 'change', 'update:modelValue','inputclick'],
+    mixins: [dataPicker],
+    components: {
+      DataPickerView
+    },
+    props: {
+      options: {
+        type: [Object, Array],
+        default () {
+          return {}
+        }
+      },
+      popupTitle: {
+        type: String,
+        default: '请选择'
+      },
+      placeholder: {
+        type: String,
+        default: '请选择'
+      },
+      heightMobile: {
+        type: String,
+        default: ''
+      },
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      clearIcon: {
+        type: Boolean,
+        default: true
+      },
+      border: {
+        type: Boolean,
+        default: true
+      },
+      split: {
+        type: String,
+        default: '/'
+      },
+      ellipsis: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+        isOpened: false,
+        inputSelected: []
+      }
+    },
+    created() {
+      this.$nextTick(() => {
+        this.load();
+      })
+    },
+    watch: {
+			localdata: {
+				handler() {
+					this.load()
+				},
+        deep: true
+			},
+    },
+    methods: {
+      clear() {
+        this._dispatchEvent([]);
+      },
+      onPropsChange() {
+        this._treeData = [];
+        this.selectedIndex = 0;
+
+        this.load();
+      },
+      load() {
+        if (this.readonly) {
+          this._processReadonly(this.localdata, this.dataValue);
+          return;
+        }
+
+        // 回显本地数据
+        if (this.isLocalData) {
+          this.loadData();
+          this.inputSelected = this.selected.slice(0);
+        } else if (this.isCloudDataList || this.isCloudDataTree) { // 回显 Cloud 数据
+          this.loading = true;
+          this.getCloudDataValue().then((res) => {
+            this.loading = false;
+            this.inputSelected = res;
+          }).catch((err) => {
+            this.loading = false;
+            this.errorMessage = err;
+          })
+        }
+      },
+      show() {
+        this.isOpened = true
+        setTimeout(() => {
+          this.$refs.pickerView.updateData({
+            treeData: this._treeData,
+            selected: this.selected,
+            selectedIndex: this.selectedIndex
+          })
+        }, 200)
+        this.$emit('popupopened')
+      },
+      hide() {
+        this.isOpened = false
+        this.$emit('popupclosed')
+      },
+      handleInput() {
+        if (this.readonly) {
+					this.$emit('inputclick')
+          return
+        }
+        this.show()
+      },
+      handleClose(e) {
+        this.hide()
+      },
+      onnodeclick(e) {
+        this.$emit('nodeclick', e)
+      },
+      ondatachange(e) {
+        this._treeData = this.$refs.pickerView._treeData
+      },
+      onchange(e) {
+        this.hide()
+        this.$nextTick(() => {
+          this.inputSelected = e;
+        })
+        this._dispatchEvent(e)
+      },
+      _processReadonly(dataList, value) {
+        var isTree = dataList.findIndex((item) => {
+          return item.children
+        })
+        if (isTree > -1) {
+          let inputValue
+          if (Array.isArray(value)) {
+            inputValue = value[value.length - 1]
+            if (typeof inputValue === 'object' && inputValue.value) {
+              inputValue = inputValue.value
+            }
+          } else {
+            inputValue = value
+          }
+          this.inputSelected = this._findNodePath(inputValue, this.localdata)
+          return
+        }
+
+        if (!this.hasValue) {
+          this.inputSelected = []
+          return
+        }
+
+        let result = []
+        for (let i = 0; i < value.length; i++) {
+          var val = value[i]
+          var item = dataList.find((v) => {
+            return v.value == val
+          })
+          if (item) {
+            result.push(item)
+          }
+        }
+        if (result.length) {
+          this.inputSelected = result
+        }
+      },
+      _filterForArray(data, valueArray) {
+        var result = []
+        for (let i = 0; i < valueArray.length; i++) {
+          var value = valueArray[i]
+          var found = data.find((item) => {
+            return item.value == value
+          })
+          if (found) {
+            result.push(found)
+          }
+        }
+        return result
+      },
+      _dispatchEvent(selected) {
+        let item = {}
+        if (selected.length) {
+          var value = new Array(selected.length)
+          for (var i = 0; i < selected.length; i++) {
+            value[i] = selected[i].value
+          }
+          item = selected[selected.length - 1]
+        } else {
+          item.value = ''
+        }
+        if (this.formItem) {
+          this.formItem.setValue(item.value)
+        }
+
+        this.$emit('input', item.value)
+        this.$emit('update:modelValue', item.value)
+        this.$emit('change', {
+          detail: {
+            value: selected
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+  .uni-data-tree {
+    flex: 1;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .error-text {
+    color: #DD524D;
+  }
+
+  .input-value {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+    align-items: center;
+    flex-wrap: nowrap;
+    font-size: 14px;
+    /* line-height: 35px; */
+    padding: 0 10px;
+    padding-right: 5px;
+    overflow: hidden;
+    height: 35px;
+    /* #ifndef APP-NVUE */
+    box-sizing: border-box;
+    /* #endif */
+  }
+
+  .input-value-border {
+    border: 1px solid #e5e5e5;
+    border-radius: 5px;
+  }
+
+  .selected-area {
+    flex: 1;
+    overflow: hidden;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+  }
+
+  .load-more {
+    /* #ifndef APP-NVUE */
+    margin-right: auto;
+    /* #endif */
+    /* #ifdef APP-NVUE */
+    width: 40px;
+    /* #endif */
+  }
+
+  .selected-list {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+    flex-wrap: nowrap;
+    /* padding: 0 5px; */
+  }
+
+  .selected-item {
+    flex-direction: row;
+    /* padding: 0 1px; */
+    /* #ifndef APP-NVUE */
+    white-space: nowrap;
+    /* #endif */
+  }
+
+  .text-color {
+    color: #333;
+  }
+
+  .placeholder {
+    color: grey;
+    font-size: 12px;
+  }
+
+  .input-split-line {
+    opacity: .5;
+  }
+
+  .arrow-area {
+    position: relative;
+    width: 20px;
+    /* #ifndef APP-NVUE */
+    margin-bottom: 5px;
+    margin-left: auto;
+    display: flex;
+    /* #endif */
+    justify-content: center;
+    transform: rotate(-45deg);
+    transform-origin: center;
+  }
+
+  .input-arrow {
+    width: 7px;
+    height: 7px;
+    border-left: 1px solid #999;
+    border-bottom: 1px solid #999;
+  }
+
+  .uni-data-tree-cover {
+    position: fixed;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, .4);
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+    z-index: 100;
+  }
+
+  .uni-data-tree-dialog {
+    position: fixed;
+    left: 0;
+    /* #ifndef APP-NVUE */
+    top: 20%;
+    /* #endif */
+    /* #ifdef APP-NVUE */
+    top: 200px;
+    /* #endif */
+    right: 0;
+    bottom: 0;
+    background-color: #FFFFFF;
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+    z-index: 102;
+    overflow: hidden;
+    /* #ifdef APP-NVUE */
+    width: 750rpx;
+    /* #endif */
+  }
+
+  .dialog-caption {
+    position: relative;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+    /* border-bottom: 1px solid #f0f0f0; */
+  }
+
+  .title-area {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    align-items: center;
+    /* #ifndef APP-NVUE */
+    margin: auto;
+    /* #endif */
+    padding: 0 10px;
+  }
+
+  .dialog-title {
+    /* font-weight: bold; */
+    line-height: 44px;
+  }
+
+  .dialog-close {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+    align-items: center;
+    padding: 0 15px;
+  }
+
+  .dialog-close-plus {
+    width: 16px;
+    height: 2px;
+    background-color: #666;
+    border-radius: 2px;
+    transform: rotate(45deg);
+  }
+
+  .dialog-close-rotate {
+    position: absolute;
+    transform: rotate(-45deg);
+  }
+
+  .picker-view {
+    flex: 1;
+    overflow: hidden;
+  }
+
+  .icon-clear {
+    display: flex;
+    align-items: center;
+  }
+
+  /* #ifdef H5 */
+  @media all and (min-width: 768px) {
+    .uni-data-tree-cover {
+      background-color: transparent;
+    }
+
+    .uni-data-tree-dialog {
+      position: absolute;
+      top: 55px;
+      height: auto;
+      min-height: 400px;
+      max-height: 50vh;
+      background-color: #fff;
+      border: 1px solid #EBEEF5;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+      border-radius: 4px;
+      overflow: unset;
+    }
+
+    .dialog-caption {
+      display: none;
+    }
+
+    .icon-clear {
+      /* margin-right: 5px; */
+    }
+  }
+
+  /* #endif */
+
+  /* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+  /* #ifndef APP-NVUE */
+  .uni-popper__arrow,
+  .uni-popper__arrow::after {
+    position: absolute;
+    display: block;
+    width: 0;
+    height: 0;
+    border-color: transparent;
+    border-style: solid;
+    border-width: 6px;
+  }
+
+  .uni-popper__arrow {
+    filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+    top: -6px;
+    left: 10%;
+    margin-right: 3px;
+    border-top-width: 0;
+    border-bottom-color: #EBEEF5;
+  }
+
+  .uni-popper__arrow::after {
+    content: " ";
+    top: 1px;
+    margin-left: -6px;
+    border-top-width: 0;
+    border-bottom-color: #fff;
+  }
+
+  /* #endif */
+</style>
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
new file mode 100644
index 0000000..cfae22a
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
@@ -0,0 +1,622 @@
+export default {
+  props: {
+    localdata: {
+      type: [Array, Object],
+      default () {
+        return []
+      }
+    },
+    spaceInfo: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    collection: {
+      type: String,
+      default: ''
+    },
+    action: {
+      type: String,
+      default: ''
+    },
+    field: {
+      type: String,
+      default: ''
+    },
+    orderby: {
+      type: String,
+      default: ''
+    },
+    where: {
+      type: [String, Object],
+      default: ''
+    },
+    pageData: {
+      type: String,
+      default: 'add'
+    },
+    pageCurrent: {
+      type: Number,
+      default: 1
+    },
+    pageSize: {
+      type: Number,
+      default: 500
+    },
+    getcount: {
+      type: [Boolean, String],
+      default: false
+    },
+    getone: {
+      type: [Boolean, String],
+      default: false
+    },
+    gettree: {
+      type: [Boolean, String],
+      default: false
+    },
+    manual: {
+      type: Boolean,
+      default: false
+    },
+    value: {
+      type: [Array, String, Number],
+      default () {
+        return []
+      }
+    },
+    modelValue: {
+      type: [Array, String, Number],
+      default () {
+        return []
+      }
+    },
+    preload: {
+      type: Boolean,
+      default: false
+    },
+    stepSearh: {
+      type: Boolean,
+      default: true
+    },
+    selfField: {
+      type: String,
+      default: ''
+    },
+    parentField: {
+      type: String,
+      default: ''
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    map: {
+      type: Object,
+      default () {
+        return {
+          text: "text",
+          value: "value"
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      errorMessage: '',
+      loadMore: {
+        contentdown: '',
+        contentrefresh: '',
+        contentnomore: ''
+      },
+      dataList: [],
+      selected: [],
+      selectedIndex: 0,
+      page: {
+        current: this.pageCurrent,
+        size: this.pageSize,
+        count: 0
+      }
+    }
+  },
+  computed: {
+    isLocalData() {
+      return !this.collection.length;
+    },
+    isCloudData() {
+      return this.collection.length > 0;
+    },
+    isCloudDataList() {
+      return (this.isCloudData && (!this.parentField && !this.selfField));
+    },
+    isCloudDataTree() {
+      return (this.isCloudData && this.parentField && this.selfField);
+    },
+    dataValue() {
+      let isModelValue = Array.isArray(this.modelValue) ? (this.modelValue.length > 0) : (this.modelValue !== null ||
+        this.modelValue !== undefined);
+      return isModelValue ? this.modelValue : this.value;
+    },
+    hasValue() {
+      if (typeof this.dataValue === 'number') {
+        return true
+      }
+      return (this.dataValue != null) && (this.dataValue.length > 0)
+    }
+  },
+  created() {
+    this.$watch(() => {
+      var al = [];
+      ['pageCurrent',
+        'pageSize',
+        'spaceInfo',
+        'value',
+        'modelValue',
+        'localdata',
+        'collection',
+        'action',
+        'field',
+        'orderby',
+        'where',
+        'getont',
+        'getcount',
+        'gettree'
+      ].forEach(key => {
+        al.push(this[key])
+      });
+      return al
+    }, (newValue, oldValue) => {
+      let needReset = false
+      for (let i = 2; i < newValue.length; i++) {
+        if (newValue[i] != oldValue[i]) {
+          needReset = true
+          break
+        }
+      }
+      if (newValue[0] != oldValue[0]) {
+        this.page.current = this.pageCurrent
+      }
+      this.page.size = this.pageSize
+
+      this.onPropsChange()
+    })
+    this._treeData = []
+  },
+  methods: {
+    onPropsChange() {
+      this._treeData = [];
+    },
+
+    // 填充 pickview 数据
+    async loadData() {
+      if (this.isLocalData) {
+        this.loadLocalData();
+      } else if (this.isCloudDataList) {
+        this.loadCloudDataList();
+      } else if (this.isCloudDataTree) {
+        this.loadCloudDataTree();
+      }
+    },
+
+    // 加载本地数据
+    async loadLocalData() {
+      this._treeData = [];
+      this._extractTree(this.localdata, this._treeData);
+
+      let inputValue = this.dataValue;
+      if (inputValue === undefined) {
+        return;
+      }
+
+      if (Array.isArray(inputValue)) {
+        inputValue = inputValue[inputValue.length - 1];
+        if (typeof inputValue === 'object' && inputValue[this.map.value]) {
+          inputValue = inputValue[this.map.value];
+        }
+      }
+
+      this.selected = this._findNodePath(inputValue, this.localdata);
+    },
+
+    // 加载 Cloud 数据 (单列)
+    async loadCloudDataList() {
+      if (this.loading) {
+        return;
+      }
+      this.loading = true;
+
+      try {
+        let response = await this.getCommand();
+        let responseData = response.result.data;
+
+        this._treeData = responseData;
+
+        this._updateBindData();
+        this._updateSelected();
+
+        this.onDataChange();
+      } catch (e) {
+        this.errorMessage = e;
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    // 加载 Cloud 数据 (树形)
+    async loadCloudDataTree() {
+      if (this.loading) {
+        return;
+      }
+      this.loading = true;
+
+      try {
+        let commandOptions = {
+          field: this._cloudDataPostField(),
+          where: this._cloudDataTreeWhere()
+        };
+        if (this.gettree) {
+          commandOptions.startwith = `${this.selfField}=='${this.dataValue}'`;
+        }
+
+        let response = await this.getCommand(commandOptions);
+        let responseData = response.result.data;
+
+        this._treeData = responseData;
+        this._updateBindData();
+        this._updateSelected();
+
+        this.onDataChange();
+      } catch (e) {
+        this.errorMessage = e;
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    // 加载 Cloud 数据 (节点)
+    async loadCloudDataNode(callback) {
+      if (this.loading) {
+        return;
+      }
+      this.loading = true;
+
+      try {
+        let commandOptions = {
+          field: this._cloudDataPostField(),
+          where: this._cloudDataNodeWhere()
+        };
+
+        let response = await this.getCommand(commandOptions);
+        let responseData = response.result.data;
+
+        callback(responseData);
+      } catch (e) {
+        this.errorMessage = e;
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    // 回显 Cloud 数据
+    getCloudDataValue() {
+      if (this.isCloudDataList) {
+        return this.getCloudDataListValue();
+      }
+
+      if (this.isCloudDataTree) {
+        return this.getCloudDataTreeValue();
+      }
+    },
+
+    // 回显 Cloud 数据 (单列)
+    getCloudDataListValue() {
+      // 根据 field's as value标识匹配 where 条件
+      let where = [];
+      let whereField = this._getForeignKeyByField();
+      if (whereField) {
+        where.push(`${whereField} == '${this.dataValue}'`)
+      }
+
+      where = where.join(' || ');
+
+      if (this.where) {
+        where = `(${this.where}) && (${where})`
+      }
+
+      return this.getCommand({
+        field: this._cloudDataPostField(),
+        where
+      }).then((res) => {
+        this.selected = res.result.data;
+        return res.result.data;
+      });
+    },
+
+    // 回显 Cloud 数据 (树形)
+    getCloudDataTreeValue() {
+      return this.getCommand({
+        field: this._cloudDataPostField(),
+        getTreePath: {
+          startWith: `${this.selfField}=='${this.dataValue}'`
+        }
+      }).then((res) => {
+        let treePath = [];
+        this._extractTreePath(res.result.data, treePath);
+        this.selected = treePath;
+        return treePath;
+      });
+    },
+
+    getCommand(options = {}) {
+      /* eslint-disable no-undef */
+      let db = uniCloud.database(this.spaceInfo)
+
+      const action = options.action || this.action
+      if (action) {
+        db = db.action(action)
+      }
+
+      const collection = options.collection || this.collection
+      db = db.collection(collection)
+
+      const where = options.where || this.where
+      if (!(!where || !Object.keys(where).length)) {
+        db = db.where(where)
+      }
+
+      const field = options.field || this.field
+      if (field) {
+        db = db.field(field)
+      }
+
+      const orderby = options.orderby || this.orderby
+      if (orderby) {
+        db = db.orderBy(orderby)
+      }
+
+      const current = options.pageCurrent !== undefined ? options.pageCurrent : this.page.current
+      const size = options.pageSize !== undefined ? options.pageSize : this.page.size
+      const getCount = options.getcount !== undefined ? options.getcount : this.getcount
+      const getTree = options.gettree !== undefined ? options.gettree : this.gettree
+
+      const getOptions = {
+        getCount,
+        getTree
+      }
+      if (options.getTreePath) {
+        getOptions.getTreePath = options.getTreePath
+      }
+
+      db = db.skip(size * (current - 1)).limit(size).get(getOptions)
+
+      return db
+    },
+
+    _cloudDataPostField() {
+      let fields = [this.field];
+      if (this.parentField) {
+        fields.push(`${this.parentField} as parent_value`);
+      }
+      return fields.join(',');
+    },
+
+    _cloudDataTreeWhere() {
+      let result = []
+      let selected = this.selected
+      let parentField = this.parentField
+      if (parentField) {
+        result.push(`${parentField} == null || ${parentField} == ""`)
+      }
+      if (selected.length) {
+        for (var i = 0; i < selected.length - 1; i++) {
+          result.push(`${parentField} == '${selected[i].value}'`)
+        }
+      }
+
+      let where = []
+      if (this.where) {
+        where.push(`(${this.where})`)
+      }
+
+      if (result.length) {
+        where.push(`(${result.join(' || ')})`)
+      }
+
+      return where.join(' && ')
+    },
+
+    _cloudDataNodeWhere() {
+      let where = []
+      let selected = this.selected;
+      if (selected.length) {
+        where.push(`${this.parentField} == '${selected[selected.length - 1].value}'`);
+      }
+
+      where = where.join(' || ');
+
+      if (this.where) {
+        return `(${this.where}) && (${where})`
+      }
+
+      return where
+    },
+
+    _getWhereByForeignKey() {
+      let result = []
+      let whereField = this._getForeignKeyByField();
+      if (whereField) {
+        result.push(`${whereField} == '${this.dataValue}'`)
+      }
+
+      if (this.where) {
+        return `(${this.where}) && (${result.join(' || ')})`
+      }
+
+      return result.join(' || ')
+    },
+
+    _getForeignKeyByField() {
+      let fields = this.field.split(',');
+      let whereField = null;
+      for (let i = 0; i < fields.length; i++) {
+        const items = fields[i].split('as');
+        if (items.length < 2) {
+          continue;
+        }
+        if (items[1].trim() === 'value') {
+          whereField = items[0].trim();
+          break;
+        }
+      }
+      return whereField;
+    },
+
+    _updateBindData(node) {
+      const {
+        dataList,
+        hasNodes
+      } = this._filterData(this._treeData, this.selected)
+
+      let isleaf = this._stepSearh === false && !hasNodes
+
+      if (node) {
+        node.isleaf = isleaf
+      }
+
+      this.dataList = dataList
+      this.selectedIndex = dataList.length - 1
+
+      if (!isleaf && this.selected.length < dataList.length) {
+        this.selected.push({
+          value: null,
+          text: "请选择"
+        })
+      }
+
+      return {
+        isleaf,
+        hasNodes
+      }
+    },
+
+    _updateSelected() {
+      let dl = this.dataList
+      let sl = this.selected
+      let textField = this.map.text
+      let valueField = this.map.value
+      for (let i = 0; i < sl.length; i++) {
+        let value = sl[i].value
+        let dl2 = dl[i]
+        for (let j = 0; j < dl2.length; j++) {
+          let item2 = dl2[j]
+          if (item2[valueField] === value) {
+            sl[i].text = item2[textField]
+            break
+          }
+        }
+      }
+    },
+
+    _filterData(data, paths) {
+      let dataList = []
+      let hasNodes = true
+
+      dataList.push(data.filter((item) => {
+        return (item.parent_value === null || item.parent_value === undefined || item.parent_value === '')
+      }))
+      for (let i = 0; i < paths.length; i++) {
+        let value = paths[i].value
+        let nodes = data.filter((item) => {
+          return item.parent_value === value
+        })
+
+        if (nodes.length) {
+          dataList.push(nodes)
+        } else {
+          hasNodes = false
+        }
+      }
+
+      return {
+        dataList,
+        hasNodes
+      }
+    },
+
+    _extractTree(nodes, result, parent_value) {
+      let list = result || []
+      let valueField = this.map.value
+      for (let i = 0; i < nodes.length; i++) {
+        let node = nodes[i]
+
+        let child = {}
+        for (let key in node) {
+          if (key !== 'children') {
+            child[key] = node[key]
+          }
+        }
+        if (parent_value !== null && parent_value !== undefined && parent_value !== '') {
+          child.parent_value = parent_value
+        }
+        result.push(child)
+
+        let children = node.children
+        if (children) {
+          this._extractTree(children, result, node[valueField])
+        }
+      }
+    },
+
+    _extractTreePath(nodes, result) {
+      let list = result || []
+      for (let i = 0; i < nodes.length; i++) {
+        let node = nodes[i]
+
+        let child = {}
+        for (let key in node) {
+          if (key !== 'children') {
+            child[key] = node[key]
+          }
+        }
+        result.push(child)
+
+        let children = node.children
+        if (children) {
+          this._extractTreePath(children, result)
+        }
+      }
+    },
+
+    _findNodePath(key, nodes, path = []) {
+      let textField = this.map.text
+      let valueField = this.map.value
+      for (let i = 0; i < nodes.length; i++) {
+        let node = nodes[i]
+        let children = node.children
+        let text = node[textField]
+        let value = node[valueField]
+
+        path.push({
+          value,
+          text
+        })
+
+        if (value === key) {
+          return path
+        }
+
+        if (children) {
+          const p = this._findNodePath(key, children, path)
+          if (p.length) {
+            return p
+          }
+        }
+
+        path.pop()
+      }
+      return []
+    }
+  }
+}
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts
new file mode 100644
index 0000000..857408d
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.uts
@@ -0,0 +1,692 @@
+export type PaginationType = {
+  current : number,
+  size : number,
+  count : number
+}
+
+export type LoadMoreType = {
+  contentdown : string,
+  contentrefresh : string,
+  contentnomore : string
+}
+
+export type SelectedItemType = {
+  name : string,
+  value : string,
+}
+
+export type GetCommandOptions = {
+  collection ?: UTSJSONObject,
+  field ?: string,
+  orderby ?: string,
+  where ?: any,
+  pageData ?: string,
+  pageCurrent ?: number,
+  pageSize ?: number,
+  getCount ?: boolean,
+  getTree ?: any,
+  getTreePath ?: UTSJSONObject,
+  startwith ?: string,
+  limitlevel ?: number,
+  groupby ?: string,
+  groupField ?: string,
+  distinct ?: boolean,
+  pageIndistinct ?: boolean,
+  foreignKey ?: string,
+  loadtime ?: string,
+  manual ?: boolean
+}
+
+const DefaultSelectedNode = {
+  text: '请选择',
+  value: ''
+}
+
+export const dataPicker = defineMixin({
+  props: {
+    localdata: {
+      type: Array as PropType<Array<UTSJSONObject>>,
+      default: [] as Array<UTSJSONObject>
+    },
+    collection: {
+      type: Object,
+      default: ''
+    },
+    field: {
+      type: String,
+      default: ''
+    },
+    orderby: {
+      type: String,
+      default: ''
+    },
+    where: {
+      type: Object,
+      default: ''
+    },
+    pageData: {
+      type: String,
+      default: 'add'
+    },
+    pageCurrent: {
+      type: Number,
+      default: 1
+    },
+    pageSize: {
+      type: Number,
+      default: 20
+    },
+    getcount: {
+      type: Boolean,
+      default: false
+    },
+    gettree: {
+      type: Object,
+      default: ''
+    },
+    gettreepath: {
+      type: Object,
+      default: ''
+    },
+    startwith: {
+      type: String,
+      default: ''
+    },
+    limitlevel: {
+      type: Number,
+      default: 10
+    },
+    groupby: {
+      type: String,
+      default: ''
+    },
+    groupField: {
+      type: String,
+      default: ''
+    },
+    distinct: {
+      type: Boolean,
+      default: false
+    },
+    pageIndistinct: {
+      type: Boolean,
+      default: false
+    },
+    foreignKey: {
+      type: String,
+      default: ''
+    },
+    loadtime: {
+      type: String,
+      default: 'auto'
+    },
+    manual: {
+      type: Boolean,
+      default: false
+    },
+    preload: {
+      type: Boolean,
+      default: false
+    },
+    stepSearh: {
+      type: Boolean,
+      default: true
+    },
+    selfField: {
+      type: String,
+      default: ''
+    },
+    parentField: {
+      type: String,
+      default: ''
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    value: {
+      type: Object,
+      default: ''
+    },
+    modelValue: {
+      type: Object,
+      default: ''
+    },
+    defaultProps: {
+      type: Object as PropType<UTSJSONObject>,
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      error: null as UniCloudError | null,
+      treeData: [] as Array<UTSJSONObject>,
+      selectedIndex: 0,
+      selectedNodes: [] as Array<UTSJSONObject>,
+      selectedPages: [] as Array<UTSJSONObject>[],
+      selectedValue: '',
+      selectedPaths: [] as Array<UTSJSONObject>,
+      pagination: {
+        current: 1,
+        size: 20,
+        count: 0
+      } as PaginationType
+    }
+  },
+  computed: {
+    mappingTextName() : string {
+      // TODO
+      return (this.defaultProps != null) ? this.defaultProps!.getString('text', 'text') : 'text'
+    },
+    mappingValueName() : string {
+      // TODO
+      return (this.defaultProps != null) ? this.defaultProps!.getString('value', 'value') : 'value'
+    },
+    currentDataList() : Array<UTSJSONObject> {
+      if (this.selectedIndex > this.selectedPages.length - 1) {
+        return [] as Array<UTSJSONObject>
+      }
+      return this.selectedPages[this.selectedIndex]
+    },
+    isLocalData() : boolean {
+      return this.localdata.length > 0
+    },
+    isCloudData() : boolean {
+      return this._checkIsNotNull(this.collection)
+    },
+    isCloudDataList() : boolean {
+      return (this.isCloudData && (this.parentField.length == 0 && this.selfField.length == 0))
+    },
+    isCloudDataTree() : boolean {
+      return (this.isCloudData && this.parentField.length > 0 && this.selfField.length > 0)
+    },
+    dataValue() : any {
+      return this.hasModelValue ? this.modelValue : this.value
+    },
+    hasCloudTreeData() : boolean {
+      return this.treeData.length > 0
+    },
+    hasModelValue() : boolean {
+      if (typeof this.modelValue == 'string') {
+        const valueString = this.modelValue as string
+        return (valueString.length > 0)
+      } else if (Array.isArray(this.modelValue)) {
+        const valueArray = this.modelValue as Array<string>
+        return (valueArray.length > 0)
+      }
+      return false
+    },
+    hasCloudDataValue() : boolean {
+      if (typeof this.dataValue == 'string') {
+        const valueString = this.dataValue as string
+        return (valueString.length > 0)
+      }
+      return false
+    }
+  },
+  created() {
+    this.pagination.current = this.pageCurrent
+    this.pagination.size = this.pageSize
+
+    this.$watch(
+      () : any => [
+        this.pageCurrent,
+        this.pageSize,
+        this.localdata,
+        this.value,
+        this.collection,
+        this.field,
+        this.getcount,
+        this.orderby,
+        this.where,
+        this.groupby,
+        this.groupField,
+        this.distinct
+      ],
+      (newValue : Array<any>, oldValue : Array<any>) => {
+        this.pagination.size = this.pageSize
+        if (newValue[0] !== oldValue[0]) {
+          this.pagination.current = this.pageCurrent
+        }
+
+        this.onPropsChange()
+      }
+    )
+  },
+  methods: {
+    onPropsChange() {
+      this.selectedIndex = 0
+      this.selectedNodes.length = 0
+      this.selectedPages.length = 0
+      this.selectedPaths.length = 0
+
+      // 加载数据
+      this.$nextTick(() => {
+        this.loadData()
+      })
+    },
+
+    onTabSelect(index : number) {
+      this.selectedIndex = index
+    },
+
+    onNodeClick(nodeData : UTSJSONObject) {
+      if (nodeData.getBoolean('disable', false)) {
+        return
+      }
+
+      const isLeaf = this._checkIsLeafNode(nodeData)
+
+      this._trimSelectedNodes(nodeData)
+
+      this.$emit('nodeclick', nodeData)
+
+      if (this.isLocalData) {
+        if (isLeaf || !this._checkHasChildren(nodeData)) {
+          this.onFinish()
+        }
+      } else if (this.isCloudDataList) {
+        this.onFinish()
+      } else if (this.isCloudDataTree) {
+        if (isLeaf) {
+          this.onFinish()
+        } else if (!this._checkHasChildren(nodeData)) {
+          // 尝试请求一次，如果没有返回数据标记为叶子节点
+          this.loadCloudDataNode(nodeData)
+        }
+      }
+    },
+
+    getChangeNodes(): Array<UTSJSONObject> {
+      const nodes: Array<UTSJSONObject> = []
+      this.selectedNodes.forEach((node : UTSJSONObject) => {
+        const newNode: UTSJSONObject = {}
+        newNode[this.mappingTextName] = node.getString(this.mappingTextName)
+        newNode[this.mappingValueName] = node.getString(this.mappingValueName)
+        nodes.push(newNode)
+      })
+      return nodes
+    },
+
+    onFinish() { },
+
+    // 加载数据(自动判定环境)
+    loadData() {
+      if (this.isLocalData) {
+        this.loadLocalData()
+      } else if (this.isCloudDataList) {
+        this.loadCloudDataList()
+      } else if (this.isCloudDataTree) {
+        this.loadCloudDataTree()
+      }
+    },
+
+    // 加载本地数据
+    loadLocalData() {
+      this.treeData = this.localdata
+      if (Array.isArray(this.dataValue)) {
+        const value = this.dataValue as Array<UTSJSONObject>
+        this.selectedPaths = value.slice(0)
+        this._pushSelectedTreeNodes(value, this.localdata)
+      } else {
+        this._pushSelectedNodes(this.localdata)
+      }
+    },
+
+    // 加载 Cloud 数据 (单列)
+    loadCloudDataList() {
+      this._loadCloudData(null, (data : Array<UTSJSONObject>) => {
+        this.treeData = data
+        this._pushSelectedNodes(data)
+      })
+    },
+
+    // 加载 Cloud 数据 (树形)
+    loadCloudDataTree() {
+      let commandOptions = {
+        field: this._cloudDataPostField(),
+        where: this._cloudDataTreeWhere(),
+        getTree: true
+      } as GetCommandOptions
+      if (this._checkIsNotNull(this.gettree)) {
+        commandOptions.startwith = `${this.selfField}=='${this.dataValue as string}'`
+      }
+      this._loadCloudData(commandOptions, (data : Array<UTSJSONObject>) => {
+        this.treeData = data
+        if (this.selectedPaths.length > 0) {
+          this._pushSelectedTreeNodes(this.selectedPaths, data)
+        } else {
+          this._pushSelectedNodes(data)
+        }
+      })
+    },
+
+    // 加载 Cloud 数据 (节点)
+    loadCloudDataNode(nodeData : UTSJSONObject) {
+      const commandOptions = {
+        field: this._cloudDataPostField(),
+        where: this._cloudDataNodeWhere()
+      } as GetCommandOptions
+      this._loadCloudData(commandOptions, (data : Array<UTSJSONObject>) => {
+        nodeData['children'] = data
+        if (data.length == 0) {
+          nodeData['isleaf'] = true
+          this.onFinish()
+        } else {
+          this._pushSelectedNodes(data)
+        }
+      })
+    },
+
+    // 回显 Cloud Tree Path
+    loadCloudDataPath() {
+      if (!this.hasCloudDataValue) {
+        return
+      }
+
+      const command : GetCommandOptions = {}
+
+      // 单列
+      if (this.isCloudDataList) {
+        // 根据 field's as value标识匹配 where 条件
+        let where : Array<string> = [];
+        let whereField = this._getForeignKeyByField();
+        if (whereField.length > 0) {
+          where.push(`${whereField} == '${this.dataValue as string}'`)
+        }
+
+        let whereString = where.join(' || ')
+        if (this._checkIsNotNull(this.where)) {
+          whereString = `(${this.where}) && (${whereString})`
+        }
+
+        command.field = this._cloudDataPostField()
+        command.where = whereString
+      }
+
+      // 树形
+      if (this.isCloudDataTree) {
+        command.field = this._cloudDataPostField()
+        command.getTreePath = {
+          startWith: `${this.selfField}=='${this.dataValue as string}'`
+        }
+      }
+
+      this._loadCloudData(command, (data : Array<UTSJSONObject>) => {
+        this._extractTreePath(data, this.selectedPaths)
+      })
+    },
+
+    _loadCloudData(options ?: GetCommandOptions, callback ?: ((data : Array<UTSJSONObject>) => void)) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.error = null
+
+      this._getCommand(options).then((response : UniCloudDBGetResult) => {
+        callback?.(response.data)
+      }).catch((err : any | null) => {
+        this.error = err as UniCloudError
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+
+    _cloudDataPostField() : string {
+      let fields = [this.field];
+      if (this.parentField.length > 0) {
+        fields.push(`${this.parentField} as parent_value`)
+      }
+      return fields.join(',')
+    },
+
+    _cloudDataTreeWhere() : string {
+      let result : Array<string> = []
+      let selectedNodes = this.selectedNodes.length > 0 ? this.selectedNodes : this.selectedPaths
+      let parentField = this.parentField
+      if (parentField.length > 0) {
+        result.push(`${parentField} == null || ${parentField} == ""`)
+      }
+      if (selectedNodes.length > 0) {
+        for (var i = 0; i < selectedNodes.length - 1; i++) {
+          const parentFieldValue = selectedNodes[i].getString('value', '')
+          result.push(`${parentField} == '${parentFieldValue}'`)
+        }
+      }
+
+      let where : Array<string> = []
+      if (this._checkIsNotNull(this.where)) {
+        where.push(`(${this.where as string})`)
+      }
+
+      if (result.length > 0) {
+        where.push(`(${result.join(' || ')})`)
+      }
+
+      return where.join(' && ')
+    },
+
+    _cloudDataNodeWhere() : string {
+      const where : Array<string> = []
+      if (this.selectedNodes.length > 0) {
+        const value = this.selectedNodes[this.selectedNodes.length - 1].getString('value', '')
+        where.push(`${this.parentField} == '${value}'`)
+      }
+
+      let whereString = where.join(' || ')
+      if (this._checkIsNotNull(this.where)) {
+        return `(${this.where as string}) && (${whereString})`
+      }
+
+      return whereString
+    },
+
+    _getWhereByForeignKey() : string {
+      let result : Array<string> = []
+      let whereField = this._getForeignKeyByField();
+      if (whereField.length > 0) {
+        result.push(`${whereField} == '${this.dataValue as string}'`)
+      }
+
+      if (this._checkIsNotNull(this.where)) {
+        return `(${this.where}) && (${result.join(' || ')})`
+      }
+
+      return result.join(' || ')
+    },
+
+    _getForeignKeyByField() : string {
+      const fields = this.field.split(',')
+      let whereField = ''
+      for (let i = 0; i < fields.length; i++) {
+        const items = fields[i].split('as')
+        if (items.length < 2) {
+          continue
+        }
+        if (items[1].trim() === 'value') {
+          whereField = items[0].trim()
+          break
+        }
+      }
+      return whereField
+    },
+
+    _getCommand(options ?: GetCommandOptions) : Promise<UniCloudDBGetResult> {
+      let db = uniCloud.databaseForJQL()
+
+      let collection = Array.isArray(this.collection) ? db.collection(...(this.collection as Array<any>)) : db.collection(this.collection)
+
+      let filter : UniCloudDBFilter | null = null
+      if (this.foreignKey.length > 0) {
+        filter = collection.foreignKey(this.foreignKey)
+      }
+
+      const where : any = options?.where ?? this.where
+      if (typeof where == 'string') {
+        const whereString = where as string
+        if (whereString.length > 0) {
+          filter = (filter != null) ? filter.where(where) : collection.where(where)
+        }
+      } else {
+        filter = (filter != null) ? filter.where(where) : collection.where(where)
+      }
+
+      let query : UniCloudDBQuery | null = null
+      if (this.field.length > 0) {
+        query = (filter != null) ? filter.field(this.field) : collection.field(this.field)
+      }
+      if (this.groupby.length > 0) {
+        if (query != null) {
+          query = query.groupBy(this.groupby)
+        } else if (filter != null) {
+          query = filter.groupBy(this.groupby)
+        }
+      }
+      if (this.groupField.length > 0) {
+        if (query != null) {
+          query = query.groupField(this.groupField)
+        } else if (filter != null) {
+          query = filter.groupField(this.groupField)
+        }
+      }
+      if (this.distinct == true) {
+        if (query != null) {
+          query = query.distinct(this.field)
+        } else if (filter != null) {
+          query = filter.distinct(this.field)
+        }
+      }
+      if (this.orderby.length > 0) {
+        if (query != null) {
+          query = query.orderBy(this.orderby)
+        } else if (filter != null) {
+          query = filter.orderBy(this.orderby)
+        }
+      }
+
+      const size = this.pagination.size
+      const current = this.pagination.current
+      if (query != null) {
+        query = query.skip(size * (current - 1)).limit(size)
+      } else if (filter != null) {
+        query = filter.skip(size * (current - 1)).limit(size)
+      } else {
+        query = collection.skip(size * (current - 1)).limit(size)
+      }
+
+      const getOptions = {}
+      const treeOptions = {
+        limitLevel: this.limitlevel,
+        startWith: this.startwith
+      }
+      if (this.getcount == true) {
+        getOptions['getCount'] = this.getcount
+      }
+
+      const getTree : any = options?.getTree ?? this.gettree
+      if (typeof getTree == 'string') {
+        const getTreeString = getTree as string
+        if (getTreeString.length > 0) {
+          getOptions['getTree'] = treeOptions
+        }
+      } else if (typeof getTree == 'object') {
+        getOptions['getTree'] = treeOptions
+      } else {
+        getOptions['getTree'] = getTree
+      }
+
+      const getTreePath = options?.getTreePath ?? this.gettreepath
+      if (typeof getTreePath == 'string') {
+        const getTreePathString = getTreePath as string
+        if (getTreePathString.length > 0) {
+          getOptions['getTreePath'] = getTreePath
+        }
+      } else {
+        getOptions['getTreePath'] = getTreePath
+      }
+
+      return query.get(getOptions)
+    },
+
+    _checkIsNotNull(value : any) : boolean {
+      if (typeof value == 'string') {
+        const valueString = value as string
+        return (valueString.length > 0)
+      } else if (value instanceof UTSJSONObject) {
+        return true
+      }
+      return false
+    },
+
+    _checkIsLeafNode(nodeData : UTSJSONObject) : boolean {
+      if (this.selectedIndex >= this.limitlevel) {
+        return true
+      }
+
+      if (nodeData.getBoolean('isleaf', false)) {
+        return true
+      }
+
+      return false
+    },
+
+    _checkHasChildren(nodeData : UTSJSONObject) : boolean {
+      const children = nodeData.getArray('children') ?? ([] as Array<any>)
+      return children.length > 0
+    },
+
+    _pushSelectedNodes(nodes : Array<UTSJSONObject>) {
+      this.selectedNodes.push(DefaultSelectedNode)
+      this.selectedPages.push(nodes)
+      this.selectedIndex = this.selectedPages.length - 1
+    },
+
+    _trimSelectedNodes(nodeData : UTSJSONObject) {
+      this.selectedNodes.splice(this.selectedIndex)
+      this.selectedNodes.push(nodeData)
+
+      if (this.selectedPages.length > 0) {
+        this.selectedPages.splice(this.selectedIndex + 1)
+      }
+
+      const children = nodeData.getArray<UTSJSONObject>('children') ?? ([] as Array<UTSJSONObject>)
+      if (children.length > 0) {
+        this.selectedNodes.push(DefaultSelectedNode)
+        this.selectedPages.push(children)
+      }
+
+      this.selectedIndex = this.selectedPages.length - 1
+    },
+
+    _pushSelectedTreeNodes(paths : Array<UTSJSONObject>, nodes : Array<UTSJSONObject>) {
+      let children : Array<UTSJSONObject> = nodes
+      paths.forEach((node : UTSJSONObject) => {
+        const findNode = children.find((item : UTSJSONObject) : boolean => {
+          return (item.getString(this.mappingValueName) == node.getString(this.mappingValueName))
+        })
+        if (findNode != null) {
+          this.selectedPages.push(children)
+          this.selectedNodes.push(node)
+          children = findNode.getArray<UTSJSONObject>('children') ?? ([] as Array<UTSJSONObject>)
+        }
+      })
+      this.selectedIndex = this.selectedPages.length - 1
+    },
+
+    _extractTreePath(nodes : Array<UTSJSONObject>, result : Array<UTSJSONObject>) {
+      if (nodes.length == 0) {
+        return
+      }
+
+      const node = nodes[0]
+      result.push(node)
+
+      const children = node.getArray<UTSJSONObject>('children')
+      if (Array.isArray(children) && children!.length > 0) {
+        this._extractTreePath(children, result)
+      }
+    }
+  }
+})
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.css b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.css
new file mode 100644
index 0000000..39fe1c3
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.css
@@ -0,0 +1,76 @@
+.uni-data-pickerview {
+  position: relative;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.loading-cover {
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  align-items: center;
+  justify-content: center;
+  background-color: rgba(150, 150, 150, .1);
+}
+
+.error {
+  background-color: #fff;
+  padding: 15px;
+}
+
+.error-text {
+  color: #DD524D;
+}
+
+.selected-node-list {
+  flex-direction: row;
+  flex-wrap: nowrap;
+}
+
+.selected-node-item {
+  margin-left: 10px;
+  margin-right: 10px;
+  padding: 8px 10px 8px 10px;
+  border-bottom: 2px solid transparent;
+}
+
+.selected-node-item-active {
+  color: #007aff;
+  border-bottom-color: #007aff;
+}
+
+.list-view {
+  flex: 1;
+}
+
+.list-item {
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 12px 15px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.item-text {
+  color: #333333;
+}
+
+.item-text-disabled {
+  opacity: .5;
+}
+
+.item-text-overflow {
+  overflow: hidden;
+}
+
+.check {
+  margin-right: 5px;
+  border: 2px solid #007aff;
+  border-left: 0;
+  border-top: 0;
+  height: 12px;
+  width: 6px;
+  transform-origin: center;
+  transform: rotate(45deg);
+}
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.uvue b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.uvue
new file mode 100644
index 0000000..f4780f3
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.uvue
@@ -0,0 +1,69 @@
+<template>
+  <view class="uni-data-pickerview">
+    <view v-if="error!=null" class="error">
+      <text class="error-text">{{error!.errMsg}}</text>
+    </view>
+    <scroll-view v-if="!isCloudDataList" :scroll-x="true">
+      <view class="selected-node-list">
+        <template v-for="(item, index) in selectedNodes">
+          <text class="selected-node-item" :class="{'selected-node-item-active':index==selectedIndex}"
+            @click="onTabSelect(index)">
+            {{item[mappingTextName]}}
+          </text>
+        </template>
+      </view>
+    </scroll-view>
+    <list-view class="list-view" :scroll-y="true">
+      <list-item class="list-item" v-for="(item, _) in currentDataList" @click="onNodeClick(item)">
+        <text class="item-text" :class="{'item-text-disabled': item['disable']}">{{item[mappingTextName]}}</text>
+        <text class="check" v-if="item[mappingValueName] == selectedNodes[selectedIndex][mappingValueName]"></text>
+      </list-item>
+    </list-view>
+    <view class="loading-cover" v-if="loading">
+      <slot name="pickerview-loading" :loading="loading"></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  import { dataPicker } from "./uni-data-picker.uts"
+
+  /**
+   * DataPickerview
+   * @description uni-data-pickerview
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=3796
+   * @property {Array} localdata 本地数据，参考
+   * @property {Boolean} step-searh = [true|false] 是否分布查询
+   * @value true 启用分布查询，仅查询当前选中节点
+   * @value false 关闭分布查询，一次查询出所有数据
+   * @property {String|DBFieldString} self-field 分布查询当前字段名称
+   * @property {String|DBFieldString} parent-field 分布查询父字段名称
+   * @property {String|DBCollectionString} collection 表名
+   * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+   * @property {String} orderby 排序字段及正序倒叙设置
+   * @property {String|JQLString} where 查询条件
+   */
+  export default {
+    name: 'UniDataPickerView',
+    emits: ['nodeclick', 'change', 'update:modelValue'],
+    mixins: [dataPicker],
+    props: {
+      ellipsis: {
+        type: Boolean,
+        default: true
+      }
+    },
+    created() {
+      this.loadData()
+    },
+    methods: {
+      onFinish() {
+        this.$emit('change', this.getChangeNodes())
+      }
+    }
+  }
+</script>
+
+<style>
+  @import url("uni-data-pickerview.css");
+</style>
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
new file mode 100644
index 0000000..6ebced9
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
@@ -0,0 +1,323 @@
+<template>
+  <view class="uni-data-pickerview">
+    <scroll-view v-if="!isCloudDataList" class="selected-area" scroll-x="true">
+      <view class="selected-list">
+          <view 
+            class="selected-item"
+            v-for="(item,index) in selected"
+            :key="index"
+            :class="{
+              'selected-item-active':index == selectedIndex
+            }"
+            @click="handleSelect(index)"
+          >
+            <text>{{item.text || ''}}</text>
+          </view>
+      </view>
+    </scroll-view>
+    <view class="tab-c">
+      <scroll-view class="list" :scroll-y="true">
+        <view class="item" :class="{'is-disabled': !!item.disable}" v-for="(item, j) in dataList[selectedIndex]" :key="j"
+          @click="handleNodeClick(item, selectedIndex, j)">
+          <text class="item-text">{{item[map.text]}}</text>
+          <view class="check" v-if="selected.length > selectedIndex && item[map.value] == selected[selectedIndex].value"></view>
+        </view>
+      </scroll-view>
+
+      <view class="loading-cover" v-if="loading">
+        <uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
+      </view>
+      <view class="error-message" v-if="errorMessage">
+        <text class="error-text">{{errorMessage}}</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import dataPicker from "./uni-data-picker.js"
+
+  /**
+   * DataPickerview
+   * @description uni-data-pickerview
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=3796
+   * @property {Array} localdata 本地数据，参考
+   * @property {Boolean} step-searh = [true|false] 是否分布查询
+   * @value true 启用分布查询，仅查询当前选中节点
+   * @value false 关闭分布查询，一次查询出所有数据
+   * @property {String|DBFieldString} self-field 分布查询当前字段名称
+   * @property {String|DBFieldString} parent-field 分布查询父字段名称
+   * @property {String|DBCollectionString} collection 表名
+   * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+   * @property {String} orderby 排序字段及正序倒叙设置
+   * @property {String|JQLString} where 查询条件
+   */
+  export default {
+    name: 'UniDataPickerView',
+    emits: ['nodeclick', 'change', 'datachange', 'update:modelValue'],
+    mixins: [dataPicker],
+    props: {
+      managedMode: {
+        type: Boolean,
+        default: false
+      },
+      ellipsis: {
+        type: Boolean,
+        default: true
+      }
+    },
+    created() {
+      if (!this.managedMode) {
+        this.$nextTick(() => {
+          this.loadData();
+        })
+      }
+    },
+    methods: {
+      onPropsChange() {
+        this._treeData = [];
+        this.selectedIndex = 0;
+        this.$nextTick(() => {
+          this.loadData();
+        })
+      },
+      handleSelect(index) {
+        this.selectedIndex = index;
+      },
+      handleNodeClick(item, i, j) {
+        if (item.disable) {
+          return;
+        }
+
+        const node = this.dataList[i][j];
+        const text = node[this.map.text];
+        const value = node[this.map.value];
+
+        if (i < this.selected.length - 1) {
+          this.selected.splice(i, this.selected.length - i)
+          this.selected.push({
+            text,
+            value
+          })
+        } else if (i === this.selected.length - 1) {
+          this.selected.splice(i, 1, {
+            text,
+            value
+          })
+        }
+
+        if (node.isleaf) {
+          this.onSelectedChange(node, node.isleaf)
+          return
+        }
+
+        const {
+          isleaf,
+          hasNodes
+        } = this._updateBindData()
+
+        // 本地数据
+        if (this.isLocalData) {
+          this.onSelectedChange(node, (!hasNodes || isleaf))
+        } else if (this.isCloudDataList) { // Cloud 数据 (单列)
+          this.onSelectedChange(node, true)
+        } else if (this.isCloudDataTree) { // Cloud 数据 (树形)
+          if (isleaf) {
+            this.onSelectedChange(node, node.isleaf)
+          } else if (!hasNodes) { // 请求一次服务器以确定是否为叶子节点
+            this.loadCloudDataNode((data) => {
+              if (!data.length) {
+                node.isleaf = true
+              } else {
+                this._treeData.push(...data)
+                this._updateBindData(node)
+              }
+              this.onSelectedChange(node, node.isleaf)
+            })
+          }
+        }
+      },
+      updateData(data) {
+        this._treeData = data.treeData
+        this.selected = data.selected
+        if (!this._treeData.length) {
+          this.loadData()
+        } else {
+          //this.selected = data.selected
+          this._updateBindData()
+        }
+      },
+      onDataChange() {
+        this.$emit('datachange');
+      },
+      onSelectedChange(node, isleaf) {
+        if (isleaf) {
+          this._dispatchEvent()
+        }
+
+        if (node) {
+          this.$emit('nodeclick', node)
+        }
+      },
+      _dispatchEvent() {
+        this.$emit('change', this.selected.slice(0))
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-data-pickerview {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		overflow: hidden;
+		height: 100%;
+	}
+
+  .error-text {
+    color: #DD524D;
+  }
+
+  .loading-cover {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(255, 255, 255, .5);
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+    align-items: center;
+    z-index: 1001;
+  }
+
+  .load-more {
+    /* #ifndef APP-NVUE */
+    margin: auto;
+    /* #endif */
+  }
+
+  .error-message {
+    background-color: #fff;
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    padding: 15px;
+    opacity: .9;
+    z-index: 102;
+  }
+
+  /* #ifdef APP-NVUE */
+  .selected-area {
+    width: 750rpx;
+  }
+  /* #endif */
+
+  .selected-list {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    flex-wrap: nowrap;
+    /* #endif */
+    flex-direction: row;
+    padding: 0 5px;
+    border-bottom: 1px solid #f8f8f8;
+  }
+
+  .selected-item {
+    margin-left: 10px;
+    margin-right: 10px;
+    padding: 12px 0;
+    text-align: center;
+    /* #ifndef APP-NVUE */
+    white-space: nowrap;
+    /* #endif */
+  }
+
+  .selected-item-text-overflow {
+    width: 168px;
+    /* fix nvue */
+    overflow: hidden;
+    /* #ifndef APP-NVUE */
+    width: 6em;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    /* #endif */
+  }
+
+	.selected-item-active {
+		border-bottom: 2px solid $uni-primary;
+	}
+
+	.selected-item-text {
+		color: $uni-primary;
+	}
+
+  .tab-c {
+    position: relative;
+    flex: 1;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+    overflow: hidden;
+  }
+
+  .list {
+    flex: 1;
+  }
+
+  .item {
+    padding: 12px 15px;
+    /* border-bottom: 1px solid #f0f0f0; */
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+    justify-content: space-between;
+  }
+
+  .is-disabled {
+    opacity: .5;
+  }
+
+  .item-text {
+    /* flex: 1; */
+    color: #333333;
+  }
+
+  .item-text-overflow {
+    width: 280px;
+    /* fix nvue */
+    overflow: hidden;
+    /* #ifndef APP-NVUE */
+    width: 20em;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    /* #endif */
+  }
+
+	.check {
+		margin-right: 5px;
+		border: 2px solid $uni-primary;
+		border-left: 0;
+		border-top: 0;
+		height: 12px;
+		width: 6px;
+		transform-origin: center;
+		/* #ifndef APP-NVUE */
+		transition: all 0.3s;
+		/* #endif */
+		transform: rotate(45deg);
+	}
+</style>
diff --git a/uni_modules/uni-data-picker/package.json b/uni_modules/uni-data-picker/package.json
new file mode 100644
index 0000000..efc60c2
--- /dev/null
+++ b/uni_modules/uni-data-picker/package.json
@@ -0,0 +1,91 @@
+{
+  "id": "uni-data-picker",
+  "displayName": "uni-data-picker 数据驱动的picker选择器",
+  "version": "2.0.1",
+  "description": "单列、多列级联选择器，常用于省市区城市选择、公司部门选择、多级分类等场景",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "picker",
+    "级联",
+    "省市区",
+    ""
+],
+  "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-load-more",
+			"uni-icons",
+			"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",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-data-picker/readme.md b/uni_modules/uni-data-picker/readme.md
new file mode 100644
index 0000000..19dd0e8
--- /dev/null
+++ b/uni_modules/uni-data-picker/readme.md
@@ -0,0 +1,22 @@
+## DataPicker 级联选择
+> **组件名：uni-data-picker**
+> 代码块： `uDataPicker`
+> 关联组件：`uni-data-pickerview`、`uni-load-more`。
+
+
+`<uni-data-picker>` 是一个选择类[datacom组件](https://uniapp.dcloud.net.cn/component/datacom)。
+
+支持单列、和多列级联选择。列数没有限制，如果屏幕显示不全，顶部tab区域会左右滚动。
+
+候选数据支持一次性加载完毕，也支持懒加载，比如示例图中，选择了“北京”后，动态加载北京的区县数据。
+
+`<uni-data-picker>` 组件尤其适用于地址选择、分类选择等选择类。
+
+`<uni-data-picker>` 支持本地数据、云端静态数据(json)，uniCloud云数据库数据。
+
+`<uni-data-picker>` 可以通过JQL直连uniCloud云数据库，配套[DB Schema](https://uniapp.dcloud.net.cn/uniCloud/schema)，可在schema2code中自动生成前端页面，还支持服务器端校验。
+
+在uniCloud数据表中新建表“uni-id-address”和“opendb-city-china”，这2个表的schema自带foreignKey关联。在“uni-id-address”表的表结构页面使用schema2code生成前端页面，会自动生成地址管理的维护页面，自动从“opendb-city-china”表包含的中国所有省市区信息里选择地址。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
\ No newline at end of file
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
new file mode 100644
index 0000000..0261131
--- /dev/null
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,42 @@
+## 2.0.10（2024-06-07）
+- 优化 uni-app x 中，size 属性的类型
+## 2.0.9（2024-01-12）
+fix: 修复图标大小默认值错误的问题
+## 2.0.8（2023-12-14）
+- 修复 项目未使用 ts 情况下，打包报错的bug
+## 2.0.7（2023-12-14）
+- 修复 size 属性为 string 时，不加单位导致尺寸异常的bug
+## 2.0.6（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.5（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.4（2023-12-06）
+- 优化 uni-app x 下示例项目图标排序
+## 2.0.3（2023-12-06）
+- 修复 nvue下引入组件报错的bug
+## 2.0.2（2023-12-05）
+-优化 size 属性支持单位
+## 2.0.1（2023-12-05）
+- 新增 uni-app x 支持定义图标
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
+## 1.3.2（2021-12-01）
+- 优化 示例可复制图标名称
+## 1.3.1（2021-11-23）
+- 优化 兼容旧组件 type 值
+## 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-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
new file mode 100644
index 0000000..8740559
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
@@ -0,0 +1,91 @@
+<template>
+  <text class="uni-icons" :style="styleObj">
+    <slot>{{unicode}}</slot>
+  </text>
+</template>
+
+<script>
+  import { fontData, IconsDataItem } from './uniicons_file'
+
+  /**
+   * Icons 图标
+   * @description 用于展示 icon 图标
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+   * @property {Number,String} size 图标大小
+   * @property {String} type 图标图案，参考示例
+   * @property {String} color 图标颜色
+   * @property {String} customPrefix 自定义图标
+   * @event {Function} click 点击 Icon 触发事件
+   */
+  export default {
+    name: "uni-icons",
+    props: {
+      type: {
+        type: String,
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#333333'
+      },
+      size: {
+        type: [Number, String],
+        default: 16
+      },
+      fontFamily: {
+        type: String,
+        default: ''
+      }
+    },
+    data() {
+      return {};
+    },
+    computed: {
+      unicode() : string {
+        let codes = fontData.find((item : IconsDataItem) : boolean => { return item.font_class == this.type })
+        if (codes !== null) {
+          return codes.unicode
+        }
+        return ''
+      },
+      iconSize() : string {
+        const size = this.size
+        if (typeof size == 'string') {
+          const reg = /^[0-9]*$/g
+          return reg.test(size as string) ? '' + size + 'px' : '' + size;
+          // return '' + this.size
+        }
+        return this.getFontSize(size as number)
+      },
+      styleObj() : UTSJSONObject {
+        if (this.fontFamily !== '') {
+          return { color: this.color, fontSize: this.iconSize, fontFamily: this.fontFamily }
+        }
+        return { color: this.color, fontSize: this.iconSize }
+      }
+    },
+    created() { },
+    methods: {
+      /**
+       * 字体大小
+       */
+      getFontSize(size : number) : string {
+        return size + 'px';
+      },
+    },
+  }
+</script>
+
+<style scoped>
+  @font-face {
+    font-family: UniIconsFontFamily;
+    src: url('./uniicons.ttf');
+  }
+
+  .uni-icons {
+    font-family: UniIconsFontFamily;
+    font-size: 18px;
+    font-style: normal;
+    color: #333;
+  }
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..7da5356
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,110 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick">
+		<slot></slot>
+	</text>
+	<!-- #endif -->
+</template>
+
+<script>
+	import { fontData } from './uniicons_file_vue.js';
+
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' || reg.test(val)) ? val + 'px' : val;
+	}
+
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	import iconUrl from './uniicons.ttf'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('" + iconUrl + "')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		emits: ['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix: {
+				type: String,
+				default: ''
+			},
+			fontFamily: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: fontData
+			}
+		},
+		computed: {
+			unicode() {
+				let code = this.icons.find(v => v.font_class === this.type)
+				if (code) {
+					return code.unicode
+				}
+				return ''
+			},
+			iconSize() {
+				return getVal(this.size)
+			},
+			styleObj() {
+				if (this.fontFamily !== '') {
+					return `color: ${this.color}; font-size: ${this.iconSize}; font-family: ${this.fontFamily};`
+				}
+				return `color: ${this.color}; font-size: ${this.iconSize};`
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
new file mode 100644
index 0000000..0a6b6fe
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,664 @@
+
+.uniui-cart-filled:before {
+  content: "\e6d0";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6d2";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6d3";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6d4";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6d1";
+}
+
+.uniui-down:before {
+  content: "\e6b8";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowright:before {
+  content: "\e6d5";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-up:before {
+  content: "\e6b6";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowup:before {
+  content: "\e6d6";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
new file mode 100644
index 0000000..14696d0
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf differ
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
new file mode 100644
index 0000000..98e93aa
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
@@ -0,0 +1,664 @@
+
+export type IconsData = {
+	id : string
+	name : string
+	font_family : string
+	css_prefix_text : string
+	description : string
+	glyphs : Array<IconsDataItem>
+}
+
+export type IconsDataItem = {
+	font_class : string
+	unicode : string
+}
+
+
+export const fontData = [
+  {
+    "font_class": "arrow-down",
+    "unicode": "\ue6be"
+  },
+  {
+    "font_class": "arrow-left",
+    "unicode": "\ue6bc"
+  },
+  {
+    "font_class": "arrow-right",
+    "unicode": "\ue6bb"
+  },
+  {
+    "font_class": "arrow-up",
+    "unicode": "\ue6bd"
+  },
+  {
+    "font_class": "auth",
+    "unicode": "\ue6ab"
+  },
+  {
+    "font_class": "auth-filled",
+    "unicode": "\ue6cc"
+  },
+  {
+    "font_class": "back",
+    "unicode": "\ue6b9"
+  },
+  {
+    "font_class": "bars",
+    "unicode": "\ue627"
+  },
+  {
+    "font_class": "calendar",
+    "unicode": "\ue6a0"
+  },
+  {
+    "font_class": "calendar-filled",
+    "unicode": "\ue6c0"
+  },
+  {
+    "font_class": "camera",
+    "unicode": "\ue65a"
+  },
+  {
+    "font_class": "camera-filled",
+    "unicode": "\ue658"
+  },
+  {
+    "font_class": "cart",
+    "unicode": "\ue631"
+  },
+  {
+    "font_class": "cart-filled",
+    "unicode": "\ue6d0"
+  },
+  {
+    "font_class": "chat",
+    "unicode": "\ue65d"
+  },
+  {
+    "font_class": "chat-filled",
+    "unicode": "\ue659"
+  },
+  {
+    "font_class": "chatboxes",
+    "unicode": "\ue696"
+  },
+  {
+    "font_class": "chatboxes-filled",
+    "unicode": "\ue692"
+  },
+  {
+    "font_class": "chatbubble",
+    "unicode": "\ue697"
+  },
+  {
+    "font_class": "chatbubble-filled",
+    "unicode": "\ue694"
+  },
+  {
+    "font_class": "checkbox",
+    "unicode": "\ue62b"
+  },
+  {
+    "font_class": "checkbox-filled",
+    "unicode": "\ue62c"
+  },
+  {
+    "font_class": "checkmarkempty",
+    "unicode": "\ue65c"
+  },
+  {
+    "font_class": "circle",
+    "unicode": "\ue65b"
+  },
+  {
+    "font_class": "circle-filled",
+    "unicode": "\ue65e"
+  },
+  {
+    "font_class": "clear",
+    "unicode": "\ue66d"
+  },
+  {
+    "font_class": "close",
+    "unicode": "\ue673"
+  },
+  {
+    "font_class": "closeempty",
+    "unicode": "\ue66c"
+  },
+  {
+    "font_class": "cloud-download",
+    "unicode": "\ue647"
+  },
+  {
+    "font_class": "cloud-download-filled",
+    "unicode": "\ue646"
+  },
+  {
+    "font_class": "cloud-upload",
+    "unicode": "\ue645"
+  },
+  {
+    "font_class": "cloud-upload-filled",
+    "unicode": "\ue648"
+  },
+  {
+    "font_class": "color",
+    "unicode": "\ue6cf"
+  },
+  {
+    "font_class": "color-filled",
+    "unicode": "\ue6c9"
+  },
+  {
+    "font_class": "compose",
+    "unicode": "\ue67f"
+  },
+  {
+    "font_class": "contact",
+    "unicode": "\ue693"
+  },
+  {
+    "font_class": "contact-filled",
+    "unicode": "\ue695"
+  },
+  {
+    "font_class": "down",
+    "unicode": "\ue6b8"
+  },
+	{
+	  "font_class": "bottom",
+	  "unicode": "\ue6b8"
+	},
+  {
+    "font_class": "download",
+    "unicode": "\ue68d"
+  },
+  {
+    "font_class": "download-filled",
+    "unicode": "\ue681"
+  },
+  {
+    "font_class": "email",
+    "unicode": "\ue69e"
+  },
+  {
+    "font_class": "email-filled",
+    "unicode": "\ue69a"
+  },
+  {
+    "font_class": "eye",
+    "unicode": "\ue651"
+  },
+  {
+    "font_class": "eye-filled",
+    "unicode": "\ue66a"
+  },
+  {
+    "font_class": "eye-slash",
+    "unicode": "\ue6b3"
+  },
+  {
+    "font_class": "eye-slash-filled",
+    "unicode": "\ue6b4"
+  },
+  {
+    "font_class": "fire",
+    "unicode": "\ue6a1"
+  },
+  {
+    "font_class": "fire-filled",
+    "unicode": "\ue6c5"
+  },
+  {
+    "font_class": "flag",
+    "unicode": "\ue65f"
+  },
+  {
+    "font_class": "flag-filled",
+    "unicode": "\ue660"
+  },
+  {
+    "font_class": "folder-add",
+    "unicode": "\ue6a9"
+  },
+  {
+    "font_class": "folder-add-filled",
+    "unicode": "\ue6c8"
+  },
+  {
+    "font_class": "font",
+    "unicode": "\ue6a3"
+  },
+  {
+    "font_class": "forward",
+    "unicode": "\ue6ba"
+  },
+  {
+    "font_class": "gear",
+    "unicode": "\ue664"
+  },
+  {
+    "font_class": "gear-filled",
+    "unicode": "\ue661"
+  },
+  {
+    "font_class": "gift",
+    "unicode": "\ue6a4"
+  },
+  {
+    "font_class": "gift-filled",
+    "unicode": "\ue6c4"
+  },
+  {
+    "font_class": "hand-down",
+    "unicode": "\ue63d"
+  },
+  {
+    "font_class": "hand-down-filled",
+    "unicode": "\ue63c"
+  },
+  {
+    "font_class": "hand-up",
+    "unicode": "\ue63f"
+  },
+  {
+    "font_class": "hand-up-filled",
+    "unicode": "\ue63e"
+  },
+  {
+    "font_class": "headphones",
+    "unicode": "\ue630"
+  },
+  {
+    "font_class": "heart",
+    "unicode": "\ue639"
+  },
+  {
+    "font_class": "heart-filled",
+    "unicode": "\ue641"
+  },
+  {
+    "font_class": "help",
+    "unicode": "\ue679"
+  },
+  {
+    "font_class": "help-filled",
+    "unicode": "\ue674"
+  },
+  {
+    "font_class": "home",
+    "unicode": "\ue662"
+  },
+  {
+    "font_class": "home-filled",
+    "unicode": "\ue663"
+  },
+  {
+    "font_class": "image",
+    "unicode": "\ue670"
+  },
+  {
+    "font_class": "image-filled",
+    "unicode": "\ue678"
+  },
+  {
+    "font_class": "images",
+    "unicode": "\ue650"
+  },
+  {
+    "font_class": "images-filled",
+    "unicode": "\ue64b"
+  },
+  {
+    "font_class": "info",
+    "unicode": "\ue669"
+  },
+  {
+    "font_class": "info-filled",
+    "unicode": "\ue649"
+  },
+  {
+    "font_class": "left",
+    "unicode": "\ue6b7"
+  },
+  {
+    "font_class": "link",
+    "unicode": "\ue6a5"
+  },
+  {
+    "font_class": "list",
+    "unicode": "\ue644"
+  },
+  {
+    "font_class": "location",
+    "unicode": "\ue6ae"
+  },
+  {
+    "font_class": "location-filled",
+    "unicode": "\ue6af"
+  },
+  {
+    "font_class": "locked",
+    "unicode": "\ue66b"
+  },
+  {
+    "font_class": "locked-filled",
+    "unicode": "\ue668"
+  },
+  {
+    "font_class": "loop",
+    "unicode": "\ue633"
+  },
+  {
+    "font_class": "mail-open",
+    "unicode": "\ue643"
+  },
+  {
+    "font_class": "mail-open-filled",
+    "unicode": "\ue63a"
+  },
+  {
+    "font_class": "map",
+    "unicode": "\ue667"
+  },
+  {
+    "font_class": "map-filled",
+    "unicode": "\ue666"
+  },
+  {
+    "font_class": "map-pin",
+    "unicode": "\ue6ad"
+  },
+  {
+    "font_class": "map-pin-ellipse",
+    "unicode": "\ue6ac"
+  },
+  {
+    "font_class": "medal",
+    "unicode": "\ue6a2"
+  },
+  {
+    "font_class": "medal-filled",
+    "unicode": "\ue6c3"
+  },
+  {
+    "font_class": "mic",
+    "unicode": "\ue671"
+  },
+  {
+    "font_class": "mic-filled",
+    "unicode": "\ue677"
+  },
+  {
+    "font_class": "micoff",
+    "unicode": "\ue67e"
+  },
+  {
+    "font_class": "micoff-filled",
+    "unicode": "\ue6b0"
+  },
+  {
+    "font_class": "minus",
+    "unicode": "\ue66f"
+  },
+  {
+    "font_class": "minus-filled",
+    "unicode": "\ue67d"
+  },
+  {
+    "font_class": "more",
+    "unicode": "\ue64d"
+  },
+  {
+    "font_class": "more-filled",
+    "unicode": "\ue64e"
+  },
+  {
+    "font_class": "navigate",
+    "unicode": "\ue66e"
+  },
+  {
+    "font_class": "navigate-filled",
+    "unicode": "\ue67a"
+  },
+  {
+    "font_class": "notification",
+    "unicode": "\ue6a6"
+  },
+  {
+    "font_class": "notification-filled",
+    "unicode": "\ue6c1"
+  },
+  {
+    "font_class": "paperclip",
+    "unicode": "\ue652"
+  },
+  {
+    "font_class": "paperplane",
+    "unicode": "\ue672"
+  },
+  {
+    "font_class": "paperplane-filled",
+    "unicode": "\ue675"
+  },
+  {
+    "font_class": "person",
+    "unicode": "\ue699"
+  },
+  {
+    "font_class": "person-filled",
+    "unicode": "\ue69d"
+  },
+  {
+    "font_class": "personadd",
+    "unicode": "\ue69f"
+  },
+  {
+    "font_class": "personadd-filled",
+    "unicode": "\ue698"
+  },
+  {
+    "font_class": "personadd-filled-copy",
+    "unicode": "\ue6d1"
+  },
+  {
+    "font_class": "phone",
+    "unicode": "\ue69c"
+  },
+  {
+    "font_class": "phone-filled",
+    "unicode": "\ue69b"
+  },
+  {
+    "font_class": "plus",
+    "unicode": "\ue676"
+  },
+  {
+    "font_class": "plus-filled",
+    "unicode": "\ue6c7"
+  },
+  {
+    "font_class": "plusempty",
+    "unicode": "\ue67b"
+  },
+  {
+    "font_class": "pulldown",
+    "unicode": "\ue632"
+  },
+  {
+    "font_class": "pyq",
+    "unicode": "\ue682"
+  },
+  {
+    "font_class": "qq",
+    "unicode": "\ue680"
+  },
+  {
+    "font_class": "redo",
+    "unicode": "\ue64a"
+  },
+  {
+    "font_class": "redo-filled",
+    "unicode": "\ue655"
+  },
+  {
+    "font_class": "refresh",
+    "unicode": "\ue657"
+  },
+  {
+    "font_class": "refresh-filled",
+    "unicode": "\ue656"
+  },
+  {
+    "font_class": "refreshempty",
+    "unicode": "\ue6bf"
+  },
+  {
+    "font_class": "reload",
+    "unicode": "\ue6b2"
+  },
+  {
+    "font_class": "right",
+    "unicode": "\ue6b5"
+  },
+  {
+    "font_class": "scan",
+    "unicode": "\ue62a"
+  },
+  {
+    "font_class": "search",
+    "unicode": "\ue654"
+  },
+  {
+    "font_class": "settings",
+    "unicode": "\ue653"
+  },
+  {
+    "font_class": "settings-filled",
+    "unicode": "\ue6ce"
+  },
+  {
+    "font_class": "shop",
+    "unicode": "\ue62f"
+  },
+  {
+    "font_class": "shop-filled",
+    "unicode": "\ue6cd"
+  },
+  {
+    "font_class": "smallcircle",
+    "unicode": "\ue67c"
+  },
+  {
+    "font_class": "smallcircle-filled",
+    "unicode": "\ue665"
+  },
+  {
+    "font_class": "sound",
+    "unicode": "\ue684"
+  },
+  {
+    "font_class": "sound-filled",
+    "unicode": "\ue686"
+  },
+  {
+    "font_class": "spinner-cycle",
+    "unicode": "\ue68a"
+  },
+  {
+    "font_class": "staff",
+    "unicode": "\ue6a7"
+  },
+  {
+    "font_class": "staff-filled",
+    "unicode": "\ue6cb"
+  },
+  {
+    "font_class": "star",
+    "unicode": "\ue688"
+  },
+  {
+    "font_class": "star-filled",
+    "unicode": "\ue68f"
+  },
+  {
+    "font_class": "starhalf",
+    "unicode": "\ue683"
+  },
+  {
+    "font_class": "trash",
+    "unicode": "\ue687"
+  },
+  {
+    "font_class": "trash-filled",
+    "unicode": "\ue685"
+  },
+  {
+    "font_class": "tune",
+    "unicode": "\ue6aa"
+  },
+  {
+    "font_class": "tune-filled",
+    "unicode": "\ue6ca"
+  },
+  {
+    "font_class": "undo",
+    "unicode": "\ue64f"
+  },
+  {
+    "font_class": "undo-filled",
+    "unicode": "\ue64c"
+  },
+  {
+    "font_class": "up",
+    "unicode": "\ue6b6"
+  },
+	{
+	  "font_class": "top",
+	  "unicode": "\ue6b6"
+	},
+  {
+    "font_class": "upload",
+    "unicode": "\ue690"
+  },
+  {
+    "font_class": "upload-filled",
+    "unicode": "\ue68e"
+  },
+  {
+    "font_class": "videocam",
+    "unicode": "\ue68c"
+  },
+  {
+    "font_class": "videocam-filled",
+    "unicode": "\ue689"
+  },
+  {
+    "font_class": "vip",
+    "unicode": "\ue6a8"
+  },
+  {
+    "font_class": "vip-filled",
+    "unicode": "\ue6c6"
+  },
+  {
+    "font_class": "wallet",
+    "unicode": "\ue6b1"
+  },
+  {
+    "font_class": "wallet-filled",
+    "unicode": "\ue6c2"
+  },
+  {
+    "font_class": "weibo",
+    "unicode": "\ue68b"
+  },
+  {
+    "font_class": "weixin",
+    "unicode": "\ue691"
+  }
+] as IconsDataItem[]
+
+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js b/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js
new file mode 100644
index 0000000..1cd11e1
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js
@@ -0,0 +1,649 @@
+
+export const fontData = [
+  {
+    "font_class": "arrow-down",
+    "unicode": "\ue6be"
+  },
+  {
+    "font_class": "arrow-left",
+    "unicode": "\ue6bc"
+  },
+  {
+    "font_class": "arrow-right",
+    "unicode": "\ue6bb"
+  },
+  {
+    "font_class": "arrow-up",
+    "unicode": "\ue6bd"
+  },
+  {
+    "font_class": "auth",
+    "unicode": "\ue6ab"
+  },
+  {
+    "font_class": "auth-filled",
+    "unicode": "\ue6cc"
+  },
+  {
+    "font_class": "back",
+    "unicode": "\ue6b9"
+  },
+  {
+    "font_class": "bars",
+    "unicode": "\ue627"
+  },
+  {
+    "font_class": "calendar",
+    "unicode": "\ue6a0"
+  },
+  {
+    "font_class": "calendar-filled",
+    "unicode": "\ue6c0"
+  },
+  {
+    "font_class": "camera",
+    "unicode": "\ue65a"
+  },
+  {
+    "font_class": "camera-filled",
+    "unicode": "\ue658"
+  },
+  {
+    "font_class": "cart",
+    "unicode": "\ue631"
+  },
+  {
+    "font_class": "cart-filled",
+    "unicode": "\ue6d0"
+  },
+  {
+    "font_class": "chat",
+    "unicode": "\ue65d"
+  },
+  {
+    "font_class": "chat-filled",
+    "unicode": "\ue659"
+  },
+  {
+    "font_class": "chatboxes",
+    "unicode": "\ue696"
+  },
+  {
+    "font_class": "chatboxes-filled",
+    "unicode": "\ue692"
+  },
+  {
+    "font_class": "chatbubble",
+    "unicode": "\ue697"
+  },
+  {
+    "font_class": "chatbubble-filled",
+    "unicode": "\ue694"
+  },
+  {
+    "font_class": "checkbox",
+    "unicode": "\ue62b"
+  },
+  {
+    "font_class": "checkbox-filled",
+    "unicode": "\ue62c"
+  },
+  {
+    "font_class": "checkmarkempty",
+    "unicode": "\ue65c"
+  },
+  {
+    "font_class": "circle",
+    "unicode": "\ue65b"
+  },
+  {
+    "font_class": "circle-filled",
+    "unicode": "\ue65e"
+  },
+  {
+    "font_class": "clear",
+    "unicode": "\ue66d"
+  },
+  {
+    "font_class": "close",
+    "unicode": "\ue673"
+  },
+  {
+    "font_class": "closeempty",
+    "unicode": "\ue66c"
+  },
+  {
+    "font_class": "cloud-download",
+    "unicode": "\ue647"
+  },
+  {
+    "font_class": "cloud-download-filled",
+    "unicode": "\ue646"
+  },
+  {
+    "font_class": "cloud-upload",
+    "unicode": "\ue645"
+  },
+  {
+    "font_class": "cloud-upload-filled",
+    "unicode": "\ue648"
+  },
+  {
+    "font_class": "color",
+    "unicode": "\ue6cf"
+  },
+  {
+    "font_class": "color-filled",
+    "unicode": "\ue6c9"
+  },
+  {
+    "font_class": "compose",
+    "unicode": "\ue67f"
+  },
+  {
+    "font_class": "contact",
+    "unicode": "\ue693"
+  },
+  {
+    "font_class": "contact-filled",
+    "unicode": "\ue695"
+  },
+  {
+    "font_class": "down",
+    "unicode": "\ue6b8"
+  },
+	{
+	  "font_class": "bottom",
+	  "unicode": "\ue6b8"
+	},
+  {
+    "font_class": "download",
+    "unicode": "\ue68d"
+  },
+  {
+    "font_class": "download-filled",
+    "unicode": "\ue681"
+  },
+  {
+    "font_class": "email",
+    "unicode": "\ue69e"
+  },
+  {
+    "font_class": "email-filled",
+    "unicode": "\ue69a"
+  },
+  {
+    "font_class": "eye",
+    "unicode": "\ue651"
+  },
+  {
+    "font_class": "eye-filled",
+    "unicode": "\ue66a"
+  },
+  {
+    "font_class": "eye-slash",
+    "unicode": "\ue6b3"
+  },
+  {
+    "font_class": "eye-slash-filled",
+    "unicode": "\ue6b4"
+  },
+  {
+    "font_class": "fire",
+    "unicode": "\ue6a1"
+  },
+  {
+    "font_class": "fire-filled",
+    "unicode": "\ue6c5"
+  },
+  {
+    "font_class": "flag",
+    "unicode": "\ue65f"
+  },
+  {
+    "font_class": "flag-filled",
+    "unicode": "\ue660"
+  },
+  {
+    "font_class": "folder-add",
+    "unicode": "\ue6a9"
+  },
+  {
+    "font_class": "folder-add-filled",
+    "unicode": "\ue6c8"
+  },
+  {
+    "font_class": "font",
+    "unicode": "\ue6a3"
+  },
+  {
+    "font_class": "forward",
+    "unicode": "\ue6ba"
+  },
+  {
+    "font_class": "gear",
+    "unicode": "\ue664"
+  },
+  {
+    "font_class": "gear-filled",
+    "unicode": "\ue661"
+  },
+  {
+    "font_class": "gift",
+    "unicode": "\ue6a4"
+  },
+  {
+    "font_class": "gift-filled",
+    "unicode": "\ue6c4"
+  },
+  {
+    "font_class": "hand-down",
+    "unicode": "\ue63d"
+  },
+  {
+    "font_class": "hand-down-filled",
+    "unicode": "\ue63c"
+  },
+  {
+    "font_class": "hand-up",
+    "unicode": "\ue63f"
+  },
+  {
+    "font_class": "hand-up-filled",
+    "unicode": "\ue63e"
+  },
+  {
+    "font_class": "headphones",
+    "unicode": "\ue630"
+  },
+  {
+    "font_class": "heart",
+    "unicode": "\ue639"
+  },
+  {
+    "font_class": "heart-filled",
+    "unicode": "\ue641"
+  },
+  {
+    "font_class": "help",
+    "unicode": "\ue679"
+  },
+  {
+    "font_class": "help-filled",
+    "unicode": "\ue674"
+  },
+  {
+    "font_class": "home",
+    "unicode": "\ue662"
+  },
+  {
+    "font_class": "home-filled",
+    "unicode": "\ue663"
+  },
+  {
+    "font_class": "image",
+    "unicode": "\ue670"
+  },
+  {
+    "font_class": "image-filled",
+    "unicode": "\ue678"
+  },
+  {
+    "font_class": "images",
+    "unicode": "\ue650"
+  },
+  {
+    "font_class": "images-filled",
+    "unicode": "\ue64b"
+  },
+  {
+    "font_class": "info",
+    "unicode": "\ue669"
+  },
+  {
+    "font_class": "info-filled",
+    "unicode": "\ue649"
+  },
+  {
+    "font_class": "left",
+    "unicode": "\ue6b7"
+  },
+  {
+    "font_class": "link",
+    "unicode": "\ue6a5"
+  },
+  {
+    "font_class": "list",
+    "unicode": "\ue644"
+  },
+  {
+    "font_class": "location",
+    "unicode": "\ue6ae"
+  },
+  {
+    "font_class": "location-filled",
+    "unicode": "\ue6af"
+  },
+  {
+    "font_class": "locked",
+    "unicode": "\ue66b"
+  },
+  {
+    "font_class": "locked-filled",
+    "unicode": "\ue668"
+  },
+  {
+    "font_class": "loop",
+    "unicode": "\ue633"
+  },
+  {
+    "font_class": "mail-open",
+    "unicode": "\ue643"
+  },
+  {
+    "font_class": "mail-open-filled",
+    "unicode": "\ue63a"
+  },
+  {
+    "font_class": "map",
+    "unicode": "\ue667"
+  },
+  {
+    "font_class": "map-filled",
+    "unicode": "\ue666"
+  },
+  {
+    "font_class": "map-pin",
+    "unicode": "\ue6ad"
+  },
+  {
+    "font_class": "map-pin-ellipse",
+    "unicode": "\ue6ac"
+  },
+  {
+    "font_class": "medal",
+    "unicode": "\ue6a2"
+  },
+  {
+    "font_class": "medal-filled",
+    "unicode": "\ue6c3"
+  },
+  {
+    "font_class": "mic",
+    "unicode": "\ue671"
+  },
+  {
+    "font_class": "mic-filled",
+    "unicode": "\ue677"
+  },
+  {
+    "font_class": "micoff",
+    "unicode": "\ue67e"
+  },
+  {
+    "font_class": "micoff-filled",
+    "unicode": "\ue6b0"
+  },
+  {
+    "font_class": "minus",
+    "unicode": "\ue66f"
+  },
+  {
+    "font_class": "minus-filled",
+    "unicode": "\ue67d"
+  },
+  {
+    "font_class": "more",
+    "unicode": "\ue64d"
+  },
+  {
+    "font_class": "more-filled",
+    "unicode": "\ue64e"
+  },
+  {
+    "font_class": "navigate",
+    "unicode": "\ue66e"
+  },
+  {
+    "font_class": "navigate-filled",
+    "unicode": "\ue67a"
+  },
+  {
+    "font_class": "notification",
+    "unicode": "\ue6a6"
+  },
+  {
+    "font_class": "notification-filled",
+    "unicode": "\ue6c1"
+  },
+  {
+    "font_class": "paperclip",
+    "unicode": "\ue652"
+  },
+  {
+    "font_class": "paperplane",
+    "unicode": "\ue672"
+  },
+  {
+    "font_class": "paperplane-filled",
+    "unicode": "\ue675"
+  },
+  {
+    "font_class": "person",
+    "unicode": "\ue699"
+  },
+  {
+    "font_class": "person-filled",
+    "unicode": "\ue69d"
+  },
+  {
+    "font_class": "personadd",
+    "unicode": "\ue69f"
+  },
+  {
+    "font_class": "personadd-filled",
+    "unicode": "\ue698"
+  },
+  {
+    "font_class": "personadd-filled-copy",
+    "unicode": "\ue6d1"
+  },
+  {
+    "font_class": "phone",
+    "unicode": "\ue69c"
+  },
+  {
+    "font_class": "phone-filled",
+    "unicode": "\ue69b"
+  },
+  {
+    "font_class": "plus",
+    "unicode": "\ue676"
+  },
+  {
+    "font_class": "plus-filled",
+    "unicode": "\ue6c7"
+  },
+  {
+    "font_class": "plusempty",
+    "unicode": "\ue67b"
+  },
+  {
+    "font_class": "pulldown",
+    "unicode": "\ue632"
+  },
+  {
+    "font_class": "pyq",
+    "unicode": "\ue682"
+  },
+  {
+    "font_class": "qq",
+    "unicode": "\ue680"
+  },
+  {
+    "font_class": "redo",
+    "unicode": "\ue64a"
+  },
+  {
+    "font_class": "redo-filled",
+    "unicode": "\ue655"
+  },
+  {
+    "font_class": "refresh",
+    "unicode": "\ue657"
+  },
+  {
+    "font_class": "refresh-filled",
+    "unicode": "\ue656"
+  },
+  {
+    "font_class": "refreshempty",
+    "unicode": "\ue6bf"
+  },
+  {
+    "font_class": "reload",
+    "unicode": "\ue6b2"
+  },
+  {
+    "font_class": "right",
+    "unicode": "\ue6b5"
+  },
+  {
+    "font_class": "scan",
+    "unicode": "\ue62a"
+  },
+  {
+    "font_class": "search",
+    "unicode": "\ue654"
+  },
+  {
+    "font_class": "settings",
+    "unicode": "\ue653"
+  },
+  {
+    "font_class": "settings-filled",
+    "unicode": "\ue6ce"
+  },
+  {
+    "font_class": "shop",
+    "unicode": "\ue62f"
+  },
+  {
+    "font_class": "shop-filled",
+    "unicode": "\ue6cd"
+  },
+  {
+    "font_class": "smallcircle",
+    "unicode": "\ue67c"
+  },
+  {
+    "font_class": "smallcircle-filled",
+    "unicode": "\ue665"
+  },
+  {
+    "font_class": "sound",
+    "unicode": "\ue684"
+  },
+  {
+    "font_class": "sound-filled",
+    "unicode": "\ue686"
+  },
+  {
+    "font_class": "spinner-cycle",
+    "unicode": "\ue68a"
+  },
+  {
+    "font_class": "staff",
+    "unicode": "\ue6a7"
+  },
+  {
+    "font_class": "staff-filled",
+    "unicode": "\ue6cb"
+  },
+  {
+    "font_class": "star",
+    "unicode": "\ue688"
+  },
+  {
+    "font_class": "star-filled",
+    "unicode": "\ue68f"
+  },
+  {
+    "font_class": "starhalf",
+    "unicode": "\ue683"
+  },
+  {
+    "font_class": "trash",
+    "unicode": "\ue687"
+  },
+  {
+    "font_class": "trash-filled",
+    "unicode": "\ue685"
+  },
+  {
+    "font_class": "tune",
+    "unicode": "\ue6aa"
+  },
+  {
+    "font_class": "tune-filled",
+    "unicode": "\ue6ca"
+  },
+  {
+    "font_class": "undo",
+    "unicode": "\ue64f"
+  },
+  {
+    "font_class": "undo-filled",
+    "unicode": "\ue64c"
+  },
+  {
+    "font_class": "up",
+    "unicode": "\ue6b6"
+  },
+	{
+	  "font_class": "top",
+	  "unicode": "\ue6b6"
+	},
+  {
+    "font_class": "upload",
+    "unicode": "\ue690"
+  },
+  {
+    "font_class": "upload-filled",
+    "unicode": "\ue68e"
+  },
+  {
+    "font_class": "videocam",
+    "unicode": "\ue68c"
+  },
+  {
+    "font_class": "videocam-filled",
+    "unicode": "\ue689"
+  },
+  {
+    "font_class": "vip",
+    "unicode": "\ue6a8"
+  },
+  {
+    "font_class": "vip-filled",
+    "unicode": "\ue6c6"
+  },
+  {
+    "font_class": "wallet",
+    "unicode": "\ue6b1"
+  },
+  {
+    "font_class": "wallet-filled",
+    "unicode": "\ue6c2"
+  },
+  {
+    "font_class": "weibo",
+    "unicode": "\ue68b"
+  },
+  {
+    "font_class": "weixin",
+    "unicode": "\ue691"
+  }
+]
+
+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000..6b681b4
--- /dev/null
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "2.0.10",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "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",
+          "app-uvue": "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",
+					"钉钉": "y",
+					"快手": "y",
+					"飞书": "y",
+					"京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-icons/readme.md b/uni_modules/uni-icons/readme.md
new file mode 100644
index 0000000..86234ba
--- /dev/null
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-load-more/changelog.md b/uni_modules/uni-load-more/changelog.md
new file mode 100644
index 0000000..667abdb
--- /dev/null
+++ b/uni_modules/uni-load-more/changelog.md
@@ -0,0 +1,25 @@
+## 1.3.6（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.5（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.4（2024-10-12）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.3（2022-01-20）
+- 新增 showText属性 ，是否显示文本
+## 1.3.2（2022-01-19）
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1（2022-01-19）
+- 修复 微信小程序平台样式选择器报警告的问题
+## 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-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+## 1.2.1（2021-08-24）
+- 新增 支持国际化
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-05-12）
+- 新增 组件示例地址
+## 1.1.7（2021-03-30）
+- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
+## 1.1.6（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
new file mode 100644
index 0000000..a4f14a5
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "Pull up to show more",
+	"uni-load-more.contentrefresh": "loading...",
+	"uni-load-more.contentnomore": "No more data"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/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-load-more/components/uni-load-more/i18n/zh-Hans.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
new file mode 100644
index 0000000..f15d510
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉显示更多",
+	"uni-load-more.contentrefresh": "正在加载...",
+	"uni-load-more.contentnomore": "没有更多数据了"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
new file mode 100644
index 0000000..a255c6d
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉顯示更多",
+	"uni-load-more.contentrefresh": "正在加載...",
+	"uni-load-more.contentnomore": "沒有更多數據了"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
new file mode 100644
index 0000000..a203417
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -0,0 +1,404 @@
+<template>
+	<view class="uni-load-more" @click="onClick">
+		<!-- #ifdef APP-NVUE -->
+		<loading-indicator v-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{color: color,width:iconSize+'px',height:iconSize+'px'}" :animating="true"
+			class="uni-load-more__img uni-load-more__img--nvue"></loading-indicator>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+		<svg width="24" height="24" viewBox="25 25 50 50"
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-H5">
+			<circle cx="50" cy="50" r="20" fill="none" :style="{color:color}" :stroke-width="3"></circle>
+		</svg>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE || H5 -->
+		<view
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-MP">
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE -->
+		<view v-else-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--ios-H5">
+			<image :src="imgBase64" mode="widthFix"></image>
+		</view>
+		<!-- #endif -->
+		<text v-if="showText" class="uni-load-more__text"
+			:style="{color: color}">{{ status === 'more' ? contentdownText : status === 'loading' ? contentrefreshText : contentnomoreText }}</text>
+	</view>
+</template>
+
+<script>
+	let platform
+	setTimeout(() => {
+		// #ifdef MP-WEIXIN
+		platform = uni.getDeviceInfo().platform
+		// #endif
+		// #ifndef MP-WEIXIN
+		platform = uni.getSystemInfoSync().platform
+		// #endif
+	}, 16)
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	/**
+	 * LoadMore 加载更多
+	 * @description 用于列表中，做滚动加载使用，展示 loading 的各种状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=29
+	 * @property {String} status = [more|loading|noMore] loading 的状态
+	 * 	@value more loading前
+	 * 	@value loading loading中
+	 * 	@value noMore 没有更多了
+	 * @property {Number} iconSize 指定图标大小
+	 * @property {Boolean} iconSize = [true|false] 是否显示 loading 图标
+	 * @property {String} iconType = [snow|circle|auto] 指定图标样式
+	 * 	@value snow ios雪花加载样式
+	 * 	@value circle 安卓唤醒加载样式
+	 * 	@value auto 根据平台自动选择加载样式
+	 * @property {String} color 图标和文字颜色
+	 * @property {Object} contentText 各状态文字说明，值为：{contentdown: "上拉显示更多",contentrefresh: "正在加载...",contentnomore: "没有更多数据了"}
+	 * @event {Function} clickLoadMore 点击加载更多时触发
+	 */
+	export default {
+		name: 'UniLoadMore',
+		emits: ['clickLoadMore'],
+		props: {
+			status: {
+				// 上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
+				type: String,
+				default: 'more'
+			},
+			showIcon: {
+				type: Boolean,
+				default: true
+			},
+			iconType: {
+				type: String,
+				default: 'auto'
+			},
+			iconSize: {
+				type: Number,
+				default: 24
+			},
+			color: {
+				type: String,
+				default: '#777777'
+			},
+			contentText: {
+				type: Object,
+				default () {
+					return {
+						contentdown: '',
+						contentrefresh: '',
+						contentnomore: ''
+					}
+				}
+			},
+			showText: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				webviewHide: false,
+				platform: platform,
+				imgBase64: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzlBMzU3OTlEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzlBMzU3OUFEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDOUEzNTc5N0Q5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDOUEzNTc5OEQ5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt+ALSwAAA6CSURBVHja1FsLkFZVHb98LM+F5bHL8khA1iSeiyQBCRM+YGqKUnnJTDLGI0BGZlKDIU2MMglUiDApEZvSsZnQtBRJtKwQNKQMFYeRDR10WOLd8ljYXdh+v8v5fR3Od+797t1dnOnO/Ofce77z+J//+b/P+ZqtXbs2sJ9MJhNUV1cHJ06cCJo3bx7EPc2aNcvpy7pWrVoF+/fvDyoqKoI2bdoE9fX1F7TjN8a+EXBn/fkfvw942Tf+wYMHg9mzZwfjxo0LDhw4EPa1x2MbFw/fOGfPng1qa2tzcCkILsLDydq2bRsunpOTMM7TD/W/tZDZhPdeKD+yGxHhdu3aBV27dg3OnDlzMVANMheLAO3btw8KCwuDmpoaX5OxbgUIMEq7K8IcPnw4KCsrC/r37x8cP378/4cAXAB3vqSkJMuiDhTkw+XcuXNhOWbMmKBly5YhUT8xArhyFvP0BfwRsAuwxJZJsm/nzp2DTp06he/OU+cZ64K6o0ePBkOHDg2GDx8e6gEbJ5Q/NHNuAJQ1hgBeHUDlR7nVTkY8rQAvAi4z34vR/mPs1FoRsaCgIJThI0eOBC1atEiFGGV+5MiRoS45efJkqFjJFXV1dQuA012m2WcwTw98fy6CqBdsaiIO4CScrGPHjvk4odhavPquRtFWXEC25VgkREKOCh/qDSq+vn37htzD/mZTOmOc5U7zKzBPEedygWshcDyWvs30igAbU+6oyMgJBCFhwQE0fccxN60Ay9iebbjoDh06hMowjQxT4fXq1SskArmHZpkArvixp/kWzHdMeArExSJEaiXIjjRjRJ4DaAGWpibLzXN3Fm1vA5teBgh3j1Rv3bp1YgKwPdmf2p9zcyNYYgPKMfY0T5f5nNYdw158nJ8QawW4CLKwiOBSEgO/hok2eBydR+3dYH+PLxA5J8Vv0KBBwenTp0P2JWAx6+yFEBfs8lMY+y0SWMBNI9E4ThKi58VKTg3FQZS1RQF1cz27eC0QHMu+3E0SkUowjhVt5VdaWhp07949ZHv2Qd1EjDXM2cla1M0nl3GxAs3J9yREzyTdFVKVFOaE9qRA8GM0WebRuo9JGZKA7Mv2SeS/Z8+eoQ9BArMfFrLGo6jvxbhHbJZnKX2Rzz1O7QhJJ9Cs2ZMaWIyq/zhdeqPNfIoHd58clIQD+JSXl4dKlyIAuBdVXZwFVWKspSSoxE++h8x4k3uCnEhE4I5KwRiFWGOU0QWKiCYLbdoRMRKAu2kQ9vkfLU6dOhX06NEjlH+yMRZSinnuyWnYosVcji8CEA/6Cg2JF+IIUBqnGKUTCNwtwBN4f89RiK1R96DEgO2o0NDmtEdvVFdVVYV+P3UAPUEs6GFwV3PHmXkD4vh74iDFJysVI/MlaQhwKeBNTLYX5VuA8T4/gZxA4MRGFxDB6R7OmYPfyykGRJbyie+XnGYnQIC/coH9+vULiYrxrkL9ZA9+0ykaHIfEpM7ge8TiJ2CsHYwyMfafAF1yCGBHYIbCVDjDjKt7BeB51D+LgQa6OkG7IDYEEtvQ7lnXLKLtLdLuJBpE4gPUXcW2+PkZwOex+4cGDhwYDBkyRL7/HFcEwUGPo/8uWRUpYnfxGHco8HkewLHLyYmAawAPuIFZxhOpDfJQ8gbUv41yORAptMWBNr6oqMhWird5+u+iHmBb2nhjDV7HWBNQTgK8y11l5NetWzc5ULscAtSj7nbNI0skhWeUZCc0W4nyH/jO4Vz0u1IeYhbk4AiwM6tjxIWByHsoZ9qcIBPJd/y+DwPfBESOmCa/QF3WiZHucLlEDpNxcNhmheEOPgdQNx6/VZFQzFZ5TN08AHXQt2Ii3EdyFuUsPtTcGPhW5iMiCNELvz+Gdn9huG4HUJaW/w3g0wxV0XaG7arG2WeKiUWYM4Y7GO5ezshTARbbWGw/DvXkpp/ivVvE0JVoMxN4rpGzJMhE5Pl+xlATsDIqikP9F9D2z3h9nOksEUFhK+qO4rcPkoalMQ/HqJLIyb3F3JdjrCcw1yZ8joyJLR5gCo54etlag7qIoeNh1N1BRYj3DTFJ0elotxPlVzkGuYAmL0VSJVGAJA41c4Z6A3BzTLfn0HYwYKEI6CUAMzZEWvLsIcQOo1AmmyyM72nHJCfYsogflGV6jEk9vyQZXSuq6w4c16NsGcGZbwOPr+H1RkOk2LEzjNepxQkihHSCQ4ynAYNRx2zMKV92CQMWqj8J0BRE8EShxRFN6YrfCRhC0x3r/Zm4IbQCcmJoV0kMamllccR6FjHqUC5F2R/wS2dcymOlfAKOS4KmzQb5cpNC2MC7JhVn5wjXoJ44rYhLh8n0eXOCorJxa7POjbSlCGVczr34/RsAmrcvo9s+wGp3tzVhntxiXiJ4nvEYb4FJkf0O8HocAePmLvCxnL0AORraVekJk6TYjDabRVXfRE2lCN1h6ZQRN1+InUbsCpKwoBZHh0dODN9JBCUffItXxEavTQkUtnfTVAplCWL3JISz29h4NjotnuSsQKJCk8dF+kJR6RARjrqFVmfPnj3ZbK8cIJ0msd6jgHPGtfVTQ8VLmlvh4mct9sobRmPic0DyDQQnx/NlfYUgyz59+oScsH379pAwXABD32nTpoUHIToESeI5mnbE/UqDdyLcafEBf2MCqgC7NwxIbMREJQ0g4D4sfJwnD+AmRrII05cfMWJE+L1169bQr+fip06dGp4oJ83lmYd5wj/EmMa4TaHivo4EeCguYZBnkB5g2aWA69OIEnUHOaGysjIYMGBAMGnSpODYsWPZwCpFmm4lNq+4gSLQA7jcX8DwtjEyRC8wjabnXEx9kfWnTJkSJkAo90xpJVV+FmcVNeYAF5zWngS4C4O91MBxmAv8blLEpbjI5sz9MTdAhcgkCT1RO8mZkAjfiYpTEvStAS53Uw1vAiUGgZ3GpuQEYvoiBqlIan7kSDHnTwJQFNiPu0+5VxCVYhcZIjNrdXUDdp+Eq5AZ3Gkg8QAyVZRZIk4Tl4QAbF9cXJxNYZMAtAokgs4BrNxEpCtteXg7DDTMDKYNSuQdKsnJBek7HxewvxaosWxLYXtw+cJp18217wql4aKCfBNoEu0O5VU+PhctJ0YeXD4C6JQpyrlpSLTojpGGGN5YwNziChdIZLk4lvLcFJ9jMX3QdiImY9bmGQU+TRUL5CHITTRlgF8D9ouD1MfmLoEPl5xokIumZ2cfgMpHt47IW9N64Hsh7wQYYjyIugWuF5fCqYncXRd5vPMWyizzvhi/32+nvG0dZc9vR6fZOu0md5e+uC408FvKSIOZwXlGvxPv95izA2Vtvg1xKFWARI+vMX66HUhpQQb643uW1bSjuTWyw2SBvDrBvjFic1eGGlz5esq3ko9uSIlBRqPuFcCv8F4WIcN12nVaBd0SaYwI6PDDImR11JkqgHcPmQssjxIn6bUshygDFJUTxPMpHk+jfjPgupgdnYV2R/g7xSjtpah8RJBewhwf0gGK6XI92u4wXFEU40afJ4DN4h5LcAd+40HI3JgJecuT0c062W0i2hQJUTcxan3/CMW1PF2K6bbA+Daz4xRs1D3Br1Cm0OihKCqizW78/nXAF/G5TXrEcVzaNMH6CyMswqsAHqDyDLEyou8lwOXnKF8DjI6KjV3KzMBiXkDH8ij/H214J5A596ekrZ3F0zXlWeL7+P5eUrNo3/QwC15uxthuzidy7DzKRwEDaAViiDgKbTbz7CJnzo0bN7pIfIiid8SuPwn25o3QCmpnyjlZkyxPP8EomCJzrGb7GJMx7tNsq4MT2xMUYaiErZOluTzKsnz3gwCeCZyVRZJfYplNEokEjwrPtxlxjeYAk+F1F74VAzPxQRNYYdtpOUvWs8J1sGhBJMNsb7igN8plJs1eSmLIhLKE4rvaCX27gOhLpLOsIzJ7qn/i+wZzcvSOZ23/du8TZjwV8zHIXoP4R3ifBxiFz1dcVpa3aPntPE+c6TmIWE9EtcMmAcPdWAhYhAXxcLOQi9L1WhD1Sc8p1d2oL7XGiRKp8F4A2i8K/nfI+y/gsTDJ/YC/8+AD5Uh04KHiGl+cIFPnBDDrPMjwRGkLXyxO4VGbfQWnDH2v0bVWE3C9QOXlepbgjEfIJQI6XDG3z5ahD9cw2pS78ipB85wyScNTvsVzlzzhL8/jRrnmVjfFJK/m3m4nj9vbgQTguT8XZTjsm672R5uJKEaQmBI/c58gyus8ZDagLpEVSJBIyHp4jn++xqPV71OgQgJYEWOtZ/haxRtKmWOBu8xdBLftWltsY84zE6WIEy/eIOWL+BaayMx+KHtL7EAkqdNDLiEXmEMUHniedtJqg9HmZtfvt26vNi0BdG3Ft3g8ZOf7PAu59TxtzivLNIekyi+wD1i8CuUiD9FXAa8C+/xS3JPmZnomyc7H+fb4/Se0bk41Fel621r4cgVxbq91V4jVqwB7HTe2M7jgB+QWHavZkDRPmZcASoZEmBx6i75bGjPcMdL4/VKGFAGWZkGzPG0XAbdL9A81G5LOmUnC9hHKJeO7dcUMjblSl12867ElFTtaGl20xvvLGPdVz/8TVuU7y0x1PG7vtNg24oz9Uo/Z412++VFWI7Fcog9tu9Lm6gvRmIPv9x1xmQAu6RDkXtbOtlGEmpgD5Nvnyc0dcv0EE6cfdi1HmhMf9wDF3k3gtRvEedhxjpgfqPb9PU9iEJHnyOUA7bQUXh6kq/D7l2iTjWv7XOD530BDr8jIrus+srXjt4MzumJMHuTsBa63YKE1+RR5lBjEikCCnWKWiHdzOgKO+nRIBAF88za/IFmJ3eMZov4CYxGBabcpGL8EYx+SeMXJeRwHNsV/h+vdxeuhEpN3ZyNY78Gm2fknJxVGhyjixPiQvVkNzT1elD9Py/aTAL64Hb9vcYmC9zfdXdT/C1LeGbg4rnBaAihDFJH12W5ulfNCNe/xTsP3bp8ikzJs5BF+5PNfAQYAPaseTdsEcaYAAAAASUVORK5CYII='
+			}
+		},
+		computed: {
+			iconSnowWidth() {
+				return (Math.floor(this.iconSize / 24) || 1) * 2
+			},
+			contentdownText() {
+				return this.contentText.contentdown || t("uni-load-more.contentdown")
+			},
+			contentrefreshText() {
+				return this.contentText.contentrefresh || t("uni-load-more.contentrefresh")
+			},
+			contentnomoreText() {
+				return this.contentText.contentnomore || t("uni-load-more.contentnomore")
+			}
+		},
+		mounted() {
+			// #ifdef APP-PLUS
+			var pages = getCurrentPages();
+			var page = pages[pages.length - 1];
+			var currentWebview = page.$getAppWebview();
+			currentWebview.addEventListener('hide', () => {
+				this.webviewHide = true
+			})
+			currentWebview.addEventListener('show', () => {
+				this.webviewHide = false
+			})
+			// #endif
+		},
+		methods: {
+			onClick() {
+				this.$emit('clickLoadMore', {
+					detail: {
+						status: this.status,
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-load-more {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		height: 40px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-load-more__text {
+		font-size: 14px;
+		margin-left: 8px;
+	}
+
+	.uni-load-more__img {
+		width: 24px;
+		height: 24px;
+		// margin-right: 8px;
+	}
+
+	.uni-load-more__img--nvue {
+		color: #666666;
+	}
+
+	.uni-load-more__img--android,
+	.uni-load-more__img--ios {
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-load-more__img--android {
+		animation: loading-ios 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	.uni-load-more__img--ios-H5 {
+		position: relative;
+		animation: loading-ios-H5 1s 0s step-end infinite;
+	}
+
+	.uni-load-more__img--ios-H5 image {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+	}
+
+	@keyframes loading-ios-H5 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		8% {
+			transform: rotate(30deg);
+		}
+
+		16% {
+			transform: rotate(60deg);
+		}
+
+		24% {
+			transform: rotate(90deg);
+		}
+
+		32% {
+			transform: rotate(120deg);
+		}
+
+		40% {
+			transform: rotate(150deg);
+		}
+
+		48% {
+			transform: rotate(180deg);
+		}
+
+		56% {
+			transform: rotate(210deg);
+		}
+
+		64% {
+			transform: rotate(240deg);
+		}
+
+		73% {
+			transform: rotate(270deg);
+		}
+
+		82% {
+			transform: rotate(300deg);
+		}
+
+		91% {
+			transform: rotate(330deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+
+	/* #ifdef H5 */
+	.uni-load-more__img--android-H5 {
+		animation: loading-android-H5-rotate 2s linear infinite;
+		transform-origin: center center;
+	}
+
+	.uni-load-more__img--android-H5 circle {
+		display: inline-block;
+		animation: loading-android-H5-dash 1.5s ease-in-out infinite;
+		stroke: currentColor;
+		stroke-linecap: round;
+	}
+
+	@keyframes loading-android-H5-rotate {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-H5-dash {
+		0% {
+			stroke-dasharray: 1, 200;
+			stroke-dashoffset: 0;
+		}
+
+		50% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -40;
+		}
+
+		100% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -120;
+		}
+	}
+
+	/* #endif */
+
+	/* #ifndef APP-NVUE || H5 */
+	.uni-load-more__img--android-MP {
+		position: relative;
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+		animation: loading-ios 1s 0s ease infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon {
+		position: absolute;
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+		border: solid 2px transparent;
+		border-top: solid 2px #777777;
+		transform-origin: center;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(1) {
+		animation: loading-android-MP-1 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(2) {
+		animation: loading-android-MP-2 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(3) {
+		animation: loading-android-MP-3 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-1 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(90deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-2 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(180deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-3 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(270deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-load-more/package.json b/uni_modules/uni-load-more/package.json
new file mode 100644
index 0000000..cf44bff
--- /dev/null
+++ b/uni_modules/uni-load-more/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "uni-load-more",
+  "displayName": "uni-load-more 加载更多",
+  "version": "1.3.6",
+  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "加载更多",
+    "load-more"
+],
+  "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"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-load-more/readme.md b/uni_modules/uni-load-more/readme.md
new file mode 100644
index 0000000..54dc1fa
--- /dev/null
+++ b/uni_modules/uni-load-more/readme.md
@@ -0,0 +1,14 @@
+
+
+### LoadMore 加载更多
+> **组件名：uni-load-more**
+> 代码块： `uLoadMore`
+
+
+用于列表中，做滚动加载使用，展示 loading 的各种状态。
+
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
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-scss/changelog.md b/uni_modules/uni-scss/changelog.md
new file mode 100644
index 0000000..b863bb0
--- /dev/null
+++ b/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000..1744a5f
--- /dev/null
+++ b/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json
new file mode 100644
index 0000000..7cc0ccb
--- /dev/null
+++ b/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "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"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-scss/readme.md b/uni_modules/uni-scss/readme.md
new file mode 100644
index 0000000..b7d1c25
--- /dev/null
+++ b/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 0000000..ffac4fe
--- /dev/null
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 0000000..12a11c3
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/uni-scss/styles/setting/_color.scss
new file mode 100644
index 0000000..1ededd9
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 0000000..9a0428b
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 0000000..3c89528
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/uni-scss/styles/setting/_styles.scss
new file mode 100644
index 0000000..689afec
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 0000000..a34d08f
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 0000000..557d3d7
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss
new file mode 100644
index 0000000..ac6f63e
--- /dev/null
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss
new file mode 100644
index 0000000..80ee62f
--- /dev/null
+++ b/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
new file mode 100644
index 0000000..1c062d4
--- /dev/null
+++ b/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/uni_modules/uni-search-bar/changelog.md b/uni_modules/uni-search-bar/changelog.md
new file mode 100644
index 0000000..2c6571c
--- /dev/null
+++ b/uni_modules/uni-search-bar/changelog.md
@@ -0,0 +1,47 @@
+## 1.3.0（2024-04-22）
+- 修复 textColor默认值导致的文字不显示的bug
+## 1.2.9（2024-04-17）
+- 修复 textColor不生效的bug
+## 1.2.8（2024-02-22）
+- 修复 清空按钮emit值错误的bug
+## 1.2.7（2024-02-21）
+- 新增 设置输入框字体颜色:textColor
+## 1.2.6（2024-02-20）
+- 修复 uni-search-bar在支付宝小程序下样式兼容问题
+## 1.2.5（2024-01-31）
+- 修复 uni-search-bar居中问题，现在默认居左，并修复样式偏移问题
+## 1.2.4（2023-05-09）
+- 修复 i18n 国际化不正确的 Bug
+## 1.2.3（2022-05-24）
+- 新增 readonly 属性，组件只读
+## 1.2.2（2022-05-06）
+- 修复  vue3 input 事件不生效的bug
+## 1.2.1（2022-05-06）
+- 修复 多余代码导致的bug
+## 1.2.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-search-bar](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+## 1.1.2（2021-08-30）
+- 修复 value 属性与 modelValue 属性不兼容的Bug
+## 1.1.1（2021-08-24）
+- 新增 支持国际化
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.9（2021-05-12）
+- 新增 项目示例地址
+## 1.0.8（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.7（2021-04-15）
+- uni-ui 新增 uni-search-bar 的 focus 事件
+
+## 1.0.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持双向绑定
+- 更改 input 事件的返回值，e={value:Number} --> e=value
+- 新增 支持图标插槽
+- 新增 支持 clear、blur 事件
+- 新增 支持 focus 属性
+- 去掉组件背景色
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json
new file mode 100644
index 0000000..dd083a5
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json
@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "cancel",
+	"uni-search-bar.placeholder": "Search enter content"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/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-search-bar/components/uni-search-bar/i18n/zh-Hans.json b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json
new file mode 100644
index 0000000..d2a1ced
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json
@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "取消",
+	"uni-search-bar.placeholder": "请输入搜索内容"
+}
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json
new file mode 100644
index 0000000..f1c96bc
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json
@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "取消",
+	"uni-search-bar.placeholder": "請輸入搜索內容"
+}
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
new file mode 100644
index 0000000..6b9b9c1
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
@@ -0,0 +1,309 @@
+<template>
+	<view class="uni-searchbar">
+		<view :style="{borderRadius:radius+'px',backgroundColor: bgColor}" class="uni-searchbar__box"
+			@click="searchClick">
+			<view class="uni-searchbar__box-icon-search">
+				<slot name="searchIcon">
+					<uni-icons color="#c0c4cc" size="18" type="search" />
+				</slot>
+			</view>
+			<input v-if="show || searchVal" :focus="showSync" :disabled="readonly" :placeholder="placeholderText" :maxlength="maxlength"
+				class="uni-searchbar__box-search-input" confirm-type="search" type="text" v-model="searchVal" :style="{color:textColor}"
+				@confirm="confirm" @blur="blur" @focus="emitFocus"/>
+			<text v-else class="uni-searchbar__text-placeholder">{{ placeholder }}</text>
+			<view v-if="show && (clearButton==='always'||clearButton==='auto'&&searchVal!=='') &&!readonly"
+				class="uni-searchbar__box-icon-clear" @click="clear">
+				<slot name="clearIcon">
+					<uni-icons color="#c0c4cc" size="20" type="clear" />
+				</slot>
+			</view>
+		</view>
+		<text @click="cancel" class="uni-searchbar__cancel"
+			v-if="cancelButton ==='always' || show && cancelButton ==='auto'">{{cancelTextI18n}}</text>
+	</view>
+</template>
+
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	/**
+	 * SearchBar 搜索栏
+	 * @description 搜索栏组件，通常用于搜索商品、文章等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=866
+	 * @property {Number} radius 搜索栏圆角
+	 * @property {Number} maxlength 输入最大长度
+	 * @property {String} placeholder 搜索栏Placeholder
+	 * @property {String} clearButton = [always|auto|none] 是否显示清除按钮
+	 * 	@value always 一直显示
+	 * 	@value auto 输入框不为空时显示
+	 * 	@value none 一直不显示
+	 * @property {String} cancelButton = [always|auto|none] 是否显示取消按钮
+	 * 	@value always 一直显示
+	 * 	@value auto 输入框不为空时显示
+	 * 	@value none 一直不显示
+	 * @property {String} cancelText 取消按钮的文字
+	 * @property {String} bgColor 输入框背景颜色
+	 * @property {String} textColor 输入文字颜色
+	 * @property {Boolean} focus 是否自动聚焦
+	 * @property {Boolean} readonly 组件只读，不能有任何操作，只做展示
+	 * @event {Function} confirm uniSearchBar 的输入框 confirm 事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} input uniSearchBar 的 value 改变时触发事件，返回参数为uniSearchBar的value，e=value
+	 * @event {Function} cancel 点击取消按钮时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} clear 点击清除按钮时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} blur input失去焦点时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 */
+
+	export default {
+		name: "UniSearchBar",
+		emits: ['input', 'update:modelValue', 'clear', 'cancel', 'confirm', 'blur', 'focus'],
+		props: {
+			placeholder: {
+				type: String,
+				default: ""
+			},
+			radius: {
+				type: [Number, String],
+				default: 5
+			},
+			clearButton: {
+				type: String,
+				default: "auto"
+			},
+			cancelButton: {
+				type: String,
+				default: "auto"
+			},
+			cancelText: {
+				type: String,
+				default: ""
+			},
+			bgColor: {
+				type: String,
+				default: "#F8F8F8"
+			},
+			textColor: {
+				type: String,
+				default: "#000000"
+			},
+			maxlength: {
+				type: [Number, String],
+				default: 100
+			},
+			value: {
+				type: [Number, String],
+				default: ""
+			},
+			modelValue: {
+				type: [Number, String],
+				default: ""
+			},
+			focus: {
+				type: Boolean,
+				default: false
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				show: false,
+				showSync: false,
+				searchVal: ''
+			}
+		},
+		computed: {
+			cancelTextI18n() {
+				return this.cancelText || t("uni-search-bar.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-search-bar.placeholder")
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal) {
+					this.searchVal = newVal
+					if (newVal) {
+						this.show = true
+					}
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal) {
+					this.searchVal = newVal
+					if (newVal) {
+						this.show = true
+					}
+				}
+			},
+			// #endif
+			focus: {
+				immediate: true,
+				handler(newVal) {
+					if (newVal) {
+						if(this.readonly) return
+						this.show = true;
+						this.$nextTick(() => {
+							this.showSync = true
+						})
+					}
+				}
+			},
+			searchVal(newVal, oldVal) {
+				this.$emit("input", newVal)
+				// #ifdef VUE3
+				this.$emit("update:modelValue", newVal)
+				// #endif
+			}
+		},
+		methods: {
+			searchClick() {
+				if(this.readonly) return
+				if (this.show) {
+					return
+				}
+				this.show = true;
+				this.$nextTick(() => {
+					this.showSync = true
+				})
+			},
+			clear() {
+				this.searchVal = ""
+				this.$nextTick(() => {
+					this.$emit("clear", { value: "" })
+				})
+			},
+			cancel() {
+				if(this.readonly) return
+				this.$emit("cancel", {
+					value: this.searchVal
+				});
+				this.searchVal = ""
+				this.show = false
+				this.showSync = false
+				// #ifndef APP-PLUS
+				uni.hideKeyboard()
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+			},
+			confirm() {
+				// #ifndef APP-PLUS
+				uni.hideKeyboard();
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+				this.$emit("confirm", {
+					value: this.searchVal
+				})
+			},
+			blur() {
+				// #ifndef APP-PLUS
+				uni.hideKeyboard();
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+				this.$emit("blur", {
+					value: this.searchVal
+				})
+			},
+			emitFocus(e) {
+				this.$emit("focus", e.detail)
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$uni-searchbar-height: 36px;
+
+	.uni-searchbar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		position: relative;
+		padding: 10px;
+		// background-color: #fff;
+	}
+
+	.uni-searchbar__box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		justify-content: left;
+		/* #endif */
+		overflow: hidden;
+		position: relative;
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+		height: $uni-searchbar-height;
+		padding: 5px 8px 5px 0px;
+	}
+
+	.uni-searchbar__box-icon-search {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		// width: 32px;
+		padding: 0 8px;
+		justify-content: center;
+		align-items: center;
+		color: #B3B3B3;
+	}
+
+	.uni-searchbar__box-search-input {
+		flex: 1;
+		font-size: 14px;
+		color: #333;
+		margin-left: 5px;
+		margin-top: 1px;
+		/* #ifndef APP-NVUE */
+		background-color: inherit;
+		/* #endif */
+	}
+
+	.uni-searchbar__box-icon-clear {
+		align-items: center;
+		line-height: 24px;
+		padding-left: 8px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-searchbar__text-placeholder {
+		font-size: 14px;
+		color: #B3B3B3;
+		margin-left: 5px;
+		text-align: left;
+	}
+
+	.uni-searchbar__cancel {
+		padding-left: 10px;
+		line-height: $uni-searchbar-height;
+		font-size: 14px;
+		color: #333333;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-search-bar/package.json b/uni_modules/uni-search-bar/package.json
new file mode 100644
index 0000000..1730d9d
--- /dev/null
+++ b/uni_modules/uni-search-bar/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-search-bar",
+  "displayName": "uni-search-bar 搜索栏",
+  "version": "1.3.0",
+  "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",
+			"uni-icons"
+		],
+    "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-search-bar/readme.md b/uni_modules/uni-search-bar/readme.md
new file mode 100644
index 0000000..253092f
--- /dev/null
+++ b/uni_modules/uni-search-bar/readme.md
@@ -0,0 +1,14 @@
+
+
+## SearchBar 搜索栏
+
+> **组件名：uni-search-bar**
+> 代码块： `uSearchBar`
+
+
+搜索栏组件
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+#### 如使用过程中有任何问题，或者您对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
diff --git a/uni_modules/uv-datetime-picker/changelog.md b/uni_modules/uv-datetime-picker/changelog.md
new file mode 100644
index 0000000..c56eabd
--- /dev/null
+++ b/uni_modules/uv-datetime-picker/changelog.md
@@ -0,0 +1,34 @@
+## 1.0.15（2024-06-14）
+1. 修复上次更改引出的BUG
+## 1.0.14（2024-05-31）
+1. 修复设置maxDate后存在选择不准确的BUG
+## 1.0.13（2024-03-22）
+1. 修复VUE3中出现的BUG
+## 1.0.12（2023-11-27）
+1. 增加round圆角属性
+## 1.0.11（2023-10-11）
+1. 修复设置minDate出现选择错乱的BUG
+## 1.0.10（2023-09-01）
+1. 增加clearDate参数，是否清除上次选择，默认false
+## 1.0.9（2023-08-31）
+1. 增加mode="year"，方便只选择年
+## 1.0.8（2023-07-17）
+1. 优化文档
+2. 优化其他
+## 1.0.7（2023-07-13）
+1. 修复 uv-datetime-picker 设置value属性不生效的BUG 
+## 1.0.6（2023-07-05）
+修复vue3模式下，动态修改v-model绑定的值无效的BUG
+## 1.0.5（2023-07-02）
+uv-datetime-picker  由于弹出层uv-popup的修改，打开和关闭方法更改，详情参考文档：https://www.uvui.cn/components/datetimePicker.html
+## 1.0.4（2023-06-29）
+1. 修复抖音小程序报错的BUG
+## 1.0.3（2023-06-07）
+1.  取消defaultIndex参数，传该值没实际意义，后续更新文档
+## 1.0.2（2023-06-02）
+1. 修复v-model重新赋值不更新的BUG
+## 1.0.1（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.0（2023-05-10）
+uv-datetime-picker 时间选择器
diff --git a/uni_modules/uv-datetime-picker/components/uv-datetime-picker/props.js b/uni_modules/uv-datetime-picker/components/uv-datetime-picker/props.js
new file mode 100644
index 0000000..6031d84
--- /dev/null
+++ b/uni_modules/uv-datetime-picker/components/uv-datetime-picker/props.js
@@ -0,0 +1,130 @@
+export default {
+	props: {
+		value: {
+			type: [String, Number],
+			default: ''
+		},
+		modelValue: {
+			type: [String, Number],
+			default: ''
+		},
+		// 是否打开组件
+		show: {
+			type: Boolean,
+			default: false
+		},
+		// 是否展示顶部的操作栏
+		showToolbar: {
+			type: Boolean,
+			default: true
+		},
+		// 顶部标题
+		title: {
+			type: String,
+			default: ''
+		},
+		// 展示格式，mode=date为日期选择，mode=time为时间选择，mode=year-month为年月选择，mode=datetime为日期时间选择
+		mode: {
+			type: String,
+			default: 'datetime'
+		},
+		// 可选的最大时间
+		maxDate: {
+			type: Number,
+			// 最大默认值为后10年
+			default: new Date(new Date().getFullYear() + 10, 0, 1).getTime()
+		},
+		// 可选的最小时间
+		minDate: {
+			type: Number,
+			// 最小默认值为前10年
+			default: new Date(new Date().getFullYear() - 10, 0, 1).getTime()
+		},
+		// 可选的最小小时，仅mode=time有效
+		minHour: {
+			type: Number,
+			default: 0
+		},
+		// 可选的最大小时，仅mode=time有效
+		maxHour: {
+			type: Number,
+			default: 23
+		},
+		// 可选的最小分钟，仅mode=time有效
+		minMinute: {
+			type: Number,
+			default: 0
+		},
+		// 可选的最大分钟，仅mode=time有效
+		maxMinute: {
+			type: Number,
+			default: 59
+		},
+		// 选项过滤函数
+		filter: {
+			type: [Function, null],
+			default: null
+		},
+		// 选项格式化函数
+		formatter: {
+			type: [Function, null],
+			default: null
+		},
+		// 是否显示加载中状态
+		loading: {
+			type: Boolean,
+			default: false
+		},
+		// 各列中，单个选项的高度
+		itemHeight: {
+			type: [String, Number],
+			default: 44
+		},
+		// 取消按钮的文字
+		cancelText: {
+			type: String,
+			default: '取消'
+		},
+		// 确认按钮的文字
+		confirmText: {
+			type: String,
+			default: '确认'
+		},
+		// 取消按钮的颜色
+		cancelColor: {
+			type: String,
+			default: '#909193'
+		},
+		// 确认按钮的颜色
+		confirmColor: {
+			type: String,
+			default: '#3c9cff'
+		},
+		// 每列中可见选项的数量
+		visibleItemCount: {
+			type: [String, Number],
+			default: 5
+		},
+		// 是否允许点击遮罩关闭选择器
+		closeOnClickOverlay: {
+			type: Boolean,
+			default: true
+		},
+		// 是否允许点击确认关闭选择器
+		closeOnClickConfirm: {
+			type: Boolean,
+			default: true
+		},
+		// 是否清空上次选择内容
+		clearDate: {
+			type: Boolean,
+			default: false
+		},
+		// 圆角
+		round: {
+			type: [String, Number],
+			default: 0
+		},
+		...uni.$uv?.props?.datetimePicker
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue b/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue
new file mode 100644
index 0000000..d45c822
--- /dev/null
+++ b/uni_modules/uv-datetime-picker/components/uv-datetime-picker/uv-datetime-picker.vue
@@ -0,0 +1,360 @@
+<template>
+	<uv-picker
+		ref="picker"
+		:closeOnClickOverlay="closeOnClickOverlay"
+		:closeOnClickConfirm="closeOnClickConfirm"
+		:columns="columns"
+		:title="title"
+		:itemHeight="itemHeight"
+		:showToolbar="showToolbar"
+		:visibleItemCount="visibleItemCount"
+		:defaultIndex="innerDefaultIndex"
+		:cancelText="cancelText"
+		:confirmText="confirmText"
+		:cancelColor="cancelColor"
+		:confirmColor="confirmColor"
+		:round="round"
+		@close="close"
+		@cancel="cancel"
+		@confirm="confirm"
+		@change="change"
+	>
+	</uv-picker>
+</template>
+<script>
+	function times(n, iteratee) {
+		let index = -1
+		const result = Array(n < 0 ? 0 : n)
+		while (++index < n) {
+			result[index] = iteratee(index)
+		}
+		return result
+	}
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	import props from './props.js';
+	import dayjs from '@/uni_modules/uv-ui-tools/libs/util/dayjs.js'
+	/**
+	 * DatetimePicker 时间日期选择器
+	 * @description 此选择器用于时间日期
+	 * @tutorial https://www.uvui.cn/components/datetimePicker.html
+	 * @property {Boolean}			showToolbar			是否显示顶部的操作栏  ( 默认 true )
+	 * @property {String | Number}	value				绑定值
+	 * @property {String}			title				顶部标题
+	 * @property {String}			mode				展示格式 mode=date为日期选择，mode=time为时间选择，mode=year-month为年月选择，mode=datetime为日期时间选择  ( 默认 ‘datetime )
+	 * @property {Number}			maxDate				可选的最大时间  默认值为后10年
+	 * @property {Number}			minDate				可选的最小时间  默认值为前10年
+	 * @property {Number}			minHour				可选的最小小时，仅mode=time有效   ( 默认 0 )
+	 * @property {Number}			maxHour				可选的最大小时，仅mode=time有效	  ( 默认 23 )
+	 * @property {Number}			minMinute			可选的最小分钟，仅mode=time有效	  ( 默认 0 )
+	 * @property {Number}			maxMinute			可选的最大分钟，仅mode=time有效   ( 默认 59 )
+	 * @property {Function}			filter				选项过滤函数
+	 * @property {Function}			formatter			选项格式化函数
+	 * @property {Boolean}			loading				是否显示加载中状态   ( 默认 false )
+	 * @property {String | Number}	itemHeight			各列中，单个选项的高度   ( 默认 44 )
+	 * @property {String}			cancelText			取消按钮的文字  ( 默认 '取消' )
+	 * @property {String}			confirmText			确认按钮的文字  ( 默认 '确认' )
+	 * @property {String}			cancelColor			取消按钮的颜色  ( 默认 '#909193' )
+	 * @property {String}			confirmColor		确认按钮的颜色  ( 默认 '#3c9cff' )
+	 * @property {String | Number}	visibleItemCount	每列中可见选项的数量  ( 默认 5 )
+	 * @property {Boolean}			closeOnClickOverlay	是否允许点击遮罩关闭选择器  ( 默认 true )
+	 * @property {String | Number}	round	圆角  ( 默认 0 )
+	 * @event {Function} close 关闭选择器时触发
+	 * @event {Function} confirm 点击确定按钮，返回当前选择的值
+	 * @event {Function} change 当选择值变化时触发
+	 * @event {Function} cancel 点击取消按钮
+	 * @example  <uv-datetime-picker ref="datetimepicker" :value="value1"  mode="datetime" ></uv-datetime-picker>
+	 */
+	export default {
+		name: 'uv-datetime-picker',
+		emits: ['close', 'cancel', 'confirm', 'input', 'change', 'update:modelValue'],
+		mixins: [mpMixin, mixin, props],
+		data() {
+			return {
+				columns: [],
+				innerDefaultIndex: [],
+				innerFormatter: (type, value) => value
+			}
+		},
+		watch: {
+			propsChange() {
+				this.$uv.sleep(100).then(res=>{
+					this.init()
+				})
+			}
+		},
+		computed: {
+			// 如果以下这些变量发生了变化，意味着需要重新初始化各列的值
+			propsChange() {
+				const propsValue = this.value || this.modelValue;
+				return [this.mode, this.maxDate, this.minDate, this.minHour, this.maxHour, this.minMinute, this.maxMinute, this.filter, propsValue]
+			}
+		},
+		mounted() {
+			this.init()
+		},
+		methods: {
+			init() {
+				this.getValue();
+				this.updateColumnValue(this.innerValue)
+			},
+			getValue() {
+				const propsValue = this.value || this.modelValue;
+				this.innerValue = this.correctValue(propsValue)
+			},
+			// 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
+			setFormatter(e) {
+				this.innerFormatter = e
+			},
+			open() {
+				this.$refs.picker.open();
+				// 解决打开的前一次和当前日期错乱的BUG
+				setTimeout(()=>{
+					this.getValue();
+					this.updateColumnValue(this.innerValue);
+				},10)
+			},
+			close() {
+				this.$emit('close');
+			},
+			// 点击工具栏的取消按钮
+			cancel() {
+				this.$emit('cancel')
+			},
+			// 点击工具栏的确定按钮
+			confirm() {
+				this.$emit('confirm', {
+					value: this.innerValue,
+					mode: this.mode
+				})
+				if(!this.clearDate) {
+					this.$emit('input', this.innerValue)
+					this.$emit('update:modelValue', this.innerValue)
+				}
+			},
+			//用正则截取输出值,当出现多组数字时,抛出错误
+			intercept(e, type) {
+				let judge = e.match(/\d+/g)
+				//判断是否掺杂数字
+				if (judge.length > 1) {
+					this.$uv.error("请勿在过滤或格式化函数时添加数字")
+					return 0
+				} else if (type && judge[0].length == 4) { //判断是否是年份
+					return judge[0]
+				} else if (judge[0].length > 2) {
+					this.$uv.error("请勿在过滤或格式化函数时添加数字")
+					return 0
+				} else {
+					return judge[0]
+				}
+			},
+			// 列发生变化时触发
+			change(e) {
+				const { indexs, values } = e
+				let selectValue = ''
+				if (this.mode === 'time') {
+					// 根据value各列索引，从各列数组中，取出当前时间的选中值
+					selectValue = `${this.intercept(values[0][indexs[0]])}:${this.intercept(values[1][indexs[1]])}`
+				} else if (this.mode === 'year') {
+					const year = parseInt(this.intercept(values[0][indexs[0]], 'year'));
+					selectValue = Number(new Date(year, 0));
+				} else {
+					// 将选择的值转为数值，比如'03'转为数值的3，'2019'转为数值的2019
+					const year = parseInt(this.intercept(values[0][indexs[0]], 'year'))
+					const month = parseInt(this.intercept(values[1][indexs[1]]))
+					let date = parseInt(values[2] ? this.intercept(values[2][indexs[2]]) : 1)
+					let hour = 0,
+						minute = 0
+					// 此月份的最大天数
+					const maxDate = dayjs(`${year}-${month}`).daysInMonth()
+					// year-month模式下，date不会出现在列中，设置为1，为了符合后边需要减1的需求
+					if (this.mode === 'year-month') {
+						date = 1
+					}
+					// 不允许超过maxDate值
+					date = Math.min(maxDate, date)
+					if (this.mode === 'datetime') {
+						hour = parseInt(this.intercept(values[3][indexs[3]]))
+						minute = parseInt(this.intercept(values[4][indexs[4]]))
+					}
+					// 转为时间模式
+					selectValue = Number(new Date(year, month - 1, date, hour, minute))
+				}
+				// 取出准确的合法值，防止超越边界的情况
+				selectValue = this.correctValue(selectValue)
+				this.innerValue = selectValue
+				this.updateColumnValue(selectValue)
+				// 发出change时间，value为当前选中的时间戳
+				this.$emit('change', {
+					value: selectValue,
+					mode: this.mode
+				})
+			},
+			// 更新各列的值，进行补0、格式化等操作
+			updateColumnValue(value) {
+				this.innerValue = value
+				this.updateColumns()
+				this.updateIndexs(value)
+			},
+			// 更新索引
+			updateIndexs(value) {
+				let values = []
+				const formatter = this.formatter || this.innerFormatter;
+				if (this.mode === 'time') {
+					// 将time模式的时间用:分隔成数组
+					const timeArr = value.split(':')
+					// 使用formatter格式化方法进行管道处理
+					values = [formatter('hour', timeArr[0]), formatter('minute', timeArr[1])]
+				} else {
+					const date = new Date(value)
+					values = [
+						formatter('year', `${dayjs(value).year()}`),
+						// 月份补0
+						formatter('month', this.$uv.padZero(dayjs(value).month() + 1))
+					]
+					if (this.mode === 'date') {
+						// date模式，需要添加天列
+						values.push(formatter('day', this.$uv.padZero(dayjs(value).date())))
+					}
+					if (this.mode === 'datetime') {
+						// 数组的push方法，可以写入多个参数
+						values.push(formatter('day', this.$uv.padZero(dayjs(value).date())), formatter('hour', this.$uv.padZero(dayjs(value).hour())), formatter('minute', this.$uv.padZero(dayjs(value).minute())))
+					}
+				}
+				// 根据当前各列的所有值，从各列默认值中找到默认值在各列中的索引
+				const indexs = this.columns.map((column, index) => {
+					// 通过取大值，可以保证不会出现找不到索引的-1情况
+					return Math.max(0, column.findIndex(item => item === values[index]))
+				})
+				this.$nextTick(()=>{
+					this.$uv.sleep(100).then(res=>{
+						this.$refs.picker.setIndexs(indexs,true);
+					})
+				})
+			},
+			// 更新各列的值
+			updateColumns() {
+				const formatter = this.formatter || this.innerFormatter
+				// 获取各列的值，并且map后，对各列的具体值进行补0操作
+				const results = this.getOriginColumns().map((column) => column.values.map((value) => formatter(column.type, value)))
+				this.columns = results
+			},
+			getOriginColumns() {
+				// 生成各列的值
+				const results = this.getRanges().map(({ type, range }) => {
+					let values = times(range[1] - range[0] + 1, (index) => {
+						let value = range[0] + index
+						value = type === 'year' ? `${value}` : this.$uv.padZero(value)
+						return value
+					})
+					// 进行过滤
+					if (this.filter) {
+						values = this.filter(type, values)
+					}
+					return { type, values }
+				})
+				return results
+			},
+			// 通过最大值和最小值生成数组
+			generateArray(start, end) {
+				return Array.from(new Array(end + 1).keys()).slice(start)
+			},
+			// 得出合法的时间
+			correctValue(value) {
+				const isDateMode = this.mode !== 'time'
+				if (isDateMode && !this.$uv.test.date(value)) {
+					// 如果是日期类型，但是又没有设置合法的当前时间的话，使用最小时间为当前时间
+					value = this.minDate
+				} else if (!isDateMode && !value) {
+					// 如果是时间类型，而又没有默认值的话，就用最小时间
+					value = `${this.$uv.padZero(this.minHour)}:${this.$uv.padZero(this.minMinute)}`
+				}
+				// 时间类型
+				if (!isDateMode) {
+					if (String(value).indexOf(':') === -1) return this.$uv.error('时间错误，请传递如12:24的格式')
+					let [hour, minute] = value.split(':')
+					// 对时间补零，同时控制在最小值和最大值之间
+					hour = this.$uv.padZero(this.$uv.range(this.minHour, this.maxHour, Number(hour)))
+					minute = this.$uv.padZero(this.$uv.range(this.minMinute, this.maxMinute, Number(minute)))
+					return `${ hour }:${ minute }`
+				} else {
+					// 如果是日期格式，控制在最小日期和最大日期之间
+					value = dayjs(value).isBefore(dayjs(this.minDate)) ? this.minDate : value
+					value = dayjs(value).isAfter(dayjs(this.maxDate)) ? this.maxDate : value
+					return value
+				}
+			},
+			// 获取每列的最大和最小值
+			getRanges() {
+				if (this.mode === 'time') {
+					return [{
+						type: 'hour',
+						range: [this.minHour, this.maxHour],
+					}, {
+						type: 'minute',
+						range: [this.minMinute, this.maxMinute],
+					}, ];
+				}
+				const { maxYear, maxDate, maxMonth, maxHour, maxMinute, } = this.getBoundary('max', this.innerValue);
+				const { minYear, minDate, minMonth, minHour, minMinute, } = this.getBoundary('min', this.innerValue);
+				const result = [{
+					type: 'year',
+					range: [minYear, maxYear],
+				}, {
+					type: 'month',
+					range: [minMonth, maxMonth],
+				}, {
+					type: 'day',
+					range: [minDate, maxDate],
+				}, {
+					type: 'hour',
+					range: [minHour, maxHour],
+				}, {
+					type: 'minute',
+					range: [minMinute, maxMinute],
+				}, ];
+				if (this.mode === 'date') result.splice(3, 2);
+				if (this.mode === 'year-month') result.splice(2, 3);
+				if (this.mode === 'year') result.splice(1, 4);
+				return result;
+			},
+			// 根据minDate、maxDate、minHour、maxHour等边界值，判断各列的开始和结束边界值
+			getBoundary(type, innerValue) {
+				const value = new Date(innerValue)
+				const boundary = new Date(this[`${type}Date`])
+				const year = dayjs(boundary).year()
+				let month = 1
+				let date = 1
+				let hour = 0
+				let minute = 0
+				if (type === 'max') {
+					month = 12
+					// 月份的天数
+					date = dayjs(value).daysInMonth()
+					hour = 23
+					minute = 59
+				}
+				// 获取边界值，逻辑是：当年达到了边界值(最大或最小年)，就检查月允许的最大和最小值，以此类推
+				if (dayjs(value).year() === year) {
+					month = dayjs(boundary).month() + 1
+					if (dayjs(value).month() + 1 === month) {
+						date = dayjs(boundary).date()
+						if (dayjs(value).date() === date) {
+							hour = dayjs(boundary).hour()
+							if (dayjs(value).hour() === hour) {
+								minute = dayjs(boundary).minute()
+							}
+						}
+					}
+				}
+				return {
+					[`${type}Year`]: year,
+					[`${type}Month`]: month,
+					[`${type}Date`]: date,
+					[`${type}Hour`]: hour,
+					[`${type}Minute`]: minute
+				}
+			},
+		},
+	}
+</script>
\ No newline at end of file
diff --git a/uni_modules/uv-datetime-picker/package.json b/uni_modules/uv-datetime-picker/package.json
new file mode 100644
index 0000000..a2415b1
--- /dev/null
+++ b/uni_modules/uv-datetime-picker/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uv-datetime-picker",
+  "displayName": "uv-datetime-picker 时间选择器 全面兼容vue3+2、app、h5、小程序等多端",
+  "version": "1.0.15",
+  "description": "时间选择器组件用于时间日期，主要用于年月日时分的选择，具体选择的精确度由参数控制。",
+  "keywords": [
+    "datetime-picker",
+    "uvui",
+    "uv-ui",
+    "datetime",
+    "时间选择"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+    	"ads": "无",
+    	"data": "插件不采集任何数据",
+    	"permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uv-ui-tools",
+			"uv-picker"
+		],
+    "encrypt": [],
+    "platforms": {
+			"cloud": {
+				"tcb": "y",
+                "aliyun": "y",
+                "alipay": "n"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"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",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-datetime-picker/readme.md b/uni_modules/uv-datetime-picker/readme.md
new file mode 100644
index 0000000..0db9d9c
--- /dev/null
+++ b/uni_modules/uv-datetime-picker/readme.md
@@ -0,0 +1,19 @@
+## DatetimePicker 时间选择器
+
+> **组件名：uv-datetime-picker**
+
+此选择器用于时间日期，主要用于年月日时分的选择，具体选择的精确度由参数控制。
+
+# <a href="https://www.uvui.cn/components/datetimePicker.html" target="_blank">查看文档</a>
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui) <small>（请不要 下载插件ZIP）</small>
+
+### [更多插件，请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+<a href="https://ext.dcloud.net.cn/plugin?name=uv-ui" target="_blank">
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+</a>
+
+#### 如使用过程中有任何问题反馈，或者您对uv-ui有一些好的建议，欢迎加入uv-ui官方交流群：<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
\ No newline at end of file
diff --git a/uni_modules/uv-icon/changelog.md b/uni_modules/uv-icon/changelog.md
new file mode 100644
index 0000000..c610827
--- /dev/null
+++ b/uni_modules/uv-icon/changelog.md
@@ -0,0 +1,31 @@
+## 1.0.13（2023-12-06）
+1. 优化
+## 1.0.12（2023-12-06）
+1. 阻止事件冒泡处理
+## 1.0.11（2023-10-29）
+1. imgMode默认值改成aspectFit
+## 1.0.10（2023-08-13）
+1. 优化nvue，方便自定义图标
+## 1.0.9（2023-07-28）
+1. 修改几个对应错误图标的BUG
+## 1.0.8（2023-07-24）
+1. 优化 支持base64图片
+## 1.0.7（2023-07-17）
+1. 修复  uv-icon 恢复uv-empty相关的图标
+## 1.0.6（2023-07-13）
+1. 修复icon设置name属性对应图标错误的BUG
+## 1.0.5（2023-07-04）
+1. 更新图标，删除一些不常用的图标
+2. 删除base64，修改成ttf文件引入读取图标
+3. 自定义图标文档说明：https://www.uvui.cn/guide/customIcon.html
+## 1.0.4（2023-07-03）
+1. 修复主题颜色在APP不生效的BUG
+## 1.0.3（2023-05-24）
+1. 将线上ttf字体包替换成base64，避免加载时或者网络差时候显示白色方块
+## 1.0.2（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.1（2023-05-10）
+1. 修复小程序中异常显示
+## 1.0.0（2023-05-04）
+新发版
diff --git a/uni_modules/uv-icon/components/uv-icon/icons.js b/uni_modules/uv-icon/components/uv-icon/icons.js
new file mode 100644
index 0000000..8469a2d
--- /dev/null
+++ b/uni_modules/uv-icon/components/uv-icon/icons.js
@@ -0,0 +1,160 @@
+export default {
+	'uvicon-level': 'e68f',
+	'uvicon-checkbox-mark': 'e659',
+	'uvicon-folder': 'e694',
+	'uvicon-movie': 'e67c',
+	'uvicon-star-fill': 'e61e',
+	'uvicon-star': 'e618',
+	'uvicon-phone-fill': 'e6ac',
+	'uvicon-phone': 'e6ba',
+	'uvicon-apple-fill': 'e635',
+	'uvicon-backspace': 'e64d',
+	'uvicon-attach': 'e640',
+	'uvicon-empty-data': 'e671',
+	'uvicon-empty-address': 'e68a',
+	'uvicon-empty-favor': 'e662',
+	'uvicon-empty-car': 'e657',
+	'uvicon-empty-order': 'e66b',
+	'uvicon-empty-list': 'e672',
+	'uvicon-empty-search': 'e677',
+	'uvicon-empty-permission': 'e67d',
+	'uvicon-empty-news': 'e67e',
+	'uvicon-empty-history': 'e685',
+	'uvicon-empty-coupon': 'e69b',
+	'uvicon-empty-page': 'e60e',
+	'uvicon-empty-wifi-off': 'e6cc',
+	'uvicon-reload': 'e627',
+	'uvicon-order': 'e695',
+	'uvicon-server-man': 'e601',
+	'uvicon-search': 'e632',
+	'uvicon-more-dot-fill': 'e66f',
+	'uvicon-scan': 'e631',
+	'uvicon-map': 'e665',
+	'uvicon-map-fill': 'e6a8',
+	'uvicon-tags': 'e621',
+	'uvicon-tags-fill': 'e613',
+	'uvicon-eye': 'e664',
+	'uvicon-eye-fill': 'e697',
+	'uvicon-eye-off': 'e69c',
+	'uvicon-eye-off-outline': 'e688',
+	'uvicon-mic': 'e66d',
+	'uvicon-mic-off': 'e691',
+	'uvicon-calendar': 'e65c',
+	'uvicon-trash': 'e623',
+	'uvicon-trash-fill': 'e6ce',
+	'uvicon-play-left': 'e6bf',
+	'uvicon-play-right': 'e6b3',
+	'uvicon-minus': 'e614',
+	'uvicon-plus': 'e625',
+	'uvicon-info-circle': 'e69f',
+	'uvicon-info-circle-fill': 'e6a7',
+	'uvicon-question-circle': 'e622',
+	'uvicon-question-circle-fill': 'e6bc',
+	'uvicon-close': 'e65a',
+	'uvicon-checkmark': 'e64a',
+	'uvicon-checkmark-circle': 'e643',
+	'uvicon-checkmark-circle-fill': 'e668',
+	'uvicon-setting': 'e602',
+	'uvicon-setting-fill': 'e6d0',
+	'uvicon-heart': 'e6a2',
+	'uvicon-heart-fill': 'e68b',
+	'uvicon-camera': 'e642',
+	'uvicon-camera-fill': 'e650',
+	'uvicon-more-circle': 'e69e',
+	'uvicon-more-circle-fill': 'e684',
+	'uvicon-chat': 'e656',
+	'uvicon-chat-fill': 'e63f',
+	'uvicon-bag': 'e647',
+	'uvicon-error-circle': 'e66e',
+	'uvicon-error-circle-fill': 'e655',
+	'uvicon-close-circle': 'e64e',
+	'uvicon-close-circle-fill': 'e666',
+	'uvicon-share': 'e629',
+	'uvicon-share-fill': 'e6bb',
+	'uvicon-share-square': 'e6c4',
+	'uvicon-shopping-cart': 'e6cb',
+	'uvicon-shopping-cart-fill': 'e630',
+	'uvicon-bell': 'e651',
+	'uvicon-bell-fill': 'e604',
+	'uvicon-list': 'e690',
+	'uvicon-list-dot': 'e6a9',
+	'uvicon-zhifubao-circle-fill': 'e617',
+	'uvicon-weixin-circle-fill': 'e6cd',
+	'uvicon-weixin-fill': 'e620',
+	'uvicon-qq-fill': 'e608',
+	'uvicon-qq-circle-fill': 'e6b9',
+	'uvicon-moments-circel-fill': 'e6c2',
+	'uvicon-moments': 'e6a0',
+	'uvicon-car': 'e64f',
+	'uvicon-car-fill': 'e648',
+	'uvicon-warning-fill': 'e6c7',
+	'uvicon-warning': 'e6c1',
+	'uvicon-clock-fill': 'e64b',
+	'uvicon-clock': 'e66c',
+	'uvicon-edit-pen': 'e65d',
+	'uvicon-edit-pen-fill': 'e679',
+	'uvicon-email': 'e673',
+	'uvicon-email-fill': 'e683',
+	'uvicon-minus-circle': 'e6a5',
+	'uvicon-plus-circle': 'e603',
+	'uvicon-plus-circle-fill': 'e611',
+	'uvicon-file-text': 'e687',
+	'uvicon-file-text-fill': 'e67f',
+	'uvicon-pushpin': 'e6d1',
+	'uvicon-pushpin-fill': 'e6b6',
+	'uvicon-grid': 'e68c',
+	'uvicon-grid-fill': 'e698',
+	'uvicon-play-circle': 'e6af',
+	'uvicon-play-circle-fill': 'e62a',
+	'uvicon-pause-circle-fill': 'e60c',
+	'uvicon-pause': 'e61c',
+	'uvicon-pause-circle': 'e696',
+	'uvicon-gift-fill': 'e6b0',
+	'uvicon-gift': 'e680',
+	'uvicon-kefu-ermai': 'e660',
+	'uvicon-server-fill': 'e610',
+	'uvicon-coupon-fill': 'e64c',
+	'uvicon-coupon': 'e65f',
+	'uvicon-integral': 'e693',
+	'uvicon-integral-fill': 'e6b1',
+	'uvicon-home-fill': 'e68e',
+	'uvicon-home': 'e67b',
+	'uvicon-account': 'e63a',
+	'uvicon-account-fill': 'e653',
+	'uvicon-thumb-down-fill': 'e628',
+	'uvicon-thumb-down': 'e60a',
+	'uvicon-thumb-up': 'e612',
+	'uvicon-thumb-up-fill': 'e62c',
+	'uvicon-lock-fill': 'e6a6',
+	'uvicon-lock-open': 'e68d',
+	'uvicon-lock-opened-fill': 'e6a1',
+	'uvicon-lock': 'e69d',
+	'uvicon-red-packet': 'e6c3',
+	'uvicon-photo-fill': 'e6b4',
+	'uvicon-photo': 'e60d',
+	'uvicon-volume-off-fill': 'e6c8',
+	'uvicon-volume-off': 'e6bd',
+	'uvicon-volume-fill': 'e624',
+	'uvicon-volume': 'e605',
+	'uvicon-download': 'e670',
+	'uvicon-arrow-up-fill': 'e636',
+	'uvicon-arrow-down-fill': 'e638',
+	'uvicon-play-left-fill': 'e6ae',
+	'uvicon-play-right-fill': 'e6ad',
+	'uvicon-arrow-downward': 'e634',
+	'uvicon-arrow-leftward': 'e63b',
+	'uvicon-arrow-rightward': 'e644',
+	'uvicon-arrow-upward': 'e641',
+	'uvicon-arrow-down': 'e63e',
+	'uvicon-arrow-right': 'e63c',
+	'uvicon-arrow-left': 'e646',
+	'uvicon-arrow-up': 'e633',
+	'uvicon-skip-back-left': 'e6c5',
+	'uvicon-skip-forward-right': 'e61f',
+	'uvicon-arrow-left-double': 'e637',
+	'uvicon-man': 'e675',
+	'uvicon-woman': 'e626',
+	'uvicon-en': 'e6b8',
+	'uvicon-twitte': 'e607',
+	'uvicon-twitter-circle-fill': 'e6cf'
+}
\ No newline at end of file
diff --git a/uni_modules/uv-icon/components/uv-icon/props.js b/uni_modules/uv-icon/components/uv-icon/props.js
new file mode 100644
index 0000000..7668cf9
--- /dev/null
+++ b/uni_modules/uv-icon/components/uv-icon/props.js
@@ -0,0 +1,90 @@
+export default {
+	props: {
+		// 图标类名
+		name: {
+			type: String,
+			default: ''
+		},
+		// 图标颜色，可接受主题色
+		color: {
+			type: String,
+			default: '#606266'
+		},
+		// 字体大小，单位px
+		size: {
+			type: [String, Number],
+			default: '16px'
+		},
+		// 是否显示粗体
+		bold: {
+			type: Boolean,
+			default: false
+		},
+		// 点击图标的时候传递事件出去的index（用于区分点击了哪一个）
+		index: {
+			type: [String, Number],
+			default: null
+		},
+		// 触摸图标时的类名
+		hoverClass: {
+			type: String,
+			default: ''
+		},
+		// 自定义扩展前缀，方便用户扩展自己的图标库
+		customPrefix: {
+			type: String,
+			default: 'uvicon'
+		},
+		// 图标右边或者下面的文字
+		label: {
+			type: [String, Number],
+			default: ''
+		},
+		// label的位置，只能右边或者下边
+		labelPos: {
+			type: String,
+			default: 'right'
+		},
+		// label的大小
+		labelSize: {
+			type: [String, Number],
+			default: '15px'
+		},
+		// label的颜色
+		labelColor: {
+			type: String,
+			default: '#606266'
+		},
+		// label与图标的距离
+		space: {
+			type: [String, Number],
+			default: '3px'
+		},
+		// 图片的mode
+		imgMode: {
+			type: String,
+			default: 'aspectFit'
+		},
+		// 用于显示图片小图标时，图片的宽度
+		width: {
+			type: [String, Number],
+			default: ''
+		},
+		// 用于显示图片小图标时，图片的高度
+		height: {
+			type: [String, Number],
+			default: ''
+		},
+		// 用于解决某些情况下，让图标垂直居中的用途
+		top: {
+			type: [String, Number],
+			default: 0
+		},
+		// 是否阻止事件传播
+		stop: {
+			type: Boolean,
+			default: false
+		},
+		...uni.$uv?.props?.icon
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-icon/components/uv-icon/uv-icon.vue b/uni_modules/uv-icon/components/uv-icon/uv-icon.vue
new file mode 100644
index 0000000..d61c9e5
--- /dev/null
+++ b/uni_modules/uv-icon/components/uv-icon/uv-icon.vue
@@ -0,0 +1,226 @@
+<template>
+	<view
+	  class="uv-icon"
+	  @tap="clickHandler"
+	  :class="['uv-icon--' + labelPos]"
+	>
+		<image
+		  class="uv-icon__img"
+		  v-if="isImg"
+		  :src="name"
+		  :mode="imgMode"
+		  :style="[imgStyle, $uv.addStyle(customStyle)]"
+		></image>
+		<text
+		  v-else
+		  class="uv-icon__icon"
+		  :class="uClasses"
+		  :style="[iconStyle, $uv.addStyle(customStyle)]"
+		  :hover-class="hoverClass"
+		>{{icon}}</text>
+		<!-- 这里进行空字符串判断，如果仅仅是v-if="label"，可能会出现传递0的时候，结果也无法显示 -->
+		<text
+		  v-if="label !== ''" 
+		  class="uv-icon__label"
+		  :style="{
+			color: labelColor,
+			fontSize: $uv.addUnit(labelSize),
+			marginLeft: labelPos == 'right' ? $uv.addUnit(space) : 0,
+			marginTop: labelPos == 'bottom' ? $uv.addUnit(space) : 0,
+			marginRight: labelPos == 'left' ? $uv.addUnit(space) : 0,
+			marginBottom: labelPos == 'top' ? $uv.addUnit(space) : 0
+		}"
+		>{{ label }}</text>
+	</view>
+</template>
+
+<script>
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	// #ifdef APP-NVUE
+	// nvue通过weex的dom模块引入字体，相关文档地址如下：
+	// https://weex.apache.org/zh/docs/modules/dom.html#addrule
+	import iconUrl from './uvicons.ttf';
+	const domModule = weex.requireModule('dom')
+	domModule.addRule('fontFace', {
+		'fontFamily': "uvicon-iconfont",
+		'src': "url('" + iconUrl + "')"
+	})
+	// #endif
+	// 引入图标名称，已经对应的unicode
+	import icons from './icons';
+	import props from './props.js';
+	/**
+	 * icon 图标
+	 * @description 基于字体的图标集，包含了大多数常见场景的图标。
+	 * @tutorial https://www.uvui.cn/components/icon.html
+	 * @property {String}			name			图标名称，见示例图标集
+	 * @property {String}			color			图标颜色,可接受主题色 （默认 color['uv-content-color'] ）
+	 * @property {String | Number}	size			图标字体大小，单位px （默认 '16px' ）
+	 * @property {Boolean}			bold			是否显示粗体 （默认 false ）
+	 * @property {String | Number}	index			点击图标的时候传递事件出去的index（用于区分点击了哪一个）
+	 * @property {String}			hoverClass		图标按下去的样式类，用法同uni的view组件的hoverClass参数，详情见官网
+	 * @property {String}			customPrefix	自定义扩展前缀，方便用户扩展自己的图标库 （默认 'uicon' ）
+	 * @property {String | Number}	label			图标右侧的label文字
+	 * @property {String}			labelPos		label相对于图标的位置，只能right或bottom （默认 'right' ）
+	 * @property {String | Number}	labelSize		label字体大小，单位px （默认 '15px' ）
+	 * @property {String}			labelColor		图标右侧的label文字颜色 （ 默认 color['uv-content-color'] ）
+	 * @property {String | Number}	space			label与图标的距离，单位px （默认 '3px' ）
+	 * @property {String}			imgMode			图片的mode
+	 * @property {String | Number}	width			显示图片小图标时的宽度
+	 * @property {String | Number}	height			显示图片小图标时的高度
+	 * @property {String | Number}	top				图标在垂直方向上的定位 用于解决某些情况下，让图标垂直居中的用途  （默认 0 ）
+	 * @property {Boolean}			stop			是否阻止事件传播 （默认 false ）
+	 * @property {Object}			customStyle		icon的样式，对象形式
+	 * @event {Function} click 点击图标时触发
+	 * @event {Function} touchstart 事件触摸时触发
+	 * @example <uv-icon name="photo" color="#2979ff" size="28"></uv-icon>
+	 */
+	export default {
+		name: 'uv-icon',
+		emits: ['click'],
+		mixins: [mpMixin, mixin, props],
+		data() {
+			return {
+				colorType: [
+					'primary',
+					'success',
+					'info',
+					'error',
+					'warning'
+				]
+			}
+		},
+		computed: {
+			uClasses() {
+				let classes = []
+				classes.push(this.customPrefix)
+				classes.push(this.customPrefix + '-' + this.name)
+				// 主题色，通过类配置
+				if (this.color && this.colorType.includes(this.color)) classes.push('uv-icon__icon--' + this.color)
+				// 阿里，头条，百度小程序通过数组绑定类名时，无法直接使用[a, b, c]的形式，否则无法识别
+				// 故需将其拆成一个字符串的形式，通过空格隔开各个类名
+				//#ifdef MP-ALIPAY || MP-TOUTIAO || MP-BAIDU
+				classes = classes.join(' ')
+				//#endif
+				return classes
+			},
+			iconStyle() {
+				let style = {}
+				style = {
+					fontSize: this.$uv.addUnit(this.size),
+					lineHeight: this.$uv.addUnit(this.size),
+					fontWeight: this.bold ? 'bold' : 'normal',
+					// 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
+					top: this.$uv.addUnit(this.top)
+				}
+				// 非主题色值时，才当作颜色值
+				if (this.color && !this.colorType.includes(this.color)) style.color = this.color
+				return style
+			},
+			// 判断传入的name属性，是否图片路径，只要带有"/"均认为是图片形式
+			isImg() {
+				const isBase64 = this.name.indexOf('data:') > -1 && this.name.indexOf('base64') > -1;
+				return this.name.indexOf('/') !== -1 || isBase64;
+			},
+			imgStyle() {
+				let style = {}
+				// 如果设置width和height属性，则优先使用，否则使用size属性
+				style.width = this.width ? this.$uv.addUnit(this.width) : this.$uv.addUnit(this.size)
+				style.height = this.height ? this.$uv.addUnit(this.height) : this.$uv.addUnit(this.size)
+				return style
+			},
+			// 通过图标名，查找对应的图标
+			icon() {
+				// 如果内置的图标中找不到对应的图标，就直接返回name值，因为用户可能传入的是unicode代码
+				const code = icons['uvicon-' + this.name];
+				// #ifdef APP-NVUE
+				if(!code) {
+					return code ? unescape(`%u${code}`) : ['uvicon'].indexOf(this.customPrefix) > -1 ? unescape(`%u${this.name}`) : '';
+				}
+				// #endif
+				return code ? unescape(`%u${code}`) : ['uvicon'].indexOf(this.customPrefix) > -1 ? this.name : '';
+			}
+		},
+		methods: {
+			clickHandler(e) {
+				this.$emit('click', this.index)
+				// 是否阻止事件冒泡
+				this.stop && this.preventEvent(e)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
+	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+	// 变量定义
+	$uv-icon-primary: $uv-primary !default;
+	$uv-icon-success: $uv-success !default;
+	$uv-icon-info: $uv-info !default;
+	$uv-icon-warning: $uv-warning !default;
+	$uv-icon-error: $uv-error !default;
+	$uv-icon-label-line-height: 1 !default;
+	/* #ifndef APP-NVUE */
+	// 非nvue下加载字体
+	@font-face {
+		font-family: 'uvicon-iconfont';
+		src: url('./uvicons.ttf') format('truetype');
+	}
+	/* #endif */
+	.uv-icon {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		&--left {
+			flex-direction: row-reverse;
+			align-items: center;
+		}
+		&--right {
+			flex-direction: row;
+			align-items: center;
+		}
+		&--top {
+			flex-direction: column-reverse;
+			justify-content: center;
+		}
+		&--bottom {
+			flex-direction: column;
+			justify-content: center;
+		}
+		&__icon {
+			font-family: uvicon-iconfont;
+			position: relative;
+			@include flex;
+			align-items: center;
+			&--primary {
+				color: $uv-icon-primary;
+			}
+			&--success {
+				color: $uv-icon-success;
+			}
+			&--error {
+				color: $uv-icon-error;
+			}
+			&--warning {
+				color: $uv-icon-warning;
+			}
+			&--info {
+				color: $uv-icon-info;
+			}
+		}
+		&__img {
+			/* #ifndef APP-NVUE */
+			height: auto;
+			will-change: transform;
+			/* #endif */
+		}
+		&__label {
+			/* #ifndef APP-NVUE */
+			line-height: $uv-icon-label-line-height;
+			/* #endif */
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uv-icon/components/uv-icon/uvicons.ttf b/uni_modules/uv-icon/components/uv-icon/uvicons.ttf
new file mode 100644
index 0000000..9aedef8
Binary files /dev/null and b/uni_modules/uv-icon/components/uv-icon/uvicons.ttf differ
diff --git a/uni_modules/uv-icon/package.json b/uni_modules/uv-icon/package.json
new file mode 100644
index 0000000..0a838d5
--- /dev/null
+++ b/uni_modules/uv-icon/package.json
@@ -0,0 +1,83 @@
+{
+  "id": "uv-icon",
+  "displayName": "uv-icon 图标 全面兼容vue3+2、app、h5、小程序等多端",
+  "version": "1.0.13",
+  "description": "基于字体的图标集，包含了大多数常见场景的图标，支持自定义，支持自定义图片图标等。可自定义颜色、大小。",
+  "keywords": [
+    "uv-ui,uvui,uv-icon,icon,图标,字体图标"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uv-ui-tools"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "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",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-icon/readme.md b/uni_modules/uv-icon/readme.md
new file mode 100644
index 0000000..d526e1a
--- /dev/null
+++ b/uni_modules/uv-icon/readme.md
@@ -0,0 +1,15 @@
+## uv-icon 图标库
+
+> **组件名：uv-icon**
+
+基于字体的图标集，包含了大多数常见场景的图标，支持自定义，支持自定义图片图标等。
+
+# <a href="https://www.uvui.cn/components/icon.html" target="_blank">查看文档</a>
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+### [更多插件，请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+#### 如使用过程中有任何问题反馈，或者您对uv-ui有一些好的建议，欢迎加入uv-ui官方交流群：<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
diff --git a/uni_modules/uv-loading-icon/changelog.md b/uni_modules/uv-loading-icon/changelog.md
new file mode 100644
index 0000000..f17e074
--- /dev/null
+++ b/uni_modules/uv-loading-icon/changelog.md
@@ -0,0 +1,9 @@
+## 1.0.3（2023-08-14）
+1. 新增参数textStyle，自定义文本样式
+## 1.0.2（2023-06-27）
+优化
+## 1.0.1（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.0（2023-05-10）
+1. 新增uv-loading-icon组件
diff --git a/uni_modules/uv-loading-icon/components/uv-loading-icon/props.js b/uni_modules/uv-loading-icon/components/uv-loading-icon/props.js
new file mode 100644
index 0000000..4ef0e94
--- /dev/null
+++ b/uni_modules/uv-loading-icon/components/uv-loading-icon/props.js
@@ -0,0 +1,67 @@
+export default {
+	props: {
+		// 是否显示组件
+		show: {
+			type: Boolean,
+			default: true
+		},
+		// 颜色
+		color: {
+			type: String,
+			default: '#909193'
+		},
+		// 提示文字颜色
+		textColor: {
+			type: String,
+			default: '#909193'
+		},
+		// 文字和图标是否垂直排列
+		vertical: {
+			type: Boolean,
+			default: false
+		},
+		// 模式选择，circle-圆形，spinner-花朵形，semicircle-半圆形
+		mode: {
+			type: String,
+			default: 'spinner'
+		},
+		// 图标大小，单位默认px
+		size: {
+			type: [String, Number],
+			default: 24
+		},
+		// 文字大小
+		textSize: {
+			type: [String, Number],
+			default: 15
+		},
+		// 文字样式
+		textStyle: {
+			type: Object,
+			default () {
+				return {}
+			}
+		},
+		// 文字内容
+		text: {
+			type: [String, Number],
+			default: ''
+		},
+		// 动画模式 https://www.runoob.com/cssref/css3-pr-animation-timing-function.html
+		timingFunction: {
+			type: String,
+			default: 'linear'
+		},
+		// 动画执行周期时间
+		duration: {
+			type: [String, Number],
+			default: 1200
+		},
+		// mode=circle时的暗边颜色
+		inactiveColor: {
+			type: String,
+			default: ''
+		},
+		...uni.$uv?.props?.loadingIcon
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.vue b/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.vue
new file mode 100644
index 0000000..5650470
--- /dev/null
+++ b/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.vue
@@ -0,0 +1,347 @@
+<template>
+	<view
+		class="uv-loading-icon"
+		:style="[$uv.addStyle(customStyle)]"
+		:class="[vertical && 'uv-loading-icon--vertical']"
+		v-if="show"
+	>
+		<view
+			v-if="!webviewHide"
+			class="uv-loading-icon__spinner"
+			:class="[`uv-loading-icon__spinner--${mode}`]"
+			ref="ani"
+			:style="{
+				color: color,
+				width: $uv.addUnit(size),
+				height: $uv.addUnit(size),
+				borderTopColor: color,
+				borderBottomColor: otherBorderColor,
+				borderLeftColor: otherBorderColor,
+				borderRightColor: otherBorderColor,
+				'animation-duration': `${duration}ms`,
+				'animation-timing-function': mode === 'semicircle' || mode === 'circle' ? timingFunction : ''
+			}"
+		>
+			<block v-if="mode === 'spinner'">
+				<!-- #ifndef APP-NVUE -->
+				<view
+					v-for="(item, index) in array12"
+					:key="index"
+					class="uv-loading-icon__dot"
+				>
+				</view>
+				<!-- #endif -->
+				<!-- #ifdef APP-NVUE -->
+				<!-- 此组件内部图标部分无法设置宽高，即使通过width和height配置了也无效 -->
+				<loading-indicator
+					v-if="!webviewHide"
+					class="uv-loading-indicator"
+					:animating="true"
+					:style="{
+						color: color,
+						width: $uv.addUnit(size),
+						height: $uv.addUnit(size)
+					}"
+				/>
+				<!-- #endif -->
+			</block>
+		</view>
+		<text
+			v-if="text"
+			class="uv-loading-icon__text"
+			:style="[{
+				fontSize: $uv.addUnit(textSize),
+				color: textColor,
+			},$uv.addStyle(textStyle)]"
+		>{{text}}</text>
+	</view>
+</template>
+
+<script>
+	import { colorGradient } from '@/uni_modules/uv-ui-tools/libs/function/colorGradient.js'
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	import props from './props.js';
+	// #ifdef APP-NVUE
+	const animation = weex.requireModule('animation');
+	// #endif
+	/**
+	 * loading 加载动画
+	 * @description 警此组件为一个小动画，目前用在uvui的loadmore加载更多和switch开关等组件的正在加载状态场景。
+	 * @tutorial https://www.uvui.cn/components/loading.html
+	 * @property {Boolean}			show			是否显示组件  (默认 true)
+	 * @property {String}			color			动画活动区域的颜色，只对 mode = flower 模式有效（默认#909193）
+	 * @property {String}			textColor		提示文本的颜色（默认#909193）
+	 * @property {Boolean}			vertical		文字和图标是否垂直排列 (默认 false )
+	 * @property {String}			mode			模式选择，见官网说明（默认 'circle' ）
+	 * @property {String | Number}	size			加载图标的大小，单位px （默认 24 ）
+	 * @property {String | Number}	textSize		文字大小（默认 15 ）
+	 * @property {String | Number}	text			文字内容 
+	 * @property {Object}	textStyle 文字样式
+	 * @property {String}			timingFunction	动画模式 （默认 'ease-in-out' ）
+	 * @property {String | Number}	duration		动画执行周期时间（默认 1200）
+	 * @property {String}			inactiveColor	mode=circle时的暗边颜色 
+	 * @property {Object}			customStyle		定义需要用到的外部样式
+	 * @example <uv-loading mode="circle"></uv-loading>
+	 */
+	export default {
+		name: 'uv-loading-icon',
+		mixins: [mpMixin, mixin, props],
+		data() {
+			return {
+				// Array.form可以通过一个伪数组对象创建指定长度的数组
+				// https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/Array/from
+				array12: Array.from({
+					length: 12
+				}),
+				// 这里需要设置默认值为360，否则在安卓nvue上，会延迟一个duration周期后才执行
+				// 在iOS nvue上，则会一开始默认执行两个周期的动画
+				aniAngel: 360, // 动画旋转角度
+				webviewHide: false, // 监听webview的状态，如果隐藏了页面，则停止动画，以免性能消耗
+				loading: false, // 是否运行中，针对nvue使用
+			}
+		},
+		computed: {
+			// 当为circle类型时，给其另外三边设置一个更轻一些的颜色
+			// 之所以需要这么做的原因是，比如父组件传了color为红色，那么需要另外的三个边为浅红色
+			// 而不能是固定的某一个其他颜色(因为这个固定的颜色可能浅蓝，导致效果没有那么细腻良好)
+			otherBorderColor() {
+				const lightColor = colorGradient(this.color, '#ffffff', 100)[80]
+				if (this.mode === 'circle') {
+					return this.inactiveColor ? this.inactiveColor : lightColor
+				} else {
+					return 'transparent'
+				}
+			}
+		},
+		watch: {
+			show(n) {
+				// nvue中，show为true，且为非loading状态，就重新执行动画模块
+				// #ifdef APP-NVUE
+				if (n && !this.loading) {
+					setTimeout(() => {
+						this.startAnimate()
+					}, 30)
+				}
+				// #endif
+			}
+		},
+		mounted() {
+			this.init()
+		},
+		methods: {
+			init() {
+				setTimeout(() => {
+					// #ifdef APP-NVUE
+					this.show && this.nvueAnimate()
+					// #endif
+					// #ifdef APP-PLUS 
+					this.show && this.addEventListenerToWebview()
+					// #endif
+				}, 20)
+			},
+			// 监听webview的显示与隐藏
+			addEventListenerToWebview() {
+				// webview的堆栈
+				const pages = getCurrentPages()
+				// 当前页面
+				const page = pages[pages.length - 1]
+				// 当前页面的webview实例
+				const currentWebview = page.$getAppWebview()
+				// 监听webview的显示与隐藏，从而停止或者开始动画(为了性能)
+				currentWebview.addEventListener('hide', () => {
+					this.webviewHide = true
+				})
+				currentWebview.addEventListener('show', () => {
+					this.webviewHide = false
+				})
+			},
+			// #ifdef APP-NVUE
+			nvueAnimate() {
+				// nvue下，非spinner类型时才需要旋转，因为nvue的spinner类型，使用了weex的
+				// loading-indicator组件，自带旋转功能
+				this.mode !== 'spinner' && this.startAnimate()
+			},
+			// 执行nvue的animate模块动画
+			startAnimate() {
+				this.loading = true
+				const ani = this.$refs.ani
+				if (!ani) return
+				animation.transition(ani, {
+					// 进行角度旋转
+					styles: {
+						transform: `rotate(${this.aniAngel}deg)`,
+						transformOrigin: 'center center'
+					},
+					duration: this.duration,
+					timingFunction: this.timingFunction,
+					// delay: 10
+				}, () => {
+					// 每次增加360deg，为了让其重新旋转一周
+					this.aniAngel += 360
+					// 动画结束后，继续循环执行动画，需要同时判断webviewHide变量
+					// nvue安卓，页面隐藏后依然会继续执行startAnimate方法
+					this.show && !this.webviewHide ? this.startAnimate() : this.loading = false
+				})
+			}
+			// #endif
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
+	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+	$uv-loading-icon-color: #c8c9cc !default;
+	$uv-loading-icon-text-margin-left:4px !default;
+	$uv-loading-icon-text-color:$uv-content-color !default;
+	$uv-loading-icon-text-font-size:14px !default;
+	$uv-loading-icon-text-line-height:20px !default;
+	$uv-loading-width:30px !default;
+	$uv-loading-height:30px !default;
+	$uv-loading-max-width:100% !default;
+	$uv-loading-max-height:100% !default;
+	$uv-loading-semicircle-border-width: 2px !default;
+	$uv-loading-semicircle-border-color:transparent !default;
+	$uv-loading-semicircle-border-top-right-radius: 100px !default;
+	$uv-loading-semicircle-border-top-left-radius: 100px !default;
+	$uv-loading-semicircle-border-bottom-left-radius: 100px !default;
+	$uv-loading-semicircle-border-bottom-right-radiu: 100px !default;
+	$uv-loading-semicircle-border-style: solid !default;
+	$uv-loading-circle-border-top-right-radius: 100px !default;
+	$uv-loading-circle-border-top-left-radius: 100px !default;
+	$uv-loading-circle-border-bottom-left-radius: 100px !default;
+	$uv-loading-circle-border-bottom-right-radiu: 100px !default;
+	$uv-loading-circle-border-width:2px !default;
+	$uv-loading-circle-border-top-color:#e5e5e5 !default;
+	$uv-loading-circle-border-right-color:$uv-loading-circle-border-top-color !default;
+	$uv-loading-circle-border-bottom-color:$uv-loading-circle-border-top-color !default;
+	$uv-loading-circle-border-left-color:$uv-loading-circle-border-top-color !default;
+	$uv-loading-circle-border-style:solid !default;
+	$uv-loading-icon-host-font-size:0px !default;
+	$uv-loading-icon-host-line-height:1 !default;
+	$uv-loading-icon-vertical-margin:6px 0 0 !default;
+	$uv-loading-icon-dot-top:0 !default;
+	$uv-loading-icon-dot-left:0 !default;
+	$uv-loading-icon-dot-width:100% !default;
+	$uv-loading-icon-dot-height:100% !default;
+	$uv-loading-icon-dot-before-width:2px !default;
+	$uv-loading-icon-dot-before-height:25% !default;
+	$uv-loading-icon-dot-before-margin:0 auto !default;
+	$uv-loading-icon-dot-before-background-color:currentColor !default;
+	$uv-loading-icon-dot-before-border-radius:40% !default;
+
+	.uv-loading-icon {
+		/* #ifndef APP-NVUE */
+		// display: inline-flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		color: $uv-loading-icon-color;
+
+		&__text {
+			margin-left: $uv-loading-icon-text-margin-left;
+			color: $uv-loading-icon-text-color;
+			font-size: $uv-loading-icon-text-font-size;
+			line-height: $uv-loading-icon-text-line-height;
+		}
+
+		&__spinner {
+			width: $uv-loading-width;
+			height: $uv-loading-height;
+			position: relative;
+			/* #ifndef APP-NVUE */
+			box-sizing: border-box;
+			max-width: $uv-loading-max-width;
+			max-height: $uv-loading-max-height;
+			animation: uv-rotate 1s linear infinite;
+			/* #endif */
+		}
+
+		&__spinner--semicircle {
+			border-width: $uv-loading-semicircle-border-width;
+			border-color: $uv-loading-semicircle-border-color;
+			border-top-right-radius: $uv-loading-semicircle-border-top-right-radius;
+			border-top-left-radius: $uv-loading-semicircle-border-top-left-radius;
+			border-bottom-left-radius: $uv-loading-semicircle-border-bottom-left-radius;
+			border-bottom-right-radius: $uv-loading-semicircle-border-bottom-right-radiu;
+			border-style: $uv-loading-semicircle-border-style;
+		}
+
+		&__spinner--circle {
+			border-top-right-radius: $uv-loading-circle-border-top-right-radius;
+			border-top-left-radius: $uv-loading-circle-border-top-left-radius;
+			border-bottom-left-radius: $uv-loading-circle-border-bottom-left-radius;
+			border-bottom-right-radius: $uv-loading-circle-border-bottom-right-radiu;
+			border-width: $uv-loading-circle-border-width;
+			border-top-color: $uv-loading-circle-border-top-color;
+			border-right-color: $uv-loading-circle-border-right-color;
+			border-bottom-color: $uv-loading-circle-border-bottom-color;
+			border-left-color: $uv-loading-circle-border-left-color;
+			border-style: $uv-loading-circle-border-style;
+		}
+
+		&--vertical {
+			flex-direction: column
+		}
+	}
+
+	/* #ifndef APP-NVUE */
+	:host {
+		font-size: $uv-loading-icon-host-font-size;
+		line-height: $uv-loading-icon-host-line-height;
+	}
+
+	.uv-loading-icon {
+		&__spinner--spinner {
+			animation-timing-function: steps(12)
+		}
+
+		&__text:empty {
+			display: none
+		}
+
+		&--vertical &__text {
+			margin: $uv-loading-icon-vertical-margin;
+			color: $uv-content-color;
+		}
+
+		&__dot {
+			position: absolute;
+			top: $uv-loading-icon-dot-top;
+			left: $uv-loading-icon-dot-left;
+			width: $uv-loading-icon-dot-width;
+			height: $uv-loading-icon-dot-height;
+
+			&:before {
+				display: block;
+				width: $uv-loading-icon-dot-before-width;
+				height: $uv-loading-icon-dot-before-height;
+				margin: $uv-loading-icon-dot-before-margin;
+				background-color: $uv-loading-icon-dot-before-background-color;
+				border-radius: $uv-loading-icon-dot-before-border-radius;
+				content: " "
+			}
+		}
+	}
+
+	@for $i from 1 through 12 {
+		.uv-loading-icon__dot:nth-of-type(#{$i}) {
+			transform: rotate($i * 30deg);
+			opacity: 1 - 0.0625 * ($i - 1);
+		}
+	}
+
+	@keyframes uv-rotate {
+		0% {
+			transform: rotate(0deg)
+		}
+
+		to {
+			transform: rotate(1turn)
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uv-loading-icon/package.json b/uni_modules/uv-loading-icon/package.json
new file mode 100644
index 0000000..1485897
--- /dev/null
+++ b/uni_modules/uv-loading-icon/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uv-loading-icon",
+  "displayName": "uv-loading-icon 加载动画 全面兼容vue3+2、app、h5、小程序等多端",
+  "version": "1.0.3",
+  "description": "此组件为一个小动画，目前用在uv-ui的uv-load-more加载更多等组件，还可以运用在项目中正在加载状态场景。",
+  "keywords": [
+    "uv-loading-icon",
+    "uvui",
+    "uv-ui",
+    "loading",
+    "加载动画"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+    	"ads": "无",
+    	"data": "插件不采集任何数据",
+    	"permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uv-ui-tools"
+		],
+    "encrypt": [],
+    "platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"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",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-loading-icon/readme.md b/uni_modules/uv-loading-icon/readme.md
new file mode 100644
index 0000000..7b0cf0f
--- /dev/null
+++ b/uni_modules/uv-loading-icon/readme.md
@@ -0,0 +1,19 @@
+## LoadingIcon 加载动画
+
+> **组件名：uv-loading-icon**
+
+此组件为一个小动画，目前用在 `uv-ui` 的 `uv-load-more` 加载更多等组件，还可以运用在项目中正在加载状态场景。
+
+# <a href="https://www.uvui.cn/components/loadingIcon.html" target="_blank">查看文档</a>
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui) <small>（请不要 下载插件ZIP）</small>
+
+### [更多插件，请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+<a href="https://ext.dcloud.net.cn/plugin?name=uv-ui" target="_blank">
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+</a>
+
+#### 如使用过程中有任何问题反馈，或者您对uv-ui有一些好的建议，欢迎加入uv-ui官方交流群：<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
\ No newline at end of file
diff --git a/uni_modules/uv-overlay/changelog.md b/uni_modules/uv-overlay/changelog.md
new file mode 100644
index 0000000..ff14713
--- /dev/null
+++ b/uni_modules/uv-overlay/changelog.md
@@ -0,0 +1,9 @@
+## 1.0.3（2023-07-02）
+uv-overlay  由于弹出层uv-transition的修改，组件内部做了相应的修改，参数不变。
+## 1.0.2（2023-06-29）
+1. 优化，H5端禁止穿透滚动
+## 1.0.1（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.0（2023-05-10）
+1. 新增uv-overlay组件
diff --git a/uni_modules/uv-overlay/components/uv-overlay/props.js b/uni_modules/uv-overlay/components/uv-overlay/props.js
new file mode 100644
index 0000000..267c613
--- /dev/null
+++ b/uni_modules/uv-overlay/components/uv-overlay/props.js
@@ -0,0 +1,25 @@
+export default {
+	props: {
+		// 是否显示遮罩
+		show: {
+			type: Boolean,
+			default: false
+		},
+		// 层级z-index
+		zIndex: {
+			type: [String, Number],
+			default: 10070
+		},
+		// 遮罩的过渡时间，单位为ms
+		duration: {
+			type: [String, Number],
+			default: 300
+		},
+		// 不透明度值，当做rgba的第四个参数
+		opacity: {
+			type: [String, Number],
+			default: 0.5
+		},
+		...uni.$uv?.props?.overlay
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.vue b/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.vue
new file mode 100644
index 0000000..53568c0
--- /dev/null
+++ b/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.vue
@@ -0,0 +1,85 @@
+<template>
+	<uv-transition
+	  :show="show"
+		mode="fade"
+	  custom-class="uv-overlay"
+	  :duration="duration"
+	  :custom-style="overlayStyle"
+	  @click="clickHandler"
+		@touchmove.stop.prevent="clear"
+	>
+		<slot />
+	</uv-transition>
+</template>
+
+<script>
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	import props from './props.js';
+
+	/**
+	 * overlay 遮罩
+	 * @description 创建一个遮罩层，用于强调特定的页面元素，并阻止用户对遮罩下层的内容进行操作，一般用于弹窗场景
+	 * @tutorial https://www.uvui.cn/components/overlay.html
+	 * @property {Boolean}			show		是否显示遮罩（默认 false ）
+	 * @property {String | Number}	zIndex		zIndex 层级（默认 10070 ）
+	 * @property {String | Number}	duration	动画时长，单位毫秒（默认 300 ）
+	 * @property {String | Number}	opacity		不透明度值，当做rgba的第四个参数 （默认 0.5 ）
+	 * @property {Object}			customStyle	定义需要用到的外部样式
+	 * @event {Function} click 点击遮罩发送事件
+	 * @example <uv-overlay :show="show" @click="show = false"></uv-overlay>
+	 */
+	export default {
+		name: "uv-overlay",
+		emits: ['click'],
+		mixins: [mpMixin, mixin, props],
+		watch: {
+			show(newVal){
+				// #ifdef H5
+				if(newVal){
+					document.querySelector('body').style.overflow = 'hidden';
+				}else{
+					document.querySelector('body').style.overflow = '';
+				}
+				// #endif
+			}
+		},
+		computed: {
+			overlayStyle() {
+				const style = {
+					position: 'fixed',
+					top: 0,
+					left: 0,
+					right: 0,
+					zIndex: this.zIndex,
+					bottom: 0,
+					'background-color': `rgba(0, 0, 0, ${this.opacity})`
+				}
+				return this.$uv.deepMerge(style, this.$uv.addStyle(this.customStyle))
+			}
+		},
+		methods: {
+			clickHandler() {
+				this.$emit('click')
+			},
+			clear() {}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+/* #ifndef APP-NVUE */
+$uv-overlay-top:0 !default;
+$uv-overlay-left:0 !default;
+$uv-overlay-width:100% !default;
+$uv-overlay-height:100% !default;
+$uv-overlay-background-color:rgba(0, 0, 0, .7) !default;
+.uv-overlay {
+	position: fixed;
+	top:$uv-overlay-top;
+	left:$uv-overlay-left;
+	width: $uv-overlay-width;
+	height:$uv-overlay-height;
+	background-color:$uv-overlay-background-color;
+}
+/* #endif */
+</style>
diff --git a/uni_modules/uv-overlay/package.json b/uni_modules/uv-overlay/package.json
new file mode 100644
index 0000000..a664f3a
--- /dev/null
+++ b/uni_modules/uv-overlay/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uv-overlay",
+  "displayName": "uv-overlay 遮罩层  全面兼容小程序、nvue、vue2、vue3等多端",
+  "version": "1.0.3",
+  "description": "uv-overlay 创建一个遮罩层，用于强调特定的页面元素，并阻止用户对遮罩下层的内容进行操作，一般用于弹窗场景，uv-popup、uv-toast、uv-tooltip等组件就是用了该组件。",
+  "keywords": [
+    "uv-overlay",
+    "uvui",
+    "uv-ui",
+    "overlay",
+    "遮罩层"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+    	"ads": "无",
+    	"data": "插件不采集任何数据",
+    	"permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uv-ui-tools",
+			"uv-transition"
+		],
+    "encrypt": [],
+    "platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"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",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-overlay/readme.md b/uni_modules/uv-overlay/readme.md
new file mode 100644
index 0000000..4e8af4b
--- /dev/null
+++ b/uni_modules/uv-overlay/readme.md
@@ -0,0 +1,11 @@
+## Overlay 遮罩层
+
+> **组件名：uv-overlay**
+
+创建一个遮罩层，用于强调特定的页面元素，并阻止用户对遮罩下层的内容进行操作，一般用于弹窗场景，uv-popup、uv-toast、uv-tooltip等组件就是用了该组件。
+
+### <a href="https://www.uvui.cn/components/overlay.html" target="_blank">查看文档</a>
+
+### [完整示例项目下载 | 关注更多组件](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+#### 如使用过程中有任何问题，或者您对uv-ui有一些好的建议，欢迎加入 uv-ui 交流群：<a href="https://ext.dcloud.net.cn/plugin?id=12287" target="_blank">uv-ui</a>、<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
diff --git a/uni_modules/uv-picker/changelog.md b/uni_modules/uv-picker/changelog.md
new file mode 100644
index 0000000..532be9b
--- /dev/null
+++ b/uni_modules/uv-picker/changelog.md
@@ -0,0 +1,33 @@
+## 1.0.14（2023-12-29）
+1. 修复上个版本引出的BUG
+## 1.0.13（2023-12-26）
+1. 修复抖音小程序滚到底不触发change的BUG
+## 1.0.12（2023-11-20）
+1. 修复issues反馈的问题uv-picker在组合式API的自定义组件中，columns动态赋值无法显示选项：https://gitee.com/climblee/uv-ui/issues/I8H0GQ
+## 1.0.11（2023-10-11）
+1. 将immediate-change默认值改为true，该值在于change回调的及时性，微信小程序生效
+## 1.0.10（2023-08-25）
+1. 增加round属性设置弹窗圆角，默认为0
+## 1.0.9（2023-08-24）
+1. 修复cli项目不返回值的问题
+## 1.0.8（2023-08-04）
+1. 优化
+## 1.0.7（2023-08-02）
+1. 改组件中删除uv-toolbar组件，请单独下载uv-toolbar组件
+## 1.0.6（2023-07-02）
+uv-picker  由于弹出层uv-popup的修改，打开和关闭方法更改，详情参考文档：https://www.uvui.cn/components/picker.html
+## 1.0.5（2023-06-26）
+1. 增加color参数
+2. 增加activeColor参数
+## 1.0.4（2023-06-15）
+1. 修改支付宝报错的BUG
+## 1.0.3（2023-06-12）
+1. setColumnValues的使用统一化，避免某些平台报错
+2. 取消change回调回传的组件实例，直接统一通过ref的方式调取setColumnValues方法
+## 1.0.2（2023-05-23）
+1. uv-toolbar组件新增下边框属性 
+## 1.0.1（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.0（2023-05-10）
+uv-picker 选择器
diff --git a/uni_modules/uv-picker/components/uv-picker/props.js b/uni_modules/uv-picker/components/uv-picker/props.js
new file mode 100644
index 0000000..19549a6
--- /dev/null
+++ b/uni_modules/uv-picker/components/uv-picker/props.js
@@ -0,0 +1,95 @@
+export default {
+	props: {
+		// 是否展示顶部的操作栏
+		showToolbar: {
+			type: Boolean,
+			default: true
+		},
+		// 顶部标题
+		title: {
+			type: String,
+			default: ''
+		},
+		// 弹窗圆角
+		round: {
+			type: [String, Number],
+			default: 0
+		},
+		// 对象数组，设置每一列的数据
+		columns: {
+			type: Array,
+			default: () => []
+		},
+		// 是否显示加载中状态
+		loading: {
+			type: Boolean,
+			default: false
+		},
+		// 各列中，单个选项的高度
+		itemHeight: {
+			type: [String, Number],
+			default: 44
+		},
+		// 取消按钮的文字
+		cancelText: {
+			type: String,
+			default: '取消'
+		},
+		// 确认按钮的文字
+		confirmText: {
+			type: String,
+			default: '确定'
+		},
+		// 取消按钮的颜色
+		cancelColor: {
+			type: String,
+			default: '#909193'
+		},
+		// 确认按钮的颜色
+		confirmColor: {
+			type: String,
+			default: '#3c9cff'
+		},
+		// 文字颜色
+		color: {
+			type: String,
+			default: ''
+		},
+		// 选中文字的颜色
+		activeColor: {
+			type: String,
+			default: ''
+		},
+		// 每列中可见选项的数量
+		visibleItemCount: {
+			type: [String, Number],
+			default: 5
+		},
+		// 选项对象中，需要展示的属性键名
+		keyName: {
+			type: String,
+			default: 'text'
+		},
+		// 是否允许点击遮罩关闭选择器
+		closeOnClickOverlay: {
+			type: Boolean,
+			default: true
+		},
+		// 是否允许点击确认关闭选择器
+		closeOnClickConfirm: {
+			type: Boolean,
+			default: true
+		},
+		// 各列的默认索引
+		defaultIndex: {
+			type: Array,
+			default: () => [],
+		},
+		// 是否在手指松开时立即触发 change 事件。若不开启则会在滚动动画结束后触发 change 事件，只在微信2.21.1及以上有效
+		immediateChange: {
+			type: Boolean,
+			default: true
+		},
+		...uni.$uv?.props?.picker
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-picker/components/uv-picker/uv-picker.vue b/uni_modules/uv-picker/components/uv-picker/uv-picker.vue
new file mode 100644
index 0000000..c5e7c8a
--- /dev/null
+++ b/uni_modules/uv-picker/components/uv-picker/uv-picker.vue
@@ -0,0 +1,330 @@
+<template>
+	<uv-popup
+		ref="pickerPopup"
+		mode="bottom"
+		:round="round"
+		:close-on-click-overlay="closeOnClickOverlay"
+		@change="popupChange"
+	>
+		<view class="uv-picker">
+			<uv-toolbar
+				v-if="showToolbar"
+				:cancelColor="cancelColor"
+				:confirmColor="confirmColor"
+				:cancelText="cancelText"
+				:confirmText="confirmText"
+				:title="title"
+				@cancel="cancel"
+				@confirm="confirm"
+			></uv-toolbar>
+			<!-- #ifdef MP-TOUTIAO -->
+			<picker-view
+				class="uv-picker__view"
+				:indicatorStyle="`height: ${$uv.addUnit(itemHeight)}`"
+				:value="innerIndex"
+				:immediateChange="immediateChange"
+				:style="{
+					height: `${$uv.addUnit(visibleItemCount * itemHeight)}`
+				}"
+				@pickend="changeHandler"
+			>
+			<!-- #endif -->
+			<!-- #ifndef MP-TOUTIAO -->
+			<picker-view
+				class="uv-picker__view"
+				:indicatorStyle="`height: ${$uv.addUnit(itemHeight)}`"
+				:value="innerIndex"
+				:immediateChange="immediateChange"
+				:style="{
+					height: `${$uv.addUnit(visibleItemCount * itemHeight)}`
+				}"
+				@change="changeHandler"
+			>
+			<!-- #endif -->
+			<!-- @pickend在这里为了解决抖音等滚到底不触发change兼容性问题 -->
+				<picker-view-column
+					v-for="(item, index) in innerColumns"
+					:key="index"
+					class="uv-picker__view__column"
+				>
+					<text
+						v-if="$uv.test.array(item)"
+						class="uv-picker__view__column__item uv-line-1"
+						v-for="(item1, index1) in item"
+						:key="index1"
+						:style="[{
+								height: $uv.addUnit(itemHeight),
+								lineHeight: $uv.addUnit(itemHeight),
+								fontWeight: index1 === innerIndex[index] ? 'bold' : 'normal'
+							},textStyle(index,index1)]"
+					>{{ getItemText(item1) }}</text>
+				</picker-view-column>
+			</picker-view>
+			<view
+				v-if="loading"
+				class="uv-picker--loading"
+			>
+				<uv-loading-icon mode="circle"></uv-loading-icon>
+			</view>
+		</view>
+	</uv-popup>
+</template>
+
+<script>
+/**
+ * uv-picker
+ * @description 选择器
+ * @property {Boolean}			showToolbar			是否显示顶部的操作栏（默认 true ）
+ * @property {String}			title				顶部标题
+ * @property {Array}			columns				对象数组，设置每一列的数据
+ * @property {Boolean}			loading				是否显示加载中状态（默认 false ）
+ * @property {String | Number}	itemHeight			各列中，单个选项的高度（默认 44 ）
+ * @property {String}			cancelText			取消按钮的文字（默认 '取消' ）
+ * @property {String}			confirmText			确认按钮的文字（默认 '确定' ）
+ * @property {String}			cancelColor			取消按钮的颜色（默认 '#909193' ）
+ * @property {String}			confirmColor		确认按钮的颜色（默认 '#3c9cff' ）
+ * @property {String}			color		文字颜色（默认 '' ）
+ * @property {String}			activeColor		选中文字的颜色（默认 '' ）
+ * @property {String | Number}	visibleItemCount	每列中可见选项的数量（默认 5 ）
+ * @property {String}			keyName				选项对象中，需要展示的属性键名（默认 'text' ）
+ * @property {Boolean}			closeOnClickOverlay	是否允许点击遮罩关闭选择器（默认 false ）
+ * @property {Array}			defaultIndex		各列的默认索引
+ * @property {Boolean}			immediateChange		是否在手指松开时立即触发change事件（默认 false ）
+ * @event {Function} close		关闭选择器时触发
+ * @event {Function} cancel		点击取消按钮触发
+ * @event {Function} change		当选择值变化时触发
+ * @event {Function} confirm	点击确定按钮，返回当前选择的值
+ */
+import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+import props from './props.js';
+export default {
+	name: 'uv-picker',
+	emits: ['confirm','cancel','close','change'],
+	mixins: [mpMixin, mixin, props],
+	computed: {
+		// 为了解决支付宝不生效
+		textStyle(){
+			return (index,index1) => {
+				const style = {};
+				// #ifndef APP-NVUE 
+				style.display = 'block';
+				// #endif
+				if(this.color) {
+					style.color = this.color;
+				}
+				if(this.activeColor && index1 === this.innerIndex[index]) {
+					style.color = this.activeColor;
+				}
+				return style;
+			}
+		}
+	},
+	data() {
+		return {
+			// 上一次选择的列索引
+			lastIndex: [],
+			// 索引值 ，对应picker-view的value
+			innerIndex: [],
+			// 各列的值
+			innerColumns: [],
+			// 上一次的变化列索引
+			columnIndex: 0,
+		}
+	},
+	watch: {
+		// 监听默认索引的变化，重新设置对应的值
+		defaultIndex: {
+			immediate: true,
+			handler(n) {
+				this.setIndexs(n, true)
+			}
+		},
+		// 监听columns参数的变化
+		columns: {
+			deep: true,
+			immediate: true,
+			handler(n) {
+				this.setColumns(n)
+			}
+		},
+	},
+	methods: {
+		open() {
+			this.$refs.pickerPopup.open();
+		},
+		close() {
+			this.$refs.pickerPopup.close();
+		},
+		popupChange(e) {
+			if(!e.show) this.$emit('close');
+		},
+		// 获取item需要显示的文字，判别为对象还是文本
+		getItemText(item) {
+			if (this.$uv.test.object(item)) {
+				return item[this.keyName]
+			} else {
+				return item
+			}
+		},
+		// 点击工具栏的取消按钮
+		cancel() {
+			this.$emit('cancel');
+			this.close();
+		},
+		// 点击工具栏的确定按钮
+		confirm() {
+			// 在这里使用deepClone拷贝后，vue3会自动转换成原始对象，这样处理是因为cli项目可能出现不返回值的情况
+			this.$emit('confirm', this.$uv.deepClone({
+				indexs: this.innerIndex,
+				value: this.innerColumns.map((item, index) => item[this.innerIndex[index]]),
+				values: this.innerColumns
+			}));
+			if(this.closeOnClickConfirm) {
+				this.close();
+			}
+		},
+		// 选择器某一列的数据发生变化时触发
+		changeHandler(e) {
+			const {
+				value
+			} = e.detail
+			let index = 0,
+				columnIndex = 0
+			// 通过对比前后两次的列索引，得出当前变化的是哪一列
+			for (let i = 0; i < value.length; i++) {
+				let item = value[i]
+				if (item !== (this.lastIndex[i] || 0)) { // 把undefined转为合法假值0
+					// 设置columnIndex为当前变化列的索引
+					columnIndex = i
+					// index则为变化列中的变化项的索引
+					index = item
+					break // 终止循环，即使少一次循环，也是性能的提升
+				}
+			}
+			this.columnIndex = columnIndex
+			const values = this.innerColumns
+			// 将当前的各项变化索引，设置为"上一次"的索引变化值
+			this.setLastIndex(value)
+			this.setIndexs(value)
+
+			this.$emit('change', {
+				value: this.innerColumns.map((item, index) => item[value[index]]),
+				index,
+				indexs: value,
+				// values为当前变化列的数组内容
+				values,
+				columnIndex
+			})
+		},
+		// 设置index索引，此方法可被外部调用设置
+		setIndexs(index, setLastIndex) {
+			this.innerIndex = this.$uv.deepClone(index)
+			if (setLastIndex) {
+				this.setLastIndex(index)
+			}
+		},
+		// 记录上一次的各列索引位置
+		setLastIndex(index) {
+			// 当能进入此方法，意味着当前设置的各列默认索引，即为“上一次”的选中值，需要记录，是因为changeHandler中
+			// 需要拿前后的变化值进行对比，得出当前发生改变的是哪一列
+			this.lastIndex = this.$uv.deepClone(index)
+		},
+		// 设置对应列选项的所有值
+		setColumnValues(columnIndex, values) {
+			// 替换innerColumns数组中columnIndex索引的值为values，使用的是数组的splice方法
+			this.innerColumns.splice(columnIndex, 1, values)
+			// 拷贝一份原有的innerIndex做临时变量，将大于当前变化列的所有的列的默认索引设置为0
+			let tmpIndex = this.$uv.deepClone(this.innerIndex)
+			for (let i = 0; i < this.innerColumns.length; i++) {
+				if (i > this.columnIndex) {
+					tmpIndex[i] = 0
+				}
+			}
+			// 一次性赋值，不能单个修改，否则无效
+			this.setIndexs(tmpIndex)
+		},
+		// 获取对应列的所有选项
+		getColumnValues(columnIndex) {
+			// 进行同步阻塞，因为外部得到change事件之后，可能需要执行setColumnValues更新列的值
+			// 索引如果在外部change的回调中调用getColumnValues的话，可能无法得到变更后的列值，这里进行一定延时，保证值的准确性
+			(async () => {
+				await this.$uv.sleep()
+			})()
+			return this.innerColumns[columnIndex]
+		},
+		// 设置整体各列的columns的值
+		setColumns(columns) {
+			this.innerColumns = this.$uv.deepClone(columns)
+			// 如果在设置各列数据时，没有被设置默认的各列索引defaultIndex，那么用0去填充它，数组长度为列的数量
+			if (this.innerIndex.length === 0) {
+				this.innerIndex = new Array(columns.length).fill(0)
+			}
+		},
+		// 获取各列选中值对应的索引
+		getIndexs() {
+			return this.innerIndex
+		},
+		// 获取各列选中的值
+		getValues() {
+			// 进行同步阻塞，因为外部得到change事件之后，可能需要执行setColumnValues更新列的值
+			// 索引如果在外部change的回调中调用getValues的话，可能无法得到变更后的列值，这里进行一定延时，保证值的准确性
+			(async () => {
+				await this.$uv.sleep()
+			})()
+			return this.innerColumns.map((item, index) => item[this.innerIndex[index]])
+		}
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+	$show-lines: 1;
+	@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
+	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
+	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
+	.uv-picker {
+		position: relative;
+
+		&__view {
+
+			&__column {
+				@include flex;
+				flex: 1;
+				justify-content: center;
+
+				&__item {
+					@include flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 16px;
+					text-align: center;
+					/* #ifndef APP-NVUE */
+					display: block;
+					/* #endif */
+					color: $uv-main-color;
+
+					&--disabled {
+						/* #ifndef APP-NVUE */
+						cursor: not-allowed;
+						/* #endif */
+						opacity: 0.35;
+					}
+				}
+			}
+		}
+
+		&--loading {
+			position: absolute;
+			top: 0;
+			right: 0;
+			left: 0;
+			bottom: 0;
+			@include flex;
+			justify-content: center;
+			align-items: center;
+			background-color: rgba(255, 255, 255, 0.87);
+			z-index: 1000;
+		}
+	}
+</style>
diff --git a/uni_modules/uv-picker/package.json b/uni_modules/uv-picker/package.json
new file mode 100644
index 0000000..0d62d7e
--- /dev/null
+++ b/uni_modules/uv-picker/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uv-picker",
+  "displayName": "uv-picker 选择器 全面兼容vue3+2、app、h5、小程序等多端",
+  "version": "1.0.14",
+  "description": "uv-picker 此选择器用于单列，多列，多列联动的选择场景...",
+  "keywords": [
+    "uv-picker",
+    "uvui",
+    "uv-ui",
+    "picker",
+    "联动选择"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+    	"ads": "无",
+    	"data": "插件不采集任何数据",
+    	"permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uv-ui-tools",
+			"uv-popup",
+			"uv-loading-icon",
+			"uv-toolbar"
+		],
+    "encrypt": [],
+    "platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"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",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-picker/readme.md b/uni_modules/uv-picker/readme.md
new file mode 100644
index 0000000..c9dd0b9
--- /dev/null
+++ b/uni_modules/uv-picker/readme.md
@@ -0,0 +1,21 @@
+## Picker 选择器
+
+> **组件名：uv-picker**
+
+此选择器用于单列，多列，多列联动的选择场景。
+
+`uv-datetime-picker`等组件也用到了该组件，功能完善，需要特别注意的是`columns`参数的形式是数组嵌套。
+
+# <a href="https://www.uvui.cn/components/picker.html" target="_blank">查看文档</a>
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui) <small>（请不要 下载插件ZIP）</small>
+
+### [更多插件，请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+<a href="https://ext.dcloud.net.cn/plugin?name=uv-ui" target="_blank">
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+</a>
+
+#### 如使用过程中有任何问题反馈，或者您对uv-ui有一些好的建议，欢迎加入uv-ui官方交流群：<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
\ No newline at end of file
diff --git a/uni_modules/uv-popup/changelog.md b/uni_modules/uv-popup/changelog.md
new file mode 100644
index 0000000..8bb3992
--- /dev/null
+++ b/uni_modules/uv-popup/changelog.md
@@ -0,0 +1,18 @@
+## 1.0.7（2023-11-20）
+修复issues问题：https://gitee.com/climblee/uv-ui/issues/I8HDLO
+## 1.0.6（2023-10-13）
+1. 优化vue，内容有背景色，设置圆角被遮挡的情况
+## 1.0.5（2023-09-10）
+1. 修复H5默认层级过高的问题
+2. 修复全局设置prop无效的问题
+## 1.0.4（2023-08-08）
+1. 修复修改zIndex不生效的BUG
+## 1.0.3（2023-07-02）
+uv-popup  弹出层，代码重构优化，性能翻倍，小程序体验性能更加，避免卡顿。打开和关闭方法更改，详情参考文档：https://www.uvui.cn/components/popup.html
+## 1.0.2（2023-06-11）
+1. 修复zIndex层级问题
+## 1.0.1（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.0（2023-05-10）
+1. 新增uv-popup组件
diff --git a/uni_modules/uv-popup/components/uv-popup/keypress.js b/uni_modules/uv-popup/components/uv-popup/keypress.js
new file mode 100644
index 0000000..62dda46
--- /dev/null
+++ b/uni_modules/uv-popup/components/uv-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/uv-popup/components/uv-popup/uv-popup.vue b/uni_modules/uv-popup/components/uv-popup/uv-popup.vue
new file mode 100644
index 0000000..a63ff9d
--- /dev/null
+++ b/uni_modules/uv-popup/components/uv-popup/uv-popup.vue
@@ -0,0 +1,539 @@
+<template>
+	<view 
+		v-if="showPopup" 
+		class="uv-popup" 
+		:class="[popupClass, isDesktop ? 'fixforpc-z-index' : '']"
+		:style="[{zIndex: zIndex}]"
+	>
+		<view @touchstart="touchstart">
+			<!-- 遮罩层 -->
+			<uv-overlay
+				key="1"
+				v-if="maskShow && overlay"
+				:show="showTrans"
+				:duration="duration"
+				:custom-style="overlayStyle"
+				:opacity="overlayOpacity"
+			  :zIndex="zIndex"
+				@click="onTap"
+			></uv-overlay>
+			<uv-transition 
+				key="2" 
+				:mode="ani" 
+				name="content" 
+				:custom-style="transitionStyle" 
+				:duration="duration"
+				:show="showTrans" 
+				@click="onTap"
+			>
+				<view 
+					class="uv-popup__content" 
+					:style="[contentStyle]" 
+					:class="[popupClass]" 
+					@click="clear"
+				>
+					<uv-status-bar v-if="safeAreaInsetTop"></uv-status-bar>
+					<slot />
+					<uv-safe-bottom v-if="safeAreaInsetBottom"></uv-safe-bottom>
+					<view
+						v-if="closeable"
+						@tap.stop="close"
+						class="uv-popup__content__close"
+						:class="['uv-popup__content__close--' + closeIconPos]"
+						hover-class="uv-popup__content__close--hover"
+						hover-stay-time="150"
+					>
+						<uv-icon
+							name="close"
+							color="#909399"
+							size="18"
+							bold
+						></uv-icon>
+					</view>
+				</view>
+			</uv-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	/**
+	* PopUp 弹出层
+	* @description 弹出层组件，为了解决遮罩弹层的问题
+	* @tutorial https://www.uvui.cn/components/popup.html
+	* @property {String} mode = [top|center|bottom|left|right] 弹出方式
+	* 	@value top 顶部弹出
+	* 	@value center 中间弹出
+	* 	@value bottom 底部弹出
+	* 	@value left		左侧弹出
+	* 	@value right  右侧弹出
+	* @property {Number} duration 动画时长，默认300
+	* @property {Boolean} overlay 是否显示遮罩，默认true
+	* @property {Boolean} overlayOpacity 遮罩透明度，默认0.5 
+	* @property {Object} overlayStyle 遮罩自定义样式
+	* @property {Boolean} closeOnClickOverlay = [true|false] 蒙版点击是否关闭弹窗，默认true
+	* @property {Number | String} zIndex 弹出层的层级
+	* @property {Boolean} safeAreaInsetTop 是否留出顶部安全区（状态栏高度），默认false
+	* @property {Boolean} safeAreaInsetBottom 是否为留出底部安全区适配，默认true
+	* @property {Boolean} closeable 是否显示关闭图标，默认false
+	* @property {Boolean} closeIconPos 自定义关闭图标位置，`top-left`-左上角，`top-right`-右上角，`bottom-left`-左下角，`bottom-right`-右下角，默认top-right
+	* @property {String}  bgColor 主窗口背景色
+	* @property {String}  maskBackgroundColor 蒙版颜色
+	* @property {Boolean} customStyle 自定义样式
+	* @event {Function} change 打开关闭弹窗触发，e={show: false}
+	* @event {Function} maskClick 点击遮罩触发
+	*/
+	export default {
+		name: 'uv-popup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		mixins: [mpMixin, mixin],
+		emits: ['change', 'maskClick'],
+		props: {
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			mode: {
+				type: String,
+				default: 'center'
+			},
+			// 动画时长，单位ms
+			duration: {
+				type: [String, Number],
+				default: 300
+			},
+			// 层级
+			zIndex: {
+				type: [String, Number],
+				// #ifdef H5
+				default: 997
+				// #endif
+				// #ifndef H5
+				default: 10075
+				// #endif
+			},
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			// 是否显示遮罩
+			overlay: {
+				type: Boolean,
+				default: true
+			},
+			// 点击遮罩是否关闭弹窗
+			closeOnClickOverlay: {
+				type: Boolean,
+				default: true
+			},
+			// 遮罩的透明度，0-1之间
+			overlayOpacity: {
+				type: [Number, String],
+				default: 0.4
+			},
+			// 自定义遮罩的样式
+			overlayStyle: {
+				type: [Object, String],
+				default: ''
+			},
+			// 是否为iPhoneX留出底部安全距离
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: true
+			},
+			// 是否留出顶部安全距离（状态栏高度）
+			safeAreaInsetTop: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示关闭图标
+			closeable: {
+				type: Boolean,
+				default: false
+			},
+			// 自定义关闭图标位置，top-left为左上角，top-right为右上角，bottom-left为左下角，bottom-right为右下角
+			closeIconPos: {
+				type: String,
+				default: 'top-right'
+			},
+			// mode=center，也即中部弹出时，是否使用缩放模式
+			zoom: {
+				type: Boolean,
+				default: true
+			},
+			round: {
+				type: [Number, String],
+				default: 0
+			},
+			...uni.$uv?.props?.popup
+		},
+		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.mode]](true)
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				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'
+				},
+				transitionStyle: {
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupClass: this.isDesktop ? 'fixforpc-top' : 'top',
+				direction: ''
+			}
+		},
+		computed: {
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.bgColor === '' || this.bgColor === 'none' || this.$uv.getPx(this.round)>0) {
+					return 'transparent'
+				}
+				return this.bgColor
+			},
+			contentStyle() {
+				const style = {};
+				if (this.bgColor) {
+					style.backgroundColor = this.bg
+				}
+				if(this.round) {
+					const value = this.$uv.addUnit(this.round)
+					const mode = this.direction?this.direction:this.mode
+					style.backgroundColor = this.bgColor
+					if(mode === 'top') {
+						style.borderBottomLeftRadius = value
+						style.borderBottomRightRadius = value
+					} else if(mode === 'bottom') {
+						style.borderTopLeftRadius = value
+						style.borderTopRightRadius = value
+					} else if(mode === 'center') {
+						style.borderRadius = value
+					} 
+				}
+				return this.$uv.deepMerge(style, this.$uv.addStyle(this.customStyle))
+			}
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		created() {
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+		},
+		methods: {
+			setH5Visible() {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = 'visible'
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = 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.mode
+				}else {
+					this.direction = direction;
+				}
+				if (!this.config[direction]) {
+					return this.$uv.error(`缺少类型：${direction}`);
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.mode
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				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.closeOnClickOverlay) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupClass = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transitionStyle = {
+					position: 'fixed',
+					zIndex: this.zIndex,
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					if (this.messageChild && this.mode === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupClass = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transitionStyle = {
+					position: 'fixed',
+					zIndex: this.zIndex,
+					left: 0,
+					right: 0,
+					bottom: 0,
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupClass = 'center'
+				this.ani = this.zoom?['zoom-in', 'fade']:['fade'];
+				this.transitionStyle = {
+					position: 'fixed',
+					zIndex: this.zIndex,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center'
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			left(type) {
+				this.popupClass = 'left'
+				this.ani = ['slide-left']
+				this.transitionStyle = {
+					position: 'fixed',
+					zIndex: this.zIndex,
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			right(type) {
+				this.popupClass = 'right'
+				this.ani = ['slide-right']
+				this.transitionStyle = {
+					position: 'fixed',
+					zIndex: this.zIndex,
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.uv-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 */
+		}
+
+		.uv-popup__content {
+			/* #ifndef APP-NVUE */
+			display: block;
+			overflow: hidden;
+			/* #endif */
+			position: relative;
+
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+			&__close {
+				position: absolute;
+
+				&--hover {
+					opacity: 0.4;
+				}
+			}
+			
+			&__close--top-left {
+				top: 15px;
+				left: 15px;
+			}
+			
+			&__close--top-right {
+				top: 15px;
+				right: 15px;
+			}
+			
+			&__close--bottom-left {
+				bottom: 15px;
+				left: 15px;
+			}
+			
+			&__close--bottom-right {
+				right: 15px;
+				bottom: 15px;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>
diff --git a/uni_modules/uv-popup/package.json b/uni_modules/uv-popup/package.json
new file mode 100644
index 0000000..53c112c
--- /dev/null
+++ b/uni_modules/uv-popup/package.json
@@ -0,0 +1,92 @@
+{
+  "id": "uv-popup",
+  "displayName": "uv-popup 弹出层 全面兼容vue3+2、app、h5、小程序等多端",
+  "version": "1.0.7",
+  "description": "uv-popup 弹出层容器，用于展示弹窗、信息提示等内容，支持上、下、左、右和中部弹出。组件只提供容器，内部内容由用户自定义。",
+  "keywords": [
+    "uv-popup",
+    "uvui",
+    "uv-ui",
+    "popup",
+    "弹出层"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+    	"ads": "无",
+    	"data": "插件不采集任何数据",
+    	"permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uv-ui-tools",
+			"uv-overlay",
+			"uv-transition",
+			"uv-icon",
+			"uv-status-bar",
+			"uv-safe-bottom"
+		],
+    "encrypt": [],
+    "platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"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",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-popup/readme.md b/uni_modules/uv-popup/readme.md
new file mode 100644
index 0000000..92229a8
--- /dev/null
+++ b/uni_modules/uv-popup/readme.md
@@ -0,0 +1,21 @@
+## Popup 弹出层
+
+> **组件名：uv-popup**
+
+弹出层容器，用于展示弹窗、信息提示等内容，支持上、下、左、右和中部弹出。组件只提供容器，内部内容由用户自定义。
+
+该组件已经放弃原来`uview2.x`的写法，参照了官方`uni-popup`的写法进行重构。在小程序端的性能大大提升，打开和关闭避免延迟，调用方法与之前相比也有所差异，具体请查看文档。
+
+# <a href="https://www.uvui.cn/components/popup.html" target="_blank">查看文档</a>
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui) <small>（请不要 下载插件ZIP）</small>
+
+### [更多插件，请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+<a href="https://ext.dcloud.net.cn/plugin?name=uv-ui" target="_blank">
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+</a>
+
+#### 如使用过程中有任何问题反馈，或者您对uv-ui有一些好的建议，欢迎加入uv-ui官方交流群：<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
\ No newline at end of file
diff --git a/uni_modules/uv-safe-bottom/changelog.md b/uni_modules/uv-safe-bottom/changelog.md
new file mode 100644
index 0000000..dbcd565
--- /dev/null
+++ b/uni_modules/uv-safe-bottom/changelog.md
@@ -0,0 +1,11 @@
+## 1.0.4（2023-09-14）
+1. 飞书小程序支持
+## 1.0.3（2023-08-14）
+1. 修复百度报错的BUG
+## 1.0.2（2023-07-02）
+uv-safe-bottom 修复，在百度程序，抖音小程序不生效的BUG
+## 1.0.1（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.0（2023-05-10）
+uv-safe-bottom 底部安全区组件
diff --git a/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.vue b/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.vue
new file mode 100644
index 0000000..b5439a8
--- /dev/null
+++ b/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.vue
@@ -0,0 +1,67 @@
+<template>
+	<view
+		class="uv-safe-bottom"
+		:style="[style]"
+		:class="[!isNvue && 'uv-safe-area-inset-bottom']"
+	>
+	</view>
+</template>
+
+<script>
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	/**
+	 * SafeBottom 底部安全区
+	 * @description 这个适配，主要是针对IPhone X等一些底部带指示条的机型，指示条的操作区域与页面底部存在重合，容易导致用户误操作，因此我们需要针对这些机型进行底部安全区适配。
+	 * @tutorial https://www.uvui.cn/components/safeAreaInset.html
+	 * @property {type}		prop_name
+	 * @property {Object}	customStyle	定义需要用到的外部样式
+	 *
+	 * @event {Function()}
+	 * @example <uv-status-bar></uv-status-bar>
+	 */
+	export default {
+		name: "uv-safe-bottom",
+		mixins: [mpMixin, mixin],
+		data() {
+			return {
+				safeAreaBottomHeight: 0,
+				isNvue: false,
+			};
+		},
+		computed: {
+			style() {
+				const style = {};
+				// #ifdef APP-NVUE || MP-TOUTIAO || MP-LARK
+				// nvue下，高度使用js计算填充
+				style.height = this.$uv.addUnit(this.$uv.sys()?.safeAreaInsets?.bottom, 'px');
+				// #endif
+				return this.$uv.deepMerge(style, this.$uv.addStyle(this.customStyle));
+			},
+		},
+		mounted() {
+			// #ifdef APP-NVUE
+			// 标识为是否nvue
+			this.isNvue = true;
+			// #endif
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.uv-safe-bottom {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		/* #endif */
+	}
+	/* #ifndef APP-NVUE */
+	// 历遍生成4个方向的底部安全区
+	@each $d in top, right, bottom, left {
+		.uv-safe-area-inset-#{$d} {
+			padding-#{$d}: 0;
+			padding-#{$d}: constant(safe-area-inset-#{$d});  
+			padding-#{$d}: env(safe-area-inset-#{$d});  
+		}
+	}
+	/* #endif */
+</style>
diff --git a/uni_modules/uv-safe-bottom/package.json b/uni_modules/uv-safe-bottom/package.json
new file mode 100644
index 0000000..5bfaab0
--- /dev/null
+++ b/uni_modules/uv-safe-bottom/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uv-safe-bottom",
+  "displayName": "uv-safe-bottom 底部安全区  全面兼容小程序、nvue、vue2、vue3等多端",
+  "version": "1.0.4",
+  "description": "这个适配，主要是针对IPhone X等一些底部带指示条的机型，指示条的操作区域与页面底部存在重合，容易导致用户误操作，因此我们需要针对这些机型进行底部安全区适配。",
+  "keywords": [
+    "uv-safe-bottom",
+    "uvui",
+    "uv-ui",
+    "bottom",
+    "底部安全区"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+    	"ads": "无",
+    	"data": "插件不采集任何数据",
+    	"permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uv-ui-tools"
+		],
+    "encrypt": [],
+    "platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"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",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-safe-bottom/readme.md b/uni_modules/uv-safe-bottom/readme.md
new file mode 100644
index 0000000..8c78882
--- /dev/null
+++ b/uni_modules/uv-safe-bottom/readme.md
@@ -0,0 +1,11 @@
+## SafeBottom 底部安全区 
+
+> **组件名：uv-safe-bottom**
+
+这个适配，主要是针对IPhone X等一些底部带指示条的机型，指示条的操作区域与页面底部存在重合，容易导致用户误操作，因此我们需要针对这些机型进行底部安全区适配。
+
+### <a href="https://www.uvui.cn/guide/safeAreaInset.html" target="_blank">查看文档</a>
+
+### [完整示例项目下载 | 关注更多组件](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+#### 如使用过程中有任何问题，或者您对uv-ui有一些好的建议，欢迎加入 uv-ui 交流群：<a href="https://ext.dcloud.net.cn/plugin?id=12287" target="_blank">uv-ui</a>、<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
diff --git a/uni_modules/uv-status-bar/changelog.md b/uni_modules/uv-status-bar/changelog.md
new file mode 100644
index 0000000..fc04088
--- /dev/null
+++ b/uni_modules/uv-status-bar/changelog.md
@@ -0,0 +1,7 @@
+## 1.0.2（2023-06-05）
+1. 兼容渐变背景色
+## 1.0.1（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.0（2023-05-10）
+1. 新增uv-status-bar组件
diff --git a/uni_modules/uv-status-bar/components/uv-status-bar/props.js b/uni_modules/uv-status-bar/components/uv-status-bar/props.js
new file mode 100644
index 0000000..f42e525
--- /dev/null
+++ b/uni_modules/uv-status-bar/components/uv-status-bar/props.js
@@ -0,0 +1,8 @@
+export default {
+    props: {
+        bgColor: {
+            type: String,
+            default: 'transparent'
+        }
+    }
+}
diff --git a/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.vue b/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.vue
new file mode 100644
index 0000000..ee887c7
--- /dev/null
+++ b/uni_modules/uv-status-bar/components/uv-status-bar/uv-status-bar.vue
@@ -0,0 +1,54 @@
+<template>
+	<view
+	    :style="[style]"
+	    class="uv-status-bar"
+	>
+		<slot />
+	</view>
+</template>
+
+<script>
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	import props from './props.js';
+	/**
+	 * StatbusBar 状态栏占位
+	 * @description 本组件主要用于状态填充，比如在自定导航栏的时候，它会自动适配一个恰当的状态栏高度。
+	 * @tutorial https://www.uvui.cn/components/statusBar.html
+	 * @property {String}			bgColor			背景色 (默认 'transparent' )
+	 * @property {String | Object}	customStyle		自定义样式 
+	 * @example <uv-status-bar></uv-status-bar>
+	 */
+	export default {
+		name: 'uv-status-bar',
+		mixins: [mpMixin, mixin, props],
+		data() {
+			return {
+			}
+		},
+		computed: {
+			style() {
+				const style = {}
+				// 状态栏高度，由于某些安卓和微信开发工具无法识别css的顶部状态栏变量，所以使用js获取的方式
+				style.height = this.$uv.addUnit(this.$uv.sys().statusBarHeight, 'px')
+				if(this.bgColor){
+					if (this.bgColor.indexOf("gradient") > -1) {// 渐变色
+						style.backgroundImage = this.bgColor;
+					}else{
+						style.background = this.bgColor;
+					}
+				}
+				return this.$uv.deepMerge(style, this.$uv.addStyle(this.customStyle))
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uv-status-bar {
+		// nvue会默认100%，如果nvue下，显式写100%的话，会导致宽度不为100%而异常
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uv-status-bar/package.json b/uni_modules/uv-status-bar/package.json
new file mode 100644
index 0000000..dd4311e
--- /dev/null
+++ b/uni_modules/uv-status-bar/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uv-status-bar",
+  "displayName": "uv-status-bar 状态栏占位",
+  "version": "1.0.2",
+  "description": "状态栏占位组件主要用于状态填充，比如在自定导航栏的时候，它会自动适配一个恰当的状态栏高度。",
+  "keywords": [
+    "uv-status-bar",
+    "uvui",
+    "uv-ui",
+    "status-bar",
+    "状态栏"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+    	"ads": "无",
+    	"data": "插件不采集任何数据",
+    	"permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uv-ui-tools"
+		],
+    "encrypt": [],
+    "platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"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",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-status-bar/readme.md b/uni_modules/uv-status-bar/readme.md
new file mode 100644
index 0000000..fc61e0b
--- /dev/null
+++ b/uni_modules/uv-status-bar/readme.md
@@ -0,0 +1,10 @@
+## StatbusBar 状态栏占位
+
+> **组件名：uv-status-bar**
+
+本组件主要用于状态填充，比如在自定导航栏的时候，它会自动适配一个恰当的状态栏高度。
+
+### [完整示例项目下载 | 关注更多组件](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+#### 如使用过程中有任何问题，或者您对uv-ui有一些好的建议，欢迎加入 uv-ui 交流群：<a href="https://ext.dcloud.net.cn/plugin?id=12287" target="_blank">uv-ui</a>、<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
+
diff --git a/uni_modules/uv-toolbar/changelog.md b/uni_modules/uv-toolbar/changelog.md
new file mode 100644
index 0000000..3acfcd6
--- /dev/null
+++ b/uni_modules/uv-toolbar/changelog.md
@@ -0,0 +1,2 @@
+## 1.0.0（2023-08-02）
+1. 新增工具条组件
diff --git a/uni_modules/uv-toolbar/components/uv-toolbar/props.js b/uni_modules/uv-toolbar/components/uv-toolbar/props.js
new file mode 100644
index 0000000..e332412
--- /dev/null
+++ b/uni_modules/uv-toolbar/components/uv-toolbar/props.js
@@ -0,0 +1,40 @@
+export default {
+	props: {
+		// 是否展示工具条
+		show: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示下边框
+		showBorder: {
+			type: Boolean,
+			default: false
+		},
+		// 取消按钮的文字
+		cancelText: {
+			type: String,
+			default: '取消'
+		},
+		// 确认按钮的文字
+		confirmText: {
+			type: String,
+			default: '确认'
+		},
+		// 取消按钮的颜色
+		cancelColor: {
+			type: String,
+			default: '#909193'
+		},
+		// 确认按钮的颜色
+		confirmColor: {
+			type: String,
+			default: '#3c9cff'
+		},
+		// 标题文字
+		title: {
+			type: String,
+			default: ''
+		},
+		...uni.$uv?.props?.toolbar
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-toolbar/components/uv-toolbar/uv-toolbar.vue b/uni_modules/uv-toolbar/components/uv-toolbar/uv-toolbar.vue
new file mode 100644
index 0000000..0b3fc9e
--- /dev/null
+++ b/uni_modules/uv-toolbar/components/uv-toolbar/uv-toolbar.vue
@@ -0,0 +1,109 @@
+<template>
+	<view
+		:class="['uv-toolbar',{'uv-border-bottom':showBorder}]"
+		@touchmove.stop.prevent="noop"
+		v-if="show"
+	>
+		<view
+			class="uv-toolbar__cancel__wrapper"
+			hover-class="uv-hover-class"
+		>
+			<text
+				class="uv-toolbar__wrapper__cancel"
+				@tap="cancel"
+				:style="{
+					color: cancelColor
+				}"
+			>{{ cancelText }}</text>
+		</view>
+		<text
+			class="uv-toolbar__title uv-line-1"
+			v-if="title"
+		>{{ title }}</text>
+		<view
+			class="uv-toolbar__confirm__wrapper"
+			hover-class="uv-hover-class"
+		>
+			<text
+				class="uv-toolbar__wrapper__confirm"
+				@tap="confirm"
+				:style="{
+				color: confirmColor
+			}"
+			>{{ confirmText }}</text>
+		</view>
+	</view>
+</template>
+<script>
+	import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	import props from './props.js';
+	/**
+	 * Toolbar 工具条
+	 * @description 
+	 * @tutorial https://www.uvui.cn/components/toolbar.html
+	 * @property {Boolean}	show			是否展示工具条（默认 true ）
+	 * @property {Boolean}	showBorder			是否展示工具条下方边框（默认 false ）
+	 * @property {String}	cancelText		取消按钮的文字（默认 '取消' ）
+	 * @property {String}	confirmText		确认按钮的文字（默认 '确认' ）
+	 * @property {String}	cancelColor		取消按钮的颜色（默认 '#909193' ）
+	 * @property {String}	confirmColor	确认按钮的颜色（默认 '#3c9cff' ）
+	 * @property {String}	title	标题文字
+	 * @event {Function} 
+	 * @example 
+	 */
+	export default {
+		name: 'uv-toolbar',
+		emits: ['confirm', 'cancel'],
+		mixins: [mpMixin, mixin, props],
+		methods: {
+			// 点击取消按钮
+			cancel() {
+				this.$emit('cancel')
+			},
+			// 点击确定按钮
+			confirm() {
+				this.$emit('confirm')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$show-lines: 1;
+	$show-hover: 1;
+	$show-border: 1;
+	$show-border-bottom: 1;
+	@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
+	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
+	$uv-tips-color: #909193 !default;
+	$uv-main-color: #303133 !default;
+	$uv-primary: #3c9cff !default;
+	.uv-toolbar {
+		height: 42px;
+		@include flex;
+		justify-content: space-between;
+		align-items: center;
+		&__wrapper {
+			&__cancel {
+				color: $uv-tips-color;
+				font-size: 15px;
+				padding: 0 15px;
+			}
+		}
+		&__title {
+			color: $uv-main-color;
+			padding: 0 60rpx;
+			font-size: 16px;
+			flex: 1;
+			text-align: center;
+		}
+		&__wrapper {
+			&__confirm {
+				color: $uv-primary;
+				font-size: 15px;
+				padding: 0 15px;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uv-toolbar/package.json b/uni_modules/uv-toolbar/package.json
new file mode 100644
index 0000000..d519665
--- /dev/null
+++ b/uni_modules/uv-toolbar/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uv-toolbar",
+  "displayName": "uv-toolbar 工具条",
+  "version": "1.0.0",
+  "description": "该组价是仅用于uv-ui中一个公共小工具，提供一个取消和确定的样式，可以设置标题，主要用于弹窗顶部的选择确定工具条",
+  "keywords": [
+    "uv-toolbar",
+    "uvui",
+    "uv-ui",
+    "工具条",
+    "工具"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+    	"ads": "无",
+    	"data": "插件不采集任何数据",
+    	"permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uv-ui-tools"
+		],
+    "encrypt": [],
+    "platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"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",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-toolbar/readme.md b/uni_modules/uv-toolbar/readme.md
new file mode 100644
index 0000000..b33643f
--- /dev/null
+++ b/uni_modules/uv-toolbar/readme.md
@@ -0,0 +1,31 @@
+## Toolbar 工具条
+
+> **组件名：uv-toolbar**
+
+该组价是仅用于uv-ui中一个公共小工具，提供一个取消和确定的样式，可以设置标题，主要用于弹窗顶部的选择确定工具条。
+
+### 基本使用
+
+```vue
+<uv-toolbar title="标题文字"></uv-toolbar>
+```
+
+### Toolbar Props
+
+| 属性名 | 类型 | 默认值 | 说明 |
+|:-|:-|:-|:-|
+| show | Boolean | true | 是否展示工具条 |
+| showBorder | Boolean | false | 是否显示下边框 |
+| cancelText | String | '取消' | 取消按钮的文字 |
+| confirmText | String | '确定' | 确定按钮的文字 |
+| cancelColor | String | '#909193' | 取消按钮的颜色 |
+| confirmColor | String | '#3c9cff' | 确认按钮的颜色 |
+| title | String | - | 标题文字 |
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+### [更多插件，请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+#### 如使用过程中有任何问题反馈，或者您对uv-ui有一些好的建议，欢迎加入uv-ui官方交流群：<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
\ No newline at end of file
diff --git a/uni_modules/uv-transition/changelog.md b/uni_modules/uv-transition/changelog.md
new file mode 100644
index 0000000..59e4968
--- /dev/null
+++ b/uni_modules/uv-transition/changelog.md
@@ -0,0 +1,19 @@
+## 1.0.8（2023-10-18）
+1. 修复在APP上不能正常显示的BUG
+## 1.0.7（2023-10-12）
+1. 修复部分情况，修改某属性自动关闭的BUG
+## 1.0.6（2023-07-24）
+1. 优化  nvue模式下增加cellChild参数，是否在list中cell节点下，nvue中cell下建议设置成true
+## 1.0.5（2023-07-02）
+修改VUE3模式下可能存在的BUG
+## 1.0.4（2023-07-02）
+uv-transition  动画组件，代码重构优化，性能更加友好，增加自定义动画功能。详情参考文档：https://www.uvui.cn/components/transition.html
+## 1.0.3（2023-06-12）
+1. 恢复this.$nextTick的使用，经过测试百度等平台无问题
+## 1.0.2（2023-05-23）
+1. 百度小程序等平台不支持this.$nextick，修改成延时
+## 1.0.1（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.0（2023-05-10）
+1. 新增动画组件
diff --git a/uni_modules/uv-transition/components/uv-transition/createAnimation.js b/uni_modules/uv-transition/components/uv-transition/createAnimation.js
new file mode 100644
index 0000000..8f89b18
--- /dev/null
+++ b/uni_modules/uv-transition/components/uv-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/uv-transition/components/uv-transition/props.js b/uni_modules/uv-transition/components/uv-transition/props.js
new file mode 100644
index 0000000..e8b4e6b
--- /dev/null
+++ b/uni_modules/uv-transition/components/uv-transition/props.js
@@ -0,0 +1,31 @@
+export default {
+	props: {
+		// 是否展示组件
+		show: {
+			type: Boolean,
+			default: false
+		},
+		// 使用的动画模式
+		mode: {
+			type: [Array, String, null],
+			default() {
+				return 'fade'
+			}
+		},
+		// 动画的执行时间，单位ms
+		duration: {
+			type: [String, Number],
+			default: 300
+		},
+		// 使用的动画过渡函数
+		timingFunction: {
+			type: String,
+			default: 'ease-out'
+		},
+		customClass: {
+			type: String,
+			default: ''
+		},
+		...uni.$uv?.props?.transition
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-transition/components/uv-transition/uv-transition.vue b/uni_modules/uv-transition/components/uv-transition/uv-transition.vue
new file mode 100644
index 0000000..cf9790d
--- /dev/null
+++ b/uni_modules/uv-transition/components/uv-transition/uv-transition.vue
@@ -0,0 +1,320 @@
+<template>
+  <!-- #ifndef APP-NVUE -->
+  <view 
+		v-if="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 mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
+	import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
+	import { createAnimation } from './createAnimation'
+	/**
+	* transition  动画组件
+	* @description
+	* @tutorial
+	* @property {Boolean}	show	控制组件显示或关闭 （默认 false ）
+	* @property {Array | String	}	mode	内置过渡动画类型 （默认 'fade' ）
+	* @value fade 渐隐渐出过渡
+	* @value slide-top 由上至下过渡
+	* @value slide-bottom 由下至上过渡
+	* @value slide-left 由左至右过渡
+	* @value slide-right 由右至左过渡
+	* @value zoom-in 由小到大过渡
+	* @value zoom-out 由大到小过渡
+	* @property {String | Number}	duration	动画的执行时间，单位ms （默认 300 ）
+	* @property {String} timingFunction	使用的动画过渡函数 （默认 'ease-out' ）
+	* @property {Object} customStyle	自定义样式
+	* @property {String} customClass	自定义类名
+	* @event {Function} click 点击组件触发	
+	* @event {Function} change	过渡动画结束时触发	
+	* @example 
+	*/
+	export default {
+		name: 'uv-transition',
+		mixins: [mpMixin,mixin],
+		emits:['click','change'],
+		props: {
+			// 是否展示组件
+			show: {
+				type: Boolean,
+				default: false
+			},
+			// 使用的动画模式
+			mode: {
+				type: [Array, String, null],
+				default() {
+					return 'fade'
+				}
+			},
+			// 动画的执行时间，单位ms
+			duration: {
+				type: [String, Number],
+				default: 300
+			},
+			// 使用的动画过渡函数
+			timingFunction: {
+				type: String,
+				default: 'ease-out'
+			},
+			customClass: {
+				type: String,
+				default: ''
+			},
+			// nvue模式下 是否直接显示，在uv-list等cell下面使用就需要设置
+			cellChild: {
+				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: {
+			// 初始化动画条件
+			transformStyles() {
+				const style = {
+					transform: this.transform,
+					opacity: this.opacity,
+					...this.$uv.addStyle(this.customStyle),
+					'transition-duration': `${this.duration / 1000}s`
+				};
+				return this.$uv.addStyle(style,'string');
+			}
+		},
+		created() {
+			// 动画默认配置
+			this.config = {
+				duration: this.duration,
+				timingFunction: this.timingFunction,
+				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();
+						// #ifdef APP-NVUE
+						if(this.cellChild) {
+							this.opacity = 1;
+						} else{
+							this.animation.run();
+						}
+						// #endif
+						// #ifndef APP-NVUE
+						this.animation.run();
+						// #endif
+						// #ifdef VUE3
+						// #ifdef H5
+						this.opacity = 1;
+						// #endif
+						// #endif
+						this.$emit('change', {
+							detail: this.isShow
+						})
+						// #ifdef H5
+						// #ifdef VUE3
+						this.transform = '';
+						// #endif
+						// #endif
+					}, 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.mode === 'string') {
+					buildStyle(type, this.mode);
+				} else {
+					this.mode.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.mode === 'string') {
+					buildTranfrom(type, this.mode)
+				} else {
+					this.mode.forEach(mode => {
+						buildTranfrom(type, mode)
+					})
+				}
+				return this.animation;
+			},
+			animationType(type) {
+				return {
+					fade: type ? 1 : 0,
+					'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>
diff --git a/uni_modules/uv-transition/package.json b/uni_modules/uv-transition/package.json
new file mode 100644
index 0000000..c05eadb
--- /dev/null
+++ b/uni_modules/uv-transition/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uv-transition",
+  "displayName": "uv-transition 动画 全面兼容vue3+2、app、h5、小程序等多端",
+  "version": "1.0.8",
+  "description": "transition 该组件用于组件的动画过渡效果。",
+  "keywords": [
+    "uv-transition",
+    "uvui",
+    "uv-ui",
+    "transition",
+    "动画"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+    	"ads": "无",
+    	"data": "插件不采集任何数据",
+    	"permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uv-ui-tools"
+		],
+    "encrypt": [],
+    "platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"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",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-transition/readme.md b/uni_modules/uv-transition/readme.md
new file mode 100644
index 0000000..fbf8f59
--- /dev/null
+++ b/uni_modules/uv-transition/readme.md
@@ -0,0 +1,15 @@
+## Transition 动画
+
+> **组件名：uv-transition**
+
+该组件用于组件的动画过渡效果，支持自定义动画，开箱即用。
+
+# <a href="https://www.uvui.cn/components/transition.html" target="_blank">查看文档</a>
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+### [更多插件，请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+#### 如使用过程中有任何问题反馈，或者您对uv-ui有一些好的建议，欢迎加入uv-ui官方交流群：<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
diff --git a/uni_modules/uv-ui-tools/changelog.md b/uni_modules/uv-ui-tools/changelog.md
new file mode 100644
index 0000000..998373e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/changelog.md
@@ -0,0 +1,76 @@
+## 1.1.25（2024-01-20）
+1.1.20版本更新
+## 1.1.24（2023-12-21）
+1. luch-request更新
+## 1.1.23（2023-12-12）
+1. 1.1.19版本
+## 1.1.22（2023-11-28）
+1. 优化
+## 1.1.21（2023-11-10）
+1. 1.1.17版本
+## 1.1.20（2023-10-30）
+1. 1.1.16版本
+## 1.1.19（2023-10-13）
+1. 兼容vue3
+## 1.1.18（2023-10-12）
+1. 1.1.15版本
+## 1.1.17（2023-09-27）
+1. 1.1.14版本发布
+## 1.1.16（2023-09-15）
+1. 1.1.13版本发布
+## 1.1.15（2023-09-15）
+1. 更新button.js相关按钮支持open-type="agreePrivacyAuthorization"
+## 1.1.14（2023-09-14）
+1. 优化dayjs
+## 1.1.13（2023-09-13）
+1. 优化，$uv中增加unit参数，方便组件中使用
+## 1.1.12（2023-09-10）
+1. 升级版本
+## 1.1.11（2023-09-04）
+1. 1.1.11版本
+## 1.1.10（2023-08-31）
+1. 修复customStyle和customClass存在冲突的问题
+## 1.1.9（2023-08-27）
+1. 版本升级
+2. 优化
+## 1.1.8（2023-08-24）
+1. 版本升级
+## 1.1.7（2023-08-22）
+1. 版本升级
+## 1.1.6（2023-08-18）
+uvui版本：1.1.6
+## 1.0.15（2023-08-14）
+1. 更新uvui版本号
+## 1.0.13（2023-08-06）
+1. 优化
+## 1.0.12（2023-08-06）
+1. 修改版本号
+## 1.0.11（2023-08-06）
+1. 路由增加events参数
+2. 路由拦截修复
+## 1.0.10（2023-08-01）
+1. 优化
+## 1.0.9（2023-06-28）
+优化openType.js
+## 1.0.8（2023-06-15）
+1. 修改支付宝报错的BUG
+## 1.0.7（2023-06-07）
+1. 解决微信小程序使用uvui提示 Some selectors are not allowed in component wxss, including tag name selectors, ID selectors, and attribute selectors
+2. 解决上述提示，需要在uni.scss配置$uvui-nvue-style: false; 然后在APP.vue下面引入uvui内置的基础样式:@import '@/uni_modules/uv-ui-tools/index.scss';
+## 1.0.6（2023-06-04）
+1.  uv-ui-tools 优化工具组件，兼容更多功能
+2.  小程序分享功能优化等
+## 1.0.5（2023-06-02）
+1. 修改扩展使用mixin中方法的问题
+## 1.0.4（2023-05-23）
+1. 兼容百度小程序修改bem函数
+## 1.0.3（2023-05-16）
+1. 优化组件依赖，修改后无需全局引入，组件导入即可使用
+2. 优化部分功能
+## 1.0.2（2023-05-10）
+1. 增加Http请求封装
+2. 优化
+## 1.0.1（2023-05-04）
+1. 修改名称及备注
+## 1.0.0（2023-05-04）
+1. uv-ui工具集首次发布
diff --git a/uni_modules/uv-ui-tools/components/uv-ui-tools/uv-ui-tools.vue b/uni_modules/uv-ui-tools/components/uv-ui-tools/uv-ui-tools.vue
new file mode 100644
index 0000000..baf45e9
--- /dev/null
+++ b/uni_modules/uv-ui-tools/components/uv-ui-tools/uv-ui-tools.vue
@@ -0,0 +1,6 @@
+<template>
+</template>
+<script>
+</script>
+<style>
+</style>
diff --git a/uni_modules/uv-ui-tools/index.js b/uni_modules/uv-ui-tools/index.js
new file mode 100644
index 0000000..71a8b66
--- /dev/null
+++ b/uni_modules/uv-ui-tools/index.js
@@ -0,0 +1,79 @@
+// 全局挂载引入http相关请求拦截插件
+import Request from './libs/luch-request'
+
+// 引入全局mixin
+import mixin from './libs/mixin/mixin.js'
+// 小程序特有的mixin
+import mpMixin from './libs/mixin/mpMixin.js'
+// #ifdef MP
+import mpShare from './libs/mixin/mpShare.js'
+// #endif
+
+// 路由封装
+import route from './libs/util/route.js'
+// 公共工具函数
+import * as index from './libs/function/index.js'
+// 防抖方法
+import debounce from './libs/function/debounce.js'
+// 节流方法
+import throttle from './libs/function/throttle.js'
+// 规则检验
+import * as test from './libs/function/test.js'
+
+// 颜色渐变相关,colorGradient-颜色渐变,hexToRgb-十六进制颜色转rgb颜色,rgbToHex-rgb转十六进制
+import * as colorGradient from './libs/function/colorGradient.js'
+
+// 配置信息
+import config from './libs/config/config.js'
+// 平台
+import platform from './libs/function/platform'
+
+const $uv = {
+	route,
+	config,
+	test,
+	date: index.timeFormat, // 另名date
+	...index,
+	colorGradient: colorGradient.colorGradient,
+	hexToRgb: colorGradient.hexToRgb,
+	rgbToHex: colorGradient.rgbToHex,
+	colorToRgba: colorGradient.colorToRgba,
+	http: new Request(),
+	debounce,
+	throttle,
+	platform,
+	mixin,
+	mpMixin
+}
+uni.$uv = $uv;
+const install = (Vue,options={}) => {
+		// #ifndef APP-NVUE
+		const cloneMixin = index.deepClone(mixin);
+		delete cloneMixin?.props?.customClass;
+		delete cloneMixin?.props?.customStyle;
+		Vue.mixin(cloneMixin);
+		// #ifdef MP
+		if(options.mpShare){
+			Vue.mixin(mpShare);
+		}
+		// #endif
+		// #endif
+		// #ifdef VUE2
+		// 时间格式化，同时两个名称，date和timeFormat
+		Vue.filter('timeFormat', (timestamp, format) => uni.$uv.timeFormat(timestamp, format));
+		Vue.filter('date', (timestamp, format) => uni.$uv.timeFormat(timestamp, format));
+		// 将多久以前的方法，注入到全局过滤器
+		Vue.filter('timeFrom', (timestamp, format) => uni.$uv.timeFrom(timestamp, format));
+		// 同时挂载到uni和Vue.prototype中
+		// #ifndef APP-NVUE
+		// 只有vue，挂载到Vue.prototype才有意义，因为nvue中全局Vue.prototype和Vue.mixin是无效的
+		Vue.prototype.$uv = $uv;
+		// #endif
+		// #endif
+		// #ifdef VUE3
+		Vue.config.globalProperties.$uv = $uv;
+		// #endif
+}
+export default {
+	install
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/index.scss b/uni_modules/uv-ui-tools/index.scss
new file mode 100644
index 0000000..8d05b8d
--- /dev/null
+++ b/uni_modules/uv-ui-tools/index.scss
@@ -0,0 +1,7 @@
+// 引入公共基础类
+@import "./libs/css/common.scss";
+
+// 非nvue的样式
+/* #ifndef APP-NVUE */
+@import "./libs/css/vue.scss";
+/* #endif */
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/config/config.js b/uni_modules/uv-ui-tools/libs/config/config.js
new file mode 100644
index 0000000..f18ae74
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/config/config.js
@@ -0,0 +1,34 @@
+// 此版本发布于2024-01-20
+const version = '1.1.20'
+
+// 开发环境才提示，生产环境不会提示
+if (process.env.NODE_ENV === 'development') {
+	console.log(`\n %c uvui V${version} https://www.uvui.cn/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0; border-radius: 5px;');
+}
+
+export default {
+    v: version,
+    version,
+    // 主题名称
+    type: [
+        'primary',
+        'success',
+        'info',
+        'error',
+        'warning'
+    ],
+    // 颜色部分，本来可以通过scss的:export导出供js使用，但是奈何nvue不支持
+    color: {
+        'uv-primary': '#2979ff',
+        'uv-warning': '#ff9900',
+        'uv-success': '#19be6b',
+        'uv-error': '#fa3534',
+        'uv-info': '#909399',
+        'uv-main-color': '#303133',
+        'uv-content-color': '#606266',
+        'uv-tips-color': '#909399',
+        'uv-light-color': '#c0c4cc'
+    },
+	// 默认单位，可以通过配置为rpx，那么在用于传入组件大小参数为数值时，就默认为rpx
+	unit: 'px'
+}
diff --git a/uni_modules/uv-ui-tools/libs/css/color.scss b/uni_modules/uv-ui-tools/libs/css/color.scss
new file mode 100644
index 0000000..ce65743
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/color.scss
@@ -0,0 +1,32 @@
+$uv-main-color: #303133 !default;
+$uv-content-color: #606266 !default;
+$uv-tips-color: #909193 !default;
+$uv-light-color: #c0c4cc !default;
+$uv-border-color: #dadbde !default;
+$uv-bg-color: #f3f4f6 !default;
+$uv-disabled-color: #c8c9cc !default;
+
+$uv-primary: #3c9cff !default;
+$uv-primary-dark: #398ade !default;
+$uv-primary-disabled: #9acafc !default;
+$uv-primary-light: #ecf5ff !default;
+
+$uv-warning: #f9ae3d !default;
+$uv-warning-dark: #f1a532 !default;
+$uv-warning-disabled: #f9d39b !default;
+$uv-warning-light: #fdf6ec !default;
+
+$uv-success: #5ac725 !default;
+$uv-success-dark: #53c21d !default;
+$uv-success-disabled: #a9e08f !default;
+$uv-success-light: #f5fff0;
+
+$uv-error: #f56c6c !default;
+$uv-error-dark: #e45656 !default;
+$uv-error-disabled: #f7b2b2 !default;
+$uv-error-light: #fef0f0 !default;
+
+$uv-info: #909399 !default;
+$uv-info-dark: #767a82 !default;
+$uv-info-disabled: #c4c6c9 !default;
+$uv-info-light: #f4f4f5 !default;
diff --git a/uni_modules/uv-ui-tools/libs/css/common.scss b/uni_modules/uv-ui-tools/libs/css/common.scss
new file mode 100644
index 0000000..7ab99f8
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/common.scss
@@ -0,0 +1,100 @@
+// 超出行数，自动显示行尾省略号，最多5行
+// 来自uvui的温馨提示：当您在控制台看到此报错，说明需要在App.vue的style标签加上【lang="scss"】
+@for $i from 1 through 5 {
+	.uv-line-#{$i} {
+		/* #ifdef APP-NVUE */
+		// nvue下，可以直接使用lines属性，这是weex特有样式
+		lines: $i;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		flex: 1;
+		/* #endif */
+
+		/* #ifndef APP-NVUE */
+		// vue下，单行和多行显示省略号需要单独处理
+		@if $i == '1' {
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		} @else {
+			display: -webkit-box!important;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			word-break: break-all;
+			-webkit-line-clamp: $i;
+			-webkit-box-orient: vertical!important;
+		}
+		/* #endif */
+	}
+}
+$uv-bordercolor: #dadbde;
+@if variable-exists(uv-border-color) {
+	$uv-bordercolor: $uv-border-color;
+}
+
+// 此处加上!important并非随意乱用，而是因为目前*.nvue页面编译到H5时，
+// App.vue的样式会被uni-app的view元素的自带border属性覆盖，导致无效
+// 综上，这是uni-app的缺陷导致我们为了多端兼容，而必须要加上!important
+// 移动端兼容性较好，直接使用0.5px去实现细边框，不使用伪元素形式实现
+.uv-border {
+	border-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-style: solid;
+}
+
+.uv-border-top {
+	border-top-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-top-style: solid;
+}
+
+.uv-border-left {
+	border-left-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-left-style: solid;
+}
+
+.uv-border-right {
+	border-right-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-right-style: solid;
+}
+
+.uv-border-bottom {
+	border-bottom-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-bottom-style: solid;
+}
+
+.uv-border-top-bottom {
+	border-top-width: 0.5px!important;
+	border-bottom-width: 0.5px!important;
+	border-color: $uv-bordercolor!important;
+    border-top-style: solid;
+    border-bottom-style: solid;
+}
+
+// 去除button的所有默认样式，让其表现跟普通的view、text元素一样
+.uv-reset-button {
+	padding: 0;
+	background-color: transparent;
+	/* #ifndef APP-PLUS */
+	font-size: inherit;
+	line-height: inherit;
+	color: inherit;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	border-width: 0;
+	/* #endif */
+}
+
+/* #ifndef APP-NVUE */
+.uv-reset-button::after {
+   border: none;
+}
+/* #endif */
+
+.uv-hover-class {
+	opacity: 0.7;
+}
+
diff --git a/uni_modules/uv-ui-tools/libs/css/components.scss b/uni_modules/uv-ui-tools/libs/css/components.scss
new file mode 100644
index 0000000..81ce15d
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/components.scss
@@ -0,0 +1,23 @@
+@mixin flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: $direction;
+}
+
+/* #ifndef APP-NVUE */
+// 由于uvui是基于nvue环境进行开发的，此环境中普通元素默认为flex-direction: column;
+// 所以在非nvue中，需要对元素进行重置为flex-direction: column; 否则可能会表现异常
+$uvui-nvue-style: true !default;
+@if $uvui-nvue-style == true {
+	view, scroll-view, swiper-item {
+		display: flex;
+		flex-direction: column;
+		flex-shrink: 0;
+		flex-grow: 0;
+		flex-basis: auto;
+		align-items: stretch;
+		align-content: flex-start;
+	}
+}
+/* #endif */
diff --git a/uni_modules/uv-ui-tools/libs/css/variable.scss b/uni_modules/uv-ui-tools/libs/css/variable.scss
new file mode 100644
index 0000000..63903c9
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/variable.scss
@@ -0,0 +1,111 @@
+// 超出行数，自动显示行尾省略号，最多5行
+// 来自uvui的温馨提示：当您在控制台看到此报错，说明需要在App.vue的style标签加上【lang="scss"】
+@if variable-exists(show-lines) {
+	@for $i from 1 through 5 {
+		.uv-line-#{$i} {
+			/* #ifdef APP-NVUE */
+			// nvue下，可以直接使用lines属性，这是weex特有样式
+			lines: $i;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			flex: 1;
+			/* #endif */
+
+			/* #ifndef APP-NVUE */
+			// vue下，单行和多行显示省略号需要单独处理
+			@if $i == '1' {
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+			} @else {
+				display: -webkit-box!important;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				word-break: break-all;
+				-webkit-line-clamp: $i;
+				-webkit-box-orient: vertical!important;
+			}
+			/* #endif */
+		}
+	}
+}
+@if variable-exists(show-border) {
+	$uv-bordercolor: #dadbde;
+	@if variable-exists(uv-border-color) {
+		$uv-bordercolor: $uv-border-color;
+	}
+	// 此处加上!important并非随意乱用，而是因为目前*.nvue页面编译到H5时，
+	// App.vue的样式会被uni-app的view元素的自带border属性覆盖，导致无效
+	// 综上，这是uni-app的缺陷导致我们为了多端兼容，而必须要加上!important
+	// 移动端兼容性较好，直接使用0.5px去实现细边框，不使用伪元素形式实现
+	@if variable-exists(show-border-surround) {
+		.uv-border {
+			border-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-style: solid;
+		}
+	}
+	@if variable-exists(show-border-top) {
+		.uv-border-top {
+			border-top-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-top-style: solid;
+		}
+	}
+	@if variable-exists(show-border-left) {
+		.uv-border-left {
+			border-left-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-left-style: solid;
+		}
+	}
+	@if variable-exists(show-border-right) {
+		.uv-border-right {
+			border-right-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-right-style: solid;
+		}
+	}
+	@if variable-exists(show-border-bottom) {
+		.uv-border-bottom {
+			border-bottom-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+				border-bottom-style: solid;
+		}
+	}
+	@if variable-exists(show-border-top-bottom) {
+		.uv-border-top-bottom {
+			border-top-width: 0.5px!important;
+			border-bottom-width: 0.5px!important;
+			border-color: $uv-bordercolor!important;
+			border-top-style: solid;
+			border-bottom-style: solid;
+		}
+	}
+}
+@if variable-exists(show-reset-button) {
+	// 去除button的所有默认样式，让其表现跟普通的view、text元素一样
+	.uv-reset-button {
+		padding: 0;
+		background-color: transparent;
+		/* #ifndef APP-PLUS */
+		font-size: inherit;
+		line-height: inherit;
+		color: inherit;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		border-width: 0;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.uv-reset-button::after {
+		 border: none;
+	}
+	/* #endif */
+}
+@if variable-exists(show-hover) {
+	.uv-hover-class {
+		opacity: 0.7;
+	}
+}
diff --git a/uni_modules/uv-ui-tools/libs/css/vue.scss b/uni_modules/uv-ui-tools/libs/css/vue.scss
new file mode 100644
index 0000000..bdbefdd
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/css/vue.scss
@@ -0,0 +1,40 @@
+// 历遍生成4个方向的底部安全区
+@each $d in top, right, bottom, left {
+	.uv-safe-area-inset-#{$d} {
+		padding-#{$d}: 0;
+		padding-#{$d}: constant(safe-area-inset-#{$d});  
+		padding-#{$d}: env(safe-area-inset-#{$d});  
+	}
+}
+
+//提升H5端uni.toast()的层级，避免被uvui的modal等遮盖
+/* #ifdef H5 */
+uni-toast {
+    z-index: 10090;
+}
+uni-toast .uni-toast {
+   z-index: 10090;
+}
+/* #endif */
+
+// 隐藏scroll-view的滚动条
+::-webkit-scrollbar {
+    display: none;  
+    width: 0 !important;  
+    height: 0 !important;  
+    -webkit-appearance: none;  
+    background: transparent;  
+}
+
+$uvui-nvue-style: true !default;
+@if $uvui-nvue-style == false {
+	view, scroll-view, swiper-item {
+		display: flex;
+		flex-direction: column;
+		flex-shrink: 0;
+		flex-grow: 0;
+		flex-basis: auto;
+		align-items: stretch;
+		align-content: flex-start;
+	}
+}
diff --git a/uni_modules/uv-ui-tools/libs/function/colorGradient.js b/uni_modules/uv-ui-tools/libs/function/colorGradient.js
new file mode 100644
index 0000000..55c188f
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/colorGradient.js
@@ -0,0 +1,134 @@
+/**
+ * 求两个颜色之间的渐变值
+ * @param {string} startColor 开始的颜色
+ * @param {string} endColor 结束的颜色
+ * @param {number} step 颜色等分的份额
+ * */
+function colorGradient(startColor = 'rgb(0, 0, 0)', endColor = 'rgb(255, 255, 255)', step = 10) {
+    const startRGB = hexToRgb(startColor, false) // 转换为rgb数组模式
+    const startR = startRGB[0]
+    const startG = startRGB[1]
+    const startB = startRGB[2]
+
+    const endRGB = hexToRgb(endColor, false)
+    const endR = endRGB[0]
+    const endG = endRGB[1]
+    const endB = endRGB[2]
+
+    const sR = (endR - startR) / step // 总差值
+    const sG = (endG - startG) / step
+    const sB = (endB - startB) / step
+    const colorArr = []
+    for (let i = 0; i < step; i++) {
+        // 计算每一步的hex值
+        let hex = rgbToHex(`rgb(${Math.round((sR * i + startR))},${Math.round((sG * i + startG))},${Math.round((sB
+			* i + startB))})`)
+        // 确保第一个颜色值为startColor的值
+        if (i === 0) hex = rgbToHex(startColor)
+        // 确保最后一个颜色值为endColor的值
+        if (i === step - 1) hex = rgbToHex(endColor)
+        colorArr.push(hex)
+    }
+    return colorArr
+}
+
+// 将hex表示方式转换为rgb表示方式(这里返回rgb数组模式)
+function hexToRgb(sColor, str = true) {
+    const reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+    sColor = String(sColor).toLowerCase()
+    if (sColor && reg.test(sColor)) {
+        if (sColor.length === 4) {
+            let sColorNew = '#'
+            for (let i = 1; i < 4; i += 1) {
+                sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+            }
+            sColor = sColorNew
+        }
+        // 处理六位的颜色值
+        const sColorChange = []
+        for (let i = 1; i < 7; i += 2) {
+            sColorChange.push(parseInt(`0x${sColor.slice(i, i + 2)}`))
+        }
+        if (!str) {
+            return sColorChange
+        }
+        return `rgb(${sColorChange[0]},${sColorChange[1]},${sColorChange[2]})`
+    } if (/^(rgb|RGB)/.test(sColor)) {
+        const arr = sColor.replace(/(?:\(|\)|rgb|RGB)*/g, '').split(',')
+        return arr.map((val) => Number(val))
+    }
+    return sColor
+}
+
+// 将rgb表示方式转换为hex表示方式
+function rgbToHex(rgb) {
+    const _this = rgb
+    const reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+    if (/^(rgb|RGB)/.test(_this)) {
+        const aColor = _this.replace(/(?:\(|\)|rgb|RGB)*/g, '').split(',')
+        let strHex = '#'
+        for (let i = 0; i < aColor.length; i++) {
+            let hex = Number(aColor[i]).toString(16)
+            hex = String(hex).length == 1 ? `${0}${hex}` : hex // 保证每个rgb的值为2位
+            if (hex === '0') {
+                hex += hex
+            }
+            strHex += hex
+        }
+        if (strHex.length !== 7) {
+            strHex = _this
+        }
+        return strHex
+    } if (reg.test(_this)) {
+        const aNum = _this.replace(/#/, '').split('')
+        if (aNum.length === 6) {
+            return _this
+        } if (aNum.length === 3) {
+            let numHex = '#'
+            for (let i = 0; i < aNum.length; i += 1) {
+                numHex += (aNum[i] + aNum[i])
+            }
+            return numHex
+        }
+    } else {
+        return _this
+    }
+}
+
+/**
+* JS颜色十六进制转换为rgb或rgba,返回的格式为 rgba（255，255，255，0.5）字符串
+* sHex为传入的十六进制的色值
+* alpha为rgba的透明度
+*/
+function colorToRgba(color, alpha) {
+    color = rgbToHex(color)
+    // 十六进制颜色值的正则表达式
+    const reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+    /* 16进制颜色转为RGB格式 */
+    let sColor = String(color).toLowerCase()
+    if (sColor && reg.test(sColor)) {
+        if (sColor.length === 4) {
+            let sColorNew = '#'
+            for (let i = 1; i < 4; i += 1) {
+                sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+            }
+            sColor = sColorNew
+        }
+        // 处理六位的颜色值
+        const sColorChange = []
+        for (let i = 1; i < 7; i += 2) {
+            sColorChange.push(parseInt(`0x${sColor.slice(i, i + 2)}`))
+        }
+        // return sColorChange.join(',')
+        return `rgba(${sColorChange.join(',')},${alpha})`
+    }
+
+    return sColor
+}
+
+export {
+    colorGradient,
+    hexToRgb,
+    rgbToHex,
+    colorToRgba
+}
diff --git a/uni_modules/uv-ui-tools/libs/function/debounce.js b/uni_modules/uv-ui-tools/libs/function/debounce.js
new file mode 100644
index 0000000..ad3996b
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/debounce.js
@@ -0,0 +1,29 @@
+let timeout = null
+
+/**
+ * 防抖原理：一定时间内，只有最后一次操作，再过wait毫秒后才执行函数
+ *
+ * @param {Function} func 要执行的回调函数
+ * @param {Number} wait 延时的时间
+ * @param {Boolean} immediate 是否立即执行
+ * @return null
+ */
+function debounce(func, wait = 500, immediate = false) {
+    // 清除定时器
+    if (timeout !== null) clearTimeout(timeout)
+    // 立即执行，此类情况一般用不到
+    if (immediate) {
+        const callNow = !timeout
+        timeout = setTimeout(() => {
+            timeout = null
+        }, wait)
+        if (callNow) typeof func === 'function' && func()
+    } else {
+        // 设置定时器，当最后一次操作后，timeout不会再被清除，所以在延时wait毫秒后执行func回调方法
+        timeout = setTimeout(() => {
+            typeof func === 'function' && func()
+        }, wait)
+    }
+}
+
+export default debounce
diff --git a/uni_modules/uv-ui-tools/libs/function/digit.js b/uni_modules/uv-ui-tools/libs/function/digit.js
new file mode 100644
index 0000000..c8260a0
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/digit.js
@@ -0,0 +1,167 @@
+let _boundaryCheckingState = true; // 是否进行越界检查的全局开关
+
+/**
+ * 把错误的数据转正
+ * @private
+ * @example strip(0.09999999999999998)=0.1
+ */
+function strip(num, precision = 15) {
+  return +parseFloat(Number(num).toPrecision(precision));
+}
+
+/**
+ * Return digits length of a number
+ * @private
+ * @param {*number} num Input number
+ */
+function digitLength(num) {
+  // Get digit length of e
+  const eSplit = num.toString().split(/[eE]/);
+  const len = (eSplit[0].split('.')[1] || '').length - +(eSplit[1] || 0);
+  return len > 0 ? len : 0;
+}
+
+/**
+ * 把小数转成整数,如果是小数则放大成整数
+ * @private
+ * @param {*number} num 输入数
+ */
+function float2Fixed(num) {
+  if (num.toString().indexOf('e') === -1) {
+    return Number(num.toString().replace('.', ''));
+  }
+  const dLen = digitLength(num);
+  return dLen > 0 ? strip(Number(num) * Math.pow(10, dLen)) : Number(num);
+}
+
+/**
+ * 检测数字是否越界，如果越界给出提示
+ * @private
+ * @param {*number} num 输入数
+ */
+function checkBoundary(num) {
+  if (_boundaryCheckingState) {
+    if (num > Number.MAX_SAFE_INTEGER || num < Number.MIN_SAFE_INTEGER) {
+      console.warn(`${num} 超出了精度限制，结果可能不正确`);
+    }
+  }
+}
+
+/**
+ * 把递归操作扁平迭代化
+ * @param {number[]} arr 要操作的数字数组
+ * @param {function} operation 迭代操作
+ * @private
+ */
+function iteratorOperation(arr, operation) {
+  const [num1, num2, ...others] = arr;
+  let res = operation(num1, num2);
+
+  others.forEach((num) => {
+    res = operation(res, num);
+  });
+
+  return res;
+}
+
+/**
+ * 高精度乘法
+ * @export
+ */
+export function times(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, times);
+  }
+
+  const [num1, num2] = nums;
+  const num1Changed = float2Fixed(num1);
+  const num2Changed = float2Fixed(num2);
+  const baseNum = digitLength(num1) + digitLength(num2);
+  const leftValue = num1Changed * num2Changed;
+
+  checkBoundary(leftValue);
+
+  return leftValue / Math.pow(10, baseNum);
+}
+
+/**
+ * 高精度加法
+ * @export
+ */
+export function plus(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, plus);
+  }
+
+  const [num1, num2] = nums;
+  // 取最大的小数位
+  const baseNum = Math.pow(10, Math.max(digitLength(num1), digitLength(num2)));
+  // 把小数都转为整数然后再计算
+  return (times(num1, baseNum) + times(num2, baseNum)) / baseNum;
+}
+
+/**
+ * 高精度减法
+ * @export
+ */
+export function minus(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, minus);
+  }
+
+  const [num1, num2] = nums;
+  const baseNum = Math.pow(10, Math.max(digitLength(num1), digitLength(num2)));
+  return (times(num1, baseNum) - times(num2, baseNum)) / baseNum;
+}
+
+/**
+ * 高精度除法
+ * @export
+ */
+export function divide(...nums) {
+  if (nums.length > 2) {
+    return iteratorOperation(nums, divide);
+  }
+
+  const [num1, num2] = nums;
+  const num1Changed = float2Fixed(num1);
+  const num2Changed = float2Fixed(num2);
+  checkBoundary(num1Changed);
+  checkBoundary(num2Changed);
+  // 重要，这里必须用strip进行修正
+  return times(num1Changed / num2Changed, strip(Math.pow(10, digitLength(num2) - digitLength(num1))));
+}
+
+/**
+ * 四舍五入
+ * @export
+ */
+export function round(num, ratio) {
+  const base = Math.pow(10, ratio);
+  let result = divide(Math.round(Math.abs(times(num, base))), base);
+  if (num < 0 && result !== 0) {
+    result = times(result, -1);
+  }
+  // 位数不足则补0
+  return result;
+}
+
+/**
+ * 是否进行边界检查，默认开启
+ * @param flag 标记开关，true 为开启，false 为关闭，默认为 true
+ * @export
+ */
+export function enableBoundaryChecking(flag = true) {
+  _boundaryCheckingState = flag;
+}
+
+
+export default {
+  times,
+  plus,
+  minus,
+  divide,
+  round,
+  enableBoundaryChecking,
+};
+
diff --git a/uni_modules/uv-ui-tools/libs/function/index.js b/uni_modules/uv-ui-tools/libs/function/index.js
new file mode 100644
index 0000000..b35e0ab
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/index.js
@@ -0,0 +1,734 @@
+import { number, empty } from './test.js'
+import { round } from './digit.js'
+/**
+ * @description 如果value小于min，取min；如果value大于max，取max
+ * @param {number} min
+ * @param {number} max
+ * @param {number} value
+ */
+function range(min = 0, max = 0, value = 0) {
+	return Math.max(min, Math.min(max, Number(value)))
+}
+
+/**
+ * @description 用于获取用户传递值的px值  如果用户传递了"xxpx"或者"xxrpx"，取出其数值部分，如果是"xxxrpx"还需要用过uni.upx2px进行转换
+ * @param {number|string} value 用户传递值的px值
+ * @param {boolean} unit
+ * @returns {number|string}
+ */
+function getPx(value, unit = false) {
+	if (number(value)) {
+		return unit ? `${value}px` : Number(value)
+	}
+	// 如果带有rpx，先取出其数值部分，再转为px值
+	if (/(rpx|upx)$/.test(value)) {
+		return unit ? `${uni.upx2px(parseInt(value))}px` : Number(uni.upx2px(parseInt(value)))
+	}
+	return unit ? `${parseInt(value)}px` : parseInt(value)
+}
+
+/**
+ * @description 进行延时，以达到可以简写代码的目的 比如: await uni.$uv.sleep(20)将会阻塞20ms
+ * @param {number} value 堵塞时间 单位ms 毫秒
+ * @returns {Promise} 返回promise
+ */
+function sleep(value = 30) {
+	return new Promise((resolve) => {
+		setTimeout(() => {
+			resolve()
+		}, value)
+	})
+}
+/**
+ * @description 运行期判断平台
+ * @returns {string} 返回所在平台(小写)
+ * @link 运行期判断平台 https://uniapp.dcloud.io/frame?id=判断平台
+ */
+function os() {
+	return uni.getSystemInfoSync().platform.toLowerCase()
+}
+/**
+ * @description 获取系统信息同步接口
+ * @link 获取系统信息同步接口 https://uniapp.dcloud.io/api/system/info?id=getsysteminfosync
+ */
+function sys() {
+	return uni.getSystemInfoSync()
+}
+
+/**
+ * @description 取一个区间数
+ * @param {Number} min 最小值
+ * @param {Number} max 最大值
+ */
+function random(min, max) {
+	if (min >= 0 && max > 0 && max >= min) {
+		const gab = max - min + 1
+		return Math.floor(Math.random() * gab + min)
+	}
+	return 0
+}
+
+/**
+ * @param {Number} len uuid的长度
+ * @param {Boolean} firstU 将返回的首字母置为"u"
+ * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
+ */
+function guid(len = 32, firstU = true, radix = null) {
+	const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
+	const uuid = []
+	radix = radix || chars.length
+
+	if (len) {
+		// 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
+		for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix]
+	} else {
+		let r
+		// rfc4122标准要求返回的uuid中,某些位为固定的字符
+		uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
+		uuid[14] = '4'
+
+		for (let i = 0; i < 36; i++) {
+			if (!uuid[i]) {
+				r = 0 | Math.random() * 16
+				uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r]
+			}
+		}
+	}
+	// 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+	if (firstU) {
+		uuid.shift()
+		return `u${uuid.join('')}`
+	}
+	return uuid.join('')
+}
+
+/**
+* @description 获取父组件的参数，因为支付宝小程序不支持provide/inject的写法
+   this.$parent在非H5中，可以准确获取到父组件，但是在H5中，需要多次this.$parent.$parent.xxx
+   这里默认值等于undefined有它的含义，因为最顶层元素(组件)的$parent就是undefined，意味着不传name
+   值(默认为undefined)，就是查找最顶层的$parent
+*  @param {string|undefined} name 父组件的参数名
+*/
+function $parent(name = undefined) {
+	let parent = this.$parent
+	// 通过while历遍，这里主要是为了H5需要多层解析的问题
+	while (parent) {
+		// 父组件
+		if (parent.$options && parent.$options.name !== name) {
+			// 如果组件的name不相等，继续上一级寻找
+			parent = parent.$parent
+		} else {
+			return parent
+		}
+	}
+	return false
+}
+
+/**
+ * @description 样式转换
+ * 对象转字符串，或者字符串转对象
+ * @param {object | string} customStyle 需要转换的目标
+ * @param {String} target 转换的目的，object-转为对象，string-转为字符串
+ * @returns {object|string}
+ */
+function addStyle(customStyle, target = 'object') {
+	// 字符串转字符串，对象转对象情形，直接返回
+	if (empty(customStyle) || typeof(customStyle) === 'object' && target === 'object' || target === 'string' &&
+		typeof(customStyle) === 'string') {
+		return customStyle
+	}
+	// 字符串转对象
+	if (target === 'object') {
+		// 去除字符串样式中的两端空格(中间的空格不能去掉，比如padding: 20px 0如果去掉了就错了)，空格是无用的
+		customStyle = trim(customStyle)
+		// 根据";"将字符串转为数组形式
+		const styleArray = customStyle.split(';')
+		const style = {}
+		// 历遍数组，拼接成对象
+		for (let i = 0; i < styleArray.length; i++) {
+			// 'font-size:20px;color:red;'，如此最后字符串有";"的话，会导致styleArray最后一个元素为空字符串，这里需要过滤
+			if (styleArray[i]) {
+				const item = styleArray[i].split(':')
+				style[trim(item[0])] = trim(item[1])
+			}
+		}
+		return style
+	}
+	// 这里为对象转字符串形式
+	let string = ''
+	for (const i in customStyle) {
+		// 驼峰转为中划线的形式，否则css内联样式，无法识别驼峰样式属性名
+		const key = i.replace(/([A-Z])/g, '-$1').toLowerCase()
+		string += `${key}:${customStyle[i]};`
+	}
+	// 去除两端空格
+	return trim(string)
+}
+
+/**
+ * @description 添加单位，如果有rpx，upx，%，px等单位结尾或者值为auto，直接返回，否则加上px单位结尾
+ * @param {string|number} value 需要添加单位的值
+ * @param {string} unit 添加的单位名 比如px
+ */
+function addUnit(value = 'auto', unit = uni?.$uv?.config?.unit ? uni?.$uv?.config?.unit : 'px') {
+	value = String(value)
+	// 用uvui内置验证规则中的number判断是否为数值
+	return number(value) ? `${value}${unit}` : value
+}
+
+/**
+ * @description 深度克隆
+ * @param {object} obj 需要深度克隆的对象
+ * @param cache 缓存
+ * @returns {*} 克隆后的对象或者原值（不是对象）
+ */
+function deepClone(obj, cache = new WeakMap()) {
+	if (obj === null || typeof obj !== 'object') return obj;
+	if (cache.has(obj)) return cache.get(obj);
+	let clone;
+	if (obj instanceof Date) {
+		clone = new Date(obj.getTime());
+	} else if (obj instanceof RegExp) {
+		clone = new RegExp(obj);
+	} else if (obj instanceof Map) {
+		clone = new Map(Array.from(obj, ([key, value]) => [key, deepClone(value, cache)]));
+	} else if (obj instanceof Set) {
+		clone = new Set(Array.from(obj, value => deepClone(value, cache)));
+	} else if (Array.isArray(obj)) {
+		clone = obj.map(value => deepClone(value, cache));
+	} else if (Object.prototype.toString.call(obj) === '[object Object]') {
+		clone = Object.create(Object.getPrototypeOf(obj));
+		cache.set(obj, clone);
+		for (const [key, value] of Object.entries(obj)) {
+			clone[key] = deepClone(value, cache);
+		}
+	} else {
+		clone = Object.assign({}, obj);
+	}
+	cache.set(obj, clone);
+	return clone;
+}
+
+/**
+ * @description JS对象深度合并
+ * @param {object} target 需要拷贝的对象
+ * @param {object} source 拷贝的来源对象
+ * @returns {object|boolean} 深度合并后的对象或者false（入参有不是对象）
+ */
+function deepMerge(target = {}, source = {}) {
+	target = deepClone(target)
+	if (typeof target !== 'object' || target === null || typeof source !== 'object' || source === null) return target;
+	const merged = Array.isArray(target) ? target.slice() : Object.assign({}, target);
+	for (const prop in source) {
+		if (!source.hasOwnProperty(prop)) continue;
+		const sourceValue = source[prop];
+		const targetValue = merged[prop];
+		if (sourceValue instanceof Date) {
+			merged[prop] = new Date(sourceValue);
+		} else if (sourceValue instanceof RegExp) {
+			merged[prop] = new RegExp(sourceValue);
+		} else if (sourceValue instanceof Map) {
+			merged[prop] = new Map(sourceValue);
+		} else if (sourceValue instanceof Set) {
+			merged[prop] = new Set(sourceValue);
+		} else if (typeof sourceValue === 'object' && sourceValue !== null) {
+			merged[prop] = deepMerge(targetValue, sourceValue);
+		} else {
+			merged[prop] = sourceValue;
+		}
+	}
+	return merged;
+}
+
+/**
+ * @description error提示
+ * @param {*} err 错误内容
+ */
+function error(err) {
+	// 开发环境才提示，生产环境不会提示
+	if (process.env.NODE_ENV === 'development') {
+		console.error(`uvui提示：${err}`)
+	}
+}
+
+/**
+ * @description 打乱数组
+ * @param {array} array 需要打乱的数组
+ * @returns {array} 打乱后的数组
+ */
+function randomArray(array = []) {
+	// 原理是sort排序,Math.random()产生0<= x < 1之间的数,会导致x-0.05大于或者小于0
+	return array.sort(() => Math.random() - 0.5)
+}
+
+// padStart 的 polyfill，因为某些机型或情况，还无法支持es7的padStart，比如电脑版的微信小程序
+// 所以这里做一个兼容polyfill的兼容处理
+if (!String.prototype.padStart) {
+	// 为了方便表示这里 fillString 用了ES6 的默认参数，不影响理解
+	String.prototype.padStart = function(maxLength, fillString = ' ') {
+		if (Object.prototype.toString.call(fillString) !== '[object String]') {
+			throw new TypeError(
+				'fillString must be String'
+			)
+		}
+		const str = this
+		// 返回 String(str) 这里是为了使返回的值是字符串字面量，在控制台中更符合直觉
+		if (str.length >= maxLength) return String(str)
+
+		const fillLength = maxLength - str.length
+		let times = Math.ceil(fillLength / fillString.length)
+		while (times >>= 1) {
+			fillString += fillString
+			if (times === 1) {
+				fillString += fillString
+			}
+		}
+		return fillString.slice(0, fillLength) + str
+	}
+}
+
+/**
+ * @description 格式化时间
+ * @param {String|Number} dateTime 需要格式化的时间戳
+ * @param {String} fmt 格式化规则 yyyy:mm:dd|yyyy:mm|yyyy年mm月dd日|yyyy年mm月dd日 hh时MM分等,可自定义组合 默认yyyy-mm-dd
+ * @returns {string} 返回格式化后的字符串
+ */
+function timeFormat(dateTime = null, formatStr = 'yyyy-mm-dd') {
+	let date
+	// 若传入时间为假值，则取当前时间
+	if (!dateTime) {
+		date = new Date()
+	}
+	// 若为unix秒时间戳，则转为毫秒时间戳（逻辑有点奇怪，但不敢改，以保证历史兼容）
+	else if (/^\d{10}$/.test(dateTime?.toString().trim())) {
+		date = new Date(dateTime * 1000)
+	}
+	// 若用户传入字符串格式时间戳，new Date无法解析，需做兼容
+	else if (typeof dateTime === 'string' && /^\d+$/.test(dateTime.trim())) {
+		date = new Date(Number(dateTime))
+	}
+	// 处理平台性差异，在Safari/Webkit中，new Date仅支持/作为分割符的字符串时间
+	// 处理 '2022-07-10 01:02:03'，跳过 '2022-07-10T01:02:03'
+	else if (typeof dateTime === 'string' && dateTime.includes('-') && !dateTime.includes('T')) {
+		date = new Date(dateTime.replace(/-/g, '/'))
+	}
+	// 其他都认为符合 RFC 2822 规范
+	else {
+		date = new Date(dateTime)
+	}
+
+	const timeSource = {
+		'y': date.getFullYear().toString(), // 年
+		'm': (date.getMonth() + 1).toString().padStart(2, '0'), // 月
+		'd': date.getDate().toString().padStart(2, '0'), // 日
+		'h': date.getHours().toString().padStart(2, '0'), // 时
+		'M': date.getMinutes().toString().padStart(2, '0'), // 分
+		's': date.getSeconds().toString().padStart(2, '0') // 秒
+		// 有其他格式化字符需求可以继续添加，必须转化成字符串
+	}
+
+	for (const key in timeSource) {
+		const [ret] = new RegExp(`${key}+`).exec(formatStr) || []
+		if (ret) {
+			// 年可能只需展示两位
+			const beginIndex = key === 'y' && ret.length === 2 ? 2 : 0
+			formatStr = formatStr.replace(ret, timeSource[key].slice(beginIndex))
+		}
+	}
+
+	return formatStr
+}
+
+/**
+ * @description 时间戳转为多久之前
+ * @param {String|Number} timestamp 时间戳
+ * @param {String|Boolean} format
+ * 格式化规则如果为时间格式字符串，超出一定时间范围，返回固定的时间格式；
+ * 如果为布尔值false，无论什么时间，都返回多久以前的格式
+ * @returns {string} 转化后的内容
+ */
+function timeFrom(timestamp = null, format = 'yyyy-mm-dd') {
+	if (timestamp == null) timestamp = Number(new Date())
+	timestamp = parseInt(timestamp)
+	// 判断用户输入的时间戳是秒还是毫秒,一般前端js获取的时间戳是毫秒(13位),后端传过来的为秒(10位)
+	if (timestamp.toString().length == 10) timestamp *= 1000
+	let timer = (new Date()).getTime() - timestamp
+	timer = parseInt(timer / 1000)
+	// 如果小于5分钟,则返回"刚刚",其他以此类推
+	let tips = ''
+	switch (true) {
+		case timer < 300:
+			tips = '刚刚'
+			break
+		case timer >= 300 && timer < 3600:
+			tips = `${parseInt(timer / 60)}分钟前`
+			break
+		case timer >= 3600 && timer < 86400:
+			tips = `${parseInt(timer / 3600)}小时前`
+			break
+		case timer >= 86400 && timer < 2592000:
+			tips = `${parseInt(timer / 86400)}天前`
+			break
+		default:
+			// 如果format为false，则无论什么时间戳，都显示xx之前
+			if (format === false) {
+				if (timer >= 2592000 && timer < 365 * 86400) {
+					tips = `${parseInt(timer / (86400 * 30))}个月前`
+				} else {
+					tips = `${parseInt(timer / (86400 * 365))}年前`
+				}
+			} else {
+				tips = timeFormat(timestamp, format)
+			}
+	}
+	return tips
+}
+
+/**
+ * @description 去除空格
+ * @param String str 需要去除空格的字符串
+ * @param String pos both(左右)|left|right|all 默认both
+ */
+function trim(str, pos = 'both') {
+	str = String(str)
+	if (pos == 'both') {
+		return str.replace(/^\s+|\s+$/g, '')
+	}
+	if (pos == 'left') {
+		return str.replace(/^\s*/, '')
+	}
+	if (pos == 'right') {
+		return str.replace(/(\s*$)/g, '')
+	}
+	if (pos == 'all') {
+		return str.replace(/\s+/g, '')
+	}
+	return str
+}
+
+/**
+ * @description 对象转url参数
+ * @param {object} data,对象
+ * @param {Boolean} isPrefix,是否自动加上"?"
+ * @param {string} arrayFormat 规则 indices|brackets|repeat|comma
+ */
+function queryParams(data = {}, isPrefix = true, arrayFormat = 'brackets') {
+	const prefix = isPrefix ? '?' : ''
+	const _result = []
+	if (['indices', 'brackets', 'repeat', 'comma'].indexOf(arrayFormat) == -1) arrayFormat = 'brackets'
+	for (const key in data) {
+		const value = data[key]
+		// 去掉为空的参数
+		if (['', undefined, null].indexOf(value) >= 0) {
+			continue
+		}
+		// 如果值为数组，另行处理
+		if (value.constructor === Array) {
+			// e.g. {ids: [1, 2, 3]}
+			switch (arrayFormat) {
+				case 'indices':
+					// 结果: ids[0]=1&ids[1]=2&ids[2]=3
+					for (let i = 0; i < value.length; i++) {
+						_result.push(`${key}[${i}]=${value[i]}`)
+					}
+					break
+				case 'brackets':
+					// 结果: ids[]=1&ids[]=2&ids[]=3
+					value.forEach((_value) => {
+						_result.push(`${key}[]=${_value}`)
+					})
+					break
+				case 'repeat':
+					// 结果: ids=1&ids=2&ids=3
+					value.forEach((_value) => {
+						_result.push(`${key}=${_value}`)
+					})
+					break
+				case 'comma':
+					// 结果: ids=1,2,3
+					let commaStr = ''
+					value.forEach((_value) => {
+						commaStr += (commaStr ? ',' : '') + _value
+					})
+					_result.push(`${key}=${commaStr}`)
+					break
+				default:
+					value.forEach((_value) => {
+						_result.push(`${key}[]=${_value}`)
+					})
+			}
+		} else {
+			_result.push(`${key}=${value}`)
+		}
+	}
+	return _result.length ? prefix + _result.join('&') : ''
+}
+
+/**
+ * 显示消息提示框
+ * @param {String} title 提示的内容，长度与 icon 取值有关。
+ * @param {Number} duration 提示的延迟时间，单位毫秒，默认：2000
+ */
+function toast(title, duration = 2000) {
+	uni.showToast({
+		title: String(title),
+		icon: 'none',
+		duration
+	})
+}
+
+/**
+ * @description 根据主题type值,获取对应的图标
+ * @param {String} type 主题名称,primary|info|error|warning|success
+ * @param {boolean} fill 是否使用fill填充实体的图标
+ */
+function type2icon(type = 'success', fill = false) {
+	// 如果非预置值,默认为success
+	if (['primary', 'info', 'error', 'warning', 'success'].indexOf(type) == -1) type = 'success'
+	let iconName = ''
+	// 目前(2019-12-12),info和primary使用同一个图标
+	switch (type) {
+		case 'primary':
+			iconName = 'info-circle'
+			break
+		case 'info':
+			iconName = 'info-circle'
+			break
+		case 'error':
+			iconName = 'close-circle'
+			break
+		case 'warning':
+			iconName = 'error-circle'
+			break
+		case 'success':
+			iconName = 'checkmark-circle'
+			break
+		default:
+			iconName = 'checkmark-circle'
+	}
+	// 是否是实体类型,加上-fill,在icon组件库中,实体的类名是后面加-fill的
+	if (fill) iconName += '-fill'
+	return iconName
+}
+
+/**
+ * @description 数字格式化
+ * @param {number|string} number 要格式化的数字
+ * @param {number} decimals 保留几位小数
+ * @param {string} decimalPoint 小数点符号
+ * @param {string} thousandsSeparator 千分位符号
+ * @returns {string} 格式化后的数字
+ */
+function priceFormat(number, decimals = 0, decimalPoint = '.', thousandsSeparator = ',') {
+	number = (`${number}`).replace(/[^0-9+-Ee.]/g, '')
+	const n = !isFinite(+number) ? 0 : +number
+	const prec = !isFinite(+decimals) ? 0 : Math.abs(decimals)
+	const sep = (typeof thousandsSeparator === 'undefined') ? ',' : thousandsSeparator
+	const dec = (typeof decimalPoint === 'undefined') ? '.' : decimalPoint
+	let s = ''
+
+	s = (prec ? round(n, prec) + '' : `${Math.round(n)}`).split('.')
+	const re = /(-?\d+)(\d{3})/
+	while (re.test(s[0])) {
+		s[0] = s[0].replace(re, `$1${sep}$2`)
+	}
+
+	if ((s[1] || '').length < prec) {
+		s[1] = s[1] || ''
+		s[1] += new Array(prec - s[1].length + 1).join('0')
+	}
+	return s.join(dec)
+}
+
+/**
+ * @description 获取duration值
+ * 如果带有ms或者s直接返回，如果大于一定值，认为是ms单位，小于一定值，认为是s单位
+ * 比如以30位阈值，那么300大于30，可以理解为用户想要的是300ms，而不是想花300s去执行一个动画
+ * @param {String|number} value 比如: "1s"|"100ms"|1|100
+ * @param {boolean} unit  提示: 如果是false 默认返回number
+ * @return {string|number}
+ */
+function getDuration(value, unit = true) {
+	const valueNum = parseInt(value)
+	if (unit) {
+		if (/s$/.test(value)) return value
+		return value > 30 ? `${value}ms` : `${value}s`
+	}
+	if (/ms$/.test(value)) return valueNum
+	if (/s$/.test(value)) return valueNum > 30 ? valueNum : valueNum * 1000
+	return valueNum
+}
+
+/**
+ * @description 日期的月或日补零操作
+ * @param {String} value 需要补零的值
+ */
+function padZero(value) {
+	return `00${value}`.slice(-2)
+}
+
+/**
+ * @description 在uv-form的子组件内容发生变化，或者失去焦点时，尝试通知uv-form执行校验方法
+ * @param {*} instance
+ * @param {*} event
+ */
+function formValidate(instance, event) {
+	const formItem = $parent.call(instance, 'uv-form-item')
+	const form = $parent.call(instance, 'uv-form')
+	// 如果发生变化的input或者textarea等，其父组件中有uv-form-item或者uv-form等，就执行form的validate方法
+	// 同时将form-item的pros传递给form，让其进行精确对象验证
+	if (formItem && form) {
+		form.validateField(formItem.prop, () => {}, event)
+	}
+}
+
+/**
+ * @description 获取某个对象下的属性，用于通过类似'a.b.c'的形式去获取一个对象的的属性的形式
+ * @param {object} obj 对象
+ * @param {string} key 需要获取的属性字段
+ * @returns {*}
+ */
+function getProperty(obj, key) {
+	if (!obj) {
+		return
+	}
+	if (typeof key !== 'string' || key === '') {
+		return ''
+	}
+	if (key.indexOf('.') !== -1) {
+		const keys = key.split('.')
+		let firstObj = obj[keys[0]] || {}
+
+		for (let i = 1; i < keys.length; i++) {
+			if (firstObj) {
+				firstObj = firstObj[keys[i]]
+			}
+		}
+		return firstObj
+	}
+	return obj[key]
+}
+
+/**
+ * @description 设置对象的属性值，如果'a.b.c'的形式进行设置
+ * @param {object} obj 对象
+ * @param {string} key 需要设置的属性
+ * @param {string} value 设置的值
+ */
+function setProperty(obj, key, value) {
+	if (!obj) {
+		return
+	}
+	// 递归赋值
+	const inFn = function(_obj, keys, v) {
+		// 最后一个属性key
+		if (keys.length === 1) {
+			_obj[keys[0]] = v
+			return
+		}
+		// 0~length-1个key
+		while (keys.length > 1) {
+			const k = keys[0]
+			if (!_obj[k] || (typeof _obj[k] !== 'object')) {
+				_obj[k] = {}
+			}
+			const key = keys.shift()
+			// 自调用判断是否存在属性，不存在则自动创建对象
+			inFn(_obj[k], keys, v)
+		}
+	}
+
+	if (typeof key !== 'string' || key === '') {
+
+	} else if (key.indexOf('.') !== -1) { // 支持多层级赋值操作
+		const keys = key.split('.')
+		inFn(obj, keys, value)
+	} else {
+		obj[key] = value
+	}
+}
+
+/**
+ * @description 获取当前页面路径
+ */
+function page() {
+	const pages = getCurrentPages();
+	const route = pages[pages.length - 1]?.route;
+	// 某些特殊情况下(比如页面进行redirectTo时的一些时机)，pages可能为空数组
+	return `/${route ? route : ''}`
+}
+
+/**
+ * @description 获取当前路由栈实例数组
+ */
+function pages() {
+	const pages = getCurrentPages()
+	return pages
+}
+
+/**
+ * 获取页面历史栈指定层实例
+ * @param back {number} [0] - 0或者负数，表示获取历史栈的哪一层，0表示获取当前页面实例，-1 表示获取上一个页面实例。默认0。
+ */
+function getHistoryPage(back = 0) {
+	const pages = getCurrentPages()
+	const len = pages.length
+	return pages[len - 1 + back]
+}
+
+
+
+/**
+ * @description 修改uvui内置属性值
+ * @param {object} props 修改内置props属性
+ * @param {object} config 修改内置config属性
+ * @param {object} color 修改内置color属性
+ * @param {object} zIndex 修改内置zIndex属性
+ */
+function setConfig({
+	props = {},
+	config = {},
+	color = {},
+	zIndex = {}
+}) {
+	const {
+		deepMerge,
+	} = uni.$uv
+	uni.$uv.config = deepMerge(uni.$uv.config, config)
+	uni.$uv.props = deepMerge(uni.$uv.props, props)
+	uni.$uv.color = deepMerge(uni.$uv.color, color)
+	uni.$uv.zIndex = deepMerge(uni.$uv.zIndex, zIndex)
+}
+
+export {
+	range,
+	getPx,
+	sleep,
+	os,
+	sys,
+	random,
+	guid,
+	$parent,
+	addStyle,
+	addUnit,
+	deepClone,
+	deepMerge,
+	error,
+	randomArray,
+	timeFormat,
+	timeFrom,
+	trim,
+	queryParams,
+	toast,
+	type2icon,
+	priceFormat,
+	getDuration,
+	padZero,
+	formValidate,
+	getProperty,
+	setProperty,
+	page,
+	pages,
+	getHistoryPage,
+	setConfig
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/function/platform.js b/uni_modules/uv-ui-tools/libs/function/platform.js
new file mode 100644
index 0000000..d6b926e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/platform.js
@@ -0,0 +1,75 @@
+/**
+ * 注意：
+ * 此部分内容，在vue-cli模式下，需要在vue.config.js加入如下内容才有效：
+ * module.exports = {
+ *     transpileDependencies: ['uview-v2']
+ * }
+ */
+
+let platform = 'none'
+
+// #ifdef VUE3
+platform = 'vue3'
+// #endif
+
+// #ifdef VUE2
+platform = 'vue2'
+// #endif
+
+// #ifdef APP-PLUS
+platform = 'plus'
+// #endif
+
+// #ifdef APP-NVUE
+platform = 'nvue'
+// #endif
+
+// #ifdef H5
+platform = 'h5'
+// #endif
+
+// #ifdef MP-WEIXIN
+platform = 'weixin'
+// #endif
+
+// #ifdef MP-ALIPAY
+platform = 'alipay'
+// #endif
+
+// #ifdef MP-BAIDU
+platform = 'baidu'
+// #endif
+
+// #ifdef MP-TOUTIAO
+platform = 'toutiao'
+// #endif
+
+// #ifdef MP-QQ
+platform = 'qq'
+// #endif
+
+// #ifdef MP-KUAISHOU
+platform = 'kuaishou'
+// #endif
+
+// #ifdef MP-360
+platform = '360'
+// #endif
+
+// #ifdef MP
+platform = 'mp'
+// #endif
+
+// #ifdef QUICKAPP-WEBVIEW
+platform = 'quickapp-webview'
+// #endif
+
+// #ifdef QUICKAPP-WEBVIEW-HUAWEI
+platform = 'quickapp-webview-huawei'
+// #endif
+
+// #ifdef QUICKAPP-WEBVIEW-UNION
+platform = 'quckapp-webview-union'
+// #endif
+
+export default platform
diff --git a/uni_modules/uv-ui-tools/libs/function/test.js b/uni_modules/uv-ui-tools/libs/function/test.js
new file mode 100644
index 0000000..7c8b747
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/test.js
@@ -0,0 +1,287 @@
+/**
+ * 验证电子邮箱格式
+ */
+function email(value) {
+    return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value)
+}
+
+/**
+ * 验证手机格式
+ */
+function mobile(value) {
+    return /^1([3589]\d|4[5-9]|6[1-2,4-7]|7[0-8])\d{8}$/.test(value)
+}
+
+/**
+ * 验证URL格式
+ */
+function url(value) {
+    return /^((https|http|ftp|rtsp|mms):\/\/)(([0-9a-zA-Z_!~*'().&=+$%-]+: )?[0-9a-zA-Z_!~*'().&=+$%-]+@)?(([0-9]{1,3}.){3}[0-9]{1,3}|([0-9a-zA-Z_!~*'()-]+.)*([0-9a-zA-Z][0-9a-zA-Z-]{0,61})?[0-9a-zA-Z].[a-zA-Z]{2,6})(:[0-9]{1,4})?((\/?)|(\/[0-9a-zA-Z_!~*'().;?:@&=+$,%#-]+)+\/?)$/
+        .test(value)
+}
+
+/**
+ * 验证日期格式
+ */
+function date(value) {
+    if (!value) return false
+    // 判断是否数值或者字符串数值(意味着为时间戳)，转为数值，否则new Date无法识别字符串时间戳
+    if (number(value)) value = +value
+    return !/Invalid|NaN/.test(new Date(value).toString())
+}
+
+/**
+ * 验证ISO类型的日期格式
+ */
+function dateISO(value) {
+    return /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(value)
+}
+
+/**
+ * 验证十进制数字
+ */
+function number(value) {
+    return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value)
+}
+
+/**
+ * 验证字符串
+ */
+function string(value) {
+    return typeof value === 'string'
+}
+
+/**
+ * 验证整数
+ */
+function digits(value) {
+    return /^\d+$/.test(value)
+}
+
+/**
+ * 验证身份证号码
+ */
+function idCard(value) {
+    return /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
+        value
+    )
+}
+
+/**
+ * 是否车牌号
+ */
+function carNo(value) {
+    // 新能源车牌
+    const xreg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/
+    // 旧车牌
+    const creg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/
+    if (value.length === 7) {
+        return creg.test(value)
+    } if (value.length === 8) {
+        return xreg.test(value)
+    }
+    return false
+}
+
+/**
+ * 金额,只允许2位小数
+ */
+function amount(value) {
+    // 金额，只允许保留两位小数
+    return /^[1-9]\d*(,\d{3})*(\.\d{1,2})?$|^0\.\d{1,2}$/.test(value)
+}
+
+/**
+ * 中文
+ */
+function chinese(value) {
+    const reg = /^[\u4e00-\u9fa5]+$/gi
+    return reg.test(value)
+}
+
+/**
+ * 只能输入字母
+ */
+function letter(value) {
+    return /^[a-zA-Z]*$/.test(value)
+}
+
+/**
+ * 只能是字母或者数字
+ */
+function enOrNum(value) {
+    // 英文或者数字
+    const reg = /^[0-9a-zA-Z]*$/g
+    return reg.test(value)
+}
+
+/**
+ * 验证是否包含某个值
+ */
+function contains(value, param) {
+    return value.indexOf(param) >= 0
+}
+
+/**
+ * 验证一个值范围[min, max]
+ */
+function range(value, param) {
+    return value >= param[0] && value <= param[1]
+}
+
+/**
+ * 验证一个长度范围[min, max]
+ */
+function rangeLength(value, param) {
+    return value.length >= param[0] && value.length <= param[1]
+}
+
+/**
+ * 是否固定电话
+ */
+function landline(value) {
+    const reg = /^\d{3,4}-\d{7,8}(-\d{3,4})?$/
+    return reg.test(value)
+}
+
+/**
+ * 判断是否为空
+ */
+function empty(value) {
+    switch (typeof value) {
+    case 'undefined':
+        return true
+    case 'string':
+        if (value.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g, '').length == 0) return true
+        break
+    case 'boolean':
+        if (!value) return true
+        break
+    case 'number':
+        if (value === 0 || isNaN(value)) return true
+        break
+    case 'object':
+        if (value === null || value.length === 0) return true
+        for (const i in value) {
+            return false
+        }
+        return true
+    }
+    return false
+}
+
+/**
+ * 是否json字符串
+ */
+function jsonString(value) {
+    if (typeof value === 'string') {
+        try {
+            const obj = JSON.parse(value)
+            if (typeof obj === 'object' && obj) {
+                return true
+            }
+            return false
+        } catch (e) {
+            return false
+        }
+    }
+    return false
+}
+
+/**
+ * 是否数组
+ */
+function array(value) {
+    if (typeof Array.isArray === 'function') {
+        return Array.isArray(value)
+    }
+    return Object.prototype.toString.call(value) === '[object Array]'
+}
+
+/**
+ * 是否对象
+ */
+function object(value) {
+    return Object.prototype.toString.call(value) === '[object Object]'
+}
+
+/**
+ * 是否短信验证码
+ */
+function code(value, len = 6) {
+    return new RegExp(`^\\d{${len}}$`).test(value)
+}
+
+/**
+ * 是否函数方法
+ * @param {Object} value
+ */
+function func(value) {
+    return typeof value === 'function'
+}
+
+/**
+ * 是否promise对象
+ * @param {Object} value
+ */
+function promise(value) {
+    return object(value) && func(value.then) && func(value.catch)
+}
+
+/** 是否图片格式
+ * @param {Object} value
+ */
+function image(value) {
+    const newValue = value.split('?')[0]
+    const IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg)/i
+    return IMAGE_REGEXP.test(newValue)
+}
+
+/**
+ * 是否视频格式
+ * @param {Object} value
+ */
+function video(value) {
+    const VIDEO_REGEXP = /\.(mp4|mpg|mpeg|dat|asf|avi|rm|rmvb|mov|wmv|flv|mkv|m3u8)/i
+    return VIDEO_REGEXP.test(value)
+}
+
+/**
+ * 是否为正则对象
+ * @param {Object}
+ * @return {Boolean}
+ */
+function regExp(o) {
+    return o && Object.prototype.toString.call(o) === '[object RegExp]'
+}
+
+export {
+    email,
+    mobile,
+    url,
+    date,
+    dateISO,
+    number,
+    digits,
+    idCard,
+    carNo,
+    amount,
+    chinese,
+    letter,
+    enOrNum,
+    contains,
+    range,
+    rangeLength,
+    empty,
+    jsonString,
+    landline,
+    object,
+    array,
+    code,
+    func,
+    promise,
+    video,
+    image,
+    regExp,
+    string
+}
diff --git a/uni_modules/uv-ui-tools/libs/function/throttle.js b/uni_modules/uv-ui-tools/libs/function/throttle.js
new file mode 100644
index 0000000..2f33611
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/function/throttle.js
@@ -0,0 +1,30 @@
+let timer; let
+    flag
+/**
+ * 节流原理：在一定时间内，只能触发一次
+ *
+ * @param {Function} func 要执行的回调函数
+ * @param {Number} wait 延时的时间
+ * @param {Boolean} immediate 是否立即执行
+ * @return null
+ */
+function throttle(func, wait = 500, immediate = true) {
+    if (immediate) {
+        if (!flag) {
+            flag = true
+            // 如果是立即执行，则在wait毫秒内开始时执行
+            typeof func === 'function' && func()
+            timer = setTimeout(() => {
+                flag = false
+            }, wait)
+        }
+    } else if (!flag) {
+        flag = true
+        // 如果是非立即执行，则在wait毫秒内的结束处执行
+        timer = setTimeout(() => {
+            flag = false
+            typeof func === 'function' && func()
+        }, wait)
+    }
+}
+export default throttle
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/adapters/index.js b/uni_modules/uv-ui-tools/libs/luch-request/adapters/index.js
new file mode 100644
index 0000000..31a5cfc
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/adapters/index.js
@@ -0,0 +1,132 @@
+import buildURL from '../helpers/buildURL'
+import buildFullPath from '../core/buildFullPath'
+import settle from '../core/settle'
+import {isUndefined} from "../utils"
+
+/**
+ * 返回可选值存在的配置
+ * @param {Array} keys - 可选值数组
+ * @param {Object} config2 - 配置
+ * @return {{}} - 存在的配置项
+ */
+const mergeKeys = (keys, config2) => {
+  let config = {}
+  keys.forEach(prop => {
+    if (!isUndefined(config2[prop])) {
+      config[prop] = config2[prop]
+    }
+  })
+  return config
+}
+export default (config) => {
+  return new Promise((resolve, reject) => {
+    let fullPath = buildURL(buildFullPath(config.baseURL, config.url), config.params, config.paramsSerializer)
+    const _config = {
+      url: fullPath,
+      header: config.header,
+      complete: (response) => {
+        config.fullPath = fullPath
+        response.config = config
+        response.rawData = response.data
+        try {
+          let jsonParseHandle = false
+          const forcedJSONParsingType = typeof config.forcedJSONParsing
+          if (forcedJSONParsingType === 'boolean') {
+            jsonParseHandle = config.forcedJSONParsing
+          } else if (forcedJSONParsingType === 'object') {
+            const includesMethod = config.forcedJSONParsing.include || []
+            jsonParseHandle = includesMethod.includes(config.method)
+          }
+
+          // 对可能字符串不是json 的情况容错
+          if (jsonParseHandle && typeof response.data === 'string') {
+            response.data = JSON.parse(response.data)
+          }
+          // eslint-disable-next-line no-empty
+        } catch (e) {
+        }
+        settle(resolve, reject, response)
+      }
+    }
+    let requestTask
+    if (config.method === 'UPLOAD') {
+      delete _config.header['content-type']
+      delete _config.header['Content-Type']
+      let otherConfig = {
+        // #ifdef MP-ALIPAY
+        fileType: config.fileType,
+        // #endif
+        filePath: config.filePath,
+        name: config.name
+      }
+      const optionalKeys = [
+        // #ifdef APP-PLUS || H5
+        'files',
+        // #endif
+        // #ifdef H5
+        'file',
+        // #endif
+        // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+        'timeout',
+        // #endif
+        'formData'
+      ]
+      requestTask = uni.uploadFile({..._config, ...otherConfig, ...mergeKeys(optionalKeys, config)})
+    } else if (config.method === 'DOWNLOAD') {
+      const optionalKeys = [
+        // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+        'timeout',
+        // #endif
+        // #ifdef MP
+        'filePath',
+        // #endif
+      ]
+      requestTask = uni.downloadFile({..._config, ...mergeKeys(optionalKeys, config)})
+    } else {
+      const optionalKeys = [
+        'data',
+        'method',
+        // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+        'timeout',
+        // #endif
+        'dataType',
+        // #ifndef MP-ALIPAY
+        'responseType',
+        // #endif
+        // #ifdef APP-PLUS
+        'sslVerify',
+        // #endif
+        // #ifdef H5
+        'withCredentials',
+        // #endif
+        // #ifdef APP-PLUS
+        'firstIpv4',
+        // #endif
+        // #ifdef MP-WEIXIN
+        'enableHttp2',
+        'enableQuic',
+        // #endif
+        // #ifdef MP-TOUTIAO || MP-WEIXIN
+        'enableCache',
+        // #endif
+        // #ifdef MP-WEIXIN
+        'enableHttpDNS',
+        'httpDNSServiceId',
+        'enableChunked',
+        'forceCellularNetwork',
+        // #endif
+        // #ifdef MP-ALIPAY
+        'enableCookie',
+        // #endif
+        // #ifdef MP-BAIDU
+        'cloudCache',
+        'defer'
+        // #endif
+      ]
+      requestTask = uni.request({..._config, ...mergeKeys(optionalKeys, config)})
+    }
+    if (config.getTask) {
+      config.getTask(requestTask, config)
+    }
+  })
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/InterceptorManager.js b/uni_modules/uv-ui-tools/libs/luch-request/core/InterceptorManager.js
new file mode 100644
index 0000000..3ea0d5e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/InterceptorManager.js
@@ -0,0 +1,51 @@
+'use strict'
+
+
+function InterceptorManager() {
+  this.handlers = []
+}
+
+/**
+ * Add a new interceptor to the stack
+ *
+ * @param {Function} fulfilled The function to handle `then` for a `Promise`
+ * @param {Function} rejected The function to handle `reject` for a `Promise`
+ *
+ * @return {Number} An ID used to remove interceptor later
+ */
+InterceptorManager.prototype.use = function use(fulfilled, rejected) {
+  this.handlers.push({
+    fulfilled: fulfilled,
+    rejected: rejected
+  })
+  return this.handlers.length - 1
+}
+
+/**
+ * Remove an interceptor from the stack
+ *
+ * @param {Number} id The ID that was returned by `use`
+ */
+InterceptorManager.prototype.eject = function eject(id) {
+  if (this.handlers[id]) {
+    this.handlers[id] = null
+  }
+}
+
+/**
+ * Iterate over all the registered interceptors
+ *
+ * This method is particularly useful for skipping over any
+ * interceptors that may have become `null` calling `eject`.
+ *
+ * @param {Function} fn The function to call for each interceptor
+ */
+InterceptorManager.prototype.forEach = function forEach(fn) {
+  this.handlers.forEach(h => {
+    if (h !== null) {
+      fn(h)
+    }
+  })
+}
+
+export default InterceptorManager
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/Request.js b/uni_modules/uv-ui-tools/libs/luch-request/core/Request.js
new file mode 100644
index 0000000..96c89a8
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/Request.js
@@ -0,0 +1,201 @@
+/**
+ * @Class Request
+ * @description luch-request http请求插件
+ * @Author lu-ch
+ * @Email webwork.s@qq.com
+ * 文档: https://www.quanzhan.co/luch-request/
+ * github: https://github.com/lei-mu/luch-request
+ * DCloud: http://ext.dcloud.net.cn/plugin?id=392
+ */
+
+
+import dispatchRequest from './dispatchRequest'
+import InterceptorManager from './InterceptorManager'
+import mergeConfig from './mergeConfig'
+import defaults from './defaults'
+import { isPlainObject } from '../utils'
+import clone from '../utils/clone'
+
+export default class Request {
+  /**
+   * @param {Object} arg - 全局配置
+   * @param {String} arg.baseURL - 全局根路径
+   * @param {Object} arg.header - 全局header
+   * @param {String} arg.method = [GET|POST|PUT|DELETE|CONNECT|HEAD|OPTIONS|TRACE] - 全局默认请求方式
+   * @param {String} arg.dataType = [json] - 全局默认的dataType
+   * @param {String} arg.responseType = [text|arraybuffer] - 全局默认的responseType。支付宝小程序不支持
+   * @param {Object} arg.custom - 全局默认的自定义参数
+   * @param {Number} arg.timeout - 全局默认的超时时间，单位 ms。默认60000。H5(HBuilderX 2.9.9+)、APP(HBuilderX 2.9.9+)、微信小程序（2.10.0）、支付宝小程序
+   * @param {Boolean} arg.sslVerify - 全局默认的是否验证 ssl 证书。默认true.仅App安卓端支持（HBuilderX 2.3.3+）
+   * @param {Boolean} arg.withCredentials - 全局默认的跨域请求时是否携带凭证（cookies）。默认false。仅H5支持（HBuilderX 2.6.15+）
+   * @param {Boolean} arg.firstIpv4 - 全DNS解析时优先使用ipv4。默认false。仅 App-Android 支持 (HBuilderX 2.8.0+)
+   * @param {Function(statusCode):Boolean} arg.validateStatus - 全局默认的自定义验证器。默认statusCode >= 200 && statusCode < 300
+   */
+  constructor(arg = {}) {
+    if (!isPlainObject(arg)) {
+      arg = {}
+      console.warn('设置全局参数必须接收一个Object')
+    }
+    this.config = clone({...defaults, ...arg})
+    this.interceptors = {
+      request: new InterceptorManager(),
+      response: new InterceptorManager()
+    }
+  }
+
+  /**
+   * @Function
+   * @param {Request~setConfigCallback} f - 设置全局默认配置
+   */
+  setConfig(f) {
+    this.config = f(this.config)
+  }
+
+  middleware(config) {
+    config = mergeConfig(this.config, config)
+    let chain = [dispatchRequest, undefined]
+    let promise = Promise.resolve(config)
+
+    this.interceptors.request.forEach(function unshiftRequestInterceptors(interceptor) {
+      chain.unshift(interceptor.fulfilled, interceptor.rejected)
+    })
+
+    this.interceptors.response.forEach(function pushResponseInterceptors(interceptor) {
+      chain.push(interceptor.fulfilled, interceptor.rejected)
+    })
+
+    while (chain.length) {
+      promise = promise.then(chain.shift(), chain.shift())
+    }
+
+    return promise
+  }
+
+  /**
+   * @Function
+   * @param {Object} config - 请求配置项
+   * @prop {String} options.url - 请求路径
+   * @prop {Object} options.data - 请求参数
+   * @prop {Object} [options.responseType = config.responseType] [text|arraybuffer] - 响应的数据类型
+   * @prop {Object} [options.dataType = config.dataType] - 如果设为 json，会尝试对返回的数据做一次 JSON.parse
+   * @prop {Object} [options.header = config.header] - 请求header
+   * @prop {Object} [options.method = config.method] - 请求方法
+   * @returns {Promise<unknown>}
+   */
+  request(config = {}) {
+    return this.middleware(config)
+  }
+
+  get(url, options = {}) {
+    return this.middleware({
+      url,
+      method: 'GET',
+      ...options
+    })
+  }
+
+  post(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'POST',
+      ...options
+    })
+  }
+
+  // #ifndef MP-ALIPAY || MP-KUAISHOU || MP-JD
+  put(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'PUT',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU
+  delete(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'DELETE',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef H5 || MP-WEIXIN
+  connect(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'CONNECT',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef  H5 || MP-WEIXIN || MP-BAIDU
+  head(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'HEAD',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU
+  options(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'OPTIONS',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef H5 || MP-WEIXIN
+  trace(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'TRACE',
+      ...options
+    })
+  }
+
+  // #endif
+
+  upload(url, config = {}) {
+    config.url = url
+    config.method = 'UPLOAD'
+    return this.middleware(config)
+  }
+
+  download(url, config = {}) {
+    config.url = url
+    config.method = 'DOWNLOAD'
+    return this.middleware(config)
+  }
+
+  get version () {
+    return '3.1.0'
+  }
+}
+
+
+/**
+ * setConfig回调
+ * @return {Object} - 返回操作后的config
+ * @callback Request~setConfigCallback
+ * @param {Object} config - 全局默认config
+ */
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/buildFullPath.js b/uni_modules/uv-ui-tools/libs/luch-request/core/buildFullPath.js
new file mode 100644
index 0000000..f2852f4
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/buildFullPath.js
@@ -0,0 +1,20 @@
+'use strict'
+
+import isAbsoluteURL from '../helpers/isAbsoluteURL'
+import combineURLs from '../helpers/combineURLs'
+
+/**
+ * Creates a new URL by combining the baseURL with the requestedURL,
+ * only when the requestedURL is not already an absolute URL.
+ * If the requestURL is absolute, this function returns the requestedURL untouched.
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} requestedURL Absolute or relative URL to combine
+ * @returns {string} The combined full path
+ */
+export default function buildFullPath(baseURL, requestedURL) {
+  if (baseURL && !isAbsoluteURL(requestedURL)) {
+    return combineURLs(baseURL, requestedURL)
+  }
+  return requestedURL
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/defaults.js b/uni_modules/uv-ui-tools/libs/luch-request/core/defaults.js
new file mode 100644
index 0000000..db74609
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/defaults.js
@@ -0,0 +1,33 @@
+/**
+ * 默认的全局配置
+ */
+
+
+export default {
+  baseURL: '',
+  header: {},
+  method: 'GET',
+  dataType: 'json',
+  paramsSerializer: null,
+  // #ifndef MP-ALIPAY
+  responseType: 'text',
+  // #endif
+  custom: {},
+  // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+  timeout: 60000,
+  // #endif
+  // #ifdef APP-PLUS
+  sslVerify: true,
+  // #endif
+  // #ifdef H5
+  withCredentials: false,
+  // #endif
+  // #ifdef APP-PLUS
+  firstIpv4: false,
+  // #endif
+  validateStatus: function validateStatus(status) {
+    return status >= 200 && status < 300
+  },
+  // 是否尝试将响应数据json化
+  forcedJSONParsing: true
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/dispatchRequest.js b/uni_modules/uv-ui-tools/libs/luch-request/core/dispatchRequest.js
new file mode 100644
index 0000000..c5f2c85
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/dispatchRequest.js
@@ -0,0 +1,6 @@
+import adapter from '../adapters/index'
+
+
+export default (config) => {
+  return adapter(config)
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/mergeConfig.js b/uni_modules/uv-ui-tools/libs/luch-request/core/mergeConfig.js
new file mode 100644
index 0000000..99c8ecd
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/mergeConfig.js
@@ -0,0 +1,126 @@
+import {deepMerge, isUndefined} from '../utils'
+
+/**
+ * 合并局部配置优先的配置，如果局部有该配置项则用局部，如果全局有该配置项则用全局
+ * @param {Array} keys - 配置项
+ * @param {Object} globalsConfig - 当前的全局配置
+ * @param {Object} config2 - 局部配置
+ * @return {{}}
+ */
+const mergeKeys = (keys, globalsConfig, config2) => {
+  let config = {}
+  keys.forEach(prop => {
+    if (!isUndefined(config2[prop])) {
+      config[prop] = config2[prop]
+    } else if (!isUndefined(globalsConfig[prop])) {
+      config[prop] = globalsConfig[prop]
+    }
+  })
+  return config
+}
+/**
+ *
+ * @param globalsConfig - 当前实例的全局配置
+ * @param config2 - 当前的局部配置
+ * @return - 合并后的配置
+ */
+export default (globalsConfig, config2 = {}) => {
+  const method = config2.method || globalsConfig.method || 'GET'
+  let config = {
+    baseURL: config2.baseURL || globalsConfig.baseURL || '',
+    method: method,
+    url: config2.url || '',
+    params: config2.params || {},
+    custom: {...(globalsConfig.custom || {}), ...(config2.custom || {})},
+    header: deepMerge(globalsConfig.header || {}, config2.header || {})
+  }
+  const defaultToConfig2Keys = ['getTask', 'validateStatus', 'paramsSerializer', 'forcedJSONParsing']
+  config = {...config, ...mergeKeys(defaultToConfig2Keys, globalsConfig, config2)}
+
+  // eslint-disable-next-line no-empty
+  if (method === 'DOWNLOAD') {
+    const downloadKeys = [
+      // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+      'timeout',
+      // #endif
+      // #ifdef MP
+      'filePath',
+      // #endif
+    ]
+    config = {...config, ...mergeKeys(downloadKeys, globalsConfig, config2)}
+  } else if (method === 'UPLOAD') {
+    delete config.header['content-type']
+    delete config.header['Content-Type']
+    const uploadKeys = [
+      // #ifdef APP-PLUS || H5
+      'files',
+      // #endif
+      // #ifdef MP-ALIPAY
+      'fileType',
+      // #endif
+      // #ifdef H5
+      'file',
+      // #endif
+      'filePath',
+      'name',
+      // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+      'timeout',
+      // #endif
+      'formData',
+    ]
+    uploadKeys.forEach(prop => {
+      if (!isUndefined(config2[prop])) {
+        config[prop] = config2[prop]
+      }
+    })
+    // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+    if (isUndefined(config.timeout) && !isUndefined(globalsConfig.timeout)) {
+      config['timeout'] = globalsConfig['timeout']
+    }
+    // #endif
+  } else {
+    const defaultsKeys = [
+      'data',
+      // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+      'timeout',
+      // #endif
+      'dataType',
+      // #ifndef MP-ALIPAY
+      'responseType',
+      // #endif
+      // #ifdef APP-PLUS
+      'sslVerify',
+      // #endif
+      // #ifdef H5
+      'withCredentials',
+      // #endif
+      // #ifdef APP-PLUS
+      'firstIpv4',
+      // #endif
+      // #ifdef MP-WEIXIN
+      'enableHttp2',
+      'enableQuic',
+      // #endif
+      // #ifdef MP-TOUTIAO || MP-WEIXIN
+      'enableCache',
+      // #endif
+      // #ifdef MP-WEIXIN
+      'enableHttpDNS',
+      'httpDNSServiceId',
+      'enableChunked',
+      'forceCellularNetwork',
+      // #endif
+      // #ifdef MP-ALIPAY
+      'enableCookie',
+      // #endif
+      // #ifdef MP-BAIDU
+      'cloudCache',
+      'defer'
+      // #endif
+
+    ]
+    config = {...config, ...mergeKeys(defaultsKeys, globalsConfig, config2)}
+  }
+
+  return config
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/core/settle.js b/uni_modules/uv-ui-tools/libs/luch-request/core/settle.js
new file mode 100644
index 0000000..b2f1659
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/core/settle.js
@@ -0,0 +1,16 @@
+/**
+ * Resolve or reject a Promise based on response status.
+ *
+ * @param {Function} resolve A function that resolves the promise.
+ * @param {Function} reject A function that rejects the promise.
+ * @param {object} response The response.
+ */
+export default function settle(resolve, reject, response) {
+  const validateStatus = response.config.validateStatus
+  const status = response.statusCode
+  if (status && (!validateStatus || validateStatus(status))) {
+    resolve(response)
+  } else {
+    reject(response)
+  }
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/helpers/buildURL.js b/uni_modules/uv-ui-tools/libs/luch-request/helpers/buildURL.js
new file mode 100644
index 0000000..e90b908
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/helpers/buildURL.js
@@ -0,0 +1,64 @@
+'use strict'
+
+import * as utils from './../utils'
+
+function encode(val) {
+  return encodeURIComponent(val).replace(/%40/gi, '@').replace(/%3A/gi, ':').replace(/%24/g, '$').replace(/%2C/gi, ',').replace(/%20/g, '+').replace(/%5B/gi, '[').replace(/%5D/gi, ']')
+}
+
+/**
+ * Build a URL by appending params to the end
+ *
+ * @param {string} url The base of the url (e.g., http://www.google.com)
+ * @param {object} [params] The params to be appended
+ * @returns {string} The formatted url
+ */
+export default function buildURL(url, params, paramsSerializer) {
+  /*eslint no-param-reassign:0*/
+  if (!params) {
+    return url
+  }
+
+  var serializedParams
+  if (paramsSerializer) {
+    serializedParams = paramsSerializer(params)
+  } else if (utils.isURLSearchParams(params)) {
+    serializedParams = params.toString()
+  } else {
+    var parts = []
+
+    utils.forEach(params, function serialize(val, key) {
+      if (val === null || typeof val === 'undefined') {
+        return
+      }
+
+      if (utils.isArray(val)) {
+        key = key + '[]'
+      } else {
+        val = [val]
+      }
+
+      utils.forEach(val, function parseValue(v) {
+        if (utils.isDate(v)) {
+          v = v.toISOString()
+        } else if (utils.isObject(v)) {
+          v = JSON.stringify(v)
+        }
+        parts.push(encode(key) + '=' + encode(v))
+      })
+    })
+
+    serializedParams = parts.join('&')
+  }
+
+  if (serializedParams) {
+    var hashmarkIndex = url.indexOf('#')
+    if (hashmarkIndex !== -1) {
+      url = url.slice(0, hashmarkIndex)
+    }
+
+    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams
+  }
+
+  return url
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/helpers/combineURLs.js b/uni_modules/uv-ui-tools/libs/luch-request/helpers/combineURLs.js
new file mode 100644
index 0000000..7b9d1ef
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/helpers/combineURLs.js
@@ -0,0 +1,14 @@
+'use strict'
+
+/**
+ * Creates a new URL by combining the specified URLs
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} relativeURL The relative URL
+ * @returns {string} The combined URL
+ */
+export default function combineURLs(baseURL, relativeURL) {
+  return relativeURL
+    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
+    : baseURL
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/helpers/isAbsoluteURL.js b/uni_modules/uv-ui-tools/libs/luch-request/helpers/isAbsoluteURL.js
new file mode 100644
index 0000000..2a82517
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/helpers/isAbsoluteURL.js
@@ -0,0 +1,14 @@
+'use strict'
+
+/**
+ * Determines whether the specified URL is absolute
+ *
+ * @param {string} url The URL to test
+ * @returns {boolean} True if the specified URL is absolute, otherwise false
+ */
+export default function isAbsoluteURL(url) {
+  // A URL is considered absolute if it begins with "<scheme>://" or "//" (protocol-relative URL).
+  // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed
+  // by any combination of letters, digits, plus, period, or hyphen.
+  return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url)
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/index.d.ts b/uni_modules/uv-ui-tools/libs/luch-request/index.d.ts
new file mode 100644
index 0000000..62d3fb9
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/index.d.ts
@@ -0,0 +1,197 @@
+export type HttpTask = UniApp.RequestTask | UniApp.UploadTask | UniApp.DownloadTask;
+
+export type HttpRequestTask = UniApp.RequestTask;
+
+export type HttpUploadTask = UniApp.UploadTask;
+
+export type HttpDownloadTask = UniApp.DownloadTask;
+
+export type HttpMethod =
+    "GET"
+    | "POST"
+    | "PUT"
+    | "DELETE"
+    | "CONNECT"
+    | "HEAD"
+    | "OPTIONS"
+    | "TRACE"
+    | "UPLOAD"
+    | "DOWNLOAD";
+
+export type HttpRequestHeader = Record<string, string>;
+
+export type HttpParams = Record<string, any>;
+
+export type HttpData = Record<string, any>;
+
+export type HttpResponseType = 'arraybuffer' | 'text';
+
+export type HttpCustom = Record<string, any>;
+
+export type HttpFileType = 'image' | 'video' | 'audio';
+
+export type HttpFormData = Record<string, any>;
+
+export type HttpResponseHeader = Record<string, string> & {
+    "set-cookie"?: string[]
+};
+
+export interface HttpRequestConfig<T = HttpTask> {
+    /** @desc 请求服务器接口地址 */
+    url?: string;
+    /** @desc 请求方式，默认为 GET */
+    method?: HttpMethod;
+    /** @desc 请求基地址 */
+    baseURL?: string;
+    /** @desc 请求头信息，不能设置 Referer，App、H5 端会自动带上 cookie，且 H5 端不可手动修改 */
+    header?: HttpRequestHeader;
+    /** @desc 请求查询参数，自动拼接为查询字符串 */
+    params?: HttpParams;
+    /** @desc 请求体参数 */
+    data?: HttpData;
+    /** @desc 超时时间，单位 ms，默认为 60000，仅 H5 (HBuilderX 2.9.9+)、APP (HBuilderX 2.9.9+)、微信小程序 (2.10.0)、支付宝小程序支持 */
+    timeout?: number;
+    /** @desc 跨域请求时是否携带凭证 (cookies)，默认为 false，仅 H5 (HBuilderX 2.6.15+) 支持 */
+    withCredentials?: boolean;
+    /** @desc 设置响应的数据类型，支付宝小程序不支持 */
+    responseType?: HttpResponseType;
+    /** @desc 全局自定义验证器 */
+    validateStatus?: ((statusCode: number) => boolean) | null;
+
+
+    /** params 参数自定义处理 */
+    paramsSerializer?: (params: AnyObject) => string | void;
+
+    /** @desc 默认为 json，如果设为 json，会尝试对返回的数据做一次 JSON.parse */
+    dataType?: string;
+    /** @desc DNS 解析时是否优先使用 ipv4，默认为 false，仅 App-Android (HBuilderX 2.8.0+) 支持 */
+    firstIpv4?: boolean;
+    /** @desc 是否验证 SSL 证书，默认为 true，仅 App-Android (HBuilderX 2.3.3+) 支持 */
+    sslVerify?: boolean;
+
+    /** @desc 开启 http2;微信小程序 */
+    enableHttp2?: boolean;
+
+    /** @desc 开启 quic；微信小程序 */
+    enableQuic?: boolean;
+    /** @desc 开启 cache;微信小程序、字节跳动小程序 2.31.0+ */
+    enableCache?: boolean;
+    /** @desc 开启 httpDNS;微信小程序 */
+    enableHttpDNS?: boolean;
+    /** @desc httpDNS 服务商；微信小程序 */
+    httpDNSServiceId?: string;
+    /** @desc 开启 transfer-encoding chunked;微信小程序 */
+    enableChunked?: boolean;
+    /** @desc wifi下使用移动网络发送请求;微信小程序 */
+    forceCellularNetwork?: boolean;
+    /** @desc 开启后可在headers中编辑cookie;支付宝小程序 10.2.33+ */
+    enableCookie?: boolean;
+    /** @desc 是否开启云加速;百度小程序 3.310.11+ */
+    cloudCache?: boolean | object;
+    /** @desc 控制当前请求是否延时至首屏内容渲染后发送；百度小程序 3.310.11+ */
+    defer?: boolean;
+
+    /** @desc 自定义参数 */
+    custom?: HttpCustom;
+
+    /** @desc 返回当前请求的 task 和 options，不要在这里修改 options */
+    getTask?: (task: T, options: HttpRequestConfig<T>) => void;
+
+    /** @desc 需要上传的文件列表，使用 files 时，filePath 和 name 不生效，仅支持 App、H5 (2.6.15+) */
+    files?: { name?: string; file?: File; uri: string; }[];
+    /** @desc 文件类型，仅支付宝小程序支持且为必填项 */
+    fileType?: HttpFileType;
+    /** @desc 要上传的文件对象，仅 H5 (2.6.15+) 支持 */
+    file?: File;
+    /** @desc 要上传文件资源的路径，使用 files 时，filePath 和 name 不生效 */
+    filePath?: string;
+    /** @desc 文件对应的 key，开发者在服务器端通过这个 key 可以获取到文件二进制内容，使用 files 时，filePath 和 name 不生效 */
+    name?: string;
+    /** @desc 请求中其他额外的 form data */
+    formData?: HttpFormData;
+}
+
+export interface HttpResponse<T = any, D = HttpTask> {
+    data: T;
+    statusCode: number;
+    header: HttpResponseHeader;
+    config: HttpRequestConfig<D>;
+    cookies: string[];
+    errMsg: string;
+    rawData: any;
+}
+
+export interface HttpUploadResponse<T = any, D = HttpTask> {
+    data: T;
+    statusCode: number;
+    config: HttpRequestConfig<D>;
+    errMsg: string;
+    rawData: any;
+}
+
+export interface HttpDownloadResponse extends HttpResponse {
+    tempFilePath: string;
+    apFilePath?: string;
+    filePath?: string;
+    fileContent?: string;
+}
+
+export interface HttpError<T = any, D = HttpTask> {
+    data?: T;
+    statusCode?: number;
+    header?: HttpResponseHeader;
+    config: HttpRequestConfig<D>;
+    cookies?: string[];
+    errMsg: string;
+}
+
+export interface HttpPromise<T = any> extends Promise<HttpResponse<T>> {
+}
+
+export interface HttpInterceptorManager<V, E = V> {
+    use(onFulfilled?: (value: V) => V | Promise<V>, onRejected?: (error: E) => T | Promise<E>): void;
+
+    eject(id: number): void;
+}
+
+export abstract class HttpRequestAbstract {
+    constructor(config?: HttpRequestConfig);
+
+    interceptors: {
+        request: HttpInterceptorManager<HttpRequestConfig>;
+        response: HttpInterceptorManager<HttpResponse, HttpError>;
+    }
+
+    request<T = any, R = HttpResponse<T>, D = HttpRequestTask>(config: HttpRequestConfig<D>): Promise<R>;
+
+    get<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, config?: HttpRequestConfig<D>): Promise<R>;
+
+    delete<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    head<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    options<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    post<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    put<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    config: HttpRequestConfig;
+
+    setConfig<D = HttpTask>(onSend: (config: HttpRequestConfig<D>) => HttpRequestConfig<D>): void;
+
+    connect<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    trace<T = any, R = HttpResponse<T>, D = HttpRequestTask>(url: string, data?: HttpData, config?: HttpRequestConfig<D>): Promise<R>;
+
+    upload<T = any, R = HttpUploadResponse<T>, D = HttpUploadTask>(url: string, config?: HttpRequestConfig<D>): Promise<R>;
+
+    download<T = any, R = HttpDownloadResponse<T>, D = HttpDownloadTask>(url: string, config?: HttpRequestConfig<D>): Promise<R>;
+
+    middleware<T = any, R = HttpResponse<T>, D = HttpTask>(config: HttpRequestConfig<D>): Promise<R>;
+}
+
+declare class HttpRequest extends HttpRequestAbstract {
+}
+
+export default HttpRequest;
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/index.js b/uni_modules/uv-ui-tools/libs/luch-request/index.js
new file mode 100644
index 0000000..d8fe348
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/index.js
@@ -0,0 +1,2 @@
+import Request from './core/Request'
+export default Request
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/utils.js b/uni_modules/uv-ui-tools/libs/luch-request/utils.js
new file mode 100644
index 0000000..0b5bf21
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/utils.js
@@ -0,0 +1,135 @@
+'use strict'
+
+// utils is a library of generic helper functions non-specific to axios
+
+var toString = Object.prototype.toString
+
+/**
+ * Determine if a value is an Array
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Array, otherwise false
+ */
+export function isArray (val) {
+  return toString.call(val) === '[object Array]'
+}
+
+
+/**
+ * Determine if a value is an Object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Object, otherwise false
+ */
+export function isObject (val) {
+  return val !== null && typeof val === 'object'
+}
+
+/**
+ * Determine if a value is a Date
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Date, otherwise false
+ */
+export function isDate (val) {
+  return toString.call(val) === '[object Date]'
+}
+
+/**
+ * Determine if a value is a URLSearchParams object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a URLSearchParams object, otherwise false
+ */
+export function isURLSearchParams (val) {
+  return typeof URLSearchParams !== 'undefined' && val instanceof URLSearchParams
+}
+
+
+/**
+ * Iterate over an Array or an Object invoking a function for each item.
+ *
+ * If `obj` is an Array callback will be called passing
+ * the value, index, and complete array for each item.
+ *
+ * If 'obj' is an Object callback will be called passing
+ * the value, key, and complete object for each property.
+ *
+ * @param {Object|Array} obj The object to iterate
+ * @param {Function} fn The callback to invoke for each item
+ */
+export function forEach (obj, fn) {
+  // Don't bother if no value provided
+  if (obj === null || typeof obj === 'undefined') {
+    return
+  }
+
+  // Force an array if not already something iterable
+  if (typeof obj !== 'object') {
+    /*eslint no-param-reassign:0*/
+    obj = [obj]
+  }
+
+  if (isArray(obj)) {
+    // Iterate over array values
+    for (var i = 0, l = obj.length; i < l; i++) {
+      fn.call(null, obj[i], i, obj)
+    }
+  } else {
+    // Iterate over object keys
+    for (var key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        fn.call(null, obj[key], key, obj)
+      }
+    }
+  }
+}
+
+/**
+ * 是否为boolean 值
+ * @param val
+ * @returns {boolean}
+ */
+export function isBoolean(val) {
+  return typeof val === 'boolean'
+}
+
+/**
+ * 是否为真正的对象{} new Object
+ * @param {any} obj - 检测的对象
+ * @returns {boolean}
+ */
+export function isPlainObject(obj) {
+  return Object.prototype.toString.call(obj) === '[object Object]'
+}
+
+
+
+/**
+ * Function equal to merge with the difference being that no reference
+ * to original objects is kept.
+ *
+ * @see merge
+ * @param {Object} obj1 Object to merge
+ * @returns {Object} Result of all merge properties
+ */
+export function deepMerge(/* obj1, obj2, obj3, ... */) {
+  let result = {}
+  function assignValue(val, key) {
+    if (typeof result[key] === 'object' && typeof val === 'object') {
+      result[key] = deepMerge(result[key], val)
+    } else if (typeof val === 'object') {
+      result[key] = deepMerge({}, val)
+    } else {
+      result[key] = val
+    }
+  }
+  for (let i = 0, l = arguments.length; i < l; i++) {
+    forEach(arguments[i], assignValue)
+  }
+  return result
+}
+
+export function isUndefined (val) {
+  return typeof val === 'undefined'
+}
diff --git a/uni_modules/uv-ui-tools/libs/luch-request/utils/clone.js b/uni_modules/uv-ui-tools/libs/luch-request/utils/clone.js
new file mode 100644
index 0000000..2fee704
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/luch-request/utils/clone.js
@@ -0,0 +1,264 @@
+/* eslint-disable */
+var clone = (function() {
+  'use strict';
+
+  function _instanceof(obj, type) {
+    return type != null && obj instanceof type;
+  }
+
+  var nativeMap;
+  try {
+    nativeMap = Map;
+  } catch(_) {
+    // maybe a reference error because no `Map`. Give it a dummy value that no
+    // value will ever be an instanceof.
+    nativeMap = function() {};
+  }
+
+  var nativeSet;
+  try {
+    nativeSet = Set;
+  } catch(_) {
+    nativeSet = function() {};
+  }
+
+  var nativePromise;
+  try {
+    nativePromise = Promise;
+  } catch(_) {
+    nativePromise = function() {};
+  }
+
+  /**
+   * Clones (copies) an Object using deep copying.
+   *
+   * This function supports circular references by default, but if you are certain
+   * there are no circular references in your object, you can save some CPU time
+   * by calling clone(obj, false).
+   *
+   * Caution: if `circular` is false and `parent` contains circular references,
+   * your program may enter an infinite loop and crash.
+   *
+   * @param `parent` - the object to be cloned
+   * @param `circular` - set to true if the object to be cloned may contain
+   *    circular references. (optional - true by default)
+   * @param `depth` - set to a number if the object is only to be cloned to
+   *    a particular depth. (optional - defaults to Infinity)
+   * @param `prototype` - sets the prototype to be used when cloning an object.
+   *    (optional - defaults to parent prototype).
+   * @param `includeNonEnumerable` - set to true if the non-enumerable properties
+   *    should be cloned as well. Non-enumerable properties on the prototype
+   *    chain will be ignored. (optional - false by default)
+   */
+  function clone(parent, circular, depth, prototype, includeNonEnumerable) {
+    if (typeof circular === 'object') {
+      depth = circular.depth;
+      prototype = circular.prototype;
+      includeNonEnumerable = circular.includeNonEnumerable;
+      circular = circular.circular;
+    }
+    // maintain two arrays for circular references, where corresponding parents
+    // and children have the same index
+    var allParents = [];
+    var allChildren = [];
+
+    var useBuffer = typeof Buffer != 'undefined';
+
+    if (typeof circular == 'undefined')
+      circular = true;
+
+    if (typeof depth == 'undefined')
+      depth = Infinity;
+
+    // recurse this function so we don't reset allParents and allChildren
+    function _clone(parent, depth) {
+      // cloning null always returns null
+      if (parent === null)
+        return null;
+
+      if (depth === 0)
+        return parent;
+
+      var child;
+      var proto;
+      if (typeof parent != 'object') {
+        return parent;
+      }
+
+      if (_instanceof(parent, nativeMap)) {
+        child = new nativeMap();
+      } else if (_instanceof(parent, nativeSet)) {
+        child = new nativeSet();
+      } else if (_instanceof(parent, nativePromise)) {
+        child = new nativePromise(function (resolve, reject) {
+          parent.then(function(value) {
+            resolve(_clone(value, depth - 1));
+          }, function(err) {
+            reject(_clone(err, depth - 1));
+          });
+        });
+      } else if (clone.__isArray(parent)) {
+        child = [];
+      } else if (clone.__isRegExp(parent)) {
+        child = new RegExp(parent.source, __getRegExpFlags(parent));
+        if (parent.lastIndex) child.lastIndex = parent.lastIndex;
+      } else if (clone.__isDate(parent)) {
+        child = new Date(parent.getTime());
+      } else if (useBuffer && Buffer.isBuffer(parent)) {
+        if (Buffer.from) {
+          // Node.js >= 5.10.0
+          child = Buffer.from(parent);
+        } else {
+          // Older Node.js versions
+          child = new Buffer(parent.length);
+          parent.copy(child);
+        }
+        return child;
+      } else if (_instanceof(parent, Error)) {
+        child = Object.create(parent);
+      } else {
+        if (typeof prototype == 'undefined') {
+          proto = Object.getPrototypeOf(parent);
+          child = Object.create(proto);
+        }
+        else {
+          child = Object.create(prototype);
+          proto = prototype;
+        }
+      }
+
+      if (circular) {
+        var index = allParents.indexOf(parent);
+
+        if (index != -1) {
+          return allChildren[index];
+        }
+        allParents.push(parent);
+        allChildren.push(child);
+      }
+
+      if (_instanceof(parent, nativeMap)) {
+        parent.forEach(function(value, key) {
+          var keyChild = _clone(key, depth - 1);
+          var valueChild = _clone(value, depth - 1);
+          child.set(keyChild, valueChild);
+        });
+      }
+      if (_instanceof(parent, nativeSet)) {
+        parent.forEach(function(value) {
+          var entryChild = _clone(value, depth - 1);
+          child.add(entryChild);
+        });
+      }
+
+      for (var i in parent) {
+        var attrs = Object.getOwnPropertyDescriptor(parent, i);
+        if (attrs) {
+          child[i] = _clone(parent[i], depth - 1);
+        }
+
+        try {
+          var objProperty = Object.getOwnPropertyDescriptor(parent, i);
+          if (objProperty.set === 'undefined') {
+            // no setter defined. Skip cloning this property
+            continue;
+          }
+          child[i] = _clone(parent[i], depth - 1);
+        } catch(e){
+          if (e instanceof TypeError) {
+            // when in strict mode, TypeError will be thrown if child[i] property only has a getter
+            // we can't do anything about this, other than inform the user that this property cannot be set.
+            continue
+          } else if (e instanceof ReferenceError) {
+            //this may happen in non strict mode
+            continue
+          }
+        }
+
+      }
+
+      if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(parent);
+        for (var i = 0; i < symbols.length; i++) {
+          // Don't need to worry about cloning a symbol because it is a primitive,
+          // like a number or string.
+          var symbol = symbols[i];
+          var descriptor = Object.getOwnPropertyDescriptor(parent, symbol);
+          if (descriptor && !descriptor.enumerable && !includeNonEnumerable) {
+            continue;
+          }
+          child[symbol] = _clone(parent[symbol], depth - 1);
+          Object.defineProperty(child, symbol, descriptor);
+        }
+      }
+
+      if (includeNonEnumerable) {
+        var allPropertyNames = Object.getOwnPropertyNames(parent);
+        for (var i = 0; i < allPropertyNames.length; i++) {
+          var propertyName = allPropertyNames[i];
+          var descriptor = Object.getOwnPropertyDescriptor(parent, propertyName);
+          if (descriptor && descriptor.enumerable) {
+            continue;
+          }
+          child[propertyName] = _clone(parent[propertyName], depth - 1);
+          Object.defineProperty(child, propertyName, descriptor);
+        }
+      }
+
+      return child;
+    }
+
+    return _clone(parent, depth);
+  }
+
+  /**
+   * Simple flat clone using prototype, accepts only objects, usefull for property
+   * override on FLAT configuration object (no nested props).
+   *
+   * USE WITH CAUTION! This may not behave as you wish if you do not know how this
+   * works.
+   */
+  clone.clonePrototype = function clonePrototype(parent) {
+    if (parent === null)
+      return null;
+
+    var c = function () {};
+    c.prototype = parent;
+    return new c();
+  };
+
+// private utility functions
+
+  function __objToStr(o) {
+    return Object.prototype.toString.call(o);
+  }
+  clone.__objToStr = __objToStr;
+
+  function __isDate(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object Date]';
+  }
+  clone.__isDate = __isDate;
+
+  function __isArray(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object Array]';
+  }
+  clone.__isArray = __isArray;
+
+  function __isRegExp(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object RegExp]';
+  }
+  clone.__isRegExp = __isRegExp;
+
+  function __getRegExpFlags(re) {
+    var flags = '';
+    if (re.global) flags += 'g';
+    if (re.ignoreCase) flags += 'i';
+    if (re.multiline) flags += 'm';
+    return flags;
+  }
+  clone.__getRegExpFlags = __getRegExpFlags;
+
+  return clone;
+})();
+
+export default clone
diff --git a/uni_modules/uv-ui-tools/libs/mixin/button.js b/uni_modules/uv-ui-tools/libs/mixin/button.js
new file mode 100644
index 0000000..0c019c2
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/button.js
@@ -0,0 +1,13 @@
+export default {
+    props: {
+        lang: String,
+        sessionFrom: String,
+        sendMessageTitle: String,
+        sendMessagePath: String,
+        sendMessageImg: String,
+        showMessageCard: Boolean,
+        appParameter: String,
+        formType: String,
+        openType: String
+    }
+}
diff --git a/uni_modules/uv-ui-tools/libs/mixin/mixin.js b/uni_modules/uv-ui-tools/libs/mixin/mixin.js
new file mode 100644
index 0000000..0dd3b03
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/mixin.js
@@ -0,0 +1,172 @@
+import * as index from '../function/index.js';
+import * as test from '../function/test.js';
+import route from '../util/route.js';
+import debounce from '../function/debounce.js';
+import throttle from '../function/throttle.js';
+export default {
+	// 定义每个组件都可能需要用到的外部样式以及类名
+	props: {
+		// 每个组件都有的父组件传递的样式，可以为字符串或者对象形式
+		customStyle: {
+			type: [Object, String],
+			default: () => ({})
+		},
+		customClass: {
+			type: String,
+			default: ''
+		},
+		// 跳转的页面路径
+		url: {
+			type: String,
+			default: ''
+		},
+		// 页面跳转的类型
+		linkType: {
+			type: String,
+			default: 'navigateTo'
+		}
+	},
+	data() {
+		return {}
+	},
+	onLoad() {
+		// getRect挂载到$uv上，因为这方法需要使用in(this)，所以无法把它独立成一个单独的文件导出
+		this.$uv.getRect = this.$uvGetRect
+	},
+	created() {
+		// 组件当中，只有created声明周期，为了能在组件使用，故也在created中将方法挂载到$uv
+		this.$uv.getRect = this.$uvGetRect
+	},
+	computed: {
+		$uv() {
+			return {
+				...index,
+				test,
+				route,
+				debounce,
+				throttle,
+				unit: uni?.$uv?.config?.unit
+			}
+		},
+		/**
+		 * 生成bem规则类名
+		 * 由于微信小程序，H5，nvue之间绑定class的差异，无法通过:class="[bem()]"的形式进行同用
+		 * 故采用如下折中做法，最后返回的是数组（一般平台）或字符串（支付宝和字节跳动平台），类似['a', 'b', 'c']或'a b c'的形式
+		 * @param {String} name 组件名称
+		 * @param {Array} fixed 一直会存在的类名
+		 * @param {Array} change 会根据变量值为true或者false而出现或者隐藏的类名
+		 * @returns {Array|string}
+		 */
+		bem() {
+			return function(name, fixed, change) {
+				// 类名前缀
+				const prefix = `uv-${name}--`
+				const classes = {}
+				if (fixed) {
+					fixed.map((item) => {
+						// 这里的类名，会一直存在
+						classes[prefix + this[item]] = true
+					})
+				}
+				if (change) {
+					change.map((item) => {
+						// 这里的类名，会根据this[item]的值为true或者false，而进行添加或者移除某一个类
+						this[item] ? (classes[prefix + item] = this[item]) : (delete classes[prefix + item])
+					})
+				}
+				return Object.keys(classes)
+					// 支付宝，头条小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
+					// #ifdef MP-ALIPAY || MP-TOUTIAO || MP-LARK || MP-BAIDU
+					.join(' ')
+				// #endif
+			}
+		}
+	},
+	methods: {
+		// 跳转某一个页面
+		openPage(urlKey = 'url') {
+			const url = this[urlKey]
+			if (url) {
+				// 执行类似uni.navigateTo的方法
+				uni[this.linkType]({
+					url
+				})
+			}
+		},
+		// 查询节点信息
+		// 目前此方法在支付宝小程序中无法获取组件跟接点的尺寸，为支付宝的bug(2020-07-21)
+		// 解决办法为在组件根部再套一个没有任何作用的view元素
+		$uvGetRect(selector, all) {
+			return new Promise((resolve) => {
+				uni.createSelectorQuery()
+					.in(this)[all ? 'selectAll' : 'select'](selector)
+					.boundingClientRect((rect) => {
+						if (all && Array.isArray(rect) && rect.length) {
+							resolve(rect)
+						}
+						if (!all && rect) {
+							resolve(rect)
+						}
+					})
+					.exec()
+			})
+		},
+		getParentData(parentName = '') {
+			// 避免在created中去定义parent变量
+			if (!this.parent) this.parent = {}
+			// 这里的本质原理是，通过获取父组件实例(也即类似uv-radio的父组件uv-radio-group的this)
+			// 将父组件this中对应的参数，赋值给本组件(uv-radio的this)的parentData对象中对应的属性
+			// 之所以需要这么做，是因为所有端中，头条小程序不支持通过this.parent.xxx去监听父组件参数的变化
+			// 此处并不会自动更新子组件的数据，而是依赖父组件uv-radio-group去监听data的变化，手动调用更新子组件的方法去重新获取
+			this.parent = this.$uv.$parent.call(this, parentName)
+			if (this.parent.children) {
+				// 如果父组件的children不存在本组件的实例，才将本实例添加到父组件的children中
+				this.parent.children.indexOf(this) === -1 && this.parent.children.push(this)
+			}
+			if (this.parent && this.parentData) {
+				// 历遍parentData中的属性，将parent中的同名属性赋值给parentData
+				Object.keys(this.parentData).map((key) => {
+					this.parentData[key] = this.parent[key]
+				})
+			}
+		},
+		// 阻止事件冒泡
+		preventEvent(e) {
+			e && typeof(e.stopPropagation) === 'function' && e.stopPropagation()
+		},
+		// 空操作
+		noop(e) {
+			this.preventEvent(e)
+		}
+	},
+	onReachBottom() {
+		uni.$emit('uvOnReachBottom')
+	},
+	beforeDestroy() {
+		// 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况
+		// 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱
+		if (this.parent && test.array(this.parent.children)) {
+			// 组件销毁时，移除父组件中的children数组中对应的实例
+			const childrenList = this.parent.children
+			childrenList.map((child, index) => {
+				// 如果相等，则移除
+				if (child === this) {
+					childrenList.splice(index, 1)
+				}
+			})
+		}
+	},
+	// 兼容vue3
+	unmounted() {
+		if (this.parent && test.array(this.parent.children)) {
+			// 组件销毁时，移除父组件中的children数组中对应的实例
+			const childrenList = this.parent.children
+			childrenList.map((child, index) => {
+				// 如果相等，则移除
+				if (child === this) {
+					childrenList.splice(index, 1)
+				}
+			})
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js b/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js
new file mode 100644
index 0000000..90b6903
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js
@@ -0,0 +1,8 @@
+export default {
+    // #ifdef MP-WEIXIN
+    // 将自定义节点设置成虚拟的（去掉自定义组件包裹层），更加接近Vue组件的表现，能更好的使用flex属性
+    options: {
+        virtualHost: true
+    }
+    // #endif
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/mixin/mpShare.js b/uni_modules/uv-ui-tools/libs/mixin/mpShare.js
new file mode 100644
index 0000000..c9695a0
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/mpShare.js
@@ -0,0 +1,13 @@
+export default {
+	onLoad() {
+	    // 设置默认的转发参数
+	    uni.$uv.mpShare = {
+	        title: '', // 默认为小程序名称
+	        path: '', // 默认为当前页面路径
+	        imageUrl: '' // 默认为当前页面的截图
+	    }
+	},
+	onShareAppMessage() {
+	    return uni.$uv.mpShare
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/libs/mixin/openType.js b/uni_modules/uv-ui-tools/libs/mixin/openType.js
new file mode 100644
index 0000000..1b94b7e
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/openType.js
@@ -0,0 +1,47 @@
+export default {
+    props: {
+        openType: String
+    },
+		emits: ['getphonenumber','getuserinfo','error','opensetting','launchapp','contact','chooseavatar','addgroupapp','chooseaddress','subscribe','login','im'],
+    methods: {
+        onGetPhoneNumber(event) {
+            this.$emit('getphonenumber', event.detail)
+        },
+        onGetUserInfo(event) {
+            this.$emit('getuserinfo', event.detail)
+        },
+        onError(event) {
+            this.$emit('error', event.detail)
+        },
+        onOpenSetting(event) {
+            this.$emit('opensetting', event.detail)
+        },
+        onLaunchApp(event) {
+            this.$emit('launchapp', event.detail)
+        },
+        onContact(event) {
+            this.$emit('contact', event.detail)
+        },
+        onChooseavatar(event) {
+            this.$emit('chooseavatar', event.detail)
+        },
+        onAgreeprivacyauthorization(event) {
+            this.$emit('agreeprivacyauthorization', event.detail)
+        },
+        onAddgroupapp(event) {
+            this.$emit('addgroupapp', event.detail)
+        },
+        onChooseaddress(event) {
+            this.$emit('chooseaddress', event.detail)
+        },
+        onSubscribe(event) {
+            this.$emit('subscribe', event.detail)
+        },
+        onLogin(event) {
+            this.$emit('login', event.detail)
+        },
+        onIm(event) {
+            this.$emit('im', event.detail)
+        }
+    }
+}
diff --git a/uni_modules/uv-ui-tools/libs/mixin/touch.js b/uni_modules/uv-ui-tools/libs/mixin/touch.js
new file mode 100644
index 0000000..0ecbd88
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/mixin/touch.js
@@ -0,0 +1,59 @@
+const MIN_DISTANCE = 10
+
+function getDirection(x, y) {
+    if (x > y && x > MIN_DISTANCE) {
+        return 'horizontal'
+    }
+    if (y > x && y > MIN_DISTANCE) {
+        return 'vertical'
+    }
+    return ''
+}
+
+export default {
+    methods: {
+        getTouchPoint(e) {
+            if (!e) {
+                return {
+                    x: 0,
+                    y: 0
+                }
+            } if (e.touches && e.touches[0]) {
+                return {
+                    x: e.touches[0].pageX,
+                    y: e.touches[0].pageY
+                }
+            } if (e.changedTouches && e.changedTouches[0]) {
+                return {
+                    x: e.changedTouches[0].pageX,
+                    y: e.changedTouches[0].pageY
+                }
+            }
+            return {
+                x: e.clientX || 0,
+                y: e.clientY || 0
+            }
+        },
+        resetTouchStatus() {
+            this.direction = ''
+            this.deltaX = 0
+            this.deltaY = 0
+            this.offsetX = 0
+            this.offsetY = 0
+        },
+        touchStart(event) {
+            this.resetTouchStatus()
+            const touch = this.getTouchPoint(event)
+            this.startX = touch.x
+            this.startY = touch.y
+        },
+        touchMove(event) {
+            const touch = this.getTouchPoint(event)
+            this.deltaX = touch.x - this.startX
+            this.deltaY = touch.y - this.startY
+            this.offsetX = Math.abs(this.deltaX)
+            this.offsetY = Math.abs(this.deltaY)
+            this.direction =				this.direction || getDirection(this.offsetX, this.offsetY)
+        }
+    }
+}
diff --git a/uni_modules/uv-ui-tools/libs/util/dayjs.js b/uni_modules/uv-ui-tools/libs/util/dayjs.js
new file mode 100644
index 0000000..c84ab68
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/util/dayjs.js
@@ -0,0 +1,216 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+
+var require_dayjs_min = __commonJS({
+  "uvuidayjs"(exports, module) {
+    !function(t, e) {
+      "object" == typeof exports && "undefined" != typeof module ? module.exports = e() : "function" == typeof define && define.amd ? define(e) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs = e();
+    }(exports, function() {
+      "use strict";
+      var t = 1e3, e = 6e4, n = 36e5, r = "millisecond", i = "second", s = "minute", u = "hour", a = "day", o = "week", f = "month", h = "quarter", c = "year", d = "date", l = "Invalid Date", $ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, M = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(t2) {
+        var e2 = ["th", "st", "nd", "rd"], n2 = t2 % 100;
+        return "[" + t2 + (e2[(n2 - 20) % 10] || e2[n2] || e2[0]) + "]";
+      } }, m = function(t2, e2, n2) {
+        var r2 = String(t2);
+        return !r2 || r2.length >= e2 ? t2 : "" + Array(e2 + 1 - r2.length).join(n2) + t2;
+      }, v = { s: m, z: function(t2) {
+        var e2 = -t2.utcOffset(), n2 = Math.abs(e2), r2 = Math.floor(n2 / 60), i2 = n2 % 60;
+        return (e2 <= 0 ? "+" : "-") + m(r2, 2, "0") + ":" + m(i2, 2, "0");
+      }, m: function t2(e2, n2) {
+        if (e2.date() < n2.date())
+          return -t2(n2, e2);
+        var r2 = 12 * (n2.year() - e2.year()) + (n2.month() - e2.month()), i2 = e2.clone().add(r2, f), s2 = n2 - i2 < 0, u2 = e2.clone().add(r2 + (s2 ? -1 : 1), f);
+        return +(-(r2 + (n2 - i2) / (s2 ? i2 - u2 : u2 - i2)) || 0);
+      }, a: function(t2) {
+        return t2 < 0 ? Math.ceil(t2) || 0 : Math.floor(t2);
+      }, p: function(t2) {
+        return { M: f, y: c, w: o, d: a, D: d, h: u, m: s, s: i, ms: r, Q: h }[t2] || String(t2 || "").toLowerCase().replace(/s$/, "");
+      }, u: function(t2) {
+        return void 0 === t2;
+      } }, g = "en", D = {};
+      D[g] = M;
+      var p = function(t2) {
+        return t2 instanceof _;
+      }, S = function t2(e2, n2, r2) {
+        var i2;
+        if (!e2)
+          return g;
+        if ("string" == typeof e2) {
+          var s2 = e2.toLowerCase();
+          D[s2] && (i2 = s2), n2 && (D[s2] = n2, i2 = s2);
+          var u2 = e2.split("-");
+          if (!i2 && u2.length > 1)
+            return t2(u2[0]);
+        } else {
+          var a2 = e2.name;
+          D[a2] = e2, i2 = a2;
+        }
+        return !r2 && i2 && (g = i2), i2 || !r2 && g;
+      }, w = function(t2, e2) {
+        if (p(t2))
+          return t2.clone();
+        var n2 = "object" == typeof e2 ? e2 : {};
+        return n2.date = t2, n2.args = arguments, new _(n2);
+      }, O = v;
+      O.l = S, O.i = p, O.w = function(t2, e2) {
+        return w(t2, { locale: e2.$L, utc: e2.$u, x: e2.$x, $offset: e2.$offset });
+      };
+      var _ = function() {
+        function M2(t2) {
+          this.$L = S(t2.locale, null, true), this.parse(t2);
+        }
+        var m2 = M2.prototype;
+        return m2.parse = function(t2) {
+          this.$d = function(t3) {
+            var e2 = t3.date, n2 = t3.utc;
+            if (null === e2)
+              return new Date(NaN);
+            if (O.u(e2))
+              return new Date();
+            if (e2 instanceof Date)
+              return new Date(e2);
+            if ("string" == typeof e2 && !/Z$/i.test(e2)) {
+              var r2 = e2.match($);
+              if (r2) {
+                var i2 = r2[2] - 1 || 0, s2 = (r2[7] || "0").substring(0, 3);
+                return n2 ? new Date(Date.UTC(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2)) : new Date(r2[1], i2, r2[3] || 1, r2[4] || 0, r2[5] || 0, r2[6] || 0, s2);
+              }
+            }
+            return new Date(e2);
+          }(t2), this.$x = t2.x || {}, this.init();
+        }, m2.init = function() {
+          var t2 = this.$d;
+          this.$y = t2.getFullYear(), this.$M = t2.getMonth(), this.$D = t2.getDate(), this.$W = t2.getDay(), this.$H = t2.getHours(), this.$m = t2.getMinutes(), this.$s = t2.getSeconds(), this.$ms = t2.getMilliseconds();
+        }, m2.$utils = function() {
+          return O;
+        }, m2.isValid = function() {
+          return !(this.$d.toString() === l);
+        }, m2.isSame = function(t2, e2) {
+          var n2 = w(t2);
+          return this.startOf(e2) <= n2 && n2 <= this.endOf(e2);
+        }, m2.isAfter = function(t2, e2) {
+          return w(t2) < this.startOf(e2);
+        }, m2.isBefore = function(t2, e2) {
+          return this.endOf(e2) < w(t2);
+        }, m2.$g = function(t2, e2, n2) {
+          return O.u(t2) ? this[e2] : this.set(n2, t2);
+        }, m2.unix = function() {
+          return Math.floor(this.valueOf() / 1e3);
+        }, m2.valueOf = function() {
+          return this.$d.getTime();
+        }, m2.startOf = function(t2, e2) {
+          var n2 = this, r2 = !!O.u(e2) || e2, h2 = O.p(t2), l2 = function(t3, e3) {
+            var i2 = O.w(n2.$u ? Date.UTC(n2.$y, e3, t3) : new Date(n2.$y, e3, t3), n2);
+            return r2 ? i2 : i2.endOf(a);
+          }, $2 = function(t3, e3) {
+            return O.w(n2.toDate()[t3].apply(n2.toDate("s"), (r2 ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(e3)), n2);
+          }, y2 = this.$W, M3 = this.$M, m3 = this.$D, v2 = "set" + (this.$u ? "UTC" : "");
+          switch (h2) {
+            case c:
+              return r2 ? l2(1, 0) : l2(31, 11);
+            case f:
+              return r2 ? l2(1, M3) : l2(0, M3 + 1);
+            case o:
+              var g2 = this.$locale().weekStart || 0, D2 = (y2 < g2 ? y2 + 7 : y2) - g2;
+              return l2(r2 ? m3 - D2 : m3 + (6 - D2), M3);
+            case a:
+            case d:
+              return $2(v2 + "Hours", 0);
+            case u:
+              return $2(v2 + "Minutes", 1);
+            case s:
+              return $2(v2 + "Seconds", 2);
+            case i:
+              return $2(v2 + "Milliseconds", 3);
+            default:
+              return this.clone();
+          }
+        }, m2.endOf = function(t2) {
+          return this.startOf(t2, false);
+        }, m2.$set = function(t2, e2) {
+          var n2, o2 = O.p(t2), h2 = "set" + (this.$u ? "UTC" : ""), l2 = (n2 = {}, n2[a] = h2 + "Date", n2[d] = h2 + "Date", n2[f] = h2 + "Month", n2[c] = h2 + "FullYear", n2[u] = h2 + "Hours", n2[s] = h2 + "Minutes", n2[i] = h2 + "Seconds", n2[r] = h2 + "Milliseconds", n2)[o2], $2 = o2 === a ? this.$D + (e2 - this.$W) : e2;
+          if (o2 === f || o2 === c) {
+            var y2 = this.clone().set(d, 1);
+            y2.$d[l2]($2), y2.init(), this.$d = y2.set(d, Math.min(this.$D, y2.daysInMonth())).$d;
+          } else
+            l2 && this.$d[l2]($2);
+          return this.init(), this;
+        }, m2.set = function(t2, e2) {
+          return this.clone().$set(t2, e2);
+        }, m2.get = function(t2) {
+          return this[O.p(t2)]();
+        }, m2.add = function(r2, h2) {
+          var d2, l2 = this;
+          r2 = Number(r2);
+          var $2 = O.p(h2), y2 = function(t2) {
+            var e2 = w(l2);
+            return O.w(e2.date(e2.date() + Math.round(t2 * r2)), l2);
+          };
+          if ($2 === f)
+            return this.set(f, this.$M + r2);
+          if ($2 === c)
+            return this.set(c, this.$y + r2);
+          if ($2 === a)
+            return y2(1);
+          if ($2 === o)
+            return y2(7);
+          var M3 = (d2 = {}, d2[s] = e, d2[u] = n, d2[i] = t, d2)[$2] || 1, m3 = this.$d.getTime() + r2 * M3;
+          return O.w(m3, this);
+        }, m2.subtract = function(t2, e2) {
+          return this.add(-1 * t2, e2);
+        }, m2.format = function(t2) {
+          var e2 = this, n2 = this.$locale();
+          if (!this.isValid())
+            return n2.invalidDate || l;
+          var r2 = t2 || "YYYY-MM-DDTHH:mm:ssZ", i2 = O.z(this), s2 = this.$H, u2 = this.$m, a2 = this.$M, o2 = n2.weekdays, f2 = n2.months, h2 = function(t3, n3, i3, s3) {
+            return t3 && (t3[n3] || t3(e2, r2)) || i3[n3].slice(0, s3);
+          }, c2 = function(t3) {
+            return O.s(s2 % 12 || 12, t3, "0");
+          }, d2 = n2.meridiem || function(t3, e3, n3) {
+            var r3 = t3 < 12 ? "AM" : "PM";
+            return n3 ? r3.toLowerCase() : r3;
+          }, $2 = { YY: String(this.$y).slice(-2), YYYY: this.$y, M: a2 + 1, MM: O.s(a2 + 1, 2, "0"), MMM: h2(n2.monthsShort, a2, f2, 3), MMMM: h2(f2, a2), D: this.$D, DD: O.s(this.$D, 2, "0"), d: String(this.$W), dd: h2(n2.weekdaysMin, this.$W, o2, 2), ddd: h2(n2.weekdaysShort, this.$W, o2, 3), dddd: o2[this.$W], H: String(s2), HH: O.s(s2, 2, "0"), h: c2(1), hh: c2(2), a: d2(s2, u2, true), A: d2(s2, u2, false), m: String(u2), mm: O.s(u2, 2, "0"), s: String(this.$s), ss: O.s(this.$s, 2, "0"), SSS: O.s(this.$ms, 3, "0"), Z: i2 };
+          return r2.replace(y, function(t3, e3) {
+            return e3 || $2[t3] || i2.replace(":", "");
+          });
+        }, m2.utcOffset = function() {
+          return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
+        }, m2.diff = function(r2, d2, l2) {
+          var $2, y2 = O.p(d2), M3 = w(r2), m3 = (M3.utcOffset() - this.utcOffset()) * e, v2 = this - M3, g2 = O.m(this, M3);
+          return g2 = ($2 = {}, $2[c] = g2 / 12, $2[f] = g2, $2[h] = g2 / 3, $2[o] = (v2 - m3) / 6048e5, $2[a] = (v2 - m3) / 864e5, $2[u] = v2 / n, $2[s] = v2 / e, $2[i] = v2 / t, $2)[y2] || v2, l2 ? g2 : O.a(g2);
+        }, m2.daysInMonth = function() {
+          return this.endOf(f).$D;
+        }, m2.$locale = function() {
+          return D[this.$L];
+        }, m2.locale = function(t2, e2) {
+          if (!t2)
+            return this.$L;
+          var n2 = this.clone(), r2 = S(t2, e2, true);
+          return r2 && (n2.$L = r2), n2;
+        }, m2.clone = function() {
+          return O.w(this.$d, this);
+        }, m2.toDate = function() {
+          return new Date(this.valueOf());
+        }, m2.toJSON = function() {
+          return this.isValid() ? this.toISOString() : null;
+        }, m2.toISOString = function() {
+          return this.$d.toISOString();
+        }, m2.toString = function() {
+          return this.$d.toUTCString();
+        }, M2;
+      }(), T = _.prototype;
+      return w.prototype = T, [["$ms", r], ["$s", i], ["$m", s], ["$H", u], ["$W", a], ["$M", f], ["$y", c], ["$D", d]].forEach(function(t2) {
+        T[t2[1]] = function(e2) {
+          return this.$g(e2, t2[0], t2[1]);
+        };
+      }), w.extend = function(t2, e2) {
+        return t2.$i || (t2(e2, _, w), t2.$i = true), w;
+      }, w.locale = S, w.isDayjs = p, w.unix = function(t2) {
+        return w(1e3 * t2);
+      }, w.en = D[g], w.Ls = D, w.p = {}, w;
+    });
+  }
+});
+export default require_dayjs_min();
diff --git a/uni_modules/uv-ui-tools/libs/util/route.js b/uni_modules/uv-ui-tools/libs/util/route.js
new file mode 100644
index 0000000..80c0afd
--- /dev/null
+++ b/uni_modules/uv-ui-tools/libs/util/route.js
@@ -0,0 +1,126 @@
+/**
+ * 路由跳转方法，该方法相对于直接使用uni.xxx的好处是使用更加简单快捷
+ * 并且带有路由拦截功能
+ */
+import { queryParams, deepMerge, page } from '@/uni_modules/uv-ui-tools/libs/function/index.js'
+class Router {
+	constructor() {
+		// 原始属性定义
+		this.config = {
+			type: 'navigateTo',
+			url: '',
+			delta: 1, // navigateBack页面后退时,回退的层数
+			params: {}, // 传递的参数
+			animationType: 'pop-in', // 窗口动画,只在APP有效
+			animationDuration: 300, // 窗口动画持续时间,单位毫秒,只在APP有效
+			intercept: false ,// 是否需要拦截
+			events: {} // 页面间通信接口，用于监听被打开页面发送到当前页面的数据。hbuilderx 2.8.9+ 开始支持。
+		}
+		// 因为route方法是需要对外赋值给另外的对象使用，同时route内部有使用this，会导致route失去上下文
+		// 这里在构造函数中进行this绑定
+		this.route = this.route.bind(this)
+	}
+
+	// 判断url前面是否有"/"，如果没有则加上，否则无法跳转
+	addRootPath(url) {
+		return url[0] === '/' ? url : `/${url}`
+	}
+
+	// 整合路由参数
+	mixinParam(url, params) {
+		url = url && this.addRootPath(url)
+
+		// 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
+		// 如果有url中有get参数，转换后无需带上"?"
+		let query = ''
+		if (/.*\/.*\?.*=.*/.test(url)) {
+			// object对象转为get类型的参数
+			query = queryParams(params, false)
+			// 因为已有get参数,所以后面拼接的参数需要带上"&"隔开
+			return url += `&${query}`
+		}
+		// 直接拼接参数，因为此处url中没有后面的query参数，也就没有"?/&"之类的符号
+		query = queryParams(params)
+		return url += query
+	}
+
+	// 对外的方法名称
+	async route(options = {}, params = {}) {
+		// 合并用户的配置和内部的默认配置
+		let mergeConfig = {}
+
+		if (typeof options === 'string') {
+			// 如果options为字符串，则为route(url, params)的形式
+			mergeConfig.url = this.mixinParam(options, params)
+			mergeConfig.type = 'navigateTo'
+		} else {
+			mergeConfig = deepMerge(this.config, options)
+			// 否则正常使用mergeConfig中的url和params进行拼接
+			mergeConfig.url = this.mixinParam(options.url, options.params)
+		}
+		// 如果本次跳转的路径和本页面路径一致，不执行跳转，防止用户快速点击跳转按钮，造成多次跳转同一个页面的问题
+		if (mergeConfig.url === page()) return
+
+		if (params.intercept) {
+			mergeConfig.intercept = params.intercept
+		}
+		// params参数也带给拦截器
+		mergeConfig.params = params
+		// 合并内外部参数
+		mergeConfig = deepMerge(this.config, mergeConfig)
+		// 判断用户是否定义了拦截器
+		if (typeof mergeConfig.intercept === 'function') {
+			// 定一个promise，根据用户执行resolve(true)或者resolve(false)来决定是否进行路由跳转
+			const isNext = await new Promise((resolve, reject) => {
+				mergeConfig.intercept(mergeConfig, resolve)
+			})
+			// 如果isNext为true，则执行路由跳转
+			isNext && this.openPage(mergeConfig)
+		} else {
+			this.openPage(mergeConfig)
+		}
+	}
+
+	// 执行路由跳转
+	openPage(config) {
+		// 解构参数
+		const {
+			url,
+			type,
+			delta,
+			animationType,
+			animationDuration,
+			events
+		} = config
+		if (config.type == 'navigateTo' || config.type == 'to') {
+			uni.navigateTo({
+				url,
+				animationType,
+				animationDuration,
+				events
+			})
+		}
+		if (config.type == 'redirectTo' || config.type == 'redirect') {
+			uni.redirectTo({
+				url
+			})
+		}
+		if (config.type == 'switchTab' || config.type == 'tab') {
+			uni.switchTab({
+				url
+			})
+		}
+		if (config.type == 'reLaunch' || config.type == 'launch') {
+			uni.reLaunch({
+				url
+			})
+		}
+		if (config.type == 'navigateBack' || config.type == 'back') {
+			uni.navigateBack({
+				delta
+			})
+		}
+	}
+}
+
+export default (new Router()).route
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/package.json b/uni_modules/uv-ui-tools/package.json
new file mode 100644
index 0000000..2d940f6
--- /dev/null
+++ b/uni_modules/uv-ui-tools/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "uv-ui-tools",
+  "displayName": "uv-ui-tools 工具集 全面兼容vue3+2、app、h5、小程序等多端",
+  "version": "1.1.25",
+  "description": "uv-ui-tools，集成工具库，强大的Http请求封装，清晰的文档说明，开箱即用。方便使用，可以全局使用",
+  "keywords": [
+    "uv-ui-tools,uv-ui组件库,工具集,uvui,uView2.x"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "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",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/readme.md b/uni_modules/uv-ui-tools/readme.md
new file mode 100644
index 0000000..79a7df5
--- /dev/null
+++ b/uni_modules/uv-ui-tools/readme.md
@@ -0,0 +1,23 @@
+## uv-ui-tools 工具集
+
+> **组件名：uv-ui-tools**
+
+uv-ui工具集成，包括网络Http请求、便捷工具、节流防抖、对象操作、时间格式化、路由跳转、全局唯一标识符、规则校验等等。
+
+该组件推荐配合[uv-ui组件库](https://www.uvui.cn/components/intro.html)使用，单独下载也可以在自己项目中使用，需要做相应的配置，可查看文档。强烈推荐使用[uv-ui组件库](https://www.uvui.cn/components/intro.html)，导入组件都会自动导入`uv-ui-tools`。需要在自己的项目中使用请参考[扩展配置](https://www.uvui.cn/components/setting.html)。
+
+uv-ui破釜沉舟之兼容vue3+2、app、h5、多端小程序的uni-app生态框架，大部分组件基于uView2.x，在经过改进后全面支持vue3，部分组件做了进一步的优化，修复大量BUG，支持单独导入，方便开发者选择导入需要的组件。开箱即用，灵活配置。
+
+# <a href="https://www.uvui.cn/js/intro.html" target="_blank">查看文档</a>
+
+## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui) <small>（请不要 下载插件ZIP）</small>
+
+### [更多插件，请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui)
+
+<a href="https://ext.dcloud.net.cn/plugin?name=uv-ui" target="_blank">
+
+![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png)
+
+</a>
+
+#### 如使用过程中有任何问题反馈，或者您对uv-ui有一些好的建议，欢迎加入uv-ui官方交流群：<a href="https://www.uvui.cn/components/addQQGroup.html" target="_blank">官方QQ群</a>
\ No newline at end of file
diff --git a/uni_modules/uv-ui-tools/theme.scss b/uni_modules/uv-ui-tools/theme.scss
new file mode 100644
index 0000000..cfaae92
--- /dev/null
+++ b/uni_modules/uv-ui-tools/theme.scss
@@ -0,0 +1,43 @@
+// 此文件为uvUI的主题变量，这些变量目前只能通过uni.scss引入才有效，另外由于
+// uni.scss中引入的样式会同时混入到全局样式文件和单独每一个页面的样式中，造成微信程序包太大，
+// 故uni.scss只建议放scss变量名相关样式，其他的样式可以通过main.js或者App.vue引入
+
+$uv-main-color: #303133;
+$uv-content-color: #606266;
+$uv-tips-color: #909193;
+$uv-light-color: #c0c4cc;
+$uv-border-color: #dadbde;
+$uv-bg-color: #f3f4f6;
+$uv-disabled-color: #c8c9cc;
+
+$uv-primary: #3c9cff;
+$uv-primary-dark: #398ade;
+$uv-primary-disabled: #9acafc;
+$uv-primary-light: #ecf5ff;
+
+$uv-warning: #f9ae3d;
+$uv-warning-dark: #f1a532;
+$uv-warning-disabled: #f9d39b;
+$uv-warning-light: #fdf6ec;
+
+$uv-success: #5ac725;
+$uv-success-dark: #53c21d;
+$uv-success-disabled: #a9e08f;
+$uv-success-light: #f5fff0;
+
+$uv-error: #f56c6c;
+$uv-error-dark: #e45656;
+$uv-error-disabled: #f7b2b2;
+$uv-error-light: #fef0f0;
+
+$uv-info: #909399;
+$uv-info-dark: #767a82;
+$uv-info-disabled: #c4c6c9;
+$uv-info-light: #f4f4f5;
+
+@mixin flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: $direction;
+}
\ No newline at end of file
diff --git a/utils/config.js b/utils/config.js
new file mode 100644
index 0000000..033a37f
--- /dev/null
+++ b/utils/config.js
@@ -0,0 +1,8 @@
+export default {
+	// api请求前缀
+	webUrl: 'https://wx.yaohe.hnjrdzkj.xyz', //
+	imgUrl: 'https://wx.yaohe.hnjrdzkj.xyz/', //
+	staticUrl: 'https://wx.yaohe.hnjrdzkj.xyz/img/', //
+	mini_appid: 'wx94a6522b1d640c3b',
+	TabbarIndex: 2
+}
\ No newline at end of file
diff --git a/utils/default.css b/utils/default.css
new file mode 100644
index 0000000..d57055c
--- /dev/null
+++ b/utils/default.css
@@ -0,0 +1,363 @@
+page{
+    background: #F8F8F9;
+}
+
+button::after{
+    border:none;
+}
+
+.over-hide{
+    overflow: hidden;
+}
+
+.flex{display: flex;}
+.flex.space{justify-content: space-between;}
+.flex.center{justify-content: center;}
+.flex.alcenter{align-items: center;}
+.flex.alend{align-items:flex-end}
+.flex.start{justify-content: flex-start;}
+.flex.end{justify-content: flex-end;}
+.flex.wrap{flex-direction: row;flex-wrap: wrap;}
+.flex .col1{width: 100%;}
+.flex .col2{width: 50%;}
+.flex .col3{width: 33.33%;}
+.flex .col4{width: 25%;}
+.flex .col5{width:20%;}
+
+.ft10{font-size: 20rpx;}
+.ft12{font-size: 24rpx;}
+.ft14{font-size: 28rpx;}
+.ft16{font-size: 32rpx;}
+.ft18{font-size: 36rpx;}
+.ft20{font-size: 40rpx;}
+.ft22{font-size: 44rpx;}
+.ft24{font-size: 48rpx;}
+.ft28{font-size: 56rpx;}
+.ft32{font-size: 64rpx;}
+.ft36{font-size: 72rpx;}
+.ft40{font-size: 80rpx;}
+.ft50{font-size: 100rpx;}
+.ft60{font-size: 120rpx;}
+.ft80{font-size: 160rpx;}
+
+/*字体加粗*/
+.ftw400{font-weight: 400;}
+.ftw500{font-weight: 500;}
+.ftw600{font-weight: 600;}
+
+.ft-italic{font-style: italic;}
+
+.text-over{ overflow: hidden; text-overflow: ellipsis;white-space: nowrap;}
+.text-over1{ overflow: hidden; text-overflow: ellipsis;white-space: nowrap;}
+.text-over2{overflow: hidden; text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
+.text-over3{overflow: hidden; text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 3;-webkit-box-orient: vertical;}
+.text-over4{overflow: hidden; text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 4;-webkit-box-orient: vertical;}
+.text-over5{overflow: hidden; text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 5;-webkit-box-orient: vertical;}
+.text-over6{overflow: hidden; text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 6;-webkit-box-orient: vertical;}
+.text-over7{overflow: hidden; text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 7;-webkit-box-orient: vertical;}
+.text-over8{overflow: hidden; text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 8;-webkit-box-orient: vertical;}
+.text-center{text-align: center;}
+.text-right{text-align: right;}
+.text-line{text-decoration:line-through;}
+.text-line-down{text-decoration: underline;}
+
+.lh16{line-height: 32rpx;}
+.lh18{line-height: 36rpx;}
+.lh20{line-height: 40rpx;}
+.lh22{line-height: 44rpx;}
+.lh24{line-height: 48rpx;}
+.lh26{line-height: 52rpx;}
+.lh28{line-height: 56rpx;}
+.lh30{line-height: 60rpx;}
+.lh32{line-height: 64rpx;}
+.lh36{line-height: 72rpx;}
+.lh40{line-height: 80rpx;}
+
+.cl-w{color:#FFFFFF;}
+.cl-w9{color:rgba(255,255,255,0.9)}
+.cl-w8{color:rgba(255,255,255,0.8)}
+.cl-main{color:#2E2F33;}
+.cl-default{color:#000000;}
+.cl-info2{color:#5C5E66;}
+.cl-info{color:#666666;}
+.cl-placeholder{color:#CCCCCC;}
+.cl-light{color:#E4E6ED;}
+.cl-notice{color:#AEB2C1;}
+.cl-price{color:#FF3D3D;}
+.cl-999{color:#999999;}
+.cl-333{color:#333333;}
+
+.cl-yellow{color:#FFE5AD;}
+.cl-green{color:#00C657;}
+.cl-manage{color:#5E40FF;}
+.cl-orange{color:#FF6600}
+.cl-blue{color:#1890FF}
+
+.bg-w{background: #FFFFFF;}
+.bg-default{background: #F7F7F7;}
+.bg-manage{background: #5E40FF;}
+
+.mt2{margin-top: 4rpx;}
+.mt4{margin-top: 8rpx;}
+.mt5{margin-top: 10rpx;}
+.mt6{margin-top: 12rpx;}
+.mt7{margin-top: 15rpx;}
+.mt8{margin-top: 16rpx;}
+.mt10{margin-top: 20rpx;}
+.mt12{margin-top: 24rpx;}
+.mt14{margin-top: 28rpx;}
+.mt15{margin-top: 30rpx;}
+.mt16{margin-top: 32rpx;}
+.mt18{margin-top: 36rpx;}
+.mt20{margin-top: 40rpx;}
+.mt24{margin-top: 48rpx;}
+.mt25{margin-top: 50rpx;}
+.mt30{margin-top: 60rpx;}
+.mt32{margin-top: 64rpx;}
+.mt40{margin-top: 80rpx;}
+.mt60{margin-top: 120rpx;}
+
+.mb4{margin-bottom: 8rpx;}
+.mb5{margin-bottom: 10rpx;}
+.mb7{margin-bottom: 15rpx;}
+.mb10{margin-bottom: 20rpx;}
+.mb15{margin-bottom: 30rpx;}
+.mb16{margin-bottom: 32rpx;}
+.mb20{margin-bottom: 40rpx;}
+.mb24{margin-bottom: 48rpx;}
+.mb25{margin-bottom: 50rpx;}
+.mb30{margin-bottom: 60rpx;}
+
+.ml4{margin-left: 8rpx;}
+.ml5{margin-left: 10rpx;}
+.ml7{margin-left: 15rpx;}
+.ml10{margin-left: 20rpx;}
+.ml15{margin-left: 30rpx;}
+.ml20{margin-left: 40rpx;}
+.ml25{margin-left: 50rpx;}
+.ml30{margin-left: 60rpx;}
+.ml60{margin-left: 120rpx;}
+
+.mr5{margin-right: 10rpx;}
+.mr7{margin-right: 15rpx;}
+.mr10{margin-right: 20rpx;}
+.mr15{margin-right: 30rpx;}
+.mr20{margin-right: 40rpx;}
+.mr25{margin-right: 50rpx;}
+.mr30{margin-right: 60rpx;}
+.mr60{margin-right: 120rpx;}
+
+/**一般PADDING需要用到的值,其他的不通用的单独设置**/
+.pt5{padding-top: 10rpx;}
+.pt10{padding-top: 20rpx;}
+.pt12{padding-top: 24rpx;}
+.pt15{padding-top: 30rpx;}
+.pt16{padding-top: 32rpx;}
+.pt18{padding-top: 36rpx;}
+.pt20{padding-top: 40rpx;}
+.pt24{padding-top: 48rpx;}
+.pt30{padding-top: 60rpx;}
+.pt32{padding-top: 64rpx;}
+.pt40{padding-top: 80rpx;}
+.pt60{padding-top: 120rpx;}
+.pt80{padding-top: 160rpx;}
+
+.pb5{padding-bottom: 10rpx;}
+.pb10{padding-bottom: 20rpx;}
+.pb12{padding-bottom: 24rpx;}
+.pb15{padding-bottom: 30rpx;}
+.pb16{padding-bottom: 32rpx;}
+.pb20{padding-bottom: 40rpx;}
+.pb24{padding-bottom: 48rpx;}
+.pb30{padding-bottom: 60rpx;}
+.pb32{padding-bottom: 64rpx;}
+
+.pd5{padding: 10rpx;}
+.pd10{padding: 20rpx;}
+.pd15{padding:30rpx;}
+.pd20{padding: 40rpx;}
+.pd30{padding: 60rpx;}
+.pd32{padding: 64rpx;}
+
+.plr5{padding:0rpx 10rpx;}
+.plr10{padding:0rpx 20rpx;}
+.plr15{padding:0rpx 30rpx;}
+.plr20{padding:0rpx 40rpx;}
+.plr30{padding: 0rpx 60rpx;}
+.plr40{padding: 0rpx 80rpx;}
+
+.pr5{padding-right: 10rpx;}
+.pr10{padding-right: 20rpx;}
+.pr15{padding-right: 30rpx;}
+.pr20{padding-right: 40rpx;}
+.pr30{padding-right: 60rpx;}
+
+.pl5{padding-left: 10rpx;}
+.pl10{padding-left: 20rpx;}
+.pl15{padding-left: 30rpx;}
+.pl20{padding-left: 40rpx;}
+.pl30{padding-left: 60rpx;}
+.pd0_15{
+    padding: 0px 30rpx;
+}
+.pd5_15{
+    padding: 10rpx 30rpx;
+}
+.pd10_15{
+    padding: 20rpx 30rpx;
+}
+.pd12_10{
+    padding: 24rpx 20rpx;
+}
+.pd20_15{
+    padding: 40rpx 30rpx;
+}
+.pd16_15{
+    padding: 32rpx 30rpx;
+}
+.pd16_20{
+    padding: 32rpx 40rpx;
+}
+.pd24_15{
+    padding: 48rpx 30rpx;
+}
+.pd24_20{
+    padding: 48rpx 40rpx;
+}
+/*缩小*/
+.scale6{transform: scale(.6);}
+.scale8{transform: scale(.8);}
+
+/*透明度*/
+.op3{opacity: .3;}
+.op5{opacity: .5;}
+.op8{opacity: .8;}
+.op9{opacity: .9;}
+
+.picker-view{
+    height: 400rpx;
+}
+.picker-view .item{
+    line-height: 100rpx;
+    font-size: 32rpx;
+    color:#333333;
+}
+
+.box{
+    width:100%;
+    background:#FFFFFF;
+    box-shadow:0rpx 8rpx 40rpx 0rpx rgba(0,0,0,0.04);
+    border-radius:32rpx;
+}
+.box.noshadow{
+    box-shadow:none;
+}
+
+.bd-line{
+    height: 2rpx;
+    width: 100%;
+    background: #E4E6ED;
+}
+.bd-bottom{
+    border-bottom: 2rpx solid rgba(230, 230, 230, 0.8);
+}
+.bd-left{
+    border-left: 2upx solid rgba(230, 230, 230, 0.4);
+}
+
+
+
+
+.form-footer-h{
+    height: 140rpx;
+    height: calc(140rpx + constant(safe-area-inset-bottom));
+    height: calc(140rpx + env(safe-area-inset-bottom));
+}
+.form-footer{
+    width: 100%;
+    position: fixed;
+    z-index: 10;
+    left: 0;
+    bottom: 0;
+    background: #FFFFFF;
+    box-shadow:0rpx -4rpx 16rpx 0rpx rgba(0,0,0,0.04);
+}
+.form-footer-main{
+    width: 100%;
+    height: 140rpx;
+}
+.form-footer-item{
+    padding: 0;
+    margin: 0;
+    background: #FFFFFF;
+    line-height: 1;
+    color:#AEB2C1;
+}
+
+.btn-big,.btn-manage,.btn-mid,.btn-manage-mid,.btn-small,.btn-mini,.btn-manage-small,.btn-manage-mini{
+    width: 100%;
+    height: 88rpx;
+    border-radius:50rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #000000;
+    background: #FFFFFF;
+    margin: 0;
+    padding: 0;
+    transition: all 0.4s;
+}
+.btn-big.dis,.btn-manage.dis,.btn-mid.dis,.btn-manage-mid.dis,.btn-small.dis,.btn-mini.dis,.btn-manage-small.dis,.btn-manage-mini.dis{
+    background:#F0F1F5;
+    color:#AEB2C1;
+}
+
+.btn-manage,.btn-manage-mid,.btn-manage-small,.btn-manage-mini{
+    background:#5E40FF;
+    color:#FFFFFF;
+}
+.btn-mid,.btn-manage-mid{
+    width: 300rpx;
+    height: 80rpx;
+    border-radius:40rpx;
+    font-size: 28rpx;
+}
+.btn-manage.plan,.btn-manage-mid.plan,.btn-manage-small.plan,.btn-manage-mini.plan{
+    border:2rpx solid #5E40FF;
+    background: #FFFFFF;
+    color:#5E40FF;
+}
+.btn-big.plan,.btn-mid.plan,.btn-small.plan,.btn-mini.plan{
+    border:2rpx solid #E4E6ED;
+    background: #FFFFFF;
+    color:#353535;
+}
+.btn-small,.btn-mini,.btn-manage-small,.btn-manage-mini{
+    width: 176rpx;
+    font-size: 28rpx;
+    height: 64rpx;
+    border-radius: 32rpx;
+}
+.btn-mini,.btn-manage-mini{
+    width: 120rpx;
+}
+/* 全局loading动画 */
+.loading_page {
+    width: 100vw;
+    height: 100vh;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: #FFFFFF;
+}
+.loading_page image{
+    width: 58rpx;
+    height: 58rpx;
+    position: relative;
+    margin-top: 100rpx;
+    /* #ifdef h5 */
+    margin-top: 0;
+    /* #endif */
+}
\ No newline at end of file
diff --git a/utils/login.js b/utils/login.js
new file mode 100644
index 0000000..1dddb81
--- /dev/null
+++ b/utils/login.js
@@ -0,0 +1,66 @@
+
+import {httpRequest} from "./request.js";
+const login={
+    wxLogin(){
+        return new Promise((resolve,reject)=>{
+            uni.login({
+                provider: 'weixin',
+                success: (res) => {
+                    httpRequest({
+                        url:'/api/user/getOpenid',
+                        data:{
+                            code: res.code, //wx.login 登录成功后的code
+                            ad_code: uni.getStorageSync('get_ad_code'),
+                            invite: uni.getStorageSync("invite_number")
+                        },
+
+                    }).then((opRes)=>{
+                        uni.setStorageSync("openid", opRes.data.openid)
+                        if (opRes.msg == '登录成功') {
+                            uni.setStorageSync("userinfo", opRes.data.userinfo);
+                            uni.setStorageSync("token", opRes.data.userinfo.token);
+                            uni.setStorageSync("config", opRes.data.config);
+                            resolve('login success')
+                        } else {
+                            this.Loginops(opRes).then(opRes => {
+                                resolve('login success')
+                            }).catch(logPErr => {
+                                reject(logPErr)
+                            })
+                        }
+                    }).catch(opErr=>{
+                        reject(opErr)
+                    })
+                },
+                fail: (err) => {
+                    reject(err)
+                }
+            });
+
+        })
+    },
+    Loginops(openData) {
+        return new Promise((resolve, reject) => {
+            httpRequest({
+                url:'/api/user/getphone',
+                method: 'GET',
+                data: {
+                    openid: openData.data.openid,
+                    pid: '0',
+                    invite: uni.getStorageSync('invite_number') ||'',
+                    ad_code: uni.getStorageSync('get_ad_code') || ''
+                },
+            }).then(uRes=>{
+                if(uRes.code ==1){
+                    uni.setStorageSync("userinfo", uRes.data.userinfo);
+                    uni.setStorageSync("token", uRes.data.userinfo.token);
+                    uni.setStorageSync("config", uRes.data.config);
+                    resolve('login success')
+                }
+            }).catch(uErr=>{
+                reject(uErr)
+            })
+        })
+    },
+}
+ export default login
\ No newline at end of file
diff --git a/utils/pay.js b/utils/pay.js
new file mode 100644
index 0000000..4c7099d
--- /dev/null
+++ b/utils/pay.js
@@ -0,0 +1,126 @@
+import {httpRequest} from "@/utils/request";
+
+const pays = {
+    beansPay(data) {
+        return new Promise((resolve, reject) => {
+            httpRequest({
+                url: '/api/pay/videopay',
+                data: data,
+                method: 'GET',
+            }).then(res => {
+                resolve(res)
+            }).catch(err => {
+                reject(err)
+            })
+        })
+    },
+    serverCreatOrder(data) {
+        return new Promise((resolve, reject) => {
+            httpRequest({
+                url: '/api/pay/payInfo',
+                data: data,
+                method: 'GET',
+            }).then(res => {
+                resolve(res)
+            }).catch(err => {
+                reject(err)
+            })
+        })
+    },
+    wxIosCreatOrder(data) {
+        return new Promise((resolve, reject) => {
+            httpRequest({
+                url: '/api/pay/beansPay',
+                data: data,
+                method: 'GET',
+            }).then(res => {
+                resolve(res)
+            }).catch(err => {
+                reject(err)
+            })
+        })
+    },
+
+    //     小程序虚拟支付（小程序android）
+    wxAppletAndroidPay(data) {
+        return new Promise((resolve, reject) => {
+            uni.requestVirtualPayment({
+                signData: JSON.stringify({
+                    buyQuantity: data.signData.buyQuantity,
+                    currencyType: data.signData.currencyType,
+                    env: data.signData.env,
+                    goodsPrice: data.signData.goodsPrice,
+                    offerId: data.signData.offerId,
+                    outTradeNo: data.signData.outTradeNo,
+                    platform: data.signData.platform,
+                    productId: data.signData.productId,
+                    attach: data.signData.attach,
+                }),
+                paySig: data.paySig,
+                signature: data.signature,
+                mode: 'short_series_coin',
+                success(res) {
+                    resolve(res)
+                },
+                fail(err){
+                    reject(err)
+                },
+            })
+			// uni.requestPayment({
+			//     provider: 'wxpay',
+			//     appId: data.appId,
+			//     timeStamp: data.timeStamp + '',
+			//     nonceStr: data.nonceStr,
+			//     package: data.package,
+			//     signType: 'MD5',
+			//     paySign: data.sign,
+			//     success: function(res1) {
+			//         resolve(res1)
+			//     },
+			//     fail: function(err1) {
+			//         reject(err1)
+			//     }
+			// });
+        })
+    },
+//     小程序IOS支付
+    wxAppletIosPay(data) {
+        return new Promise((resolve, reject) => {
+            console.log('wxAppletIosPay')
+            console.log(data)
+            uni.requestPayment({
+                provider: 'wxpay',
+                appId: data.appId,
+                timeStamp: data.timeStamp + '',
+                nonceStr: data.nonceStr,
+                package: data.package,
+                signType: 'MD5',
+                paySign: data.sign,
+                success: function(res1) {
+                    resolve(res1)
+                },
+                fail: function(err1) {
+                    reject(err1)
+                }
+            });
+        })
+    },
+//     拉卡拉支付
+    lakalaPay(data) {
+        return new Promise((resolve, reject) => {
+            httpRequest({
+                url: '/api/pay/payInfo',
+                data: data,
+                method: 'GET',
+            }).then(res => {
+                resolve(res)
+            }).catch(err => {
+                reject(err)
+            })
+        })
+    },
+
+}
+export default {
+    pays
+}
\ No newline at end of file
diff --git a/utils/playerManager.js b/utils/playerManager.js
new file mode 100644
index 0000000..462642c
--- /dev/null
+++ b/utils/playerManager.js
@@ -0,0 +1,423 @@
+var playletPlugin = requirePlugin("playlet-plugin");
+import configs from '@/utils/config.js';
+import {httpRequest} from '@/utils/request'
+import {login} from './login'
+import PAY from '@/utils/pay'
+// 点击按钮触发此函数跳转到播放器页面
+function navigateToPlayer(obj) {
+  // 下面的${dramaId}变量,需要替换成小程序管理后台的媒资管理上传的剧的dramaId
+  // 变量${srcAppid}是提审方appid
+  // 变量${serialNo}第几集
+  // 变量${extParam}是分享参数，分享的卡片和二维码会在分享的链接上携带此参数
+  const { extParam, dramaId, srcAppid=configs.mini_appid,serialNo=1 } = obj
+  wx.navigateTo({
+    url: `plugin-private://wx94a6522b1d640c3b/pages/playlet/playlet?dramaId=${dramaId}&srcAppid=${srcAppid}&serialNo=${serialNo}&extParam=${extParam || ''}`
+  })
+}
+function deepClone(obj) {
+  if (typeof obj !== 'object' || !obj) return obj
+  let newObj = obj instanceof Array ? [] : {}
+  for (let key in obj) {
+    if (typeof obj[key] === 'object') {
+      newObj[key] = deepClone(obj[key])
+    } else {
+      newObj[key] = obj[key]
+    }
+  }
+  return newObj
+}
+
+const proto = {
+  data: { // 可通过this.data访问
+    playerId: '',//播放器id
+    arr: [],
+    vid:"",//剧id
+    info:{},
+    mid:"",//剧集id
+    userInfo:{},
+    is_record:0,//是否追剧 0未追 1已追
+    pay_oid:'',
+  },
+  _onPlayerLoad(info) {
+    let that = this,
+        shareInterval = null;
+    console.log("_onPlayerLoad",info);
+    if(info.extParam){
+      if(info.extParam.indexOf("%")<0){
+        this.data.info = info;
+      }else if(info.extParam){
+        info.extParam = decodeURIComponent(info.extParam )
+        this.data.info = info;
+      }else{}
+      this.data.vid = JSON.parse(info.extParam).vid;
+      if(JSON.parse(info.extParam).g_order_id){//存储分享后的gid
+        uni.setStorageSync('g_order_id',JSON.parse(info.extParam).g_order_id);
+        uni.setStorageSync('g_order_vid',JSON.parse(info.extParam).vid);
+      }
+    }
+    this.data.playerId = info.playerId
+    const pm = playletPlugin.PlayletManager.getPageManager(info.playerId)
+    this.pm = pm
+
+    let user = uni.getStorageSync('userinfo');
+    if(user.token){
+      this.data.userInfo = uni.getStorageSync('userinfo');
+      console.log('onPlayerLoad info', info, 'data', this.data)
+      that.getVideoId();
+      that.getEncryptData({serialNo: info.serialNo}).then(setRes => {
+        // encryptedData是后台加密后的数据，具体实现见官方文档的加密章节
+        let lists = [setRes.data];
+        pm.setCanPlaySerialList({
+          data: setRes.encryptedData,
+          freeList:lists
+          // freeList: [{ // 1~10集是免费剧,data里面的字段也必须至少设置1~10集可播放
+          //   start_serial_no: setRes.data.start_serial_no,
+          //   end_serial_no: setRes.data.end_serial_no
+          // }],
+        })
+      });
+    }else{
+      login.wxLogin().then(res=>{
+        this.data.userInfo = uni.getStorageSync('userinfo');
+        console.log('onPlayerLoad info', info, 'data', this.data)
+        that.getVideoId();
+        that.getEncryptData({serialNo: info.serialNo}).then(setRes => {
+          // encryptedData是后台加密后的数据，具体实现见官方文档的加密章节
+          let lists = [setRes.data];
+          pm.setCanPlaySerialList({
+            data: setRes.encryptedData,
+            freeList:lists
+          })
+        });
+      });
+    }
+
+    // 需要解锁的事件
+    pm.onCheckIsCanPlay(this.onCheckIsCanPlay);
+    // 页面返回事件
+    pm.onBack(this.pageBack)
+    // 支付回调事件
+    pm.onCustomEvent('chargeEnd', this.chargeEnd)
+    pm.setVisualEffectOnCapture({
+      visualEffect: 'none',
+    })
+    // 参考文档章节“数据上报”
+    pm.onDataReport((obj) => {
+      if(obj.event === playletPlugin.REPORT_DATA_EVENTS.LIKE || obj.event === playletPlugin.REPORT_DATA_EVENTS.UNLIKE){//监听点赞、取消点赞操作
+        console.log("user like")
+        this.userLikeChange();
+      }else if(obj.event === playletPlugin.REPORT_DATA_EVENTS.FAV || obj.event === playletPlugin.REPORT_DATA_EVENTS.UNFAV){//监听在追,取消在追操作
+        console.log("user zhui ju")
+        this.changeStar()
+      }else if(obj.event === playletPlugin.REPORT_DATA_EVENTS.CHANGE_SERIAL){//监听切换剧集操作
+        console.log("user changePlay log")
+        this.changePlayLog()
+      }else if(obj.event === playletPlugin.REPORT_DATA_EVENTS.SHARE){//监听分享操作
+        console.log("user share")
+      }else {
+        // console.log("其他操作")
+      }
+
+    })
+    // 设置右侧固定运营位置跳转路径
+    pm.setActivityInfo({
+      url: ''
+    })
+    // 设置运营区域
+    pm.updateOpenArea({
+      showLeft: false,
+      showRight: false,
+      leftsideAreaList: [
+        {
+          left: 16, // 类似绝对定位的样式
+          top: 20,
+          width: 72,
+          height: 32
+        },
+      ],
+      ext: 'extInfo',
+    })
+  },
+  _initShare() {
+    const pm = this.pm
+    // 关于分享的处理
+    // 开启分享以及withShareTicket
+    pm.setDramaFlag({
+      share: true,
+      withShareTicket: true
+    })
+    // 获取分享参数,页面栈只有短剧播放器一个页面的时候可获取到此参数
+    // 例如从分享卡片进入、从投流广告直接跳转到播放器页面，从二维码直接进入播放器页面等情况
+    playletPlugin.getShareParams().then(res => {
+      console.log('getLaunch options query res', res)
+      // 关于extParam的处理，需要先做decodeURIComponent之后才能得到原值
+      const extParam = decodeURIComponent(res.extParam)
+      console.log('getLaunch options extParam', extParam)
+      // 如果设置了withShareTicket为true，可通过文档的方法获取更多信息
+      // https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/share.html
+      const enterOptions = wx.getEnterOptionsSync()
+      console.log('getLaunch options shareTicket', enterOptions.shareTicket)
+    }).catch(err => {
+      console.log('getLaunch options query err', err)
+    })
+    this.getVideoId()
+    // 设置分享参数
+    pm.setExtParam(JSON.stringify({
+      vid:this.data.vid,
+      fxpid:this.data.userInfo.id,
+      invite:this.data.userInfo.invite||''
+    }))
+  },
+  // 检测是否可以播放
+  onCheckIsCanPlay(param) {
+    var that = this;
+    let intervalTime=null;
+    console.log('onCheckIsCanPlay param',param);
+    if(uni.getStorageSync('userinfo').token){
+      that.getVideoId().then(video=>{
+        that.beansPay(video.data.id,param.serialNo);
+      })
+    }else{
+      intervalTime = setInterval(()=>{
+        if(uni.getStorageSync('userinfo').token){
+          clearInterval(intervalTime)
+          that.getVideoId().then(video=>{
+            that.beansPay(video.data.id,param.serialNo);
+          })
+        }else {
+          console.log('no users login')}
+      },100)
+    }
+  },
+  getEncryptData(obj) {
+    const {code, serialNo } = obj;
+    let that = this;
+    // TODO: 此接口请求后台，返回下面的setCanPlaySerialList接口需要的加密参数
+    const { srcAppid, dramaId } = this.pm.getInfo()
+
+    console.log('getEncryptData start', srcAppid, dramaId, serialNo)
+    return new Promise((resolve, reject) => {
+      // 获取免费剧集列表（包含用户已经支付的 ）
+      wx.login({
+        success(res) {
+          // console.log('code',res.code)
+          httpRequest({
+            url:"/api/video/videoInfoWechatV1",
+            method:"GET",
+            data:{
+              code:res.code,
+              vid:that.data.vid,
+              oid:that.data.pay_oid
+            }
+          }).then(res=>{
+            console.log('videoPlayer getCanPlayList res', res)
+            resolve({
+              data:res.data.data,
+              encryptedData: res.data.enData
+            })
+          }).catch(err=>{
+            reject(err)
+            console.log(err)
+          })
+        }
+      })
+    })
+  },
+  pageBack(){
+    let that = this;
+    if(that.data.is_record==1){
+      // that.pm.navigateBack()
+      that.pm.switchTab({
+        url: '/pages/tabs/home'
+      })
+    }else{
+      uni.showModal({
+        title:"提示",
+        content:"是否将此剧加入追剧列表",
+        success(modelRes){
+          if(modelRes.confirm){
+            console.log('success');
+            that.changeStar();
+          }
+          that.pm.switchTab({
+            url: '/pages/tabs/home'
+          })
+        }
+      })
+    }
+
+  },
+  getVideoId(){
+    let that = this;
+    let infos = this.pm.getInfo();
+    console.log('getVideoId start',infos);
+    // 获取当前需支付剧集ID（媒资库的ID不能用，需要用我们自己的剧集ID）
+    return new Promise((resolve, reject) => {
+      httpRequest({
+        url:"/api/video/dramaIdToVideoId",
+        method:"GET",
+        data:{
+          drama_id:infos.dramaId,
+          no:infos.serialNo
+        }
+      }).then(res=>{
+        this.data.mid = res.data.id;
+        if(res.data.drama_vid != that.data.vid){
+          that.data.vid = res.data.drama_vid
+        }
+        this.data.is_record = res.data.is_record
+        resolve(res)
+      }).catch(err=>{
+        console.log(err)
+        reject(err)
+      })
+    })
+  },
+
+
+
+  // 金豆购买剧集
+  beansPay(mid,serialNo){
+    let buyData =  uni.getStorageSync("buydata");
+    let that = this;
+    console.log('beansPay begin',mid,serialNo)
+    let upData={
+      sum:1,
+      buytype:"金豆",
+      pricebuy:buyData.isvip ==2?buyData.vippriceq:buyData.priceq,
+      token:uni.getStorageSync("userinfo").token,
+      uid:uni.getStorageSync("userinfo").id,
+      ad_code:uni.getStorageSync('get_ad_code'),
+      lx:2,//1 全章购买 2单集购买
+      smid:mid,//单集ID
+      wxlx:'wxxcx',
+      id:that.data.vid ,//剧ID
+      openid: uni.getStorageSync("openid")
+    }
+    // 支付
+    PAY.pays.beansPay(upData).then((res)=>{
+      console.log('beansPay res',res)
+      that.getEncryptData({serialNo: serialNo}).then(enRes => {
+        that.pm.isCanPlay({
+          data: enRes.encryptedData,
+          serialNo: serialNo,
+          status:res.code ==1?1:2
+        })
+      })
+    }).catch(err=>{
+      if(err.msg =='金豆不足'){
+        that.getEncryptData({serialNo: serialNo}).then(enRes => {
+          that.pm.isCanPlay({
+            data: enRes.encryptedData,
+            serialNo: serialNo,
+            status:2
+          })
+        })
+      }
+      console.log('jinDouPay fail',err)
+    })
+
+  },
+  // 更新喜欢状态
+  userLikeChange(){
+    let that = this;
+    that.getVideoId({dramaId:that.data.info.dramaId,serialNo:that.data.info.serialNo}).then(res=>{
+      httpRequest({
+        url:"/api/user/tapLove",
+        method:"GET",
+        data:{
+          vid:that.data.vid,
+          mid:res.data.id
+        }
+      }).then(res=>{
+        console.log('userLikeChange res',res)
+      })
+    })
+  },
+  // 更新追剧状态
+  changeStar(){
+    let that = this;
+    let subData = {
+      vid:that.data.vid,
+      token:uni.getStorageSync("userinfo").token,
+      uid:uni.getStorageSync("userinfo").id,
+      mid:""
+    }
+    that.getVideoId({dramaId:that.data.info.dramaId,serialNo:that.data.info.serialNo}).then(res=>{
+
+      httpRequest({
+        url:"/api/user/videorecord",
+        method:"GET",
+        data:{
+          vid:that.data.vid,
+          mid:res.data.id
+        }
+      }).then(rest=>{
+        console.log('userLikeChange res',rest)
+      }).catch(errs=>{
+        console.log(errs)
+      })
+
+    })
+  },
+  // 更新播放记录
+  changePlayLog(){
+    let that = this;
+    that.getVideoId({dramaId:that.data.info.dramaId,serialNo:that.data.info.serialNo}).then(res=>{
+      console.log('changePlayLog mid',res)
+      httpRequest({
+        url:"/api/video/bfjl",
+        method:"GET",
+        data:{
+          vid:that.data.vid,
+          mid:res.data.id
+        }
+      }).then(rest=>{
+        console.log('changePlayLog res',rest)
+      }).catch(errs=>{
+        console.log('change PlayLog fail',errs)
+      })
+    })
+  },
+  // 支付完
+  chargeEnd(payRes){
+    let that = this;
+    console.log("paySuccess",payRes)
+    let share_g_order_vid = uni.getStorageSync('g_order_vid');
+    if(payRes.status == "paySuccess"){
+      that.data.pay_oid = payRes.oid;
+      this.onCheckIsCanPlay({dramaId:that.data.info.dramaId,serialNo:payRes.serialNo,oid:payRes.oid })
+      that.pm.setExtParam(JSON.stringify({
+        vid:this.data.vid,
+        fxpid:this.data.userInfo.id,
+        invite:this.data.userInfo.invite||'',
+        g_order_id:payRes.gOrderId,
+        g_order_vid:payRes.vid
+
+      }))
+      that.pm.hideChargeDialog();
+      if(payRes.gOrderId && share_g_order_vid != payRes.vid){
+        that.pm.updateOpenArea({showLeft: true});
+      }
+
+    }
+  },
+}
+
+function PlayerManager() {
+  var newProto = Object.assign({}, proto)
+  for (const k in newProto) {
+    if (typeof newProto[k] === 'function') {
+      this[k] = newProto[k].bind(this)
+    } else if (typeof newProto[k] === 'object') {
+      if (!newProto[k]) {
+        this[k] = newProto[k]
+      } else {
+        this[k] = deepClone(newProto[k])
+      }
+    }
+  }
+}
+
+PlayerManager.navigateToPlayer = navigateToPlayer
+module.exports = PlayerManager
diff --git a/utils/request.js b/utils/request.js
new file mode 100644
index 0000000..bfd6d48
--- /dev/null
+++ b/utils/request.js
@@ -0,0 +1,87 @@
+import config from "./config.js";
+// 获取当前运行环境
+// 同步获取系统信息
+const systemInfo = uni.getSystemInfoSync();
+const os = systemInfo.osName;
+const os_type = getType();
+function getType() {
+    // #ifdef APP
+    return 1
+    // #endif
+    // #ifdef H5
+    return 1
+    // #endif
+    // #ifdef MP-WEIXIN
+    return 3
+    // #endif
+    // #ifdef MP-TOUTIAO
+    return 4
+    // #endif
+}
+
+const options = {
+    url: String,
+    method: String,
+    data: Object,
+    header: Object,
+    isLoading: Boolean,
+    isAllLink: Boolean
+}
+ function httpRequest(options = options) {
+    let token = uni.getStorageSync('token');
+     token = token?token:uni.getStorageSync('userinfo').token
+    const OS = uni.getSystemInfoSync();
+    // let token = '0fea3d3d-9c6b-446c-a5df-57779c70a273';
+    return new Promise((resolve, reject) => {
+        if (options.isLoading) {
+            uni.showLoading()
+        }
+        uni.request({
+            url: options.isAllLink ? options.url : config.webUrl + options.url,
+            method: options.method || "GET",
+            data: options.data || {},
+            header: {
+                'token': token || "",
+                'os':os,
+                'os_type':os_type,
+            },
+            success: (res) => {
+                if (res.data.code == 401) {
+                    console.log('no login')
+
+                    uni.showModal({
+                        title: '提示',
+                        content: "请登录后再进行操作",
+                        confirmText: "确定",
+                        cancelText: '取消',
+                        success: (res) => {
+                            if (res.confirm) {
+                                let nowPage = getCurrentPages();
+                                let pageNum = nowPage.length - 1;
+                                console.log(nowPage)
+                                uni.setStorageSync('loginPage', nowPage[pageNum].route)
+                                uni.navigateTo({url: "/pagesA/login/login"})
+                            }
+                        }
+                    })
+                    reject(res.data)
+                } else if (res.data.code == 0) {
+                    resolve(res.data)
+                } else {
+                    resolve(res.data);
+                }
+            },
+            fail: (error) => {
+                reject(error);
+            },
+            complete: (req) => {
+                if (options.isLoading) {
+                    uni.hideLoading()
+                }
+            }
+        });
+    });
+}
+module.exports = {
+    httpRequest
+}
\ No newline at end of file
diff --git a/utils/share.js b/utils/share.js
new file mode 100644
index 0000000..547c231
--- /dev/null
+++ b/utils/share.js
@@ -0,0 +1,59 @@
+export default {
+	data() {
+		return {
+			share: {
+				// 转发的标题 （默认标题）
+				title: '灵图剧场影视',
+				// 默认是当前页面，必须是以‘/’开头的完整路径
+				path: 'pages/client/member/index',
+				//自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，
+				//支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
+				imageUrl: ''
+			},
+			userinfo:uni.getStorageSync('userinfo')
+		}
+	},
+	/*
+	 在要分享的页面 生命周期中  设计当前页面分享标题
+	 onLoad() {
+	     this.share.title = "当前页面分享标题"
+	 },
+	 */
+	// 发送给朋友
+	onShareAppMessage(res) {
+		// 来自页面内的按钮的转发
+		if (res.from == 'button') {
+			console.log("按钮转发--配置");
+		}
+		// 获取加载的页面
+		let pages = getCurrentPages(),
+			// 获取当前页面的对象
+			view = pages[pages.length - 1];
+		// this.share.path = `/${view.route}`;
+		let invite = this.userinfo.invite?this.userinfo.invite:"";
+		this.share.path = '/pages/client/index?invite='+invite;
+ 
+		//转发参数
+		return this.share;
+	},
+	//分享到朋友圈
+	onShareTimeline(res) {
+		// 获取加载的页面
+		let pages = getCurrentPages(),
+			// 获取当前页面的对象
+			view = pages[pages.length - 1];
+		// console.log("获取加载的页面", pages);
+		console.log("当前页面的对象", view.options);
+		// this.share.path = `/${view.route}`; //分享当前页面
+		let obj = view.options;
+		 const paramsArray = Object.entries(obj).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+		// 将数组连接成一个字符串，使用 '&' 或其他分隔符
+		const pathParamsString = paramsArray.join('&');
+		console.log( pathParamsString);
+		let invite = this.userinfo.invite?this.userinfo.invite:"";
+		this.share.query = `${pathParamsString}&invite=${invite}`
+		// this.share.path = `/${view.route}?invite=${invite}`  //指定分享页面 
+		//转发参数
+		return this.share;
+	}
+}
\ No newline at end of file