diff --git a/.env b/.env
new file mode 100644
index 0000000..486391d
--- /dev/null
+++ b/.env
@@ -0,0 +1,27 @@
+# 版本号
+SHOPRO_VERSION = v1.8.3
+
+# 后端接口 - 正式环境（通过 process.env.NODE_ENV 非 development）
+SHOPRO_BASE_URL = http://localhost:48080
+
+# 后端接口 - 测试环境（通过 process.env.NODE_ENV = development）
+SHOPRO_DEV_BASE_URL = http://127.0.0.1:48080
+### SHOPRO_DEV_BASE_URL = https://peiwan.mfzt.site
+
+# 后端接口前缀（一般不建议调整）
+SHOPRO_API_PATH = /app-api
+
+# 后端 websocket 接口前缀
+SHOPRO_WEBSOCKET_PATH = /infra/ws
+
+# 开发环境运行端口
+SHOPRO_DEV_PORT = 3000
+
+# 客户端静态资源地址 空=默认使用服务端指定的CDN资源地址前缀 | local=本地  |  http(s)://xxx.xxx=自定义静态资源地址前缀
+SHOPRO_STATIC_URL = https://file.sheepjs.com
+
+# 是否开启直播  1 开启直播 | 0 关闭直播 (小程序官方后台未审核开通直播权限时请勿开启)
+SHOPRO_MPLIVE_ON = 0
+
+# 租户ID 默认 1
+SHOPRO_TENANT_ID = 1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..43dda18
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+unpackage/*
+node_modules/*
+.idea/*
+deploy.sh
+.hbuilderx/
+.vscode/
+**/.DS_Store
+yarn.lock
+package-lock.json
+*.keystore
+pnpm-lock.yaml
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..7384df0
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,6 @@
+/unpackage/*
+/node_modules/**
+/uni_modules/**
+/public/*
+**/*.svg
+**/*.sh
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..fe0a3f9
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,10 @@
+{
+  "printWidth": 100,
+  "semi": true,
+  "vueIndentScriptAndStyle": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "proseWrap": "never",
+  "htmlWhitespaceSensitivity": "strict",
+  "endOfLine": "auto"
+}
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..1c143ef
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,129 @@
+<script setup>
+  import { onLaunch, onShow, onHide, onUnload, onError } from '@dcloudio/uni-app';
+  import { ShoproInit } from './sheep';
+  import { useWebSocket } from '@/sheep/hooks/useWebSocket';
+  import { WebSocketMessageTypeConstants } from '@/sheep/util/const';
+
+  onLaunch(() => {
+    // 隐藏原生导航栏 使用自定义底部导航
+    //uni.hideTabBar();
+
+    // 加载Shopro底层依赖
+    ShoproInit();
+  });
+
+  onError((err) => {
+    console.log('AppOnError:', err);
+  });
+
+  onShow((options) => {
+    // #ifdef APP-PLUS
+    // 获取urlSchemes参数
+    const args = plus.runtime.arguments;
+    if (args) {
+    } 
+
+    // 获取剪贴板
+    uni.getClipboardData({
+      success: (res) => { },
+    });
+    // #endif
+
+    // #ifdef MP-WEIXIN
+    // 确认收货回调结果
+    console.log(options,'options');
+    // #endif
+	
+	// 禁止截屏
+	if (wx.setVisualEffectOnCapture) {
+		wx.setVisualEffectOnCapture({
+			visualEffect: 'hidden',
+			complete: function(res) {}
+		})
+	}
+	
+	if (wx.setVisualEffectOnCapture) {
+		let that = this
+		wx.onUserCaptureScreen(function (res) {
+			uni.showToast({
+				icon: 'none',
+				title: '禁止截屏！',
+				position: 'bottom'
+			})
+			that.flushed()
+		})
+	}
+	console.log('App Show')
+  });
+  
+  onHide(() => {
+	  if (wx.setVisualEffectOnCapture) {
+	  	wx.setVisualEffectOnCapture({
+	  		visualEffect: 'none',
+	  		complete: function(res) {}
+	  	})
+	  }
+  });
+  
+  onUnload(() => {
+  	if (wx.setVisualEffectOnCapture) {
+  		wx.setVisualEffectOnCapture({
+  			visualEffect: 'none',
+  			complete: function(res) {}
+  		})
+  	}
+  });
+  
+  //======================= 聊天工具相关 end =======================
+  /* const { options } = useWebSocket({
+    // 连接成功
+    onConnected: async () => {
+		console.log('连接成功');
+    },
+    // 收到消息
+    onMessage: async (data) => {
+		console.log('接收消息');
+		const type = data.type;
+		if (!type) {
+			console.error('未知的消息类型：' + data.value);
+			return;
+		}
+		if (type == WebSocketMessageTypeConstants.IM_MESSAGE_READ) {
+			console.log('刷新消息');
+			setTimeout(function(){
+				uni.$emit(WebSocketMessageTypeConstants.IM_MESSAGE_READ, data);
+			},1000);
+			return;
+		}
+		
+		if (type == WebSocketMessageTypeConstants.IM_MESSAGE_NEWS) {
+			uni.$emit(WebSocketMessageTypeConstants.IM_MESSAGE_NEWS, data);
+			return;
+		}
+		
+		// 2.2 消息类型：KEFU_MESSAGE_TYPE
+		if (type == WebSocketMessageTypeConstants.KEFU_MESSAGE_TYPE) {
+			console.log('刷新消息');
+			// 刷新消息列表
+			//await messageListRef.value.refreshMessageList(JSON.parse(data.content));
+			return;
+		}
+		// 2.3 消息类型：KEFU_MESSAGE_ADMIN_READ
+		if (type == WebSocketMessageTypeConstants.KEFU_MESSAGE_ADMIN_READ) {
+			console.log('管理员已读消息');
+		}
+    },
+  }); */
+</script>
+
+<style lang="scss">
+  @import '@/sheep/scss/index.scss'; 
+  @import "@/static/css/iconfont.css";
+  @import "@/uni_modules/vk-uview-ui/index.scss"; 
+  ::-webkit-scrollbar {
+  	width: 0 !important;
+  	height: 0 !important;
+  	color: transparent !important;
+  	display: none;
+  }
+</style>
diff --git a/androidPrivacy.json b/androidPrivacy.json
new file mode 100644
index 0000000..0d726ca
--- /dev/null
+++ b/androidPrivacy.json
@@ -0,0 +1,3 @@
+{
+    "prompt" : "template"
+}
diff --git a/components/custom-back-to-top/custom-back-to-top.vue b/components/custom-back-to-top/custom-back-to-top.vue
new file mode 100644
index 0000000..37bc253
--- /dev/null
+++ b/components/custom-back-to-top/custom-back-to-top.vue
@@ -0,0 +1,89 @@
+<!-- z-paging自定义的点击返回顶部view -->
+<template>
+	<view class="back-to-top">
+		<view class="container">
+			<u-icon name="fanhuidingbu" color="#555666" size="50" custom-prefix="iconfont"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			// 当前加载了几页
+			current: { 
+				type: Number,
+				default: function() {
+					return 0;
+				},
+			},
+			// 一共有多少页可以加载
+			total: {
+				type: Number,
+				default: function() {
+					return 0;
+				},
+			},
+		},
+		data() {
+			return {
+				// 0 返回返回顶部图片 1显示current/total
+				type: 0,
+				// 当前定时器
+				timeout: null
+			};
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped>
+	.back-to-top {
+		/* 这里请设置100%填充满返回顶部按钮 */
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		background-color: white;
+		border-radius: 50%;
+		background-color: white;
+		box-shadow: 0 0 20rpx #cccccc;
+		background-color: white;
+
+	}
+
+	.container {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+	}
+
+	.count-text {
+		font-size: 24rpx;
+		color: #555555;
+		font-weight: bold;
+	}
+
+	.line {
+		width: 55rpx;
+		height: 1rpx;
+		background-color: #dedede;
+	}
+
+	.back-img {
+		width: 50rpx;
+		height: 50rpx;
+	}
+</style>
diff --git a/components/htz-image-upload/htz-image-upload.vue b/components/htz-image-upload/htz-image-upload.vue
new file mode 100644
index 0000000..897499a
--- /dev/null
+++ b/components/htz-image-upload/htz-image-upload.vue
@@ -0,0 +1,831 @@
+<template>
+	<view class="htz-image-upload-list">
+		<view class="htz-image-upload-Item" v-for="(item,index) in uploadLists" :key="index">
+			<view class="htz-image-upload-Item-video" v-if="isVideo(item)">
+				<!-- #ifndef APP-PLUS -->
+				<video :disabled="false" :controls="false" :src="getFileUrl(item)">
+					<cover-view class="htz-image-upload-Item-video-fixed" @tap.stop="previewVideo(getFileUrl(item))">
+					</cover-view>
+
+					<cover-view class="htz-image-upload-Item-del-cover" v-if="remove && previewVideoSrc==''" @tap.stop="imgDel(index)">×</cover-view>
+
+				</video>
+				<!-- #endif -->
+				<!-- #ifdef APP-PLUS -->
+				<view class="htz-image-upload-Item-video-fixed" @tap.stop="previewVideo(getFileUrl(item))"></view>
+				<image v-if="dataType==1 && item.cover" class="htz-image-upload-Item-video-app-poster" mode="widthFix" :src="item.cover"></image>
+				<image v-else class="htz-image-upload-Item-video-app-poster" mode="widthFix" :src="appVideoPoster"></image>
+				<!-- #endif -->
+			</view>
+
+			<image v-else :src="getFileUrl(item)" @tap.stop="imgPreview(getFileUrl(item))"></image>
+			
+			<!-- #ifdef APP-PLUS -->
+			<view class="htz-image-upload-Item-del" v-if="remove" @tap.stop="imgDel(index)">×</view>
+			<!-- #endif -->
+		</view>
+		<view class="htz-image-upload-Item htz-image-upload-Item-add" v-if="uploadLists.length<max && add" @click="chooseFile">
+			+
+		</view>
+		<view class="preview-full" v-if="previewVideoSrc!=''">
+			<video :autoplay="true" :src="previewVideoSrc" :show-fullscreen-btn="false">
+				<cover-view class="preview-full-close" @click="previewVideoClose"> ×
+				</cover-view>
+			</video>
+		</view>
+
+
+		<!--  -->
+	</view>
+</template>
+
+<style>
+	.ceshi {
+		width: 100%;
+		height: 100%;
+		position: relative;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		background-color: #FFFFFF;
+		color: #2C405A;
+		opacity: 0.5;
+		z-index: 100;
+	}
+</style>
+
+<script>
+	export default {
+		name: 'htz-image-upload',
+		props: {
+			max: { //展示图片最大值
+				type: Number,
+				default: 1,
+			},
+			chooseNum: { //选择图片数
+				type: Number,
+				default: 9,
+			},
+			name: { //发到后台的文件参数名
+				type: String,
+				default: 'file',
+			},
+			dataType: { //v-model的数据结构类型
+				type: Number,
+				default: 0, // 0: ['http://xxxx.jpg','http://xxxx.jpg'] 1:[{type:0,url:'http://xxxx.jpg'}]  type 0 图片 1 视频 url 文件地址 此类型是为了给没有文件后缀的状况使用的
+			},
+			remove: { //是否展示删除按钮
+				type: Boolean,
+				default: true,
+			},
+			add: { //是否展示添加按钮
+				type: Boolean,
+				default: true,
+			},
+			disabled: { //是否禁用
+				type: Boolean,
+				default: false,
+			},
+			sourceType: { //选择照片来源 【ps：H5就别费劲了，设置了也没用。不是我说的，官方文档就这样！！！】
+				type: Array,
+				default: () => ['album', 'camera'],
+			},
+			action: { //上传地址 如需使用uniCloud服务，设置为uniCloud即可
+				type: String,
+				default: '',
+			},
+			headers: { //上传的请求头部
+				type: Object,
+				default: () => {},
+			},
+			formData: { //HTTP 请求中其他额外的 form data
+				type: Object,
+				default: () => {},
+			},
+			compress: { //是否需要压缩
+				type: Boolean,
+				default: true,
+			},
+			quality: { //压缩质量，范围0～100
+				type: Number,
+				default: 80,
+			},
+			// #ifndef VUE3
+			value: { //受控图片列表
+				type: Array,
+				default: () => [],
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: { //受控图片列表
+				type: Array,
+				default: () => [],
+			},
+			// #endif
+			uploadSuccess: {
+				default: (res) => {
+					return {
+						success: false,
+						url: ''
+					}
+				},
+			},
+			mediaType: { //文件类型 image/video/all
+				type: String,
+				default: 'image',
+			},
+			maxDuration: { //拍摄视频最长拍摄时间，单位秒。最长支持 60 秒。 (只针对拍摄视频有用)
+				type: Number,
+				default: 60,
+			},
+			camera: { //'front'、'back'，默认'back'(只针对拍摄视频有用)
+				type: String,
+				default: 'back',
+			},
+			appVideoPoster: { //app端视频展示封面 只对app有效
+				type: String,
+				default: '/static/htz-image-upload/play.png',
+			},
+		},
+		data() {
+			return {
+				uploadLists: [],
+				mediaTypeData: ['image', 'video', 'all'],
+				previewVideoSrc: '',
+			}
+		},
+		mounted: function() {
+			this.$nextTick(function() {
+				// #ifndef VUE3
+				this.uploadLists = this.value;
+				// #endif
+				// #ifdef VUE3
+				this.uploadLists = this.modelValue;
+				// #endif
+				if (this.mediaTypeData.indexOf(this.mediaType) == -1) {
+					uni.showModal({
+						title: '提示',
+						content: 'mediaType参数不正确',
+						showCancel: false,
+						success: function(res) {
+							if (res.confirm) {
+								//console.log('用户点击确定');
+							} else if (res.cancel) {
+								//console.log('用户点击取消');
+							}
+						}
+					});
+				}
+			});
+		},
+		watch: {
+			// #ifndef VUE3
+			value(val, oldVal) {
+				//console.log('value',val, oldVal)
+				this.uploadLists = val;
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue(val, oldVal) {
+				//console.log('value',val, oldVal)
+				this.uploadLists = val;
+			},
+			// #endif
+
+		},
+		methods: {
+			isVideo(item) {
+				let isPass = false
+				if ((!/.(gif|jpg|jpeg|png|gif|jpg|png)$/i.test(item) && this.dataType == 0) || (this.dataType == 1 && item
+						.type == 1)) {
+					isPass = true
+				}
+				return isPass
+			},
+			getFileUrl(item) {
+				var url = item;
+				if (this.dataType == 1) {
+					url = item.url
+				}
+				//console.log('url', url)
+				return url
+			},
+			previewVideo(src) {
+				this.previewVideoSrc = src;
+				// this.previewVideoSrc =
+				// 	'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-fbd63a76-dc76-485c-b711-f79f2986daeb/ba804d82-860b-4d1a-a706-5a4c8ce137c3.mp4'
+			},
+			previewVideoClose() {
+				this.previewVideoSrc = ''
+				//console.log('previewVideoClose', this.previewVideoSrc)
+			},
+			imgDel(index) {
+				// this.uploadLists.splice(index, 1)
+				// this.$emit("input", this.uploadLists);
+				// this.$emit("imgDelete", this.uploadLists);
+				let delUrl = this.uploadLists[index]
+				this.uploadLists.splice(index, 1)
+				// #ifndef VUE3
+				this.$emit("input", this.uploadLists);
+				// #endif
+				// #ifdef VUE3
+				this.$emit("update:modelValue", this.uploadLists);
+				// #endif
+				this.$emit("imgDelete", {
+					del: delUrl,
+					tempFilePaths: this.uploadLists
+				});
+			},
+			imgPreview(index) {
+
+				var imgData = []
+
+				this.uploadLists.forEach(item => {
+					if (!this.isVideo(item)) {
+						imgData.push(this.getFileUrl(item))
+					}
+				})
+
+
+				//console.log('imgPreview', imgData)
+				uni.previewImage({
+					urls: imgData,
+					current: index,
+					loop: true,
+				});
+
+
+			},
+			chooseFile() {
+				if (this.disabled) {
+					return false;
+				}
+				switch (this.mediaTypeData.indexOf(this.mediaType)) {
+					case 1: //视频
+						this.videoAdd();
+						break;
+					case 2: //全部
+						uni.showActionSheet({
+							itemList: ['相册', '视频'],
+							success: (res) => {
+								if (res.tapIndex == 1) {
+									this.videoAdd();
+								} else if (res.tapIndex == 0) {
+									this.imgAdd();
+								}
+							},
+							fail: (res) => {
+								console.log(res.errMsg);
+							}
+						});
+						break;
+					default: //图片
+						this.imgAdd();
+						break;
+				}
+
+
+				//if(this.mediaType=='image'){
+
+
+			},
+			videoAdd() {
+				//console.log('videoAdd')
+				let nowNum = Math.abs(this.uploadLists.length - this.max);
+				let thisNum = (this.chooseNum > nowNum ? nowNum : this.chooseNum) //可选数量
+				uni.chooseVideo({
+					compressed: this.compress,
+					sourceType: this.sourceType,
+					camera: this.camera,
+					maxDuration: this.maxDuration,
+					success: (res) => {
+						// console.log('videoAdd', res)
+						// console.log(res.tempFilePath)
+						this.chooseSuccessMethod([res.tempFilePath], 1)
+						//this.imgUpload([res.tempFilePath]);
+						//console.log('tempFiles', res)
+						// if (this.action == '') { //未配置上传路径
+						// 	this.$emit("chooseSuccess", res.tempFilePaths);
+						// } else {
+						// 	if (this.compress && (res.tempFiles[0].size / 1024 > 1025)) { //设置了需要压缩 并且 文件大于1M，进行压缩上传
+						// 		this.imgCompress(res.tempFilePaths);
+						// 	} else {
+						// 		this.imgUpload(res.tempFilePaths);
+						// 	}
+						// }
+					}
+				});
+			},
+			imgAdd() {
+				//console.log('imgAdd')
+				let nowNum = Math.abs(this.uploadLists.length - this.max);
+				let thisNum = (this.chooseNum > nowNum ? nowNum : this.chooseNum) //可选数量
+				//console.log('nowNum', nowNum)
+				//console.log('thisNum', thisNum)
+				// #ifdef APP-PLUS
+				if (this.sourceType.length > 1) {
+					uni.showActionSheet({
+						itemList: ['拍摄', '从手机相册选择'],
+						success: (res) => {
+							if (res.tapIndex == 1) {
+								this.appGallery(thisNum);
+							} else if (res.tapIndex == 0) {
+								this.appCamera();
+							}
+						},
+						fail: (res) => {
+							console.log(res.errMsg);
+						}
+					});
+				}
+				if (this.sourceType.length == 1 && this.sourceType.indexOf('album') > -1) {
+					this.appGallery(thisNum);
+				}
+
+				if (this.sourceType.length == 1 && this.sourceType.indexOf('camera') > -1) {
+					this.appCamera();
+				}
+				// #endif
+				//#ifndef APP-PLUS
+				uni.chooseImage({
+					count: thisNum,
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: this.sourceType,
+					success: (res) => {
+						this.chooseSuccessMethod(res.tempFilePaths, 0)
+						//console.log('tempFiles', res)
+						// if (this.action == '') { //未配置上传路径
+						// 	this.$emit("chooseSuccess", res.tempFilePaths);
+						// } else {
+						// 	if (this.compress && (res.tempFiles[0].size / 1024 > 1025)) { //设置了需要压缩 并且 文件大于1M，进行压缩上传
+						// 		this.imgCompress(res.tempFilePaths);
+						// 	} else {
+						// 		this.imgUpload(res.tempFilePaths);
+						// 	}
+						// }
+					}
+				});
+				// #endif
+			},
+			appCamera() {
+				var cmr = plus.camera.getCamera();
+				var res = cmr.supportedImageResolutions[0];
+				var fmt = cmr.supportedImageFormats[0];
+				//console.log("Resolution: " + res + ", Format: " + fmt);
+				cmr.captureImage((path) => {
+						//alert("Capture image success: " + path);
+						this.chooseSuccessMethod([path], 0)
+					},
+					(error) => {
+						//alert("Capture image failed: " + error.message);
+						console.log("Capture image failed: " + error.message)
+					}, {
+						resolution: res,
+						format: fmt
+					}
+				);
+			},
+			appGallery(maxNum) {
+				plus.gallery.pick((res) => {
+					this.chooseSuccessMethod(res.files, 0)
+				}, function(e) {
+					//console.log("取消选择图片");
+				}, {
+					filter: "image",
+					multiple: true,
+					maximum: maxNum
+				});
+			},
+			chooseSuccessMethod(filePaths, type) {
+				if (this.action == '') { //未配置上传路径
+					this.$emit("chooseSuccess", filePaths, type); //filePaths 路径 type 0 为图片 1为视频
+				} else {
+					if (type == 1) {
+						this.imgUpload(filePaths, type);
+					} else {
+						if (this.compress) { //设置了需要压缩
+							this.imgCompress(filePaths, type);
+						} else {
+							this.imgUpload(filePaths, type);
+						}
+					}
+
+				}
+			},
+			imgCompress(tempFilePaths, type) { //type 0 为图片 1为视频
+				uni.showLoading({
+					title: '压缩中...'
+				});
+
+				let compressImgs = [];
+				let results = [];
+				tempFilePaths.forEach((item, index) => {
+					compressImgs.push(new Promise((resolve, reject) => {
+						// #ifndef H5
+						uni.compressImage({
+							src: item,
+							quality: this.quality,
+							success: res => {
+								//console.log('compressImage', res.tempFilePath)
+								results.push(res.tempFilePath);
+								resolve(res.tempFilePath);
+							},
+							fail: (err) => {
+								//console.log(err.errMsg);
+								reject(err);
+							},
+							complete: () => {
+								//uni.hideLoading();
+							}
+						})
+						// #endif
+						// #ifdef H5
+						this.canvasDataURL(item, {
+							quality: this.quality / 100
+						}, (base64Codes) => {
+							//this.imgUpload(base64Codes);
+							results.push(base64Codes);
+							resolve(base64Codes);
+						})
+						// #endif
+					}))
+				})
+				Promise.all(compressImgs) //执行所有需请求的接口
+					.then((results) => {
+						uni.hideLoading();
+						//console.log('imgCompress', type)
+						this.imgUpload(results, type);
+					})
+					.catch((res, object) => {
+						uni.hideLoading();
+					});
+			},
+			imgUpload(tempFilePaths, type) { //type 0 为图片 1为视频
+				// if (this.action == '') {
+				// 	uni.showToast({
+				// 		title: '未配置上传地址',
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	});
+				// 	return false;
+				// }
+				if (this.action == 'uniCloud') {
+					this.uniCloudUpload(tempFilePaths, type)
+					return
+				}
+				uni.showLoading({
+					title: '上传中'
+				});
+				//console.log('imgUpload', tempFilePaths)
+				let uploadImgs = [];
+				tempFilePaths.forEach((item, index) => {
+					uploadImgs.push(new Promise((resolve, reject) => {
+						//console.log(index, item)
+						const uploadTask = uni.uploadFile({
+							url: this.action, //仅为示例，非真实的接口地址
+							filePath: item,
+							name: this.name,
+							fileType: 'image',
+							formData: this.formData,
+							header: this.headers,
+							success: (uploadFileRes) => {
+								//uni.hideLoading();
+								//console.log(typeof this.uploadSuccess)
+								//console.log('')
+								uploadFileRes.fileType = type
+								if (typeof this.uploadSuccess == 'function') {
+
+									let thisUploadSuccess = this.uploadSuccess(
+										uploadFileRes)
+									if (thisUploadSuccess.success) {
+										let keyName = '';
+										// #ifndef VUE3
+										keyName = 'value'
+										// #endif
+										// #ifdef VUE3
+										keyName = 'modelValue'
+										// #endif
+										if (this.dataType == 0) {
+											this[keyName].push(thisUploadSuccess.url)
+										} else {
+											this[keyName].push({
+												type: type,
+												url: thisUploadSuccess.url,
+												...thisUploadSuccess
+											})
+										}
+
+										//this.$emit("input", this.uploadLists);
+										// #ifndef VUE3
+										this.$emit("input", this.uploadLists);
+										// #endif
+										// #ifdef VUE3
+										this.$emit("update:modelValue", this.uploadLists);
+										// #endif
+									}
+								}
+								resolve(uploadFileRes);
+								this.$emit("uploadSuccess", uploadFileRes);
+							},
+							fail: (err) => {
+								console.log(err);
+								//uni.hideLoading();
+								reject(err);
+								this.$emit("uploadFail", err);
+							},
+							complete: () => {
+								//uni.hideLoading();
+							}
+						});
+					}))
+				})
+				Promise.all(uploadImgs) //执行所有需请求的接口
+					.then((results) => {
+						uni.hideLoading();
+					})
+					.catch((res, object) => {
+						uni.hideLoading();
+						this.$emit("uploadFail", res);
+					});
+				// uploadTask.onProgressUpdate((res) => {
+				// 	//console.log('',)
+				// 	uni.showLoading({
+				// 		title: '上传中' + res.progress + '%'
+				// 	});
+				// 	if (res.progress == 100) {
+				// 		uni.hideLoading();
+				// 	}
+				// });
+			},
+			uniCloudUpload(tempFilePaths, type) {
+				uni.showLoading({
+					title: '上传中'
+				});
+				console.log('uniCloudUpload', tempFilePaths);
+				let uploadImgs = [];
+				tempFilePaths.forEach((item, index) => {
+					uploadImgs.push(new Promise((resolve, reject) => {
+
+						uniCloud.uploadFile({
+							filePath: item,
+							cloudPath: this.guid() + '.' + this.getFileType(item, type),
+							success(uploadFileRes) {
+								if (uploadFileRes.success) {
+									resolve(uploadFileRes.fileID);
+								}
+							},
+							fail(err) {
+								console.log(err);
+								reject(err);
+							},
+							complete() {}
+						});
+
+					}))
+				})
+				Promise.all(uploadImgs) //执行所有需请求的接口
+					.then((results) => {
+						uni.hideLoading();
+						// console.log('then', results)
+
+						uniCloud.getTempFileURL({
+							fileList: results,
+							success: (res) => {
+								//console.log('success',res.fileList)
+								res.fileList.forEach(item => {
+									//console.log(item.tempFileURL)
+									//this.value.push(item.tempFileURL)
+									// #ifndef VUE3
+									this.value.push(item.tempFileURL)
+									this.$emit("input", this.value);
+									// #endif
+									// #ifdef VUE3
+									this.modelValue.push(item.tempFileURL)
+									this.$emit("update:modelValue", this.modelValue);
+									// #endif
+								})
+							},
+							fail() {},
+							complete() {}
+						});
+					})
+					.catch((res, object) => {
+						uni.hideLoading();
+					});
+			},
+			getFileType(path, type) { //手机端默认图片为jpg 视频为mp4
+				// #ifdef H5 
+				var result = type == 0 ? 'jpg' : 'mp4';
+				// #endif
+
+
+				// #ifndef H5
+				var result = path.split('.').pop().toLowerCase();
+				// #ifdef MP 
+				if (this.compress) { //微信小程序压缩完没有后缀
+					result = type == 0 ? 'jpg' : 'mp4';
+				}
+				// #endif
+				// #endif
+				return result;
+			},
+			guid() {
+				return 'xxxxxxxx-date-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+					var r = Math.random() * 16 | 0,
+						v = c == 'x' ? r : (r & 0x3 | 0x8);
+					return v.toString(16);
+				}).replace(/date/g, function(c) {
+					return Date.parse(new Date());
+				});
+			},
+			canvasDataURL(path, obj, callback) {
+				var img = new Image();
+				img.src = path;
+				img.onload = function() {
+					var that = this;
+					// 默认按比例压缩
+					var w = that.width,
+						h = that.height,
+						scale = w / h;
+					w = obj.width || w;
+					h = obj.height || (w / scale);
+					var quality = 0.8; // 默认图片质量为0.8
+					//生成canvas
+					var canvas = document.createElement('canvas');
+					var ctx = canvas.getContext('2d');
+					// 创建属性节点
+					var anw = document.createAttribute("width");
+					anw.nodeValue = w;
+					var anh = document.createAttribute("height");
+					anh.nodeValue = h;
+					canvas.setAttributeNode(anw);
+					canvas.setAttributeNode(anh);
+					ctx.drawImage(that, 0, 0, w, h);
+					// 图像质量
+					if (obj.quality && obj.quality <= 1 && obj.quality > 0) {
+						quality = obj.quality;
+					}
+					// quality值越小，所绘制出的图像越模糊
+					var base64 = canvas.toDataURL('image/jpeg', quality);
+					// 回调函数返回base64的值
+					callback(base64);
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+	.preview-full {
+		position: fixed;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1002;
+	}
+
+	.preview-full video {
+		width: 100%;
+		height: 100%;
+		z-index: 1002;
+	}
+
+	.preview-full-close {
+		position: fixed;
+		right: 32rpx;
+		top: 25rpx;
+		width: 80rpx;
+		height: 80rpx;
+		line-height: 60rpx;
+		text-align: center;
+		z-index: 1003;
+		/* 	background-color: #808080; */
+		color: #fff;
+		font-size: 65rpx;
+		font-weight: bold;
+		text-shadow: 1px 2px 5px rgb(0 0 0);
+	}
+
+
+
+	/* .preview-full-close-before,
+	.preview-full-close-after {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		content: '';
+		height: 60rpx;
+		margin-top: -30rpx;
+		width: 6rpx;
+		margin-left: -3rpx;
+		background-color: #FFFFFF;
+		z-index: 20000;
+	}
+
+	.preview-full-close-before {
+		transform: rotate(45deg);
+
+	}
+
+	.preview-full-close-after {
+		transform: rotate(-45deg);
+
+	} */
+
+	.htz-image-upload-list {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.htz-image-upload-Item {
+		width: 160rpx;
+		height: 160rpx;
+		margin: 13rpx;
+		border-radius: 10rpx;
+		position: relative;
+	}
+
+	.htz-image-upload-Item image {
+		width: 100%;
+		height: 100%;
+		border-radius: 10rpx;
+	}
+
+	.htz-image-upload-Item-video {
+		width: 100%;
+		height: 100%;
+		border-radius: 10rpx;
+		position: relative;
+
+	}
+
+	.htz-image-upload-Item-video-fixed {
+		position: absolute;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 100%;
+		border-radius: 10rpx;
+		z-index: 996;
+
+	}
+
+	.htz-image-upload-Item video {
+		width: 100%;
+		height: 100%;
+		border-radius: 10rpx;
+
+	}
+
+	.htz-image-upload-Item-add {
+		font-size: 105rpx;
+		/* line-height: 160rpx; */
+		text-align: center;
+		border: 1px dashed #d9d9d9;
+		color: #d9d9d9;
+	}
+
+	.htz-image-upload-Item-del {
+		background-color: var(--ui-BG-Main);
+		font-size: 24rpx;
+		position: absolute;
+		width: 35rpx;
+		height: 35rpx;
+		line-height: 35rpx;
+		text-align: center;
+		top: 0;
+		right: 0;
+		z-index: 997;
+		color: #fff;
+		border-top-right-radius: 10rpx;
+	}
+
+	.htz-image-upload-Item-del-cover {
+		background-color: var(--ui-BG-Main);
+		font-size: 24rpx;
+		position: absolute;
+		width: 35rpx;
+		height: 35rpx;
+		text-align: center;
+		top: 0;
+		right: 0;
+		color: #fff;
+		/* #ifdef APP-PLUS */
+		line-height: 25rpx;
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		line-height: 35rpx;
+		/* #endif */
+		z-index: 997;
+		border-top-right-radius: 10rpx;
+	}
+
+	.htz-image-upload-Item-video-app-poster {
+		width: 100%;
+		height: 100%;
+	}
+</style>
diff --git a/components/qrcode-modal/qrcode-modal.vue b/components/qrcode-modal/qrcode-modal.vue
new file mode 100644
index 0000000..a94dc44
--- /dev/null
+++ b/components/qrcode-modal/qrcode-modal.vue
@@ -0,0 +1,121 @@
+<template>
+	 <su-popup
+		:show="modal.qrcode"
+		type="center"
+		backgroundColor="none"
+		round="0"
+		:showClose="false"
+		:isMaskClick="true"
+		@close="closeModal"
+	  >
+		<view class="content">
+			<image class="img" :src="tradeConfig.qrcode" show-menu-by-longpress="true"></image>
+			<view class="tip">长按二维码 关注公众号</view>
+			<view class="desc">用于接收消息提醒</view>
+			<view class="close-btn" @click="getQrcode">点击验证</view>
+		</view>
+	</su-popup>
+</template>
+
+<script>
+import sheep from '@/sheep';
+import $store from '@/sheep/store';
+import UserApi from '@/sheep/api/member/user';
+export default {  
+	components: { 
+		
+	},  
+	data() {
+		return {
+			show: false,
+		};
+	},
+	computed: {
+		modal() {
+			return sheep.$store('modal');
+		},
+		tradeConfig() {
+			return sheep.$store('user').tradeConfig;
+		},
+	},
+	methods: {
+		open() {
+			this.show = true;
+		},
+		closeModal() {
+			$store('modal').$patch((state) => {
+				state.qrcode = false;
+			});
+		},
+		getQrcode() {
+			UserApi.getQrcode().then((res) => {
+				if (res.code === 0) {
+					if(res.data){
+						sheep.$helper.toast('验证通过');
+						this.closeModal();
+					}else{
+						sheep.$helper.toast('未关注公众号');
+					}
+				}
+			});
+		},
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.show {
+		background-color: rgba(0, 0, 0, 0.7);
+		position: fixed;
+		z-index: 999999;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.hide {
+		display: none;
+	}
+	
+	.content {
+		padding: 40rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+		
+		.img {
+			width: 500rpx;
+			height: 500rpx;
+		}
+		
+		.tip {
+			display: flex;
+			justify-content: center;
+			padding-top: 40rpx;
+			padding-bottom: 20rpx;
+			font-size: 28rpx;
+			color: #666666;
+		}
+		
+		.desc{
+			display: flex;
+			justify-content: center;
+			font-size: 28rpx;
+			font-weight: bold;
+		}
+		
+		.close-btn {
+			display: flex;
+			justify-content: center;
+			background-color: var(--ui-BG-Main);
+			border-radius: 40px;
+			margin-top: 40rpx;
+			padding: 20rpx;
+			font-size: 24rpx;
+			color: #fff;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/search-modal/search-modal.vue b/components/search-modal/search-modal.vue
new file mode 100644
index 0000000..bc5c1ba
--- /dev/null
+++ b/components/search-modal/search-modal.vue
@@ -0,0 +1,356 @@
+<template>
+	<su-popup
+		:show="modal.search"
+		backgroundColor="#fff"
+		round="5"
+		:showClose="false"
+		:isMaskClick="true"
+		@close="closeModal"
+	  >
+		<view class="s-form">
+			<view class="s-title">筛选</view>
+			<view class="s-box">
+				<view class="s-label">年龄</view>
+				<view class="age-box">
+					<view class="s-tag" @click="ageChange(aindex)" :class="ageIndex == aindex ? 'active' : ''" v-for="(age, aindex) in ageList" :key="aindex">{{age.text}}</view>
+				</view>
+			</view>
+			<view class="s-box">
+				<view class="s-label">性别</view>
+				<view class="age-box">
+					<view class="s-tag" @click="sexChange(index)" :class="sexIndex == index ? 'active' : ''" v-for="(sex, index) in sexList" :key="index">{{sex.text}}</view>
+				</view>
+			</view>
+			<view class="s-box">
+				<view class="s-label">是否同城（会员特权）</view>
+				<view class="age-box">
+					<view class="s-tag" @click="cityChange(cindex)" :class="cityIndex == cindex ? 'active' : ''" v-for="(city, cindex) in cityList" :key="cindex">{{city.text}}</view>
+				</view>
+			</view>
+			<view class="s-box">
+				<view class="s-label">城市（会员特权）</view>
+				<view class="age-box">
+					<view class="s-tag" @click="query.city = ''">全部</view>
+					<view class="s-tag" @click="cityShow = true" v-if="query.city">{{query.city}}</view>
+					<view class="s-tag" @click="cityShow = true" v-else>切换城市</view>
+				</view>
+			</view>
+			<!-- <view class="s-box">
+				<view class="s-label">距离</view>
+				<view class="age-box">
+					<view class="s-tag" @click="miChange(mindex)" :class="miIndex == mindex ? 'active' : ''" v-for="(mi, mindex) in miList" :key="mindex">{{mi.text}}</view>
+				</view>
+			</view> -->
+			<view class="btn-box" :class="(ageIndex < 0 && sexIndex < 0 && miIndex < 0) ? 'btn-disabled' : ''" @click="ok">确定</view>
+		</view>
+	</su-popup>
+	
+	<su-region-picker :show="cityShow" @cancel="cityShow = false" @confirm="cityOk" />
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import $store from '@/sheep/store';
+	export default {
+		emits: ['query'],
+		components: {
+			
+		},
+		data() {
+			return {
+				min: 18,
+				max: 18,
+				ageIndex: 0,
+				sexIndex: 0,
+				cityIndex: 0,
+				miIndex: -1,
+				ageList: [
+					{
+						text: '全部',
+						min: 0,
+						max: 100,
+					},
+					{
+						text: '18~23',
+						min: 18,
+						max: 23,
+					},
+					{
+						text: '23~28',
+						min: 23,
+						max: 28,
+					},
+					{
+						text: '28~33',
+						min: 28,
+						max: 33,
+					},
+					{
+						text: '33~38',
+						min: 33,
+						max: 38,
+					},
+					{
+						text: '38~43',
+						min: 38,
+						max: 43,
+					},
+					{
+						text: '43~48',
+						min: 43,
+						max: 48,
+					},
+					{
+						text: '48~53',
+						min: 48,
+						max: 53,
+					},
+				],
+				sexList: [
+					{
+						text: '全部',
+						value: '',
+					},
+					{
+						text: '男',
+						value: 2,
+					},
+					{
+						text: '女',
+						value: 1,
+					},
+				],
+				cityList: [
+					{
+						text: '否',
+						value: '1',
+					},
+					{
+						text: '是',
+						value: '0',
+					},
+				],
+				miList: [
+					{
+						text: '5KM',
+						value: 5000,
+					},
+					{
+						text: '10KM',
+						value: 10000,
+					},
+					{
+						text: '15KM',
+						value: 15000,
+					},
+					{
+						text: '20KM',
+						value: 20000,
+					},
+					{
+						text: '25KM',
+						value: 25000,
+					},
+					{
+						text: '30KM',
+						value: 30000,
+					},
+					{
+						text: '35KM',
+						value: 35000,
+					},
+					{
+						text: '40KM',
+						value: 40000,
+					},
+				],
+				search: false,
+				
+				cityShow: false,
+				
+				query: {
+					maxAge: 35,
+					minAge: 18,
+					sex: '',
+					isCity: 1,
+					city: '',
+				},
+			}
+		},
+		computed: {
+			modal() {
+				return sheep.$store('modal');
+			},
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+		},
+		methods: {
+			closeModal() {
+				$store('modal').$patch((state) => {
+					state.search = false;
+				});
+			},
+			ageChange(i) {
+				this.ageIndex = i;
+			},
+			sexChange(i) {
+				this.sexIndex = i;
+			},
+			cityChange(i) {
+				this.cityIndex = i;
+			},
+			miChange(i) {
+				this.miIndex = i;
+			},
+			ok() {
+				if(this.ageIndex < 0 && this.sexIndex < 0 && this.miIndex < 0){
+					return;
+				}
+				if(this.ageIndex > -1){
+					this.query.maxAge = this.ageList[this.ageIndex].max;
+					this.query.minAge = this.ageList[this.ageIndex].min;
+				}
+				if(this.sexIndex > -1){
+					this.query.sex = this.sexList[this.sexIndex].value;
+				}
+				if(this.cityIndex > -1){
+					this.query.isCity = this.cityList[this.cityIndex].value;
+				}
+				this.$emit('query', this.query);
+				
+				this.closeModal();
+			},
+			handerChooseLocation () {
+			  uni.chooseLocation({
+			    success: (res) => {
+			  	  this.updateLocation(res.latitude, res.longitude);
+			    },
+			    fail: function (err) {
+			        console.log('取消按钮', err)
+			    }
+			  });
+			},
+			doCity() {
+				this.$u.route({
+					url: '/pages/index/user/city',
+				});
+			},
+			updateLocation(lat,lng) {
+				this.$u.put('/system/user/profile',{
+					lat: lat,
+					lon: lng,
+				}).then(res => {
+					this.doCity();
+				})
+			},
+			more() {
+				this.$u.route({
+					url: 'pages/index/user/menu',
+				});
+			},
+			open() {
+				this.search = true;
+			},
+			cancel() {
+				this.search = false;
+			},
+			minEnd() {
+				if(this.max < this.min){
+					this.max = this.min;
+				}
+			},
+			maxEnd() {
+				if(this.max < this.min){
+					this.min = this.max;
+				}
+			},
+			cityOk(e) {
+				this.query.city = e.city_name;
+				this.cityShow = false;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.s-form {
+		padding: 20px;
+	}
+	.s-title {
+		font-size: 38rpx;
+		display: flex;
+		align-items: center;
+		font-weight: bold;
+		justify-content: center;
+		margin-bottom: 15px;
+	}
+	.s-label {
+		font-size: 30rpx;
+		margin-top: 10px;
+		margin-bottom: 10px;
+		color: black;
+	}
+	.s-age {
+		display: flex;
+		align-items: center;
+		margin: 30px 0;
+	}
+	.s-slider {
+		flex: 1;
+	}
+	.btn-box {
+		background-color: #283242;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 10px;
+		border-radius: 20px;
+		font-size: 30rpx;
+		color: #fff;
+		margin-top: 20px;
+	}
+	.sex-btn {
+		background-color: #2979ff;
+		border-radius: 20px;
+		padding: 3px 10px;
+		color: #fff;
+		display: flex;
+		justify-content: center;
+		margin-left: 10px;
+	}
+	.more {
+		margin-bottom: 15px;
+		background-color: #19be6b;
+	}
+	.s-box {
+		display: flex;
+		flex-direction: column;
+	}
+	.age-box {
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.s-tag {
+		border: 1px solid #ddd;
+		border-radius: 40px;
+		display: flex;
+		font-size: 24rpx;
+		align-items: center;
+		justify-content: center;
+		margin-right: 10px;
+		height: 25px;
+		width: 60px;
+		margin-bottom: 15px;
+	}
+	.active {
+		background-color: #283242;
+		color: #fff;
+		border: 1px solid #283242;
+	}
+	.btn-disabled {
+		background-color: #ddd;
+	}
+</style>
diff --git a/components/thorui/tui-actionsheet/tui-actionsheet.vue b/components/thorui/tui-actionsheet/tui-actionsheet.vue
new file mode 100644
index 0000000..84901ea
--- /dev/null
+++ b/components/thorui/tui-actionsheet/tui-actionsheet.vue
@@ -0,0 +1,201 @@
+<template>
+	<view @touchmove.stop.prevent>
+		<view class="tui-actionsheet" :class="{'tui-actionsheet-show':show,'tui-actionsheet-radius':radius}"
+			:style="{zIndex:getZIndex}">
+			<view class="tui-actionsheet-tips" :style="{fontSize:size+'rpx',color:color}" v-if="tips">
+				{{tips}}
+			</view>
+			<view :class="[isCancel?'tui-operate-box':'']">
+				<block v-for="(item,index) in itemList" :key="index">
+					<view class="tui-actionsheet-btn tui-actionsheet-divider"
+						:class="{'tui-btn-last':!isCancel && index==itemList.length-1}"
+						hover-class="tui-actionsheet-hover" :hover-stay-time="150" :data-index="index"
+						:style="{color:item.color || '#2B2B2B'}" @tap="handleClickItem">{{item.text}}</view>
+				</block>
+			</view>
+			<view class="tui-actionsheet-btn tui-actionsheet-cancel" hover-class="tui-actionsheet-hover"
+				:hover-stay-time="150" v-if="isCancel" @tap="handleClickCancel">取消</view>
+		</view>
+		<view class="tui-actionsheet-mask" :class="{'tui-mask-show':show}" :style="{background:maskColor,zIndex:zIndex}"
+			@tap="handleClickMask"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiActionsheet",
+		emits: ['click', 'cancel'],
+		props: {
+			//显示操作菜单
+			show: {
+				type: Boolean,
+				default: false
+			},
+			//菜单按钮数组，自定义文本颜色，红色参考色：#e53a37
+			itemList: {
+				type: Array,
+				default: function() {
+					return [{
+						text: "确定",
+						color: "#2B2B2B"
+					}]
+				}
+			},
+			//点击遮罩 是否可关闭
+			maskClosable: {
+				type: Boolean,
+				default: true
+			},
+			//v2.1.0
+			maskColor: {
+				type: String,
+				default: "rgba(0, 0, 0, 0.6)"
+			},
+			//提示文字
+			tips: {
+				type: String,
+				default: ""
+			},
+			//提示文字颜色
+			color: {
+				type: String,
+				default: "#808080"
+			},
+			//提示文字大小 rpx
+			size: {
+				type: Number,
+				default: 26
+			},
+			//是否需要圆角
+			radius: {
+				type: Boolean,
+				default: true
+			},
+			//是否需要取消按钮
+			isCancel: {
+				type: Boolean,
+				default: true
+			},
+			zIndex: {
+				type: [Number, String],
+				default: 998
+			}
+		},
+		computed: {
+			getZIndex() {
+				return Number(this.zIndex) + 2
+			}
+		},
+		methods: {
+			handleClickMask() {
+				if (!this.maskClosable) return;
+				this.handleClickCancel();
+			},
+			handleClickItem(e) {
+				if (!this.show) return;
+				const index = Number(e.currentTarget.dataset.index);
+				this.$emit('click', {
+					index: index,
+					...this.itemList[index]
+				});
+			},
+			handleClickCancel() {
+				this.$emit('cancel');
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-actionsheet {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		visibility: hidden;
+		transform: translate3d(0, 100%, 0);
+		transform-origin: center;
+		transition: all 0.25s ease-in-out;
+		background-color: #F7F7F7;
+		min-height: 100rpx;
+	}
+
+	.tui-actionsheet-radius {
+		border-top-left-radius: 20rpx;
+		border-top-right-radius: 20rpx;
+		overflow: hidden;
+	}
+
+	.tui-actionsheet-show {
+		transform: translate3d(0, 0, 0);
+		visibility: visible;
+	}
+
+	.tui-actionsheet-tips {
+		width: 100%;
+		padding: 40rpx 60rpx;
+		box-sizing: border-box;
+		text-align: center;
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tui-operate-box {
+		padding-bottom: 12rpx;
+	}
+
+	.tui-actionsheet-btn {
+		width: 100%;
+		height: 100rpx;
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		text-align: center;
+		font-size: 34rpx;
+		position: relative;
+	}
+
+	.tui-btn-last {
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.tui-actionsheet-divider::before {
+		content: '';
+		width: 100%;
+		border-top: 1rpx solid #E7E7E7;
+		position: absolute;
+		top: 0;
+		left: 0;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
+
+	.tui-actionsheet-cancel {
+		color: #1a1a1a;
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.tui-actionsheet-hover {
+		background-color: #f7f7f9;
+	}
+
+	.tui-actionsheet-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		transition: all 0.3s ease-in-out;
+		opacity: 0;
+		visibility: hidden;
+	}
+
+	.tui-mask-show {
+		opacity: 1;
+		visibility: visible;
+	}
+</style>
\ No newline at end of file
diff --git a/components/thorui/tui-badge/tui-badge.vue b/components/thorui/tui-badge/tui-badge.vue
new file mode 100644
index 0000000..d361637
--- /dev/null
+++ b/components/thorui/tui-badge/tui-badge.vue
@@ -0,0 +1,129 @@
+<template>
+	<view :class="[dot ? 'tui-badge-dot' : 'tui-badge', !dot ? 'tui-badge-scale' : '']"
+		:style="{ top: top, right: right, position: absolute ? 'absolute' : 'static', transform: getStyle, margin: margin,background:getBackground,color:getColor }"
+		@tap="handleClick">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiBadge',
+		emits: ['click'],
+		props: {
+			//primary,warning,green,danger,white，black，gray,white_red
+			type: {
+				type: String,
+				default: 'primary'
+			},
+			//是否是圆点
+			dot: {
+				type: Boolean,
+				default: false
+			},
+			margin: {
+				type: String,
+				default: '0'
+			},
+			//是否绝对定位
+			absolute: {
+				type: Boolean,
+				default: false
+			},
+			top: {
+				type: String,
+				default: '-8rpx'
+			},
+			right: {
+				type: String,
+				default: '0'
+			},
+			//缩放比例
+			scaleRatio: {
+				type: Number,
+				default: 1
+			},
+			//水平方向移动距离
+			translateX: {
+				type: String,
+				default: '0'
+			}
+		},
+		computed: {
+			getStyle() {
+				return `scale(${this.scaleRatio}) translateX(${this.translateX})`;
+			},
+			getBackground() {
+				const global = uni && uni.$tui && uni.$tui.color;
+				let color = {
+					'primary': (global && global.primary) || '#5677fc',
+					'green': (global && global.success) || '#07c160',
+					'warning': (global && global.warning) || '#ff7900',
+					'danger': (global && global.danger) || '#EB0909',
+					'white': '#fff',
+					'black': '#000',
+					'gray': '#ededed',
+					'red': (global && global.pink) || '#f74d54',
+					'pink': (global && global.pink) || '#f74d54',
+					'white_red': '#fff',
+					'white_primary': '#fff',
+					'white_green': '#fff',
+					'white_warning': '#fff',
+					'white_pink': '#fff'
+				} [this.type]
+				return color
+			},
+			getColor() {
+				const global = uni && uni.$tui && uni.$tui.color;
+				let color = {
+					'primary': '#fff',
+					'green': '#fff',
+					'warning': '#fff',
+					'danger': '#fff',
+					'white': '#333',
+					'black': '#fff',
+					'gray': '#999',
+					'red': '#fff',
+					'pink': (global && global.pink) || '#f74d54',
+					'white_red': (global && global.danger) || '#EB0909',
+					'white_primary': (global && global.primary) || '#5677fc',
+					'white_green': (global && global.success) || '#07c160',
+					'white_warning': (global && global.warning) || '#ff7900',
+					'white_pink': (global && global.pink) || '#f74d54',
+				} [this.type]
+				return color
+			}
+		},
+		methods: {
+			handleClick() {
+				this.$emit('click', {});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-badge-dot {
+		height: 8px;
+		width: 8px;
+		border-radius: 50%;
+	}
+
+	.tui-badge {
+		font-size: 24rpx;
+		line-height: 24rpx;
+		height: 36rpx;
+		min-width: 36rpx;
+		padding: 0 10rpx;
+		box-sizing: border-box;
+		border-radius: 100rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 10;
+	}
+
+	.tui-badge-scale {
+		transform-origin: center center;
+	}
+</style>
\ No newline at end of file
diff --git a/components/thorui/tui-bottom-popup/tui-bottom-popup.vue b/components/thorui/tui-bottom-popup/tui-bottom-popup.vue
new file mode 100644
index 0000000..c06e4ed
--- /dev/null
+++ b/components/thorui/tui-bottom-popup/tui-bottom-popup.vue
@@ -0,0 +1,119 @@
+<template>
+	<view @touchmove.stop.prevent>
+		<view class="tui-popup-class tui-bottom-popup"
+			:class="{ 'tui-popup-show': show, 'tui-popup-radius': radius,'tui-bp__safearea':isSafeArea }"
+			:style="{ background: backgroundColor, height: height ? height + 'rpx' : 'auto', zIndex: zIndex,transform:`translate3d(0, ${show?translateY:'100%'}, 0)`}">
+			<slot></slot>
+		</view>
+		<view class="tui-popup-mask" :class="[show ? 'tui-mask-show' : '']" :style="{ zIndex: maskZIndex }" v-if="mask"
+			@tap="handleClose"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiBottomPopup',
+		emits: ['close'],
+		props: {
+			//是否需要mask
+			mask: {
+				type: Boolean,
+				default: true
+			},
+			//控制显示
+			show: {
+				type: Boolean,
+				default: false
+			},
+			//背景颜色
+			backgroundColor: {
+				type: String,
+				default: '#fff'
+			},
+			//高度 rpx
+			height: {
+				type: Number,
+				default: 0
+			},
+			//设置圆角
+			radius: {
+				type: Boolean,
+				default: true
+			},
+			zIndex: {
+				type: [Number, String],
+				default: 997
+			},
+			maskZIndex: {
+				type: [Number, String],
+				default: 996
+			},
+			//弹层显示时，垂直方向移动的距离
+			translateY: {
+				type: String,
+				default: '0'
+			},
+			//是否需要判断底部安全区域（主要针对iphonex以上机型）
+			isSafeArea: {
+				type: Boolean,
+				default: true
+			}
+		},
+		methods: {
+			handleClose() {
+				if (!this.show) {
+					return;
+				}
+				this.$emit('close', {});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-bottom-popup {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		opacity: 0;
+		transform: translate3d(0, 100%, 0);
+		transform-origin: center;
+		transition: all 0.3s ease-in-out;
+		min-height: 20rpx;
+	}
+
+	.tui-bp__safearea {
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.tui-popup-radius {
+		border-top-left-radius: 24rpx;
+		border-top-right-radius: 24rpx;
+		overflow: hidden;
+	}
+
+
+	.tui-popup-show {
+		opacity: 1;
+		/* transform: translate3d(0, 0, 0); */
+	}
+
+	.tui-popup-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.6);
+		transition: all 0.3s ease-in-out;
+		opacity: 0;
+		visibility: hidden;
+	}
+
+	.tui-mask-show {
+		opacity: 1;
+		visibility: visible;
+	}
+</style>
\ No newline at end of file
diff --git a/components/thorui/tui-bubble-popup/tui-bubble-popup.vue b/components/thorui/tui-bubble-popup/tui-bubble-popup.vue
new file mode 100644
index 0000000..dbb3cea
--- /dev/null
+++ b/components/thorui/tui-bubble-popup/tui-bubble-popup.vue
@@ -0,0 +1,204 @@
+<template>
+	<view :class="{ 'tui-flex-end': flexEnd }">
+		<view class="tui-popup-list" :class="{ 'tui-popup-show': show,'tui-z_index':show && position!='relative' }" :style="{ width: width, backgroundColor: backgroundColor, borderRadius: radius, color: color, position: position, left: left, right: right, bottom: bottom, top: top,transform:`translate(${translateX},${translateY})` }">
+			<view class="tui-triangle" :style="{
+					borderWidth: borderWidth,
+					borderColor: `transparent transparent ${backgroundColor} transparent`,
+					left: triangleLeft,
+					right: triangleRight,
+					top: triangleTop,
+					bottom: triangleBottom
+				}"
+			 v-if="direction == 'top'"></view>
+			<view class="tui-triangle" :style="{
+					borderWidth: borderWidth,
+					borderColor: `${backgroundColor}  transparent transparent transparent`,
+					left: triangleLeft,
+					right: triangleRight,
+					top: triangleTop,
+					bottom: triangleBottom
+				}"
+			 v-if="direction == 'bottom'"></view>
+			<view class="tui-triangle" :style="{
+					borderWidth: borderWidth,
+					borderColor: `transparent  ${backgroundColor} transparent transparent`,
+					left: triangleLeft,
+					right: triangleRight,
+					top: triangleTop,
+					bottom: triangleBottom
+				}"
+			 v-if="direction == 'left'"></view>
+			<view class="tui-triangle" :style="{
+					borderWidth: borderWidth,
+					borderColor: `transparent transparent  transparent ${backgroundColor}`,
+					left: triangleLeft,
+					right: triangleRight,
+					top: triangleTop,
+					bottom: triangleBottom
+				}"
+			 v-if="direction == 'right'"></view>
+			<slot></slot>
+		</view>
+		<view @touchmove.stop.prevent="stop" class="tui-popup-mask" :class="{ 'tui-popup-show': show }" :style="{ backgroundColor: maskBgColor }"
+		 v-if="mask" @tap="handleClose"></view>
+	</view>
+</template>
+<script>
+	export default {
+		name: 'tuiBubblePopup',
+		emits: ['close'],
+		props: {
+			//宽度
+			width: {
+				type: String,
+				default: '300rpx'
+			},
+			//popup圆角
+			radius: {
+				type: String,
+				default: '8rpx'
+			},
+			//popup 定位 left right top bottom值
+			left: {
+				type: String,
+				default: 'auto'
+			},
+			right: {
+				type: String,
+				default: 'auto'
+			},
+			top: {
+				type: String,
+				default: 'auto'
+			},
+			bottom: {
+				type: String,
+				default: 'auto'
+			},
+			translateX:{
+				type: String,
+				default: '0'
+			},
+			translateY:{
+				type: String,
+				default: '0'
+			},
+			//背景颜色
+			backgroundColor: {
+				type: String,
+				default: '#4c4c4c'
+			},
+			//字体颜色
+			color: {
+				type: String,
+				default: '#fff'
+			},
+			//三角border-width
+			borderWidth: {
+				type: String,
+				default: '12rpx'
+			},
+			//三角形方向 top left right bottom
+			direction: {
+				type: String,
+				default: 'top'
+			},
+			//定位 left right top bottom值
+			triangleLeft: {
+				type: String,
+				default: 'auto'
+			},
+			triangleRight: {
+				type: String,
+				default: 'auto'
+			},
+			triangleTop: {
+				type: String,
+				default: 'auto'
+			},
+			triangleBottom: {
+				type: String,
+				default: 'auto'
+			},
+			//定位 relative absolute  fixed
+			position: {
+				type: String,
+				default: 'fixed'
+			},
+			//flex-end
+			flexEnd: {
+				type: Boolean,
+				default: false
+			},
+			//是否需要mask
+			mask: {
+				type: Boolean,
+				default: true
+			},
+			maskBgColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+			//控制显示
+			show: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			handleClose() {
+				if (!this.show) {
+					return;
+				}
+				this.$emit('close', {});
+			},
+			stop() {
+				return false;
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-popup-list {
+		z-index: 1;
+		transition: all 0.3s ease-in-out;
+		opacity: 0;
+		visibility: hidden;
+	}
+
+	.tui-flex-end {
+		width: 100%;
+		display: flex;
+		justify-content: flex-end;
+	}
+
+	.tui-triangle {
+		position: absolute;
+		width: 0;
+		height: 0;
+		border-style: solid;
+		z-index: 997;
+	}
+
+	.tui-popup-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 995;
+		transition: all 0.3s ease-in-out;
+		opacity: 0;
+		visibility: hidden;
+	}
+
+	.tui-popup-show {
+		opacity: 1;
+		visibility: visible;
+	}
+
+	.tui-z_index {
+		z-index: 996;
+	}
+</style>
diff --git a/components/thorui/tui-circular-progress/tui-circular-progress.vue b/components/thorui/tui-circular-progress/tui-circular-progress.vue
new file mode 100644
index 0000000..2fc86a4
--- /dev/null
+++ b/components/thorui/tui-circular-progress/tui-circular-progress.vue
@@ -0,0 +1,309 @@
+<template>
+	<view class="tui-circular-container" :style="{ width: diam + 'px', height: (height || diam) + 'px' }">
+		<!-- #ifndef MP-ALIPAY -->
+		<canvas class="tui-circular-default" :canvas-id="defaultCanvasId" :id="defaultCanvasId"
+			:style="{ width: diam + 'px', height: (height || diam) + 'px' }"
+			v-if="defaultShow && defaultCanvasId"></canvas>
+		<canvas class="tui-circular-progress" :canvas-id="progressCanvasId" :id="progressCanvasId"
+			:style="{ width: diam + 'px', height: (height || diam) + 'px' }" v-if="progressCanvasId"></canvas>
+		<!-- #endif -->
+
+		<!-- #ifdef MP-ALIPAY -->
+		<canvas class="tui-circular-default" :canvas-id="defaultCanvasId" :id="defaultCanvasId"
+			:style="{ width: diam*4 + 'px', height: (height || diam)*4 + 'px' }" v-if="defaultShow"></canvas>
+		<canvas class="tui-circular-progress" :canvas-id="progressCanvasId" :id="progressCanvasId"
+			:style="{ width: diam*4 + 'px', height: (height || diam)*4 + 'px' }"></canvas>
+		<!-- #endif -->
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiCircularProgress',
+		emits: ['change', 'end'],
+		props: {
+			/*
+				  传值需使用rpx进行转换保证各终端兼容
+				  px = rpx / 750 * wx.getSystemInfoSync().windowWidth
+				  圆形进度条(画布)宽度，直径 [px]
+				*/
+			diam: {
+				type: Number,
+				default: 60
+			},
+			//圆形进度条(画布)高度，默认取diam值[当画半弧时传值，height有值时则取height]
+			height: {
+				type: Number,
+				default: 0
+			},
+			//进度条线条宽度[px]
+			lineWidth: {
+				type: Number,
+				default: 4
+			},
+			/*
+				 线条的端点样式
+				 butt：向线条的每个末端添加平直的边缘
+				 round	向线条的每个末端添加圆形线帽
+				 square	向线条的每个末端添加正方形线帽
+				*/
+			lineCap: {
+				type: String,
+				default: 'round'
+			},
+			//圆环进度字体大小 [px]
+			fontSize: {
+				type: Number,
+				default: 12
+			},
+			//圆环进度字体颜色
+			fontColor: {
+				type: String,
+				default: ''
+			},
+			//是否显示进度文字
+			fontShow: {
+				type: Boolean,
+				default: true
+			},
+			/*
+				 自定义显示文字[默认为空，显示百分比，fontShow=true时生效]
+				 可以使用 slot自定义显示内容
+				*/
+			percentText: {
+				type: String,
+				default: ''
+			},
+			//是否显示默认(背景)进度条
+			defaultShow: {
+				type: Boolean,
+				default: true
+			},
+			//默认进度条颜色
+			defaultColor: {
+				type: String,
+				default: '#CCCCCC'
+			},
+			//进度条颜色
+			progressColor: {
+				type: String,
+				default: ''
+			},
+			//进度条渐变颜色[结合progressColor使用，默认为空]
+			gradualColor: {
+				type: String,
+				default: ''
+			},
+			//起始弧度，单位弧度
+			sAngle: {
+				type: Number,
+				default: -Math.PI / 2
+			},
+			//指定弧度的方向是逆时针还是顺时针。默认是false，即顺时针
+			counterclockwise: {
+				type: Boolean,
+				default: false
+			},
+			//进度百分比 [10% 传值 10]
+			percentage: {
+				type: Number,
+				default: 0
+			},
+			//进度百分比缩放倍数[使用半弧为100%时，则可传2]
+			multiple: {
+				type: Number,
+				default: 1
+			},
+			//动画执行时间[单位毫秒，低于50无动画]
+			duration: {
+				type: Number,
+				default: 800
+			},
+			//backwards: 动画从头播；forwards：动画从上次结束点接着播
+			activeMode: {
+				type: String,
+				default: 'backwards'
+			}
+		},
+		watch: {
+			percentage(val) {
+				this.initDraw();
+			}
+		},
+		data() {
+			// #ifndef MP-WEIXIN || MP-QQ
+			let cid = `id01_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			let did = `id02_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			// #endif
+			return {
+				// #ifdef MP-WEIXIN || MP-QQ
+				progressCanvasId: 'progressCanvasId',
+				defaultCanvasId: 'defaultCanvasId',
+				// #endif
+				// #ifndef MP-WEIXIN || MP-QQ
+				progressCanvasId: cid,
+				defaultCanvasId: did,
+				// #endif
+				progressContext: null,
+				linearGradient: null,
+				//起始百分比
+				startPercentage: 0
+				// dpi
+				//pixelRatio: uni.getSystemInfoSync().pixelRatio
+			};
+		},
+		mounted() {
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.initDraw(true);
+				}, 50)
+			})
+		},
+		methods: {
+			//初始化绘制
+			initDraw(init) {
+				let start = this.activeMode === 'backwards' ? 0 : this.startPercentage;
+				start = start > this.percentage ? 0 : start;
+				if (this.defaultShow && init) {
+					this.drawDefaultCircular();
+				}
+				this.drawProgressCircular(start);
+			},
+			//默认(背景)圆环
+			drawDefaultCircular() {
+				let ctx = uni.createCanvasContext(this.defaultCanvasId, this);
+				let lineWidth = Number(this.lineWidth)
+				// #ifdef MP-ALIPAY
+				lineWidth = lineWidth * 4
+				// #endif
+				ctx.setLineWidth(lineWidth);
+				ctx.setStrokeStyle(this.defaultColor);
+				//终止弧度
+				let eAngle = Math.PI * (this.height ? 1 : 2) + this.sAngle;
+				this.drawArc(ctx, eAngle);
+			},
+			//进度圆环
+			drawProgressCircular(startPercentage) {
+				let ctx = this.progressContext;
+				let gradient = this.linearGradient;
+				if (!ctx) {
+					ctx = uni.createCanvasContext(this.progressCanvasId, this);
+					//创建一个线性的渐变颜色 CanvasGradient对象
+					let diam = Number(this.diam)
+					// #ifdef MP-ALIPAY
+					diam = diam * 4
+					// #endif
+					const progressColor = this.progressColor || (uni && uni.$tui && uni.$tui.color.primary) || '#5677fc';
+					gradient = ctx.createLinearGradient(0, 0, diam, 0);
+					gradient.addColorStop('0', progressColor);
+					if (this.gradualColor) {
+						gradient.addColorStop('1', this.gradualColor);
+					}
+					// #ifdef APP-PLUS || MP
+					const res = uni.getSystemInfoSync();
+					if (!this.gradualColor && res.platform.toLocaleLowerCase() == 'android') {
+						gradient.addColorStop('1', progressColor);
+					}
+					// #endif
+					this.progressContext = ctx;
+					this.linearGradient = gradient;
+				}
+				let lineWidth = Number(this.lineWidth)
+				// #ifdef MP-ALIPAY
+				lineWidth = lineWidth * 4
+				// #endif
+				ctx.setLineWidth(lineWidth);
+				ctx.setStrokeStyle(gradient);
+				let time = this.percentage == 0 || this.duration < 50 ? 0 : this.duration / this.percentage;
+				if (this.percentage > 0) {
+					startPercentage = this.duration < 50 ? this.percentage - 1 : startPercentage;
+					startPercentage++;
+				}
+				if (this.fontShow) {
+					let fontSize = Number(this.fontSize)
+					// #ifdef MP-ALIPAY
+					fontSize = fontSize * 4
+					// #endif
+					ctx.setFontSize(fontSize);
+					const fontColor = this.fontColor || (uni && uni.$tui && uni.$tui.color.primary) || '#5677fc';
+					ctx.setFillStyle(fontColor);
+					ctx.setTextAlign('center');
+					ctx.setTextBaseline('middle');
+					let percentage = this.percentText;
+					if (!percentage) {
+						percentage = this.counterclockwise ? 100 - startPercentage * this.multiple : startPercentage * this
+							.multiple;
+						percentage = `${percentage}%`;
+					}
+					let radius = this.diam / 2;
+					// #ifdef MP-ALIPAY
+					radius = radius * 4
+					// #endif
+					ctx.fillText(percentage, radius, radius);
+				}
+				if (this.percentage == 0 || (this.counterclockwise && startPercentage == 100)) {
+					ctx.draw();
+				} else {
+					let eAngle = ((2 * Math.PI) / 100) * startPercentage + this.sAngle;
+					this.drawArc(ctx, eAngle);
+				}
+				setTimeout(() => {
+					this.startPercentage = startPercentage;
+					if (startPercentage >= this.percentage) {
+						this.$emit('end', {
+							canvasId: this.progressCanvasId,
+							percentage: startPercentage
+						});
+					} else {
+						this.drawProgressCircular(startPercentage);
+					}
+					this.$emit('change', {
+						percentage: startPercentage
+					});
+				}, time);
+				// #ifdef H5
+				// requestAnimationFrame(()=>{})
+				// #endif
+			},
+			//创建弧线
+			drawArc(ctx, eAngle) {
+				ctx.setLineCap(this.lineCap);
+				ctx.beginPath();
+				let radius = this.diam / 2; //x=y
+				let lineWidth = Number(this.lineWidth)
+				// #ifdef MP-ALIPAY
+				radius = radius * 4
+				lineWidth = lineWidth * 4
+				// #endif
+				ctx.arc(radius, radius, radius - lineWidth, this.sAngle, eAngle, this.counterclockwise);
+				ctx.stroke();
+				ctx.draw();
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-circular-container,
+	.tui-circular-default {
+		position: relative;
+
+	}
+
+	/* #ifdef MP-ALIPAY */
+	.tui-circular-default,
+	.tui-circular-progress {
+		zoom: 0.25;
+	}
+
+	/* #endif */
+
+
+	.tui-circular-progress {
+		position: absolute !important;
+		left: 0;
+		top: 0;
+		z-index: 10;
+	}
+</style>
\ No newline at end of file
diff --git a/components/thorui/tui-icon/tui-icon.js b/components/thorui/tui-icon/tui-icon.js
new file mode 100644
index 0000000..0304802
--- /dev/null
+++ b/components/thorui/tui-icon/tui-icon.js
@@ -0,0 +1,3 @@
+export default {
+
+}
diff --git a/components/thorui/tui-icon/tui-icon.vue b/components/thorui/tui-icon/tui-icon.vue
new file mode 100644
index 0000000..665c71a
--- /dev/null
+++ b/components/thorui/tui-icon/tui-icon.vue
@@ -0,0 +1,82 @@
+<template>
+	<text class="tui-icon" :class="[customPrefix,customPrefix?name:'']"
+		:style="{ color: getColor, fontSize: getSize, fontWeight: bold ? 'bold' : 'normal',margin:margin }"
+		@tap="handleClick">{{ icons[name] || '' }}</text>
+
+</template>
+
+<script>
+	import icons from './tui-icon.js';
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	domModule.addRule('fontFace', {
+		'fontFamily': 'thoruiFont',
+		'src': "url('data:font/truetype;charset=utf-8;base64,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AHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgAAR2VuZXJhdGVkIGJ5IHN2ZzJ0dGYgZnJvbSBGb250ZWxsbyBwcm9qZWN0LgAAaAB0AHQAcAA6AC8ALwBmAG8AbgB0AGUAbABsAG8ALgBjAG8AbQAAaHR0cDovL2ZvbnRlbGxvLmNvbQAAAAACAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAABAAIBAgEDAQQBBQEGAQcBCAEJAQoBCwEMAQ0BDgEPARABEQESARMBFAEVARYBFwEYARkBGgEbARwBHQEeAR8BIAEhASIBIwEkASUBJgEnASgBKQEqASsBLAEtAS4BLwEwATEBMgEzATQBNQE2ATcBOAE5AToBOwE8AT0BPgE/AUABQQFCAUMBRAAOAUUBRgFHAUgBSQFKAUsBTAFNAU4BTwFQAVEBUgFTAVQBVQFWAVcBWAFZAVoBWwFcAV0BXgFfAWABYQFiAWMBZAFlAWYBZwFoAWkBagFrAWwBbQFuAW8BcAFxAXIBcwF0AXUBdgF3AXgBeQF6AXsBfAF9AX4BfwGAAYEAqwGCAYMBhAGFAYYBhwGIAYkBigGLAYwBjQGOAY8BkAGRAZIBkwGUAZUBlgGXAZgBmQGaAZsBnAGdAZ4BnwGgAaEBogGjAaQBpQGmAacBqAGpAaoBqwGsAa0BrgGvAbABsQGyAbMBtAG1AbYBtwG4AbkBugG7AbwEd2lmaQZ3ZWNoYXQHd2VhdGhlcgt3ZWFsdGgtZmlsbAZ3ZWFsdGgHd2FybmluZwZ3YWxsZXQJdm9pcHBob25lCnZvaWNlLWZpbGwFdm9pY2UFdmlkZW8GdXBsb2FkAnVwCXVucmVjZWl2ZQl0dXJuaW5ndXAMdHVybmluZ3JpZ2h0C3R1cm5pbmdsZWZ0C3R1cm5pbmdkb3duDnRyYW5zcG9ydC1maWxsCXRyYW5zcG9ydBF0b3dhcmRzcmlnaHQtZmlsbAx0b3dhcmRzcmlnaHQLdG93YXJkc2xlZnQHdG9yaWdodAN0b3AEdG9vbAZ0b2xlZnQGdG9kb3duCXRpbWUtZmlsbAR0aW1lBXN3ZWVwCHN0cmF0ZWd5CXN0YXItZmlsbARzdGFyD3NxdWFyZS1zZWxlY3RlZAtzcXVhcmUtZmlsbAZzcXVhcmUEc29zbwRza2luBHNpbmEGc2lnbmluBHNodXQJc2hvcC1maWxsBHNob3AGc2hpZWxkCnNoYXJlLWZpbGwFc2hhcmUKc2V0dXAtZmlsbAVzZXR1cAxzZXJ2aWNlLWZpbGwHc2VydmljZQRzZW5kCHNlYXJjaC0yBnNlYXJjaAZzY3JlZW4Jc2F0aXNmaWVkBnJldm9rZQdyZWZyZXNoBnJlZHVjZQ5yZWRwYWNrZXQtZmlsbAlyZWRwYWNrZXQGcXJjb2RlAnFxA3B3ZA1wb3NpdGlvbi1maWxsCHBvc2l0aW9uCXBvbHlnb25hbANwaWUHcGljdHVyZQhwaWMtZmlsbANwaWMLcGVvcGxlLWZpbGwGcGVvcGxlB3BhcnRha2UFb3JkZXILb3Bwb3NlLWZpbGwGb3Bwb3NlDG9mZmxpbmUtZmlsbAdvZmZsaW5lC25vdGljZS1maWxsBm5vdGljZQZub2RhdGEJbmV3cy1maWxsBG5ld3MGbmFycm93CW1vcmUtZmlsbARtb3JlB21vbWVudHMGbW9iaWxlDG1lc3NhZ2UtZmlsbAdtZXNzYWdlC21lbWJlci1maWxsBm1lbWJlcgttYW5hZ2UtZmlsbAZtYW5hZ2UJbWFpbC1maWxsBG1haWwIbG9jYXRpb24HbG9hZGluZwhsaXN0dmlldwRsaW5rCWxpa2UtZmlsbARsaWtlCmxhYmVsLWZpbGwFbGFiZWwEa2VmdQNpb3MHaW12b2ljZQZpbW1vcmUKaW1rZXlib2FyZAZpbWZhY2UFaG91c2UJaG9tZS1maWxsBGhvbWUJaGlzdG9ncmFtA2dwcw5mcmllbmRhZGQtZmlsbAlmcmllbmRhZGQLZmluZ2VycHJpbnQIZmVlZGJhY2sDZXllDGV4cGxvcmUtZmlsbAdleHBsb3JlDGV4cGxhaW4tZmlsbAdleHBsYWluCGV4Y2hhbmdlCGV2YWx1YXRlB2VubGFyZ2UEZWRpdAhkb3dubG9hZARkb3duDGRpc3NhdGlzZmllZAhkaW5ndGFsawlkZWxldGVrZXkGZGVsZXRlBmNvdXBvbg1jb21wdXRlci1maWxsCGNvbXB1dGVyDmNvbW11bml0eS1maWxsCWNvbW11bml0eQpjbG9zZS1maWxsBWNsb3NlCmNsb2NrLWZpbGwFY2xvY2sPY2lyY2xlLXNlbGVjdGVkC2NpcmNsZS1maWxsBmNpcmNsZQVjaGVjaw1jYXRlZ29yeS1maWxsCGNhdGVnb3J5CWNhcnQtZmlsbARjYXJ0CWNhcmQtZmlsbARjYXJkCmNhbWVyYS1hZGQLY2FtZXJhLWZpbGwGY2FtZXJhCGNhbGVuZGFyBmJvdHRvbQ1iYW5rY2FyZC1maWxsCGJhbmtjYXJkB2JhbGxvb24IYmFnLWZpbGwDYmFnBGJhY2sLYXR0ZXN0YXRpb24HYXJyb3d1cAphcnJvd3JpZ2h0CWFycm93bGVmdAlhcnJvd2Rvd24HYXBwbGV0cwdhbmRyb2lkBmFsaXBheQphbGFybS1maWxsBWFsYXJtCmFncmVlLWZpbGwFYWdyZWULYWRkcmVzc2Jvb2sKYWRkbWVzc2FnZQhhZGQtZmlsbANhZGQKYWJvdXQtZmlsbAVhYm91dAZ1bnNlZW4Ec2VlbgdzdXNwZW5kBHBsYXkAAAAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwC/AAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAAN1knXsAAAAA3WSdew==')"
+	});
+	// #endif
+	export default {
+		name: 'tuiIcon',
+		emits: ['click'],
+		props: {
+			name: {
+				type: String,
+				default: ''
+			},
+			customPrefix: {
+				type: String,
+				default: ''
+			},
+			size: {
+				type: [Number, String],
+				default: 0
+			},
+			//px或者rpx
+			unit: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: ''
+			},
+			bold: {
+				type: Boolean,
+				default: false
+			},
+			margin: {
+				type: String,
+				default: "0"
+			},
+			index: {
+				type: Number,
+				default: 0
+			}
+		},
+		computed: {
+			getColor() {
+				return this.color || (uni && uni.$tui && uni.$tui.tuiIcon.color) || '#999';
+			},
+			getSize() {
+				const size = this.size || (uni && uni.$tui && uni.$tui.tuiIcon.size) || 32;
+				const unit = this.unit || (uni && uni.$tui && uni.$tui.tuiIcon.unit) || 'px';
+				return size + unit
+			}
+		},
+		data() {
+			return {
+				icons: icons
+			}
+		},
+		methods: {
+			handleClick() {
+				this.$emit('click', {
+					index: this.index
+				});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	
+</style>
\ No newline at end of file
diff --git a/components/thorui/tui-modal/tui-modal.vue b/components/thorui/tui-modal/tui-modal.vue
new file mode 100644
index 0000000..b6e2898
--- /dev/null
+++ b/components/thorui/tui-modal/tui-modal.vue
@@ -0,0 +1,338 @@
+<template>
+	<view class="tui-modal__container" :class="[show ? 'tui-modal-show' : '']" :style="{zIndex:zIndex}"
+		@touchmove.stop.prevent>
+		<view class="tui-modal-box"
+			:style="{ width: width, padding: padding, borderRadius: radius, backgroundColor: backgroundColor,zIndex:zIndex+1 }"
+			:class="[fadeIn || show ? 'tui-modal-normal' : 'tui-modal-scale', show ? 'tui-modal-show' : '']">
+			<view v-if="!custom">
+				<view class="tui-modal-title" v-if="title">{{ title }}</view>
+				<view class="tui-modal-content" :class="[title ? '' : 'tui-mtop']"
+					:style="{ color: color, fontSize: size + 'rpx' }">{{ content }}</view>
+				<view class="tui-modalBtn-box" :class="[button.length != 2 ? 'tui-flex-column' : '']">
+					<view v-for="(item, index) in button" :key="index" class="tui-modal-btn" :class="[
+								button.length != 2 ? 'tui-btn-width' : '',
+								button.length > 2 ? 'tui-mbtm' : '',
+								shape == 'circle' ? 'tui-circle-btn' : ''
+							]" :style="{background:getColor(item.type,true,item.plain),color:getTextColor(item.type,item.plain)}"
+						@tap="handleClick(index)">
+						{{ item.text || '确定' }}
+						<view class="tui-modal__border" :class="[shape == 'circle' ? 'tui-circle-border' : '']"
+							:style="{borderColor:getColor(item.type)}" v-if="item.plain"></view>
+					</view>
+				</view>
+			</view>
+			<view v-else>
+				<slot></slot>
+			</view>
+		</view>
+		<view v-if="isMask" class="tui-modal-mask" :class="[show ? 'tui-mask-show' : '']"
+			:style="{zIndex:maskZIndex,background:maskColor}" @tap="handleClickCancel"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiModal',
+		emits: ['click', 'cancel'],
+		props: {
+			//是否显示
+			show: {
+				type: Boolean,
+				default: false
+			},
+			width: {
+				type: String,
+				default: '84%'
+			},
+			backgroundColor: {
+				type: String,
+				default: '#fff'
+			},
+			padding: {
+				type: String,
+				default: '40rpx 64rpx'
+			},
+			radius: {
+				type: String,
+				default: '24rpx'
+			},
+			//标题
+			title: {
+				type: String,
+				default: ''
+			},
+			//内容
+			content: {
+				type: String,
+				default: ''
+			},
+			//内容字体颜色
+			color: {
+				type: String,
+				default: '#999'
+			},
+			//内容字体大小 rpx
+			size: {
+				type: Number,
+				default: 28
+			},
+			//形状 circle, square
+			shape: {
+				type: String,
+				default: 'square'
+			},
+			button: {
+				type: Array,
+				default: function() {
+					return [{
+							text: '取消',
+							type: 'red',
+							plain: true //是否空心
+						},
+						{
+							text: '确定',
+							type: 'red',
+							plain: false
+						}
+					];
+				}
+			},
+			//点击遮罩 是否可关闭
+			maskClosable: {
+				type: Boolean,
+				default: true
+			},
+			//是否显示mask
+			isMask: {
+				type: Boolean,
+				default: true
+			},
+			maskColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.6)'
+			},
+			//淡入效果，自定义弹框插入input输入框时传true
+			fadeIn: {
+				type: Boolean,
+				default: false
+			},
+			//自定义弹窗内容
+			custom: {
+				type: Boolean,
+				default: false
+			},
+			//容器z-index
+			zIndex: {
+				type: Number,
+				default: 9997
+			},
+			//mask z-index
+			maskZIndex: {
+				type: Number,
+				default: 9990
+			}
+		},
+		data() {
+			return {};
+		},
+		methods: {
+			getColor(type, isBg, plain) {
+				const global = uni && uni.$tui && uni.$tui.color;
+				let color = {
+					'primary': (global && global.primary) || '#5677fc',
+					'green': (global && global.success) || '#07c160',
+					'warning': (global && global.warning) || '#ff7900',
+					'danger': (global && global.danger) || '#EB0909',
+					'red': (global && global.danger) || '#EB0909',
+					'pink': (global && global.pink) || '#f74d54',
+					'white': isBg ? '#fff' : '#333',
+					'gray': isBg ? '#ededed' : '#999'
+				} [type || 'primary']
+				if (isBg && plain) {
+					color = 'transparent'
+				}
+				return color
+			},
+			getTextColor(type, plain) {
+				const global = uni && uni.$tui && uni.$tui.color;
+				let color = {
+					'primary': (global && global.primary) || '#5677fc',
+					'green': (global && global.success) || '#07c160',
+					'warning': (global && global.warning) || '#ff7900',
+					'danger': (global && global.danger) || '#EB0909',
+					'red': (global && global.danger) || '#EB0909',
+					'pink': (global && global.pink) || '#f74d54',
+					'white': '#333',
+					'gray': '#999'
+				} [type || 'primary']
+				if (!plain && type !== 'white' && type !== 'gray') {
+					color = '#fff'
+				}
+				return color
+			},
+			handleClick(index) {
+				if (!this.show) return;
+				this.$emit('click', {
+					index: Number(index)
+				});
+			},
+			handleClickCancel() {
+				if (!this.maskClosable) return;
+				this.$emit('cancel');
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-modal__container {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		left: 0;
+		top: 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		visibility: hidden;
+	}
+
+	.tui-modal-box {
+		position: relative;
+		opacity: 0;
+		visibility: hidden;
+		box-sizing: border-box;
+		transition: all 0.3s ease-in-out;
+	}
+
+	.tui-modal-scale {
+		transform: scale(0);
+	}
+
+	.tui-modal-normal {
+		transform: scale(1);
+	}
+
+	.tui-modal-show {
+		opacity: 1;
+		visibility: visible;
+	}
+
+	.tui-modal-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		transition: all 0.3s ease-in-out;
+		opacity: 0;
+		visibility: hidden;
+	}
+
+	.tui-mask-show {
+		visibility: visible;
+		opacity: 1;
+	}
+
+	.tui-modal-title {
+		text-align: center;
+		font-size: 34rpx;
+		color: #333;
+		padding-top: 20rpx;
+		font-weight: bold;
+	}
+
+	.tui-modal-content {
+		text-align: center;
+		color: #999;
+		font-size: 28rpx;
+		padding-top: 20rpx;
+		padding-bottom: 60rpx;
+	}
+
+	.tui-mtop {
+		margin-top: 30rpx;
+	}
+
+	.tui-mbtm {
+		margin-bottom: 30rpx;
+	}
+
+	.tui-modalBtn-box {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.tui-flex-column {
+		flex-direction: column;
+	}
+
+	.tui-modal-btn {
+		width: 46%;
+		height: 68rpx;
+		line-height: 68rpx;
+		position: relative;
+		border-radius: 10rpx;
+		font-size: 26rpx;
+		overflow: visible;
+		margin-left: 0;
+		margin-right: 0;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+		border-width: 0;
+	}
+
+	.tui-modal-btn:active::after {
+		content: '';
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+		background-color: rgba(0, 0, 0, 0.15);
+		pointer-events: none;
+	}
+
+	.tui-modal-btn::after {
+		border-radius: 10rpx;
+	}
+
+	.tui-modal__border {
+		position: absolute;
+		width: 200%;
+		height: 200%;
+		-webkit-transform-origin: 0 0;
+		transform-origin: 0 0;
+		transform: scale(0.5, 0.5) translateZ(0);
+		border: 1px solid;
+		box-sizing: border-box;
+		left: 0;
+		top: 0;
+		z-index: 2;
+		border-radius: 20rpx;
+		pointer-events: none;
+	}
+
+	.tui-btn-width {
+		width: 80% !important;
+	}
+
+	.tui-circle-btn {
+		border-radius: 40rpx !important;
+	}
+
+	.tui-circle-btn::after {
+		border-radius: 40rpx !important;
+	}
+
+	.tui-circle-border {
+		border-radius: 80rpx !important;
+	}
+</style>
\ No newline at end of file
diff --git a/components/thorui/tui-navigation-bar/tui-navigation-bar.vue b/components/thorui/tui-navigation-bar/tui-navigation-bar.vue
new file mode 100644
index 0000000..7db07ea
--- /dev/null
+++ b/components/thorui/tui-navigation-bar/tui-navigation-bar.vue
@@ -0,0 +1,258 @@
+<template>
+	<view class="tui-navigation-bar"
+		:class="{ 'tui-bar-line': opacity > 0.85 && splitLine, 'tui-navbar-fixed': isFixed, 'tui-backdrop__filter': backdropFilter && dropDownOpacity > 0  }"
+		:style="{ height: height + 'px', background: isOpacity? `rgba(${background},${opacity})`:background, opacity: dropDownOpacity, zIndex: isFixed ? zIndex : 'auto' }">
+		<view class="tui-status-bar" :style="{ height: statusBarHeight + 'px' }" v-if="isImmersive"></view>
+		<view class="tui-navigation_bar-title"
+			:style="{ opacity: transparent || opacity >= maxOpacity ? 1 : opacity, color: color, paddingTop: top - statusBarHeight + 'px' }"
+			v-if="title && !isCustom">
+			{{ title }}
+		</view>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiNavigationBar',
+		emits: ['init', 'change'],
+		props: {
+			//NavigationBar标题
+			title: {
+				type: String,
+				default: ''
+			},
+			//NavigationBar标题颜色
+			color: {
+				type: String,
+				default: '#333'
+			},
+			//NavigationBar背景颜色,不支持rgb
+			backgroundColor: {
+				type: String,
+				default: '#fff'
+			},
+			//是否需要分割线
+			splitLine: {
+				type: Boolean,
+				default: false
+			},
+			//是否设置不透明度
+			isOpacity: {
+				type: Boolean,
+				default: true
+			},
+			//不透明度最大值 0-1
+			maxOpacity: {
+				type: [Number, String],
+				default: 1
+			},
+			//背景透明 【设置该属性，则背景透明，只出现内容，isOpacity和maxOpacity失效】
+			transparent: {
+				type: Boolean,
+				default: false
+			},
+			//滚动条滚动距离
+			scrollTop: {
+				type: [Number, String],
+				default: 0
+			},
+			/*
+				 isOpacity 为true时生效
+				 opacity=scrollTop /windowWidth * scrollRatio
+				*/
+			scrollRatio: {
+				type: [Number, String],
+				default: 0.3
+			},
+			//是否自定义header内容
+			isCustom: {
+				type: Boolean,
+				default: false
+			},
+			//是否沉浸式
+			isImmersive: {
+				type: Boolean,
+				default: true
+			},
+			isFixed: {
+				type: Boolean,
+				default: true
+			},
+			//是否开启高斯模糊效果[仅在支持的浏览器有效果]
+			backdropFilter: {
+				type: Boolean,
+				default: false
+			},
+			//下拉隐藏NavigationBar，主要针对有回弹效果ios端
+			dropDownHide: {
+				type: Boolean,
+				default: false
+			},
+			//z-index设置
+			zIndex: {
+				type: [Number, String],
+				default: 996
+			}
+		},
+		watch: {
+			scrollTop(newValue, oldValue) {
+				if (this.isOpacity && !this.transparent) {
+					this.opacityChange();
+				}
+			},
+			backgroundColor(val) {
+				if (val) {
+					if (this.isOpacity) {
+						this.background = this.hexToRgb(val);
+					} else {
+						this.background = this.transparent ? 'rgba(0, 0, 0, 0)' : val
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				width: 375, //header宽度
+				left: 375, //小程序端 左侧距胶囊按钮距离
+				height: 44, //header高度
+				top: 0,
+				scrollH: 1, //滚动总高度,计算opacity
+				opacity: 1, //0-1
+				statusBarHeight: 0, //状态栏高度
+				background: '255,255,255', //header背景色
+				dropDownOpacity: 1
+			};
+		},
+		created() {
+			this.dropDownOpacity = this.backdropFilter && 0;
+			this.opacity = this.isOpacity || this.transparent ? 0 : this.maxOpacity;
+			if (this.isOpacity) {
+				this.background = this.hexToRgb(this.backgroundColor);
+			} else {
+				this.background = this.transparent ? 'rgba(0, 0, 0, 0)' : this.backgroundColor
+			}
+			let obj = {};
+			// #ifdef MP-WEIXIN
+			obj = wx.getMenuButtonBoundingClientRect();
+			// #endif
+			// #ifdef MP-BAIDU
+			obj = swan.getMenuButtonBoundingClientRect();
+			// #endif
+			// #ifdef MP-ALIPAY
+			my.hideAddToDesktopMenu();
+			// #endif
+			uni.getSystemInfo({
+				success: res => {
+					this.statusBarHeight = res.statusBarHeight;
+					this.width = res.windowWidth;
+					this.left = obj.left || res.windowWidth;
+					if (this.isImmersive) {
+						this.height = obj.top ? obj.top + obj.height + 8 : res.statusBarHeight + 44;
+					}
+					this.scrollH = res.windowWidth * this.scrollRatio;
+					this.top = obj.top ? obj.top + (obj.height - 32) / 2 : res.statusBarHeight + 6;
+					this.$emit('init', {
+						width: this.width,
+						height: this.height,
+						left: this.left,
+						top: this.top,
+						statusBarHeight: this.statusBarHeight,
+						opacity: this.opacity,
+						windowHeight: res.windowHeight
+					});
+				}
+			});
+		},
+		methods: {
+			hexToRgb(hex) {
+				let rgb = '255,255,255';
+				if (hex && ~hex.indexOf('#')) {
+					if (hex.length === 4) {
+						let text = hex.substring(1, 4);
+						hex = '#' + text + text;
+					}
+					let result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+					if (result) {
+						rgb = `${parseInt(result[1], 16)},${parseInt(result[2], 16)},${parseInt(result[3], 16)}`;
+					}
+				}
+				return rgb;
+			},
+			opacityChange() {
+				if (this.dropDownHide) {
+					if (this.scrollTop < 0) {
+						if (this.dropDownOpacity > 0) {
+							this.dropDownOpacity = 1 - Math.abs(this.scrollTop) / 30;
+						}
+					} else {
+						this.dropDownOpacity = 1;
+					}
+				}
+
+				let scroll = this.scrollTop <= 1 ? 0 : this.scrollTop;
+				let opacity = scroll / this.scrollH;
+				if ((this.opacity >= this.maxOpacity && opacity >= this.maxOpacity) || (this.opacity == 0 && opacity ==
+						0)) {
+					return;
+				}
+				this.opacity = opacity > this.maxOpacity ? this.maxOpacity : opacity;
+				if (this.backdropFilter) {
+					this.dropDownOpacity = this.opacity >= this.maxOpacity ? 1 : this.opacity;
+				}
+				this.$emit('change', {
+					opacity: this.opacity
+				});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-navigation-bar {
+		width: 100%;
+		transition: opacity 0.4s;
+	}
+
+	.tui-backdrop__filter {
+		/* Safari for macOS & iOS */
+		-webkit-backdrop-filter: blur(15px);
+		/* Google Chrome */
+		backdrop-filter: blur(15px);
+	}
+
+	.tui-navbar-fixed {
+		position: fixed;
+		left: 0;
+		top: 0;
+		transform: translateZ(0);
+	}
+
+	.tui-status-bar {
+		width: 100%;
+	}
+
+	.tui-navigation_bar-title {
+		width: 100%;
+		font-size: 17px;
+		line-height: 17px;
+		/* #ifndef APP-PLUS */
+		font-weight: 500;
+		/* #endif */
+		height: 32px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tui-bar-line::after {
+		content: '';
+		position: absolute;
+		border-bottom: 1rpx solid #eaeef1;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/components/thorui/tui-numberbox/tui-numberbox.vue b/components/thorui/tui-numberbox/tui-numberbox.vue
new file mode 100644
index 0000000..2fb6e7e
--- /dev/null
+++ b/components/thorui/tui-numberbox/tui-numberbox.vue
@@ -0,0 +1,248 @@
+<template>
+	<view class="tui-numberbox">
+		<view class="tui-num__icon__box" :style="{background:iconBgColor,borderRadius:radius}" @tap="reduce"
+			:class="[disabled || min >= inputValue ? 'tui-disabled' : '']">
+			<text class="tui-numbox-icon tui-num__icon-reduce"
+				:style="{ color: iconColor, fontSize: iconSize + 'rpx',lineHeight:iconSize + 'rpx' }"></text>
+		</view>
+		<input type="number" v-model="inputValue" :disabled="disabled" @blur="blur" class="tui-num-input"
+			:style="{ color: color, fontSize: size + 'rpx', background: backgroundColor, height: height + 'rpx', minHeight: height + 'rpx', width: width + 'rpx' }" />
+		<view class="tui-num__icon__box" :style="{background:iconBgColor,borderRadius:radius}" @tap="plus"
+			:class="[disabled || inputValue >= max ? 'tui-disabled' : '']">
+			<text class="tui-numbox-icon tui-num__icon-plus"
+				:style="{ color: iconColor, fontSize: iconSize + 'rpx',lineHeight:iconSize + 'rpx' }"></text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiNumberbox',
+		emits: ['change'],
+		props: {
+			value: {
+				type: [Number, String],
+				default: 1
+			},
+			//最小值
+			min: {
+				type: Number,
+				default: 1
+			},
+			//最大值
+			max: {
+				type: Number,
+				default: 99
+			},
+			//迈步大小 1 1.1 10...
+			step: {
+				type: Number,
+				default: 1
+			},
+			//是否禁用操作
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			iconBgColor: {
+				type: String,
+				default: 'transparent'
+			},
+			radius:{
+				type: String,
+				default: '50%'
+			},
+			//加减图标大小 rpx
+			iconSize: {
+				type: Number,
+				default: 22
+			},
+			iconColor: {
+				type: String,
+				default: '#666666'
+			},
+			//input 高度
+			height: {
+				type: Number,
+				default: 42
+			},
+			//input 宽度
+			width: {
+				type: Number,
+				default: 80
+			},
+			size: {
+				type: Number,
+				default: 28
+			},
+			//input 背景颜色
+			backgroundColor: {
+				type: String,
+				default: '#F5F5F5'
+			},
+			//input 字体颜色
+			color: {
+				type: String,
+				default: '#333'
+			},
+			//索引值，列表中使用
+			index: {
+				type: [Number, String],
+				default: 0
+			},
+			//自定义参数
+			custom: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		created() {
+			this.inputValue = +this.value;
+		},
+		data() {
+			return {
+				inputValue: 0
+			};
+		},
+		watch: {
+			value(val) {
+				this.inputValue = +val;
+			}
+		},
+		methods: {
+			getScale(val, step) {
+				let scale = 1;
+				let scaleVal = 1;
+				//浮点型
+				if (!Number.isInteger(step)) {
+					scale = Math.pow(10, (step + '').split('.')[1].length);
+				}
+				//浮点型
+				if (!Number.isInteger(val)) {
+					scaleVal = Math.pow(10, (val + '').split('.')[1].length);
+				}
+				return Math.max(scale, scaleVal);
+			},
+			calcNum: function(type) {
+				if (this.disabled || (this.inputValue == this.min && type === 'reduce') || (this.inputValue == this
+						.max && type === 'plus')) {
+					return;
+				}
+				const scale = this.getScale(Number(this.inputValue), Number(this.step));
+				let num = Number(this.inputValue) * scale;
+				let step = this.step * scale;
+				if (type === 'reduce') {
+					num -= step;
+				} else if (type === 'plus') {
+					num += step;
+				}
+				let value = Number((num / scale).toFixed(String(scale).length - 1));
+				if (value < this.min) {
+					value = this.min;
+				} else if (value > this.max) {
+					value = this.max;
+				}
+				this.handleChange(value, type);
+			},
+			plus: function() {
+				this.calcNum('plus');
+			},
+			reduce: function() {
+				this.calcNum('reduce');
+			},
+			blur: function(e) {
+				let value = e.detail.value;
+				if (value) {
+					if (~value.indexOf('.') && Number.isInteger(this.step) && Number.isInteger(Number(value))) {
+						value = value.split('.')[0];
+					}
+					value = Number(value);
+					if (value > this.max) {
+						value = this.max;
+					} else if (value < this.min) {
+						value = this.min;
+					}
+				} else {
+					value = this.min;
+				}
+				if ((value == this.value && value != this.inputValue) || !e.detail.value) {
+					this.inputValue = value;
+				}
+				this.handleChange(value, 'blur');
+			},
+			handleChange(value, type) {
+				if (this.disabled) return;
+				this.$emit('change', {
+					value: Number(value),
+					type: type,
+					index: this.index,
+					custom: this.custom
+				});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	@font-face {
+		font-family: 'numberbox';
+		src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAASQAA0AAAAABtwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAEdAAAABoAAAAciBpnRUdERUYAAARUAAAAHgAAAB4AKQALT1MvMgAAAZwAAABDAAAAVjxzSINjbWFwAAAB9AAAAEYAAAFK5zLpOGdhc3AAAARMAAAACAAAAAj//wADZ2x5ZgAAAkgAAACHAAAAnIfIEjxoZWFkAAABMAAAAC8AAAA2FZWEOWhoZWEAAAFgAAAAHAAAACQH3gOFaG10eAAAAeAAAAARAAAAEgwAAAFsb2NhAAACPAAAAAwAAAAMADAATm1heHAAAAF8AAAAHwAAACABEAAobmFtZQAAAtAAAAFJAAACiCnmEVVwb3N0AAAEHAAAAC0AAABV/+8iFXjaY2BkYGAA4gVmC5Tj+W2+MnCzMIDATWsFOQT9v5GFgbkeyOVgYAKJAgDrogf+AHjaY2BkYGBu+N/AEMPCAAJAkpEBFbAAAEcKAm142mNgZGBgYGWQYQDRDAxMQMwFhAwM/8F8BgALpAE5AHjaY2BkYWCcwMDKwMDUyXSGgYGhH0IzvmYwYuQAijKwMjNgBQFprikMDs9Yn01kbvjfwBDD3MDQABRmBMkBAOXpDHEAeNpjYYAAFghmZGAAAACdAA4AAAB42mNgYGBmgGAZBkYGEHAB8hjBfBYGDSDNBqQZGZiesT6b+P8/AwOElvwnWQxVDwSMbAxwDiMTkGBiQAWMDMMeAABRZwszAAAAAAAAAAAAAAAwAE542iWKQQrCMBBF5xNpd0pQ7EIoTEnahSCTUNqdWz2A9TrieXKeXCc1qcPn/zfzh0BYv2pVH7oQgbvqdG5Yt/DTrNlPYz+wHvuuqhFSME4sFshTgKUsKfhH5lg8BSul3i5bS3mQdd0RIh2IjnvUrkXDd8zuhuFt86tY9fonIsSYgsXpB+cCGosAeNp9kD1OAzEQhZ/zByQSQiCoXVEA2vyUKRMp9Ailo0g23pBo1155nUg5AS0VB6DlGByAGyDRcgpelkmTImvt6PObmeexAZzjGwr/3yXuhBWO8ShcwREy4Sr1F+Ea+V24jhY+hRvUf4SbuFUD4RYu1BsdVO2Eu5vSbcsKZxgIV3CKJ+Eq9ZVwjfwqXMcVPoQb1L+EmxjjV7iFa2WpDOFhMEFgnEFjig3jAjEcLJIyBtahOfRmEsxMTzd6ETubOBso71dilwMeaDnngCntPbdmvkon/mDLgdSYbh4FS7YpjS4idCgbXyyc1d2oc7D9nu22tNi/a4E1x+xRDWzU/D3bM9JIbAyvkJI18jK3pBJTj2hrrPG7ZynW814IiU68y/SIx5o0dTr3bmniwOLn8owcfbS5kj33qBw+Y1kIeb/dTsQgil2GP5PYcRkAAAB42mNgYoAALjDJyIAOWMGiTIxMjMwiWZmJQJRXVQoigTgjMd9QGIsgAFDsEBsAAAAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwAEAAEABAAAAAIAAAAAeNpjYGBgZACCq0vUOUD0TWsFORgNADPBBE4AAA==) format('woff');
+		font-weight: normal;
+		font-style: normal;
+	}
+
+	.tui-num__icon__box {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		text-align: center;
+		padding: 12rpx;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.tui-numbox-icon {
+		font-family: 'numberbox' !important;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+
+	.tui-num__icon-reduce:before {
+		content: '\e691';
+	}
+
+	.tui-num__icon-plus:before {
+		content: '\e605';
+	}
+
+	.tui-numberbox {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.tui-num-input {
+		text-align: center;
+		margin: 0 6rpx;
+		font-weight: 400;
+		padding: 0;
+		border-width: 0;
+	}
+	/* #ifdef H5 */
+	::-webkit-inner-spin-button,
+	::-webkit-outer-spin-button{
+		-webkit-appearance: none;
+		margin: 0;
+	}
+	/* #endif */
+
+	.tui-disabled {
+		opacity: .5;
+		/* #ifdef H5 */
+		cursor: not-allowed;
+		/* #endif */
+	}
+</style>
diff --git a/components/thorui/tui-sticky/tui-sticky.vue b/components/thorui/tui-sticky/tui-sticky.vue
new file mode 100644
index 0000000..050047f
--- /dev/null
+++ b/components/thorui/tui-sticky/tui-sticky.vue
@@ -0,0 +1,166 @@
+<template>
+	<view class="tui-sticky-class" :id="tui_Id">
+		<!--sticky 容器-->
+		<view :style="{height: stickyHeight,background:backgroundColor}" v-if="isFixed"></view>
+		<view :class="{'tui-sticky-fixed':isFixed}" :style="{top:isFixed?stickyTop+'px':'auto'}">
+			<slot name="header"></slot>
+		</view>
+		<!--sticky 容器-->
+		<!--内容-->
+		<slot name="content"></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiSticky",
+		emits: ['sticky', 'change'],
+		props: {
+			scrollTop: {
+				type: Number
+			},
+			//吸顶时与顶部的距离，单位px
+			stickyTop: {
+				type: [Number, String]
+					// #ifndef H5
+					,
+				default: 0
+					// #endif
+					// #ifdef H5
+					,
+				default: 44
+				// #endif
+			},
+			//是否指定容器，即内容放置插槽content内
+			container: {
+				type: Boolean,
+				default: false
+			},
+			//是否是原生自带header
+			isNativeHeader: {
+				type: Boolean,
+				default: true
+			},
+			//吸顶容器 高度 rpx
+			stickyHeight: {
+				type: String,
+				default: "auto"
+			},
+			//占位容器背景颜色
+			backgroundColor: {
+				type: String,
+				default: "transparent"
+			},
+			//是否重新计算[有异步加载时使用,设置大于0的数]
+			recalc: {
+				type: Number,
+				default: 0
+			},
+			//列表中的索引值
+			index: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		watch: {
+			scrollTop(newValue, oldValue) {
+				if (this.initialize != 0) {
+					this.updateScrollChange(() => {
+						this.updateStickyChange();
+						this.initialize = 0
+					});
+				} else {
+					this.updateStickyChange();
+				}
+			},
+			recalc(newValue, oldValue) {
+				this.updateScrollChange(() => {
+					this.updateStickyChange();
+					this.initialize = 0;
+				});
+			}
+		},
+		created() {
+			this.initialize = this.recalc
+		},
+		mounted() {
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.updateScrollChange();
+				}, 50)
+			})
+		},
+		data() {
+			const Id = `tui_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				timer: null,
+				top: 0,
+				height: 0,
+				isFixed: false,
+				initialize: 0, //重新初始化
+				tui_Id: Id
+			};
+		},
+		methods: {
+			updateStickyChange() {
+				const top = this.top;
+				const height = this.height;
+				const scrollTop = this.scrollTop
+				let stickyTop = this.stickyTop
+				// #ifdef H5
+				if (this.isNativeHeader) {
+					stickyTop = stickyTop - 44
+					stickyTop = stickyTop < 0 ? 0 : stickyTop
+				}
+				// #endif
+				if (this.container) {
+					this.isFixed = (scrollTop + stickyTop >= top && scrollTop + stickyTop < top + height) ? true : false
+				} else {
+					this.isFixed = scrollTop + stickyTop >= top ? true : false
+				}
+				//是否吸顶
+				this.$emit("sticky", {
+					isFixed: this.isFixed,
+					index: this.index
+				})
+			},
+			updateScrollChange(callback) {
+				if (this.timer) {
+					clearTimeout(this.timer)
+					this.timer = null
+				}
+				this.timer = setTimeout(() => {
+					const selectId = `#${this.tui_Id}`;
+					uni.createSelectorQuery()
+						// #ifndef MP-ALIPAY
+						.in(this)
+						// #endif
+						.select(selectId)
+						.fields({
+							size: true,
+							rect: true
+						}, res => {
+							if (res) {
+								this.top = res.top + (this.scrollTop || 0);
+								this.height = res.height;
+								callback && callback();
+								this.$emit("change", {
+									index: Number(this.index),
+									top: this.top
+								})
+							}
+						}).exec()
+				}, 0)
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tui-sticky-fixed {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		z-index: 888;
+	}
+</style>
\ No newline at end of file
diff --git a/components/thorui/tui-tabbar/tui-tabbar.vue b/components/thorui/tui-tabbar/tui-tabbar.vue
new file mode 100644
index 0000000..e03aab7
--- /dev/null
+++ b/components/thorui/tui-tabbar/tui-tabbar.vue
@@ -0,0 +1,287 @@
+<template>
+	<view class="tui-tabbar"
+		:class="{ 'tui-tabbar-fixed': isFixed, 'tui-unlined': unlined, 'tui-backdrop__filter': backdropFilter }"
+		:style="{ background: backgroundColor, zIndex: isFixed ? zIndex : 'auto' }">
+		<block v-for="(item, index) in tabBar" :key="index">
+			<view class="tui-tabbar-item" :class="{ 'tui-item-hump': item.hump }"
+				:style="{ backgroundColor: item.hump && !backdropFilter ? backgroundColor : 'none' }"
+				@tap="tabbarSwitch(index, item.hump, item.pagePath, item.verify)">
+				<view class="tui-icon-box" :class="{ 'tui-tabbar-hump': item.hump }">
+					<image :src="current == index ? item.selectedIconPath : item.iconPath"
+						:class="[item.hump ? '' : 'tui-tabbar-icon']" v-if="!item.name"></image>
+					<tui-icon :name="current===index?item.activeName:item.name" :customPrefix="item.customPrefix || ''"
+						:size="item.iconSize || iconSize" unit="rpx" :color="current == index?getActiveColor:color"
+						v-else></tui-icon>
+					<view :class="[item.isDot ? 'tui-badge-dot' : 'tui-badge']"
+						:style="{ color: badgeColor, backgroundColor: getBadgeBgColor }" v-if="item.num">
+						{{ item.isDot ? '' : item.num }}
+					</view>
+				</view>
+				<view class="tui-text-scale" :class="{ 'tui-text-hump': item.hump }"
+					:style="{ color: current == index ? getActiveColor : color }">{{ item.text }}</view>
+			</view>
+		</block>
+		<view :style="{ background: backgroundColor }" :class="{ 'tui-hump-box': hump }"
+			v-if="hump && !unlined && !backdropFilter"></view>
+	</view>
+</template>
+
+<script>
+	import tuiIcon from '@/components/thorui/tui-icon/tui-icon.vue'
+	export default {
+		name: 'tuiTabbar',
+		emits: ['click'],
+		components:{
+			tuiIcon
+		},
+		props: {
+			//当前索引
+			current: {
+				type: Number,
+				default: 0
+			},
+			//字体颜色
+			color: {
+				type: String,
+				default: '#666'
+			},
+			//字体选中颜色
+			selectedColor: {
+				type: String,
+				default: ''
+			},
+			//背景颜色
+			backgroundColor: {
+				type: String,
+				default: '#FFFFFF'
+			},
+			//是否需要中间凸起按钮
+			hump: {
+				type: Boolean,
+				default: false
+			},
+			iconSize: {
+				type: [Number, String],
+				default: 52
+			},
+			//固定在底部
+			isFixed: {
+				type: Boolean,
+				default: true
+			},
+			tabBar: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			//角标字体颜色
+			badgeColor: {
+				type: String,
+				default: '#fff'
+			},
+			//角标背景颜色
+			badgeBgColor: {
+				type: String,
+				default: ''
+			},
+			unlined: {
+				type: Boolean,
+				default: false
+			},
+			//是否开启高斯模糊效果[仅在支持的浏览器有效果]
+			backdropFilter: {
+				type: Boolean,
+				default: false
+			},
+			//z-index
+			zIndex: {
+				type: [Number, String],
+				default: 9999
+			}
+		},
+		data() {
+			return {};
+		},
+		computed:{
+			getActiveColor(){
+				return this.selectedColor || (uni && uni.$tui && uni.$tui.color.primary) || '#5677fc';
+			},
+			getBadgeBgColor(){
+				return this.badgeBgColor || (uni && uni.$tui && uni.$tui.color.pink) || '#f74d54';
+			}
+		},
+		methods: {
+			tabbarSwitch(index, hump, pagePath, verify) {
+				this.$emit('click', {
+					index: index,
+					hump: hump,
+					pagePath: pagePath,
+					verify: verify
+				});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-tabbar {
+		width: 100%;
+		height: 100rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: relative;
+	}
+
+	.tui-backdrop__filter {
+		/* Safari for macOS & iOS */
+		-webkit-backdrop-filter: blur(15px);
+		/* Google Chrome */
+		backdrop-filter: blur(15px);
+	}
+
+	.tui-tabbar-fixed {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		box-sizing: content-box !important;
+	}
+
+	.tui-tabbar::before {
+		content: ' ';
+		width: 100%;
+		border-top: 1px solid #b2b2b2;
+		position: absolute;
+		top: -1rpx;
+		left: 0;
+		transform: scaleY(0.5) translateZ(0);
+		transform-origin: 0 0;
+		display: block;
+		z-index: 3;
+	}
+
+	.tui-tabbar-item {
+		height: 100%;
+		flex: 1;
+		display: flex;
+		text-align: center;
+		align-items: center;
+		flex-direction: column;
+		justify-content: space-between;
+		position: relative;
+		padding: 10rpx 0;
+		box-sizing: border-box;
+		z-index: 5;
+	}
+
+	.tui-icon-box {
+		position: relative;
+	}
+
+	.tui-item-hump {
+		height: 98rpx;
+	}
+
+	.tui-tabbar-icon {
+		width: 52rpx;
+		height: 52rpx;
+		display: block;
+	}
+
+	.tui-hump-box {
+		width: 120rpx;
+		height: 120rpx;
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
+		top: -50rpx;
+		border-radius: 50%;
+		z-index: 4;
+	}
+
+	.tui-hump-box::after {
+		content: ' ';
+		height: 200%;
+		width: 200%;
+		border: 1px solid #b2b2b2;
+		position: absolute;
+		top: 0;
+		left: 0;
+		transform: scale(0.5) translateZ(0);
+		transform-origin: 0 0;
+		border-radius: 120rpx;
+		box-sizing: border-box;
+		display: block;
+	}
+
+	.tui-unlined::after {
+		height: 0 !important;
+	}
+
+	.tui-tabbar-hump {
+		width: 100rpx;
+		height: 100rpx;
+		position: absolute;
+		left: 50%;
+		-webkit-transform: translateX(-50%) rotate(0deg);
+		transform: translateX(-50%) rotate(0deg);
+		top: -40rpx;
+		-webkit-transition: all 0.2s linear;
+		transition: all 0.2s linear;
+		border-radius: 50%;
+		z-index: 5;
+	}
+
+	.tui-tabbar-hump image {
+		width: 100rpx;
+		height: 100rpx;
+		display: block;
+	}
+
+	.tui-hump-active {
+		-webkit-transform: translateX(-50%) rotate(135deg);
+		transform: translateX(-50%) rotate(135deg);
+	}
+
+	.tui-text-scale {
+		transform: scale(0.8);
+		font-size: 25rpx;
+		line-height: 28rpx;
+		transform-origin: center 100%;
+	}
+
+	.tui-text-hump {
+		position: absolute;
+		left: 50%;
+		bottom: 10rpx;
+		transform: scale(0.8) translateX(-50%);
+		transform-origin: 0 100%;
+	}
+
+	.tui-badge {
+		position: absolute;
+		font-size: 24rpx;
+		height: 32rpx;
+		min-width: 20rpx;
+		padding: 0 6rpx;
+		border-radius: 40rpx;
+		right: 0;
+		top: -5rpx;
+		transform: translateX(70%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tui-badge-dot {
+		position: absolute;
+		height: 16rpx;
+		width: 16rpx;
+		border-radius: 50%;
+		right: -4rpx;
+		top: -4rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/thorui/tui-tabs/tui-tabs.vue b/components/thorui/tui-tabs/tui-tabs.vue
new file mode 100644
index 0000000..b734d7d
--- /dev/null
+++ b/components/thorui/tui-tabs/tui-tabs.vue
@@ -0,0 +1,346 @@
+<template>
+	<view class="tui-tabs-view"
+		:class="[isFixed ? 'tui-tabs-fixed' : 'tui-tabs-relative', unlined ? 'tui-unlined' : '']" :style="{
+			width: tabsWidth + 'px',
+			height: height + 'rpx',
+			padding: `0 ${padding}rpx`,
+			background: backgroundColor,
+			top: isFixed ? top + 'px' : 'auto',
+			zIndex: isFixed ? zIndex : 'auto'
+		}" v-if="tabsWidth>0">
+		<view v-for="(item, index) in tabs" :key="index" class="tui-tabs-item"
+			:style="{ width: getItemWidth,height: height + 'rpx' }" @tap.stop="swichTabs(index)">
+			<view class="tui-tabs-title" :class="{'tui-tabs-disabled': item.disabled }" :style="{
+					color: currentTab == index ? getSelectedColor : color,
+					fontSize: size + 'rpx',
+					fontWeight: bold && currentTab == index ? 'bold' : 'normal',transform:`scale(${currentTab == index?scale:1})`
+				}">
+				{{ item[field] }} <text v-if="item[badgeField]">({{item[badgeField]}})</text>
+				<view :class="[item.isDot ? 'tui-badge__dot' : 'tui-tabs__badge']"
+					:style="{ color: badgeColor, backgroundColor: getBadgeBgColor }"
+					v-if="item.isDot">
+					{{ item.isDot ? '' : item[badgeField] }}
+				</view>
+			</view>
+		</view>
+		<view v-if="isSlider" class="tui-tabs-slider" :style="{
+				transform: 'translateX(' + scrollLeft + 'px)',
+				width: sliderWidth + 'rpx',
+				height: sliderHeight + 'rpx',
+				borderRadius: sliderRadius,
+				bottom: bottom,
+				background: getSliderBgColor,
+				marginBottom: bottom == '50%' ? '-' + sliderHeight / 2 + 'rpx' : 0
+			}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tuiTabs',
+		emits: ['change'],
+		props: {
+			//标签页
+			tabs: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			//显示文本字段名称
+			field: {
+				type: String,
+				default: 'name'
+			},
+			badgeField: {
+				type: String,
+				default: 'num'
+			},
+			//tabs宽度，不传值则默认使用windowWidth，单位px
+			width: {
+				type: [Number, String],
+				default: 0
+			},
+			//rpx
+			height: {
+				type: Number,
+				default: 80
+			},
+			//rpx 只对左右padding起作用，上下为0
+			padding: {
+				type: Number,
+				default: 30
+			},
+			//背景色
+			backgroundColor: {
+				type: String,
+				default: '#FFFFFF'
+			},
+			//是否固定
+			isFixed: {
+				type: Boolean,
+				default: false
+			},
+			//px
+			top: {
+				type: Number,
+				// #ifndef H5
+				default: 0,
+				// #endif
+				// #ifdef H5
+				default: 44
+				// #endif
+			},
+			//是否去掉底部线条
+			unlined: {
+				type: Boolean,
+				default: false
+			},
+			//当前选项卡
+			currentTab: {
+				type: Number,
+				default: 0
+			},
+			isSlider: {
+				type: Boolean,
+				default: true
+			},
+			//滑块宽度
+			sliderWidth: {
+				type: Number,
+				default: 68
+			},
+			//滑块高度
+			sliderHeight: {
+				type: Number,
+				default: 6
+			},
+			//滑块背景颜色
+			sliderBgColor: {
+				type: String,
+				default: ''
+			},
+			sliderRadius: {
+				type: String,
+				default: '50rpx'
+			},
+			//滑块bottom
+			bottom: {
+				type: String,
+				default: '0'
+			},
+			//标签页宽度
+			itemWidth: {
+				type: String,
+				default: ''
+			},
+			//字体颜色
+			color: {
+				type: String,
+				default: '#666'
+			},
+			//选中后字体颜色
+			selectedColor: {
+				type: String,
+				default: ''
+			},
+			//字体大小
+			size: {
+				type: Number,
+				default: 28
+			},
+			//选中后 是否加粗 ，未选中则无效
+			bold: {
+				type: Boolean,
+				default: false
+			},
+			//2.3.0+
+			scale: {
+				type: [Number, String],
+				default: 1
+			},
+			//角标字体颜色
+			badgeColor: {
+				type: String,
+				default: '#fff'
+			},
+			//角标背景颜色
+			badgeBgColor: {
+				type: String,
+				default: ''
+			},
+			zIndex: {
+				type: [Number, String],
+				default: 996
+			}
+		},
+		watch: {
+			currentTab() {
+				this.checkCor();
+			},
+			tabs() {
+				this.checkCor();
+			},
+			width(val) {
+				this.tabsWidth = val;
+				this.checkCor();
+			}
+		},
+		computed: {
+			getItemWidth() {
+				let width = 100 / (this.tabs.length || 4) + '%'
+				return this.itemWidth ? this.itemWidth : width
+			},
+			getSliderBgColor() {
+				return this.sliderBgColor || (uni && uni.$tui && uni.$tui.color.primary) || '#5677fc';
+			},
+			getSelectedColor() {
+				return this.selectedColor || (uni && uni.$tui && uni.$tui.color.primary) || '#5677fc';
+			},
+			getBadgeBgColor() {
+				return this.badgeBgColor || (uni && uni.$tui && uni.$tui.color.pink) || '#f74d54';
+			}
+		},
+		created() {
+			// 高度自适应
+			setTimeout(() => {
+				uni.getSystemInfo({
+					success: res => {
+						this.winWidth = res.windowWidth;
+						this.tabsWidth = this.width == 0 ? this.winWidth : Number(this.width);
+						this.checkCor();
+					}
+				});
+			}, 0);
+		},
+		data() {
+			return {
+				winWidth: 0,
+				tabsWidth: 0,
+				scrollLeft: 0
+			};
+		},
+		methods: {
+			checkCor: function() {
+				let tabsNum = this.tabs.length;
+				let padding = uni.upx2px(Number(this.padding));
+				let width = this.tabsWidth - padding * 2;
+				let left = (width / tabsNum - uni.upx2px(Number(this.sliderWidth))) / 2 + padding;
+				let scrollLeft = left;
+				if (this.currentTab > 0) {
+					scrollLeft = scrollLeft + (width / tabsNum) * this.currentTab;
+				}
+				this.scrollLeft = scrollLeft;
+			},
+			// 点击标题切换当前页时改变样式
+			swichTabs: function(index) {
+				let item = this.tabs[index];
+				if (item && item.disabled) return;
+				if (this.currentTab == index) {
+					return false;
+				} else {
+					this.$emit('change', {
+						index: Number(index),
+						item: item
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.tui-tabs-view {
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.tui-tabs-relative {
+		position: relative;
+	}
+
+	.tui-tabs-fixed {
+		position: fixed;
+		left: 0;
+	}
+
+	.tui-tabs-fixed::before,
+	.tui-tabs-relative::before {
+		content: '';
+		position: absolute;
+		border-bottom: 1rpx solid #eaeef1;
+		-webkit-transform: scaleY(0.5) translateZ(0);
+		transform: scaleY(0.5) translateZ(0);
+		transform-origin: 0 100%;
+		bottom: 0;
+		right: 0;
+		left: 0;
+	}
+
+	.tui-unlined::before {
+		border-bottom: 0 !important;
+	}
+
+	.tui-tabs-item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		overflow: visible;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.tui-tabs-disabled {
+		opacity: 0.6;
+	}
+
+	.tui-tabs-title {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		z-index: 3;
+		overflow: visible;
+		transition: all 0.15s ease-in-out;
+	}
+
+	.tui-tabs-slider {
+		position: absolute;
+		left: 0;
+		transition: all 0.3s ease-in-out;
+		z-index: 1;
+		transform-style: preserve-3d;
+	}
+
+	.tui-tabs__badge {
+		position: absolute;
+		font-size: 24rpx;
+		height: 32rpx;
+		min-width: 20rpx;
+		padding: 0 6rpx;
+		border-radius: 40rpx;
+		right: 0;
+		top: 0;
+		transform: translate(88%, -50%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+		z-index: 4;
+		font-weight: normal !important;
+	}
+
+	.tui-badge__dot {
+		position: absolute;
+		height: 16rpx;
+		width: 16rpx;
+		border-radius: 50%;
+		right: -10rpx;
+		top: -10rpx;
+		z-index: 4;
+	}
+</style>
\ No newline at end of file
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..2269a69
--- /dev/null
+++ b/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
+    />
+    <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/jsconfig.json b/jsconfig.json
new file mode 100644
index 0000000..b1968ee
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "jsx": "preserve",
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./*"]
+    }
+  }
+}
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..3d6411c
--- /dev/null
+++ b/main.js
@@ -0,0 +1,21 @@
+import App from './App';
+
+// 引入 uView UI
+import uView from './uni_modules/vk-uview-ui';
+
+import { createSSRApp } from 'vue';
+import { setupPinia } from './sheep/store';
+
+
+export function createApp() {
+
+  const app = createSSRApp(App);
+  
+  app.use(uView);
+  
+  setupPinia(app);
+
+  return {
+    app,
+  };
+}
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..28f1440
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,239 @@
+{
+  "name": "晚趣语音",
+  "appid": "__UNI__458F814",
+  "description": "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
+  "versionName": "2.1.0",
+  "versionCode": 183,
+  "transformPx": false,
+  "app-plus": {
+    "usingComponents": true,
+    "nvueCompiler": "uni-app",
+    "nvueStyleCompiler": "uni-app",
+    "compilerVersion": 3,
+    "nvueLaunchMode": "fast",
+    "splashscreen": {
+      "alwaysShowBeforeRender": true,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
+    },
+    "safearea": {
+      "bottom": {
+        "offset": "none"
+      }
+    },
+    "modules": {
+      "Payment": {},
+      "Share": {},
+      "VideoPlayer": {},
+      "OAuth": {}
+    },
+    "distribute": {
+      "android": {
+        "permissions": [
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
+          "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+          "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
+          "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
+        ],
+        "minSdkVersion": 21,
+        "schemes": "shopro"
+      },
+      "ios": {
+        "urlschemewhitelist": [
+          "baidumap",
+          "iosamap"
+        ],
+        "dSYMs": false,
+        "privacyDescription": {
+          "NSPhotoLibraryUsageDescription": "需要同意访问您的相册选取图片才能完善该条目",
+          "NSPhotoLibraryAddUsageDescription": "需要同意访问您的相册才能保存该图片",
+          "NSCameraUsageDescription": "需要同意访问您的摄像头拍摄照片才能完善该条目",
+          "NSUserTrackingUsageDescription": "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验"
+        },
+        "urltypes": "shopro",
+        "capabilities": {
+          "entitlements": {
+            "com.apple.developer.associated-domains": [
+              "applinks:shopro.sheepjs.com"
+            ]
+          }
+        },
+        "idfa": true
+      },
+      "sdkConfigs": {
+        "speech": {
+          "ifly": {}
+        },
+        "ad": {},
+        "oauth": {
+          "apple": {},
+          "weixin": {
+            "appid": "wxae7a0c156da9383b",
+            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+          }
+        },
+        "payment": {
+          "weixin": {
+            "__platform__": [
+              "ios",
+              "android"
+            ],
+            "appid": "wxae7a0c156da9383b",
+            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+          },
+          "alipay": {
+            "__platform__": [
+              "ios",
+              "android"
+            ]
+          }
+        },
+        "share": {
+          "weixin": {
+            "appid": "wxae7a0c156da9383b",
+            "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
+          }
+        }
+      },
+      "orientation": [
+        "portrait-primary"
+      ],
+      "splashscreen": {
+        "androidStyle": "common",
+        "iosStyle": "common",
+        "useOriginalMsgbox": true
+      },
+      "icons": {
+        "android": {
+          "hdpi": "unpackage/res/icons/72x72.png",
+          "xhdpi": "unpackage/res/icons/96x96.png",
+          "xxhdpi": "unpackage/res/icons/144x144.png",
+          "xxxhdpi": "unpackage/res/icons/192x192.png"
+        },
+        "ios": {
+          "appstore": "unpackage/res/icons/1024x1024.png",
+          "ipad": {
+            "app": "unpackage/res/icons/76x76.png",
+            "app@2x": "unpackage/res/icons/152x152.png",
+            "notification": "unpackage/res/icons/20x20.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "proapp@2x": "unpackage/res/icons/167x167.png",
+            "settings": "unpackage/res/icons/29x29.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "spotlight": "unpackage/res/icons/40x40.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png"
+          },
+          "iphone": {
+            "app@2x": "unpackage/res/icons/120x120.png",
+            "app@3x": "unpackage/res/icons/180x180.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "notification@3x": "unpackage/res/icons/60x60.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "settings@3x": "unpackage/res/icons/87x87.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png",
+            "spotlight@3x": "unpackage/res/icons/120x120.png"
+          }
+        }
+      }
+    }
+  },
+  "quickapp": {},
+  "quickapp-native": {
+    "icon": "/static/logo.png",
+    "package": "com.example.demo",
+    "features": [
+      {
+        "name": "system.clipboard"
+      }
+    ]
+  },
+  "quickapp-webview": {
+    "icon": "/static/logo.png",
+    "package": "com.example.demo",
+    "minPlatformVersion": 1070,
+    "versionName": "1.0.0",
+    "versionCode": 100
+  },
+  "mp-weixin": {
+    "appid": "wx2708b75e03e8440a",
+    "setting": {
+      "urlCheck": false,
+      "minified": true,
+      "postcss": true
+    },
+    "optimization": {
+      "subPackages": true
+    },
+    "plugins": {},
+    "lazyCodeLoading": "requiredComponents",
+    "usingComponents": {},
+    "permission": {},
+    "requiredPrivateInfos": [
+      "chooseAddress"
+    ]
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "mp-jd": {
+    "usingComponents": true
+  },
+  "h5": {
+    "template": "index.html",
+    "router": {
+      "mode": "hash",
+      "base": "./"
+    },
+    "sdkConfigs": {
+      "maps": {}
+    },
+    "async": {
+      "timeout": 20000
+    },
+    "title": "晚趣语音",
+    "optimization": {
+      "treeShaking": {
+        "enable": true
+      }
+    }
+  },
+  "vueVersion": "3",
+  "_spaceID": "192b4892-5452-4e1d-9f09-eee1ece40639",
+  "locale": "zh-Hans",
+  "fallbackLocale": "zh-Hans"
+}
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..b158175
--- /dev/null
+++ b/package.json
@@ -0,0 +1,103 @@
+{
+  "id": "shopro",
+  "name": "shopro",
+  "displayName": "晚趣语音",
+  "version": "2.2.0",
+  "description": "晚趣语音，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能",
+  "scripts": {
+    "prettier": "prettier --write  \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""
+  },
+  "repository": "https://github.com/sheepjs/shop.git",
+  "keywords": [
+    "商城",
+    "B2C",
+    "商城模板"
+  ],
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/sheepjs/shop/issues"
+  },
+  "homepage": "https://github.com/dcloudio/hello-uniapp#readme",
+  "dcloudext": {
+    "category": [
+      "前端页面模板",
+      "uni-app前端项目模板"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "u",
+        "aliyun": "u"
+      },
+      "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",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+          "vue2": "u",
+          "vue3": "y"
+        }
+      }
+    }
+  },
+  "dependencies": {
+    "dayjs": "^1.11.7",
+    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
+    "luch-request": "^3.0.8",
+    "pinia": "^2.0.33",
+    "pinia-plugin-persist-uni": "^1.2.0",
+    "weixin-js-sdk": "^1.6.0"
+  },
+  "devDependencies": {
+    "prettier": "^2.8.7",
+    "vconsole": "^3.15.0"
+  }
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..cd8ad0e
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,625 @@
+{
+	"easycom": {
+		"autoscan": true,
+		"custom": {
+			"^s-(.*)": "@/sheep/components/s-$1/s-$1.vue",
+			"^su-(.*)": "@/sheep/ui/su-$1/su-$1.vue"
+		}
+	},
+	"pages": [
+		{
+			"path": "pages/tabbar/index",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/index/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		}
+	],
+	"subPackages": [
+		{
+			"root": "pages/trend",
+			"pages": [
+				{
+					"path": "city/list",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "detail/index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "my/list",
+					"style": {
+						"navigationStyle": "custom"
+					},
+					"meta": {
+						"auth": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/reward",
+			"pages": [
+				{
+					"path": "list",
+					"style": {
+						"navigationStyle": "custom"
+					},
+					"meta": {
+						"auth": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/worker",
+			"pages": [
+				{
+					"path": "levelList/index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "workerList/index",
+					"style": {
+						"navigationStyle": "custom"
+					},
+					"meta": {
+						"auth": true
+					}
+				},
+				{
+					"path": "workerList/set",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "blind/index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/clerk",
+			"pages": [
+				{
+					"path": "apply/index",
+					"style": {
+						"navigationStyle": "custom"
+					},
+					"meta": {
+						"auth": true
+					}
+				},
+				{
+					"path": "fans/list",
+					"style": {
+						"navigationStyle": "custom"
+					},
+					"meta": {
+						"auth": true
+					}
+				},
+				{
+					"path": "apply/edit",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "detail/index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/goods",
+			"pages": [
+				{
+					"path": "comment/worker/add",
+					"style": {
+						"navigationBarTitleText": "评价店员"
+					},
+					"meta": {
+						"auth": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/order",
+			"pages": [
+				{
+					"path": "worker/confirm",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "blind/confirm",
+					"style": {
+						"navigationStyle": "custom"
+					},
+					"meta": {
+						"auth": true
+					}
+				},
+				{
+					"path": "worker/aftersale/apply",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "my/aftersale/apply",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "worker/aftersale/list",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "blind/detail",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "worker/detail",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "my/detail",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "worker/list",
+					"style": {
+						"navigationStyle": "custom"
+					},
+					"meta": {
+						"auth": true
+					}
+				},
+				{
+					"path": "blind/list",
+					"style": {
+						"navigationStyle": "custom"
+					},
+					"meta": {
+						"auth": true
+					}
+				},
+				{
+					"path": "my/list",
+					"style": {
+						"navigationStyle": "custom"
+					},
+					"meta": {
+						"auth": true
+					}
+				},
+				{
+					"path": "receive/index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "my/index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/user",
+			"pages": [{
+					"path": "info",
+					"style": {
+						"navigationBarTitleText": "我的信息"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "用户信息",
+						"group": "用户中心"
+					}
+				},
+				{
+					"path": "vip",
+					"style": {
+						"navigationStyle": "custom"
+					},
+					"meta": {
+						"auth": true
+					}
+				},
+				{
+					"path": "detail/index",
+					"style": {
+						"navigationStyle": "custom"
+					},
+					"meta": {
+						"auth": true
+					}
+				},
+				{
+					"path": "wallet/money",
+					"style": {
+						"navigationBarTitleText": "我的余额"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "用户余额",
+						"group": "用户中心"
+					}
+				},
+				{
+					"path": "wallet/score",
+					"style": {
+						"navigationBarTitleText": "我的积分"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "用户积分",
+						"group": "用户中心"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/commission",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "分销"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "分销中心",
+						"group": "分销商城"
+					}
+				},
+				{
+					"path": "wallet",
+					"style": {
+						"navigationBarTitleText": "我的佣金"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "用户佣金",
+						"group": "分销中心"
+					}
+				},
+				{
+					"path": "order",
+					"style": {
+						"navigationBarTitleText": "分销订单"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "分销订单",
+						"group": "分销商城"
+					}
+				},
+				{
+					"path": "team",
+					"style": {
+						"navigationBarTitleText": "我的团队"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "我的团队",
+						"group": "分销商城"
+					}
+				}, {
+					"path": "promoter",
+					"style": {
+						"navigationBarTitleText": "推广人排行榜"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "推广人排行榜",
+						"group": "分销商城"
+					}
+				}, {
+					"path": "commission-ranking",
+					"style": {
+						"navigationBarTitleText": "佣金排行榜"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "佣金排行榜",
+						"group": "分销商城"
+					}
+				}, {
+                "path": "withdraw",
+                "style": {
+                  "navigationBarTitleText": "申请提现"
+                },
+                "meta": {
+                  "auth": true,
+                  "sync": true,
+                  "title": "申请提现",
+                  "group": "分销商城"
+                }
+              }
+			]
+		},
+		{
+			"root": "pages/app",
+			"pages": [{
+				"path": "sign",
+				"style": {
+					"navigationBarTitleText": "签到中心"
+				},
+				"meta": {
+					"auth": true,
+					"sync": true,
+					"title": "签到中心",
+					"group": "应用"
+				}
+			}]
+		},
+		{
+			"root": "pages/public",
+			"pages": [{
+					"path": "setting",
+					"style": {
+						"navigationBarTitleText": "系统设置"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "系统设置",
+						"group": "通用"
+					}
+				},
+				{
+					"path": "richtext",
+					"style": {
+						"navigationBarTitleText": "富文本"
+					},
+					"meta": {
+						"sync": true,
+						"title": "富文本",
+						"group": "通用"
+					}
+				},
+				{
+					"path": "faq",
+					"style": {
+						"navigationBarTitleText": "常见问题"
+					},
+					"meta": {
+						"sync": true,
+						"title": "常见问题",
+						"group": "通用"
+					}
+				},
+				{
+					"path": "error",
+					"style": {
+						"navigationBarTitleText": "错误页面"
+					}
+				},
+				{
+					"path": "webview",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/coupon",
+			"pages": [{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "领券中心"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "领券中心",
+						"group": "优惠券"
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "优惠券"
+					},
+					"meta": {
+						"auth": false,
+						"sync": true,
+						"title": "优惠券详情",
+						"group": "优惠券"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/chat",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "客服"
+				},
+				"meta": {
+					"auth": true,
+					"sync": true,
+					"title": "客服",
+					"group": "客服"
+				}
+			}]
+		},
+		{
+			"root": "pages/im",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "聊天"
+				},
+				"meta": {
+					"auth": true,
+					"sync": true,
+					"title": "聊天",
+					"group": "聊天"
+				}
+			}]
+		},
+		{
+			"root": "pages/point",
+			"pages": [
+				{
+					"path": "recharge",
+					"style": {
+						"navigationBarTitleText": "充值积分"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "充值积分",
+						"group": "支付"
+					}
+				},
+				{
+					"path": "recharge-log",
+					"style": {
+						"navigationBarTitleText": "充值记录"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "充值记录",
+						"group": "支付"
+					}
+				},
+				{
+					"path": "result",
+					"style": {
+						"navigationBarTitleText": "支付结果"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "支付结果",
+						"group": "支付"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/pay",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "收银台"
+					}
+				},
+				{
+					"path": "result",
+					"style": {
+						"navigationBarTitleText": "支付结果"
+					}
+				},
+				{
+					"path": "worker/index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "point/index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "vip/index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "reward/index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "worker/result",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "recharge",
+					"style": {
+						"navigationBarTitleText": "充值余额"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "充值余额",
+						"group": "支付"
+					}
+				},
+				{
+					"path": "recharge-log",
+					"style": {
+						"navigationBarTitleText": "充值记录"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "充值记录",
+						"group": "支付"
+					}
+				}
+			]
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "晚趣语音",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#FFFFFF",
+		"navigationStyle": "custom"
+	}
+}
diff --git a/pages/app/sign.vue b/pages/app/sign.vue
new file mode 100644
index 0000000..7a4702c
--- /dev/null
+++ b/pages/app/sign.vue
@@ -0,0 +1,451 @@
+<!-- 签到界面  -->
+<template>
+  <s-layout title="签到有礼">
+    <s-empty v-if="state.loading" icon="/static/data-empty.png" text="签到活动还未开始" />
+    <view v-if="state.loading" />
+    <view class="sign-wrap" v-else-if="!state.loading">
+      <!-- 签到日历 -->
+      <view class="content-box calendar">
+        <view class="sign-everyday ss-flex ss-col-center ss-row-between ss-p-x-30">
+          <text class="sign-everyday-title">签到日历</text>
+          <view class="sign-num-box">
+            已连续签到 <text class="sign-num">{{ state.signInfo.continuousDay }}</text> 天
+          </view>
+        </view>
+        <view
+          class="list acea-row row-between-wrapper"
+          style="
+            padding: 0 30rpx;
+            height: 240rpx;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+          "
+        >
+          <view class="item" v-for="(item, index) in state.signConfigList" :key="index">
+            <view
+              :class="
+                (index  === state.signConfigList.length ? 'reward' : '') +
+                ' ' +
+                (state.signInfo.continuousDay >= item.day ? 'rewardTxt' : '')
+              "
+            >
+              第{{ item.day }}天
+            </view>
+            <view
+              class="venus"
+              :class="
+                (index + 1 === state.signConfigList.length ? 'reward' : '') +
+                ' ' +
+                (state.signInfo.continuousDay >= item.day ? 'venusSelect' : '')
+              "
+            >
+            </view>
+            <view class="num" :class="state.signInfo.continuousDay >= item.day ? 'on' : ''">
+              + {{ item.point }}
+            </view>
+          </view>
+        </view>
+
+        <!-- 签到按钮 -->
+        <view class="myDateTable">
+          <view class="ss-flex ss-col-center ss-row-center sign-box ss-m-y-40">
+            <button
+              class="ss-reset-button sign-btn"
+              v-if="!state.signInfo.todaySignIn"
+              @tap="onSign"
+            >
+              签到
+            </button>
+            <button class="ss-reset-button already-btn" v-else disabled> 已签到 </button>
+          </view>
+        </view>
+      </view>
+
+      <!-- 签到说明 TODO @芋艿：【签到】这里改成【已累计签到】；改版，接入 sheepjs  -->
+      <view class="bg-white ss-m-t-16 ss-p-t-30 ss-p-b-60 ss-p-x-40">
+        <view class="activity-title ss-m-b-30">签到说明</view>
+        <view class="activity-des">1、已累计签到{{state.signInfo.totalDay}}天</view>
+        <view class="activity-des">
+          2、据说连续签到第 {{ state.maxDay }} 天可获得超额积分，一定要坚持签到哦~~~
+        </view>
+      </view>
+    </view>
+
+    <!-- 签到结果弹窗 -->
+    <su-popup :show="state.showModel" type="center" round="10" :isMaskClick="false">
+      <view class="model-box ss-flex-col">
+        <view class="ss-m-t-56 ss-flex-col ss-col-center">
+          <text class="cicon-check-round"></text>
+          <view class="score-title">
+            <text v-if="state.signResult.point">{{ state.signResult.point }} 积分 </text>
+            <text v-if="state.signResult.experience"> {{ state.signResult.experience }} 经验</text>
+          </view>
+          <view class="model-title ss-flex ss-col-center ss-m-t-22 ss-m-b-30">
+            已连续打卡 {{ state.signResult.day }} 天
+          </view>
+        </view>
+        <view class="model-bg ss-flex-col ss-col-center ss-row-right">
+          <view class="title ss-m-b-64">签到成功</view>
+          <view class="ss-m-b-40">
+            <button class="ss-reset-button confirm-btn" @tap="onConfirm">确认</button>
+          </view>
+        </view>
+      </view>
+    </su-popup>
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onReady } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import SignInApi from '@/sheep/api/member/signin';
+
+  const headerBg = sheep.$url.css('/static/img/shop/app/sign.png');
+
+  const state = reactive({
+    loading: true,
+
+    signInfo: {}, // 签到信息
+
+    signConfigList: [], // 签到配置列表
+    maxDay: 0, // 最大的签到天数
+
+    showModel: false, // 签到弹框
+    signResult: {}, // 签到结果
+  });
+
+  // 发起签到
+  async function onSign() {
+    const { code, data } = await SignInApi.createSignInRecord();
+    if (code !== 0) {
+      return;
+    }
+    state.showModel = true;
+    state.signResult = data;
+    // 重新获得签到信息
+    await getSignInfo();
+  }
+
+  // 签到确认刷新页面
+  function onConfirm() {
+    state.showModel = false;
+  }
+
+  // 获得个人签到统计
+  async function getSignInfo() {
+    const { code, data } = await SignInApi.getSignInRecordSummary();
+    if (code !== 0) {
+      return;
+    }
+    state.signInfo = data;
+    state.loading = false;
+  }
+
+  // 获取签到配置
+  async function getSignConfigList() {
+    const { code, data } = await SignInApi.getSignInConfigList();
+    if (code !== 0) {
+      return;
+    }
+    state.signConfigList = data;
+    if (data.length > 0) {
+      state.maxDay = data[data.length - 1].day;
+    }
+  }
+
+  onReady(() => {
+    getSignInfo();
+    getSignConfigList();
+  });
+  // TODO 芋艿：1）css 需要优化，例如说引入的图片；2）删除多余的样式
+</script>
+
+<style lang="scss" scoped>
+  .header-box {
+    border-top: 2rpx solid rgba(#dfdfdf, 0.5);
+  }
+
+  // 日历
+  .calendar {
+    background: #fff;
+
+    .sign-everyday {
+      height: 100rpx;
+      background: rgba(255, 255, 255, 1);
+      border: 2rpx solid rgba(223, 223, 223, 0.4);
+
+      .sign-everyday-title {
+        font-size: 32rpx;
+        color: rgba(51, 51, 51, 1);
+        font-weight: 500;
+      }
+
+      .sign-num-box {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: rgba(153, 153, 153, 1);
+
+        .sign-num {
+          font-size: 30rpx;
+          font-weight: 600;
+          color: #ff6000;
+          padding: 0 10rpx;
+          font-family: OPPOSANS;
+        }
+      }
+    }
+
+    // 年月日
+    .bar {
+      height: 100rpx;
+
+      .date {
+        font-size: 30rpx;
+        font-family: OPPOSANS;
+        font-weight: 500;
+        color: #333333;
+        line-height: normal;
+      }
+    }
+
+    .cicon-back {
+      margin-top: 6rpx;
+      font-size: 30rpx;
+      color: #c4c4c4;
+      line-height: normal;
+    }
+
+    .cicon-forward {
+      margin-top: 6rpx;
+      font-size: 30rpx;
+      color: #c4c4c4;
+      line-height: normal;
+    }
+
+    // 星期
+    .week {
+      .week-item {
+        font-size: 24rpx;
+        font-weight: 500;
+        color: rgba(153, 153, 153, 1);
+        flex: 1;
+      }
+    }
+
+    // 日历表
+    .myDateTable {
+      display: flex;
+      flex-wrap: wrap;
+
+      .dateCell {
+        width: calc(750rpx / 7);
+        height: 80rpx;
+        font-size: 26rpx;
+        font-weight: 400;
+        color: rgba(51, 51, 51, 1);
+      }
+    }
+  }
+
+  .is-sign {
+    width: 48rpx;
+    height: 48rpx;
+    position: relative;
+
+    .is-sign-num {
+      font-size: 24rpx;
+      font-family: OPPOSANS;
+      font-weight: 500;
+      line-height: normal;
+    }
+
+    .is-sign-image {
+      position: absolute;
+      left: 0;
+      top: 0;
+      width: 48rpx;
+      height: 48rpx;
+    }
+  }
+
+  .cell-num {
+    font-size: 24rpx;
+    font-family: OPPOSANS;
+    font-weight: 500;
+    color: #333333;
+    line-height: normal;
+  }
+
+  .cicon-title {
+    position: absolute;
+    right: -10rpx;
+    top: -6rpx;
+    font-size: 20rpx;
+    color: red;
+  }
+
+  // 签到按钮
+  .sign-box {
+    height: 140rpx;
+    width: 100%;
+
+    .sign-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 35rpx;
+      font-size: 30rpx;
+      font-weight: 500;
+      box-shadow: 0 0.2em 0.5em rgba(#ff6000, 0.4);
+      background: linear-gradient(90deg, #ff6000, #fe832a);
+      color: #fff;
+    }
+
+    .already-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 35rpx;
+      font-size: 30rpx;
+      font-weight: 500;
+    }
+  }
+
+  .model-box {
+    width: 520rpx;
+    // height: 590rpx;
+    background: linear-gradient(177deg, #ff6000 0%, #fe832a 100%);
+    // background: linear-gradient(177deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    border-radius: 10rpx;
+
+    .cicon-check-round {
+      font-size: 70rpx;
+      color: #fff;
+    }
+
+    .score-title {
+      font-size: 34rpx;
+      font-family: OPPOSANS;
+      font-weight: 500;
+      color: #fcff00;
+    }
+
+    .model-title {
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #ffffff;
+    }
+
+    .model-bg {
+      width: 520rpx;
+      height: 344rpx;
+      background-size: 100% 100%;
+      background-image: v-bind(headerBg);
+      background-repeat: no-repeat;
+      border-radius: 0 0 10rpx 10rpx;
+
+      .title {
+        font-size: 34rpx;
+        font-weight: bold;
+        // color: var(--ui-BG-Main);
+        color: #ff6000;
+      }
+
+      .subtitle {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #999999;
+      }
+
+      .cancel-btn {
+        width: 220rpx;
+        height: 70rpx;
+        border: 2rpx solid #ff6000;
+        border-radius: 35rpx;
+        font-size: 28rpx;
+        font-weight: 500;
+        color: #ff6000;
+        line-height: normal;
+        margin-right: 10rpx;
+      }
+
+      .confirm-btn {
+        width: 220rpx;
+        height: 70rpx;
+        background: linear-gradient(90deg, #ff6000, #fe832a);
+        box-shadow: 0 0.2em 0.5em rgba(#ff6000, 0.4);
+        border-radius: 35rpx;
+        font-size: 28rpx;
+        font-weight: 500;
+        color: #ffffff;
+        line-height: normal;
+      }
+    }
+  }
+
+  //签到说明
+  .activity-title {
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #333333;
+    line-height: normal;
+  }
+
+  .activity-des {
+    font-size: 26rpx;
+    font-weight: 500;
+    color: #666666;
+    line-height: 40rpx;
+  }
+
+  .reward {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAAA4CAYAAAC1+AWFAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowYWFmYjU3Mi03MGJhLTRiNDctOTI2Yi0zOThlZDkzZDkxMDkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RUEyNzZEMjZEMDFCMTFFOEIzQzhEMjMxNjI1NENDQjciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RUEyNzZEMjVEMDFCMTFFOEIzQzhEMjMxNjI1NENDQjciIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTggKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6ZmRjNTM0MmUtNmFkOC1iMDRhLThjZTEtMjk2YWYzM2FkMmUxIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjBhYWZiNTcyLTcwYmEtNGI0Ny05MjZiLTM5OGVkOTNkOTEwOSIv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');
+    width: 75rpx;
+    height: 56rpx;
+  }
+
+  .rewardTxt {
+    width: 74rpx;
+    height: 32rpx;
+    background-color: #f4b409;
+    border-radius: 16rpx;
+    font-size: 20rpx;
+    color: #a57d3f;
+    line-height: 32rpx;
+  }
+
+  .venusSelect {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADgAAAA4CAYAAACohjseAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowYWFmYjU3Mi03MGJhLTRiNDctOTI2Yi0zOThlZDkzZDkxMDkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzkwRkI4NEFEMDFCMTFFODhDNDdBMDVGOTBBN0U2NTQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzkwRkI4NDlEMDFCMTFFODhDNDdBMDVGOTBBN0U2NTQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTggKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6ZmRjNTM0MmUtNmFkOC1iMDRhLThjZTEtMjk2YWYzM2FkMmUxIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjBhYWZiNTcyLTcwYmEtNGI0Ny05MjZiLTM5OGVkOTNkOTEwOSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PkX00M0AAAfVSURBVHjaxFpdcBNVFD67STbppn9poU0LtSBYykBlgKrjqKOtihbq8ICKILyJwxM+6fjCk2/6pC+O4hs+6fgAbWFw1OID+ICMAwwKlRmKLW3Tpvlrskk3m13Pvdm0NNn//HA73+ymd3Pv+e4595xzT5bJ3DgJNWyMelUqNaD36a8N+9kaEeMR3yAERES952sxsbtya2lIbgQxqH72IT5EbEW8pZKuHkGlugyLyT3aBtW+qpJkKb/qgEeMIAYNnhlUn+Edz2NuokqtNVdTTbqVyhO0Q67qJMt2MnXbTq/cp+9+ZkyOYYFxN4EiLaF5SbokccyKkWRS1z4we4ZDfIE4hmhxvJLNu8HTtg85ekGRRcjOXwIp9pfT4aKIs4iP+f4zYrl78HPEqbLMJNAPXHBI/SQjSTd+PoD3LpCi15wMGVBlSiM+NfSihJ8Jjlt4Rheu5n7wtL+B93IJPO37aH8Z45+ohBdtKUtz7a+jJLK+/dN+BTX5p5MpWh6HF6XNE9iLwr9mSG6VZP65bPR6NVI1BwQZF3BtA+Bq2oG3Pt3HFCVnfUHaX6XQHCeXgVz8Nojz4+SDzTgo2yfIBV9G89utzi5DtRvDcnQ+JSciyd+rH+hdjb22tFOp5mreCUrocg0CPet5LATJvHbldWSiGllIzZpdeR2ZqFPtZTNJSIQeQGv3DucEbcrLmkRSXvP/cs4RZm6Ow/T1McffpyiSJTZ+jDfOZFDlOuARo5p9aKJ2IYkpCN+9AmLsIcSm/3Y0BkWpPCPRX9/nDVI1BTTAI0YRA9r99gWbv3MF90MGvG4WQrfHnRMslWcQMRL55SivbaJk064FjxhFDGj0gad5u22zkrMZiExcBQ7JcW4GlhfuQ3L+gSMTzc9fItcgYiTy8xHeTIOGmnMHtoEn2G971cP3MAUTk+B2MeBBkh4kGbp92ZEGyfxEDj1NLl56j9fbg4U9N6C179zNPZhK7cV7yRZkSYTI3atIjgUXywCLINf03L8gRGZtj0dA5CDyaMg5SPZk+OLhFZLMwtg7hTLDKGJAM09s6QGuY6+upxLTKcgkFmE5FUdFIYQEiHgv4VURl4BjgZon0SA9EeKKi1kZliU8Nnn84OabwIPw+huB8zdR+OqbwdcYMAwB4ux1yEYmtLp+I5WBdft/EApx8Cs9cu6mblyxXXTl9FpOFGDyjzGQMwlwIQlUEDAMagqvhBTVHl4ZplDezpsq+UdOTkMuIcByfBYElCWHmsgpLHQ/NwTe+gaTBH0XWkgGpPgDrfLHl4gTTOj8IVLdTqkF2aIslwF+2zCeGDjzIJ5OwtSVc6Cko9QMCUmWyZMiZJn8cI8E7Lwm11wJOTypBPuHoCG4yVrgz2VBmFBj69pGTvv1hVSN0XSxHE8LRUbaW9G01wdPvHgQQtcugJwMU5LFpIrWDjXMUGIsMNRR5DwcBPcMQV1L0NKchYHIkU2WkiVrTvgT6XEjyN/TY08R5KyAaWc6n3tagMvjhuCzQ+jlOmylVPRZjw/an9kPdYF1lucjIPLJmERoyP9j+8GflIIXPYW4XOKVJAmWZ27Y8nAMaq5t9yB4WjeumJ4hOaIErx/W978JXH2TbY9K5ZNKMhzC5dSjyTapQ5IyFxozvLJGz9Hp/Am+Y7utH8kan+yDhYVp8lVgdDWX33f+ji3gruNpnLPTxNl/8vKtbeTAeKDj0DmhuGShT3Jxkp4guGCv5cnT0QX0hgq4dOnBSshIxxehUbZJbu4OSJEpbXJvnxf0zoP6JMP/keVGTfZYEiCDQlttmXjE1hlTnJ3A+Ketuc53RwSz86AuSXFxitYzueBWUyGWE9E1pqiozoRhXdQJMLAaEyUMMdJyGp2Ux4Lm7iG5h5rkNhweFUpLFtonZANNTmOA3WzmFiGLGY3XlSel0DpOCzRs6gWXj4fkgwnIhKZIcKDhgsTLTCICfMs683gb1tbchiNjgt0TfYFkym7JQkyl8nkoixkMesiGzT1Q19q20t+0dTvwnU/A0iQSDYeoNinBQLOTE/2BjUcvCE5rMoJ2XcSYYBr3FOPmoHHLU+APdtJMpvg7bp8XAr19mKJ1weK9u5CJxUDpMt+HxfJ2HbsoVLzwa1aT4fw8dD3/Au43lv7YYjQF19gAHXv6UYMJa7UepQZFJzMT9fp9lJidorCvgbfkSRXbBB2UDRX5MdREnZYNwZECRcxQXLUnl8s5KPw6MNFsdBFzzdaaE8xGwrUx0eXZORrw3c1NNdEk0ZwUi2OQn7fvZBz9fEZKDjNzFLqn7dYApnVtNtKvecx5oxVfHCsmSt4ts/0rrxiO5NO6jvUWyC0guZgT+SPllu4Jzjr9AT0bjqKWQ1qH0RWQfvKcwzm+s6BB01X6RC1pHIf82w02NRmnsng7WjX28iJqLu5Ec4XXSE5XYg+S91A+UlHS/H2riXfq1n3N8mM2HKOOgutsodkNqZKIMxGQokvFw40jhnFMoZZ70CzyrpLd2S0kb00Oa5KMJDC8LAHL4QEmK4HGKYaSq+/bJFTyZ/GyX+VK3pzUStA1SRJrkTNZrWHG1e8IGuMZt5eqrUH9U8iwUbVci1w1BKnW65RWSVaVnBomAKoI3E9IQEEipX3jap9Q1hxmBElBocp/AmIYcQaRQSQQ36r/E8odvepOxoa5khfRT1pf+8q0/wUYAFU/P0XyeZQPAAAAAElFTkSuQmCC');
+  }
+
+  .venus {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADgAAAA4CAYAAACohjseAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowYWFmYjU3Mi03MGJhLTRiNDctOTI2Yi0zOThlZDkzZDkxMDkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RDQ3N0E3RkJEMDFCMTFFODhGODVBOTc1NEM5Nzg2NzkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RDQ3N0E3RkFEMDFCMTFFODhGODVBOTc1NEM5Nzg2NzkiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTggKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6ZmRjNTM0MmUtNmFkOC1iMDRhLThjZTEtMjk2YWYzM2FkMmUxIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjBhYWZiNTcyLTcwYmEtNGI0Ny05MjZiLTM5OGVkOTNkOTEwOSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnZClGIAAAT7SURBVHja7JtLcxtFEMdnn1rJUhIrTiS7KLsK/EXwNck3gCMcuUFx4QvACW48buHGMZxJPkiowpjC2LElcKzXSqul/6OdoOB9zezsCCimqmvXtdqd+U33dPf0rq2Tn54zg81KjrGuB75x8FbuddsQWIvkS5IxySA5b5no2DUE94TkKPk7IHmf5JDkUQJdW7MNw623o+Ra698KmAdnDNLeIJwRSHvDcLVDVnYynU771fnLl9eFcLZts+VymQf5iJ6pzfFYJeKgT/IZyTskXdWOPM9jjYbPLMticRyz2Sxk8/lc9XFDksckH1IcDKtq8FOSD6rMIuCCoPHXrBIk/qYDC0MlyO1kTBOSj6uuwXerwPn+63DrrdFo8OsV2ns6nEy3Chwg8lpFyK4OwNrgNGpSvxfFoDzP5etJR8PzsiYETmk+X5BjmpkBrHPGU109TeKqv5X3rT3QQ3ObaPDGRjIZXWZpol+b/cebUUA4iuHw938UoNbk9+zsjP16eqoV4JfjH1uqgLjxe10DiaKIDYZDNqfU7OrqSifjkzxIuwDubV2juLi8ZK7j8oT74uJSJ+BRHqQtC6cS/7A9wtrDvb7v84A9Go2UMyQZSFsWrmz6td4GgyF38a7r8lgGefHiQjnjkYG064ZDmjWktecRnEOCDa9DpjqdTrnUDSk2vJXgsHGdTKa0t5vx/V0Yhvy4WMx5hdf3VqYJDQqTxW+QdmECPM8h8flvPPRFR/QXBEEuKEw9Yz/5AyoDtBkei5zriyw4pGVFmoOHPD7+mQ/ccR1mWzZpyuIacx2Hgzl0FJkIjjBTHBeLiO6LuDZH4zFbRkt63oLt7+8XAmJcIhFP0eTn2C9CgzBTrPjUp7XbW6VSJGjx5OSEBhsz2wGkxc0R967LuukuSWKaFEwMnXJQSL/fZ51Op/QSuL5OdVjY7beFBq2sAlHZ/A8aOTg4YKenv/EBr8Nl5ZUO6jPJRGCg0dJie/d3WbPZlMpPMwpZsN0Y2sOVb7PcOzou22CGe3u7fB3J3Cd+udvvScG9soT0Kt13tAZj4UVRwHmWtZClcj+azX6vxx0GN8ECUFyHjnsEp+KlM8b3TBTKBCDqkA/SIFV20jCbO3duk8OIcgHF7G9ttbinVYFLcTBgeAAP+vc4mAkJVywLibARpZvOjWWA36rApYSI1+DSMhltkJPpRGIyJrXAZeWiWiCnk9kNU4RGl8m5MN1VLFzwWKobLm83kQtZbnMb8lgYJ2aIYH//3g73lEHQ5ECAXYUSu7QWZeCKqmoCcqSyPkQgd8lHbne3uSMRbWenSwNtU476BxtT9oJQOZ3OKKloq6SmmXBlyoZKb3nG4wnXyt1ul9261UkN9ggjvd497mDOz885KGN3pfvKg1OuixY15JCHh2/ymFjUms2AMqD9BFB/qwUQg5ZtrVY9b7H/LxtmZSCbaCr9KgGmpEeG6qpzM2tQBHudb5eKNLfKiUMzgAIyL6uRreHklB9qX4MDlQfLpHUV4AY6AB+rzl4ZyIqa+0aHiX6UlDTwMcK2CqQoEGmEE5+RfFK4N636vWjKh0Cp5ceS38k8JXko8yHQ7W7PXKBPBvYwGegNF4/q12g05mV7HXClqgs1ffEr+/LmaTIx0nCb+uI3U5M64Tadi5aBrBXORLKdB1k7nKndhID8GqUaErze/coEXJ1OJm9CY2bw3wr+FGAAoa6PIUihovYAAAAASUVORK5CYII=');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    width: 56rpx;
+    height: 56rpx;
+    margin: 10rpx 0;
+  }
+
+  .num {
+    font-size: 24rpx;
+    font-family: 'Guildford Pro';
+  }
+
+  .item {
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #eee;
+    height: 130rpx;
+  }
+
+  .reward {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAAA4CAYAAAC1+AWFAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowYWFmYjU3Mi03MGJhLTRiNDctOTI2Yi0zOThlZDkzZDkxMDkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RUEyNzZEMjZEMDFCMTFFOEIzQzhEMjMxNjI1NENDQjciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RUEyNzZEMjVEMDFCMTFFOEIzQzhEMjMxNjI1NENDQjciIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTggKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6ZmRjNTM0MmUtNmFkOC1iMDRhLThjZTEtMjk2YWYzM2FkMmUxIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjBhYWZiNTcyLTcwYmEtNGI0Ny05MjZiLTM5OGVkOTNkOTEwOSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PuGQ9m8AAAf3SURBVHja7Jxbb9xEFMe9Xu81u6VJL0kqSCToZ0CCNyp4CQ0FqVAkQAgeEE98EPgEwBOCSoCEQPTCG30BVSpfAaQ2KQ1tc4Fm77v2cv7jmc3UGdvjsTdrJEY68m527Zn5zZlzszeF8XhspWl37/xhZdwK/Di2jqA9ufqM9ndtKz+tTvIpSYdkl7+u52h8lpMjUFdIzvH3VZIPSM6SrHOAM292DkHJ7Rz/rP4/rGhQuQNm5xxUroAVNm//PhUnQ7JEco9LGlBy+znGhsX1O1vNajYbjwm1F0l+JfmN5BeSlwKfx4KybTtWw6TriXao39xpFga8v98q08tPSN7Dn0yvVSqVrEqlbBUKBQvxX78/sIbDoenlxhzs6ySDPNmsj0k+SguqWq0wUGwV6Yj35XIpTXD7Csk3eTPw76c5GUAARtUqlVTA0C5wOzd7WLQF19JoFEAASFRLCQwa9hXJ2rQj+GdJ3sCcQj4vkrw7TVAyMLTBwMiGHSP5luQLEjfkO0O+ZW+ZGPjnuIE8YQoDEyyVnIkdmmaDQxgOR+QU+mku85DkZe5RE23D19KCguYcBSjhEHxNLStBarZTJBdNtuGcqlNVx6q4CBo1iwavipDjsUk6Rdq+I0u1brZdkKpCrDVMYLlBUMVikQ0mGM4EBydWeiYpiaLfWq1GwEbKUAwQPc+Vz3NTlWgEqHq9xo7BpoKVpwbNDwtNbHto9XpdAjaOXWBtWNhWAOV53lQnBiPdarWs+fnjmRr/MLtVLjvUp2O57tCK2wwJ4qxCyECyhXX//n3r3tZWxp4yel4+pPiJRMHydAbR7XYzm5Trutbu3p41pFjq0aNHmV0XY0ywqJ4JrIoOKEwwq7a9s2M5RYe5/+3tnUwXIQGwSlJYyKfeMgVlkprAFu7t/c3OLZfLLLhst9vGmUEKYG/x+WvBQgT7ZTDfE8ZPB5RuCiO33d095o0cx2HhCeThw+1UAbEusIAXbPL5r8XBWuf5UVP2JNgWGLzrelMBhT72yFaVCFSRBK6+SNux1+sxmSYwaDQ0GfOTPGaTc1gPyw2R3nwdTJoRMiCow4U6HXNQKOJ1uz0KAvssGR4MBuw4Gg2ZHyqX/O0HzRKTwHcQw/mhCwLisj8x9EVH9FetViOhYTurkm+EQZgXlAqahf4wvtFoJGsaAshLJD/IcdYaJ1mSV9uvM/mD6fX6oaAANE6jcO6dOxtsUEVKP+yCzVINaJJDAwckTEAu/mG1cRyNXBZlQ8vanY7lkYa77shaWVmJhYVxiSQ7OB6ARLCKz6HNtVqVaR364+Mocy6vkvwEzUKR/6blF/snoDB4ROyixLu/3wodUKMxp5XeQLs2NzdZtGwXAazABolzZZHH4SGgJMCAjF0CaJClpSWr2Wxqb/NWS+0s5Dq+r2Eu30GePJZNkuehWSsyKFmrsPKYWFwqoZsHQlNWV1etra2/2ORlUGF5XhGLxaFiXK5XsM6cXmZbKEm+iPOD2UewXz+tI013SqRdfTmifwqMYOA3SO7GlTUOJ9AHBjLJwyXYamfOLDO7k+Q88c3lpcVEoCYaqkjThH3USI3AZ8PmLz7klcIJcRhFWRWx91VJtDCiSRPbpcVFZqy9iLxNngBGsUigTLytanyYS/Bavn0cMacjadWQ87knQodr3OoPxEm+i+2xFfG3il/qUAEzqVDimsePP0HG2o2EJbRibq7OPKYJqKBxlz2hvIAHc55UIIQ3vBaMs77nVcK2TBkns5WNAQZNTAoM13Y1qhjCrZuACoYNKlAHc+1OlINzuMi5KIPSK5xkS1wEHgzeQUfDkgLr9roJwHanBgoaFfCALc7hSly6A5V7h2RfqCc6hSofxEDZAOt1+4e2GzTN46/F9hQrr5u0q0AdhEKHzQGCXym22ufzv6abSCNivRzMC4O5ol+udZTA9Ap9AxZrjflWw7VOnzrJPF61WmNwvIkJsLW1K9g/dod4LCDchk5eXhYRe5JKaax6IA7DILDqJvZEBJ0O+br5hXlmxEU7eXKBJt2gnPEf2iIdNhlkEY1Gw6D6Opgshka40jcpK8dWUYXhN2mwEdCWEwsL1rFjTeV1EFosLp5ixv3BgwcMmsndueXlZV9L9UridqoafFwIYNKQ0509+3TU40WThpxtdXWFwzKrwWdxtykBrPFkb2dRdweApK1erxvDCltoP2IPv8eQGJbwiOK+4YxuCabS/jDNQgkINldDwSNhFVWBIaDJ/YatWlaqn4UWAYbqoTh8FZ8Fxlo0gdUOrg6LgxSxjsruIC5L+VyVUVNBYZmCMkYrMI0KLGrLxOMhzN9RlTqCEhUYjsfjI9MoPyAeKNMl1bgVzzmg6P+diWbd5BXUS3IFVbFV8XzWXBiwqGg+ac0+rESs6bGxU1I9nxVn4G9FnSylR1e13ElIpK0DzBQUb0hh3iS5nkZ7s3i0+zqHZdR0csmUoJBevJ0WVCaweLuYZjBRwFKC8jioH7OYZCawSLsGJLg5i/tswWwX79fp8wKE27cbKmDI/YRDwBHvFaBw7px0vUJEvxesHD7aLaBd5QPc4H+6jff87+I7yFnOq4DB7eMuTLvdYbfuFWEAzjnPryE3Zb9pzIPSUUzxtzvLJH9a4b+hqfPJvKB5zRsccidlv+awZvyzX11gOqDMVvU/9LPf0C15FKBmarOmACw3oPICSwb2OQlu4+Cxv8/yBCoPNitsAcdWDv9Vwb8CDACdCFE+P8dk8gAAAABJRU5ErkJggg==');
+    width: 75rpx;
+    height: 56rpx;
+  }
+
+  .on {
+    background-color: #999 !important;
+  }
+</style>
diff --git a/pages/chat/components/goods.vue b/pages/chat/components/goods.vue
new file mode 100644
index 0000000..eabdd21
--- /dev/null
+++ b/pages/chat/components/goods.vue
@@ -0,0 +1,21 @@
+<template>
+  <s-goods-item
+    :title="goodsData.spuName"
+    :img="goodsData.picUrl"
+    :price="goodsData.price"
+    :skuText="goodsData.introduction"
+    priceColor="#FF3000"
+    :titleWidth="400"
+  />
+</template>
+
+<script setup>
+
+  const props = defineProps({
+    goodsData: {
+      type: Object,
+      default: {},
+    },
+  });
+</script>
+
diff --git a/pages/chat/components/messageInput.vue b/pages/chat/components/messageInput.vue
new file mode 100644
index 0000000..1714ac5
--- /dev/null
+++ b/pages/chat/components/messageInput.vue
@@ -0,0 +1,102 @@
+<template>
+  <view class="send-wrap ss-flex">
+    <view class="left ss-flex ss-flex-1">
+      <uni-easyinput
+        class="ss-flex-1 ss-p-l-22"
+        :inputBorder="false"
+        :clearable="false"
+        v-model="message"
+        placeholder="请输入你要咨询的问题"
+      ></uni-easyinput>
+    </view>
+    <text class="sicon-basic bq" @tap.stop="onTools('emoji')"></text>
+    <text
+      v-if="!message"
+      class="sicon-edit"
+      :class="{ 'is-active': toolsMode === 'tools' }"
+      @tap.stop="onTools('tools')"
+    ></text>
+    <button v-if="message" class="ss-reset-button send-btn" @tap="sendMessage">
+      发送
+    </button>
+  </view>
+</template>
+
+<script setup>
+  import { computed } from 'vue';
+  /**
+   * 消息发送组件
+   */
+  const props = defineProps({
+    // 消息
+    modelValue: {
+      type: String,
+      default: '',
+    },
+    // 工具模式
+    toolsMode: {
+      type: String,
+      default: '',
+    },
+  });
+  const emits = defineEmits(['update:modelValue', 'onTools', 'sendMessage']);
+  const message = computed({
+    get() {
+      return props.modelValue;
+    },
+    set(newValue) {
+      emits(`update:modelValue`, newValue);
+    }
+  });
+
+
+  // 打开工具菜单
+  function onTools(mode) {
+    emits('onTools', mode);
+  }
+
+  // 发送消息
+  function sendMessage() {
+    emits('sendMessage');
+  }
+</script>
+
+<style scoped lang="scss">
+  .send-wrap {
+    padding: 18rpx 20rpx;
+    background: #fff;
+
+    .left {
+      height: 64rpx;
+      border-radius: 32rpx;
+      background: var(--ui-BG-1);
+    }
+
+    .bq {
+      font-size: 50rpx;
+      margin-left: 10rpx;
+    }
+
+    .sicon-edit {
+      font-size: 50rpx;
+      margin-left: 10rpx;
+      transform: rotate(0deg);
+      transition: all linear 0.2s;
+
+      &.is-active {
+        transform: rotate(45deg);
+      }
+    }
+
+    .send-btn {
+      width: 100rpx;
+      height: 60rpx;
+      line-height: 60rpx;
+      border-radius: 30rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      font-size: 26rpx;
+      color: #fff;
+      margin-left: 11rpx;
+    }
+  }
+</style>
diff --git a/pages/chat/components/messageList.vue b/pages/chat/components/messageList.vue
new file mode 100644
index 0000000..d08fd83
--- /dev/null
+++ b/pages/chat/components/messageList.vue
@@ -0,0 +1,94 @@
+<template>
+  <!--  聊天虚拟列表  -->
+  <z-paging ref="pagingRef" v-model="messageList" use-chat-record-mode use-virtual-list
+            cell-height-mode="dynamic" default-page-size="20" :auto-clean-list-when-reload="false"
+            safe-area-inset-bottom bottom-bg-color="#f8f8f8" :back-to-top-style="backToTopStyle"
+            :auto-show-back-to-top="showNewMessageTip" @backToTopClick="onBackToTopClick"
+            @scrolltoupper="onScrollToUpper" @query="queryList">
+    <template #top>
+      <!-- 撑一下顶部导航 -->
+      <view style="height: 45px"></view>
+    </template>
+    <!-- style="transform: scaleY(-1)"必须写，否则会导致列表倒置！！！ -->
+    <!-- 注意不要直接在chat-item组件标签上设置style，因为在微信小程序中是无效的，请包一层view -->
+    <template #cell="{item,index}">
+      <view style="transform: scaleY(-1)">
+        <!--  消息渲染  -->
+        <MessageListItem :message="item" :message-index="index" :message-list="messageList"></MessageListItem>
+      </view>
+    </template>
+    <!-- 底部聊天输入框 -->
+    <template #bottom>
+      <slot name="bottom"></slot>
+    </template>
+    <!-- 查看最新消息 -->
+    <template #backToTop>
+      <text>有新消息</text>
+    </template>
+  </z-paging>
+</template>
+
+<script setup>
+  import MessageListItem from '@/pages/chat/components/messageListItem.vue';
+  import { reactive, ref } from 'vue';
+  import KeFuApi from '@/sheep/api/promotion/kefu';
+  import { isEmpty } from '@/sheep/helper/utils';
+
+  const messageList = ref([]); // 消息列表
+  const showNewMessageTip = ref(false); // 显示有新消息提示
+  const backToTopStyle = reactive({
+    'width': '100px',
+    'background-color': '#fff',
+    'border-radius': '30px',
+    'box-shadow': '0 2px 4px rgba(0, 0, 0, 0.1)',
+    'display': 'flex',
+    'justifyContent': 'center',
+    'alignItems': 'center',
+  }); // 返回顶部样式
+  const queryParams = reactive({
+    pageNo: 1,
+    pageSize: 10,
+  });
+  const pagingRef = ref(null); // 虚拟列表
+  const queryList = async (pageNo, pageSize) => {
+    // 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+    // 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+    queryParams.pageNo = pageNo;
+    queryParams.pageSize = pageSize;
+    await getMessageList();
+  };
+  // 获得消息分页列表
+  const getMessageList = async () => {
+    const { data } = await KeFuApi.getKefuMessagePage(queryParams);
+    if (isEmpty(data.list)) {
+      return;
+    }
+    pagingRef.value.completeByTotal(data.list, data.total);
+  };
+  /** 刷新消息列表 */
+  const refreshMessageList = (message = undefined) => {
+    if (queryParams.pageNo != 1 && message !== undefined) {
+      showNewMessageTip.value = true;
+      // 追加数据
+      pagingRef.value.addChatRecordData([message], false);
+      return;
+    }
+    pagingRef.value.reload();
+  };
+  /** 滚动到最新消息 */
+  const onBackToTopClick = (event) => {
+    event(false); // 禁用默认操作
+    pagingRef.value.scrollToBottom();
+  };
+  /** 监听滚动到底部事件（因为 scroll 翻转了顶就是底） */
+  const onScrollToUpper = () => {
+    // 若已是第一页则不做处理
+    if (queryParams.pageNo === 1) {
+      return;
+    }
+    showNewMessageTip.value = false;
+    // 到底重置消息列表
+    refreshMessageList();
+  };
+  defineExpose({ getMessageList, refreshMessageList });
+</script>
diff --git a/pages/chat/components/messageListItem.vue b/pages/chat/components/messageListItem.vue
new file mode 100644
index 0000000..3379539
--- /dev/null
+++ b/pages/chat/components/messageListItem.vue
@@ -0,0 +1,304 @@
+<template>
+  <view class="chat-box">
+    <!--  消息渲染  -->
+    <view class="message-item ss-flex-col scroll-item">
+      <view class="ss-flex ss-row-center ss-col-center">
+        <!-- 日期 -->
+        <view
+          v-if="
+            message.contentType !== KeFuMessageContentTypeEnum.SYSTEM &&
+            showTime(message, messageIndex)
+          "
+          class="date-message"
+        >
+          {{ formatDate(message.createTime) }}
+        </view>
+        <!-- 系统消息 -->
+        <view
+          v-if="message.contentType === KeFuMessageContentTypeEnum.SYSTEM"
+          class="system-message"
+        >
+          {{ message.content }}
+        </view>
+      </view>
+      <!-- 消息体渲染管理员消息和用户消息并左右展示  -->
+      <view
+        v-if="message.contentType !== KeFuMessageContentTypeEnum.SYSTEM"
+        class="ss-flex ss-col-top"
+        :class="[
+          message.senderType === UserTypeEnum.ADMIN
+            ? `ss-row-left`
+            : message.senderType === UserTypeEnum.MEMBER
+            ? `ss-row-right`
+            : '',
+        ]"
+      >
+        <!-- 客服头像 -->
+        <image
+          v-show="message.senderType === UserTypeEnum.ADMIN"
+          class="chat-avatar ss-m-r-24"
+          :src="
+            sheep.$url.cdn(message.senderAvatar) ||
+            sheep.$url.static('/static/img/shop/chat/default.png')
+          "
+          mode="aspectFill"
+        ></image>
+        <!-- 内容 -->
+        <template v-if="message.contentType === KeFuMessageContentTypeEnum.TEXT">
+          <view class="message-box" :class="{ admin: message.senderType === UserTypeEnum.ADMIN }">
+            <mp-html :content="replaceEmoji(message.content)" />
+          </view>
+        </template>
+        <template v-if="message.contentType === KeFuMessageContentTypeEnum.IMAGE">
+          <view
+            class="message-box"
+            :class="{ admin: message.senderType === UserTypeEnum.ADMIN }"
+          >
+            <su-image
+              class="message-img"
+              isPreview
+              :previewList="[sheep.$url.cdn(message.content)]"
+              :current="0"
+              :src="sheep.$url.cdn(message.content)"
+              :height="200"
+              :width="200"
+              mode="aspectFill"
+            ></su-image>
+          </view>
+        </template>
+        <template v-if="message.contentType === KeFuMessageContentTypeEnum.PRODUCT">
+          <GoodsItem
+            :goodsData="getMessageContent(message)"
+            @tap="sheep.$router.go('/pages/goods/index', { id: getMessageContent(message).spuId })"
+          />
+        </template>
+        <template v-if="message.contentType === KeFuMessageContentTypeEnum.ORDER">
+          <OrderItem
+            :orderData="getMessageContent(message)"
+            @tap="sheep.$router.go('/pages/order/my/detail', { id: getMessageContent(message).id })"
+          />
+        </template>
+        <!-- user头像 -->
+        <image
+          v-if="message.senderType === UserTypeEnum.MEMBER"
+          class="chat-avatar ss-m-l-24"
+          :src="
+            sheep.$url.cdn(message.senderAvatar) ||
+            sheep.$url.static('/static/img/shop/chat/default.png')
+          "
+          mode="aspectFill"
+        >
+        </image>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { computed, unref } from 'vue';
+  import dayjs from 'dayjs';
+  import { KeFuMessageContentTypeEnum, UserTypeEnum } from '@/pages/chat/util/constants';
+  import { emojiList } from '@/pages/chat/util/emoji';
+  import sheep from '@/sheep';
+  import { formatDate } from '@/sheep/util';
+  import GoodsItem from '@/pages/chat/components/goods.vue';
+  import OrderItem from '@/pages/chat/components/order.vue';
+
+  const props = defineProps({
+    // 消息
+    message: {
+      type: Object,
+      default: () => ({}),
+    },
+    // 消息索引
+    messageIndex: {
+      type: Number,
+      default: 0,
+    },
+    // 消息列表
+    messageList: {
+      type: Array,
+      default: () => [],
+    },
+  });
+  const getMessageContent = computed(() => (item) => JSON.parse(item.content)); // 解析消息内容
+
+  //======================= 工具 =======================
+
+  const showTime = computed(() => (item, index) => {
+    if (unref(props.messageList)[index + 1]) {
+      let dateString = dayjs(unref(props.messageList)[index + 1].createTime).fromNow();
+      return dateString !== dayjs(unref(item).createTime).fromNow();
+    }
+    return false;
+  });
+
+  // 处理表情
+  function replaceEmoji(data) {
+    let newData = data;
+    if (typeof newData !== 'object') {
+      let reg = /\[(.+?)]/g; // [] 中括号
+      let zhEmojiName = newData.match(reg);
+      if (zhEmojiName) {
+        zhEmojiName.forEach((item) => {
+          let emojiFile = selEmojiFile(item);
+          newData = newData.replace(
+            item,
+            `<img class="chat-img" style="width: 24px;height: 24px;margin: 0 3px;" src="${sheep.$url.cdn(
+              '/static/img/chat/emoji/' + emojiFile,
+            )}"/>`,
+          );
+        });
+      }
+    }
+    return newData;
+  }
+
+  function selEmojiFile(name) {
+    for (let index in emojiList) {
+      if (emojiList[index].name === name) {
+        return emojiList[index].file;
+      }
+    }
+    return false;
+  }
+</script>
+
+<style scoped lang="scss">
+  .message-item {
+    margin-bottom: 33rpx;
+  }
+
+  .date-message,
+  .system-message {
+    width: fit-content;
+    border-radius: 12rpx;
+    padding: 8rpx 16rpx;
+    margin-bottom: 16rpx;
+    background-color: var(--ui-BG-3);
+    color: #999;
+    font-size: 24rpx;
+  }
+
+  .chat-avatar {
+    width: 70rpx;
+    height: 70rpx;
+    border-radius: 50%;
+  }
+
+  .send-status {
+    color: #333;
+    height: 80rpx;
+    margin-right: 8rpx;
+    display: flex;
+    align-items: center;
+
+    .loading {
+      width: 32rpx;
+      height: 32rpx;
+      -webkit-animation: rotating 2s linear infinite;
+      animation: rotating 2s linear infinite;
+
+      @-webkit-keyframes rotating {
+        0% {
+          transform: rotateZ(0);
+        }
+
+        100% {
+          transform: rotateZ(360deg);
+        }
+      }
+
+      @keyframes rotating {
+        0% {
+          transform: rotateZ(0);
+        }
+
+        100% {
+          transform: rotateZ(360deg);
+        }
+      }
+    }
+
+    .warning {
+      width: 32rpx;
+      height: 32rpx;
+      color: #ff3000;
+    }
+  }
+
+  .message-box {
+    max-width: 50%;
+    font-size: 16px;
+    line-height: 20px;
+    white-space: normal;
+    word-break: break-all;
+    word-wrap: break-word;
+    padding: 20rpx;
+    border-radius: 10rpx;
+    color: #fff;
+    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+
+    &.admin {
+      background: #fff;
+      color: #333;
+    }
+
+    :deep() {
+      .imgred {
+        width: 100%;
+      }
+
+      .imgred,
+      img {
+        width: 100%;
+      }
+    }
+  }
+
+  :deep() {
+    .goods,
+    .order {
+      max-width: 500rpx;
+    }
+  }
+
+  .message-img {
+    width: 100px;
+    height: 100px;
+    border-radius: 6rpx;
+  }
+
+  .template-wrap {
+    // width: 100%;
+    padding: 20rpx 24rpx;
+    background: #fff;
+    border-radius: 10rpx;
+
+    .title {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333;
+      margin-bottom: 29rpx;
+    }
+
+    .item {
+      font-size: 24rpx;
+      color: var(--ui-BG-Main);
+      margin-bottom: 16rpx;
+
+      &:last-of-type {
+        margin-bottom: 0;
+      }
+    }
+  }
+
+  .error-img {
+    width: 400rpx;
+    height: 400rpx;
+  }
+  
+  .chat-box {
+	  padding: 10px;
+  }
+</style>
diff --git a/pages/chat/components/order.vue b/pages/chat/components/order.vue
new file mode 100644
index 0000000..3a68172
--- /dev/null
+++ b/pages/chat/components/order.vue
@@ -0,0 +1,115 @@
+<template>
+  <view class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20"
+        :key="orderData.id">
+    <view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
+      <view class="order-no">订单号：{{ orderData.no }}</view>
+      <view class="order-state ss-font-26" :class="formatOrderColor(orderData)">
+        {{ formatOrderStatus(orderData) }}
+      </view>
+    </view>
+    <view class="border-bottom" v-for="item in orderData.items" :key="item.id">
+      <s-goods-item
+        :img="item.picUrl"
+        :title="item.spuName"
+        :skuText="item.properties.map((property) => property.valueName).join(' ')"
+        :price="item.price"
+        :num="item.count"
+      />
+    </view>
+    <view class="pay-box ss-m-t-30 ss-p-b-30 ss-flex ss-row-right ss-p-r-20">
+      <view class="ss-flex ss-col-center">
+        <view class="discounts-title pay-color">共 {{ orderData.productCount }} 件商品,总金额:</view>
+        <view class="discounts-money pay-color">
+          ￥{{ fen2yuan(orderData.payPrice) }}
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { fen2yuan, formatOrderColor, formatOrderStatus } from '@/sheep/hooks/useGoods';
+
+  const props = defineProps({
+    orderData: {
+      type: Object,
+      default: {},
+    },
+  });
+</script>
+
+<style lang="scss" scoped>
+  .order-list-card-box {
+    .order-card-header {
+      height: 80rpx;
+
+      .order-no {
+        font-size: 26rpx;
+        font-weight: 500;
+		margin-right: 5px;
+      }
+
+      .order-state {}
+    }
+    .pay-box {
+      .discounts-title {
+        font-size: 24rpx;
+        line-height: normal;
+        color: #999999;
+      }
+
+      .discounts-money {
+        font-size: 24rpx;
+        line-height: normal;
+        color: #999;
+        font-family: OPPOSANS;
+      }
+
+      .pay-color {
+        color: #333;
+      }
+    }
+    .order-card-footer {
+      height: 100rpx;
+
+      .more-item-box {
+        padding: 20rpx;
+
+        .more-item {
+          height: 60rpx;
+
+          .title {
+            font-size: 26rpx;
+          }
+        }
+      }
+
+      .more-btn {
+        color: $dark-9;
+        font-size: 24rpx;
+      }
+
+      .content {
+        width: 154rpx;
+        color: #333333;
+        font-size: 26rpx;
+        font-weight: 500;
+      }
+    }
+  }
+  .warning-color {
+    color: #faad14;
+  }
+
+  .danger-color {
+    color: #ff3000;
+  }
+
+  .success-color {
+    color: #52c41a;
+  }
+
+  .info-color {
+    color: #999999;
+  }
+</style>
diff --git a/pages/chat/components/select-popup.vue b/pages/chat/components/select-popup.vue
new file mode 100644
index 0000000..60711af
--- /dev/null
+++ b/pages/chat/components/select-popup.vue
@@ -0,0 +1,151 @@
+<template>
+  <su-popup :show="show" showClose round="10" backgroundColor="#eee" @close="emits('close')">
+    <view class="select-popup">
+      <view class="title">
+        <span>{{ mode == 'goods' ? '我的浏览' : '我的订单' }}</span>
+      </view>
+      <scroll-view
+        class="scroll-box"
+        scroll-y="true"
+        :scroll-with-animation="true"
+        :show-scrollbar="false"
+        @scrolltolower="loadmore"
+      >
+        <view
+          class="item"
+          v-for="item in state.pagination.data"
+          :key="item.id"
+          @tap="emits('select', { type: mode, data: item })"
+        >
+          <template v-if="mode == 'goods'">
+            <GoodsItem :goodsData="item" />
+          </template>
+          <template v-if="mode == 'order'">
+            <OrderItem :orderData="item" />
+          </template>
+        </view>
+        <uni-load-more :status="state.loadStatus" :content-text="{ contentdown: '上拉加载更多' }" />
+      </scroll-view>
+    </view>
+  </su-popup>
+</template>
+
+<script setup>
+  import { reactive, watch } from 'vue';
+  import _ from 'lodash-es';
+  import GoodsItem from './goods.vue';
+  import OrderItem from './order.vue';
+  import OrderApi from '@/sheep/api/trade/order';
+  import SpuHistoryApi from '@/sheep/api/product/history';
+
+  const emits = defineEmits(['select', 'close']);
+  const props = defineProps({
+    mode: {
+      type: String,
+      default: 'goods',
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    },
+  });
+
+  watch(
+    () => props.mode,
+    () => {
+      state.pagination.data = [];
+      if (props.mode) {
+        getList(state.pagination.page);
+      }
+    },
+  );
+
+  const state = reactive({
+    loadStatus: '',
+    pagination: {
+      data: [],
+      current_page: 1,
+      total: 1,
+      last_page: 1,
+    },
+  });
+
+  async function getList(page, list_rows = 5) {
+    state.loadStatus = 'loading';
+    const res =
+      props.mode == 'goods'
+        ? await SpuHistoryApi.getBrowseHistoryPage({
+            page,
+            list_rows,
+          })
+        : await OrderApi.getOrderPage({
+            page,
+            list_rows,
+          });
+    let orderList = _.concat(state.pagination.data, res.data.list);
+    state.pagination = {
+      ...res.data,
+      data: orderList,
+    };
+    if (state.pagination.current_page < state.pagination.last_page) {
+      state.loadStatus = 'more';
+    } else {
+      state.loadStatus = 'noMore';
+    }
+  }
+
+  function loadmore() {
+    if (state.loadStatus !== 'noMore') {
+      getList(state.pagination.current_page + 1);
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .select-popup {
+    max-height: 600rpx;
+
+    .title {
+      height: 100rpx;
+      line-height: 100rpx;
+      padding: 0 26rpx;
+      background: #fff;
+      border-radius: 20rpx 20rpx 0 0;
+
+      span {
+        font-size: 32rpx;
+        position: relative;
+
+        &::after {
+          content: '';
+          display: block;
+          width: 100%;
+          height: 2px;
+          z-index: 1;
+          position: absolute;
+          left: 0;
+          bottom: -15px;
+          background: var(--ui-BG-Main);
+          pointer-events: none;
+        }
+      }
+    }
+
+    .scroll-box {
+      height: 500rpx;
+    }
+
+    .item {
+      background: #fff;
+      margin: 26rpx 26rpx 0;
+      border-radius: 20rpx;
+
+      :deep() {
+        .image {
+          width: 140rpx;
+          height: 140rpx;
+        }
+      }
+    }
+  }
+</style>
diff --git a/pages/chat/components/toolsPopup.vue b/pages/chat/components/toolsPopup.vue
new file mode 100644
index 0000000..d446197
--- /dev/null
+++ b/pages/chat/components/toolsPopup.vue
@@ -0,0 +1,166 @@
+<template>
+  <su-popup
+    :show="showTools"
+    @close="handleClose"
+  >
+    <view class="ss-modal-box ss-flex-col">
+      <slot></slot>
+      <view class="content ss-flex ss-flex-1">
+        <template v-if="toolsMode === 'emoji'">
+          <swiper
+            class="emoji-swiper"
+            :indicator-dots="true"
+            circular
+            indicator-active-color="#7063D2"
+            indicator-color="rgba(235, 231, 255, 1)"
+            :autoplay="false"
+            :interval="3000"
+            :duration="1000"
+          >
+            <swiper-item v-for="emoji in emojiPage" :key="emoji">
+              <view class="ss-flex ss-flex-wrap">
+                <image
+                  v-for="item in emoji" :key="item"
+                  class="emoji-img"
+                  :src="sheep.$url.cdn(`/static/img/chat/emoji/${item.file}`)"
+                  @tap="onEmoji(item)"
+                >
+                </image>
+              </view>
+            </swiper-item>
+          </swiper>
+        </template>
+        <template v-else>
+          <view class="image">
+            <s-uploader
+              file-mediatype="image"
+              :imageStyles="{ width: 50, height: 50, border: false }"
+              @select="imageSelect({ type: 'image', data: $event })"
+            >
+              <image
+                class="icon"
+                :src="sheep.$url.static('/static/img/shop/chat/image.png')"
+                mode="aspectFill"
+              ></image>
+            </s-uploader>
+            <view>图片</view>
+          </view>
+          <!-- <view class="goods" @tap="onShowSelect('goods')">
+            <image
+              class="icon"
+              :src="sheep.$url.static('/static/img/shop/chat/goods.png')"
+              mode="aspectFill"
+            ></image>
+            <view>商品</view>
+          </view> -->
+          <view class="order" @tap="onShowSelect('order')">
+            <image
+              class="icon"
+              :src="sheep.$url.static('/static/img/shop/chat/order.png')"
+              mode="aspectFill"
+            ></image>
+            <view>订单</view>
+          </view>
+        </template>
+      </view>
+    </view>
+  </su-popup>
+</template>
+
+<script setup>
+  /**
+   * 聊天工具
+   */
+  import { emojiPage } from '@/pages/chat/util/emoji';
+  import sheep from '@/sheep';
+
+  const props = defineProps({
+    // 工具模式
+    toolsMode: {
+      type: String,
+      default: '',
+    },
+    // 控制工具菜单弹出
+    showTools: {
+      type: Boolean,
+      default: () => false,
+    },
+  });
+  const emits = defineEmits(['onEmoji', 'imageSelect', 'onShowSelect', 'close']);
+
+  // 关闭弹出工具菜单
+  function handleClose() {
+    emits('close');
+  }
+
+  // 选择表情
+  function onEmoji(emoji) {
+    emits('onEmoji', emoji);
+  }
+
+  // 选择图片
+  function imageSelect(val) {
+    emits('imageSelect', val);
+  }
+
+  // 选择商品或订单
+  function onShowSelect(mode) {
+    emits('onShowSelect', mode);
+  }
+</script>
+
+<style scoped lang="scss">
+  .content {
+    width: 100%;
+    align-content: space-around;
+    border-top: 1px solid #dfdfdf;
+    padding: 20rpx 0 0;
+
+    .emoji-swiper {
+      width: 100%;
+      height: 280rpx;
+      padding: 0 20rpx;
+
+      .emoji-img {
+        width: 50rpx;
+        height: 50rpx;
+        display: inline-block;
+        margin: 10rpx;
+      }
+    }
+
+    .image,
+    .goods,
+    .order {
+      width: 33.3%;
+      height: 280rpx;
+      text-align: center;
+      font-size: 24rpx;
+      color: #333;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+
+      .icon {
+        width: 50rpx;
+        height: 50rpx;
+        margin-bottom: 21rpx;
+      }
+    }
+
+    :deep() {
+      .uni-file-picker__container {
+        justify-content: center;
+      }
+
+      .file-picker__box {
+        display: none;
+
+        &:last-of-type {
+          display: flex;
+        }
+      }
+    }
+  }
+</style>
diff --git a/pages/chat/index.vue b/pages/chat/index.vue
new file mode 100644
index 0000000..5b20a61
--- /dev/null
+++ b/pages/chat/index.vue
@@ -0,0 +1,187 @@
+<template>
+  <s-layout class="chat-wrap" :title="!isReconnecting ? '连接客服成功' : '会话重连中'" navbar="inner">
+    <!--  覆盖头部导航栏背景颜色  -->
+    <div class="page-bg" :style="{ height: sys_navBar + 'px' }"></div>
+    <!--  聊天区域  -->
+    <MessageList ref="messageListRef">
+      <template #bottom>
+        <message-input v-model="chat.msg" @on-tools="onTools" @send-message="onSendMessage"></message-input>
+      </template>
+    </MessageList>
+    <!--  聊天工具  -->
+    <tools-popup :show-tools="chat.showTools" :tools-mode="chat.toolsMode" @close="handleToolsClose"
+                 @on-emoji="onEmoji" @image-select="onSelect" @on-show-select="onShowSelect">
+      <message-input v-model="chat.msg" @on-tools="onTools" @send-message="onSendMessage"></message-input>
+    </tools-popup>
+    <!--  商品订单选择  -->
+    <SelectPopup
+      :mode="chat.selectMode"
+      :show="chat.showSelect"
+      @select="onSelect"
+      @close="chat.showSelect = false"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import MessageList from '@/pages/chat/components/messageList.vue';
+  import { reactive, ref, toRefs } from 'vue';
+  import sheep from '@/sheep';
+  import ToolsPopup from '@/pages/chat/components/toolsPopup.vue';
+  import MessageInput from '@/pages/chat/components/messageInput.vue';
+  import SelectPopup from '@/pages/chat/components/select-popup.vue';
+  import { KeFuMessageContentTypeEnum, WebSocketMessageTypeConstants } from '@/pages/chat/util/constants';
+  import FileApi from '@/sheep/api/infra/file';
+  import KeFuApi from '@/sheep/api/promotion/kefu';
+  import { useWebSocket } from '@/sheep/hooks/useWebSocket';
+
+  const sys_navBar = sheep.$platform.navbar;
+
+  const chat = reactive({
+    msg: '',
+    scrollInto: '',
+    showTools: false,
+    toolsMode: '',
+    showSelect: false,
+    selectMode: '',
+  });
+
+  // 发送消息
+  async function onSendMessage() {
+    if (!chat.msg) return;
+    try {
+      const data = {
+        contentType: KeFuMessageContentTypeEnum.TEXT,
+        content: chat.msg,
+      };
+      await KeFuApi.sendKefuMessage(data);
+      await messageListRef.value.refreshMessageList();
+      chat.msg = '';
+    } finally {
+      chat.showTools = false;
+    }
+  }
+
+  const messageListRef = ref();
+
+  //======================= 聊天工具相关 start =======================
+
+  function handleToolsClose() {
+    chat.showTools = false;
+    chat.toolsMode = '';
+  }
+
+  function onEmoji(item) {
+    chat.msg += item.name;
+  }
+
+  // 点击工具栏开关
+  function onTools(mode) {
+    if (isReconnecting.value) {
+      sheep.$helper.toast('您已掉线！请返回重试');
+      return;
+    }
+
+    if (!chat.toolsMode || chat.toolsMode === mode) {
+      chat.showTools = !chat.showTools;
+    }
+    chat.toolsMode = mode;
+    if (!chat.showTools) {
+      chat.toolsMode = '';
+    }
+  }
+
+  function onShowSelect(mode) {
+    chat.showTools = false;
+    chat.showSelect = true;
+    chat.selectMode = mode;
+  }
+
+  async function onSelect({ type, data }) {
+    let msg;
+    switch (type) {
+      case 'image':
+        const res = await FileApi.uploadFile(data.tempFiles[0].path);
+        msg = {
+          contentType: KeFuMessageContentTypeEnum.IMAGE,
+          content: res.data,
+        };
+        break;
+      case 'goods':
+        msg = {
+          contentType: KeFuMessageContentTypeEnum.PRODUCT,
+          content: JSON.stringify(data),
+        };
+        break;
+      case 'order':
+        msg = {
+          contentType: KeFuMessageContentTypeEnum.ORDER,
+          content: JSON.stringify(data),
+        };
+        break;
+    }
+    if (msg) {
+      // 发送消息
+      // scrollBottom();
+      await KeFuApi.sendKefuMessage(msg);
+      await messageListRef.value.refreshMessageList();
+      chat.showTools = false;
+      chat.showSelect = false;
+      chat.selectMode = '';
+    }
+  }
+
+  //======================= 聊天工具相关 end =======================
+  const { options } = useWebSocket({
+    // 连接成功
+    onConnected: async () => {
+    },
+    // 收到消息
+    onMessage: async (data) => {
+      const type = data.type;
+      if (!type) {
+        console.error('未知的消息类型：' + data.value);
+        return;
+      }
+      // 2.2 消息类型：KEFU_MESSAGE_TYPE
+      if (type === WebSocketMessageTypeConstants.KEFU_MESSAGE_TYPE) {
+        // 刷新消息列表
+        await messageListRef.value.refreshMessageList(JSON.parse(data.content));
+        return;
+      }
+      // 2.3 消息类型：KEFU_MESSAGE_ADMIN_READ
+      if (type === WebSocketMessageTypeConstants.KEFU_MESSAGE_ADMIN_READ) {
+        console.log('管理员已读消息');
+      }
+    },
+  });
+  const isReconnecting = toRefs(options).isReconnecting; // 重连状态
+</script>
+
+<style scoped lang="scss">
+  .chat-wrap {
+
+    .page-bg {
+      width: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      background-color: var(--ui-BG-Main);
+      z-index: 1;
+    }
+
+    .status {
+      position: relative;
+      box-sizing: border-box;
+      z-index: 3;
+      height: 70rpx;
+      padding: 0 30rpx;
+      background: var(--ui-BG-Main-opacity-1);
+      display: flex;
+      align-items: center;
+      font-size: 30rpx;
+      font-weight: 400;
+      color: var(--ui-BG-Main);
+    }
+  }
+</style>
diff --git a/pages/chat/util/constants.js b/pages/chat/util/constants.js
new file mode 100644
index 0000000..bdf5cb3
--- /dev/null
+++ b/pages/chat/util/constants.js
@@ -0,0 +1,21 @@
+export const KeFuMessageContentTypeEnum = {
+  TEXT: 1, // 文本消息
+  IMAGE: 2, // 图片消息
+  VOICE: 3, // 语音消息
+  VIDEO: 4, // 视频消息
+  SYSTEM: 5, // 系统消息
+  // ========== 商城特殊消息 ==========
+  PRODUCT: 10,//  商品消息
+  ORDER: 11,//  订单消息"
+};
+export const UserTypeEnum = {
+  MEMBER: 1, // 会员 面向 c 端，普通用户
+  ADMIN: 2, // 管理员 面向 b 端，管理后台
+};
+// Promotion 的 WebSocket 消息类型枚举类
+export const WebSocketMessageTypeConstants = {
+  KEFU_MESSAGE_TYPE: 'kefu_message_type', // 客服消息类型
+  IM_MESSAGE_READ: 'im_message_read_status_change', // IM消息已读
+  IM_MESSAGE_NEWS: 'im_message_news', // IM新消息
+  KEFU_MESSAGE_ADMIN_READ: 'kefu_message_read_status_change' // 客服消息管理员已读
+}
diff --git a/pages/chat/util/emoji.js b/pages/chat/util/emoji.js
new file mode 100644
index 0000000..83e6e84
--- /dev/null
+++ b/pages/chat/util/emoji.js
@@ -0,0 +1,58 @@
+export const emojiList = [
+  { name: '[笑掉牙]', file: 'xiaodiaoya.png' },
+  { name: '[可爱]', file: 'keai.png' },
+  { name: '[冷酷]', file: 'lengku.png' },
+  { name: '[闭嘴]', file: 'bizui.png' },
+  { name: '[生气]', file: 'shengqi.png' },
+  { name: '[惊恐]', file: 'jingkong.png' },
+  { name: '[瞌睡]', file: 'keshui.png' },
+  { name: '[大笑]', file: 'daxiao.png' },
+  { name: '[爱心]', file: 'aixin.png' },
+  { name: '[坏笑]', file: 'huaixiao.png' },
+  { name: '[飞吻]', file: 'feiwen.png' },
+  { name: '[疑问]', file: 'yiwen.png' },
+  { name: '[开心]', file: 'kaixin.png' },
+  { name: '[发呆]', file: 'fadai.png' },
+  { name: '[流泪]', file: 'liulei.png' },
+  { name: '[汗颜]', file: 'hanyan.png' },
+  { name: '[惊悚]', file: 'jingshu.png' },
+  { name: '[困~]', file: 'kun.png' },
+  { name: '[心碎]', file: 'xinsui.png' },
+  { name: '[天使]', file: 'tianshi.png' },
+  { name: '[晕]', file: 'yun.png' },
+  { name: '[啊]', file: 'a.png' },
+  { name: '[愤怒]', file: 'fennu.png' },
+  { name: '[睡着]', file: 'shuizhuo.png' },
+  { name: '[面无表情]', file: 'mianwubiaoqing.png' },
+  { name: '[难过]', file: 'nanguo.png' },
+  { name: '[犯困]', file: 'fankun.png' },
+  { name: '[好吃]', file: 'haochi.png' },
+  { name: '[呕吐]', file: 'outu.png' },
+  { name: '[龇牙]', file: 'ziya.png' },
+  { name: '[懵比]', file: 'mengbi.png' },
+  { name: '[白眼]', file: 'baiyan.png' },
+  { name: '[饿死]', file: 'esi.png' },
+  { name: '[凶]', file: 'xiong.png' },
+  { name: '[感冒]', file: 'ganmao.png' },
+  { name: '[流汗]', file: 'liuhan.png' },
+  { name: '[笑哭]', file: 'xiaoku.png' },
+  { name: '[流口水]', file: 'liukoushui.png' },
+  { name: '[尴尬]', file: 'ganga.png' },
+  { name: '[惊讶]', file: 'jingya.png' },
+  { name: '[大惊]', file: 'dajing.png' },
+  { name: '[不好意思]', file: 'buhaoyisi.png' },
+  { name: '[大闹]', file: 'danao.png' },
+  { name: '[不可思议]', file: 'bukesiyi.png' },
+  { name: '[爱你]', file: 'aini.png' },
+  { name: '[红心]', file: 'hongxin.png' },
+  { name: '[点赞]', file: 'dianzan.png' },
+  { name: '[恶魔]', file: 'emo.png' },
+];
+
+export let emojiPage = {};
+emojiList.forEach((item, index) => {
+  if (!emojiPage[Math.floor(index / 30) + 1]) {
+    emojiPage[Math.floor(index / 30) + 1] = [];
+  }
+  emojiPage[Math.floor(index / 30) + 1].push(item);
+});
diff --git a/pages/clerk/apply/components/formAvatar.vue b/pages/clerk/apply/components/formAvatar.vue
new file mode 100644
index 0000000..73b8f4a
--- /dev/null
+++ b/pages/clerk/apply/components/formAvatar.vue
@@ -0,0 +1,183 @@
+<template>
+	<view>
+		<view class="form-item">
+			<view class="label">上传头像</view>
+		</view>
+		<view class="upload-box">
+			<!-- <button v-if="mp_is_new" class="avatar-box" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+				<u-avatar size="180" :src="avatarUrl"></u-avatar>
+				<view class="icon">
+					<u-icon name="camera" color="#fff" size="30"></u-icon>
+				</view>
+			</button> -->
+			
+			<view class="avatar-box" @click="chooseImage">
+				<u-avatar size="180" :src="avatarUrl"></u-avatar>
+				<view class="icon">
+					<u-icon name="camera" color="#fff" size="30"></u-icon>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import FileApi from '@/sheep/api/infra/file';
+	export default {
+		components: {
+			
+		},
+		props: {
+			modelValue: {
+			  type: String,
+			  default: ''
+			},
+		},
+		data() {
+			return {
+				mp_is_new: false,
+			}
+		},
+		created() {
+			// #ifdef MP-WEIXIN
+			const version = uni.getSystemInfoSync().SDKVersion;
+			if(this.compareVersion(version, '2.21.2') >= 0){
+				this.mp_is_new = true; 
+			} 
+			// #endif
+		},
+		computed: {
+			avatarUrl() {
+				return this.modelValue;
+			},
+		},
+		watch: {
+			
+		},
+		methods: {
+			/**
+			 * 小程序比较版本信息
+			 * @param v1 当前版本
+			 * @param v2 进行比较的版本 
+			 * @return boolen
+			 * 
+			 */
+			compareVersion(v1, v2) {
+				v1 = v1.split('.')
+				v2 = v2.split('.')
+				const len = Math.max(v1.length, v2.length)
+			
+				while (v1.length < len) {
+					v1.push('0')
+				}
+				while (v2.length < len) {
+					v2.push('0')
+				}
+			
+				for (let i = 0; i < len; i++) {
+					const num1 = parseInt(v1[i])
+					const num2 = parseInt(v2[i])
+			
+					if (num1 > num2) {
+						return 1
+					} else if (num1 < num2) {
+						return -1
+					}
+				}
+				return 0
+			},
+			//选照片 or 拍照
+			chooseImage() {
+				uni.chooseImage({
+					count: 1, //默认9
+					sourceType: ['album', 'camera'],
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					success: (res) => {
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							uni.getImageInfo({
+								src: res.tempFilePaths[i],
+								success: (image) => {
+									this.uploadImage(image.path);
+								}
+							});
+						}
+					}
+				});
+			},
+			uploadImage(path) {
+				FileApi.uploadFile(path).then((res) => {
+					this.$emit('update:modelValue', res.data); 
+				});
+			},
+			// 微信头像获取
+			onChooseAvatar(e) {
+				const {
+					avatarUrl
+				} = e.detail
+				this.uploadImage(avatarUrl);
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15px;
+		
+		.label {
+			font-size: 30rpx;
+			min-width: 200rpx;
+		}
+	}
+	
+	.upload-box {
+		padding: 15px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding-top: 0;
+		
+		.avatar-box {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: relative;
+			
+			.icon {
+				position: absolute;
+				right: 0;
+				bottom: 5px;
+				background-color: var(--ui-BG-Main);
+				width: 50rpx;
+				height: 50rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 100%;
+			}
+		}
+		
+		button{
+			padding: unset;
+			margin: unset;
+			border: unset;
+			position: relative;
+			line-height: unset;
+			background-color: unset;
+			font-size: unset;
+			color: unset;
+			border-radius: unset;
+			text-align: unset;
+			text-decoration: unset;
+			display: unset;
+			overflow: unset;
+		}
+		button::after{ 
+			border: none; 
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/apply/components/formCity.vue b/pages/clerk/apply/components/formCity.vue
new file mode 100644
index 0000000..b101a8a
--- /dev/null
+++ b/pages/clerk/apply/components/formCity.vue
@@ -0,0 +1,69 @@
+<template>
+	<view>
+		<view class="form-item">
+			<view class="label">所在城市</view>
+			<u-input @click="citySelect" input-align="right" type="select" placeholder="请选择所在的城市" v-model="city" />
+		</view>
+		<!-- 省市区弹窗 -->
+		<su-region-picker :show="show" @cancel="show = false" @confirm="cityOk" />
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			modelValue: {
+			  type: String,
+			  default: ''
+			},
+		},
+		data() {
+			return {
+				show: false,
+				params: {
+					province: true,
+					city: true,
+					area: false
+				},
+			}
+		},
+		created() {
+			
+		},
+		computed: {
+			city() {
+				return this.modelValue;
+			},
+		},
+		watch: {
+			
+		},
+		methods: {
+			citySelect() {
+				this.show = true;
+			},
+			cityOk(e) {
+				this.$emit('update:modelValue', e.city_name); 
+				this.show = false;
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15px;
+		
+		.label {
+			font-size: 30rpx;
+			min-width: 200rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/apply/components/formImage.vue b/pages/clerk/apply/components/formImage.vue
new file mode 100644
index 0000000..ad63575
--- /dev/null
+++ b/pages/clerk/apply/components/formImage.vue
@@ -0,0 +1,73 @@
+<template>
+	<view>
+		<view class="form-item">
+			<view class="label">上传图片</view>
+			<view>{{imgList.length}}/{{number}}</view>
+		</view>
+		<view class="upload-box">
+			<shmily-drag-image :number="number" v-model="imgList"></shmily-drag-image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			number: {
+			  type: Number,
+			  default: 6
+			},
+			modelValue: {
+			  type: Array,
+			  default: []
+			},
+		},
+		data() {
+			return {
+				imgList: [],
+			}
+		},
+		created() {
+			this.imgList = this.modelValue;
+		},
+		computed: {
+			
+		},
+		watch: {
+			imgList: {
+				handler: function(newVal, oldVal) {
+					this.$emit('update:modelValue', newVal); 
+				}
+			},
+			modelValue: {
+				handler: function(newVal, oldVal) {
+					this.imgList = newVal;
+				}
+			},
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15px;
+		
+		.label {
+			font-size: 30rpx;
+			min-width: 200rpx;
+		}
+	}
+	
+	.upload-box {
+		padding: 15px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/apply/components/formSex.vue b/pages/clerk/apply/components/formSex.vue
new file mode 100644
index 0000000..00ddbdc
--- /dev/null
+++ b/pages/clerk/apply/components/formSex.vue
@@ -0,0 +1,90 @@
+<template>
+	<view class="form-item">
+		<view class="label">性别</view>
+		<view class="radio-box">
+			<view @click="change(item)" class="text" :class="item.value == valueDom ? 'active' : ''"  v-for="(item,index) in list">{{item.name}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			modelValue: {
+			  type: String,
+			  default: ''
+			},
+		},
+		data() {
+			return {
+				list: [
+					{
+						name: '男',
+						value: '0',
+					},
+					{
+						name: '女',
+						value: '1',
+					},
+				],
+			}
+		},
+		created() {
+			
+		},
+		computed: {
+			valueDom() {
+				return this.modelValue;
+			},
+		},
+		watch: {
+			
+		},
+		methods: {
+			change(e) {
+				this.$emit('update:modelValue', e.value); 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form-item {
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15px;
+		
+		.label {
+			font-size: 30rpx;
+			min-width: 200rpx;
+		}
+	}
+	
+	.radio-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		
+		.text {
+			width: 70rpx;
+			height: 70rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background-color: #ececec;
+			color: #949494;
+			border-radius: 100%;
+			margin-left: 10px; 
+		}
+		
+		.active {
+			color: #fff;
+			background-color: #949494;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/apply/components/formVoice.vue b/pages/clerk/apply/components/formVoice.vue
new file mode 100644
index 0000000..1422d8c
--- /dev/null
+++ b/pages/clerk/apply/components/formVoice.vue
@@ -0,0 +1,255 @@
+<template>
+	<view class="form-bg">
+		<view class="form-item">
+			<view class="label">录音</view>
+			<view class="bubble-box">
+				<u-input @click="topBubble" input-align="right" type="select" :placeholder="voice.name" />
+				<tui-bubble-popup :show="show" :mask="false" position="absolute" direction="right" triangleRight="-22rpx" triangleTop="30rpx" @close="topBubble" :flexEnd="false">
+				 	<view @click="change(item)" class="tui-menu-item" v-for="(item,index) in list">{{item.name}}</view>
+				</tui-bubble-popup>
+			</view>
+		</view>
+		<view>
+			<view class="voice-box" v-if="voice.type == 'voice'">
+				<view v-if="voiceUrl" @click="playAudio" class="upload-btn-box">
+					<view class="icon">
+						<u-icon v-if="play" name="pause" color="#fff" size="70"></u-icon>
+						<u-icon v-else name="play-right-fill" color="#fff" size="70"></u-icon>
+					</view>
+					<view class="upload-btn" v-if="play">停止播放</view>
+					<view class="upload-btn" v-else>播放录音</view>
+				</view>
+				<view v-else>
+					<all-speech ref="speech" @okClick="voiceOk"></all-speech>
+				</view>
+				<view v-if="voiceUrl" @click="reloadBtn" class="reload-btn">
+					<u-icon name="reload" size="30"></u-icon>
+					<text class="text">重录</text>
+				</view>
+			</view>
+			<view class="voice-box" v-if="voice.type == 'upload'">
+				<view v-if="voiceUrl" @click="playAudio" class="upload-btn-box">
+					<view class="icon">
+						<u-icon v-if="play" name="pause" color="#fff" size="70"></u-icon>
+						<u-icon v-else name="play-right-fill" color="#fff" size="70"></u-icon>
+					</view>
+					<view class="upload-btn" v-if="play">停止播放</view>
+					<view class="upload-btn" v-else>播放录音</view>
+				</view>
+				<view v-else @click="chooseVoice" class="upload-btn-box">
+					<view class="icon">
+						<u-icon name="plus" color="#fff" size="70"></u-icon>
+					</view>
+					<view class="upload-btn">上传录音文件</view>
+				</view>
+				<view v-if="voiceUrl" @click="reloadBtn" class="reload-btn">
+					<u-icon name="reload" size="30"></u-icon>
+					<text class="text">重录</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import FileApi from '@/sheep/api/infra/file';
+	import tuiBubblePopup from "@/components/thorui/tui-bubble-popup/tui-bubble-popup.vue"
+	const audio = uni.createInnerAudioContext();
+	export default {
+		components: {
+			tuiBubblePopup,
+		},
+		props: {
+			modelValue: {
+			  type: String,
+			  default: ''
+			},
+		},
+		data() {
+			return {
+				voice: {
+					
+				},
+				list: [
+					{
+						name: '直接录音',
+						type: 'voice',
+					},
+				],
+				current: 0,
+				voicePath: '',
+				show: false,
+				play: false,
+			}
+		},
+		created() {
+			this.voice = this.list[this.current];
+			
+			// #ifndef MP-WEIXIN
+			var voiceType = {
+				name: '上传手机音频',
+				type: 'upload',
+			};
+			this.list.push(voiceType);
+			// #endif
+		},
+		computed: {
+			voiceUrl(){
+				return this.modelValue;
+			}
+		},
+		methods: {
+			topBubble() {
+				this.show = !this.show;
+			},
+			change(e) {
+				this.reloadBtn();
+				this.topBubble();
+				this.voice = e;
+			},
+			reloadBtn() {
+				this.play = false;
+				this.$emit('update:modelValue', ""); 
+				this.$emit('sec', ""); 
+			},
+			playAudio() {
+				if(this.play){
+					this.play = false;
+					audio.stop();
+				}else{
+					this.play = true;
+					//语音自然播放结束
+					audio.onEnded((res) => {
+						this.play = false;
+					});
+					audio.src = this.modelValue;
+					audio.play();
+				}
+			},
+			chooseVoice() {
+				var that = this;
+				uni.chooseFile({
+				  count: 1, //默认100
+				  extension:['.mp3','.mp4','.m4a'],
+					success: function (res) {
+						var fileSize = res.tempFiles[0].size;
+						if (fileSize > 1024 * 1024 * 10) { // 假设设置的文件大小限制为5MB
+						  uni.showToast({
+							title: '文件大小限制为10MB',
+							icon: 'none'
+						  });
+						  return;
+						}
+						
+						that.voicePath = res.tempFilePaths[0];
+						console.log(JSON.stringify(res.tempFilePaths));
+						that.uploadVoice(that.voicePath);
+					}
+				});
+			},
+			uploadVoice(path) {
+				FileApi.uploadFile(path).then((res) => {
+					this.$emit('update:modelValue', res.data); 
+				});
+			},
+			voiceOk(e) {
+				this.voicePath = e.path;
+				this.uploadVoice(this.voicePath);
+				this.$emit('sec', e.sec); 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form-bg {
+		padding: 0 15px;
+	}
+	
+	.form-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10px 0;
+		
+		.label {
+			font-size: 30rpx;
+			min-width: 200rpx;
+		}
+	}
+	
+	.bubble-box {
+		position: relative;
+		
+		.tui-menu-item {
+			width: 100%;
+			padding: 30rpx 20rpx;
+			text-align: center;
+			position: relative;
+		}
+		
+		.tui-menu-item:after {
+			    position: absolute;
+			    box-sizing: border-box;
+			    content: " ";
+			    pointer-events: none;
+			    top: 0%;
+			    right: 10%;
+			    bottom: 0%;
+			    left: 10%;
+			    border: 0 solid #ebedf0;
+				border-color: #646566;
+				border-bottom-width: 1px;
+		}
+		
+		.tui-menu-item:last-child:after {
+				border-bottom-width: 0;
+		}
+	}
+	
+	.voice-box {
+		height: 400rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+		
+		.icon {
+			display: flex;
+			background-color: #3cc9a4;
+			border-radius: 100%;
+			width: 170rpx;
+			height: 170rpx;
+			justify-content: center;
+			align-items: center;
+		}
+		
+		.upload-btn-box {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+		}
+		
+		.upload-btn {
+			font-size: 34rpx;
+			color: #aaa;
+			margin-top: 10px;
+		}
+		
+		.reload-btn {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: absolute;
+			right: 0px;
+			font-size: 30rpx;
+			color: #3cc9a4;
+			
+			.text {
+				margin-left: 4px;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/apply/edit.vue b/pages/clerk/apply/edit.vue
new file mode 100644
index 0000000..4d017c4
--- /dev/null
+++ b/pages/clerk/apply/edit.vue
@@ -0,0 +1,213 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<su-navbar title="编辑资料" statusBar></su-navbar>
+		
+		<view class="form-box">
+			<form-avatar v-model="form.avatar"></form-avatar>
+		</view>
+		
+		<view class="form-box">
+			<view class="form-item">
+				<view class="label">昵称</view>
+				<u-input input-align="right" placeholder="请输入昵称" v-model="form.nickname" />
+			</view>
+			<form-sex v-model="form.sex"></form-sex>
+			<view class="form-item">
+				<view class="label">年龄</view>
+				<u-input input-align="right" placeholder="请输入年龄" type="number" v-model="form.age" />
+			</view>
+			<view class="form-item" v-if="isPass">
+				<view class="label">微信</view>
+				<u-input input-align="right" placeholder="请输入您的微信" v-model="form.weixin" />
+			</view> 
+			<view class="form-item">
+				<view class="label">手机号</view>
+				<u-input input-align="right" placeholder="请输入手机号" type="number" v-model="form.mobile" />
+			</view>
+			<view class="form-item">
+				<view class="label">相关经验</view>
+				<u-input input-align="right" placeholder="是否有其它店铺的经验" v-model="form.experience" />
+			</view>
+			<view class="form-item">
+				<view class="label">自我介绍</view>
+				<u-input input-align="right" placeholder="请输入自我介绍" v-model="form.intro" />
+			</view>
+			<view class="form-item">
+				<view class="label">所在城市</view>
+				<u-input input-align="right" placeholder="请输入所在城市" v-model="form.city" />
+			</view>
+		</view>
+		
+		<view class="form-box">
+			<form-image :number="6" v-model="imgList"></form-image>
+		</view>
+		
+		<view class="form-box">
+			<form-voice @sec="toSec" v-model="form.sound"></form-voice>
+		</view>
+		
+		<view class="submit-box">
+			<view class="sub-btn" @click="saveApply">提交申请</view>
+		</view>
+		
+		<s-menu-tools />
+		<s-auth-modal />
+	</view>
+</template>
+
+<script>
+	import FormAvatar from '@/pages/clerk/apply/components/formAvatar.vue';
+	import FormSex from '@/pages/clerk/apply/components/formSex.vue';
+	import FormVoice from '@/pages/clerk/apply/components/formVoice.vue';
+	import FormImage from '@/pages/clerk/apply/components/formImage.vue';
+	import ClerkApi from '@/sheep/api/worker/clerk'; 
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			FormAvatar,
+			FormSex,
+			FormVoice, 
+			FormImage,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				form: {
+					id: 0,
+					avatar: '',
+					nickname: '',
+					sex: '',
+					age: '',
+					weixin: '',
+					mobile: '',
+					experience: '',
+					intro: '',
+					city: '',
+					albums: '',
+					sound: '',
+					soundTime: '',
+				},
+				imgList: [],
+			}
+		},
+		onLoad(options) {
+			this.form.id = options.id;
+			this.init();  
+		},
+		computed: {
+			isPass() {
+				return sheep.$store('user').tradeConfig.weixinEnabled;
+			},
+		},
+		methods: {
+			init() {
+				ClerkApi.getClerkApply(this.form.id).then((res) => {
+					this.form = res.data;
+					if(this.form.albums){
+						this.imgList = this.form.albums.split(',');
+					}
+				});
+			},
+			saveApply() {
+				if(!this.form.avatar){
+					sheep.$helper.toast('请上传头像');
+					return;
+				}
+				if(!this.form.nickname){
+					sheep.$helper.toast('请输入昵称');
+					return;
+				}
+				if(!this.form.sex){
+					sheep.$helper.toast('请选择性别');
+					return;
+				}
+				if(!this.form.age){
+					sheep.$helper.toast('请输入年龄');
+					return;
+				}
+				if(this.isPass && !this.form.weixin){
+					sheep.$helper.toast('请输入正确的微信号');
+					return;
+				}
+				if(!this.form.mobile){
+					sheep.$helper.toast('请输入正确的手机号');
+					return;
+				}
+				if(!this.form.experience){
+					sheep.$helper.toast('请输入相关经验');
+					return;
+				}
+				if(!this.form.intro){
+					sheep.$helper.toast('请输入自我介绍');
+					return;
+				}
+				if(!this.form.city){
+					sheep.$helper.toast('请输入所在城市');
+					return;
+				}
+				if(this.imgList.length < 1){
+					sheep.$helper.toast('请上传图片');
+					return;
+				}
+				this.form.albums = this.imgList.join(',');
+				ClerkApi.updateClerkApply(this.form).then((res) => {
+					
+				});
+			},
+			toSec(e) {
+				this.form.soundTime = e;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fafafa;
+		padding-bottom: 140rpx;
+	}
+	.form-box {
+		background-color: #fff;
+		margin: 15px;
+		border-radius: 10px;
+	}
+	
+	.form-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15px;
+		
+		.label {
+			font-size: 30rpx;
+			min-width: 200rpx;
+		}
+	}
+	
+	.submit-box {
+		display: flex;
+		align-items: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 140rpx;
+		padding: 0 15px;
+		z-index: 99;
+		
+		.sub-btn {
+			background-color: var(--ui-BG-Main);
+			display: flex;
+			flex: 1;
+			justify-content: center;
+			align-items: center;
+			padding: 10px;
+			color: #fff;
+			border-radius: 40px;
+			font-size: 30rpx;
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/clerk/apply/index.vue b/pages/clerk/apply/index.vue
new file mode 100644
index 0000000..ff88263
--- /dev/null
+++ b/pages/clerk/apply/index.vue
@@ -0,0 +1,307 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<su-navbar title="达人申请" statusBar></su-navbar>
+		
+		<!-- #ifdef MP -->
+		<view v-if="showSubscribeBtn" class="subscribe-box">
+		  <u-icon name="bell-fill" color="var(--ui-BG-Main)" size="44"></u-icon>
+		  <view class="info">获取实时审核结果</view>
+		  <view class="sub-btn" @tap="subscribeMessage">立即订阅</view>
+		</view>
+		<!-- #endif -->
+		
+		<view class="form-box">
+			<form-avatar v-model="form.avatar"></form-avatar>
+		</view>
+		
+		<view class="form-box">
+			<view class="form-item">
+				<view class="label">昵称</view>
+				<u-input input-align="right" placeholder="请输入昵称" v-model="form.nickname" />
+			</view>
+			<form-sex v-model="form.sex"></form-sex>
+			<view class="form-item">
+				<view class="label">年龄</view>
+				<u-input input-align="right" placeholder="请输入年龄" type="number" v-model="form.age" />
+			</view>
+			<view class="form-item" v-if="isPass">
+				<view class="label">微信</view>
+				<u-input input-align="right" placeholder="请输入您的微信" v-model="form.weixin" />
+			</view> 
+			<view class="form-item">
+				<view class="label">手机号</view>
+				<u-input input-align="right" placeholder="请输入手机号" type="number" v-model="form.mobile" />
+			</view>
+			<view class="form-item">
+				<view class="label">自我介绍</view>
+				<u-input input-align="right" placeholder="请输入自我介绍" v-model="form.intro" />
+			</view>
+			<view class="form-item">
+				<view class="label">所在城市</view>
+				<u-input input-align="right" placeholder="请输入所在城市" v-model="form.city" />
+			</view>
+		</view>
+		
+		<view class="form-box">
+			<form-image :number="6" v-model="imgList"></form-image>
+		</view>
+		
+		<view class="form-box">
+			<form-voice @sec="toSec" v-model="form.sound"></form-voice>
+		</view>
+		
+		<view class="check-box" @click="changeCheck">
+			<u-icon size="44" v-if="check" name="checkmark-circle-fill" color="var(--ui-BG-Main)"></u-icon>
+			<u-icon size="44" v-else name="checkmark-circle" color="var(--ui-BG-Main)"></u-icon>
+			<text class="info">我已阅读并接受</text>
+			<text @tap.stop="toAggre()" class="sub-btn">《达人申请协议》</text>
+		</view>
+		
+		<view class="submit-box">
+			<view class="sub-btn" @click="saveApply">提交申请</view>
+		</view>
+		
+		<s-menu-tools />
+		<s-auth-modal />
+		<qrcode-modal />
+	</view>
+</template>
+
+<script>
+	import FormAvatar from '@/pages/clerk/apply/components/formAvatar.vue';
+	import FormSex from '@/pages/clerk/apply/components/formSex.vue';
+	import FormVoice from '@/pages/clerk/apply/components/formVoice.vue';
+	import FormImage from '@/pages/clerk/apply/components/formImage.vue';
+	import qrcodeModal from '@/components/qrcode-modal/qrcode-modal.vue';
+	import ClerkApi from '@/sheep/api/worker/clerk'; 
+	import test from '@/sheep/helper/test.js';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			FormAvatar,
+			FormSex,
+			FormVoice, 
+			FormImage,
+			qrcodeModal,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				form: {
+					avatar: '',
+					nickname: '',
+					sex: '',
+					age: '',
+					weixin: '',
+					mobile: '',
+					experience: '',
+					intro: '',
+					city: '',
+					albums: '',
+					sound: '',
+					soundTime: '',
+				},
+				imgList: [],
+				
+				showSubscribeBtn: false,
+				
+				check: true,
+			}
+		},
+		onLoad() {
+			// #ifdef MP
+			// 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
+			this.autoSubscribeMessage();
+			// #endif
+		},
+		computed: {
+			isPass() {
+				return sheep.$store('user').tradeConfig.weixinEnabled;
+			},
+		},
+		methods: {
+			saveApply() {
+				// #ifdef MP
+				// 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
+				this.autoSubscribeMessage();
+				// #endif
+				
+				if(!this.form.avatar){
+					sheep.$helper.toast('请上传头像');
+					return;
+				}
+				if(!this.form.nickname){
+					sheep.$helper.toast('请输入昵称');
+					return;
+				}
+				if(!this.form.sex){
+					sheep.$helper.toast('请选择性别');
+					return;
+				}
+				if(!this.form.age){
+					sheep.$helper.toast('请输入年龄');
+					return;
+				}
+				if(this.form.age < 18){
+					sheep.$helper.toast('未成年禁止申请');
+					return;
+				}
+				if(this.isPass && !this.form.weixin){
+					sheep.$helper.toast('请输入正确的微信号');
+					return;
+				}
+				if(!this.form.mobile || !test.mobile(this.form.mobile)){
+					sheep.$helper.toast('请输入正确的手机号');
+					return;
+				}
+				if(!this.form.intro){
+					sheep.$helper.toast('请输入自我介绍');
+					return;
+				}
+				if(!this.form.city){
+					sheep.$helper.toast('请输入所在城市');
+					return;
+				}
+				if(this.imgList.length < 1){
+					sheep.$helper.toast('请上传图片');
+					return;
+				}
+				if(this.imgList.length < 1){
+					sheep.$helper.toast('请上传图片');
+					return;
+				}
+				
+				if(!this.check){
+					sheep.$helper.toast('未同意协议');
+					return;
+				}
+				
+				this.form.albums = this.imgList.join(',');
+				ClerkApi.createClerkApply(this.form).then((res) => {
+					if(res.data){
+						sheep.$router.go('/pages/worker/levelList/index', {id: res.data});
+					}
+				});
+			},
+			toSec(e) {
+				this.form.soundTime = e;
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.CLERK_APPLY_SUCCESS];
+			  event.push(WxaSubscribeTemplate.CLERK_BLIND);
+			  event.push(WxaSubscribeTemplate.CLERK_ORDER);
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.CLERK_APPLY_SUCCESS);
+			    uni.setStorageSync(WxaSubscribeTemplate.CLERK_APPLY_SUCCESS, '已订阅');
+			    // 隐藏订阅按钮
+			    this.showSubscribeBtn = false;
+			  });
+			},
+			async autoSubscribeMessage() {
+			  // 1. 校验是否手动订阅过
+			  const subscribeBtnStatus = uni.getStorageSync(WxaSubscribeTemplate.CLERK_APPLY_SUCCESS);
+			  if (!subscribeBtnStatus) {
+			    this.showSubscribeBtn = true;
+			  }
+			
+			  // 2. 订阅消息
+			  this.subscribeMessage();
+			},
+			changeCheck() {
+				if(this.check){
+					this.check = false;
+				}else{
+					this.check = true;
+				}
+			},
+			toAggre() {
+				sheep.$router.go('/pages/public/richtext', {title: '店员申请协议'})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fafafa;
+		padding-bottom: 140rpx;
+	}
+	.form-box {
+		background-color: #fff;
+		margin: 15px;
+		border-radius: 10px;
+	}
+	
+	.form-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15px;
+		
+		.label {
+			font-size: 30rpx;
+			min-width: 200rpx;
+		}
+	}
+	
+	.submit-box {
+		display: flex;
+		align-items: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 140rpx;
+		padding: 0 15px;
+		z-index: 99;
+		
+		.sub-btn {
+			background-color: var(--ui-BG-Main);
+			display: flex;
+			flex: 1;
+			justify-content: center;
+			align-items: center;
+			padding: 10px;
+			color: #fff;
+			border-radius: 40px;
+			font-size: 30rpx;
+		}
+	}
+	
+	.subscribe-box {
+		display: flex;
+		align-items: center;
+		padding: 10px;
+		padding-bottom: 0;
+		justify-content: center;
+		font-size: 28rpx;
+		
+		.info {
+			margin: 0 10rpx;
+		}
+		
+		.sub-btn {
+			color: var(--ui-BG-Main);
+		}
+	}
+	
+	.check-box {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 28rpx;
+		
+		.info{
+			margin: 0 10rpx;
+		}
+		
+		.sub-btn {
+			color: var(--ui-BG-Main);
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/detail-navbar.vue b/pages/clerk/detail/components/detail-navbar.vue
new file mode 100644
index 0000000..f4b7e2f
--- /dev/null
+++ b/pages/clerk/detail/components/detail-navbar.vue
@@ -0,0 +1,225 @@
+<template>
+  <su-fixed alway :bgStyles="{ background: '#fff' }" :val="0" noNav opacity :placeholder="false">
+    <su-status-bar />
+    <view
+      class="ui-bar ss-flex ss-col-center ss-row-between ss-p-x-20"
+      :style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
+    >
+      <!-- 左 -->
+      <view class="icon-box ss-flex">
+        <view class="icon-button icon-button-left ss-flex ss-row-center" @tap="onClickLeft">
+          <text :class="tabOpacityVal > 0.4 ? 'black' : ''" class="sicon-back" v-if="hasHistory" />
+          <text :class="tabOpacityVal > 0.4 ? 'black' : ''" class="sicon-home" v-else />
+        </view>
+        <view class="line"></view>
+        <view class="icon-button icon-button-right ss-flex ss-row-center" @tap="onClickRight">
+          <text :class="tabOpacityVal > 0.4 ? 'black' : ''" class="sicon-more" />
+        </view>
+      </view>
+      <!-- 中 -->
+      <view class="detail-tab-card ss-flex-1" :style="[{ opacity: tabOpacityVal }]">
+        <view class="tab-box ss-flex ss-col-center ss-row-around">
+          <view
+            class="tab-item ss-flex-1 ss-flex ss-row-center ss-col-center"
+            v-for="item in tabList"
+            :key="item.value"
+            @tap="onTab(item)"
+          >
+            <view class="tab-title" :class="currentTab === item.value ? 'cur-tab-title' : ''">
+              {{ item.label }}
+            </view>
+            <view v-show="currentTab === item.value" class="tab-line"></view>
+          </view>
+        </view>
+      </view>
+      <!-- #ifdef MP -->
+      <view :style="[capsuleStyle]"></view>
+      <!-- #endif -->
+    </view>
+  </su-fixed>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import { showMenuTools, closeMenuTools } from '@/sheep/hooks/useModal';
+	export default {
+		components: {
+			
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			},
+			//滚动条滚动距离
+			scrollTop: {
+				type: [Number, String],
+				default: 0
+			},
+		},
+		data() {
+			return {
+				sys_navBar: sheep.$platform.navbar,
+				sys_statusBar: sheep.$platform.device.statusBarHeight,
+				hasHistory: sheep.$router.hasHistory(),
+				tabList: [
+				  {
+				    label: '价格',
+				    value: 1,
+				  },
+				  {
+				    label: '动态',
+				    value: 2,
+				  },
+				  {
+				    label: '评价',
+				    value: 3,
+				  },
+				],
+				capsuleStyle: {
+				  width: sheep.$platform.capsule.width + 'px',
+				  height: sheep.$platform.capsule.height + 'px',
+				},
+			}
+		},
+		computed: {
+			tabOpacityVal() {
+				return this.scrollTop > sheep.$platform.navbar ? 1 : this.scrollTop * 0.01;;
+			},
+			currentTab() {
+				return sheep.$store('sys').clerkTabIndex;
+			},
+		},
+		methods: {
+			onClickLeft() {
+				if (this.hasHistory) {
+					sheep.$router.back();
+				} else {
+					sheep.$router.go('/pages/tabbar/index');
+				}
+			},
+			onClickRight() {
+				showMenuTools();
+			},
+			onTab(e) {
+				this.$emit('onTab', e.value);
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.icon-box {
+	  box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
+	  border-radius: 30rpx;
+	  width: 134rpx;
+	  height: 56rpx;
+	  margin-left: 8rpx;
+	  border: 1px solid rgba(#fff, 0.4);
+	  .line {
+	    width: 2rpx;
+	    height: 24rpx;
+	    background: #e5e5e7;
+	  }
+	  .sicon-back {
+	    font-size: 32rpx;
+	    color: #fff;
+	  }
+	  .sicon-home {
+	    font-size: 32rpx;
+	    color: #fff;
+	  }
+	  .sicon-more {
+	    font-size: 32rpx;
+	    color: #fff;
+	  }
+	  
+	  .black {
+		  color: #000;
+	  }
+	  
+	  .icon-button {
+	    width: 67rpx;
+	    height: 56rpx;
+	    &-left:hover {
+	      background: rgba(0, 0, 0, 0.16);
+	      border-radius: 30rpx 0px 0px 30rpx;
+	    }
+	    &-right:hover {
+	      background: rgba(0, 0, 0, 0.16);
+	      border-radius: 0px 30rpx 30rpx 0px;
+	    }
+	  }
+	}
+	.left-box {
+	  position: relative;
+	  width: 60rpx;
+	  height: 60rpx;
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	  .circle {
+	    position: absolute;
+	    left: 0;
+	    top: 0;
+	    width: 60rpx;
+	    height: 60rpx;
+	    background: rgba(#fff, 0.6);
+	    border: 1rpx solid #ebebeb;
+	    border-radius: 50%;
+	    box-sizing: border-box;
+	    z-index: -1;
+	  }
+	}
+	.right {
+	  position: relative;
+	  width: 60rpx;
+	  height: 60rpx;
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	  .circle {
+	    position: absolute;
+	    left: 0;
+	    top: 0;
+	    width: 60rpx;
+	    height: 60rpx;
+	    background: rgba(#ffffff, 0.6);
+	    border: 1rpx solid #ebebeb;
+	    box-sizing: border-box;
+	    border-radius: 50%;
+	    z-index: -1;
+	  }
+	}
+	.detail-tab-card {
+	  width: 50%;
+	  .tab-item {
+	    height: 80rpx;
+	    position: relative;
+	    z-index: 11;
+	
+	    .tab-title {
+	      font-size: 30rpx;
+	    }
+	
+	    .cur-tab-title {
+	      font-weight: $font-weight-bold;
+	    }
+	
+	    .tab-line {
+	      width: 60rpx;
+	      height: 6rpx;
+	      border-radius: 6rpx;
+	      position: absolute;
+	      left: 50%;
+	      transform: translateX(-50%);
+	      bottom: 10rpx;
+	      background-color: var(--ui-BG-Main);
+	      z-index: 12;
+	    }
+	  }
+	}
+	
+
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/gameBox.vue b/pages/clerk/detail/components/gameBox.vue
new file mode 100644
index 0000000..7930cef
--- /dev/null
+++ b/pages/clerk/detail/components/gameBox.vue
@@ -0,0 +1,150 @@
+<template>
+	<view>
+		<view class="option-box">
+			<view class="tag-box">
+				<u-icon name="tags" color="#f6f6f6" size="34"></u-icon>
+				<view class="name">服务类型</view>
+			</view>
+			<view class="span-box">
+				<view @click="changeGame(option)" class="span" :class="catId == option.id ? 'active': '' " v-for="(option,t) in optionList">{{option.name}}</view>
+			</view>
+		</view>
+		
+		<view class="option-box" v-if="categoryList.length > 0">
+			<view class="tag-box">
+				<u-icon name="tags" color="#f6f6f6" size="34"></u-icon>
+				<view class="name">选项</view>
+			</view>
+			<view class="span-box">
+				<view @click="changeCategory(option)" class="span" :class="gameId == option.id ? 'active': '' " v-for="(option,t) in categoryList">{{option.name}}</view>
+			</view>
+		</view>
+		
+		<view class="option-box" v-if="goodsList.length > 0">
+			<view class="tag-box">
+				<u-icon name="tags" color="#f6f6f6" size="34"></u-icon>
+				<view class="name">选项</view>
+			</view>
+			<view class="span-box">
+				<view @click="changeGoods(option)" class="span" :class="goodsId == option.id ? 'active': '' " v-for="(option,t) in goodsList">{{option.name}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			optionList: {
+				type: Array,
+				default: [],
+			},
+			modelValue: {
+			  type: Object,
+			  default: {}
+			},
+		},
+		data() {
+			return {
+				catId: -1,
+				gameId: -1,
+				goodsId: -1,
+				categoryList: [],
+				goodsList: [],
+				goodsList: [],
+			}
+		},
+		methods: {
+			changeGame(e) {
+				this.gameId = -1;
+				this.goodsId = -1;
+				
+				this.catId = e.id;
+				if(e.categoryList){
+					this.goodsList = [];
+					this.categoryList = e.categoryList;
+				}else{
+					this.categoryList = [];
+					this.goodsList = e.goodsList;
+				}
+				
+				var node = {
+					catId: this.catId,
+					gameId: this.gameId,
+					goodsId: this.goodsId,
+					price: 0,
+				}
+				this.$emit('update:modelValue', node); 
+			},
+			changeCategory(e) {
+				this.goodsId = -1;
+				this.gameId = e.id;
+				this.goodsList = e.goodsList;
+				
+				var node = {
+					catId: this.catId,
+					gameId: this.gameId,
+					goodsId: this.goodsId,
+					price: 0,
+				}
+				this.$emit('update:modelValue', node); 
+			},
+			changeGoods(e) {
+				this.goodsId = e.id;
+				var node = {
+					catId: this.catId,
+					gameId: this.gameId,
+					goodsId: this.goodsId,
+					price: e.price,
+				}
+				this.$emit('update:modelValue', node); 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.option-box {
+		margin-bottom: 10px;
+		
+		.tag-box {
+			display: flex;
+			align-items: center;
+			margin-bottom: 12px;
+			
+			.name {
+				font-size: 28rpx;
+				color: #333;
+				margin-left: 5px;
+			}
+		}
+		
+		.span-box {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-around;
+			
+			.span {
+				background-color: #f6f6f6;
+				padding: 14rpx 20rpx;
+				border-radius: 40px;
+				margin-right: 12px;
+				margin-bottom: 12px;
+				min-width: 140rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 24rpx;
+				color: #949494;
+			}
+			
+			.active {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/giftList.vue b/pages/clerk/detail/components/giftList.vue
new file mode 100644
index 0000000..63eefff
--- /dev/null
+++ b/pages/clerk/detail/components/giftList.vue
@@ -0,0 +1,316 @@
+<template>
+	<view v-show="showPop" class="gift-box">
+		<scroll-view style="height: 100%;" scroll-y>
+			<view class="top-box">
+				<view class="title">选择礼物</view>
+				<view class="btn-box" @click="close">
+					<u-icon name="close"></u-icon>
+					<view class="text">取消</view>
+				</view>
+			</view>
+			<view class="list-box">
+				<view v-for="(item,index) in dataList" class="gift" @click="sendGift(item)">
+					<view class="img-box">
+						<img class="img" :src="item.img"></img>
+						<view class="tag" v-if="item.giftType == 1">
+							<text>特效</text>
+							<text v-if="item.tag">·{{item.tag}}</text>
+						</view>
+						<view class="tag" v-if="item.giftType == 0 && item.tag">
+							<text>{{item.tag}}</text>
+						</view>
+					</view>
+					<view class="name">{{item.name}}</view>
+					<view class="price">{{ fen2yuan(item.money) }} 钻石</view>
+				</view>
+			</view>
+		</scroll-view>
+		
+	</view>
+	
+	<view class="svga-box" :class="giftFlag ? 'svga-show': 'svga-hide'">
+		<c-svga ref="cSvgaRef" :canvasId='canvasId' :src="src" :loops='0' :auto-play="false" @frame='onFrame' @finished='onFinished' @percentage='onPercentage' @loaded='onLoaded'></c-svga>
+		<view class="close-btn">
+			<view class="bottom-box">
+				<view class="title">{{gift.name}}</view>
+				<view class="price">{{ fen2yuan(gift.money) }} 钻石</view>
+				<view class="btn-box">
+					<view class="btn" @click="cannel">取消</view>
+					<view class="btn active" @click="ok">确定</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			
+		},
+		props: {
+			modelValue: {
+			  type: Object,
+			  default: {}
+			},
+			showPop: {
+			  type: Boolean,
+			  default: false
+			},
+			dataList: {
+			  type: Array,
+			  default: []
+			},
+		},
+		emits: ["close", "update:modelValue"],
+		data() {
+			return { 
+				giftFlag: false,
+				src: '',
+				canvasId: 'myCanvas2',
+				
+				gift: {},
+				
+			}
+		},
+		methods: {
+			close() {
+				this.$emit('close');
+			},
+			sendGift(e) {
+				this.gift = e;
+				
+				if(e.giftType == 0){
+					// 普通礼物不播放
+					this.close();
+					this.$emit('update:modelValue', this.gift); 
+					return;
+				}
+				
+				this.src = e.pic;
+				this.giftFlag = true;
+			},
+			onFinished() {
+				this.giftFlag = false;
+				console.log('动画停止播放时回调');
+			},
+			onFrame(frame) {//动画播放至某帧后回调
+				// console.log(frame);
+			},
+			onPercentage(percentage) { //动画播放至某进度后回调
+				// console.log(percentage);
+			},
+			onLoaded() {
+				this.$refs.cSvgaRef.call('setContentMode', 'AspectFill');
+				console.log('加载完成');
+				this.$refs.cSvgaRef.call('startAnimation');
+			},
+			closeSvga() {
+				this.src = "";
+				this.$refs.cSvgaRef.call('stopAnimation');
+				this.giftFlag = false;
+			},
+			fen2yuan(price) {
+			  var f = 0;
+			  var p = (price / 100.0).toFixed(0);
+			  var p1 = (price / 100.0).toFixed(1);
+			  var p2 = (price / 100.0).toFixed(2);
+			  if(p*100 == price){
+				f = 0;  
+			  }else if(p1*100 == price){
+				  f = 1;
+			  }else if(p2*100 == price){
+				  f = 2;
+			  }
+			  return (price / 100.0).toFixed(f)
+			},
+			cannel() {
+				this.closeSvga();
+			},
+			ok() {
+				this.closeSvga();
+				this.close();
+				this.$emit('update:modelValue', this.gift); 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.gift-box {
+		background-color: #fff;
+		position: absolute;
+		top: 200rpx;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 9999;
+		padding: 15px;
+		border-top-right-radius: 20rpx;
+		border-top-left-radius: 20rpx;
+		padding-bottom: 0;
+		
+		.top-box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			position: fixed;
+			left: 0;
+			right: 0;
+			background-color: #fff;
+			top: 200rpx;
+			padding: 0 15px;
+			border-top-right-radius: 20rpx;
+			border-top-left-radius: 20rpx;
+			height: 110rpx;
+			z-index: 1;
+			
+			.title {
+				font-size: 28rpx;
+			}
+			
+			.btn-box {
+				background-color: var(--ui-BG-Main);
+				padding: 7px 15px;
+				font-size: 24rpx;
+				border-radius: 40px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #fff;
+				
+				.text {
+					margin-left: 5px;
+				}
+			}
+		}
+		
+		.list-box {
+			display: flex;
+			flex-wrap: wrap;
+			padding-top: 60rpx;
+			
+			.gift {
+				width: 25%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				margin: 20rpx 0px;
+				
+				.img-box {
+					position: relative;
+						
+					.img{
+						max-width: 160rpx;
+						height: 160rpx;
+					}
+					
+					.tag {
+						position: absolute;
+						top: 0;
+						right: 0;
+						font-size: 16rpx;
+						color: #fff;
+						background-color: var(--ui-BG-Main);
+						border-radius: 40px;
+						padding: 2rpx 8rpx;
+					}
+				}
+				
+				.name {
+					font-size: 24rpx;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					max-width: 160rpx;
+					margin-top: 2px;
+					margin-bottom: 7px;
+				}
+				
+				.price {
+					font-size: 20rpx;
+					color: var(--ui-BG-Main);
+				}
+			}
+		}
+	}
+	
+	.svga-box {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999999999;
+		width: 100%;
+		height: 100%;
+		background-color: black;
+		
+		.close-btn {
+			color: #fff;
+			position: absolute;
+			z-index: 999999999;
+			padding: 5px 10px;
+			
+			left: 0;
+			right: 0;
+			bottom: 100rpx;
+			
+			.bottom-box {
+				display: flex;
+				justify-content: center;
+				flex-direction: column;
+				align-items: center;
+				
+				.title {
+					font-size: 28rpx;
+					margin-bottom: 5px;
+				}
+				
+				.price {
+					font-size: 24rpx;
+				}
+				
+				.btn-box {
+					display: flex;
+					align-items: center;
+					margin-top: 10px;
+					
+					.btn {
+						border: 1px solid #fff;
+						font-size: 28rpx;
+						padding: 20rpx 110rpx;
+						border-radius: 40px;
+						margin: 15px;
+						color: #fff;
+					}
+					
+					.active {
+						border: 1px solid var(--ui-BG-Main);
+						background-color: var(--ui-BG-Main);
+					}
+				}
+			}
+		}
+	}
+	
+	.svga-hide {
+		/* #ifdef MP */
+		transform: translate(-100%, 0);
+		/* #endif */
+		
+		/* #ifndef MP */
+		display: none;
+		/* #endif */
+	}
+	
+	.svga-show {
+		/* #ifdef MP */
+		transform: translate(0, 0);
+		/* #endif */
+		
+		/* #ifndef MP */
+		display: block;
+		/* #endif */
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/giftPopup.vue b/pages/clerk/detail/components/giftPopup.vue
new file mode 100644
index 0000000..397d7f0
--- /dev/null
+++ b/pages/clerk/detail/components/giftPopup.vue
@@ -0,0 +1,444 @@
+<template>
+	<tui-bottom-popup :zIndex="1002" :maskZIndex="1001" :show="popupShow" @close="hiddenPopup">
+		<view class="order-box">
+			<view class="avatar-box">
+				<u-image width="140" height="140" border-radius="20" :src="clerk.avatar"></u-image>
+				<view class="close-span" @click="hiddenPopup">
+					<u-icon name="close-circle" color="#98a2a1" size="50"></u-icon>
+				</view>
+			</view>
+			<scroll-view style="height: 700rpx;" scroll-y>
+				<view class="page-box">
+					
+					<view class="form-box">
+						
+						<view class="input-box">
+							<view class="tag-box">
+								<view class="name">服务类型</view>
+							</view>
+							<view class="tab-span">
+								<!-- <view @click="changeTab(0)" class="btn" :class="form.rewardType == 0 ? 'active' : ''">赠送</view> -->
+								<view @click="changeTab(1)" class="btn" :class="form.rewardType == 1 ? 'active' : ''">赠礼</view>
+							</view>
+						</view>
+						
+						
+						<view class="input-box" v-if="form.rewardType == 0">
+							<view class="tag-box">
+								<view class="name">打赏金额</view>
+							</view>
+							<view class="input-span">
+								<u-input v-model="payMoney" type="number" :placeholder-style="`fontSize: 24rpx; color: #cbced5;`" placeholder="请输入赠送金额"></u-input>
+							</view>
+						</view>
+						
+						<view class="input-box" v-if="form.rewardType == 1">
+							<view class="tag-box">
+								<view class="name">赠送礼物</view>
+							</view>
+							<view class="select-span" @click="openGift">
+								<view v-if="gift.id > 0">已选【{{gift.name}}】</view>
+								<view v-else>点击选择礼物</view>
+								<u-icon name="arrow-right"></u-icon>
+							</view>
+						</view>
+						
+						<view class="input-box" v-if="gift.id > 0">
+							<view class="tag-box">
+								<view class="name">礼物数量</view>
+							</view>
+							<view class="step-span">
+								<img class="img" :src="gift.img"></img>
+								<tui-numberbox iconBgColor="var(--ui-BG-Main)" iconColor="#fff" backgroundColor="#fff" :min="1" :value="form.count" @change="change"></tui-numberbox>
+							</view>
+						</view>
+						
+						<view class="input-box">
+							<view class="textarea-box">
+								<view class="name">心动留言</view>
+							</view>
+							<view class="textarea-span">
+								<u-input v-model="form.msg" type="textarea" :placeholder-style="`fontSize: 24rpx; color: #cbced5;`" placeholder="请输入心动留言"></u-input>
+							</view>
+						</view>
+						
+						<view class="input-box" v-if="isPass">
+							<view class="tag-box">
+								<view class="name">您的微信号</view>
+							</view>
+							<view class="input-span">
+								<u-input v-model="form.weixin" :placeholder-style="`fontSize: 24rpx; color: #cbced5;`" placeholder="请输入正确的微信号"></u-input>
+							</view>
+						</view>
+						
+					</view>
+					
+				</view>
+			</scroll-view>
+			<view class="bottom-box2" v-if="form.rewardType == 0">
+				<view class="btn-box">
+					<view class="pay-btn" @click="confirm">立即赠送</view>
+				</view>
+			</view>
+			
+			<view class="bottom-box" v-if="form.rewardType == 1">
+				<view class="price-box">
+					<text>总价：</text>
+					<text class="price">{{ fen2yuan(gift.money*form.count) }}</text>
+					<text>钻石</text>
+				</view>
+				<view class="btn-box">
+					<view class="pay-btn" @click="confirm">立即赠送</view>
+				</view>
+			</view>
+		</view>
+	</tui-bottom-popup>
+	
+	<gift-list :showPop="giftFlag" :dataList="giftList" v-model="gift" @close="closeGift"></gift-list>
+</template>
+
+<script>
+	import tuiBottomPopup from "@/components/thorui/tui-bottom-popup/tui-bottom-popup.vue"
+	import tuiNumberbox from "@/components/thorui/tui-numberbox/tui-numberbox.vue"
+	import GiftList from '@/pages/clerk/detail/components/giftList.vue';
+	import RewardApi from '@/sheep/api/worker/reward'; 
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			tuiBottomPopup,
+			tuiNumberbox,
+			GiftList,
+		},
+		props: {
+			
+		},
+		data() {
+			return { 
+				popupShow: false,
+				
+				gift: {
+					id: -1,
+					money: 0,
+				},
+				
+				giftFlag: false,
+				
+				giftList: [],
+				
+				payMoney: '',
+				
+				form: {
+					rewardType: 1,
+					count: 1,
+					giftId: -1,
+					money: '',
+					weixin: '',
+					msg: '',
+					payMoney: '',
+				},
+				
+	
+			}
+		},
+		computed: {
+			clerk() {
+				return sheep.$store('sys').clerk;
+			},
+			userInfo() {
+				return sheep.$store('user').userInfo;
+			},
+			isPass() {
+				return sheep.$store('user').tradeConfig.weixinEnabled;
+			},
+		},
+		methods: {
+			//调用此方法显示弹层
+			showPopup() {
+				this.form.weixin = this.userInfo.weixin;
+				RewardApi.getGiftList().then(res => {
+					this.giftList = res.data;
+					this.popupShow = true
+				});
+			},
+			showGiftPopup(e) {
+				this.gift = e;
+				this.form.rewardType = 1;
+				this.form.weixin = this.userInfo.weixin;
+				RewardApi.getGiftList().then(res => {
+					this.giftList = res.data;
+					this.popupShow = true
+				});
+			},
+			hiddenPopup() {
+				this.popupShow = false
+			},
+			change(e) {
+				this.form.count = e.value
+			},
+			changeTab(e) {
+				this.form.rewardType = e;
+				this.gift = {
+					id: -1,
+					money: 0,
+				};
+			},
+			fen2yuan(price) {
+			  var f = 0;
+			  var p = (price / 100.0).toFixed(0);
+			  var p1 = (price / 100.0).toFixed(1);
+			  var p2 = (price / 100.0).toFixed(2);
+			  if(p*100 == price){
+				f = 0;  
+			  }else if(p1*100 == price){
+				  f = 1;
+			  }else if(p2*100 == price){
+				  f = 2;
+			  }
+			  return (price / 100.0).toFixed(f)
+			},
+			yuan2fen(price) {
+			  return (price * 100.0).toFixed(0)
+			},
+			openGift() {
+				this.giftFlag = true;
+			},
+			closeGift() {
+				this.form.count = 1;
+				this.giftFlag = false;
+			},
+			confirm() {
+				if(this.isPass && !this.form.weixin){
+					sheep.$helper.toast('请输入正确的微信');
+					return;
+				}
+				if(this.form.rewardType == 0){
+					this.form.payMoney = this.yuan2fen(this.payMoney);
+					if(this.form.payMoney < 1){
+						sheep.$helper.toast('请输入打赏金额');
+						return; 
+					}
+				}else{
+					this.form.giftId = this.gift.id;
+					if(this.form.giftId < 1){
+						sheep.$helper.toast('请选择打赏礼物');
+						return;
+					}
+				}
+				this.form.workerClerkId = this.clerk.id;
+				RewardApi.createRewardOrder(this.form).then(res => {
+					// 跳转到支付页面
+					this.$u.route({
+						url: 'pages/pay/reward/index',
+						params: {
+							id: res.data.payOrderId,
+						}
+					});
+				});
+				
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.avatar-box {
+		padding: 10px 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.close-span {
+			position: absolute;
+			right: 5px;
+			top: 5px;
+			width: 70rpx;
+			height: 70rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+	
+	.page-box {
+		padding: 15px;
+		padding-bottom: 10px;
+		
+		.form-box {
+			margin-bottom: 10px;
+			
+			.tag-box {
+				display: flex;
+				align-items: center;
+				width: 180rpx;
+				
+				.name {
+					font-size: 24rpx;
+					color: #333;
+					margin-left: 5px;
+				}
+			}
+			
+			.textarea-box {
+				height: 20px;
+				display: flex;
+				width: 180rpx;
+				
+				.name {
+					font-size: 24rpx;
+					color: #333;
+					margin-left: 5px;
+				}
+			}
+			
+			.input-box {
+				display: flex;
+				margin-bottom: 20px;
+				align-items: center;
+				
+				.input-span {
+					background-color: #f6f6f6;
+					margin-left: 15px;
+					display: flex;
+					flex: 1;
+					padding: 0 12px;
+					border-radius: 10rpx;
+				}
+				
+				.select-span {
+					font-size: 24rpx;
+					background-color: #f6f6f6;
+					margin-left: 15px;
+					display: flex;
+					flex: 1;
+					padding: 12px 12px;
+					border-radius: 10rpx;
+					color: #aaaaaa;
+					justify-content: space-between;
+				}
+				
+				.tab-span {
+					display: flex;
+					flex: 1;
+					padding: 0 12px;
+					align-items: center;
+					
+					.btn {
+						background-color: #f6f6f6;
+						font-size: 24rpx;
+						padding: 7px 0;
+						border-radius: 40px;
+						min-width: 120rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						margin-right: 15px;
+					}
+					
+					.active {
+						color: #fff;
+						background-color: var(--ui-BG-Main);
+					}
+				}
+				
+				.textarea-span {
+					background-color: #f6f6f6;
+					margin-left: 15px;
+					flex: 1;
+					padding: 2px 12px;
+					border-radius: 10px;
+				}
+				
+				.step-span {
+					display: flex;
+					justify-content: space-between;
+					flex: 1;
+					padding-left: 12px;
+					align-items: center;
+					
+					.img {
+						width: 80rpx;
+						height: 80rpx;
+						border-radius: 100%;
+						box-shadow: 0 0 8px rgba(0, 0, 0, 0.5);
+					}
+				}
+			}
+		}
+	}
+
+	.bottom-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 15px;
+		box-shadow: 0 0 6px 0 #ccc;
+		
+		.price-box {
+			color: #fb932c;
+			font-size: 28rpx;
+			width: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			
+			.price {
+				margin-right: 5px;
+			}
+		}
+		
+		.btn-box {
+			width: 50%;
+			padding-left: 15px;
+			
+			.pay-btn {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				font-size: 28rpx;
+				height: 70rpx;
+			}
+		}
+		
+	}
+	
+	.bottom-box2 {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 15px;
+		box-shadow: 0 0 6px 0 #ccc;
+		
+		.price-box {
+			color: #fb932c;
+			font-size: 28rpx;
+			width: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			
+			.price {
+				margin-right: 5px;
+			}
+		}
+		
+		.btn-box {
+			width: 50%;
+			
+			.pay-btn {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				font-size: 28rpx;
+				height: 70rpx;
+			}
+		}
+		
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/layout.vue b/pages/clerk/detail/components/layout.vue
new file mode 100644
index 0000000..f552d28
--- /dev/null
+++ b/pages/clerk/detail/components/layout.vue
@@ -0,0 +1,263 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" :show-loading-more-no-more-view="showLoad" :show-default-loading-more-text="showLoad" use-virtual-list :force-close-inner-list="true" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @scroll="scroll" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<nav-bar :title="title" :scrollTop="scrollTop" @onTab="change" @initNav="initNav"></nav-bar>
+			</template>  
+			   
+			<view>  
+				<user-box :clerk="clerk" :clerkLevel="clerk.clerkLevel" :paddingTop="paddingTop"></user-box>
+				<sticky-box :clerk="clerk" @change="change"></sticky-box>
+			</view>
+			
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<view class="data-box">
+				<star-list v-if="currentTab == 0" @openGift="openGift" :clerk="clerk" :virtualList="giftList"></star-list>
+				<price-list v-if="currentTab == 1" :clerk="clerk"></price-list>
+				<post-list v-if="currentTab == 2" :virtualList="virtualList"></post-list>
+				<rate-list v-if="currentTab == 3" :clerk="clerk" :virtualList="virtualList"></rate-list>
+			</view>
+			
+			<template #bottom>
+				<view v-if="isGift" class="bottom-box">
+					<view class="order" @click="doOrder">立即下单</view>
+					<view class="gift" @click="doGift">赠礼</view>
+				</view>
+				<view v-else class="bottom-box">
+					<view class="order-btn" @click="doOrder">立即下单</view>
+				</view>
+			</template>  
+			
+		</z-paging>
+		
+		<order-popup ref="orderPopup"></order-popup>
+		
+		<gift-popup ref="giftPopup"></gift-popup>
+		
+	</view>
+</template>
+
+<script>
+	import UserBox from '@/pages/clerk/detail/components/userBox.vue';
+	import StickyBox from '@/pages/clerk/detail/components/stickyBox.vue';
+	import StarList from '@/pages/clerk/detail/components/starList.vue';
+	import PriceList from '@/pages/clerk/detail/components/priceList.vue';
+	import PostList from '@/pages/clerk/detail/components/postList.vue';
+	import RateList from '@/pages/clerk/detail/components/rateList.vue';
+	import NavBar from '@/pages/clerk/detail/components/navBar.vue';
+	import OrderPopup from '@/pages/clerk/detail/components/orderPopup.vue';
+	import GiftPopup from '@/pages/clerk/detail/components/giftPopup.vue';
+	import UserApi from '@/sheep/api/member/user';
+	import ClerkApi from '@/sheep/api/worker/clerk'; 
+	import TrendApi from '@/sheep/api/worker/trend'; 
+	import RewardApi from '@/sheep/api/worker/reward'; 
+	import CommentApi from '@/sheep/api/product/comment';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			UserBox,
+			StickyBox,
+			StarList,
+			PriceList,
+			PostList,
+			RateList,
+			NavBar, 
+			OrderPopup,
+			GiftPopup,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			}
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 0,
+				height: 0,
+				
+				clerk: {},
+				workerClerkId: 0,
+				giftList: [],
+			}
+		},
+		computed: {
+			currentTab() {
+				return sheep.$store('sys').clerkTabIndex;
+			},
+			showLoad() {
+				return sheep.$store('sys').clerkTabIndex > 1;
+			},
+			isLogin: {
+				get() {
+				  return sheep.$store('user').isLogin;
+				},
+			},
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+			isGift() {
+				return sheep.$store('user').tradeConfig.giftEnabled;
+			},
+		},
+		methods: {
+			initNav(e) {
+				this.height = e.height;
+				this.paddingTop = this.height;
+			},
+			initData(options) {
+				this.workerClerkId = options.id;
+				ClerkApi.getClerk({
+					id: options.id,
+					userId: this.userInfo.id,
+				}).then(res => {
+					this.clerk = res.data;
+					sheep.$store('sys').setClerk(res.data);
+				});
+				
+				RewardApi.getRewardGiftList({
+				  workerClerkId: options.id,
+				}).then(res => {
+					this.giftList = res.data;
+				});
+			},
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					workerClerkId: this.workerClerkId,
+				}
+				
+				if(this.currentTab == 0){
+					
+				}else if(this.currentTab == 1){
+					
+				}else if(this.currentTab == 2){
+					TrendApi.getTrendPage(params).then(res => {
+						// 将请求的结果数组传递给z-paging
+						this.$refs.paging.complete(res.data.list);
+					}).catch(res => {
+						// 如果请求失败写this.$refs.paging.complete(false);
+						// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+						// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+						this.$refs.paging.complete(false);
+					})
+				}else if(this.currentTab == 3){
+					CommentApi.getCommentPage(this.workerClerkId,pageNo,pageSize,0).then(res => {
+						// 将请求的结果数组传递给z-paging
+						this.$refs.paging.complete(res.data.list);
+					}).catch(res => {
+						// 如果请求失败写this.$refs.paging.complete(false);
+						// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+						// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+						this.$refs.paging.complete(false);
+					})
+				}
+			},
+			change(e) {
+				sheep.$store('sys').setClerkTabIndex(e);
+				this.scrollTop = 0;
+				this.$refs.paging.reload();
+			},
+			doOrder() {
+				if(this.isLogin){
+					this.$refs.orderPopup.showPopup();
+				}else{
+					showAuthModal();
+				}
+			},
+			doGift() {
+				if(this.isLogin){
+					this.$refs.giftPopup.showPopup();
+				}else{
+					showAuthModal();
+				}
+			},
+			openGift(e) {
+				if(this.isLogin){
+					this.$refs.giftPopup.showGiftPopup(e);
+				}else{
+					showAuthModal();
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.data-box {
+		padding: 0 15px;
+	}
+	.bottom-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 10px 30px;
+		box-shadow: 0 0 6px 0 #ccc;
+		
+		.order {
+			background-color: var(--ui-BG-Main);
+			padding: 10px;
+			border-top-left-radius: 40px;
+			border-bottom-left-radius: 40px;
+			color: #fff;
+			width: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 88rpx;
+			font-size: 28rpx;
+		}
+		
+		.order-btn {
+			background-color: var(--ui-BG-Main);
+			padding: 10px;
+			border-radius: 40px;
+			color: #fff;
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 88rpx;
+			font-size: 28rpx;
+		}
+		
+		.gift {
+			background-color: #eef3f2;
+			padding: 10px;
+			border-top-right-radius: 40px;
+			border-bottom-right-radius: 40px;
+			width: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 88rpx;
+			color: #aaa;
+			font-size: 28rpx;
+		}
+	}
+</style>
diff --git a/pages/clerk/detail/components/navBar.vue b/pages/clerk/detail/components/navBar.vue
new file mode 100644
index 0000000..8504cbe
--- /dev/null
+++ b/pages/clerk/detail/components/navBar.vue
@@ -0,0 +1,89 @@
+<template>
+  <view>
+	 <tui-navigation-bar @init="initNavigation" @change="opacityChange" :scrollTop="scrollTop" backgroundColor="#fff" color="#333">
+	 	<detailNavbar @onTab="onTab" :scrollTop="scrollTop" />
+	 </tui-navigation-bar>
+  </view>
+</template>
+
+<script>
+	import tuiNavigationBar from "@/components/thorui/tui-navigation-bar/tui-navigation-bar.vue";
+	import detailNavbar from '@/pages/clerk/detail/components/detail-navbar.vue';
+	export default {
+		components: {
+			tuiNavigationBar,
+			detailNavbar,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			},
+			//滚动条滚动距离
+			scrollTop: {
+				type: [Number, String],
+				default: 0
+			},
+		},
+		data() {
+			return {
+				top: 0, //标题图标距离顶部距离
+				opacity: 0,
+				height: 0,
+			}
+		},
+		methods: {
+			initNavigation(e) {
+				this.height = e.height;
+				this.opacity = e.opacity;
+				this.top = e.top;
+				this.$emit('initNav', e);
+			},
+			opacityChange(e) {
+				this.opacity = e.opacity;
+			},
+			onTab(e) {
+				this.$emit('onTab', e);
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-bpx {
+		color: #fff;
+		display: flex;
+		align-items: center;
+		height: 44px;
+		justify-content: center;
+		
+		.left-box {
+			display: flex;
+			position: absolute;
+			left: 0;
+		}
+		
+		.nickname {
+			position: absolute;
+			width: 100px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 44px;
+			font-size: 15px;
+			font-weight: bolder;
+			color: #1f2122;
+		}
+		
+		.set-btn {
+			padding: 0 15px;
+			height: 44px;
+			display: flex;
+			align-items: center;
+		}
+		
+	}
+	
+
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/orderPopup.vue b/pages/clerk/detail/components/orderPopup.vue
new file mode 100644
index 0000000..a50c285
--- /dev/null
+++ b/pages/clerk/detail/components/orderPopup.vue
@@ -0,0 +1,282 @@
+<template>
+	<tui-bottom-popup :zIndex="1002" :maskZIndex="1001" :show="popupShow" @close="hiddenPopup">
+		<view class="order-box">
+			<view class="avatar-box">
+				<u-image width="140" height="140" border-radius="20" :src="clerk.avatar"></u-image>
+				<view class="close-span" @click="hiddenPopup">
+					<u-icon name="close-circle" color="#98a2a1" size="50"></u-icon>
+				</view>
+			</view>
+			<scroll-view style="height: 700rpx;" scroll-y>
+				<view class="page-box">
+					
+					<game-box v-model="game" :optionList="clerk.goodsList"></game-box>
+					
+					<view class="form-box">
+						<!-- <view class="input-box">
+							<view class="tag-box">
+								<u-icon name="tags" color="#f6f6f6" size="34"></u-icon>
+								<view class="name">你的微信号</view>
+							</view>
+							<view class="input-span">
+								<u-input placeholder="请输入正确的微信号~"></u-input>
+							</view>
+						</view>
+						
+						<view class="input-box">
+							<view class="textarea-box">
+								<u-icon name="tags" color="#f6f6f6" size="34"></u-icon>
+								<view class="name">其它备注</view>
+							</view>
+							<view class="textarea-span">
+								<u-input type="textarea" placeholder="请输入备注内容"></u-input>
+							</view>
+						</view> -->
+						
+						<view class="input-box">
+							<view class="tag-box">
+								<u-icon name="tags" color="#f6f6f6" size="34"></u-icon>
+								<view class="name">购买数量</view>
+							</view>
+							<view class="step-span">
+								<tui-numberbox iconBgColor="var(--ui-BG-Main)" iconColor="#fff" backgroundColor="#fff" :min="1" :value="order.num" @change="change"></tui-numberbox>
+							</view>
+						</view>
+						
+						<!-- <view class="input-box">
+							<radio-box style="width: 100%;" v-model="payMethod" :optionList="optionList"></radio-box>
+						</view> -->
+						
+					</view>
+					
+				</view>
+			</scroll-view>
+			<view class="bottom-box">
+				<view class="price-box">
+					<text>总价：</text>
+					<text class="price">{{ fen2yuan(game.price*order.num) }}</text>
+					<text>钻石</text>
+				</view>
+				<view class="btn-box">
+					<view class="pay-btn" @click="confirm">立即下单</view>
+				</view>
+			</view>
+		</view>
+	</tui-bottom-popup>
+</template>
+
+<script>
+	import tuiBottomPopup from "@/components/thorui/tui-bottom-popup/tui-bottom-popup.vue"
+	import tuiNumberbox from "@/components/thorui/tui-numberbox/tui-numberbox.vue"
+	import RadioBox from '@/pages/clerk/detail/components/radioBox.vue';
+	import GameBox from '@/pages/clerk/detail/components/gameBox.vue';
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			tuiBottomPopup,
+			tuiNumberbox,
+			RadioBox,
+			GameBox,
+		},
+		props: {
+			
+		},
+		data() {
+			return { 
+				popupShow: false,
+				optionList: [
+					{
+						name: '余额支付',
+						value: '0',
+						type: 'number',
+						number: '1000',
+					},
+					{
+						name: '微信支付',
+						value: '1',
+						type: 'icon',
+					},
+				],
+				payMethod: '0',
+				
+				game: {
+					goodsId: -1,
+					price: 0,
+				},
+				order: {
+					num: 1,
+					goodsId: -1,
+					price: 0,
+				},
+				
+	
+			}
+		},
+		computed: {
+			clerk() {
+				return sheep.$store('sys').clerk;
+			},
+		},
+		methods: {
+			//调用此方法显示弹层
+			showPopup() {
+				this.popupShow = true
+			},
+			hiddenPopup() {
+				this.popupShow = false
+			},
+			change(e) {
+				this.order.num = e.value
+			},
+			// 选中某个单选框时，由radio时触发
+			radioChange(e) {
+				// console.log(e);
+			},
+			// 选中任一radio时，由radio-group触发
+			radioGroupChange(e) {
+				// console.log(e);
+			},
+			fen2yuan(price) {
+			  return (price / 100.0).toFixed(0)
+			},
+			confirm() {
+				this.order.goodsId = this.game.goodsId,
+				this.order.price = this.game.price*this.order.num
+				if(this.order.goodsId < 0) {
+					sheep.$helper.toast('请选择商品');
+					return;
+				}
+				var data = {
+					"clerkId": this.clerk.id,
+					'items' : [{"skuId": this.order.goodsId, "count": this.order.num}]
+				}
+				this.$u.route({
+					url: 'pages/order/worker/confirm',
+					params: {
+						data: JSON.stringify(data),
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.avatar-box {
+		padding: 10px 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.close-span {
+			position: absolute;
+			right: 5px;
+			top: 5px;
+			width: 70rpx;
+			height: 70rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+	
+	.page-box {
+		padding: 15px;
+		padding-bottom: 10px;
+		
+		.form-box {
+			margin-bottom: 10px;
+			
+			.tag-box {
+				display: flex;
+				align-items: center;
+				width: 200rpx;
+				
+				.name {
+					font-size: 28rpx;
+					color: #333;
+					margin-left: 5px;
+				}
+			}
+			
+			.textarea-box {
+				height: 20px;
+				display: flex;
+				width: 200rpx;
+				
+				.name {
+					font-size: 28rpx;
+					color: #333;
+					margin-left: 5px;
+				}
+			}
+			
+			.input-box {
+				display: flex;
+				margin-bottom: 20px;
+				
+				.input-span {
+					background-color: #f6f6f6;
+					margin-left: 15px;
+					display: flex;
+					flex: 1;
+					padding: 0 12px;
+					border-radius: 40px;
+				}
+				
+				.textarea-span {
+					background-color: #f6f6f6;
+					margin-left: 15px;
+					flex: 1;
+					padding: 2px 12px;
+					border-radius: 10px;
+				}
+				
+				.step-span {
+					display: flex;
+					justify-content: flex-end;
+					flex: 1;
+					align-items: center;
+				}
+			}
+		}
+	}
+
+	.bottom-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 15px;
+		box-shadow: 0 0 6px 0 #ccc;
+		
+		.price-box {
+			color: #fb932c;
+			font-size: 28rpx;
+			width: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			
+			.price {
+				margin-right: 5px;
+			}
+		}
+		
+		.btn-box {
+			width: 50%;
+			padding-left: 15px;
+			
+			.pay-btn {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				font-size: 28rpx;
+				height: 70rpx;
+			}
+		}
+		
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/photoBox.vue b/pages/clerk/detail/components/photoBox.vue
new file mode 100644
index 0000000..7d575ed
--- /dev/null
+++ b/pages/clerk/detail/components/photoBox.vue
@@ -0,0 +1,50 @@
+<template>
+	<view class="photo-box">
+		<scroll-view scroll-x>
+			<view class="scroll-box">
+				<view class="img-box" @click="showImage(item)" v-for="(item,index) in dataList">
+					<u-image border-radius="20" width="170rpx" height="170rpx" :src="item"></u-image>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			dataList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			showImage(src) {
+				uni.previewImage({
+					indicator: "none",
+					current: src,
+					urls: this.dataList,
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.photo-box {
+		.scroll-box {
+			display: flex;
+		}
+		.img-box {
+			margin-right: 15px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/postList.vue b/pages/clerk/detail/components/postList.vue
new file mode 100644
index 0000000..7c1bca8
--- /dev/null
+++ b/pages/clerk/detail/components/postList.vue
@@ -0,0 +1,342 @@
+<template>
+  <view>
+	  <view class="item" :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in orderList">
+		  <view class="card">
+		  	<view class="right">
+		  		<view class="card-header">
+		  			<view class="box3">
+		  				<view class="box1">
+		  					<view class="tag-list">
+		  						<!-- <view class="tag">Ta爱玩王者荣耀</view> -->
+		  						<view class="tag">发布于 {{item.createTimeStr}}</view>
+		  					</view>
+		  				</view>
+		  			</view>
+		  		</view>
+		  		<view class="card-content"> 
+		  			<view class="text-box">  
+		  				<rich-text :nodes="item.content"></rich-text>
+		  			</view>
+		  		</view>
+		  		<view class="image-box" v-if="item.fileType == 0">
+		  			<img-box :file="item.file"></img-box>
+		  		</view>
+				<view class="voice-box" v-if="item.fileType == 1">
+					<voice-play :sec="item.seconds" @tap.stop="playAudio(item)" :isPlay="item.id == playId"></voice-play>
+				</view>
+				<view class="video-box" v-if="item.fileType == 2">
+					<video-box :file="item.file"></video-box>
+				</view>
+		  		<view class="topic-list">
+		  			<view class="topic">
+		  				<u-icon name="map-fill" size="40" color="#3cc9a4"></u-icon>
+		  				<view class="tag-text">{{item.city}}</view>
+						<u-icon name="arrow-right" size="24" color="#3cc9a4"></u-icon>
+		  			</view>
+		  		</view>
+		  		<view class="card-footer">
+		  			<!-- <view class="toolbar"> 
+		  				<u-icon color="#f880ab" name="presentfill" size="38" custom-prefix="iconfont"></u-icon>
+		  				<view class="toolbar-text">3</view>
+		  			</view> -->
+		  			<!-- <view class="toolbar">
+		  				<u-icon name="pinglun" size="38" custom-prefix="iconfont"></u-icon>
+		  				<view class="toolbar-text">22</view>
+		  			</view> -->
+		  			<view class="toolbar" @click="thumb(item)">
+						<u-icon v-if="item.like" name="thumb-up-fill" color="var(--ui-BG-Main)" size="40"></u-icon>
+		  				<u-icon v-else name="thumb-up" size="40"></u-icon>
+		  				<view class="toolbar-text" v-if="item.likeNum > 0">{{item.likeNum}}</view>
+						<view class="text" v-else>点赞</view>
+		  			</view>
+		  		</view>
+		  	</view>
+		  </view>
+	  </view>
+	  
+  </view>
+</template>
+
+<script>
+	import ImgBox from '@/pages/tabbar/components/trend/imgBox.vue';
+	import VideoBox from '@/pages/tabbar/components/trend/videoBox.vue';
+	import VoicePlay from '@/pages/tabbar/components/trend/voicePlay.vue';
+	import sheep from '@/sheep';
+	import TrendApi from '@/sheep/api/worker/trend';
+	const audio = uni.createInnerAudioContext();
+	export default {
+		components: {
+			ImgBox,
+			VideoBox,
+			VoicePlay,
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				playId: null,
+			}
+		},
+		computed: {
+			orderList() {
+				this.virtualList.forEach((order) => order.createTimeStr = sheep.$helper.timeFormat(order.createTime, 'yyyy-mm-dd hh:MM'));
+				return this.virtualList;
+			},
+		},
+		methods: {
+			playAudio(e) {
+				if(this.playId == e.id){
+					this.playId = null;
+					audio.stop();
+					return;
+				}
+				this.playId = e.id;
+				//语音自然播放结束
+				audio.onEnded((res) => {
+					this.playId = null;
+				});
+				audio.src = e.file;
+				audio.play();
+			},
+			thumb(e) {
+				TrendApi.createTrendLike({
+					trendId: e.id,
+				}).then((res) => {
+					if(res) {
+						if(e.like){
+							e.like = false;
+							e.likeNum = e.likeNum-1;
+							sheep.$helper.toast('取消点赞');
+						}else{
+							e.like = true;
+							e.likeNum = e.likeNum+1;
+							sheep.$helper.toast('点赞成功');
+						}
+					}
+				});
+			},
+			fans(e) {
+				TrendApi.createClerkFans({
+					workerClerkId: e.workerClerkId,
+				}).then((res) => {
+					if(res){
+						if(e.fans){
+							sheep.$helper.toast('取消收藏');
+							e.fans = false;
+						}else{
+							sheep.$helper.toast('收藏成功');
+							e.fans = true;
+						}
+					}
+				});
+			},
+			detail(e) {
+				this.$u.route({
+					url: 'pages/clerk/detail/index',
+					params: {
+						id: e.workerClerkId,
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item {
+		display: flex;
+		flex-direction: column;
+	}
+	
+	.card {
+		padding: 30rpx 20rpx;
+		border-bottom: 1rpx solid #f5f5f5;
+		display: flex;
+		
+		.right {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+		}
+	}
+	
+	.avatar-img{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 8rpx;
+		
+		.img {
+			width: 100%;
+			height: 100%;
+			border-radius: 100%;
+		}
+	}
+	
+	.avatar{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.img {
+			width: 75%;
+			height: 75%;
+			border-radius: 100%;
+		}
+		.gif {
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	
+	.card-header {
+		display: flex;
+		align-items: center;
+		
+		.box1 {
+			.tag-list {
+				display: flex;
+				align-items: center;
+				font-size: 22rpx;
+				margin-top: 4rpx;
+				
+				.tag::after {
+				  content: '·';
+				  padding: 0 10rpx; /* 添加一些间隔 */
+				}
+				
+			}
+			
+			.tag-list .tag:last-child::after {
+				content: unset;
+			}
+		}
+		
+		.box2 {
+			display: flex;
+			align-items: center;
+			line-height: 40rpx;
+			
+			.nickname {
+				font-size: 28rpx;
+				color: #333333;
+			}
+			
+			.sex-box {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background-color: #d06b8d1f;
+				border-radius: 20px;
+				font-size: 20rpx;
+				padding: 4rpx 10rpx;
+				color: #d06b8d;
+				line-height: 24rpx;
+				margin: 0 5px;
+				
+				.age {
+					margin-left: 2px;
+				}
+			}
+			
+			.nan {
+				background-color: #007aff1a;
+				color: #007aff;
+			}
+		}
+		
+		.box3 {
+			display: flex;
+			justify-content: space-between;
+			flex: 1;
+			align-items: center;
+		}
+		
+		.fans {
+			width: 60rpx;
+			display: flex;
+			justify-content: flex-end;
+			height: 60rpx;
+			align-items: center;
+			color: var(--ui-BG-Main);
+			font-size: 24rpx;
+			padding-right: 3px;
+		}
+	}
+	
+	.card-content {
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		
+		.text-box {
+			font-size: 26rpx;
+			line-height: 180%;
+			white-space: pre-wrap;
+			letter-spacing: 2rpx;
+		}
+	}
+	
+	.topic-list { 
+		display: flex;
+		align-items: center;
+		margin-top: 10px;
+		
+		.topic {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 28rpx;
+			margin-right: 20rpx;
+			color: var(--ui-BG-Main);
+			font-weight: bold;
+			
+			.tag-text {
+				margin-left: 2px;
+			}
+		}
+	}
+	
+	.card-footer {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 30rpx;
+		
+		.toolbar {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			color: #666666;
+			width: 80rpx;
+			height: 40rpx;
+			flex: 1;
+		}
+		
+		.toolbar-text {
+			font-size: 26rpx;
+			margin-left: 5px;
+		}
+		
+		.text {
+			font-size: 24rpx;
+			margin-left: 5px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/priceList.vue b/pages/clerk/detail/components/priceList.vue
new file mode 100644
index 0000000..284ef71
--- /dev/null
+++ b/pages/clerk/detail/components/priceList.vue
@@ -0,0 +1,50 @@
+<template>
+	  <view class="price-box">
+		  
+		  
+		<table-list :tableList="clerk.goodsList"></table-list>  
+	  	
+		<view class="price-remark">
+			<u-parse :html="content"></u-parse>
+		</view>
+		
+	  </view>
+  
+</template>
+
+<script>
+	import TableList from '@/pages/clerk/detail/components/tableList.vue';
+	export default {
+		components: {
+			TableList,
+		},
+		props: {
+			clerk: {
+				type: Object,
+				default: {},
+			},
+		},
+		data() {
+			return {
+				content: `
+						<p>露从今夜白，月是故乡明</p>
+						`
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.price-box {
+		padding: 30rpx 20rpx;
+		padding-top: 0px;
+		
+		.price-remark {
+			padding: 5px 15px;
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/radioBox.vue b/pages/clerk/detail/components/radioBox.vue
new file mode 100644
index 0000000..da299ce
--- /dev/null
+++ b/pages/clerk/detail/components/radioBox.vue
@@ -0,0 +1,112 @@
+<template>
+	<view class="check-box">
+		<view class="check-option" @click="change(option)" v-for="(option,index) in optionList">
+			<view class="icon-box">
+				<view class="check-icon-span" v-if="option.value == valueDom">
+					<u-icon name="checkmark-circle-fill" color="var(--ui-BG-Main)" size="50"></u-icon>
+				</view>
+				<text class="check-icon" v-else></text>
+				<text class="check-label">{{option.name}}</text>
+			</view>
+			<view class="price-box" v-if="option.type == 'number'">
+				<text class="num">{{option.number}}</text>
+				<text>钻石</text>
+			</view>
+			<view v-if="option.type == 'icon'">
+				<u-icon name="weixin-fill" color="#39b54a" size="50"></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			optionList: {
+				type: Array,
+				default: [],
+			},
+			modelValue: {
+			  type: String,
+			  default: ''
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			valueDom() {
+				return this.modelValue;
+			},
+		},
+		methods: {
+			change(e) {
+				this.$emit('update:modelValue', e.value); 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.check-box {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		
+		.check-option {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 15px;
+			
+			.icon-box {
+				display: flex;
+				align-items: center;
+				
+				.check-icon {
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 100%;
+					border: 1px solid var(--ui-BG-Main);
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+				
+				.check-icon-span {
+					width: 40rpx;
+					height: 44rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+				
+				.check-label {
+					font-size: 28rpx;
+					color: var(--ui-BG-Main);
+					margin-left: 5px;
+				}
+			}
+			
+			.price-box {
+				font-size: 26rpx;
+				color: var(--ui-BG-Main);
+				
+				.num {
+					font-size: 40rpx;
+					margin-right: 2px;
+				}
+			}
+			
+		}
+		
+		.check-option:last-child {
+			margin-bottom: 0;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/rateList.vue b/pages/clerk/detail/components/rateList.vue
new file mode 100644
index 0000000..648d122
--- /dev/null
+++ b/pages/clerk/detail/components/rateList.vue
@@ -0,0 +1,125 @@
+<template>
+	  <view :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in orderList" class="card-box">
+	  	 <view class="avatar-box">
+			 <u-avatar v-if="item.anonymous" size="80"></u-avatar>
+			 <u-avatar v-else size="80" :src="item.userAvatar"></u-avatar>
+			 <view class="nickname-box">
+				 <view class="nickname">
+					 <text class="text">{{item.userNickname}}</text>
+					 <uni-rate :readonly="true" v-model="item.scores" size="14" />
+				 </view>
+				 <view class="time">{{item.createTimeStr}}</view>
+			 </view>
+		 </view>
+		 
+		 <view class="spu-box">
+			 <text class="tag">{{clerk.nickname}}</text>
+			 <text class="tag">服务类型：{{item.skuName}}</text>
+		 </view>
+		 
+		 <view class="content">
+			 <rich-text :nodes="item.content"></rich-text>
+		 </view>
+		 
+		 <view class="img-box" v-if="item.picUrls && item.picUrls.length > 0">
+			 <img-box :file="item.picUrls.join(',')"></img-box>
+		 </view>
+		 
+	  </view>
+  
+</template>
+
+<script>
+	import ImgBox from '@/pages/tabbar/components/trend/imgBox.vue';
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			ImgBox
+		},
+		props: {
+			clerk: {
+				type: Object,
+				default: {},
+			},
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			orderList() {
+				this.virtualList.forEach((order) => order.createTimeStr = sheep.$helper.timeFormat(order.createTime, 'yyyy-mm-dd'));
+				this.virtualList.forEach(function(e){
+					if(e.skuProperties){
+						var skuNameList = [];
+						e.skuProperties.forEach(function(sku){
+							skuNameList.push(sku.valueName);
+						});
+						e.skuName = skuNameList.join('-');
+					}
+				});
+				return this.virtualList; 
+			},
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card-box {
+		padding: 30rpx 20rpx;
+		border-bottom: 1rpx solid #eeeeee;
+	}
+	
+	.avatar-box {
+		display: flex;
+		align-items: center;
+		
+		.nickname-box {
+			font-size: 24rpx;
+			margin-left: 10px;
+			
+			.nickname {
+				letter-spacing: 0.0625rem;
+				display: flex;
+				align-items: center;
+				
+				.text {
+					letter-spacing: 2rpx;
+					margin-right: 10px;
+				}
+			}
+			
+			.time {
+				color: rgb(164, 164, 164);
+				font-size: 22rpx;
+				margin-top: 3px;
+			}
+		}
+	}
+	
+	.spu-box {
+		font-size: 24rpx;
+		color: rgb(164, 164, 164);
+		margin: 10px 0;
+		letter-spacing: 2rpx;
+		
+		.tag {
+			margin-right: 20rpx;
+		}
+	}
+	
+	.content {
+		font-size: 26rpx;
+		line-height: 180%;
+		white-space: pre-wrap;
+		letter-spacing: 2rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/starList.vue b/pages/clerk/detail/components/starList.vue
new file mode 100644
index 0000000..32ff751
--- /dev/null
+++ b/pages/clerk/detail/components/starList.vue
@@ -0,0 +1,310 @@
+<template>
+  <view>
+	  <view v-if="isGift" class="star-box">
+		 <view class="title-box">
+			 <view class="title">礼物墙</view>
+			 <view class="num">(已点亮：{{starNum}}/{{total}})</view>
+		 </view>
+		 
+		 <view class="list-box">
+			 <view @click="sendGift(item)" v-for="(item,index) in virtualList" :key="item.id" class="gift">
+			 	<view class="img-box">
+			 		<img class="img" :class="item.playStatus == 0 ? 'hui' : ''" :src="item.img"></img>
+					<view class="tag" v-if="item.giftType == 1">
+						<text>特效</text>
+						<text v-if="item.tag">·{{item.tag}}</text>
+					</view>
+					<view class="tag" v-if="item.giftType == 0 && item.tag">
+						<text>{{item.tag}}</text>
+					</view>
+			 	</view>
+			 	<view class="name">{{item.name}}</view>
+			 	<view class="price">x {{item.playNum}}</view>
+				<view class="btn" @tap.stop="openGift(item)" v-if="item.playStatus == 0">点亮</view>
+				<view class="btn" @tap.stop="openGift(item)" v-if="item.playStatus == 1">赠送</view>
+				<view class="btn" v-if="item.playStatus == 2">已下架</view>
+			 </view>
+		 </view>
+		 
+	  </view>
+	  
+	  
+	  <view class="svga-box" :class="giftFlag ? 'svga-show': 'svga-hide'">
+	  	<c-svga ref="cSvgaRef" :canvasId='canvasId' :src="src" :loops='0' :auto-play="false" @frame='onFrame' @finished='onFinished' @percentage='onPercentage' @loaded='onLoaded'></c-svga>
+	  	<view class="close-btn" @click="closeSvga">
+	  		<view class="bottom-box">
+	  			<view class="title">{{gift.name}}</view>
+	  			<view class="price">{{ fen2yuan(gift.money) }} 钻石</view>
+	  			<view class="btn-box">
+	  				<view class="btn" @click="cannel">取消</view>
+	  				<view v-if="gift.playStatus == 0" class="btn active" @click="ok">点亮</view>
+					<view v-if="gift.playStatus == 1" class="btn active" @click="ok">赠送</view>
+	  			</view>
+	  		</view>
+	  	</view>
+	  </view>
+  </view>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				giftFlag: false,
+				src: '',
+				canvasId: 'myCanvas',
+				
+				gift: {},
+			}
+		},
+		computed: {
+			starNum() {
+				var count = 0;
+				this.virtualList.forEach(e => {
+					if(e.playStatus > 0){
+						count ++;
+					}
+				});
+				return count;
+			},
+			total() {
+				return this.virtualList.length;
+			},
+			isGift() {
+				return sheep.$store('user').tradeConfig.giftEnabled;
+			},
+		},
+		methods: {
+			sendGift(e) {
+				this.gift = e;
+				
+				if(e.giftType == 0){
+					// 普通礼物不播放
+					this.$emit('openGift', this.gift); 
+					return;
+				}
+				
+				this.src = e.pic;
+				this.giftFlag = true;
+			},
+			onFinished() {
+				this.giftFlag = false;
+				console.log('动画停止播放时回调');
+			},
+			onFrame(frame) {//动画播放至某帧后回调
+				// console.log(frame);
+			},
+			onPercentage(percentage) { //动画播放至某进度后回调
+				// console.log(percentage);
+			},
+			onLoaded() {
+				this.$refs.cSvgaRef.call('setContentMode', 'AspectFill');
+				console.log('加载完成');
+				this.$refs.cSvgaRef.call('startAnimation');
+			},
+			closeSvga() {
+				this.src = "";
+				this.$refs.cSvgaRef.call('stopAnimation');
+				this.giftFlag = false;
+			},
+			fen2yuan(price) {
+			  var f = 0;
+			  var p = (price / 100.0).toFixed(0);
+			  var p1 = (price / 100.0).toFixed(1);
+			  var p2 = (price / 100.0).toFixed(2);
+			  if(p*100 == price){
+				f = 0;  
+			  }else if(p1*100 == price){
+				  f = 1;
+			  }else if(p2*100 == price){
+				  f = 2;
+			  }
+			  return (price / 100.0).toFixed(f)
+			},
+			cannel() {
+				this.closeSvga();
+			},
+			ok() {
+				this.closeSvga();
+				this.$emit('openGift', this.gift);
+			},
+			openGift(e) {
+				this.$emit('openGift', e);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.star-box {
+		padding: 30rpx 20rpx;
+		
+		.title-box {
+			display: flex;
+			align-items: center;
+			
+			.title {
+				font-size: 28rpx;
+				margin-right: 10px;
+			}
+			
+			.num {
+				font-size: 24rpx;
+				color: var(--ui-BG-Main);
+			}
+		}
+		
+		.list-box {
+			display: flex;
+			flex-wrap: wrap;
+			padding-top: 30rpx;
+			
+			.gift {
+				width: 25%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				margin: 20rpx 0px;
+				
+				.img-box {
+					position: relative;
+						
+					.img{
+						max-width: 150rpx;
+						height: 150rpx;
+					}
+					
+					.hui {
+						filter: grayscale(100%);
+					}
+					
+					.tag {
+						position: absolute;
+						top: 0;
+						right: 0;
+						font-size: 16rpx;
+						color: #fff;
+						background-color: var(--ui-BG-Main);
+						border-radius: 40px;
+						padding: 2rpx 8rpx;
+					}
+				}
+				
+				.name {
+					font-size: 24rpx;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					max-width: 150rpx;
+					margin-top: 2px;
+					margin-bottom: 7px;
+				}
+				
+				.price {
+					font-size: 20rpx;
+					color: var(--ui-BG-Main);
+					margin-bottom: 7px;
+				}
+				
+				.btn {
+					border: 1px solid var(--ui-BG-Main);
+					border-radius: 40px;
+					color: var(--ui-BG-Main);
+					padding: 8rpx 20rpx;
+					font-size: 24rpx;
+				}
+			}
+		}
+		
+		
+		
+	}
+	
+	.svga-box {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999999999;
+		width: 100%;
+		height: 100%;
+		background-color: black;
+		
+		.close-btn {
+			color: #fff;
+			position: absolute;
+			z-index: 999999999;
+			padding: 5px 10px;
+			
+			left: 0;
+			right: 0;
+			bottom: 100rpx;
+			
+			.bottom-box {
+				display: flex;
+				justify-content: center;
+				flex-direction: column;
+				align-items: center;
+				
+				.title {
+					font-size: 28rpx;
+					margin-bottom: 5px;
+				}
+				
+				.price {
+					font-size: 24rpx;
+				}
+				
+				.btn-box {
+					display: flex;
+					align-items: center;
+					margin-top: 10px;
+					
+					.btn {
+						border: 1px solid #fff;
+						font-size: 28rpx;
+						padding: 20rpx 110rpx;
+						border-radius: 40px;
+						margin: 15px;
+						color: #fff;
+					}
+					
+					.active {
+						border: 1px solid var(--ui-BG-Main);
+						background-color: var(--ui-BG-Main);
+					}
+				}
+			}
+		}
+	}
+	
+	.svga-hide {
+		/* #ifdef MP */
+		transform: translate(-100%, 0);
+		/* #endif */
+		
+		/* #ifndef MP */
+		display: none;
+		/* #endif */
+	}
+	
+	.svga-show {
+		/* #ifdef MP */
+		transform: translate(0, 0);
+		/* #endif */
+		
+		/* #ifndef MP */
+		display: block;
+		/* #endif */
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/stickyBox.vue b/pages/clerk/detail/components/stickyBox.vue
new file mode 100644
index 0000000..089eda2
--- /dev/null
+++ b/pages/clerk/detail/components/stickyBox.vue
@@ -0,0 +1,64 @@
+<template>
+	<view>
+		<view class="sticky-box">
+			<view>
+				<tui-tabs :tabs="tabList" badgeBgColor="var(--ui-BG-Main)" selectedColor="var(--ui-BG-Main)" sliderBgColor="var(--ui-BG-Main)" :currentTab="currentTab" @change="change"></tui-tabs>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import tuiTabs from "@/components/thorui/tui-tabs/tui-tabs.vue"
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			tuiTabs,
+		},
+		props: {
+			clerk: {
+				type: Object,
+				default: {},
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			tabList() {
+				var tabs = [{
+					name: '礼物墙'
+				},{
+					name: '价格'
+				}, {
+					name: '动态',
+					num: this.clerk.trendNum,
+				}, {
+					name: '评价',
+					num: this.clerk.commentNum,
+				}];
+				return tabs;
+			},
+			currentTab() {
+				return sheep.$store('sys').clerkTabIndex;
+			},
+		},
+		created() {
+			
+		},
+		methods: {
+			change(e) {
+				this.$emit('change', e.index);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.sticky-box {
+		background-color: #fff;
+		padding: 5px 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/table-bd.vue b/pages/clerk/detail/components/table-bd.vue
new file mode 100644
index 0000000..8819269
--- /dev/null
+++ b/pages/clerk/detail/components/table-bd.vue
@@ -0,0 +1,100 @@
+<template>
+  <view class="tn-table-class tn-table" :class="[tableClass]" :style="[tableStyle]">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'table-bd',
+    props: {
+      // 边框宽度
+      borderWidth: {
+        type: [String, Number],
+        default: ''
+      },
+      // 边框颜色
+      borderColor: {
+        type: String,
+        default: ''
+      },
+      // 显示上边框
+      borderTop: {
+        type: Boolean,
+        default: true
+      },
+      // 显示右边框
+      borderRight: {
+        type: Boolean,
+        default: false
+      },
+      // 显示下边框
+      borderBottom: {
+        type: Boolean,
+        default: false
+      },
+      // 显示左边框
+      borderLeft: {
+        type: Boolean,
+        default: true
+      }
+    },
+    computed: {
+      parentData() {
+        return [this.borderWidth, this.borderColor]
+      },
+      tableClass() {
+        let clazz = ''
+        return clazz
+      },
+      tableStyle() {
+        let style = {}
+        if (this.borderWidth !== '') {
+          style.borderWidth = this.borderWidth + 'rpx'
+        }
+        if (this.borderColor) {
+          style.borderColor = this.borderColor
+        }
+        if (this.borderLeft) {
+          style.borderLeftStyle = 'solid'
+        }
+        if (this.borderRight) {
+          style.borderRightStyle = 'solid'
+        }
+        if (this.borderTop) {
+          style.borderTopStyle = 'solid'
+        }
+        if (this.borderBottom) {
+          style.borderBottomStyle = 'solid'
+        }
+        return style
+      }
+    },
+    data() {
+      return {}
+    },
+    created() {
+      this.children = []
+    },
+    watch: {
+      parentData() {
+        // 更新子组件的数据
+        if (this.children.length) {
+          this.children.map((child) => {
+            typeof(child.updateParentData) === 'function' && child.updateParentData()
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-table {
+    box-sizing: border-box;
+    width: 100%;
+    border-width: 1rpx;
+    border-style: none;
+    border-color: var(--ui-BG-Main);;
+  }
+</style>
diff --git a/pages/clerk/detail/components/table-td.vue b/pages/clerk/detail/components/table-td.vue
new file mode 100644
index 0000000..13c6ea3
--- /dev/null
+++ b/pages/clerk/detail/components/table-td.vue
@@ -0,0 +1,305 @@
+<template>
+  <view class="tn-td-class tn-td" :class="[tdClass]" :style="[tdStyle]" @tap.stop="handleClick">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'table-td',
+    options: {
+    	// 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现(不会出现shadow节点下再去创建元素)
+    	virtualHost: true
+    },
+    props: {
+      // 占整个表格的宽度跨度
+      // [1-24]
+      span: {
+        type: Number,
+        default: 24
+      },
+      // 宽度
+      // 优先级比span高
+      width: {
+        type: [String, Number],
+        default: ''
+      },
+      // 高度
+      height: {
+        type: [String, Number],
+        default: ''
+      },
+      // 字体加粗
+      bold: {
+        type: Boolean,
+        default: false
+      },
+      // 格内边距
+      padding: {
+        type: String,
+        default: ''
+      },
+      // 边框颜色
+      borderColor: {
+        type: String,
+        default: ''
+      },
+      // 边框宽度
+      borderWidth: {
+        type: [String, Number],
+        default: ''
+      },
+      // 左边框
+      borderLeft: {
+        type: Boolean,
+        default: false
+      },
+      // 下边框
+      borderBottom: {
+        type: Boolean,
+        default: false
+      },
+      // 右边框
+      borderRight: {
+        type: Boolean,
+        default: true
+      },
+      // 文字超出隐藏
+      ellipsis: {
+        type: Boolean,
+        default: false
+      },
+      // 文本对齐方式
+      // left center right
+      textAlign: {
+        type: String,
+        default: 'left'
+      },
+      // 排列方式
+      // left center right
+      alignItems: {
+        type: String,
+        default: 'left'
+      },
+      // 收缩表格
+      shrink: {
+        type: Boolean,
+        default: true
+      },
+      // 铺满剩余空间
+      grow: {
+        type: Boolean,
+        default: false
+      },
+      // 隐藏
+      hidden: {
+        type: Boolean,
+        default: false
+      },
+      // 固定列数据
+      fixed: {
+        type: Boolean,
+        default: false
+      },
+      // zIndex
+      zIndex: {
+        type: Number,
+        default: 0
+      },
+      // 列数
+      index: {
+        type: [String, Number],
+        default: 0
+      },
+      // keys
+      keys: {
+        type: [String, Number],
+        default: ''
+      }
+    },
+    computed: {
+      tdClass() {
+        let clazz = ''
+        clazz += `${this.ellipsis ? 'tn-td--ellipsis' : 'tn-td--normal'}`
+       /* if (this.backgroundColorClass) {
+          clazz += ` ${this.backgroundColorClass}`
+        }
+        if (this.fontColorClass) {
+          clazz += ` ${this.fontColorClass}`
+        } */
+        if (this.alignItems) {
+          clazz += ` tn-td--${this.alignItems}`
+        }
+        if (this.textAlign) {
+          clazz += ` tn-td__text--${this.textAlign}`
+        }
+        if (!this.shrink) {
+          clazz += ' tn-td--shrink'
+        }
+        if (this.grow) {
+          clazz += ' tn-td--grow'
+        }
+        if (this.hidden) {
+          clazz += ' tn-td--hidden'
+        }
+        return clazz
+      },
+      tdStyle() {
+        let style = {}
+        /* if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        } */
+       /* if (this.fontColorStyle) {
+          style.color = this.fontColorStyle
+        } */
+        /* if (this.fontSizeStyle) {
+          style.fontSize = this.fontSizeStyle
+        } */
+        style.width = this.getWidth()
+        if (this.height) {
+          style.height = this.height + 'rpx';
+        }
+        style.fontWeight = this.bold ? 'bold' : 'normal'
+        if (this.padding) {
+          style.padding = this.padding
+        }
+        if (this.borderWidth !== '' || this.parentData.borderWidthValue !== '') {
+          style.borderWidth = this.borderWidth !== '' ? this.borderWidth+'rpx' : this.parentData.borderWidthValue + 'rpx'
+        }
+        if (this.borderColor || this.parentData.borderColorValue) {
+          style.borderColor = this.borderColor || this.parentData.borderColorValue
+        }
+        if (this.borderLeft) {
+          style.borderLeftStyle = 'solid'
+        }
+        if (this.borderRight) {
+          style.borderRightStyle = 'solid'
+        }
+        if (this.borderBottom) {
+          style.borderBottomStyle = 'solid'
+        }
+        if (this.fixed) {
+          style.zIndex = this.zIndex ? this.zIndex : 1000
+        }
+        return style
+      }
+    },
+    data() {
+      return {
+        parentData: {
+          borderColorValue: null,
+          borderWidthValue: null
+        }
+      }
+    },
+    created() {
+      this.parent = false
+      this.updateParentData()
+      this.parent && this.parent.children.push(this)
+    },
+    methods: {
+      // 获取表格宽度
+      getWidth() {
+        if (this.width) {
+          return this.width + 'rpx'
+        }
+        return [
+          '4.16666667%',
+          '8.33333333%',
+          '12.5%',
+          '16.66666667%',
+          '20.83333333%',
+          '25%',
+          '29.16666667%',
+          '33.33333333%',
+          '37.5%',
+          '41.66666667%',
+          '45.83333333%',
+          '50%',
+          '54.16666667%',
+          '58.33333333%',
+          '62.5%',
+          '66.66666667%',
+          '70.83333333%',
+          '75%',
+          '79.16666667%',
+          '83.33333333%',
+          '87.5%',
+          '91.66666667%',
+          '95.83333333%',
+          '100%'
+        ][this.span - 1]
+      },
+      // 点击事件
+      handleClick() {
+        this.$emit('click', {
+          index: this.index,
+          key: this.keys
+        })
+      },
+      // 更新父组件信息
+      updateParentData() {
+        this.getParentData('tn-tr')
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-td {
+    box-sizing: border-box;
+    position: relative;
+    word-break: break-all;
+    background-color: transparent;
+    height: auto;
+    padding: 12rpx;
+    
+    border-width: 1rpx;
+    border-style: none;
+    border-color: var(--ui-BG-Main);
+    
+    &--normal {
+      display: inline-flex;
+      align-items: center;
+    }
+    &--ellipsis {
+      display: inline-block;
+      overflow: hidden;
+      white-space: nowrap !important;
+      text-overflow: ellipsis;
+    }
+    
+    &--shrink {
+      flex-shrink: 0;
+    }
+    &--grow {
+      flex-grow: 1;
+    }
+    
+    &--left {
+      justify-content: flex-start;
+    }
+    &--center {
+      justify-content: center;
+    }
+    &--right {
+      justify-content: flex-end;
+    }
+    
+    &__text {
+      &--left {
+        text-align: left;
+      }
+      &--center {
+        text-align: center;
+      }
+      &--right {
+        text-align: right;
+      }
+    }
+    
+    &--hidden {
+      visibility: hidden;
+    }
+  }
+</style>
diff --git a/pages/clerk/detail/components/table-tr.vue b/pages/clerk/detail/components/table-tr.vue
new file mode 100644
index 0000000..2b12c95
--- /dev/null
+++ b/pages/clerk/detail/components/table-tr.vue
@@ -0,0 +1,208 @@
+<template>
+  <view class="tn-tr-class tn-tr" :class="[trClass]" :style="[trStyle]">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'table-tr',
+    options: {
+    	// 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现(不会出现shadow节点下再去创建元素)
+    	virtualHost: true
+    },
+    props: {
+      // 宽度
+      width: {
+        type: [String, Number],
+        default: ''
+      },
+      // 边框颜色
+      borderColor: {
+        type: String,
+        default: ''
+      },
+      // 边框宽度
+      borderWidth: {
+        type: [String, Number],
+        default: ''
+      },
+      // 左边框
+      borderLeft: {
+        type: Boolean,
+        default: false
+      },
+      // 上边框
+      borderTop: {
+        type: Boolean,
+        default: false
+      },
+      // 换行显示
+      wrap: {
+        type: Boolean,
+        default: false
+      },
+      // 固定表格
+      fixed: {
+        type: Boolean,
+        default: false
+      },
+      // left偏移值
+      left: {
+        type: [String, Number],
+        default: 0
+      },
+      // right偏移值
+      right: {
+        type: [String, Number],
+        default: 0
+      },
+      // top偏移值(自定义顶部导航栏时用到)
+      top: {
+        type: [String, Number],
+        default: 0
+      },
+      // 外边距
+      margin: {
+        type: String,
+        default: ''
+      },
+      // zIndex
+      zIndex: {
+        type: Number,
+        default: 0
+      },
+      // 行数索引
+      index: {
+        type: [String, Number],
+        default: 0
+      },
+      // 参数
+      params: {
+        type: String,
+        default: ''
+      }
+    },
+    computed: {
+      borderWidthValue() {
+        return this.borderWidth || this.parentData.borderWidth || ''
+      },
+      borderColorValue() {
+        return this.borderColor || this.parentData.borderColor || ''
+      },
+      trClass() {
+        let clazz = ''
+        /* if (this.backgroundColorClass) {
+          clazz += ` ${this.backgroundColorClass}`
+        }
+        if (this.fontColorClass) {
+          clazz += ` ${this.fontColorClass}`
+        } */
+        if (this.wrap) {
+          clazz += ' tn-tr--wrap'
+        }
+        if (this.fixed) {
+          clazz += ' tn-tr--fixed'
+        }
+        return clazz
+      },
+      trStyle() {
+        let style = {}
+        if (this.width) {
+          style.width = this.width + 'rpx'
+        }
+        /* if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        if (this.fontColorStyle) {
+          style.color = this.fontColorStyle
+        }
+        if (this.fontSizeStyle) {
+          style.fontSize = this.fontSizeStyle
+        } */
+        if (this.borderWidth !== '' || this.parentData.borderWidth !== '') {
+          style.borderWidth = this.borderWidth !== '' ? this.borderWidth + 'rpx' : this.parentData.borderWidth + 'rpx'
+        }
+        if (this.borderColor || this.parentData.borderColor) {
+          style.borderColor = this.borderColor || this.parentData.borderColor
+        }
+        if (this.borderLeft) {
+          style.borderLeftStyle = 'solid'
+        }
+        if (this.borderTop) {
+          style.borderTopStyle = 'solid'
+        }
+        if (this.fixed) {
+          style.left = this.left ? this.left + 'rpx' : 'auto'
+          style.right = this.right ? this.right + 'rpx' : 'auto'
+          style.top = this.top ? this.top + 'rpx' : 'auto'
+        }
+        if (this.margin) {
+          style.margin = this.margin
+        }
+        style.zIndex = this.zIndex ? this.zIndex : 1000
+        return style
+      }
+    },
+    data() {
+      return {
+        parentData: {
+          borderColor: null,
+          borderWidth: null
+        }
+      }
+    },
+    watch: {
+      parentData: {
+        handler() {
+          // 更新子组件的数据
+          if (this.children.length) {
+            this.children.map((child) => {
+              typeof(child.updateParentData) === 'function' && child.updateParentData()
+            })
+          }
+        },
+        deep: true
+      }
+    },
+    created() {
+      this.children = []
+      this.parent = false
+      this.updateParentData()
+      this.parent && this.parent.children.push(this)
+    },
+    methods: {
+      handleClick() {
+        this.$emit('click', {
+          index: this.index,
+          params: this.params
+        })
+      },
+      // 更新父组件信息
+      updateParentData() {
+        this.getParentData('tn-table')
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-tr {
+    width: 100%;
+    display: flex;
+    box-sizing: border-box;
+    background-color: #FFFFFF;
+    
+    border-width: 1rpx;
+    border-style: none none solid none;
+    border-color: var(--ui-BG-Main);;
+    
+    &--wrap {
+      flex-wrap: wrap;
+    }
+    
+    &--fixed {
+      position: fixed;
+    }
+  }
+</style>
diff --git a/pages/clerk/detail/components/tableList.vue b/pages/clerk/detail/components/tableList.vue
new file mode 100644
index 0000000..50ddbde
--- /dev/null
+++ b/pages/clerk/detail/components/tableList.vue
@@ -0,0 +1,98 @@
+<template>
+	<view>
+		
+		<table-bd style="width: 100%;">
+		  <table-tr>
+		    <table-td :span="18" height="80rpx" :fontSize="30" :bold="true" fontColor="#01BEFF" alignItems="center">服务项目</table-td>
+			<table-td :span="6" height="80rpx" :fontSize="30" :bold="true" fontColor="#01BEFF" alignItems="center">价格</table-td>
+		  </table-tr>
+		  
+		  <block v-for="(tb,t) in tableList">
+			  <table-tr>
+			    <table-td :span="6" alignItems="center">{{tb.name}}</table-td>
+				
+				<block v-if="tb.goodsList">
+					<table-td :span="12" :ellipsis="true" padding="0">
+						<block v-for="(tb2,t2) in tb.goodsList">
+						  <table-tr :borderWidth="t2 == tb.goodsList.length-1 ? 0 : 1">
+							<table-td :span="24" :borderRight="false" alignItems="center">{{tb2.name}}</table-td>
+						  </table-tr>
+						</block>
+					</table-td>
+					<table-td :span="6" :ellipsis="true" padding="0">
+						<block v-for="(tb2,t2) in tb.goodsList">
+							<table-tr :borderWidth="t2 == tb.goodsList.length-1 ? 0 : 1">
+							  <table-td  :span="24" borderWidth="1rpx" :borderRight="false" alignItems="center">{{ fen2yuan(tb2.price) }}</table-td>
+							</table-tr>
+						</block>
+					</table-td>
+				</block>
+			  	
+			  	<block v-if="tb.categoryList">
+					<table-td :span="12" :ellipsis="true" padding="0">
+						<block v-for="(tb2,t2) in tb.categoryList">
+							<table-tr :borderWidth="t2 == tb.categoryList.length-1 ? 0 : 1">
+							  <table-td :span="12" borderWidth="1rpx" alignItems="center">{{tb2.name}}</table-td>
+							  <table-td :span="12" :ellipsis="true" :borderRight="false" padding="0">
+								  <block v-for="(tb3,t3) in tb2.goodsList">
+									  <table-tr :borderWidth="t3 == tb2.goodsList.length-1 ? 0 : 1">
+										<table-td :span="24" :borderRight="false" alignItems="center">{{tb3.name}}</table-td>
+									  </table-tr>
+								  </block>
+							  </table-td>
+							</table-tr>
+						</block>
+					</table-td>
+					
+					<table-td :span="6" :ellipsis="true" padding="0">
+						<block v-for="(tb2,t2) in tb.categoryList">
+							<block v-for="(tb3,t3) in tb2.goodsList">
+								<table-tr :borderWidth="t2 == tb.categoryList.length-1 && t3 == tb2.goodsList.length-1 ? 0 : 1">
+								  <table-td  :span="24" borderWidth="1rpx" :borderRight="false" alignItems="center">{{ fen2yuan(tb3.price) }}</table-td>
+								</table-tr>
+							</block>
+						</block>
+					</table-td>
+				</block>
+				
+			  </table-tr>
+		  </block>
+		
+		</table-bd>
+		
+		
+	</view>
+</template>
+
+<script>
+	import TableBd from '@/pages/clerk/detail/components/table-bd.vue';
+	import TableTd from '@/pages/clerk/detail/components/table-td.vue';
+	import TableTr from '@/pages/clerk/detail/components/table-tr.vue';
+	export default {
+		components: {
+			TableBd,
+			TableTd,
+			TableTr,
+		},
+		props: {
+			tableList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+			
+			}
+		},
+		methods: {
+			fen2yuan(price) {
+			  return (price / 100.0).toFixed(0)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/userBox.vue b/pages/clerk/detail/components/userBox.vue
new file mode 100644
index 0000000..3e6ce6f
--- /dev/null
+++ b/pages/clerk/detail/components/userBox.vue
@@ -0,0 +1,270 @@
+<template>
+	<view class="user-box" :style="`background-size: contain;background-image: url(${clerk.avatar});`">
+		<view class="info-box" :style="{ paddingTop: paddingTop + 20 + 'px'}">
+			<view class="avatar-box">
+				<view class="avatar-span">
+					<u-image width="100%" height="100%" shape="circle" :src="clerk.avatar"></u-image>
+					<view class="fans-btn" @click="fans(clerk)">
+						<u-icon v-if="clerk.isFans" color="var(--ui-BG-Main)" name="checkmark-circle-fill" size="46"></u-icon>
+						<u-icon v-else color="var(--ui-BG-Main)" name="plus-circle-fill" size="46"></u-icon>
+					</view>
+				</view>
+				<view class="right-box">
+					<view class="nickname-box">
+						<view class="nickname">{{clerk.nickname}}</view>
+						<view class="icon">
+							 <u-icon name="wode_duanwei" size="36" custom-prefix="iconfont"></u-icon>
+							 <text>{{clerkLevel.name}}</text>
+						</view>
+					</view> 
+					<view class="online" v-if="clerk.onlineStatus">可接单</view>
+					<view class="online" v-else>休息中</view>
+				</view>
+			</view>
+			<view class="sex-box">
+				<view class="span" v-if="clerk.sex == 1">
+					<u-icon name="ziyuan2" color="#f898c5" size="34" custom-prefix="iconfont"></u-icon>
+				</view>
+				<view class="span" v-if="clerk.sex == 0">
+					<u-icon name="ziyuan3" color="#0081ff" size="34" custom-prefix="iconfont"></u-icon>
+				</view>
+				<view class="span">{{clerk.age}}</view>
+				<!-- <view class="span">{{clerk.city}}</view> -->
+			</view>
+			<view class="sign-box">{{clerk.intro}}</view>
+			<view class="voice-box" v-if="clerk.sound">
+				<view class="voice-span">
+					<voice-play :sec="clerk.soundTime" :src="clerk.sound"></voice-play>
+				</view>
+				<!-- <view class="span">全声线</view>
+				<view class="span">御姐音</view>
+				<view class="span">夹子音</view> -->
+			</view>
+			<view class="tag-list">
+				 <view class="tag-box">
+					 <span class="tag" v-for="(categoryName,index) in clerk.categoryNameList">{{categoryName}}</span>
+				 </view>
+			</view>
+			
+			<!-- <view class="tags-box">
+				<view class="span">搞笑</view>
+				<view class="span">风骚走位</view>
+				<view class="span">乖巧懂事🍑 极致体验</view>
+			</view> -->
+			
+			<photo-box v-if="clerk.albums" :dataList="clerk.albums.split(',')"></photo-box>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	import VoicePlay from '@/pages/clerk/detail/components/voicePlay.vue';
+	import PhotoBox from '@/pages/clerk/detail/components/photoBox.vue';
+	import sheep from '@/sheep';
+	import TrendApi from '@/sheep/api/worker/trend';
+	export default {
+		components: {
+			VoicePlay,
+			PhotoBox,
+		},
+		props: {
+			paddingTop: {
+				type: Number,
+				default: 0,
+			},
+			clerk: {
+				type: Object,
+				default: {},
+			},
+			clerkLevel: {
+				type: Object,
+				default: {},
+			},
+		},
+		data() {
+			return {
+				photo: 'http://cos.duopei.feiniaowangluo.com/34/clerk/1707236152609pJKyvtedS9.jpg,http://cos.duopei.feiniaowangluo.com/34/clerk/1720278125689P34fP9MU1c.jpg?imageView2/1/w/200/h/200',
+			}
+		},
+		methods: {
+			fans(e) {
+				TrendApi.createClerkFans({
+					workerClerkId: e.id,
+				}).then((res) => {
+					if(res){
+						if(e.isFans){
+							sheep.$helper.toast('取消关注');
+							e.isFans = false;
+						}else{
+							sheep.$helper.toast('关注成功');
+							e.isFans = true;
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.info-box {
+		backdrop-filter: blur(10px);
+		background-color: rgba(0, 0, 0, 0.5);
+		padding: 15px;
+		
+		.avatar-box {
+			display: flex;
+			align-items: center;
+			
+			.avatar-span {
+				border-radius: 100%;
+				width: 140rpx;
+				height: 140rpx;
+				border: 2px solid #fff;
+				position: relative;
+				
+				.fans-btn {
+					position: absolute;
+					right: 0;
+					bottom: 0;
+				}
+			}
+			
+			.right-box {
+				color: #fff;
+				display: flex;
+				justify-content: space-between;
+				flex: 1;
+				align-items: center;
+				margin-left: 10px;
+				
+				.nickname {
+					font-size: 34rpx;
+					font-weight: bold;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					max-width: 320rpx;
+				}
+				
+				.icon {
+					background-color: #ff5ebd;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border-radius: 40px;
+					font-weight: bold;
+					color: #fff;
+					font-size: 22rpx;
+					line-height: 22rpx;
+					padding: 5px 5px;
+					margin-top: 10px;
+				}
+				
+				.online {
+					border-bottom: 1px solid #fff;
+					font-size: 28rpx;
+				}
+			}
+		}
+		
+		.sex-box {
+			color: #fff;
+			display: flex;
+			align-items: center;
+			line-height: 30px;
+			
+			.span {
+				margin-right: 5px;
+				font-size: 26rpx;
+			}
+		}
+		
+		.sign-box {
+			color: #cfcfcf;
+			font-size: 28rpx;
+			margin-top: 10px;
+			margin-bottom: 10px;
+		}
+		
+		.voice-box {
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+			
+			.voice-span {
+				margin-bottom: 10px;
+				margin-right: 10px;
+			}
+			
+			.span {
+				padding: 10rpx 20rpx;
+				background-color: rgba(132, 167, 164, .81);
+				border-radius: 20px;
+				font-size: 24rpx;
+				margin-bottom: 10px;
+				margin-right: 10px;
+				color: #fff;
+			}
+		}
+		
+		.tags-box {
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+			margin: 5px 0;
+			
+			.span {
+				font-size: 20rpx;
+				color: #fff;
+				background-color: #000000;
+				border-radius: 999px;
+				padding: 3px 10px;
+				margin: 0 10px 10px 0;
+			}
+		}
+		
+		.tag-list {
+			display: flex;
+			margin: 5px 0;
+		}
+		
+		.tag-box {
+			display: inline-block;
+			align-items: center;
+			margin-bottom: 5px;
+			background-color: #eef2f26e;
+			border-radius: 3px;
+			color: #fff;
+			font-size: 12px;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+			max-width: 100%;
+			padding: 5px 0;
+			
+			.tag {
+				white-space: nowrap;
+				padding: 5px 5px;
+				position: relative;
+			}
+			
+			.tag:after {
+				content: ' ';
+				border-left: 1px solid #fff;
+				display: inline-block;
+				height: 10px;
+				position: absolute;
+				top: 50%;
+				transform: translateY(-50%);
+				right: 0;
+			}
+			
+			.tag:last-child:after{
+				display: none;
+			}
+		}
+		
+	}
+</style>
\ No newline at end of file
diff --git a/pages/clerk/detail/components/voicePlay.vue b/pages/clerk/detail/components/voicePlay.vue
new file mode 100644
index 0000000..4eee5b7
--- /dev/null
+++ b/pages/clerk/detail/components/voicePlay.vue
@@ -0,0 +1,183 @@
+<template>
+	<view class="voice-btn" @click="playBtn" :class="play?'audioplaying':''">
+		<img class="play-btn" src="@/static/images/audio.png"></img>
+		<view class="audio-box">
+			<view class="audio1 wave1"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio3 wave3"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio1 wave1"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio3 wave3"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio1 wave1"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio3 wave3"></view>
+			<view class="audio2 wave2"></view>
+		</view>
+		<view>{{sec}}"</view>
+	</view>
+</template>
+<script>
+const audio = uni.createInnerAudioContext();
+export default {
+	emits: ['playAudio'],
+	props: {
+		src: {
+			type: String,
+			default: '' 
+		},
+		sec: {
+			type: Number,
+			default: 0
+		},
+	},
+	data() {
+		return {
+			play: false,
+		};
+	},
+	methods: {
+		playBtn() {
+			if(this.play){
+				this.play = false;
+				audio.stop();
+				return;
+			}
+			this.play = true;
+			//语音自然播放结束
+			audio.onEnded((res) => {
+				this.play = false;
+			});
+			audio.src = this.src;
+			audio.play();
+		},
+	}
+};
+</script>
+<style lang="scss" scoped>
+view{
+	box-sizing: border-box;
+}
+.voice-btn {
+	background-color: #3cc9a4;
+	width: 140rpx;
+	border-radius: 20px;
+	padding: 10rpx 10rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	color: #fff;
+	font-size: 20rpx;
+}
+
+.play-btn {
+	width: 24rpx;
+	height: 24rpx;
+}
+
+.audio-box {
+	height: 20rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.audio1{
+    margin-right: 2rpx;
+	width: 1px;
+	height: 33.3%;
+	border-radius: 50px;
+	background-color: #fff;
+}
+
+.audio2{
+	margin-right: 2rpx;
+	width: 1px;
+	height: 66.6%;
+	border-radius: 50px;
+	background-color: #fff;
+}
+
+.audio3{
+	margin-right: 2rpx;
+	width: 1px;
+	height: 100%;
+	border-radius: 50px;
+	background-color: #fff;
+}
+
+.audioplaying .wave1 {
+	animation: wave1 1s linear 0s infinite;
+}
+
+.audioplaying .wave2 {
+	animation: wave2 1s linear 0s infinite;
+}
+
+.audioplaying .wave3 {
+	animation: wave3 1s linear 0s infinite;
+}
+
+@keyframes wave1{
+  0% {
+      width: 1px;
+      height: 33%;
+  }
+  25% {
+      width: 1px;
+      height: 66%;
+  }
+  50% {
+      width: 1px;
+      height: 100%;
+  }
+  75% {
+      width: 1px;
+      height: 66%;
+  }
+  100% {
+      width: 1px;
+      height: 33%;
+  }
+}
+
+@keyframes wave2{
+  0% {
+      width: 1px;
+      height: 66%;
+  }
+  25% {
+      width: 1px;
+      height: 33%;
+  }
+  50% {
+      width: 1px;
+      height: 66%;
+  }
+  75% {
+      width: 1px;
+      height: 100%;
+  }
+  100% {
+      width: 1px;
+      height: 66%;
+  }
+}
+
+@keyframes wave3{
+  0% {
+      width: 1px;
+      height: 100%;
+  }
+  50% {
+      width: 1px;
+      height: 33%;
+  }
+  100% {
+      width: 1px;
+      height: 100%;
+  }
+}
+
+</style>
diff --git a/pages/clerk/detail/index.vue b/pages/clerk/detail/index.vue
new file mode 100644
index 0000000..3f63706
--- /dev/null
+++ b/pages/clerk/detail/index.vue
@@ -0,0 +1,61 @@
+<template>
+	<view class="container page-app theme-light main-green font-1"> 
+		<layout ref="skill" title="选人下单"> 
+			    
+		</layout> 
+		
+		<s-auth-modal />
+		<s-menu-tools />
+	</view>
+</template>
+  
+<script>
+	import layout from '@/pages/clerk/detail/components/layout.vue';
+	import sheep from '@/sheep';
+	export default { 
+		components: {  
+			layout,
+		}, 
+		data() {
+			return {
+				
+			} 
+		}, 
+		// 分享小程序
+		onShareAppMessage(res) {
+			return {
+				title: this.shareInfo.title,
+				imageUrl: this.shareInfo.image,
+			};
+		},
+		onShareTimeline() {
+			return {
+				title: this.shareInfo.title,
+				imageUrl: this.shareInfo.image,
+			}
+		},
+		onLoad(options) {
+			this.$nextTick(() => {
+				this.$refs.skill.initData(options);
+			});
+		},
+		computed: {
+			shareInfo() {
+				return sheep.$platform.share.getShareInfo();
+			},
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background-color: #fff;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	
+</style>
\ No newline at end of file
diff --git a/pages/clerk/fans/components/layout.vue b/pages/clerk/fans/components/layout.vue
new file mode 100644
index 0000000..f0bb9d9
--- /dev/null
+++ b/pages/clerk/fans/components/layout.vue
@@ -0,0 +1,82 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" :auto="true" use-virtual-list :force-close-inner-list="true" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @scroll="scroll" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<su-navbar :title="title" statusBar></su-navbar>
+			</template>  
+			   
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<order-list :virtualList="virtualList"></order-list>
+			
+		</z-paging>
+		
+	</view>
+</template>
+
+<script>
+	import OrderList from '@/pages/clerk/fans/components/orderList.vue';
+	import ClerkApi from '@/sheep/api/worker/clerk';
+	import {
+	  fen2yuan,
+	} from '@/sheep/hooks/useGoods';
+	export default {
+		components: {
+			OrderList,
+		}, 
+		props: {
+			title: {
+				type: String,
+				default: '我收藏的店员',
+			},
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 0,
+				height: 0,
+			}
+		},
+		methods: {
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+				}
+				ClerkApi.getClerkFansPage(params).then(res => {
+					// 将请求的结果数组传递给z-paging
+					this.$refs.paging.complete(res.data.list); 
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
diff --git a/pages/clerk/fans/components/orderList.vue b/pages/clerk/fans/components/orderList.vue
new file mode 100644
index 0000000..adc3a4f
--- /dev/null
+++ b/pages/clerk/fans/components/orderList.vue
@@ -0,0 +1,212 @@
+<template>
+	  <view :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in orderList" class="order-card">
+		
+		<view class="main-box" :class="index == orderList.length-1 ? '':'bt'">
+			<view @click="detail(item)">
+				<u-avatar mode="square" size="170" :src="item.avatar"></u-avatar>
+			</view>
+			<view class="right-box">
+				<view class="nickname-box">
+					<view class="nickname">{{item.nickname}}</view>
+					<view class="oline" v-if="item.onlineStatus">
+						<tui-badge :scaleRatio="0.8" type="green" dot></tui-badge>
+						<text class="text">在线</text>
+					</view>
+					<view class="oline un" v-else>
+						<tui-badge :scaleRatio="0.8" type="gray" dot></tui-badge>
+						<text class="text">休息中</text>
+					</view>
+				</view>
+				<view class="city">{{item.city}}</view>
+				<view class="sex-box">
+					<view class="sex-tag">
+						<text class="tag" v-if="item.sex == 1">女</text>
+						<text class="tag" v-if="item.sex == 0">男</text>
+						<text class="tag">{{item.age}}岁</text>
+					</view>
+					<view class="fans-box" @click="fans(item)">
+						<view class="fans">{{item.fansNum}}人收藏</view>
+						<u-icon v-if="item.fans" name="star-fill" size="36" color="var(--ui-BG-Main)"></u-icon>
+						<u-icon v-else name="star" size="36" color="#ddd"></u-icon>
+					</view>
+				</view>
+				<view class="info">{{item.intro}}</view> 
+			</view>
+		</view>
+		
+	  </view>
+  
+</template>
+
+<script>
+	import TuiBadge from "@/components/thorui/tui-badge/tui-badge.vue";
+	import TrendApi from '@/sheep/api/worker/trend';
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			TuiBadge,
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			orderList() {
+				return this.virtualList;
+			},
+		},
+		methods: {
+			fans(e) {
+				TrendApi.createClerkFans({
+					workerClerkId: e.workerClerkId,
+				}).then((res) => {
+					if(res){
+						if(e.fans){
+							sheep.$helper.toast('取消收藏');
+							e.fans = false;
+						}else{
+							sheep.$helper.toast('收藏成功');
+							e.fans = true;
+						}
+					}
+				});
+			},
+			detail(e) {
+				this.$u.route({
+					url: 'pages/clerk/detail/index',
+					params: {
+						id: e.workerClerkId,
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.order-card {
+		padding: 0 10px;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		
+		.main-box {
+			display: flex;
+			padding: 10px 0;
+			
+			.right-box {
+				display: flex;
+				justify-content: center;
+				flex: 1;
+				margin-left: 10px;
+				flex-direction: column;
+				
+				.nickname-box {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 20rpx;
+					
+					.nickname {
+						font-size: 28rpx;
+					}
+					
+					.oline {
+						display: flex;
+						align-items: center;
+						
+						.text {
+							font-size: 24rpx;
+							margin-left: 10rpx;
+						}
+					}
+					
+					.un {
+						color: rgb(100, 101, 102);
+					}
+				}
+				
+				.city {
+					font-size: 24rpx;
+					margin-bottom: 10rpx;
+				}
+				
+				.sex-box {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 18rpx;
+					
+					.sex-tag {
+						font-size: 24rpx;
+						
+						.tag {
+							margin-right: 20rpx;
+						}
+					}
+					
+					.fans-box {
+						display: flex;
+						align-items: center;
+						
+						.fans {
+							font-size: 22rpx;
+							color: rgb(100, 101, 102);
+							margin-right: 10rpx;
+						}
+					}
+				}
+				
+				.info {
+					font-size: 24rpx;
+					color: rgb(100, 101, 102);
+					line-height: 22rpx;
+					margin-bottom: 10rpx;
+					display: flex;
+					align-items: center;
+				}
+				
+			}
+		}
+		
+		.bt {
+			border-bottom: 1px solid #fbf0f0;
+		}
+		
+		.bottom-box {
+			display: flex;
+			justify-content: flex-end;
+			
+			.btn-box {
+				display: flex;
+				align-items: center;
+			}
+			
+			.btn {
+				background-color: #ddd;
+				color: rgb(100, 101, 102);
+				font-size: 22rpx;
+				border-radius: 40px;
+				padding: 5px 10px;
+				margin-left: 10px;
+				min-width: 140rpx;
+				display: flex;
+				justify-content: center;
+			}
+			
+			.active {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+			}
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/clerk/fans/list.vue b/pages/clerk/fans/list.vue
new file mode 100644
index 0000000..6825d61
--- /dev/null
+++ b/pages/clerk/fans/list.vue
@@ -0,0 +1,40 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<layout ref="order"></layout>
+		
+		<s-menu-tools />
+		<s-auth-modal />
+	</view>
+</template>
+
+<script>
+	import layout from '@/pages/clerk/fans/components/layout.vue';
+	export default { 
+		components: {
+			layout,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		onLoad(options) {
+		
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fafafa;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/commission/commission-ranking.vue b/pages/commission/commission-ranking.vue
new file mode 100644
index 0000000..d8dd4ab
--- /dev/null
+++ b/pages/commission/commission-ranking.vue
@@ -0,0 +1,249 @@
+<!-- 佣金排行榜 -->
+<template>
+	<s-layout title="佣金排行榜">
+		<view class="CommissionRank">
+			<view class="header">
+				<view class="rank" v-if="state.position">
+					您目前的排名
+					<text class="num">{{ state.position }}</text> 名
+				</view>
+				<view class="rank" v-else>您目前暂无排名</view>
+			</view>
+			<view class="wrapper">
+				<view class="nav acea-row row-around" style="justify-content: space-around; display: flex">
+					<view class="item" :class="state.currentTab === index ? 'font-color' : ''"
+						v-for="(item, index) in tabMaps" :key="index" @click="switchTap(index)">
+						{{ item }}
+					</view>
+				</view>
+				<view class="list">
+					<view class="item acea-row row-between-wrapper" v-for="(item, index) in state.rankList"
+						:key="index">
+						<view class="num" v-if="index <= 2">
+							<image :src="'/static/images/medal0' + (index + 1) + '.png'" />
+						</view>
+						<view class="num" v-else>
+							{{ index + 1 }}
+						</view>
+						<view class="picTxt acea-row row-between-wrapper">
+							<view class="pictrue">
+								<image :src="item.avatar" />
+							</view>
+							<view class="text line1">{{ item.nickname }}</view>
+						</view>
+						<view class="people font-color">￥{{ fen2yuan(item.brokeragePrice) }}</view>
+					</view>
+				</view>
+				<view class="noCommodity"
+					v-if="state.rankList.length === 0 && (state.page !== 1 || state.active === 0)">
+					<emptyPage title="暂无排行～" />
+				</view>
+			</view>
+		</view>
+	</s-layout>
+</template>
+
+<script setup>
+	import sheep from '@/sheep';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	import {
+		reactive
+	} from 'vue';
+	import BrokerageApi from '@/sheep/api/trade/brokerage';
+	import {
+		fen2yuan
+	} from '@/sheep/hooks/useGoods';
+
+	const tabMaps = ['周排行', '月排行'];
+
+	const state = reactive({
+		currentTab: 0,
+		position: 0, // 排名
+		rankList: [],
+	});
+
+	async function switchTap(index) {
+		state.currentTab = index;
+		state.rankList = [];
+		calculateTimes();
+		getBrokerageRankList();
+		getBrokerageRankNumber();
+	}
+
+	async function getBrokerageRankList() {
+		const {
+			code,
+			data
+		} = await BrokerageApi.getBrokerageUserChildSummaryPageByPrice({
+			pageNo: 1,
+			pageSize: 10,
+			'times[0]': state.times[0],
+			'times[1]': state.times[1],
+		});
+		if (code !== 0) {
+			return;
+		}
+		state.rankList = data.list;
+	}
+
+	async function getBrokerageRankNumber() {
+		const {
+			code,
+			data
+		} = await BrokerageApi.getRankByPrice({
+			times: state.times,
+		});
+		if (code !== 0) {
+			return;
+		}
+		state.position = data;
+	}
+
+	function formatDate(date) {
+		return sheep.$helper.timeFormat(date, 'yyyy-mm-dd hh:MM:ss');
+	}
+
+	function calculateTimes() {
+		let times;
+		if (state.currentTab === 0) {
+			times = getWeekTimes();
+		} else {
+			times = getMonthTimes();
+		}
+		state.times = [formatDate(times[0]), formatDate(times[1])];
+	}
+
+	onLoad(function() {
+		calculateTimes();
+		getBrokerageRankList();
+		getBrokerageRankNumber();
+	});
+
+	// TODO 芋艿：此处可考虑抽离
+	/**
+	 * 获得当前周的开始和结束时间
+	 */
+	function getWeekTimes() {
+		const today = new Date();
+		const dayOfWeek = today.getDay();
+		return [
+			new Date(today.getFullYear(), today.getMonth(), today.getDate() - dayOfWeek, 0, 0, 0),
+			new Date(
+				today.getFullYear(),
+				today.getMonth(),
+				today.getDate() + (6 - dayOfWeek),
+				23,
+				59,
+				59,
+			),
+		];
+	}
+
+	/**
+	 * 获得当前月的开始和结束时间
+	 */
+	function getMonthTimes() {
+		const today = new Date();
+		const year = today.getFullYear();
+		const month = today.getMonth();
+		const startDate = new Date(year, month, 1, 0, 0, 0);
+		const nextMonth = new Date(year, month + 1, 1);
+		const endDate = new Date(nextMonth.getTime() - 1);
+		return [startDate, endDate];
+	}
+
+	// TODO 芋艿：css 需要优化下；并且展示样式有问题
+</script>
+<style lang="scss" scoped>
+	.CommissionRank .header {
+		background: url('data:image/jpeg;base64,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') no-repeat;
+		width: 100%;
+		height: 344rpx;
+		background-size: 100% 100%;
+	}
+
+	.CommissionRank .header .rank {
+		font-size: 33rpx;
+		color: #fff;
+		position: absolute;
+		top: 160rpx;
+		left: 48rpx;
+	}
+
+	.CommissionRank .header .rank .num {
+		font-size: 51rpx;
+		font-weight: bold;
+		margin: 0 10rpx;
+	}
+
+	.CommissionRank .wrapper {
+		width: 710rpx;
+		background-color: #fff;
+		border-radius: 14rpx;
+		margin: -76rpx auto 0 auto;
+	}
+
+	.CommissionRank .wrapper .nav {
+		height: 99rpx;
+		border-bottom: 2.5rpx solid #f3f3f3;
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #999;
+		line-height: 99rpx;
+	}
+
+	.CommissionRank .wrapper .nav .item.font-color {
+		border-bottom: 4rpx solid #e93323;
+		margin-top: -2rpx;
+		color: #e93323;
+	}
+
+	.CommissionRank .wrapper .list {
+		padding: 0 30rpx;
+	}
+
+	.CommissionRank .wrapper .list .item {
+		border-bottom: 1px solid #f3f3f3;
+		height: 101rpx;
+		font-size: 28rpx;
+	}
+
+	.CommissionRank .wrapper .list .item .num {
+		color: #666;
+		width: 70rpx;
+	}
+
+	.CommissionRank .wrapper .list .item .num image {
+		width: 34rpx;
+		height: 40rpx;
+		display: block;
+	}
+
+	.CommissionRank .wrapper .list .item .picTxt {
+		width: 350rpx;
+	}
+
+	.CommissionRank .wrapper .list .item .picTxt .pictrue {
+		width: 68rpx;
+		height: 68rpx;
+	}
+
+	.CommissionRank .wrapper .list .item .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+		display: block;
+		border-radius: 50%;
+	}
+
+	.CommissionRank .wrapper .list .item .picTxt .text {
+		width: 262rpx;
+		color: #333;
+	}
+
+	.CommissionRank .wrapper .list .item .people {
+		width: 175rpx;
+		text-align: right;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/commission/components/account-info.vue b/pages/commission/components/account-info.vue
new file mode 100644
index 0000000..d904b8d
--- /dev/null
+++ b/pages/commission/components/account-info.vue
@@ -0,0 +1,125 @@
+<!-- 分销账户：展示基本统计信息 -->
+<template>
+  <view class="account-card">
+    <view class="account-card-box">
+      <view class="ss-flex ss-row-between card-box-header">
+        <view class="ss-flex">
+          <view class="header-title ss-m-r-16">账户信息</view>
+          <button
+            class="ss-reset-button look-btn ss-flex"
+            @tap="state.showMoney = !state.showMoney"
+          >
+            <uni-icons
+              :type="state.showMoney ? 'eye-filled' : 'eye-slash-filled'"
+              color="#A57A55"
+              size="20"
+            />
+          </button>
+        </view>
+        <view class="ss-flex" @tap="sheep.$router.go('/pages/commission/wallet')">
+          <view class="header-title ss-m-r-4">查看明细</view>
+          <text class="cicon-play-arrow" />
+        </view>
+      </view>
+
+      <!-- 收益 -->
+      <view class="card-content ss-flex">
+        <view class="ss-flex-1 ss-flex-col ss-col-center">
+          <view class="item-title">当前佣金(元)</view>
+          <view class="item-detail">
+            {{ state.showMoney ? fen2yuan(state.summary.brokeragePrice || 0) : '***' }}
+          </view>
+        </view>
+        <view class="ss-flex-1 ss-flex-col ss-col-center">
+          <view class="item-title">昨天的佣金(元)</view>
+          <view class="item-detail">
+            {{ state.showMoney ? fen2yuan(state.summary.yesterdayPrice || 0) : '***' }}
+          </view>
+        </view>
+        <view class="ss-flex-1 ss-flex-col ss-col-center">
+          <view class="item-title">累计已提(元)</view>
+          <view class="item-detail">
+            {{ state.showMoney ? fen2yuan(state.summary.withdrawPrice || 0) : '***' }}
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { computed, reactive, onMounted } from 'vue';
+  import BrokerageApi from '@/sheep/api/trade/brokerage';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+
+  const userInfo = computed(() => sheep.$store('user').userInfo);
+
+  const state = reactive({
+    showMoney: false,
+    summary: {},
+  });
+
+  onMounted(async () => {
+    let { code, data } = await BrokerageApi.getBrokerageUserSummary();
+    if (code === 0) {
+      state.summary = data || {}
+    }
+  });
+</script>
+
+<style lang="scss" scoped>
+  .account-card {
+    width: 694rpx;
+    margin: 0 auto;
+    padding: 2rpx;
+    background: linear-gradient(180deg, #ffffff 0.88%, #fff9ec 100%);
+    border-radius: 12rpx;
+    z-index: 3;
+    position: relative;
+
+    .account-card-box {
+      background: #ffefd6;
+
+      .card-box-header {
+        padding: 0 30rpx;
+        height: 72rpx;
+        box-shadow: 0px 2px 6px #f2debe;
+
+        .header-title {
+          font-size: 24rpx;
+          font-weight: 500;
+          color: #a17545;
+          line-height: 30rpx;
+        }
+
+        .cicon-play-arrow {
+          color: #a17545;
+          font-size: 24rpx;
+          line-height: 30rpx;
+        }
+      }
+
+      .card-content {
+        height: 190rpx;
+        background: #fdfae9;
+
+        .item-title {
+          font-size: 24rpx;
+          font-weight: 500;
+          color: #cba67e;
+          line-height: 30rpx;
+          margin-bottom: 24rpx;
+        }
+
+        .item-detail {
+          font-size: 36rpx;
+          font-family: OPPOSANS;
+          font-weight: bold;
+          color: #692e04;
+          line-height: 30rpx;
+        }
+      }
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages/commission/components/account-type-select.vue b/pages/commission/components/account-type-select.vue
new file mode 100644
index 0000000..c5ee5c0
--- /dev/null
+++ b/pages/commission/components/account-type-select.vue
@@ -0,0 +1,160 @@
+<!-- 提现方式的 select 组件 -->
+<template>
+  <su-popup :show="show" class="ss-checkout-counter-wrap" @close="hideModal">
+    <view class="ss-modal-box bg-white ss-flex-col">
+      <view class="modal-header ss-flex-col ss-col-left">
+        <text class="modal-title ss-m-b-20">选择提现方式</text>
+      </view>
+      <view class="modal-content ss-flex-1 ss-p-b-100">
+        <radio-group @change="onChange">
+          <label
+            class="container-list ss-p-l-34 ss-p-r-24 ss-flex ss-col-center ss-row-center"
+            v-for="(item, index) in typeList"
+            :key="index"
+          >
+            <view class="container-icon ss-flex ss-m-r-20">
+              <image :src="sheep.$url.static(item.icon)" />
+            </view>
+            <view class="ss-flex-1">{{ item.title }}</view>
+            <radio
+              :value="item.value"
+              color="var(--ui-BG-Main)"
+              :checked="item.value === state.currentValue"
+              :disabled="!methods.includes(parseInt(item.value))"
+            />
+          </label>
+        </radio-group>
+      </view>
+      <view class="modal-footer ss-flex ss-row-center ss-col-center">
+        <button class="ss-reset-button save-btn" @tap="onConfirm">确定</button>
+      </view>
+    </view>
+  </su-popup>
+</template>
+
+<script setup>
+  import { reactive } from 'vue';
+  import sheep from '@/sheep';
+
+  const props = defineProps({
+    modelValue: {
+      type: Object,
+      default() {},
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    methods: { // 开启的提现方式
+      type: Array,
+      default: [],
+    },
+  });
+  const emits = defineEmits(['update:modelValue', 'change', 'close']);
+  const state = reactive({
+    currentValue: '',
+  });
+
+  const typeList = [
+    {
+      icon: 'https://file.sheepjs.com/static/img/shop/pay/wallet.png', // TODO 芋艿：后续给个 icon
+      title: '钱包余额',
+      value: '1',
+    },
+    {
+      icon: '/static/img/shop/pay/bank.png',
+      title: '银行卡转账',
+      value: '2',
+    },
+    {
+      icon: '/static/img/shop/pay/wechat.png',
+      title: '微信零钱',
+      value: '3',
+    },
+    {
+      icon: '/static/img/shop/pay/alipay.png',
+      title: '支付宝账户',
+      value: '4',
+    }
+  ];
+
+  function onChange(e) {
+    state.currentValue = e.detail.value;
+  }
+
+  const onConfirm = async () => {
+    if (state.currentValue === '') {
+      sheep.$helper.toast('请选择提现方式');
+      return;
+    }
+    // 赋值
+    emits('update:modelValue', {
+      type: state.currentValue
+    });
+    // 关闭弹窗
+    emits('close');
+  };
+
+  const hideModal = () => {
+    emits('close');
+  };
+</script>
+
+<style lang="scss" scoped>
+  .ss-modal-box {
+    border-radius: 30rpx 30rpx 0 0;
+    max-height: 1000rpx;
+
+    .modal-header {
+      position: relative;
+      padding: 60rpx 40rpx 40rpx;
+
+      .modal-title {
+        font-size: 32rpx;
+        font-weight: bold;
+      }
+
+      .close-icon {
+        position: absolute;
+        top: 10rpx;
+        right: 20rpx;
+        font-size: 46rpx;
+        opacity: 0.2;
+      }
+    }
+
+    .modal-content {
+      overflow-y: auto;
+
+      .container-list {
+        height: 96rpx;
+        border-bottom: 2rpx solid rgba(#dfdfdf, 0.5);
+        font-size: 28rpx;
+        font-weight: 500;
+        color: #333333;
+
+        .container-icon {
+          width: 36rpx;
+          height: 36rpx;
+        }
+      }
+    }
+
+    .modal-footer {
+      height: 120rpx;
+
+      .save-btn {
+        width: 710rpx;
+        height: 80rpx;
+        border-radius: 40rpx;
+        background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+        color: $white;
+      }
+    }
+  }
+
+  image {
+    width: 100%;
+    height: 100%;
+  }
+</style>
diff --git a/pages/commission/components/commission-auth.vue b/pages/commission/components/commission-auth.vue
new file mode 100644
index 0000000..9a484fa
--- /dev/null
+++ b/pages/commission/components/commission-auth.vue
@@ -0,0 +1,101 @@
+<!-- 分销权限弹窗：再没有权限时，进行提示  -->
+<template>
+  <su-popup
+    :show="state.show"
+    type="center"
+    round="10"
+    @close="state.show = false"
+    :isMaskClick="false"
+    maskBackgroundColor="rgba(0, 0, 0, 0.7)"
+  >
+    <view class="notice-box">
+      <view class="img-wrap">
+        <image
+          class="notice-img"
+          :src="sheep.$url.static('/static/img/shop/commission/forbidden.png')"
+          mode="aspectFill"
+        />
+      </view>
+      <view class="notice-title"> 抱歉！您没有分销权限 </view>
+      <view class="notice-detail"> 该功能暂不可用 </view>
+      <button
+        class="ss-reset-button notice-btn ui-Shadow-Main ui-BG-Main-Gradient"
+        @tap="sheep.$router.back()"
+      >
+        知道了
+      </button>
+      <button class="ss-reset-button back-btn" @tap="sheep.$router.back()"> 返回 </button>
+    </view>
+  </su-popup>
+</template>
+
+<script setup>
+  import { onShow } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import { reactive } from 'vue';
+  import BrokerageApi from '@/sheep/api/trade/brokerage';
+
+  const state = reactive({
+    show: false,
+  });
+
+  onShow(async () => {
+    // 读取是否有分销权限
+    const { code, data } = await BrokerageApi.getBrokerageUser();
+    if (code === 0 && !data?.brokerageEnabled) {
+      state.show = true;
+    }
+  });
+</script>
+
+<style lang="scss" scoped>
+  .notice-box {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    background-color: #fff;
+    width: 612rpx;
+    min-height: 658rpx;
+    background: #ffffff;
+    padding: 30rpx;
+    border-radius: 20rpx;
+    .img-wrap {
+      margin-bottom: 50rpx;
+      .notice-img {
+        width: 180rpx;
+        height: 170rpx;
+      }
+    }
+    .notice-title {
+      font-size: 35rpx;
+      font-weight: bold;
+      color: #333;
+      margin-bottom: 28rpx;
+    }
+    .notice-detail {
+      font-size: 28rpx;
+      font-weight: 400;
+      color: #999999;
+      line-height: 36rpx;
+      margin-bottom: 50rpx;
+    }
+    .notice-btn {
+      width: 492rpx;
+      line-height: 70rpx;
+      border-radius: 35rpx;
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #ffffff;
+      margin-bottom: 10rpx;
+    }
+    .back-btn {
+      width: 492rpx;
+      line-height: 70rpx;
+      font-size: 28rpx;
+      font-weight: 500;
+      color: var(--ui-BG-Main-gradient);
+      background: none;
+    }
+  }
+</style>
diff --git a/pages/commission/components/commission-info.vue b/pages/commission/components/commission-info.vue
new file mode 100644
index 0000000..948f380
--- /dev/null
+++ b/pages/commission/components/commission-info.vue
@@ -0,0 +1,112 @@
+<!-- 分销商信息  -->
+<template>
+	<!-- 用户资料 -->
+	<view class="user-card ss-flex ss-col-bottom">
+		<view class="card-top ss-flex ss-row-between">
+			<view class="ss-flex">
+				<view class="head-img-box">
+					<image class="head-img" :src="sheep.$url.cdn(userInfo.avatar)" mode="aspectFill"></image>
+				</view>
+				<view class="ss-flex-col">
+					<view class="user-name">{{ userInfo.nickname }}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import sheep from '@/sheep';
+	import { computed, reactive } from 'vue';
+
+	const userInfo = computed(() => sheep.$store('user').userInfo);
+	const headerBg = sheep.$url.css('/static/img/shop/commission/background.png');
+
+	const state = reactive({
+		showMoney: false,
+	});
+
+</script>
+
+<style lang="scss" scoped>
+	// 用户资料卡片
+	.user-card {
+		width: 690rpx;
+		margin: -88rpx 20rpx 0 20rpx;
+		padding-top: 138rpx;
+		background: v-bind(headerBg) no-repeat;
+		background-size: 100% 100%;
+
+		.head-img-box {
+			margin-right: 20rpx;
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			position: relative;
+			background: #fce0ad;
+
+			.head-img {
+				width: 92rpx;
+				height: 92rpx;
+				border-radius: 50%;
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+			}
+		}
+
+		.card-top {
+			box-sizing: border-box;
+			padding-bottom: 34rpx;
+
+			.user-name {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #692e04;
+				line-height: 30rpx;
+				margin-bottom: 20rpx;
+			}
+
+			.log-btn {
+				width: 84rpx;
+				height: 42rpx;
+				border: 2rpx solid rgba(#ffffff, 0.33);
+				border-radius: 21rpx;
+				font-size: 22rpx;
+				font-weight: 400;
+				color: #ffffff;
+				margin-bottom: 20rpx;
+			}
+
+			.look-btn {
+				color: #fff;
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+
+		.user-info-box {
+			.tag-box {
+				background: #ff6000;
+				border-radius: 18rpx;
+				line-height: 36rpx;
+
+				.tag-img {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+					margin-left: -2rpx;
+				}
+
+				.tag-title {
+					font-size: 24rpx;
+					padding: 0 10rpx;
+					font-weight: 500;
+					line-height: 36rpx;
+					color: #fff;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/commission/components/commission-log.vue b/pages/commission/components/commission-log.vue
new file mode 100644
index 0000000..2c4b70c
--- /dev/null
+++ b/pages/commission/components/commission-log.vue
@@ -0,0 +1,181 @@
+<!-- 分销首页：明细列表  -->
+<template>
+  <view class="distribution-log-wrap">
+    <view class="header-box">
+      <image class="header-bg" :src="sheep.$url.static('/static/img/shop/commission/title2.png')" />
+      <view class="ss-flex header-title">
+        <view class="title">实时动态</view>
+        <text class="cicon-forward" />
+      </view>
+    </view>
+    <scroll-view
+      scroll-y="true"
+      @scrolltolower="loadmore"
+      class="scroll-box log-scroll"
+      scroll-with-animation="true"
+    >
+      <view v-if="state.pagination.list">
+        <view
+          class="log-item-box ss-flex ss-row-between"
+          v-for="item in state.pagination.list"
+          :key="item.id"
+        >
+          <view class="log-item-wrap">
+            <view class="log-item ss-flex ss-ellipsis-1 ss-col-center">
+              <view class="ss-flex ss-col-center">
+                <image
+                  class="log-img"
+                  :src="sheep.$url.static('/static/img/shop/avatar/notice.png')"
+                  mode="aspectFill"
+                />
+              </view>
+              <view class="log-text ss-ellipsis-1">
+                {{ item.title }} {{ fen2yuan(item.price) }} 元
+              </view>
+            </view>
+          </view>
+          <text class="log-time">{{ dayjs(item.createTime).fromNow() }}</text>
+        </view>
+      </view>
+
+      <!-- 加载更多 -->
+      <uni-load-more
+        v-if="state.pagination.total > 0"
+        :status="state.loadStatus"
+        color="#333333"
+        @tap="loadmore"
+      />
+    </scroll-view>
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { reactive } from 'vue';
+  import _ from 'lodash-es';
+  import dayjs from 'dayjs';
+  import BrokerageApi from '@/sheep/api/trade/brokerage';
+  import { fen2yuan } from '../../../sheep/hooks/useGoods';
+
+  const state = reactive({
+    loadStatus: '',
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 10,
+    },
+  });
+
+  async function getLog() {
+    state.loadStatus = 'loading';
+    const { code, data } = await BrokerageApi.getBrokerageRecordPage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  getLog();
+
+  // 加载更多
+  function loadmore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getLog();
+  }
+</script>
+
+<style lang="scss" scoped>
+  .distribution-log-wrap {
+    width: 690rpx;
+    margin: 0 auto;
+    margin-bottom: 20rpx;
+    border-radius: 12rpx;
+    z-index: 3;
+    position: relative;
+
+    .header-box {
+      width: 690rpx;
+      height: 76rpx;
+      position: relative;
+
+      .header-bg {
+        width: 690rpx;
+        height: 76rpx;
+      }
+
+      .header-title {
+        position: absolute;
+        left: 20rpx;
+        top: 24rpx;
+      }
+
+      .title {
+        font-size: 28rpx;
+        font-weight: 500;
+        color: #ffffff;
+        line-height: 30rpx;
+      }
+
+      .cicon-forward {
+        font-size: 30rpx;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 30rpx;
+      }
+    }
+
+    .log-scroll {
+      height: 600rpx;
+      background: #fdfae9;
+      padding: 10rpx 20rpx 0;
+      box-sizing: border-box;
+      border-radius: 0 0 12rpx 12rpx;
+
+      .log-item-box {
+        margin-bottom: 20rpx;
+
+        .log-time {
+          // margin-left: 30rpx;
+          text-align: right;
+          font-size: 24rpx;
+          font-family: OPPOSANS;
+          font-weight: 400;
+          color: #c4c4c4;
+        }
+      }
+
+      .loadmore-wrap {
+        // line-height: 80rpx;
+      }
+
+      .log-item {
+        // background: rgba(#ffffff, 0.2);
+        border-radius: 24rpx;
+        padding: 6rpx 20rpx 6rpx 12rpx;
+
+        .log-img {
+          width: 40rpx;
+          height: 40rpx;
+          border-radius: 50%;
+          margin-right: 10rpx;
+        }
+
+        .log-text {
+          max-width: 480rpx;
+          font-size: 24rpx;
+          font-weight: 500;
+          color: #333333;
+        }
+      }
+    }
+  }
+</style>
diff --git a/pages/commission/components/commission-menu.vue b/pages/commission/components/commission-menu.vue
new file mode 100644
index 0000000..988b9b7
--- /dev/null
+++ b/pages/commission/components/commission-menu.vue
@@ -0,0 +1,137 @@
+<!-- 分销：商菜单栏 -->
+<template>
+	<view class="menu-box ss-flex-col">
+		<view class="header-box">
+			<image class="header-bg" :src="sheep.$url.static('/static/img/shop/commission/title1.png')" />
+			<view class="ss-flex header-title">
+				<view class="title">功能专区</view>
+				<text class="cicon-forward"></text>
+			</view>
+		</view>
+		<view class="menu-list ss-flex ss-flex-wrap">
+			<view v-for="(item, index) in state.menuList" :key="index" class="item-box ss-flex-col ss-col-center"
+				@tap="sheep.$router.go(item.path)">
+				<image class="menu-icon ss-m-b-10" :src="sheep.$url.static(item.img)" mode="aspectFill"></image>
+				<view>{{ item.title }}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import sheep from '@/sheep';
+	import { reactive } from 'vue';
+
+	const state = reactive({
+		menuList: [{
+				img: '/static/img/shop/commission/commission_icon1.png',
+				title: '我的团队',
+				path: '/pages/commission/team',
+			},
+			{
+				img: '/static/img/shop/commission/commission_icon2.png',
+				title: '佣金明细',
+				path: '/pages/commission/wallet',
+			},
+			{
+				img: '/static/img/shop/commission/commission_icon3.png',
+				title: '分销订单',
+				path: '/pages/commission/order',
+			},
+			/* {
+				img: '/static/img/shop/commission/commission_icon4.png',
+				title: '推广商品',
+				path: '/pages/commission/goods',
+			}, */
+			// {
+			//   img: '/static/img/shop/commission/commission_icon5.png',
+			//   title: '我的资料',
+			//   path: '/pages/commission/apply',
+			//   isAgentFrom: true,
+			// },
+			// todo @芋艿：邀请海报需要登录后的个人数据
+			{
+				img: '/static/img/shop/commission/commission_icon7.png',
+				title: '邀请海报',
+				path: 'action:showShareModal',
+			},
+			/* {
+				img: '/static/img/shop/commission/commission_icon7.png',
+				title: '推广排行',
+				path: '/pages/commission/promoter',
+			},
+			{
+				img: '/static/img/shop/commission/commission_icon7.png',
+				title: '佣金排行',
+				path: '/pages/commission/commission-ranking',
+			} */
+		],
+	});
+</script>
+
+<style lang="scss" scoped>
+	.menu-box {
+		margin: 0 auto;
+		width: 690rpx;
+		margin-bottom: 20rpx;
+		margin-top: 20rpx;
+		border-radius: 12rpx;
+		z-index: 3;
+		position: relative;
+	}
+
+	.header-box {
+		width: 690rpx;
+		height: 76rpx;
+		position: relative;
+
+		.header-bg {
+			width: 690rpx;
+			height: 76rpx;
+		}
+
+		.header-title {
+			position: absolute;
+			left: 20rpx;
+			top: 24rpx;
+		}
+
+		.title {
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #ffffff;
+			line-height: 30rpx;
+		}
+
+		.cicon-forward {
+			font-size: 30rpx;
+			font-weight: 400;
+			color: #ffffff;
+			line-height: 30rpx;
+		}
+	}
+
+	.menu-list {
+		padding: 50rpx 0 10rpx 0;
+		background: #fdfae9;
+		border-radius: 0 0 12rpx 12rpx;
+	}
+
+	.item-box {
+		width: 25%;
+		margin-bottom: 40rpx;
+	}
+
+	.menu-icon {
+		width: 68rpx;
+		height: 68rpx;
+		background: #ffffff;
+		border-radius: 50%;
+	}
+
+	.menu-title {
+		font-size: 26rpx;
+		font-weight: 500;
+		color: #ffffff;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/commission/goods.vue b/pages/commission/goods.vue
new file mode 100644
index 0000000..509cc04
--- /dev/null
+++ b/pages/commission/goods.vue
@@ -0,0 +1,156 @@
+<!-- 分销商品列表  -->
+<template>
+  <s-layout title="推广商品" :onShareAppMessage="state.shareInfo">
+    <view class="goods-item ss-m-20" v-for="item in state.pagination.list" :key="item.id">
+      <s-goods-item
+        size="lg"
+        :img="item.picUrl"
+        :title="item.name"
+        :subTitle="item.introduction"
+        :price="item.price"
+        :originPrice="item.marketPrice"
+        priceColor="#333"
+        @tap="sheep.$router.go('/pages/goods/index', { id: item.id })"
+      >
+        <template #rightBottom>
+          <view class="ss-flex ss-row-between">
+            <view class="commission-num" v-if="item.brokerageMinPrice === undefined"
+              >预计佣金：计算中</view
+            >
+            <view
+              class="commission-num"
+              v-else-if="item.brokerageMinPrice === item.brokerageMaxPrice"
+            >
+              预计佣金：{{ fen2yuan(item.brokerageMinPrice) }}
+            </view>
+            <view class="commission-num" v-else>
+              预计佣金：{{ fen2yuan(item.brokerageMinPrice) }} ~
+              {{ fen2yuan(item.brokerageMaxPrice) }}
+            </view>
+            <button
+              class="ss-reset-button share-btn ui-BG-Main-Gradient"
+              @tap.stop="onShareGoods(item)"
+            >
+              分享赚
+            </button>
+          </view>
+        </template>
+      </s-goods-item>
+    </view>
+    <s-empty
+      v-if="state.pagination.total === 0"
+      icon="/static/goods-empty.png"
+      text="暂无推广商品"
+    />
+    <!-- 加载更多 -->
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import $share from '@/sheep/platform/share';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import _ from 'lodash-es';
+  import { showShareModal } from '@/sheep/hooks/useModal';
+  import SpuApi from '@/sheep/api/product/spu';
+  import BrokerageApi from '@/sheep/api/trade/brokerage';
+  import { fen2yuan } from '../../sheep/hooks/useGoods';
+
+  const state = reactive({
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 10,
+    },
+    loadStatus: '',
+    shareInfo: {},
+  });
+
+  // TODO @puhui999：【分享】接入
+  function onShareGoods(goodsInfo) {
+    state.shareInfo = $share.getShareInfo(
+      {
+        title: goodsInfo.title,
+        image: sheep.$url.cdn(goodsInfo.image),
+        desc: goodsInfo.subtitle,
+        params: {
+          page: '2',
+          query: goodsInfo.id,
+        },
+      },
+      {
+        type: 'goods', // 商品海报
+        title: goodsInfo.title, // 商品标题
+        image: sheep.$url.cdn(goodsInfo.image), // 商品主图
+        price: goodsInfo.price[0], // 商品价格
+        original_price: goodsInfo.original_price, // 商品原价
+      },
+    );
+    showShareModal();
+  }
+
+  async function getGoodsList() {
+    state.loadStatus = 'loading';
+    let { code, data } = await SpuApi.getSpuPage({
+      pageSize: state.pagination.pageSize,
+      pageNo: state.pagination.pageNo,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+    // 补充分佣金额
+    data.list.forEach((item) => {
+      BrokerageApi.getProductBrokeragePrice(item.id).then((res) => {
+        item.brokerageMinPrice = res.data.brokerageMinPrice;
+        item.brokerageMaxPrice = res.data.brokerageMaxPrice;
+      });
+    });
+  }
+
+  onLoad(() => {
+    getGoodsList();
+  });
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getGoodsList();
+  }
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .goods-item {
+    .commission-num {
+      font-size: 24rpx;
+      font-weight: 500;
+      color: $red;
+    }
+
+    .share-btn {
+      width: 120rpx;
+      height: 50rpx;
+      border-radius: 25rpx;
+    }
+  }
+</style>
diff --git a/pages/commission/index.vue b/pages/commission/index.vue
new file mode 100644
index 0000000..1b7ee06
--- /dev/null
+++ b/pages/commission/index.vue
@@ -0,0 +1,51 @@
+<!-- 分销中心  -->
+<template>
+	<s-layout navbar="inner" class="index-wrap" title="分销中心" :bgStyle="bgStyle" :onShareAppMessage="shareInfo">
+		<!-- 分销商信息 -->
+		<commission-info />
+		<!-- 账户信息 -->
+		<account-info />
+		<!-- 菜单栏 -->
+		<commission-menu />
+		<!-- 分销记录 -->
+		<commission-log />
+
+		<!-- 权限弹窗 -->
+		<commission-auth />
+	</s-layout>
+</template>
+
+<script setup>
+  import { computed } from 'vue';
+  import { onPageScroll } from '@dcloudio/uni-app';
+  import commissionInfo from './components/commission-info.vue';
+  import accountInfo from './components/account-info.vue';
+  import commissionLog from './components/commission-log.vue';
+  import commissionMenu from './components/commission-menu.vue';
+  import commissionAuth from './components/commission-auth.vue';
+  import sheep from '@/sheep';
+
+  const shareInfo = computed(() => {
+    return sheep.$platform.share.getShareInfo({
+      params: {
+        page: '6',
+      },
+    }, {
+      type: 'user',
+    });
+  });
+
+  const bgStyle = {
+    backgroundColor: '#F7D598',
+  };
+  
+  onPageScroll((e) => {
+	  
+  });
+</script>
+
+<style lang="scss" scoped>
+	:deep(.page-main) {
+		background-size: 100% 100% !important;
+	}
+</style>
diff --git a/pages/commission/order.vue b/pages/commission/order.vue
new file mode 100644
index 0000000..54232a4
--- /dev/null
+++ b/pages/commission/order.vue
@@ -0,0 +1,328 @@
+<!-- 分销 - 订单明细 -->
+<template>
+  <s-layout title="分销订单" :class="state.scrollTop ? 'order-warp' : ''" navbar="inner">
+    <view
+      class="header-box"
+      :style="[
+        {
+          marginTop: '-' + Number(statusBarHeight + 88 + 22) + 'rpx',
+          paddingTop: Number(statusBarHeight + 108 + 22) + 'rpx',
+        },
+      ]"
+    >
+      <!-- 团队数据总览 -->
+      <view class="team-data-box ss-flex ss-col-center ss-row-between" style="width: 100%">
+        <view class="data-card" style="width: 100%">
+          <view class="total-item" style="width: 100%">
+            <view class="item-title" style="text-align: center">累计推广订单（单）</view>
+            <view class="total-num" style="text-align: center">
+              {{ state.totals }}
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- tab -->
+    <su-sticky bgColor="#fff">
+      <su-tabs
+        :list="tabMaps"
+        :scrollable="false"
+        :current="state.currentTab"
+        @change="onTabsChange"
+      >
+      </su-tabs>
+    </su-sticky>
+
+    <!-- 订单 -->
+    <view class="order-box">
+      <view class="order-item" v-for="item in state.pagination.list" :key="item">
+        <view class="order-header">
+          <view class="no-box ss-flex ss-col-center ss-row-between">
+            <text class="order-code">订单编号：{{ item.bizId }}</text>
+            <text class="order-state">
+              {{ item.status === 0 ? '待结算' : item.status === 1 ? '已结算' : '已取消' }}
+              ( 佣金 {{ fen2yuan(item.price) }} 元 )
+            </text>
+          </view>
+          <view class="order-from ss-flex ss-col-center ss-row-between">
+            <view class="from-user ss-flex ss-col-center">
+              <text>{{ item.title }}</text>
+            </view>
+            <view class="order-time">
+              {{ sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 数据为空 -->
+      <s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单" />
+      <!-- 加载更多 -->
+      <uni-load-more
+        v-if="state.pagination.total > 0"
+        :status="state.loadStatus"
+        :content-text="{
+          contentdown: '上拉加载更多',
+        }"
+        @tap="loadMore"
+      />
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import _ from 'lodash-es';
+  import { onPageScroll } from '@dcloudio/uni-app';
+  import { resetPagination } from '@/sheep/util';
+  import BrokerageApi from '@/sheep/api/trade/brokerage';
+  import { fen2yuan } from '../../sheep/hooks/useGoods';
+
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
+
+  onPageScroll((e) => {
+    state.scrollTop = e.scrollTop <= 100;
+  });
+
+  const state = reactive({
+    totals: 0, // 累计推广订单（单）
+    scrollTop: false,
+
+    currentTab: 0,
+    loadStatus: '',
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 10,
+    },
+  });
+
+  const tabMaps = [
+    {
+      name: '全部',
+      value: 'all',
+    },
+    {
+      name: '待结算',
+      value: '0', // 待结算
+    },
+    {
+      name: '已结算',
+      value: '1', // 已结算
+    },
+  ];
+
+  // 切换选项卡
+  function onTabsChange(e) {
+    resetPagination(state.pagination);
+    state.currentTab = e.index;
+    getOrderList();
+  }
+
+  // 获取订单列表
+  async function getOrderList() {
+    state.loadStatus = 'loading';
+    let { code, data } = await BrokerageApi.getBrokerageRecordPage({
+      pageSize: state.pagination.pageSize,
+      pageNo: state.pagination.pageNo,
+      bizType: 1, // 获得推广佣金
+      status: state.currentTab > 0 ? state.currentTab : undefined,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+    if (state.currentTab === 0) {
+      state.totals = data.total;
+    }
+  }
+
+  onLoad(() => {
+    getOrderList();
+  });
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getOrderList();
+  }
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .header-box {
+    box-sizing: border-box;
+    padding: 0 20rpx 20rpx 20rpx;
+    width: 750rpx;
+    background: v-bind(headerBg) no-repeat,
+      linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    background-size: 750rpx 100%;
+
+    // 团队信息总览
+    .team-data-box {
+      .data-card {
+        width: 305rpx;
+        background: #ffffff;
+        border-radius: 20rpx;
+        padding: 20rpx;
+
+        .total-item {
+          margin-bottom: 30rpx;
+
+          .item-title {
+            font-size: 24rpx;
+            font-weight: 500;
+            color: #999999;
+            line-height: normal;
+            margin-bottom: 20rpx;
+          }
+
+          .total-num {
+            font-size: 38rpx;
+            font-weight: 500;
+            color: #333333;
+            font-family: OPPOSANS;
+          }
+        }
+
+        .category-num {
+          font-size: 26rpx;
+          font-weight: 500;
+          color: #333333;
+          font-family: OPPOSANS;
+        }
+      }
+    }
+
+    // 直推
+    .direct-box {
+      margin-top: 20rpx;
+
+      .direct-item {
+        width: 340rpx;
+        background: #ffffff;
+        border-radius: 20rpx;
+        padding: 20rpx;
+        box-sizing: border-box;
+
+        .item-title {
+          font-size: 22rpx;
+          font-weight: 500;
+          color: #999999;
+          margin-bottom: 6rpx;
+        }
+
+        .item-value {
+          font-size: 38rpx;
+          font-weight: 500;
+          color: #333333;
+          font-family: OPPOSANS;
+        }
+      }
+    }
+  }
+
+  // 订单
+  .order-box {
+    .order-item {
+      background: #ffffff;
+      border-radius: 10rpx;
+      margin: 20rpx;
+
+      .order-footer {
+        padding: 20rpx;
+        font-size: 24rpx;
+        color: #999;
+      }
+
+      .order-header {
+        .no-box {
+          padding: 20rpx;
+
+          .order-code {
+            font-size: 26rpx;
+            font-weight: 500;
+            color: #333333;
+          }
+
+          .order-state {
+            font-size: 26rpx;
+            font-weight: 500;
+            color: var(--ui-BG-Main);
+          }
+        }
+
+        .order-from {
+          padding: 20rpx;
+
+          .from-user {
+            font-size: 24rpx;
+            font-weight: 400;
+            color: #666666;
+
+            .user-avatar {
+              width: 26rpx;
+              height: 26rpx;
+              border-radius: 50%;
+              margin-right: 8rpx;
+            }
+
+            .user-name {
+              font-size: 24rpx;
+              font-weight: 400;
+              color: #999999;
+            }
+          }
+
+          .order-time {
+            font-size: 24rpx;
+            font-weight: 400;
+            color: #999999;
+          }
+        }
+      }
+
+      .commission-box {
+        .name {
+          font-size: 24rpx;
+          font-weight: 400;
+          color: #999999;
+        }
+      }
+
+      .commission-num {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: $red;
+        font-family: OPPOSANS;
+
+        &::before {
+          content: '￥';
+          font-size: 22rpx;
+        }
+      }
+
+      .order-status {
+        line-height: 30rpx;
+        padding: 0 10rpx;
+        border-radius: 30rpx;
+        margin-left: 20rpx;
+        font-size: 24rpx;
+        color: var(--ui-BG-Main);
+      }
+    }
+  }
+</style>
diff --git a/pages/commission/promoter.vue b/pages/commission/promoter.vue
new file mode 100644
index 0000000..b7d0a89
--- /dev/null
+++ b/pages/commission/promoter.vue
@@ -0,0 +1,297 @@
+<template>
+	<s-layout title="推广人排行榜">
+		<view class="PromoterRank" style='backgroundColor:red'>
+			<view class="redBg bg-color">
+				<view class="header">
+					<view class="nav acea-row row-center-wrapper" style='display:flex'>
+						<view class="item" :class="state.currentTab === index ? 'font-color' : ''"
+							v-for="(item, index) in tabMaps" :key="index" @click="switchTap(index)">
+							{{ item }}
+						</view>
+					</view>
+					<!-- top3 排名 -->
+					<view class="rank acea-row row-bottom row-around">
+						<view class="item" v-show="state.two.id">
+							<view class="pictrue">
+								<image :src="state.two.avatar"></image>
+							</view>
+							<view class="name line1">{{state.two.nickname}}</view>
+							<view class="num">{{ state.two.brokerageUserCount }}人</view>
+						</view>
+						<view class="item" v-show="state.one.id">
+							<view class="pictrue">
+								<image :src="state.one.avatar"></image>
+							</view>
+							<view class="name line1">{{state.one.nickname}}</view>
+							<view class="num">{{ state.one.brokerageUserCount }}人</view>
+						</view>
+						<view class="item" v-show="state.three.id">
+							<view class="pictrue">
+								<image :src="state.three.avatar"></image>
+							</view>
+							<view class="name line1">{{state.three.nickname}}</view>
+							<view class="num">{{ state.three.brokerageUserCount }}人</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 其它排名 -->
+			<view class="list" v-if="state.rankList.length">
+				<view class="item acea-row row-between-wrapper" v-for="(item,index) in state.rankList" :key="index">
+					<view class="num">{{ index + 4 }}</view>
+					<view class="picTxt acea-row row-between-wrapper">
+						<view class="pictrue">
+							<image :src="item.avatar"></image>
+						</view>
+						<view class="text line1">{{item.nickname}}</view>
+					</view>
+					<view class="people font-color">{{ item.brokerageUserCount }}人</view>
+				</view>
+			</view>
+		</view>
+	</s-layout>
+</template>
+
+<script setup>
+	import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import BrokerageApi from '@/sheep/api/trade/brokerage';
+
+  const tabMaps = ['周排行', '月排行'];
+
+  const state = reactive({
+    currentTab: 0,
+
+		rankList: [],
+		times: [],
+
+		one: {}, // 排名第一
+		two: {}, // 排名第二
+		three: {}, // 排名第三
+	});
+
+	function switchTap(index) {
+		if (state.currentTab === index) {
+			return;
+		}
+		state.currentTab = index;
+		calculateTimes();
+		getRankList();
+	}
+
+	async function getRankList() {
+    // 重置数据
+    state.one = {};
+    state.two = {};
+    state.three = {};
+    state.rankList = [];
+    // 查询
+    const { code, data } = await BrokerageApi.getBrokerageUserRankPageByUserCount({
+      pageNo: 1,
+      pageSize: 10,
+      'times[0]': state.times[0],
+      'times[1]': state.times[1],
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.rankList = data.list;
+    state.one = state.rankList.shift() || {};
+    state.two = state.rankList.shift() || {};
+    state.trhee = state.rankList.shift() || {};
+  }
+
+	function calculateTimes() {
+		let times;
+		if (state.currentTab === 0) {
+			times = getWeekTimes();
+		} else {
+			times = getMonthTimes();
+		}
+		state.times = [formatDate(times[0]), formatDate(times[1])]
+	}
+
+  onLoad(function () {
+    calculateTimes();
+    getRankList();
+  });
+
+	function formatDate(date) {
+		return sheep.$helper.timeFormat(date, 'yyyy-mm-dd hh:MM:ss');
+	}
+
+  // TODO 芋艿：此处可考虑抽离
+  // 此处可考虑抽离
+	/**
+	 * 获得当前周的开始和结束时间
+	 */
+	function getWeekTimes() {
+		const today = new Date();
+		const dayOfWeek = today.getDay();
+		return [
+			new Date(today.getFullYear(), today.getMonth(), today.getDate() - dayOfWeek, 0, 0, 0),
+			new Date(today.getFullYear(), today.getMonth(), today.getDate() + (6 - dayOfWeek), 23, 59, 59)
+		]
+	}
+
+	/**
+	 * 获得当前月的开始和结束时间
+	 */
+	function getMonthTimes() {
+		const today = new Date();
+		const year = today.getFullYear();
+		const month = today.getMonth();
+		const startDate = new Date(year, month, 1, 0, 0, 0);
+		const nextMonth = new Date(year, month + 1, 1);
+		const endDate = new Date(nextMonth.getTime() - 1);
+		return [startDate, endDate]
+	}
+  // TODO 芋艿：css 需要优化下；并且展示样式有问题
+</script>
+
+<style lang='scss' scoped>
+	.PromoterRank .redBg {
+		padding: 45rpx 0 30rpx 0;
+	}
+
+	.PromoterRank .header {
+		background: url("data:image/jpeg;base64,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") no-repeat;
+		width: 100%;
+		height: 460rpx;
+		background-size: 100% 100%;
+	}
+
+	.PromoterRank .header .nav {
+		width: 450rpx;
+		height: 66rpx;
+		border: 1px solid #fff;
+		border-radius: 33rpx;
+		font-size: 30rpx;
+		color: #fff;
+		margin: 0 auto;
+	}
+
+	.PromoterRank .header .nav .item {
+		width: 223rpx;
+		height: 100%;
+		text-align: center;
+		line-height: 60rpx;
+	}
+
+	.PromoterRank .header .nav .item.font-color:nth-of-type(1) {
+		background-color: #fff;
+		border-radius: 33rpx 0 0 33rpx;
+		color: red
+	}
+
+	.PromoterRank .header .nav .item.font-color:nth-of-type(2) {
+		background-color: #fff;
+		border-radius: 0 33rpx 33rpx 0;
+		color: red
+	}
+
+	.PromoterRank .header .rank {
+		padding: 0 20rpx;
+		margin-top: 30rpx;
+	}
+
+	.PromoterRank .header .rank .item .pictrue {
+		background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIgAAACxCAYAAAAfz/U3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNGUyNzRkOS00YmQ4LTUzNGItYWZkZS02ZTlmMTgxYmZlYWUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6ODVBODg2MzdEOEU1MTFFOTg4RTM5OTQyQjhDODMzMTciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ODVBODg2MzZEOEU1MTFFOTg4RTM5OTQyQjhDODMzMTciIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTggKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OTAxZGU2OWItNWM2My0xOTQ1LTllZmMtMGIzNjcwYTFmNWUxIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE0ZTI3NGQ5LTRiZDgtNTM0Yi1hZmRlLTZlOWYxODFiZmVhZSIv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") no-repeat;
+		background-size: 100% 100%;
+		width: 136rpx;
+		height: 177rpx;
+		position: relative;
+		margin: 0 auto;
+	}
+
+	.PromoterRank .header .rank .item .pictrue image {
+		position: absolute;
+		width: 130rpx;
+		height: 130rpx;
+		display: block;
+		bottom: 2rpx;
+		border-radius: 50%;
+		left: 50%;
+		margin-left: -65rpx;
+	}
+
+	.PromoterRank .header .rank .item:nth-of-type(2) .pictrue {
+		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJwAAADNCAYAAABNahkfAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNGUyNzRkOS00YmQ4LTUzNGItYWZkZS02ZTlmMTgxYmZlYWUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NUU1MTlBRjBEOEU1MTFFOUEwRjRGRTQyMUZGNDk5NEIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NUU1MTlBRUZEOEU1MTFFOUEwRjRGRTQyMUZGNDk5NEIiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTggKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OTAxZGU2OWItNWM2My0xOTQ1LTllZmMtMGIzNjcwYTFmNWUxIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE0ZTI3NGQ5LTRiZDgtNTM0Yi1hZmRlLTZlOWYxODFiZmVhZSIv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");
+		width: 156rpx;
+		height: 205rpx;
+	}
+
+	.PromoterRank .header .rank .item:nth-of-type(2) .pictrue image {
+		width: 150rpx;
+		height: 150rpx;
+		margin-left: -75rpx;
+	}
+
+	.PromoterRank .header .rank .item:nth-of-type(3) .pictrue {
+		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIgAAACxCAYAAAAfz/U3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNGUyNzRkOS00YmQ4LTUzNGItYWZkZS02ZTlmMTgxYmZlYWUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MTExRTlGRDlEOEU2MTFFOTg0MDg4RjQ5MDM3QjNGRTIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MTExRTlGRDhEOEU2MTFFOTg0MDg4RjQ5MDM3QjNGRTIiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTggKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OTAxZGU2OWItNWM2My0xOTQ1LTllZmMtMGIzNjcwYTFmNWUxIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE0ZTI3NGQ5LTRiZDgtNTM0Yi1hZmRlLTZlOWYxODFiZmVhZSIv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");
+	}
+
+	.PromoterRank .header .rank .item:nth-of-type(3) .pictrue image {
+		margin-left: -64rpx;
+	}
+
+	.PromoterRank .header .rank .item .name {
+		font-size: 30rpx;
+		color: #fff;
+		margin-top: 22rpx;
+		text-align: center;
+		width: 170rpx;
+	}
+
+	.PromoterRank .header .rank .item .num {
+		font-size: 30rpx;
+		color: #fff;
+		text-align: center;
+	}
+
+	.PromoterRank .list {
+		width: 710rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		margin: -60rpx auto 0 auto;
+		padding: 0 30rpx;
+	}
+
+	.PromoterRank .list .item {
+		border-bottom: 1px solid #f3f3f3;
+		height: 101rpx;
+		font-size: 28rpx;
+	}
+
+	.PromoterRank .list .item .num {
+		color: #666;
+		width: 70rpx;
+	}
+
+	.PromoterRank .list .item .picTxt {
+		width: 350rpx;
+	}
+
+	.PromoterRank .list .item .picTxt .pictrue {
+		width: 68rpx;
+		height: 68rpx;
+	}
+
+	.PromoterRank .list .item .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+		display: block;
+		border-radius: 50%;
+	}
+
+	.PromoterRank .list .item .picTxt .text {
+		width: 262rpx;
+		color: #333;
+	}
+
+	.PromoterRank .list .item .people {
+		width: 175rpx;
+		text-align: right;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/commission/team.vue b/pages/commission/team.vue
new file mode 100644
index 0000000..df1ac58
--- /dev/null
+++ b/pages/commission/team.vue
@@ -0,0 +1,585 @@
+<!-- 页面 TODO 芋艿：该页面的实现代码需要优化，包括 js 和 css，以及相关的样式设计 -->
+<template>
+  <s-layout title="我的团队" :class="state.scrollTop ? 'team-wrap' : ''" :bgStyle="bgStyle" navbar="inner">
+    <view class="promoter-list">
+      <view
+        class="promoterHeader bg-color"
+        style="backgroundcolor: #e93323 !important; height: 218rpx; color: #fff"
+      >
+        <view class="headerCon acea-row row-between" style="padding: 28px 29px 0 29px">
+          <view>
+            <view class="name" style="color: #fff">推广人数</view>
+            <view>
+              <text class="num" style="color: #fff">
+                {{
+                  state.summary.firstBrokerageUserCount + state.summary.secondBrokerageUserCount ||
+                  0
+                }}
+              </text>
+              人
+            </view>
+          </view>
+          <view class="iconfont icon-tuandui" />
+        </view>
+      </view>
+      <view style="padding: 0 30rpx">
+        <view class="nav acea-row row-around l1">
+          <view :class="state.level == 1 ? 'item on' : 'item'" @click="setType(1)">
+            一级({{ state.summary.firstBrokerageUserCount || 0 }})
+          </view>
+          <view :class="state.level == 2 ? 'item on' : 'item'" @click="setType(2)">
+            二级({{ state.summary.secondBrokerageUserCount || 0 }})
+          </view>
+        </view>
+        <view
+          class="search acea-row row-between-wrapper"
+          style="display: flex; height: 100rpx; align-items: center"
+        >
+          <view class="input">
+            <input
+              placeholder="点击搜索会员名称"
+              v-model="state.nickname"
+              confirm-type="search"
+              name="search"
+              @confirm="submitForm"
+            />
+          </view>
+          <image
+            src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/3de207ef9b45973cea9e050ae17a4e411769bb57cd7e4050381678c23776488b.png"
+            mode=""
+            style="width: 60rpx; height: 64rpx"
+            @click="submitForm"
+          />
+        </view>
+        <view class="list">
+          <view class="sortNav acea-row row-middle" style="display: flex; align-items: center">
+            <view
+              class="sortItem"
+              @click="setSort('userCount', 'asc')"
+              v-if="sort === 'userCountDESC'"
+            >
+              团队排序
+              <!-- TODO 芋艿：看看怎么从项目里拿出去 -->
+              <image src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a6525d55086903956fab235ba4ff92a9d8edd7097489059354667f6e17313c55.png" />
+            </view>
+            <view
+              class="sortItem"
+              @click="setSort('userCount', 'desc')"
+              v-else-if="sort === 'userCountASC'"
+            >
+              团队排序
+              <image src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a6525d55086903956fab235ba4ff92a9d8edd7097489059354667f6e17313c55.png" />
+            </view>
+            <view class="sortItem" @click="setSort('userCount', 'desc')" v-else>
+              团队排序
+              <image src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a6525d55086903956fab235ba4ff92a9d8edd7097489059354667f6e17313c55.png" />
+            </view>
+            <view class="sortItem" @click="setSort('price', 'asc')" v-if="sort === 'priceDESC'">
+              金额排序
+              <image src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a6525d55086903956fab235ba4ff92a9d8edd7097489059354667f6e17313c55.png" />
+            </view>
+            <view
+              class="sortItem"
+              @click="setSort('price', 'desc')"
+              v-else-if="sort === 'priceASC'"
+            >
+              金额排序
+              <image src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a6525d55086903956fab235ba4ff92a9d8edd7097489059354667f6e17313c55.png" />
+            </view>
+            <view class="sortItem" @click="setSort('price', 'desc')" v-else>
+              金额排序
+              <image src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a6525d55086903956fab235ba4ff92a9d8edd7097489059354667f6e17313c55.png" />
+            </view>
+            <view
+              class="sortItem"
+              @click="setSort('orderCount', 'asc')"
+              v-if="sort === 'orderCountDESC'"
+            >
+              订单排序
+              <image src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a6525d55086903956fab235ba4ff92a9d8edd7097489059354667f6e17313c55.png" />
+            </view>
+            <view
+              class="sortItem"
+              @click="setSort('orderCount', 'desc')"
+              v-else-if="sort === 'orderCountASC'"
+            >
+              订单排序
+              <image src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a6525d55086903956fab235ba4ff92a9d8edd7097489059354667f6e17313c55.png" />
+            </view>
+            <view class="sortItem" @click="setSort('orderCount', 'desc')" v-else>
+              订单排序
+              <image src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a6525d55086903956fab235ba4ff92a9d8edd7097489059354667f6e17313c55.png" />
+            </view>
+          </view>
+          <block v-for="(item, index) in state.pagination.list" :key="index">
+            <view class="item acea-row row-between-wrapper" style="display: flex">
+              <view
+                class="picTxt acea-row row-between-wrapper"
+                style="display: flex; align-items: center"
+              >
+                <view class="pictrue">
+                  <image :src="item.avatar" />
+                </view>
+                <view class="text">
+                  <view class="name line1">{{ item.nickname }}</view>
+                  <view>
+                    加入时间:
+                    {{ sheep.$helper.timeFormat(item.brokerageTime, 'yyyy-mm-dd hh:MM:ss') }}
+                  </view>
+                </view>
+              </view>
+              <view
+                class="right"
+                style="
+                  justify-content: center;
+                  flex-direction: column;
+                  display: flex;
+                  margin-left: auto;
+                "
+              >
+                <view>
+                  <text class="num font-color">{{ item.brokerageUserCount || 0 }} </text>人
+                </view>
+                <view>
+                  <text class="num">{{ item.orderCount || 0 }}</text
+                  >单</view
+                >
+                <view>
+                  <text class="num">{{ item.brokeragePrice || 0 }}</text
+                  >元
+                </view>
+              </view>
+            </view>
+          </block>
+          <block v-if="state.pagination.list.length === 0">
+            <s-empty icon="/static/data-empty.png" text="暂无推广人数"></s-empty>
+          </block>
+        </view>
+      </view>
+    </view>
+    <!-- <home></home> -->
+
+    <!-- 		<view class="header-box" :style="[
+        {
+          marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
+          paddingTop: Number(statusBarHeight + 108) + 'rpx',
+        },
+      ]">
+			<view v-if="userInfo.parent_user" class="referrer-box ss-flex ss-col-center">
+				推荐人：
+				<image class="referrer-avatar ss-m-r-10" :src="sheep.$url.cdn(userInfo.parent_user.avatar)"
+					mode="aspectFill">
+				</image>
+				{{ userInfo.parent_user.nickname }}
+			</view>
+			<view class="team-data-box ss-flex ss-col-center ss-row-between">
+				<view class="data-card">
+					<view class="total-item">
+						<view class="item-title">团队总人数（人）</view>
+						<view class="total-num">
+							{{ (state.summary.firstBrokerageUserCount+ state.summary.secondBrokerageUserCount)|| 0 }}
+						</view>
+					</view>
+					<view class="category-item ss-flex">
+						<view class="ss-flex-1">
+							<view class="item-title">一级成员</view>
+							<view class="category-num">{{ state.summary.firstBrokerageUserCount || 0 }}</view>
+						</view>
+						<view class="ss-flex-1">
+							<view class="item-title">二级成员</view>
+							<view class="category-num">{{ state.summary.secondBrokerageUserCount || 0 }}</view>
+						</view>
+					</view>
+				</view>
+				<view class="data-card">
+					<view class="total-item">
+						<view class="item-title">团队分销商人数（人）</view>
+						<view class="total-num">{{ agentInfo?.child_agent_count_all || 0 }}</view>
+					</view>
+					<view class="category-item ss-flex">
+						<view class="ss-flex-1">
+							<view class="item-title">一级分销商</view>
+							<view class="category-num">{{ agentInfo?.child_agent_count_1 || 0 }}</view>
+						</view>
+						<view class="ss-flex-1">
+							<view class="item-title">二级分销商</view>
+							<view class="category-num">{{ agentInfo?.child_agent_count_2 || 0 }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="list-box">
+			<uni-list :border="false">
+				<uni-list-chat v-for="item in state.pagination.data" :key="item.id" :avatar-circle="true"
+					:title="item.nickname" :avatar="sheep.$url.cdn(item.avatar)"
+					:note="filterUserNum(item.agent?.child_user_count_1)">
+					<view class="chat-custom-right">
+						<view v-if="item.avatar" class="tag-box ss-flex ss-col-center">
+							<image class="tag-img" :src="sheep.$url.cdn(item.avatar)" mode="aspectFill">
+							</image>
+							<text class="tag-title">{{ item.nickname }}</text>
+						</view>
+						<text
+							class="time-text">{{ sheep.$helper.timeFormat(item.brokerageTime, 'yyyy-mm-dd hh:MM:ss') }}</text>
+					</view>
+				</uni-list-chat>
+			</uni-list>
+		</view>
+		<s-empty v-if="state.pagination.total === 0" icon="/static/data-empty.png" text="暂无团队信息">
+		</s-empty> -->
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { computed, reactive, ref } from 'vue';
+  import _ from 'lodash-es';
+  import { onPageScroll } from '@dcloudio/uni-app';
+  import BrokerageApi from '@/sheep/api/trade/brokerage';
+
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  // const agentInfo = computed(() => sheep.$store('user').agentInfo);
+  const userInfo = computed(() => sheep.$store('user').userInfo);
+  const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
+
+  onPageScroll((e) => {
+    state.scrollTop = e.scrollTop <= 100;
+  });
+
+  let sort = ref();
+  const state = reactive({
+    summary: {},
+    pagination: {
+      pageNo: 1,
+      pageSize: 8,
+      list: [],
+      total: 0,
+    },
+    loadStatus: '',
+    // ↓ 新 ui 逻辑
+    level: 1,
+    nickname: ref(''),
+    sortKey: '',
+    isAsc: '',
+  });
+
+  function filterUserNum(num) {
+    if (_.isNil(num)) {
+      return '';
+    }
+    return `下级团队${num}人`;
+  }
+
+  function submitForm() {
+    state.pagination.list = [];
+    getTeamList();
+  }
+
+  async function getTeamList() {
+    state.loadStatus = 'loading';
+    let { code, data } = await BrokerageApi.getBrokerageUserChildSummaryPage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+      level: state.level,
+      'sortingField.order': state.isAsc,
+      'sortingField.field': state.sortKey,
+      nickname: state.nickname,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  function setType(e) {
+    state.pagination.list = [];
+    state.level = e + '';
+    getTeamList();
+  }
+
+  function setSort(sortKey, isAsc) {
+    state.pagination.list = [];
+    sort = sortKey + isAsc.toUpperCase();
+    state.isAsc = isAsc;
+    state.sortKey = sortKey;
+    getTeamList();
+  }
+
+  onLoad(async () => {
+    await getTeamList();
+    // 概要数据
+    let { data } = await BrokerageApi.getBrokerageUserSummary();
+    state.summary = data;
+  });
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getTeamList();
+  }
+  
+  const bgStyle = {
+    backgroundColor: 'var(--ui-BG-Main)',
+  };
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .l1 {
+    background-color: #fff;
+    height: 86rpx;
+    line-height: 86rpx;
+    font-size: 28rpx;
+    color: #282828;
+    border-bottom: 1rpx solid #eee;
+    border-top-left-radius: 14rpx;
+    border-top-right-radius: 14rpx;
+    display: flex;
+    justify-content: space-around;
+  }
+
+  .header-box {
+    box-sizing: border-box;
+    padding: 0 20rpx 20rpx 20rpx;
+    width: 750rpx;
+    z-index: 3;
+    position: relative;
+    background: v-bind(headerBg) no-repeat,
+      linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    background-size: 750rpx 100%;
+
+    // 团队信息总览
+    .team-data-box {
+      .data-card {
+        width: 305rpx;
+        background: #ffffff;
+        border-radius: 20rpx;
+        padding: 20rpx;
+
+        .item-title {
+          font-size: 22rpx;
+          font-weight: 500;
+          color: #999999;
+          line-height: 30rpx;
+          margin-bottom: 10rpx;
+        }
+
+        .total-item {
+          margin-bottom: 30rpx;
+        }
+
+        .total-num {
+          font-size: 38rpx;
+          font-weight: 500;
+          color: #333333;
+          font-family: OPPOSANS;
+        }
+
+        .category-num {
+          font-size: 26rpx;
+          font-weight: 500;
+          color: #333333;
+          font-family: OPPOSANS;
+        }
+      }
+    }
+  }
+
+  .list-box {
+    z-index: 3;
+    position: relative;
+  }
+
+  .chat-custom-right {
+    .time-text {
+      font-size: 22rpx;
+      font-weight: 400;
+      color: #999999;
+    }
+
+    .tag-box {
+      background: rgba(0, 0, 0, 0.2);
+      border-radius: 21rpx;
+      line-height: 30rpx;
+      padding: 5rpx 10rpx;
+      width: 140rpx;
+
+      .tag-img {
+        width: 34rpx;
+        height: 34rpx;
+        margin-right: 6rpx;
+        border-radius: 50%;
+      }
+
+      .tag-title {
+        font-size: 18rpx;
+        font-weight: 500;
+        color: rgba(255, 255, 255, 1);
+        line-height: 20rpx;
+      }
+    }
+  }
+
+  // 推荐人
+  .referrer-box {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #ffffff;
+    padding: 20rpx;
+
+    .referrer-avatar {
+      width: 34rpx;
+      height: 34rpx;
+      border-radius: 50%;
+    }
+  }
+
+  .promoter-list .nav {
+    background-color: #fff;
+    height: 86rpx;
+    line-height: 86rpx;
+    font-size: 28rpx;
+    color: #282828;
+    border-bottom: 1rpx solid #eee;
+    border-top-left-radius: 14rpx;
+    border-top-right-radius: 14rpx;
+    margin-top: -30rpx;
+  }
+
+  .promoter-list .nav .item.on {
+    border-bottom: 5rpx solid;
+    // $theme-color
+    color: var(--ui-BG-Main);
+    // $theme-color
+  }
+
+  .promoter-list .search {
+    width: 100%;
+    background-color: #fff;
+    height: 100rpx;
+    padding: 0 24rpx;
+    box-sizing: border-box;
+    border-bottom-left-radius: 14rpx;
+    border-bottom-right-radius: 14rpx;
+  }
+
+  .promoter-list .search .input {
+    width: 592rpx;
+    height: 60rpx;
+    border-radius: 50rpx;
+    background-color: #f5f5f5;
+    text-align: center;
+    position: relative;
+  }
+
+  .promoter-list .search .input input {
+    height: 100%;
+    font-size: 26rpx;
+    width: 610rpx;
+    text-align: center;
+  }
+
+  .promoter-list .search .input .placeholder {
+    color: #bbb;
+  }
+
+  .promoter-list .search .input .iconfont {
+    position: absolute;
+    right: 28rpx;
+    color: #999;
+    font-size: 28rpx;
+    top: 50%;
+    transform: translateY(-50%);
+  }
+
+  .promoter-list .search .iconfont {
+    font-size: 32rpx;
+    color: #515151;
+    height: 60rpx;
+    line-height: 60rpx;
+  }
+
+  .promoter-list .list {
+    margin-top: 20rpx;
+  }
+
+  .promoter-list .list .sortNav {
+    background-color: #fff;
+    height: 76rpx;
+    border-bottom: 1rpx solid #eee;
+    color: #333;
+    font-size: 28rpx;
+    border-top-left-radius: 14rpx;
+    border-top-right-radius: 14rpx;
+  }
+
+  .promoter-list .list .sortNav .sortItem {
+    text-align: center;
+    flex: 1;
+  }
+
+  .promoter-list .list .sortNav .sortItem image {
+    width: 24rpx;
+    height: 24rpx;
+    margin-left: 6rpx;
+    vertical-align: -3rpx;
+  }
+
+  .promoter-list .list .item {
+    background-color: #fff;
+    border-bottom: 1rpx solid #eee;
+    height: 152rpx;
+    padding: 0 24rpx;
+    font-size: 24rpx;
+    color: #666;
+  }
+
+  .promoter-list .list .item .picTxt .pictrue {
+    width: 106rpx;
+    height: 106rpx;
+    border-radius: 50%;
+  }
+
+  .promoter-list .list .item .picTxt .pictrue image {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+    border: 3rpx solid #fff;
+    box-shadow: 0 0 10rpx #aaa;
+    box-sizing: border-box;
+  }
+
+  .promoter-list .list .item .picTxt .text {
+    // width: 304rpx;
+    font-size: 24rpx;
+    color: #666;
+    margin-left: 14rpx;
+  }
+
+  .promoter-list .list .item .picTxt .text .name {
+    font-size: 28rpx;
+    color: #333;
+    margin-bottom: 13rpx;
+  }
+
+  .promoter-list .list .item .right {
+    text-align: right;
+    font-size: 22rpx;
+    color: #333;
+  }
+
+  .promoter-list .list .item .right .num {
+    margin-right: 7rpx;
+  }
+</style>
diff --git a/pages/commission/wallet.vue b/pages/commission/wallet.vue
new file mode 100644
index 0000000..bc69563
--- /dev/null
+++ b/pages/commission/wallet.vue
@@ -0,0 +1,533 @@
+<!-- 分销 - 佣金明细 -->
+<template>
+  <s-layout class="wallet-wrap" title="佣金">
+    <!-- 钱包卡片 -->
+    <view class="header-box ss-flex ss-row-center ss-col-center">
+      <view class="card-box ui-BG-Main ui-Shadow-Main">
+        <view class="card-head ss-flex ss-col-center">
+          <view class="card-title ss-m-r-10">当前佣金（元）</view>
+          <view
+            @tap="state.showMoney = !state.showMoney"
+            class="ss-eye-icon"
+            :class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"
+          />
+        </view>
+        <view class="ss-flex ss-row-between ss-col-center ss-m-t-30">
+          <view class="money-num">{{
+            state.showMoney ? fen2yuan(state.summary.withdrawPrice || 0) : '*****'
+          }}</view>
+          <view class="ss-flex">
+            <view class="ss-m-r-20">
+              <button
+                class="ss-reset-button withdraw-btn"
+                @tap="sheep.$router.go('/pages/commission/withdraw')"
+              >
+                提现
+              </button>
+            </view>
+            <button class="ss-reset-button balance-btn ss-m-l-20" @tap="state.showModal = true">
+              转钻石
+            </button>
+          </view>
+        </view>
+
+        <view class="ss-flex">
+          <view class="loading-money">
+            <view class="loading-money-title">冻结佣金</view>
+            <view class="loading-money-num">
+              {{ state.showMoney ? fen2yuan(state.summary.frozenPrice || 0) : '*****' }}
+            </view>
+          </view>
+          <view class="loading-money ss-m-l-100">
+            <view class="loading-money-title">可提现佣金</view>
+            <view class="loading-money-num">
+              {{ state.showMoney ? fen2yuan(state.summary.brokeragePrice || 0) : '*****' }}
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <su-sticky>
+      <!-- 统计 -->
+      <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
+        <uni-datetime-picker
+          v-model="state.date"
+          type="daterange"
+          @change="onChangeTime"
+          :end="state.today"
+        >
+          <button class="ss-reset-button date-btn">
+            <text>{{ dateFilterText }}</text>
+            <text class="cicon-drop-down ss-seldate-icon" />
+          </button>
+        </uni-datetime-picker>
+
+        <view class="total-box">
+          <!-- TODO 芋艿：这里暂时不考虑做 -->
+          <!-- <view class="ss-m-b-10">总收入￥{{ state.pagination.income.toFixed(2) }}</view> -->
+          <!-- <view>总支出￥{{ (-state.pagination.expense).toFixed(2) }}</view> -->
+        </view>
+      </view>
+      <su-tabs
+        :list="tabMaps"
+        @change="onChangeTab"
+        :scrollable="false"
+        :current="state.currentTab"
+      />
+    </su-sticky>
+    <s-empty
+      v-if="state.pagination.total === 0"
+      icon="/static/data-empty.png"
+      text="暂无数据"
+    ></s-empty>
+
+    <!-- 转余额弹框 -->
+    <su-popup
+      :show="state.showModal"
+      type="bottom"
+      round="20"
+      @close="state.showModal = false"
+      showClose
+    >
+      <view class="ss-p-x-20 ss-p-y-30">
+        <view class="model-title ss-m-b-30 ss-m-l-20">转余额</view>
+        <view class="model-subtitle ss-m-b-100 ss-m-l-20">将您的佣金转为钻石继续消费</view>
+        <view class="input-box ss-flex ss-col-center border-bottom ss-m-b-70 ss-m-x-20">
+          <view class="unit">￥</view>
+          <uni-easyinput
+            :inputBorder="false"
+            class="ss-flex-1 ss-p-l-10"
+            v-model="state.price"
+            type="number"
+            placeholder="请输入金额"
+          />
+        </view>
+        <button
+          class="ss-reset-button model-btn ui-BG-Main-Gradient ui-Shadow-Main"
+          @tap="onConfirm"
+        >
+          确定
+        </button>
+      </view>
+    </su-popup>
+
+    <!-- 钱包记录 -->
+    <view v-if="state.pagination.total > 0">
+      <view
+        class="wallet-list ss-flex border-bottom"
+        v-for="item in state.pagination.list"
+        :key="item.id"
+      >
+        <view class="list-content">
+          <view class="title-box ss-flex ss-row-between ss-m-b-20">
+            <text class="title ss-line-1">{{ item.description }}</text>
+            <view class="money">
+              <text v-if="item.price >= 0" class="add">+{{ fen2yuan(item.price) }}</text>
+              <text v-else class="minus">{{ fen2yuan(item.price) }}</text>
+            </view>
+          </view>
+		  <view class="status-box">
+			  <text class="time">{{
+			    sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss')
+			  }}</text>
+			  <text class="status" v-if="item.price >= 0 && item.status == 0">待结算</text>
+			  <text class="status" v-if="item.price >= 0 && item.status == 1">已结算</text>
+		  </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- <u-gap></u-gap> -->
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import { computed, reactive } from 'vue';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import dayjs from 'dayjs';
+  import _ from 'lodash-es';
+  import BrokerageApi from '@/sheep/api/trade/brokerage';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import { resetPagination } from '@/sheep/util';
+
+  const headerBg = sheep.$url.css('/static/img/shop/user/wallet_card_bg.png');
+
+  const state = reactive({
+    showMoney: false,
+    summary: {}, // 分销信息
+
+    today: '',
+    date: [],
+    currentTab: 0,
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 10,
+    },
+    loadStatus: '',
+
+    price: undefined,
+    showModal: false,
+  });
+
+  const tabMaps = [
+    {
+      name: '分佣',
+      value: '1', // BrokerageRecordBizTypeEnum.ORDER
+    },
+    {
+      name: '提现',
+      value: '2', // BrokerageRecordBizTypeEnum.WITHDRAW
+    },
+  ];
+
+  const dateFilterText = computed(() => {
+    if (state.date[0] === state.date[1]) {
+      return state.date[0];
+    } else {
+      return state.date.join('~');
+    }
+  });
+
+  async function getLogList() {
+    state.loadStatus = 'loading';
+    let { code, data } = await BrokerageApi.getBrokerageRecordPage({
+      pageSize: state.pagination.pageSize,
+      pageNo: state.pagination.pageNo,
+      bizType: tabMaps[state.currentTab].value,
+      'createTime[0]': state.date[0] + ' 00:00:00',
+      'createTime[1]': state.date[1] + ' 23:59:59',
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  function onChangeTab(e) {
+    resetPagination(state.pagination);
+    state.currentTab = e.index;
+    getLogList();
+  }
+
+  function onChangeTime(e) {
+    state.date[0] = e[0];
+    state.date[1] = e[e.length - 1];
+    resetPagination(state.pagination);
+    getLogList();
+  }
+
+  // 确认操作（转账到余额）
+  async function onConfirm() {
+    if (state.price <= 0) {
+      sheep.$helper.toast('请输入正确的金额');
+      return;
+    }
+    uni.showModal({
+      title: '提示',
+      content: '确认把您的佣金转入到余额钱包中？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await BrokerageApi.createBrokerageWithdraw({
+          type: 1, // 钱包
+          price: state.price * 100,
+        });
+        if (code === 0) {
+          state.showModal = false;
+          await getAgentInfo();
+          onChangeTab({
+            index: 1,
+          });
+        }
+      },
+    });
+  }
+
+  async function getAgentInfo() {
+    const { code, data } = await BrokerageApi.getBrokerageUserSummary();
+    if (code !== 0) {
+      return;
+    }
+    state.summary = data;
+  }
+
+  onLoad(async (options) => {
+    state.today = dayjs().format('YYYY-MM-DD');
+    state.date = [state.today, state.today];
+    if (options.type === 2) {
+      // 切换到“提现” tab 下
+      state.currentTab = 1;
+    }
+    getLogList();
+    getAgentInfo();
+  });
+
+  onReachBottom(() => {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getLogList();
+  });
+</script>
+
+<style lang="scss" scoped>
+	
+  .status-box {
+	  display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  
+	  .status {
+		 font-size: 22rpx;
+	  }
+  }
+	
+  // 钱包
+  .header-box {
+    background-color: $white;
+    padding: 30rpx;
+
+    .card-box {
+      width: 100%;
+      min-height: 300rpx;
+      padding: 40rpx;
+      background-size: 100% 100%;
+      border-radius: 30rpx;
+      overflow: hidden;
+      position: relative;
+      z-index: 1;
+      box-sizing: border-box;
+
+      &::after {
+        content: '';
+        display: block;
+        width: 100%;
+        height: 100%;
+        z-index: 2;
+        position: absolute;
+        top: 0;
+        left: 0;
+        background: v-bind(headerBg) no-repeat;
+        pointer-events: none;
+      }
+
+      .card-head {
+        color: $white;
+        font-size: 24rpx;
+      }
+
+      .ss-eye-icon {
+        font-size: 40rpx;
+        color: $white;
+      }
+
+      .money-num {
+        font-size: 40rpx;
+        line-height: normal;
+        font-weight: 500;
+        color: $white;
+        font-family: OPPOSANS;
+      }
+
+      .reduce-num {
+        font-size: 26rpx;
+        font-weight: 400;
+        color: $white;
+      }
+
+      .withdraw-btn {
+        width: 120rpx;
+        height: 60rpx;
+        line-height: 60rpx;
+        border-radius: 30px;
+        font-size: 24rpx;
+        font-weight: 500;
+        background-color: $white;
+        color: var(--ui-BG-Main);
+      }
+
+      .balance-btn {
+        width: 120rpx;
+        height: 60rpx;
+        line-height: 60rpx;
+        border-radius: 30px;
+        font-size: 24rpx;
+        font-weight: 500;
+        color: $white;
+        border: 1px solid $white;
+      }
+    }
+  }
+
+  .loading-money {
+    margin-top: 56rpx;
+
+    .loading-money-title {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #ffffff;
+      line-height: normal;
+      margin-bottom: 30rpx;
+    }
+
+    .loading-money-num {
+      font-size: 30rpx;
+      font-family: OPPOSANS;
+      font-weight: 500;
+      color: #fefefe;
+    }
+  }
+
+  // 筛选
+
+  .filter-box {
+    height: 120rpx;
+    padding: 0 30rpx;
+    background-color: $bg-page;
+
+    .total-box {
+      font-size: 24rpx;
+      font-weight: 500;
+      color: $dark-9;
+    }
+
+    .date-btn {
+      background-color: $white;
+      line-height: 54rpx;
+      border-radius: 27rpx;
+      padding: 0 20rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      color: $dark-6;
+
+      .ss-seldate-icon {
+        font-size: 50rpx;
+        color: $dark-9;
+      }
+    }
+  }
+
+  // tab
+  .wallet-tab-card {
+    .tab-item {
+      height: 80rpx;
+      position: relative;
+
+      .tab-title {
+        font-size: 30rpx;
+      }
+
+      .cur-tab-title {
+        font-weight: $font-weight-bold;
+      }
+
+      .tab-line {
+        width: 60rpx;
+        height: 6rpx;
+        border-radius: 6rpx;
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        bottom: 2rpx;
+        background-color: var(--ui-BG-Main);
+      }
+    }
+  }
+
+  // 钱包记录
+  .wallet-list {
+    padding: 30rpx;
+    background-color: #ffff;
+
+    .head-img {
+      width: 70rpx;
+      height: 70rpx;
+      border-radius: 50%;
+      background: $gray-c;
+    }
+
+    .list-content {
+      justify-content: space-between;
+      align-items: flex-start;
+      flex: 1;
+
+      .title {
+        font-size: 28rpx;
+        color: $dark-3;
+        width: 400rpx;
+      }
+
+      .time {
+        color: $gray-c;
+        font-size: 22rpx;
+      }
+    }
+
+    .money {
+      font-size: 28rpx;
+      font-weight: bold;
+      font-family: OPPOSANS;
+
+      .add {
+        color: var(--ui-BG-Main);
+      }
+
+      .minus {
+        color: $dark-3;
+      }
+    }
+  }
+
+  .model-title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333333;
+  }
+
+  .model-subtitle {
+    font-size: 26rpx;
+    color: #c2c7cf;
+  }
+
+  .model-btn {
+    width: 100%;
+    height: 80rpx;
+    border-radius: 40rpx;
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #ffffff;
+    line-height: normal;
+  }
+
+  .input-box {
+    height: 100rpx;
+
+    .unit {
+      font-size: 48rpx;
+      color: #333;
+      font-weight: 500;
+      line-height: normal;
+    }
+
+    .uni-easyinput__placeholder-class {
+      font-size: 30rpx;
+      height: 40rpx;
+      line-height: normal;
+    }
+  }
+</style>
diff --git a/pages/commission/withdraw.vue b/pages/commission/withdraw.vue
new file mode 100644
index 0000000..e60309f
--- /dev/null
+++ b/pages/commission/withdraw.vue
@@ -0,0 +1,467 @@
+<!-- 分佣提现 -->
+<template>
+  <s-layout title="申请提现" class="withdraw-wrap" navbar="inner">
+    <view class="page-bg"></view>
+    <view
+      class="wallet-num-box ss-flex ss-col-center ss-row-between"
+      :style="[
+        {
+          marginTop: '-' + Number(statusBarHeight + 88 + 22) + 'rpx',
+          paddingTop: Number(statusBarHeight + 88 + 22) + 'rpx',
+        },
+      ]"
+    >
+      <view class="">
+        <view class="num-title">可提现金额（元）</view>
+        <view class="wallet-num">{{ fen2yuan(state.brokerageInfo.brokeragePrice) }}</view>
+      </view>
+      <button
+        class="ss-reset-button log-btn"
+        @tap="sheep.$router.go('/pages/commission/wallet', { type: 2 })"
+      >
+        提现记录
+      </button>
+    </view>
+    <!-- 提现输入卡片-->
+    <view class="draw-card" v-if="isPass">
+      <view class="bank-box ss-flex ss-col-center ss-row-between ss-m-b-30">
+        <view class="name">提现至</view>
+        <view class="bank-list ss-flex ss-col-center" @tap="onAccountSelect(true)">
+          <view v-if="!state.accountInfo.type" class="empty-text">请选择提现方式</view>
+          <view v-if="state.accountInfo.type === '1'" class="empty-text">钱包余额</view>
+          <view v-if="state.accountInfo.type === '2'" class="empty-text">银行卡转账</view>
+          <view v-if="state.accountInfo.type === '3'" class="empty-text">微信零钱</view>
+          <view v-if="state.accountInfo.type === '4'" class="empty-text">支付宝账户</view>
+          <text class="cicon-forward" />
+        </view>
+      </view>
+      <!-- 提现金额 -->
+      <view class="card-title">提现金额</view>
+      <view class="input-box ss-flex ss-col-center border-bottom">
+        <view class="unit">￥</view>
+        <uni-easyinput
+          :inputBorder="false"
+          class="ss-flex-1 ss-p-l-10"
+          v-model="state.accountInfo.price"
+          type="number"
+          placeholder="请输入提现金额"
+        />
+      </view>
+      <!-- 提现账号 -->
+      <view class="card-title" v-show="['2', '3', '4'].includes(state.accountInfo.type)">
+        提现账号
+      </view>
+      <view
+        class="input-box ss-flex ss-col-center border-bottom"
+        v-show="['2', '3', '4'].includes(state.accountInfo.type)"
+      >
+        <view class="unit" />
+        <uni-easyinput
+          :inputBorder="false"
+          class="ss-flex-1 ss-p-l-10"
+          v-model="state.accountInfo.accountNo"
+          placeholder="请输入提现账号"
+        />
+      </view>
+      <!-- 收款码 -->
+      <view class="card-title" v-show="['3', '4'].includes(state.accountInfo.type)">收款码</view>
+      <view
+        class="input-box ss-flex ss-col-center"
+        v-show="['3', '4'].includes(state.accountInfo.type)"
+      >
+        <view class="unit" />
+        <view class="upload-img">
+          <s-uploader
+            v-model:url="state.accountInfo.accountQrCodeUrl"
+            fileMediatype="image"
+            limit="1"
+            mode="grid"
+            :imageStyles="{ width: '168rpx', height: '168rpx' }"
+          />
+        </view>
+      </view>
+      <!-- 持卡人姓名 -->
+      <view class="card-title" v-show="state.accountInfo.type === '2'">持卡人</view>
+      <view
+        class="input-box ss-flex ss-col-center border-bottom"
+        v-show="state.accountInfo.type === '2'"
+      >
+        <view class="unit" />
+        <uni-easyinput
+          :inputBorder="false"
+          class="ss-flex-1 ss-p-l-10"
+          v-model="state.accountInfo.name"
+          placeholder="请输入持卡人姓名"
+        />
+      </view>
+      <!-- 提现银行 -->
+      <view class="card-title" v-show="state.accountInfo.type === '2'">提现银行</view>
+      <view
+        class="input-box ss-flex ss-col-center border-bottom"
+        v-show="state.accountInfo.type === '2'"
+      >
+        <view class="unit" />
+        <!--银行改为下拉选择-->
+        <picker
+          @change="bankChange"
+          :value="state.bankListSelectedIndex"
+          :range="state.bankList"
+          range-key="label"
+          style="width: 100%"
+        >
+          <uni-easyinput
+            :inputBorder="false"
+            :value="state.accountInfo.bankName"
+            placeholder="请选择银行"
+            suffixIcon="right"
+            disabled
+            :styles="{ disableColor: '#fff', borderColor: '#fff', color: '#333!important' }"
+          />
+        </picker>
+      </view>
+      <!-- 开户地址 -->
+      <view class="card-title" v-show="state.accountInfo.type === '2'">开户地址</view>
+      <view
+        class="input-box ss-flex ss-col-center border-bottom"
+        v-show="state.accountInfo.type === '2'"
+      >
+        <view class="unit" />
+        <uni-easyinput
+          :inputBorder="false"
+          class="ss-flex-1 ss-p-l-10"
+          v-model="state.accountInfo.bankAddress"
+          placeholder="请输入开户地址"
+        />
+      </view>
+      <button class="ss-reset-button save-btn ui-BG-Main-Gradient ui-Shadow-Main" @tap="onConfirm">
+        确认提现
+      </button>
+    </view>
+
+    <!-- 提现说明 -->
+    <view class="draw-notice">
+      <view class="title ss-m-b-30">提现说明</view>
+      <view class="draw-list"> 最低提现金额 {{ fen2yuan(state.minPrice) }} 元 </view>
+      <view class="draw-list">
+        冻结佣金：<text>￥{{ fen2yuan(state.brokerageInfo.frozenPrice) }}</text>
+        （每笔佣金的冻结期为 {{ state.frozenDays }} 天，到期后可提现）
+      </view>
+    </view>
+
+    <!-- 选择提现账户 -->
+    <account-type-select
+      :show="state.accountSelect"
+      @close="onAccountSelect(false)"
+      round="10"
+      v-model="state.accountInfo"
+      :methods="state.withdrawTypes"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import { computed, reactive, onBeforeMount } from 'vue';
+  import sheep from '@/sheep';
+  import accountTypeSelect from './components/account-type-select.vue';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import TradeConfigApi from '@/sheep/api/trade/config';
+  import BrokerageApi from '@/sheep/api/trade/brokerage';
+  import DictApi from '@/sheep/api/system/dict';
+  
+  const isPass = computed(() => {
+      return sheep.$store('user').tradeConfig.weixinEnabled;
+  });
+
+  const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+
+  const userStore = sheep.$store('user');
+  const userInfo = computed(() => userStore.userInfo);
+  const state = reactive({
+    accountInfo: {
+      // 提现表单
+      type: undefined,
+      accountNo: undefined,
+      accountQrCodeUrl: undefined,
+      name: undefined,
+      bankName: undefined,
+      bankAddress: undefined,
+    },
+
+    accountSelect: false,
+
+    brokerageInfo: {}, // 分销信息
+
+    frozenDays: 0, // 冻结天数
+    minPrice: 0, // 最低提现金额
+    withdrawTypes: [], // 提现方式
+    bankList: [], // 银行字典数据
+    bankListSelectedIndex: '', // 选中银行 bankList 的 index
+  });
+
+  // 打开提现方式的弹窗
+  const onAccountSelect = (e) => {
+    state.accountSelect = e;
+  };
+
+  // 提交提现
+  const onConfirm = async () => {
+    // 参数校验
+    //debugger;
+    if (
+      !state.accountInfo.price ||
+      state.accountInfo.price > state.brokerageInfo.price ||
+      state.accountInfo.price <= 0
+    ) {
+      sheep.$helper.toast('请输入正确的提现金额');
+      return;
+    }
+    if (!state.accountInfo.type) {
+      sheep.$helper.toast('请选择提现方式');
+      return;
+    }
+    // 提交请求
+    let { code } = await BrokerageApi.createBrokerageWithdraw({
+      ...state.accountInfo,
+      price: state.accountInfo.price * 100,
+    });
+    if (code !== 0) {
+      return;
+    }
+    // 提示
+    uni.showModal({
+      title: '操作成功',
+      content: '您的提现申请已成功提交',
+      cancelText: '继续提现',
+      confirmText: '查看记录',
+      success: (res) => {
+        if (res.confirm) {
+          sheep.$router.go('/pages/commission/wallet', { type: 2 });
+          return;
+        }
+        getBrokerageUser();
+        state.accountInfo = {};
+      },
+    });
+  };
+
+  // 获得分销配置
+  async function getWithdrawRules() {
+    let { code, data } = await TradeConfigApi.getTradeConfig();
+    if (code !== 0) {
+      return;
+    }
+    if (data) {
+      state.minPrice = data.brokerageWithdrawMinPrice || 0;
+      state.frozenDays = data.brokerageFrozenDays || 0;
+      state.withdrawTypes = data.brokerageWithdrawTypes;
+    }
+  }
+
+  // 获得分销信息
+  async function getBrokerageUser() {
+    const { data, code } = await BrokerageApi.getBrokerageUser();
+    if (code === 0) {
+      state.brokerageInfo = data;
+    }
+  }
+
+  // 获取提现银行配置字典
+  async function getDictDataListByType() {
+    let { code, data } = await DictApi.getDictDataListByType('brokerage_bank_name');
+    if (code !== 0) {
+      return;
+    }
+    if (data && data.length > 0) {
+      state.bankList = data;
+    }
+  }
+
+  // 银行选择
+  function bankChange(e) {
+    const value = e.detail.value;
+    state.bankListSelectedIndex = value;
+    state.accountInfo.bankName = state.bankList[value].label;
+  }
+
+  onBeforeMount(() => {
+    getWithdrawRules();
+    getBrokerageUser();
+    getDictDataListByType(); //获取银行字典数据
+  });
+</script>
+
+<style lang="scss" scoped>
+  :deep() {
+    .uni-input-input {
+      font-family: OPPOSANS !important;
+    }
+  }
+
+  .wallet-num-box {
+    padding: 0 40rpx 80rpx;
+    background: var(--ui-BG-Main) v-bind(headerBg) center/750rpx 100% no-repeat;
+    border-radius: 0 0 5% 5%;
+
+    .num-title {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: $white;
+      margin-bottom: 20rpx;
+    }
+
+    .wallet-num {
+      font-size: 60rpx;
+      font-weight: 500;
+      color: $white;
+      font-family: OPPOSANS;
+    }
+
+    .log-btn {
+      width: 170rpx;
+      height: 60rpx;
+      line-height: 60rpx;
+      border: 1rpx solid $white;
+      border-radius: 30rpx;
+      padding: 0;
+      font-size: 26rpx;
+      font-weight: 500;
+      color: $white;
+    }
+  }
+
+  // 提现输入卡片
+  .draw-card {
+    background-color: $white;
+    border-radius: 20rpx;
+    width: 690rpx;
+    min-height: 560rpx;
+    margin: -60rpx 30rpx 30rpx 30rpx;
+    padding: 30rpx;
+    position: relative;
+    z-index: 3;
+    box-sizing: border-box;
+
+    .card-title {
+      font-size: 30rpx;
+      font-weight: 500;
+      margin-bottom: 30rpx;
+    }
+
+    .bank-box {
+      .name {
+        font-size: 28rpx;
+        font-weight: 500;
+      }
+
+      .bank-list {
+        .empty-text {
+          font-size: 28rpx;
+          font-weight: 400;
+          color: $dark-9;
+        }
+
+        .cicon-forward {
+          color: $dark-9;
+        }
+      }
+
+      .input-box {
+        width: 624rpx;
+        height: 100rpx;
+        margin-bottom: 40rpx;
+
+        .unit {
+          font-size: 48rpx;
+          color: #333;
+          font-weight: 500;
+        }
+
+        .uni-easyinput__placeholder-class {
+          font-size: 30rpx;
+          height: 36rpx;
+        }
+
+        :deep(.uni-easyinput__content-input) {
+          font-size: 48rpx;
+        }
+      }
+
+      .save-btn {
+        width: 616rpx;
+        height: 86rpx;
+        line-height: 86rpx;
+        border-radius: 40rpx;
+        margin-top: 80rpx;
+      }
+    }
+
+    .bind-box {
+      .placeholder-text {
+        font-size: 26rpx;
+        color: $dark-9;
+      }
+
+      .add-btn {
+        width: 100rpx;
+        height: 50rpx;
+        border-radius: 25rpx;
+        line-height: 50rpx;
+        font-size: 22rpx;
+        color: var(--ui-BG-Main);
+        background-color: var(--ui-BG-Main-light);
+      }
+    }
+
+    .input-box {
+      width: 624rpx;
+      height: 100rpx;
+      margin-bottom: 40rpx;
+
+      .unit {
+        font-size: 48rpx;
+        color: #333;
+        font-weight: 500;
+      }
+
+      .uni-easyinput__placeholder-class {
+        font-size: 30rpx;
+      }
+
+      :deep(.uni-easyinput__content-input) {
+        font-size: 48rpx;
+      }
+    }
+
+    .save-btn {
+      width: 616rpx;
+      height: 86rpx;
+      line-height: 86rpx;
+      border-radius: 40rpx;
+      margin-top: 80rpx;
+    }
+  }
+
+  // 提现说明
+  .draw-notice {
+    width: 684rpx;
+    background: #ffffff;
+    border: 2rpx solid #fffaee;
+    border-radius: 20rpx;
+    margin: 20rpx 32rpx 0 32rpx;
+    padding: 30rpx;
+    box-sizing: border-box;
+
+    .title {
+      font-weight: 500;
+      color: #333333;
+      font-size: 30rpx;
+    }
+
+    .draw-list {
+      font-size: 24rpx;
+      color: #999999;
+      line-height: 46rpx;
+    }
+  }
+</style>
diff --git a/pages/coupon/detail.vue b/pages/coupon/detail.vue
new file mode 100644
index 0000000..2fca525
--- /dev/null
+++ b/pages/coupon/detail.vue
@@ -0,0 +1,390 @@
+<!-- 优惠券详情  -->
+<template>
+  <s-layout title="优惠券详情">
+    <view class="bg-white">
+      <!-- 详情卡片 -->
+      <view class="detail-wrap ss-p-20">
+        <view class="detail-box">
+          <view class="tag-box ss-flex ss-col-center ss-row-center">
+            <image
+              class="tag-image"
+              :src="sheep.$url.static('/static/img/shop/app/coupon_icon.png')"
+              mode="aspectFit"
+            />
+          </view>
+          <view class="top ss-flex-col ss-col-center">
+            <view class="title ss-m-t-50 ss-m-b-20 ss-m-x-20">{{ state.coupon.name }}</view>
+            <view class="subtitle ss-m-b-50">
+              满 {{ fen2yuan(state.coupon.usePrice) }} 元，
+              {{
+                state.coupon.discountType === 1
+                  ? '减 ' + fen2yuan(state.coupon.discountPrice) + ' 元'
+                  : '打 ' + state.coupon.discountPercent / 10.0 + ' 折'
+              }}
+            </view>
+            <button
+              class="ss-reset-button ss-m-b-30"
+              :class="
+                state.coupon.canTake || state.coupon.status === 1
+                  ? 'use-btn' // 优惠劵模版（可领取）、优惠劵（可使用）
+                  : 'disable-btn'
+              "
+              :disabled="!state.coupon.canTake"
+              @click="getCoupon"
+            >
+              <text v-if="state.id > 0">{{ state.coupon.canTake ? '立即领取' : '已领取' }}</text>
+              <text v-else>
+                {{
+                  state.coupon.status === 1
+                    ? '可使用'
+                    : state.coupon.status === 2
+                    ? '已使用'
+                    : '已过期'
+                }}
+              </text>
+            </button>
+            <view class="time ss-m-y-30" v-if="state.coupon.validityType === 2">
+              有效期：领取后 {{ state.coupon.fixedEndTerm }} 天内可用
+            </view>
+            <view class="time ss-m-y-30" v-else>
+              有效期: {{ sheep.$helper.timeFormat(state.coupon.validStartTime, 'yyyy-mm-dd') }} 至
+              {{ sheep.$helper.timeFormat(state.coupon.validEndTime, 'yyyy-mm-dd') }}
+            </view>
+            <view class="coupon-line ss-m-t-14"></view>
+          </view>
+          <view class="bottom">
+            <view class="type ss-flex ss-col-center ss-row-between ss-p-x-30">
+              <view>优惠券类型</view>
+              <view>{{ state.coupon.discountType === 1 ? '满减券' : '折扣券' }}</view>
+            </view>
+            <uni-collapse>
+              <uni-collapse-item title="优惠券说明" v-if="state.coupon.description">
+                <view class="content ss-p-b-20">
+                  <text class="des ss-p-l-30">{{ state.coupon.description }}</text>
+                </view>
+              </uni-collapse-item>
+            </uni-collapse>
+          </view>
+        </view>
+      </view>
+
+      <!-- 适用商品 -->
+      <view
+        class="all-user ss-flex ss-row-center ss-col-center"
+        v-if="state.coupon.productScope === 1"
+      >
+        全场通用
+      </view>
+
+      <su-sticky v-else bgColor="#fff">
+        <view class="goods-title ss-p-20">
+          {{ state.coupon.productScope === 2 ? '指定商品可用' : '指定分类可用' }}
+        </view>
+        <su-tabs
+          :scrollable="true"
+          :list="state.tabMaps"
+          @change="onTabsChange"
+          :current="state.currentTab"
+          v-if="state.coupon.productScope === 3"
+        />
+      </su-sticky>
+      <!-- 指定商品 -->
+      <view v-if="state.coupon.productScope === 2">
+        <view v-for="(item, index) in state.pagination.list" :key="index">
+          <s-goods-column
+            class="ss-m-20"
+            size="lg"
+            :data="item"
+            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+            :goodsFields="{
+              title: { show: true },
+              subtitle: { show: true },
+              price: { show: true },
+              original_price: { show: true },
+              sales: { show: true },
+              stock: { show: false },
+            }"
+          />
+        </view>
+      </view>
+      <!-- 指定分类 -->
+      <view v-if="state.coupon.productScope === 3">
+        <view v-for="(item, index) in state.pagination.list" :key="index">
+          <s-goods-column
+            class="ss-m-20"
+            size="lg"
+            :data="item"
+            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+            :goodsFields="{
+              title: { show: true },
+              subtitle: { show: true },
+              price: { show: true },
+              original_price: { show: true },
+              sales: { show: true },
+              stock: { show: false },
+            }"
+          ></s-goods-column>
+        </view>
+      </view>
+      <uni-load-more
+        v-if="state.pagination.total > 0 && state.coupon.productScope === 3"
+        :status="state.loadStatus"
+        :content-text="{
+          contentdown: '上拉加载更多',
+        }"
+        @tap="loadMore"
+      />
+      <s-empty
+        v-if="state.coupon.productScope === 3 && state.pagination.total === 0"
+        paddingTop="0"
+        icon="/static/soldout-empty.png"
+        text="暂无商品"
+      />
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import _ from 'lodash-es';
+  import CouponApi from '@/sheep/api/promotion/coupon';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import SpuApi from '@/sheep/api/product/spu';
+  import CategoryApi from '@/sheep/api/product/category';
+  import { resetPagination } from '@/sheep/util';
+
+  const state = reactive({
+    id: 0, // 优惠劵模版编号 templateId
+    couponId: 0, // 用户优惠劵编号 couponId
+    coupon: {}, // 优惠劵信息
+
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 1,
+    },
+    categoryId: 0, // 选中的商品分类编号
+    tabMaps: [], // 指定分类时，每个分类构成一个 tab
+    currentTab: 0, // 选中的 tabMaps 下标
+    loadStatus: '',
+  });
+
+  function onTabsChange(e) {
+    resetPagination(state.pagination);
+    state.currentTab = e.index;
+    state.categoryId = e.value;
+    getGoodsListByCategory();
+  }
+
+  async function getGoodsListByCategory() {
+    state.loadStatus = 'loading';
+    const { code, data } = await SpuApi.getSpuPage({
+      categoryId: state.categoryId,
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  // 获得商品列表，指定商品范围
+  async function getGoodsListById() {
+    const { data, code } = await SpuApi.getSpuListByIds(state.coupon.productScopeValues.join(','));
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = data;
+  }
+
+  // 获得分类列表
+  async function getCategoryList() {
+    const { data, code } = await CategoryApi.getCategoryListByIds(
+      state.coupon.productScopeValues.join(','),
+    );
+    if (code !== 0) {
+      return;
+    }
+    state.tabMaps = data.map((category) => ({ name: category.name, value: category.id }));
+    // 加载第一个分类的商品列表
+    if (state.tabMaps.length > 0) {
+      state.categoryId = state.tabMaps[0].value;
+      await getGoodsListByCategory();
+    }
+  }
+
+  // 领取优惠劵
+  async function getCoupon() {
+    const { code } = await CouponApi.takeCoupon(state.id);
+    if (code !== 0) {
+      return;
+    }
+    uni.showToast({
+      title: '领取成功',
+    });
+    setTimeout(() => {
+      getCouponContent();
+    }, 1000);
+  }
+
+  // 加载优惠劵信息
+  async function getCouponContent() {
+    const { code, data } =
+      state.id > 0
+        ? await CouponApi.getCouponTemplate(state.id)
+        : await CouponApi.getCoupon(state.couponId);
+    if (code !== 0) {
+      return;
+    }
+    state.coupon = data;
+    // 不同指定范围，加载不同数据
+    if (state.coupon.productScope === 2) {
+      await getGoodsListById();
+    } else if (state.coupon.productScope === 3) {
+      await getCategoryList();
+    }
+  }
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getGoodsListByCategory();
+  }
+
+  onLoad((options) => {
+    state.id = options.id;
+    state.couponId = options.couponId;
+    getCouponContent(state.id, state.couponId);
+  });
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .goods-title {
+    font-size: 34rpx;
+    font-weight: bold;
+    color: #333333;
+  }
+
+  .detail-wrap {
+    background: linear-gradient(
+      180deg,
+      var(--ui-BG-Main),
+      var(--ui-BG-Main-gradient),
+      var(--ui-BG-Main),
+      #fff
+    );
+  }
+
+  .detail-box {
+    // background-color: var(--ui-BG);
+    border-radius: 6rpx;
+    position: relative;
+    margin-top: 100rpx;
+    .tag-box {
+      width: 140rpx;
+      height: 140rpx;
+      background: var(--ui-BG);
+      border-radius: 50%;
+      position: absolute;
+      top: -70rpx;
+      left: 50%;
+      z-index: 6;
+      transform: translateX(-50%);
+
+      .tag-image {
+        width: 104rpx;
+        height: 104rpx;
+        border-radius: 50%;
+      }
+    }
+
+    .top {
+      background-color: #fff;
+      border-radius: 20rpx 20rpx 0 0;
+      -webkit-mask: radial-gradient(circle at 16rpx 100%, #0000 16rpx, red 0) -16rpx;
+      padding: 110rpx 0 0 0;
+      position: relative;
+      z-index: 5;
+
+      .title {
+        font-size: 40rpx;
+        color: #333;
+        font-weight: bold;
+      }
+
+      .subtitle {
+        font-size: 28rpx;
+        color: #333333;
+      }
+
+      .use-btn {
+        width: 386rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+        border-radius: 40rpx;
+        color: $white;
+      }
+
+      .disable-btn {
+        width: 386rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        background: #e5e5e5;
+        border-radius: 40rpx;
+        color: $white;
+      }
+
+      .time {
+        font-size: 26rpx;
+        font-weight: 400;
+        color: #999999;
+      }
+
+      .coupon-line {
+        width: 95%;
+        border-bottom: 2rpx solid #eeeeee;
+      }
+    }
+
+    .bottom {
+      background-color: #fff;
+      border-radius: 0 0 20rpx 20rpx;
+      -webkit-mask: radial-gradient(circle at 16rpx 0%, #0000 16rpx, red 0) -16rpx;
+      padding: 40rpx 30rpx;
+
+      .type {
+        height: 96rpx;
+        border-bottom: 2rpx solid #eeeeee;
+      }
+    }
+
+    .des {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #666666;
+    }
+  }
+
+  .all-user {
+    width: 100%;
+    height: 300rpx;
+    font-size: 34rpx;
+    font-weight: bold;
+    color: #333333;
+  }
+</style>
diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue
new file mode 100644
index 0000000..ec5ea45
--- /dev/null
+++ b/pages/coupon/list.vue
@@ -0,0 +1,222 @@
+<!-- 优惠券中心  -->
+<template>
+  <s-layout title="优惠券" :bgStyle="{ color: '#f2f2f2' }">
+    <su-sticky bgColor="#fff">
+      <su-tabs
+        :list="tabMaps"
+        :scrollable="false"
+        @change="onTabsChange"
+        :current="state.currentTab"
+      />
+    </su-sticky>
+    <s-empty
+      v-if="state.pagination.total === 0"
+      icon="/static/coupon-empty.png"
+      text="暂无优惠券"
+    />
+    <!-- 情况一：领劵中心 -->
+    <template v-if="state.currentTab === 0">
+      <view v-for="item in state.pagination.list" :key="item.id">
+        <s-coupon-list
+          :data="item"
+          @tap="sheep.$router.go('/pages/coupon/detail', { id: item.id })"
+        >
+          <template #default>
+            <button
+              class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center"
+              :class="!item.canTake ? 'border-btn' : ''"
+              @click.stop="getBuy(item.id)"
+              :disabled="!item.canTake"
+            >
+              {{ item.canTake ? '立即领取' : '已领取' }}
+            </button>
+          </template>
+        </s-coupon-list>
+      </view>
+    </template>
+    <!-- 情况二：我的优惠劵 -->
+    <template v-else>
+      <view v-for="item in state.pagination.list" :key="item.id">
+        <s-coupon-list
+          :data="item"
+          type="user"
+          @tap="sheep.$router.go('/pages/coupon/detail', { couponId: item.id })"
+        >
+          <template #default>
+            <button
+              class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center"
+              :class="item.status !== 1 ? 'disabled-btn' : ''"
+              :disabled="item.status !== 1"
+              @click.stop="sheep.$router.go('/pages/coupon/detail', { couponId: item.id })"
+            >
+              {{ item.status === 1 ? '查看详情' : item.status === 2 ? '已使用' : '已过期' }}
+            </button>
+          </template>
+        </s-coupon-list>
+      </view>
+    </template>
+
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import _ from 'lodash-es';
+  import { resetPagination } from '@/sheep/util';
+  import CouponApi from '@/sheep/api/promotion/coupon';
+
+  // 数据
+  const state = reactive({
+    currentTab: 0, // 当前 tab
+    type: '1',
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 5,
+    },
+    loadStatus: '',
+  });
+
+  const tabMaps = [
+    {
+      name: '领券中心',
+      value: 'all',
+    },
+    {
+      name: '已领取',
+      value: '1',
+    },
+    {
+      name: '已使用',
+      value: '2',
+    },
+    {
+      name: '已失效',
+      value: '3',
+    },
+  ];
+
+  function onTabsChange(e) {
+    state.currentTab = e.index;
+    state.type = e.value;
+    resetPagination(state.pagination);
+    if (state.currentTab === 0) {
+      getData();
+    } else {
+      getCoupon();
+    }
+  }
+
+  // 获得优惠劵模版列表
+  async function getData() {
+    state.loadStatus = 'loading';
+    const { data, code } = await CouponApi.getCouponTemplatePage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  // 获得我的优惠劵
+  async function getCoupon() {
+    state.loadStatus = 'loading';
+    const { data, code } = await CouponApi.getCouponPage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+      status: state.type,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  // 领取优惠劵
+  async function getBuy(id) {
+    const { code } = await CouponApi.takeCoupon(id);
+    if (code !== 0) {
+      return;
+    }
+    uni.showToast({
+      title: '领取成功',
+    });
+    setTimeout(() => {
+      resetPagination(state.pagination);
+      getData();
+    }, 1000);
+  }
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    if (state.currentTab === 0) {
+      getData();
+    } else {
+      getCoupon();
+    }
+  }
+
+  onLoad((Option) => {
+    // 领劵中心
+    if (Option.type === 'all' || !Option.type) {
+      getData();
+      // 我的优惠劵
+    } else {
+      Option.type === 'geted'
+        ? (state.currentTab = 1)
+        : Option.type === 'used'
+        ? (state.currentTab = 2)
+        : (state.currentTab = 3);
+      state.type = state.currentTab;
+      getCoupon();
+    }
+  });
+
+  onReachBottom(() => {
+    loadMore();
+  });
+</script>
+<style lang="scss" scoped>
+  .card-btn {
+    // width: 144rpx;
+    padding: 0 16rpx;
+    height: 50rpx;
+    border-radius: 40rpx;
+    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    color: #ffffff;
+    font-size: 24rpx;
+    font-weight: 400;
+  }
+
+  .border-btn {
+    background: linear-gradient(90deg, var(--ui-BG-Main-opacity-4), var(--ui-BG-Main-light));
+    color: #fff !important;
+  }
+
+  .disabled-btn {
+    background: #cccccc;
+    background-color: #cccccc !important;
+    color: #fff !important;
+  }
+</style>
diff --git a/pages/goods/comment/add.vue b/pages/goods/comment/add.vue
new file mode 100644
index 0000000..bfbc800
--- /dev/null
+++ b/pages/goods/comment/add.vue
@@ -0,0 +1,190 @@
+<!-- 评价  -->
+<template>
+  <s-layout title="评价">
+    <view>
+      <view v-for="(item, index) in state.orderInfo.items" :key="item.id">
+        <view>
+          <view class="commont-from-wrap">
+            <!-- 评价商品 -->
+            <s-goods-item
+              :img="item.picUrl"
+              :title="item.spuName"
+              :skuText="item.properties.map((property) => property.valueName).join(' ')"
+              :price="item.payPrice"
+              :num="item.count"
+            />
+          </view>
+
+          <view class="form-item">
+            <!-- 评分 -->
+            <view class="star-box ss-flex ss-col-center">
+              <view class="star-title ss-m-r-40">商品质量</view>
+              <uni-rate v-model="state.commentList[index].descriptionScores" />
+            </view>
+            <view class="star-box ss-flex ss-col-center">
+              <view class="star-title ss-m-r-40">服务态度</view>
+              <uni-rate v-model="state.commentList[index].benefitScores" />
+            </view>
+            <!-- 评价 -->
+            <view class="area-box">
+              <uni-easyinput
+                :inputBorder="false"
+                type="textarea"
+                maxlength="120"
+                autoHeight
+                v-model="state.commentList[index].content"
+                placeholder="宝贝满足你的期待吗？说说你的使用心得，分享给想买的他们吧~"
+              />
+              <view class="img-box">
+                <s-uploader
+                  v-model:url="state.commentList[index].images"
+                  fileMediatype="image"
+                  limit="9"
+                  mode="grid"
+                  :imageStyles="{ width: '168rpx', height: '168rpx' }"
+                  @success="(payload) => uploadSuccess(payload, index)"
+                />
+              </view>
+            </view>
+            <view class="checkbox-container">
+              <checkbox-group @change="(event) => toggleAnonymous(index, event)">
+                <label>
+                  <checkbox value="anonymousChecked" />
+                  匿名评论
+                </label>
+              </checkbox-group>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <su-fixed bottom placeholder>
+      <view class="foot_box ss-flex ss-row-center ss-col-center">
+        <button class="ss-reset-button post-btn ui-BG-Main-Gradient ui-Shadow-Main" @tap="onSubmit">
+          发布
+        </button>
+      </view>
+    </su-fixed>
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive, ref } from 'vue';
+  import OrderApi from '@/sheep/api/trade/order';
+
+  const state = reactive({
+    orderInfo: {},
+    commentList: [],
+    id: null,
+  });
+
+  /**
+   * 切换是否匿名
+   *
+   * @param commentIndex  当前评论下标
+   * @param event 复选框事件
+   */
+  function toggleAnonymous(commentIndex, event) {
+    state.commentList[commentIndex].anonymous = event.detail.value[0] === 'anonymousChecked';
+  }
+
+  /**
+   * 发布评论
+   *
+   * @returns {Promise<void>}
+   */
+  async function onSubmit() {
+    // 顺序提交评论
+    for (const comment of state.commentList) {
+      await OrderApi.createOrderItemComment(comment);
+    }
+    // 都评论好，返回
+    sheep.$router.back();
+  }
+
+  /**
+   * 图片添加到表单
+   *
+   * @param payload 上传成功后的回调数据
+   * @param commentIndex  当前评论的下标
+   */
+  function uploadSuccess(payload, commentIndex) {
+    state.commentList[commentIndex].picUrls = state.commentList[commentIndex].images;
+  }
+
+  onLoad(async (options) => {
+    if (!options.id) {
+      sheep.$helper.toast(`缺少订单信息，请检查`);
+      return;
+    }
+    state.id = options.id;
+
+    const { code, data } = await OrderApi.getOrder(state.id);
+    if (code !== 0) {
+      sheep.$helper.toast('无待评价订单');
+      return;
+    }
+    // 处理评论
+    data.items.forEach((item) => {
+      state.commentList.push({
+        anonymous: false,
+        orderItemId: item.id,
+        descriptionScores: 5,
+        benefitScores: 5,
+        content: '',
+        picUrls: [],
+      });
+    });
+    state.orderInfo = data;
+  });
+</script>
+
+<style lang="scss" scoped>
+  // 评价商品
+  .goods-card {
+    margin: 10rpx 0;
+    padding: 20rpx;
+    background: #fff;
+  }
+
+  // 评论，选择图片
+  .form-item {
+    background: #fff;
+
+    .star-box {
+      height: 100rpx;
+      padding: 0 25rpx;
+    }
+
+    .star-title {
+      font-weight: 600;
+    }
+  }
+
+  .area-box {
+    width: 690rpx;
+    min-height: 306rpx;
+    background: rgba(249, 250, 251, 1);
+    border-radius: 20rpx;
+    padding: 28rpx;
+    margin: auto;
+
+    .img-box {
+      margin-top: 20rpx;
+    }
+  }
+
+  .checkbox-container {
+    padding: 10rpx;
+  }
+
+  .post-btn {
+    width: 690rpx;
+    line-height: 80rpx;
+    border-radius: 40rpx;
+    color: rgba(#fff, 0.9);
+    margin-bottom: 20rpx;
+  }
+</style>
diff --git a/pages/goods/comment/worker/add.vue b/pages/goods/comment/worker/add.vue
new file mode 100644
index 0000000..0cf7976
--- /dev/null
+++ b/pages/goods/comment/worker/add.vue
@@ -0,0 +1,180 @@
+<!-- 评价  -->
+<template>
+	<s-layout title="评价店员">
+		<view>
+			<view v-for="(item, index) in state.orderInfo.items" :key="item.id">
+				<view>
+					<view class="commont-from-wrap">
+						<!-- 评价商品 -->
+						<s-goods-item
+              :img="item.picUrl"
+              :title="item.spuName"
+              :skuText="item.properties.map((property) => property.valueName).join(' ')"
+							:price="item.payPrice"
+              :num="item.count"
+            />
+					</view>
+
+					<view class="form-item">
+						<!-- 评分 -->
+						<view class="star-box ss-flex ss-col-center">
+							<view class="star-title ss-m-r-40">店员质量</view>
+							<uni-rate v-model="state.commentList[index].descriptionScores" />
+						</view>
+						<view class="star-box ss-flex ss-col-center">
+							<view class="star-title ss-m-r-40">服务态度</view>
+							<uni-rate v-model="state.commentList[index].benefitScores" />
+						</view>
+						<!-- 评价 -->
+						<view class="area-box">
+							<uni-easyinput :inputBorder="false" type="textarea" maxlength="120" autoHeight
+								v-model="state.commentList[index].content"
+								placeholder="店员满足你的期待吗？说说你的体验心得，分享给想下单的宝子们吧~" />
+							<!-- TODO 卢越：【评论】文件上传 -->
+							<view class="img-box">
+								<s-uploader v-model:url="state.commentList[index].images" fileMediatype="image"
+									@success="(payload) => uploadSuccess(payload, index)"
+									limit="9" mode="grid" :imageStyles="{ width: '168rpx', height: '168rpx' }" />
+							</view>
+						</view>
+						<view class="checkbox-container">
+						  <checkbox-group @change="(event) => toggleAnonymous(index, event)">
+						    <label>
+						      <checkbox value="anonymousChecked" />
+						      匿名评论
+						    </label>
+						  </checkbox-group>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- TODO 卢越：【评论】是否匿名 -->
+
+		<su-fixed bottom placeholder>
+			<view class="foot_box ss-flex ss-row-center ss-col-center">
+				<button class="ss-reset-button post-btn ui-BG-Main-Gradient ui-Shadow-Main" @tap="onSubmit">
+					发布
+				</button>
+			</view>
+		</su-fixed>
+	</s-layout>
+</template>
+
+<script setup>
+	import sheep from '@/sheep';
+	import { onLoad } from '@dcloudio/uni-app';
+	import { reactive } from 'vue';
+  import OrderApi from '@/sheep/api/trade/order';
+
+	const state = reactive({
+		orderInfo: {},
+		commentList: [],
+		id: null
+	});
+	
+	/**
+	 * 切换是否匿名
+	 *
+	 * @param commentIndex  当前评论下标
+	 * @param event 复选框事件
+	 */
+	function toggleAnonymous(commentIndex, event) {
+	  state.commentList[commentIndex].anonymous = event.detail.value[0] === 'anonymousChecked';
+	}
+
+	async function onSubmit() {
+		// 顺序提交评论
+		for (const comment of state.commentList) {
+		  await OrderApi.createOrderItemComment(comment);
+		}
+		// 都评论好，返回
+		sheep.$router.go('/pages/order/my/list');
+		//sheep.$router.back();
+	}
+
+	/**
+	 * 图片添加到表单
+	 *
+	 * @param payload 上传成功后的回调数据
+	 * @param commentIndex  当前评论的下标
+	 */
+	function uploadSuccess(payload, commentIndex) {
+	  state.commentList[commentIndex].picUrls = state.commentList[commentIndex].images;
+	}
+	
+	onLoad(async (options) => {
+    if (!options.id) {
+      sheep.$helper.toast(`缺少订单信息，请检查`);
+      return
+    }
+		state.id = options.id;
+
+		const { code, data } = await OrderApi.getOrder(state.id);
+    if (code !== 0) {
+      sheep.$helper.toast('无待评价订单');
+      return
+    }
+    // 处理评论
+    data.items.forEach((item) => {
+      state.commentList.push({
+        anonymous: false,
+        orderItemId: item.id,
+        descriptionScores: 5,
+        benefitScores: 5,
+        content: '',
+        picUrls: []
+      });
+    });
+    state.orderInfo = data;
+	});
+</script>
+
+<style lang="scss" scoped>
+	// 评价商品
+	.goods-card {
+		margin: 10rpx 0;
+		padding: 20rpx;
+		background: #fff;
+	}
+
+	// 评论，选择图片
+	.form-item {
+		background: #fff;
+		padding-bottom: 30rpx;
+
+		.star-box {
+			height: 100rpx;
+			padding: 0 25rpx;
+		}
+
+		.star-title {
+			font-weight: 600;
+		}
+	}
+
+	.area-box {
+		width: 690rpx;
+		min-height: 306rpx;
+		background: rgba(249, 250, 251, 1);
+		border-radius: 20rpx;
+		padding: 28rpx;
+		margin: auto;
+
+		.img-box {
+			margin-top: 20rpx;
+		}
+	}
+	
+	.checkbox-container {
+	  padding: 20rpx 30rpx;
+	}
+
+	.post-btn {
+		width: 690rpx;
+		line-height: 80rpx;
+		border-radius: 40rpx;
+		color: rgba(#fff, 0.9);
+		margin-bottom: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/im/components/cardNotice.vue b/pages/im/components/cardNotice.vue
new file mode 100644
index 0000000..fe43f5f
--- /dev/null
+++ b/pages/im/components/cardNotice.vue
@@ -0,0 +1,41 @@
+<template>
+	<view>
+		<view class="card-notice">
+			<u-notice-bar mode="horizontal" :list="list"></u-notice-bar>
+			<view class="btn">投诉举报</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [
+					'平台绝对不会收取实名认证等任何费用。让你加微信支付或者点链接、扫二维码的都是骗子！平台绝对不会收取实名认证等任何费用。让你加微信支付或者点链接、扫二维码的都是骗子！平台绝对不会收取实名认证等任何费用。让你加微信支付或者点链接、扫二维码的都是骗子！平台绝对不会收取实名认证等任何费用。让你加微信支付或者点链接、扫二维码的都是骗子！平台绝对不会收取实名认证等任何费用。让你加微信支付或者点链接、扫二维码的都是骗子！平台绝对不会收取实名认证等任何费用。让你加微信支付或者点链接、扫二维码的都是骗子！平台绝对不会收取实名认证等任何费用。让你加微信支付或者点链接、扫二维码的都是骗子！',
+				],
+			}
+		},
+		methods: {
+			onBanner(index) {
+				console.log(22222, index);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card-notice {
+		background-color: #fff;
+		
+		.btn {
+			display: flex;
+			justify-content: center;
+			background-color: #fff;
+			height: 60px;
+			align-items: center;
+			color: #ffa31a;
+			font-size: 12px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/im/components/cardSwiper.vue b/pages/im/components/cardSwiper.vue
new file mode 100644
index 0000000..7494020
--- /dev/null
+++ b/pages/im/components/cardSwiper.vue
@@ -0,0 +1,225 @@
+<template>
+	<view>
+		<uni-swiper-dot class="uni-swiper-dot-box" @clickItem=clickItem :info="info" :current="current" :mode="mode" :dots-styles="dotsStyles" field="content">
+			<swiper class="swiper-box" @change="change" :current="swiperDotIndex">
+				<swiper-item v-for="(item, index) in 3" :key="index">
+					<view class="swiper-item">
+						<view class="card">
+							<image class="logo" src="http://rbtnet.oss-cn-hangzhou.aliyuncs.com/test/20240726/98a24075202b429d9c9722df541621c6.jpg"></image>
+							<view class="content-box">
+								<view class="left-box">
+									<view class="title">15开黑卡/局</view>
+									<view class="text-gray">LOL手游</view>
+									<view class="text-gray">下单前聊一聊</view>
+								</view>
+								<view class="btn">找TA开黑</view>
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+		</uni-swiper-dot>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				info: [{
+						colorClass: 'uni-bg-red',
+						url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+						content: '内容 A'
+					},
+					{
+						colorClass: 'uni-bg-green',
+						url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+						content: '内容 B'
+					},
+					{
+						colorClass: 'uni-bg-blue',
+						url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+						content: '内容 C'
+					}
+				],
+				dotStyle: [{
+						backgroundColor: '#00c8b0',
+						border: '1px rgba(0, 0, 0, .3) solid',
+						color: '#fff',
+						selectedBackgroundColor: 'rgba(0, 0, 0, .9)',
+						selectedBorder: '1px rgba(0, 0, 0, .9) solid'
+					},
+					{
+						backgroundColor: 'rgba(255, 90, 95,0.3)',
+						border: '1px rgba(255, 90, 95,0.3) solid',
+						color: '#fff',
+						selectedBackgroundColor: 'rgba(255, 90, 95,0.9)',
+						selectedBorder: '1px rgba(255, 90, 95,0.9) solid'
+					},
+					{
+						backgroundColor: 'rgba(83, 200, 249,0.3)',
+						border: '1px rgba(83, 200, 249,0.3) solid',
+						color: '#fff',
+						selectedBackgroundColor: 'rgba(83, 200, 249,0.9)',
+						selectedBorder: '1px rgba(83, 200, 249,0.9) solid'
+					}
+				],
+				modeIndex: -1,
+				styleIndex: -1,
+				current: 0,
+				mode: 'default',
+				dotsStyles: {
+					selectedBackgroundColor: '#00c8b0',
+				},
+				swiperDotIndex: 0,
+				current: 0,
+			}
+		},
+		methods: {
+			change(e) {
+				this.current = e.detail.current
+			},
+			selectStyle(index) {
+				this.dotsStyles = this.dotStyle[index]
+				this.styleIndex = index
+			},
+			selectMode(mode, index) {
+				this.mode = mode
+				this.modeIndex = index
+				this.styleIndex = -1
+				this.dotsStyles = this.dotStyle[0]
+			},
+			clickItem(e) {
+				this.swiperDotIndex = e
+			},
+			onBanner(index) {
+				console.log(22222, index);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.swiper-box {
+		height: 80px;
+	}
+
+	.swiper-item {
+		height: 80px;
+	}
+
+	.image {
+		width: 750rpx;
+	}
+
+	/* #ifndef APP-NVUE */
+	::v-deep .image img {
+		-webkit-user-drag: none;
+		-khtml-user-drag: none;
+		-moz-user-drag: none;
+		-o-user-drag: none;
+		user-drag: none;
+	}
+
+	/* #endif */
+
+	.uni-bg-red {
+		background-color: #ff5a5f;
+	}
+
+	.uni-bg-green {
+		background-color: #09bb07;
+	}
+
+	.uni-bg-blue {
+		background-color: #007aff;
+	}
+
+	.example-body {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 20rpx;
+	}
+
+	.example-body-item {
+
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		margin: 15rpx;
+		padding: 15rpx;
+		height: 60rpx;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		padding: 0 15rpx;
+		/* #endif */
+		flex: 1;
+		border-color: #e5e5e5;
+		border-style: solid;
+		border-width: 1px;
+		border-radius: 5px;
+	}
+
+	.example-body-item-text {
+		font-size: 28rpx;
+		color: #333;
+	}
+
+	.example-body-dots {
+		width: 16rpx;
+		height: 16rpx;
+		border-radius: 50px;
+		background-color: #333333;
+		margin-left: 10rpx;
+	}
+
+	.active {
+		border-style: solid;
+		border-color: #007aff;
+		border-width: 1px;
+	}
+	
+	
+	.card {
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		height: 80px;
+		padding: 10px;
+		
+		.logo {
+			width: 40px;
+			height: 40px;
+			border-radius: 100%;;
+		}
+		
+		.content-box {
+			display: flex;
+			flex: 1;
+			justify-content: space-between;
+			align-items: center;
+			margin-left: 10px;
+			
+			.title {
+				font-size: 28rpx;
+				color: #333333;
+			}
+			
+			.text-gray {
+				font-size: 24rpx;
+				color: #aaaaaa;
+				margin: 3px 0;
+			}
+			
+			.btn {
+				background-color: #00c8b0;
+				color: #fff;
+				font-size: 24rpx;
+				border-radius: 45px;
+				padding: 5px 10px;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/im/components/chatBar.vue b/pages/im/components/chatBar.vue
new file mode 100644
index 0000000..97df5cb
--- /dev/null
+++ b/pages/im/components/chatBar.vue
@@ -0,0 +1,1452 @@
+<template>
+	<view>
+		<!-- 底部输入栏 -->
+		<view class="input-box" :style="{bottom: keyboardHeight+'px'}" :class="popupLayerClass" @touchmove.stop.prevent="discard">
+			<view class="send-box">
+				<!-- <view>
+					<u-icon name="outline-voice-cricle" custom-prefix="iconfont" color="#333" :size="60" @tap="switchVoice" />
+				</view> -->
+				<view class="textbox">
+					<view class="text-mode">
+						<view class="box">
+							<textarea style="font-size: 12px;" placeholder="输入聊天内容" :adjust-position="false" :show-confirm-bar="false" auto-height="true" v-model="textMsg" @focus="textareaFocus"/>
+						</view>
+					</view>
+				</view>
+				<view class="icon" v-if="hideEmoji">
+					<u-icon name="vuesax-outline-happyemoji" custom-prefix="iconfont" color="#333" :size="60" @tap="chooseEmoji" />
+				</view>
+				<view class="icon" v-else>
+					<u-icon name="outline-keyboard" custom-prefix="iconfont" color="#333" :size="60" @tap="chooseEmoji" />
+				</view>
+				<view class="icon" :class="textMsg?'hidden':''">
+					<u-icon name="vuesax-outline-add-circle" custom-prefix="iconfont" color="#333" :size="60" @tap="showMore" />
+				</view>
+				<view class="send" :class="!textMsg?'hidden':''" @tap="sendText">
+					<view class="btn">{{btnText}}</view>
+				</view>
+			</view>
+			 <view class="send-tool">
+				 <view @tap="switchVoice">
+					 <u-icon name="outline-microphone" custom-prefix="iconfont" color="#333" :size="60"/>
+				 </view>
+				 <view v-if="user.hasQrcode" @tap="getWeixin">
+				 	 <u-icon name="weixin" custom-prefix="iconfont" color="#19be6b" :size="60" />
+				 </view>
+				 <view @tap="openGift">
+					 <u-icon color="#f880ab" name="presentfill" :size="64" custom-prefix="iconfont"></u-icon>
+				 </view>
+				 <view @tap="chooseImage">
+					 <u-icon name="outline-image" custom-prefix="iconfont" color="#333" :size="60" />
+				 </view>
+				 <view @tap="camera">
+					 <u-icon name="outline-camera" custom-prefix="iconfont" color="#333" :size="60" />
+				 </view>
+				 <!-- <u-icon name="outline-map" custom-prefix="iconfont" color="#333" :size="60" />
+				 <view @tap="openGift">
+					<u-icon name="outline-gift" custom-prefix="iconfont" color="#333" :size="60"/>
+				 </view> -->
+			 </view>
+		</view>
+		
+		<!-- 抽屉栏 -->
+		<view class="popup-layer" :class="popupLayerClass" @touchmove.stop.prevent="discard">
+			<view class="emoji-view" :class="{hidden:hideEmoji}">
+				<!-- 表情 --> 
+				<scroll-view scroll-y="true">
+					<view v-if="emojiScene == 'emoji'">
+						<view class="emoji-swiper" v-if="timeEmojiList.length > 0">
+							<view class="title">最近使用</view>
+							<view class="emoji-list">
+								<view class="emoji_tools1" v-for="(em,pid) in timeEmojiList" :key="pid" @tap="addEmoji(em, emojiScene)">
+									<text>{{em}}</text>
+								</view>
+							</view>
+							<view class="title">全部表情</view>
+							<view class="emoji-list">
+								<view class="emoji_tools1" v-for="(em,pid) in emojiList" :key="pid" @tap="addEmoji(em, emojiScene)">
+									<text>{{em}}</text>
+								</view>
+							</view>
+							<view class="del-btn" @tap="delBtn">
+								<u-icon name="backspace" color="#333" :size="40"/>
+							</view>
+						</view>
+						<view class="emoji-swiper" v-else>
+							<view class="emoji-list">
+								<view class="emoji_tools1" v-for="(em,pid) in emojiList" :key="pid" @tap="addEmoji(em, emojiScene)">
+									<text>{{em}}</text>
+								</view>
+							</view>
+							<view class="del-btn" @tap="delBtn">
+								<u-icon name="backspace" color="#333" :size="40"/>
+							</view>
+						</view>
+					</view>
+					<view v-if="emojiScene == 'like'">
+						<view class="emoji-swiper">
+							<view class="title">添加的单个表情</view>
+							<view class="emoji-list">
+								<view class="emoji_image">
+									<view class="emoji-add">
+										<u-icon name="plus" color="#333" :size="60"/>
+									</view>
+								</view>
+								<view class="emoji_image" v-for="(emoji,pid) in shopEmojiList" :key="pid" @tap="addEmoji(emoji, emojiScene)">
+									<image class="image" :src="emoji.src"></image>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view v-if="emojiScene == 'shop'">
+						<view class="emoji-swiper">
+							<view class="title">一只小老虎</view>
+							<view class="emoji-list">
+								<view class="emoji_image" v-for="(emoji,pid) in shopEmojiList" :key="pid" @tap="addEmoji(emoji, emojiScene)">
+									<image class="image" :src="emoji.src"></image>
+									<text>{{emoji.name}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				
+				<!--选择表情类型栏-->
+				<scroll-view class="emoji-tools-scroll-view" scroll-x>
+					<view class="emoji-tool-box">
+						<view class="emoji-tools-item" :class="tindex == pid ? 'select' : ''" :data-i="pid" v-for="(tool,pid) in emojiTools" :key="pid" @tap="changeTool(pid)">
+							<u-icon v-if="tool.type == 'icon'" :name="tool.icon" custom-prefix="iconfont" :size="45"/>
+							<image class="img" mode="aspectFill" v-if="tool.type == 'image'" :src="tool.icon"/>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			
+			<!-- 更多功能 相册-拍照-红包 -->
+			
+			<swiper class="tool-swiper" :class="{hidden:hideMore}" indicator-dots="true" duration="150">
+				<swiper-item class="tool-swiper-box">
+					<view class="tool-btn" v-if="user.hasQrcode" @tap="getWeixin">
+						<view class="btn-card">
+							<u-icon name="weixin" custom-prefix="iconfont" color="#19be6b" :size="55" />
+						</view>
+						<view class="btn-text">交换名片</view>
+					</view>
+					<view class="tool-btn" @tap="openGift">
+						<view class="btn-card">
+							<u-icon color="#f880ab" name="presentfill" :size="55" custom-prefix="iconfont"></u-icon>
+						</view>
+						<view class="btn-text">赠送礼物</view>
+					</view>
+					<view class="tool-btn" @tap="chooseImage">
+						<view class="btn-card">
+							<u-icon name="photo-fill" color="#333" :size="55"/>
+						</view>
+						<view class="btn-text">发送照片</view>
+					</view>
+					<!-- 
+					<view class="tool-btn">
+						<view class="btn-card">
+							<u-icon name="creative-fill" color="#333" :size="55"/>
+						</view>
+						<view class="btn-text">添加回复</view>
+					</view>
+					<view class="tool-btn">
+						<view class="btn-card">
+							<u-icon name="time-fill" color="#333" :size="55"/>
+						</view>
+						<view class="btn-text">聊天记录</view>
+					</view>
+					<view class="tool-btn">
+						<view class="btn-card">
+							<u-icon name="image-fill" color="#333" :size="55"/>
+						</view>
+						<view class="btn-text">发送照片</view>
+					</view>
+					<view class="tool-btn">
+						<view class="btn-card">
+							<u-icon name="service-fill" color="#333" :size="55"/>
+						</view>
+						<view class="btn-text">快捷回复</view>
+					</view>
+					<view class="tool-btn">
+						<view class="btn-card">
+							<u-icon name="creative-fill" color="#333" :size="55"/>
+						</view>
+						<view class="btn-text">添加回复</view>
+					</view>
+					<view class="tool-btn">
+						<view class="btn-card">
+							<u-icon name="time-fill" color="#333" :size="55"/>
+						</view>
+						<view class="btn-text">聊天记录</view>
+					</view> -->
+				</swiper-item>
+				<!-- <swiper-item class="tool-swiper-box">
+					<view class="tool-btn">
+						<view class="btn-card">
+							<u-icon name="location-fill" color="#333" :size="55"/>
+						</view>
+						<view class="btn-text">发送位置</view>
+					</view>
+					<view class="tool-btn">
+						<view class="btn-card">
+							<u-icon name="warning-fill" color="#333" :size="55"/>
+						</view>
+						<view class="btn-text">举报拉黑</view>
+					</view>
+				</swiper-item> -->
+			</swiper>
+			
+			
+			<!-- 录音功能 -->
+			
+			<view class="voice-center" :class="{hidden:isVoice}">
+				<all-speech ref="speech" @okClick="voiceOk"></all-speech>
+			</view>
+			
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import emoji from '@/pages/im/util/emoji';
+	//聊天栏 回复栏
+	export default {
+		components: {
+			 
+		},
+		props: {
+			//禁用聊天栏
+			isLocked: {
+				type: Boolean,
+				default: false
+			},
+			//是否显示遮罩
+			mask: {
+				type: Boolean,
+				default: true
+			},
+			//true表示遮罩透明
+			maskOpacity: {
+				type: Boolean,
+				default: true
+			},
+			keyboardHeight: {
+				type: Number,
+				default: -1
+			},
+			btnText: {
+				type: String,
+				default: '发送'
+			},
+			color: {
+				type: String,
+				default: '#5677fc'
+			},
+			user: {
+				type: Object,
+				default: {}
+			},
+		},
+		data() {
+			return {
+				// more参数
+				hideMore:true,
+				//表情定义
+				hideEmoji:true,
+				tindex: 0,
+				emojiScene: 'emoji',
+				timeEmojiList: ["😀", "😁", "😃", "😄"],
+				emojiList:[],
+				shopEmojiList: [
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水1',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水2',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如水',
+					},
+					{
+						src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+						name: '心静如',
+					},
+				],
+				//表情图片图床名称 ，由于我上传的第三方图床名称会有改变，所以有此数据来做对应，您实际应用中应该不需要
+				onlineEmoji:{"100.gif":"AbNQgA.gif","101.gif":"AbN3ut.gif","102.gif":"AbNM3d.gif","103.gif":"AbN8DP.gif","104.gif":"AbNljI.gif","105.gif":"AbNtUS.gif","106.gif":"AbNGHf.gif","107.gif":"AbNYE8.gif","108.gif":"AbNaCQ.gif","109.gif":"AbNN4g.gif","110.gif":"AbN0vn.gif","111.gif":"AbNd3j.gif","112.gif":"AbNsbV.gif","113.gif":"AbNwgs.gif","114.gif":"AbNrD0.gif","115.gif":"AbNDuq.gif","116.gif":"AbNg5F.gif","117.gif":"AbN6ET.gif","118.gif":"AbNcUU.gif","119.gif":"AbNRC4.gif","120.gif":"AbNhvR.gif","121.gif":"AbNf29.gif","122.gif":"AbNW8J.gif","123.gif":"AbNob6.gif","124.gif":"AbN5K1.gif","125.gif":"AbNHUO.gif","126.gif":"AbNIDx.gif","127.gif":"AbN7VK.gif","128.gif":"AbNb5D.gif","129.gif":"AbNX2d.gif","130.gif":"AbNLPe.gif","131.gif":"AbNjxA.gif","132.gif":"AbNO8H.gif","133.gif":"AbNxKI.gif","134.gif":"AbNzrt.gif","135.gif":"AbU9Vf.gif","136.gif":"AbUSqP.gif","137.gif":"AbUCa8.gif","138.gif":"AbUkGQ.gif","139.gif":"AbUFPg.gif","140.gif":"AbUPIS.gif","141.gif":"AbUZMn.gif","142.gif":"AbUExs.gif","143.gif":"AbUA2j.gif","144.gif":"AbUMIU.gif","145.gif":"AbUerq.gif","146.gif":"AbUKaT.gif","147.gif":"AbUmq0.gif","148.gif":"AbUuZV.gif","149.gif":"AbUliF.gif","150.gif":"AbU1G4.gif","151.gif":"AbU8z9.gif","152.gif":"AbU3RJ.gif","153.gif":"AbUYs1.gif","154.gif":"AbUJMR.gif","155.gif":"AbUadK.gif","156.gif":"AbUtqx.gif","157.gif":"AbUUZ6.gif","158.gif":"AbUBJe.gif","159.gif":"AbUdIO.gif","160.gif":"AbU0iD.gif","161.gif":"AbUrzd.gif","162.gif":"AbUDRH.gif","163.gif":"AbUyQA.gif","164.gif":"AbUWo8.gif","165.gif":"AbU6sI.gif","166.gif":"AbU2eP.gif","167.gif":"AbUcLt.gif","168.gif":"AbU4Jg.gif","169.gif":"AbURdf.gif","170.gif":"AbUhFS.gif","171.gif":"AbU5WQ.gif","172.gif":"AbULwV.gif","173.gif":"AbUIzj.gif","174.gif":"AbUTQs.gif","175.gif":"AbU7yn.gif","176.gif":"AbUqe0.gif","177.gif":"AbUHLq.gif","178.gif":"AbUOoT.gif","179.gif":"AbUvYF.gif","180.gif":"AbUjFU.gif","181.gif":"AbaSSJ.gif","182.gif":"AbUxW4.gif","183.gif":"AbaCO1.gif","184.gif":"Abapl9.gif","185.gif":"Aba9yR.gif","186.gif":"AbaFw6.gif","187.gif":"Abaiex.gif","188.gif":"AbakTK.gif","189.gif":"AbaZfe.png","190.gif":"AbaEFO.gif","191.gif":"AbaVYD.gif","192.gif":"AbamSH.gif","193.gif":"AbaKOI.gif","194.gif":"Abanld.gif","195.gif":"Abau6A.gif","196.gif":"AbaQmt.gif","197.gif":"Abal0P.gif","198.gif":"AbatpQ.gif","199.gif":"Aba1Tf.gif","200.png":"Aba8k8.png","201.png":"AbaGtS.png","202.png":"AbaJfg.png","203.png":"AbaNlj.png","204.png":"Abawmq.png","205.png":"AbaU6s.png","206.png":"AbaaXn.png","207.png":"Aba000.png","208.png":"AbarkT.png","209.png":"AbastU.png","210.png":"AbaB7V.png","211.png":"Abafn1.png","212.png":"Abacp4.png","213.png":"AbayhF.png","214.png":"Abag1J.png","215.png":"Aba2c9.png","216.png":"AbaRXR.png","217.png":"Aba476.png","218.png":"Abah0x.png","219.png":"Abdg58.png"},
+				emojiTools: [{
+					icon: 'emoji-good',
+					type: 'icon',
+					scene: 'emoji',
+				}/* ,{
+					icon: 'outline-heart',
+					type: 'icon',
+					scene: 'like',
+				},{
+					icon: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+					type: 'image',
+					scene: 'shop',
+				} */],
+				//文字消息
+				textMsg:'',
+				// 抽屉参数
+				popupLayerClass:'',
+				//录音相关参数
+				timeOutEvent: 0,
+				// #ifndef H5
+				//H5不能录音
+				RECORDER:uni.getRecorderManager(),
+				// #endif
+				initPoint:{identifier:0,Y:0},
+				voiceTis:'按住 说话',
+				recordTis:"手指上滑 取消发送",
+				recordLength:0,
+				recordTimer:null,
+				isVoice:true,
+				willStop:false,
+				recording:false,
+			};
+		},
+		created() {
+			//键盘高度监听
+			let safeH = this.isPhoneX() ? 34 : 0;
+			/* uni.onKeyboardHeightChange(res => {
+				let h = res.height - safeH - 1;
+				this.keyboardHeight = h > 0 ? h : 0;
+			}); */
+			
+			// #ifndef H5
+			//录音开始事件
+			this.RECORDER.onStart((e)=>{
+				this.recordBegin(e);
+			})
+			//录音结束事件
+			this.RECORDER.onStop((e)=>{
+				this.recordEnd(e);
+			})
+			// #endif
+		},
+		methods: {
+			//添加表情
+			addEmoji(em, scene){
+				if('emoji' == scene){
+					this.textMsg+=em;
+				}else{
+					this.$emit('sendEmoji', em);
+				}
+			},
+			openGift() {
+				this.hideDrawer();
+				this.$emit('openGift');
+			},
+			//获取焦点，则关闭抽屉
+			textareaFocus(){
+				this.hideDrawer();
+			},
+			changeTool(i) {
+				this.tindex = i;
+				this.emojiScene = this.emojiTools[i].scene;
+				if('shop' == this.emojiScene){
+					
+				}
+			},
+			delBtn() {
+				var length = this.textMsg.length;
+				var str = this.textMsg.slice(length-2, length);
+				if(this.emojiList.includes(str)){
+					this.textMsg =  this.textMsg.slice(0, length-2);
+				}else{
+					this.textMsg =  this.textMsg.slice(0, length-1);
+				}
+			},
+			// 发送文字消息
+			sendText(){
+				this.hideDrawer();//隐藏抽屉
+				if(!this.textMsg){
+					return;
+				}
+				let msg = {
+					contentType: 1,
+					content: this.textMsg,
+				}; 
+				this.$emit('send', msg);
+				this.textMsg = '';//清空输入框
+			},
+			//替换表情符号为图片
+			replaceEmoji(str){
+				let replacedStr = str.replace(/\[([^(\]|\[)]*)\]/g,(item, index)=>{
+					console.log("item: " + item);
+					for(let i=0;i<this.emojiList.length;i++){
+						let row = this.emojiList[i];
+						for(let j=0;j<row.length;j++){
+							let EM = row[j];
+							if(EM.alt==item){
+								//在线表情路径，图文混排必须使用网络路径，请上传一份表情到你的服务器后再替换此路径 
+								//比如你上传服务器后，你的100.gif路径为https://www.xxx.com/emoji/100.gif 则替换onlinePath填写为https://www.xxx.com/emoji/
+								let onlinePath = 'https://s2.ax1x.com/2019/04/12/'
+								let imgstr = '<img src="'+onlinePath+this.onlineEmoji[EM.url]+'">';
+								console.log("imgstr: " + imgstr);
+								return imgstr;
+							}
+						}
+					}
+				});
+				return '<div style="display: flex;align-items: center;word-wrap:break-word;">'+replacedStr+'</div>';
+			},
+			voiceOk(e) {
+				this.$emit('voiceOk', e);
+			},
+			// 打开抽屉
+			openDrawer(){
+				this.popupLayerClass = 'showLayer';
+			},
+			//更多功能(点击+弹出)
+			showMore(){
+				this.isVoice = true;
+				this.hideEmoji = true;
+				if(this.hideMore){
+					this.hideMore = false;
+					this.openDrawer();
+				}else{
+					this.hideDrawer();
+				}
+			},
+			// 隐藏抽屉
+			hideDrawer(){
+				this.popupLayerClass = '';
+				this.hideMore = true;
+				this.hideEmoji = true;
+				this.isVoice = true;
+			},
+			// 选择表情
+			chooseEmoji(){
+				this.emojiList = emoji;
+				this.isVoice = true;
+				this.hideMore = true;
+				if(this.hideEmoji){
+					this.hideEmoji = false;
+					this.openDrawer();
+				}else{
+					this.hideDrawer();
+				}
+			},
+			// 切换语音/文字输入
+			switchVoice(){
+				this.hideEmoji = true;
+				this.hideMore = true;
+				if(this.isVoice){
+					this.isVoice = false;
+					this.openDrawer();
+				}else{
+					this.hideDrawer();
+				}
+			},
+			// 录音开始
+			voiceBegin(e){
+				this.timeOutEvent = setTimeout(() => {
+					this.longPress(e);  //长按方法
+				}, 500); //这里设置定时器，定义长按500毫秒触发长按事件
+				return false;
+			},
+			longPress(e) {
+				if(e.touches.length>1){
+					return ;
+				}
+				this.initPoint.Y = e.touches[0].clientY;
+				this.initPoint.identifier = e.touches[0].identifier;
+				this.RECORDER.start({format:"mp3"});//录音开始,
+			},
+			//录音开始UI效果
+			recordBegin(e){
+				this.recording = true;
+				this.voiceTis='松开 结束';
+				this.recordLength = 0;
+				this.recordTimer = setInterval(()=>{
+					this.recordLength++;
+				},1000)
+			},
+			// 录音被打断
+			voiceCancel(){
+				clearTimeout(this.timeOutEvent); //清除定时器
+				this.timeOutEvent = 0;
+				
+				this.recording = false;
+				this.voiceTis='按住 说话';
+				this.recordTis = '手指上滑 取消发送'
+				this.willStop = true;//不发送录音
+				this.RECORDER.stop();//录音结束
+			},
+			// 录音中(判断是否触发上滑取消发送)
+			voiceIng(e){
+				clearTimeout(this.timeOutEvent); //清除定时器
+				this.timeOutEvent = 0;
+				
+				if(!this.recording){
+					return;
+				}
+				let touche = e.touches[0];
+				//上滑一个导航栏的高度触发上滑取消发送
+				if(this.initPoint.Y - touche.clientY>=uni.upx2px(100)){
+					this.willStop = true;
+					this.recordTis = '松开手指 取消发送'
+				}else{
+					this.willStop = false;
+					this.recordTis = '手指上滑 取消发送'
+				}
+			},
+			// 结束录音
+			voiceEnd(e){
+				clearTimeout(this.timeOutEvent); //清除定时器
+				
+				if(!this.recording){
+					return;
+				}
+				this.recording = false;
+				this.voiceTis='按住 说话';
+				this.recordTis = '手指上滑 取消发送'
+				this.RECORDER.stop();//录音结束
+			},
+			//录音结束(回调文件)
+			recordEnd(e){
+				clearInterval(this.recordTimer);
+				if(!this.willStop){
+					console.log("e: " + JSON.stringify(e));
+					let msg = {
+						length:0,
+						url:e.tempFilePath
+					}
+					let min = parseInt(this.recordLength/60);
+					let sec = this.recordLength%60;
+					min = min<10?'0'+min:min;
+					sec = sec<10?'0'+sec:sec;
+					msg.length = min+':'+sec;
+					this.$emit('send', msg, 'voice');
+				}else{
+					console.log('取消发送录音');
+				}
+				this.willStop = false;
+			},
+			isPhoneX() {
+				const res = uni.getSystemInfoSync();
+				let iphonex = false;
+				let models = ['iphonex', 'iphonexr', 'iphonexsmax', 'iphone11', 'iphone11pro', 'iphone11promax']
+				const model = res.model.replace(/\s/g, "").toLowerCase()
+				if (models.includes(model)) {
+					iphonex = true;
+				}
+				return iphonex;
+			},
+			// 选择图片发送
+			chooseImage() {
+				this.getImage('album');
+			},
+			//拍照发送
+			camera() {
+				this.getImage('camera');
+			},
+			getWeixin() {
+				var that = this;
+				uni.showModal({
+				  title: '交换名片',
+				  content: '确认交换名片吗？',
+				  success: function (res) {
+				    if (res.confirm) {
+						that.$emit('getWeixin');
+				    }
+				  },
+				});
+			},
+			//选照片 or 拍照
+			getImage(type) {
+				this.hideDrawer();
+				uni.chooseImage({
+					count: 9,
+					sourceType: [type],
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					success: (res) => {
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							uni.getImageInfo({
+								src: res.tempFilePaths[i],
+								success: (image) => {
+									let msg = {
+										path: res.tempFilePaths[i],
+										imgWidth: image.width,
+										imgHeight: image.height
+									};
+									this.$emit('imageOk', msg);
+								}
+							});
+						}
+					}
+				});
+			},
+			discard(){
+				return;
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.voice-center {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.hidden{
+		display: none !important;
+	}
+	.popup-layer{
+		position: relative;
+		&.showLayer{height: 570rpx;}
+		transition: all .15s linear;
+		width: 100%;
+		height: 0rpx;
+		background-color: #fff;
+		//position: fixed;
+		z-index: 20;
+		top: 100%;
+		
+		.emoji-tools-scroll-view {
+			height: 110rpx;
+			
+			.emoji-tool-box {
+				display: flex;
+				height: 100%;
+				padding: 0 10px;
+				align-items: center;
+			}
+			
+			.emoji-tools-item {
+				height: 80rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 80rpx;
+				padding: 0 10px;
+				border-radius: 10px;
+				margin-right: 10px;
+				
+				.img {
+					height: 50rpx;
+					width: 50rpx;
+					position: absolute;
+					border-radius: 0;
+				}
+				
+				.emoji {
+					width: 36.36rpx;
+					height: 36.36rpx !important;
+					margin: 5.45rpx 18.18rpx;
+					position: relative;
+					top: 3.63rpx;
+				}
+			}
+			
+			.emoji-tools-item.select {
+				background: #eaeaea;
+			}
+		}
+		
+		.del-btn {
+			position: fixed;
+			right: 10px;
+			bottom: 136rpx;
+			background-color: #fff;
+			border-radius: 6px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding: 14rpx 20rpx;
+			box-shadow: 1px 1px 1px 1px #ddd;
+		}
+		
+		.emoji-swiper{
+			height: 460rpx;
+			display: flex;
+			flex-direction: column;
+			
+			.title {
+				margin-left: 30rpx;
+				font-size: 22rpx;
+				color: #333;
+				margin-bottom: 30rpx;
+			}
+			
+			.emoji-list {
+				transform: translate(1%, -5px) translateZ(0px);
+				display: flex;
+				flex-wrap: wrap;
+			}
+			
+			.emoji_tools1{
+				width: 14%;
+				display: flex;
+				justify-content: center;
+				padding-bottom: 10px;
+				text{
+					height: 100%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 44rpx;
+				}
+				.icon{
+					width: 8.4vw;
+					height: 8.4vw;
+				}
+			}
+			
+			.emoji_image{
+				width: 20%;
+				display: flex;
+				justify-content: center;
+				flex-direction: column;
+				align-items: center;
+				margin-bottom: 20rpx;
+				
+				.emoji-add {
+					border: 1px dashed #333;
+					height: 100rpx;
+					width: 100rpx;
+					border-radius: 20rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+				
+				.image {
+					height: 100rpx;
+					width: 100rpx;
+					margin-bottom: 10rpx;
+				}
+				
+				text {
+					font-size: 22rpx;
+				}
+			}
+		}
+		.tool-swiper{
+			height: 570rpx;
+			padding: 0px 40rpx;
+			
+			.tool-swiper-box {
+				display: flex;
+				padding-top: 30rpx;
+			}
+			
+			swiper-item{
+				display: flex;
+				align-content: flex-start;
+				flex-wrap: wrap;
+				
+				.tool-btn {
+					padding-top: 10px;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					width: 25%;
+					margin-bottom: 40rpx;
+					.btn-card {
+						background-color: #f5f5f5;
+						width: 110rpx;
+						height: 110rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						border-radius: 10px;
+						margin-bottom: 20rpx;
+					}
+					.btn-text {
+						font-size: 22rpx;
+						color: #333;
+					}
+				}
+			}
+		}
+		.more-layer{
+			width: 100%;
+			height: 42vw;
+			.list{
+				width: 100%;
+				display: flex;
+				flex-wrap: wrap;
+				.box{
+					width: 18vw;
+					height: 18vw;
+					border-radius: 20upx;
+					background-color: #fff;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin: 0 3vw 2vw 3vw;
+					.icon{
+						font-size: 70upx;
+					}
+				}
+			}
+		}
+	}
+	.input-box{
+		min-height: 100upx;
+		left: 0;
+		right: 0;
+		background-color: #fff;
+		display: flex;
+		z-index: 20;
+		bottom:-2upx;
+		&.showLayer{}
+		transition: all .15s linear;
+		display: flex;
+		flex-direction: column;
+		padding: 0 5px;
+		.voice,.more{
+			flex-shrink: 0;
+			width: 90upx;
+			height: 100upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		
+		.send{
+			//H5发送按钮左边距
+			margin-left: 20upx;
+			flex-shrink: 0;
+			display: flex;
+			align-items: center;
+			.btn{
+				width: 90upx;
+				height: 56upx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				background-color: #e54d42;
+				color: #fff;
+				border-radius: 3px;
+				font-size: 24rpx;
+			}
+		}
+		.textbox{
+			width: 100%;
+			min-height: 70upx;
+			//margin-left: 8px;
+			
+			.voice-mode{
+				width: calc(100% - 2upx);
+				height: 68upx;
+				border-radius: 6px;
+				border:solid 1upx #cdcdcd;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 28upx;
+				background-color: #fff;
+				font-weight: bold;
+				color: #555;
+				&.recording{
+					background-color: #e5e5e5;
+				}
+			}
+			.text-mode{
+				width: 100%;
+				min-height: 70upx;
+				display: flex;
+				background-color: #F8F8F8;
+				border-radius: 45px;
+				color: #666666;
+				font-size: 12px;
+				.box{
+					width: 100%;
+					padding-left: 30upx;
+					min-height: 70upx;
+					display: flex;
+					align-items: center;
+					padding: 5px 10px;
+					textarea{
+						width: 100%;
+					}
+				}
+				.em{
+					flex-shrink: 0;
+					width: 80upx;
+					padding-left: 10upx;
+					height: 70upx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+				
+				.input-placeholder {
+				    color: #bfbfbf;
+					font-size: 12px;
+				}
+			}
+		}
+	}
+	.record{
+		width: 40vw;
+		height: 40vw;
+		position: fixed;
+		top: 55%;
+		left: 30%;
+		background-color: rgba(0,0,0,.6);
+		border-radius: 20upx;
+		.ing{
+			width: 100%;
+			height: 30vw;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			// 模拟录音音效动画
+			@keyframes volatility {
+				0% {background-position: 0% 130%;}
+				20% {background-position: 0% 150%;}
+				30% {background-position: 0% 155%;}
+				40% {background-position: 0% 150%;}
+				50% {background-position: 0% 145%;}
+				70% {background-position: 0% 150%;}
+				80% {background-position: 0% 155%;}
+				90% {background-position: 0% 140%;}
+				100% {background-position: 0% 135%;}
+			}
+			.icon{
+				background-image:linear-gradient(to bottom,#f09b37,#fff 50%); 
+				background-size:100% 200%;
+				animation: volatility 1.5s ease-in-out -1.5s infinite alternate;
+				-webkit-background-clip:text; 
+				-webkit-text-fill-color:transparent; 
+				font-size: 150upx;
+				color: #f09b37;
+			}
+		}
+		.cancel{
+			width: 100%;
+			height: 30vw;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.icon{
+				color: #fff;
+				font-size: 150upx;
+			}
+		}
+		.tis{
+			width: 100%;
+			height: 10vw;
+			display: flex;
+			justify-content: center;
+			font-size: 28upx;
+			color: #fff;
+			&.change{
+				color: #f09b37;
+			}
+		}
+	}
+	.content{
+		width: 100%;
+		.msg-list{
+			width: 96%;
+			padding: 0 2%;
+			position: absolute;
+			top: 0;
+			bottom: 100upx;
+			.loading{
+				//loading动画
+				display: flex;
+				justify-content: center;
+				@keyframes stretchdelay {
+					0%, 40%, 100% {
+						transform: scaleY(0.6);
+					}
+					20% {
+						transform: scaleY(1.0);
+					}
+				}
+				.spinner {
+					margin: 20upx 0;
+					width: 60upx;
+					height: 100upx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					view {
+						background-color: #f06c7a;
+						height: 50upx;
+						width: 6upx;
+						border-radius: 6upx;
+						animation: stretchdelay 1.2s infinite ease-in-out;
+					}
+					.rect2 {
+					  animation-delay: -1.1s;
+					}
+					.rect3 {
+					  animation-delay: -1.0s;
+					}
+					.rect4 {
+					  animation-delay: -0.9s;
+					}
+					.rect5 {
+					  animation-delay: -0.8s;
+					}
+				}
+			}
+			.row{
+				.system{
+					display: flex;
+					justify-content: center;
+					view{
+						padding: 0 30upx;
+						height: 50upx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						background-color: #c9c9c9;
+						color: #fff;
+						font-size: 24upx;
+						border-radius: 40upx;
+					}
+					.red-envelope{
+						image{
+							margin-right: 5upx;
+							width: 30upx;
+							height: 30upx;
+						}
+					}
+				}
+				&:first-child{
+					margin-top: 20upx;
+				}
+				padding: 20upx 0;
+				.my .left,.other .right{
+					width: 100%;
+					display: flex;
+					.bubble{
+						max-width: 70%;
+						min-height: 50upx;
+						border-radius: 10upx;
+						padding: 15upx 20upx;
+						display: flex;
+						align-items: center;
+						font-size: 32upx;
+						word-break: break-word;
+						&.img{
+							background-color: transparent;
+							padding:0;
+							overflow: hidden;
+							image{
+								max-width: 350upx;
+								max-height: 350upx;
+							}
+						}
+						&.red-envelope{
+							background-color: transparent;
+							padding:0;
+							overflow: hidden;
+							position: relative;
+							justify-content: center;
+							align-items: flex-start;
+							image{
+								width: 250upx;
+								height: 313upx;
+							}
+							.tis{
+								position: absolute;
+								top: 6%;
+								font-size: 26upx;
+								color: #9c1712;
+							}
+							.blessing{
+								position: absolute;
+								bottom: 14%;
+								color: #e9b874;
+								width: 80%;
+								text-align: center;
+								overflow: hidden;
+								// 最多两行
+								display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;
+							}
+						}
+						&.voice{
+							.icon{
+								font-size: 40upx;
+								display: flex;
+								align-items: center;
+							}
+							.icon:after
+							{
+								content:" ";
+								width: 53upx;
+								height: 53upx;
+								border-radius: 100%;
+								position: absolute;
+								box-sizing: border-box;
+							}
+							.length{
+								font-size: 28upx;
+							}
+						}
+					}
+				}
+				.my .right,.other .left{
+					flex-shrink: 0;
+					width: 80upx;
+					height: 80upx;
+					image{
+						width: 80upx;
+						height: 80upx;
+						border-radius: 10upx;
+					}
+				}
+				.my{
+					width: 100%;
+					display: flex;
+					justify-content: flex-end;
+					.left{
+						min-height: 80upx;
+						
+						align-items: center;
+						justify-content: flex-end;
+						.bubble{
+							background-color: #f06c7a;
+							color: #fff;
+							
+							&.voice{
+								.icon{
+									color: #fff;
+								}
+								.length{
+									margin-right: 20upx;
+								}
+							}
+							&.play{
+								@keyframes my-play {
+									0% {
+										transform: translateX(80%);
+									}
+									100% {
+										transform: translateX(0%);
+									}
+								}
+								.icon:after
+								{
+									border-left: solid 10upx rgba(240,108,122,.5);
+									animation: my-play 1s linear infinite;
+								}
+							}
+						}
+					}
+					.right{
+						margin-left: 15upx;
+					}
+				}
+				.other{
+					width: 100%;
+					display: flex;
+					.left{
+						margin-right: 15upx;
+					}
+					.right{
+						flex-wrap: wrap;
+						.username{
+							width: 100%;
+							height: 45upx;
+							font-size: 24upx;
+							color: #999;
+							display: flex;
+							.name{
+								margin-right: 50upx;
+							}
+						}
+						.bubble{
+							background-color: #fff;
+							color: #333;
+							&.voice{
+								.icon{
+									color: #333;
+									
+								}
+								.length{
+									margin-left: 20upx;
+								}
+							}
+							&.play{
+								@keyframes other-play {
+									0% {
+										transform: translateX(-80%);
+									}
+									100% {
+										transform: translateX(0%);
+									}
+								}
+								.icon:after
+								{
+									border-right: solid 10upx rgba(255,255,255,.8);
+									
+									animation: other-play 1s linear infinite;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	.windows{
+	
+		.mask{
+			position: fixed;
+			top: 100%;
+			width: 100%;
+			height: 100%;
+			z-index: 1000;
+			background-color: rgba(0,0,0,.6);
+			opacity: 0;
+			transition: opacity .2s ease-out;
+		}
+		.layer{
+			position: fixed;
+			width: 80%;
+			height: 70%;
+			left: 10%;
+			z-index: 1001;
+			border-radius: 20upx;
+			overflow: hidden;
+			top:100%;
+			transform: scale3d(.5,.5,1);
+			transition: all .2s ease-out;
+		}
+		&.show{
+			display: block;
+			.mask{
+				top: 0;
+				opacity: 1;
+			}
+			.layer{
+				transform: translate3d(0,-85vh,0) scale3d(1,1,1);
+			}
+		}
+		&.hide{
+			display: block;
+			.mask{
+				top: 0;
+				opacity: 0;
+			}
+			.layer{
+				//transform: translate3d(0,-85vh,0) scale3d(.5,.5,1);
+			}
+		}
+	}
+	.open-redenvelope{
+		width: 100%;
+		height: 70vh;
+		background-color: #cf3c35; 
+		position: relative;
+		.top{
+			width: 100%;
+			background-color: #fe5454;
+			display: flex;
+			justify-content: center;
+			flex-wrap: wrap;
+			border-radius: 0 0 100% 100%;
+			box-shadow: inset 0 -20upx 0 #9c1712;
+			.close-btn{
+				width: 100%;
+				height: 80upx;
+				display: flex;
+				justify-content: flex-end;
+				margin-bottom: 30upx;
+				.icon{
+					color: #9c1712;
+					margin-top: 10upx;
+					margin-right: 10upx;
+				}
+			}
+			image{
+				width: 130upx;
+				height: 130upx;
+				border: solid 12upx #cf3c35;
+				border-radius: 100%;
+				
+				margin-bottom: -65upx;
+			}
+			margin-bottom: 65upx;
+		}
+		.from,.blessing,.money,.showDetails{
+			width: 90%;
+			padding: 5upx 5%;
+			display: flex;
+			justify-content: center;
+			font-size: 32upx;
+			color: #fff;
+		}
+		.money{
+			font-size: 100upx;
+			color: #f8d757;
+			display: flex;
+			padding-top: 20upx;
+		}
+		.showDetails{
+			position: absolute;
+			bottom: 20upx;
+			align-items: center;
+			font-size: 28upx;
+			color: #f8d757;
+			.icon{
+				font-size: 26upx;
+				color: #f8d757;
+			}
+		}
+	}
+	.send-box {
+		display: flex;
+		flex: 1;
+		padding: 30rpx 20rpx;
+		align-items: center;
+		
+		.icon {
+			padding-left: 8px;
+		}
+	}
+	.tool-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 10px;
+	}
+	
+	.send-tool {
+		display: flex;
+		justify-content: space-between;
+		padding: 15px;
+		padding-top: 0px;
+	}
+</style>
diff --git a/pages/im/components/layout.vue b/pages/im/components/layout.vue
new file mode 100644
index 0000000..5d29165
--- /dev/null
+++ b/pages/im/components/layout.vue
@@ -0,0 +1,336 @@
+<!-- 聊天记录模式+虚拟列表演示(vue)，加载更多聊天记录无闪动&支持渲染大量数据 -->
+<!-- 注意：虚拟列表缓存高度默认仅在cell初始化时获取一次，若您的聊天列表中带有图片，强烈建议给图片一个固定的高度，如果高度根据内容动态撑高，可能导致虚拟列表抖动 -->
+<!-- 如果必须实现高度根据内容动态撑高+虚拟列表功能，可监听图片加载完毕事件，并在其中调用z-paging的didUpdateVirtualListCell刷新缓存高度 -->
+<template>
+	<view class="content">
+		<!-- use-chat-record-mode：开启聊天记录模式 -->
+		<!-- use-virtual-list：开启虚拟列表模式 -->
+		<!-- cell-height-mode：设置虚拟列表模式高度不固定 -->
+		<!-- safe-area-inset-bottom：开启底部安全区域适配 -->
+		<!-- bottom-bg-color：设置slot="bottom"容器的背景色，这里设置为和chat-input-bar的背景色一致 -->
+		<z-paging ref="paging" v-model="dataList" :paging-style="{ paddingTop: paddingTop + 'px' }" default-page-size="20" :innerListStyle="innerListStyle" use-chat-record-mode use-virtual-list cell-height-mode="dynamic" :auto-clean-list-when-reload="false" safe-area-inset-bottom bottom-bg-color="#fafafa"
+		
+		@query="queryList" :back-to-top-style="backToTopStyle" :auto-show-back-to-top="showNewMessageTip" @scrolltoupper="onScrollToUpper" @backToTopClick="onBackToTopClick" @keyboardHeightChange="keyboardHeightChange" @hidedKeyboard="hidedKeyboard">
+			<!-- 顶部提示文字 -->
+			<template #top>
+				<navigation-Bar :isReconnecting="isReconnecting" :user="user" @initNav="initNav" @more="navMore">
+					<template #card-swiper>
+						<card-swiper v-if="navSwiper"></card-swiper>
+					</template>
+					<template #card-notice>
+						<card-notice v-if="navNotice"></card-notice>
+					</template>
+				</navigation-Bar>
+			</template>
+			
+			<!-- style="transform: scaleY(-1)"必须写，否则会导致列表倒置！！！ -->
+			<!-- 注意不要直接在chat-item组件标签上设置style，因为在微信小程序中是无效的，请包一层view -->
+			<template #cell="{item,index}">
+				<view style="transform: scaleY(-1)">
+					<view-item @playAudio="playAudio" :playId="playId" :messageList="dataList" :messageIndex="index" :item="item"></view-item>
+				</view>
+			</template>
+			
+			<!-- 底部聊天输入框 -->
+			<template #bottom>
+				<slot name="chat-bar" :user="user" :keyboardHeight="keyboardHeight"></slot>
+			</template>
+			
+			<!-- 查看最新消息 -->
+			<template #backToTop>
+			  <text>有新消息</text>
+			</template>
+			
+		</z-paging>
+	</view>
+</template>
+ 
+<script>
+	import dayjs from 'dayjs';
+	import relativeTime from "dayjs/plugin/relativeTime";
+	dayjs.extend(relativeTime);
+	import NavigationBar from '@/pages/im/components/navigationBar.vue';
+	import cardSwiper from '@/pages/im/components/cardSwiper.vue';
+	import cardNotice from '@/pages/im/components/cardNotice.vue';
+	import ViewItem from '@/pages/im/components/viewItem.vue';
+	import ImMessageApi from '@/sheep/api/im/memberMessage';
+	import UserApi from '@/sheep/api/member/user';
+	export default {
+		components: {
+			NavigationBar,
+			cardSwiper,
+			cardNotice,
+			ViewItem,
+		},
+		props: {
+			groupId: 0,
+			userId: 0,
+			isReconnecting: false,
+		},
+		data() {
+			return {
+				dataList: [],
+				keyboardHeight: -1,
+				paddingTop: 0,
+				navSwiper: false,
+				navSwiperH: 80,
+				navNotice: false,
+				navNoticeH: 90,
+				height: 0,
+				
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10,
+					groupId: 0,
+				},
+				
+				showNewMessageTip: false,
+				backToTopStyle: {
+					'width': '100px',
+					'background-color': '#fff',
+					'border-radius': '30px',
+					'box-shadow': '0 2px 4px rgba(0, 0, 0, 0.1)',
+					'display': 'flex',
+					'justifyContent': 'center',
+					'alignItems': 'center',
+				},
+ 				 
+				innerListStyle: {
+					borderBottom: '20px solid #fafafa',
+				},
+				
+				audioList: [],
+				voiceIndex: -1,
+				playId: null,
+				
+				user: {},
+			}
+		},
+		created() {
+			this.getUserInfo();
+		},
+		methods: {
+			getUserInfo() {
+				UserApi.getUserInfoById(this.userId).then(res => {
+					this.user = res.data;
+					this.user.time = this.showDayTime(this.user.updateTime);
+				});
+			},
+			showDayTime(datetime) {
+			  if (!datetime) return "";
+			  return dayjs(datetime).fromNow();
+			},
+			initNav(e) {
+				this.height = e.height;
+				this.paddingTop = this.height;
+				
+				if(this.navSwiper){
+					this.paddingTop = this.paddingTop + this.navSwiperH;
+				}
+				
+				if(this.navNotice){
+					this.paddingTop = this.paddingTop + this.navNoticeH;
+				}
+			},
+			navMore() {
+				this.navNotice = !this.navNotice;
+				
+				if(this.navNotice){
+					this.paddingTop = this.paddingTop + this.navNoticeH;
+				}else{
+					this.paddingTop = this.paddingTop - this.navNoticeH;
+				}
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				this.queryParams.pageNo = pageNo;
+				this.queryParams.pageSize = pageSize;
+				this.queryParams.groupId = this.groupId;  
+				
+				/* this.$refs.paging.complete([
+					{
+						dd:'2',
+						msgType: 'message',
+						message: {
+							time: false,
+							src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+							position: 'left',
+							isRead: true,
+							src: '',
+							sec: '30',
+							msgType: 'voice',
+						},
+					},
+					{
+						dd:'2',
+						msgType: 'info',
+						message: {
+							title: '温馨提示',
+							content: '请礼貌用语友好沟通，如遇骚扰等不文明行为，可以将对方屏蔽并投诉。',
+							msgType: 'card',
+						},
+					},
+					{
+						dd:'2',
+						msgType: 'message',
+						message: {
+							time: true,
+							timeDesc: '14:52',
+							src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+							position: 'right',
+							isRead: true,
+							msgType: 'emoji',
+						},
+					},
+					{
+						dd:'2',
+						msgType: 'message',
+						message: {
+							time: true,
+							timeDesc: '14:52',
+							src: 'http://rbtnet.oss-cn-hangzhou.aliyuncs.com/test/20240726/98a24075202b429d9c9722df541621c6.jpg',
+							position: 'right',
+							isRead: true,
+							msgType: 'img',
+						},
+					},
+					{
+						dd:'2',
+						msgType: 'message',
+						message: {
+							time: false,
+							src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+							position: 'right',
+							isRead: true,
+							src: '',
+							sec: '130',
+							msgType: 'voice',
+						},
+					},
+					{
+						dd:'2',
+						msgType: 'message',
+						message: {
+							time: false,
+							position: 'right',
+							content: '地址：广东省广州市番禺区祈福新村129号',
+							msgType: 'map',
+						},
+					},
+					{
+						dd:'2',
+						msgType: 'message',
+						message: {
+							time: false,
+							position: 'right',
+							content: '吃饭了吗',
+							msgType: 'text',
+						},
+					},
+					{
+						dd:'2',
+						msgType: 'info',
+						message: {
+							content: '长按图片、文字或视频，支持撤回消息哦~',
+							msgType: 'text',
+						},
+					},
+					{
+						dd:'2',
+						msgType: 'message',
+						message: {
+							time: true,
+							timeDesc: '14:52',
+							src: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/laohu.png',
+							position: 'left',
+							isRead: true,
+							msgType: 'emoji',
+						},
+					},
+					]);
+					 */
+					
+				ImMessageApi.getMemberMessagePage(this.queryParams).then(res => {
+					// 将请求的结果数组传递给z-paging
+					this.$refs.paging.complete(res.data.list);
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})	
+			},
+			/** 监听滚动到底部事件（因为 scroll 翻转了顶就是底） */
+			onScrollToUpper() {
+			  // 若已是第一页则不做处理
+			  if (this.queryParams.pageNo === 1) {
+			    return;
+			  }
+			  this.showNewMessageTip = false;
+			  // 到底重置消息列表
+			  this.reload();
+			},
+			// 监听键盘高度改变，请不要直接通过uni.onKeyboardHeightChange监听，否则可能导致z-paging内置的键盘高度改变监听失效（如果不需要切换表情面板则不用写）
+			keyboardHeightChange(res) {
+				this.keyboardHeight = res.height;
+			}, 
+			// 用户尝试隐藏键盘，此时如果表情面板在展示中，应当通知chatInputBar隐藏表情面板（如果不需要切换表情面板则不用写）
+			hidedKeyboard() {
+				this.$emit('hidedKeyboard');
+			},
+			reload(message) {
+				if(message){
+					if(this.queryParams.pageNo > 1){
+						this.showNewMessageTip = true;
+					}
+					if(message.readStatus){
+						this.updateReadStatus(message);
+					}else{
+						this.$refs.paging.addChatRecordData([message]);
+					}
+				}else{
+					this.$refs.paging.reload();
+				}
+			},
+			updateReadStatus(message) {
+				this.dataList.forEach(item => {
+				    if (item.id == message.id) {
+				      item.readStatus = true;
+				    }
+				});
+			},
+			/** 滚动到最新消息 */
+			onBackToTopClick(event) {
+				event(false); // 禁用默认操作
+				this.$refs.paging.scrollToBottom();
+			},
+			playAudio(e) {
+				this.playId = e.id;
+				this.clearAllAudio();
+				var audio = uni.createInnerAudioContext();
+				this.audioList.push(audio);
+				//语音自然播放结束
+				audio.onEnded((res) => {
+					this.playId = null;
+				});
+				
+				audio.src = e.content;
+				audio.play();
+			},
+			clearAllAudio() {
+				this.audioList.forEach(function(e){
+					e.destroy();
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.content {
+		background-color: #fafafa;
+		height: calc(100vh);
+	}
+</style>
diff --git a/pages/im/components/navigationBar.vue b/pages/im/components/navigationBar.vue
new file mode 100644
index 0000000..cde82cb
--- /dev/null
+++ b/pages/im/components/navigationBar.vue
@@ -0,0 +1,194 @@
+<template>
+  <view>
+	 <tui-navigation-bar :isOpacity="false" @init="initNavigation" @change="opacityChange" :scrollTop="scrollTop" backgroundColor="#fff" color="#333">
+	 	<view>
+			<view class="nav-box">
+				<view class="title">
+					<text class="nickname">{{user.nickname}}</text>
+					<view class="sex-badge" v-if="user.sex == 2">
+						<u-icon name="ziyuan2" custom-prefix="iconfont"></u-icon>
+					</view>
+					<view class="sex-man" v-if="user.sex == 1">
+						<u-icon name="ziyuan3" custom-prefix="iconfont"></u-icon>
+					</view>
+				</view>
+				<view class="online" v-if="user.online">
+					<view v-if="isReconnecting">会话重连中</view>
+					<view class="text" v-else>
+						<tui-badge :scaleRatio="0.8" type="green" dot></tui-badge>
+						<text class="time">在线</text>
+						<!-- <u-icon name="arrow-right" size="16"></u-icon> -->
+					</view>
+				</view>
+				<!-- <view class="online" v-else>
+					<view v-if="isReconnecting">会话重连中</view>
+					<view v-else>
+						<text class="time">{{user.time}}</text>
+					</view>
+				</view> -->
+				<view class="action" @click="goBack">
+					<u-icon name="nav-back" size="44"></u-icon>
+				</view>
+			</view>
+			<view>
+				<slot name="card-swiper"></slot>
+			</view>
+			<view>
+				<slot name="card-notice"></slot>
+			</view>
+			<!-- <view class="more">
+				<view class="more-btn" @click="more">
+					<view class="line"></view>
+					<view class="line"></view>
+				</view>
+			</view> -->
+		</view>
+	 </tui-navigation-bar>
+  </view>
+</template>
+
+<script>
+	import tuiBadge from "@/components/thorui/tui-badge/tui-badge.vue";
+	import tuiNavigationBar from "@/components/thorui/tui-navigation-bar/tui-navigation-bar.vue";
+	export default {
+		components: {
+			tuiBadge, 
+			tuiNavigationBar,
+		},
+		props: {
+			user: {},
+			isReconnecting: false,
+		},
+		data() {
+			return {
+				top: 0, //标题图标距离顶部距离
+				opacity: 1,
+				height: 0,
+				scrollTop: 0.5,
+			}
+		},
+		methods: {
+			initNavigation(e) {
+				this.height = e.height;
+				this.opacity = e.opacity;
+				this.top = e.top;
+				this.$emit('initNav', e);
+			},
+			opacityChange(e) {
+				this.opacity = e.opacity;
+			},
+			goBack() {
+				uni.navigateBack();
+			},
+			more() {
+				this.$emit('more');
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.nav-box {
+		height: 44px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #fff;
+		flex-direction: column;
+		font-size: 22rpx;
+		position: relative;
+		
+		.title {
+			justify-content: center;
+			align-items: center;
+			text-align: center;
+			margin-bottom: 3px;
+			display: flex;
+			width: 100%;
+			
+			.nickname {
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+				max-width: calc(100% - 440rpx);
+				font-size: 12px;
+			}
+		}
+		
+		.online {
+			font-size: 10px;
+			line-height: 10px;
+			color: #303133;
+			display: flex;
+			align-items: center;
+			
+			.time {
+				margin: 0 3px;
+			}
+			
+			.text {
+				display: flex;
+				align-items: center;
+			}
+		}
+		
+		.action {
+			position: absolute;
+			left: 0;
+			top: 0;
+			bottom: 0;
+			display: flex;
+			padding: 0 10px;
+			align-items: center;
+			width: 50px;
+		}
+	}
+	
+	.sex-badge {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #e03997;
+		color: #ffffff;
+		border-radius: 3px;
+		font-size: 8px;
+		height: 30rpx;
+		width: 30rpx;
+		margin: 0 10rpx;
+	}
+	
+	.sex-man {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #0081ff;
+		color: #ffffff;
+		border-radius: 3px;
+		font-size: 8px;
+		height: 30rpx;
+		width: 30rpx;
+		margin: 0 10rpx;
+	}
+	
+	.more {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.more-btn {
+			background-color: #fff;
+			padding: 0 7px;
+			width: 31px;
+			height: 15px;
+			border-radius: 0 0 3px 3px;
+			
+			.line {
+				background-color: rgba(0, 0, 0, 0.1);
+				margin: 3px 0;
+				height: 1px;
+				width: 100%;
+			}
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/im/components/viewItem.vue b/pages/im/components/viewItem.vue
new file mode 100644
index 0000000..830dc26
--- /dev/null
+++ b/pages/im/components/viewItem.vue
@@ -0,0 +1,385 @@
+<template>
+  <view v-if="userId > 0">
+	  <view v-if="item.sendType == 1">
+		  <view class="tip-box" v-if="item.contentType == 1">
+		  		<text class="time">{{item.content}}</text>
+		  </view>
+		  <view class="tip-card" v-if="item.contentType == 2">
+		  		  <!-- <image class="icon" src="@/static/images/help.png"></image> -->
+		  		  <view class="content-box">
+		  			  <view class="title">温馨提示</view>
+		  			  <view class="content">{{item.content}}</view>
+		  		  </view>
+		  </view>
+	  </view>
+	  
+	  <view v-if="item.sendType == 2">
+		  <view class="tip-box" v-if="showTime(item, messageIndex)">
+			<text class="time">{{showDayTime(item.createTime)}}</text>
+		  </view>
+		  <view class="chat-box left" v-if="item.sendUserId != userId">
+			  <view class="avatar" @click="detail(item)">
+				<u-avatar width="80rpx" height="80rpx" :src="item.sendAvatar"></u-avatar>
+			  </view>
+			  
+			  <view class="content-box" v-if="item.contentType == 1">
+				  <view class="content" >{{item.content}}</view>
+			  </view>
+			  <view class="content-box" v-if="item.contentType == 2">
+				  <view class="content" >{{item.content}}</view>
+				  <u-icon name="map-fill" color="#3D7EFF" size="40"></u-icon>
+			  </view>
+			  <view class="content voice" :class="item.id == playId ?'play':''" @click="playAudio(item)" v-if="item.contentType == 3">
+				  <view class="icon">
+					  <u-icon name="voice1" custom-prefix="iconfont" color="#080808" size="40"></u-icon>
+				  </view>
+				  <text>{{item.voiceSec}}”</text>
+			  </view>
+			  <view v-if="item.contentType == 4" @click="showPic(item)" class="msg-img">
+				<u-image width="420rpx" border-radius="5px" height="220rpx" :fade="false" :src="item.content"></u-image>
+			  </view>
+			  <view v-if="item.contentType == 5" class="msg-img">
+				<u-image width="200rpx" height="200rpx" :fade="false" :src="item.content"></u-image>
+			  </view>
+		  </view>
+		  <view class="chat-box right" v-if="item.sendUserId == userId">
+			  <view class="content-box" v-if="item.contentType == 1">
+				  <u-icon v-if="item.readStatus" name="checkmark-circle-fill" color="#00c8b0" size="40"></u-icon>
+				  <u-icon v-else name="checkmark-circle" color="#00c8b0" size="40"></u-icon>
+				  <view class="content" >{{item.content}}</view>
+			  </view>
+			  
+			  <view class="content-box" v-if="item.contentType == 2">
+				  <u-icon name="map-fill" color="#3D7EFF" size="40"></u-icon>
+				  <view class="content" >{{item.content}}</view>
+			  </view>
+			  
+			  <view class="content-box" v-if="item.contentType == 3">
+				  <u-icon v-if="item.readStatus" name="checkmark-circle-fill" color="#00c8b0" size="40"></u-icon>
+				  <u-icon v-else name="checkmark-circle" color="#00c8b0" size="40"></u-icon>
+				  <view class="content voice" :class="item.id == playId ?'play':''" @click="playAudio(item)">
+					  <text>{{item.voiceSec}}”</text>
+					  <view class="icon">
+						  <u-icon name="chat_voice" custom-prefix="iconfont" color="#fff" size="40"></u-icon>
+					  </view>
+				  </view>
+			  </view>
+			  
+			  <view class="content-box" v-if="item.contentType == 4">
+				  <u-icon v-if="item.readStatus" name="checkmark-circle-fill" color="#00c8b0" size="40"></u-icon>
+				  <u-icon v-else name="checkmark-circle" color="#00c8b0" size="40"></u-icon>
+				  <view class="msg-img" @click="showPic(item)">
+					<u-image width="420rpx" border-radius="5px" height="220rpx" :fade="false" :src="item.content"></u-image>
+				  </view>
+			  </view>
+			  
+			  <view class="content-box" v-if="item.contentType == 5">
+				  <u-icon v-if="item.readStatus" name="checkmark-circle-fill" color="#00c8b0" size="40"></u-icon>
+				  <u-icon v-else name="checkmark-circle" color="#00c8b0" size="40"></u-icon>
+				  <view class="msg-img">
+					<u-image width="200rpx" height="200rpx" :fade="false" :src="item.content"></u-image>
+				  </view>
+			  </view>
+			  
+			  <view class="avatar" @click="detail(item)">
+				<u-avatar width="80rpx" height="80rpx" :src="item.sendAvatar"></u-avatar>
+			  </view>
+		  </view>
+	  </view>
+	  
+  </view>
+</template>
+
+<script>
+	import dayjs from 'dayjs';
+	import isToday from "dayjs/plugin/isToday";
+	import isYesterday from "dayjs/plugin/isYesterday";
+	dayjs.extend(isToday);
+	dayjs.extend(isYesterday);
+	import sheep from '@/sheep';
+	export default {
+		props: {
+			item: {
+				type: Object,
+				default: {
+					createTime: 0,
+				},
+			},
+			// 消息索引
+			messageIndex: {
+			  type: Number,
+			  default: 0,
+			},
+			// 消息列表
+			messageList:{
+			  type: Array,
+			  default: () => [],
+			},
+			playId: {
+				type: Number,
+				default: 0,
+			},
+		},
+		data() {
+			return {
+				userId: 0,
+			}
+		},
+		created() {
+			var user = sheep.$store('user').userInfo;
+			this.userId = user.id;
+		},
+		methods: {
+			// 预览图片
+			showPic(e) {
+				uni.previewImage({
+					indicator: "none",
+					current: e.content,
+					urls: [e.content],
+				});
+			},
+			detail(e) {
+				sheep.$router.go('/pages/user/detail/index',{id: e.sendUserId});
+			},
+			playAudio(e) {
+				this.$emit('playAudio', e);
+			},
+			formatDate(date, format= 'YYYY-MM-DD HH:mm:ss') {
+			  // 日期不存在，则返回空
+			  if (!date) {
+			    return ''
+			  }
+			  // 日期存在，则进行格式化
+			  if (format === undefined) {
+			    format = 'YYYY-MM-DD HH:mm:ss'
+			  }
+			  return dayjs(date).format(format);
+			},
+			showDayTime(datetime) {
+			  if (!datetime) return "";
+			  const weeks = [
+			   "星期日",
+			   "星期一",
+			   "星期二",
+			   "星期三",
+			   "星期四",
+			   "星期五",
+			   "星期六",
+			  ];
+			  // 当天 显示时分
+			  if (dayjs(datetime).isToday()) {
+			    return dayjs(datetime).format("HH:mm");
+			  }
+			  // 昨天 昨天+时分
+			  if (dayjs(datetime).isYesterday()) {
+			    return `昨天 ${dayjs(datetime).format("HH:mm")}`;
+			  }
+			  // 本周 显示周几+时分
+			  if (dayjs().isSame(datetime, "week")) {
+			    const weekIndex = dayjs().day();
+			    return `${weeks[weekIndex]} ${dayjs(datetime).format("HH:mm")}`;
+			  }
+			  // 本周之前 显示年月日
+			  if (dayjs(datetime).isBefore(new Date(), "week")) {
+			    return dayjs(datetime).format("YYYY-MM-DD");
+			  }
+			},
+			showTime(item, index) {
+				// 最后一个
+				var createTime = new Date().getTime();
+				if(index > 0){
+					var message = this.messageList[index + 1];
+					if(message){
+						createTime = message.createTime;
+					} 
+				}
+				
+				let dateString = dayjs(createTime).fromNow();
+				let nowDateString = dayjs(item.createTime).fromNow();
+				return dateString !== nowDateString;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.chat-box {
+		padding: 6px 12px;
+		display: flex;
+		
+		.content-box {
+			display: flex;
+			align-items: center;
+		}
+	}
+	.left {
+		.content {
+			border-radius: 0px 8px 8px;
+			width: fit-content;
+			background-color: #fff;
+			color: #080808;
+			padding: 8px;
+			margin: 8px;
+			text-align: justify;
+			max-width: 470rpx;
+			font-size: 11px;
+			font-family: Helvetica Neue, Helvetica, sans-serif;
+			align-items: center;
+			display: flex;
+		}
+		
+		.msg-img {
+			margin: 8px;
+		}
+		
+		.icon {
+			margin-right: 5px;
+		}
+		
+		.play{
+			
+			.icon {
+				color: #fff;
+			}
+			
+			.icon:after
+			{
+				border-right: solid 3px #fff;
+				animation: other-play 1s linear infinite;
+				z-index: 9;
+			}
+			
+		}
+	}
+	
+	.right {
+		display: flex;
+		justify-content: flex-end;
+		
+		.content {
+			border-radius: 8px 0px 8px 8px;
+			width: fit-content;
+			background-color: #00c8b0;
+			color: #080808;
+			padding: 8px;
+			margin: 8px;
+			color: #fff;
+			text-align: justify;
+			max-width: 470rpx;
+			font-size: 11px;
+			font-family: Helvetica Neue, Helvetica, sans-serif;
+			align-items: center;
+			display: flex;
+		}
+		
+		.msg-img {
+			margin: 8px;
+		}
+		
+		.icon {
+			margin-left: 5px;
+		}
+		
+		.play{
+			
+			.icon {
+				color: #fff;
+			}
+			
+			.icon:after
+			{
+				border-left: solid 3px #00c8b0;
+				animation: my-play 1s linear infinite;
+				z-index: 9;
+			}
+			
+		}
+		
+	}
+	
+	@keyframes my-play {
+		0% {
+			transform: translateX(80%);
+		}
+		100% {
+			transform: translateX(0%);
+		}
+	}
+	
+	@keyframes other-play {
+		0% {
+			transform: translateX(-80%);
+		}
+		100% {
+			transform: translateX(0%);
+		}
+	}
+	
+	.voice{
+		.icon{
+			font-size: 40upx;
+			display: flex;
+			align-items: center;
+		}
+		.icon:after
+		{
+			content:" ";
+			width: 20px;
+			height: 20px;
+			border-radius: 100%;
+			position: absolute;
+			box-sizing: border-box;
+		}
+	}
+	
+	
+	.avatar {
+		margin-top: 8px;
+	}
+	
+	.tip-box {
+		display: flex;
+		justify-content: center;
+		padding: 7px 0;
+		padding: 7px 20px;
+		text-align: center;
+		
+		.time {
+			color: #aaaaaa;
+			font-size: 10px;
+		}
+	}
+	
+	.tip-card {
+		display: flex;
+		justify-content: center;
+		background-color: #fff;
+		border-radius: 3px;
+		padding: 7px;
+		margin: 12px;
+		text-align: justify;
+		
+		.icon {
+			width: 60rpx;
+			height: 60rpx;
+		}
+		
+		.content-box {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+			margin-left: 7px;
+			
+			.title {
+				font-size: 11px;
+				color: #333333;
+			}
+			
+			.content {
+				margin-top: 3px;
+				color: #aaaaaa;
+				font-size: 10px;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/im/index - 副本.vue b/pages/im/index - 副本.vue
new file mode 100644
index 0000000..7390a29
--- /dev/null
+++ b/pages/im/index - 副本.vue	
@@ -0,0 +1,204 @@
+<template>
+	<view>
+		<message-list @hidedKeyboard="hidedKeyboard">
+			<template #chat-bar="{keyboardHeight}">
+				<chat-bar ref="chatBar" :keyboardHeight="keyboardHeight"  @openGift="openGift"></chat-bar>
+			</template>
+		</message-list>
+		
+		<gift-bar ref="gift" @sendGift="sendGift"></gift-bar>
+		
+		<view class="svga-box" :class="giftFlag ? 'svga-show': 'svga-hide'">
+			<c-svga ref="cSvgaRef" :canvasId='canvasId' :src="src" :loops='1' :auto-play="true" @frame='onFrame' @finished='onFinished' @percentage='onPercentage' @loaded='onLoaded'></c-svga>
+			<view class="close-btn" @click="closeSvga"></view>
+		</view>
+		
+	</view>  
+</template>
+  
+<script>
+	import MessageList from '@/pages/im/components/messageList.vue'; 
+	import ChatBar from "@/components/chat-bar/chat-bar.vue"
+	import GiftBar from "@/components/gift-bar/gift-bar.vue"
+	export default { 
+		components: { 
+			MessageList,
+			ChatBar,
+			GiftBar,
+		},
+		data() {
+			return {
+				giftFlag: false,
+				src: 'https://cos.duopei.feiniaowangluo.com/1866/reward/gift/171241866882267KgIoSuLt.svga',
+				canvasId: 'myCanvas',
+				modal: true,
+				current: 0, // tabs组件的current值，表示当前活动的tab选项
+				swiperCurrent: 0,
+				typeidx: 0,
+				currentTab: 1,
+				showMoreSheet: false,
+				modalButton: [{
+				  text: "置顶该聊天",
+				  type: "green",
+				  plain: false
+				},
+				{
+				  text: "删除该聊天",
+				  type: "green",
+				  plain: false
+				},
+				{
+				  text: "设置免打扰",
+				  type: "green",
+				  plain: false
+				}],
+				itemList: [{
+					text: "删除",
+					color: "#2B2B2B"
+				}, {
+					text: "举报",
+					color: "#2B2B2B"
+				}, {
+					text: "分享",
+					color: "#2B2B2B"
+				}],
+			}
+		}, 
+		created() {
+			
+		},
+		computed: {
+		  swiperHeight: {
+		    get() {
+		      let that = this;
+		      return ' calc( 100vh - 100rpx )';
+		    },
+		    set(v) {}
+		  },
+		},
+		methods: {
+			hidedKeyboard() {
+				this.$refs.chatBar.hideDrawer();
+			},
+			toChat() {
+				this.$u.route({
+					url: 'pages/chat/index',
+				});
+			},
+			//调用此方法显示组件
+			showModal() {
+				this.modal = true;
+			},
+			//隐藏组件
+			hideModal() {
+				this.modal = false;
+			},
+			handleClick(e){
+				let index = e.index;
+				if (index === 0) {
+					
+				} else {
+					
+				}
+				this.hideModal();
+			},
+			openGift() {
+				this.$refs.gift.open();
+			},
+			sendGift(e) {
+				this.src = e.src;
+				this.$refs.cSvgaRef.call('startAnimation');
+				this.giftFlag = true;
+			},
+			onFinished() {
+				this.giftFlag = false;
+				console.log('动画停止播放时回调');
+			},
+			onFrame(frame) {//动画播放至某帧后回调
+				// console.log(frame);
+			},
+			onPercentage(percentage) { //动画播放至某进度后回调
+				// console.log(percentage);
+			},
+			onLoaded() {
+				this.$refs.cSvgaRef.call('setContentMode', 'AspectFill');
+				console.log('加载完成');
+			},
+			closeSvga() {
+				this.$refs.cSvgaRef.call('stopAnimation');
+				this.giftFlag = false;
+			}
+	
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background-color: #fafafa;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	.nav-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.tab-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.tab-box .title-label {
+		height: 44px;
+		padding: 0 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		color: #333333;
+		font-size: 28rpx;
+	}
+	
+	.tab-box .title-label text {
+		font-weight: bold;
+		transition: all 0.3s;
+	}
+	
+	
+	
+	.svga-box {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999999999;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, .7);
+		
+		.close-btn {
+			color: #fff;
+			font-size: 14px;
+			position: absolute;
+			z-index: 999999999;
+			//background: rgba(0, 0, 0, .5);
+			padding: 5px 10px;
+			
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+		}
+	}
+	
+	.svga-hide {
+		transform: translate(-100%, 0);
+	}
+	
+	.svga-show {
+		transform: translate(0, 0);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/im/index.vue b/pages/im/index.vue
new file mode 100644
index 0000000..ee4b170
--- /dev/null
+++ b/pages/im/index.vue
@@ -0,0 +1,194 @@
+<template>
+	<view class="container page-app theme-light main-green font-1">
+		<layout v-if="groupId > 0 && receiveUserId > 0"  @hidedKeyboard="hidedKeyboard" :isReconnecting="isReconnecting" :groupId="groupId" :userId="receiveUserId"  ref="im">
+			<template #chat-bar="{keyboardHeight, user}">
+				<chat-bar ref="chatBar" :user="user" :keyboardHeight="keyboardHeight" @send="sendMessage" @openGift="openGift" @voiceOk="voiceOk" @getWeixin="getWeixin" @imageOk="imageOk"></chat-bar>
+			</template>
+		</layout> 
+		
+		<s-auth-modal />
+		
+		<qrcode-modal />
+	</view>  
+</template> 
+  
+<script>
+	import Layout from '@/pages/im/components/layout.vue'; 
+	import ChatBar from "@/pages/im/components/chatBar.vue";
+	import ImMessageApi from '@/sheep/api/im/memberMessage';
+	import qrcodeModal from '@/components/qrcode-modal/qrcode-modal.vue';
+	import FileApi from '@/sheep/api/infra/file';
+	import UserApi from '@/sheep/api/member/user';
+	import sheep from '@/sheep';
+	import { WxaSubscribeTemplate, WebSocketMessageTypeConstants } from '@/sheep/util/const';
+	import { useWebSocket } from '@/sheep/hooks/useWebSocket';
+	export default { 
+		components: { 
+			Layout,
+			ChatBar,
+			qrcodeModal,
+		},
+		data() {
+			return {
+				groupId: 0,
+				receiveUserId: 0,
+				
+				Reconnect: {},
+			}
+		}, 
+		onLoad(option) {
+			this.groupId = option.groupId;
+			this.receiveUserId = option.receiveUserId;
+		},
+		onShow() {
+			//======================= 聊天工具相关 end =======================
+			const { options } = useWebSocket({
+			  // 连接成功
+			  onConnected: async () => {
+					console.log('连接成功');
+			  },
+			  // 收到消息
+			  onMessage: async (data) => {
+					console.log('接收消息');
+					const type = data.type;
+					if (!type) {
+						console.error('未知的消息类型：' + data.value);
+						return;
+					}
+					if (type == WebSocketMessageTypeConstants.IM_MESSAGE_READ) {
+						console.log('刷新消息');
+						var that = this;
+						setTimeout(function(){
+							var message = JSON.parse(data.content);
+							if(message.groupId != that.groupId){
+								return;
+							}
+							that.$nextTick(function() {
+								that.$refs.im.reload(message);
+							});
+						},1000);
+						return;
+					}
+					
+					if (type == WebSocketMessageTypeConstants.IM_MESSAGE_NEWS) {
+						var message = JSON.parse(data.content);
+						if(message.groupId != this.groupId){
+							return;
+						}
+						ImMessageApi.updateReadStatus(message.id);
+						
+						this.$nextTick(function() {
+							this.$refs.im.reload(message);
+						});
+						return;
+					}
+					
+					// 2.2 消息类型：KEFU_MESSAGE_TYPE
+					if (type == WebSocketMessageTypeConstants.KEFU_MESSAGE_TYPE) {
+						console.log('刷新消息');
+						// 刷新消息列表
+						//await messageListRef.value.refreshMessageList(JSON.parse(data.content));
+						return;
+					}
+					// 2.3 消息类型：KEFU_MESSAGE_ADMIN_READ
+					if (type == WebSocketMessageTypeConstants.KEFU_MESSAGE_ADMIN_READ) {
+						console.log('管理员已读消息');
+					}
+			  },
+			});
+			
+			this.Reconnect = options; // 重连状态
+		},
+		computed: {
+			isReconnecting() {
+				return this.Reconnect.isReconnecting;
+			},
+		},
+		onHide() {
+			
+		},
+		methods: {
+			hidedKeyboard() {
+				this.$refs.chatBar.hideDrawer();
+			},
+			sendMessage(e) {
+				// #ifdef MP
+				// 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
+				this.autoSubscribeMessage();
+				// #endif
+				
+				ImMessageApi.sendImMessage({
+					groupId: this.groupId,
+					receiveUserId: this.receiveUserId,
+					contentType: e.contentType,
+					content: e.content,
+					voiceSec: e.voiceSec,
+					imgWidth: e.imgWidth,
+					imgHeight: e.imgHeight,
+				}).then(res => {
+					this.$refs.im.reload();
+				});
+			},
+			async imageOk(e) {
+				const res = await FileApi.uploadFile(e.path);
+				var data = {
+					contentType: 4,
+					content: res.data,
+					imgWidth: e.imgWidth,
+					imgHeight: e.imgHeight,
+				}
+				this.sendMessage(data);
+			},
+			openGift() {
+				sheep.$router.go('/pages/user/detail/index',{id: this.receiveUserId});
+			},
+			getWeixin() {
+				UserApi.getQrcodeByUserId(this.receiveUserId).then(res => {
+					if(res.data){
+						uni.previewImage({
+							current: 0, //预览图片的下标
+							urls: [res.data], //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+							indicator: 'number',
+							loop: true
+						});
+					}
+				});
+			},
+			showDayTime(datetime) {
+			  if (!datetime) return "";
+			  return dayjs(datetime).fromNow();
+			},
+			async voiceOk(e) {
+				const res = await FileApi.uploadFile(e.path);
+				var data = {
+					contentType: 3,
+					content: res.data,
+					voiceSec: e.sec,
+				}
+				this.sendMessage(data);
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+			  event.push(WxaSubscribeTemplate.CLERK_BLIND);
+			  event.push(WxaSubscribeTemplate.CLERK_ORDER);
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			    uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+			  });
+			},
+			async autoSubscribeMessage() {
+			  // 2. 订阅消息
+			  this.subscribeMessage();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background-color: #fafafa;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/im/util/emoji.js b/pages/im/util/emoji.js
new file mode 100644
index 0000000..fb04e14
--- /dev/null
+++ b/pages/im/util/emoji.js
@@ -0,0 +1,33 @@
+export default [
+    "😀", "😁", "😃", "😄", "😅", "😆", "😉", "😊", "😋", "😎", "😍",
+    "😘", "😗", "😙", "😚", "😇", "😐", "😑", "😶", "😏", "😣", "😥", "😮", "😯", "😪",
+    "😫", "😴", "😌", "😛", "😜", "😝", "😒", "😓", "😔", "😕", "😲", "😷", "😖", "😞", "😟",
+    "😤", "😢", "😭", "😦", "😧", "😨", "😬", "😰", "😱", "😳", "😵", "😡", "😠",
+    "👦", "👧", "👨", "👩", "👴", "👵", "👶", "👱", "👮", "👲", "👳", "👷", "👸", "💂", "🎅", "👰", "👼",
+    "💆", "💇", "🙍", "🙎", "🙅", "🙆", "💁", "🙋", "🙇", "🙌", "🙏", "👤", "👥", "🚶", "🏃", "👯",
+    "💃", "👫", "👬", "👭", "💏", "💑", "👪", "💪", "👈", "👉", "☝", "👆", "👇", "✌", "✋", "👌",
+    "👍", "👎", "✊", "👊", "👋", "👏", "👐", "✍", "👣", "👀", "👂", "👃", "👅", "👄", "💋", "👓",
+    "👔", "👙", "👛", "👜", "👝", "🎒", "💼", "👞", "👟", "👠", "👡", "👢", "👑",
+    "👒", "🎩", "🎓", "💄", "💅", "💍", "🌂", "📶", "📳", "📴", "♻", "🏧","🚮", "🚰", "♿", "🚹", "🚺",
+    "🚻", "🚼", "🚾", "⚠", "🚸", "⛔", "🚫", "🚳", "🚭", "🚯", "🚱", "🚷", "🔞", "💈",
+    "🙈", "🐒", "🐶", "🐕", "🐩", "🐺", "🐱","🐈", "🐯", "🐅", "🐆", "🐴", "🐎", "🐮", "🐂",
+    "🐃","🐄","🐷","🐖","🐗","🐽","🐏","🐑","🐐","🐪","🐫","🐘","🐭",
+    "🐁","🐀","🐹","🐰","🐇","🐻","🐨","🐼","🐾","🐔","🐓","🐣","🐤","🐥",
+    "🐦", "🐧", "🐸", "🐊","🐢", "🐍", "🐲", "🐉", "🐳", "🐋", "🐬", "🐟", "🐠", "🐡",
+    "🐙", "🐚", "🐌", "🐛", "🐜", "🐝", "🐞", "🦋",  "💐", "🌸", "💮", "🌹", "🌺",
+    "🌻", "🌼", "🌷", "🌱", "🌲", "🌳", "🌴", "🌵", "🌾", "🌿", "🍀", "🍁", "🍂", "🍃",
+    "🌍","🌎","🌏","🌐","🌑","🌒","🌓","🌔","🌕","🌖","🌗","🌘","🌙","🌚",
+    "🌛","🌜","☀","🌝","🌞","⭐","🌟","🌠","☁","⛅","☔","⚡","❄","🔥","💧","🌊",
+    "🏀", "🏈", "🏉", "🎾", "🎱", "🎳", "⛳", "🎣", "🎽", "🎿",
+    "😈", "👿", "👹", "👺", "💀", "☠", "👻", "👽", "👾", "💣",
+    "🌋", "🗻", "🏠", "🏡", "🏢", "🏣", "🏤", "🏥", "🏦", "🏨",
+    "⛲", "🌁", "🌃", "🌆", "🌇", "🎠", "🎡", "🎢", "🚂",
+    "🚌", "🚍", "🚎", "🚏", "🚐", "🚑", "🚒", "🚓", "🚔", "🚕", "🚖", "🚗", "🚘",
+    "💌", "💎", "🔪", "💈", "🚪", "🚽", "🚿", "🛁", "⌛", "⏳", "⌚", "⏰", "🎈", "🎉",
+    "💤", "💢", "💬", "💭", "♨", "🌀", "🔔", "🔕", "✡", "✝", "🔯", "📛", "🔰", "🔱", "⭕", "✅",
+    "☑", "✔", "✖", "❌", "❎", "➕", "➖", "➗", "➰", "➿", "〽", "✳", "✴", "❇", "‼", "⁉", "❓", "❔", "❕", "❗",
+    "🕛", "🕧", "🕐", "🕜", "🕑", "🕝", "🕒", "🕞", "🕓", "🕟", "🕔", "🕠", "🕕", "🕡",
+    "🕖", "🕢", "🕗", "🕣", "🕘", "🕤", "🕙", "🕥", "🕚", "🕦", "⏱", "⏲", "🕰",
+    "💘", "❤", "💓", "💔", "💕", "💖", "💗", "💙", "💚", "💛", "💜", "💝", "💞", "💟❣",
+    "🍇", "🍈", "🍉", "🍊", "🍋", "🍌", "🍍", "🍎", "🍏", "🍐", "🍑", "🍒", "🍓",
+]
\ No newline at end of file
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
new file mode 100644
index 0000000..633b567
--- /dev/null
+++ b/pages/index/cart.vue
@@ -0,0 +1,192 @@
+<template>
+	<s-layout title="购物车" tabbar="/pages/index/cart" :bgStyle="{ color: '#fff' }">
+		<s-empty v-if="state.list.length === 0" text="购物车空空如也,快去逛逛吧~" icon="/static/cart-empty.png" />
+
+		<!-- 头部 -->
+		<view class="cart-box ss-flex ss-flex-col ss-row-between" v-if="state.list.length">
+			<view class="cart-header ss-flex ss-col-center ss-row-between ss-p-x-30">
+				<view class="header-left ss-flex ss-col-center ss-font-26">
+					共
+					<text class="goods-number ui-TC-Main ss-flex">{{ state.list.length }}</text>
+					件商品
+				</view>
+				<view class="header-right">
+					<button v-if="state.editMode" class="ss-reset-button" @tap="state.editMode = false">
+						取消
+					</button>
+					<button v-else class="ss-reset-button ui-TC-Main" @tap="state.editMode = true">
+						编辑
+					</button>
+				</view>
+			</view>
+			<!-- 内容 -->
+			<view class="cart-content ss-flex-1 ss-p-x-30 ss-m-b-40">
+				<view class="goods-box ss-r-10 ss-m-b-14" v-for="item in state.list" :key="item.id">
+					<view class="ss-flex ss-col-center">
+						<label class="check-box ss-flex ss-col-center ss-p-l-10" @tap="onSelectSingle(item.id)">
+							<radio :checked="state.selectedIds.includes(item.id)" color="var(--ui-BG-Main)"
+								style="transform: scale(0.8)" @tap.stop="onSelectSingle(item.id)" />
+						</label>
+						<s-goods-item :title="item.spu.name" :img="item.spu.picUrl || item.goods.image"
+							:price="item.sku.price"
+							:skuText="item.sku.properties.length>1? item.sku.properties.reduce((items2,items)=>items2.valueName+' '+items.valueName):item.sku.properties[0].valueName"
+							priceColor="#FF3000" :titleWidth="400">
+							<template v-if="!state.editMode" v-slot:tool>
+								<su-number-box :min="0" :max="item.sku.stock" :step="1" v-model="item.count" @change="onNumberChange($event, item)" />
+							</template>
+						</s-goods-item>
+					</view>
+				</view>
+			</view>
+			<!-- 底部 -->
+			<su-fixed bottom :val="48" placeholder v-if="state.list.length > 0" :isInset="false">
+				<view class="cart-footer ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom">
+					<view class="footer-left ss-flex ss-col-center">
+						<label class="check-box ss-flex ss-col-center ss-p-r-30" @tap="onSelectAll">
+							<radio :checked="state.isAllSelected" color="var(--ui-BG-Main)"
+								style="transform: scale(0.8)" @tap.stop="onSelectAll" />
+							<view class="ss-m-l-8"> 全选 </view>
+						</label>
+						<text>合计：</text>
+						<view class="text-price price-text">
+							{{ fen2yuan(state.totalPriceSelected) }}
+						</view>
+					</view>
+					<view class="footer-right">
+						<button v-if="state.editMode" class="ss-reset-button ui-BG-Main-Gradient pay-btn ui-Shadow-Main"
+							@tap="onDelete">
+							删除
+						</button>
+						<button v-else class="ss-reset-button ui-BG-Main-Gradient pay-btn ui-Shadow-Main"
+							@tap="onConfirm">
+							去结算
+							{{ state.selectedIds?.length ? `(${state.selectedIds.length})` : '' }}
+						</button>
+					</view>
+				</view>
+			</su-fixed>
+		</view>
+	</s-layout>
+</template>
+
+<script setup>
+	import sheep from '@/sheep';
+	import { computed, reactive } from 'vue';
+  import { fen2yuan } from '../../sheep/hooks/useGoods';
+
+	const sys_navBar = sheep.$platform.navbar;
+	const cart = sheep.$store('cart');
+
+	const state = reactive({
+		editMode: false,
+		list: computed(() => cart.list),
+		selectedList: [],
+		selectedIds: computed(() => cart.selectedIds),
+		isAllSelected: computed(() => cart.isAllSelected),
+		totalPriceSelected: computed(() => cart.totalPriceSelected),
+	});
+
+	// 单选选中
+	function onSelectSingle(id) {
+		cart.selectSingle(id);
+	}
+
+  // 全选
+	function onSelectAll() {
+		cart.selectAll(!state.isAllSelected);
+	}
+
+	// 结算
+	function onConfirm() {
+		let items = []
+		let goods_list = [];
+		state.selectedList = state.list.filter((item) => state.selectedIds.includes(item.id));
+		state.selectedList.map((item) => {
+			// 此处前端做出修改
+			items.push({
+				skuId: item.sku.id,
+				count: item.count,
+				cartId: item.id,
+				categoryId: item.spu.categoryId
+			})
+			goods_list.push({
+				// goods_id: item.goods_id,
+				goods_id: item.spu.id,
+				// goods_num: item.goods_num,
+				goods_num: item.count,
+				// 商品价格id真没有
+				// goods_sku_price_id: item.goods_sku_price_id,
+			});
+		});
+		// return;
+		if (goods_list.length === 0) {
+			sheep.$helper.toast('请选择商品');
+			return;
+		}
+		sheep.$router.go('/pages/order/confirm', {
+			data: JSON.stringify({
+				items
+			}),
+		});
+	}
+
+	function onNumberChange(e, cartItem) {
+		if (e === 0) {
+			cart.delete(cartItem.id);
+			return;
+		}
+		if (cartItem.goods_num === e) return;
+		cartItem.goods_num = e;
+		cart.update({
+			goods_id: cartItem.id,
+			goods_num: e,
+			goods_sku_price_id: cartItem.goods_sku_price_id,
+		});
+	}
+	async function onDelete() {
+		cart.delete(state.selectedIds);
+	}
+</script>
+
+<style lang="scss" scoped>
+	:deep(.ui-fixed) {
+		height: 72rpx;
+	}
+
+	.cart-box {
+		width: 100%;
+
+		.cart-header {
+			height: 70rpx;
+			background-color: #f6f6f6;
+			width: 100%;
+			position: fixed;
+			left: 0;
+			top: v-bind('sys_navBar') rpx;
+			z-index: 1000;
+			box-sizing: border-box;
+		}
+
+		.cart-footer {
+			height: 100rpx;
+			background-color: #fff;
+
+			.pay-btn {
+				width: 180rpx;
+				height: 70rpx;
+				font-size: 28rpx;
+				line-height: 28rpx;
+				font-weight: 500;
+				border-radius: 40rpx;
+			}
+		}
+
+		.cart-content {
+			margin-top: 70rpx;
+
+			.goods-box {
+				background-color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/category.vue b/pages/index/category.vue
new file mode 100644
index 0000000..4c88f38
--- /dev/null
+++ b/pages/index/category.vue
@@ -0,0 +1,237 @@
+<!-- 商品分类列表 -->
+<template>
+  <s-layout title="分类" tabbar="/pages/index/category" :bgStyle="{ color: '#fff' }">
+    <view class="s-category">
+      <view class="three-level-wrap ss-flex ss-col-top" :style="[{ height: pageHeight + 'px' }]">
+        <!-- 商品分类（左） -->
+        <scroll-view class="side-menu-wrap" scroll-y :style="[{ height: pageHeight + 'px' }]">
+          <view
+            class="menu-item ss-flex"
+            v-for="(item, index) in state.categoryList"
+            :key="item.id"
+            :class="[{ 'menu-item-active': index === state.activeMenu }]"
+            @tap="onMenu(index)"
+          >
+            <view class="menu-title ss-line-1">
+              {{ item.name }}
+            </view>
+          </view>
+        </scroll-view>
+        <!-- 商品分类（右） -->
+        <scroll-view
+          class="goods-list-box"
+          scroll-y
+          :style="[{ height: pageHeight + 'px' }]"
+          v-if="state.categoryList?.length"
+        >
+          <image
+            v-if="state.categoryList[state.activeMenu].picUrl"
+            class="banner-img"
+            :src="sheep.$url.cdn(state.categoryList[state.activeMenu].picUrl)"
+            mode="widthFix"
+          />
+          <first-one v-if="state.style === 'first_one'" :pagination="state.pagination" />
+          <first-two v-if="state.style === 'first_two'" :pagination="state.pagination" />
+          <second-one
+            v-if="state.style === 'second_one'"
+            :data="state.categoryList"
+            :activeMenu="state.activeMenu"
+          />
+          <uni-load-more
+            v-if="
+              (state.style === 'first_one' || state.style === 'first_two') &&
+              state.pagination.total > 0
+            "
+            :status="state.loadStatus"
+            :content-text="{
+              contentdown: '点击查看更多',
+            }"
+            @tap="loadMore"
+          />
+        </scroll-view>
+      </view>
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import secondOne from './components/second-one.vue';
+  import firstOne from './components/first-one.vue';
+  import firstTwo from './components/first-two.vue';
+  import sheep from '@/sheep';
+  import CategoryApi from '@/sheep/api/product/category';
+  import SpuApi from '@/sheep/api/product/spu';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { computed, reactive } from 'vue';
+  import _ from 'lodash-es';
+  import { handleTree } from '@/sheep/util';
+
+  const state = reactive({
+    style: 'second_one', // first_one（一级 - 样式一）, first_two（二级 - 样式二）, second_one（二级）
+    categoryList: [], // 商品分类树
+    activeMenu: 0, // 选中的一级菜单，在 categoryList 的下标
+
+    pagination: {
+      // 商品分页
+      list: [], // 商品列表
+      total: [], // 商品总数
+      pageNo: 1,
+      pageSize: 6,
+    },
+    loadStatus: '',
+  });
+
+  const { safeArea } = sheep.$platform.device;
+  const pageHeight = computed(() => safeArea.height - 44 - 50);
+
+  // 加载商品分类
+  async function getList() {
+    const { code, data } = await CategoryApi.getCategoryList();
+    if (code !== 0) {
+      return;
+    }
+    state.categoryList = handleTree(data);
+  }
+
+  // 选中菜单
+  const onMenu = (val) => {
+    state.activeMenu = val;
+    if (state.style === 'first_one' || state.style === 'first_two') {
+      state.pagination.pageNo = 1;
+      state.pagination.list = [];
+      state.pagination.total = 0;
+      getGoodsList();
+    }
+  };
+
+  // 加载商品列表
+  async function getGoodsList() {
+    // 加载列表
+    state.loadStatus = 'loading';
+    const res = await SpuApi.getSpuPage({
+      categoryId: state.categoryList[state.activeMenu].id,
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+    });
+    if (res.code !== 0) {
+      return;
+    }
+    // 合并列表
+    state.pagination.list = _.concat(state.pagination.list, res.data.list);
+    state.pagination.total = res.data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  // 加载更多商品
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getGoodsList();
+  }
+
+  onLoad(async (params) => {
+    await getList();
+
+    // 首页点击分类的处理：查找满足条件的分类
+    const foundCategory = state.categoryList.find(category => category.id === params.id);
+    // 如果找到则调用 onMenu 自动勾选相应分类，否则调用 onMenu(0) 勾选第一个分类
+    onMenu(foundCategory ? state.categoryList.indexOf(foundCategory) : 0);
+  });
+
+  onReachBottom(() => {
+    loadMore();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .s-category {
+    :deep() {
+      .side-menu-wrap {
+        width: 200rpx;
+        height: 100%;
+        padding-left: 12rpx;
+        background-color: #f6f6f6;
+
+        .menu-item {
+          width: 100%;
+          height: 88rpx;
+          position: relative;
+          transition: all linear 0.2s;
+
+          .menu-title {
+            line-height: 32rpx;
+            font-size: 30rpx;
+            font-weight: 400;
+            color: #333;
+            margin-left: 28rpx;
+            position: relative;
+            z-index: 0;
+
+            &::before {
+              content: '';
+              width: 64rpx;
+              height: 12rpx;
+              background: linear-gradient(
+                90deg,
+                var(--ui-BG-Main-gradient),
+                var(--ui-BG-Main-light)
+              ) !important;
+              position: absolute;
+              left: -64rpx;
+              bottom: 0;
+              z-index: -1;
+              transition: all linear 0.2s;
+            }
+          }
+
+          &.menu-item-active {
+            background-color: #fff;
+            border-radius: 20rpx 0 0 20rpx;
+
+            &::before {
+              content: '';
+              position: absolute;
+              right: 0;
+              bottom: -20rpx;
+              width: 20rpx;
+              height: 20rpx;
+              background: radial-gradient(circle at 0 100%, transparent 20rpx, #fff 0);
+            }
+
+            &::after {
+              content: '';
+              position: absolute;
+              top: -20rpx;
+              right: 0;
+              width: 20rpx;
+              height: 20rpx;
+              background: radial-gradient(circle at 0% 0%, transparent 20rpx, #fff 0);
+            }
+
+            .menu-title {
+              font-weight: 600;
+
+              &::before {
+                left: 0;
+              }
+            }
+          }
+        }
+      }
+
+      .goods-list-box {
+        background-color: #fff;
+        width: calc(100vw - 100px);
+        padding: 10px;
+      }
+
+      .banner-img {
+        width: calc(100vw - 130px);
+        border-radius: 5px;
+        margin-bottom: 20rpx;
+      }
+    }
+  }
+</style>
diff --git a/pages/index/components/first-one.vue b/pages/index/components/first-one.vue
new file mode 100644
index 0000000..2decc86
--- /dev/null
+++ b/pages/index/components/first-one.vue
@@ -0,0 +1,26 @@
+<!-- 分类展示：first-one 风格  -->
+<template>
+  <view class="ss-flex-col">
+    <view class="goods-box" v-for="item in pagination.list" :key="item.id">
+      <s-goods-column
+        size="sl"
+        :data="item"
+        @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+      />
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+
+  const props = defineProps({
+    pagination: Object,
+  });
+</script>
+
+<style lang="scss" scoped>
+  .goods-box {
+    width: 100%;
+  }
+</style>
diff --git a/pages/index/components/first-two.vue b/pages/index/components/first-two.vue
new file mode 100644
index 0000000..482931c
--- /dev/null
+++ b/pages/index/components/first-two.vue
@@ -0,0 +1,66 @@
+<!-- 分类展示：first-two 风格  -->
+<template>
+  <view>
+    <view class="ss-flex flex-wrap">
+      <view class="goods-box" v-for="item in pagination?.list" :key="item.id">
+        <view @click="sheep.$router.go('/pages/goods/index', { id: item.id })">
+          <view class="goods-img">
+            <image class="goods-img" :src="item.picUrl" mode="aspectFit" />
+          </view>
+          <view class="goods-content">
+            <view class="goods-title ss-line-1 ss-m-b-28">{{ item.title }}</view>
+            <view class="goods-price">￥{{ fen2yuan(item.price) }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+
+  const props = defineProps({
+    pagination: Object,
+  });
+</script>
+
+<style lang="scss" scoped>
+  .goods-box {
+    width: calc((100% - 20rpx) / 2);
+    margin-bottom: 20rpx;
+
+    .goods-img {
+      width: 100%;
+      height: 246rpx;
+      border-radius: 10rpx 10rpx 0px 0px;
+    }
+
+    .goods-content {
+      width: 100%;
+      background: #ffffff;
+      box-shadow: 0px 0px 20rpx 4rpx rgba(199, 199, 199, 0.22);
+      padding: 20rpx 0 32rpx 16rpx;
+      box-sizing: border-box;
+      border-radius: 0 0 10rpx 10rpx;
+
+      .goods-title {
+        font-size: 26rpx;
+        font-weight: bold;
+        color: #333333;
+      }
+
+      .goods-price {
+        font-size: 24rpx;
+        font-family: OPPOSANS;
+        font-weight: 500;
+        color: #e1212b;
+      }
+    }
+
+    &:nth-child(2n + 1) {
+      margin-right: 20rpx;
+    }
+  }
+</style>
diff --git a/pages/index/components/second-one.vue b/pages/index/components/second-one.vue
new file mode 100644
index 0000000..86b7078
--- /dev/null
+++ b/pages/index/components/second-one.vue
@@ -0,0 +1,80 @@
+<!-- 分类展示：second-one 风格  -->
+<template>
+  <view>
+    <!-- 一级分类的名字 -->
+    <view class="title-box ss-flex ss-col-center ss-row-center ss-p-b-30">
+      <view class="title-line-left" />
+      <view class="title-text ss-p-x-20">{{ props.data[activeMenu].name }}</view>
+      <view class="title-line-right" />
+    </view>
+    <!-- 二级分类的名字 -->
+    <view class="goods-item-box ss-flex ss-flex-wrap ss-p-b-20">
+      <view
+        class="goods-item"
+        v-for="item in props.data[activeMenu].children"
+        :key="item.id"
+        @tap="
+          sheep.$router.go('/pages/goods/list', {
+            categoryId: item.id,
+          })
+        "
+      >
+        <image class="goods-img" :src="item.picUrl" mode="aspectFill" />
+        <view class="ss-p-10">
+          <view class="goods-title ss-line-1">{{ item.name }}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+
+  const props = defineProps({
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+    activeMenu: [Number, String],
+  });
+</script>
+
+<style lang="scss" scoped>
+  .title-box {
+    .title-line-left,
+    .title-line-right {
+      width: 15px;
+      height: 1px;
+      background: #d2d2d2;
+    }
+  }
+
+  .goods-item {
+    width: calc((100% - 20px) / 3);
+    margin-right: 10px;
+    margin-bottom: 10px;
+
+    &:nth-of-type(3n) {
+      margin-right: 0;
+    }
+
+    .goods-img {
+      width: calc((100vw - 140px) / 3);
+      height: calc((100vw - 140px) / 3);
+    }
+
+    .goods-title {
+      font-size: 26rpx;
+      font-weight: bold;
+      color: #333333;
+      line-height: 40rpx;
+      text-align: center;
+    }
+
+    .goods-price {
+      color: $red;
+      line-height: 40rpx;
+    }
+  }
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
new file mode 100644
index 0000000..c62c563
--- /dev/null
+++ b/pages/index/index.vue
@@ -0,0 +1,88 @@
+<!-- 首页，支持店铺装修 -->
+<template>
+	<view v-if="template">
+		<s-layout title="首页" navbar="custom" tabbar="/pages/tabbar/index" :bgStyle="template.page"
+			:navbarStyle="template.navigationBar" onShareAppMessage>
+			<s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
+				<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
+			</s-block>
+		</s-layout>
+	</view>
+</template>
+
+<script setup>
+	import {
+		computed
+	} from 'vue';
+	import {
+		onLoad,
+		onPageScroll,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
+	import $share from '@/sheep/platform/share';
+	// 隐藏原生tabBar
+	uni.hideTabBar();
+
+	const template = computed(() => sheep.$store('app').template?.home);
+	// 在此处拦截改变一下首页轮播图 此处先写死后期复活 放到启动函数里
+	// (async function() {
+		// console.log('原代码首页定制化数据',template)
+		// let {
+		// 	data
+		// } = await index2Api.decorate();
+		// console.log('首页导航配置化过高无法兼容',JSON.parse(data[1].value))
+		// 改变首页底部数据 但是没有通过数组id获取商品数据接口
+		// let {
+		// 	data: datas
+		// } = await index2Api.spids();
+		// template.value.data[9].data.goodsIds = datas.list.map(item => item.id);
+		// template.value.data[0].data.list = JSON.parse(data[0].value).map(item => {
+		// 	return {
+		// 		src: item.picUrl,
+		// 		url: item.url,
+		// 		title: item.name,
+		// 		type: "image"
+		// 	}
+		// })
+	// }())
+
+
+	onLoad((options) => {
+		// #ifdef MP
+		// 小程序识别二维码
+		if (options.scene) {
+			const sceneParams = decodeURIComponent(options.scene).split('=');
+      console.log("sceneParams=>",sceneParams);
+			options[sceneParams[0]] = sceneParams[1];
+		}
+		// #endif
+
+		// 预览模板
+		if (options.templateId) {
+			sheep.$store('app').init(options.templateId);
+		}
+
+		// 解析分享信息
+		if (options.spm) {
+			$share.decryptSpm(options.spm);
+		}
+
+		// 进入指定页面(完整页面路径)
+		if (options.page) {
+			sheep.$router.go(decodeURIComponent(options.page));
+		}
+	});
+
+	// 下拉刷新
+	onPullDownRefresh(() => {
+		sheep.$store('app').init();
+		setTimeout(function() {
+			uni.stopPullDownRefresh();
+		}, 800);
+	});
+
+	onPageScroll(() => {});
+</script>
+
+<style></style>
diff --git a/pages/index/login.vue b/pages/index/login.vue
new file mode 100644
index 0000000..e498870
--- /dev/null
+++ b/pages/index/login.vue
@@ -0,0 +1,39 @@
+<!-- 微信公众号的登录回调页 -->
+<template>
+  <!-- 空登陆页 -->
+  <view />
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+
+  onLoad(async (options) => {
+    // #ifdef H5
+    // 将 search 参数赋值到 options 中，方便下面解析
+    new URLSearchParams(location.search).forEach((value, key) => {
+      options[key] = value;
+    });
+    // 执行登录 or 绑定，注意需要 await 绑定
+    const event = options.event;
+    const code = options.code;
+    const state = options.state;
+    if (event === 'login') { // 场景一：登录
+      await sheep.$platform.useProvider().login(code, state);
+    } else if (event === 'bind') { // 场景二：绑定
+      await sheep.$platform.useProvider().bind(code, state);
+    }
+
+    // 检测 H5 登录回调
+    let returnUrl = uni.getStorageSync('returnUrl');
+    if (returnUrl) {
+      uni.removeStorage({key:'returnUrl'});
+      location.replace(returnUrl);
+    } else {
+      uni.switchTab({
+        url: '/',
+      });
+    }
+    // #endif
+  });
+</script>
diff --git a/pages/index/page.vue b/pages/index/page.vue
new file mode 100644
index 0000000..b5d8ef3
--- /dev/null
+++ b/pages/index/page.vue
@@ -0,0 +1,51 @@
+<!-- 自定义页面：支持装修 -->
+<template>
+  <s-layout
+    :title="state.name"
+    navbar="custom"
+    :bgStyle="state.page"
+    :navbarStyle="state.navigationBar"
+    onShareAppMessage
+    showLeftButton
+  >
+    <s-block v-for="(item, index) in state.components" :key="index" :styles="item.property.style">
+      <s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
+    </s-block>
+  </s-layout>
+</template>
+
+<script setup>
+  import { reactive } from 'vue';
+  import { onLoad, onPageScroll } from '@dcloudio/uni-app';
+  import DiyApi from '@/sheep/api/promotion/diy';
+
+  const state = reactive({
+    name: '',
+    components: [],
+    navigationBar: {},
+    page: {},
+  });
+  onLoad(async (options) => {
+    let id = options.id
+
+    // #ifdef MP
+    // 小程序预览自定义页面
+    if (options.scene) {
+      const sceneParams = decodeURIComponent(options.scene).split('=');
+      id = sceneParams[1];
+    }
+    // #endif
+
+    const { code, data } = await DiyApi.getDiyPage(id);
+    if (code === 0) {
+      state.name = data.name;
+      state.components = data.property?.components;
+      state.navigationBar = data.property?.navigationBar;
+      state.page = data.property?.page;
+    }
+  });
+
+  onPageScroll(() => {});
+</script>
+
+<style></style>
diff --git a/pages/index/search.vue b/pages/index/search.vue
new file mode 100644
index 0000000..8497298
--- /dev/null
+++ b/pages/index/search.vue
@@ -0,0 +1,119 @@
+<!-- 搜索界面 -->
+<template>
+  <s-layout class="set-wrap" title="搜索" :bgStyle="{ color: '#FFF' }">
+    <view class="ss-p-x-24">
+      <view class="ss-flex ss-col-center">
+        <uni-search-bar
+          class="ss-flex-1"
+          radius="33"
+          placeholder="请输入关键字"
+          cancelButton="none"
+          :focus="true"
+          @confirm="onSearch($event.value)"
+        />
+      </view>
+      <view class="ss-flex ss-row-between ss-col-center">
+        <view class="serach-history">搜索历史</view>
+        <button class="clean-history ss-reset-button" @tap="onDelete"> 清除搜索历史 </button>
+      </view>
+      <view class="ss-flex ss-col-center ss-row-left ss-flex-wrap">
+        <button
+          class="history-btn ss-reset-button"
+          @tap="onSearch(item)"
+          v-for="(item, index) in state.historyList"
+          :key="index"
+        >
+          {{ item }}
+        </button>
+      </view>
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import { reactive } from 'vue';
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+
+  const state = reactive({
+    historyList: [],
+  });
+
+  // 搜索
+  function onSearch(keyword) {
+    if (!keyword) {
+      return;
+    }
+    saveSearchHistory(keyword);
+    // 前往商品列表（带搜索条件）
+    sheep.$router.go('/pages/goods/list', { keyword });
+  }
+
+  // 保存搜索历史
+  function saveSearchHistory(keyword) {
+    // 如果关键词在搜索历史中，则把此关键词先移除
+    if (state.historyList.includes(keyword)) {
+      state.historyList.splice(state.historyList.indexOf(keyword), 1);
+    }
+    // 置顶关键词
+    state.historyList.unshift(keyword);
+
+    // 最多保留 10 条记录
+    if (state.historyList.length >= 10) {
+      state.historyList.length = 10;
+    }
+    uni.setStorageSync('searchHistory', state.historyList);
+  }
+
+  function onDelete() {
+    uni.showModal({
+      title: '提示',
+      content: '确认清除搜索历史吗？',
+      success: function (res) {
+        if (res.confirm) {
+          state.historyTag = [];
+          uni.removeStorageSync('searchHistory');
+        }
+      },
+    });
+  }
+
+  onLoad(() => {
+    state.historyList = uni.getStorageSync('searchHistory') || [];
+  });
+</script>
+
+<style lang="scss" scoped>
+  .serach-title {
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #333333;
+  }
+
+  .uni-searchbar {
+    padding-left: 0;
+  }
+
+  .serach-history {
+    font-weight: bold;
+    color: #333333;
+    font-size: 30rpx;
+  }
+
+  .clean-history {
+    font-weight: 500;
+    color: #999999;
+    font-size: 28rpx;
+  }
+
+  .history-btn {
+    padding: 0 38rpx;
+    height: 60rpx;
+    background: #f5f6f8;
+    border-radius: 30rpx;
+    font-size: 28rpx;
+    color: #333333;
+    max-width: 690rpx;
+    margin: 0 20rpx 20rpx 0;
+  }
+</style>
diff --git a/pages/index/user.vue b/pages/index/user.vue
new file mode 100644
index 0000000..705451a
--- /dev/null
+++ b/pages/index/user.vue
@@ -0,0 +1,42 @@
+<!-- 个人中心：支持装修 -->
+<template>
+  <s-layout
+    title="我的"
+    tabbar="/pages/index/user"
+    navbar="custom"
+    :bgStyle="template.page"
+    :navbarStyle="template.navigationBar"
+    onShareAppMessage
+  >
+    <s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
+      <s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
+    </s-block>
+  </s-layout>
+</template>
+
+<script setup>
+  import { computed } from 'vue';
+  import { onShow, onPageScroll, onPullDownRefresh } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+
+  // 隐藏原生tabBar
+  uni.hideTabBar();
+
+  const template = computed(() => sheep.$store('app').template.user);
+  const isLogin = computed(() => sheep.$store('user').isLogin);
+
+  onShow(() => {
+    sheep.$store('user').updateUserData();
+  });
+
+  onPullDownRefresh(() => {
+    sheep.$store('user').updateUserData();
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 800);
+  });
+
+  onPageScroll(() => {});
+</script>
+
+<style></style>
diff --git a/pages/order/addressSelection.vue b/pages/order/addressSelection.vue
new file mode 100644
index 0000000..2432d41
--- /dev/null
+++ b/pages/order/addressSelection.vue
@@ -0,0 +1,261 @@
+<!-- 下单界面，收货地址 or 自提门店的选择组件 -->
+<template>
+  <view class="allAddress" :style="state.isPickUp ? '':'padding-top:10rpx;'">
+    <view class="nav flex flex-wrap">
+      <view class="item font-color" :class="state.deliveryType === 1 ? 'on' : 'on2'"
+            @tap="switchDeliveryType(1)" v-if='state.isPickUp' />
+      <view class="item font-color" :class="state.deliveryType === 2 ? 'on' : 'on2'"
+            @tap="switchDeliveryType(2)" v-if='state.isPickUp' />
+    </view>
+    <!-- 情况一：收货地址的选择 -->
+    <view class='address flex flex-wrap flex-center ss-row-between' @tap='onSelectAddress' v-if='state.deliveryType === 1'
+          :style="state.isPickUp ? '':'border-top-left-radius: 14rpx;border-top-right-radius: 14rpx;'">
+      <view class='addressCon' v-if="state.addressInfo.name">
+        <view class='name'>{{ state.addressInfo.name }}
+          <text class='phone'>{{ state.addressInfo.mobile }}</text>
+        </view>
+        <view class="flex flex-wrap">
+          <text class='default font-color' v-if="state.addressInfo.defaultStatus">[默认]</text>
+          <text class="line2">{{ state.addressInfo.areaName }} {{ state.addressInfo.detailAddress }}</text>
+        </view>
+      </view>
+      <view class='addressCon' v-else>
+        <view class='setaddress'>设置收货地址</view>
+      </view>
+      <view class='iconfont'>
+        <view class="ss-rest-button">
+          <text class="_icon-forward" />
+        </view>
+      </view>
+    </view>
+    <!-- 情况二：门店的选择 -->
+    <view class='address flex flex-wrap flex-center ss-row-between' v-else @tap="onSelectAddress">
+        <view class='addressCon' v-if="state.pickUpInfo.name">
+          <view class='name'>{{ state.pickUpInfo.name }}
+            <text class='phone'>{{ state.pickUpInfo.phone }}</text>
+          </view>
+          <view class="line1"> {{ state.pickUpInfo.areaName }}{{ ', ' + state.pickUpInfo.detailAddress }}
+          </view>
+        </view>
+        <view class='addressCon' v-else>
+          <view class='setaddress'>选择自提门店</view>
+        </view>
+        <view class='iconfont'>
+          <view class="ss-rest-button">
+            <text class="_icon-forward" />
+          </view>
+        </view>
+    </view>
+    <view class='line'>
+      <image :src="sheep.$url.static('/static/images/line.png', 'local')" />
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { computed } from 'vue';
+  import sheep from '@/sheep';
+  import { isEmpty } from 'lodash-es';
+
+  const props = defineProps({
+    modelValue: {
+      type: Object,
+      default() {},
+    }
+  });
+  const emits = defineEmits(['update:modelValue']);
+
+  // computed 解决父子组件双向数据同步
+  const state = computed({
+    get(){
+      return new Proxy(props.modelValue, {
+        set(obj, name, val) {
+          emits('update:modelValue', {
+            ...obj,
+            [name]: val,
+          });
+          return true;
+        }
+      })
+    },
+    set(val){
+      emits('update:modelValue', val);
+    }
+  })
+
+  // 选择地址
+  function onSelectAddress() {
+    let emitName = 'SELECT_ADDRESS'
+    let addressPage = '/pages/user/address/list?type=select';
+    if (state.value.deliveryType === 2){
+      emitName = 'SELECT_PICK_UP_INFO'
+      addressPage = '/pages/user/goods_details_store/index'
+    }
+    uni.$once(emitName, (e) => {
+      changeConsignee(e.addressInfo);
+    });
+    sheep.$router.go(addressPage);
+  }
+
+  // 更改收货人地址&计算订单信息
+  async function changeConsignee(addressInfo = {}) {
+    if (!isEmpty(addressInfo)) {
+      if (state.value.deliveryType === 1){
+        state.value.addressInfo = addressInfo;
+      }
+      if (state.value.deliveryType === 2){
+        state.value.pickUpInfo = addressInfo;
+      }
+    }
+  }
+
+  // 收货方式切换
+  const switchDeliveryType = (type) =>{
+    state.value.deliveryType = type;
+  }
+</script>
+
+<style scoped lang="scss">
+  .allAddress .font-color{
+    color: #E93323!important
+  }
+  .line2{
+    width: 504rpx;
+  }
+  .textR {
+    text-align: right;
+  }
+
+  .line {
+    width: 100%;
+    height: 3rpx;
+  }
+
+  .line image {
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
+
+  .address {
+    padding: 28rpx;
+    background-color: #fff;
+    box-sizing: border-box;
+  }
+
+  .address .addressCon {
+    width: 596rpx;
+    font-size: 26rpx;
+    color: #666;
+  }
+
+  .address .addressCon .name {
+    font-size: 30rpx;
+    color: #282828;
+    font-weight: bold;
+    margin-bottom: 10rpx;
+  }
+
+  .address .addressCon .name .phone {
+    margin-left: 50rpx;
+  }
+
+  .address .addressCon .default {
+    margin-right: 12rpx;
+  }
+
+  .address .addressCon .setaddress {
+    color: #333;
+    font-size: 28rpx;
+  }
+
+  .address .iconfont {
+    font-size: 35rpx;
+    color: #707070;
+  }
+
+  .allAddress {
+    width: 100%;
+    background: linear-gradient(to bottom, #e93323 0%, #f5f5f5 100%);
+    // background-image: linear-gradient(to bottom, #e93323 0%, #f5f5f5 100%);
+    // background-image: -webkit-linear-gradient(to bottom, #e93323 0%, #f5f5f5 100%);
+    // background-image: -moz-linear-gradient(to bottom, #e93323 0%, #f5f5f5 100%);
+    //padding: 100rpx 30rpx 0 30rpx;
+    padding-top: 100rpx;
+    padding-bottom: 10rpx;
+  }
+
+  .allAddress .nav {
+    width: 690rpx;
+    margin: 0 auto;
+  }
+
+  .allAddress .nav .item {
+    width: 334rpx;
+  }
+
+  .allAddress .nav .item.on {
+    position: relative;
+    width: 230rpx;
+  }
+
+  .allAddress .nav .item.on::before {
+    position: absolute;
+    bottom: 0;
+    content: "快递配送";
+    font-size: 28rpx;
+    display: block;
+    height: 0;
+    width: 336rpx;
+    border-width: 0 20rpx 80rpx 0;
+    border-style: none solid solid;
+    border-color: transparent transparent #fff;
+    z-index: 2;
+    border-radius: 14rpx 36rpx 0 0;
+    text-align: center;
+    line-height: 80rpx;
+  }
+
+  .allAddress .nav .item:nth-of-type(2).on::before {
+    content: "到店自提";
+    border-width: 0 0 80rpx 20rpx;
+    border-radius: 36rpx 14rpx 0 0;
+  }
+
+  .allAddress .nav .item.on2 {
+    position: relative;
+  }
+
+  .allAddress .nav .item.on2::before {
+    position: absolute;
+    bottom: 0;
+    content: "到店自提";
+    font-size: 28rpx;
+    display: block;
+    height: 0;
+    width: 401rpx;
+    border-width: 0 0 60rpx 60rpx;
+    border-style: none solid solid;
+    border-color: transparent transparent #f7c1bd;
+    border-radius: 36rpx 14rpx 0 0;
+    text-align: center;
+    line-height: 60rpx;
+  }
+
+  .allAddress .nav .item:nth-of-type(1).on2::before {
+    content: "快递配送";
+    border-width: 0 60rpx 60rpx 0;
+    border-radius: 14rpx 36rpx 0 0;
+  }
+
+  .allAddress .address {
+    width: 690rpx;
+    max-height: 180rpx;
+    margin: 0 auto;
+  }
+
+  .allAddress .line {
+    width: 100%;
+    margin: 0 auto;
+  }
+</style>
diff --git a/pages/order/aftersale/apply.vue b/pages/order/aftersale/apply.vue
new file mode 100644
index 0000000..805ea94
--- /dev/null
+++ b/pages/order/aftersale/apply.vue
@@ -0,0 +1,351 @@
+<!-- 售后申请 -->
+<template>
+  <s-layout title="申请售后">
+    <!-- 售后商品 -->
+    <view class="goods-box">
+      <s-goods-item
+        :img="state.item.picUrl"
+        :title="state.item.spuName"
+        :skuText="state.item.properties?.map((property) => property.valueName).join(' ')"
+        :price="state.item.price"
+        :num="state.item.count"
+      />
+    </view>
+
+    <uni-forms ref="form" v-model="formData" :rules="rules" label-position="top">
+      <!-- 售后类型 -->
+      <view class="refund-item">
+        <view class="item-title ss-m-b-20">售后类型</view>
+        <view class="ss-flex-col">
+          <radio-group @change="onRefundChange">
+            <label
+              class="ss-flex ss-col-center ss-p-y-10"
+              v-for="(item, index) in state.wayList"
+              :key="index"
+            >
+              <radio
+                :checked="formData.type === item.value"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                :value="item.value"
+              />
+              <view class="item-value ss-m-l-8">{{ item.text }}</view>
+            </label>
+          </radio-group>
+        </view>
+      </view>
+      <!-- 退款金额 -->
+      <view class="refund-item ss-flex ss-col-center ss-row-between" @tap="state.showModal = true">
+        <text class="item-title">退款金额</text>
+        <view class="ss-flex refund-cause ss-col-center">
+          <text class="ss-m-r-20">￥{{ fen2yuan(state.item.payPrice) }}</text>
+        </view>
+      </view>
+      <!-- 申请原因 -->
+      <view class="refund-item ss-flex ss-col-center ss-row-between" @tap="state.showModal = true">
+        <text class="item-title">申请原因</text>
+        <view class="ss-flex refund-cause ss-col-center">
+          <text class="ss-m-r-20" v-if="formData.applyReason">{{ formData.applyReason }}</text>
+          <text class="ss-m-r-20" v-else>请选择申请原因~</text>
+          <text class="cicon-forward" style="height: 28rpx"></text>
+        </view>
+      </view>
+
+      <!-- 留言 -->
+      <view class="refund-item">
+        <view class="item-title ss-m-b-20">相关描述</view>
+        <view class="describe-box">
+          <uni-easyinput
+            :inputBorder="false"
+            class="describe-content"
+            type="textarea"
+            maxlength="120"
+            autoHeight
+            v-model="formData.applyDescription"
+            placeholder="客官~请描述您遇到的问题，建议上传照片"
+          />
+          <!-- TODO 芋艿：上传的测试 -->
+          <view class="upload-img">
+            <s-uploader
+              v-model:url="formData.images"
+              fileMediatype="image"
+              limit="9"
+              mode="grid"
+              :imageStyles="{ width: '168rpx', height: '168rpx' }"
+            />
+          </view>
+        </view>
+      </view>
+    </uni-forms>
+
+    <!-- 底部按钮 -->
+    <su-fixed bottom placeholder>
+      <view class="foot-wrap">
+        <view class="foot_box ss-flex ss-col-center ss-row-between ss-p-x-30">
+          <button class="ss-reset-button contcat-btn" @tap="sheep.$router.go('/pages/chat/index')">
+            联系客服
+          </button>
+          <button class="ss-reset-button ui-BG-Main-Gradient sub-btn" @tap="submit">提交</button>
+        </view>
+      </view>
+    </su-fixed>
+
+    <!-- 申请原因弹窗 -->
+    <su-popup :show="state.showModal" round="10" :showClose="true" @close="state.showModal = false">
+      <view class="modal-box page_box">
+        <view class="modal-head item-title head_box ss-flex ss-row-center ss-col-center">
+          申请原因
+        </view>
+        <view class="modal-content content_box">
+          <radio-group @change="onChange">
+            <label class="radio ss-flex ss-col-center" v-for="item in state.reasonList" :key="item">
+              <view class="ss-flex-1 ss-p-20">{{ item }}</view>
+              <radio
+                :value="item"
+                color="var(--ui-BG-Main)"
+                :checked="item === state.currentValue"
+              />
+            </label>
+          </radio-group>
+        </view>
+        <view class="modal-foot foot_box ss-flex ss-row-center ss-col-center">
+          <button class="ss-reset-button close-btn ui-BG-Main-Gradient" @tap="onReason">
+            确定
+          </button>
+        </view>
+      </view>
+    </su-popup>
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive, ref } from 'vue';
+  import OrderApi from '@/sheep/api/trade/order';
+  import TradeConfigApi from '@/sheep/api/trade/config';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import AfterSaleApi from '@/sheep/api/trade/afterSale';
+  import { WxaSubscribeTemplate } from '@/sheep/util/const';
+
+  const form = ref(null);
+  const state = reactive({
+    orderId: 0, // 订单编号
+    itemId: 0, // 订单项编号
+    order: {}, // 订单
+    item: {}, // 订单项
+    config: {}, // 交易配置
+
+    // 售后类型
+    wayList: [
+      {
+        text: '仅退款',
+        value: '10',
+      },
+      {
+        text: '退款退货',
+        value: '20',
+      },
+    ],
+    reasonList: [], // 可选的申请原因数组
+    showModal: false, // 是否显示申请原因弹窗
+    currentValue: '', // 当前选择的售后原因
+  });
+  let formData = reactive({
+    way: '',
+    applyReason: '',
+    applyDescription: '',
+    images: [],
+  });
+  const rules = reactive({});
+
+  // 提交表单
+  async function submit() {
+    let data = {
+      orderItemId: state.itemId,
+      refundPrice: state.item.payPrice,
+      ...formData,
+    };
+    const { code } = await AfterSaleApi.createAfterSale(data);
+    if (code === 0) {
+      uni.showToast({
+        title: '申请成功',
+      });
+      sheep.$router.go('/pages/order/aftersale/list');
+    }
+  }
+
+  // 选择售后类型
+  function onRefundChange(e) {
+    formData.way = e.detail.value;
+    // 清理理由
+    state.reasonList =
+      formData.way === '10'
+        ? state.config.afterSaleRefundReasons || []
+        : state.config.afterSaleReturnReasons || [];
+    formData.applyReason = '';
+    state.currentValue = '';
+  }
+
+  // 选择申请原因
+  function onChange(e) {
+    state.currentValue = e.detail.value;
+  }
+
+  // 确定
+  function onReason() {
+    formData.applyReason = state.currentValue;
+    state.showModal = false;
+  }
+
+  onLoad(async (options) => {
+    // 解析参数
+    if (!options.orderId || !options.itemId) {
+      sheep.$helper.toast(`缺少订单信息，请检查`);
+      return;
+    }
+    state.orderId = options.orderId;
+    state.itemId = parseInt(options.itemId);
+
+    // 读取订单信息
+    const { code, data } = await OrderApi.getOrder(state.orderId);
+    if (code !== 0) {
+      return;
+    }
+    state.order = data;
+    state.item = data.items.find((item) => item.id === state.itemId) || {};
+
+    // 设置选项
+    if (state.order.status === 10) {
+      state.wayList.splice(1, 1);
+    }
+
+    // 读取配置
+    state.config = (await TradeConfigApi.getTradeConfig()).data;
+  });
+</script>
+
+<style lang="scss" scoped>
+  .item-title {
+    font-size: 30rpx;
+    font-weight: bold;
+    color: rgba(51, 51, 51, 1);
+    // margin-bottom: 20rpx;
+  }
+
+  // 售后项目
+  .refund-item {
+    background-color: #fff;
+    border-bottom: 1rpx solid #f5f5f5;
+    padding: 30rpx;
+
+    &:last-child {
+      border: none;
+    }
+
+    // 留言
+    .describe-box {
+      width: 690rpx;
+      background: rgba(249, 250, 251, 1);
+      padding: 30rpx;
+      box-sizing: border-box;
+      border-radius: 20rpx;
+
+      .describe-content {
+        height: 200rpx;
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #333;
+      }
+    }
+
+    // 联系方式
+    .input-box {
+      height: 84rpx;
+      background: rgba(249, 250, 251, 1);
+      border-radius: 20rpx;
+    }
+  }
+
+  .goods-box {
+    background: #fff;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .foot-wrap {
+    height: 100rpx;
+    width: 100%;
+  }
+
+  .foot_box {
+    height: 100rpx;
+    background-color: #fff;
+
+    .sub-btn {
+      width: 336rpx;
+      line-height: 74rpx;
+      border-radius: 38rpx;
+      color: rgba(#fff, 0.9);
+      font-size: 28rpx;
+    }
+
+    .contcat-btn {
+      width: 336rpx;
+      line-height: 74rpx;
+      background: rgba(238, 238, 238, 1);
+      border-radius: 38rpx;
+      font-size: 28rpx;
+      font-weight: 400;
+      color: rgba(51, 51, 51, 1);
+    }
+  }
+
+  .modal-box {
+    width: 750rpx;
+    // height: 680rpx;
+    border-radius: 30rpx 30rpx 0 0;
+    background: #fff;
+
+    .modal-head {
+      height: 100rpx;
+      font-size: 30rpx;
+    }
+
+    .modal-content {
+      font-size: 28rpx;
+    }
+
+    .modal-foot {
+      .close-btn {
+        width: 710rpx;
+        line-height: 80rpx;
+        border-radius: 40rpx;
+        color: rgba(#fff, 0.9);
+      }
+    }
+  }
+
+  .success-box {
+    width: 600rpx;
+    padding: 90rpx 0 64rpx 0;
+
+    .cicon-check-round {
+      font-size: 96rpx;
+      color: #04b750;
+    }
+
+    .success-title {
+      font-weight: 500;
+      color: #333333;
+      font-size: 32rpx;
+    }
+
+    .success-btn {
+      width: 492rpx;
+      height: 70rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main-gradient), var(--ui-BG-Main));
+      border-radius: 35rpx;
+    }
+  }
+</style>
diff --git a/pages/order/aftersale/detail.vue b/pages/order/aftersale/detail.vue
new file mode 100644
index 0000000..6b7bfcc
--- /dev/null
+++ b/pages/order/aftersale/detail.vue
@@ -0,0 +1,379 @@
+<!-- 售后详情 -->
+<template>
+  <s-layout title="售后详情" :navbar="!isEmpty(state.info) && state.loading ? 'inner' : 'normal'">
+    <view class="content_box" v-if="!isEmpty(state.info) && state.loading">
+      <!-- 步骤条 -->
+      <view
+        class="steps-box ss-flex"
+        :style="[
+          {
+            marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
+            paddingTop: Number(statusBarHeight + 88) + 'rpx',
+          },
+        ]"
+      >
+        <view class="ss-flex">
+          <view class="steps-item" v-for="(item, index) in state.list" :key="index">
+            <view class="ss-flex">
+              <text
+                class="sicon-circleclose"
+                v-if="state.list.length - 1 === index && [61, 62, 63].includes(state.info.status)"
+              />
+              <text
+                class="sicon-circlecheck"
+                v-else
+                :class="state.active >= index ? 'activity-color' : 'info-color'"
+              />
+
+              <view
+                v-if="state.list.length - 1 !== index"
+                class="line"
+                :class="state.active >= index ? 'activity-bg' : 'info-bg'"
+              />
+            </view>
+            <view
+              class="steps-item-title"
+              :class="state.active >= index ? 'activity-color' : 'info-color'"
+            >
+              {{ item.title }}
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 服务状态 -->
+      <view
+        class="status-box ss-flex ss-col-center ss-row-between ss-m-x-20"
+        @tap="sheep.$router.go('/pages/order/aftersale/log', { id: state.id })"
+      >
+        <view class="">
+          <view class="status-text">
+            {{ formatAfterSaleStatusDescription(state.info) }}
+          </view>
+          <view class="status-time">
+            {{ sheep.$helper.timeFormat(state.info.updateTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </view>
+        </view>
+        <text class="ss-iconfont _icon-forward" style="color: #666" />
+      </view>
+
+      <!-- 退款金额 -->
+      <view class="aftersale-money ss-flex ss-col-center ss-row-between">
+        <view class="aftersale-money--title">退款总额</view>
+        <view class="aftersale-money--num">￥{{ fen2yuan(state.info.refundPrice) }}</view>
+      </view>
+      <!-- 服务商品 -->
+      <view class="order-shop">
+        <s-goods-item
+          :img="state.info.picUrl"
+          :title="state.info.spuName"
+          :titleWidth="480"
+          :skuText="state.info.properties.map((property) => property.valueName).join(' ')"
+          :num="state.info.count"
+        />
+      </view>
+
+      <!-- 服务内容 -->
+      <view class="aftersale-content">
+        <view class="aftersale-item ss-flex ss-col-center">
+          <view class="item-title">服务单号：</view>
+          <view class="item-content ss-m-r-16">{{ state.info.no }}</view>
+          <button class="ss-reset-button copy-btn" @tap="onCopy">复制</button>
+        </view>
+        <view class="aftersale-item ss-flex ss-col-center">
+          <view class="item-title">申请时间：</view>
+          <view class="item-content">
+            {{ sheep.$helper.timeFormat(state.info.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </view>
+        </view>
+        <view class="aftersale-item ss-flex ss-col-center">
+          <view class="item-title">售后类型：</view>
+          <view class="item-content">{{ state.info.way === 10 ? '仅退款' : '退款退货' }}</view>
+        </view>
+        <view class="aftersale-item ss-flex ss-col-center">
+          <view class="item-title">申请原因：</view>
+          <view class="item-content">{{ state.info.applyReason }}</view>
+        </view>
+        <view class="aftersale-item ss-flex ss-col-center">
+          <view class="item-title">相关描述：</view>
+          <view class="item-content">{{ state.info.applyDescription }}</view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 操作区 -->
+    <s-empty
+      v-if="isEmpty(state.info) && state.loading"
+      icon="/static/order-empty.png"
+      text="暂无该订单售后详情"
+    />
+    <su-fixed bottom placeholder bg="bg-white" v-if="!isEmpty(state.info)">
+      <view class="foot_box">
+        <button
+          class="ss-reset-button btn"
+          v-if="state.info.buttons?.includes('cancel')"
+          @tap="onApply(state.info.id)"
+        >
+          取消申请
+        </button>
+        <button
+          class="ss-reset-button btn"
+          v-if="state.info.buttons?.includes('delivery')"
+          @tap="sheep.$router.go('/pages/order/aftersale/return-delivery', { id: state.info.id })"
+        >
+          填写退货
+        </button>
+        <button
+          class="ss-reset-button contcat-btn btn"
+          @tap="sheep.$router.go('/pages/chat/index')"
+        >
+          联系客服
+        </button>
+      </view>
+    </su-fixed>
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import { isEmpty } from 'lodash-es';
+  import {
+    fen2yuan,
+    formatAfterSaleStatusDescription,
+    handleAfterSaleButtons,
+  } from '@/sheep/hooks/useGoods';
+  import AfterSaleApi from '@/sheep/api/trade/afterSale';
+
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
+  const state = reactive({
+    id: 0, // 售后编号
+    info: {}, // 收货信息
+    loading: false,
+    active: 0, // 在 list 的激活位置
+    list: [
+      {
+        title: '提交申请',
+      },
+      {
+        title: '处理中',
+      },
+      {
+        title: '完成',
+      },
+    ], // 时间轴
+  });
+
+  function onApply(id) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消此申请吗？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await AfterSaleApi.cancelAfterSale(id);
+        if (code === 0) {
+          await getDetail(id);
+        }
+      },
+    });
+  }
+
+  // 复制
+  const onCopy = () => {
+    sheep.$helper.copyText(state.info.no);
+  };
+
+  async function getDetail(id) {
+    state.loading = true;
+    const { code, data } = await AfterSaleApi.getAfterSale(id);
+    if (code !== 0) {
+      state.info = null;
+      return;
+    }
+    state.info = data;
+    handleAfterSaleButtons(state.info);
+
+    // 处理时间轴
+    if ([10].includes(state.info.status)) {
+      state.active = 0;
+    } else if ([20, 30].includes(state.info.status)) {
+      state.active = 1;
+    } else if ([40, 50].includes(state.info.status)) {
+      state.active = 2;
+    } else if ([61, 62, 63].includes(state.info.status)) {
+      state.active = 2;
+    }
+  }
+
+  onLoad((options) => {
+    if (!options.id) {
+      sheep.$helper.toast(`缺少订单信息，请检查`);
+      return;
+    }
+    state.id = options.id;
+    getDetail(options.id);
+  });
+</script>
+
+<style lang="scss" scoped>
+  // 步骤条
+  .steps-box {
+    width: 100%;
+    height: 190rpx;
+    background: v-bind(headerBg) no-repeat,
+      linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    background-size: 750rpx 100%;
+    padding-left: 72rpx;
+
+    .steps-item {
+      .sicon-circleclose {
+        font-size: 24rpx;
+        color: #fff;
+      }
+
+      .sicon-circlecheck {
+        font-size: 24rpx;
+      }
+
+      .steps-item-title {
+        font-size: 24rpx;
+        font-weight: 400;
+        margin-top: 16rpx;
+        margin-left: -36rpx;
+        width: 100rpx;
+        text-align: center;
+      }
+    }
+  }
+
+  .activity-color {
+    color: #fff;
+  }
+
+  .info-color {
+    color: rgba(#fff, 0.4);
+  }
+
+  .activity-bg {
+    background: #fff;
+  }
+
+  .info-bg {
+    background: rgba(#fff, 0.4);
+  }
+
+  .line {
+    width: 270rpx;
+    height: 4rpx;
+  }
+
+  // 服务状态
+  .status-box {
+    position: relative;
+    z-index: 3;
+    background-color: #fff;
+    border-radius: 20rpx 20rpx 0px 0px;
+    padding: 20rpx;
+    margin-top: -20rpx;
+
+    .status-text {
+      font-size: 28rpx;
+
+      font-weight: 500;
+      color: rgba(51, 51, 51, 1);
+      margin-bottom: 20rpx;
+    }
+
+    .status-time {
+      font-size: 24rpx;
+
+      font-weight: 400;
+      color: rgba(153, 153, 153, 1);
+    }
+  }
+
+  // 退款金额
+  .aftersale-money {
+    background-color: #fff;
+    height: 98rpx;
+    padding: 0 20rpx;
+    margin: 20rpx;
+
+    .aftersale-money--title {
+      font-size: 28rpx;
+
+      font-weight: 500;
+      color: rgba(51, 51, 51, 1);
+    }
+
+    .aftersale-money--num {
+      font-size: 28rpx;
+      font-family: OPPOSANS;
+      font-weight: 500;
+      color: #ff3000;
+    }
+  }
+
+  // order-shop
+  .order-shop {
+    padding: 20rpx;
+    background-color: #fff;
+    margin: 0 20rpx 20rpx 20rpx;
+  }
+
+  // 服务内容
+  .aftersale-content {
+    background-color: #fff;
+    padding: 20rpx;
+    margin: 0 20rpx;
+
+    .aftersale-item {
+      height: 60rpx;
+
+      .copy-btn {
+        background: #eeeeee;
+        color: #333;
+        border-radius: 20rpx;
+        width: 75rpx;
+        height: 40rpx;
+        font-size: 22rpx;
+      }
+
+      .item-title {
+        color: #999;
+        font-size: 28rpx;
+      }
+
+      .item-content {
+        color: #333;
+        font-size: 28rpx;
+      }
+    }
+  }
+
+  // 底部功能
+  .foot_box {
+    height: 100rpx;
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+
+    .btn {
+      width: 160rpx;
+      line-height: 60rpx;
+      background: rgba(238, 238, 238, 1);
+      border-radius: 30rpx;
+      padding: 0;
+      margin-right: 20rpx;
+      font-size: 26rpx;
+
+      font-weight: 400;
+      color: rgba(51, 51, 51, 1);
+    }
+  }
+</style>
diff --git a/pages/order/aftersale/list.vue b/pages/order/aftersale/list.vue
new file mode 100644
index 0000000..5ec22b4
--- /dev/null
+++ b/pages/order/aftersale/list.vue
@@ -0,0 +1,210 @@
+<!-- 售后列表 -->
+<template>
+  <s-layout title="售后列表">
+    <!-- tab -->
+    <su-sticky bgColor="#fff">
+      <su-tabs
+        :list="tabMaps"
+        :scrollable="false"
+        @change="onTabsChange"
+        :current="state.currentTab"
+      />
+    </su-sticky>
+    <s-empty v-if="state.pagination.total === 0" icon="/static/data-empty.png" text="暂无数据" />
+    <!-- 列表 -->
+    <view v-if="state.pagination.total > 0">
+      <view
+        class="list-box ss-m-y-20"
+        v-for="order in state.pagination.list"
+        :key="order.id"
+        @tap="sheep.$router.go('/pages/order/aftersale/detail', { id: order.id })"
+      >
+        <view class="order-head ss-flex ss-col-center ss-row-between">
+          <text class="no">服务单号：{{ order.no }}</text>
+          <text class="state">{{ formatAfterSaleStatus(order) }}</text>
+        </view>
+        <s-goods-item
+          :img="order.picUrl"
+          :title="order.spuName"
+          :skuText="order.properties.map((property) => property.valueName).join(' ')"
+          :price="order.refundPrice"
+        />
+        <view class="apply-box ss-flex ss-col-center ss-row-between border-bottom ss-p-x-20">
+          <view class="ss-flex ss-col-center">
+            <view class="title ss-m-r-20">{{ order.way === 10 ? '仅退款' : '退款退货' }}</view>
+            <view class="value">{{ formatAfterSaleStatusDescription(order) }}</view>
+          </view>
+          <text class="_icon-forward"></text>
+        </view>
+        <view class="tool-btn-box ss-flex ss-col-center ss-row-right ss-p-r-20">
+          <!-- TODO 功能缺失：填写退货信息 -->
+          <view>
+            <button
+              class="ss-reset-button tool-btn"
+              @tap.stop="onApply(order.id)"
+              v-if="order?.buttons.includes('cancel')"
+              >取消申请</button
+            >
+          </view>
+        </view>
+      </view>
+    </view>
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import _ from 'lodash-es';
+  import {
+    formatAfterSaleStatus,
+    formatAfterSaleStatusDescription,
+    handleAfterSaleButtons,
+  } from '@/sheep/hooks/useGoods';
+  import AfterSaleApi from '@/sheep/api/trade/afterSale';
+  import { resetPagination } from '@/sheep/util';
+
+  const state = reactive({
+    currentTab: 0,
+    showApply: false,
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 10,
+    },
+    loadStatus: '',
+  });
+
+  // TODO 芋艿：优化点，增加筛选
+  const tabMaps = [
+    {
+      name: '全部',
+      value: 'all',
+    },
+    // {
+    //   name: '申请中',
+    //   value: 'nooper',
+    // },
+    // {
+    //   name: '处理中',
+    //   value: 'ing',
+    // },
+    // {
+    //   name: '已完成',
+    //   value: 'completed',
+    // },
+    // {
+    //   name: '已拒绝',
+    //   value: 'refuse',
+    // },
+  ];
+
+  // 切换选项卡
+  function onTabsChange(e) {
+    resetPagination(state.pagination);
+    state.currentTab = e.index;
+    getOrderList();
+  }
+
+  // 获取售后列表
+  async function getOrderList() {
+    state.loadStatus = 'loading';
+    let { data, code } = await AfterSaleApi.getAfterSalePage({
+      // type: tabMaps[state.currentTab].value,
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+    });
+    if (code !== 0) {
+      return;
+    }
+    data.list.forEach((order) => handleAfterSaleButtons(order));
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  function onApply(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消此申请吗？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await AfterSaleApi.cancelAfterSale(orderId);
+        if (code === 0) {
+          resetPagination(state.pagination);
+          await getOrderList();
+        }
+      },
+    });
+  }
+
+  onLoad(async (options) => {
+    if (options.type) {
+      state.currentTab = options.type;
+    }
+    await getOrderList();
+  });
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getOrderList();
+  }
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .list-box {
+    background-color: #fff;
+
+    .order-head {
+      padding: 0 25rpx;
+      height: 77rpx;
+    }
+
+    .apply-box {
+      height: 82rpx;
+
+      .title {
+        font-size: 24rpx;
+      }
+
+      .value {
+        font-size: 22rpx;
+        color: $dark-6;
+      }
+    }
+
+    .tool-btn-box {
+      height: 100rpx;
+
+      .tool-btn {
+        width: 160rpx;
+        height: 60rpx;
+        background: #f6f6f6;
+        border-radius: 30rpx;
+        font-size: 26rpx;
+        font-weight: 400;
+      }
+    }
+  }
+</style>
diff --git a/pages/order/aftersale/log-item.vue b/pages/order/aftersale/log-item.vue
new file mode 100644
index 0000000..01329df
--- /dev/null
+++ b/pages/order/aftersale/log-item.vue
@@ -0,0 +1,77 @@
+<!-- 售后日志的每一项展示 -->
+<template>
+  <view class="log-item ss-flex">
+    <view class="log-icon ss-flex-col ss-col-center ss-m-r-20">
+      <text class="cicon-title" :class="index === 0 ? 'activity-color' : ''" />
+      <view v-if="data.length - 1 !== index" class="line" />
+    </view>
+    <view>
+      <view class="text">{{ item.content }}</view>
+      <view class="date">
+        {{ sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+      </view>
+    </view>
+  </view>
+</template>
+<script setup>
+  import sheep from '@/sheep';
+
+  const props = defineProps({
+    item: {
+      type: Object, // 当前日志
+      default() {},
+    },
+    index: {
+      type: Number, // item 在 data 的下标
+      default: 0,
+    },
+    data: {
+      type: Object, // 日志列表
+      default() {},
+    },
+  });
+</script>
+<style lang="scss" scoped>
+  .log-item {
+    align-items: stretch;
+  }
+  .log-icon {
+    height: inherit;
+    .cicon-title {
+      font-size: 30rpx;
+      color: #dfdfdf;
+    }
+    .activity-color {
+      color: #60bd45;
+    }
+    .line {
+      width: 1px;
+      height: 100%;
+      background: #dfdfdf;
+    }
+  }
+  .text {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #333333;
+  }
+  .richtext {
+    font-size: 24rpx;
+    font-weight: 500;
+    color: #999999;
+    margin: 20rpx 0 0 0;
+  }
+  .content-img {
+    margin-top: 20rpx;
+    width: 200rpx;
+    height: 200rpx;
+  }
+  .date {
+    margin-top: 20rpx;
+    font-size: 24rpx;
+    font-family: OPPOSANS;
+    font-weight: 400;
+    color: #999999;
+    margin-bottom: 40rpx;
+  }
+</style>
diff --git a/pages/order/aftersale/log.vue b/pages/order/aftersale/log.vue
new file mode 100644
index 0000000..a8df8a2
--- /dev/null
+++ b/pages/order/aftersale/log.vue
@@ -0,0 +1,38 @@
+<!-- 售后日志列表  -->
+<template>
+  <s-layout title="售后进度">
+    <view class="log-box">
+      <view v-for="(item, index) in state.list" :key="item.id">
+        <log-item :item="item" :index="index" :data="state.list" />
+      </view>
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import logItem from './log-item.vue';
+  import AfterSaleApi from '@/sheep/api/trade/afterSale';
+
+  const state = reactive({
+    list: [],
+  });
+
+  async function getDetail(id) {
+    const { data } = await AfterSaleApi.getAfterSaleLogList(id);
+    state.list = data;
+  }
+
+  onLoad((options) => {
+    state.aftersaleId = options.id;
+    getDetail(options.id);
+  });
+</script>
+
+<style lang="scss" scoped>
+  .log-box {
+    padding: 24rpx 24rpx 24rpx 40rpx;
+    background-color: #fff;
+  }
+</style>
diff --git a/pages/order/aftersale/return-delivery.vue b/pages/order/aftersale/return-delivery.vue
new file mode 100644
index 0000000..fa3ecec
--- /dev/null
+++ b/pages/order/aftersale/return-delivery.vue
@@ -0,0 +1,195 @@
+<template>
+	<s-layout title="退货物流">
+		<view>
+			<form @submit="subRefund" report-submit='true'>
+				<view class='apply-return'>
+					<view class='list borRadius14'>
+						<view class='item acea-row row-between-wrapper' style="display: flex;align-items: center;">
+							<view>物流公司</view>
+							<view v-if="state.expresses.length>0" style="flex:1">
+								<picker mode='selector' class='num' @change="bindPickerChange" :value="state.expressIndex"
+									:range="state.expresses" range-key="name">
+									<view class="picker acea-row row-between-wrapper" style="display: flex;justify-content: space-between;">
+										<view class='reason'>{{ state.expresses[state.expressIndex].name }}</view>
+										<text class='iconfont _icon-forward' />
+									</view>
+								</picker>
+							</view>
+						</view>
+						<view class='item textarea acea-row row-between' style="display: flex;align-items: center;">
+							<view>物流单号</view>
+							<input placeholder='请填写物流单号' class='num' name="logisticsNo"
+                     placeholder-class='placeholder' />
+						</view>
+						<button class='returnBnt bg-color ss-reset-button ui-BG-Main-Gradient sub-btn'
+							form-type="submit"
+							style="background: linear-gradient(90deg,var(--ui-BG-Main),var(--ui-BG-Main-gradient))!important">提交</button>
+					</view>
+				</view>
+			</form>
+		</view>
+	</s-layout>
+</template>
+
+<script setup>
+	import { onLoad } from '@dcloudio/uni-app';
+	import { reactive } from 'vue';
+  import sheep from '@/sheep';
+  import AfterSaleApi from '@/sheep/api/trade/afterSale';
+  import DeliveryApi from '@/sheep/api/trade/delivery';
+
+  const state = reactive({
+    id: 0, // 售后编号
+		expressIndex: 0, // 选中的 expresses 下标
+		expresses: [], // 可选的快递列表
+	})
+
+	function bindPickerChange(e) {
+		state.expressIndex = e.detail.value;
+	}
+
+	async function subRefund(e) {
+    let data = {
+      id: state.id,
+      logisticsId: state.expresses[state.expressIndex].id,
+      logisticsNo: e.detail.value.logisticsNo,
+    };
+    const { code } = await AfterSaleApi.deliveryAfterSale(data);
+    if (code !== 0) {
+      return;
+    }
+    uni.showToast({
+      title: '填写退货成功',
+    });
+    sheep.$router.go('/pages/order/aftersale/detail', { id: state.id });
+	}
+
+  // 获得快递物流列表
+	async function getExpressList() {
+    const { code, data } = await DeliveryApi.getDeliveryExpressList();
+    if (code !== 0) {
+      return;
+    }
+    state.expresses = data;
+	}
+
+	onLoad(options => {
+    if (!options.id) {
+      sheep.$helper.toast(`缺少订单信息，请检查`);
+      return
+    }
+    state.id = options.id;
+    // 获得快递物流列表
+    getExpressList();
+	})
+</script>
+<style lang="scss" scoped>
+	.apply-return {
+		padding: 20rpx 30rpx 70rpx 30rpx;
+	}
+
+	.apply-return .list {
+		background-color: #fff;
+		margin-top: 18rpx;
+		padding: 0 24rpx 70rpx 24rpx;
+	}
+
+	.apply-return .list .item {
+		min-height: 90rpx;
+		border-bottom: 1rpx solid #eee;
+		font-size: 30rpx;
+		color: #333;
+	}
+
+	.apply-return .list .item .num {
+		color: #282828;
+		margin-left: 27rpx;
+		// width: 227rpx;
+		// text-align: right;
+	}
+
+	.apply-return .list .item .num .picker .reason {
+		width: 385rpx;
+	}
+
+	.apply-return .list .item .num .picker .iconfont {
+		color: #666;
+		font-size: 30rpx;
+		margin-top: 2rpx;
+	}
+
+	.apply-return .list .item.textarea {
+		padding: 24rpx 0;
+	}
+
+	.apply-return .list .item textarea {
+		height: 100rpx;
+		font-size: 30rpx;
+	}
+
+	.apply-return .list .item .placeholder {
+		color: #bbb;
+	}
+
+	.apply-return .list .item .title {
+		height: 95rpx;
+		width: 100%;
+	}
+
+	.apply-return .list .item .title .tip {
+		font-size: 30rpx;
+		color: #bbb;
+	}
+
+	.apply-return .list .item .upload {
+		padding-bottom: 36rpx;
+	}
+
+	.apply-return .list .item .upload .pictrue {
+		border-radius: 14rpx;
+		margin: 22rpx 23rpx 0 0;
+		width: 156rpx;
+		height: 156rpx;
+		position: relative;
+		font-size: 24rpx;
+		color: #bbb;
+	}
+
+	.apply-return .list .item .upload .pictrue:nth-of-type(4n) {
+		margin-right: 0;
+	}
+
+	.apply-return .list .item .upload .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 14rpx;
+	}
+
+	.apply-return .list .item .upload .pictrue .icon-guanbi1 {
+		position: absolute;
+		font-size: 45rpx;
+		top: -10rpx;
+		right: -10rpx;
+	}
+
+	.apply-return .list .item .upload .pictrue .icon-icon25201 {
+		color: #bfbfbf;
+		font-size: 50rpx;
+	}
+
+	.apply-return .list .item .upload .pictrue:nth-last-child(1) {
+		border: 1rpx solid #ddd;
+		box-sizing: border-box;
+	}
+
+	.apply-return .returnBnt {
+		font-size: 32rpx;
+		color: #fff;
+		width: 100%;
+		height: 86rpx;
+		border-radius: 50rpx;
+		text-align: center;
+		line-height: 86rpx;
+		margin: 43rpx auto;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/blind/components/layout.vue b/pages/order/blind/components/layout.vue
new file mode 100644
index 0000000..3a0e444
--- /dev/null
+++ b/pages/order/blind/components/layout.vue
@@ -0,0 +1,182 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" :auto="false" use-virtual-list :force-close-inner-list="true" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @scroll="scroll" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<su-navbar :title="title" statusBar></su-navbar>
+				<tab-box :tabList="tabList" :currentValue="currentIndex" @change="tabChange"></tab-box>
+			</template>  
+			   
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<order-list @onCancel="onCancel" @onConfirm="onConfirm" @onOrderConfirm="onOrderConfirm" :virtualList="virtualList"></order-list>
+			
+		</z-paging>
+		
+	</view>
+</template>
+
+<script>
+	import TabBox from '@/pages/order/blind/components/tabBox.vue';
+	import OrderList from '@/pages/order/blind/components/orderList.vue';
+	import OrderApi from '@/sheep/api/trade/order';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import sheep from '@/sheep';
+	import {
+	  formatBlindOrderStatus,
+	  handleBlindOrderButtons,
+	  fen2yuan,
+	} from '@/sheep/hooks/useGoods';
+	export default {
+		components: {
+			TabBox, 
+			OrderList,
+		}, 
+		props: {
+			title: {
+				type: String,
+				default: '抢单中心',
+			},
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 0,
+				height: 0,
+				
+				tabList: [{
+					name: '全部',
+				}, {
+					name: '待抢单',
+					value: 10,
+				}, {
+					name: '服务中',
+					value: 20,
+				}, {
+					name: '已完成',
+					value: 30,
+				}],
+				
+				currentIndex: 0,
+			}
+		},
+		methods: {
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					status: this.tabList[this.currentIndex].value,
+					commentStatus: this.tabList[this.currentIndex].value === 30 ? false : null,
+				}
+				OrderApi.getBlindOrderPage(params).then(res => {
+					// 将请求的结果数组传递给z-paging
+					res.data.list.forEach((order) => handleBlindOrderButtons(order, sheep.$store('user').userInfo.id));
+					res.data.list.forEach((order) => formatBlindOrderStatus(order));
+					res.data.list.forEach((order) => order.brokeragePrice = fen2yuan(order.brokeragePrice));
+					this.$refs.paging.complete(res.data.list); 
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			tabChange(e) {
+				this.currentIndex = e;
+				this.$refs.paging.reload();
+			},
+			// 取消订单
+			async onCancel(orderId) {
+			  var that = this;
+			  uni.showModal({
+			    title: '提示',
+			    content: '确定要取消订单吗?',
+			    success: async function (res) {
+			      if (!res.confirm) {
+			        return;
+			      }
+			      const { code } = await OrderApi.cancelOrder(orderId);
+			      if (code === 0) {
+			        that.$refs.paging.reload();
+			      }
+			    },
+			  });
+			},
+			// 开始接单
+			async onOrderConfirm(order) {
+				var that = this;
+				uni.showModal({
+				    title: '是否确认抢单',
+				    content: '请确认符合老板要求',
+				    success: async function (res) {
+				      if (!res.confirm) {
+				        return;
+				      }
+				      // 正常的确认收货流程
+				      const { code } = await OrderApi.deliveryOrder(order.id);
+				      if (code === 0) {
+						that.tabChange(2);
+				      }
+				    },
+				});
+			},
+			// 确认收货
+			async onConfirm(order) {
+				// #ifdef MP
+				// 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
+				this.subscribeMessage();
+				// #endif
+				
+				var that = this;
+				uni.showModal({
+				  title: '确定要结束服务么？',
+				  content: '请确认经过老板同意',
+				  success: async function (res) {
+				    if (!res.confirm) {
+				      return;
+				    }
+					
+					// 正常的确认收货流程
+					const { code } = await OrderApi.receiveOrder(order.id);
+					if (code === 0) {
+					  that.$refs.paging.reload();
+					}
+				    
+				  },
+				});
+			  
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.CLERK_ORDER];
+			  event.push(WxaSubscribeTemplate.REWARD_SUCCESS);
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.CLERK_ORDER);
+			    uni.setStorageSync(WxaSubscribeTemplate.CLERK_ORDER, '已订阅');
+			  });
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
diff --git a/pages/order/blind/components/orderList.vue b/pages/order/blind/components/orderList.vue
new file mode 100644
index 0000000..5cc40ec
--- /dev/null
+++ b/pages/order/blind/components/orderList.vue
@@ -0,0 +1,248 @@
+<template>
+	  <view @click="onOrderDetail(order.id)"  :id="`zp-id-${order.zp_index}`" :key="order.zp_index" v-for="(order,index) in orderList" class="order-card">
+	  	<view class="no-box">
+			<view class="order-no">
+				<u-icon name="order"></u-icon>
+				<text class="number">{{ order.no }}</text>
+			</view>
+			<view class="status">{{order.statusStr}}</view>
+		</view> 
+		
+		<view class="main-box" v-for="item in order.items" :key="item.id">
+			<view>
+				<u-avatar size="100" :src="order.avatar"></u-avatar>
+			</view>
+			<view class="right-box">
+				<view class="nickname-box">
+					<view class="nickname">{{order.nickname}}</view>
+					<view class="info">订单时间：{{order.createTimeStr}}</view> 
+					<view class="info">服务内容：{{item.spuName}} {{item.properties.map((property) => property.valueName).join(' ')}}×{{item.count}}</view>
+					<view class="info" v-if="order.sex == '1'">性别要求：女生</view> 
+					<view class="info" v-if="order.sex == '0'">性别要求：男生</view>
+					<view class="info" v-if="userInfo.id == order.workerUserId">
+						<text class="weixin">微信：{{order.weixin}}</text>
+						<view @tap.stop="onCopy(order.weixin)">
+							<u-icon name="outline-copy" custom-prefix="iconfont"></u-icon>
+						</view>
+					</view>
+					<view class="info">
+						<text>剩余时间：</text>
+						<view v-if="order.receiveTime">
+							<text v-if="order.end">已结束</text>
+							<view v-else>
+								<u-count-down :timestamp="order.timestamp" format="DD天HH时mm分ss秒" @end="order.end = true"></u-count-down>
+							</view>
+						</view>
+						<text v-else>暂未接单</text>
+					</view>
+					<view class="info" v-if="order.userRemark">备注：{{order.userRemark}}</view>
+					<view class="info" v-if="order.cancelReason">取消原因：{{order.cancelReason}}</view>
+				</view>
+				<view class="price-box"> 
+					<text class="price">{{order.brokeragePrice}}</text>
+					<text>/钻</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="bottom-box">
+			<view class="btn-box">
+				<view v-if="order.buttons.includes('other')" class="btn">也被其它店员抢单</view>
+				<view v-if="order.buttons.includes('detail')" @tap.stop="onOrderDetail(order.id)" class="btn">查看详情</view>
+				<view v-if="order.buttons.includes('unpay')" @tap.stop="onOrderCancel(order.id, order.items[0].id)" class="btn">取消接单</view>
+				<view v-if="order.buttons.includes('cancel')" @tap.stop="onCancel(order.id)" class="btn">取消订单</view>
+				<view v-if="order.buttons.includes('invite')" @tap.stop="onBuy(order.items[0].spuId)" class="btn active">邀请好友抢单</view>
+				<view v-if="order.buttons.includes('invite2')" @tap.stop="onBuy(order.items[0].spuId)" class="btn active">邀请评价</view>
+				<view v-if="order.buttons.includes('agree')" @tap.stop="onOrderConfirm(order)" class="btn active">立即抢单</view>
+				<view v-if="order.buttons.includes('confirm')" @tap.stop="onConfirm(order)" class="btn active">结束服务</view>
+			</view>
+		</view>
+		
+	  </view>
+  
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import dayjs from 'dayjs';
+	export default {
+		components: {
+			
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		emits: ["onCancel", "onConfirm", "onOrderConfirm"],
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+			orderList() {
+				this.virtualList.forEach((order) => order.createTimeStr = sheep.$helper.timeFormat(order.createTime, 'yyyy-mm-dd hh:MM:ss'));
+				this.virtualList.forEach((order) => order.timestamp = order.receiveTime ? sheep.$helper.parseTimeData(order.receiveTime) : 0);
+				return this.virtualList;
+			},
+		},
+		methods: {
+			// 订单详情
+			onOrderDetail(id) { 
+			  sheep.$router.go('/pages/order/blind/detail', {
+			    id,
+			  });
+			},
+			onCancel(orderId) {
+			  this.$emit('onCancel', orderId);
+			},
+			onBuy(id) {
+			  sheep.$router.go('/pages/clerk/detail/index', {
+				id,
+			  });
+			},
+			// 评价
+			onComment(id) { 
+			  sheep.$router.go('/pages/goods/comment/worker/add', {
+			    id,
+			  });
+			},
+			// 继续支付
+			onPay(payOrderId) {
+			  sheep.$router.go('/pages/pay/worker/index', {
+			    id: payOrderId,
+			  });
+			},
+			onOrderCancel(orderId, itemId) {
+			  sheep.$router.go('/pages/order/worker/aftersale/apply', {
+				orderId: orderId,
+				itemId: itemId
+			  });
+			},
+			onOrderConfirm(order) {
+			  this.$emit('onOrderConfirm', order);
+			},
+			// 复制
+			onCopy(text) {
+			  sheep.$helper.copyText(text);
+			},
+			// 确认收货
+			onConfirm(order) {
+			  this.$emit('onConfirm', order);
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.order-card {
+		padding: 10px;
+		margin-top: 10px;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		
+		.no-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex: 1;
+			padding-bottom: 10px;
+			color: rgb(100, 101, 102);
+			
+			.order-no {
+				
+				.number {
+					margin-left: 5px;
+					font-size: 22rpx;
+				}
+			}
+			
+			.status {
+				font-size: 22rpx;
+			}
+		}
+		
+		.main-box {
+			display: flex;
+			padding: 10px 0;
+			border-top: 1px solid #fbf0f0;
+			border-bottom: 1px solid #fbf0f0;
+			margin-bottom: 10px;
+			
+			.right-box {
+				display: flex;
+				justify-content: space-between;
+				flex: 1;
+				align-items: center;
+				margin-left: 10px;
+				
+				.nickname {
+					font-size: 12px;
+					font-weight: bold;
+					margin-bottom: 10px;
+				}
+				
+				.info {
+					font-size: 22rpx;
+					color: rgb(100, 101, 102);
+					line-height: 22rpx;
+					margin-bottom: 5px;
+					display: flex;
+					align-items: center;
+					
+					.weixin {
+						margin-right: 5px;
+					}
+				}
+				
+				.price-box {
+					font-size: 22rpx;
+					color: rgb(100, 101, 102);
+					
+					.price {
+						font-size: 34rpx;
+						font-weight: bold;
+						color: var(--ui-BG-Main);
+					}
+				}
+			}
+		}
+		
+		.bottom-box {
+			display: flex;
+			justify-content: flex-end;
+			
+			.btn-box {
+				display: flex;
+				align-items: center;
+			}
+			
+			.btn {
+				background-color: #ddd;
+				color: rgb(100, 101, 102);
+				font-size: 22rpx;
+				border-radius: 40px;
+				padding: 5px 10px;
+				margin-left: 10px;
+				min-width: 140rpx;
+				display: flex;
+				justify-content: center;
+			}
+			
+			.active {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/blind/components/tabBox.vue b/pages/order/blind/components/tabBox.vue
new file mode 100644
index 0000000..db9711d
--- /dev/null
+++ b/pages/order/blind/components/tabBox.vue
@@ -0,0 +1,47 @@
+<template>
+	<view>
+		<u-tabs :list="tabList" bg-color="#fff" font-size="28" active-color="var(--ui-BG-Main)" :is-scroll="false" v-model="current" @change="change"></u-tabs>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			currentValue: 0,
+			tabList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			current: {
+				get() {
+				    return this.currentValue;
+				},
+				set(newValue) {
+					
+				}
+			},
+		},
+		methods: {
+			change(index) {
+				this.$emit('change', index);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tab-box {
+		background-color: #fff;
+		padding: 5px 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/blind/confirm.vue b/pages/order/blind/confirm.vue
new file mode 100644
index 0000000..92e7541
--- /dev/null
+++ b/pages/order/blind/confirm.vue
@@ -0,0 +1,435 @@
+<template>
+  <s-layout title="确认订单">
+    <!-- 商品信息 -->
+    <view class="order-card-box ss-m-b-14">
+      <s-goods-item
+        v-for="item in state.orderInfo.items"
+        :key="item.skuId"
+        :img="item.picUrl"
+        :title="item.spuName"
+        :skuText="item.properties.map((property) => property.valueName).join(' ')"
+        :price="item.price"
+        :num="item.count"
+        marginBottom="10"
+      />
+      <view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
+        <view class="item-title">订单备注</view>
+        <view class="ss-flex ss-col-center">
+          <uni-easyinput
+            maxlength="20"
+            placeholder="请输入备注内容"
+            v-model="state.orderPayload.remark"
+            :inputBorder="false"
+            :clearable="false"
+          />
+        </view>
+      </view>
+    </view>
+
+    <!-- 价格信息 -->
+    <view class="bg-white total-card-box ss-p-20 ss-m-b-14 ss-r-10">
+      <view class="total-box-content border-bottom">
+        <view class="order-item ss-flex ss-col-center ss-row-between">
+          <view class="item-title">技能金额</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value ss-m-r-24">
+              ￥{{ fen2yuan(state.orderInfo.price.totalPrice) }}
+            </text>
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.type === 6"
+        >
+          <view class="item-title">积分抵扣</view>
+          <view class="ss-flex ss-col-center">
+            {{ state.pointStatus ? '剩余积分' : '当前积分' }}
+            <image
+              :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+              class="score-img"
+            />
+            <text class="item-value ss-m-r-24">
+              {{ state.pointStatus ? state.orderInfo.totalPoint - state.orderInfo.usePoint : (state.orderInfo.totalPoint || 0) }}
+            </text>
+            <checkbox-group @change="changeIntegral">
+              <checkbox :checked='state.pointStatus' :disabled="!state.orderInfo.totalPoint || state.orderInfo.totalPoint <= 0" />
+            </checkbox-group>
+          </view>
+        </view>
+        <view v-if="isPass" class="order-item ss-flex ss-col-center ss-row-between">
+          <view class="item-title">TA添加你的微信号</view>
+          <view class="ss-flex ss-col-center">
+            <uni-easyinput
+              maxlength="20"
+              placeholder="输入正确微信号"
+              v-model="state.orderInfo.weixin"
+              :inputBorder="false"
+              :clearable="false"
+            />
+          </view>
+        </view>
+        <!-- 优惠劵：只有 type = 0 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.type === 6"
+        >
+          <view class="item-title">优惠券</view>
+          <view class="ss-flex ss-col-center" @tap="state.showCoupon = true">
+            <text class="item-value text-red" v-if="state.orderPayload.couponId > 0">
+              -￥{{ fen2yuan(state.orderInfo.price.couponPrice) }}
+            </text>
+            <text
+              class="item-value"
+              :class="state.couponInfo.length > 0 ? 'text-red' : 'text-disabled'"
+              v-else
+            >
+              {{
+                state.couponInfo.length > 0 ? state.couponInfo.length + ' 张可用' : '暂无可用优惠券'
+              }}
+            </text>
+            <text class="_icon-forward item-icon" />
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.discountPrice > 0"
+        >
+          <view class="item-title">活动优惠</view>
+          <view class="ss-flex ss-col-center">
+            <!--                @tap="state.showDiscount = true" TODO puhui999：【折扣】后续要把优惠信息打进去 -->
+            <text class="item-value text-red">
+              -￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
+            </text>
+            <text class="_icon-forward item-icon" />
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.vipPrice > 0"
+        >
+          <view class="item-title">会员优惠</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value text-red">
+              -￥{{ fen2yuan(state.orderInfo.price.vipPrice) }}
+            </text>
+          </view>
+        </view>
+      </view>
+      <view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
+        <view class="total-num ss-m-r-20">
+          共{{ state.orderInfo.items.reduce((acc, item) => acc + item.count, 0) }}件
+        </view>
+        <view>合计：</view>
+        <view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}</view>
+      </view>
+    </view>
+
+    <!-- 选择优惠券弹框 -->
+    <s-coupon-select
+      v-model="state.couponInfo"
+      :show="state.showCoupon"
+      @confirm="onSelectCoupon"
+      @close="state.showCoupon = false"
+    />
+
+    <!-- 满额折扣弹框 TODO @puhui999：【折扣】后续要把优惠信息打进去 -->
+    <s-discount-list
+      v-model="state.orderInfo"
+      :show="state.showDiscount"
+      @close="state.showDiscount = false"
+    />
+
+    <!-- 底部 -->
+    <su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
+      <view class="footer-box border-top ss-flex ss-row-between ss-p-x-20 ss-col-center">
+        <view class="total-box-footer ss-flex ss-col-center">
+          <view class="total-num ss-font-30 text-red">
+            ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}
+          </view>
+        </view>
+        <button
+          class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main"
+          @tap="onConfirm"
+        >
+          提交订单
+        </button>
+      </view>
+    </su-fixed>
+	
+	<qrcode-modal />
+  </s-layout>
+</template>
+
+<script setup>
+  import { reactive, ref, watch, computed } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import AddressSelection from '@/pages/order/addressSelection.vue';
+  import qrcodeModal from '@/components/qrcode-modal/qrcode-modal.vue';
+  import sheep from '@/sheep';
+  import OrderApi from '@/sheep/api/trade/order';
+  import CouponApi from '@/sheep/api/promotion/coupon';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  
+  const isPass = computed(() => {
+      return sheep.$store('user').tradeConfig.weixinEnabled;
+  });
+
+  const state = reactive({
+    orderPayload: {},
+    orderInfo: {
+      items: [], // 商品项列表
+      price: {}, // 价格信息
+    },
+    showCoupon: false, // 是否展示优惠劵
+    couponInfo: [], // 优惠劵列表
+    showDiscount: false, // 是否展示营销活动
+    // ========== 积分 ==========
+    pointStatus: false, //是否使用积分
+  });
+
+  const addressState = ref({
+    addressInfo: {}, // 选择的收货地址
+    deliveryType: 1, // 收货方式：1-快递配送，2-门店自提
+    isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
+    pickUpInfo: {}, // 选择的自提门店信息
+    weixin: '', // 收件人名称
+    receiverMobile: '', // 收件人手机
+  });
+
+  // ========== 积分 ==========
+  /**
+   * 使用积分抵扣
+   */
+  const changeIntegral = async () => {
+    state.pointStatus = !state.pointStatus;
+    await getOrderInfo();
+  };
+
+  // 选择优惠券
+  async function onSelectCoupon(couponId) {
+    state.orderPayload.couponId = couponId;
+    await getOrderInfo();
+    state.showCoupon = false;
+  }
+
+  // 提交订单
+  function onConfirm() {
+    if (isPass && !state.orderInfo.weixin) {
+      sheep.$helper.toast('请填写正确的微信号');
+      return;
+    }
+    submitOrder();
+  }
+
+  // 创建订单&跳转
+  async function submitOrder() {
+    const { code, data } = await OrderApi.createWorkerOrder({
+      items: state.orderPayload.items,
+      couponId: state.orderPayload.couponId,
+      remark: state.orderPayload.remark,
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
+      weixin: state.orderInfo.weixin,// 微信名称
+      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pointStatus: state.pointStatus,
+      combinationActivityId: state.orderPayload.combinationActivityId,
+      combinationHeadId: state.orderPayload.combinationHeadId,
+      seckillActivityId: state.orderPayload.seckillActivityId,
+	  workerClerkLevelId: state.orderPayload.workerClerkLevelId,
+	  sex: state.orderPayload.sex,
+	  blind: state.orderPayload.blind,
+    });
+    if (code !== 0) {
+      return;
+    }
+    // 更新购物车列表，如果来自购物车
+    if (state.orderPayload.items[0].cartId > 0) {
+      sheep.$store('cart').getList();
+    }
+
+    // 跳转到支付页面
+    sheep.$router.redirect('/pages/pay/worker/index', {
+      id: data.payOrderId,
+    });
+  }
+
+  // 检查库存 & 计算订单价格
+  async function getOrderInfo() {
+    // 计算价格
+    const { data, code } = await OrderApi.clerkOrder({
+      items: state.orderPayload.items,
+      couponId: state.orderPayload.couponId,
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
+      weixin: state.orderInfo.weixin,// 微信名称
+      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pointStatus: state.pointStatus,
+      combinationActivityId: state.orderPayload.combinationActivityId,
+      combinationHeadId: state.orderPayload.combinationHeadId,
+      seckillActivityId: state.orderPayload.seckillActivityId,
+	  workerClerkLevelId: state.orderPayload.workerClerkLevelId,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.orderInfo = data;
+    // 设置收货地址
+    if (state.orderInfo.address) {
+      addressState.value.addressInfo = state.orderInfo.address;
+    }
+  }
+
+  // 获取可用优惠券
+  async function getCoupons() {
+    const { code, data } = await CouponApi.getMatchCouponList(
+      state.orderInfo.price.payPrice,
+      state.orderInfo.items.map((item) => item.spuId),
+      state.orderPayload.items.map((item) => item.skuId),
+      state.orderPayload.items.map((item) => item.categoryId),
+    );
+    if (code === 0) {
+      state.couponInfo = data;
+    }
+  }
+
+  onLoad(async (options) => {
+    if (!options.data) {
+      sheep.$helper.toast('参数不正确，请检查！');
+      return;
+    }
+    state.orderPayload = JSON.parse(options.data);
+    await getOrderInfo();
+    await getCoupons();
+  });
+
+  // 使用 watch 监听地址和配送方式的变化
+  watch(addressState, async (newAddress, oldAddress) => {
+    // 如果收货地址或配送方式有变化，则重新计算价格
+    if (newAddress.addressInfo.id !== oldAddress.addressInfo.id || newAddress.deliveryType !== oldAddress.deliveryType) {
+      await getOrderInfo();
+    }
+  });
+</script>
+
+<style lang="scss" scoped>
+  :deep() {
+    .uni-input-wrapper {
+      width: 320rpx;
+    }
+
+    .uni-easyinput__content-input {
+      font-size: 28rpx;
+      height: 72rpx;
+      text-align: right !important;
+      padding-right: 0 !important;
+
+      .uni-input-input {
+        font-weight: 500;
+        color: #333333;
+        font-size: 26rpx;
+        height: 32rpx;
+        margin-top: 4rpx;
+      }
+    }
+
+    .uni-easyinput__content {
+      display: flex !important;
+      align-items: center !important;
+      justify-content: right !important;
+    }
+  }
+
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .order-item {
+    height: 80rpx;
+
+    .item-title {
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+
+    .item-value {
+      font-size: 28rpx;
+      font-weight: 500;
+      font-family: OPPOSANS;
+    }
+
+    .text-disabled {
+      color: #bbbbbb;
+    }
+
+    .item-icon {
+      color: $dark-9;
+    }
+
+    .remark-input {
+      text-align: right;
+    }
+
+    .item-placeholder {
+      color: $dark-9;
+      font-size: 26rpx;
+      text-align: right;
+    }
+  }
+
+  .total-box-footer {
+    height: 90rpx;
+
+    .total-num {
+      color: #333333;
+      font-family: OPPOSANS;
+    }
+  }
+
+  .footer-box {
+    height: 100rpx;
+
+    .submit-btn {
+      width: 240rpx;
+      height: 70rpx;
+      font-size: 28rpx;
+      font-weight: 500;
+
+      .goto-pay-text {
+        line-height: 28rpx;
+      }
+    }
+
+    .cancel-btn {
+      width: 240rpx;
+      height: 80rpx;
+      font-size: 26rpx;
+      background-color: #e5e5e5;
+      color: $dark-9;
+    }
+  }
+
+  .title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333333;
+  }
+
+  .subtitle {
+    font-size: 28rpx;
+    color: #999999;
+  }
+
+  .cicon-checkbox {
+    font-size: 36rpx;
+    color: var(--ui-BG-Main);
+  }
+
+  .cicon-box {
+    font-size: 36rpx;
+    color: #999999;
+  }
+</style>
diff --git a/pages/order/blind/detail.vue b/pages/order/blind/detail.vue
new file mode 100644
index 0000000..3368079
--- /dev/null
+++ b/pages/order/blind/detail.vue
@@ -0,0 +1,599 @@
+<!-- 订单详情 -->
+<template>
+  <s-layout title="订单详情" class="index-wrap" navbar="inner">
+    <!-- 订单状态 TODO -->
+    <view
+      class="state-box ss-flex-col ss-col-center ss-row-right"
+      :style="[
+        {
+          marginTop: '-' + Number(statusBarHeight + 88 + 22) + 'rpx',
+          paddingTop: Number(statusBarHeight + 88 + 22) + 'rpx',
+        },
+      ]"
+    >
+      <view class="ss-flex ss-m-t-32 ss-m-b-20">
+        <image
+          v-if="
+            state.orderInfo.status_code == 'unpaid' ||
+            state.orderInfo.status === 10 || // 待发货
+            state.orderInfo.status_code == 'nocomment'
+          "
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_loading.png')"
+        >
+        </image>
+        <image
+          v-if="
+            state.orderInfo.status_code == 'completed' ||
+            state.orderInfo.status_code == 'refund_agree'
+          "
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_success.png')"
+        >
+        </image>
+        <image
+          v-if="state.orderInfo.status_code == 'cancel' || state.orderInfo.status_code == 'closed'"
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_close.png')"
+        >
+        </image>
+        <image
+          v-if="state.orderInfo.status_code == 'noget'"
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_express.png')"
+        >
+        </image>
+        <view class="ss-font-30">{{ formatBlindOrderStatus(state.orderInfo) }}</view>
+      </view>
+      <view class="ss-font-26 ss-m-x-20 ss-m-b-70">
+        {{ formatBlindOrderStatusDescription(state.orderInfo) }}
+      </view>
+    </view>
+
+    <!-- 收货地址 -->
+    <view class="order-address-box" v-if="state.orderInfo.receiverAreaId > 0">
+      <view class="ss-flex ss-col-center">
+        <text class="address-username">
+          {{ state.orderInfo.receiverName }}
+        </text>
+        <text class="address-phone">{{ state.orderInfo.receiverMobile }}</text>
+      </view>
+      <view class="address-detail">
+        {{ state.orderInfo.receiverAreaName }} {{ state.orderInfo.receiverDetailAddress }}
+      </view>
+    </view>
+
+    <view
+      class="detail-goods"
+      :style="[{ marginTop: state.orderInfo.receiverAreaId > 0 ? '0' : '-40rpx' }]"
+    >
+      <!-- 订单信 -->
+      <view class="order-list" v-for="item in state.orderInfo.items" :key="item.goods_id">
+        <view class="order-card">
+          <s-goods-item
+            @tap="onGoodsDetail(item.spuId)"
+            :img="item.picUrl"
+            :title="item.spuName"
+            :skuText="item.properties.map((property) => property.valueName).join(' ')"
+            :price="item.price"
+            :num="item.count"
+          >
+            <template #tool>
+              <view class="ss-flex">
+				<button
+				  class="ss-reset-button apply-btn" 
+				  v-if="[10].includes(state.orderInfo.status) && item.afterSaleStatus === 0"
+				  @tap.stop="
+				    sheep.$router.go('/pages/order/blind/list', {
+				      type: 1,
+				    })
+				  "
+				>
+				  立即抢单
+				</button>
+                <button
+                  class="ss-reset-button apply-btn"
+                  v-if="[20].includes(state.orderInfo.status) && item.afterSaleStatus === 0 && state.orderInfo.workerUserId == sheep.$store('user').userInfo.id"
+                  @tap.stop="
+                    sheep.$router.go('/pages/order/worker/aftersale/apply', {
+                      orderId: state.orderInfo.id,
+                      itemId: item.id,
+                    })
+                  "
+                >
+                  取消接单
+                </button>
+              </view>
+            </template>
+            <template #priceSuffix>
+              <button class="ss-reset-button tag-btn" v-if="item.status_text">
+                {{ item.status_text }}
+              </button>
+            </template>
+          </s-goods-item>
+        </view>
+      </view>
+    </view>
+
+    <!--  自提核销  -->
+    <PickUpVerify :order-info="state.orderInfo" :systemStore="systemStore" ref="pickUpVerifyRef"></PickUpVerify>
+
+    <!-- 订单信息 -->
+    <view class="notice-box">
+      <view class="notice-box__content">
+        <view class="notice-item--center">
+          <view class="ss-flex ss-flex-1">
+            <text class="title">订单编号：</text>
+            <text class="detail">{{ state.orderInfo.no }}</text>
+          </view>
+          <button class="ss-reset-button copy-btn" @tap="onCopy">复制</button>
+        </view>
+        <view class="notice-item">
+          <text class="title">下单时间：</text>
+          <text class="detail">
+            {{ sheep.$helper.timeFormat(state.orderInfo.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </text>
+        </view>
+        <view class="notice-item" v-if="state.orderInfo.payTime">
+          <text class="title">支付时间：</text>
+          <text class="detail">
+            {{ sheep.$helper.timeFormat(state.orderInfo.payTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </text>
+        </view>
+        <view class="notice-item">
+          <text class="title">支付方式：</text>
+          <text class="detail">{{ state.orderInfo.payChannelName || '-' }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 价格信息 -->
+    <view class="order-price-box">
+      <view class="notice-item ss-flex ss-row-between">
+        <text class="title">订单总额</text>
+        <view class="ss-flex">
+          <text class="detail">￥{{ fen2yuan(state.orderInfo.totalPrice) }}</text>
+        </view>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.couponPrice > 0">
+        <text class="title">优惠劵金额</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.couponPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.pointPrice > 0">
+        <text class="title">积分抵扣</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.pointPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.discountPrice > 0">
+        <text class="title">活动优惠</text>
+        <text class="detail">¥{{ fen2yuan(state.orderInfo.discountPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.vipPrice > 0">
+        <text class="title">会员优惠</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.vipPrice) }}</text>
+      </view>
+	  <view class="notice-item ss-flex ss-row-between">
+	    <text class="title">用户付款</text>
+	    <text class="detail">￥{{ fen2yuan(state.orderInfo.payPrice) }}</text>
+	  </view>
+	  <view class="notice-item ss-flex ss-row-between">
+	    <text class="title">佣金比例</text>
+	    <text class="detail">{{state.orderInfo.brokeragePercent}}%</text>
+	  </view>
+      <view class="notice-item all-rpice-item ss-flex ss-m-t-20"> 
+        <text class="title">{{ state.orderInfo.status == '30' ? '结算佣金' : '可得佣金' }}</text>
+        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.brokeragePrice) }}</text>
+      </view>
+      <view
+        class="notice-item all-rpice-item ss-flex ss-m-t-20"
+        v-if="state.orderInfo.refundPrice > 0"
+      >
+        <text class="title">已退款</text>
+        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.refundPrice) }}</text>
+      </view>
+    </view>
+
+   
+  </s-layout>
+</template>
+ 
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive, ref } from 'vue';
+  import { isEmpty } from 'lodash-es';
+  import {
+    fen2yuan,
+    formatBlindOrderStatus,
+    formatBlindOrderStatusDescription,
+    handleOrderButtons,
+  } from '@/sheep/hooks/useGoods';
+  import OrderApi from '@/sheep/api/trade/order';
+  import DeliveryApi from '@/sheep/api/trade/delivery';
+  import PickUpVerify from '@/pages/order/pickUpVerify.vue';
+
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
+
+  const state = reactive({
+    orderInfo: {},
+    merchantTradeNo: '', // 商户订单号
+    comeinType: '', // 进入订单详情的来源类型
+  });
+
+  // ========== 门店自提（核销） ==========
+  const systemStore = ref({}); // 门店信息
+
+  // 复制
+  const onCopy = () => {
+    sheep.$helper.copyText(state.orderInfo.no);
+  };
+
+  // 去支付
+  function onPay(payOrderId) {
+    sheep.$router.go('/pages/pay/index', {
+      id: payOrderId,
+    });
+  }
+
+  // 查看商品
+  function onGoodsDetail(id) {
+	if(id) {
+		sheep.$router.go('/pages/clerk/detail/index', {
+		  id,
+		});
+	}
+  }
+
+  // 取消订单
+  async function onCancel(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消订单吗?',
+      success: async function(res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await OrderApi.cancelOrder(orderId);
+        if (code === 0) {
+          await getOrderDetail(orderId);
+        }
+      },
+    });
+  }
+
+  // 查看物流
+  async function onExpress(id) {
+    sheep.$router.go('/pages/order/express/log', {
+      id,
+    });
+  }
+
+  // 确认收货
+  async function onConfirm(orderId, ignore = false) {
+    // 需开启确认收货组件
+    // todo: 芋艿：待接入微信
+    // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+    // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+    let isOpenBusinessView = true;
+    if (
+      sheep.$platform.name === 'WechatMiniProgram' &&
+      !isEmpty(state.orderInfo.wechat_extra_data) &&
+      isOpenBusinessView &&
+      !ignore
+    ) {
+      mpConfirm(orderId);
+      return;
+    }
+
+    // 正常的确认收货流程
+    const { code } = await OrderApi.receiveOrder(orderId);
+    if (code === 0) {
+      await getOrderDetail(orderId);
+    }
+  }
+
+  // #ifdef MP-WEIXIN
+  // 小程序确认收货组件
+  function mpConfirm(orderId) {
+    if (!wx.openBusinessView) {
+      sheep.$helper.toast(`请升级微信版本`);
+      return;
+    }
+    wx.openBusinessView({
+      businessType: 'weappOrderConfirm',
+      extraData: {
+        merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
+        transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
+      },
+      success(response) {
+        console.log('success:', response);
+        if (response.errMsg === 'openBusinessView:ok') {
+          if (response.extraData.status === 'success') {
+            onConfirm(orderId, true);
+          }
+        }
+      },
+      fail(error) {
+        console.log('error:', error);
+      },
+      complete(result) {
+        console.log('result:', result);
+      },
+    });
+  }
+
+  // #endif
+
+  // 评价
+  function onComment(id) {
+    sheep.$router.go('/pages/goods/comment/add', {
+      id,
+    });
+  }
+
+  const pickUpVerifyRef = ref();
+
+  async function getOrderDetail(id) {
+    // 对详情数据进行适配
+    let res;
+    if (state.comeinType === 'wechat') {
+      // TODO 芋艿：微信场景下
+      res = await OrderApi.getOrder(id, {
+        merchant_trade_no: state.merchantTradeNo,
+      });
+    } else {
+      res = await OrderApi.getOrder(id);
+    }
+    if (res.code === 0) {
+      state.orderInfo = res.data;
+      handleOrderButtons(state.orderInfo);
+      // 配送方式：门店自提
+      if (res.data.pickUpStoreId) {
+        const { data } = await DeliveryApi.getDeliveryPickUpStore(res.data.pickUpStoreId);
+        systemStore.value = data || {};
+      }
+      if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
+        pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
+      }
+    } else {
+      sheep.$router.back();
+    }
+  }
+
+  onLoad(async (options) => {
+    let id = 0;
+    if (options.id) {
+      id = options.id;
+    }
+    // TODO 芋艿：下面两个变量，后续接入
+    state.comeinType = options.comein_type;
+    if (state.comeinType === 'wechat') {
+      state.merchantTradeNo = options.merchant_trade_no;
+    }
+    await getOrderDetail(id);
+  });
+</script>
+
+<style lang="scss" scoped>
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .apply-btn {
+    width: 140rpx;
+    height: 50rpx;
+    border-radius: 25rpx;
+    font-size: 24rpx;
+    border: 2rpx solid #dcdcdc;
+    line-height: normal;
+    margin-left: 16rpx;
+  }
+
+  .state-box {
+    color: rgba(#fff, 0.9);
+    width: 100%;
+    background: v-bind(headerBg) no-repeat,
+    linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    background-size: 750rpx 100%;
+    box-sizing: border-box;
+
+    .state-img {
+      width: 60rpx;
+      height: 60rpx;
+      margin-right: 20rpx;
+    }
+  }
+
+  .order-address-box {
+    background-color: #fff;
+    border-radius: 10rpx;
+    margin: -50rpx 20rpx 16rpx 20rpx;
+    padding: 44rpx 34rpx 42rpx 20rpx;
+    font-size: 30rpx;
+    box-sizing: border-box;
+    font-weight: 500;
+    color: rgba(51, 51, 51, 1);
+
+    .address-username {
+      margin-right: 20rpx;
+    }
+
+    .address-detail {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: rgba(153, 153, 153, 1);
+      margin-top: 20rpx;
+    }
+  }
+
+  .detail-goods {
+    border-radius: 10rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .order-list {
+      margin-bottom: 20rpx;
+      background-color: #fff;
+
+      .order-card {
+        padding: 20rpx 0;
+
+        .order-sku {
+          font-size: 24rpx;
+
+          font-weight: 400;
+          color: rgba(153, 153, 153, 1);
+          width: 450rpx;
+          margin-bottom: 20rpx;
+
+          .order-num {
+            margin-right: 10rpx;
+          }
+        }
+
+        .tag-btn {
+          margin-left: 16rpx;
+          font-size: 24rpx;
+          height: 36rpx;
+          color: var(--ui-BG-Main);
+          border: 2rpx solid var(--ui-BG-Main);
+          border-radius: 14rpx;
+          padding: 0 4rpx;
+        }
+      }
+    }
+  }
+
+  // 订单信息。
+  .notice-box {
+    background: #fff;
+    border-radius: 10rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .notice-box__head {
+      font-size: 30rpx;
+
+      font-weight: 500;
+      color: rgba(51, 51, 51, 1);
+      line-height: 80rpx;
+      border-bottom: 1rpx solid #dfdfdf;
+      padding: 0 25rpx;
+    }
+
+    .notice-box__content {
+      padding: 20rpx;
+
+      .self-pickup-box {
+        width: 100%;
+
+        .self-pickup--img {
+          width: 200rpx;
+          height: 200rpx;
+          margin: 40rpx 0;
+        }
+      }
+    }
+
+    .notice-item,
+    .notice-item--center {
+      display: flex;
+      align-items: center;
+      line-height: normal;
+      margin-bottom: 24rpx;
+
+      .title {
+        font-size: 28rpx;
+        color: #999;
+      }
+
+      .detail {
+        font-size: 28rpx;
+        color: #333;
+        flex: 1;
+      }
+    }
+  }
+
+  .copy-btn {
+    width: 100rpx;
+    line-height: 50rpx;
+    border-radius: 25rpx;
+    padding: 0;
+    background: rgba(238, 238, 238, 1);
+    font-size: 22rpx;
+    font-weight: 400;
+    color: rgba(51, 51, 51, 1);
+  }
+
+  // 订单价格信息
+  .order-price-box {
+    background-color: #fff;
+    border-radius: 10rpx;
+    padding: 20rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .notice-item {
+      line-height: 70rpx;
+
+      .title {
+        font-size: 28rpx;
+        color: #999;
+      }
+
+      .detail {
+        font-size: 28rpx;
+        color: #333;
+        font-family: OPPOSANS;
+      }
+    }
+
+    .all-rpice-item {
+      justify-content: flex-end;
+      align-items: center;
+
+      .title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+        line-height: normal;
+      }
+
+      .all-price {
+        font-size: 26rpx;
+        font-family: OPPOSANS;
+        line-height: normal;
+        color: $red;
+      }
+    }
+  }
+
+  // 底部
+  .footer-box {
+    height: 100rpx;
+    width: 100%;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    padding-right: 20rpx;
+
+    .cancel-btn {
+      width: 160rpx;
+      height: 60rpx;
+      background: #eeeeee;
+      border-radius: 30rpx;
+      margin-right: 20rpx;
+      font-size: 26rpx;
+      font-weight: 400;
+      color: #333333;
+    }
+
+    .pay-btn {
+      width: 160rpx;
+      height: 60rpx;
+      font-size: 26rpx;
+      border-radius: 30rpx;
+      font-weight: 500;
+      color: #fff;
+    }
+  }
+</style>
diff --git a/pages/order/blind/list.vue b/pages/order/blind/list.vue
new file mode 100644
index 0000000..03a1146
--- /dev/null
+++ b/pages/order/blind/list.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<layout ref="order"></layout>
+		
+		<s-menu-tools />
+		<s-auth-modal />
+	</view>
+</template>
+
+<script>
+	import layout from '@/pages/order/blind/components/layout.vue';
+	export default { 
+		components: {
+			layout,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				currentIndex: 0,
+			}
+		},
+		onLoad(options) {
+		  if (options.type) {
+		    this.currentIndex = options.type;
+		  }
+		  this.$nextTick(() => {
+		  	this.$refs.order.tabChange(this.currentIndex);
+		  });
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fafafa;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
new file mode 100644
index 0000000..b18df4f
--- /dev/null
+++ b/pages/order/confirm.vue
@@ -0,0 +1,468 @@
+<template>
+  <s-layout title="确认订单">
+    <!-- 头部地址选择【配送地址】【自提地址】 -->
+    <AddressSelection v-model="addressState" />
+
+    <!-- 商品信息 -->
+    <view class="order-card-box ss-m-b-14">
+      <s-goods-item
+        v-for="item in state.orderInfo.items"
+        :key="item.skuId"
+        :img="item.picUrl"
+        :title="item.spuName"
+        :skuText="item.properties.map((property) => property.valueName).join(' ')"
+        :price="item.price"
+        :num="item.count"
+        marginBottom="10"
+      />
+      <view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
+        <view class="item-title">订单备注</view>
+        <view class="ss-flex ss-col-center">
+          <uni-easyinput
+            maxlength="20"
+            placeholder="建议留言前先与商家沟通"
+            v-model="state.orderPayload.remark"
+            :inputBorder="false"
+            :clearable="false"
+          />
+        </view>
+      </view>
+    </view>
+
+    <!-- 价格信息 -->
+    <view class="bg-white total-card-box ss-p-20 ss-m-b-14 ss-r-10">
+      <view class="total-box-content border-bottom">
+        <view class="order-item ss-flex ss-col-center ss-row-between">
+          <view class="item-title">商品金额</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value ss-m-r-24">
+              ￥{{ fen2yuan(state.orderInfo.price.totalPrice) }}
+            </text>
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.type === 0"
+        >
+          <view class="item-title">积分抵扣</view>
+          <view class="ss-flex ss-col-center">
+            {{ state.pointStatus ? '剩余积分' : '当前积分' }}
+            <image
+              :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+              class="score-img"
+            />
+            <text class="item-value ss-m-r-24">
+              {{ state.pointStatus ? state.orderInfo.totalPoint - state.orderInfo.usePoint : (state.orderInfo.totalPoint || 0) }}
+            </text>
+            <checkbox-group @change="changeIntegral">
+              <checkbox :checked='state.pointStatus' :disabled="!state.orderInfo.totalPoint || state.orderInfo.totalPoint <= 0" />
+            </checkbox-group>
+          </view>
+        </view>
+        <!-- 快递配置时，信息的展示 -->
+        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 1'>
+          <view class="item-title">运费</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value ss-m-r-24" v-if="state.orderInfo.price.deliveryPrice > 0">
+              +￥{{ fen2yuan(state.orderInfo.price.deliveryPrice) }}
+            </text>
+            <view class='item-value ss-m-r-24' v-else>免运费</view>
+          </view>
+        </view>
+        <!-- 门店自提时，需要填写姓名和手机号 -->
+        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 2'>
+          <view class="item-title">联系人</view>
+          <view class="ss-flex ss-col-center">
+            <uni-easyinput
+              maxlength="20"
+              placeholder="请填写您的联系姓名"
+              v-model="addressState.receiverName"
+              :inputBorder="false"
+              :clearable="false"
+            />
+          </view>
+        </view>
+        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 2'>
+          <view class="item-title">联系电话</view>
+          <view class="ss-flex ss-col-center">
+            <uni-easyinput
+              maxlength="20"
+              placeholder="请填写您的联系电话"
+              v-model="addressState.receiverMobile"
+              :inputBorder="false"
+              :clearable="false"
+            />
+          </view>
+        </view>
+        <!-- 优惠劵：只有 type = 0 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.type === 0"
+        >
+          <view class="item-title">优惠券</view>
+          <view class="ss-flex ss-col-center" @tap="state.showCoupon = true">
+            <text class="item-value text-red" v-if="state.orderPayload.couponId > 0">
+              -￥{{ fen2yuan(state.orderInfo.price.couponPrice) }}
+            </text>
+            <text
+              class="item-value"
+              :class="state.couponInfo.length > 0 ? 'text-red' : 'text-disabled'"
+              v-else
+            >
+              {{
+                state.couponInfo.length > 0 ? state.couponInfo.length + ' 张可用' : '暂无可用优惠券'
+              }}
+            </text>
+            <text class="_icon-forward item-icon" />
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.discountPrice > 0"
+        >
+          <view class="item-title">活动优惠</view>
+          <view class="ss-flex ss-col-center">
+            <!--                @tap="state.showDiscount = true" TODO puhui999：【折扣】后续要把优惠信息打进去 -->
+            <text class="item-value text-red">
+              -￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
+            </text>
+            <text class="_icon-forward item-icon" />
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.vipPrice > 0"
+        >
+          <view class="item-title">会员优惠</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value text-red">
+              -￥{{ fen2yuan(state.orderInfo.price.vipPrice) }}
+            </text>
+          </view>
+        </view>
+      </view>
+      <view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
+        <view class="total-num ss-m-r-20">
+          共{{ state.orderInfo.items.reduce((acc, item) => acc + item.count, 0) }}件
+        </view>
+        <view>合计：</view>
+        <view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}</view>
+      </view>
+    </view>
+
+    <!-- 选择优惠券弹框 -->
+    <s-coupon-select
+      v-model="state.couponInfo"
+      :show="state.showCoupon"
+      @confirm="onSelectCoupon"
+      @close="state.showCoupon = false"
+    />
+
+    <!-- 满额折扣弹框 TODO @puhui999：【折扣】后续要把优惠信息打进去 -->
+    <s-discount-list
+      v-model="state.orderInfo"
+      :show="state.showDiscount"
+      @close="state.showDiscount = false"
+    />
+
+    <!-- 底部 -->
+    <su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
+      <view class="footer-box border-top ss-flex ss-row-between ss-p-x-20 ss-col-center">
+        <view class="total-box-footer ss-flex ss-col-center">
+          <view class="total-num ss-font-30 text-red">
+            ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}
+          </view>
+        </view>
+        <button
+          class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main"
+          @tap="onConfirm"
+        >
+          提交订单
+        </button>
+      </view>
+    </su-fixed>
+  </s-layout>
+</template>
+
+<script setup>
+  import { reactive, ref, watch } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import AddressSelection from '@/pages/order/addressSelection.vue';
+  import sheep from '@/sheep';
+  import OrderApi from '@/sheep/api/trade/order';
+  import CouponApi from '@/sheep/api/promotion/coupon';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+
+  const state = reactive({
+    orderPayload: {},
+    orderInfo: {
+      items: [], // 商品项列表
+      price: {}, // 价格信息
+    },
+    showCoupon: false, // 是否展示优惠劵
+    couponInfo: [], // 优惠劵列表
+    showDiscount: false, // 是否展示营销活动
+    // ========== 积分 ==========
+    pointStatus: false, //是否使用积分
+  });
+
+  const addressState = ref({
+    addressInfo: {}, // 选择的收货地址
+    deliveryType: 1, // 收货方式：1-快递配送，2-门店自提
+    isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
+    pickUpInfo: {}, // 选择的自提门店信息
+    receiverName: '', // 收件人名称
+    receiverMobile: '', // 收件人手机
+  });
+
+  // ========== 积分 ==========
+  /**
+   * 使用积分抵扣
+   */
+  const changeIntegral = async () => {
+    state.pointStatus = !state.pointStatus;
+    await getOrderInfo();
+  };
+
+  // 选择优惠券
+  async function onSelectCoupon(couponId) {
+    state.orderPayload.couponId = couponId;
+    await getOrderInfo();
+    state.showCoupon = false;
+  }
+
+  // 提交订单
+  function onConfirm() {
+    if (addressState.value.deliveryType === 1 && !addressState.value.addressInfo.id) {
+      sheep.$helper.toast('请选择收货地址');
+      return;
+    }
+    if (addressState.value.deliveryType === 2) {
+      if (!addressState.value.pickUpInfo.id) {
+        sheep.$helper.toast('请选择自提门店地址');
+        return;
+      }
+      if (addressState.value.receiverName === '' || addressState.value.receiverMobile === '') {
+        sheep.$helper.toast('请填写联系人或联系人电话');
+        return;
+      }
+      if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(addressState.value.receiverName)) {
+        sheep.$helper.toast('请填写您的真实姓名');
+        return;
+      }
+      if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(addressState.value.receiverMobile)) {
+        sheep.$helper.toast('请填写正确的手机号');
+        return;
+      }
+    }
+    submitOrder();
+  }
+
+  // 创建订单&跳转
+  async function submitOrder() {
+    const { code, data } = await OrderApi.createOrder({
+      items: state.orderPayload.items,
+      couponId: state.orderPayload.couponId,
+      remark: state.orderPayload.remark,
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
+      receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pointStatus: state.pointStatus,
+      combinationActivityId: state.orderPayload.combinationActivityId,
+      combinationHeadId: state.orderPayload.combinationHeadId,
+      seckillActivityId: state.orderPayload.seckillActivityId,
+    });
+    if (code !== 0) {
+      return;
+    }
+    // 更新购物车列表，如果来自购物车
+    if (state.orderPayload.items[0].cartId > 0) {
+      sheep.$store('cart').getList();
+    }
+
+    // 跳转到支付页面
+    sheep.$router.redirect('/pages/pay/index', {
+      id: data.payOrderId,
+    });
+  }
+
+  // 检查库存 & 计算订单价格
+  async function getOrderInfo() {
+    // 计算价格
+    const { data, code } = await OrderApi.settlementOrder({
+      items: state.orderPayload.items,
+      couponId: state.orderPayload.couponId,
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
+      receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pointStatus: state.pointStatus,
+      combinationActivityId: state.orderPayload.combinationActivityId,
+      combinationHeadId: state.orderPayload.combinationHeadId,
+      seckillActivityId: state.orderPayload.seckillActivityId,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.orderInfo = data;
+    // 设置收货地址
+    if (state.orderInfo.address) {
+      addressState.value.addressInfo = state.orderInfo.address;
+    }
+  }
+
+  // 获取可用优惠券
+  async function getCoupons() {
+    const { code, data } = await CouponApi.getMatchCouponList(
+      state.orderInfo.price.payPrice,
+      state.orderInfo.items.map((item) => item.spuId),
+      state.orderPayload.items.map((item) => item.skuId),
+      state.orderPayload.items.map((item) => item.categoryId),
+    );
+    if (code === 0) {
+      state.couponInfo = data;
+    }
+  }
+
+  onLoad(async (options) => {
+    if (!options.data) {
+      sheep.$helper.toast('参数不正确，请检查！');
+      return;
+    }
+    state.orderPayload = JSON.parse(options.data);
+    await getOrderInfo();
+    await getCoupons();
+  });
+
+  // 使用 watch 监听地址和配送方式的变化
+  watch(addressState, async (newAddress, oldAddress) => {
+    // 如果收货地址或配送方式有变化，则重新计算价格
+    if (newAddress.addressInfo.id !== oldAddress.addressInfo.id || newAddress.deliveryType !== oldAddress.deliveryType) {
+      await getOrderInfo();
+    }
+  });
+</script>
+
+<style lang="scss" scoped>
+  :deep() {
+    .uni-input-wrapper {
+      width: 320rpx;
+    }
+
+    .uni-easyinput__content-input {
+      font-size: 28rpx;
+      height: 72rpx;
+      text-align: right !important;
+      padding-right: 0 !important;
+
+      .uni-input-input {
+        font-weight: 500;
+        color: #333333;
+        font-size: 26rpx;
+        height: 32rpx;
+        margin-top: 4rpx;
+      }
+    }
+
+    .uni-easyinput__content {
+      display: flex !important;
+      align-items: center !important;
+      justify-content: right !important;
+    }
+  }
+
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .order-item {
+    height: 80rpx;
+
+    .item-title {
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+
+    .item-value {
+      font-size: 28rpx;
+      font-weight: 500;
+      font-family: OPPOSANS;
+    }
+
+    .text-disabled {
+      color: #bbbbbb;
+    }
+
+    .item-icon {
+      color: $dark-9;
+    }
+
+    .remark-input {
+      text-align: right;
+    }
+
+    .item-placeholder {
+      color: $dark-9;
+      font-size: 26rpx;
+      text-align: right;
+    }
+  }
+
+  .total-box-footer {
+    height: 90rpx;
+
+    .total-num {
+      color: #333333;
+      font-family: OPPOSANS;
+    }
+  }
+
+  .footer-box {
+    height: 100rpx;
+
+    .submit-btn {
+      width: 240rpx;
+      height: 70rpx;
+      font-size: 28rpx;
+      font-weight: 500;
+
+      .goto-pay-text {
+        line-height: 28rpx;
+      }
+    }
+
+    .cancel-btn {
+      width: 240rpx;
+      height: 80rpx;
+      font-size: 26rpx;
+      background-color: #e5e5e5;
+      color: $dark-9;
+    }
+  }
+
+  .title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333333;
+  }
+
+  .subtitle {
+    font-size: 28rpx;
+    color: #999999;
+  }
+
+  .cicon-checkbox {
+    font-size: 36rpx;
+    color: var(--ui-BG-Main);
+  }
+
+  .cicon-box {
+    font-size: 36rpx;
+    color: #999999;
+  }
+</style>
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
new file mode 100644
index 0000000..ed0119f
--- /dev/null
+++ b/pages/order/detail.vue
@@ -0,0 +1,655 @@
+<!-- 订单详情 -->
+<template>
+  <s-layout title="订单详情" class="index-wrap" navbar="inner">
+    <!-- 订单状态 TODO -->
+    <view
+      class="state-box ss-flex-col ss-col-center ss-row-right"
+      :style="[
+        {
+          marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
+          paddingTop: Number(statusBarHeight + 88) + 'rpx',
+        },
+      ]"
+    >
+      <view class="ss-flex ss-m-t-32 ss-m-b-20">
+        <image
+          v-if="
+            state.orderInfo.status_code == 'unpaid' ||
+            state.orderInfo.status === 10 || // 待发货
+            state.orderInfo.status_code == 'nocomment'
+          "
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_loading.png')"
+        >
+        </image>
+        <image
+          v-if="
+            state.orderInfo.status_code == 'completed' ||
+            state.orderInfo.status_code == 'refund_agree'
+          "
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_success.png')"
+        >
+        </image>
+        <image
+          v-if="state.orderInfo.status_code == 'cancel' || state.orderInfo.status_code == 'closed'"
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_close.png')"
+        >
+        </image>
+        <image
+          v-if="state.orderInfo.status_code == 'noget'"
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_express.png')"
+        >
+        </image>
+        <view class="ss-font-30">{{ formatOrderStatus(state.orderInfo) }}</view>
+      </view>
+      <view class="ss-font-26 ss-m-x-20 ss-m-b-70">
+        {{ formatOrderStatusDescription(state.orderInfo) }}
+      </view>
+    </view>
+
+    <!-- 收货地址 -->
+    <view class="order-address-box" v-if="state.orderInfo.receiverAreaId > 0">
+      <view class="ss-flex ss-col-center">
+        <text class="address-username">
+          {{ state.orderInfo.receiverName }}
+        </text>
+        <text class="address-phone">{{ state.orderInfo.receiverMobile }}</text>
+      </view>
+      <view class="address-detail">
+        {{ state.orderInfo.receiverAreaName }} {{ state.orderInfo.receiverDetailAddress }}
+      </view>
+    </view>
+
+    <view
+      class="detail-goods"
+      :style="[{ marginTop: state.orderInfo.receiverAreaId > 0 ? '0' : '-40rpx' }]"
+    >
+      <!-- 订单信 -->
+      <view class="order-list" v-for="item in state.orderInfo.items" :key="item.goods_id">
+        <view class="order-card">
+          <s-goods-item
+            @tap="onGoodsDetail(item.spuId)"
+            :img="item.picUrl"
+            :title="item.spuName"
+            :skuText="item.properties.map((property) => property.valueName).join(' ')"
+            :price="item.price"
+            :num="item.count"
+          >
+            <template #tool>
+              <view class="ss-flex">
+                <button
+                  class="ss-reset-button apply-btn"
+                  v-if="[10, 20, 30].includes(state.orderInfo.status) && item.afterSaleStatus === 0"
+                  @tap.stop="
+                    sheep.$router.go('/pages/order/aftersale/apply', {
+                      orderId: state.orderInfo.id,
+                      itemId: item.id,
+                    })
+                  "
+                >
+                  申请售后
+                </button>
+                <button
+                  class="ss-reset-button apply-btn"
+                  v-if="item.afterSaleStatus === 10"
+                  @tap.stop="
+                    sheep.$router.go('/pages/order/aftersale/detail', {
+                      id: item.afterSaleId,
+                    })
+                  "
+                >
+                  退款中
+                </button>
+                <button
+                  class="ss-reset-button apply-btn"
+                  v-if="item.afterSaleStatus === 20"
+                  @tap.stop="
+                    sheep.$router.go('/pages/order/aftersale/detail', {
+                      id: item.afterSaleId,
+                    })
+                  "
+                >
+                  退款成功
+                </button>
+              </view>
+            </template>
+            <template #priceSuffix>
+              <button class="ss-reset-button tag-btn" v-if="item.status_text">
+                {{ item.status_text }}
+              </button>
+            </template>
+          </s-goods-item>
+        </view>
+      </view>
+    </view>
+
+    <!--  自提核销  -->
+    <PickUpVerify :order-info="state.orderInfo" :systemStore="systemStore" ref="pickUpVerifyRef"></PickUpVerify>
+
+    <!-- 订单信息 -->
+    <view class="notice-box">
+      <view class="notice-box__content">
+        <view class="notice-item--center">
+          <view class="ss-flex ss-flex-1">
+            <text class="title">订单编号：</text>
+            <text class="detail">{{ state.orderInfo.no }}</text>
+          </view>
+          <button class="ss-reset-button copy-btn" @tap="onCopy">复制</button>
+        </view>
+        <view class="notice-item">
+          <text class="title">下单时间：</text>
+          <text class="detail">
+            {{ sheep.$helper.timeFormat(state.orderInfo.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </text>
+        </view>
+        <view class="notice-item" v-if="state.orderInfo.payTime">
+          <text class="title">支付时间：</text>
+          <text class="detail">
+            {{ sheep.$helper.timeFormat(state.orderInfo.payTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </text>
+        </view>
+        <view class="notice-item">
+          <text class="title">支付方式：</text>
+          <text class="detail">{{ state.orderInfo.payChannelName || '-' }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 价格信息 -->
+    <view class="order-price-box">
+      <view class="notice-item ss-flex ss-row-between">
+        <text class="title">商品总额</text>
+        <view class="ss-flex">
+          <text class="detail">￥{{ fen2yuan(state.orderInfo.totalPrice) }}</text>
+        </view>
+      </view>
+      <view class="notice-item ss-flex ss-row-between">
+        <text class="title">运费</text>
+        <text class="detail">￥{{ fen2yuan(state.orderInfo.deliveryPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.couponPrice > 0">
+        <text class="title">优惠劵金额</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.couponPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.pointPrice > 0">
+        <text class="title">积分抵扣</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.pointPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.discountPrice > 0">
+        <text class="title">活动优惠</text>
+        <text class="detail">¥{{ fen2yuan(state.orderInfo.discountPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.vipPrice > 0">
+        <text class="title">会员优惠</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.vipPrice) }}</text>
+      </view>
+      <view class="notice-item all-rpice-item ss-flex ss-m-t-20">
+        <text class="title">{{ state.orderInfo.payStatus ? '已付款' : '需付款' }}</text>
+        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.payPrice) }}</text>
+      </view>
+      <view
+        class="notice-item all-rpice-item ss-flex ss-m-t-20"
+        v-if="state.orderInfo.refundPrice > 0"
+      >
+        <text class="title">已退款</text>
+        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.refundPrice) }}</text>
+      </view>
+    </view>
+
+    <!-- 底部按钮 -->
+    <!-- TODO: 查看物流、等待成团、评价完后返回页面没刷新页面 -->
+    <su-fixed bottom placeholder bg="bg-white" v-if="state.orderInfo.buttons?.length">
+      <view class="footer-box ss-flex ss-col-center ss-row-right">
+        <button
+          class="ss-reset-button cancel-btn"
+          v-if="state.orderInfo.buttons?.includes('cancel')"
+          @tap="onCancel(state.orderInfo.id)"
+        >
+          取消订单
+        </button>
+        <button
+          class="ss-reset-button pay-btn ui-BG-Main-Gradient"
+          v-if="state.orderInfo.buttons?.includes('pay')"
+          @tap="onPay(state.orderInfo.payOrderId)"
+        >
+          继续支付
+        </button>
+        <button
+          class="ss-reset-button cancel-btn"
+          v-if="state.orderInfo.buttons?.includes('combination')"
+          @tap="
+            sheep.$router.go('/pages/activity/groupon/detail', {
+              id: state.orderInfo.combinationRecordId,
+            })
+          "
+        >
+          拼团详情
+        </button>
+        <button
+          class="ss-reset-button cancel-btn"
+          v-if="state.orderInfo.buttons?.includes('express')"
+          @tap="onExpress(state.orderInfo.id)"
+        >
+          查看物流
+        </button>
+        <button
+          class="ss-reset-button cancel-btn"
+          v-if="state.orderInfo.buttons?.includes('confirm')"
+          @tap="onConfirm(state.orderInfo.id)"
+        >
+          确认收货
+        </button>
+        <button
+          class="ss-reset-button cancel-btn"
+          v-if="state.orderInfo.buttons?.includes('comment')"
+          @tap="onComment(state.orderInfo.id)"
+        >
+          评价
+        </button>
+      </view>
+    </su-fixed>
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive, ref } from 'vue';
+  import { isEmpty } from 'lodash-es';
+  import {
+    fen2yuan,
+    formatOrderStatus,
+    formatOrderStatusDescription,
+    handleOrderButtons,
+  } from '@/sheep/hooks/useGoods';
+  import OrderApi from '@/sheep/api/trade/order';
+  import DeliveryApi from '@/sheep/api/trade/delivery';
+  import PickUpVerify from '@/pages/order/pickUpVerify.vue';
+
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
+
+  const state = reactive({
+    orderInfo: {},
+    merchantTradeNo: '', // 商户订单号
+    comeinType: '', // 进入订单详情的来源类型
+  });
+
+  // ========== 门店自提（核销） ==========
+  const systemStore = ref({}); // 门店信息
+
+  // 复制
+  const onCopy = () => {
+    sheep.$helper.copyText(state.orderInfo.no);
+  };
+
+  // 去支付
+  function onPay(payOrderId) {
+    sheep.$router.go('/pages/pay/index', {
+      id: payOrderId,
+    });
+  }
+
+  // 查看商品
+  function onGoodsDetail(id) {
+    sheep.$router.go('/pages/goods/index', {
+      id,
+    });
+  }
+
+  // 取消订单
+  async function onCancel(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消订单吗?',
+      success: async function(res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await OrderApi.cancelOrder(orderId);
+        if (code === 0) {
+          await getOrderDetail(orderId);
+        }
+      },
+    });
+  }
+
+  // 查看物流
+  async function onExpress(id) {
+    sheep.$router.go('/pages/order/express/log', {
+      id,
+    });
+  }
+
+  // 确认收货
+  async function onConfirm(orderId, ignore = false) {
+    // 需开启确认收货组件
+    // todo: 芋艿：待接入微信
+    // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+    // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+    let isOpenBusinessView = true;
+    if (
+      sheep.$platform.name === 'WechatMiniProgram' &&
+      !isEmpty(state.orderInfo.wechat_extra_data) &&
+      isOpenBusinessView &&
+      !ignore
+    ) {
+      mpConfirm(orderId);
+      return;
+    }
+
+    // 正常的确认收货流程
+    const { code } = await OrderApi.receiveOrder(orderId);
+    if (code === 0) {
+      await getOrderDetail(orderId);
+    }
+  }
+
+  // #ifdef MP-WEIXIN
+  // 小程序确认收货组件
+  function mpConfirm(orderId) {
+    if (!wx.openBusinessView) {
+      sheep.$helper.toast(`请升级微信版本`);
+      return;
+    }
+    wx.openBusinessView({
+      businessType: 'weappOrderConfirm',
+      extraData: {
+        merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
+        transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
+      },
+      success(response) {
+        console.log('success:', response);
+        if (response.errMsg === 'openBusinessView:ok') {
+          if (response.extraData.status === 'success') {
+            onConfirm(orderId, true);
+          }
+        }
+      },
+      fail(error) {
+        console.log('error:', error);
+      },
+      complete(result) {
+        console.log('result:', result);
+      },
+    });
+  }
+
+  // #endif
+
+  // 评价
+  function onComment(id) {
+    sheep.$router.go('/pages/goods/comment/add', {
+      id,
+    });
+  }
+
+  const pickUpVerifyRef = ref();
+
+  async function getOrderDetail(id) {
+    // 对详情数据进行适配
+    let res;
+    if (state.comeinType === 'wechat') {
+      // TODO 芋艿：微信场景下
+      res = await OrderApi.getOrder(id, {
+        merchant_trade_no: state.merchantTradeNo,
+      });
+    } else {
+      res = await OrderApi.getOrder(id);
+    }
+    if (res.code === 0) {
+      state.orderInfo = res.data;
+      handleOrderButtons(state.orderInfo);
+      // 配送方式：门店自提
+      if (res.data.pickUpStoreId) {
+        const { data } = await DeliveryApi.getDeliveryPickUpStore(res.data.pickUpStoreId);
+        systemStore.value = data || {};
+      }
+      if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
+        pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
+      }
+    } else {
+      sheep.$router.back();
+    }
+  }
+
+  onLoad(async (options) => {
+    let id = 0;
+    if (options.id) {
+      id = options.id;
+    }
+    // TODO 芋艿：下面两个变量，后续接入
+    state.comeinType = options.comein_type;
+    if (state.comeinType === 'wechat') {
+      state.merchantTradeNo = options.merchant_trade_no;
+    }
+    await getOrderDetail(id);
+  });
+</script>
+
+<style lang="scss" scoped>
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .apply-btn {
+    width: 140rpx;
+    height: 50rpx;
+    border-radius: 25rpx;
+    font-size: 24rpx;
+    border: 2rpx solid #dcdcdc;
+    line-height: normal;
+    margin-left: 16rpx;
+  }
+
+  .state-box {
+    color: rgba(#fff, 0.9);
+    width: 100%;
+    background: v-bind(headerBg) no-repeat,
+    linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    background-size: 750rpx 100%;
+    box-sizing: border-box;
+
+    .state-img {
+      width: 60rpx;
+      height: 60rpx;
+      margin-right: 20rpx;
+    }
+  }
+
+  .order-address-box {
+    background-color: #fff;
+    border-radius: 10rpx;
+    margin: -50rpx 20rpx 16rpx 20rpx;
+    padding: 44rpx 34rpx 42rpx 20rpx;
+    font-size: 30rpx;
+    box-sizing: border-box;
+    font-weight: 500;
+    color: rgba(51, 51, 51, 1);
+
+    .address-username {
+      margin-right: 20rpx;
+    }
+
+    .address-detail {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: rgba(153, 153, 153, 1);
+      margin-top: 20rpx;
+    }
+  }
+
+  .detail-goods {
+    border-radius: 10rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .order-list {
+      margin-bottom: 20rpx;
+      background-color: #fff;
+
+      .order-card {
+        padding: 20rpx 0;
+
+        .order-sku {
+          font-size: 24rpx;
+
+          font-weight: 400;
+          color: rgba(153, 153, 153, 1);
+          width: 450rpx;
+          margin-bottom: 20rpx;
+
+          .order-num {
+            margin-right: 10rpx;
+          }
+        }
+
+        .tag-btn {
+          margin-left: 16rpx;
+          font-size: 24rpx;
+          height: 36rpx;
+          color: var(--ui-BG-Main);
+          border: 2rpx solid var(--ui-BG-Main);
+          border-radius: 14rpx;
+          padding: 0 4rpx;
+        }
+      }
+    }
+  }
+
+  // 订单信息。
+  .notice-box {
+    background: #fff;
+    border-radius: 10rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .notice-box__head {
+      font-size: 30rpx;
+
+      font-weight: 500;
+      color: rgba(51, 51, 51, 1);
+      line-height: 80rpx;
+      border-bottom: 1rpx solid #dfdfdf;
+      padding: 0 25rpx;
+    }
+
+    .notice-box__content {
+      padding: 20rpx;
+
+      .self-pickup-box {
+        width: 100%;
+
+        .self-pickup--img {
+          width: 200rpx;
+          height: 200rpx;
+          margin: 40rpx 0;
+        }
+      }
+    }
+
+    .notice-item,
+    .notice-item--center {
+      display: flex;
+      align-items: center;
+      line-height: normal;
+      margin-bottom: 24rpx;
+
+      .title {
+        font-size: 28rpx;
+        color: #999;
+      }
+
+      .detail {
+        font-size: 28rpx;
+        color: #333;
+        flex: 1;
+      }
+    }
+  }
+
+  .copy-btn {
+    width: 100rpx;
+    line-height: 50rpx;
+    border-radius: 25rpx;
+    padding: 0;
+    background: rgba(238, 238, 238, 1);
+    font-size: 22rpx;
+    font-weight: 400;
+    color: rgba(51, 51, 51, 1);
+  }
+
+  // 订单价格信息
+  .order-price-box {
+    background-color: #fff;
+    border-radius: 10rpx;
+    padding: 20rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .notice-item {
+      line-height: 70rpx;
+
+      .title {
+        font-size: 28rpx;
+        color: #999;
+      }
+
+      .detail {
+        font-size: 28rpx;
+        color: #333;
+        font-family: OPPOSANS;
+      }
+    }
+
+    .all-rpice-item {
+      justify-content: flex-end;
+      align-items: center;
+
+      .title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+        line-height: normal;
+      }
+
+      .all-price {
+        font-size: 26rpx;
+        font-family: OPPOSANS;
+        line-height: normal;
+        color: $red;
+      }
+    }
+  }
+
+  // 底部
+  .footer-box {
+    height: 100rpx;
+    width: 100%;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    padding-right: 20rpx;
+
+    .cancel-btn {
+      width: 160rpx;
+      height: 60rpx;
+      background: #eeeeee;
+      border-radius: 30rpx;
+      margin-right: 20rpx;
+      font-size: 26rpx;
+      font-weight: 400;
+      color: #333333;
+    }
+
+    .pay-btn {
+      width: 160rpx;
+      height: 60rpx;
+      font-size: 26rpx;
+      border-radius: 30rpx;
+      font-weight: 500;
+      color: #fff;
+    }
+  }
+</style>
diff --git a/pages/order/express/log.vue b/pages/order/express/log.vue
new file mode 100644
index 0000000..eb992a5
--- /dev/null
+++ b/pages/order/express/log.vue
@@ -0,0 +1,162 @@
+<!-- 物流追踪 -->
+<template>
+  <s-layout title="物流追踪">
+    <view class="log-wrap">
+      <!-- 商品信息 -->
+      <view class="log-card ss-flex ss-m-20 ss-r-10" v-if="goodsImages.length > 0">
+        <uni-swiper-dot :info="goodsImages" :current="state.current" mode="round">
+          <swiper class="swiper-box">
+            <swiper-item v-for="(item, index) in goodsImages" :key="index">
+              <image class="log-card-img" :src="sheep.$url.static(item.image)" />
+            </swiper-item>
+          </swiper>
+        </uni-swiper-dot>
+        <view class="log-card-msg">
+          <!-- TODO 芋艿：【物流】优化点：展示状态 -->
+<!--          <view class="ss-flex ss-m-b-8">-->
+<!--            <view>物流状态：</view>-->
+<!--            <view class="warning-color">{{ state.info.status_text }}</view>-->
+<!--          </view>-->
+          <view class="ss-m-b-8">快递单号：{{ state.info.logisticsNo }}</view>
+          <view>快递公司：{{ state.info.logisticsName }}</view>
+        </view>
+      </view>
+
+      <!-- 物流轨迹 -->
+      <view class="log-content ss-m-20 ss-r-10">
+        <view
+          class="log-content-box ss-flex"
+          v-for="(item, index) in state.tracks"
+          :key="item.title"
+        >
+          <view class="log-icon ss-flex-col ss-col-center ss-m-r-20">
+            <text class="cicon-title" />
+            <view v-if="state.tracks.length - 1 !== index" class="line" />
+          </view>
+          <view class="log-content-msg">
+            <!-- TODO 芋艿：【物流】优化点：展示状态 -->
+<!--            <view class="log-msg-title ss-m-b-20">-->
+<!--              {{ item.status_text }}-->
+<!--            </view>-->
+            <view class="log-msg-desc ss-m-b-16">{{ item.content }}</view>
+            <view class="log-msg-date ss-m-b-40">
+              {{ sheep.$helper.timeFormat(item.time, 'yyyy-mm-dd hh:MM:ss') }}
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { computed, reactive } from 'vue';
+  import OrderApi from '@/sheep/api/trade/order';
+
+  const state = reactive({
+    info: [],
+    tracks: [],
+  });
+
+  const goodsImages = computed(() => {
+    let array = [];
+    if (state.info.items) {
+      state.info.items.forEach((item) => {
+        array.push({
+          image: item.picUrl,
+        });
+      });
+    }
+    return array;
+  });
+
+  async function getExpressDetail(id) {
+    const { data } = await OrderApi.getOrderExpressTrackList(id);
+    state.tracks = data.reverse();
+  }
+
+  async function getOrderDetail(id) {
+    const { data } = await OrderApi.getOrder(id)
+    state.info = data;
+  }
+
+  onLoad((options) => {
+    getExpressDetail(options.id);
+    getOrderDetail(options.id);
+  });
+</script>
+
+<style lang="scss" scoped>
+  .swiper-box {
+    width: 200rpx;
+    height: 200rpx;
+  }
+  .log-card {
+    border-top: 2rpx solid rgba(#dfdfdf, 0.5);
+    padding: 20rpx;
+    background: #fff;
+    margin-bottom: 20rpx;
+    .log-card-img {
+      width: 200rpx;
+      height: 200rpx;
+      margin-right: 20rpx;
+    }
+    .log-card-msg {
+      font-size: 28rpx;
+      font-weight: 500;
+      width: 490rpx;
+      color: #333333;
+      .warning-color {
+        color: #999;
+      }
+    }
+  }
+  .log-content {
+    padding: 34rpx 20rpx 0rpx 20rpx;
+    background: #fff;
+    .log-content-box {
+      align-items: stretch;
+    }
+    .log-icon {
+      height: inherit;
+      .cicon-title {
+        color: #ccc;
+        font-size: 40rpx;
+      }
+      .activity-color {
+        color: #f0c785;
+        font-size: 40rpx;
+      }
+      .info-color {
+        color: #ccc;
+        font-size: 40rpx;
+      }
+      .line {
+        width: 1px;
+        height: 100%;
+        background: #d8d8d8;
+      }
+    }
+
+    .log-content-msg {
+      .log-msg-title {
+        font-size: 28rpx;
+        font-weight: bold;
+        color: #333333;
+      }
+      .log-msg-desc {
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #333333;
+        line-height: 36rpx;
+      }
+      .log-msg-date {
+        font-size: 24rpx;
+        font-weight: 500;
+        color: #999999;
+      }
+    }
+  }
+</style>
diff --git a/pages/order/list.vue b/pages/order/list.vue
new file mode 100644
index 0000000..926ecfd
--- /dev/null
+++ b/pages/order/list.vue
@@ -0,0 +1,495 @@
+<!-- 订单列表 -->
+<template>
+  <s-layout title="我的订单">
+    <su-sticky bgColor="#fff">
+      <su-tabs
+        :list="tabMaps"
+        :scrollable="false"
+        @change="onTabsChange"
+        :current="state.currentTab"
+      />
+    </su-sticky>
+    <s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单" />
+    <view v-if="state.pagination.total > 0">
+      <view
+        class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20"
+        v-for="order in state.pagination.list"
+        :key="order.id"
+        @tap="onOrderDetail(order.id)"
+      >
+        <view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
+          <view class="order-no">订单号：{{ order.no }}</view>
+          <view class="order-state ss-font-26" :class="formatOrderColor(order)">
+            {{ formatOrderStatus(order) }}
+          </view>
+        </view>
+        <view class="border-bottom" v-for="item in order.items" :key="item.id">
+          <s-goods-item
+            :img="item.picUrl"
+            :title="item.spuName"
+            :skuText="item.properties.map((property) => property.valueName).join(' ')"
+            :price="item.price"
+            :num="item.count"
+          />
+        </view>
+        <view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20">
+          <view class="ss-flex ss-col-center">
+            <view class="discounts-title pay-color"
+              >共 {{ order.productCount }} 件商品,总金额:</view
+            >
+            <view class="discounts-money pay-color"> ￥{{ fen2yuan(order.payPrice) }} </view>
+          </view>
+        </view>
+        <view
+          class="order-card-footer ss-flex ss-col-center ss-p-x-20"
+          :class="order.buttons.length > 3 ? 'ss-row-between' : 'ss-row-right'"
+        >
+          <view class="ss-flex ss-col-center">
+            <button
+              v-if="order.buttons.includes('combination')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onOrderGroupon(order)"
+            >
+              拼团详情
+            </button>
+            <button
+              v-if="order.buttons.length === 0"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onOrderDetail(order.id)"
+            >
+              查看详情
+            </button>
+            <button
+              v-if="order.buttons.includes('confirm')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onConfirm(order)"
+            >
+              确认收货
+            </button>
+            <button
+              v-if="order.buttons.includes('express')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onExpress(order.id)"
+            >
+              查看物流
+            </button>
+            <button
+              v-if="order.buttons.includes('cancel')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onCancel(order.id)"
+            >
+              取消订单
+            </button>
+            <button
+              v-if="order.buttons.includes('comment')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onComment(order.id)"
+            >
+              评价
+            </button>
+            <button
+              v-if="order.buttons.includes('delete')"
+              class="delete-btn ss-reset-button"
+              @tap.stop="onDelete(order.id)"
+            >
+              删除订单
+            </button>
+            <button
+              v-if="order.buttons.includes('pay')"
+              class="tool-btn ss-reset-button ui-BG-Main-Gradient"
+              @tap.stop="onPay(order.payOrderId)"
+            >
+              继续支付
+            </button>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 加载更多 -->
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import { reactive } from 'vue';
+  import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
+  import {
+    fen2yuan,
+    formatOrderColor,
+    formatOrderStatus,
+    handleOrderButtons,
+  } from '@/sheep/hooks/useGoods';
+  import sheep from '@/sheep';
+  import _ from 'lodash-es';
+  import { isEmpty } from 'lodash-es';
+  import OrderApi from '@/sheep/api/trade/order';
+  import { resetPagination } from '@/sheep/util';
+
+  // 数据
+  const state = reactive({
+    currentTab: 0, // 选中的 tabMaps 下标
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 5,
+    },
+    loadStatus: '',
+  });
+
+  const tabMaps = [
+    {
+      name: '全部',
+    },
+    {
+      name: '待付款',
+      value: 0,
+    },
+    {
+      name: '待发货',
+      value: 10,
+    },
+    {
+      name: '待收货',
+      value: 20,
+    },
+    {
+      name: '待评价',
+      value: 30,
+    },
+  ];
+
+  // 切换选项卡
+  function onTabsChange(e) {
+    if (state.currentTab === e.index) {
+      return;
+    }
+    // 重头加载代码
+    resetPagination(state.pagination);
+    state.currentTab = e.index;
+    getOrderList();
+  }
+
+  // 订单详情
+  function onOrderDetail(id) {
+    sheep.$router.go('/pages/order/detail', {
+      id,
+    });
+  }
+
+  // 跳转拼团记录的详情
+  function onOrderGroupon(order) {
+    sheep.$router.go('/pages/activity/groupon/detail', {
+      id: order.combinationRecordId,
+    });
+  }
+
+  // 继续支付
+  function onPay(payOrderId) {
+    sheep.$router.go('/pages/pay/index', {
+      id: payOrderId,
+    });
+  }
+
+  // 评价
+  function onComment(id) {
+    sheep.$router.go('/pages/goods/comment/add', {
+      id,
+    });
+  }
+
+  // 确认收货 TODO 芋艿：待测试
+  async function onConfirm(order, ignore = false) {
+    // 需开启确认收货组件
+    // todo: 芋艿：需要后续接入微信收货组件
+    // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+    // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+    let isOpenBusinessView = true;
+    if (
+      sheep.$platform.name === 'WechatMiniProgram' &&
+      !isEmpty(order.wechat_extra_data) &&
+      isOpenBusinessView &&
+      !ignore
+    ) {
+      mpConfirm(order);
+      return;
+    }
+
+    // 正常的确认收货流程
+    const { code } = await OrderApi.receiveOrder(order.id);
+    if (code === 0) {
+      resetPagination(state.pagination);
+      await getOrderList();
+    }
+  }
+
+  // #ifdef MP-WEIXIN
+  // 小程序确认收货组件 TODO 芋艿：后续再接入
+  function mpConfirm(order) {
+    if (!wx.openBusinessView) {
+      sheep.$helper.toast(`请升级微信版本`);
+      return;
+    }
+    wx.openBusinessView({
+      businessType: 'weappOrderConfirm',
+      extraData: {
+        merchant_id: '1481069012',
+        merchant_trade_no: order.wechat_extra_data.merchant_trade_no,
+        transaction_id: order.wechat_extra_data.transaction_id,
+      },
+      success(response) {
+        console.log('success:', response);
+        if (response.errMsg === 'openBusinessView:ok') {
+          if (response.extraData.status === 'success') {
+            onConfirm(order, true);
+          }
+        }
+      },
+      fail(error) {
+        console.log('error:', error);
+      },
+      complete(result) {
+        console.log('result:', result);
+      },
+    });
+  }
+  // #endif
+
+  // 查看物流
+  async function onExpress(id) {
+    sheep.$router.go('/pages/order/express/log', {
+      id,
+    });
+  }
+
+  // 取消订单
+  async function onCancel(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消订单吗?',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await OrderApi.cancelOrder(orderId);
+        if (code === 0) {
+          // 修改数据的状态
+          let index = state.pagination.list.findIndex((order) => order.id === orderId);
+          const orderInfo = state.pagination.list[index];
+          orderInfo.status = 40;
+          handleOrderButtons(orderInfo);
+        }
+      },
+    });
+  }
+
+  // 删除订单
+  function onDelete(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要删除订单吗?',
+      success: async function (res) {
+        if (res.confirm) {
+          const { code } = await OrderApi.deleteOrder(orderId);
+          if (code === 0) {
+            // 删除数据
+            let index = state.pagination.list.findIndex((order) => order.id === orderId);
+            state.pagination.list.splice(index, 1);
+          }
+        }
+      },
+    });
+  }
+
+  // 获取订单列表
+  async function getOrderList() {
+    state.loadStatus = 'loading';
+    let { code, data } = await OrderApi.getOrderPage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+      status: tabMaps[state.currentTab].value,
+      commentStatus: tabMaps[state.currentTab].value === 30 ? false : null,
+    });
+    if (code !== 0) {
+      return;
+    }
+    data.list.forEach((order) => handleOrderButtons(order));
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  onLoad(async (options) => {
+    if (options.type) {
+      state.currentTab = options.type;
+    }
+    await getOrderList();
+  });
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getOrderList();
+  }
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
+
+  // 下拉刷新
+  onPullDownRefresh(() => {
+    resetPagination(state.pagination);
+    getOrderList();
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 800);
+  });
+</script>
+
+<style lang="scss" scoped>
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .tool-btn {
+    width: 160rpx;
+    height: 60rpx;
+    background: #f6f6f6;
+    font-size: 26rpx;
+    border-radius: 30rpx;
+    margin-right: 10rpx;
+
+    &:last-of-type {
+      margin-right: 0;
+    }
+  }
+
+  .delete-btn {
+    width: 160rpx;
+    height: 56rpx;
+    color: #ff3000;
+    background: #fee;
+    border-radius: 28rpx;
+    font-size: 26rpx;
+    margin-right: 10rpx;
+    line-height: normal;
+
+    &:last-of-type {
+      margin-right: 0;
+    }
+  }
+
+  .apply-btn {
+    width: 140rpx;
+    height: 50rpx;
+    border-radius: 25rpx;
+    font-size: 24rpx;
+    border: 2rpx solid #dcdcdc;
+    line-height: normal;
+    margin-left: 16rpx;
+  }
+
+  .swiper-box {
+    flex: 1;
+
+    .swiper-item {
+      height: 100%;
+      width: 100%;
+    }
+  }
+
+  .order-list-card-box {
+    .order-card-header {
+      height: 80rpx;
+
+      .order-no {
+        font-size: 26rpx;
+        font-weight: 500;
+      }
+
+      .order-state {
+      }
+    }
+
+    .pay-box {
+      .discounts-title {
+        font-size: 24rpx;
+        line-height: normal;
+        color: #999999;
+      }
+
+      .discounts-money {
+        font-size: 24rpx;
+        line-height: normal;
+        color: #999;
+        font-family: OPPOSANS;
+      }
+
+      .pay-color {
+        color: #333;
+      }
+    }
+
+    .order-card-footer {
+      height: 100rpx;
+
+      .more-item-box {
+        padding: 20rpx;
+
+        .more-item {
+          height: 60rpx;
+
+          .title {
+            font-size: 26rpx;
+          }
+        }
+      }
+
+      .more-btn {
+        color: $dark-9;
+        font-size: 24rpx;
+      }
+
+      .content {
+        width: 154rpx;
+        color: #333333;
+        font-size: 26rpx;
+        font-weight: 500;
+      }
+    }
+  }
+
+  :deep(.uni-tooltip-popup) {
+    background: var(--ui-BG);
+  }
+
+  .warning-color {
+    color: #faad14;
+  }
+
+  .danger-color {
+    color: #ff3000;
+  }
+
+  .success-color {
+    color: #52c41a;
+  }
+
+  .info-color {
+    color: #999999;
+  }
+</style>
diff --git a/pages/order/my/aftersale/apply.vue b/pages/order/my/aftersale/apply.vue
new file mode 100644
index 0000000..6d86283
--- /dev/null
+++ b/pages/order/my/aftersale/apply.vue
@@ -0,0 +1,333 @@
+<!-- 售后申请 -->
+<template>
+  <s-layout title="取消订单">
+    <!-- 售后商品 -->
+    <view class="goods-box">
+      <s-goods-item
+        :img="state.item.picUrl"
+        :title="state.item.spuName"
+        :skuText="state.item.properties?.map((property) => property.valueName).join(' ')"
+        :price="state.item.price"
+        :num="state.item.count"
+      />
+    </view>
+
+    <uni-forms ref="form" v-model="formData" :rules="rules" label-position="top">
+     
+      <!-- 退款金额 -->
+      <view class="refund-item ss-flex ss-col-center ss-row-between" @tap="state.showModal = true">
+        <text class="item-title">退回余额</text>
+        <view class="ss-flex refund-cause ss-col-center">
+          <text class="ss-m-r-20">￥{{ fen2yuan(state.item.payPrice) }}</text>
+        </view>
+      </view>
+      <!-- 申请原因 -->
+     <!-- <view class="refund-item ss-flex ss-col-center ss-row-between" @tap="state.showModal = true">
+        <text class="item-title">取消原因</text>
+        <view class="ss-flex refund-cause ss-col-center">
+          <text class="ss-m-r-20" v-if="formData.applyReason">{{ formData.applyReason }}</text>
+          <text class="ss-m-r-20" v-else>请选择取消原因~</text>
+          <text class="cicon-forward" style="height: 28rpx"></text>
+        </view>
+      </view> -->
+
+      <!-- 留言 -->
+      <view class="refund-item">
+        <view class="item-title ss-m-b-20">取消原因</view>
+        <view class="describe-box">
+          <uni-easyinput
+            :inputBorder="false"
+            class="describe-content"
+            type="textarea"
+            maxlength="120"
+            autoHeight
+            v-model="formData.applyDescription"
+            placeholder="客官~请描述您遇到的问题，建议上传照片"
+          />
+          <!-- TODO 芋艿：上传的测试 -->
+          <view class="upload-img">
+            <s-uploader
+              v-model:url="formData.images"
+              fileMediatype="image"
+              limit="9"
+              mode="grid"
+              :imageStyles="{ width: '168rpx', height: '168rpx' }"
+            />
+          </view>
+        </view>
+      </view>
+    </uni-forms>
+
+    <!-- 底部按钮 -->
+    <su-fixed bottom placeholder>
+      <view class="foot-wrap">
+        <view class="foot_box ss-flex ss-col-center ss-row-between ss-p-x-30">
+          <button class="ss-reset-button contcat-btn" @tap="sheep.$router.go('/pages/chat/index')">
+            联系客服
+          </button>
+          <button class="ss-reset-button ui-BG-Main-Gradient sub-btn" @tap="submit">提交</button>
+        </view>
+      </view>
+    </su-fixed>
+
+    <!-- 申请原因弹窗 -->
+    <su-popup :show="state.showModal" round="10" :showClose="true" @close="state.showModal = false">
+      <view class="modal-box page_box">
+        <view class="modal-head item-title head_box ss-flex ss-row-center ss-col-center">
+          取消原因
+        </view>
+        <view class="modal-content content_box">
+          <radio-group @change="onChange">
+            <label class="radio ss-flex ss-col-center" v-for="item in state.reasonList" :key="item">
+              <view class="ss-flex-1 ss-p-20">{{ item }}</view>
+              <radio
+                :value="item"
+                color="var(--ui-BG-Main)"
+                :checked="item === state.currentValue"
+              />
+            </label>
+          </radio-group>
+        </view>
+        <view class="modal-foot foot_box ss-flex ss-row-center ss-col-center">
+          <button class="ss-reset-button close-btn ui-BG-Main-Gradient" @tap="onReason">
+            确定
+          </button>
+        </view>
+      </view>
+    </su-popup>
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive, ref } from 'vue';
+  import OrderApi from '@/sheep/api/trade/order';
+  import TradeConfigApi from '@/sheep/api/trade/config';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import AfterSaleApi from '@/sheep/api/trade/afterSale';
+  import { WxaSubscribeTemplate } from '@/sheep/util/const';
+
+  const form = ref(null);
+  const state = reactive({
+    orderId: 0, // 订单编号
+    itemId: 0, // 订单项编号
+    order: {}, // 订单
+    item: {}, // 订单项
+    config: {}, // 交易配置
+
+    // 售后类型
+    wayList: [
+      {
+        text: '仅退款',
+        value: '10',
+      },
+      {
+        text: '退款退货',
+        value: '20',
+      },
+    ],
+    reasonList: [], // 可选的申请原因数组
+    showModal: false, // 是否显示申请原因弹窗
+    currentValue: '', // 当前选择的售后原因
+  });
+  let formData = reactive({
+    way: '',
+    applyReason: '',
+    applyDescription: '',
+    images: [],
+  });
+  const rules = reactive({});
+
+  // 提交表单
+  async function submit() {
+    let data = {
+      orderItemId: state.itemId,
+      refundPrice: state.item.payPrice,
+      ...formData,
+    };
+    const { code } = await AfterSaleApi.createAfterSale(data);
+    if (code === 0) {
+      uni.showToast({
+        title: '取消成功',
+      });
+      sheep.$router.go('/pages/order/my/list');
+    }
+  }
+
+  // 选择售后类型
+  function onRefundChange(e) {
+    formData.way = e;
+    // 清理理由
+    state.reasonList =
+      formData.way === '10'
+        ? state.config.afterSaleRefundReasons || []
+        : state.config.afterSaleReturnReasons || [];
+    formData.applyReason = '';
+    state.currentValue = '';
+  }
+
+  // 选择申请原因
+  function onChange(e) {
+    state.currentValue = e.detail.value;
+  }
+
+  // 确定
+  function onReason() {
+    formData.applyReason = state.currentValue;
+    state.showModal = false;
+  }
+
+  onLoad(async (options) => {
+    // 解析参数
+    if (!options.orderId || !options.itemId) {
+      sheep.$helper.toast(`缺少订单信息，请检查`);
+      return;
+    }
+    state.orderId = options.orderId;
+    state.itemId = parseInt(options.itemId);
+
+    // 读取订单信息
+    const { code, data } = await OrderApi.getOrder(state.orderId);
+    if (code !== 0) {
+      return;
+    }
+    state.order = data;
+    state.item = data.items.find((item) => item.id === state.itemId) || {};
+
+    // 设置选项
+    if (state.order.status === 10) {
+      state.wayList.splice(1, 1);
+    }
+
+    // 读取配置
+    state.config = (await TradeConfigApi.getTradeConfig()).data;
+	
+	onRefundChange("10");
+  });
+</script>
+
+<style lang="scss" scoped>
+  .item-title {
+    font-size: 30rpx;
+    font-weight: bold;
+    color: rgba(51, 51, 51, 1);
+    // margin-bottom: 20rpx;
+  }
+
+  // 售后项目
+  .refund-item {
+    background-color: #fff;
+    border-bottom: 1rpx solid #f5f5f5;
+    padding: 30rpx;
+
+    &:last-child {
+      border: none;
+    }
+
+    // 留言
+    .describe-box {
+      width: 690rpx;
+      background: rgba(249, 250, 251, 1);
+      padding: 30rpx;
+      box-sizing: border-box;
+      border-radius: 20rpx;
+
+      .describe-content {
+        height: 200rpx;
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #333;
+      }
+    }
+
+    // 联系方式
+    .input-box {
+      height: 84rpx;
+      background: rgba(249, 250, 251, 1);
+      border-radius: 20rpx;
+    }
+  }
+
+  .goods-box {
+    background: #fff;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .foot-wrap {
+    height: 100rpx;
+    width: 100%;
+  }
+
+  .foot_box {
+    height: 100rpx;
+    background-color: #fff;
+
+    .sub-btn {
+      width: 336rpx;
+      line-height: 74rpx;
+      border-radius: 38rpx;
+      color: rgba(#fff, 0.9);
+      font-size: 28rpx;
+    }
+
+    .contcat-btn {
+      width: 336rpx;
+      line-height: 74rpx;
+      background: rgba(238, 238, 238, 1);
+      border-radius: 38rpx;
+      font-size: 28rpx;
+      font-weight: 400;
+      color: rgba(51, 51, 51, 1);
+    }
+  }
+
+  .modal-box {
+    width: 750rpx;
+    // height: 680rpx;
+    border-radius: 30rpx 30rpx 0 0;
+    background: #fff;
+
+    .modal-head {
+      height: 100rpx;
+      font-size: 30rpx;
+    }
+
+    .modal-content {
+      font-size: 28rpx;
+    }
+
+    .modal-foot {
+      .close-btn {
+        width: 710rpx;
+        line-height: 80rpx;
+        border-radius: 40rpx;
+        color: rgba(#fff, 0.9);
+      }
+    }
+  }
+
+  .success-box {
+    width: 600rpx;
+    padding: 90rpx 0 64rpx 0;
+
+    .cicon-check-round {
+      font-size: 96rpx;
+      color: #04b750;
+    }
+
+    .success-title {
+      font-weight: 500;
+      color: #333333;
+      font-size: 32rpx;
+    }
+
+    .success-btn {
+      width: 492rpx;
+      height: 70rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main-gradient), var(--ui-BG-Main));
+      border-radius: 35rpx;
+    }
+  }
+</style>
diff --git a/pages/order/my/aftersale/list.vue b/pages/order/my/aftersale/list.vue
new file mode 100644
index 0000000..9ed49bf
--- /dev/null
+++ b/pages/order/my/aftersale/list.vue
@@ -0,0 +1,184 @@
+<!-- 售后列表 -->
+<template>
+  <s-layout title="退款列表">
+    <s-empty v-if="state.pagination.total === 0" icon="/static/data-empty.png" text="暂无数据" />
+    <!-- 列表 -->
+    <view v-if="state.pagination.total > 0">
+      <view
+        class="list-box ss-m-y-20"
+        v-for="order in state.pagination.list"
+        :key="order.id"
+        @tap="sheep.$router.go('/pages/clerk/detail/index', { id: order.spuId })"
+      >
+        <view class="order-head ss-flex ss-col-center ss-row-between">
+          <text class="no">服务单号：{{ order.no }}</text>
+          <text class="state">{{ formatAfterSaleStatus(order) }}</text>
+        </view>
+        <s-goods-item
+          :img="order.picUrl"
+          :title="order.spuName"
+          :skuText="order.properties.map((property) => property.valueName).join(' ')"
+          :price="order.refundPrice"
+        />
+       
+      </view>
+    </view>
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import _ from 'lodash-es';
+  import {
+    formatAfterSaleStatus,
+    formatAfterSaleStatusDescription,
+    handleAfterSaleButtons,
+  } from '@/sheep/hooks/useGoods';
+  import AfterSaleApi from '@/sheep/api/trade/afterSale';
+  import { resetPagination } from '@/sheep/util';
+
+  const state = reactive({
+    currentTab: 0,
+    showApply: false,
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 10,
+    },
+    loadStatus: '',
+  });
+
+  // TODO 芋艿：优化点，增加筛选
+  const tabMaps = [
+    {
+      name: '全部',
+      value: 'all',
+    },
+    // {
+    //   name: '申请中',
+    //   value: 'nooper',
+    // },
+    // {
+    //   name: '处理中',
+    //   value: 'ing',
+    // },
+    // {
+    //   name: '已完成',
+    //   value: 'completed',
+    // },
+    // {
+    //   name: '已拒绝',
+    //   value: 'refuse',
+    // },
+  ];
+
+  // 切换选项卡
+  function onTabsChange(e) {
+    resetPagination(state.pagination);
+    state.currentTab = e.index;
+    getOrderList();
+  }
+
+  // 获取售后列表
+  async function getOrderList() {
+    state.loadStatus = 'loading';
+    let { data, code } = await AfterSaleApi.getAfterSalePage({
+      // type: tabMaps[state.currentTab].value,
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+    });
+    if (code !== 0) {
+      return;
+    }
+    data.list.forEach((order) => handleAfterSaleButtons(order));
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  function onApply(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消此申请吗？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await AfterSaleApi.cancelAfterSale(orderId);
+        if (code === 0) {
+          resetPagination(state.pagination);
+          await getOrderList();
+        }
+      },
+    });
+  }
+
+  onLoad(async (options) => {
+    if (options.type) {
+      state.currentTab = options.type;
+    }
+    await getOrderList();
+  });
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getOrderList();
+  }
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .list-box {
+    background-color: #fff;
+
+    .order-head {
+      padding: 0 25rpx;
+      height: 77rpx;
+    }
+
+    .apply-box {
+      height: 82rpx;
+
+      .title {
+        font-size: 24rpx;
+      }
+
+      .value {
+        font-size: 22rpx;
+        color: $dark-6;
+      }
+    }
+
+    .tool-btn-box {
+      height: 100rpx;
+
+      .tool-btn {
+        width: 160rpx;
+        height: 60rpx;
+        background: #f6f6f6;
+        border-radius: 30rpx;
+        font-size: 26rpx;
+        font-weight: 400;
+      }
+    }
+  }
+</style>
diff --git a/pages/order/my/components/layout.vue b/pages/order/my/components/layout.vue
new file mode 100644
index 0000000..8b493d8
--- /dev/null
+++ b/pages/order/my/components/layout.vue
@@ -0,0 +1,130 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" :auto="false" use-virtual-list :force-close-inner-list="true" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @scroll="scroll" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<su-navbar :title="title" statusBar></su-navbar>
+				<tab-box :tabList="tabList" :currentValue="currentIndex" @change="tabChange"></tab-box>
+			</template>  
+			   
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<order-list @onCancel="onCancel" :virtualList="virtualList"></order-list>
+			
+		</z-paging>
+		
+	</view>
+</template>
+
+<script>
+	import TabBox from '@/pages/order/my/components/tabBox.vue';
+	import OrderList from '@/pages/order/my/components/orderList.vue';
+	import OrderApi from '@/sheep/api/trade/order';
+	import {
+	  formatMyOrderStatus,
+	  handleMyOrderButtons,
+	  fen2yuan,
+	} from '@/sheep/hooks/useGoods';
+	export default {
+		components: {
+			TabBox, 
+			OrderList,
+		}, 
+		props: {
+			title: {
+				type: String,
+				default: '我的订单',
+			},
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 0,
+				height: 0,
+				
+				tabList: [{
+					name: '全部',
+				}, {
+					name: '待付款',
+					value: 0,
+				}, {
+					name: '待服务',
+					value: 10,
+				}, {
+					name: '服务中',
+					value: 20,
+				}, {
+					name: '待评价',
+					value: 30,
+				}],
+				
+				currentIndex: 0,
+			}
+		},
+		methods: {
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					status: this.tabList[this.currentIndex].value,
+					commentStatus: this.tabList[this.currentIndex].value === 30 ? false : null,
+				}
+				OrderApi.getOrderPage(params).then(res => {
+					// 将请求的结果数组传递给z-paging
+					res.data.list.forEach((order) => handleMyOrderButtons(order));
+					res.data.list.forEach((order) => formatMyOrderStatus(order));
+					res.data.list.forEach((order) => order.payPrice = fen2yuan(order.payPrice));
+					this.$refs.paging.complete(res.data.list); 
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			tabChange(e) {
+				this.currentIndex = e;
+				this.$refs.paging.reload();
+			},
+			// 取消订单
+			async onCancel(orderId) {
+			  var that = this;
+			  uni.showModal({
+			    title: '提示',
+			    content: '确定要取消订单吗?',
+			    success: async function (res) {
+			      if (!res.confirm) {
+			        return;
+			      }
+			      const { code } = await OrderApi.cancelOrder(orderId);
+			      if (code === 0) {
+			        that.$refs.paging.reload();
+			      }
+			    },
+			  });
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
diff --git a/pages/order/my/components/orderList.vue b/pages/order/my/components/orderList.vue
new file mode 100644
index 0000000..f44058e
--- /dev/null
+++ b/pages/order/my/components/orderList.vue
@@ -0,0 +1,219 @@
+<template>
+	  <view @click="onOrderDetail(order.id)"  :id="`zp-id-${order.zp_index}`" :key="order.zp_index" v-for="(order,index) in orderList" class="order-card">
+	  	<view class="no-box">
+			<view class="order-no">
+				<u-icon name="order"></u-icon>
+				<text class="number">{{ order.no }}</text>
+			</view>
+			<view class="status">{{order.statusStr}}</view>
+		</view> 
+		
+		<view class="main-box" v-for="item in order.items" :key="item.id">
+			<view @tap.stop="onBuy(item.spuId)">
+				<u-avatar size="100" :src="item.avatar"></u-avatar>
+			</view>
+			<view class="right-box">
+				<view class="nickname-box">
+					<view class="nickname" v-if="item.nickname">{{item.nickname}}</view>
+					<view class="nickname" v-else>待接单..</view>
+					<view class="info">订单时间：{{order.createTimeStr}}</view> 
+					<view class="info">服务内容：{{item.spuName}} {{item.properties.map((property) => property.valueName).join(' ')}}×{{item.count}}</view>
+					<view class="info">开始服务时间：{{order.deliveryTimeStr}}</view>
+					<view class="info">
+						<text>剩余时间：</text>
+						<view v-if="order.receiveTime">
+							<text v-if="order.end">已结束</text>
+							<view v-else>
+								<u-count-down :timestamp="order.timestamp" format="DD天HH时mm分ss秒" @end="order.end = true"></u-count-down>
+							</view>
+						</view>
+						<text v-else>暂未接单</text>
+					</view>
+					<view class="info" v-if="order.status == 40">取消原因：{{order.cancelReason}}</view>
+				</view>
+				<view class="price-box"> 
+					<text class="price">{{order.payPrice}}</text>
+					<text>/钻</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="bottom-box">
+			<view class="btn-box">
+				<view v-if="order.buttons.includes('detail')" @tap.stop="onOrderDetail(order.id)" class="btn">查看详情</view>
+				<view v-if="order.buttons.includes('unpay')" @tap.stop="onOrderDetail(order.id)" class="btn">取消订单</view>
+				<view v-if="order.buttons.includes('cancel')" @tap.stop="onCancel(order.id)" class="btn">取消订单</view>
+				<view v-if="order.buttons.includes('buy') && order.items[0].spuId" @tap.stop="onBuy(order.items[0].spuId)" class="btn active">再来一单</view>
+				<view v-if="order.buttons.includes('comment')" @tap.stop="onComment(order.id)" class="btn active">评价</view>
+				<view v-if="order.buttons.includes('pay')" @tap.stop="onPay(order.payOrderId)" class="btn active">继续支付</view>
+			</view>
+		</view>
+		
+	  </view>
+  
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import dayjs from 'dayjs';
+	export default {
+		components: {
+			
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		emits: ["onCancel"],
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			orderList() {
+				this.virtualList.forEach((order) => order.createTimeStr = sheep.$helper.timeFormat(order.createTime, 'yyyy-mm-dd hh:MM:ss'));
+				this.virtualList.forEach((order) => order.deliveryTimeStr = order.deliveryTime ? sheep.$helper.timeFormat(order.deliveryTime, 'yyyy-mm-dd hh:MM:ss') : '');
+				this.virtualList.forEach((order) => order.timestamp = order.receiveTime ? sheep.$helper.parseTimeData(order.receiveTime) : 0);
+				return this.virtualList;
+			},
+		},
+		methods: {
+			// 订单详情
+			onOrderDetail(id) { 
+			  sheep.$router.go('/pages/order/my/detail', {
+			    id,
+			  });
+			},
+			onCancel(orderId) {
+			  this.$emit('onCancel', orderId);
+			},
+			onBuy(id) {
+			  if(id){
+				  sheep.$router.go('/pages/clerk/detail/index', {
+				  				id,
+				  });
+			  }
+			},
+			// 评价
+			onComment(id) { 
+			  sheep.$router.go('/pages/goods/comment/worker/add', {
+			    id,
+			  });
+			},
+			// 继续支付
+			onPay(payOrderId) {
+			  sheep.$router.go('/pages/pay/worker/index', {
+			    id: payOrderId,
+			  });
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.order-card {
+		padding: 10px;
+		margin-top: 10px;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		
+		.no-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex: 1;
+			padding-bottom: 10px;
+			color: rgb(100, 101, 102);
+			
+			.order-no {
+				
+				.number {
+					margin-left: 5px;
+					font-size: 22rpx;
+				}
+			}
+			
+			.status {
+				font-size: 22rpx;
+			}
+		}
+		
+		.main-box {
+			display: flex;
+			padding: 10px 0;
+			border-top: 1px solid #fbf0f0;
+			border-bottom: 1px solid #fbf0f0;
+			margin-bottom: 10px;
+			
+			.right-box {
+				display: flex;
+				justify-content: space-between;
+				flex: 1;
+				align-items: center;
+				margin-left: 10px;
+				
+				.nickname {
+					font-size: 12px;
+					font-weight: bold;
+					margin-bottom: 10px;
+				}
+				
+				.info {
+					font-size: 22rpx;
+					color: rgb(100, 101, 102);
+					line-height: 22rpx;
+					margin-bottom: 5px;
+					display: flex;
+					align-items: center;
+					
+					.weixin {
+						margin-right: 5px;
+					}
+				}
+				
+				.price-box {
+					font-size: 22rpx;
+					color: rgb(100, 101, 102);
+					
+					.price {
+						font-size: 34rpx;
+						font-weight: bold;
+						color: var(--ui-BG-Main);
+					}
+				}
+			}
+		}
+		
+		.bottom-box {
+			display: flex;
+			justify-content: flex-end;
+			
+			.btn-box {
+				display: flex;
+				align-items: center;
+			}
+			
+			.btn {
+				background-color: #ddd;
+				color: rgb(100, 101, 102);
+				font-size: 22rpx;
+				border-radius: 40px;
+				padding: 5px 10px;
+				margin-left: 10px;
+				min-width: 140rpx;
+				display: flex;
+				justify-content: center;
+			}
+			
+			.active {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/my/components/tabBox.vue b/pages/order/my/components/tabBox.vue
new file mode 100644
index 0000000..db9711d
--- /dev/null
+++ b/pages/order/my/components/tabBox.vue
@@ -0,0 +1,47 @@
+<template>
+	<view>
+		<u-tabs :list="tabList" bg-color="#fff" font-size="28" active-color="var(--ui-BG-Main)" :is-scroll="false" v-model="current" @change="change"></u-tabs>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			currentValue: 0,
+			tabList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			current: {
+				get() {
+				    return this.currentValue;
+				},
+				set(newValue) {
+					
+				}
+			},
+		},
+		methods: {
+			change(index) {
+				this.$emit('change', index);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tab-box {
+		background-color: #fff;
+		padding: 5px 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/my/confirm.vue b/pages/order/my/confirm.vue
new file mode 100644
index 0000000..2476e5d
--- /dev/null
+++ b/pages/order/my/confirm.vue
@@ -0,0 +1,426 @@
+<template>
+  <s-layout title="确认订单">
+    <!-- 商品信息 -->
+    <view class="order-card-box ss-m-b-14">
+      <s-goods-item
+        v-for="item in state.orderInfo.items"
+        :key="item.skuId"
+        :img="item.picUrl"
+        :title="item.spuName"
+        :skuText="item.properties.map((property) => property.valueName).join(' ')"
+        :price="item.price"
+        :num="item.count"
+        marginBottom="10"
+      />
+      <view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
+        <view class="item-title">订单备注</view>
+        <view class="ss-flex ss-col-center">
+          <uni-easyinput
+            maxlength="20"
+            placeholder="请输入备注内容"
+            v-model="state.orderPayload.remark"
+            :inputBorder="false"
+            :clearable="false"
+          />
+        </view>
+      </view>
+    </view>
+
+    <!-- 价格信息 -->
+    <view class="bg-white total-card-box ss-p-20 ss-m-b-14 ss-r-10">
+      <view class="total-box-content border-bottom">
+        <view class="order-item ss-flex ss-col-center ss-row-between">
+          <view class="item-title">商品金额</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value ss-m-r-24">
+              ￥{{ fen2yuan(state.orderInfo.price.totalPrice) }}
+            </text>
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.type === 5"
+        >
+          <view class="item-title">积分抵扣</view>
+          <view class="ss-flex ss-col-center">
+            {{ state.pointStatus ? '剩余积分' : '当前积分' }}
+            <image
+              :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+              class="score-img"
+            />
+            <text class="item-value ss-m-r-24">
+              {{ state.pointStatus ? state.orderInfo.totalPoint - state.orderInfo.usePoint : (state.orderInfo.totalPoint || 0) }}
+            </text>
+            <checkbox-group @change="changeIntegral">
+              <checkbox :checked='state.pointStatus' :disabled="!state.orderInfo.totalPoint || state.orderInfo.totalPoint <= 0" />
+            </checkbox-group>
+          </view>
+        </view>
+        <view class="order-item ss-flex ss-col-center ss-row-between">
+          <view class="item-title">你的微信号</view>
+          <view class="ss-flex ss-col-center">
+            <uni-easyinput
+              maxlength="20"
+              placeholder="请输入正确的微信号"
+              v-model="addressState.receiverName"
+              :inputBorder="false"
+              :clearable="false"
+            />
+          </view>
+        </view>
+        <!-- 优惠劵：只有 type = 0 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.type === 0"
+        >
+          <view class="item-title">优惠券</view>
+          <view class="ss-flex ss-col-center" @tap="state.showCoupon = true">
+            <text class="item-value text-red" v-if="state.orderPayload.couponId > 0">
+              -￥{{ fen2yuan(state.orderInfo.price.couponPrice) }}
+            </text>
+            <text
+              class="item-value"
+              :class="state.couponInfo.length > 0 ? 'text-red' : 'text-disabled'"
+              v-else
+            >
+              {{
+                state.couponInfo.length > 0 ? state.couponInfo.length + ' 张可用' : '暂无可用优惠券'
+              }}
+            </text>
+            <text class="_icon-forward item-icon" />
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.discountPrice > 0"
+        >
+          <view class="item-title">活动优惠</view>
+          <view class="ss-flex ss-col-center">
+            <!--                @tap="state.showDiscount = true" TODO puhui999：【折扣】后续要把优惠信息打进去 -->
+            <text class="item-value text-red">
+              -￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
+            </text>
+            <text class="_icon-forward item-icon" />
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.vipPrice > 0"
+        >
+          <view class="item-title">会员优惠</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value text-red">
+              -￥{{ fen2yuan(state.orderInfo.price.vipPrice) }}
+            </text>
+          </view>
+        </view>
+      </view>
+      <view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
+        <view class="total-num ss-m-r-20">
+          共{{ state.orderInfo.items.reduce((acc, item) => acc + item.count, 0) }}件
+        </view>
+        <view>合计：</view>
+        <view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}</view>
+      </view>
+    </view>
+
+    <!-- 选择优惠券弹框 -->
+    <s-coupon-select
+      v-model="state.couponInfo"
+      :show="state.showCoupon"
+      @confirm="onSelectCoupon"
+      @close="state.showCoupon = false"
+    />
+
+    <!-- 满额折扣弹框 TODO @puhui999：【折扣】后续要把优惠信息打进去 -->
+    <s-discount-list
+      v-model="state.orderInfo"
+      :show="state.showDiscount"
+      @close="state.showDiscount = false"
+    />
+
+    <!-- 底部 -->
+    <su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
+      <view class="footer-box border-top ss-flex ss-row-between ss-p-x-20 ss-col-center">
+        <view class="total-box-footer ss-flex ss-col-center">
+          <view class="total-num ss-font-30 text-red">
+            ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}
+          </view>
+        </view>
+        <button
+          class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main"
+          @tap="onConfirm"
+        >
+          提交订单
+        </button>
+      </view>
+    </su-fixed>
+  </s-layout>
+</template>
+
+<script setup>
+  import { reactive, ref, watch } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import AddressSelection from '@/pages/order/addressSelection.vue';
+  import sheep from '@/sheep';
+  import OrderApi from '@/sheep/api/trade/order';
+  import CouponApi from '@/sheep/api/promotion/coupon';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+
+  const state = reactive({
+    orderPayload: {},
+    orderInfo: {
+      items: [], // 商品项列表
+      price: {}, // 价格信息
+    },
+    showCoupon: false, // 是否展示优惠劵
+    couponInfo: [], // 优惠劵列表
+    showDiscount: false, // 是否展示营销活动
+    // ========== 积分 ==========
+    pointStatus: false, //是否使用积分
+  });
+
+  const addressState = ref({
+    addressInfo: {}, // 选择的收货地址
+    deliveryType: 1, // 收货方式：1-快递配送，2-门店自提
+    isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
+    pickUpInfo: {}, // 选择的自提门店信息
+    receiverName: '', // 收件人名称
+    receiverMobile: '', // 收件人手机
+  });
+
+  // ========== 积分 ==========
+  /**
+   * 使用积分抵扣
+   */
+  const changeIntegral = async () => {
+    state.pointStatus = !state.pointStatus;
+    await getOrderInfo();
+  };
+
+  // 选择优惠券
+  async function onSelectCoupon(couponId) {
+    state.orderPayload.couponId = couponId;
+    await getOrderInfo();
+    state.showCoupon = false;
+  }
+
+  // 提交订单
+  function onConfirm() {
+    if (addressState.value.receiverName === '') {
+      sheep.$helper.toast('请填写正确的微信号');
+      return;
+    }
+    submitOrder();
+  }
+
+  // 创建订单&跳转
+  async function submitOrder() {
+    const { code, data } = await OrderApi.createWorkerOrder({
+      items: state.orderPayload.items,
+      couponId: state.orderPayload.couponId,
+      remark: state.orderPayload.remark,
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
+      receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pointStatus: state.pointStatus,
+      combinationActivityId: state.orderPayload.combinationActivityId,
+      combinationHeadId: state.orderPayload.combinationHeadId,
+      seckillActivityId: state.orderPayload.seckillActivityId,
+	  clerkId: state.orderPayload.clerkId,
+    });
+    if (code !== 0) {
+      return;
+    }
+    // 更新购物车列表，如果来自购物车
+    if (state.orderPayload.items[0].cartId > 0) {
+      sheep.$store('cart').getList();
+    }
+
+    // 跳转到支付页面
+    sheep.$router.redirect('/pages/pay/index', {
+      id: data.payOrderId,
+    });
+  }
+
+  // 检查库存 & 计算订单价格
+  async function getOrderInfo() {
+    // 计算价格
+    const { data, code } = await OrderApi.clerkOrder({
+      items: state.orderPayload.items,
+      couponId: state.orderPayload.couponId,
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
+      receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pointStatus: state.pointStatus,
+      combinationActivityId: state.orderPayload.combinationActivityId,
+      combinationHeadId: state.orderPayload.combinationHeadId,
+      seckillActivityId: state.orderPayload.seckillActivityId,
+	  clerkId: state.orderPayload.clerkId,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.orderInfo = data;
+    // 设置收货地址
+    if (state.orderInfo.address) {
+      addressState.value.addressInfo = state.orderInfo.address;
+    }
+  }
+
+  // 获取可用优惠券
+  async function getCoupons() {
+    const { code, data } = await CouponApi.getMatchCouponList(
+      state.orderInfo.price.payPrice,
+      state.orderInfo.items.map((item) => item.spuId),
+      state.orderPayload.items.map((item) => item.skuId),
+      state.orderPayload.items.map((item) => item.categoryId),
+    );
+    if (code === 0) {
+      state.couponInfo = data;
+    }
+  }
+
+  onLoad(async (options) => {
+    if (!options.data) {
+      sheep.$helper.toast('参数不正确，请检查！');
+      return;
+    }
+    state.orderPayload = JSON.parse(options.data);
+    await getOrderInfo();
+    await getCoupons();
+  });
+
+  // 使用 watch 监听地址和配送方式的变化
+  watch(addressState, async (newAddress, oldAddress) => {
+    // 如果收货地址或配送方式有变化，则重新计算价格
+    if (newAddress.addressInfo.id !== oldAddress.addressInfo.id || newAddress.deliveryType !== oldAddress.deliveryType) {
+      await getOrderInfo();
+    }
+  });
+</script>
+
+<style lang="scss" scoped>
+  :deep() {
+    .uni-input-wrapper {
+      width: 320rpx;
+    }
+
+    .uni-easyinput__content-input {
+      font-size: 28rpx;
+      height: 72rpx;
+      text-align: right !important;
+      padding-right: 0 !important;
+
+      .uni-input-input {
+        font-weight: 500;
+        color: #333333;
+        font-size: 26rpx;
+        height: 32rpx;
+        margin-top: 4rpx;
+      }
+    }
+
+    .uni-easyinput__content {
+      display: flex !important;
+      align-items: center !important;
+      justify-content: right !important;
+    }
+  }
+
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .order-item {
+    height: 80rpx;
+
+    .item-title {
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+
+    .item-value {
+      font-size: 28rpx;
+      font-weight: 500;
+      font-family: OPPOSANS;
+    }
+
+    .text-disabled {
+      color: #bbbbbb;
+    }
+
+    .item-icon {
+      color: $dark-9;
+    }
+
+    .remark-input {
+      text-align: right;
+    }
+
+    .item-placeholder {
+      color: $dark-9;
+      font-size: 26rpx;
+      text-align: right;
+    }
+  }
+
+  .total-box-footer {
+    height: 90rpx;
+
+    .total-num {
+      color: #333333;
+      font-family: OPPOSANS;
+    }
+  }
+
+  .footer-box {
+    height: 100rpx;
+
+    .submit-btn {
+      width: 240rpx;
+      height: 70rpx;
+      font-size: 28rpx;
+      font-weight: 500;
+
+      .goto-pay-text {
+        line-height: 28rpx;
+      }
+    }
+
+    .cancel-btn {
+      width: 240rpx;
+      height: 80rpx;
+      font-size: 26rpx;
+      background-color: #e5e5e5;
+      color: $dark-9;
+    }
+  }
+
+  .title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333333;
+  }
+
+  .subtitle {
+    font-size: 28rpx;
+    color: #999999;
+  }
+
+  .cicon-checkbox {
+    font-size: 36rpx;
+    color: var(--ui-BG-Main);
+  }
+
+  .cicon-box {
+    font-size: 36rpx;
+    color: #999999;
+  }
+</style>
diff --git a/pages/order/my/detail.vue b/pages/order/my/detail.vue
new file mode 100644
index 0000000..e03b0c4
--- /dev/null
+++ b/pages/order/my/detail.vue
@@ -0,0 +1,580 @@
+<!-- 订单详情 -->
+<template>
+  <s-layout title="订单详情" class="index-wrap" navbar="inner">
+    <!-- 订单状态 TODO -->
+    <view
+      class="state-box ss-flex-col ss-col-center ss-row-right"
+      :style="[
+        {
+          marginTop: '-' + Number(statusBarHeight + 88 + 22) + 'rpx',
+          paddingTop: Number(statusBarHeight + 88 + 22) + 'rpx',
+        },
+      ]"
+    >
+      <view class="ss-flex ss-m-t-32 ss-m-b-20">
+        <image
+          v-if="
+            state.orderInfo.status_code == 'unpaid' ||
+            state.orderInfo.status === 10 || // 待发货
+            state.orderInfo.status_code == 'nocomment'
+          "
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_loading.png')"
+        >
+        </image>
+        <image
+          v-if="
+            state.orderInfo.status_code == 'completed' ||
+            state.orderInfo.status_code == 'refund_agree'
+          "
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_success.png')"
+        >
+        </image>
+        <image
+          v-if="state.orderInfo.status_code == 'cancel' || state.orderInfo.status_code == 'closed'"
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_close.png')"
+        >
+        </image>
+        <image
+          v-if="state.orderInfo.status_code == 'noget'"
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_express.png')"
+        >
+        </image>
+        <view class="ss-font-30">{{ formatWorkerOrderStatus(state.orderInfo) }}</view>
+      </view>
+      <view class="ss-font-26 ss-m-x-20 ss-m-b-70">
+        {{ formatMyOrderStatusDescription(state.orderInfo) }}
+      </view>
+    </view>
+
+    <!-- 收货地址 -->
+    <view class="order-address-box" v-if="state.orderInfo.receiverAreaId > 0">
+      <view class="ss-flex ss-col-center">
+        <text class="address-username">
+          {{ state.orderInfo.receiverName }}
+        </text>
+        <text class="address-phone">{{ state.orderInfo.receiverMobile }}</text>
+      </view>
+      <view class="address-detail">
+        {{ state.orderInfo.receiverAreaName }} {{ state.orderInfo.receiverDetailAddress }}
+      </view>
+    </view>
+
+    <view
+      class="detail-goods"
+      :style="[{ marginTop: state.orderInfo.receiverAreaId > 0 ? '0' : '-40rpx' }]"
+    >
+      <!-- 订单信 -->
+      <view class="order-list" v-for="item in state.orderInfo.items" :key="item.goods_id">
+        <view class="order-card">
+          <s-goods-item
+            @tap="onGoodsDetail(item.spuId)"
+            :img="item.picUrl"
+            :title="item.spuName"
+            :skuText="item.properties.map((property) => property.valueName).join(' ')"
+            :price="item.price"
+            :num="item.count"
+          >
+            <template #tool>
+              <view class="ss-flex">
+                <button
+                  class="ss-reset-button apply-btn"
+                  v-if="[10].includes(state.orderInfo.status) && item.afterSaleStatus === 0"
+                  @tap.stop="
+                    sheep.$router.go('/pages/order/my/aftersale/apply', {
+                      orderId: state.orderInfo.id,
+                      itemId: item.id,
+                    })
+                  "
+                >
+                  确认取消
+                </button>
+              </view>
+            </template>
+            <template #priceSuffix>
+              <button class="ss-reset-button tag-btn" v-if="item.status_text">
+                {{ item.status_text }}
+              </button>
+            </template>
+          </s-goods-item>
+        </view>
+      </view>
+    </view>
+
+    <!--  自提核销  -->
+    <PickUpVerify :order-info="state.orderInfo" :systemStore="systemStore" ref="pickUpVerifyRef"></PickUpVerify>
+
+    <!-- 订单信息 -->
+    <view class="notice-box">
+      <view class="notice-box__content">
+        <view class="notice-item--center">
+          <view class="ss-flex ss-flex-1">
+            <text class="title">订单编号：</text>
+            <text class="detail">{{ state.orderInfo.no }}</text>
+          </view>
+          <button class="ss-reset-button copy-btn" @tap="onCopy">复制</button>
+        </view>
+        <view class="notice-item">
+          <text class="title">下单时间：</text>
+          <text class="detail">
+            {{ sheep.$helper.timeFormat(state.orderInfo.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </text>
+        </view>
+        <view class="notice-item" v-if="state.orderInfo.payTime">
+          <text class="title">支付时间：</text>
+          <text class="detail">
+            {{ sheep.$helper.timeFormat(state.orderInfo.payTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </text>
+        </view>
+        <view class="notice-item">
+          <text class="title">支付方式：</text>
+          <text class="detail">{{ state.orderInfo.payChannelName || '-' }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 价格信息 -->
+    <view class="order-price-box">
+      <view class="notice-item ss-flex ss-row-between">
+        <text class="title">订单总额</text>
+        <view class="ss-flex">
+          <text class="detail">￥{{ fen2yuan(state.orderInfo.totalPrice) }}</text>
+        </view>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.couponPrice > 0">
+        <text class="title">优惠劵金额</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.couponPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.pointPrice > 0">
+        <text class="title">积分抵扣</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.pointPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.discountPrice > 0">
+        <text class="title">活动优惠</text>
+        <text class="detail">¥{{ fen2yuan(state.orderInfo.discountPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.vipPrice > 0">
+        <text class="title">会员优惠</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.vipPrice) }}</text>
+      </view>
+      <view class="notice-item all-rpice-item ss-flex ss-m-t-20">
+        <text class="title">{{ state.orderInfo.payStatus ? '实付款' : '需付款' }}</text>
+        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.payPrice) }}</text>
+      </view>
+      <view
+        class="notice-item all-rpice-item ss-flex ss-m-t-20"
+        v-if="state.orderInfo.refundPrice > 0"
+      >
+        <text class="title">已退款</text>
+        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.refundPrice) }}</text>
+      </view>
+    </view>
+
+   
+  </s-layout>
+</template>
+ 
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive, ref } from 'vue';
+  import { isEmpty } from 'lodash-es';
+  import {
+    fen2yuan,
+    formatWorkerOrderStatus,
+    formatMyOrderStatusDescription,
+    handleOrderButtons,
+  } from '@/sheep/hooks/useGoods';
+  import OrderApi from '@/sheep/api/trade/order';
+  import DeliveryApi from '@/sheep/api/trade/delivery';
+  import PickUpVerify from '@/pages/order/pickUpVerify.vue';
+
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
+
+  const state = reactive({
+    orderInfo: {},
+    merchantTradeNo: '', // 商户订单号
+    comeinType: '', // 进入订单详情的来源类型
+  });
+
+  // ========== 门店自提（核销） ==========
+  const systemStore = ref({}); // 门店信息
+
+  // 复制
+  const onCopy = () => {
+    sheep.$helper.copyText(state.orderInfo.no);
+  };
+
+  // 去支付
+  function onPay(payOrderId) {
+    sheep.$router.go('/pages/pay/index', {
+      id: payOrderId,
+    });
+  }
+
+  // 查看商品
+  function onGoodsDetail(id) {
+	if(id) {
+		sheep.$router.go('/pages/clerk/detail/index', {
+		  id,
+		});
+	}
+  }
+
+  // 取消订单
+  async function onCancel(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消订单吗?',
+      success: async function(res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await OrderApi.cancelOrder(orderId);
+        if (code === 0) {
+          await getOrderDetail(orderId);
+        }
+      },
+    });
+  }
+
+  // 查看物流
+  async function onExpress(id) {
+    sheep.$router.go('/pages/order/express/log', {
+      id,
+    });
+  }
+
+  // 确认收货
+  async function onConfirm(orderId, ignore = false) {
+    // 需开启确认收货组件
+    // todo: 芋艿：待接入微信
+    // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+    // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+    let isOpenBusinessView = true;
+    if (
+      sheep.$platform.name === 'WechatMiniProgram' &&
+      !isEmpty(state.orderInfo.wechat_extra_data) &&
+      isOpenBusinessView &&
+      !ignore
+    ) {
+      mpConfirm(orderId);
+      return;
+    }
+
+    // 正常的确认收货流程
+    const { code } = await OrderApi.receiveOrder(orderId);
+    if (code === 0) {
+      await getOrderDetail(orderId);
+    }
+  }
+
+  // #ifdef MP-WEIXIN
+  // 小程序确认收货组件
+  function mpConfirm(orderId) {
+    if (!wx.openBusinessView) {
+      sheep.$helper.toast(`请升级微信版本`);
+      return;
+    }
+    wx.openBusinessView({
+      businessType: 'weappOrderConfirm',
+      extraData: {
+        merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
+        transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
+      },
+      success(response) {
+        console.log('success:', response);
+        if (response.errMsg === 'openBusinessView:ok') {
+          if (response.extraData.status === 'success') {
+            onConfirm(orderId, true);
+          }
+        }
+      },
+      fail(error) {
+        console.log('error:', error);
+      },
+      complete(result) {
+        console.log('result:', result);
+      },
+    });
+  }
+
+  // #endif
+
+  // 评价
+  function onComment(id) {
+    sheep.$router.go('/pages/goods/comment/add', {
+      id,
+    });
+  }
+
+  const pickUpVerifyRef = ref();
+
+  async function getOrderDetail(id) {
+    // 对详情数据进行适配
+    let res;
+    if (state.comeinType === 'wechat') {
+      // TODO 芋艿：微信场景下
+      res = await OrderApi.getOrder(id, {
+        merchant_trade_no: state.merchantTradeNo,
+      });
+    } else {
+      res = await OrderApi.getOrder(id);
+    }
+    if (res.code === 0) {
+      state.orderInfo = res.data;
+      handleOrderButtons(state.orderInfo);
+      // 配送方式：门店自提
+      if (res.data.pickUpStoreId) {
+        const { data } = await DeliveryApi.getDeliveryPickUpStore(res.data.pickUpStoreId);
+        systemStore.value = data || {};
+      }
+      if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
+        pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
+      }
+    } else {
+      sheep.$router.back();
+    }
+  }
+
+  onLoad(async (options) => {
+    let id = 0;
+    if (options.id) {
+      id = options.id;
+    }
+    // TODO 芋艿：下面两个变量，后续接入
+    state.comeinType = options.comein_type;
+    if (state.comeinType === 'wechat') {
+      state.merchantTradeNo = options.merchant_trade_no;
+    }
+    await getOrderDetail(id);
+  });
+</script>
+
+<style lang="scss" scoped>
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .apply-btn {
+    width: 140rpx;
+    height: 50rpx;
+    border-radius: 25rpx;
+    font-size: 24rpx;
+    border: 2rpx solid #dcdcdc;
+    line-height: normal;
+    margin-left: 16rpx;
+  }
+
+  .state-box {
+    color: rgba(#fff, 0.9);
+    width: 100%;
+    background: v-bind(headerBg) no-repeat,
+    linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    background-size: 750rpx 100%;
+    box-sizing: border-box;
+
+    .state-img {
+      width: 60rpx;
+      height: 60rpx;
+      margin-right: 20rpx;
+    }
+  }
+
+  .order-address-box {
+    background-color: #fff;
+    border-radius: 10rpx;
+    margin: -50rpx 20rpx 16rpx 20rpx;
+    padding: 44rpx 34rpx 42rpx 20rpx;
+    font-size: 30rpx;
+    box-sizing: border-box;
+    font-weight: 500;
+    color: rgba(51, 51, 51, 1);
+
+    .address-username {
+      margin-right: 20rpx;
+    }
+
+    .address-detail {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: rgba(153, 153, 153, 1);
+      margin-top: 20rpx;
+    }
+  }
+
+  .detail-goods {
+    border-radius: 10rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .order-list {
+      margin-bottom: 20rpx;
+      background-color: #fff;
+
+      .order-card {
+        padding: 20rpx 0;
+
+        .order-sku {
+          font-size: 24rpx;
+
+          font-weight: 400;
+          color: rgba(153, 153, 153, 1);
+          width: 450rpx;
+          margin-bottom: 20rpx;
+
+          .order-num {
+            margin-right: 10rpx;
+          }
+        }
+
+        .tag-btn {
+          margin-left: 16rpx;
+          font-size: 24rpx;
+          height: 36rpx;
+          color: var(--ui-BG-Main);
+          border: 2rpx solid var(--ui-BG-Main);
+          border-radius: 14rpx;
+          padding: 0 4rpx;
+        }
+      }
+    }
+  }
+
+  // 订单信息。
+  .notice-box {
+    background: #fff;
+    border-radius: 10rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .notice-box__head {
+      font-size: 30rpx;
+
+      font-weight: 500;
+      color: rgba(51, 51, 51, 1);
+      line-height: 80rpx;
+      border-bottom: 1rpx solid #dfdfdf;
+      padding: 0 25rpx;
+    }
+
+    .notice-box__content {
+      padding: 20rpx;
+
+      .self-pickup-box {
+        width: 100%;
+
+        .self-pickup--img {
+          width: 200rpx;
+          height: 200rpx;
+          margin: 40rpx 0;
+        }
+      }
+    }
+
+    .notice-item,
+    .notice-item--center {
+      display: flex;
+      align-items: center;
+      line-height: normal;
+      margin-bottom: 24rpx;
+
+      .title {
+        font-size: 28rpx;
+        color: #999;
+      }
+
+      .detail {
+        font-size: 28rpx;
+        color: #333;
+        flex: 1;
+      }
+    }
+  }
+
+  .copy-btn {
+    width: 100rpx;
+    line-height: 50rpx;
+    border-radius: 25rpx;
+    padding: 0;
+    background: rgba(238, 238, 238, 1);
+    font-size: 22rpx;
+    font-weight: 400;
+    color: rgba(51, 51, 51, 1);
+  }
+
+  // 订单价格信息
+  .order-price-box {
+    background-color: #fff;
+    border-radius: 10rpx;
+    padding: 20rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .notice-item {
+      line-height: 70rpx;
+
+      .title {
+        font-size: 28rpx;
+        color: #999;
+      }
+
+      .detail {
+        font-size: 28rpx;
+        color: #333;
+        font-family: OPPOSANS;
+      }
+    }
+
+    .all-rpice-item {
+      justify-content: flex-end;
+      align-items: center;
+
+      .title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+        line-height: normal;
+      }
+
+      .all-price {
+        font-size: 26rpx;
+        font-family: OPPOSANS;
+        line-height: normal;
+        color: $red;
+      }
+    }
+  }
+
+  // 底部
+  .footer-box {
+    height: 100rpx;
+    width: 100%;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    padding-right: 20rpx;
+
+    .cancel-btn {
+      width: 160rpx;
+      height: 60rpx;
+      background: #eeeeee;
+      border-radius: 30rpx;
+      margin-right: 20rpx;
+      font-size: 26rpx;
+      font-weight: 400;
+      color: #333333;
+    }
+
+    .pay-btn {
+      width: 160rpx;
+      height: 60rpx;
+      font-size: 26rpx;
+      border-radius: 30rpx;
+      font-weight: 500;
+      color: #fff;
+    }
+  }
+</style>
diff --git a/pages/order/my/index.vue b/pages/order/my/index.vue
new file mode 100644
index 0000000..96befc2
--- /dev/null
+++ b/pages/order/my/index.vue
@@ -0,0 +1,39 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<layout></layout>
+		
+		<s-menu-tools />
+	</view>
+</template>
+
+<script>
+	import layout from '@/pages/order/my/components/layout.vue';
+	export default {
+		components: {
+			layout,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		created() {
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fafafa;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/my/list - 副本.vue b/pages/order/my/list - 副本.vue
new file mode 100644
index 0000000..b7718c0
--- /dev/null
+++ b/pages/order/my/list - 副本.vue	
@@ -0,0 +1,514 @@
+<!-- 订单列表 -->
+<template>
+  <s-layout title="我的订单">
+    <su-sticky bgColor="#fff">
+      <su-tabs
+        :list="tabMaps"
+        :scrollable="false"
+        @change="onTabsChange"
+        :current="state.currentTab"
+      />
+    </su-sticky>
+    <s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单" />
+    <view v-if="state.pagination.total > 0">
+      <view
+        class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20"
+        v-for="order in state.pagination.list"
+        :key="order.id"
+      >
+        <view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
+          <view class="order-no">订单号：{{ order.no }}</view>
+          <view class="order-state ss-font-26" :class="formatOrderColor(order)">
+            {{ formatWorkerOrderStatus(order) }}
+          </view>
+        </view>
+        <view @tap.stop="onBuy(order.items[0].spuId)" class="border-bottom" v-for="item in order.items" :key="item.id">
+          <s-worker-item
+            :img="item.picUrl"
+            :title="item.spuName"
+            :skuText="item.properties.map((property) => property.valueName).join(' ')"
+            :price="item.price"
+            :num="item.count"
+          />
+        </view>
+        <view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20">
+          <view class="ss-flex ss-col-center">
+            <view class="discounts-title pay-color"
+              >共 {{ order.productCount }} 件商品,总金额:</view
+            >
+            <view class="discounts-money pay-color"> ￥{{ fen2yuan(order.payPrice) }} </view>
+          </view>
+        </view>
+        <view
+          class="order-card-footer ss-flex ss-col-center ss-p-x-20"
+          :class="order.buttons.length > 3 ? 'ss-row-between' : 'ss-row-right'"
+        >
+          <view class="ss-flex ss-col-center">
+            <button
+              v-if="order.buttons.includes('combination')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onOrderGroupon(order)"
+            >
+              拼团详情
+            </button>
+            <button
+              v-if="order.buttons.includes('detail')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onOrderDetail(order.id)"
+            >
+              查看详情
+            </button>
+            <button
+              v-if="order.buttons.includes('confirm')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onConfirm(order)"
+            >
+              确认收货
+            </button>
+            <button
+              v-if="order.buttons.includes('express')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onExpress(order.id)"
+            >
+              查看物流
+            </button>
+            <button
+              v-if="order.buttons.includes('cancel')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onCancel(order.id)"
+            >
+              取消订单
+            </button>
+			<button
+			  v-if="order.buttons.includes('unpay')"
+			  class="tool-btn ss-reset-button"
+			  @tap.stop="onOrderDetail(order.id)"
+			>
+			  取消订单
+			</button>
+            <button
+              v-if="order.buttons.includes('comment')"
+              class="tool-btn ss-reset-button"
+              @tap.stop="onComment(order.id)"
+            >
+              评价
+            </button>
+            <button
+              v-if="order.buttons.includes('delete')"
+              class="delete-btn ss-reset-button"
+              @tap.stop="onDelete(order.id)"
+            >
+              删除订单
+            </button>
+            <button
+              v-if="order.buttons.includes('pay')"
+              class="tool-btn ss-reset-button ui-BG-Main-Gradient"
+              @tap.stop="onPay(order.payOrderId)"
+            >
+              继续支付
+            </button>
+			<button
+			  v-if="order.buttons.includes('buy')"
+			  class="tool-btn ss-reset-button ui-BG-Main-Gradient"
+			  @tap.stop="onBuy(order.items[0].spuId)"
+			>
+			  再来一单
+			</button>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 加载更多 -->
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import { reactive } from 'vue';
+  import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
+  import {
+    fen2yuan,
+    formatOrderColor,
+    formatWorkerOrderStatus,
+    handleMyOrderButtons,
+  } from '@/sheep/hooks/useGoods';
+  import sheep from '@/sheep';
+  import _ from 'lodash-es';
+  import { isEmpty } from 'lodash-es';
+  import OrderApi from '@/sheep/api/trade/order';
+  import { resetPagination } from '@/sheep/util';
+
+  // 数据
+  const state = reactive({
+    currentTab: 0, // 选中的 tabMaps 下标
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 5,
+    },
+    loadStatus: '',
+  });
+
+  const tabMaps = [
+    {
+      name: '全部',
+    },
+    {
+      name: '待付款',
+      value: 0,
+    },
+    {
+      name: '待服务',
+      value: 10,
+    },
+    {
+      name: '服务中',
+      value: 20,
+    },
+    {
+      name: '待评价',
+      value: 30,
+    },
+  ];
+
+  // 切换选项卡
+  function onTabsChange(e) {
+    if (state.currentTab === e.index) {
+      return;
+    }
+    // 重头加载代码
+    resetPagination(state.pagination);
+    state.currentTab = e.index;
+    getOrderList();
+  }
+
+  // 订单详情
+  function onOrderDetail(id) { 
+    sheep.$router.go('/pages/order/my/detail', {
+      id,
+    });
+  }
+  
+  function onBuy(id) {
+	  sheep.$router.go('/pages/clerk/detail/index', {
+		id,
+	  });
+  }
+
+  // 跳转拼团记录的详情
+  function onOrderGroupon(order) {
+    sheep.$router.go('/pages/activity/groupon/detail', {
+      id: order.combinationRecordId,
+    });
+  }
+
+  // 继续支付
+  function onPay(payOrderId) {
+    sheep.$router.go('/pages/pay/worker/index', {
+      id: payOrderId,
+    });
+  }
+
+  // 评价
+  function onComment(id) {
+    sheep.$router.go('/pages/goods/comment/worker/add', {
+      id,
+    });
+  }
+
+  // 确认收货 TODO 芋艿：待测试
+  async function onConfirm(order, ignore = false) {
+    // 需开启确认收货组件
+    // todo: 芋艿：需要后续接入微信收货组件
+    // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+    // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+    let isOpenBusinessView = true;
+    if (
+      sheep.$platform.name === 'WechatMiniProgram' &&
+      !isEmpty(order.wechat_extra_data) &&
+      isOpenBusinessView &&
+      !ignore
+    ) {
+      mpConfirm(order);
+      return;
+    }
+
+    // 正常的确认收货流程
+    const { code } = await OrderApi.receiveOrder(order.id);
+    if (code === 0) {
+      resetPagination(state.pagination);
+      await getOrderList();
+    }
+  }
+
+  // #ifdef MP-WEIXIN
+  // 小程序确认收货组件 TODO 芋艿：后续再接入
+  function mpConfirm(order) {
+    if (!wx.openBusinessView) {
+      sheep.$helper.toast(`请升级微信版本`);
+      return;
+    }
+    wx.openBusinessView({
+      businessType: 'weappOrderConfirm',
+      extraData: {
+        merchant_id: '1481069012',
+        merchant_trade_no: order.wechat_extra_data.merchant_trade_no,
+        transaction_id: order.wechat_extra_data.transaction_id,
+      },
+      success(response) {
+        console.log('success:', response);
+        if (response.errMsg === 'openBusinessView:ok') {
+          if (response.extraData.status === 'success') {
+            onConfirm(order, true);
+          }
+        }
+      },
+      fail(error) {
+        console.log('error:', error);
+      },
+      complete(result) {
+        console.log('result:', result);
+      },
+    });
+  }
+  // #endif
+
+  // 查看物流
+  async function onExpress(id) {
+    sheep.$router.go('/pages/order/express/log', {
+      id,
+    });
+  }
+
+  // 取消订单
+  async function onCancel(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消订单吗?',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await OrderApi.cancelOrder(orderId);
+        if (code === 0) {
+          // 修改数据的状态
+          let index = state.pagination.list.findIndex((order) => order.id === orderId);
+          const orderInfo = state.pagination.list[index];
+          orderInfo.status = 40;
+          handleMyOrderButtons(orderInfo);
+        }
+      },
+    });
+  }
+
+  // 删除订单
+  function onDelete(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要删除订单吗?',
+      success: async function (res) {
+        if (res.confirm) {
+          const { code } = await OrderApi.deleteOrder(orderId);
+          if (code === 0) {
+            // 删除数据
+            let index = state.pagination.list.findIndex((order) => order.id === orderId);
+            state.pagination.list.splice(index, 1);
+          }
+        }
+      },
+    }); 
+  }
+
+  // 获取订单列表
+  async function getOrderList() {
+    state.loadStatus = 'loading';
+    let { code, data } = await OrderApi.getOrderPage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+      status: tabMaps[state.currentTab].value,
+      commentStatus: tabMaps[state.currentTab].value === 30 ? false : null,
+    });
+    if (code !== 0) {
+      return;
+    } 
+    data.list.forEach((order) => handleMyOrderButtons(order));
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  onLoad(async (options) => {
+    if (options.type) {
+      state.currentTab = options.type;
+    }
+    await getOrderList();
+  });
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getOrderList();
+  }
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
+
+  // 下拉刷新
+  onPullDownRefresh(() => {
+    resetPagination(state.pagination);
+    getOrderList();
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 800);
+  });
+</script>
+
+<style lang="scss" scoped>
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .tool-btn {
+    width: 160rpx;
+    height: 60rpx;
+    background: #f6f6f6;
+    font-size: 26rpx;
+    border-radius: 30rpx;
+    margin-right: 10rpx;
+
+    &:last-of-type {
+      margin-right: 0;
+    }
+  }
+
+  .delete-btn {
+    width: 160rpx;
+    height: 56rpx;
+    color: #ff3000;
+    background: #fee;
+    border-radius: 28rpx;
+    font-size: 26rpx;
+    margin-right: 10rpx;
+    line-height: normal;
+
+    &:last-of-type {
+      margin-right: 0;
+    }
+  }
+
+  .apply-btn {
+    width: 140rpx;
+    height: 50rpx;
+    border-radius: 25rpx;
+    font-size: 24rpx;
+    border: 2rpx solid #dcdcdc;
+    line-height: normal;
+    margin-left: 16rpx;
+  }
+
+  .swiper-box {
+    flex: 1;
+
+    .swiper-item {
+      height: 100%;
+      width: 100%;
+    }
+  }
+
+  .order-list-card-box {
+    .order-card-header {
+      height: 80rpx;
+
+      .order-no {
+        font-size: 26rpx;
+        font-weight: 500;
+      }
+
+      .order-state {
+      }
+    }
+
+    .pay-box {
+      .discounts-title {
+        font-size: 24rpx;
+        line-height: normal;
+        color: #999999;
+      }
+
+      .discounts-money {
+        font-size: 24rpx;
+        line-height: normal;
+        color: #999;
+        font-family: OPPOSANS;
+      }
+
+      .pay-color {
+        color: #333;
+      }
+    }
+
+    .order-card-footer {
+      height: 100rpx;
+
+      .more-item-box {
+        padding: 20rpx;
+
+        .more-item {
+          height: 60rpx;
+
+          .title {
+            font-size: 26rpx;
+          }
+        }
+      }
+
+      .more-btn {
+        color: $dark-9;
+        font-size: 24rpx;
+      }
+
+      .content {
+        width: 154rpx;
+        color: #333333;
+        font-size: 26rpx;
+        font-weight: 500;
+      }
+    }
+  }
+
+  :deep(.uni-tooltip-popup) {
+    background: var(--ui-BG);
+  }
+
+  .warning-color {
+    color: #faad14;
+  }
+
+  .danger-color {
+    color: #ff3000;
+  }
+
+  .success-color {
+    color: #52c41a;
+  }
+
+  .info-color {
+    color: #999999;
+  }
+</style>
diff --git a/pages/order/my/list.vue b/pages/order/my/list.vue
new file mode 100644
index 0000000..6e2bdbb
--- /dev/null
+++ b/pages/order/my/list.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<layout ref="order"></layout>
+		
+		<s-menu-tools />
+		<s-auth-modal />
+	</view>
+</template>
+
+<script>
+	import layout from '@/pages/order/my/components/layout.vue';
+	export default {
+		components: {
+			layout,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				currentIndex: 0,
+			}
+		},
+		onLoad(options) {
+		  if (options.type) {
+		    this.currentIndex = options.type;
+		  }
+		  this.$nextTick(() => {
+		  	this.$refs.order.tabChange(this.currentIndex);
+		  });
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fafafa;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/pickUpVerify.vue b/pages/order/pickUpVerify.vue
new file mode 100644
index 0000000..1e8bb6e
--- /dev/null
+++ b/pages/order/pickUpVerify.vue
@@ -0,0 +1,261 @@
+<template>
+  <view class='order-details'>
+    <!--  自提商品核销  -->
+    <view v-if="orderInfo.deliveryType === 2 && orderInfo.payStatus" class="writeOff borRadius14">
+      <view class="title">核销信息</view>
+      <view class="grayBg flex-center">
+        <view class="pictrue">
+          <image
+            v-if="!!painterImageUrl"
+            :src="painterImageUrl"
+            :style="{width: `${state.qrcodeSize}px`, height: `${state.qrcodeSize}px`}"
+            :show-menu-by-longpress="true"
+          />
+        </view>
+      </view>
+      <view class="gear">
+        <image :src="sheep.$url.static('/static/images/writeOff.png', 'local')"></image>
+      </view>
+      <view class="num">{{ orderInfo.pickUpVerifyCode }}</view>
+      <view class="rules">
+        <!-- TODO puhui999: 需要后端放回：使用 receiveTime 即可 -->
+<!--        <view class="item">-->
+<!--          <view class="rulesTitle flex flex-wrap align-center">-->
+<!--            核销时间-->
+<!--          </view>-->
+<!--          <view class="info">-->
+<!--            每日：-->
+<!--            <text class="time">2020-2-+52</text>-->
+<!--          </view>-->
+<!--        </view>-->
+        <view class="item">
+          <view class="rulesTitle flex flex-wrap align-center">
+            <text class="iconfont icon-shuoming1"></text>
+            使用说明
+          </view>
+          <view class="info">可将二维码出示给店员扫描或提供数字核销码</view>
+        </view>
+      </view>
+    </view>
+    <view v-if="orderInfo.deliveryType === 2" class="map flex flex-wrap align-center ss-row-between borRadius14">
+      <view>自提地址信息</view>
+      <view class="place cart-color flex flex-wrap flex-center" @tap="showMaoLocation">
+        查看位置
+      </view>
+    </view>
+    <!--  海报画板：默认隐藏只用来生成海报。生成方式为主动调用  -->
+    <l-painter
+      v-if="showPainter"
+      isCanvasToTempFilePath
+      pathType="url"
+      @success="setPainterImageUrl"
+      hidden
+      ref="painterRef"
+    />
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { reactive, ref } from 'vue';
+
+  const props = defineProps({
+    orderInfo: {
+      type: Object,
+      default() {},
+    },
+    systemStore:{
+      type: Object,
+      default() {},
+    }
+  });
+  const state = reactive({
+    qrcodeSize: 145
+  })
+
+  /**
+   * 打开地图
+   */
+  const showMaoLocation = () => {
+    console.log(props.systemStore);
+    if (!props.systemStore.latitude || !props.systemStore.longitude) {
+      sheep.$helper.toast('缺少经纬度信息无法查看地图!');
+      return
+    }
+    uni.openLocation({
+      latitude: props.systemStore.latitude,
+      longitude: props.systemStore.longitude,
+      scale: 8,
+      name: props.systemStore.name,
+      address: props.systemStore.areaName + props.systemStore.detailAddress,
+    });
+  }
+  /**
+   * 拨打电话
+   */
+  const makePhone = () => {
+    uni.makePhoneCall({
+      phoneNumber: props.systemStore.phone
+    })
+  }
+
+  const painterRef = ref(); // 海报画板
+  const painterImageUrl = ref(); // 海报 url
+  const showPainter = ref(true)
+  // 渲染海报
+  const renderPoster = async (poster) => {
+    await painterRef.value.render(poster);
+  };
+  // 获得生成的图片
+  const setPainterImageUrl = (path) => {
+    painterImageUrl.value = path;
+    showPainter.value = false
+  };
+  /**
+   * 生成核销二维码
+   */
+  const markCode = (text) => {
+    renderPoster({
+      css: {
+        width: `${state.qrcodeSize}px`,
+        height: `${state.qrcodeSize}px`
+      },
+      views:[
+        {
+          type: 'qrcode',
+          text: text,
+          css: {
+            width: `${state.qrcodeSize}px`,
+            height: `${state.qrcodeSize}px`
+          }
+        }
+      ]
+    })
+  }
+  defineExpose({
+    markCode
+  })
+</script>
+
+<style scoped lang="scss">
+  // TODO puhui999: 样式需要调整有 bug
+  .borRadius14 {
+    border-radius: 14rpx !important;
+  }
+  .cart-color {
+    color: #E93323 !important;
+    border: 1px solid #E93323 !important
+  }
+  .order-details{
+    border-radius: 10rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+  }
+  .order-details .writeOff {
+    background-color: #fff;
+    margin-top: 15rpx;
+    padding-bottom: 50rpx;
+  }
+
+  .order-details .writeOff .title {
+    font-size: 30rpx;
+    color: #282828;
+    height: 87rpx;
+    border-bottom: 1px solid #f0f0f0;
+    padding: 0 24rpx;
+    line-height: 87rpx;
+  }
+
+  .order-details .writeOff .grayBg {
+    background-color: #f2f5f7;
+    width: 590rpx;
+    height: 384rpx;
+    border-radius: 20rpx 20rpx 0 0;
+    margin: 50rpx auto 0 auto;
+    padding-top: 55rpx;
+  }
+
+  .order-details .writeOff .grayBg .pictrue {
+    width: 290rpx;
+    height: 290rpx;
+  }
+
+  .order-details .writeOff .grayBg .pictrue image {
+    width: 100%;
+    height: 100%;
+  }
+
+  .order-details .writeOff .gear {
+    width: 590rpx;
+    height: 30rpx;
+    margin: 0 auto;
+  }
+
+  .order-details .writeOff .gear image {
+    width: 100%;
+    height: 100%;
+  }
+
+  .order-details .writeOff .num {
+    background-color: #f0c34c;
+    width: 590rpx;
+    height: 84rpx;
+    color: #282828;
+    font-size: 48rpx;
+    margin: 0 auto;
+    border-radius: 0 0 20rpx 20rpx;
+    text-align: center;
+    padding-top: 4rpx;
+  }
+
+  .order-details .writeOff .rules {
+    margin: 46rpx 30rpx 0 30rpx;
+    border-top: 1px solid #f0f0f0;
+    padding-top: 10rpx;
+  }
+
+  .order-details .writeOff .rules .item {
+    margin-top: 20rpx;
+  }
+
+  .order-details .writeOff .rules .item .rulesTitle {
+    font-size: 28rpx;
+    color: #282828;
+  }
+
+  .order-details .writeOff .rules .item .rulesTitle .iconfont {
+    font-size: 30rpx;
+    color: #333;
+    margin-right: 8rpx;
+    margin-top: 5rpx;
+  }
+
+  .order-details .writeOff .rules .item .info {
+    font-size: 28rpx;
+    color: #999;
+    margin-top: 7rpx;
+  }
+
+  .order-details .writeOff .rules .item .info .time {
+    margin-left: 20rpx;
+  }
+
+  .order-details .map {
+    height: 86rpx;
+    font-size: 30rpx;
+    color: #282828;
+    line-height: 86rpx;
+    border-bottom: 1px solid #f0f0f0;
+    margin-top: 15rpx;
+    background-color: #fff;
+    padding: 0 24rpx;
+  }
+
+  .order-details .map .place {
+    font-size: 26rpx;
+    width: 176rpx;
+    height: 50rpx;
+    border-radius: 25rpx;
+    line-height: 50rpx;
+    text-align: center;
+  }
+</style>
diff --git a/pages/order/receive/components/layout.vue b/pages/order/receive/components/layout.vue
new file mode 100644
index 0000000..7944220
--- /dev/null
+++ b/pages/order/receive/components/layout.vue
@@ -0,0 +1,93 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" use-virtual-list :force-close-inner-list="true" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @scroll="scroll" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<su-navbar :title="title" statusBar></su-navbar>
+				<tab-box></tab-box>
+			</template>  
+			   
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<order-list :virtualList="virtualList"></order-list>
+			
+		</z-paging>
+		
+	</view>
+</template>
+
+<script>
+	import TabBox from '@/pages/order/receive/components/tabBox.vue';
+	import OrderList from '@/pages/order/receive/components/orderList.vue';
+	import UserApi from '@/sheep/api/member/user';
+	export default {
+		components: {
+			TabBox, 
+			OrderList,
+		}, 
+		props: {
+			title: {
+				type: String,
+				default: '接单中心',
+			}
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 0,
+				height: 0,
+				
+				current: 0,
+			}
+		},
+		methods: {
+			initNav(e) {
+				this.height = e.height;
+				this.paddingTop = this.height;
+			},
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					random: this.tabIndex === 1
+				}
+				UserApi.getUserPage(params).then(res => {
+					// 将请求的结果数组传递给z-paging
+					this.$refs.paging.complete(res.data.list);
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			change(e) {
+				this.current = e;
+				this.scrollTop = 0;
+				this.$refs.paging.reload();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
diff --git a/pages/order/receive/components/orderList.vue b/pages/order/receive/components/orderList.vue
new file mode 100644
index 0000000..5c21013
--- /dev/null
+++ b/pages/order/receive/components/orderList.vue
@@ -0,0 +1,163 @@
+<template>
+	  <view @click="detail(item)"  :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in virtualList" class="order-card">
+	  	<view class="no-box">
+			<view class="order-no">
+				<u-icon name="order"></u-icon>
+				<text class="number">123213123123</text>
+			</view>
+			<view class="status">待服务</view>
+		</view>
+		
+		<view class="main-box">
+			<u-avatar size="100" src="http://cos.duopei.feiniaowangluo.com/34/clerk/1720278125689P34fP9MU1c.jpg?imageView2/1/w/200/h/200"></u-avatar>
+			<view class="right-box">
+				<view class="nickname-box">
+					<view class="nickname">碎冰冰</view>
+					<view class="info">订单时间：2024-08-10</view>
+					<view class="info">服务内容：文字×1</view>
+					<view class="info">
+						<text class="weixin">微信：rbtnet</text>
+						<u-icon name="outline-copy" custom-prefix="iconfont"></u-icon>
+					</view>
+					<view class="info">剩余时间：已结束</view>
+					<view class="info">取消原因：</view>
+				</view>
+				<view class="price-box">
+					<text class="price">5.00</text>
+					<text>/钻</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="bottom-box">
+			<view class="btn-box">
+				<view class="btn active">结束服务</view>
+				<view class="btn">取消接单</view>
+			</view>
+		</view>
+		
+	  </view>
+  
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.order-card {
+		padding: 10px;
+		margin-top: 10px;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		
+		.no-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex: 1;
+			padding-bottom: 10px;
+			color: rgb(100, 101, 102);
+			
+			.order-no {
+				
+				.number {
+					margin-left: 5px;
+					font-size: 22rpx;
+				}
+			}
+			
+			.status {
+				font-size: 22rpx;
+			}
+		}
+		
+		.main-box {
+			display: flex;
+			padding: 10px 0;
+			border-top: 1px solid #fbf0f0;
+			border-bottom: 1px solid #fbf0f0;
+			margin-bottom: 10px;
+			
+			.right-box {
+				display: flex;
+				justify-content: space-between;
+				flex: 1;
+				align-items: center;
+				margin-left: 10px;
+				
+				.nickname {
+					font-size: 12px;
+					font-weight: bold;
+					margin-bottom: 10px;
+				}
+				
+				.info {
+					font-size: 22rpx;
+					color: rgb(100, 101, 102);
+					line-height: 22rpx;
+					margin-bottom: 5px;
+					
+					.weixin {
+						margin-right: 5px;
+					}
+				}
+				
+				.price-box {
+					font-size: 22rpx;
+					color: rgb(100, 101, 102);
+					
+					.price {
+						font-size: 34rpx;
+						font-weight: bold;
+						color: var(--ui-BG-Main);
+					}
+				}
+			}
+		}
+		
+		.bottom-box {
+			display: flex;
+			justify-content: flex-end;
+			
+			.btn-box {
+				display: flex;
+				align-items: center;
+			}
+			
+			.btn {
+				background-color: #ddd;
+				color: rgb(100, 101, 102);
+				font-size: 22rpx;
+				border-radius: 40px;
+				padding: 5px 10px;
+				margin-left: 10px;
+			}
+			
+			.active {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/receive/components/tabBox.vue b/pages/order/receive/components/tabBox.vue
new file mode 100644
index 0000000..532c152
--- /dev/null
+++ b/pages/order/receive/components/tabBox.vue
@@ -0,0 +1,49 @@
+<template>
+	<view>
+		<u-tabs :list="list" bg-color="#fff" font-size="28" active-color="var(--ui-BG-Main)" :is-scroll="false" v-model="current" @change="change"></u-tabs>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			currentValue: {
+				type: Number,
+				default: 0,
+			},
+		},
+		data() {
+			return {
+				list: [{
+					name: '全部'
+				}, {
+					name: '待接单'
+				}, {
+					name: '服务中',
+				}, {
+					name: '已完成',
+				}],
+				
+				current: 0,
+			}
+		},
+		created() {
+			this.current = this.currentValue;
+		},
+		methods: {
+			change(index) {
+				this.$emit('change', index);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tab-box {
+		background-color: #fff;
+		padding: 5px 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/receive/index.vue b/pages/order/receive/index.vue
new file mode 100644
index 0000000..be27386
--- /dev/null
+++ b/pages/order/receive/index.vue
@@ -0,0 +1,39 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<layout></layout>
+		
+		<s-menu-tools />
+	</view>
+</template>
+
+<script>
+	import layout from '@/pages/order/receive/components/layout.vue';
+	export default {
+		components: {
+			layout,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		created() {
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fafafa;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/worker/aftersale/apply.vue b/pages/order/worker/aftersale/apply.vue
new file mode 100644
index 0000000..4ebd868
--- /dev/null
+++ b/pages/order/worker/aftersale/apply.vue
@@ -0,0 +1,318 @@
+<!-- 售后申请 -->
+<template>
+  <s-layout title="取消接单">
+    <!-- 售后商品 -->
+    <view class="goods-box">
+      <s-goods-item
+        :img="state.item.picUrl"
+        :title="state.item.spuName"
+        :skuText="state.item.properties?.map((property) => property.valueName).join(' ')"
+        :price="state.item.price"
+        :num="state.item.count"
+      />
+    </view>
+
+    <uni-forms ref="form" v-model="formData" :rules="rules" label-position="top">
+     
+      <!-- 退款金额 -->
+      <view class="refund-item ss-flex ss-col-center ss-row-between" @tap="state.showModal = true">
+        <text class="item-title">退款金额</text>
+        <view class="ss-flex refund-cause ss-col-center">
+          <text class="ss-m-r-20">￥{{ fen2yuan(state.item.payPrice) }}</text>
+        </view>
+      </view>
+      <!-- 留言 -->
+      <view class="refund-item">
+        <view class="item-title ss-m-b-20">取消原因</view>
+        <view class="describe-box">
+          <uni-easyinput
+            :inputBorder="false"
+            class="describe-content"
+            type="textarea"
+            maxlength="120"
+            autoHeight
+            v-model="formData.applyDescription"
+            placeholder="如果因为个人原因暂时无法接单,建议先添加老板约定其它服务时间~"
+          />
+        </view>
+      </view>
+    </uni-forms>
+
+    <!-- 底部按钮 -->
+    <su-fixed bottom placeholder>
+      <view class="foot-wrap">
+        <view class="foot_box ss-flex ss-col-center ss-row-between ss-p-x-30">
+          <button class="ss-reset-button contcat-btn" @tap="sheep.$router.go('/pages/chat/index')">
+            联系客服
+          </button>
+          <button class="ss-reset-button ui-BG-Main-Gradient sub-btn" @tap="submit">提交</button>
+        </view>
+      </view>
+    </su-fixed>
+
+    <!-- 申请原因弹窗 -->
+    <su-popup :show="state.showModal" round="10" :showClose="true" @close="state.showModal = false">
+      <view class="modal-box page_box">
+        <view class="modal-head item-title head_box ss-flex ss-row-center ss-col-center">
+          申请原因
+        </view>
+        <view class="modal-content content_box">
+          <radio-group @change="onChange">
+            <label class="radio ss-flex ss-col-center" v-for="item in state.reasonList" :key="item">
+              <view class="ss-flex-1 ss-p-20">{{ item }}</view>
+              <radio
+                :value="item"
+                color="var(--ui-BG-Main)"
+                :checked="item === state.currentValue"
+              />
+            </label>
+          </radio-group>
+        </view>
+        <view class="modal-foot foot_box ss-flex ss-row-center ss-col-center">
+          <button class="ss-reset-button close-btn ui-BG-Main-Gradient" @tap="onReason">
+            确定
+          </button>
+        </view>
+      </view>
+    </su-popup>
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive, ref } from 'vue';
+  import OrderApi from '@/sheep/api/trade/order';
+  import TradeConfigApi from '@/sheep/api/trade/config';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import AfterSaleApi from '@/sheep/api/trade/afterSale';
+  import { WxaSubscribeTemplate } from '@/sheep/util/const';
+
+  const form = ref(null);
+  const state = reactive({
+    orderId: 0, // 订单编号
+    itemId: 0, // 订单项编号
+    order: {}, // 订单
+    item: {}, // 订单项
+    config: {}, // 交易配置
+
+    // 售后类型
+    wayList: [
+      {
+        text: '仅退款',
+        value: '10',
+      },
+      {
+        text: '退款退货',
+        value: '20',
+      },
+    ],
+    reasonList: [], // 可选的申请原因数组
+    showModal: false, // 是否显示申请原因弹窗
+    currentValue: '', // 当前选择的售后原因
+  });
+  let formData = reactive({
+    way: '',
+    applyReason: '',
+    applyDescription: '',
+    images: [],
+  });
+  const rules = reactive({});
+
+  // 提交表单
+  async function submit() {
+	if(!formData.applyDescription){
+		sheep.$helper.toast(`请输入取消原因`);
+		return;
+	}  
+	  
+    let data = {
+      orderItemId: state.itemId,
+      refundPrice: state.item.payPrice,
+      ...formData,
+    };
+    const { code } = await AfterSaleApi.createAfterSale(data);
+    if (code === 0) {
+      uni.showToast({
+        title: '申请成功',
+      });
+      sheep.$router.go('/pages/order/worker/list');
+    }
+  }
+
+  // 选择售后类型
+  function onRefundChange(e) {
+    formData.way = e;
+    // 清理理由
+    state.reasonList =
+      formData.way === '10'
+        ? state.config.afterSaleRefundReasons || []
+        : state.config.afterSaleReturnReasons || [];
+    formData.applyReason = '';
+    state.currentValue = '';
+  }
+
+  // 选择申请原因
+  function onChange(e) {
+    state.currentValue = e.detail.value;
+  }
+
+  // 确定
+  function onReason() {
+    formData.applyReason = state.currentValue;
+    state.showModal = false;
+  }
+
+  onLoad(async (options) => {
+    // 解析参数
+    if (!options.orderId || !options.itemId) {
+      sheep.$helper.toast(`缺少订单信息，请检查`);
+      return;
+    }
+    state.orderId = options.orderId;
+    state.itemId = parseInt(options.itemId);
+
+    // 读取订单信息
+    const { code, data } = await OrderApi.getOrder(state.orderId);
+    if (code !== 0) {
+      return;
+    }
+    state.order = data;
+    state.item = data.items.find((item) => item.id === state.itemId) || {};
+
+    // 设置选项
+    if (state.order.status === 10) {
+      state.wayList.splice(1, 1);
+    }
+
+    // 读取配置
+    state.config = (await TradeConfigApi.getTradeConfig()).data;
+	
+	onRefundChange("10");
+  });
+</script>
+
+<style lang="scss" scoped>
+  .item-title {
+    font-size: 30rpx;
+    font-weight: bold;
+    color: rgba(51, 51, 51, 1);
+    // margin-bottom: 20rpx;
+  }
+
+  // 售后项目
+  .refund-item {
+    background-color: #fff;
+    border-bottom: 1rpx solid #f5f5f5;
+    padding: 30rpx;
+
+    &:last-child {
+      border: none;
+    }
+
+    // 留言
+    .describe-box {
+      width: 690rpx;
+      background: rgba(249, 250, 251, 1);
+      padding: 30rpx;
+      box-sizing: border-box;
+      border-radius: 20rpx;
+
+      .describe-content {
+        height: 200rpx;
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #333;
+      }
+    }
+
+    // 联系方式
+    .input-box {
+      height: 84rpx;
+      background: rgba(249, 250, 251, 1);
+      border-radius: 20rpx;
+    }
+  }
+
+  .goods-box {
+    background: #fff;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .foot-wrap {
+    height: 100rpx;
+    width: 100%;
+  }
+
+  .foot_box {
+    height: 100rpx;
+    background-color: #fff;
+
+    .sub-btn {
+      width: 336rpx;
+      line-height: 74rpx;
+      border-radius: 38rpx;
+      color: rgba(#fff, 0.9);
+      font-size: 28rpx;
+    }
+
+    .contcat-btn {
+      width: 336rpx;
+      line-height: 74rpx;
+      background: rgba(238, 238, 238, 1);
+      border-radius: 38rpx;
+      font-size: 28rpx;
+      font-weight: 400;
+      color: rgba(51, 51, 51, 1);
+    }
+  }
+
+  .modal-box {
+    width: 750rpx;
+    // height: 680rpx;
+    border-radius: 30rpx 30rpx 0 0;
+    background: #fff;
+
+    .modal-head {
+      height: 100rpx;
+      font-size: 30rpx;
+    }
+
+    .modal-content {
+      font-size: 28rpx;
+    }
+
+    .modal-foot {
+      .close-btn {
+        width: 710rpx;
+        line-height: 80rpx;
+        border-radius: 40rpx;
+        color: rgba(#fff, 0.9);
+      }
+    }
+  }
+
+  .success-box {
+    width: 600rpx;
+    padding: 90rpx 0 64rpx 0;
+
+    .cicon-check-round {
+      font-size: 96rpx;
+      color: #04b750;
+    }
+
+    .success-title {
+      font-weight: 500;
+      color: #333333;
+      font-size: 32rpx;
+    }
+
+    .success-btn {
+      width: 492rpx;
+      height: 70rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main-gradient), var(--ui-BG-Main));
+      border-radius: 35rpx;
+    }
+  }
+</style>
diff --git a/pages/order/worker/aftersale/list.vue b/pages/order/worker/aftersale/list.vue
new file mode 100644
index 0000000..78f9d26
--- /dev/null
+++ b/pages/order/worker/aftersale/list.vue
@@ -0,0 +1,184 @@
+<!-- 售后列表 -->
+<template>
+  <s-layout title="取消列表">
+    <s-empty v-if="state.pagination.total === 0" icon="/static/data-empty.png" text="暂无数据" />
+    <!-- 列表 -->
+    <view v-if="state.pagination.total > 0">
+      <view
+        class="list-box ss-m-y-20"
+        v-for="order in state.pagination.list"
+        :key="order.id"
+        @tap="sheep.$router.go('/pages/clerk/detail/index', { id: order.spuId })"
+      >
+        <view class="order-head ss-flex ss-col-center ss-row-between">
+          <text class="no">服务单号：{{ order.no }}</text>
+          <text class="state">{{ formatAfterSaleStatus(order) }}</text>
+        </view>
+        <s-goods-item
+          :img="order.picUrl"
+          :title="order.spuName"
+          :skuText="order.properties.map((property) => property.valueName).join(' ')"
+          :price="order.refundPrice"
+        />
+       
+      </view>
+    </view>
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import _ from 'lodash-es';
+  import {
+    formatAfterSaleStatus,
+    formatAfterSaleStatusDescription,
+    handleAfterSaleButtons,
+  } from '@/sheep/hooks/useGoods';
+  import AfterSaleApi from '@/sheep/api/trade/afterSale';
+  import { resetPagination } from '@/sheep/util';
+
+  const state = reactive({
+    currentTab: 0,
+    showApply: false,
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 10,
+    },
+    loadStatus: '',
+  });
+
+  // TODO 芋艿：优化点，增加筛选
+  const tabMaps = [
+    {
+      name: '全部',
+      value: 'all',
+    },
+    // {
+    //   name: '申请中',
+    //   value: 'nooper',
+    // },
+    // {
+    //   name: '处理中',
+    //   value: 'ing',
+    // },
+    // {
+    //   name: '已完成',
+    //   value: 'completed',
+    // },
+    // {
+    //   name: '已拒绝',
+    //   value: 'refuse',
+    // },
+  ];
+
+  // 切换选项卡
+  function onTabsChange(e) {
+    resetPagination(state.pagination);
+    state.currentTab = e.index;
+    getOrderList();
+  }
+
+  // 获取售后列表
+  async function getOrderList() {
+    state.loadStatus = 'loading';
+    let { data, code } = await AfterSaleApi.getAfterSalePage({
+      // type: tabMaps[state.currentTab].value,
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+    });
+    if (code !== 0) {
+      return;
+    }
+    data.list.forEach((order) => handleAfterSaleButtons(order));
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  function onApply(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消此申请吗？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await AfterSaleApi.cancelAfterSale(orderId);
+        if (code === 0) {
+          resetPagination(state.pagination);
+          await getOrderList();
+        }
+      },
+    });
+  }
+
+  onLoad(async (options) => {
+    if (options.type) {
+      state.currentTab = options.type;
+    }
+    await getOrderList();
+  });
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getOrderList();
+  }
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .list-box {
+    background-color: #fff;
+
+    .order-head {
+      padding: 0 25rpx;
+      height: 77rpx;
+    }
+
+    .apply-box {
+      height: 82rpx;
+
+      .title {
+        font-size: 24rpx;
+      }
+
+      .value {
+        font-size: 22rpx;
+        color: $dark-6;
+      }
+    }
+
+    .tool-btn-box {
+      height: 100rpx;
+
+      .tool-btn {
+        width: 160rpx;
+        height: 60rpx;
+        background: #f6f6f6;
+        border-radius: 30rpx;
+        font-size: 26rpx;
+        font-weight: 400;
+      }
+    }
+  }
+</style>
diff --git a/pages/order/worker/components/layout.vue b/pages/order/worker/components/layout.vue
new file mode 100644
index 0000000..846bfd9
--- /dev/null
+++ b/pages/order/worker/components/layout.vue
@@ -0,0 +1,182 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" :auto="false" use-virtual-list :force-close-inner-list="true" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @scroll="scroll" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<su-navbar :title="title" statusBar></su-navbar>
+				<tab-box :tabList="tabList" :currentValue="currentIndex" @change="tabChange"></tab-box>
+			</template>  
+			   
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<order-list @onCancel="onCancel" @onConfirm="onConfirm" @onOrderConfirm="onOrderConfirm" :virtualList="virtualList"></order-list>
+			
+		</z-paging>
+		
+	</view>
+</template>
+
+<script>
+	import TabBox from '@/pages/order/worker/components/tabBox.vue';
+	import OrderList from '@/pages/order/worker/components/orderList.vue';
+	import OrderApi from '@/sheep/api/trade/order';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import sheep from '@/sheep';
+	import {
+	  formatWorkerOrderStatus,
+	  handleWorkerOrderButtons,
+	  fen2yuan,
+	} from '@/sheep/hooks/useGoods';
+	export default {
+		components: {
+			TabBox, 
+			OrderList,
+		}, 
+		props: {
+			title: {
+				type: String,
+				default: '接单中心',
+			},
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 0,
+				height: 0,
+				
+				tabList: [{
+					name: '全部',
+				}, {
+					name: '待接单',
+					value: 10,
+				}, {
+					name: '服务中',
+					value: 20,
+				}, {
+					name: '已完成',
+					value: 30,
+				}],
+				
+				currentIndex: 0,
+			}
+		},
+		methods: {
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					status: this.tabList[this.currentIndex].value,
+					//commentStatus: this.tabList[this.currentIndex].value === 30 ? false : null,
+				}
+				OrderApi.getWorkerOrderPage(params).then(res => {
+					// 将请求的结果数组传递给z-paging
+					res.data.list.forEach((order) => handleWorkerOrderButtons(order));
+					res.data.list.forEach((order) => formatWorkerOrderStatus(order));
+					res.data.list.forEach((order) => order.brokeragePrice = fen2yuan(order.brokeragePrice));
+					this.$refs.paging.complete(res.data.list); 
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			tabChange(e) {
+				this.currentIndex = e;
+				this.$refs.paging.reload();
+			},
+			// 取消订单
+			async onCancel(orderId) {
+			  var that = this;
+			  uni.showModal({
+			    title: '提示',
+			    content: '确定要取消订单吗?',
+			    success: async function (res) {
+			      if (!res.confirm) {
+			        return;
+			      }
+			      const { code } = await OrderApi.cancelOrder(orderId);
+			      if (code === 0) {
+			        that.$refs.paging.reload();
+			      }
+			    },
+			  });
+			},
+			// 开始接单
+			async onOrderConfirm(order) {
+				var that = this;
+				uni.showModal({
+				    title: '是否开始接单',
+				    content: '请确认已经联系到老板',
+				    success: async function (res) {
+				      if (!res.confirm) {
+				        return;
+				      }
+				      // 正常的确认收货流程
+				      const { code } = await OrderApi.deliveryOrder(order.id);
+				      if (code === 0) {
+						that.$refs.paging.reload();
+				      }
+				    },
+				});
+			},
+			// 确认收货
+			async onConfirm(order) {
+				// #ifdef MP
+				// 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
+				this.subscribeMessage();
+				// #endif
+				
+				var that = this;
+				uni.showModal({
+				  title: '确定要结束服务么？',
+				  content: '请确认经过老板同意',
+				  success: async function (res) {
+				    if (!res.confirm) {
+				      return;
+				    }
+					
+					// 正常的确认收货流程
+					const { code } = await OrderApi.receiveOrder(order.id);
+					if (code === 0) {
+					  that.$refs.paging.reload();
+					}
+				    
+				  },
+				});
+			  
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.CLERK_ORDER];
+			  event.push(WxaSubscribeTemplate.REWARD_SUCCESS);
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.CLERK_ORDER);
+			    uni.setStorageSync(WxaSubscribeTemplate.CLERK_ORDER, '已订阅');
+			  });
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
diff --git a/pages/order/worker/components/orderList.vue b/pages/order/worker/components/orderList.vue
new file mode 100644
index 0000000..ad1856f
--- /dev/null
+++ b/pages/order/worker/components/orderList.vue
@@ -0,0 +1,242 @@
+<template>
+	  <view @click="onOrderDetail(order.id)"  :id="`zp-id-${order.zp_index}`" :key="order.zp_index" v-for="(order,index) in orderList" class="order-card">
+	  	<view class="no-box">
+			<view class="order-no">
+				<u-icon name="order"></u-icon>
+				<text class="number">{{ order.no }}</text>
+			</view>
+			<view class="status">{{order.statusStr}}</view>
+		</view> 
+		
+		<view class="main-box" v-for="item in order.items" :key="item.id">
+			<view>
+				<u-avatar size="100" :src="order.avatar"></u-avatar>
+			</view>
+			<view class="right-box">
+				<view class="nickname-box">
+					<view class="nickname">{{order.nickname}}</view>
+					<view class="info">订单时间：{{order.createTimeStr}}</view> 
+					<view class="info">服务内容：{{item.spuName}} {{item.properties.map((property) => property.valueName).join(' ')}}×{{item.count}}</view>
+					<view class="info">
+						<text class="weixin">微信：{{order.weixin}}</text>
+						<view @tap.stop="onCopy(order.weixin)">
+							<u-icon name="outline-copy" custom-prefix="iconfont"></u-icon>
+						</view>
+					</view>
+					<view class="info">
+						<text>剩余时间：</text>
+						<view v-if="order.receiveTime">
+							<text v-if="order.end">已结束</text>
+							<view v-else>
+								<u-count-down :timestamp="order.timestamp" format="DD天HH时mm分ss秒" @end="order.end = true"></u-count-down>
+							</view>
+						</view>
+						<text v-else>暂未接单</text>
+					</view>
+					<view class="info" v-if="order.userRemark">备注：{{order.userRemark}}</view>
+					<view class="info" v-if="order.cancelReason">取消原因：{{order.cancelReason}}</view>
+				</view>
+				<view class="price-box"> 
+					<text class="price">{{order.brokeragePrice}}</text>
+					<text>/钻</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="bottom-box">
+			<view class="btn-box">
+				<view v-if="order.buttons.includes('detail')" @tap.stop="onOrderDetail(order.id)" class="btn">查看详情</view>
+				<view v-if="order.buttons.includes('unpay')" @tap.stop="onOrderCancel(order.id, order.items[0].id)" class="btn">取消接单</view>
+				<view v-if="order.buttons.includes('cancel')" @tap.stop="onCancel(order.id)" class="btn">取消订单</view>
+				<view v-if="order.buttons.includes('buy')" @tap.stop="onBuy(order.items[0].spuId)" class="btn active">再来一单</view>
+				<view v-if="order.buttons.includes('comment')" @tap.stop="onComment(order.id)" class="btn active">评价</view>
+				<view v-if="order.buttons.includes('pay')" @tap.stop="onPay(order.payOrderId)" class="btn active">继续支付</view>
+				<view v-if="order.buttons.includes('agree')" @tap.stop="onOrderConfirm(order)" class="btn active">开始接单</view>
+				<view v-if="order.buttons.includes('confirm')" @tap.stop="onConfirm(order)" class="btn active">结束服务</view>
+				<view v-if="order.buttons.includes('invite')" @tap.stop="onBuy(order.items[0].spuId)" class="btn active">邀请老板</view>
+			</view>
+		</view>
+		
+	  </view>
+  
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import dayjs from 'dayjs';
+	export default {
+		components: {
+			
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		emits: ["onCancel", "onConfirm", "onOrderConfirm"],
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			orderList() {
+				this.virtualList.forEach((order) => order.createTimeStr = sheep.$helper.timeFormat(order.createTime, 'yyyy-mm-dd hh:MM:ss'));
+				this.virtualList.forEach((order) => order.timestamp = order.receiveTime ? sheep.$helper.parseTimeData(order.receiveTime) : 0);
+				return this.virtualList;
+			},
+		},
+		methods: {
+			// 订单详情
+			onOrderDetail(id) { 
+			  sheep.$router.go('/pages/order/worker/detail', {
+			    id,
+			  });
+			},
+			onCancel(orderId) {
+			  this.$emit('onCancel', orderId);
+			},
+			onBuy(id) {
+			  sheep.$router.go('/pages/clerk/detail/index', {
+				id,
+			  });
+			},
+			// 评价
+			onComment(id) { 
+			  sheep.$router.go('/pages/goods/comment/worker/add', {
+			    id,
+			  });
+			},
+			// 继续支付
+			onPay(payOrderId) {
+			  sheep.$router.go('/pages/pay/worker/index', {
+			    id: payOrderId,
+			  });
+			},
+			onOrderCancel(orderId, itemId) {
+			  sheep.$router.go('/pages/order/worker/aftersale/apply', {
+				orderId: orderId,
+				itemId: itemId
+			  });
+			},
+			onOrderConfirm(order) {
+			  this.$emit('onOrderConfirm', order);
+			},
+			// 复制
+			onCopy(text) {
+			  sheep.$helper.copyText(text);
+			},
+			// 确认收货
+			onConfirm(order) {
+			  this.$emit('onConfirm', order);
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.order-card {
+		padding: 10px;
+		margin-top: 10px;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		
+		.no-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex: 1;
+			padding-bottom: 10px;
+			color: rgb(100, 101, 102);
+			
+			.order-no {
+				
+				.number {
+					margin-left: 5px;
+					font-size: 22rpx;
+				}
+			}
+			
+			.status {
+				font-size: 22rpx;
+			}
+		}
+		
+		.main-box {
+			display: flex;
+			padding: 10px 0;
+			border-top: 1px solid #fbf0f0;
+			border-bottom: 1px solid #fbf0f0;
+			margin-bottom: 10px;
+			
+			.right-box {
+				display: flex;
+				justify-content: space-between;
+				flex: 1;
+				align-items: center;
+				margin-left: 10px;
+				
+				.nickname {
+					font-size: 12px;
+					font-weight: bold;
+					margin-bottom: 10px;
+				}
+				
+				.info {
+					font-size: 22rpx;
+					color: rgb(100, 101, 102);
+					line-height: 22rpx;
+					margin-bottom: 5px;
+					display: flex;
+					align-items: center;
+					
+					.weixin {
+						margin-right: 5px;
+					}
+				}
+				
+				.price-box {
+					font-size: 22rpx;
+					color: rgb(100, 101, 102);
+					
+					.price {
+						font-size: 34rpx;
+						font-weight: bold;
+						color: var(--ui-BG-Main);
+					}
+				}
+			}
+		}
+		
+		.bottom-box {
+			display: flex;
+			justify-content: flex-end;
+			
+			.btn-box {
+				display: flex;
+				align-items: center;
+			}
+			
+			.btn {
+				background-color: #ddd;
+				color: rgb(100, 101, 102);
+				font-size: 22rpx;
+				border-radius: 40px;
+				padding: 5px 10px;
+				margin-left: 10px;
+				min-width: 140rpx;
+				display: flex;
+				justify-content: center;
+			}
+			
+			.active {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/worker/components/tabBox.vue b/pages/order/worker/components/tabBox.vue
new file mode 100644
index 0000000..db9711d
--- /dev/null
+++ b/pages/order/worker/components/tabBox.vue
@@ -0,0 +1,47 @@
+<template>
+	<view>
+		<u-tabs :list="tabList" bg-color="#fff" font-size="28" active-color="var(--ui-BG-Main)" :is-scroll="false" v-model="current" @change="change"></u-tabs>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			currentValue: 0,
+			tabList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			current: {
+				get() {
+				    return this.currentValue;
+				},
+				set(newValue) {
+					
+				}
+			},
+		},
+		methods: {
+			change(index) {
+				this.$emit('change', index);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tab-box {
+		background-color: #fff;
+		padding: 5px 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/worker/confirm.vue b/pages/order/worker/confirm.vue
new file mode 100644
index 0000000..bbd3809
--- /dev/null
+++ b/pages/order/worker/confirm.vue
@@ -0,0 +1,433 @@
+<template>
+  <s-layout title="确认订单">
+    <!-- 商品信息 -->
+    <view class="order-card-box ss-m-b-14">
+      <s-goods-item
+        v-for="item in state.orderInfo.items"
+        :key="item.skuId"
+        :img="item.picUrl"
+        :title="item.spuName"
+        :skuText="item.properties.map((property) => property.valueName).join(' ')"
+        :price="item.price"
+        :num="item.count"
+        marginBottom="10"
+      />
+      <view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
+        <view class="item-title">订单备注</view>
+        <view class="ss-flex ss-col-center">
+          <uni-easyinput
+            maxlength="20"
+            placeholder="请输入备注内容"
+            v-model="state.orderPayload.remark"
+            :inputBorder="false"
+            :clearable="false"
+          />
+        </view>
+      </view>
+    </view>
+
+    <!-- 价格信息 -->
+    <view class="bg-white total-card-box ss-p-20 ss-m-b-14 ss-r-10">
+      <view class="total-box-content border-bottom">
+        <view class="order-item ss-flex ss-col-center ss-row-between">
+          <view class="item-title">技能金额</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value ss-m-r-24">
+              ￥{{ fen2yuan(state.orderInfo.price.totalPrice) }}
+            </text>
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.type === 5"
+        >
+          <view class="item-title">积分抵扣</view>
+          <view class="ss-flex ss-col-center">
+            {{ state.pointStatus ? '剩余积分' : '当前积分' }}
+            <image
+              :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+              class="score-img"
+            />
+            <text class="item-value ss-m-r-24">
+              {{ state.pointStatus ? state.orderInfo.totalPoint - state.orderInfo.usePoint : (state.orderInfo.totalPoint || 0) }}
+            </text>
+            <checkbox-group @change="changeIntegral">
+              <checkbox :checked='state.pointStatus' :disabled="!state.orderInfo.totalPoint || state.orderInfo.totalPoint <= 0" />
+            </checkbox-group>
+          </view>
+        </view>
+        <view v-if="isPass" class="order-item ss-flex ss-col-center ss-row-between">
+          <view class="item-title">TA添加你的微信号</view>
+          <view class="ss-flex ss-col-center">
+            <uni-easyinput
+              maxlength="20"
+              placeholder="请输入正确的微信号"
+              v-model="state.orderInfo.weixin"
+              :inputBorder="false"
+              :clearable="false"
+            />
+          </view>
+        </view>
+        <!-- 优惠劵：只有 type = 0 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.type === 5"
+        >
+          <view class="item-title">优惠券</view>
+          <view class="ss-flex ss-col-center" @tap="state.showCoupon = true">
+            <text class="item-value text-red" v-if="state.orderPayload.couponId > 0">
+              -￥{{ fen2yuan(state.orderInfo.price.couponPrice) }}
+            </text>
+            <text
+              class="item-value"
+              :class="state.couponInfo.length > 0 ? 'text-red' : 'text-disabled'"
+              v-else
+            >
+              {{
+                state.couponInfo.length > 0 ? state.couponInfo.length + ' 张可用' : '暂无可用优惠券'
+              }}
+            </text>
+            <text class="_icon-forward item-icon" />
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.discountPrice > 0"
+        >
+          <view class="item-title">活动优惠</view>
+          <view class="ss-flex ss-col-center">
+            <!--                @tap="state.showDiscount = true" TODO puhui999：【折扣】后续要把优惠信息打进去 -->
+            <text class="item-value text-red">
+              -￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
+            </text>
+            <text class="_icon-forward item-icon" />
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.vipPrice > 0"
+        >
+          <view class="item-title">会员优惠</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value text-red">
+              -￥{{ fen2yuan(state.orderInfo.price.vipPrice) }}
+            </text>
+          </view>
+        </view>
+      </view>
+      <view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
+        <view class="total-num ss-m-r-20">
+          共{{ state.orderInfo.items.reduce((acc, item) => acc + item.count, 0) }}件
+        </view>
+        <view>合计：</view>
+        <view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}</view>
+      </view>
+    </view>
+
+    <!-- 选择优惠券弹框 -->
+    <s-coupon-select
+      v-model="state.couponInfo"
+      :show="state.showCoupon"
+      @confirm="onSelectCoupon"
+      @close="state.showCoupon = false"
+    />
+
+    <!-- 满额折扣弹框 TODO @puhui999：【折扣】后续要把优惠信息打进去 -->
+    <s-discount-list
+      v-model="state.orderInfo"
+      :show="state.showDiscount"
+      @close="state.showDiscount = false"
+    />
+
+    <!-- 底部 -->
+    <su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
+      <view class="footer-box border-top ss-flex ss-row-between ss-p-x-20 ss-col-center">
+        <view class="total-box-footer ss-flex ss-col-center">
+          <view class="total-num ss-font-30 text-red">
+            ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}
+          </view>
+        </view>
+        <button
+          class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main"
+          @tap="onConfirm"
+        >
+          提交订单
+        </button>
+      </view>
+	  
+	  <qrcode-modal />
+    </su-fixed>
+  </s-layout>
+</template>
+
+<script setup>
+  import { reactive, ref, watch, computed } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import AddressSelection from '@/pages/order/addressSelection.vue';
+  import qrcodeModal from '@/components/qrcode-modal/qrcode-modal.vue';
+  import sheep from '@/sheep';
+  import OrderApi from '@/sheep/api/trade/order';
+  import CouponApi from '@/sheep/api/promotion/coupon';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  
+  const isPass = computed(() => {
+      return sheep.$store('user').tradeConfig.weixinEnabled;
+  });
+
+  const state = reactive({
+    orderPayload: {},
+    orderInfo: {
+      items: [], // 商品项列表
+      price: {}, // 价格信息
+    },
+    showCoupon: false, // 是否展示优惠劵
+    couponInfo: [], // 优惠劵列表
+    showDiscount: false, // 是否展示营销活动
+    // ========== 积分 ==========
+    pointStatus: false, //是否使用积分
+  });
+
+  const addressState = ref({
+    addressInfo: {}, // 选择的收货地址
+    deliveryType: 1, // 收货方式：1-快递配送，2-门店自提
+    isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
+    pickUpInfo: {}, // 选择的自提门店信息
+    weixin: '', // 收件人名称
+    receiverMobile: '', // 收件人手机
+  });
+
+  // ========== 积分 ==========
+  /**
+   * 使用积分抵扣
+   */
+  const changeIntegral = async () => {
+    state.pointStatus = !state.pointStatus;
+    await getOrderInfo();
+  };
+
+  // 选择优惠券
+  async function onSelectCoupon(couponId) {
+    state.orderPayload.couponId = couponId;
+    await getOrderInfo();
+    state.showCoupon = false;
+  }
+
+  // 提交订单
+  function onConfirm() {
+    if (isPass && !state.orderInfo.weixin) {
+      sheep.$helper.toast('请填写正确的微信号');
+      return;
+    }
+    submitOrder();
+  }
+
+  // 创建订单&跳转
+  async function submitOrder() {
+    const { code, data } = await OrderApi.createWorkerOrder({
+      items: state.orderPayload.items,
+      couponId: state.orderPayload.couponId,
+      remark: state.orderPayload.remark,
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
+      weixin: state.orderInfo.weixin,// 微信名称
+      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pointStatus: state.pointStatus,
+      combinationActivityId: state.orderPayload.combinationActivityId,
+      combinationHeadId: state.orderPayload.combinationHeadId,
+      seckillActivityId: state.orderPayload.seckillActivityId,
+	  clerkId: state.orderPayload.clerkId,
+    });
+    if (code !== 0) {
+      return;
+    }
+    // 更新购物车列表，如果来自购物车
+    if (state.orderPayload.items[0].cartId > 0) {
+      sheep.$store('cart').getList();
+    }
+
+    // 跳转到支付页面
+    sheep.$router.redirect('/pages/pay/worker/index', {
+      id: data.payOrderId,
+    });
+  }
+
+  // 检查库存 & 计算订单价格
+  async function getOrderInfo() {
+    // 计算价格
+    const { data, code } = await OrderApi.clerkOrder({
+      items: state.orderPayload.items,
+      couponId: state.orderPayload.couponId,
+      deliveryType: addressState.value.deliveryType,
+      addressId: addressState.value.addressInfo.id, // 收件地址编号
+      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
+      weixin: state.orderInfo.weixin,// 微信名称
+      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pointStatus: state.pointStatus,
+      combinationActivityId: state.orderPayload.combinationActivityId,
+      combinationHeadId: state.orderPayload.combinationHeadId,
+      seckillActivityId: state.orderPayload.seckillActivityId,
+	  clerkId: state.orderPayload.clerkId,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.orderInfo = data;
+    // 设置收货地址
+    if (state.orderInfo.address) {
+      addressState.value.addressInfo = state.orderInfo.address;
+    }
+  }
+
+  // 获取可用优惠券
+  async function getCoupons() {
+    const { code, data } = await CouponApi.getMatchCouponList(
+      state.orderInfo.price.payPrice,
+      state.orderInfo.items.map((item) => item.spuId),
+      state.orderPayload.items.map((item) => item.skuId),
+      state.orderPayload.items.map((item) => item.categoryId),
+    );
+    if (code === 0) {
+      state.couponInfo = data;
+    }
+  }
+
+  onLoad(async (options) => {
+    if (!options.data) {
+      sheep.$helper.toast('参数不正确，请检查！');
+      return;
+    }
+    state.orderPayload = JSON.parse(options.data);
+    await getOrderInfo();
+    await getCoupons();
+  });
+
+  // 使用 watch 监听地址和配送方式的变化
+  watch(addressState, async (newAddress, oldAddress) => {
+    // 如果收货地址或配送方式有变化，则重新计算价格
+    if (newAddress.addressInfo.id !== oldAddress.addressInfo.id || newAddress.deliveryType !== oldAddress.deliveryType) {
+      await getOrderInfo();
+    }
+  });
+</script>
+
+<style lang="scss" scoped>
+  :deep() {
+    .uni-input-wrapper {
+      width: 320rpx;
+    }
+
+    .uni-easyinput__content-input {
+      font-size: 28rpx;
+      height: 72rpx;
+      text-align: right !important;
+      padding-right: 0 !important;
+
+      .uni-input-input {
+        font-weight: 500;
+        color: #333333;
+        font-size: 26rpx;
+        height: 32rpx;
+        margin-top: 4rpx;
+      }
+    }
+
+    .uni-easyinput__content {
+      display: flex !important;
+      align-items: center !important;
+      justify-content: right !important;
+    }
+  }
+
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .order-item {
+    height: 80rpx;
+
+    .item-title {
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+
+    .item-value {
+      font-size: 28rpx;
+      font-weight: 500;
+      font-family: OPPOSANS;
+    }
+
+    .text-disabled {
+      color: #bbbbbb;
+    }
+
+    .item-icon {
+      color: $dark-9;
+    }
+
+    .remark-input {
+      text-align: right;
+    }
+
+    .item-placeholder {
+      color: $dark-9;
+      font-size: 26rpx;
+      text-align: right;
+    }
+  }
+
+  .total-box-footer {
+    height: 90rpx;
+
+    .total-num {
+      color: #333333;
+      font-family: OPPOSANS;
+    }
+  }
+
+  .footer-box {
+    height: 100rpx;
+
+    .submit-btn {
+      width: 240rpx;
+      height: 70rpx;
+      font-size: 28rpx;
+      font-weight: 500;
+
+      .goto-pay-text {
+        line-height: 28rpx;
+      }
+    }
+
+    .cancel-btn {
+      width: 240rpx;
+      height: 80rpx;
+      font-size: 26rpx;
+      background-color: #e5e5e5;
+      color: $dark-9;
+    }
+  }
+
+  .title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333333;
+  }
+
+  .subtitle {
+    font-size: 28rpx;
+    color: #999999;
+  }
+
+  .cicon-checkbox {
+    font-size: 36rpx;
+    color: var(--ui-BG-Main);
+  }
+
+  .cicon-box {
+    font-size: 36rpx;
+    color: #999999;
+  }
+</style>
diff --git a/pages/order/worker/detail.vue b/pages/order/worker/detail.vue
new file mode 100644
index 0000000..26316bf
--- /dev/null
+++ b/pages/order/worker/detail.vue
@@ -0,0 +1,593 @@
+<!-- 订单详情 -->
+<template>
+  <s-layout title="订单详情" class="index-wrap" navbar="inner">
+    <!-- 订单状态 TODO -->
+    <view
+      class="state-box ss-flex-col ss-col-center ss-row-right"
+      :style="[
+        {
+          marginTop: '-' + Number(statusBarHeight + 88 + 22) + 'rpx',
+          paddingTop: Number(statusBarHeight + 88 + 22) + 'rpx',
+        },
+      ]"
+    >
+      <view class="ss-flex ss-m-t-32 ss-m-b-20">
+        <image
+          v-if="
+            state.orderInfo.status_code == 'unpaid' ||
+            state.orderInfo.status === 10 || // 待发货
+            state.orderInfo.status_code == 'nocomment'
+          "
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_loading.png')"
+        >
+        </image>
+        <image
+          v-if="
+            state.orderInfo.status_code == 'completed' ||
+            state.orderInfo.status_code == 'refund_agree'
+          "
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_success.png')"
+        >
+        </image>
+        <image
+          v-if="state.orderInfo.status_code == 'cancel' || state.orderInfo.status_code == 'closed'"
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_close.png')"
+        >
+        </image>
+        <image
+          v-if="state.orderInfo.status_code == 'noget'"
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/order_express.png')"
+        >
+        </image>
+        <view class="ss-font-30">{{ formatWorkerOrderStatus(state.orderInfo) }}</view>
+      </view>
+      <view class="ss-font-26 ss-m-x-20 ss-m-b-70">
+        {{ formatWorkerOrderStatusDescription(state.orderInfo) }}
+      </view>
+    </view>
+
+    <!-- 收货地址 -->
+    <view class="order-address-box" v-if="state.orderInfo.receiverAreaId > 0">
+      <view class="ss-flex ss-col-center">
+        <text class="address-username">
+          {{ state.orderInfo.receiverName }}
+        </text>
+        <text class="address-phone">{{ state.orderInfo.receiverMobile }}</text>
+      </view>
+      <view class="address-detail">
+        {{ state.orderInfo.receiverAreaName }} {{ state.orderInfo.receiverDetailAddress }}
+      </view>
+    </view>
+
+    <view
+      class="detail-goods"
+      :style="[{ marginTop: state.orderInfo.receiverAreaId > 0 ? '0' : '-40rpx' }]"
+    >
+      <!-- 订单信 -->
+      <view class="order-list" v-for="item in state.orderInfo.items" :key="item.goods_id">
+        <view class="order-card">
+          <s-goods-item
+            @tap="onGoodsDetail(item.spuId)"
+            :img="item.picUrl"
+            :title="item.spuName"
+            :skuText="item.properties.map((property) => property.valueName).join(' ')"
+            :price="item.price"
+            :num="item.count"
+          >
+            <template #tool>
+              <view class="ss-flex">
+                <button
+                  class="ss-reset-button apply-btn"
+                  v-if="[10, 20].includes(state.orderInfo.status) && item.afterSaleStatus === 0"
+                  @tap.stop="
+                    sheep.$router.go('/pages/order/worker/aftersale/apply', {
+                      orderId: state.orderInfo.id,
+                      itemId: item.id,
+                    })
+                  "
+                >
+                  取消接单
+                </button>
+				<button
+				  class="ss-reset-button apply-btn"
+				  v-if="[0,30,40].includes(state.orderInfo.status)"
+				  @tap.stop="onGoodsDetail(item.spuId)"
+				>
+				  邀请老板
+				</button>
+              </view>
+            </template>
+            <template #priceSuffix>
+              <button class="ss-reset-button tag-btn" v-if="item.status_text">
+                {{ item.status_text }}
+              </button>
+            </template>
+          </s-goods-item>
+        </view>
+      </view>
+    </view>
+
+    <!--  自提核销  -->
+    <PickUpVerify :order-info="state.orderInfo" :systemStore="systemStore" ref="pickUpVerifyRef"></PickUpVerify>
+
+    <!-- 订单信息 -->
+    <view class="notice-box">
+      <view class="notice-box__content">
+        <view class="notice-item--center">
+          <view class="ss-flex ss-flex-1">
+            <text class="title">订单编号：</text>
+            <text class="detail">{{ state.orderInfo.no }}</text>
+          </view>
+          <button class="ss-reset-button copy-btn" @tap="onCopy">复制</button>
+        </view>
+        <view class="notice-item">
+          <text class="title">下单时间：</text>
+          <text class="detail">
+            {{ sheep.$helper.timeFormat(state.orderInfo.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </text>
+        </view>
+        <view class="notice-item" v-if="state.orderInfo.payTime">
+          <text class="title">支付时间：</text>
+          <text class="detail">
+            {{ sheep.$helper.timeFormat(state.orderInfo.payTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </text>
+        </view>
+        <view class="notice-item">
+          <text class="title">支付方式：</text>
+          <text class="detail">{{ state.orderInfo.payChannelName || '-' }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 价格信息 -->
+    <view class="order-price-box">
+      <view class="notice-item ss-flex ss-row-between">
+        <text class="title">订单总额</text>
+        <view class="ss-flex">
+          <text class="detail">￥{{ fen2yuan(state.orderInfo.totalPrice) }}</text>
+        </view>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.couponPrice > 0">
+        <text class="title">优惠劵金额</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.couponPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.pointPrice > 0">
+        <text class="title">积分抵扣</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.pointPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.discountPrice > 0">
+        <text class="title">活动优惠</text>
+        <text class="detail">¥{{ fen2yuan(state.orderInfo.discountPrice) }}</text>
+      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.vipPrice > 0">
+        <text class="title">会员优惠</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.vipPrice) }}</text>
+      </view>
+	  <view class="notice-item ss-flex ss-row-between">
+	    <text class="title">用户付款</text>
+	    <text class="detail">￥{{ fen2yuan(state.orderInfo.payPrice) }}</text>
+	  </view>
+	  <view class="notice-item ss-flex ss-row-between">
+	    <text class="title">佣金比例</text>
+	    <text class="detail">{{state.orderInfo.brokeragePercent}}%</text>
+	  </view>
+      <view class="notice-item all-rpice-item ss-flex ss-m-t-20">
+        <text class="title">{{ state.orderInfo.payStatus ? '结算佣金' : '可得佣金' }}</text>
+        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.brokeragePrice) }}</text>
+      </view>
+      <view
+        class="notice-item all-rpice-item ss-flex ss-m-t-20"
+        v-if="state.orderInfo.refundPrice > 0"
+      >
+        <text class="title">已退款</text>
+        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.refundPrice) }}</text>
+      </view>
+    </view>
+
+   
+  </s-layout>
+</template>
+ 
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive, ref } from 'vue';
+  import { isEmpty } from 'lodash-es';
+  import {
+    fen2yuan,
+    formatWorkerOrderStatus,
+    formatWorkerOrderStatusDescription,
+    handleOrderButtons,
+  } from '@/sheep/hooks/useGoods';
+  import OrderApi from '@/sheep/api/trade/order';
+  import DeliveryApi from '@/sheep/api/trade/delivery';
+  import PickUpVerify from '@/pages/order/pickUpVerify.vue';
+
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
+
+  const state = reactive({
+    orderInfo: {},
+    merchantTradeNo: '', // 商户订单号
+    comeinType: '', // 进入订单详情的来源类型
+  });
+
+  // ========== 门店自提（核销） ==========
+  const systemStore = ref({}); // 门店信息
+
+  // 复制
+  const onCopy = () => {
+    sheep.$helper.copyText(state.orderInfo.no);
+  };
+
+  // 去支付
+  function onPay(payOrderId) {
+    sheep.$router.go('/pages/pay/index', {
+      id: payOrderId,
+    });
+  }
+
+  // 查看商品
+  function onGoodsDetail(id) {
+    sheep.$router.go('/pages/clerk/detail/index', {
+      id,
+    });
+  }
+
+  // 取消订单
+  async function onCancel(orderId) {
+    uni.showModal({
+      title: '提示',
+      content: '确定要取消订单吗?',
+      success: async function(res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await OrderApi.cancelOrder(orderId);
+        if (code === 0) {
+          await getOrderDetail(orderId);
+        }
+      },
+    });
+  }
+
+  // 查看物流
+  async function onExpress(id) {
+    sheep.$router.go('/pages/order/express/log', {
+      id,
+    });
+  }
+
+  // 确认收货
+  async function onConfirm(orderId, ignore = false) {
+    // 需开启确认收货组件
+    // todo: 芋艿：待接入微信
+    // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+    // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+    let isOpenBusinessView = true;
+    if (
+      sheep.$platform.name === 'WechatMiniProgram' &&
+      !isEmpty(state.orderInfo.wechat_extra_data) &&
+      isOpenBusinessView &&
+      !ignore
+    ) {
+      mpConfirm(orderId);
+      return;
+    }
+
+    // 正常的确认收货流程
+    const { code } = await OrderApi.receiveOrder(orderId);
+    if (code === 0) {
+      await getOrderDetail(orderId);
+    }
+  }
+
+  // #ifdef MP-WEIXIN
+  // 小程序确认收货组件
+  function mpConfirm(orderId) {
+    if (!wx.openBusinessView) {
+      sheep.$helper.toast(`请升级微信版本`);
+      return;
+    }
+    wx.openBusinessView({
+      businessType: 'weappOrderConfirm',
+      extraData: {
+        merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
+        transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
+      },
+      success(response) {
+        console.log('success:', response);
+        if (response.errMsg === 'openBusinessView:ok') {
+          if (response.extraData.status === 'success') {
+            onConfirm(orderId, true);
+          }
+        }
+      },
+      fail(error) {
+        console.log('error:', error);
+      },
+      complete(result) {
+        console.log('result:', result);
+      },
+    });
+  }
+
+  // #endif
+
+  // 评价
+  function onComment(id) {
+    sheep.$router.go('/pages/goods/comment/add', {
+      id,
+    });
+  }
+
+  const pickUpVerifyRef = ref();
+
+  async function getOrderDetail(id) {
+    // 对详情数据进行适配
+    let res;
+    if (state.comeinType === 'wechat') {
+      // TODO 芋艿：微信场景下
+      res = await OrderApi.getOrder(id, {
+        merchant_trade_no: state.merchantTradeNo,
+      });
+    } else {
+      res = await OrderApi.getOrder(id);
+    }
+    if (res.code === 0) {
+      state.orderInfo = res.data;
+      handleOrderButtons(state.orderInfo);
+      // 配送方式：门店自提
+      if (res.data.pickUpStoreId) {
+        const { data } = await DeliveryApi.getDeliveryPickUpStore(res.data.pickUpStoreId);
+        systemStore.value = data || {};
+      }
+      if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
+        pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
+      }
+    } else {
+      sheep.$router.back();
+    }
+  }
+
+  onLoad(async (options) => {
+    let id = 0;
+    if (options.id) {
+      id = options.id;
+    }
+    // TODO 芋艿：下面两个变量，后续接入
+    state.comeinType = options.comein_type;
+    if (state.comeinType === 'wechat') {
+      state.merchantTradeNo = options.merchant_trade_no;
+    }
+    await getOrderDetail(id);
+  });
+</script>
+
+<style lang="scss" scoped>
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .apply-btn {
+    width: 140rpx;
+    height: 50rpx;
+    border-radius: 25rpx;
+    font-size: 24rpx;
+    border: 2rpx solid #dcdcdc;
+    line-height: normal;
+    margin-left: 16rpx;
+  }
+
+  .state-box {
+    color: rgba(#fff, 0.9);
+    width: 100%;
+    background: v-bind(headerBg) no-repeat,
+    linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    background-size: 750rpx 100%;
+    box-sizing: border-box;
+
+    .state-img {
+      width: 60rpx;
+      height: 60rpx;
+      margin-right: 20rpx;
+    }
+  }
+
+  .order-address-box {
+    background-color: #fff;
+    border-radius: 10rpx;
+    margin: -50rpx 20rpx 16rpx 20rpx;
+    padding: 44rpx 34rpx 42rpx 20rpx;
+    font-size: 30rpx;
+    box-sizing: border-box;
+    font-weight: 500;
+    color: rgba(51, 51, 51, 1);
+
+    .address-username {
+      margin-right: 20rpx;
+    }
+
+    .address-detail {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: rgba(153, 153, 153, 1);
+      margin-top: 20rpx;
+    }
+  }
+
+  .detail-goods {
+    border-radius: 10rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .order-list {
+      margin-bottom: 20rpx;
+      background-color: #fff;
+
+      .order-card {
+        padding: 20rpx 0;
+
+        .order-sku {
+          font-size: 24rpx;
+
+          font-weight: 400;
+          color: rgba(153, 153, 153, 1);
+          width: 450rpx;
+          margin-bottom: 20rpx;
+
+          .order-num {
+            margin-right: 10rpx;
+          }
+        }
+
+        .tag-btn {
+          margin-left: 16rpx;
+          font-size: 24rpx;
+          height: 36rpx;
+          color: var(--ui-BG-Main);
+          border: 2rpx solid var(--ui-BG-Main);
+          border-radius: 14rpx;
+          padding: 0 4rpx;
+        }
+      }
+    }
+  }
+
+  // 订单信息。
+  .notice-box {
+    background: #fff;
+    border-radius: 10rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .notice-box__head {
+      font-size: 30rpx;
+
+      font-weight: 500;
+      color: rgba(51, 51, 51, 1);
+      line-height: 80rpx;
+      border-bottom: 1rpx solid #dfdfdf;
+      padding: 0 25rpx;
+    }
+
+    .notice-box__content {
+      padding: 20rpx;
+
+      .self-pickup-box {
+        width: 100%;
+
+        .self-pickup--img {
+          width: 200rpx;
+          height: 200rpx;
+          margin: 40rpx 0;
+        }
+      }
+    }
+
+    .notice-item,
+    .notice-item--center {
+      display: flex;
+      align-items: center;
+      line-height: normal;
+      margin-bottom: 24rpx;
+
+      .title {
+        font-size: 28rpx;
+        color: #999;
+      }
+
+      .detail {
+        font-size: 28rpx;
+        color: #333;
+        flex: 1;
+      }
+    }
+  }
+
+  .copy-btn {
+    width: 100rpx;
+    line-height: 50rpx;
+    border-radius: 25rpx;
+    padding: 0;
+    background: rgba(238, 238, 238, 1);
+    font-size: 22rpx;
+    font-weight: 400;
+    color: rgba(51, 51, 51, 1);
+  }
+
+  // 订单价格信息
+  .order-price-box {
+    background-color: #fff;
+    border-radius: 10rpx;
+    padding: 20rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+
+    .notice-item {
+      line-height: 70rpx;
+
+      .title {
+        font-size: 28rpx;
+        color: #999;
+      }
+
+      .detail {
+        font-size: 28rpx;
+        color: #333;
+        font-family: OPPOSANS;
+      }
+    }
+
+    .all-rpice-item {
+      justify-content: flex-end;
+      align-items: center;
+
+      .title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+        line-height: normal;
+      }
+
+      .all-price {
+        font-size: 26rpx;
+        font-family: OPPOSANS;
+        line-height: normal;
+        color: $red;
+      }
+    }
+  }
+
+  // 底部
+  .footer-box {
+    height: 100rpx;
+    width: 100%;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    padding-right: 20rpx;
+
+    .cancel-btn {
+      width: 160rpx;
+      height: 60rpx;
+      background: #eeeeee;
+      border-radius: 30rpx;
+      margin-right: 20rpx;
+      font-size: 26rpx;
+      font-weight: 400;
+      color: #333333;
+    }
+
+    .pay-btn {
+      width: 160rpx;
+      height: 60rpx;
+      font-size: 26rpx;
+      border-radius: 30rpx;
+      font-weight: 500;
+      color: #fff;
+    }
+  }
+</style>
diff --git a/pages/order/worker/list.vue b/pages/order/worker/list.vue
new file mode 100644
index 0000000..27d5ece
--- /dev/null
+++ b/pages/order/worker/list.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<layout ref="order"></layout>
+		
+		<s-menu-tools />
+		<s-auth-modal />
+	</view>
+</template>
+
+<script>
+	import layout from '@/pages/order/worker/components/layout.vue';
+	export default { 
+		components: {
+			layout,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				currentIndex: 0,
+			}
+		},
+		onLoad(options) {
+		  if (options.type) {
+		    this.currentIndex = options.type;
+		  }
+		  this.$nextTick(() => {
+		  	this.$refs.order.tabChange(this.currentIndex);
+		  });
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fafafa;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/pay/index.vue b/pages/pay/index.vue
new file mode 100644
index 0000000..ef8bfe1
--- /dev/null
+++ b/pages/pay/index.vue
@@ -0,0 +1,295 @@
+<!-- 收银台 -->
+<template>
+  <s-layout title="收银台">
+    <view class="bg-white ss-modal-box ss-flex-col">
+      <!-- 订单信息 -->
+      <view class="modal-header ss-flex-col ss-col-center ss-row-center">
+        <view class="money-box ss-m-b-20">
+          <text class="money-text">{{ fen2yuan(state.orderInfo.price) }}</text>
+        </view>
+        <view class="time-text">
+          <text>{{ payDescText }}</text>
+        </view>
+      </view>
+
+      <!-- 支付方式 -->
+      <view class="modal-content ss-flex-1">
+        <view class="pay-title ss-p-l-30 ss-m-y-30">选择支付方式</view>
+        <radio-group @change="onTapPay">
+          <label class="pay-type-item" v-for="item in state.payMethods" :key="item.title">
+            <view
+			  v-if="!item.disabled"
+              class="pay-item ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom"
+              :class="{ 'disabled-pay-item': item.disabled }"
+            >
+              <view class="ss-flex ss-col-center">
+                <image
+                  class="pay-icon"
+                  v-if="item.disabled"
+                  :src="sheep.$url.static('/static/img/shop/pay/cod_disabled.png')"
+                  mode="aspectFit"
+                />
+                <image
+                  class="pay-icon"
+                  v-else
+                  :src="sheep.$url.static(item.icon)"
+                  mode="aspectFit"
+                />
+                <text class="pay-title">{{ item.title }}</text>
+              </view>
+              <view class="check-box ss-flex ss-col-center ss-p-l-10">
+                <view class="userInfo-money ss-m-r-10" v-if="item.value === 'wallet'">
+                  余额: {{ fen2yuan(userWallet.balance) }}元
+                </view>
+                <radio
+                  :value="item.value"
+                  color="var(--ui-BG-Main)"
+                  style="transform: scale(0.8)"
+                  :disabled="item.disabled"
+                  :checked="state.payment === item.value"
+                />
+              </view>
+            </view>
+          </label>
+        </radio-group>
+      </view>
+
+      <!-- 工具 -->
+      <view class="modal-footer ss-flex ss-row-center ss-col-center ss-m-t-80 ss-m-b-40">
+        <button v-if="state.payStatus === 0" class="ss-reset-button past-due-btn">
+          检测支付环境中
+        </button>
+        <button v-else-if="state.payStatus === -1" class="ss-reset-button past-due-btn" disabled>
+          支付已过期
+        </button>
+        <button
+          v-else
+          class="ss-reset-button save-btn"
+          @tap="onPay"
+          :disabled="state.payStatus !== 1"
+          :class="{ 'disabled-btn': state.payStatus !== 1 }"
+        >
+          立即支付
+        </button>
+      </view>
+    </view>
+  </s-layout>
+</template>
+<script setup>
+  import { computed, reactive } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
+  import PayOrderApi from '@/sheep/api/pay/order';
+  import PayChannelApi from '@/sheep/api/pay/channel';
+  import { getPayMethods } from '@/sheep/platform/pay';
+
+  const userWallet = computed(() => sheep.$store('user').userWallet);
+
+  // 检测支付环境
+  const state = reactive({
+    orderType: 'goods', // 订单类型; goods - 商品订单, recharge - 充值订单
+    orderInfo: {}, // 支付单信息
+    payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息， -1=支付已过期， 1=待支付，2=订单已支付
+    payMethods: [], // 可选的支付方式
+    payment: '', // 选中的支付方式
+  });
+
+  const onPay = () => {
+    if (state.payment === '') {
+      sheep.$helper.toast('请选择支付方式');
+      return;
+    }
+    if (state.payment === 'wallet') {
+      uni.showModal({
+        title: '提示',
+        content: '确定要支付吗?',
+        success: function (res) {
+          if (res.confirm) {
+            sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id);
+          }
+        },
+      });
+    } else {
+      sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id);
+    }
+  };
+
+  // 支付文案提示
+  const payDescText = computed(() => {
+    if (state.payStatus === 2) {
+      return '该订单已支付';
+    }
+    if (state.payStatus === 1) {
+      const time = useDurationTime(state.orderInfo.expireTime);
+      if (time.ms <= 0) {
+        state.payStatus = -1;
+        return '';
+      }
+      return `剩余支付时间 ${time.h}:${time.m}:${time.s} `;
+    }
+    if (state.payStatus === -2) {
+      return '未查询到支付单信息';
+    }
+    return '';
+  });
+
+  // 状态转换：payOrder.status => payStatus
+  function checkPayStatus() {
+    if (state.orderInfo.status === 10
+      || state.orderInfo.status === 20 ) { // 支付成功
+      state.payStatus = 2;
+      return;
+    }
+    if (state.orderInfo.status === 30) { // 支付关闭
+      state.payStatus = -1;
+      return;
+    }
+    state.payStatus = 1; // 待支付
+  }
+
+  // 切换支付方式
+  function onTapPay(e) {
+    state.payment = e.detail.value;
+  }
+
+  // 设置支付订单信息
+  async function setOrder(id) {
+    // 获得支付订单信息
+    const { data, code } = await PayOrderApi.getOrder(id);
+    if (code !== 0 || !data) {
+      state.payStatus = -2;
+      return;
+    }
+    state.orderInfo = data;
+    // 获得支付方式
+    await setPayMethods();
+    // 设置支付状态
+    checkPayStatus();
+  }
+
+  // 获得支付方式
+  async function setPayMethods() {
+    const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId)
+    if (code !== 0) {
+      return
+    }
+    state.payMethods = getPayMethods(data)
+	state.payMethods.find(item => {
+	  if (item.value && !item.disabled) {
+		state.payment = item.value;
+		return true;
+	  }
+	});
+  }
+
+  onLoad((options) => {
+    if (sheep.$platform.name === 'WechatOfficialAccount'
+      && sheep.$platform.os === 'ios'
+      && !sheep.$platform.landingPage.includes('pages/pay/index')) {
+      location.reload();
+      return;
+    }
+    // 获得支付订单信息
+    let id = options.id;
+    if (options.orderType) {
+      state.orderType = options.orderType;
+    }
+    setOrder(id);
+    // 刷新钱包的缓存
+    sheep.$store('user').getWallet();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .pay-icon {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 26rpx;
+  }
+
+  .ss-modal-box {
+    // max-height: 1000rpx;
+
+    .modal-header {
+      position: relative;
+      padding: 60rpx 20rpx 40rpx;
+
+
+      .money-text {
+        color: $red;
+        font-size: 46rpx;
+        font-weight: bold;
+        font-family: OPPOSANS;
+
+        &::before {
+          content: '￥';
+          font-size: 30rpx;
+        }
+      }
+
+      .time-text {
+        font-size: 26rpx;
+        color: $gray-b;
+      }
+
+      .close-icon {
+        position: absolute;
+        top: 10rpx;
+        right: 20rpx;
+        font-size: 46rpx;
+        opacity: 0.2;
+      }
+    }
+
+    .modal-content {
+      overflow-y: auto;
+
+      .pay-title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .pay-tip {
+        font-size: 26rpx;
+        color: #bbbbbb;
+      }
+
+      .pay-item {
+        height: 86rpx;
+      }
+      .disabled-pay-item {
+        .pay-title {
+          color: #999999;
+        }
+      }
+
+      .userInfo-money {
+        font-size: 26rpx;
+        color: #bbbbbb;
+        line-height: normal;
+      }
+    }
+
+    .save-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      color: $white;
+    }
+    .disabled-btn {
+      background: #e5e5e5;
+      color: #999999;
+    }
+
+    .past-due-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background-color: #999;
+      color: #fff;
+    }
+  }
+</style>
diff --git a/pages/pay/point/index.vue b/pages/pay/point/index.vue
new file mode 100644
index 0000000..830ac1e
--- /dev/null
+++ b/pages/pay/point/index.vue
@@ -0,0 +1,308 @@
+<!-- 收银台 -->
+<template>
+  <s-layout title="收银台">
+    <view class="bg-white ss-modal-box ss-flex-col">
+      <!-- 订单信息 -->
+      <view class="modal-header ss-flex-col ss-col-center ss-row-center">
+        <view class="money-box ss-m-b-20">
+          <text class="money-text">{{ fen2yuan(state.orderInfo.price) }}</text>
+        </view>
+        <view class="time-text">
+          <text>{{ payDescText }}</text>
+        </view>
+      </view>
+
+      <!-- 支付方式 -->
+      <view class="modal-content ss-flex-1">
+        <view class="pay-title ss-p-l-30 ss-m-y-30">选择支付方式</view>
+        <radio-group @change="onTapPay">
+          <label class="pay-type-item" v-for="item in state.payMethods" :key="item.title">
+            <view
+			  v-if="!item.disabled"
+              class="pay-item ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom"
+              :class="{ 'disabled-pay-item': item.disabled }"
+            >
+              <view class="ss-flex ss-col-center">
+                <image
+                  class="pay-icon"
+                  v-if="item.disabled"
+                  :src="sheep.$url.static('/static/img/shop/pay/cod_disabled.png')"
+                  mode="aspectFit"
+                />
+                <image
+                  class="pay-icon"
+                  v-else
+                  :src="sheep.$url.static(item.icon)"
+                  mode="aspectFit"
+                />
+                <text class="pay-title">{{ item.title }}</text>
+              </view>
+              <view class="check-box ss-flex ss-col-center ss-p-l-10">
+                <view class="userInfo-money ss-m-r-10" v-if="item.value === 'wallet'">
+                  余额: {{ fen2yuan(userWallet.balance) }}元
+                </view>
+                <radio
+                  :value="item.value"
+                  color="var(--ui-BG-Main)"
+                  style="transform: scale(0.8)"
+                  :disabled="item.disabled"
+                  :checked="state.payment === item.value"
+                />
+              </view>
+            </view>
+          </label>
+        </radio-group>
+      </view>
+
+      <!-- 工具 -->
+      <view class="modal-footer ss-flex ss-row-center ss-col-center ss-m-t-80 ss-m-b-40">
+        <button v-if="state.payStatus === 0" class="ss-reset-button past-due-btn">
+          检测支付环境中
+        </button>
+        <button v-else-if="state.payStatus === -1" class="ss-reset-button past-due-btn" disabled>
+          支付已过期
+        </button>
+        <button
+          v-else
+          class="ss-reset-button save-btn"
+          @tap="onPay"
+          :disabled="state.payStatus !== 1"
+          :class="{ 'disabled-btn': state.payStatus !== 1 }"
+        >
+          立即支付
+        </button>
+      </view>
+    </view>
+  </s-layout>
+</template>
+<script setup>
+  import { computed, reactive } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
+  import PayOrderApi from '@/sheep/api/pay/order';
+  import PayChannelApi from '@/sheep/api/pay/channel';
+  import { getPayMethods } from '@/sheep/platform/pay';
+
+  const userWallet = computed(() => sheep.$store('user').userWallet);
+
+  // 检测支付环境
+  const state = reactive({
+    orderType: 'goods', // 订单类型; goods - 商品订单, recharge - 充值订单
+    orderInfo: {}, // 支付单信息
+    payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息， -1=支付已过期， 1=待支付，2=订单已支付
+    payMethods: [], // 可选的支付方式
+    payment: '', // 选中的支付方式
+  });
+
+  const onPay = () => {
+    if (state.payment === '') {
+      sheep.$helper.toast('请选择支付方式');
+      return;
+    }
+    if (state.payment === 'wallet') {
+	  if(state.orderInfo.price > userWallet.value.balance){
+		  uni.showModal({
+		    title: '账户余额不足',
+			confirmText: '去充值',
+		    success: function (res) {
+		      if (res.confirm) {
+				  sheep.$router.go('/pages/pay/recharge');
+		      }
+		    },
+		  });
+		  return;
+	  }
+	  	
+      uni.showModal({
+        title: '提示',
+        content: '确定要支付吗?',
+        success: function (res) {
+          if (res.confirm) {
+            sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id, 'point');
+          }
+        },
+      });
+    } else {
+      sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id, 'point');
+    }
+  };
+
+  // 支付文案提示
+  const payDescText = computed(() => {
+    if (state.payStatus === 2) {
+      return '该订单已支付';
+    }
+    if (state.payStatus === 1) {
+      const time = useDurationTime(state.orderInfo.expireTime);
+      if (time.ms <= 0) {
+        state.payStatus = -1;
+        return '';
+      }
+      return `剩余支付时间 ${time.h}:${time.m}:${time.s} `;
+    }
+    if (state.payStatus === -2) {
+      return '未查询到支付单信息';
+    }
+    return '';
+  });
+
+  // 状态转换：payOrder.status => payStatus
+  function checkPayStatus() {
+    if (state.orderInfo.status === 10
+      || state.orderInfo.status === 20 ) { // 支付成功
+      state.payStatus = 2;
+      return;
+    }
+    if (state.orderInfo.status === 30) { // 支付关闭
+      state.payStatus = -1;
+      return;
+    }
+    state.payStatus = 1; // 待支付
+  }
+
+  // 切换支付方式
+  function onTapPay(e) {
+    state.payment = e.detail.value;
+  }
+
+  // 设置支付订单信息
+  async function setOrder(id) {
+    // 获得支付订单信息
+    const { data, code } = await PayOrderApi.getOrder(id);
+    if (code !== 0 || !data) {
+      state.payStatus = -2;
+      return;
+    }
+    state.orderInfo = data;
+    // 获得支付方式
+    await setPayMethods();
+    // 设置支付状态
+    checkPayStatus();
+  }
+
+  // 获得支付方式
+  async function setPayMethods() {
+    const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId)
+    if (code !== 0) {
+      return
+    }
+    state.payMethods = getPayMethods(data)
+	state.payMethods.find(item => {
+	  if (item.value && !item.disabled) {
+		state.payment = item.value;
+		return true;
+	  }
+	});
+  }
+
+  onLoad((options) => {
+    if (sheep.$platform.name === 'WechatOfficialAccount'
+      && sheep.$platform.os === 'ios'
+      && !sheep.$platform.landingPage.includes('pages/pay/point/index')) {
+      location.reload();
+      return;
+    }
+    // 获得支付订单信息
+    let id = options.id;
+    if (options.orderType) {
+      state.orderType = options.orderType;
+    }
+    setOrder(id);
+    // 刷新钱包的缓存
+    sheep.$store('user').getWallet();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .pay-icon {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 26rpx;
+  }
+
+  .ss-modal-box {
+    // max-height: 1000rpx;
+
+    .modal-header {
+      position: relative;
+      padding: 60rpx 20rpx 40rpx;
+
+
+      .money-text {
+        color: $red;
+        font-size: 46rpx;
+        font-weight: bold;
+        font-family: OPPOSANS;
+
+        &::before {
+          content: '￥';
+          font-size: 30rpx;
+        }
+      }
+
+      .time-text {
+        font-size: 26rpx;
+        color: $gray-b;
+      }
+
+      .close-icon {
+        position: absolute;
+        top: 10rpx;
+        right: 20rpx;
+        font-size: 46rpx;
+        opacity: 0.2;
+      }
+    }
+
+    .modal-content {
+      overflow-y: auto;
+
+      .pay-title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .pay-tip {
+        font-size: 26rpx;
+        color: #bbbbbb;
+      }
+
+      .pay-item {
+        height: 86rpx;
+      }
+      .disabled-pay-item {
+        .pay-title {
+          color: #999999;
+        }
+      }
+
+      .userInfo-money {
+        font-size: 26rpx;
+        color: #bbbbbb;
+        line-height: normal;
+      }
+    }
+
+    .save-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      color: $white;
+    }
+    .disabled-btn {
+      background: #e5e5e5;
+      color: #999999;
+    }
+
+    .past-due-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background-color: #999;
+      color: #fff;
+    }
+  }
+</style>
diff --git a/pages/pay/recharge-log.vue b/pages/pay/recharge-log.vue
new file mode 100644
index 0000000..5dd3e36
--- /dev/null
+++ b/pages/pay/recharge-log.vue
@@ -0,0 +1,167 @@
+<!-- 充值记录 -->
+<template>
+  <s-layout class="widthdraw-log-wrap" title="充值记录">
+    <!-- 记录卡片 -->
+    <view class="wallet-log-box ss-p-b-30">
+      <view class="log-list" v-for="item in state.pagination.list" :key="item">
+        <view class="head ss-flex ss-col-center ss-row-between">
+          <view class="title">充值钻石</view>
+          <view class="num" :class="item.refundStatus === 10 ? 'danger-color' : 'success-color'">
+            {{ fen2yuan(item.payPrice) }} 钻
+            <text v-if="item.bonusPrice > 0">（赠送 {{ fen2yuan(item.bonusPrice) }} 钻）</text>
+          </view>
+        </view>
+        <view class="status-box item ss-flex ss-col-center ss-row-between">
+          <view class="item-title">支付状态</view>
+          <view
+            class="status-text"
+            :class="item.refundStatus === 10 ? 'danger-color' : 'success-color'"
+          >
+            {{ item.refundStatus === 10 ? '已退款' : '已支付' }}
+          </view>
+        </view>
+        <view class="time-box item ss-flex ss-col-center ss-row-between">
+          <text class="item-title">充值渠道</text>
+          <view class="time ss-ellipsis-1">{{ item.payChannelName }}</view>
+        </view>
+        <view class="time-box item ss-flex ss-col-center ss-row-between">
+          <text class="item-title">充值单号</text>
+          <view class="time"> {{ item.payOrderChannelOrderNo }} </view>
+        </view>
+        <view class="time-box item ss-flex ss-col-center ss-row-between">
+          <text class="item-title">充值时间</text>
+          <view class="time">
+            {{ sheep.$helper.timeFormat(item.payTime, 'yyyy-mm-dd hh:MM:ss') }}</view
+          >
+        </view>
+      </view>
+    </view>
+    <s-empty
+      v-if="state.pagination.total === 0"
+      icon="/static/comment-empty.png"
+      text="暂无充值记录"
+    />
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import { reactive } from 'vue';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import _ from 'lodash-es';
+  import PayWalletApi from '@/sheep/api/pay/wallet';
+  import sheep from '@/sheep';
+  import { fen2yuan } from '../../sheep/hooks/useGoods';
+
+  const state = reactive({
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 5,
+    },
+    loadStatus: '',
+  });
+
+  async function getLogList(page = 1, list_rows = 5) {
+    const { code, data } = await PayWalletApi.getWalletRechargePage({
+      pageNo: page,
+      pageSize: list_rows,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getLogList();
+  }
+
+  onLoad(() => {
+    getLogList();
+  });
+
+  onReachBottom(() => {
+    loadMore();
+  });
+</script>
+
+<style lang="scss" scoped>
+  // 记录卡片
+  .log-list {
+    min-height: 213rpx;
+    background: $white;
+    margin-bottom: 10rpx;
+    padding-bottom: 10rpx;
+
+    .head {
+      padding: 0 35rpx;
+      height: 80rpx;
+      border-bottom: 1rpx solid $gray-e;
+      margin-bottom: 20rpx;
+
+      .title {
+        font-size: 28rpx;
+        font-weight: 500;
+        color: $dark-3;
+      }
+
+      .num {
+        font-size: 28rpx;
+        font-weight: 500;
+      }
+    }
+
+    .item {
+      padding: 0 30rpx 10rpx;
+
+      .item-icon {
+        color: $gray-d;
+        font-size: 36rpx;
+        margin-right: 8rpx;
+      }
+
+      .item-title {
+        width: 180rpx;
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #666666;
+      }
+
+      .status-text {
+        font-size: 24rpx;
+        font-weight: 500;
+      }
+
+      .time {
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #c0c0c0;
+      }
+    }
+  }
+  .warning-color {
+    color: #faad14;
+  }
+  .danger-color {
+    color: #ff4d4f;
+  }
+  .success-color {
+    color: #67c23a;
+  }
+</style>
diff --git a/pages/pay/recharge.vue b/pages/pay/recharge.vue
new file mode 100644
index 0000000..d63c640
--- /dev/null
+++ b/pages/pay/recharge.vue
@@ -0,0 +1,264 @@
+<!-- 充值界面 -->
+<template>
+  <s-layout title="充值钻石" class="withdraw-wrap" navbar="inner">
+    <view class="wallet-num-box ss-flex ss-col-center ss-row-between" :style="[
+      {
+        marginTop: '-' + Number(statusBarHeight + 88 + 22) + 'rpx',
+        paddingTop: Number(statusBarHeight + 108 + 22) + 'rpx',
+      },
+    ]">
+      <view class="">
+        <view class="num-title">当前钻石（钻）</view>
+        <view class="wallet-num">{{ fen2yuan(userWallet.balance) }}</view>
+      </view>
+      <button class="ss-reset-button log-btn" @tap="sheep.$router.go('/pages/user/wallet/money')">
+        钻石明细
+      </button>
+    </view>
+    <view class="recharge-box">
+      <view class="recharge-card-box">
+        <view class="input-label ss-m-b-50">充值钻石</view>
+       <!-- <view class="input-box ss-flex border-bottom ss-p-b-20">
+          <view class="unit">￥</view>
+          <uni-easyinput v-model="state.recharge_money" type="digit" placeholder="请输入充值金额"
+                         :inputBorder="false" />
+        </view> -->
+        <view class="face-value-box ss-flex ss-flex-wrap ss-m-y-40">
+          <button class="ss-reset-button face-value-btn" v-for="item in state.packageList" :key="item.money"
+                  :class="[{ 'btn-active': state.recharge_money === fen2yuan(item.payPrice) }]"
+                  @tap="onCard(item.payPrice)">
+            <text class="face-value-title">{{ fen2yuan(item.payPrice) }}</text>
+            <view v-if="item.bonusPrice" class="face-value-tag">
+              送 {{ fen2yuan(item.bonusPrice) }} 钻
+            </view>
+          </button>
+        </view>
+        <button class="ss-reset-button save-btn ui-BG-Main-Gradient ss-m-t-60 ui-Shadow-Main" @tap="onConfirm">
+          确认充值
+        </button>
+      </view>
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import { computed, reactive } from 'vue';
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import PayWalletApi from '@/sheep/api/pay/wallet';
+  import { WxaSubscribeTemplate } from '@/sheep/util/const';
+
+  const userWallet = computed(() => sheep.$store('user').userWallet);
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
+
+  const state = reactive({
+    recharge_money: '', // 输入的充值金额
+    packageList: [],
+  });
+
+  // 点击卡片，选择充值金额
+  function onCard(e) {
+    state.recharge_money = fen2yuan(e);
+  }
+
+  // 获得钱包充值套餐列表
+  async function getRechargeTabs() {
+    const { code, data } = await PayWalletApi.getWalletRechargePackageList();
+    if (code !== 0) {
+      return;
+    }
+    state.packageList = data;
+  }
+
+  // 发起支付
+  async function onConfirm() {
+	if(state.recharge_money == 0){
+		sheep.$helper.toast('请选择充值套餐');
+		return;
+	}  
+    const { code, data } = await PayWalletApi.createWalletRecharge({
+      packageId: state.packageList.find((item) => fen2yuan(item.payPrice) === state.recharge_money)?.id,
+      payPrice: state.recharge_money * 100,
+    });
+    if (code !== 0) {
+      return;
+    }
+    // #ifdef MP
+    sheep.$platform.useProvider('wechat').subscribeMessage(WxaSubscribeTemplate.PAY_WALLET_RECHARGER_SUCCESS);
+    // #endif
+    sheep.$router.go('/pages/pay/index', {
+      id: data.payOrderId,
+      orderType: 'recharge',
+    });
+  }
+
+  onLoad(() => {
+    getRechargeTabs();
+  });
+</script>
+
+<style lang="scss" scoped>
+  :deep() {
+    .uni-input-input {
+      font-family: OPPOSANS !important;
+    }
+  }
+
+  .wallet-num-box {
+    padding: 0 40rpx 80rpx;
+    background: var(--ui-BG-Main) v-bind(headerBg) center/750rpx 100% no-repeat;
+    border-radius: 0 0 5% 5%;
+
+    .num-title {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: $white;
+      margin-bottom: 20rpx;
+    }
+
+    .wallet-num {
+      font-size: 60rpx;
+      font-weight: 500;
+      color: $white;
+      font-family: OPPOSANS;
+    }
+
+    .log-btn {
+      width: 170rpx;
+      height: 60rpx;
+      line-height: 60rpx;
+      border: 1rpx solid $white;
+      border-radius: 30rpx;
+      padding: 0;
+      font-size: 26rpx;
+      font-weight: 500;
+      color: $white;
+    }
+  }
+
+  .recharge-box {
+    position: relative;
+    padding: 0 30rpx;
+    margin-top: -60rpx;
+  }
+
+  .save-btn {
+    width: 620rpx;
+    height: 86rpx;
+    border-radius: 44rpx;
+    font-size: 30rpx;
+  }
+
+  .recharge-card-box {
+    width: 690rpx;
+    background: var(--ui-BG);
+    border-radius: 20rpx;
+    padding: 30rpx;
+    box-sizing: border-box;
+
+    .input-label {
+      font-size: 30rpx;
+      font-weight: 500;
+      color: #333;
+    }
+
+    .unit {
+      display: flex;
+      align-items: center;
+      font-size: 48rpx;
+      font-weight: 500;
+    }
+
+    .uni-easyinput__placeholder-class {
+      font-size: 30rpx;
+      height: 60rpx;
+      display: flex;
+      align-items: center;
+    }
+
+    :deep(.uni-easyinput__content-input) {
+      font-size: 48rpx;
+    }
+
+    .face-value-btn {
+      width: 200rpx;
+      height: 144rpx;
+      border: 1px solid var(--ui-BG-Main);
+      border-radius: 10rpx;
+      position: relative;
+      z-index: 1;
+      margin-bottom: 15rpx;
+      margin-right: 15rpx;
+
+      &:nth-of-type(3n) {
+        margin-right: 0;
+      }
+
+      .face-value-title {
+        font-size: 36rpx;
+        font-weight: 500;
+        color: var(--ui-BG-Main);
+        font-family: OPPOSANS;
+
+        &::after {
+          content: '钻';
+          font-size: 24rpx;
+          margin-left: 6rpx;
+        }
+      }
+
+      .face-value-tag {
+        position: absolute;
+        z-index: 2;
+        height: 40rpx;
+        line-height: 40rpx;
+        background: var(--ui-BG-Main);
+        opacity: 0.8;
+        border-radius: 10rpx 0 20rpx 0;
+        top: 0;
+        left: -2rpx;
+        padding: 0 16rpx;
+        font-size: 22rpx;
+        color: $white;
+        font-family: OPPOSANS;
+      }
+
+      &::before {
+        position: absolute;
+        content: ' ';
+        width: 100%;
+        height: 100%;
+        background: var(--ui-BG-Main);
+        opacity: 0.1;
+        z-index: 0;
+        left: 0;
+        top: 0;
+      }
+    }
+
+    .btn-active {
+      z-index: 1;
+
+      &::before {
+        content: '';
+        background: var(--ui-BG-Main);
+        opacity: 1;
+      }
+
+      .face-value-title {
+        color: $white;
+        position: relative;
+        z-index: 1;
+        font-family: OPPOSANS;
+      }
+
+      .face-value-tag {
+        background: $white;
+        color: var(--ui-BG-Main);
+        font-family: OPPOSANS;
+      }
+    }
+  }
+</style>
diff --git a/pages/pay/result.vue b/pages/pay/result.vue
new file mode 100644
index 0000000..e4cc298
--- /dev/null
+++ b/pages/pay/result.vue
@@ -0,0 +1,318 @@
+<!-- 支付结果页面 -->
+<template>
+  <s-layout title="支付结果" :bgStyle="{ color: '#FFF' }">
+    <view class="pay-result-box ss-flex-col ss-row-center ss-col-center">
+      <!-- 信息展示 -->
+      <view class="pay-waiting ss-m-b-30" v-if="payResult === 'waiting'" />
+      <image
+        class="pay-img ss-m-b-30"
+        v-if="payResult === 'success'"
+        :src="sheep.$url.static('/static/img/shop/order/order_pay_success.gif')"
+      />
+      <image
+        class="pay-img ss-m-b-30"
+        v-if="['failed', 'closed'].includes(payResult)"
+        :src="sheep.$url.static('/static/img/shop/order/order_paty_fail.gif')"
+      />
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'success'">支付成功</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'failed'">支付失败</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'closed'">该订单已关闭</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'waiting'">检测支付结果...</view>
+      <view class="pay-total-num ss-flex" v-if="payResult === 'success'">
+        <view>￥{{ fen2yuan(state.orderInfo.price) }}</view>
+      </view>
+
+      <!-- 操作区 -->
+      <view class="btn-box ss-flex ss-row-center ss-m-t-50">
+        <button class="back-btn ss-reset-button" @tap="sheep.$router.go('/pages/tabbar/index')">
+          返回首页
+        </button>
+        <button
+          class="check-btn ss-reset-button"
+          v-if="payResult === 'failed'"
+          @tap="
+            sheep.$router.redirect('/pages/pay/index', { id: state.id, orderType: state.orderType })
+          "
+        >
+          重新支付
+        </button>
+        <button class="check-btn ss-reset-button" v-if="payResult === 'success'" @tap="onOrder">
+          查看订单
+        </button>
+        <button
+          class="check-btn ss-reset-button"
+          v-if="payResult === 'success' && state.tradeOrder.type === 3"
+          @tap="sheep.$router.redirect('/pages/activity/groupon/order')"
+        >
+          我的拼团
+        </button>
+      </view>
+
+      <!-- #ifdef MP -->
+      <view
+        class="subscribe-box ss-flex ss-m-t-44"
+        v-if="showSubscribeBtn && state.orderType === 'goods'"
+      >
+        <image class="subscribe-img" :src="sheep.$url.static('/static/img/shop/order/cargo.png')" />
+        <view class="subscribe-title ss-m-r-48 ss-m-l-16">获取实时发货信息与订单状态</view>
+        <view class="subscribe-start" @tap="subscribeMessage">立即订阅</view>
+      </view>
+      <!-- #endif -->
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import { onLoad, onHide, onShow } from '@dcloudio/uni-app';
+  import { reactive, computed, ref } from 'vue';
+  import { isEmpty } from 'lodash-es';
+  import sheep from '@/sheep';
+  import PayOrderApi from '@/sheep/api/pay/order';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import OrderApi from '@/sheep/api/trade/order';
+  import { WxaSubscribeTemplate } from '@/sheep/util/const';
+
+  const state = reactive({
+    id: 0, // 支付单号
+    orderType: 'goods', // 订单类型
+    result: 'unpaid', // 支付状态
+    orderInfo: {}, // 支付订单信息
+    tradeOrder: {}, // 商品订单信息，只有在 orderType 为 goods 才会请求。目的：【我的拼团】按钮的展示
+    counter: 0, // 获取结果次数
+  });
+
+  // 支付结果 result => payResult
+  const payResult = computed(() => {
+    if (state.result === 'unpaid') {
+      return 'waiting';
+    }
+    if (state.result === 'paid') {
+      return 'success';
+    }
+    if (state.result === 'failed') {
+      return 'failed';
+    }
+    if (state.result === 'closed') {
+      return 'closed';
+    }
+  });
+
+  // 获得订单信息
+  async function getOrderInfo(id) {
+    state.counter++;
+    // 1. 加载订单信息
+    const { data, code } = await PayOrderApi.getOrder(id);
+    if (code === 0) {
+      state.orderInfo = data;
+      if (!state.orderInfo || state.orderInfo.status === 30) {
+        // 支付关闭
+        state.result = 'closed';
+        return;
+      }
+      if (state.orderInfo.status !== 0) {
+		sheep.$store('user').getWallet();
+        // 非待支付，可能是已支付，可能是已退款
+        state.result = 'paid';
+        // #ifdef MP
+        uni.showModal({
+          title: '支付结果',
+          showCancel: false, // 不要取消按钮
+          content: '支付成功',
+          success: () => {
+            // 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
+            autoSubscribeMessage();
+          },
+        });
+
+        // #endif
+        // 特殊：获得商品订单信息
+        if (state.orderType === 'goods') {
+          const { data, code } = await OrderApi.getOrder(state.orderInfo.merchantOrderId);
+          if (code === 0) {
+            state.tradeOrder = data;
+          }
+        }
+        return;
+      }
+    }
+    // 2.1 情况三一：未支付，且轮询次数小于三次，则继续轮询
+    if (state.counter < 3 && state.result === 'unpaid') {
+      setTimeout(() => {
+        getOrderInfo(id);
+      }, 1500);
+    }
+    // 2.2 情况二：超过三次检测才判断为支付失败
+    if (state.counter >= 3) {
+      state.result = 'failed';
+    }
+  }
+
+  function onOrder() {
+    if (state.orderType === 'recharge') {
+      sheep.$router.redirect('/pages/pay/recharge-log');
+    } else {
+      sheep.$router.redirect('/pages/order/list');
+    }
+  }
+
+  // #ifdef MP
+  const showSubscribeBtn = ref(false); // 默认隐藏
+  const SUBSCRIBE_BTN_STATUS_STORAGE_KEY = 'subscribe_btn_status';
+  function subscribeMessage() {
+    if (state.orderType !== 'goods') {
+      return;
+    }
+    const event = [WxaSubscribeTemplate.TRADE_ORDER_DELIVERY];
+    if (state.tradeOrder.type === 3) {
+      event.push(WxaSubscribeTemplate.PROMOTION_COMBINATION_SUCCESS);
+    }
+    sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+      // 订阅后记录一下订阅状态
+      uni.removeStorageSync(SUBSCRIBE_BTN_STATUS_STORAGE_KEY);
+      uni.setStorageSync(SUBSCRIBE_BTN_STATUS_STORAGE_KEY, '已订阅');
+      // 隐藏订阅按钮
+      showSubscribeBtn.value = false;
+    });
+  }
+  async function autoSubscribeMessage() {
+    // 1. 校验是否手动订阅过
+    const subscribeBtnStatus = uni.getStorageSync(SUBSCRIBE_BTN_STATUS_STORAGE_KEY);
+    if (!subscribeBtnStatus) {
+      showSubscribeBtn.value = true;
+      return;
+    }
+
+    // 2. 订阅消息
+    subscribeMessage();
+  }
+  // #endif
+
+  onLoad(async (options) => {
+    // 支付订单号
+    if (options.id) {
+      state.id = options.id;
+    }
+    // 订单类型
+    if (options.orderType) {
+      state.orderType = options.orderType;
+    }
+
+    // 支付结果传值过来是失败，则直接显示失败界面
+    if (options.payState === 'fail') {
+      state.result = 'failed';
+    } else {
+      // 轮询三次检测订单支付结果
+      await getOrderInfo(state.id);
+    }
+  });
+
+  onShow(() => {
+    if (isEmpty(state.orderInfo)) {
+      return;
+    }
+    getOrderInfo(state.id);
+  });
+
+  onHide(() => {
+    state.result = 'unpaid';
+    state.counter = 0;
+  });
+</script>
+
+<style lang="scss" scoped>
+  @keyframes rotation {
+    0% {
+      transform: rotate(0deg);
+    }
+
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .pay-result-box {
+    padding: 60rpx 0;
+
+    .pay-waiting {
+      margin-top: 20rpx;
+      width: 60rpx;
+      height: 60rpx;
+      border: 10rpx solid rgb(233, 231, 231);
+      border-bottom-color: rgb(204, 204, 204);
+      border-radius: 50%;
+      display: inline-block;
+      // -webkit-animation: rotation 1s linear infinite;
+      animation: rotation 1s linear infinite;
+    }
+
+    .pay-img {
+      width: 130rpx;
+      height: 130rpx;
+    }
+
+    .tip-text {
+      font-size: 30rpx;
+      font-weight: bold;
+      color: #333333;
+    }
+
+    .pay-total-num {
+      font-size: 36rpx;
+      font-weight: 500;
+      color: #333333;
+      font-family: OPPOSANS;
+    }
+
+    .btn-box {
+      width: 100%;
+
+      .back-btn {
+        width: 190rpx;
+        height: 70rpx;
+        font-size: 28rpx;
+        border: 2rpx solid #dfdfdf;
+        border-radius: 35rpx;
+        font-weight: 400;
+        color: #595959;
+      }
+
+      .check-btn {
+        width: 190rpx;
+        height: 70rpx;
+        font-size: 28rpx;
+        border: 2rpx solid #dfdfdf;
+        border-radius: 35rpx;
+        font-weight: 400;
+        color: #595959;
+        margin-left: 32rpx;
+      }
+    }
+
+    .subscribe-box {
+      .subscribe-img {
+        width: 44rpx;
+        height: 44rpx;
+      }
+
+      .subscribe-title {
+        font-weight: 500;
+        font-size: 32rpx;
+        line-height: 36rpx;
+        color: #434343;
+      }
+
+      .subscribe-start {
+        color: var(--ui-BG-Main);
+        font-weight: 700;
+        font-size: 32rpx;
+        line-height: 36rpx;
+      }
+    }
+  }
+</style>
diff --git a/pages/pay/reward/index.vue b/pages/pay/reward/index.vue
new file mode 100644
index 0000000..3541dda
--- /dev/null
+++ b/pages/pay/reward/index.vue
@@ -0,0 +1,308 @@
+<!-- 收银台 -->
+<template>
+  <s-layout title="收银台">
+    <view class="bg-white ss-modal-box ss-flex-col">
+      <!-- 订单信息 -->
+      <view class="modal-header ss-flex-col ss-col-center ss-row-center">
+        <view class="money-box ss-m-b-20">
+          <text class="money-text">{{ fen2yuan(state.orderInfo.price) }}</text>
+        </view>
+        <view class="time-text">
+          <text>{{ payDescText }}</text>
+        </view>
+      </view>
+
+      <!-- 支付方式 -->
+      <view class="modal-content ss-flex-1">
+        <view class="pay-title ss-p-l-30 ss-m-y-30">选择支付方式</view>
+        <radio-group @change="onTapPay">
+          <label class="pay-type-item" v-for="item in state.payMethods" :key="item.title">
+            <view
+			  v-if="!item.disabled"
+              class="pay-item ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom"
+              :class="{ 'disabled-pay-item': item.disabled }"
+            >
+              <view class="ss-flex ss-col-center">
+                <image
+                  class="pay-icon"
+                  v-if="item.disabled"
+                  :src="sheep.$url.static('/static/img/shop/pay/cod_disabled.png')"
+                  mode="aspectFit"
+                />
+                <image
+                  class="pay-icon"
+                  v-else
+                  :src="sheep.$url.static(item.icon)"
+                  mode="aspectFit"
+                />
+                <text class="pay-title">{{ item.title }}</text>
+              </view>
+              <view class="check-box ss-flex ss-col-center ss-p-l-10">
+                <view class="userInfo-money ss-m-r-10" v-if="item.value === 'wallet'">
+                  余额: {{ fen2yuan(userWallet.balance) }}元
+                </view>
+                <radio
+                  :value="item.value"
+                  color="var(--ui-BG-Main)"
+                  style="transform: scale(0.8)"
+                  :disabled="item.disabled"
+                  :checked="state.payment === item.value"
+                />
+              </view>
+            </view>
+          </label>
+        </radio-group>
+      </view>
+
+      <!-- 工具 -->
+      <view class="modal-footer ss-flex ss-row-center ss-col-center ss-m-t-80 ss-m-b-40">
+        <button v-if="state.payStatus === 0" class="ss-reset-button past-due-btn">
+          检测支付环境中
+        </button>
+        <button v-else-if="state.payStatus === -1" class="ss-reset-button past-due-btn" disabled>
+          支付已过期
+        </button>
+        <button
+          v-else
+          class="ss-reset-button save-btn"
+          @tap="onPay"
+          :disabled="state.payStatus !== 1"
+          :class="{ 'disabled-btn': state.payStatus !== 1 }"
+        >
+          立即支付
+        </button>
+      </view>
+    </view>
+  </s-layout>
+</template>
+<script setup>
+  import { computed, reactive } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
+  import PayOrderApi from '@/sheep/api/pay/order';
+  import PayChannelApi from '@/sheep/api/pay/channel';
+  import { getPayMethods } from '@/sheep/platform/pay';
+
+  const userWallet = computed(() => sheep.$store('user').userWallet);
+
+  // 检测支付环境
+  const state = reactive({
+    orderType: 'goods', // 订单类型; goods - 商品订单, recharge - 充值订单
+    orderInfo: {}, // 支付单信息
+    payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息， -1=支付已过期， 1=待支付，2=订单已支付
+    payMethods: [], // 可选的支付方式
+    payment: '', // 选中的支付方式
+  });
+
+  const onPay = () => {
+    if (state.payment === '') {
+      sheep.$helper.toast('请选择支付方式');
+      return;
+    }
+    if (state.payment === 'wallet') {
+	  if(state.orderInfo.price > userWallet.value.balance){
+		  uni.showModal({
+			title: '账户余额不足',
+			confirmText: '去充值',
+			success: function (res) {
+			  if (res.confirm) {
+				  sheep.$router.go('/pages/pay/recharge');
+			  }
+			},
+		  });
+		  return;
+	  }	
+		
+      uni.showModal({
+        title: '提示',
+        content: '确定要支付吗?',
+        success: function (res) {
+          if (res.confirm) {
+            sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id, 'reward');
+          }
+        },
+      });
+    } else {
+      sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id, 'reward');
+    }
+  };
+
+  // 支付文案提示
+  const payDescText = computed(() => {
+    if (state.payStatus === 2) {
+      return '该订单已支付';
+    }
+    if (state.payStatus === 1) {
+      const time = useDurationTime(state.orderInfo.expireTime);
+      if (time.ms <= 0) {
+        state.payStatus = -1;
+        return '';
+      }
+      return `剩余支付时间 ${time.h}:${time.m}:${time.s} `;
+    }
+    if (state.payStatus === -2) {
+      return '未查询到支付单信息';
+    }
+    return '';
+  });
+
+  // 状态转换：payOrder.status => payStatus
+  function checkPayStatus() {
+    if (state.orderInfo.status === 10
+      || state.orderInfo.status === 20 ) { // 支付成功
+      state.payStatus = 2;
+      return;
+    }
+    if (state.orderInfo.status === 30) { // 支付关闭
+      state.payStatus = -1;
+      return;
+    }
+    state.payStatus = 1; // 待支付
+  }
+
+  // 切换支付方式
+  function onTapPay(e) {
+    state.payment = e.detail.value;
+  }
+
+  // 设置支付订单信息
+  async function setOrder(id) {
+    // 获得支付订单信息
+    const { data, code } = await PayOrderApi.getOrder(id);
+    if (code !== 0 || !data) {
+      state.payStatus = -2;
+      return;
+    }
+    state.orderInfo = data;
+    // 获得支付方式
+    await setPayMethods();
+    // 设置支付状态
+    checkPayStatus();
+  }
+
+  // 获得支付方式
+  async function setPayMethods() {
+    const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId)
+    if (code !== 0) {
+      return
+    }
+    state.payMethods = getPayMethods(data)
+	state.payMethods.find(item => {
+	  if (item.value && !item.disabled) {
+		state.payment = item.value;
+		return true;
+	  }
+	});
+  }
+
+  onLoad((options) => {
+    if (sheep.$platform.name === 'WechatOfficialAccount'
+      && sheep.$platform.os === 'ios'
+      && !sheep.$platform.landingPage.includes('pages/pay/reward/index')) {
+      location.reload();
+      return;
+    }
+    // 获得支付订单信息
+    let id = options.id;
+    if (options.orderType) {
+      state.orderType = options.orderType;
+    }
+    setOrder(id);
+    // 刷新钱包的缓存
+    sheep.$store('user').getWallet();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .pay-icon {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 26rpx;
+  }
+
+  .ss-modal-box {
+    // max-height: 1000rpx;
+
+    .modal-header {
+      position: relative;
+      padding: 60rpx 20rpx 40rpx;
+
+
+      .money-text {
+        color: $red;
+        font-size: 46rpx;
+        font-weight: bold;
+        font-family: OPPOSANS;
+
+        &::before {
+          content: '￥';
+          font-size: 30rpx;
+        }
+      }
+
+      .time-text {
+        font-size: 26rpx;
+        color: $gray-b;
+      }
+
+      .close-icon {
+        position: absolute;
+        top: 10rpx;
+        right: 20rpx;
+        font-size: 46rpx;
+        opacity: 0.2;
+      }
+    }
+
+    .modal-content {
+      overflow-y: auto;
+
+      .pay-title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .pay-tip {
+        font-size: 26rpx;
+        color: #bbbbbb;
+      }
+
+      .pay-item {
+        height: 86rpx;
+      }
+      .disabled-pay-item {
+        .pay-title {
+          color: #999999;
+        }
+      }
+
+      .userInfo-money {
+        font-size: 26rpx;
+        color: #bbbbbb;
+        line-height: normal;
+      }
+    }
+
+    .save-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      color: $white;
+    }
+    .disabled-btn {
+      background: #e5e5e5;
+      color: #999999;
+    }
+
+    .past-due-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background-color: #999;
+      color: #fff;
+    }
+  }
+</style>
diff --git a/pages/pay/vip/index.vue b/pages/pay/vip/index.vue
new file mode 100644
index 0000000..bd47e5b
--- /dev/null
+++ b/pages/pay/vip/index.vue
@@ -0,0 +1,308 @@
+<!-- 收银台 -->
+<template>
+  <s-layout title="收银台">
+    <view class="bg-white ss-modal-box ss-flex-col">
+      <!-- 订单信息 -->
+      <view class="modal-header ss-flex-col ss-col-center ss-row-center">
+        <view class="money-box ss-m-b-20">
+          <text class="money-text">{{ fen2yuan(state.orderInfo.price) }}</text>
+        </view>
+        <view class="time-text">
+          <text>{{ payDescText }}</text>
+        </view>
+      </view>
+
+      <!-- 支付方式 -->
+      <view class="modal-content ss-flex-1">
+        <view class="pay-title ss-p-l-30 ss-m-y-30">选择支付方式</view>
+        <radio-group @change="onTapPay">
+          <label class="pay-type-item" v-for="item in state.payMethods" :key="item.title">
+            <view
+			  v-if="!item.disabled"
+              class="pay-item ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom"
+              :class="{ 'disabled-pay-item': item.disabled }"
+            >
+              <view class="ss-flex ss-col-center">
+                <image
+                  class="pay-icon"
+                  v-if="item.disabled"
+                  :src="sheep.$url.static('/static/img/shop/pay/cod_disabled.png')"
+                  mode="aspectFit"
+                />
+                <image
+                  class="pay-icon"
+                  v-else
+                  :src="sheep.$url.static(item.icon)"
+                  mode="aspectFit"
+                />
+                <text class="pay-title">{{ item.title }}</text>
+              </view>
+              <view class="check-box ss-flex ss-col-center ss-p-l-10">
+                <view class="userInfo-money ss-m-r-10" v-if="item.value === 'wallet'">
+                  余额: {{ fen2yuan(userWallet.balance) }}元
+                </view>
+                <radio
+                  :value="item.value"
+                  color="var(--ui-BG-Main)"
+                  style="transform: scale(0.8)"
+                  :disabled="item.disabled"
+                  :checked="state.payment === item.value"
+                />
+              </view>
+            </view>
+          </label>
+        </radio-group>
+      </view>
+
+      <!-- 工具 -->
+      <view class="modal-footer ss-flex ss-row-center ss-col-center ss-m-t-80 ss-m-b-40">
+        <button v-if="state.payStatus === 0" class="ss-reset-button past-due-btn">
+          检测支付环境中
+        </button>
+        <button v-else-if="state.payStatus === -1" class="ss-reset-button past-due-btn" disabled>
+          支付已过期
+        </button>
+        <button
+          v-else
+          class="ss-reset-button save-btn"
+          @tap="onPay"
+          :disabled="state.payStatus !== 1"
+          :class="{ 'disabled-btn': state.payStatus !== 1 }"
+        >
+          立即支付
+        </button>
+      </view>
+    </view>
+  </s-layout>
+</template>
+<script setup>
+  import { computed, reactive } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
+  import PayOrderApi from '@/sheep/api/pay/order';
+  import PayChannelApi from '@/sheep/api/pay/channel';
+  import { getPayMethods } from '@/sheep/platform/pay';
+
+  const userWallet = computed(() => sheep.$store('user').userWallet);
+
+  // 检测支付环境
+  const state = reactive({
+    orderType: 'goods', // 订单类型; goods - 商品订单, recharge - 充值订单
+    orderInfo: {}, // 支付单信息
+    payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息， -1=支付已过期， 1=待支付，2=订单已支付
+    payMethods: [], // 可选的支付方式
+    payment: '', // 选中的支付方式
+  });
+
+  const onPay = () => {
+    if (state.payment === '') {
+      sheep.$helper.toast('请选择支付方式');
+      return;
+    }
+    if (state.payment === 'wallet') {
+	  if(state.orderInfo.price > userWallet.value.balance){
+		  uni.showModal({
+		    title: '账户余额不足',
+			confirmText: '去充值',
+		    success: function (res) {
+		      if (res.confirm) {
+				  sheep.$router.go('/pages/pay/recharge');
+		      }
+		    },
+		  });
+		  return;
+	  }
+	  	
+      uni.showModal({
+        title: '提示',
+        content: '确定要支付吗?',
+        success: function (res) {
+          if (res.confirm) {
+            sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id, 'vip');
+          }
+        },
+      });
+    } else {
+      sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id, 'vip');
+    }
+  };
+
+  // 支付文案提示
+  const payDescText = computed(() => {
+    if (state.payStatus === 2) {
+      return '该订单已支付';
+    }
+    if (state.payStatus === 1) {
+      const time = useDurationTime(state.orderInfo.expireTime);
+      if (time.ms <= 0) {
+        state.payStatus = -1;
+        return '';
+      }
+      return `剩余支付时间 ${time.h}:${time.m}:${time.s} `;
+    }
+    if (state.payStatus === -2) {
+      return '未查询到支付单信息';
+    }
+    return '';
+  });
+
+  // 状态转换：payOrder.status => payStatus
+  function checkPayStatus() {
+    if (state.orderInfo.status === 10
+      || state.orderInfo.status === 20 ) { // 支付成功
+      state.payStatus = 2;
+      return;
+    }
+    if (state.orderInfo.status === 30) { // 支付关闭
+      state.payStatus = -1;
+      return;
+    }
+    state.payStatus = 1; // 待支付
+  }
+
+  // 切换支付方式
+  function onTapPay(e) {
+    state.payment = e.detail.value;
+  }
+
+  // 设置支付订单信息
+  async function setOrder(id) {
+    // 获得支付订单信息
+    const { data, code } = await PayOrderApi.getOrder(id);
+    if (code !== 0 || !data) {
+      state.payStatus = -2;
+      return;
+    }
+    state.orderInfo = data;
+    // 获得支付方式
+    await setPayMethods();
+    // 设置支付状态
+    checkPayStatus();
+  }
+
+  // 获得支付方式
+  async function setPayMethods() {
+    const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId)
+    if (code !== 0) {
+      return
+    }
+    state.payMethods = getPayMethods(data)
+	state.payMethods.find(item => {
+	  if (item.value && !item.disabled) {
+		state.payment = item.value;
+		return true;
+	  }
+	});
+  }
+
+  onLoad((options) => {
+    if (sheep.$platform.name === 'WechatOfficialAccount'
+      && sheep.$platform.os === 'ios'
+      && !sheep.$platform.landingPage.includes('pages/pay/vip/index')) {
+      location.reload();
+      return;
+    }
+    // 获得支付订单信息
+    let id = options.id;
+    if (options.orderType) {
+      state.orderType = options.orderType;
+    }
+    setOrder(id);
+    // 刷新钱包的缓存
+    sheep.$store('user').getWallet();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .pay-icon {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 26rpx;
+  }
+
+  .ss-modal-box {
+    // max-height: 1000rpx;
+
+    .modal-header {
+      position: relative;
+      padding: 60rpx 20rpx 40rpx;
+
+
+      .money-text {
+        color: $red;
+        font-size: 46rpx;
+        font-weight: bold;
+        font-family: OPPOSANS;
+
+        &::before {
+          content: '￥';
+          font-size: 30rpx;
+        }
+      }
+
+      .time-text {
+        font-size: 26rpx;
+        color: $gray-b;
+      }
+
+      .close-icon {
+        position: absolute;
+        top: 10rpx;
+        right: 20rpx;
+        font-size: 46rpx;
+        opacity: 0.2;
+      }
+    }
+
+    .modal-content {
+      overflow-y: auto;
+
+      .pay-title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .pay-tip {
+        font-size: 26rpx;
+        color: #bbbbbb;
+      }
+
+      .pay-item {
+        height: 86rpx;
+      }
+      .disabled-pay-item {
+        .pay-title {
+          color: #999999;
+        }
+      }
+
+      .userInfo-money {
+        font-size: 26rpx;
+        color: #bbbbbb;
+        line-height: normal;
+      }
+    }
+
+    .save-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      color: $white;
+    }
+    .disabled-btn {
+      background: #e5e5e5;
+      color: #999999;
+    }
+
+    .past-due-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background-color: #999;
+      color: #fff;
+    }
+  }
+</style>
diff --git a/pages/pay/worker/index.vue b/pages/pay/worker/index.vue
new file mode 100644
index 0000000..db34839
--- /dev/null
+++ b/pages/pay/worker/index.vue
@@ -0,0 +1,308 @@
+<!-- 收银台 -->
+<template>
+  <s-layout title="收银台">
+    <view class="bg-white ss-modal-box ss-flex-col">
+      <!-- 订单信息 -->
+      <view class="modal-header ss-flex-col ss-col-center ss-row-center">
+        <view class="money-box ss-m-b-20">
+          <text class="money-text">{{ fen2yuan(state.orderInfo.price) }}</text>
+        </view>
+        <view class="time-text">
+          <text>{{ payDescText }}</text>
+        </view>
+      </view>
+
+      <!-- 支付方式 -->
+      <view class="modal-content ss-flex-1">
+        <view class="pay-title ss-p-l-30 ss-m-y-30">选择支付方式</view>
+        <radio-group @change="onTapPay">
+          <label class="pay-type-item" v-for="item in state.payMethods" :key="item.title">
+            <view
+			  v-if="!item.disabled"
+              class="pay-item ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom"
+              :class="{ 'disabled-pay-item': item.disabled }"
+            >
+              <view class="ss-flex ss-col-center">
+                <image
+                  class="pay-icon"
+                  v-if="item.disabled"
+                  :src="sheep.$url.static('/static/img/shop/pay/cod_disabled.png')"
+                  mode="aspectFit"
+                />
+                <image
+                  class="pay-icon"
+                  v-else
+                  :src="sheep.$url.static(item.icon)"
+                  mode="aspectFit"
+                />
+                <text class="pay-title">{{ item.title }}</text>
+              </view>
+              <view class="check-box ss-flex ss-col-center ss-p-l-10">
+                <view class="userInfo-money ss-m-r-10" v-if="item.value === 'wallet'">
+                  余额: {{ fen2yuan(userWallet.balance) }}元
+                </view>
+                <radio
+                  :value="item.value"
+                  color="var(--ui-BG-Main)"
+                  style="transform: scale(0.8)"
+                  :disabled="item.disabled"
+                  :checked="state.payment === item.value"
+                />
+              </view>
+            </view>
+          </label>
+        </radio-group>
+      </view>
+
+      <!-- 工具 -->
+      <view class="modal-footer ss-flex ss-row-center ss-col-center ss-m-t-80 ss-m-b-40">
+        <button v-if="state.payStatus === 0" class="ss-reset-button past-due-btn">
+          检测支付环境中
+        </button>
+        <button v-else-if="state.payStatus === -1" class="ss-reset-button past-due-btn" disabled>
+          支付已过期
+        </button>
+        <button
+          v-else
+          class="ss-reset-button save-btn"
+          @tap="onPay"
+          :disabled="state.payStatus !== 1"
+          :class="{ 'disabled-btn': state.payStatus !== 1 }"
+        >
+          立即支付
+        </button>
+      </view>
+    </view>
+  </s-layout>
+</template>
+<script setup>
+  import { computed, reactive } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import { fen2yuan, useDurationTime } from '@/sheep/hooks/useGoods';
+  import PayOrderApi from '@/sheep/api/pay/order';
+  import PayChannelApi from '@/sheep/api/pay/channel';
+  import { getPayMethods } from '@/sheep/platform/pay';
+
+  const userWallet = computed(() => sheep.$store('user').userWallet);
+
+  // 检测支付环境
+  const state = reactive({
+    orderType: 'goods', // 订单类型; goods - 商品订单, recharge - 充值订单
+    orderInfo: {}, // 支付单信息
+    payStatus: 0, // 0=检测支付环境, -2=未查询到支付单信息， -1=支付已过期， 1=待支付，2=订单已支付
+    payMethods: [], // 可选的支付方式
+    payment: '', // 选中的支付方式
+  });
+
+  const onPay = () => {
+    if (state.payment === '') {
+      sheep.$helper.toast('请选择支付方式');
+      return;
+    }
+    if (state.payment === 'wallet') {
+	  if(state.orderInfo.price > userWallet.value.balance){
+		  uni.showModal({
+		    title: '账户余额不足',
+			confirmText: '去充值',
+		    success: function (res) {
+		      if (res.confirm) {
+				  sheep.$router.go('/pages/pay/recharge');
+		      }
+		    },
+		  });
+		  return;
+	  }
+	  	
+      uni.showModal({
+        title: '提示',
+        content: '确定要支付吗?',
+        success: function (res) {
+          if (res.confirm) {
+            sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id, 'worker');
+          }
+        },
+      });
+    } else {
+      sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id, 'worker');
+    }
+  };
+
+  // 支付文案提示
+  const payDescText = computed(() => {
+    if (state.payStatus === 2) {
+      return '该订单已支付';
+    }
+    if (state.payStatus === 1) {
+      const time = useDurationTime(state.orderInfo.expireTime);
+      if (time.ms <= 0) {
+        state.payStatus = -1;
+        return '';
+      }
+      return `剩余支付时间 ${time.h}:${time.m}:${time.s} `;
+    }
+    if (state.payStatus === -2) {
+      return '未查询到支付单信息';
+    }
+    return '';
+  });
+
+  // 状态转换：payOrder.status => payStatus
+  function checkPayStatus() {
+    if (state.orderInfo.status === 10
+      || state.orderInfo.status === 20 ) { // 支付成功
+      state.payStatus = 2;
+      return;
+    }
+    if (state.orderInfo.status === 30) { // 支付关闭
+      state.payStatus = -1;
+      return;
+    }
+    state.payStatus = 1; // 待支付
+  }
+
+  // 切换支付方式
+  function onTapPay(e) {
+    state.payment = e.detail.value;
+  }
+
+  // 设置支付订单信息
+  async function setOrder(id) {
+    // 获得支付订单信息
+    const { data, code } = await PayOrderApi.getOrder(id);
+    if (code !== 0 || !data) {
+      state.payStatus = -2;
+      return;
+    }
+    state.orderInfo = data;
+    // 获得支付方式
+    await setPayMethods();
+    // 设置支付状态
+    checkPayStatus();
+  }
+
+  // 获得支付方式
+  async function setPayMethods() {
+    const { data, code } = await PayChannelApi.getEnableChannelCodeList(state.orderInfo.appId)
+    if (code !== 0) {
+      return
+    }
+    state.payMethods = getPayMethods(data)
+	state.payMethods.find(item => {
+	  if (item.value && !item.disabled) {
+		state.payment = item.value;
+		return true;
+	  }
+	});
+  }
+
+  onLoad((options) => {
+    if (sheep.$platform.name === 'WechatOfficialAccount'
+      && sheep.$platform.os === 'ios'
+      && !sheep.$platform.landingPage.includes('pages/pay/worker/index')) {
+      location.reload();
+      return;
+    }
+    // 获得支付订单信息
+    let id = options.id;
+    if (options.orderType) {
+      state.orderType = options.orderType;
+    }
+    setOrder(id);
+    // 刷新钱包的缓存
+    sheep.$store('user').getWallet();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .pay-icon {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 26rpx;
+  }
+
+  .ss-modal-box {
+    // max-height: 1000rpx;
+
+    .modal-header {
+      position: relative;
+      padding: 60rpx 20rpx 40rpx;
+
+
+      .money-text {
+        color: $red;
+        font-size: 46rpx;
+        font-weight: bold;
+        font-family: OPPOSANS;
+
+        &::before {
+          content: '￥';
+          font-size: 30rpx;
+        }
+      }
+
+      .time-text {
+        font-size: 26rpx;
+        color: $gray-b;
+      }
+
+      .close-icon {
+        position: absolute;
+        top: 10rpx;
+        right: 20rpx;
+        font-size: 46rpx;
+        opacity: 0.2;
+      }
+    }
+
+    .modal-content {
+      overflow-y: auto;
+
+      .pay-title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+      }
+
+      .pay-tip {
+        font-size: 26rpx;
+        color: #bbbbbb;
+      }
+
+      .pay-item {
+        height: 86rpx;
+      }
+      .disabled-pay-item {
+        .pay-title {
+          color: #999999;
+        }
+      }
+
+      .userInfo-money {
+        font-size: 26rpx;
+        color: #bbbbbb;
+        line-height: normal;
+      }
+    }
+
+    .save-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      color: $white;
+    }
+    .disabled-btn {
+      background: #e5e5e5;
+      color: #999999;
+    }
+
+    .past-due-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background-color: #999;
+      color: #fff;
+    }
+  }
+</style>
diff --git a/pages/pay/worker/result.vue b/pages/pay/worker/result.vue
new file mode 100644
index 0000000..bd3fa33
--- /dev/null
+++ b/pages/pay/worker/result.vue
@@ -0,0 +1,310 @@
+<!-- 支付结果页面 -->
+<template>
+  <s-layout title="支付结果" :bgStyle="{ color: '#FFF' }">
+    <view class="pay-result-box ss-flex-col ss-row-center ss-col-center">
+      <!-- 信息展示 -->
+      <view class="pay-waiting ss-m-b-30" v-if="payResult === 'waiting'" />
+      <image
+        class="pay-img ss-m-b-30"
+        v-if="payResult === 'success'"
+        :src="sheep.$url.static('/static/img/shop/order/order_pay_success.gif')"
+      />
+      <image
+        class="pay-img ss-m-b-30"
+        v-if="['failed', 'closed'].includes(payResult)"
+        :src="sheep.$url.static('/static/img/shop/order/order_paty_fail.gif')"
+      />
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'success'">支付成功</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'failed'">支付失败</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'closed'">该订单已关闭</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'waiting'">检测支付结果...</view>
+      <view class="pay-total-num ss-flex" v-if="payResult === 'success'">
+        <view>￥{{ fen2yuan(state.orderInfo.price) }}</view>
+      </view>
+
+      <!-- 操作区 -->
+      <view class="btn-box ss-flex ss-row-center ss-m-t-50">
+        <button class="back-btn ss-reset-button" @tap="sheep.$router.go('/pages/tabbar/index')">
+          返回首页
+        </button>
+        <button
+          class="check-btn ss-reset-button"
+          v-if="payResult === 'failed'"
+          @tap="
+            sheep.$router.redirect('/pages/pay/worker/index', { id: state.id, orderType: state.orderType })
+          "
+        >
+          重新支付
+        </button>
+        <button class="check-btn ss-reset-button" v-if="payResult === 'success'" @tap="onOrder">
+          查看订单
+        </button>
+      </view>
+
+      <!-- #ifdef MP -->
+      <view
+        class="subscribe-box ss-flex ss-m-t-44"
+        v-if="showSubscribeBtn && state.orderType === 'goods'"
+      >
+        <u-icon name="bell-fill" color="var(--ui-BG-Main)" size="44"></u-icon>
+        <view class="subscribe-title ss-m-r-48 ss-m-l-16">获取实时接单信息与订单状态</view>
+        <view class="subscribe-start" @tap="subscribeMessage">立即订阅</view>
+      </view>
+      <!-- #endif -->
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import { onLoad, onHide, onShow } from '@dcloudio/uni-app';
+  import { reactive, computed, ref } from 'vue';
+  import { isEmpty } from 'lodash-es';
+  import sheep from '@/sheep';
+  import PayOrderApi from '@/sheep/api/pay/order';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import OrderApi from '@/sheep/api/trade/order';
+  import { WxaSubscribeTemplate } from '@/sheep/util/const';
+
+  const state = reactive({
+    id: 0, // 支付单号
+    orderType: 'goods', // 订单类型
+    result: 'unpaid', // 支付状态
+    orderInfo: {}, // 支付订单信息
+    tradeOrder: {}, // 商品订单信息，只有在 orderType 为 goods 才会请求。目的：【我的拼团】按钮的展示
+    counter: 0, // 获取结果次数
+  });
+
+  // 支付结果 result => payResult
+  const payResult = computed(() => {
+    if (state.result === 'unpaid') {
+      return 'waiting';
+    }
+    if (state.result === 'paid') {
+      return 'success';
+    }
+    if (state.result === 'failed') {
+      return 'failed';
+    }
+    if (state.result === 'closed') {
+      return 'closed';
+    }
+  });
+
+  // 获得订单信息
+  async function getOrderInfo(id) {
+    state.counter++;
+    // 1. 加载订单信息
+    const { data, code } = await PayOrderApi.getOrder(id);
+    if (code === 0) {
+      state.orderInfo = data;
+      if (!state.orderInfo || state.orderInfo.status === 30) {
+        // 支付关闭
+        state.result = 'closed';
+        return;
+      }
+      if (state.orderInfo.status !== 0) {
+        // 非待支付，可能是已支付，可能是已退款
+        state.result = 'paid';
+        // #ifdef MP
+        uni.showModal({
+          title: '支付结果',
+          showCancel: false, // 不要取消按钮
+          content: '支付成功',
+          success: () => {
+            // 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
+            autoSubscribeMessage();
+          },
+        });
+
+        // #endif
+        // 特殊：获得商品订单信息
+        if (state.orderType === 'goods') {
+          const { data, code } = await OrderApi.getOrder(state.orderInfo.merchantOrderId);
+          if (code === 0) {
+            state.tradeOrder = data;
+          }
+        }
+        return;
+      }
+    }
+    // 2.1 情况三一：未支付，且轮询次数小于三次，则继续轮询
+    if (state.counter < 3 && state.result === 'unpaid') {
+      setTimeout(() => {
+        getOrderInfo(id);
+      }, 1500);
+    }
+    // 2.2 情况二：超过三次检测才判断为支付失败
+    if (state.counter >= 3) {
+      state.result = 'failed';
+    }
+  }
+
+  function onOrder() {
+    if (state.orderType === 'recharge') {
+      sheep.$router.redirect('/pages/pay/recharge-log');
+    } else {
+      sheep.$router.redirect('/pages/order/my/list');
+    }
+  }
+
+  // #ifdef MP
+  const showSubscribeBtn = ref(false); // 默认隐藏
+  const SUBSCRIBE_BTN_STATUS_STORAGE_KEY = 'subscribe_btn_status';
+  function subscribeMessage() {
+    if (state.orderType !== 'goods') {
+      return;
+    }
+    const event = [WxaSubscribeTemplate.TRADE_ORDER_DELIVERY];
+    if (state.tradeOrder.type === 3) {
+      event.push(WxaSubscribeTemplate.PROMOTION_COMBINATION_SUCCESS);
+    }
+    sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+      // 订阅后记录一下订阅状态
+      uni.removeStorageSync(SUBSCRIBE_BTN_STATUS_STORAGE_KEY);
+      uni.setStorageSync(SUBSCRIBE_BTN_STATUS_STORAGE_KEY, '已订阅');
+      // 隐藏订阅按钮
+      showSubscribeBtn.value = false;
+    });
+  }
+  async function autoSubscribeMessage() {
+    // 1. 校验是否手动订阅过
+    const subscribeBtnStatus = uni.getStorageSync(SUBSCRIBE_BTN_STATUS_STORAGE_KEY);
+    if (!subscribeBtnStatus) {
+      showSubscribeBtn.value = true;
+      return;
+    }
+
+    // 2. 订阅消息
+    subscribeMessage();
+  }
+  // #endif
+
+  onLoad(async (options) => {
+    // 支付订单号
+    if (options.id) {
+      state.id = options.id;
+    }
+    // 订单类型
+    if (options.orderType) {
+      state.orderType = options.orderType;
+    }
+
+    // 支付结果传值过来是失败，则直接显示失败界面
+    if (options.payState === 'fail') {
+      state.result = 'failed';
+    } else {
+      // 轮询三次检测订单支付结果
+      await getOrderInfo(state.id);
+    }
+  });
+
+  onShow(() => {
+    if (isEmpty(state.orderInfo)) {
+      return;
+    }
+    getOrderInfo(state.id);
+  });
+
+  onHide(() => {
+    state.result = 'unpaid';
+    state.counter = 0;
+  });
+</script>
+
+<style lang="scss" scoped>
+  @keyframes rotation {
+    0% {
+      transform: rotate(0deg);
+    }
+
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .pay-result-box {
+    padding: 60rpx 0;
+
+    .pay-waiting {
+      margin-top: 20rpx;
+      width: 60rpx;
+      height: 60rpx;
+      border: 10rpx solid rgb(233, 231, 231);
+      border-bottom-color: rgb(204, 204, 204);
+      border-radius: 50%;
+      display: inline-block;
+      // -webkit-animation: rotation 1s linear infinite;
+      animation: rotation 1s linear infinite;
+    }
+
+    .pay-img {
+      width: 130rpx;
+      height: 130rpx;
+    }
+
+    .tip-text {
+      font-size: 30rpx;
+      font-weight: bold;
+      color: #333333;
+    }
+
+    .pay-total-num {
+      font-size: 36rpx;
+      font-weight: 500;
+      color: #333333;
+      font-family: OPPOSANS;
+    }
+
+    .btn-box {
+      width: 100%;
+
+      .back-btn {
+        width: 190rpx;
+        height: 70rpx;
+        font-size: 28rpx;
+        border: 2rpx solid #dfdfdf;
+        border-radius: 35rpx;
+        font-weight: 400;
+        color: #595959;
+      }
+
+      .check-btn {
+        width: 190rpx;
+        height: 70rpx;
+        font-size: 28rpx;
+        border: 2rpx solid #dfdfdf;
+        border-radius: 35rpx;
+        font-weight: 400;
+        color: #595959;
+        margin-left: 32rpx;
+      }
+    }
+
+    .subscribe-box {
+      .subscribe-img {
+        width: 44rpx;
+        height: 44rpx;
+      }
+
+      .subscribe-title {
+        font-weight: 500;
+        font-size: 32rpx;
+        line-height: 36rpx;
+        color: #434343;
+      }
+
+      .subscribe-start {
+        color: var(--ui-BG-Main);
+        font-weight: 700;
+        font-size: 32rpx;
+        line-height: 36rpx;
+      }
+    }
+  }
+</style>
diff --git a/pages/point/recharge-log.vue b/pages/point/recharge-log.vue
new file mode 100644
index 0000000..3e44fb6
--- /dev/null
+++ b/pages/point/recharge-log.vue
@@ -0,0 +1,167 @@
+<!-- 充值记录 -->
+<template>
+  <s-layout class="widthdraw-log-wrap" title="充值记录">
+    <!-- 记录卡片 -->
+    <view class="wallet-log-box ss-p-b-30">
+      <view class="log-list" v-for="item in state.pagination.list" :key="item">
+        <view class="head ss-flex ss-col-center ss-row-between">
+          <view class="title">充值积分</view>
+          <view class="num" :class="item.refundStatus === 10 ? 'danger-color' : 'success-color'">
+            {{ item.payPrice }} 积分
+            <text v-if="item.bonusPrice > 0">（赠送 {{ item.bonusPrice }} 积分）</text>
+          </view>
+        </view>
+        <view class="status-box item ss-flex ss-col-center ss-row-between">
+          <view class="item-title">支付状态</view>
+          <view
+            class="status-text"
+            :class="item.refundStatus === 10 ? 'danger-color' : 'success-color'"
+          >
+            {{ item.refundStatus === 10 ? '已退款' : '已支付' }}
+          </view>
+        </view>
+        <view class="time-box item ss-flex ss-col-center ss-row-between">
+          <text class="item-title">充值渠道</text>
+          <view class="time ss-ellipsis-1">{{ item.payChannelName }}</view>
+        </view>
+        <view class="time-box item ss-flex ss-col-center ss-row-between">
+          <text class="item-title">充值单号</text>
+          <view class="time"> {{ item.payOrderChannelOrderNo }} </view>
+        </view>
+        <view class="time-box item ss-flex ss-col-center ss-row-between">
+          <text class="item-title">充值时间</text>
+          <view class="time">
+            {{ sheep.$helper.timeFormat(item.payTime, 'yyyy-mm-dd hh:MM:ss') }}</view
+          >
+        </view>
+      </view>
+    </view>
+    <s-empty
+      v-if="state.pagination.total === 0"
+      icon="/static/comment-empty.png"
+      text="暂无充值记录"
+    />
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="loadMore"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import { reactive } from 'vue';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import _ from 'lodash-es';
+  import PayPointApi from '@/sheep/api/pay/point';
+  import sheep from '@/sheep';
+  import { fen2yuan } from '../../sheep/hooks/useGoods';
+
+  const state = reactive({
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 5,
+    },
+    loadStatus: '',
+  });
+
+  async function getLogList(page = 1, list_rows = 5) {
+    const { code, data } = await PayPointApi.getPointRechargePage({
+      pageNo: page,
+      pageSize: list_rows,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getLogList();
+  }
+
+  onLoad(() => {
+    getLogList();
+  });
+
+  onReachBottom(() => {
+    loadMore();
+  });
+</script>
+
+<style lang="scss" scoped>
+  // 记录卡片
+  .log-list {
+    min-height: 213rpx;
+    background: $white;
+    margin-bottom: 10rpx;
+    padding-bottom: 10rpx;
+
+    .head {
+      padding: 0 35rpx;
+      height: 80rpx;
+      border-bottom: 1rpx solid $gray-e;
+      margin-bottom: 20rpx;
+
+      .title {
+        font-size: 28rpx;
+        font-weight: 500;
+        color: $dark-3;
+      }
+
+      .num {
+        font-size: 28rpx;
+        font-weight: 500;
+      }
+    }
+
+    .item {
+      padding: 0 30rpx 10rpx;
+
+      .item-icon {
+        color: $gray-d;
+        font-size: 36rpx;
+        margin-right: 8rpx;
+      }
+
+      .item-title {
+        width: 180rpx;
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #666666;
+      }
+
+      .status-text {
+        font-size: 24rpx;
+        font-weight: 500;
+      }
+
+      .time {
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #c0c0c0;
+      }
+    }
+  }
+  .warning-color {
+    color: #faad14;
+  }
+  .danger-color {
+    color: #ff4d4f;
+  }
+  .success-color {
+    color: #67c23a;
+  }
+</style>
diff --git a/pages/point/recharge.vue b/pages/point/recharge.vue
new file mode 100644
index 0000000..f919e83
--- /dev/null
+++ b/pages/point/recharge.vue
@@ -0,0 +1,264 @@
+<!-- 充值界面 -->
+<template>
+  <s-layout title="充值积分" class="withdraw-wrap" navbar="inner">
+    <view class="wallet-num-box ss-flex ss-col-center ss-row-between" :style="[
+      {
+        marginTop: '-' + Number(statusBarHeight + 88 + 22) + 'rpx',
+        paddingTop: Number(statusBarHeight + 108 + 22) + 'rpx',
+      },
+    ]">
+      <view class="">
+        <view class="num-title">当前积分（个）</view>
+        <view class="wallet-num">{{ userInfo.point }}</view>
+      </view>
+      <button class="ss-reset-button log-btn" @tap="sheep.$router.go('/pages/user/wallet/score')">
+        积分明细
+      </button>
+    </view>
+    <view class="recharge-box">
+      <view class="recharge-card-box">
+        <view class="input-label ss-m-b-50">充值积分</view>
+       <!-- <view class="input-box ss-flex border-bottom ss-p-b-20">
+          <view class="unit">￥</view>
+          <uni-easyinput v-model="state.recharge_money" type="digit" placeholder="请输入充值金额"
+                         :inputBorder="false" />
+        </view> -->
+        <view class="face-value-box ss-flex ss-flex-wrap ss-m-y-40">
+          <button class="ss-reset-button face-value-btn" v-for="item in state.packageList" :key="item.money"
+                  :class="[{ 'btn-active': state.recharge_money === fen2yuan(item.payPrice) }]"
+                  @tap="onCard(item.payPrice)">
+            <text class="face-value-title">{{ item.payPrice }}</text>
+            <view v-if="item.bonusPrice" class="face-value-tag">
+              送 {{ item.bonusPrice }} 积分
+            </view>
+          </button>
+        </view>
+        <button class="ss-reset-button save-btn ui-BG-Main-Gradient ss-m-t-60 ui-Shadow-Main" @tap="onConfirm">
+          确认充值
+        </button>
+      </view>
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import { computed, reactive } from 'vue';
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import PayPointApi from '@/sheep/api/pay/point';
+  import { WxaSubscribeTemplate } from '@/sheep/util/const';
+
+  const userInfo = computed(() => sheep.$store('user').userInfo);
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
+
+  const state = reactive({
+    recharge_money: '', // 输入的充值金额
+    packageList: [],
+  });
+
+  // 点击卡片，选择充值金额
+  function onCard(e) { 
+    state.recharge_money = fen2yuan(e);
+  }
+
+  // 获得钱包充值套餐列表
+  async function getRechargeTabs() {
+    const { code, data } = await PayPointApi.getPointRechargePackageList();
+    if (code !== 0) {
+      return;
+    }
+    state.packageList = data;
+  }
+
+  // 发起支付
+  async function onConfirm() {
+	if(state.recharge_money == 0){
+		sheep.$helper.toast('请选择充值套餐');
+		return;
+	}  
+    const { code, data } = await PayPointApi.createPointRecharge({ 
+      packageId: state.packageList.find((item) => fen2yuan(item.payPrice) === state.recharge_money)?.id,
+      payPrice: state.recharge_money * 100,
+    });
+    if (code !== 0) {
+      return;
+    }
+    // #ifdef MP
+    sheep.$platform.useProvider('wechat').subscribeMessage(WxaSubscribeTemplate.PAY_WALLET_RECHARGER_SUCCESS);
+    // #endif
+    sheep.$router.go('/pages/pay/point/index', {
+      id: data.payOrderId,
+      orderType: 'recharge',
+    });
+  }
+
+  onLoad(() => {
+    getRechargeTabs();
+  });
+</script>
+
+<style lang="scss" scoped>
+  :deep() {
+    .uni-input-input {
+      font-family: OPPOSANS !important;
+    }
+  }
+
+  .wallet-num-box {
+    padding: 0 40rpx 80rpx;
+    background: var(--ui-BG-Main) v-bind(headerBg) center/750rpx 100% no-repeat;
+    border-radius: 0 0 5% 5%;
+
+    .num-title {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: $white;
+      margin-bottom: 20rpx;
+    }
+
+    .wallet-num {
+      font-size: 60rpx;
+      font-weight: 500;
+      color: $white;
+      font-family: OPPOSANS;
+    }
+
+    .log-btn {
+      width: 170rpx;
+      height: 60rpx;
+      line-height: 60rpx;
+      border: 1rpx solid $white;
+      border-radius: 30rpx;
+      padding: 0;
+      font-size: 26rpx;
+      font-weight: 500;
+      color: $white;
+    }
+  }
+
+  .recharge-box {
+    position: relative;
+    padding: 0 30rpx;
+    margin-top: -60rpx;
+  }
+
+  .save-btn {
+    width: 620rpx;
+    height: 86rpx;
+    border-radius: 44rpx;
+    font-size: 30rpx;
+  }
+
+  .recharge-card-box {
+    width: 690rpx;
+    background: var(--ui-BG);
+    border-radius: 20rpx;
+    padding: 30rpx;
+    box-sizing: border-box;
+
+    .input-label {
+      font-size: 30rpx;
+      font-weight: 500;
+      color: #333;
+    }
+
+    .unit {
+      display: flex;
+      align-items: center;
+      font-size: 48rpx;
+      font-weight: 500;
+    }
+
+    .uni-easyinput__placeholder-class {
+      font-size: 30rpx;
+      height: 60rpx;
+      display: flex;
+      align-items: center;
+    }
+
+    :deep(.uni-easyinput__content-input) {
+      font-size: 48rpx;
+    }
+
+    .face-value-btn {
+      width: 200rpx;
+      height: 144rpx;
+      border: 1px solid var(--ui-BG-Main);
+      border-radius: 10rpx;
+      position: relative;
+      z-index: 1;
+      margin-bottom: 15rpx;
+      margin-right: 15rpx;
+
+      &:nth-of-type(3n) {
+        margin-right: 0;
+      }
+
+      .face-value-title {
+        font-size: 28rpx;
+        font-weight: 500;
+        color: var(--ui-BG-Main);
+        font-family: OPPOSANS;
+
+        &::after {
+          content: '积分';
+          font-size: 24rpx;
+          margin-left: 6rpx;
+        }
+      }
+
+      .face-value-tag {
+        position: absolute;
+        z-index: 2;
+        height: 40rpx;
+        line-height: 40rpx;
+        background: var(--ui-BG-Main);
+        opacity: 0.8;
+        border-radius: 10rpx 0 20rpx 0;
+        top: 0;
+        left: -2rpx;
+        padding: 0 16rpx;
+        font-size: 22rpx;
+        color: $white;
+        font-family: OPPOSANS;
+      }
+
+      &::before {
+        position: absolute;
+        content: ' ';
+        width: 100%;
+        height: 100%;
+        background: var(--ui-BG-Main);
+        opacity: 0.1;
+        z-index: 0;
+        left: 0;
+        top: 0;
+      }
+    }
+
+    .btn-active {
+      z-index: 1;
+
+      &::before {
+        content: '';
+        background: var(--ui-BG-Main);
+        opacity: 1;
+      }
+
+      .face-value-title {
+        color: $white;
+        position: relative;
+        z-index: 1;
+        font-family: OPPOSANS;
+      }
+
+      .face-value-tag {
+        background: $white;
+        color: var(--ui-BG-Main);
+        font-family: OPPOSANS;
+      }
+    }
+  }
+</style>
diff --git a/pages/point/result.vue b/pages/point/result.vue
new file mode 100644
index 0000000..d188e52
--- /dev/null
+++ b/pages/point/result.vue
@@ -0,0 +1,318 @@
+<!-- 支付结果页面 -->
+<template>
+  <s-layout title="支付结果" :bgStyle="{ color: '#FFF' }">
+    <view class="pay-result-box ss-flex-col ss-row-center ss-col-center">
+      <!-- 信息展示 -->
+      <view class="pay-waiting ss-m-b-30" v-if="payResult === 'waiting'" />
+      <image
+        class="pay-img ss-m-b-30"
+        v-if="payResult === 'success'"
+        :src="sheep.$url.static('/static/img/shop/order/order_pay_success.gif')"
+      />
+      <image
+        class="pay-img ss-m-b-30"
+        v-if="['failed', 'closed'].includes(payResult)"
+        :src="sheep.$url.static('/static/img/shop/order/order_paty_fail.gif')"
+      />
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'success'">支付成功</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'failed'">支付失败</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'closed'">该订单已关闭</view>
+      <view class="tip-text ss-m-b-30" v-if="payResult === 'waiting'">检测支付结果...</view>
+      <view class="pay-total-num ss-flex" v-if="payResult === 'success'">
+        <view>￥{{ fen2yuan(state.orderInfo.price) }}</view>
+      </view>
+
+      <!-- 操作区 -->
+      <view class="btn-box ss-flex ss-row-center ss-m-t-50">
+        <button class="back-btn ss-reset-button" @tap="sheep.$router.go('/pages/tabbar/index')">
+          返回首页
+        </button>
+        <button
+          class="check-btn ss-reset-button"
+          v-if="payResult === 'failed'"
+          @tap="
+            sheep.$router.redirect('/pages/pay/index', { id: state.id, orderType: state.orderType })
+          "
+        >
+          重新支付
+        </button>
+        <button class="check-btn ss-reset-button" v-if="payResult === 'success'" @tap="onOrder">
+          查看订单
+        </button>
+        <button
+          class="check-btn ss-reset-button"
+          v-if="payResult === 'success' && state.tradeOrder.type === 3"
+          @tap="sheep.$router.redirect('/pages/activity/groupon/order')"
+        >
+          我的拼团
+        </button>
+      </view>
+
+      <!-- #ifdef MP -->
+      <view
+        class="subscribe-box ss-flex ss-m-t-44"
+        v-if="showSubscribeBtn && state.orderType === 'goods'"
+      >
+        <image class="subscribe-img" :src="sheep.$url.static('/static/img/shop/order/cargo.png')" />
+        <view class="subscribe-title ss-m-r-48 ss-m-l-16">获取实时发货信息与订单状态</view>
+        <view class="subscribe-start" @tap="subscribeMessage">立即订阅</view>
+      </view>
+      <!-- #endif -->
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import { onLoad, onHide, onShow } from '@dcloudio/uni-app';
+  import { reactive, computed, ref } from 'vue';
+  import { isEmpty } from 'lodash-es';
+  import sheep from '@/sheep';
+  import PayOrderApi from '@/sheep/api/pay/order';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import OrderApi from '@/sheep/api/trade/order';
+  import { WxaSubscribeTemplate } from '@/sheep/util/const';
+
+  const state = reactive({
+    id: 0, // 支付单号
+    orderType: 'goods', // 订单类型
+    result: 'unpaid', // 支付状态
+    orderInfo: {}, // 支付订单信息
+    tradeOrder: {}, // 商品订单信息，只有在 orderType 为 goods 才会请求。目的：【我的拼团】按钮的展示
+    counter: 0, // 获取结果次数
+  });
+
+  // 支付结果 result => payResult
+  const payResult = computed(() => {
+    if (state.result === 'unpaid') {
+      return 'waiting';
+    }
+    if (state.result === 'paid') {
+      return 'success';
+    }
+    if (state.result === 'failed') {
+      return 'failed';
+    }
+    if (state.result === 'closed') {
+      return 'closed';
+    }
+  });
+
+  // 获得订单信息
+  async function getOrderInfo(id) {
+    state.counter++;
+    // 1. 加载订单信息
+    const { data, code } = await PayOrderApi.getOrder(id);
+    if (code === 0) {
+      state.orderInfo = data;
+      if (!state.orderInfo || state.orderInfo.status === 30) {
+        // 支付关闭
+        state.result = 'closed';
+        return;
+      }
+      if (state.orderInfo.status !== 0) {
+		sheep.$store('user').getInfo();
+        // 非待支付，可能是已支付，可能是已退款
+        state.result = 'paid';
+        // #ifdef MP
+        uni.showModal({
+          title: '支付结果',
+          showCancel: false, // 不要取消按钮
+          content: '支付成功',
+          success: () => {
+            // 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
+            autoSubscribeMessage();
+          },
+        });
+
+        // #endif
+        // 特殊：获得商品订单信息
+        if (state.orderType === 'goods') {
+          const { data, code } = await OrderApi.getOrder(state.orderInfo.merchantOrderId);
+          if (code === 0) {
+            state.tradeOrder = data;
+          }
+        }
+        return;
+      }
+    }
+    // 2.1 情况三一：未支付，且轮询次数小于三次，则继续轮询
+    if (state.counter < 3 && state.result === 'unpaid') {
+      setTimeout(() => {
+        getOrderInfo(id);
+      }, 1500);
+    }
+    // 2.2 情况二：超过三次检测才判断为支付失败
+    if (state.counter >= 3) {
+      state.result = 'failed';
+    }
+  }
+
+  function onOrder() {
+    if (state.orderType === 'recharge') {
+      sheep.$router.redirect('/pages/point/recharge-log');
+    } else {
+      sheep.$router.redirect('/pages/order/list');
+    }
+  }
+
+  // #ifdef MP
+  const showSubscribeBtn = ref(false); // 默认隐藏
+  const SUBSCRIBE_BTN_STATUS_STORAGE_KEY = 'subscribe_btn_status';
+  function subscribeMessage() {
+    if (state.orderType !== 'goods') {
+      return;
+    }
+    const event = [WxaSubscribeTemplate.TRADE_ORDER_DELIVERY];
+    if (state.tradeOrder.type === 3) {
+      event.push(WxaSubscribeTemplate.PROMOTION_COMBINATION_SUCCESS);
+    }
+    sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+      // 订阅后记录一下订阅状态
+      uni.removeStorageSync(SUBSCRIBE_BTN_STATUS_STORAGE_KEY);
+      uni.setStorageSync(SUBSCRIBE_BTN_STATUS_STORAGE_KEY, '已订阅');
+      // 隐藏订阅按钮
+      showSubscribeBtn.value = false;
+    });
+  }
+  async function autoSubscribeMessage() {
+    // 1. 校验是否手动订阅过
+    const subscribeBtnStatus = uni.getStorageSync(SUBSCRIBE_BTN_STATUS_STORAGE_KEY);
+    if (!subscribeBtnStatus) {
+      showSubscribeBtn.value = true;
+      return;
+    }
+
+    // 2. 订阅消息
+    subscribeMessage();
+  }
+  // #endif
+
+  onLoad(async (options) => {
+    // 支付订单号
+    if (options.id) {
+      state.id = options.id;
+    }
+    // 订单类型
+    if (options.orderType) {
+      state.orderType = options.orderType;
+    }
+
+    // 支付结果传值过来是失败，则直接显示失败界面
+    if (options.payState === 'fail') {
+      state.result = 'failed';
+    } else {
+      // 轮询三次检测订单支付结果
+      await getOrderInfo(state.id);
+    }
+  });
+
+  onShow(() => {
+    if (isEmpty(state.orderInfo)) {
+      return;
+    }
+    getOrderInfo(state.id);
+  });
+
+  onHide(() => {
+    state.result = 'unpaid';
+    state.counter = 0;
+  });
+</script>
+
+<style lang="scss" scoped>
+  @keyframes rotation {
+    0% {
+      transform: rotate(0deg);
+    }
+
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
+  .pay-result-box {
+    padding: 60rpx 0;
+
+    .pay-waiting {
+      margin-top: 20rpx;
+      width: 60rpx;
+      height: 60rpx;
+      border: 10rpx solid rgb(233, 231, 231);
+      border-bottom-color: rgb(204, 204, 204);
+      border-radius: 50%;
+      display: inline-block;
+      // -webkit-animation: rotation 1s linear infinite;
+      animation: rotation 1s linear infinite;
+    }
+
+    .pay-img {
+      width: 130rpx;
+      height: 130rpx;
+    }
+
+    .tip-text {
+      font-size: 30rpx;
+      font-weight: bold;
+      color: #333333;
+    }
+
+    .pay-total-num {
+      font-size: 36rpx;
+      font-weight: 500;
+      color: #333333;
+      font-family: OPPOSANS;
+    }
+
+    .btn-box {
+      width: 100%;
+
+      .back-btn {
+        width: 190rpx;
+        height: 70rpx;
+        font-size: 28rpx;
+        border: 2rpx solid #dfdfdf;
+        border-radius: 35rpx;
+        font-weight: 400;
+        color: #595959;
+      }
+
+      .check-btn {
+        width: 190rpx;
+        height: 70rpx;
+        font-size: 28rpx;
+        border: 2rpx solid #dfdfdf;
+        border-radius: 35rpx;
+        font-weight: 400;
+        color: #595959;
+        margin-left: 32rpx;
+      }
+    }
+
+    .subscribe-box {
+      .subscribe-img {
+        width: 44rpx;
+        height: 44rpx;
+      }
+
+      .subscribe-title {
+        font-weight: 500;
+        font-size: 32rpx;
+        line-height: 36rpx;
+        color: #434343;
+      }
+
+      .subscribe-start {
+        color: var(--ui-BG-Main);
+        font-weight: 700;
+        font-size: 32rpx;
+        line-height: 36rpx;
+      }
+    }
+  }
+</style>
diff --git a/pages/public/error.vue b/pages/public/error.vue
new file mode 100644
index 0000000..3c9097d
--- /dev/null
+++ b/pages/public/error.vue
@@ -0,0 +1,60 @@
+<!-- 错误界面 -->
+<template>
+  <view class="error-page">
+    <s-empty
+      v-if="errCode === 'NetworkError'"
+      icon="/static/internet-empty.png"
+      text="网络连接失败"
+      showAction
+      actionText="重新连接"
+      @clickAction="onReconnect"
+      buttonColor="#ff3000"
+    />
+    <s-empty
+      v-else-if="errCode === 'TemplateError'"
+      icon="/static/internet-empty.png"
+      text="系统升级中"
+      showAction
+      actionText="重新加载"
+      @clickAction="onReconnect"
+      buttonColor="#ff3000"
+    />
+    <s-empty
+      v-else-if="errCode !== ''"
+      icon="/static/internet-empty.png"
+      :text="errMsg"
+      showAction
+      actionText="重新加载"
+      @clickAction="onReconnect"
+      buttonColor="#ff3000"
+    />
+  </view>
+</template>
+
+<script setup>
+  import { onLoad } from '@dcloudio/uni-app';
+  import { ref } from 'vue';
+  import { ShoproInit } from '@/sheep';
+
+  const errCode = ref('');
+  const errMsg = ref('');
+
+  onLoad((options) => {
+    errCode.value = options.errCode;
+    errMsg.value = options.errMsg;
+  });
+
+  // 重新连接
+  async function onReconnect() {
+    uni.reLaunch({
+      url: '/pages/tabbar/index',
+    });
+    await ShoproInit();
+  }
+</script>
+
+<style lang="scss" scoped>
+  .error-page {
+    width: 100%;
+  }
+</style>
diff --git a/pages/public/faq.vue b/pages/public/faq.vue
new file mode 100644
index 0000000..ebfeaf8
--- /dev/null
+++ b/pages/public/faq.vue
@@ -0,0 +1,118 @@
+<!-- FAQ 常见问题 -->
+<template>
+  <s-layout class="set-wrap" title="常见问题" :bgStyle="{ color: '#FFF' }">
+    <uni-collapse>
+      <uni-collapse-item v-for="(item, index) in state.list" :key="item">
+        <template v-slot:title>
+          <view class="ss-flex ss-col-center header">
+            <view class="ss-m-l-20 ss-m-r-20 icon">
+              <view class="rectangle">
+                <view class="num ss-flex ss-row-center ss-col-center">
+                  {{ index + 1 < 10 ? '0' + (index + 1) : index + 1 }}
+                </view>
+              </view>
+              <view class="triangle"> </view>
+            </view>
+            <view class="title ss-m-t-36 ss-m-b-36">
+              {{ item.title }}
+            </view>
+          </view>
+        </template>
+        <view class="content ss-p-l-78 ss-p-r-40 ss-p-b-50 ss-p-t-20">
+          <text class="text">{{ item.content }}</text>
+        </view>
+      </uni-collapse-item>
+    </uni-collapse>
+    <s-empty
+      v-if="state.list.length === 0 && !state.loading"
+      text="暂无常见问题"
+      icon="/static/collect-empty.png"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import sheep from '@/sheep';
+
+  const state = reactive({
+    list: [],
+    loading: true,
+  });
+
+  async function getFaqList() {
+    const { error, data } = await sheep.$api.data.faq();
+    if (error === 0) {
+      state.list = data;
+      state.loading = false;
+    }
+  }
+  onLoad(() => {
+    // TODO 芋艿：【文章】目前简单做，使用营销文章，作为 faq
+    if (true) {
+      sheep.$router.go('/pages/public/richtext', {
+        title: '常见问题',
+      })
+      return;
+    }
+    getFaqList();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .header {
+    .title {
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 30rpx;
+      max-width: 688rpx;
+    }
+
+    .icon {
+      position: relative;
+      width: 40rpx;
+      height: 40rpx;
+
+      .rectangle {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 40rpx;
+        height: 36rpx;
+        background: var(--ui-BG-Main);
+        border-radius: 4px;
+
+        .num {
+          width: 100%;
+          height: 100%;
+          font-size: 24rpx;
+          font-weight: 500;
+          color: var(--ui-BG);
+          line-height: 32rpx;
+        }
+      }
+
+      .triangle {
+        width: 0;
+        height: 0;
+        border-left: 4rpx solid transparent;
+        border-right: 4rpx solid transparent;
+        border-top: 8rpx solid var(--ui-BG-Main);
+        position: absolute;
+        left: 16rpx;
+        bottom: -4rpx;
+      }
+    }
+  }
+
+  .content {
+    border-bottom: 1rpx solid #dfdfdf;
+
+    .text {
+      font-size: 26rpx;
+      color: #666666;
+    }
+  }
+</style>
diff --git a/pages/public/richtext.vue b/pages/public/richtext.vue
new file mode 100644
index 0000000..e4a0921
--- /dev/null
+++ b/pages/public/richtext.vue
@@ -0,0 +1,54 @@
+<!-- 文章展示 -->
+<template>
+  <s-layout class="set-wrap" :title="state.title" :bgStyle="{ color: '#FFF' }">
+    <view class="ss-p-30">
+      <mp-html class="richtext" :content="state.content" />
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import { onLoad } from '@dcloudio/uni-app';
+  import { reactive } from 'vue';
+  import ArticleApi from '@/sheep/api/promotion/article';
+
+  const state = reactive({
+    title: '',
+    content: '',
+  });
+
+  async function getRichTextContent(id, title) {
+    const { code, data } = await ArticleApi.getArticle(id, title);
+    if (code !== 0) {
+      return;
+    }
+    state.content = data.content;
+    // 标题不一致时，修改标题
+    if (state.title !== data.title) {
+      state.title = data.title;
+      uni.setNavigationBarTitle({
+        title: state.title,
+      });
+    }
+  }
+
+  onLoad((options) => {
+    if (options.title) {
+      state.title = options.title;
+      uni.setNavigationBarTitle({
+        title: state.title,
+      });
+    }
+    getRichTextContent(options.id, options.title);
+  });
+
+</script>
+
+<style lang="scss" scoped>
+  .set-title {
+    margin: 0 30rpx;
+  }
+
+  .richtext {
+  }
+</style>
diff --git a/pages/public/setting.vue b/pages/public/setting.vue
new file mode 100644
index 0000000..6a08ff9
--- /dev/null
+++ b/pages/public/setting.vue
@@ -0,0 +1,236 @@
+<template>
+  <s-layout class="set-wrap" title="系统设置" :bgStyle="{ color: '#fff' }">
+    <view class="header-box ss-flex-col ss-row-center ss-col-center">
+      <u-avatar
+	    size="160"
+        class="logo-img ss-m-b-46"
+        :src="appInfo.logo"
+      ></u-avatar>
+      <view class="name ss-m-b-24">{{ appInfo.name }}</view>
+    </view>
+
+    <view class="container-list">
+      <uni-list :border="false">
+        <uni-list-item
+          title="当前版本"
+          :rightText="appInfo.version"
+          showArrow
+          clickable
+          :border="false"
+          class="list-border"
+          @tap="onCheckUpdate"
+        />
+        <uni-list-item
+          title="本地缓存"
+          :rightText="storageSize"
+          showArrow
+          :border="false"
+          class="list-border"
+        />
+        <uni-list-item
+          title="关于我们"
+          showArrow
+          clickable
+          :border="false"
+          class="list-border"
+          @tap="
+            sheep.$router.go('/pages/public/richtext', {
+              title: '关于我们'
+            })
+          "
+        />
+        <!-- 为了过审 只有 iOS-App 有注销账号功能 -->
+        <uni-list-item
+          v-if="isLogin && sheep.$platform.os === 'ios' && sheep.$platform.name === 'App'"
+          title="注销账号"
+          rightText=""
+          showArrow
+          clickable
+          :border="false"
+          class="list-border"
+          @click="onLogoff"
+        />
+      </uni-list>
+    </view>
+    <view class="set-footer ss-flex-col ss-row-center ss-col-center">
+      <view class="agreement-box ss-flex ss-col-center ss-m-b-40">
+        <view class="ss-flex ss-col-center ss-m-b-10">
+          <view
+            class="tcp-text"
+            @tap="
+              sheep.$router.go('/pages/public/richtext', {
+                title: '用户协议'
+              })
+            "
+          >
+            《用户协议》
+          </view>
+          <view class="agreement-text">与</view>
+          <view
+            class="tcp-text"
+            @tap="
+              sheep.$router.go('/pages/public/richtext', {
+                title: '隐私协议'
+              })
+            "
+          >
+            《隐私协议》
+          </view>
+        </view>
+      </view>
+      <view class="copyright-text ss-m-b-10">{{ appInfo.copyright }}</view>
+      <view class="copyright-text">{{ appInfo.copytime }}</view>
+    </view>
+    <su-fixed bottom placeholder>
+      <view class="ss-p-x-20 ss-p-b-40">
+        <button
+          class="loginout-btn ss-reset-button ui-BG-Main ui-Shadow-Main"
+          @tap="onLogout"
+          v-if="isLogin"
+        >
+          退出登录
+        </button>
+      </view>
+    </su-fixed>
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { computed, reactive } from 'vue';
+  import AuthUtil from '@/sheep/api/member/auth';
+
+  const appInfo = computed(() => sheep.$store('app').info);
+  const isLogin = computed(() => sheep.$store('user').isLogin);
+  const storageSize = uni.getStorageInfoSync().currentSize + 'Kb';
+  const state = reactive({
+    showModal: false,
+  });
+
+  function onCheckUpdate() {
+    sheep.$platform.checkUpdate();
+    // 小程序初始化时已检查更新
+    // H5实时更新无需检查
+    // App 1.跳转应用市场更新 2.手动热更新 3.整包更新
+  }
+
+  // 注销账号
+  function onLogoff() {
+    uni.showModal({
+      title: '提示',
+      content: '确认注销账号？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await AuthUtil.logout();
+        if (code !== 0) {
+          return;
+        }
+        sheep.$store('user').logout();
+        sheep.$router.go('/pages/index/user');
+      },
+    });
+  }
+
+  // 退出账号
+  function onLogout() {
+    uni.showModal({
+      title: '提示',
+      content: '确认退出账号？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await AuthUtil.logout();
+        if (code !== 0) {
+          return;
+        }
+        sheep.$store('user').logout();
+        sheep.$router.go('/pages/tabbar/index');
+      },
+    });
+  }
+</script>
+
+<style lang="scss" scoped>
+  .container-list {
+    width: 100%;
+  }
+
+  .set-title {
+    margin: 0 30rpx;
+  }
+
+  .header-box {
+    padding: 100rpx 0;
+
+    .logo-img {
+      width: 160rpx;
+      height: 160rpx;
+      border-radius: 50%;
+    }
+
+    .name {
+      font-size: 42rpx;
+      font-weight: 400;
+      color: $dark-3;
+    }
+
+    .version {
+      font-size: 32rpx;
+      font-weight: 500;
+      line-height: 32rpx;
+      color: $gray-b;
+    }
+  }
+
+  .set-footer {
+    margin: 100rpx 0 0 0;
+
+    .copyright-text {
+      font-size: 22rpx;
+      font-weight: 500;
+      color: $gray-c;
+      line-height: 30rpx;
+    }
+
+    .agreement-box {
+      font-size: 26rpx;
+      font-weight: 500;
+
+      .tcp-text {
+        color: var(--ui-BG-Main);
+      }
+
+      .agreement-text {
+        color: $dark-9;
+      }
+    }
+  }
+
+  .loginout-btn {
+    width: 100%;
+    height: 80rpx;
+    border-radius: 40rpx;
+    font-size: 30rpx;
+  }
+
+  .list-border {
+    font-size: 28rpx;
+    font-weight: 400;
+    color: #333333;
+    border-bottom: 2rpx solid #eeeeee;
+  }
+
+  :deep(.uni-list-item__content-title) {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #333;
+  }
+
+  :deep(.uni-list-item__extra-text) {
+    color: #bbbbbb;
+    font-size: 28rpx;
+  }
+</style>
diff --git a/pages/public/webview.vue b/pages/public/webview.vue
new file mode 100644
index 0000000..1327295
--- /dev/null
+++ b/pages/public/webview.vue
@@ -0,0 +1,18 @@
+<!-- 网页加载 -->
+<template>
+  <view>
+    <web-view :src="url" />
+  </view>
+</template>
+
+<script setup>
+  import { onLoad } from '@dcloudio/uni-app';
+  import { ref } from 'vue';
+
+  const url = ref('');
+  onLoad((options) => {
+    url.value = decodeURIComponent(options.url);
+  });
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/pages/reward/components/layout.vue b/pages/reward/components/layout.vue
new file mode 100644
index 0000000..c5cab70
--- /dev/null
+++ b/pages/reward/components/layout.vue
@@ -0,0 +1,84 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" :auto="true" use-virtual-list :force-close-inner-list="true" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @scroll="scroll" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<su-navbar :title="title" statusBar></su-navbar>
+			</template>  
+			   
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<order-list :virtualList="virtualList"></order-list>
+			
+		</z-paging>
+		
+	</view>
+</template>
+
+<script>
+	import OrderList from '@/pages/reward/components/orderList.vue';
+	import RewardApi from '@/sheep/api/worker/reward';
+	import {
+	  fen2yuan,
+	} from '@/sheep/hooks/useGoods';
+	export default {
+		components: {
+			OrderList,
+		}, 
+		props: {
+			title: {
+				type: String,
+				default: '打赏记录',
+			},
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 0,
+				height: 0,
+			}
+		},
+		methods: {
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+				}
+				RewardApi.getRewardPage(params).then(res => {
+					// 将请求的结果数组传递给z-paging
+					res.data.list.forEach((order) => order.payMoney = fen2yuan(order.payMoney));
+					res.data.list.forEach((order) => order.money = fen2yuan(order.money));
+					this.$refs.paging.complete(res.data.list); 
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
diff --git a/pages/reward/components/orderList.vue b/pages/reward/components/orderList.vue
new file mode 100644
index 0000000..126279a
--- /dev/null
+++ b/pages/reward/components/orderList.vue
@@ -0,0 +1,169 @@
+<template>
+	  <view :id="`zp-id-${order.zp_index}`" :key="order.zp_index" v-for="(order,index) in orderList" class="order-card">
+		
+		<view class="main-box" :class="index == orderList.length-1 ? '':'bt'">
+			<view>
+				<u-avatar size="100" :src="order.avatar"></u-avatar>
+			</view>
+			<view class="right-box">
+				<view class="nickname-box">
+					<view class="nickname">{{order.nickname}}</view>
+					<view class="info">礼物名称：{{order.gift}}×{{order.count}}</view>
+					<view class="info">到账金额：{{order.money}}</view>
+					<view class="info">心动留言：{{order.msg}}</view>
+					<view class="info">
+						<text class="weixin">微信：{{order.weixin}}</text>
+						<view @tap.stop="onCopy(order.weixin)">
+							<u-icon name="outline-copy" custom-prefix="iconfont"></u-icon>
+						</view>
+					</view>
+					<view class="info">订单时间：{{order.createTimeStr}}</view> 
+				</view>
+				<view class="price-box"> 
+					<text class="price">{{order.payMoney}}</text>
+				</view>
+			</view>
+		</view>
+		
+	  </view>
+  
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			orderList() {
+				this.virtualList.forEach((order) => order.createTimeStr = sheep.$helper.timeFormat(order.createTime, 'yyyy-mm-dd hh:MM:ss'));
+				return this.virtualList;
+			},
+		},
+		methods: {
+			// 复制
+			onCopy(text) {
+			  sheep.$helper.copyText(text);
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.order-card {
+		padding: 0 10px;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		
+		.no-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex: 1;
+			padding-bottom: 10px;
+			color: rgb(100, 101, 102);
+			
+			.order-no {
+				
+				.number {
+					margin-left: 5px;
+					font-size: 22rpx;
+				}
+			}
+			
+			.status {
+				font-size: 22rpx;
+			}
+		}
+		
+		.main-box {
+			display: flex;
+			padding: 10px 0;
+			
+			.right-box {
+				display: flex;
+				justify-content: space-between;
+				flex: 1;
+				align-items: center;
+				margin-left: 10px;
+				
+				.nickname {
+					font-size: 12px;
+					font-weight: bold;
+					margin-bottom: 10px;
+				}
+				
+				.info {
+					font-size: 22rpx;
+					color: rgb(100, 101, 102);
+					line-height: 22rpx;
+					margin-bottom: 5px;
+					display: flex;
+					align-items: center;
+					
+					.weixin {
+						margin-right: 5px;
+					}
+				}
+				
+				.price-box {
+					font-size: 22rpx;
+					color: rgb(100, 101, 102);
+					
+					.price {
+						font-size: 34rpx;
+						font-weight: bold;
+						color: var(--ui-BG-Main);
+					}
+				}
+			}
+		}
+		
+		.bt {
+			border-bottom: 1px solid #fbf0f0;
+		}
+		
+		.bottom-box {
+			display: flex;
+			justify-content: flex-end;
+			
+			.btn-box {
+				display: flex;
+				align-items: center;
+			}
+			
+			.btn {
+				background-color: #ddd;
+				color: rgb(100, 101, 102);
+				font-size: 22rpx;
+				border-radius: 40px;
+				padding: 5px 10px;
+				margin-left: 10px;
+				min-width: 140rpx;
+				display: flex;
+				justify-content: center;
+			}
+			
+			.active {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+			}
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/reward/list.vue b/pages/reward/list.vue
new file mode 100644
index 0000000..abc3de3
--- /dev/null
+++ b/pages/reward/list.vue
@@ -0,0 +1,40 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<layout ref="order"></layout>
+		
+		<s-menu-tools />
+		<s-auth-modal />
+	</view>
+</template>
+
+<script>
+	import layout from '@/pages/reward/components/layout.vue';
+	export default { 
+		components: {
+			layout,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		onLoad(options) {
+		
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fafafa;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/actionSheet.vue b/pages/tabbar/components/home/actionSheet.vue
new file mode 100644
index 0000000..ba318d4
--- /dev/null
+++ b/pages/tabbar/components/home/actionSheet.vue
@@ -0,0 +1,220 @@
+<template>
+	<view @touchmove.stop.prevent>
+		<view class="tui-actionsheet" :class="{'tui-actionsheet-show':show,'tui-actionsheet-radius':radius}"
+			:style="{zIndex:getZIndex}">
+			<view class="tui-actionsheet-tips" :style="{fontSize:size+'rpx',color:color}" v-if="tips">
+				{{tips}}
+			</view>
+			<view :class="[isCancel?'tui-operate-box':'']">
+				<scroll-view class="scroll-box" :style="{height: scrollHeight}" scroll-y>
+				<block v-for="(item,index) in itemList" :key="index">
+					<view class="tui-actionsheet-btn"
+						:class="index == 0 ? 'top' : ''"
+						hover-class="tui-actionsheet-hover" :hover-stay-time="150" :data-index="index"
+						:style="{color:item.color || '#2B2B2B'}" @tap="handleClickItem">{{item.text}}</view>
+				</block>
+				</scroll-view>
+			</view>
+			<view class="tui-actionsheet-btn tui-actionsheet-cancel" hover-class="tui-actionsheet-hover"
+				:hover-stay-time="150" v-if="isCancel" @tap="handleClickCancel">取消</view>
+		</view>
+		<view class="tui-actionsheet-mask" :class="{'tui-mask-show':show}" :style="{background:maskColor,zIndex:zIndex}"
+			@tap="handleClickMask"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiActionsheet",
+		emits: ['click', 'cancel'],
+		props: {
+			//显示操作菜单
+			show: {
+				type: Boolean,
+				default: false
+			},
+			//菜单按钮数组，自定义文本颜色，红色参考色：#e53a37
+			itemList: {
+				type: Array,
+				default: function() {
+					return [{
+						text: "确定",
+						color: "#2B2B2B"
+					}]
+				}
+			},
+			//点击遮罩 是否可关闭
+			maskClosable: {
+				type: Boolean,
+				default: true
+			},
+			//v2.1.0
+			maskColor: {
+				type: String,
+				default: "rgba(0, 0, 0, 0.6)"
+			},
+			//提示文字
+			tips: {
+				type: String,
+				default: ""
+			},
+			//提示文字颜色
+			color: {
+				type: String,
+				default: "#808080"
+			},
+			//提示文字大小 rpx
+			size: {
+				type: Number,
+				default: 26
+			},
+			//是否需要圆角
+			radius: {
+				type: Boolean,
+				default: true
+			},
+			//是否需要取消按钮
+			isCancel: {
+				type: Boolean,
+				default: true
+			},
+			zIndex: {
+				type: [Number, String],
+				default: 998
+			}
+		},
+		computed: {
+			getZIndex() {
+				return Number(this.zIndex) + 2
+			},
+			scrollHeight() {
+				var num = 7
+				if(this.itemList.length <= num){
+					num = this.itemList.length-1;
+				}
+				var h = 100*num;
+				return h + 'rpx';
+			}
+		},
+		methods: {
+			handleClickMask() {
+				if (!this.maskClosable) return;
+				this.handleClickCancel();
+			},
+			handleClickItem(e) {
+				if (!this.show) return;
+				const index = Number(e.currentTarget.dataset.index);
+				this.$emit('click', {
+					index: index,
+					...this.itemList[index]
+				});
+			},
+			handleClickCancel() {
+				this.$emit('cancel');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.scroll-box {
+		padding-top: 100rpx;
+		
+		.top {
+			position: fixed;
+			top: 0;
+		}
+	}
+	
+	.tui-actionsheet {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		visibility: hidden;
+		transform: translate3d(0, 100%, 0);
+		transform-origin: center;
+		transition: all 0.25s ease-in-out;
+		background-color: #F7F7F7;
+		min-height: 100rpx;
+	}
+
+	.tui-actionsheet-radius {
+		border-top-left-radius: 20rpx;
+		border-top-right-radius: 20rpx;
+		overflow: hidden;
+	}
+
+	.tui-actionsheet-show {
+		transform: translate3d(0, 0, 0);
+		visibility: visible;
+	}
+
+	.tui-actionsheet-tips {
+		width: 100%;
+		padding: 40rpx 60rpx;
+		box-sizing: border-box;
+		text-align: center;
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.tui-operate-box {
+		padding-bottom: 12rpx;
+	}
+
+	.tui-actionsheet-btn {
+		width: 100%;
+		height: 100rpx;
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		text-align: center;
+		font-size: 34rpx;
+		position: relative;
+	}
+
+	.tui-btn-last {
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.tui-actionsheet-divider::before {
+		content: '';
+		width: 100%;
+		border-bottom: 1rpx solid #E7E7E7;
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
+
+	.tui-actionsheet-cancel {
+		color: #1a1a1a;
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.tui-actionsheet-hover {
+		background-color: #f7f7f9;
+	}
+
+	.tui-actionsheet-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		transition: all 0.3s ease-in-out;
+		opacity: 0;
+		visibility: hidden;
+	}
+
+	.tui-mask-show {
+		opacity: 1;
+		visibility: visible;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/cardList.vue b/pages/tabbar/components/home/cardList.vue
new file mode 100644
index 0000000..577bdc6
--- /dev/null
+++ b/pages/tabbar/components/home/cardList.vue
@@ -0,0 +1,448 @@
+<template>
+	<view>
+		<!-- #ifdef MP -->
+		<view v-if="showSubscribeBtn" class="subscribe-box">
+		  <u-icon name="bell-fill" color="var(--ui-BG-Main)" size="44"></u-icon>
+		  <view class="info">获取未读消息提醒</view>
+		  <view class="sub-btn" @tap="subscribeMessage">立即订阅</view>
+		</view>
+		<!-- #endif -->
+		
+		<view :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in orderList" class="user-card">
+			 <view class="avatar-box" @click="detail(item)">
+				<u-avatar size="180" :src="item.avatar"></u-avatar>
+			 </view>
+			 <view class="right-box">
+				 <view class="top-box">
+					 <view class="nickname-box">
+						 <view class="nickname">{{item.nickname}}</view>
+						 <view class="sex-nv" v-if="item.sex == 2">
+							 <u-icon name="ziyuan2" size="22" custom-prefix="iconfont"></u-icon>
+							 <text>{{item.age}}</text>
+						 </view>
+						 <view class="sex-nan" v-if="item.sex == 1">
+							 <u-icon name="ziyuan3" size="22" custom-prefix="iconfont"></u-icon>
+							 <text>{{item.age}}</text>
+						 </view>
+					 </view>
+					 <view class="map-box">
+						 <u-icon name="map" size="32" color="#aaa"></u-icon>
+						 <view class="city" v-if="item.city">
+							<text class="text">{{item.city}}</text>
+						 </view>
+						 <text v-else>未知</text>
+					 </view>
+				 </view>
+				 <view class="oline-box">
+					 <view class="tag-box">
+					 	<span class="tag">已注册{{item.day}}天</span>
+						<span class="tag" v-if="item.qrcode && item.qrcodeShow == 0">可交换名片</span>
+					 </view>
+					 <view class="badge-box">
+						 <view v-if="item.qrcode && item.qrcodeShow == 0" class="weixin-btn" @click="getWeixin(item)">
+							 <u-icon name="weixin-fill" size="28" color="#fff"></u-icon>
+						 </view>
+					 </view>
+				 </view>
+				 <view class="tag-list">
+					 <img-box :file="item.photo"></img-box>
+					 <view class="chat-btn" @click="chat(item)">
+						 <u-icon name="chat" size="28" color="#fff"></u-icon>
+						 <view class="text">密聊</view>
+					 </view>
+				 </view>
+				 
+			 </view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import TuiBadge from "@/components/thorui/tui-badge/tui-badge.vue";
+	import ImgBox from '@/pages/tabbar/components/home/friend/imgBox.vue';
+	import sheep from '@/sheep'; 
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	import UserApi from '@/sheep/api/member/user';
+	import dayjs from 'dayjs';
+	import relativeTime from "dayjs/plugin/relativeTime";
+	dayjs.extend(relativeTime);
+	const audio = uni.createInnerAudioContext();
+	export default {
+		components: {
+			TuiBadge,
+			ImgBox,
+		},
+		props: {
+			item: {
+				type: Object,
+				default: {},
+			},
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				playId: null,
+				
+				showSubscribeBtn: false,
+			}
+		},
+		computed: {
+			authType() {
+				return sheep.$store('modal').auth;
+			},
+			orderList() {
+				this.virtualList.forEach((order) => order.time = this.showDayTime(order.updateTime));
+				return this.virtualList;
+			},
+		},
+		created() {
+			// #ifdef MP
+			// 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
+			this.autoSubscribeMessage();
+			// #endif
+		},
+		methods: {
+			playAudio(e) {
+				if(this.playId == e.id){
+					this.playId = null;
+					audio.stop();
+					return;
+				}
+				this.playId = e.id;
+				//语音自然播放结束
+				audio.onEnded((res) => {
+					this.playId = null;
+				});
+				audio.src = e.sound;
+				audio.play();
+			},
+			detail(e) {
+				sheep.$router.go('/pages/user/detail/index',{id: e.id});
+			},
+			getWeixin(e) {
+				var that = this;
+				uni.showModal({
+				  title: '交换名片',
+				  content: '确认交换名片吗？',
+				  success: function (res) {
+				    if (res.confirm) {
+						that.queryWeixin(e);
+				    }
+				  },
+				});
+				
+			},
+			queryWeixin(e) {
+				UserApi.getQrcodeByUserId(e.id).then(res => {
+					if(res.data){
+						uni.previewImage({
+							current: 0, //预览图片的下标
+							urls: [res.data], //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+							indicator: 'number',
+							loop: true
+						});
+					}
+				});
+			},
+			chat(e) {
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				
+				const userInfo = sheep.$store('user').userInfo;
+				// 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。
+				if(userInfo.visible) {
+					// #ifdef MP-WEIXIN
+					this.subscribeMessage();
+					// #endif
+					
+					ImConversationApi.createMemberConversation({
+						userId: e.id,
+						groupType: 1,
+						lastMessageContentType: 1,
+					}).then(res => {
+						if(res.data){
+							sheep.$router.go('/pages/im/index',{groupId: res.data, receiveUserId: e.id});
+						}
+					});
+					return;
+				}
+				// 触发小程序授权信息弹框
+				// #ifdef MP-WEIXIN
+				showAuthModal('mpAuthorization');
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				showAuthModal('h5Authorization');
+				// #endif
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			    uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+			    // 隐藏订阅按钮
+			    this.showSubscribeBtn = false;
+			  });
+			},
+			async autoSubscribeMessage() {
+			  // 1. 校验是否手动订阅过
+			  const subscribeBtnStatus = uni.getStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			  if (!subscribeBtnStatus) {
+			    this.showSubscribeBtn = true;
+			    return;
+			  }
+			},
+			showDayTime(datetime) {
+			  if (!datetime) return "";
+			  return dayjs(datetime).fromNow();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.user-card {
+		padding: 15px;
+		margin-bottom: 15px;
+		background-color: #fff;
+		border-radius: 10px;
+		display: flex;
+		flex: 1;
+	}
+	
+	.user-card:last-child {
+		margin-bottom: 0;
+	}
+	
+	.avatar-box {
+		position: relative;
+		display: flex;
+		justify-content: center;
+		
+		.voice-play {
+			position: absolute;
+			bottom: 0;
+		}
+	}
+	
+	.right-box {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		margin-left: 10px;
+		min-width: 0;
+		position: relative;
+		justify-content: center;
+		
+		.top-box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 5px;
+			
+			.nickname-box {
+				display: flex;
+				align-items: center;
+				
+				.nickname {
+					font-size: 28rpx;
+					font-weight: bolder;
+					margin-right: 4px;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					overflow: hidden;
+					max-width: 200rpx;
+				}
+				
+				.sex-nv {
+					background-color: #d5656f;
+					border-radius: 40px;
+					color: #fff;
+					font-size: 22rpx;
+					padding: 1px 5px;
+				}
+				
+				.sex-nan {
+					background-color: #0081ff;
+					border-radius: 40px;
+					color: #fff;
+					font-size: 22rpx;
+					padding: 1px 5px;
+				}
+			}
+			
+			.map-box {
+				display: flex;
+				align-items: center;
+				font-size: 22rpx;
+				color: #aaa;
+				
+				.city {
+					display: flex;
+					
+					.text {
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						overflow: hidden;
+						max-width: 88rpx;
+					}
+				}
+			}
+		}
+		
+		.oline-box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 5px;
+			
+			.img-icon {
+				width: 40rpx;
+				height: 50rpx;
+			}
+			
+			.icon {
+				background-color: #ff5ebd;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				font-weight: bold;
+				color: #fff;
+				font-size: 22rpx;
+				line-height: 22rpx;
+				padding: 5px 5px;
+			}
+			
+			.badge-box {
+				display: flex;
+				align-items: center;
+				font-size: 26rpx;
+				color: #aaa;
+				
+				.online {
+					display: flex;
+					align-items: center;
+				}
+				
+				.text {
+					margin-left: 3px;
+				}
+			}
+		}
+		
+		.tag-list {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+		
+		.tag-box {
+			display: inline-block;
+			align-items: center;
+			background-color: #eef2f2;
+			border-radius: 3px;
+			color: #aaa;
+			font-size: 24rpx;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+			max-width: 100%;
+			padding: 5px 0;
+			
+			.tag {
+				white-space: nowrap;
+				padding: 5px 5px;
+				position: relative;
+			}
+			
+			.tag:after {
+				content: ' ';
+				border-left: 1px solid #aaa;
+				display: inline-block;
+				height: 10px;
+				position: absolute;
+				top: 50%;
+				transform: translateY(-50%);
+				right: 0;
+			}
+			
+			.tag:last-child:after{
+				display: none;
+			}
+		}
+		
+		.note-box {
+			display: flex;
+			align-items: center;
+			color: #aaa;
+			font-size: 24rpx;
+			
+			.text {
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+				max-width: 100%;
+			}
+		}
+		
+		.chat-btn {
+			display: flex;
+			align-items: center;
+			background-color: var(--ui-BG-Main);
+			justify-content: center;
+			border-radius: 40px;
+			color: #fff;
+			font-size: 22rpx;
+			padding: 5px;
+			position: absolute;
+			right: 0;
+			bottom: 0;
+			
+			.text {
+				margin-left: 2px;
+			}
+		}
+		
+		.weixin-btn {
+			display: flex;
+			align-items: center;
+			background-color: #19be6b;
+			justify-content: center;
+			border-radius: 40px;
+			color: #fff;
+			font-size: 22rpx;
+			padding: 5px;
+			
+			.text {
+				margin-left: 2px;
+			}
+		}
+	}
+	
+	.subscribe-box {
+		display: flex;
+		align-items: center;
+		padding-bottom: 10px;
+		justify-content: center;
+		font-size: 28rpx;
+		
+		.info {
+			margin: 0 10rpx;
+		}
+		
+		.sub-btn {
+			color: var(--ui-BG-Main);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/categoryCard.vue b/pages/tabbar/components/home/categoryCard.vue
new file mode 100644
index 0000000..cf0e7af
--- /dev/null
+++ b/pages/tabbar/components/home/categoryCard.vue
@@ -0,0 +1,181 @@
+<template>
+	<view class="user-card-box">
+		
+		<view class="user-card">
+			<view class="title">
+				<view class="icon">
+					<u-icon name="grid-fill" size="20" color="#aaa"></u-icon>
+				</view>
+				<text class="text">技能分类</text>
+			</view>
+			
+			
+			<uni-swiper-dot class="uni-swiper-dot-box" @clickItem="clickItem" :info="swiperList" :current="current" :dots-styles="dotsStyles" field="content">
+				<swiper class="swiper-box" :class="dataList.length > 4 ? '' : 'line'" @change="change" :current="swiperDotIndex">
+					<swiper-item v-for="(swiper,si) in swiperList">
+						<view class="user-swiper">
+							<view @click="tabClick(item)" class="user-box" v-for="(item,i) in swiper.list">
+								<view class="avatar-box">
+									<u-image border-radius="10" height="140" width="140"  :src="item.thumb"></u-image>
+								</view>
+								<view class="nickname">{{item.name}}</view>
+							</view>
+						</view>  
+					</swiper-item>
+				</swiper>
+			</uni-swiper-dot>
+			
+		
+		</view>
+		
+		
+	</view>
+	
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			dataList: {
+				type: Array,
+				default: [],
+			},
+		}, 
+		data() {
+			return {
+				swiperDotIndex: 0,  
+				current: 0,
+				dotsStyles: {
+					backgroundColor: '#ddd',
+					border: '1px #ddd solid',
+					color: '#fff',
+					selectedBackgroundColor: 'var(--ui-BG-Main)',
+					selectedBorder: '1px var(--ui-BG-Main) solid'
+				},
+			}
+		},
+		computed: {
+			swiperList() {
+				return this.getSwiperList(this.dataList);
+			},
+		},
+		created() {
+			
+		},
+		methods: {
+			change(e) {
+				this.current = e.detail.current
+			},
+			getSwiperList(dataList) {
+				var swiperList = [];
+				var categoryList = [];
+				for(var i=0;i<dataList.length;i++){
+					var category = dataList[i];
+					categoryList.push(category);
+					if((i+1)%8 == 0 || (i+1) == dataList.length){
+						var swiper = {
+							list: categoryList
+						};
+						swiperList.push(swiper);
+						categoryList = [];
+					}
+				}
+				return swiperList;
+			},
+			clickItem(e) {
+				this.swiperDotIndex = e
+			},
+			tabClick(e) {
+				this.$emit('tabClick', e);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.user-card-box {
+		background-color: #fff;
+		border-radius: 10px;
+	}
+	
+	.swiper-box {
+		height: 460rpx;
+	}
+	
+	.line {
+		height: 240rpx;
+	}
+	
+	.user-card {
+		padding: 10px 0;
+		padding-bottom: 0;
+		
+		.title {
+			padding: 10px;
+			padding-top: 0;
+			font-size: 28rpx;
+			font-weight: bold;
+			display: flex;
+			align-items: center;
+			padding-bottom: 15px;
+			
+			.icon {
+				background-color: #ddd;
+				width: 36rpx;
+				height: 36rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 100%;
+			}
+			
+			.text {
+				margin-left: 4px;
+			}
+		}
+		
+		.user-swiper {
+			display: flex;
+			flex-wrap: wrap;
+			padding: 0px 5px;
+				
+			.avatar-box {
+				margin-bottom: 5px;
+				position: relative;
+				
+				.badge {
+					width: 30rpx;
+					height: 30rpx;
+					background-color: var(--ui-BG-Main);
+					position: absolute;
+					right: 0;
+					bottom: 0;
+					border-radius: 100%;
+					border: 2px solid #fff;
+				}
+			}
+			
+			.user-box {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				margin-bottom: 10px;
+				width: 25%;
+				
+				.nickname {
+					font-size: 28rpx;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					max-width: 140rpx;
+					text-align: center;
+				}
+			}
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/categorySheet.vue b/pages/tabbar/components/home/categorySheet.vue
new file mode 100644
index 0000000..8b944b3
--- /dev/null
+++ b/pages/tabbar/components/home/categorySheet.vue
@@ -0,0 +1,67 @@
+<template>
+	<view>
+		<action-sheet zIndex="9999" :show="showActionSheet" :item-list="categoryList" @click="itemClick" @cancel="closeActionSheet"></action-sheet>
+	</view>
+</template>
+
+<script>
+	import ActionSheet from '@/pages/tabbar/components/home/actionSheet.vue';
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			ActionSheet,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				showActionSheet: false,
+			}
+		},
+		computed: {
+			categoryList() {
+				var cateList = [];
+				var cate = {
+					text: "全部",
+					label: '项目分类',
+					value: '',
+					color: "#2B2B2B"
+				};
+				cateList.push(cate);
+				var dataList = sheep.$store('sys').categoryList;
+				for(var i=0;i<dataList.length;i++){
+					var category = {
+						text: "",
+						label: '',
+						value: '',
+						color: "#2B2B2B"
+					};
+					category.text = dataList[i].name;
+					category.label = dataList[i].name;
+					category.value = dataList[i].id;
+					cateList.push(category);
+				}
+				return cateList;
+			},
+		},
+		methods: {
+			//隐藏组件
+			closeActionSheet() {
+				this.showActionSheet = false
+			},
+			//调用此方法显示组件
+			openActionSheet() {
+				this.showActionSheet = true;
+			},
+			itemClick(e) {
+				this.$emit('categoryOk', e);
+				this.closeActionSheet();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/dazi.vue b/pages/tabbar/components/home/dazi.vue
new file mode 100644
index 0000000..ddfda62
--- /dev/null
+++ b/pages/tabbar/components/home/dazi.vue
@@ -0,0 +1,49 @@
+<template>
+	<view>
+		<view class="data-box">
+			<card-list :virtualList="virtualList"></card-list>
+		</view>
+	</view>
+</template>
+
+<script>
+	import topBox from '@/pages/tabbar/components/home/topBox.vue';
+	import CardList from '@/pages/tabbar/components/home/cardList.vue';
+	export default {
+		components: {  
+			topBox,
+			CardList,
+		},
+		props: {
+			scrollTop: {
+				type: Number,
+				default: 0,
+			},
+			stickyTop: {
+				type: Number,
+				default: uni.upx2px(80),
+			},
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		}, 
+		created() {
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.data-box {
+		padding: 0 15px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/friend.vue b/pages/tabbar/components/home/friend.vue
new file mode 100644
index 0000000..4764e54
--- /dev/null
+++ b/pages/tabbar/components/home/friend.vue
@@ -0,0 +1,55 @@
+<template>
+	<view>
+		<top-box @tabClick="tabClick" @search="search" :scrollTop="scrollTop" :stickyTop="stickyTop"></top-box>
+		<view class="data-box">
+			<card-list :virtualList="virtualList"></card-list>
+		</view>
+	</view>
+</template>
+
+<script>
+	import topBox from '@/pages/tabbar/components/home/friend/topBox.vue';
+	import CardList from '@/pages/tabbar/components/home/cardList.vue';
+	export default {
+		components: {  
+			topBox,
+			CardList,
+		},
+		props: {
+			scrollTop: {
+				type: Number,
+				default: 0,
+			},
+			stickyTop: {
+				type: Number,
+				default: uni.upx2px(80),
+			},
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		}, 
+		created() {
+		
+		},
+		methods: {
+			tabClick(e) {
+				this.$emit('tabClick', e);
+			},
+			search(e) {
+				this.$emit('search', e);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.data-box {
+		padding: 0 15px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/friend/imgBox.vue b/pages/tabbar/components/home/friend/imgBox.vue
new file mode 100644
index 0000000..e2076b5
--- /dev/null
+++ b/pages/tabbar/components/home/friend/imgBox.vue
@@ -0,0 +1,86 @@
+<template>
+	<view>
+		<view class="img-box" v-if="imgList.length > 0">
+		    <block v-for="(img,index) in imgList">
+				<view @click="onPreviewTap(img)" class="img" v-if="index < 3">
+					<u-image border-radius="10" width="70rpx" height="70rpx" :src="img"></u-image>
+					<view class="more" v-if="imgList.length > 3">
+						<text>+{{imgList.length-3}}</text>
+					</view>
+				</view>
+			</block>
+		</view>
+		<view v-else>
+			<view>暂未上传相册</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			file: {
+			  type: String,
+			  default: ''
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		created() {
+			
+		},
+		computed: {
+			imgList() {
+				if(this.file){
+					return this.file.split(',');
+				}else{
+					return [];
+				}
+			},
+		},
+		methods: {
+			// 预览图片
+			onPreviewTap(url) {
+			    uni.previewImage({
+			        current: url,
+			        urls: this.imgList,
+			    })
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.img-box {
+		display: flex;
+		position: relative;
+		width: fit-content;
+		
+		.img {
+			margin-right: 10rpx;
+		}
+		
+		.more {
+			position: absolute;
+			right: 10rpx;
+			bottom: 0;
+			background-color: #333333a6;
+			color: #fff;
+			font-size: 24rpx;
+			width: 70rpx;
+			height: 70rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 10rpx;
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/friend/rankBox.vue b/pages/tabbar/components/home/friend/rankBox.vue
new file mode 100644
index 0000000..d0cf316
--- /dev/null
+++ b/pages/tabbar/components/home/friend/rankBox.vue
@@ -0,0 +1,246 @@
+<template>
+	<view class="rank-box">
+		<view class="tab-box">
+			<tui-tabs width="200" unlined :tabs="tabList" badgeBgColor="var(--ui-BG-Main)" selectedColor="var(--ui-BG-Main)" sliderBgColor="var(--ui-BG-Main)" :currentTab="current" @change="change"></tui-tabs>
+		</view>
+		<view class="user-box">
+			<view class="avatar-box two" @click="detail(1)">
+				<view class="img-box">
+					<img v-if="list[1]" class="img" :src="list[1].avatar"></img>
+					<img v-else class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a0b0a27972615aee024a6e36f0a7e9e399e477ae55b7eec2b32032a6cc8bb268.png"></img>
+					<img class="two-icon" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/03072abb5a8c90a4f457549b8394d3c3db2a652410692d732b5c25f2478e3a85.png"></img>
+				</view>
+				<view class="nickname" v-if="list[1]">{{list[1].nickname}}</view>
+				<view class="nickname" v-else>???</view>
+			</view>
+			<view class="avatar-box one" @click="detail(0)">
+				<view class="img-box">
+					<img v-if="list[0]" class="img" :src="list[0].avatar"></img>
+					<img v-else class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a0b0a27972615aee024a6e36f0a7e9e399e477ae55b7eec2b32032a6cc8bb268.png"></img>
+					<img class="two-icon" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/d191aec3b3d6e95c1dcb3bace7bffe28834f4fb062a9675aeaa1ae42a9bbc366.png"></img>
+				</view>
+				<view class="nickname" v-if="list[0]">{{list[0].nickname}}</view>
+				<view class="nickname" v-else>???</view>
+			</view>
+			<view class="avatar-box three" @click="detail(2)">
+				<view class="img-box">
+					<img v-if="list[2]" class="img" :src="list[2].avatar"></img>
+					<img v-else class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a0b0a27972615aee024a6e36f0a7e9e399e477ae55b7eec2b32032a6cc8bb268.png"></img>
+					<img class="two-icon" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/27209281e1b0e00dcc112bae4d06c14b089ec2f74db14b62eca4cbc0cf741cff.png"></img>
+				</view>
+				<view class="nickname" v-if="list[2]">{{list[2].nickname}}</view>
+				<view class="nickname" v-else>???</view>
+			</view>
+		</view>
+		<view class="time-box">更新时间: {{updateTime}}</view>
+	</view>
+</template>
+
+<script>
+	import tuiTabs from "@/components/thorui/tui-tabs/tui-tabs.vue"
+	import sheep from '@/sheep'; 
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import dayjs from 'dayjs';
+	export default {
+		components: {
+			tuiTabs
+		},
+		props: {
+			maleWeekTopList: {
+				type: Array,
+				default: [],
+			},
+			femaleWeekTopList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				list: [],
+				current: 0,
+			}
+		},
+		computed: {
+			updateTime() {
+				this.list = this.femaleWeekTopList;
+				
+				// 获取当前日期和时间
+				const now = dayjs();
+				const nowDays = now.format('MM/DD');
+				const sevenDaysAgo = now.subtract(7, 'day').format('MM/DD');
+				return sevenDaysAgo + '-' + nowDays
+			},
+			tabList() {
+				return [{
+					name: '女神榜',
+					list: this.femaleWeekTopList,
+				},{
+					name: '男神榜',
+					list: this.maleWeekTopList,
+				}];
+			},
+		},
+		methods: {
+			change(e) {
+				this.current = e.index;
+				this.list = this.tabList[e.index].list;
+			},
+			detail(e) {
+				var user = this.list[e];
+				sheep.$router.go('/pages/user/detail/index',{id: user.id});
+			},
+			chat(e) {
+				var user = this.list[e];
+				if(!user){
+					return;
+				}
+				
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				
+				const userInfo = sheep.$store('user').userInfo;
+				// 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。
+				if(userInfo.visible) {
+					// #ifdef MP-WEIXIN
+					this.subscribeMessage();
+					// #endif
+					ImConversationApi.createMemberConversation({
+						userId: user.id,
+						groupType: 1,
+						lastMessageContentType: 1,
+					}).then(res => {
+						if(res.data){
+							sheep.$router.go('/pages/im/index',{groupId: res.data, receiveUserId: user.id});
+						}
+					});
+					return;
+				}
+				// 触发小程序授权信息弹框
+				// #ifdef MP-WEIXIN
+				showAuthModal('mpAuthorization');
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				showAuthModal('h5Authorization');
+				// #endif
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			    uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+			  });
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.rank-box {
+		background-color: #fff;
+		display: flex;
+		justify-content: center;
+		margin: 15px;
+		border-radius: 10px;
+		padding: 15px;
+		flex-direction: column;
+		align-items: center;
+		padding-top: 5px;
+		
+		.tab-box {
+			width: 200px;
+		}
+		
+		.user-box {
+			display: flex;
+			width: 100%;
+		}
+		
+		.avatar-box {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			flex: 1;
+			
+			.nickname {
+				margin-top: 10px;
+				font-size: 28rpx;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+				max-width: 160rpx;
+				text-align: center;
+				line-height: 28rpx;
+			}
+			
+			.point {
+				font-size: 24rpx;
+			}
+			
+			.img-box {
+				height: 200rpx;
+				position: relative;
+				display: flex;
+				justify-content: center;
+				
+				.two-icon {
+					width: 50rpx;
+					height: 50rpx;
+					position: absolute;
+					bottom: -8px;
+				}
+			}
+			
+			.img {
+				width: 120rpx;
+				height: 120rpx;
+				position: absolute;
+				bottom: 0;
+				border-radius: 100%;
+			}
+			
+		}
+		
+		.one{
+			color: #fed530;
+			
+			.img {
+				width: 160rpx;
+				height: 160rpx;
+				border: 2px solid #fed530;
+				object-fit: cover;
+			}
+		} 
+		
+		.two {
+			color: #d8d8d8;
+			
+			.img {
+				border: 2px solid #d8d8d8;
+				object-fit: cover;
+			}
+		} 
+		
+		.three {
+			color: #ef9e3f;
+			
+			.img {
+				border: 2px solid #ef9e3f;
+				object-fit: cover;
+			}
+		} 
+		
+		.time-box {
+			padding-top: 15px;
+			font-size: 24rpx;
+			color: #666;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/friend/stickyBox.vue b/pages/tabbar/components/home/friend/stickyBox.vue
new file mode 100644
index 0000000..9b05d5d
--- /dev/null
+++ b/pages/tabbar/components/home/friend/stickyBox.vue
@@ -0,0 +1,109 @@
+<template>
+	<view>
+		<view class="tag-box">
+			<view class="title">
+				<view class="icon">
+					<u-icon name="account-fill" size="20" color="#aaa"></u-icon>
+				</view>
+				<text class="text">更多用户</text>
+			</view>
+			<view class="sticky-box">
+				<view class="btn-tag" @click="searchTab">
+					<text class="text">筛选</text>
+					<u-icon name="shaixuan" custom-prefix="iconfont" size="20" color="#aaa"></u-icon>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import $store from '@/sheep/store';
+	export default {
+		components: {
+			
+		},
+		props: {
+			scrollTop: {
+				type: Number,
+				default: 0,
+			},
+			stickyTop: {
+				type: Number,
+				default: uni.upx2px(80),
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			
+		},
+		methods: {
+			searchTab() {
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				$store('modal').$patch((state) => {
+					state.search = true;
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tag-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 15px;
+		background-color: #fafafa;
+		height: 100rpx;
+		
+		.title {
+			font-size: 28rpx;
+			font-weight: bold;
+			display: flex;
+			
+			.icon {
+				background-color: #ddd;
+				width: 36rpx;
+				height: 36rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 100%;
+			}
+			
+			.text {
+				margin-left: 4px;
+			}
+		}
+		
+		.sticky-box {
+			display: flex;
+			
+			.btn-tag {
+				background-color: #fff;
+				border-radius: 40px;
+				margin-left: 5px;
+				padding: 0px 10px;
+				display: flex;
+				align-items: center;
+				font-size: 24rpx;
+				height: 48rpx;
+				
+				.text {
+					margin-right: 3px;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/friend/topBox.vue b/pages/tabbar/components/home/friend/topBox.vue
new file mode 100644
index 0000000..2237f41
--- /dev/null
+++ b/pages/tabbar/components/home/friend/topBox.vue
@@ -0,0 +1,260 @@
+<template>
+	<view class="main-box">
+		<view class="notice-box">
+			<notice-bar></notice-bar>
+		</view>
+		
+		<!-- <view class="blind-box">
+			<view class="blind-card">
+				<view class="icon">
+					<image style="width: 88rpx;height: 88rpx;" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/1d291d514fe8833f941924f273a5deb8f2cc8c06680fd49b6c08c58b16338c93.png"></image>
+				</view>
+				<view class="avatar-box">
+					<image style="width: 320rpx;height: 64rpx;" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/41888275859ee7d4663bfcbd322a55ac3da9bbfc3621ca8a1137f39b2fde47bd.png"></image>
+					<view @click="blindOrder" class="btn">快速匹配</view>
+				</view>
+			</view>
+		</view> -->
+		
+		<!-- <view>
+			<rank-box :femaleWeekTopList="femaleWeekTopList" :maleWeekTopList="maleWeekTopList"></rank-box>
+		</view> -->
+		
+		<view class="card-box">
+			<user-card :newList="newList" :hotList="hotList"></user-card>
+		</view>
+		
+		<view>
+			<sticky-box @tabClick="tabClick" :scrollTop="scrollTop" :stickyTop="stickyTop"></sticky-box>
+		</view>
+		
+		<view class="menu-btn">
+			<view class="icon" @click="slashed">
+				<image class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/097d1fd05a1176fe93df9de64e416e771ff8ccba72330d90d905783dff66c376.png"></image>
+			</view>
+			
+			<!-- <view class="icon" @click="blindOrder">
+				<image class="img" src="http://cos.duopei.feiniaowangluo.com/2065/shop/navbar/1727183771735mx5tNxqRg6.jpg"></image>
+			</view> -->
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import NoticeBar from '@/pages/tabbar/components/home/noticeBar.vue';
+	import StickyBox from '@/pages/tabbar/components/home/friend/stickyBox.vue';
+	import RankBox from '@/pages/tabbar/components/home/friend/rankBox.vue';
+	import UserCard from '@/pages/tabbar/components/home/friend/userCard.vue';
+	import UserApi from '@/sheep/api/member/user';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			NoticeBar,
+			RankBox,
+			StickyBox,
+			UserCard,
+		},
+		props: {
+			scrollTop: {
+				type: Number,
+				default: 0,
+			},
+			stickyTop: {
+				type: Number,
+				default: uni.upx2px(80),
+			},
+		},
+		data() {
+			return {
+				actionStyle: {
+					backgroundColor: 'var(--ui-BG-Main)',
+					borderRadius: '40px',
+					padding: '7px',
+					color: '#fff',
+					fontSize: '28rpx',
+					width: '80px',
+				},
+				keyword: '',
+				categoryList: [],
+				newList: [],
+				hotList: [],
+				maleWeekTopList: [],
+				femaleWeekTopList: [],
+			}
+		},
+		created() {
+			this.getInitData();
+		},
+		methods: {
+			tabClick(e) {
+				this.$emit('tabClick', e);
+			},
+			getInitData() {
+				this.getHomeData();
+				
+				UserApi.getWeekTopList().then(res => {
+					this.maleWeekTopList = res.data.maleWeekTopList;
+					this.femaleWeekTopList = res.data.femaleWeekTopList;
+				});
+				
+			},
+			search() {
+				this.$emit('search', this.keyword);
+			},
+			blindOrder() {
+				this.chat();
+			},
+			slashed() {
+				var that = this;
+				uni.showModal({
+				  title: '首页置顶',
+				  content: '每次置顶3小时，可以累计置顶时间。累计时间越多，排名越靠前',
+				  success: function (res) {
+				    if (res.confirm) {
+						that.submitSlashed();
+				    }
+				  },
+				});
+			},
+			getHomeData() {
+				UserApi.getHomeData().then(res => {
+					this.newList = res.data.memberNewList;
+					this.hotList = res.data.memberHotList;
+				});
+			},
+			submitSlashed() {
+				UserApi.slashed().then(res => {
+					if(res.data){
+						this.getHomeData();
+					}
+				});
+			},
+			chat() {
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				
+				const userInfo = sheep.$store('user').userInfo;
+				// 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。
+				if(userInfo.visible) {
+					// #ifdef MP-WEIXIN
+					this.subscribeMessage();
+					// #endif
+					ImConversationApi.getRandomMemberConversation().then(res => {
+						if(res.data){
+							sheep.$router.go('/pages/im/index',{groupId: res.data.groupId, receiveUserId: res.data.userId});
+						}
+					});
+					return;
+				}
+				// 触发小程序授权信息弹框
+				// #ifdef MP-WEIXIN
+				showAuthModal('mpAuthorization');
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				showAuthModal('h5Authorization');
+				// #endif
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			    uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+			  });
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main-box {
+		
+		.search-box {
+			background-color: #fff;
+			border-radius: 40px;
+			padding: 3px;
+			margin: 15px;
+		}
+		
+		.notice-box {
+			margin: 15px;
+		}
+		
+	}
+	
+	.card-box {
+		padding: 0 15px;
+	}
+	
+	.category-box {
+		padding: 15px;
+		padding-bottom: 0;
+	}
+	
+	.blind-box {
+		padding: 0 15px;
+		margin-bottom: 15px;
+	}
+	
+	.blind-card {
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+		padding: 10px;
+		border-radius: 10px;
+		
+		.icon {
+			margin-right: 10px;
+		}
+		
+		.avatar-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex: 1;
+			
+			.btn {
+				color: #fff;
+				font-size: 24rpx;
+				border-radius: 40px;
+				padding: 5px 10px;
+				background-color: var(--ui-BG-Main);
+			}
+		}
+	}
+	
+	
+	.menu-btn {
+		position: fixed;
+		bottom: 220rpx;
+		right: 25rpx;
+		z-index: 1;
+		
+		.icon {
+			background-color: #ffff;
+			width: 90rpx;
+			height: 90rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 100%;
+			box-shadow: 0 0 10px #cccccc;
+			margin-top: 70rpx;
+		}
+			
+		.img {
+			height: 80rpx;
+			width: 80rpx;
+			border-radius: 100%;
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/friend/userCard.vue b/pages/tabbar/components/home/friend/userCard.vue
new file mode 100644
index 0000000..803ce69
--- /dev/null
+++ b/pages/tabbar/components/home/friend/userCard.vue
@@ -0,0 +1,210 @@
+<template>
+	<view class="user-card-box">
+		<view class="user-card">
+			<view class="title">
+				<view class="icon">
+					<u-icon name="tuijian" custom-prefix="iconfont" size="20" color="#aaa"></u-icon>
+				</view>
+				<text class="text">新人推荐</text>
+			</view>
+			<scroll-view class="scroll-box" scroll-x>
+				<view class="user-swiper">
+					<view @click="detail(item)" class="user-box" v-for="(item,i) in newList">
+						<view class="avatar-box">
+							<u-avatar mode="square" size="140" :src="item.avatar"></u-avatar>
+							<view v-if="item.onlineStatus" class="badge"></view>
+						</view>
+						<view class="nickname">{{item.nickname}}</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		
+		<view class="user-card">
+			<view class="title">
+				<view class="icon">
+					<u-icon name="huo" custom-prefix="iconfont" size="20" color="#aaa"></u-icon>
+				</view>
+				<text class="text">置顶用户</text>
+			</view>
+			<scroll-view class="scroll-box" scroll-x>
+				<view class="user-swiper">
+					
+					<view @click="detail(item)" class="user-box" v-for="(item,i) in orderList">
+						<view class="avatar-box">
+							<u-avatar mode="square" size="140" :src="item.avatar"></u-avatar>
+							<view v-if="item.onlineStatus" class="badge"></view>
+							<view class="count-down">
+								<u-count-down :timestamp="item.timestamp" format="HH时mm分ss秒"></u-count-down>
+							</view>
+						</view>
+						<view class="nickname">{{item.nickname}}</view>
+					</view>
+					
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	export default {
+		components: {
+			
+		},
+		props: {
+			newList: {
+				type: Array,
+				default: [],
+			},
+			hotList: {
+				type: Array,
+				default: [],
+			},
+		}, 
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			orderList() {
+				this.hotList.forEach((order) => order.timestamp = order.slashedTime ? sheep.$helper.parseTimeData(order.slashedTime) : 0);
+				return this.hotList;
+			},
+		},
+		methods: {
+			detail(e) {
+				sheep.$router.go('/pages/user/detail/index',{id: e.id});
+			},
+			chat(e) {
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				
+				const userInfo = sheep.$store('user').userInfo;
+				// 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。
+				if(userInfo.visible) {
+					// #ifdef MP-WEIXIN
+					this.subscribeMessage();
+					// #endif
+					ImConversationApi.createMemberConversation({
+						userId: e.id,
+						groupType: 1,
+						lastMessageContentType: 1,
+					}).then(res => {
+						if(res.data){
+							sheep.$router.go('/pages/im/index',{groupId: res.data, receiveUserId: e.id});
+						}
+					});
+					return;
+				}
+				// 触发小程序授权信息弹框
+				// #ifdef MP-WEIXIN
+				showAuthModal('mpAuthorization');
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				showAuthModal('h5Authorization');
+				// #endif
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			    uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+			  });
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.user-card-box {
+		background-color: #fff;
+		border-radius: 10px;
+	}
+	
+	.user-card {
+		padding: 10px 0;
+		
+		.title {
+			padding: 10px;
+			padding-top: 0;
+			font-size: 28rpx;
+			font-weight: bold;
+			display: flex;
+			align-items: center;
+			padding-bottom: 15px;
+			
+			.icon {
+				background-color: #ddd;
+				width: 36rpx;
+				height: 36rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 100%;
+			}
+			
+			.text {
+				margin-left: 4px;
+			}
+		}
+		
+		.user-swiper {
+			display: flex;
+				
+			.avatar-box {
+				margin-bottom: 5px;
+				position: relative;
+				
+				.badge {
+					width: 30rpx;
+					height: 30rpx;
+					background-color: var(--ui-BG-Main);
+					position: absolute;
+					right: 0;
+					bottom: 0;
+					border-radius: 100%;
+					border: 2px solid #fff;
+				}
+				
+				.count-down {
+					font-size: 20rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+			}
+			
+			.user-box {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				margin-left: 10px;
+				
+				.nickname {
+					font-size: 28rpx;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					max-width: 140rpx;
+					text-align: center;
+					line-height: 28rpx;
+				}
+			}
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/navBar - 副本.vue b/pages/tabbar/components/home/navBar - 副本.vue
new file mode 100644
index 0000000..3bbe7b9
--- /dev/null
+++ b/pages/tabbar/components/home/navBar - 副本.vue	
@@ -0,0 +1,78 @@
+<template>
+  <view>
+	 <tui-navigation-bar :isOpacity="false" @init="initNavigation" @change="opacityChange" :scrollTop="scrollTop" backgroundColor="#fafafa" color="#333">
+	 	<view>
+			<view class="nav-box">
+				<view style="width: 200px;">
+					<u-tabs :list="list" bg-color="#fafafa" font-size="36" active-color="var(--ui-BG-Main)" :is-scroll="false" v-model="current" @change="change"></u-tabs>
+				</view>
+			</view>
+		</view>
+	 </tui-navigation-bar>
+  </view>
+</template>
+
+<script>
+	import tuiNavigationBar from "@/components/thorui/tui-navigation-bar/tui-navigation-bar.vue";
+	export default {
+		components: {
+			tuiNavigationBar,
+		},
+		props: {
+			currentValue: {
+				type: Number,
+				default: 0,
+			},
+		},
+		data() {
+			return {
+				list: [{
+					name: '搭子'
+				}, {
+					name: '服务'
+				}, {
+					name: '社交',
+				}],
+				
+				top: 0, //标题图标距离顶部距离
+				opacity: 1,
+				height: 0,
+				scrollTop: 0.5,
+			}
+		},
+		computed: {
+			current() {
+				return this.currentValue;
+			},
+		},
+		methods: {
+			initNavigation(e) {
+				this.height = e.height;
+				this.opacity = e.opacity;
+				this.top = e.top;
+				this.$emit('initNav', e);
+			},
+			opacityChange(e) {
+				this.opacity = e.opacity;
+			},
+			change(index) {
+				this.$emit('change', index);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.nav-box {
+		height: 44px;
+		display: flex;
+		justify-content: center;
+		background-color: #fafafa;
+		flex-direction: column;
+		font-size: 22rpx;
+		position: relative;
+		
+	}
+	
+
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/navBar.vue b/pages/tabbar/components/home/navBar.vue
new file mode 100644
index 0000000..e4fd304
--- /dev/null
+++ b/pages/tabbar/components/home/navBar.vue
@@ -0,0 +1,106 @@
+<template>
+  <view>
+	 <tui-navigation-bar :isOpacity="false" @init="initNavigation" @change="opacityChange" :scrollTop="scrollTop">
+		<view class="tab-box">
+			<view class="zhong">
+				<view class="tab-box">
+					<block v-for="(item,i) in tabList" :key="i">
+						<view v-if="item.enabled" class="title-label" @click="tabsChange" :data-i="i" >
+							<text
+								:style="{fontWeight:current==i?'bold':'',fontSize:current==i?'36rpx':'28rpx'}">
+								{{item.name}}
+							</text> 
+						</view> 
+					</block>
+				</view>
+			</view>
+		</view>
+	 </tui-navigation-bar>
+  </view>
+</template>
+
+<script>
+	import tuiNavigationBar from "@/components/thorui/tui-navigation-bar/tui-navigation-bar.vue";
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			tuiNavigationBar,
+		},
+		props: {
+			tabList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				top: 0, //标题图标距离顶部距离
+				opacity: 1,
+				height: 0,
+				scrollTop: 0.5,
+			}
+		},
+		computed: {
+			current: {
+				get() { 
+				  return sheep.$store('sys').homeTabIndex;
+				},
+			},
+		},
+		methods: {
+			initNavigation(e) {
+				this.height = e.height;
+				this.opacity = e.opacity;
+				this.top = e.top;
+				this.$emit('initNav', e);
+			},
+			opacityChange(e) {
+				this.opacity = e.opacity;
+			},
+			tabsChange(e) {
+				var current = e.currentTarget.dataset.i; 
+				sheep.$store('sys').setHomeTabIndex(current);
+				this.$emit('change', current);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.zhong {
+		//width: 230rpx;
+	}
+	
+	.tab-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.avatar-box {
+		display: flex;
+		align-items: center;
+		position: absolute;
+		left: 40rpx;
+		
+		.icon {
+			position: absolute;
+			right: 0;
+			bottom: 0;
+		}
+	}
+	
+	.tab-box .title-label {
+		height: 44px;
+		padding: 0 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		//font-size: 34rpx;
+	}
+	
+	.tab-box .title-label text {
+		transition: all 0.3s;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/noticeBar.vue b/pages/tabbar/components/home/noticeBar.vue
new file mode 100644
index 0000000..9cc4e9b
--- /dev/null
+++ b/pages/tabbar/components/home/noticeBar.vue
@@ -0,0 +1,112 @@
+<template>
+	<view class="tui-rolling-news">
+		<view class="title">
+			<u-icon name="bell-fill" size="26" color='#fff'></u-icon>
+			<text class="text">最新消息</text>
+		</view>
+		<swiper vertical autoplay circular interval="3000" class="tui-swiper">
+			<swiper-item v-for="(item,index) in newsList" :key="index" class="tui-swiper-item">
+				<view class="tui-news-item">{{item}}</view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			newsList() {
+				var giftList = sheep.$store('sys').giftList;
+				var newsList = [];
+				var that = this;
+				giftList.forEach(function(item){
+					var news = "【"+item.nickname+"】收到了好友赠送 "+ that.fen2yuan(item.payMoney)+" 颗"
+					if(item.rewardType){
+						news = "【"+item.nickname+"】收到好友赠送 "+item.name+" x"+item.count;
+					}
+					newsList.push(news);
+				})
+				return newsList;
+			},
+		},
+		methods: {
+			fen2yuan(price) {
+			  var f = 0;
+			  var p = (price / 100.0).toFixed(0);
+			  var p1 = (price / 100.0).toFixed(1);
+			  var p2 = (price / 100.0).toFixed(2);
+			  if(p*100 == price){
+				f = 0;  
+			  }else if(p1*100 == price){
+				  f = 1;
+			  }else if(p2*100 == price){
+				  f = 2;
+			  }
+			  return (price / 100.0).toFixed(f)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tui-rolling-news {
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-wrap: nowrap;
+		background-color: #fff;
+		border-radius: 40px;
+		height: 30px;
+		
+		.title {
+			background-color: var(--ui-BG-Main);
+			height: 30px;
+			display: flex;
+			align-items: center;
+			color: #fff;
+			border-top-left-radius: 20px;
+			border-top-right-radius: 20px;
+			border-bottom-left-radius: 20px;
+			padding: 10px;
+			margin-right: 10px;
+			font-size: 24rpx;
+			
+			.text {
+				margin-left: 4px;
+			}
+		}
+	}
+	
+	.tui-swiper {
+		font-size: 24rpx;
+		height: 50rpx;
+		flex: 1;
+	}
+	
+	.tui-swiper-item {
+		display: flex;
+		align-items: center
+	}
+	
+	.tui-news-item {
+		line-height: 24rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		color: #666;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/peiwan.vue b/pages/tabbar/components/home/peiwan.vue
new file mode 100644
index 0000000..3cf0030
--- /dev/null
+++ b/pages/tabbar/components/home/peiwan.vue
@@ -0,0 +1,58 @@
+<template>
+	<view>
+		<top-box @tabClick="tabClick" @search="search" @categoryClick="categoryClick" :scrollTop="scrollTop" :stickyTop="stickyTop"></top-box>
+		<view class="data-box">
+			<user-list :virtualList="virtualList"></user-list>
+		</view>
+	</view>
+</template>
+
+<script>
+	import topBox from '@/pages/tabbar/components/home/topBox.vue';
+	import UserList from '@/pages/tabbar/components/home/userList.vue';
+	export default {
+		components: {  
+			topBox,
+			UserList,
+		},
+		props: {
+			scrollTop: {
+				type: Number,
+				default: 0,
+			},
+			stickyTop: {
+				type: Number,
+				default: uni.upx2px(80),
+			},
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		}, 
+		created() {
+			
+		},
+		methods: {
+			tabClick(e) {
+				this.$emit('tabClick', e);
+			},
+			search(e) {
+				this.$emit('search', e);
+			},
+			categoryClick(e) {
+				this.$emit('categoryClick', e);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.data-box {
+		padding: 0 15px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/rankBox.vue b/pages/tabbar/components/home/rankBox.vue
new file mode 100644
index 0000000..600faa8
--- /dev/null
+++ b/pages/tabbar/components/home/rankBox.vue
@@ -0,0 +1,198 @@
+<template>
+	<view class="rank-box">
+		<view class="tab-box">
+			<tui-tabs width="200" unlined :tabs="tabList" badgeBgColor="var(--ui-BG-Main)" selectedColor="var(--ui-BG-Main)" sliderBgColor="var(--ui-BG-Main)" :currentTab="current" @change="change"></tui-tabs>
+		</view>
+		<view class="user-box">
+			<view class="avatar-box two" @click="detail(1)">
+				<view class="img-box">
+					<img v-if="list[1]" class="img" :src="list[1].avatar"></img>
+					<img v-else class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a0b0a27972615aee024a6e36f0a7e9e399e477ae55b7eec2b32032a6cc8bb268.png"></img>
+					<img class="two-icon" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/03072abb5a8c90a4f457549b8394d3c3db2a652410692d732b5c25f2478e3a85.png"></img>
+				</view>
+				<view class="nickname" v-if="list[1]">{{list[1].nickname}}</view>
+				<view class="nickname" v-else>???</view>
+			</view>
+			<view class="avatar-box one" @click="detail(0)">
+				<view class="img-box">
+					<img v-if="list[0]" class="img" :src="list[0].avatar"></img>
+					<img v-else class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a0b0a27972615aee024a6e36f0a7e9e399e477ae55b7eec2b32032a6cc8bb268.png"></img>
+					<img class="two-icon" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/d191aec3b3d6e95c1dcb3bace7bffe28834f4fb062a9675aeaa1ae42a9bbc366.png"></img>
+				</view>
+				<view class="nickname" v-if="list[0]">{{list[0].nickname}}</view>
+				<view class="nickname" v-else>???</view>
+			</view>
+			<view class="avatar-box three" @click="detail(2)">
+				<view class="img-box">
+					<img v-if="list[2]" class="img" :src="list[2].avatar"></img>
+					<img v-else class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a0b0a27972615aee024a6e36f0a7e9e399e477ae55b7eec2b32032a6cc8bb268.png"></img>
+					<img class="two-icon" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/27209281e1b0e00dcc112bae4d06c14b089ec2f74db14b62eca4cbc0cf741cff.png"></img>
+				</view>
+				<view class="nickname" v-if="list[2]">{{list[2].nickname}}</view>
+				<view class="nickname" v-else>???</view>
+			</view>
+		</view>
+		<view class="time-box">更新时间: {{updateTime}}</view>
+	</view>
+</template>
+
+<script>
+	import tuiTabs from "@/components/thorui/tui-tabs/tui-tabs.vue"
+	import dayjs from 'dayjs';
+	export default {
+		components: {
+			tuiTabs
+		},
+		props: {
+			maleWeekTopList: {
+				type: Array,
+				default: [],
+			},
+			femaleWeekTopList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				list: [],
+				current: 0,
+			}
+		},
+		computed: {
+			updateTime() {
+				this.list = this.femaleWeekTopList;
+				
+				// 获取当前日期和时间
+				const now = dayjs();
+				const nowDays = now.format('MM/DD');
+				const sevenDaysAgo = now.subtract(7, 'day').format('MM/DD');
+				return sevenDaysAgo + '-' + nowDays
+			},
+			tabList() {
+				return [{
+					name: '女神榜',
+					list: this.femaleWeekTopList,
+				}, {
+					name: '男神榜',
+					list: this.maleWeekTopList,
+				}];
+			},
+		},
+		methods: {
+			change(e) {
+				this.current = e.index;
+				this.list = this.tabList[e.index].list;
+			},
+			detail(e) {
+				if(this.list[e]){
+					this.$u.route({
+						url: 'pages/clerk/detail/index',
+						params: {
+							id: this.list[e].id,
+						}
+					});
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.rank-box {
+		background-color: #fff;
+		display: flex;
+		justify-content: center;
+		margin: 15px;
+		border-radius: 10px;
+		padding: 15px;
+		flex-direction: column;
+		align-items: center;
+		padding-top: 5px;
+		
+		.tab-box {
+			width: 200px;
+		}
+		
+		.user-box {
+			display: flex;
+			width: 100%;
+		}
+		
+		.avatar-box {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			flex: 1;
+			
+			.nickname {
+				margin-top: 10px;
+				font-size: 28rpx;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+				max-width: 160rpx;
+				text-align: center;
+				line-height: 28rpx;
+			}
+			
+			.img-box {
+				height: 200rpx;
+				position: relative;
+				display: flex;
+				justify-content: center;
+				
+				.two-icon {
+					width: 50rpx;
+					height: 50rpx;
+					position: absolute;
+					bottom: -8px;
+				}
+			}
+			
+			.img {
+				width: 120rpx;
+				height: 120rpx;
+				position: absolute;
+				bottom: 0;
+				border-radius: 100%;
+			}
+			
+		}
+		
+		.one{
+			color: #fed530;
+			
+			.img {
+				width: 160rpx;
+				height: 160rpx;
+				border: 2px solid #fed530;
+				object-fit: cover;
+			}
+		} 
+		
+		.two {
+			color: #d8d8d8;
+			
+			.img {
+				border: 2px solid #d8d8d8;
+				object-fit: cover;
+			}
+		} 
+		
+		.three {
+			color: #ef9e3f;
+			
+			.img {
+				border: 2px solid #ef9e3f;
+				object-fit: cover;
+			}
+		} 
+		
+		.time-box {
+			padding-top: 15px;
+			font-size: 24rpx;
+			color: #666;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/sexSheet.vue b/pages/tabbar/components/home/sexSheet.vue
new file mode 100644
index 0000000..87b2d28
--- /dev/null
+++ b/pages/tabbar/components/home/sexSheet.vue
@@ -0,0 +1,61 @@
+<template>
+	<view>
+		<tui-actionsheet zIndex="9999"
+		 :show="showActionSheet" 
+		 :item-list="itemList" 
+		 @click="itemClick" 
+		 @cancel="closeActionSheet">
+		</tui-actionsheet>
+	</view>
+</template>
+
+<script>
+	import tuiActionsheet from "@/components/thorui/tui-actionsheet/tui-actionsheet.vue"
+	export default {
+		components: {
+			tuiActionsheet,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				showActionSheet: false,
+				itemList: [{
+					text: "全部",
+					label: '性别',
+					value: '',
+					color: "#2B2B2B"
+				}, {
+					text: "男生",
+					label: '性别：男',
+					value: '0',
+					color: "#2B2B2B"
+				}, {
+					text: "女生",
+					label: '性别：女',
+					value: '1',
+					color: "#2B2B2B"
+				}],
+			}
+		},
+		methods: {
+			//隐藏组件
+			closeActionSheet() {
+				this.showActionSheet = false
+			},
+			//调用此方法显示组件
+			openActionSheet() {
+				this.showActionSheet = true;
+			},
+			itemClick(e) {
+				this.$emit('sexOk', e);
+				this.closeActionSheet();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/stickyBox.vue b/pages/tabbar/components/home/stickyBox.vue
new file mode 100644
index 0000000..79d21f1
--- /dev/null
+++ b/pages/tabbar/components/home/stickyBox.vue
@@ -0,0 +1,118 @@
+<template>
+	<view>
+		<view class="tag-box">
+			<view class="title">
+				<view class="icon">
+					<u-icon name="account-fill" size="20" color="#aaa"></u-icon>
+				</view>
+				<text class="text">更多达人</text>
+			</view>
+			<view class="sticky-box">
+				<view class="btn-tag" @click="tabClick('category')">
+					<text class="text">{{searchTabs.categoryLabel}}</text>
+					<u-icon name="arrow-down" size="20" color="#aaa"></u-icon>
+				</view>
+				<view class="btn-tag" @click="tabClick('sex')">
+					<text class="text">{{searchTabs.sexLabel}}</text>
+					<u-icon name="arrow-down" size="20" color="#aaa"></u-icon>
+				</view>
+				<!-- <view class="btn-tag" @click="tabClick('level')">
+					<text class="text">等级</text>
+					<u-icon name="arrow-down" size="20" color="#aaa"></u-icon>
+				</view> -->
+				<!-- <view class="btn-tag" @click="tabClick('city')">
+					<text class="text">城市</text>
+					<u-icon name="arrow-down" size="20" color="#aaa"></u-icon>
+				</view> -->
+				<!-- <view class="btn-tag" @click="tabClick('city')">
+					<text class="text">筛选</text>
+					<u-icon name="shaixuan" custom-prefix="iconfont" size="20" color="#aaa"></u-icon>
+				</view> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			
+		},
+		props: {
+			scrollTop: {
+				type: Number,
+				default: 0,
+			},
+			stickyTop: {
+				type: Number,
+				default: uni.upx2px(80),
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			searchTabs() {
+				return sheep.$store('sys').searchTabs;
+			},
+		},
+		methods: {
+			tabClick(e) {
+				this.$emit('tabClick', e);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tag-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 15px;
+		background-color: #fafafa;
+		height: 100rpx;
+		
+		.title {
+			font-size: 28rpx;
+			font-weight: bold;
+			display: flex;
+			
+			.icon {
+				background-color: #ddd;
+				width: 36rpx;
+				height: 36rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 100%;
+			}
+			
+			.text {
+				margin-left: 4px;
+			}
+		}
+		
+		.sticky-box {
+			display: flex;
+			
+			.btn-tag {
+				background-color: #fff;
+				border-radius: 40px;
+				margin-left: 5px;
+				padding: 0px 10px;
+				display: flex;
+				align-items: center;
+				font-size: 24rpx;
+				height: 48rpx;
+				
+				.text {
+					margin-right: 3px;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/topBox.vue b/pages/tabbar/components/home/topBox.vue
new file mode 100644
index 0000000..8f6d628
--- /dev/null
+++ b/pages/tabbar/components/home/topBox.vue
@@ -0,0 +1,183 @@
+<template>
+	<view class="main-box">
+		<view class="search-box">
+			<u-search @custom="search" placeholder="可搜索达人名称/标签" bg-color="#fff" input-align="left" :action-style="actionStyle" v-model="keyword"></u-search>
+		</view>
+		
+		<view class="notice-box">
+			<notice-bar></notice-bar>
+		</view>
+		
+		<view class="blind-box">
+			<view class="blind-card">
+				<view class="icon">
+					<image style="width: 88rpx;height: 88rpx;" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/1d291d514fe8833f941924f273a5deb8f2cc8c06680fd49b6c08c58b16338c93.png"></image>
+				</view>
+				<view class="avatar-box">
+					<image style="width: 320rpx;height: 64rpx;" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/41888275859ee7d4663bfcbd322a55ac3da9bbfc3621ca8a1137f39b2fde47bd.png"></image>
+					<view @click="blindOrder" class="btn">随机下单</view>
+				</view>
+			</view>
+		</view>
+		
+		<view>
+			<rank-box :femaleWeekTopList="femaleWeekTopList" :maleWeekTopList="maleWeekTopList"></rank-box>
+		</view>
+		
+		<view class="card-box">
+			<user-card :newList="newList" :hotList="hotList"></user-card>
+		</view>
+		
+		<view class="category-box">
+			<category-card @tabClick="getCategory" :dataList="categoryList"></category-card>
+		</view> 
+		
+		<view>
+			<sticky-box @tabClick="tabClick" :scrollTop="scrollTop" :stickyTop="stickyTop"></sticky-box>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NoticeBar from '@/pages/tabbar/components/home/noticeBar.vue';
+	import StickyBox from '@/pages/tabbar/components/home/stickyBox.vue';
+	import RankBox from '@/pages/tabbar/components/home/rankBox.vue';
+	import UserCard from '@/pages/tabbar/components/home/userCard.vue';
+	import CategoryCard from '@/pages/tabbar/components/home/categoryCard.vue';
+	import ClerkApi from '@/sheep/api/worker/clerk';
+	import RewardApi from '@/sheep/api/worker/reward';
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			NoticeBar, 
+			RankBox,
+			StickyBox,
+			UserCard,
+			CategoryCard,
+		},
+		props: {
+			scrollTop: {
+				type: Number,
+				default: 0,
+			},
+			stickyTop: {
+				type: Number,
+				default: uni.upx2px(80),
+			},
+		},
+		data() {
+			return {
+				actionStyle: {
+					backgroundColor: 'var(--ui-BG-Main)',
+					borderRadius: '40px',
+					padding: '7px',
+					color: '#fff',
+					fontSize: '28rpx',
+					width: '80px',
+				},
+				keyword: '',
+				categoryList: [],
+				newList: [],
+				hotList: [],
+				maleWeekTopList: [],
+				femaleWeekTopList: [],
+			}
+		},
+		created() {
+			this.getInitData();
+		},
+		methods: {
+			tabClick(e) {
+				this.$emit('tabClick', e);
+			},
+			getCategory(e) {
+				ClerkApi.getCategoryListByParentId(e.id).then(res => {
+					this.$emit('categoryClick', e);
+					if(res.data.length > 0){
+						sheep.$store('sys').setCategoryList(res.data);
+					}else{
+						sheep.$store('sys').setCategoryList(this.categoryList);
+					}
+				});
+			},
+			getInitData() {
+				ClerkApi.getHomeData().then(res => {
+					this.categoryList = res.data.categoryList;
+					this.newList = res.data.clerkNewList;
+					this.hotList = res.data.clerkHotList;
+					sheep.$store('sys').setCategoryList(this.categoryList);
+				});
+				
+				ClerkApi.getWeekTopList().then(res => {
+					this.maleWeekTopList = res.data.maleWeekTopList;
+					this.femaleWeekTopList = res.data.femaleWeekTopList;
+				});
+				
+			},
+			search() {
+				this.$emit('search', this.keyword);
+			},
+			blindOrder() {
+				sheep.$router.go('/pages/worker/blind/index');
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main-box {
+		
+		.search-box {
+			background-color: #fff;
+			border-radius: 40px;
+			padding: 3px;
+			margin: 15px;
+		}
+		
+		.notice-box {
+			margin: 15px;
+		}
+		
+	}
+	
+	.card-box {
+		padding: 0 15px;
+	}
+	
+	.category-box {
+		padding: 15px;
+		padding-bottom: 0;
+	}
+	
+	.blind-box {
+		padding: 0 15px;
+	}
+	
+	.blind-card {
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+		padding: 10px;
+		border-radius: 10px;
+		
+		.icon {
+			margin-right: 10px;
+		}
+		
+		.avatar-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			flex: 1;
+			
+			.btn {
+				color: #fff;
+				font-size: 24rpx;
+				border-radius: 40px;
+				padding: 5px 10px;
+				background-color: var(--ui-BG-Main);
+			}
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/userCard.vue b/pages/tabbar/components/home/userCard.vue
new file mode 100644
index 0000000..bd6d0ab
--- /dev/null
+++ b/pages/tabbar/components/home/userCard.vue
@@ -0,0 +1,153 @@
+<template>
+	<view class="user-card-box">
+		<view class="user-card">
+			<view class="title">
+				<view class="icon">
+					<u-icon name="tuijian" custom-prefix="iconfont" size="20" color="#aaa"></u-icon>
+				</view>
+				<text class="text">新人推荐</text>
+			</view>
+			<scroll-view class="scroll-box" scroll-x>
+				<view class="user-swiper">
+					<view @click="detail(item)" class="user-box" v-for="(item,i) in newList">
+						<view class="avatar-box">
+							<u-avatar mode="square" size="140" :src="item.avatar"></u-avatar>
+							<view v-if="item.onlineStatus" class="badge"></view>
+						</view>
+						<view class="nickname">{{item.nickname}}</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		
+		<view class="user-card">
+			<view class="title">
+				<view class="icon">
+					<u-icon name="huo" custom-prefix="iconfont" size="20" color="#aaa"></u-icon>
+				</view>
+				<text class="text">人气达人</text>
+			</view>
+			<scroll-view class="scroll-box" scroll-x>
+				<view class="user-swiper">
+					
+					<view @click="detail(item)" class="user-box" v-for="(item,i) in hotList">
+						<view class="avatar-box">
+							<u-avatar mode="square" size="140" :src="item.avatar"></u-avatar>
+							<view v-if="item.onlineStatus" class="badge"></view>
+						</view>
+						<view class="nickname">{{item.nickname}}</view>
+					</view>
+					
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			newList: {
+				type: Array,
+				default: [],
+			},
+			hotList: {
+				type: Array,
+				default: [],
+			},
+		}, 
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			detail(e) {
+				this.$u.route({
+					url: 'pages/clerk/detail/index',
+					params: {
+						id: e.id,
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.user-card-box {
+		background-color: #fff;
+		border-radius: 10px;
+	}
+	
+	.user-card {
+		padding: 10px 0;
+		
+		.title {
+			padding: 10px;
+			padding-top: 0;
+			font-size: 28rpx;
+			font-weight: bold;
+			display: flex;
+			align-items: center;
+			padding-bottom: 15px;
+			
+			.icon {
+				background-color: #ddd;
+				width: 36rpx;
+				height: 36rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 100%;
+			}
+			
+			.text {
+				margin-left: 4px;
+			}
+		}
+		
+		.user-swiper {
+			display: flex;
+				
+			.avatar-box {
+				margin-bottom: 5px;
+				position: relative;
+				
+				.badge {
+					width: 30rpx;
+					height: 30rpx;
+					background-color: var(--ui-BG-Main);
+					position: absolute;
+					right: 0;
+					bottom: 0;
+					border-radius: 100%;
+					border: 2px solid #fff;
+				}
+			}
+			
+			.user-box {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				margin-left: 10px;
+				
+				.nickname {
+					font-size: 28rpx;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					max-width: 140rpx;
+					text-align: center;
+					line-height: 28rpx;
+				}
+			}
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/userList.vue b/pages/tabbar/components/home/userList.vue
new file mode 100644
index 0000000..18019d6
--- /dev/null
+++ b/pages/tabbar/components/home/userList.vue
@@ -0,0 +1,379 @@
+<template>
+	  <view @click="detail(item)"  :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in virtualList" class="user-card">
+	  	 <view class="avatar-box">
+	  		<u-avatar mode="square" size="180" :src="item.avatar"></u-avatar>
+	  		<view class="voice-play" v-if="item.sound">
+	  			<voice-play :sec="item.soundTime" @tap.stop="playAudio(item)" :isPlay="item.id == playId"></voice-play>
+	  		</view>
+	  	 </view>
+	  	 <view class="right-box">
+	  		 <view class="top-box">
+	  			 <view class="nickname-box">
+	  				 <view class="nickname">{{item.nickname}}</view>
+	  				 <view class="sex-nv" v-if="item.sex == 1">
+	  					 <u-icon name="ziyuan2" size="22" custom-prefix="iconfont"></u-icon>
+	  					 <text>{{item.age}}</text>
+	  				 </view>
+					 <view class="sex-nan" v-if="item.sex == 0">
+						 <u-icon name="ziyuan3" size="22" custom-prefix="iconfont"></u-icon>
+						 <text>{{item.age}}</text>
+					 </view>
+	  			 </view>
+	  			<!-- <view class="map-box">
+	  				 <u-icon name="map" size="32" color="#aaa"></u-icon>
+					 <view class="city" v-if="item.city">
+						<text class="text">{{item.city}}</text>
+					 </view>
+					 <text v-else>未知</text>
+	  			 </view> -->
+	  		 </view>
+	  		 <view class="oline-box">
+				 <view v-if="item.clerkLevel">
+					 <view class="img-icon" v-if="item.clerkLevel.img">
+						 <img style="width: 100%;height: 100%;" :src="item.clerkLevel.img"></img>
+					 </view>
+					 <view class="icon" v-else>
+						 <u-icon name="wode_duanwei" size="36" custom-prefix="iconfont"></u-icon>
+						 <text>{{item.clerkLevel.name}}</text>
+					 </view>
+				 </view>
+	  			 <view class="badge-box">
+					 <view class="online" v-if="item.onlineStatus">
+						 <tui-badge :scaleRatio="0.8" type="green" dot></tui-badge>
+						 <text class="text">在线</text>
+					 </view>
+					 <view class="online" v-else>
+						 <tui-badge :scaleRatio="0.8" type="gray" dot></tui-badge>
+						 <text class="text">离线</text>
+					 </view>
+	  			 </view>
+	  		 </view>
+	  		 <view class="tag-list">
+	  			 <view class="tag-box">
+	  				 <span class="tag" v-for="(categoryName,index) in item.categoryNameList">{{categoryName}}</span>
+	  			 </view>
+	  		 </view>
+	  		 <view class="note-box">
+	  			 <u-icon name="tingkebiji" custom-prefix="iconfont" size="36" color="#3cc9a4"></u-icon>
+	  			 <view class="text">{{item.intro}}</view>
+	  		 </view>
+	  	 </view>
+	  </view>
+	  
+	  <view class="menu-btn">
+		  
+	  	<!-- <view class="icon" @click="toApply">
+	  		<image class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/9966c9c45969e2b33987642950d9061c0471c1fa352f9a60825a4e88595090b8.png"></image>
+	  	</view>
+	  	
+	  	<view class="icon" @click="fenxiao">
+	  		<image class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/8225510a565cf510a4ee26c6997aa2d967de4bc35f05e12558dae9e42ce8581a.png"></image>
+	  	</view> -->
+		
+		<!-- <view class="icon" @click="xiadan">
+			<image class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/c50c079a74fcf57d5fbadc3b3354316eab6ce6de7ac382d5e0bb587bbffabbcf.png"></image>
+		</view>
+		
+		<view class="icon" @click="toKaidian">
+			<image class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/4f453e94e7bccc7a0361e4baa004beafdec4f287db010d044d860863f969f3bb.png"></image>
+		</view> -->
+		
+	  </view>
+  
+</template>
+
+<script>
+	import VoicePlay from '@/pages/tabbar/components/home/voicePlay.vue';
+	import TuiBadge from "@/components/thorui/tui-badge/tui-badge.vue";
+	import sheep from '@/sheep';
+	const audio = uni.createInnerAudioContext();
+	export default {
+		components: {
+			VoicePlay,
+			TuiBadge,
+		},
+		props: {
+			item: {
+				type: Object,
+				default: {},
+			},
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				playId: null,
+			}
+		},
+		methods: {
+			playAudio(e) {
+				if(this.playId == e.id){
+					this.playId = null;
+					audio.stop();
+					return;
+				}
+				this.playId = e.id;
+				//语音自然播放结束
+				audio.onEnded((res) => {
+					this.playId = null;
+				});
+				audio.src = e.sound;
+				audio.play();
+			},
+			detail(e) {
+				this.$u.route({
+					url: 'pages/clerk/detail/index',
+					params: {
+						id: e.id,
+					}
+				});
+			},
+			toApply() {
+				uni.showModal({
+				  title: '达人申请',
+				  content: '请确认是否成年，未成年禁止申请，申请后会有客服添加进行微信实名认证！',
+				  success: function (res) {
+				    if (res.confirm) {
+				      sheep.$router.go('/pages/clerk/apply/index');
+				    }
+				  },
+				});
+			},
+			toKaidian() {
+				uni.showModal({
+				  title: '搭建同款',
+				  content: '搭建同款请联系客服微信：rbtnet',
+				  success: function (res) {
+				    
+				  },
+				});
+			},
+			xiadan() {
+				sheep.$router.go('/pages/worker/blind/index');
+			},
+			fenxiao() {
+				uni.showModal({
+				  title: '分销申请',
+				  content: '点击邀请海报，生成海报，生成邀请码，邀请一人下单，可得下单20%佣金！',
+				  success: function (res) {
+				    if (res.confirm) {
+				      sheep.$router.go('/pages/commission/index');
+				    }
+				  },
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.user-card {
+		padding: 15px;
+		margin-bottom: 15px;
+		background-color: #fff;
+		border-radius: 10px;
+		display: flex;
+		flex: 1;
+	}
+	
+	.user-card:last-child {
+		margin-bottom: 0;
+	}
+	
+	.avatar-box {
+		position: relative;
+		display: flex;
+		justify-content: center;
+		
+		.voice-play {
+			position: absolute;
+			bottom: 0;
+		}
+	}
+	
+	.right-box {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		margin-left: 10px;
+		min-width: 0;
+		
+		.top-box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 5px;
+			
+			.nickname-box {
+				display: flex;
+				align-items: center;
+				
+				.nickname {
+					font-size: 28rpx;
+					font-weight: bolder;
+					margin-right: 4px;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					overflow: hidden;
+					max-width: 200rpx;
+				}
+				
+				.sex-nv {
+					background-color: #d5656f;
+					border-radius: 40px;
+					color: #fff;
+					font-size: 22rpx;
+					padding: 1px 5px;
+				}
+				
+				.sex-nan {
+					background-color: #0081ff;
+					border-radius: 40px;
+					color: #fff;
+					font-size: 22rpx;
+					padding: 1px 5px;
+				}
+			}
+			
+			.map-box {
+				display: flex;
+				align-items: center;
+				font-size: 22rpx;
+				color: #aaa;
+				
+				.city {
+					display: flex;
+					
+					.text {
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						overflow: hidden;
+						max-width: 88rpx;
+					}
+				}
+			}
+		}
+		
+		.oline-box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 5px;
+			
+			.img-icon {
+				width: 40rpx;
+				height: 50rpx;
+			}
+			
+			.icon {
+				background-color: #ff5ebd;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				font-weight: bold;
+				color: #fff;
+				font-size: 22rpx;
+				line-height: 22rpx;
+				padding: 5px 5px;
+			}
+			
+			.badge-box {
+				display: flex;
+				align-items: center;
+				font-size: 26rpx;
+				color: #aaa;
+				
+				.online {
+					display: flex;
+					align-items: center;
+				}
+				
+				.text {
+					margin-left: 3px;
+				}
+			}
+		}
+		
+		.tag-list {
+			display: flex;
+		}
+		
+		.tag-box {
+			display: inline-block;
+			align-items: center;
+			margin-bottom: 5px;
+			background-color: #eef2f2;
+			border-radius: 3px;
+			color: #aaa;
+			font-size: 24rpx;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+			max-width: 100%;
+			padding: 5px 0;
+			
+			.tag {
+				white-space: nowrap;
+				padding: 5px 5px;
+				position: relative;
+			}
+			
+			.tag:after {
+				content: ' ';
+				border-left: 1px solid #aaa;
+				display: inline-block;
+				height: 10px;
+				position: absolute;
+				top: 50%;
+				transform: translateY(-50%);
+				right: 0;
+			}
+			
+			.tag:last-child:after{
+				display: none;
+			}
+		}
+		
+		.note-box {
+			display: flex;
+			align-items: center;
+			color: #aaa;
+			font-size: 24rpx;
+			
+			.text {
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+				max-width: 100%;
+			}
+		}
+	}
+	
+	
+	.menu-btn {
+		position: fixed;
+		bottom: 220rpx;
+		right: 25rpx;
+		
+		.icon {
+			background-color: #ffff;
+			width: 90rpx;
+			height: 90rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 100%;
+			box-shadow: 0 0 10px #cccccc;
+			margin-top: 70rpx;
+		}
+			
+		.img {
+			height: 80rpx;
+			width: 80rpx;
+			border-radius: 100%;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/home/voicePlay.vue b/pages/tabbar/components/home/voicePlay.vue
new file mode 100644
index 0000000..fb95eec
--- /dev/null
+++ b/pages/tabbar/components/home/voicePlay.vue
@@ -0,0 +1,184 @@
+<template>
+	<view class="voice-btn" @click="playBtn" :class="play?'audioplaying':''">
+		<img class="play-btn" src="@/static/images/audio.png"></img>
+		<view class="audio-box">
+			<view class="audio1 wave1"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio3 wave3"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio1 wave1"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio3 wave3"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio1 wave1"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio3 wave3"></view>
+			<view class="audio2 wave2"></view>
+		</view>
+		<view>{{sec}}"</view>
+	</view>
+</template>
+<script>
+export default {
+	emits: ['playAudio'],
+	props: {
+		isPlay: {
+			type: [Boolean],
+			default: false 
+		},
+		sec: {
+			type: Number,
+			default: 0
+		},
+	},
+	data() {
+		return {
+			play: false,
+		};
+	},
+	watch: {
+		isPlay: {
+			handler(newVal) {
+				this.play = newVal;
+			},
+			immediate: true
+		},
+	},
+	methods: {
+		playBtn() {
+			/* if(this.play){
+				this.play = false;
+			}else{
+				this.play = true;
+			} */
+			this.$emit('playAudio');
+		},
+	}
+};
+</script>
+<style lang="scss" scoped>
+view{
+	box-sizing: border-box;
+}
+.voice-btn {
+	background-color: #3cc9a4;
+	width: 140rpx;
+	border-radius: 20px;
+	padding: 8rpx 10rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	color: #fff;
+	font-size: 20rpx;
+}
+
+.play-btn {
+	width: 20rpx;
+	height: 20rpx;
+}
+
+.audio-box {
+	height: 20rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.audio1{
+    margin-right: 2rpx;
+	width: 1px;
+	height: 33.3%;
+	border-radius: 50px;
+	background-color: #fff;
+}
+
+.audio2{
+	margin-right: 2rpx;
+	width: 1px;
+	height: 66.6%;
+	border-radius: 50px;
+	background-color: #fff;
+}
+
+.audio3{
+	margin-right: 2rpx;
+	width: 1px;
+	height: 100%;
+	border-radius: 50px;
+	background-color: #fff;
+}
+
+.audioplaying .wave1 {
+	animation: wave1 1s linear 0s infinite;
+}
+
+.audioplaying .wave2 {
+	animation: wave2 1s linear 0s infinite;
+}
+
+.audioplaying .wave3 {
+	animation: wave3 1s linear 0s infinite;
+}
+
+@keyframes wave1{
+  0% {
+      width: 1px;
+      height: 33%;
+  }
+  25% {
+      width: 1px;
+      height: 66%;
+  }
+  50% {
+      width: 1px;
+      height: 100%;
+  }
+  75% {
+      width: 1px;
+      height: 66%;
+  }
+  100% {
+      width: 1px;
+      height: 33%;
+  }
+}
+
+@keyframes wave2{
+  0% {
+      width: 1px;
+      height: 66%;
+  }
+  25% {
+      width: 1px;
+      height: 33%;
+  }
+  50% {
+      width: 1px;
+      height: 66%;
+  }
+  75% {
+      width: 1px;
+      height: 100%;
+  }
+  100% {
+      width: 1px;
+      height: 66%;
+  }
+}
+
+@keyframes wave3{
+  0% {
+      width: 1px;
+      height: 100%;
+  }
+  50% {
+      width: 1px;
+      height: 33%;
+  }
+  100% {
+      width: 1px;
+      height: 100%;
+  }
+}
+
+</style>
diff --git a/pages/tabbar/components/member/layout.vue b/pages/tabbar/components/member/layout.vue
new file mode 100644
index 0000000..d3bcce3
--- /dev/null
+++ b/pages/tabbar/components/member/layout.vue
@@ -0,0 +1,233 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" use-virtual-list :force-close-inner-list="true" :paging-style="{ paddingTop: paddingTop + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<nav-bar :title="title" @initNav="initNav">
+					<template v-if="$slots.navLeft" #left>
+						<slot name="navLeft"></slot>
+					</template>
+					
+					<template v-if="$slots.navContent" #content>
+						<slot name="navContent"></slot>
+					</template>
+				</nav-bar>
+			</template>
+			
+			<view>
+				<slot name="top"></slot>
+			</view>
+			
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<view class="item" :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in virtualList">
+				<view-item :index="index" :item="item" @onLongPress="onLongPress"></view-item>
+			</view> 
+		</z-paging>
+		
+		<view class="shade" v-show="showShade" @tap="hidePop">
+			<view class="pop" :style="popStyle" :class="{'show':showPop}">
+				<view v-for="(item,index) in popButton" :key="index" @tap="pickerMenu" :data-index="index">{{item}}</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/pages/tabbar/components/member/navBar.vue';
+	import ViewItem from '@/pages/tabbar/components/member/viewItem.vue';
+	import UserApi from '@/sheep/api/member/user';
+	export default {
+		components: {
+			NavBar, 
+			ViewItem,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			}
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				winSize: {},
+				/* 显示遮罩 */
+				showShade: false,
+				/* 显示操作弹窗 */
+				showPop: false,
+				/* 弹窗按钮列表 */
+				popButton: ["标为关注", "置顶聊天", "删除该聊天"],
+				/* 弹窗定位样式 */
+				popStyle: "",
+				/* 选择的用户下标 */
+				pickerUserIndex: -1,
+				paddingTop: 0,
+				paddingBottom: 100,
+				navSwiper: false,
+				navSwiperH: 80,
+				navNotice: false,
+				navNoticeH: 90,
+				height: 0,
+			}
+		},
+		methods: {
+			initNav(e) {
+				this.height = e.height;
+				this.paddingTop = this.height;
+				
+				if(this.navSwiper){
+					this.paddingTop = this.paddingTop + this.navSwiperH;
+				}
+				
+				if(this.navNotice){
+					this.paddingTop = this.paddingTop + this.navNoticeH;
+				}
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					random: this.tabIndex === 1
+				}
+				UserApi.getUserPage(params).then(res => {
+					// 将请求的结果数组传递给z-paging
+					this.$refs.paging.complete(res.data.list);
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			/* 获取窗口尺寸 */
+			getWindowSize() {
+				uni.getSystemInfo({
+					success: (res) => {
+						this.winSize = {
+							"witdh": res.windowWidth,
+							"height": res.windowHeight
+						}
+					}
+				})
+			},
+			/* 长按监听 */
+			onLongPress(e) {
+				let [touches, style, index] = [e.touches[0], "", e.currentTarget.dataset.index];
+				
+				/* 因 非H5端不兼容 style 属性绑定 Object ，所以拼接字符 */
+				if (touches.clientY > (this.winSize.height / 2)) {
+					style = `bottom:${this.winSize.height-touches.clientY}px;`;
+				} else {
+					style = `top:${touches.clientY}px;`;
+				}
+				if (touches.clientX > (this.winSize.witdh / 2)) {
+					style += `right:${this.winSize.witdh-touches.clientX}px`;
+				} else {
+					style += `left:${touches.clientX}px`;
+				}
+			
+				this.popStyle = style;
+				this.pickerUserIndex = Number(index);
+				this.showShade = true;
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.showPop = true;
+					}, 10);
+				});
+			},
+			/* 隐藏弹窗 */
+			hidePop() {
+				this.showPop = false;
+				this.pickerUserIndex = -1;
+				setTimeout(() => {
+					this.showShade = false;
+				}, 250);
+			},
+			/* 选择菜单 */
+			pickerMenu(e) {
+				let index = Number(e.currentTarget.dataset.index);
+				console.log(`第${this.pickerUserIndex+1}个用户,第${index+1}个按钮`);
+				// 在这里开启你的代码秀
+			
+				uni.showToast({
+					title: `第${this.pickerUserIndex+1}个用户,第${index+1}个按钮`,
+					icon: "none",
+					mask: true,
+					duration: 600
+				});
+			
+				/* 
+				 因为隐藏弹窗方法中会将当前选择的用户下标还原为-1,
+				 如果行的菜单方法存在异步情况，请在隐藏之前将该值保存，或通过参数传入异步函数中
+				 */
+				this.hidePop();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item {
+		background-color: #fff;
+	}
+	
+	/* 遮罩 */
+	.shade {
+		position: fixed;
+		z-index: 100;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		-webkit-touch-callout: none;
+	
+		.pop {
+			position: fixed;
+			z-index: 101;
+			width: 260rpx;
+			box-sizing: border-box;
+			font-size: 28upx;
+			text-align: left;
+			color: #333;
+			background-color: #fff;
+			box-shadow: 0 0 5px rgba(0, 0, 0, 0.5);
+			line-height: 80upx;
+			transition: transform 0.15s ease-in-out 0s;
+			user-select: none;
+			-webkit-touch-callout: none;
+			transform: scale(0, 0);
+	
+			&.show {
+				transform: scale(1, 1);
+			}
+	
+			&>view {
+				padding: 0 20upx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				user-select: none;
+				-webkit-touch-callout: none;
+	
+				&:active {
+					background-color: #f3f3f3;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/tabbar/components/member/navBar.vue b/pages/tabbar/components/member/navBar.vue
new file mode 100644
index 0000000..dafb8da
--- /dev/null
+++ b/pages/tabbar/components/member/navBar.vue
@@ -0,0 +1,94 @@
+<template>
+  <view>
+	 <tui-navigation-bar :isOpacity="false" @init="initNavigation" @change="opacityChange" :scrollTop="scrollTop" backgroundColor="#fff" color="#333">
+	 	<view>
+			<view class="nav-box">
+				<view class="action">
+					<slot v-if="$slots.left" name="left"></slot>
+				</view>
+				
+				<slot v-if="$slots.content" name="content"></slot>
+				<view class="title" v-else>
+					<text class="nickname">{{title}}</text>
+				</view>
+			</view>
+			<view>
+				<slot name="card-swiper"></slot>
+			</view>
+			<view>
+				<slot name="card-notice"></slot>
+			</view>
+		</view>
+	 </tui-navigation-bar>
+  </view>
+</template>
+
+<script>
+	import tuiNavigationBar from "@/components/thorui/tui-navigation-bar/tui-navigation-bar.vue";
+	export default {
+		components: {
+			tuiNavigationBar,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			},
+		},
+		data() {
+			return {
+				top: 0, //标题图标距离顶部距离
+				opacity: 1,
+				height: 0,
+				scrollTop: 0.5,
+			}
+		},
+		methods: {
+			initNavigation(e) {
+				this.height = e.height;
+				this.opacity = e.opacity;
+				this.top = e.top;
+				this.$emit('initNav', e);
+			},
+			opacityChange(e) {
+				this.opacity = e.opacity;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.nav-box {
+		height: 44px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #fff;
+		flex-direction: column;
+		font-size: 22rpx;
+		position: relative;
+		
+		.title {
+			justify-content: center;
+			align-items: center;
+			text-align: center;
+			display: flex;
+			width: 100%;
+			font-size: 32rpx;
+		}
+		
+		
+		.action {
+			position: absolute;
+			left: 0;
+			top: 0;
+			bottom: 0;
+			display: flex;
+			padding: 0 5px;
+			align-items: center;
+			width: 50px;
+		}
+	}
+	
+
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/member/viewItem.vue b/pages/tabbar/components/member/viewItem.vue
new file mode 100644
index 0000000..87c81f5
--- /dev/null
+++ b/pages/tabbar/components/member/viewItem.vue
@@ -0,0 +1,216 @@
+<template>
+  <view>
+	   <!-- 用户消息 --> 
+	  <view class="msg-list" @click="toChat(item)" :data-index="index">
+	  	<view class="msg-user">
+	  		<view class="avatar">
+	  			<image class="img" :src="item.avatar"></image>
+	  			<view class="badge"></view>
+	  		</view>
+	  		<view class="content">
+	  			<view class="text-black">
+	  				<view class="text-nickname">
+	  					<view class="nickname">{{item.nickname}}</view>
+	  					<view class="sex-badge" v-if="item.sex == 1">
+	  						<u-icon name="ziyuan2" custom-prefix="iconfont"></u-icon>
+	  					</view>
+						<view class="sex-man" v-if="item.sex == 0">
+							<u-icon name="ziyuan3" custom-prefix="iconfont"></u-icon>
+						</view>
+	  					<image class="vip-img" src="@/static/images/vip.png"></image>
+	  				</view>
+	  				<text class="time">19:39</text>
+	  			</view>
+	  			<view class="text-gray">
+	  				<view class="text-msg">
+	  					<view>[已读]</view>
+	  					<view>希望打个赏哦</view>
+	  				</view>
+					<view v-if="item.slashed == 1">
+						<u-icon name="bell-slash" custom-prefix="iconfont"></u-icon>
+					</view>
+					<view v-else>
+						<view v-if="item.unreadMessageCount > 0">
+							<tui-badge :scaleRatio="0.8" type="green" dot></tui-badge>
+						</view>
+					</view>
+	  			</view>
+	  		</view>
+	  	</view>
+	  </view>
+	  
+  </view>
+</template>
+
+<script>
+	import tuiBadge from "@/components/thorui/tui-badge/tui-badge.vue";
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	export default {
+		components: {
+			tuiBadge,
+		},
+		props: {
+			index: {
+				type: Number,
+				default: -1,
+			},
+			item: {
+				type: Object,
+				default: function() {
+					return {
+						dd: '',
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			toChat(e) {
+				ImConversationApi.createMemberConversation({
+					userId: e.id,
+					groupType: 1,
+					lastMessageContentType: 1,
+				}).then(res => {
+					this.$u.route({
+						url: 'pages/im/index',
+						params: {
+							groupId: res.data,
+							receiveUserId: e.id,
+						}
+					});
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.msg-list {
+		display: flex;
+		padding: 15px;
+		
+		.msg-user{
+			display: flex;
+			align-items: center;
+			flex: 1;
+				
+			.avatar {
+				width: 88rpx;
+				height: 88rpx;
+				position: relative;
+				
+				.img {
+					width: 100%;
+					height: 100%;
+					border-radius: 100%;
+				}
+				
+				.badge {
+					width: 20rpx;
+					height: 20rpx;
+					top: 0;
+					right: 0;
+					border: 1px solid #fff;
+					position: absolute;
+					background-color: #dd514c;
+					border-radius: 85px;
+				}
+			}
+			
+			.content {
+				display: flex;
+				flex: 1;
+				flex-direction: column;
+				margin-left: 10px;
+				
+				.new {
+					width: 14rpx;
+					height: 14rpx;
+					background-color: #dd514c;
+					border-radius: 85px;
+				}
+				
+				.text-black {
+					font-size: 28rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					color: #333333;
+					margin-bottom: 8rpx;
+					
+					.tag {
+						margin-right: 5px;
+					}
+					
+					.time {
+						color: #aaaaaa;
+						font-size: 24rpx;
+					}
+					
+					.text-nickname {
+						display: flex;
+						align-items: center;
+					}
+				}
+				
+				.text-gray {
+					font-size: 24rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					color: #aaaaaa;
+					
+					.text-msg {
+						display: flex;
+						align-items: center;
+					}
+				}
+			}
+			
+		} 
+	}
+	
+	.green {
+		color: #735fed;
+	}
+	
+	.sex-badge {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #e03997;
+		color: #ffffff;
+		border-radius: 3px;
+		font-size: 8px;
+		height: 30rpx;
+		width: 30rpx;
+		margin: 0 10rpx;
+	}
+	
+	.sex-man {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #0081ff;
+		color: #ffffff;
+		border-radius: 3px;
+		font-size: 8px;
+		height: 30rpx;
+		width: 30rpx;
+		margin: 0 10rpx;
+	}
+	
+	.vip-img {
+		width: 34rpx;
+		height: 34rpx;
+	}
+	
+	.svip-img {
+		width: 60rpx;
+		height: 30rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/message/friend.vue b/pages/tabbar/components/message/friend.vue
new file mode 100644
index 0000000..1337205
--- /dev/null
+++ b/pages/tabbar/components/message/friend.vue
@@ -0,0 +1,208 @@
+<template>
+	<view>
+		<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+		<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+		<view class="item" :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in orderList">
+			<view-item :index="index" :item="item" @onLongPress="onLongPress"></view-item>
+		</view> 
+		
+		<view class="shade" v-show="showShade" @tap="hidePop">
+			<view class="pop" :style="popStyle" :class="{'show':showPop}">
+				<view v-for="(item,index) in popButton" :key="index" @tap="pickerMenu" :data-index="index">{{item}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import ViewItem from '@/pages/tabbar/components/message/viewItem.vue';
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	import dayjs from 'dayjs';
+	import relativeTime from "dayjs/plugin/relativeTime";
+	dayjs.extend(relativeTime);
+	export default {
+		components: {  
+			ViewItem,
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				winSize: {},
+				/* 显示遮罩 */
+				showShade: false,
+				/* 显示操作弹窗 */
+				showPop: false,
+				/* 弹窗按钮列表 */
+				popButton: [],
+				/* 弹窗定位样式 */
+				popStyle: "",
+				/* 选择的用户下标 */
+				pickerUserIndex: -1,
+				paddingTop: 0,
+				paddingBottom: 100,
+			}
+		}, 
+		computed: {
+			orderList() {
+				this.virtualList.forEach((order) => order.time = this.showDayTime(order.lastMessageTime));
+				return this.virtualList;
+			},
+		},
+		created() {
+			this.getWindowSize();
+			this.$emit('reload');
+		},
+		methods: {
+			/* 获取窗口尺寸 */
+			getWindowSize() {
+				uni.getSystemInfo({
+					success: (res) => {
+						this.winSize = {
+							"witdh": res.windowWidth,
+							"height": res.windowHeight
+						}
+					}
+				})
+			},
+			/* 长按监听 */
+			onLongPress(e) {
+				let [touches, style, index] = [e.touches[0], "", e.currentTarget.dataset.index];
+				
+				/* 因 非H5端不兼容 style 属性绑定 Object ，所以拼接字符 */
+				if (touches.clientY > (this.winSize.height / 2)) {
+					style = `bottom:${this.winSize.height-touches.clientY}px;`;
+				} else {
+					style = `top:${touches.clientY}px;`;
+				}
+				if (touches.clientX > (this.winSize.witdh / 2)) {
+					style += `right:${this.winSize.witdh-touches.clientX}px`;
+				} else {
+					style += `left:${touches.clientX}px`;
+				}
+				
+				this.popStyle = style;
+				this.pickerUserIndex = Number(index);
+				var conversation = this.orderList[this.pickerUserIndex];
+				if(conversation.pinned == '0'){
+					this.popButton = ["置顶聊天", "删除该聊天", "拉黑该用户"];
+				}else{
+					this.popButton = ["取消置顶", "删除该聊天", "拉黑该用户"];
+				}
+				this.showShade = true;
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.showPop = true;
+					}, 10);
+				});
+			},
+			pinned(id, pinned) {
+				var form = {
+					pinned: pinned,
+					id: id,
+				};
+				ImConversationApi.pinnedMemberConversation(form).then(res => {
+					this.$emit('reload');
+					this.$refs.paging.reload();
+				});
+			},
+			delete(id) {
+				ImConversationApi.deleteMemberConversation(id).then(res => {
+					this.$emit('reload');
+				});
+			},
+			slashed(id) {
+				ImConversationApi.slashedMemberConversation(id).then(res => {
+					this.$emit('reload');
+				});
+			},
+			/* 隐藏弹窗 */
+			hidePop() {
+				this.showPop = false;
+				this.pickerUserIndex = -1;
+				setTimeout(() => {
+					this.showShade = false;
+				}, 250);
+			},
+			/* 选择菜单 */
+			pickerMenu(e) {
+				let index = Number(e.currentTarget.dataset.index);
+				console.log(`第${this.pickerUserIndex+1}个用户,第${index+1}个按钮`);
+				var conversation = this.orderList[this.pickerUserIndex];
+				
+				if(index == 0){
+					if(conversation.pinned == '0'){
+						this.pinned(conversation.id, '1');
+					}else{
+						this.pinned(conversation.id, '0');
+					}
+				}else if(index == 1){
+					this.delete(conversation.id);
+				}else if(index == 2){
+					this.slashed(conversation.id);
+				}
+			
+				this.hidePop();
+			},
+			showDayTime(datetime) {
+			  if (!datetime) return "";
+			  return dayjs(datetime).fromNow();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item {
+		background-color: #fff;
+	}
+	
+	/* 遮罩 */
+	.shade {
+		position: fixed;
+		z-index: 100;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		-webkit-touch-callout: none;
+	
+		.pop {
+			position: fixed;
+			z-index: 101;
+			width: 260rpx;
+			box-sizing: border-box;
+			font-size: 28upx;
+			text-align: left;
+			color: #333;
+			background-color: #fff;
+			box-shadow: 0 0 5px rgba(0, 0, 0, 0.5);
+			line-height: 80upx;
+			transition: transform 0.15s ease-in-out 0s;
+			user-select: none;
+			-webkit-touch-callout: none;
+			transform: scale(0, 0);
+	
+			&.show {
+				transform: scale(1, 1);
+			}
+	
+			&>view {
+				padding: 0 20upx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				user-select: none;
+				-webkit-touch-callout: none;
+	
+				&:active {
+					background-color: #f3f3f3;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/message/gameBox.vue b/pages/tabbar/components/message/gameBox.vue
new file mode 100644
index 0000000..a9e02d1
--- /dev/null
+++ b/pages/tabbar/components/message/gameBox.vue
@@ -0,0 +1,149 @@
+<template>
+	<view>
+		<view class="option-box">
+			<view class="tag-box">
+				<u-icon name="tags" color="#88e6b4" size="34"></u-icon>
+				<view class="name">服务类型</view>
+			</view>
+			<view class="span-box">
+				<view @click="changeGame(option)" class="span" :class="catId == option.id ? 'active': '' " v-for="(option,t) in optionList">{{option.name}}</view>
+			</view>
+		</view>
+		
+		<view class="option-box" v-if="categoryList.length > 0">
+			<view class="tag-box">
+				<u-icon name="tags" color="#88e6b4" size="34"></u-icon>
+				<view class="name">选项</view>
+			</view>
+			<view class="span-box">
+				<view @click="changeCategory(option)" class="span" :class="gameId == option.id ? 'active': '' " v-for="(option,t) in categoryList">{{option.name}}</view>
+			</view>
+		</view>
+		
+		<view class="option-box" v-if="goodsList.length > 0">
+			<view class="tag-box">
+				<u-icon name="tags" color="#88e6b4" size="34"></u-icon>
+				<view class="name">选项</view>
+			</view>
+			<view class="span-box">
+				<view @click="changeGoods(option)" class="span" :class="goodsId == option.id ? 'active': '' " v-for="(option,t) in goodsList">{{option.name}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			optionList: {
+				type: Array,
+				default: [],
+			},
+			modelValue: {
+			  type: Object,
+			  default: {}
+			},
+		},
+		data() {
+			return {
+				catId: -1,
+				gameId: -1,
+				goodsId: -1,
+				categoryList: [],
+				goodsList: [],
+				goodsList: [],
+			}
+		},
+		methods: {
+			changeGame(e) {
+				this.gameId = -1;
+				this.goodsId = -1;
+				
+				this.catId = e.id;
+				if(e.categoryList){
+					this.goodsList = [];
+					this.categoryList = e.categoryList;
+				}else{
+					this.categoryList = [];
+					this.goodsList = e.goodsList;
+				}
+				
+				var node = {
+					catId: this.catId,
+					gameId: this.gameId,
+					goodsId: this.goodsId,
+					price: 0,
+				}
+				this.$emit('update:modelValue', node); 
+			},
+			changeCategory(e) {
+				this.goodsId = -1;
+				this.gameId = e.id;
+				this.goodsList = e.goodsList;
+				
+				var node = {
+					catId: this.catId,
+					gameId: this.gameId,
+					goodsId: this.goodsId,
+					price: 0,
+				}
+				this.$emit('update:modelValue', node); 
+			},
+			changeGoods(e) {
+				this.goodsId = e.id;
+				var node = {
+					catId: this.catId,
+					gameId: this.gameId,
+					goodsId: this.goodsId,
+					price: e.price,
+				}
+				this.$emit('update:modelValue', node); 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.option-box {
+		margin-bottom: 10px;
+		
+		.tag-box {
+			display: flex;
+			align-items: center;
+			margin-bottom: 12px;
+			
+			.name {
+				font-size: 28rpx;
+				font-weight: 700;
+				color: #1a1a1a;
+				padding-left: 3px;
+			}
+		}
+		
+		.span-box {
+			display: flex;
+			flex-wrap: wrap;
+			
+			.span {
+				padding: 10rpx 30rpx;
+				font-size: 28rpx;
+				background-color: #f5f5f5;
+				min-width: 120rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				margin-right: 7px;
+				margin-bottom: 8px;
+			}
+			
+			.active {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/message/navBar.vue b/pages/tabbar/components/message/navBar.vue
new file mode 100644
index 0000000..85e02b3
--- /dev/null
+++ b/pages/tabbar/components/message/navBar.vue
@@ -0,0 +1,106 @@
+<template>
+  <view>
+	 <tui-navigation-bar :isOpacity="false" @init="initNavigation" @change="opacityChange" :scrollTop="scrollTop">
+		<view class="tab-box">
+			<view class="zhong">
+				<view class="tab-box">
+					<block v-for="(item,i) in tabList" :key="i">
+						<view v-if="item.enabled" class="title-label" @click="tabsChange" :data-i="i" >
+							<text
+								:style="{fontWeight:current==i?'bold':'',fontSize:current==i?'36rpx':'28rpx'}">
+								{{item.name}}
+							</text> 
+						</view> 
+					</block>
+				</view>
+			</view>
+		</view>
+	 </tui-navigation-bar>
+  </view>
+</template>
+
+<script>
+	import tuiNavigationBar from "@/components/thorui/tui-navigation-bar/tui-navigation-bar.vue";
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			tuiNavigationBar,
+		},
+		props: {
+			tabList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				top: 0, //标题图标距离顶部距离
+				opacity: 1,
+				height: 0,
+				scrollTop: 0.5,
+			}
+		},
+		computed: {
+			current: {
+				get() { 
+				  return sheep.$store('sys').messageTabIndex;
+				},
+			},
+		},
+		methods: {
+			initNavigation(e) {
+				this.height = e.height;
+				this.opacity = e.opacity;
+				this.top = e.top;
+				this.$emit('initNav', e);
+			},
+			opacityChange(e) {
+				this.opacity = e.opacity;
+			},
+			tabsChange(e) {
+				var current = e.currentTarget.dataset.i; 
+				sheep.$store('sys').setMessageTabIndex(current);
+				this.$emit('change', current);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.zhong {
+		//width: 230rpx;
+	}
+	
+	.tab-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.avatar-box {
+		display: flex;
+		align-items: center;
+		position: absolute;
+		left: 40rpx;
+		
+		.icon {
+			position: absolute;
+			right: 0;
+			bottom: 0;
+		}
+	}
+	
+	.tab-box .title-label {
+		height: 44px;
+		padding: 0 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		//font-size: 34rpx;
+	}
+	
+	.tab-box .title-label text {
+		transition: all 0.3s;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/message/peiwan.vue b/pages/tabbar/components/message/peiwan.vue
new file mode 100644
index 0000000..0f6c54c
--- /dev/null
+++ b/pages/tabbar/components/message/peiwan.vue
@@ -0,0 +1,346 @@
+<template>
+	<view class="page-box">
+		<view class="game-card">
+			<view class="title">
+				<u-icon name="tags" color="#f5736a" size="34"></u-icon>
+				<view class="name">店员性别</view>
+			</view>
+			
+			<view class="sex-option">
+				<view class="sex-tab" @click="sexChange(1)">
+					<view class="img-span">
+						<img v-if="form.sex == 1" class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/16d050d0b229f12a8997a8118ca815c936bdb9b580db48ab8b2737181ca8518a.png"></img>
+						<img v-else class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/15c4eb12397fb3374be6e8bf38854b708abb09f61fb076eaa0c23d5f92cc9583.png"></img>
+						<view class="sex-ok" v-if="form.sex == 1">
+							<u-icon name="checkmark-circle-fill" color="#fe8497" size="34"></u-icon>
+						</view>
+					</view>
+					<view class="name">小姐姐</view>
+				</view>
+				
+				<view class="sex-tab" @click="sexChange(0)">
+					<view class="img-span">
+						<img v-if="form.sex == 0" class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/74e49dd19affb2c8016df4805d3947bab3a93af83236e4f875b5ea18bf57d8b3.png"></img>
+						<img v-else class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/d0757757a5b4c0559f1bc1d373ab983902bd056bda7ca4be6c2fa04553b4665d.png"></img>
+						<view class="sex-ok" v-if="form.sex == 0">
+							<u-icon name="checkmark-circle-fill" color="#6497f8" size="34"></u-icon>
+						</view>
+					</view>
+					<view class="name">小哥哥</view>
+				</view>
+				
+			</view>
+			
+			<view class="title">
+				<u-icon name="tags" color="#e475e5" size="34"></u-icon>
+				<view class="name">店员等级</view>
+			</view>
+			
+			<view class="level-option">
+				<view @click="levelChange(option)" class="tab" :class="option.id == form.workerClerkLevelId ? 'active' : ''" v-for="(option,t) in levelList">{{option.name}}</view>
+			</view>
+			
+			<game-box v-model="game" :optionList="goodsList"></game-box>
+			
+			<view class="input-box">
+				<view class="title">
+					<u-icon name="tags" color="#e475e5" size="34"></u-icon>
+					<view class="name">购买数量</view>
+				</view>
+				<view class="step-span">
+					<tui-numberbox iconBgColor="var(--ui-BG-Main)" iconColor="#fff" backgroundColor="#fff" :min="1" :value="form.num" @change="change"></tui-numberbox>
+				</view>
+			</view>
+			
+			<view class="input-box">
+				<view class="title">
+					<u-icon name="tags" color="#e475e5" size="34"></u-icon>
+					<view class="name">排除下单过的店员</view>
+				</view>
+				<view class="step-span">
+					<u-switch active-color="var(--ui-BG-Main)" size="40" v-model="form.blind"></u-switch>
+				</view>
+			</view>
+			
+		</view>
+		
+		
+		<view class="bottom-box">
+			<view class="price-box">
+				<text>总价：</text>
+				<text class="price">{{ fen2yuan(game.price*form.num) }}</text>
+				<text>钻石</text>
+			</view>
+			<view class="btn-box">
+				<view class="pay-btn" @click="confirm">立即下单</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import gameBox from '@/pages/tabbar/components/message/gameBox.vue';
+	import tuiNumberbox from "@/components/thorui/tui-numberbox/tui-numberbox.vue"
+	import ClerkApi from '@/sheep/api/worker/clerk'; 
+	import sheep from '@/sheep';
+	export default {
+		components: {  
+			gameBox,
+			tuiNumberbox,
+		},
+		data() {
+			return {
+				form: {
+					num: 1,
+					goodsId: -1,
+					price: 0,
+					sex: 2,
+					workerClerkLevelId: 0,
+					blind: false,
+				},
+				
+				game: {
+					goodsId: -1,
+					price: 0,
+				},
+				
+				goodsList: [],
+				
+				levelList: [
+					{
+						id: 0,
+						name: '金牌',
+					},
+					{
+						id: 1,
+						name: '银牌',
+					},
+					{
+						id: 2,
+						name: '铜牌',
+					},
+				],
+			}
+		}, 
+		created() {
+			this.initData();
+		},
+		methods: {
+			initData() {
+				ClerkApi.getClerkBlind().then(res => {
+					this.goodsList = res.data.goodsList;
+					this.levelList = res.data.clerkLevelList;
+				});
+			},
+			sexChange(e) {
+				this.form.sex = e;
+			},
+			levelChange(e) {
+				this.form.workerClerkLevelId = e.id;
+			},
+			change(e) {
+				this.form.num = e.value
+			},
+			fen2yuan(price) {
+			  var f = 0;
+			  var p = (price / 100.0).toFixed(0);
+			  var p1 = (price / 100.0).toFixed(1);
+			  var p2 = (price / 100.0).toFixed(2);
+			  if(p*100 == price){
+			  				f = 0;  
+			  }else if(p1*100 == price){
+			  				  f = 1;
+			  }else if(p2*100 == price){
+			  				  f = 2;
+			  }
+			  return (price / 100.0).toFixed(f)
+			},
+			confirm() {
+				this.form.goodsId = this.game.goodsId,
+				this.form.price = this.game.price*this.form.num
+				if(this.form.sex > 1) {
+					sheep.$helper.toast('请选择店员性别');
+					return;
+				}
+				if(this.form.workerClerkLevelId < 1) {
+					sheep.$helper.toast('请选择店员等级');
+					return;
+				}
+				if(this.form.goodsId < 0) {
+					sheep.$helper.toast('请选择服务类型');
+					return;
+				}
+				if(this.form.price < 1) {
+					sheep.$helper.toast('价格不能为0');
+					return;
+				}
+				var data = {
+					workerClerkLevelId: this.form.workerClerkLevelId,
+					sex: this.form.sex,
+					blind: this.form.blind,
+					items : [
+						{
+							skuId: this.form.goodsId, 
+							count: this.form.num,
+						},
+					]
+				}
+				
+				sheep.$router.go('/pages/order/blind/confirm',{data: JSON.stringify(data)});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-box {
+		padding-bottom: 100px;
+	}
+	
+	.game-card {
+		background-color: #fff;
+		padding: 15px;
+		
+		.title {
+			display: flex;
+			align-items: center;
+			
+			.name {
+				font-size: 28rpx;
+				font-weight: 700;
+				color: #1a1a1a;
+				padding-left: 3px;
+			}
+		}
+		
+		.sex-option {
+			display: flex;
+			align-items: center;
+			margin: 15px 0px;
+			
+			.sex-tab {
+				display: flex;
+				align-items: center;
+				flex-direction: column;
+				justify-content: center;
+				margin-right: 30px;
+				
+				.img-span {
+					width: 130rpx;
+					height: 130rpx;
+					position: relative;
+					display: flex;
+					justify-content: center;
+					
+					.img {
+						height: 100%;
+						width: 100%;
+					}
+					
+					.sex-ok {
+						background-color: #fff;
+						width: 34rpx;
+						height: 34rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						position: absolute;
+						bottom: 0;
+						border-radius: 100%;
+					}
+				}
+			}
+			
+			.name {
+				font-size: 28rpx;
+				font-weight: 400;
+				padding-top: 10px;
+				color: #333;
+			}
+			
+		}
+		
+		.level-option {
+			display: flex;
+			padding: 15px 0;
+			flex-wrap: wrap;
+			
+			.tab {
+				padding: 10rpx 30rpx;
+				font-size: 28rpx;
+				background-color: #f5f5f5;
+				min-width: 120rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				margin-right: 7px;
+				margin-bottom: 8px;
+			}
+			
+			.active {
+				color: #fff;
+				background: var(--ui-BG-Main);
+			}
+		}
+		
+		.input-box {
+			display: flex;
+			margin-bottom: 20px;
+			
+			.step-span {
+				display: flex;
+				justify-content: flex-end;
+				flex: 1;
+				align-items: center;
+			}
+		}
+		
+	}
+	
+	
+	.bottom-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 15px;
+		height: 100rpx;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 100rpx;
+		background-color: #fff;
+		z-index: 9;
+		
+		.price-box {
+			color: #fb932c;
+			font-size: 28rpx;
+			width: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			
+			.price {
+				margin-right: 5px;
+			}
+		}
+		
+		.btn-box {
+			width: 50%;
+			padding-left: 15px;
+			
+			.pay-btn {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				font-size: 28rpx;
+				height: 64rpx;
+			}
+		}
+		
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/message/viewItem.vue b/pages/tabbar/components/message/viewItem.vue
new file mode 100644
index 0000000..ce8bd94
--- /dev/null
+++ b/pages/tabbar/components/message/viewItem.vue
@@ -0,0 +1,265 @@
+<template>
+  <view>
+	  <!-- 系统消息 --> 
+	  <view class="msg-list" v-if="item.groupType == 3">
+	  	<view class="msg-user"> 
+	  		<view class="avatar">
+	  			<!-- <image class="img" src="@/static/images/bell.png"></image> -->
+	  		</view>
+	  		<view class="content">
+	  			<view class="text-black">
+	  				<view class="text-nickname">
+	  					<view class="nickname green">通知助手</view>
+	  				</view>
+	  				<text class="time">前天</text>
+	  			</view>
+	  			<view class="text-gray">
+	  				<view class="text-msg">
+	  					<view>希望打个赏哦</view>
+	  				</view>
+					<view v-if="item.slashed == 1">
+						<u-icon name="bell-slash" custom-prefix="iconfont"></u-icon>
+					</view>
+					<view v-else>
+						<view v-if="item.unreadMessageCount > 0">
+							<tui-badge :scaleRatio="0.8" type="green" dot></tui-badge>
+						</view>
+					</view>
+	  			</view>
+	  		</view>
+	  	</view>
+	  </view>
+	  
+	   <!-- 用户消息 --> 
+	  <view class="msg-list" @longpress="onLongPress" :data-index="index" v-if="item.groupType == 1">
+	  	<view class="msg-user">
+	  		<view class="avatar" @click="detail(item)">
+	  			<image class="img" :src="item.avatar"></image>
+	  			<view class="badge" v-if="item.online"></view>
+	  		</view>
+	  		<view class="content" @click="toChat(item)">
+	  			<view class="text-black">
+	  				<view class="text-nickname">
+	  					<view class="nickname">{{item.nickname}}</view>
+	  					<view class="sex-badge" v-if="item.sex == 2">
+	  						<u-icon name="ziyuan2" custom-prefix="iconfont"></u-icon>
+	  					</view>
+						<view class="sex-man" v-if="item.sex == 1">
+							<u-icon name="ziyuan3" custom-prefix="iconfont"></u-icon>
+						</view>
+	  					<!-- <image class="vip-img" src="@/static/images/vip.png"></image> -->
+	  				</view>
+	  				<text class="time">{{item.time}}</text>
+	  			</view>
+	  			<view class="text-gray">
+	  				<view class="text-msg">
+	  					<view v-if="item.lastMessageReadStatus == '1'">已读</view>
+	  					<view class="text" v-if="item.lastMessageContentType == 1">{{item.lastMessageContent}}</view>
+						<view v-if="item.lastMessageContentType == 3">[语音消息]</view>
+						<view v-if="item.lastMessageContentType == 4">[图片消息]</view>
+	  				</view>
+					<view v-if="item.slashed == 1">
+						<u-icon name="bell-slash" custom-prefix="iconfont"></u-icon>
+					</view>
+					<view v-else> 
+						<view v-if="item.unreadMessageCount > 0">
+							<tui-badge :scaleRatio="0.8" type="green">{{item.unreadMessageCount}}</tui-badge>
+						</view>
+					</view>
+	  			</view>
+	  		</view>
+	  	</view>
+	  </view>
+	  
+  </view>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import tuiBadge from "@/components/thorui/tui-badge/tui-badge.vue";
+	export default {
+		components: {
+			tuiBadge,
+		},
+		props: {
+			index: {
+				type: Number,
+				default: -1,
+			},
+			item: {
+				type: Object,
+				default: function() {
+					return {
+						dd: '',
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			onLongPress(e) {
+				this.$emit('onLongPress', e);
+			},
+			detail(e) {
+				sheep.$router.go('/pages/user/detail/index',{id: e.userId});
+			},
+			toChat(e) {
+				e.unreadMessageCount = 0;
+				this.$u.route({
+					url: 'pages/im/index',
+					params: {
+						groupId: e.groupId,
+						receiveUserId: e.userId,
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.msg-list {
+		display: flex;
+		padding: 15px;
+		
+		.msg-user{
+			display: flex;
+			align-items: center;
+			flex: 1;
+				
+			.avatar {
+				width: 88rpx;
+				height: 88rpx;
+				position: relative;
+				background-color: #ddd;
+				border-radius: 100%;
+				
+				.img {
+					width: 100%;
+					height: 100%;
+					border-radius: 100%;
+				}
+				
+				.badge {
+					width: 20rpx;
+					height: 20rpx;
+					top: 0;
+					right: 0;
+					border: 1px solid #fff;
+					position: absolute;
+					background-color: #dd514c;
+					border-radius: 85px;
+				}
+			}
+			
+			.content {
+				display: flex;
+				flex: 1;
+				flex-direction: column;
+				margin-left: 10px;
+				
+				.new {
+					width: 14rpx;
+					height: 14rpx;
+					background-color: #dd514c;
+					border-radius: 85px;
+				}
+				
+				.text-black {
+					font-size: 28rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					color: #333333;
+					margin-bottom: 8rpx;
+					
+					.tag {
+						margin-right: 5px;
+					}
+					
+					.time {
+						color: #aaaaaa;
+						font-size: 24rpx;
+					}
+					
+					.text-nickname {
+						display: flex;
+						align-items: center;
+						
+						.nickname {
+							text-overflow: ellipsis;
+							white-space: nowrap;
+							overflow: hidden;
+							max-width: 200rpx;
+						}
+					}
+				}
+				
+				.text-gray {
+					font-size: 24rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					color: #aaaaaa;
+					
+					.text-msg {
+						display: flex;
+						align-items: center;
+						
+						.text {
+							text-overflow: ellipsis;
+							white-space: nowrap;
+							overflow: hidden;
+							max-width: 340rpx;
+						}
+					}
+				}
+			}
+			
+		} 
+	}
+	
+	.green {
+		color: #735fed;
+	}
+	
+	.sex-badge {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #e03997;
+		color: #ffffff;
+		border-radius: 3px;
+		font-size: 8px;
+		height: 30rpx;
+		width: 30rpx;
+		margin: 0 10rpx;
+	}
+	
+	.sex-man {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #0081ff;
+		color: #ffffff;
+		border-radius: 3px;
+		font-size: 8px;
+		height: 30rpx;
+		width: 30rpx;
+		margin: 0 10rpx;
+	}
+	
+	.vip-img {
+		width: 34rpx;
+		height: 34rpx;
+	}
+	
+	.svip-img {
+		width: 60rpx;
+		height: 30rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/mine/bgBox.vue b/pages/tabbar/components/mine/bgBox.vue
new file mode 100644
index 0000000..acf464e
--- /dev/null
+++ b/pages/tabbar/components/mine/bgBox.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="bg-box">
+		<!-- <view class="tip-btn">
+			<view class="text">Tip: 完善资料，更能吸引异性的关注哦~</view>
+		</view> -->
+		<u-image width="100%" height="400rpx" :fade="false" :src="userInfo.avatar ? userInfo.avatar: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/aa361225849eeb86428e1a3d647d6f7b94354e74de212403bb968e6ad85e79b3.jpeg'"></u-image>
+	</view>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg-box {
+		background-color: red;
+		position: fixed;
+		left: 0;
+		right: 0;
+		
+		.tip-btn {
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			z-index: 99999;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			bottom: 0;
+			
+			.text {
+				background-color: #3333334a;
+				font-size: 24rpx;
+				border-radius: 40px;
+				padding: 3px 10px;
+				text-align: center;
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/mine/layout.vue b/pages/tabbar/components/mine/layout.vue
new file mode 100644
index 0000000..80b8a00
--- /dev/null
+++ b/pages/tabbar/components/mine/layout.vue
@@ -0,0 +1,96 @@
+<!-- 普通模式演示(vue) -->
+<template>
+	<view class="content">
+		<z-paging ref="paging" v-model="dataList" @scroll="scroll" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<!-- 注意！此处的z-tabs为独立的组件，可替换为第三方的tabs，若需要使用z-tabs，请在插件市场搜索z-tabs并引入，否则会报插件找不到的错误 -->
+			<template #top>
+				<nav-bar :scrollTop="scrollTop" @initNav="initNav"></nav-bar>
+			</template>
+			<!-- 如果希望其他view跟着页面滚动，可以放在z-paging标签内 -->
+			<view>
+				<bg-box></bg-box>
+				<main-box></main-box> 
+			</view>
+			<!-- 自定义没有更多数据view -->
+			<template #empty>
+				<view></view>
+			</template>
+			<!-- 自定义没有更多数据view -->
+			<template #loadingMoreNoMore>
+				<view></view>
+			</template>
+		</z-paging>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/pages/tabbar/components/mine/navBar.vue';
+	import BgBox from '@/pages/tabbar/components/mine/bgBox.vue';
+	import MainBox from '@/pages/tabbar/components/mine/mainBox.vue';
+	import ClerkApi from '@/sheep/api/worker/clerk';
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			NavBar, 
+			BgBox,
+			MainBox,
+		},
+		data() {
+			return {
+				dataList: [],
+				paddingTop: 0,
+				paddingBottom: 100,
+				height: 0,
+				scrollTop: 0.5,
+			}
+		},
+		created() {
+			const isLogin = sheep.$store('user').isLogin;
+			if(isLogin) {
+				this.getClerk();
+			}
+		},
+		methods: {
+			initNav(e) {
+				this.height = e.height;
+				this.paddingTop = this.height;
+			},
+			tabChange(index) {
+				this.tabIndex = index;
+				// 当切换tab或搜索时请调用组件的reload方法，请勿直接调用：queryList方法！！
+				this.$refs.paging.reload();
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					type: this.tabIndex + 1
+				}
+				this.$refs.paging.complete([]);
+			},
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			getClerk() {
+				ClerkApi.getClerkList().then((res) => {
+					if(res.data[0]){
+						sheep.$store('sys').setCurrentClerk(res.data[0]);
+					}else{
+						sheep.$store('sys').setCurrentClerk({
+							id: -1,
+							avatar: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/aa361225849eeb86428e1a3d647d6f7b94354e74de212403bb968e6ad85e79b3.jpeg',
+						});
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
diff --git a/pages/tabbar/components/mine/mainBox.vue b/pages/tabbar/components/mine/mainBox.vue
new file mode 100644
index 0000000..d91404c
--- /dev/null
+++ b/pages/tabbar/components/mine/mainBox.vue
@@ -0,0 +1,502 @@
+<template>
+	<view class="main-box">
+		<view class="info-box">
+			<view class="avatar-box">
+				<u-avatar @click="editUser" size="160" :src="isLogin ? userInfo.avatar : ''"></u-avatar>
+				<view class="nickname-box">
+					<view class="vip-box">
+						<view class="nickname">{{ userInfo?.nickname || nickname }}</view>
+						<!-- <image class="vip-img" src="@/static/images/vip.png"></image> -->
+					</view>
+					<view class="id-box" @click="onCopy(userInfo.id)">
+						<text class="text">ID: {{ userInfo?.id || 88888 }}</text>
+						<u-icon v-if="userInfo.id" name="outline-copy" custom-prefix="iconfont" size="28"></u-icon>
+					</view>
+					<view class="tag-box">
+						<view class="tag-btn" @click="wallet">
+							<image class="icon-img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/c9cec930606ecf028e61bce7415a2587e8089abd5d4144bb52b7bd487daedc26.png"></image>
+							<text>钻石</text>
+						</view>
+						<!-- <view class="tag-btn">
+							<image class="icon-img" src="@/static/images/shop.png"></image>
+							<text>礼物</text>
+						</view> -->
+						<view class="tag-btn" v-if="friendEnabled" @click="point">
+							<image class="icon-img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/ab8540e145165ed31ba32f8673cc3e6bddf72161b20789a7c0ecfc36fcbf67d8.png"></image>
+							<text>积分</text>
+						</view>
+						<view class="tag-btn" @click="toTrend">
+							<image class="icon-img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/06d4ac22b8acbdb021f698531ddc0091f8b1a4c1b938c4189025edccc7a4beed.png"></image>
+							<text>动态</text>
+						</view>
+						<view class="tag-btn" @click="toGift">
+							<text>礼物</text>
+							<u-icon name="arrow-right" size="20" color="#aaa"></u-icon>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- <view class="fans-box">
+				<view class="tag">
+					<text class="tag-num">2.3万</text>
+					<text>获赞</text>
+				</view>
+				<view class="tag">
+					<text class="tag-num">22.3万</text>
+					<text>关注</text>
+				</view>
+				<view class="tag">
+					<text class="tag-num">223.3万</text>
+					<text>粉丝</text>
+				</view>
+				<view class="tag">
+					<text class="tag-num">1000.3万</text>
+					<text>信用分</text>
+				</view>
+			</view> -->
+			
+			<view class="vip-box" v-if="isPass && friendEnabled" @click="toVip">
+				<vip-card></vip-card>
+			</view>
+			
+		</view>
+		
+		<view class="card-box" v-if="isPass">
+			<view class="title">我的订单</view>
+			<view class="card-item">
+				<view class="item" @click="myOrder(1)">
+					<u-icon name="outline-empty-wallet-time" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">待付款</view>
+					<tui-badge v-if="numData.orderCount['unpaidCount'] > 0" absolute top="30rpx" right="30rpx" :scaleRatio="0.8" type="green">{{numData.orderCount['unpaidCount']}}</tui-badge>
+				</view>
+				
+				<view class="item" @click="myOrder(2)">
+					<u-icon name="outline-timer-1" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">待服务</view>
+				</view>
+				
+				<view class="item" @click="myOrder(3)">
+					<u-icon name="outline-timer-start" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">服务中</view>
+				</view>
+				
+				<view class="item" @click="myOrder(4)">
+					<u-icon name="vuesax-outline-task-square" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">已完成</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="card-box" v-if="isPass && peiwanEnabled && clerk.id > 0">
+			<view class="title">接单中心</view>
+			<view class="card-item">
+				
+				<view class="item" @click="receiveOrder">
+					<u-icon name="jiedan" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">接单中心</view>
+				</view>
+				
+				<view class="item" @click="blindOrder">
+					<u-icon name="snatch" custom-prefix="iconfont" size="56"></u-icon>
+					<view class="name">抢单中心</view>
+				</view>
+				
+				<view class="item" @click="workerList">
+					<u-icon name="dianyuan" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">达人资料</view>
+				</view>
+				
+				<view class="item" @click="reward">
+					<u-icon name="zhaopiandashangjilu" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">打赏记录</view>
+				</view>
+				
+				<!-- <view class="item">
+					<u-icon name="shimingrenzheng" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">实名认证</view>
+				</view> -->
+				
+			</view>
+		</view>
+		
+		<view class="card-box">
+			<view class="title">常用工具</view>
+			
+			<view class="card-item">
+				<!-- <view class="item">
+					<u-icon name="dashang" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">打赏店员</view>
+				</view> -->
+				
+				<view class="item" v-if="isPass && peiwanEnabled" @click="toApply">
+					<u-icon name="dianyuan1" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">达人申请</view>
+				</view>
+				
+				<view v-if="brokerageEnabled" class="item" @click="fenxiao">
+					<u-icon name="fenxiaozhongxin2" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">分销中心</view>
+				</view>
+				
+				<view class="item" v-if="friendEnabled" @click="sign">
+					<u-icon name="calendar" size="50"></u-icon>
+					<view class="name">签到有礼</view>
+				</view>
+				
+				<view class="item" @click="toFans">
+					<u-icon name="xingxing" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">收藏达人</view>
+				</view>
+				
+				<view class="item" v-if="friendEnabled" @click="youhuiquan">
+					<u-icon name="youhuiquan" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">优惠券</view>
+				</view>
+				
+				<view class="item" @click="toChat">
+					<u-icon name="kefuzhongxin" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">购买授权</view>
+				</view>
+				
+				<view class="item" @click="cashApply">
+					<u-icon name="tixian" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">申请提现</view>
+				</view>
+				
+				<!-- <view class="item">
+					<u-icon name="mianfei-liwutujian" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">礼物图鉴</view>
+				</view>
+				
+				<view class="item">
+					<u-icon name="kaidian" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">我要开店</view>
+				</view>
+				
+				<view class="item">
+					<u-icon name="outline-timer-1" custom-prefix="iconfont" size="50"></u-icon>
+					<view class="name">合作推广</view>
+				</view> -->
+				
+			</view>
+			
+			
+			
+		</view>
+		
+		<view class="co-right">尔加科技版权所有</view>
+		
+	</view>
+</template>
+
+<script>
+	import sheep from '@/sheep'; 
+	import tuiBadge from "@/components/thorui/tui-badge/tui-badge.vue";
+	import VipCard from '@/pages/tabbar/components/mine/vipCard.vue';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	export default {
+		components: {
+			VipCard, 
+			tuiBadge,
+		},
+		data() {
+			return {
+				nickname: '请先登陆',
+			}
+		},
+		computed: {
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+			isLogin: {
+				get() {
+				  return sheep.$store('user').isLogin;
+				},
+			},
+			numData: {
+				get() {
+				  return sheep.$store('user').numData;
+				},
+			},
+			clerk() {
+				return sheep.$store('sys').currentClerk;
+			},
+			brokerageEnabled() {
+				return sheep.$store('user').tradeConfig.brokerageEnabled;
+			},
+			peiwanEnabled() {
+				return sheep.$store('user').tradeConfig.peiwanEnabled;
+			},
+			friendEnabled() {
+				return sheep.$store('user').tradeConfig.friendEnabled
+			},
+			isPass() {
+				return sheep.$store('user').tradeConfig.weixinEnabled;
+			},
+		},
+		methods: {
+			toApply() {
+				uni.showModal({
+				  title: '达人申请',
+				  content: '请确认是否成年，未成年禁止申请，申请后会有客服添加进行微信实名认证！',
+				  success: function (res) {
+				    if (res.confirm) {
+				      sheep.$router.go('/pages/worker/workerList/index');
+				    }
+				  },
+				});
+			},
+			toFans() {
+				sheep.$router.go('/pages/clerk/fans/list');
+			},
+			toVip() {
+				sheep.$router.go('/pages/user/vip');
+			},
+			receiveOrder() {
+				sheep.$router.go('/pages/order/worker/list');
+			},
+			blindOrder() {
+				sheep.$router.go('/pages/order/blind/list');
+			},
+			myOrder(type) {
+				sheep.$router.go('/pages/order/my/list', {type: type});
+			},
+			cashApply() {
+				sheep.$router.go('/pages/commission/wallet');
+			},
+			fenxiao() {
+				uni.showModal({
+				  title: '分销申请',
+				  content: '点击邀请海报，生成海报，生成邀请码，邀请一人下单，可得下单20%佣金！',
+				  success: function (res) {
+				    if (res.confirm) {
+				      sheep.$router.go('/pages/commission/index');
+				    }
+				  },
+				});
+			},
+			workerList() {
+				sheep.$router.go('/pages/worker/workerList/index');
+			},
+			youhuiquan() {
+				sheep.$router.go('/pages/coupon/list',{type: 'all'});
+			},
+			wallet() {
+				sheep.$router.go('/pages/user/wallet/money')
+			},
+			point() {
+				sheep.$router.go('/pages/user/wallet/score')
+			},
+			sign() {
+				sheep.$router.go('/pages/app/sign')
+			},
+			toGift() {
+				sheep.$router.go('/pages/reward/list')
+			},
+			toTrend() {
+				sheep.$router.go('/pages/trend/my/list')
+			},
+			reward() {
+				sheep.$router.go('/pages/reward/list')
+			},
+			// 复制
+			onCopy(text) {
+			  if(text){
+				  sheep.$helper.copyText(text+"");
+			  }
+			},
+			toChat() {
+				//sheep.$router.go('/pages/chat/index');
+				uni.showModal({
+				  title: '购买授权',
+				  content: '客服微信：rbtnet',
+				  success: function (res) {
+				   
+				  },
+				});
+			},
+			toKaidian() {
+				uni.showModal({
+				  title: '搭建同款',
+				  content: '搭建同款请联系客服微信：rbtnet',
+				  success: function (res) {
+				   
+				  },
+				});
+			},
+			async editUser() {
+				if(!this.friendEnabled){
+					sheep.$router.go('/pages/user/info')
+					return;
+				}
+				
+				if(this.isLogin){
+					if(this.isPass){
+						await sheep.$store('user').getInfo();
+						showAuthModal('chatAuthorization');
+					}
+				}else{
+					showAuthModal();
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main-box {
+		margin-top: 300rpx;
+		background-color: #fafafa;
+		position: absolute;
+		left: 0px;
+		right: 0px;
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		
+		.info-box {
+			//background-color: #fff;
+			padding: 15px;
+			border-top-left-radius: 10px;
+			border-top-right-radius: 10px;
+			padding-bottom: 0;
+		}
+		
+		.avatar-box {
+			display: flex;
+			align-items: center;
+			margin-bottom: 30rpx;
+			
+			.nickname-box {
+				display: flex;
+				flex: 1;
+				flex-direction: column;
+				justify-content: center;
+				margin-left: 10px;
+				
+				.vip-box {
+					display: flex;
+					align-items: center;
+					
+					.nickname {
+						font-size: 15px;
+						font-weight: bold;
+					}
+					
+					.vip-img {
+						width: 38rpx;
+						height: 38rpx;
+						margin-left: 5px;
+					}
+				}
+				
+				.id-box {
+					margin: 5px 0;
+					font-size: 12px;
+					color: #aaa;
+					
+					.text {
+						margin-right: 5px;
+					}
+				}
+				
+				.tag-box {
+					display: flex;
+					align-items: center;
+					
+					.tag-btn {
+						background-color: #efe4e4;
+						border-radius: 10px;
+						padding: 3px 5px;
+						font-size: 10px;
+						margin-right: 7px;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						
+						.icon-img {
+							width: 12px;
+							height: 12px;
+							margin-right: 2px;
+						}
+					}
+				}
+			}
+		}
+		
+		.fans-box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 30rpx 0;
+			padding-top: 0;
+			
+			.tag {
+				display: flex;
+				justify-content: center;
+				flex: 1;
+				flex-direction: column;
+				align-items: center;
+				font-size: 24rpx;
+				color: #303133;
+				
+				.tag-num {
+					margin-bottom: 5px;
+					font-size: 32rpx;
+					color: #303133;
+				}
+			}
+		}
+		
+	}
+	
+	
+	.card-box {
+		background-color: #fff;
+		margin: 30rpx;
+		margin-top: 0;
+		border-radius: 10px;
+		padding-bottom: 0;
+		
+		.title {
+			font-size: 15px;
+			font-weight: bolder;
+			padding: 38rpx 0 10rpx 40rpx;
+			color: #1f2122;
+		}
+		
+		.card-item {
+			display: flex;
+			flex-wrap: wrap;
+			
+			.item {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				width: 25%;
+				padding: 30rpx 0;
+				position: relative;
+				
+				.name {
+					margin-top: 10rpx;
+					font-size: 11px;
+					color: #333;
+				}
+			}
+		}
+	}
+	 
+	.swiper-box {
+		height: 320rpx;
+	}
+	
+	.co-right {
+		display: flex;
+		justify-content: center;
+		padding: 10px;
+		font-size: 10px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/mine/navBar.vue b/pages/tabbar/components/mine/navBar.vue
new file mode 100644
index 0000000..93c98a2
--- /dev/null
+++ b/pages/tabbar/components/mine/navBar.vue
@@ -0,0 +1,108 @@
+<template>
+  <view>
+	 <tui-navigation-bar @init="initNavigation" @change="opacityChange" :scrollTop="scrollTop" backgroundColor="#fff" color="#333">
+	 	<view class="content-bpx">
+			<view class="left-box">
+				<view @click="setBtn" class="set-btn">
+					<u-icon name="setting" :color="opacity > 0.85 ? '#333' : '#fff'" size="48"></u-icon>
+				</view>
+				<view @click="editUser" class="set-btn" v-show="opacity < 1">
+					<u-icon name="edit-pen" size="48"></u-icon>
+				</view>
+			</view>
+			<view v-if="opacity > 0.85" class="nickname">{{userInfo.nickname}}</view>
+		</view>
+	 </tui-navigation-bar>
+  </view>
+</template>
+
+<script>
+	import tuiNavigationBar from "@/components/thorui/tui-navigation-bar/tui-navigation-bar.vue";
+	import sheep from '@/sheep'; 
+	export default {
+		components: {
+			tuiNavigationBar,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			},
+			//滚动条滚动距离
+			scrollTop: {
+				type: [Number, String],
+				default: 0
+			},
+		},
+		data() {
+			return {
+				top: 0, //标题图标距离顶部距离
+				opacity: 0,
+				height: 0,
+			}
+		},
+		computed: {
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+		},
+		methods: {
+			initNavigation(e) {
+				this.height = e.height;
+				this.opacity = e.opacity;
+				this.top = e.top;
+				this.$emit('initNav', e);
+			},
+			opacityChange(e) {
+				this.opacity = e.opacity;
+			},
+			setBtn() {
+				sheep.$router.go('/pages/public/setting')
+			},
+			editUser() {
+				sheep.$router.go('/pages/user/info')
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-bpx {
+		color: #fff;
+		display: flex;
+		align-items: center;
+		height: 44px;
+		justify-content: center;
+		
+		.left-box {
+			display: flex;
+			position: absolute;
+			left: 0;
+		}
+		
+		.nickname {
+			position: absolute;
+			width: 100px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 44px;
+			font-size: 15px;
+			font-weight: bolder;
+			color: #1f2122;
+		}
+		
+		.set-btn {
+			padding: 0 15px;
+			height: 44px;
+			display: flex;
+			align-items: center;
+		}
+		
+	}
+	
+
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/mine/vipCard.vue b/pages/tabbar/components/mine/vipCard.vue
new file mode 100644
index 0000000..4a17861
--- /dev/null
+++ b/pages/tabbar/components/mine/vipCard.vue
@@ -0,0 +1,109 @@
+<template>
+	<view class="vip-card">
+		<view class="vip-content">
+			<view>
+				<view class="name">VIP<text class="text">会员中心</text></view>
+				<view class="remark">成为VIP尊享会员可享受更多权益~</view>
+			</view>
+			<view class="vip-btn" v-if="userInfo.isVip">
+				<u-icon name="eye-fill" size="26"></u-icon>
+				<text class="text">查看特权</text>
+			</view>
+			<view class="vip-btn" v-else>
+				<u-icon name="lock-fill" size="26"></u-icon>
+				<text class="text">立即开通</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import sheep from '@/sheep'; 
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.vip-card {
+		background: linear-gradient(-120deg, #2bab89, #388772, #3e8472, #227761);
+		width: 100%;
+		height: 64px;
+		border-radius: 6px;
+		position: relative;
+		z-index: 1;
+		margin-bottom: 30rpx;
+		
+		.vip-content {
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			color: #fff;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 0px 15px;
+			
+			.name {
+				color: #a8f9e4;
+				font-size: 15px;
+				font-weight: bold;
+				margin-bottom: 5px;
+				display: flex;
+				align-items: center;
+			}
+			
+			.text {
+				font-size: 12px;
+			}
+			
+			.remark {
+				font-size: 10px;
+				color: #0fe3ac;
+			}
+			
+			.vip-btn {
+				background: linear-gradient(-120deg, #2c8970, #3c8975, #39a287, #0eb68b);
+				padding: 7px 10px;
+				border-radius: 40px;
+				font-size: 10px;
+				
+				.text {
+					margin-left: 2px;
+					color: #dafff5;
+				}
+			}
+		}
+	}
+	
+	.vip-card:after {
+		content: " ";
+		position: absolute;
+		z-index: -1;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		bottom: 0;
+		border-radius: inherit;
+		opacity: 1;
+		-webkit-transform: scale(1, 1);
+		transform: scale(1, 1);
+		background-size: 100% 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/trend/clerk-popup.vue b/pages/tabbar/components/trend/clerk-popup.vue
new file mode 100644
index 0000000..41f15a3
--- /dev/null
+++ b/pages/tabbar/components/trend/clerk-popup.vue
@@ -0,0 +1,132 @@
+<template>
+	<tui-bottom-popup :zIndex="1002" :maskZIndex="1001" :show="popupShow" @close="hiddenPopup">
+		<view class="order-box">
+			<view class="avatar-box">
+				<view class="title">切换店员</view>
+				<view class="close-span" @click="hiddenPopup">
+					<u-icon name="close-circle" color="var(--ui-BG-Main)" size="50"></u-icon>
+				</view>
+			</view>
+			<scroll-view style="height: 700rpx;" scroll-y>
+				<view class="page-box">
+					<view @click="change(item)" class="item" :key="item.id" v-for="(item,index) in clerkList">
+						<view class="avatar-span">
+							<u-avatar :src="item.avatar"></u-avatar>
+							<view class="nickname">{{item.nickname}}</view>
+						</view>
+						<view>
+							<u-icon size="44" v-if="clerk.id == item.id" name="checkmark-circle-fill" color="var(--ui-BG-Main)"></u-icon>
+							<u-icon size="44" v-else name="checkmark-circle" color="var(--ui-BG-Main)"></u-icon>
+						</view>
+					</view>
+					
+				</view>
+			</scroll-view>
+			
+		</view>
+	</tui-bottom-popup>
+	
+</template>
+
+<script>
+	import tuiBottomPopup from "@/components/thorui/tui-bottom-popup/tui-bottom-popup.vue"
+	import RewardApi from '@/sheep/api/worker/reward'; 
+	import ClerkApi from '@/sheep/api/worker/clerk'; 
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			tuiBottomPopup,
+		},
+		props: {
+			
+		},
+		data() {
+			return { 
+				popupShow: false,
+			}
+		},
+		computed: {
+			clerkList() {
+				return sheep.$store('sys').clerkList;
+			},
+			clerk() {
+				return sheep.$store('sys').currentClerk;
+			},
+		},
+		methods: {
+			//调用此方法显示弹层
+			showPopup() {
+				ClerkApi.getClerkList().then((res) => {
+					if(res.data[0]){
+						sheep.$store('sys').setCurrentClerk(res.data[0]);
+						sheep.$store('sys').setClerkList(res.data);
+					}else{
+						sheep.$store('sys').setCurrentClerk({
+							id: -1,
+							avatar: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/aa361225849eeb86428e1a3d647d6f7b94354e74de212403bb968e6ad85e79b3.jpeg',
+						});
+						sheep.$store('sys').setClerkList([]);
+					}
+					this.popupShow = true;
+				});
+			},
+			hiddenPopup() {
+				this.popupShow = false;
+			},
+			change(e) {
+				sheep.$store('sys').setCurrentClerk(e);
+				this.hiddenPopup();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.avatar-box {
+		padding: 10px 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.title {
+			height: 70rpx;
+			display: flex;
+			align-items: center;
+			font-size: 28rpx;
+		}
+		
+		.close-span {
+			position: absolute;
+			right: 5px;
+			top: 5px;
+			width: 70rpx;
+			height: 70rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+	
+	.page-box {
+		padding: 15px;
+		padding-bottom: 10px;
+		
+		.item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-bottom: 30rpx;
+			
+			.avatar-span {
+				display: flex;
+				align-items: center;
+				
+				.nickname {
+					font-size: 24rpx;
+					margin-left: 14rpx;
+				}
+			}
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/trend/fb-popup.vue b/pages/tabbar/components/trend/fb-popup.vue
new file mode 100644
index 0000000..20640c4
--- /dev/null
+++ b/pages/tabbar/components/trend/fb-popup.vue
@@ -0,0 +1,313 @@
+<template>
+	<view>
+		<view class="fabu" @click="fabu">
+			<u-icon name="edit-pen-fill" color="#fff" size="50"></u-icon>
+		</view>
+		
+		<tui-bottom-popup :show="openFabu" zIndex="998" @close="close">
+			<view class="fabu-box">
+				<view class="title">
+					<text>发布动态</text>
+					<view class="close-span" @click="close">
+						<u-icon name="close-circle" color="#98a2a1" size="50"></u-icon>
+					</view>
+				</view>
+				
+				<view class="menu-box" v-if="!edit">
+					<view class="menu-btn" @click="pubText(0)">
+						<view class="menu-icon red">
+							<u-icon name="photo" size="50"></u-icon>
+						</view>
+						<view>图文</view>
+					</view>
+					<view class="menu-btn" @click="pubText(1)">
+						<view class="menu-icon">
+							<u-icon name="mic" size="50"></u-icon>
+						</view>
+						<view>声音</view>
+					</view>
+					<view class="menu-btn" @click="pubText(2)">
+						<view class="menu-icon blue">
+							<u-icon name="play-circle-fill" size="50"></u-icon>
+						</view>
+						<view>视频</view>
+					</view>
+				</view>
+				
+				<view class="post-box" v-if="edit">
+					<view class="input-box">
+						<u-input type="textarea" placeholder="请输入动态内容" v-model="form.content" />
+					</view>
+					<form-image v-if="form.fileType == 0" :number="6" v-model="imgList"></form-image>
+					<form-voice v-if="form.fileType == 1"  @sec="toSec" v-model="form.file"></form-voice>
+					<form-video v-if="form.fileType == 2" v-model="form.file"></form-video>
+					<form-city @select="selectClerk"></form-city>
+					<view class="btn-box">
+						<view class="btn" @click="submit">立即发布</view>
+					</view>
+				</view>
+			</view>
+		</tui-bottom-popup>
+		
+		<clerk-popup ref="clerk"></clerk-popup>
+	</view>
+</template>
+
+<script>
+	import FormImage from '@/pages/tabbar/components/trend/formImage.vue';
+	import FormVideo from '@/pages/tabbar/components/trend/formVideo.vue';
+	import FormVoice from '@/pages/tabbar/components/trend/formVoice.vue';
+	import formCity from '@/pages/tabbar/components/trend/formCity.vue';
+	import tuiBottomPopup from "@/components/thorui/tui-bottom-popup/tui-bottom-popup.vue"
+	import ClerkPopup from "@/pages/tabbar/components/trend/clerk-popup.vue";
+	import TrendApi from '@/sheep/api/worker/trend'; 
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			FormImage,
+			FormVideo,
+			FormVoice,
+			formCity,
+			tuiBottomPopup,
+			ClerkPopup,
+		},
+		props:{
+			btnType: { // 当前tab的下标 (除了支付宝小程序必须在这里定义, 其他平台都可不用写, 因为已在MescrollMoreItemMixin定义)
+				type: String,
+				default(){
+					return 'fabu'
+				}
+			},
+		},
+		data() {
+			return {
+				openFabu: false,
+				
+				edit: false,
+				
+				form: {
+					workerClerkId: null,
+					content: '',
+					seconds: 0,
+					file: '',
+					fileType: 0,
+				},
+				imgList: [],
+			}
+		},
+		computed: {
+			authType() {
+				return sheep.$store('modal').auth;
+			},
+			clerk() {
+				return sheep.$store('sys').currentClerk;
+			},
+		},
+		methods: {
+			fabu() {
+				this.init();
+				
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				
+				const userInfo = sheep.$store('user').userInfo;
+				// 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。
+				if(userInfo.visible) {
+					this.openFabu = true;
+					return;
+				}
+				// 触发小程序授权信息弹框
+				// #ifdef MP-WEIXIN
+				showAuthModal('mpAuthorization');
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				showAuthModal('h5Authorization');
+				// #endif
+			},
+			init() {
+				this.edit = false;
+				this.form.content = '';
+				this.form.file = '';
+				this.imgList = [];
+			},
+			selectClerk() {
+				this.$refs.clerk.showPopup();
+			},
+			close() { 
+				this.openFabu = false;
+			}, 
+			pubText(fileType) {
+				this.edit = true;
+				this.form.fileType = fileType;
+			},
+			toSec(e) {
+				this.form.seconds = e;
+			},
+			submit() {
+				// #ifdef MP
+				// 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
+				this.subscribeMessage();
+				// #endif
+				
+				if(!this.form.content){
+					sheep.$helper.toast('请输入动态内容');
+					return;
+				}
+				if(this.form.fileType == 0){
+					if(this.imgList.length < 1){
+						sheep.$helper.toast('请上传图片');
+						return;
+					}else{
+						this.form.file = this.imgList.join(',');
+					}
+				}else if(this.form.fileType == 1){
+					if(!this.form.file){
+						sheep.$helper.toast('请上传录音');
+						return;
+					}
+				}else if(this.form.fileType == 2){
+					if(!this.form.file){
+						sheep.$helper.toast('请上传视频');
+						return;
+					}
+				}
+				
+				if(this.clerk.id > 0){
+					this.form.workerClerkId = this.clerk.id;
+				}
+				TrendApi.createTrend(this.form).then((res) => {
+					if(res.data){
+						this.close();
+					}
+				});
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.TREND_APPLY_SUCCESS];
+			  event.push(WxaSubscribeTemplate.CLERK_BLIND);
+			  event.push(WxaSubscribeTemplate.CLERK_ORDER);
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.TREND_APPLY_SUCCESS);
+			    uni.setStorageSync(WxaSubscribeTemplate.TREND_APPLY_SUCCESS, '已订阅');
+			  });
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.fabu {
+		background-color: var(--ui-BG-Main);
+		position: fixed;
+		bottom: 220rpx;
+		right: 25rpx;
+		border-radius: 100%;
+		height: 90rpx;
+		width: 90rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 48rpx;
+		color: black;
+		box-shadow: 0 0 10px #cccccc;
+	}
+	.fabu-box {
+		padding: 30rpx;
+		
+		.title {
+			font-size: 28rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-weight: bold;
+			border-bottom: 1rpx solid #f5f5f5;
+			padding-bottom: 30rpx;
+			
+			.close-span {
+				position: absolute;
+				right: 5px;
+				top: 5px;
+				width: 70rpx;
+				height: 70rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+		
+		.menu-box {
+			display: flex;
+			padding: 30px 55px;
+			justify-content: space-between;
+			
+			.menu-btn {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				font-size: 12px;
+				
+				.menu-icon {
+					width: 110rpx;
+					height: 110rpx;
+					background-color: var(--ui-BG-Main);
+					color: #fff;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border-radius: 100%;
+					margin-bottom: 10px;
+				}
+				
+				.red {
+					background-color: #dd6161;
+				}
+				
+				.blue {
+					background-color: #37c0fe;
+				}
+			}
+		}
+		
+		.close-btn {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #909399;
+			height: 60rpx;
+		}
+	}
+	
+	.post-box {
+		
+		.input-box {
+			padding: 10rpx;
+		}
+		
+		.btn-box {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-top: 40rpx;
+			padding-bottom: 20rpx;
+			
+			.btn {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+				border-radius: 40px;
+				font-size: 28rpx;
+				width: 100%;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 80rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/tabbar/components/trend/formCity.vue b/pages/tabbar/components/trend/formCity.vue
new file mode 100644
index 0000000..58d3a0f
--- /dev/null
+++ b/pages/tabbar/components/trend/formCity.vue
@@ -0,0 +1,55 @@
+<template>
+	<view>
+		<view class="form-item">
+			<view class="label">关联店员</view>
+			<u-input @click="citySelect" input-align="right" type="select" placeholder="请选择店员" v-model="city" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		created() {
+			
+		},
+		computed: {
+			city() {
+				return sheep.$store('sys').currentClerk.nickname;
+			},
+		},
+		watch: {
+			
+		},
+		methods: {
+			citySelect() {
+				this.$emit('select');
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 16rpx;
+		
+		.label {
+			font-size: 30rpx;
+			min-width: 200rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/trend/formImage.vue b/pages/tabbar/components/trend/formImage.vue
new file mode 100644
index 0000000..ebe341f
--- /dev/null
+++ b/pages/tabbar/components/trend/formImage.vue
@@ -0,0 +1,68 @@
+<template>
+	<view>
+		<shmily-drag-image :number="number" :cols="cols" v-model="imgList"></shmily-drag-image>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			number: {
+			  type: Number,
+			  default: 6
+			},
+			modelValue: {
+			  type: Array,
+			  default: []
+			},
+		},
+		data() {
+			return {
+				imgList: [],
+				cols: 4,
+			}
+		},
+		created() {
+			this.imgList = this.modelValue;
+		},
+		computed: {
+			
+		},
+		watch: {
+			imgList: {
+				handler: function(newVal, oldVal) {
+					this.$emit('update:modelValue', newVal); 
+				}
+			},
+			modelValue: {
+				handler: function(newVal, oldVal) {
+					this.imgList = newVal;
+				}
+			},
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 15px;
+		
+		.label {
+			font-size: 30rpx;
+			min-width: 200rpx;
+		}
+	}
+	
+	.upload-box {
+		padding: 15px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/trend/formVideo.vue b/pages/tabbar/components/trend/formVideo.vue
new file mode 100644
index 0000000..a74af80
--- /dev/null
+++ b/pages/tabbar/components/trend/formVideo.vue
@@ -0,0 +1,71 @@
+<template>
+	<view>
+		<htz-image-upload :dataType="1" :max="1" mediaType="video" name="file" :chooseNum="1" v-model="imageDataType1" @chooseSuccess="ceshiChooseSuccessDataType1"></htz-image-upload>
+	</view>
+</template>
+
+<script>
+	import htzImageUpload from '@/components/htz-image-upload/htz-image-upload.vue'
+	import FileApi from '@/sheep/api/infra/file';
+	export default {
+		components: {
+			htzImageUpload,
+		},
+		props: {
+			modelValue: {
+			  type: String,
+			  default: ''
+			},
+		},
+		data() {
+			return {
+				imageDataType1: [],
+			}
+		},
+		created() {
+			
+		},
+		computed: {
+			
+		},
+		methods: {
+			ceshiChooseSuccessDataType1(tempFilePaths, e) {
+				tempFilePaths.forEach(path => {
+					uni.getFileInfo({
+					  filePath: path,
+					  success: (infoRes) => {
+						const fileSize = infoRes.size; // 获取文件大小（字节）
+						if (fileSize > 1024 * 1024 * 10) { // 假设设置的文件大小限制为5MB
+						  uni.showToast({
+							title: '文件大小限制为10MB',
+							icon: 'none'
+						  });
+						  return;
+						}
+						// 文件大小符合要求，可以执行上传操作
+						this.uploadVoice(e, path);
+					  },
+					  fail: (err) => {
+						console.log('获取文件信息失败', err);
+					  }
+					});
+				})
+			},
+			async uploadVoice(e, path) {
+				
+				
+				var res = await FileApi.uploadFile(path);
+				this.$emit('update:modelValue', res.data); 
+				var thisData = {
+						type: e,
+						url: path 
+				};
+				this.imageDataType1.push(thisData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/trend/formVoice.vue b/pages/tabbar/components/trend/formVoice.vue
new file mode 100644
index 0000000..3028da4
--- /dev/null
+++ b/pages/tabbar/components/trend/formVoice.vue
@@ -0,0 +1,256 @@
+<template>
+	<view class="form-bg">
+		<view class="form-item">
+			<view class="label">录音</view>
+			<view class="bubble-box">
+				<u-input @click="topBubble" input-align="right" type="select" :placeholder="voice.name" />
+				<tui-bubble-popup :show="show" :mask="false" position="absolute" direction="right" triangleRight="-22rpx" triangleTop="30rpx" @close="topBubble" :flexEnd="false">
+				 	<view @click="change(item)" class="tui-menu-item" v-for="(item,index) in list">{{item.name}}</view>
+				</tui-bubble-popup>
+			</view>
+		</view>
+		<view>
+			<view class="voice-box" v-if="voice.type == 'voice'">
+				<view v-if="voiceUrl" @click="playAudio" class="upload-btn-box">
+					<view class="icon">
+						<u-icon v-if="play" name="pause" color="#fff" size="70"></u-icon>
+						<u-icon v-else name="play-right-fill" color="#fff" size="70"></u-icon>
+					</view>
+					<view class="upload-btn" v-if="play">停止播放</view>
+					<view class="upload-btn" v-else>播放录音</view>
+				</view>
+				<view v-else>
+					<all-speech :maxTime="maxTime" ref="speech" @okClick="voiceOk"></all-speech>
+				</view>
+				<view v-if="voiceUrl" @click="reloadBtn" class="reload-btn">
+					<u-icon name="reload" size="30"></u-icon>
+					<text class="text">重录</text>
+				</view>
+			</view>
+			<view class="voice-box" v-if="voice.type == 'upload'">
+				<view v-if="voiceUrl" @click="playAudio" class="upload-btn-box">
+					<view class="icon">
+						<u-icon v-if="play" name="pause" color="#fff" size="70"></u-icon>
+						<u-icon v-else name="play-right-fill" color="#fff" size="70"></u-icon>
+					</view>
+					<view class="upload-btn" v-if="play">停止播放</view>
+					<view class="upload-btn" v-else>播放录音</view>
+				</view>
+				<view v-else @click="chooseVoice" class="upload-btn-box">
+					<view class="icon">
+						<u-icon name="plus" color="#fff" size="70"></u-icon>
+					</view>
+					<view class="upload-btn">上传录音文件</view>
+				</view>
+				<view v-if="voiceUrl" @click="reloadBtn" class="reload-btn">
+					<u-icon name="reload" size="30"></u-icon>
+					<text class="text">重录</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import FileApi from '@/sheep/api/infra/file';
+	import tuiBubblePopup from "@/components/thorui/tui-bubble-popup/tui-bubble-popup.vue"
+	const audio = uni.createInnerAudioContext();
+	export default {
+		components: {
+			tuiBubblePopup,
+		},
+		props: {
+			modelValue: {
+			  type: String,
+			  default: ''
+			},
+		},
+		data() {
+			return {
+				voice: {
+					
+				},
+				maxTime: 60,
+				list: [
+					{
+						name: '直接录音',
+						type: 'voice',
+					},
+				],
+				current: 0,
+				voicePath: '',
+				show: false,
+				play: false,
+			}
+		},
+		created() {
+			this.voice = this.list[this.current];
+			
+			// #ifndef MP-WEIXIN
+			var voiceType = {
+				name: '上传手机音频',
+				type: 'upload',
+			};
+			this.list.push(voiceType);
+			// #endif
+		},
+		computed: {
+			voiceUrl(){
+				return this.modelValue;
+			}
+		},
+		methods: {
+			topBubble() {
+				this.show = !this.show;
+			},
+			change(e) {
+				this.reloadBtn();
+				this.topBubble();
+				this.voice = e;
+			},
+			reloadBtn() {
+				this.play = false;
+				this.$emit('update:modelValue', ""); 
+				this.$emit('sec', ""); 
+			},
+			playAudio() {
+				if(this.play){
+					this.play = false;
+					audio.stop();
+				}else{
+					this.play = true;
+					//语音自然播放结束
+					audio.onEnded((res) => {
+						this.play = false;
+					});
+					audio.src = this.modelValue;
+					audio.play();
+				}
+			},
+			chooseVoice() {
+				var that = this;
+				
+				uni.chooseFile({
+				  count: 1, //默认100
+				  extension:['.mp3','.m4a'],
+					success: function (res) {
+						var fileSize = res.tempFiles[0].size;
+						if (fileSize > 1024 * 1024 * 10) { // 假设设置的文件大小限制为5MB
+						  uni.showToast({
+							title: '文件大小限制为10MB',
+							icon: 'none'
+						  });
+						  return;
+						}
+						that.voicePath = res.tempFilePaths[0];
+						console.log(JSON.stringify(res.tempFilePaths));
+						that.uploadVoice(that.voicePath);
+					}
+				});
+			},
+			uploadVoice(path) {
+				FileApi.uploadFile(path).then((res) => {
+					this.$emit('update:modelValue', res.data); 
+				});
+			},
+			voiceOk(e) {
+				this.voicePath = e.path;
+				this.uploadVoice(this.voicePath);
+				this.$emit('sec', e.sec); 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form-bg {
+		padding: 0 10rpx;
+	}
+	
+	.form-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10px 0;
+		
+		.label {
+			font-size: 30rpx;
+			min-width: 200rpx;
+		}
+	}
+	
+	.bubble-box {
+		position: relative;
+		
+		.tui-menu-item {
+			width: 100%;
+			padding: 30rpx 20rpx;
+			text-align: center;
+			position: relative;
+		}
+		
+		.tui-menu-item:after {
+			    position: absolute;
+			    box-sizing: border-box;
+			    content: " ";
+			    pointer-events: none;
+			    top: 0%;
+			    right: 10%;
+			    bottom: 0%;
+			    left: 10%;
+			    border: 0 solid #ebedf0;
+				border-color: #646566;
+				border-bottom-width: 1px;
+		}
+		
+		.tui-menu-item:last-child:after {
+				border-bottom-width: 0;
+		}
+	}
+	
+	.voice-box {
+		height: 400rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+		
+		.icon {
+			display: flex;
+			background-color: #3cc9a4;
+			border-radius: 100%;
+			width: 170rpx;
+			height: 170rpx;
+			justify-content: center;
+			align-items: center;
+		}
+		
+		.upload-btn-box {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+		}
+		
+		.upload-btn {
+			font-size: 34rpx;
+			color: #aaa;
+			margin-top: 10px;
+		}
+		
+		.reload-btn {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: absolute;
+			right: 0px;
+			font-size: 30rpx;
+			color: #3cc9a4;
+			
+			.text {
+				margin-left: 4px;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/trend/imgBox.vue b/pages/tabbar/components/trend/imgBox.vue
new file mode 100644
index 0000000..060ed7c
--- /dev/null
+++ b/pages/tabbar/components/trend/imgBox.vue
@@ -0,0 +1,149 @@
+<template>
+	<view>
+		<view class="img-box" v-if="imgList.length == 1">
+			<u-image @click="onPreviewTap(file)" border-radius="10" width="460rpx" height="560rpx" :src="file"></u-image>
+			<!-- #ifdef MP -->
+			<view v-if="isAd" class="lock-box2" @click="onAdPreviewTap(file)">
+				<u-icon name="lock" size="36"></u-icon>
+				<text class="text">观看视频解锁</text>
+			</view>
+			<!-- #endif -->
+		</view>
+		<view class="img-box" v-if="imgList.length > 1">
+		    <block v-for="(img,index) in imgList">
+				<view @click="onPreviewTap(img)" class="img" v-if="index < 2">
+					<u-image border-radius="10" width="270rpx" height="270rpx" :src="img"></u-image>
+				</view>
+			</block>
+			
+			<view class="more" v-if="imgList.length > 2">
+				<u-icon name="photo"></u-icon>
+				<text>+{{imgList.length-2}}</text>
+			</view>
+			
+			<!-- #ifdef MP -->
+			<view v-if="isAd" class="lock-box" @click="onAdPreviewTap(file)">
+				<u-icon name="lock" size="36"></u-icon>
+				<text class="text">观看视频解锁</text>
+			</view>
+			<!-- #endif -->
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			file: {
+			  type: String,
+			  default: ''
+			},
+			ad: {
+			  type: Boolean,
+			  default: false
+			},
+		},
+		data() {
+			return {
+				isAd: this.ad 
+			}
+		},
+		created() {
+			
+		},
+		computed: {
+			imgList() {
+				return this.file.split(',');
+			},
+		},
+		methods: {
+			// 预览图片
+			onPreviewTap(url) {
+				uni.previewImage({
+				    current: url,
+				    urls: this.imgList,
+				})
+			},
+			// 预览图片
+			onAdPreviewTap(url) {
+				this.$emit('preAd', (res)=> {
+				   if(res){
+					   this.isAd = false;
+					   uni.previewImage({
+					       current: url,
+					       urls: this.imgList,
+					   })
+				   }
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.img-box {
+		display: flex;
+		position: relative;
+		width: fit-content;
+		
+		.img {
+			margin-right: 10rpx;
+		}
+		
+		.more {
+			position: absolute;
+			right: 20rpx;
+			bottom: 10rpx;
+			background-color: #333333a6;
+			color: #fff;
+			font-size: 20rpx;
+			padding: 4rpx 14rpx;
+			border-radius: 6rpx;
+		}
+		
+		.lock-box {
+			position: absolute;
+			background-color: #00000094;
+			left: 0;
+			right: 10rpx;
+			bottom: 0;
+			top: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			border-radius: 6rpx;
+			flex-direction: column;
+			
+			.text {
+				font-size: 28rpx;
+				margin-top: 20rpx;
+			}
+		}
+		
+		.lock-box2 {
+			position: absolute;
+			background-color: #00000094;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			top: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			border-radius: 6rpx;
+			flex-direction: column;
+			
+			.text {
+				font-size: 28rpx;
+				margin-top: 20rpx;
+			}
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/trend/layout.vue b/pages/tabbar/components/trend/layout.vue
new file mode 100644
index 0000000..ee38589
--- /dev/null
+++ b/pages/tabbar/components/trend/layout.vue
@@ -0,0 +1,179 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" defaultPageSize="20" use-virtual-list :force-close-inner-list="true" auto-show-back-to-top :paging-style="{ paddingTop: paddingTop + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<nav-bar :title="title" @changeClerk="changeClerk" @tabsChange="tabsChange" @initNav="initNav"></nav-bar>
+			</template>
+			
+			<!-- #ifdef MP -->
+			<view v-if="showSubscribeBtn" class="subscribe-box">
+			  <u-icon name="bell-fill" color="var(--ui-BG-Main)" size="44"></u-icon>
+			  <view class="info">获取实时动态提醒</view>
+			  <view class="sub-btn" @tap="subscribeMessage">立即订阅</view>
+			</view>
+			<!-- #endif -->
+			
+			<user-card v-if="friendEnabled"></user-card>
+			
+			
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<view class="main-box">
+				<post-list :virtualList="virtualList"></post-list>
+			</view>
+			
+			<!-- 自定义返回顶部view -->
+			<template #backToTop>  
+				<custom-back-to-top></custom-back-to-top> 
+			</template> 
+			
+		</z-paging>
+		
+		<fb-popup></fb-popup>
+		<clerk-popup ref="clerk"></clerk-popup>
+	</view>
+</template>
+
+<script>
+	import FbPopup from "@/pages/tabbar/components/trend/fb-popup.vue";
+	import ClerkPopup from "@/pages/tabbar/components/trend/clerk-popup.vue";
+	import NavBar from '@/pages/tabbar/components/trend/navBar.vue';
+	import UserCard from '@/pages/tabbar/components/trend/userCard.vue';
+	import PostList from '@/pages/tabbar/components/trend/postList.vue';
+	import TrendApi from '@/sheep/api/worker/trend'; 
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import sheep from '@/sheep';
+	export default {
+		components: { 
+			NavBar, 
+			FbPopup,
+			ClerkPopup,
+			UserCard,
+			PostList,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			}
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				paddingTop: 0,
+				paddingBottom: 100,
+				height: 0,
+				
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10,
+					userId: null,
+					queryType: '2',
+				},
+				
+				showSubscribeBtn: false,
+			}
+		},
+		computed: {
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+			friendEnabled() {
+				return sheep.$store('user').tradeConfig.friendEnabled
+			},
+		},
+		created() {
+			// #ifdef MP
+			// 订阅只能由用户主动触发，只能包一层 showModal 诱导用户点击
+			this.autoSubscribeMessage();
+			// #endif
+		},
+		methods: {
+			initNav(e) {
+				this.height = e.height;
+				this.paddingTop = this.height;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				this.queryParams.pageNo = pageNo;
+				this.queryParams.pageSize = pageSize;
+				this.queryParams.userId = this.userInfo.id;
+				
+				TrendApi.getTrendPage(this.queryParams).then(res => {
+					// 将请求的结果数组传递给z-paging
+					this.$refs.paging.complete(res.data.list);
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			tabsChange(e) {
+				this.queryParams.queryType = e;
+				this.$refs.paging.reload();
+			},
+			changeClerk() {
+				this.$refs.clerk.showPopup();
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.TREND_APPLY_SUCCESS];
+			  event.push(WxaSubscribeTemplate.CLERK_BLIND);
+			  event.push(WxaSubscribeTemplate.CLERK_ORDER);
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.TREND_APPLY_SUCCESS);
+			    uni.setStorageSync(WxaSubscribeTemplate.TREND_APPLY_SUCCESS, '已订阅');
+			    // 隐藏订阅按钮
+			    this.showSubscribeBtn = false;
+			  });
+			},
+			async autoSubscribeMessage() {
+			  // 1. 校验是否手动订阅过
+			  const subscribeBtnStatus = uni.getStorageSync(WxaSubscribeTemplate.TREND_APPLY_SUCCESS);
+			  if (!subscribeBtnStatus) {
+			    this.showSubscribeBtn = true;
+			    return;
+			  }
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main-box {
+		
+	}
+	
+	.subscribe-box {
+		display: flex;
+		align-items: center;
+		padding: 10px;
+		padding-bottom: 0;
+		justify-content: center;
+		font-size: 28rpx;
+		
+		.info {
+			margin: 0 10rpx;
+		}
+		
+		.sub-btn {
+			color: var(--ui-BG-Main);
+		}
+	}
+</style>
diff --git a/pages/tabbar/components/trend/navBar.vue b/pages/tabbar/components/trend/navBar.vue
new file mode 100644
index 0000000..5fbdf9c
--- /dev/null
+++ b/pages/tabbar/components/trend/navBar.vue
@@ -0,0 +1,131 @@
+<template>
+  <view>
+	 <tui-navigation-bar :isOpacity="false" @init="initNavigation" @change="opacityChange" :scrollTop="scrollTop" backgroundColor="#fff" color="#333">
+	 	<view class="tab-box">
+			<view class="avatar-box" @click="changeClerk">
+				<u-avatar size="44" :src="clerk.avatar"></u-avatar>
+				<view class="icon">
+					<u-icon name="qiehuan1" size="20" color="#fff" custom-prefix="iconfont"></u-icon>
+				</view>
+			</view>
+	 		<view class="zhong">
+	 			<view class="tab-box">
+	 				<view class="title-label" @click="tabsChange" :data-i="i" v-for="(item,i) in tabList" :key="i">
+	 					<text
+	 						:style="{fontWeight:current==i?'bold':'',fontSize:current==i?'36rpx':'28rpx'}">
+	 						{{item.name}}
+	 					</text>
+	 				</view> 
+	 			</view>
+	 		</view>
+	 	</view>
+	 </tui-navigation-bar>
+
+  </view>
+</template>
+
+<script>
+	import tuiNavigationBar from "@/components/thorui/tui-navigation-bar/tui-navigation-bar.vue";
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			tuiNavigationBar,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			},
+		},
+		data() {
+			return {
+				top: 0, //标题图标距离顶部距离
+				opacity: 1,
+				height: 0,
+				scrollTop: 0.5,
+				
+				tabList: [
+					{
+						name: '达人',
+						value: '0',
+					},
+					{
+						name: '最新',
+						value: '2',
+					},
+					{
+						name: '推荐',
+						value: '1',
+					},
+				],
+				current: 1, 
+			}
+		},
+		computed: {
+			clerk: {
+			    get() {
+			      return sheep.$store('sys').currentClerk;
+			    },
+			},
+		},
+		methods: {
+			initNavigation(e) {
+				this.height = e.height;
+				this.opacity = e.opacity;
+				this.top = e.top;
+				this.$emit('initNav', e);
+			},
+			opacityChange(e) {
+				this.opacity = e.opacity;
+			},
+			tabsChange(e) {
+				this.current = e.currentTarget.dataset.i; 
+				this.$emit('tabsChange', this.tabList[this.current].value);
+			},
+			changeClerk() {
+				this.$emit('changeClerk');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.zhong {
+		//width: 230rpx;
+	}
+	
+	.tab-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.avatar-box {
+		display: flex;
+		align-items: center;
+		position: absolute;
+		left: 40rpx;
+		
+		.icon {
+			position: absolute;
+			right: 0;
+			bottom: 0;
+		}
+	}
+	
+	.tab-box .title-label {
+		height: 44px;
+		padding: 0 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		//font-size: 34rpx;
+	}
+	
+	.tab-box .title-label text {
+		transition: all 0.3s;
+	}
+	
+
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/trend/postList.vue b/pages/tabbar/components/trend/postList.vue
new file mode 100644
index 0000000..1b5fe42
--- /dev/null
+++ b/pages/tabbar/components/trend/postList.vue
@@ -0,0 +1,512 @@
+<template>
+  <view>
+	  <view class="item" :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in orderList">
+		  <view class="card">
+		  	<view @click="detail(item)" class="left">
+		  		<view class="avatar-img">
+		  			<u-avatar class="img" :src="item.avatar"></u-avatar>
+		  		</view>
+		  		<!-- <view class="avatar" v-else>
+		  			<image class="img" :src="item.avatar"></image>
+		  			<image class="gif" src="@/static/images/avatar.gif"></image>
+		  		</view> -->
+		  	</view>
+		  	<view class="right">
+		  		<view class="card-header">
+		  			<view class="box3">
+		  				<view class="box1">
+		  					<view class="box2">
+		  						<view class="nickname">{{item.nickname}}</view>
+		  						<view class="sex-box" v-if="item.sex == 1">
+		  							<u-icon name="ziyuan2" custom-prefix="iconfont"></u-icon>
+		  							<view class="age">{{item.age}}</view>
+		  						</view>
+								<view class="sex-box nan" v-if="item.sex == 0">
+									<u-icon name="ziyuan3" custom-prefix="iconfont"></u-icon>
+									<view class="age">{{item.age}}</view>
+								</view>
+		  					</view>
+		  					<view class="tag-list">
+		  						<view class="tag" v-if="item.trendType == 1">Ta是店员</view>
+		  						<view class="tag" v-if="friendEnabled">发布于 {{item.createTimeStr}}</view>
+		  					</view>
+		  				</view>
+		  				<!-- <view class="fans"  @click="fans(item)">
+							<u-icon v-if="item.fans" name="star-fill" size="40"></u-icon>
+							<u-icon v-else name="star" size="40"></u-icon>
+		  				</view> -->
+						<view v-if="item.trendType == 0" class="chat-btn" @click="chat(item)">
+							 <u-icon name="chat" size="28" color="#fff"></u-icon>
+							 <view class="text">密聊</view>
+						</view>
+						<view v-if="item.trendType == 1" class="chat-btn" @click="detail(item)">
+							 <u-icon name="phone" size="28" color="#fff"></u-icon>
+							 <view class="text">下单</view>
+						</view>
+		  			</view>
+		  		</view>
+		  		<view class="card-content"> 
+		  			<view class="text-box">  
+		  				<rich-text :nodes="item.content"></rich-text>
+		  			</view>
+		  		</view>
+		  		<view class="image-box" v-if="item.fileType == 0">
+		  			<img-box @preAd="preAd" :ad="item.adStatus" :file="item.file"></img-box>
+		  		</view>
+				<view class="voice-box" v-if="item.fileType == 1">
+					<voice-play :sec="item.seconds" @tap.stop="playAudio(item)" :isPlay="item.id == playId"></voice-play>
+				</view>
+				<view class="video-box" v-if="item.fileType == 2">
+					<video-box :file="item.file"></video-box>
+				</view>
+		  		<view class="topic-list" v-if="friendEnabled">
+		  			<view class="topic" @click="toCity(item)">
+		  				<u-icon name="map-fill" size="40" color="#3cc9a4"></u-icon>
+		  				<view class="tag-text">{{item.city}}</view>
+						<u-icon name="arrow-right" size="24" color="#3cc9a4"></u-icon>
+		  			</view>
+		  		</view>
+		  		<view class="card-footer">
+		  			<!-- <view class="toolbar">
+		  				<u-icon name="pinglun" size="38" custom-prefix="iconfont"></u-icon>
+		  				<view class="toolbar-text">22</view>
+		  			</view> -->
+		  			<view class="toolbar" @click="thumb(item)">
+						<u-icon v-if="item.like" name="thumb-up-fill" color="var(--ui-BG-Main)" size="40"></u-icon>
+		  				<u-icon v-else name="thumb-up" size="40"></u-icon>
+		  				<view class="toolbar-text" v-if="item.likeNum > 0">{{item.likeNum}}</view>
+						<view class="text" v-else>点赞</view>
+		  			</view>
+		  		</view>
+		  	</view>
+		  </view>
+	  </view>
+	  
+  </view>
+</template>
+
+<script>
+	import dayjs from 'dayjs';
+	import isToday from "dayjs/plugin/isToday";
+	import isYesterday from "dayjs/plugin/isYesterday";
+	dayjs.extend(isToday);
+	dayjs.extend(isYesterday);
+	import ImgBox from '@/pages/tabbar/components/trend/imgBox.vue';
+	import VideoBox from '@/pages/tabbar/components/trend/videoBox.vue';
+	import VoicePlay from '@/pages/tabbar/components/trend/voicePlay.vue';
+	import sheep from '@/sheep';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import adVideoUtils from '@/sheep/util/adVideoUtils'; 
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	import TrendApi from '@/sheep/api/worker/trend'; 
+	const audio = uni.createInnerAudioContext();
+	export default {
+		components: {
+			ImgBox,
+			VideoBox,
+			VoicePlay,
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				playId: null,
+			}
+		},
+		computed: {
+			authType() {
+				return sheep.$store('modal').auth;
+			},
+			orderList() {
+				this.virtualList.forEach((order) => order.createTimeStr = this.showDayTime(order.createTime));
+				return this.virtualList;
+			},
+			tradeConfig() {
+				return sheep.$store('user').tradeConfig;
+			},
+			friendEnabled() {
+				return sheep.$store('user').tradeConfig.friendEnabled
+			},
+		},
+		methods: {
+			showDayTime(datetime) {
+			  if (!datetime) return "";
+			  const weeks = [
+			   "星期日",
+			   "星期一",
+			   "星期二",
+			   "星期三",
+			   "星期四",
+			   "星期五",
+			   "星期六",
+			  ];
+			  // 当天 显示时分
+			  if (dayjs(datetime).isToday()) {
+			    return dayjs(datetime).format("HH:mm");
+			  }
+			  // 昨天 昨天+时分
+			  if (dayjs(datetime).isYesterday()) {
+			    return `昨天 ${dayjs(datetime).format("HH:mm")}`;
+			  }
+			  // 本周 显示周几+时分
+			  if (dayjs().isSame(datetime, "week")) {
+			    const weekIndex = dayjs().day();
+			    return `${weeks[weekIndex]} ${dayjs(datetime).format("HH:mm")}`;
+			  }
+			  // 本周之前 显示年月日
+			  if (dayjs(datetime).isBefore(new Date(), "week")) {
+			    return dayjs(datetime).format("YYYY-MM-DD");
+			  }
+			},
+			playAudio(e) {
+				if(this.playId == e.id){
+					this.playId = null;
+					audio.stop();
+					return;
+				}
+				this.playId = e.id;
+				//语音自然播放结束
+				audio.onEnded((res) => {
+					this.playId = null;
+				});
+				audio.src = e.file;
+				audio.play();
+			},
+			thumb(e) {
+				TrendApi.createTrendLike({
+					trendId: e.id,
+				}).then((res) => {
+					if(res) {
+						if(e.like){
+							e.like = false;
+							e.likeNum = e.likeNum-1;
+							sheep.$helper.toast('取消点赞');
+						}else{
+							e.like = true;
+							e.likeNum = e.likeNum+1;
+							sheep.$helper.toast('点赞成功');
+						}
+					}
+				});
+			},
+			preAd(run) {
+				adVideoUtils.videoAdInit(this.tradeConfig.adUnitId);
+				adVideoUtils.videoAdShow()
+				.then((res) => {
+				  if (res) {
+					run(true);
+				  } else {
+					console.log('广告提前退出')
+					run(false);
+				  }
+				})
+				.catch((err) => {
+					console.log('广告加载失败')
+					run(false);
+				});  
+			},
+			fans(e) {
+				TrendApi.createClerkFans({
+					workerClerkId: e.workerClerkId,
+				}).then((res) => {
+					if(res){
+						if(e.fans){
+							sheep.$helper.toast('取消收藏');
+							e.fans = false;
+						}else{
+							sheep.$helper.toast('收藏成功');
+							e.fans = true;
+						}
+					}
+				});
+			},
+			detail(e) {
+				if(e.workerClerkId){
+					this.$u.route({
+						url: 'pages/clerk/detail/index',
+						params: {
+							id: e.workerClerkId,
+						}
+					});
+				}else{
+					sheep.$router.go('/pages/user/detail/index',{id: e.userId});
+				}
+			},
+			toCity(e) {
+				this.$u.route({
+					url: 'pages/trend/city/list',
+					params: {
+						city: e.city,
+					}
+				});
+			},
+			chat(e) {
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				
+				const userInfo = sheep.$store('user').userInfo;
+				// 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。
+				if(userInfo.visible) {
+					// #ifdef MP-WEIXIN
+					this.subscribeMessage();
+					// #endif
+					
+					ImConversationApi.createMemberConversation({
+						userId: e.userId,
+						groupType: 1,
+						lastMessageContentType: 1,
+					}).then(res => {
+						if(res.data){
+							sheep.$router.go('/pages/im/index',{groupId: res.data, receiveUserId: e.userId});
+						}
+					});
+					return;
+				}
+				// 触发小程序授权信息弹框
+				// #ifdef MP-WEIXIN
+				showAuthModal('mpAuthorization');
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				showAuthModal('h5Authorization');
+				// #endif
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			    uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+			  });
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item {
+		display: flex;
+		flex-direction: column;
+		padding: 0 30rpx;
+		margin-bottom: 30rpx;
+	}
+	
+	.card {
+		padding: 30rpx 0;
+		border-bottom: 1rpx solid #eeeeee;
+		padding-top: 0;
+		display: flex;
+		
+		.right {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+			padding-top: 10px;
+		}
+	}
+	
+	.avatar-img{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 8rpx;
+		
+		.img {
+			width: 100%;
+			height: 100%;
+			border-radius: 100%;
+		}
+	}
+	
+	.avatar{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.img {
+			width: 75%;
+			height: 75%;
+			border-radius: 100%;
+		}
+		.gif {
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	
+	.card-header {
+		display: flex;
+		align-items: center;
+		
+		.box1 {
+			.tag-list {
+				display: flex;
+				align-items: center;
+				font-size: 22rpx;
+				color: #666666;
+				margin-top: 4rpx;
+				
+				.tag::after {
+				  content: '·';
+				  padding: 0 10rpx; /* 添加一些间隔 */
+				}
+				
+			}
+			
+			.tag-list .tag:last-child::after {
+				content: unset;
+			}
+		}
+		
+		.box2 {
+			display: flex;
+			align-items: center;
+			line-height: 40rpx;
+			
+			.nickname {
+				font-size: 28rpx;
+				color: #333333;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+				max-width: 200rpx;
+			}
+			
+			.sex-box {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background-color: #d06b8d1f;
+				border-radius: 20px;
+				font-size: 20rpx;
+				padding: 4rpx 10rpx;
+				color: #d06b8d;
+				line-height: 24rpx;
+				margin: 0 5px;
+				
+				.age {
+					margin-left: 2px;
+				}
+			}
+			
+			.nan {
+				background-color: #007aff1a;
+				color: #007aff;
+			}
+		}
+		
+		.box3 {
+			display: flex;
+			justify-content: space-between;
+			flex: 1;
+			align-items: center;
+		}
+		
+		.fans {
+			width: 60rpx;
+			display: flex;
+			justify-content: flex-end;
+			height: 60rpx;
+			align-items: center;
+			color: var(--ui-BG-Main);
+			font-size: 24rpx;
+			padding-right: 3px;
+		}
+		
+		.chat-btn {
+			display: flex;
+			align-items: center;
+			background-color: var(--ui-BG-Main);
+			justify-content: center;
+			border-radius: 40px;
+			color: #fff;
+			font-size: 22rpx;
+			padding: 5px;
+			
+			.text {
+				margin-left: 2px;
+			}
+		}
+	}
+	
+	.card-content {
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		
+		.text-box {
+			font-size: 26rpx;
+			line-height: 180%;
+			white-space: pre-wrap;
+			letter-spacing: 2rpx;
+		}
+	}
+	
+	.topic-list { 
+		display: flex;
+		align-items: center;
+		margin-top: 10px;
+		
+		.topic {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 28rpx;
+			margin-right: 20rpx;
+			color: var(--ui-BG-Main);
+			font-weight: bold;
+			
+			.tag-text {
+				margin-left: 2px;
+			}
+		}
+	}
+	
+	.card-footer {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 30rpx;
+		
+		.toolbar {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			color: #666666;
+			width: 80rpx;
+			height: 40rpx;
+			flex: 1;
+		}
+		
+		.toolbar-text {
+			font-size: 26rpx;
+			margin-left: 5px;
+		}
+		
+		.text {
+			font-size: 24rpx;
+			margin-left: 5px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/trend/userCard.vue b/pages/tabbar/components/trend/userCard.vue
new file mode 100644
index 0000000..d8f58e3
--- /dev/null
+++ b/pages/tabbar/components/trend/userCard.vue
@@ -0,0 +1,190 @@
+<template>
+	<view class="user-card-box">
+		<view class="user-card">
+			<view class="title">
+				<view class="icon">
+					<u-icon name="huo" custom-prefix="iconfont" size="20" color="#aaa"></u-icon>
+				</view>
+				<text class="text">置顶用户</text>
+			</view>
+			<scroll-view class="scroll-box" scroll-x>
+				<view class="user-swiper">
+					
+					<view @click="detail(item)" class="user-box" v-for="(item,i) in hotList">
+						<view class="avatar-box">
+							<u-avatar mode="square" size="140" :src="item.avatar"></u-avatar>
+							<view v-if="item.onlineStatus" class="badge"></view>
+							<view class="count-down">
+								<u-count-down :timestamp="item.timestamp" format="HH时mm分ss秒"></u-count-down>
+							</view>
+						</view>
+						<view class="nickname">{{item.nickname}}</view>
+					</view>
+					
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	import UserApi from '@/sheep/api/member/user';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				hotList: [],
+			}
+		},
+		created() {
+			this.getHomeData();
+		},
+		methods: {
+			getHomeData() {
+				UserApi.getHomeData().then(res => {
+					this.hotList = res.data.memberHotList;
+					
+					this.hotList.forEach((order) => order.timestamp = order.slashedTime ? sheep.$helper.parseTimeData(order.slashedTime) : 0);
+				});
+			},
+			detail(e) {
+				sheep.$router.go('/pages/user/detail/index',{id: e.id});
+			},
+			chat(e) {
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				
+				const userInfo = sheep.$store('user').userInfo;
+				// 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。
+				if(userInfo.visible) {
+					// #ifdef MP-WEIXIN
+					this.subscribeMessage();
+					// #endif
+					ImConversationApi.createMemberConversation({
+						userId: e.id,
+						groupType: 1,
+						lastMessageContentType: 1,
+					}).then(res => {
+						if(res.data){
+							sheep.$router.go('/pages/im/index',{groupId: res.data, receiveUserId: e.id});
+						}
+					});
+					return;
+				}
+				// 触发小程序授权信息弹框
+				// #ifdef MP-WEIXIN
+				showAuthModal('mpAuthorization');
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				showAuthModal('h5Authorization');
+				// #endif
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			    uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+			  });
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.user-card-box {
+		background-color: #fff;
+		border-radius: 10px;
+	}
+	
+	.user-card {
+		padding: 10px 0;
+		
+		.title {
+			padding: 10px;
+			padding-top: 0;
+			padding-left: 20px;
+			font-size: 28rpx;
+			font-weight: bold;
+			display: flex;
+			align-items: center;
+			padding-bottom: 15px;
+			
+			.icon {
+				background-color: #ddd;
+				width: 36rpx;
+				height: 36rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 100%;
+			}
+			
+			.text {
+				margin-left: 4px;
+			}
+		}
+		
+		.user-swiper {
+			display: flex;
+				
+			.avatar-box {
+				margin-bottom: 5px;
+				position: relative;
+				
+				.badge {
+					width: 30rpx;
+					height: 30rpx;
+					background-color: var(--ui-BG-Main);
+					position: absolute;
+					right: 0;
+					bottom: 0;
+					border-radius: 100%;
+					border: 2px solid #fff;
+				}
+				
+				.count-down {
+					font-size: 20rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+			}
+			
+			.user-box {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				margin-left: 10px;
+				
+				.nickname {
+					font-size: 28rpx;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					max-width: 140rpx;
+					text-align: center;
+					line-height: 28rpx;
+				}
+			}
+		}
+		
+		.user-swiper .user-box:first-child{
+			margin-left: 20px;
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/trend/videoBox.vue b/pages/tabbar/components/trend/videoBox.vue
new file mode 100644
index 0000000..10f336d
--- /dev/null
+++ b/pages/tabbar/components/trend/videoBox.vue
@@ -0,0 +1,44 @@
+<template>
+	<view class="video-box">
+		<video :autoplay="false" :src="file" :show-fullscreen-btn="true"></video>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			file: {
+			  type: String,
+			  default: ''
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		created() {
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.video-box {
+		width: 460rpx;
+		height: 560rpx;
+	}
+	
+	.video-box video {
+		width: 100%;
+		height: 100%;
+		border-radius: 10rpx;
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/components/trend/voicePlay.vue b/pages/tabbar/components/trend/voicePlay.vue
new file mode 100644
index 0000000..6720241
--- /dev/null
+++ b/pages/tabbar/components/trend/voicePlay.vue
@@ -0,0 +1,184 @@
+<template>
+	<view class="voice-btn" @click="playBtn" :class="play?'audioplaying':''">
+		<img class="play-btn" src="@/static/images/audio.png"></img>
+		<view class="audio-box">
+			<view class="audio1 wave1"></view>
+			<view class="audio2 wave2"></view> 
+			<view class="audio3 wave3"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio1 wave1"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio3 wave3"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio1 wave1"></view>
+			<view class="audio2 wave2"></view>
+			<view class="audio3 wave3"></view>
+			<view class="audio2 wave2"></view>
+		</view>
+		<view>{{sec}}"</view>
+	</view>
+</template>
+<script>
+export default {
+	emits: ['playAudio'],
+	props: {
+		isPlay: {
+			type: [Boolean],
+			default: false 
+		},
+		sec: {
+			type: Number,
+			default: 0
+		},
+	},
+	data() {
+		return {
+			play: false,
+		};
+	},
+	watch: {
+		isPlay: {
+			handler(newVal) {
+				this.play = newVal;
+			},
+			immediate: true
+		},
+	},
+	methods: {
+		playBtn() {
+			/* if(this.play){
+				this.play = false;
+			}else{
+				this.play = true;
+			} */
+			this.$emit('playAudio');
+		},
+	}
+};
+</script>
+<style lang="scss" scoped>
+view{
+	box-sizing: border-box;
+}
+.voice-btn {
+	background-color: #3cc9a4;
+	width: 340rpx;
+	border-radius: 20px;
+	padding: 16rpx 10rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	color: #fff;
+	font-size: 24rpx;
+}
+
+.play-btn {
+	width: 40rpx;
+	height: 40rpx;
+}
+
+.audio-box {
+	height: 34rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.audio1{
+    margin-right: 8rpx;
+	width: 6rpx;
+	height: 33.3%;
+	border-radius: 50px;
+	background-color: #fff;
+}
+
+.audio2{
+	margin-right: 8rpx;
+	width: 6rpx;
+	height: 66.6%;
+	border-radius: 50px;
+	background-color: #fff;
+}
+
+.audio3{
+	margin-right: 8rpx;
+	width: 6rpx;
+	height: 100%;
+	border-radius: 50px;
+	background-color: #fff;
+}
+
+.audioplaying .wave1 {
+	animation: wave1 1s linear 0s infinite;
+}
+
+.audioplaying .wave2 {
+	animation: wave2 1s linear 0s infinite;
+}
+
+.audioplaying .wave3 {
+	animation: wave3 1s linear 0s infinite;
+}
+
+@keyframes wave1{
+  0% {
+      width: 6rpx;
+      height: 33%;
+  }
+  25% {
+      width: 6rpx;
+      height: 66%;
+  }
+  50% {
+      width: 6rpx;
+      height: 100%;
+  }
+  75% {
+      width: 6rpx;
+      height: 66%;
+  }
+  100% {
+      width: 6rpx;
+      height: 33%;
+  }
+}
+
+@keyframes wave2{
+  0% {
+      width: 6rpx;
+      height: 66%;
+  }
+  25% {
+      width: 6rpx;
+      height: 33%;
+  }
+  50% {
+      width: 6rpx;
+      height: 66%;
+  }
+  75% {
+      width: 6rpx;
+      height: 100%;
+  }
+  100% {
+      width: 6rpx;
+      height: 66%;
+  }
+}
+
+@keyframes wave3{
+  0% {
+      width: 6rpx;
+      height: 100%;
+  }
+  50% {
+      width: 6rpx;
+      height: 33%;
+  }
+  100% {
+      width: 6rpx;
+      height: 100%;
+  }
+}
+
+</style>
diff --git a/pages/tabbar/home.vue b/pages/tabbar/home.vue
new file mode 100644
index 0000000..f237486
--- /dev/null
+++ b/pages/tabbar/home.vue
@@ -0,0 +1,244 @@
+<template>
+	<view class="container"> 
+		<view class="content">
+			<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+			<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+			<z-paging ref="paging" :auto="false" defaultPageSize="20" use-virtual-list :force-close-inner-list="true" :paging-style="{ paddingTop: paddingTop + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @virtualListChange="virtualListChange" @query="queryList">
+				<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+				<template #top>
+					<nav-bar :tabList="tabList" @initNav="initNav" @change="change"></nav-bar>
+				</template> 
+				
+				<peiwan @tabClick="tabClick" @search="search" @categoryClick="categoryClick" v-if="tabType == 'peiwan'" :stickyTop="paddingTop" :scrollTop="scrollTop" :virtualList="virtualList"></peiwan>
+				<friend @tabClick="tabClick" @search="search" v-if="tabType == 'friend'" :stickyTop="paddingTop" :scrollTop="scrollTop" :virtualList="virtualList"></friend>
+			
+			</z-paging>
+			
+			<sex-sheet ref="sexSheet" @sexOk="sexOk"></sex-sheet>
+			<su-region-picker :show="cityShow" @cancel="cityShow = false" @confirm="cityOk" />
+			<category-sheet ref="categorySheet" @categoryOk="categoryOk"></category-sheet>
+		</view>
+	</view>
+</template>
+  
+<script>
+	import NavBar from '@/pages/tabbar/components/home/navBar.vue';
+	import peiwan from '@/pages/tabbar/components/home/peiwan.vue';
+	import friend from '@/pages/tabbar/components/home/friend.vue';
+	import SexSheet from '@/pages/tabbar/components/home/sexSheet.vue';
+	import CategorySheet from '@/pages/tabbar/components/home/categorySheet.vue';
+	import sheep from '@/sheep';
+	import ClerkApi from '@/sheep/api/worker/clerk';
+	import UserApi from '@/sheep/api/member/user';
+	import TradeConfigApi from '@/sheep/api/trade/config';
+	export default {
+		components: {
+			NavBar,
+			peiwan,
+			friend,
+			SexSheet,
+			CategorySheet,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 100,
+				height: 0,
+				
+				cityShow: false,
+				params: {
+					province: true,
+					city: true,
+					area: false
+				},
+				
+				tabList: [
+				{
+					name: '达人',
+					enabled: false,
+					type: 'peiwan',
+				},{
+					name: '交友',
+					enabled: false,
+					type: 'friend',
+				},],
+				
+				tabType: '',
+				
+				queryParams: {
+					pageNo: 1,
+					pageSize: 20,
+					sex: '',
+					city: '',
+					isCity: 1,
+					maxAge: 50,
+					minAge: 18,
+					keyword: '',
+					categoryId: '',
+				},
+			}
+		},
+		computed: {
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+			current: {
+				get() { 
+				  return sheep.$store('sys').homeTabIndex;
+				},
+			},
+		},
+		created() {
+			this.getTradeConfig();
+		},
+		methods: {
+			initNav(e) {
+				this.height = e.height;
+				this.paddingTop = this.height;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				this.queryParams.pageNo = pageNo;
+				this.queryParams.pageSize = pageSize;
+				this.queryParams.userId = this.userInfo.id;
+				this.getDataPageList(this.queryParams);
+			},
+			getDataPageList(params) {
+				switch(this.tabType){
+					case 'peiwan':
+						ClerkApi.getClerkPage(params).then(res => {
+							this.queryParams.keyword = '';
+							// 将请求的结果数组传递给z-paging
+							this.$refs.paging.complete(res.data.list);
+						}).catch(res => {
+							// 如果请求失败写this.$refs.paging.complete(false);
+							// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+							// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+							this.$refs.paging.complete(false);
+						});
+					break;
+					case 'friend':
+						if(this.queryParams.sex == ''){
+							params.sex = this.userInfo.sex;
+						}
+						UserApi.getUserPage(params).then(res => {
+							this.queryParams.keyword = '';
+							// 将请求的结果数组传递给z-paging
+							this.$refs.paging.complete(res.data.list);
+						}).catch(res => {
+							// 如果请求失败写this.$refs.paging.complete(false);
+							// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+							// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+							this.$refs.paging.complete(false);
+						});
+					break;
+					case 2:
+					break;
+				}
+			},
+			change(e) {
+				sheep.$store('sys').setHomeTabIndex(e);
+				this.tabChange();
+				this.scrollTop = 0;
+				this.queryParams.sex = "";
+				sheep.$store('sys').setSexLabel("性别");
+				sheep.$store('sys').setSex2Label("性别");
+				this.$refs.paging.reload();
+			},
+			tabChange() {
+				this.tabList = this.tabList.filter(function(tab) {
+				    return tab.enabled;
+				}); 
+				if(this.tabList[this.current]){
+					this.tabType = this.tabList[this.current].type;
+				}else{
+					sheep.$store('sys').setHomeTabIndex(0);
+					this.tabType = this.tabList[0].type;
+				}
+			}, 
+			getTradeConfig() {
+				TradeConfigApi.getTradeConfig().then(res => {
+					this.tabList[0].enabled = res.data.peiwanEnabled;
+					this.tabList[1].enabled = res.data.friendEnabled;
+					this.tabChange();
+					this.$refs.paging.reload();
+				});
+			},
+			tabClick(e) {
+				if('city' == e){
+					this.cityShow = true;
+				}else if('sex2' == e){ 
+					this.$refs.sex2Sheet.openActionSheet();
+				}else if('sex' == e){ 
+					this.$refs.sexSheet.openActionSheet();
+				}else if('category' == e){
+					this.$refs.categorySheet.openActionSheet();
+				}else if('level' == e){
+					
+				}
+			},
+			search(e) {
+				this.queryParams.keyword = e;
+				this.$refs.paging.reload();
+			},
+			categoryOk(e) {
+				sheep.$store('sys').setCategoryLabel(e.label);
+				this.queryParams.categoryId = e.value;
+				this.$refs.paging.reload();
+			},
+			cityOk(e) {
+				this.cityShow = false;
+				this.queryParams.city = e.city_name;
+				sheep.$store('sys').setCityLabel(e.city_name);
+				this.$refs.paging.reload();
+			},
+			categoryClick(e) {
+				sheep.$store('sys').setCategoryLabel(e.name);
+				this.queryParams.categoryId = e.id;
+				this.$refs.paging.reload();
+			},
+			sexOk(e) {
+				sheep.$store('sys').setSexLabel(e.label);
+				this.queryParams.sex = e.value;
+				this.$refs.paging.reload();
+			},
+			sex2Ok(e) {
+				sheep.$store('sys').setSex2Label(e.label);
+				this.queryParams.sex = e.value;
+				this.$refs.paging.reload();
+			},
+			queryUser(e) {
+				this.queryParams.sex = e.sex;
+				this.queryParams.isCity = e.isCity;
+				this.queryParams.maxAge = e.maxAge;
+				this.queryParams.minAge = e.minAge;
+				this.queryParams.city = e.city;
+				this.$refs.paging.reload();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background-color: #fafafa;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/index.vue b/pages/tabbar/index.vue
new file mode 100644
index 0000000..73b8995
--- /dev/null
+++ b/pages/tabbar/index.vue
@@ -0,0 +1,395 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<view v-if="currentIndex === 0" :style="{display: currentIndex === 0 ? '' : 'none'}">
+			<home ref="home"></home>
+		</view>
+		<view v-if="currentIndex === 1" :style="{display: currentIndex === 1 ? '' : 'none'}">
+			<trend></trend>
+		</view>  
+		<view v-if="currentIndex === 2" :style="{display: currentIndex === 2 ? '' : 'none'}">
+			<message></message>
+		</view>
+		<view v-if="currentIndex === 3" :style="{display: currentIndex === 3 ? '' : 'none'}">
+			<mine></mine>
+		</view>
+		<tui-tabbar zIndex="997" :current="currentIndex"  backdropFilter backgroundColor="#fff" :tabBar="tabbarList" color="#333" selectedColor="#aaaaaa" @click="tabbarSwitch"></tui-tabbar>
+	
+	
+		<view class="svga-box" :class="giftFlag ? 'svga-show': 'svga-hide'">
+			<c-svga ref="cSvgaRef" :canvasId='canvasId' :src="src" :loops='1' :auto-play="false" @frame='onFrame' @finished='onFinished' @percentage='onPercentage' @loaded='onLoaded'></c-svga>
+			<view class="close-btn" @click="closeSvga">
+				<view class="bottom-box">
+					<view class="title">
+						<text class="username">{{gift.username}}</text>
+						<text class="unit">赠送</text>
+						<text class="nickname">{{gift.nickname}}</text>
+						<text class="name">{{gift.name}}</text>
+						<text class="count">x{{gift.count}}</text>
+					</view>
+					<view class="btn-box">
+						<view class="btn" @click="cannel">关闭</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<s-auth-modal />
+		<qrcode-modal />
+		<search-modal @query="query" />
+	</view>
+</template>
+ 
+<script>
+import home from "@/pages/tabbar/home.vue"
+import trend from "@/pages/tabbar/trend.vue"
+import message from "@/pages/tabbar/message.vue"
+import mine from "@/pages/tabbar/mine.vue"
+import RewardApi from '@/sheep/api/worker/reward';
+import TradeConfigApi from '@/sheep/api/trade/config';
+import qrcodeModal from '@/components/qrcode-modal/qrcode-modal.vue';
+import searchModal from '@/components/search-modal/search-modal.vue';
+import sheep from '@/sheep';
+import $share from '@/sheep/platform/share';
+import _ from 'lodash-es';
+import AreaApi from '@/sheep/api/system/area';
+import tuiTabbar from "@/components/thorui/tui-tabbar/tui-tabbar.vue"
+export default {  
+	components: { 
+		home,
+		trend,
+		message,
+		mine,
+		searchModal,
+		qrcodeModal,
+		tuiTabbar
+	},  
+	data() {
+		return {
+			tabberPageLoadFlag: [],  
+			currentIndex: 0,
+			tabbarList: [
+				{
+					pagePath: '/pages/chat/chat',
+					text: '首页',
+					iconPath: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/5c3dd70b602fa866a431e42cf23a584f12da91dd9675468090f69d1f74fac11f.png', 
+					selectedIconPath: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/d3803064e60b0e2a0610b62bb48f0ff5c75c8c08bcd090d09bc9f67cb51e7ed9.png'
+				},
+				{
+					pagePath: '/pages/chat/chat',
+					text: '动态',
+					iconPath: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/e7f56870666bea98fef3e9323773b37e5dccfe48db51dcd63e306b1c8f400605.png',
+					selectedIconPath: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/3ef2198fcbb01321b59b822292345e75a58c32e6d2504238fd4675b4a529be51.png'
+				},
+				{
+					pagePath: '',
+					text: '滴滴', 
+					iconPath: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/810802ecdce16ff51b71d1d3de894350062ca9c1ee148053dd0c80db301c23e8.png',
+					selectedIconPath: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/52e3b3bb2a3cc4dd003b4024f21b2d28a5844cd5c3ffb636a6858d9c6c09e610.png'
+				},
+				/* {
+					pagePath: '', 
+					text: '消息',
+					num: 2,
+					isDot: true,
+					iconPath: '/static/tabbar/find.png',
+					selectedIconPath: '/static/tabbar/find_cur.png'
+				}, */
+				{
+					pagePath: '/pages/tabbar/my/my',
+					text: '我的',
+					iconPath: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/6c4098dbe1982ad7d6ee23f46e28bc21d4abc22fcdb42f75a9fe58da0a53c8cd.png',
+					selectedIconPath: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/a1c7d19aa554fed74be5ecaba6545633c7e3f4f6c36d68b3b61213ba28233621.png',
+					verify: false
+				}
+			],
+			
+			
+			giftFlag: false,
+			src: '',
+			canvasId: 'myCanvas',
+		};
+	},
+	// 分享小程序
+	onShareAppMessage(res) {
+		return {
+			title: this.shareInfo.title,
+			path: this.shareInfo.path,
+			imageUrl: this.shareInfo.image,
+		};
+	},
+	onShareTimeline() {
+		return {
+			title: this.shareInfo.title,
+			path: this.shareInfo.path,
+			imageUrl: this.shareInfo.image,
+		}
+	},
+	onLoad(options) {
+		this.initData(options);
+		
+		this.getGiftList();
+		
+		this.getTradeConfig();
+		
+		this.getAreaData();
+		
+		const index = Number(options.index || this.currentIndex);
+		this.currentIndex = index;
+		// 根据底部tabbar菜单列表设置对应页面的加载情况
+		this.tabberPageLoadFlag = this.tabbarList.map((item, tabbar_index) => {
+			return index === tabbar_index
+		})
+	},
+	computed: {
+		gift() {
+			return sheep.$store('sys').gift;
+		},
+		shareInfo() {
+			return sheep.$platform.share.getShareInfo();
+		},
+		isLogin: {
+			get() {
+			  return sheep.$store('user').isLogin;
+			},
+		},
+		userInfo: {
+		    get() {
+		      return sheep.$store('user').userInfo;
+		    },
+		},
+		friendEnabled() {
+			return sheep.$store('user').tradeConfig.friendEnabled
+		},
+		clerk() {
+			return sheep.$store('sys').currentClerk;
+		},
+	},
+	methods: {
+		initData(options) {
+			// #ifdef MP
+			// 小程序识别二维码
+			if (options.scene) {
+				const sceneParams = decodeURIComponent(options.scene).split('=');
+				console.log("sceneParams=>",sceneParams);
+				options[sceneParams[0]] = sceneParams[1];
+			}
+			// 小程序场景值
+			const config = uni.getLaunchOptionsSync();
+			if(config.scene){
+				sheep.$store('sys').setScene(config.scene);
+			}
+			// #endif
+	
+			// 预览模板
+			if (options.templateId) {
+				sheep.$store('app').init(options.templateId);
+			}
+	
+			// 解析分享信息
+			if (options.spm) {
+				$share.decryptSpm(options.spm);
+			}
+	
+			// 进入指定页面(完整页面路径)
+			if (options.page) {
+				sheep.$router.go(decodeURIComponent(options.page));
+			}
+		},
+		tabbarSwitch(e) {
+			//获取登录状态，此处默认未登录
+			//跳转切换逻辑需自行实现
+			let isLogin = false;
+			if (e.verify && !isLogin) {
+				this.$u.toast('您还未登录，请先登录');
+			} else {
+				this.tabberPageLoadFlag[e.index] = true
+				this.currentIndex = e.index;
+				this.getGiftList();
+				this.getTradeConfig();
+			}
+		},
+		onFinished() {
+			this.giftFlag = false;
+			console.log('动画停止播放时回调');
+		},
+		onFrame(frame) {//动画播放至某帧后回调
+			// console.log(frame);
+		},
+		onPercentage(percentage) { //动画播放至某进度后回调
+			// console.log(percentage);
+		},
+		onLoaded() {
+			this.$refs.cSvgaRef.call('setContentMode', 'AspectFill');
+			console.log('加载完成');
+			this.$refs.cSvgaRef.call('startAnimation');
+		},
+		closeSvga() {
+			this.src = "";
+			this.$refs.cSvgaRef.call('stopAnimation');
+			this.giftFlag = false;
+		},
+		fen2yuan(price) {
+		  var f = 0;
+		  var p = (price / 100.0).toFixed(0);
+		  var p1 = (price / 100.0).toFixed(1);
+		  var p2 = (price / 100.0).toFixed(2);
+		  if(p*100 == price){
+			f = 0;  
+		  }else if(p1*100 == price){
+			  f = 1;
+		  }else if(p2*100 == price){
+			  f = 2;
+		  }
+		  return (price / 100.0).toFixed(f)
+		},
+		cannel() {
+			this.closeSvga();
+		},
+		ok() {
+			this.closeSvga();
+		},
+		sendGift(e) {
+			if(e.giftType != 1){
+				// 普通礼物不播放
+				return;
+			}
+			sheep.$store('sys').setGift(e);
+			
+			this.src = e.pic;
+			this.giftFlag = true;
+		},
+		getGiftList() {
+			RewardApi.getTopList().then(res => {
+				var gift = res.data[0];
+				if(gift){
+					if(this.gift.id != gift.id){
+						// 播放特效
+						this.sendGift(gift);
+					}
+					sheep.$store('sys').setGiftList(res.data);
+				}
+			});
+		},
+		getTradeConfig() {
+			TradeConfigApi.getTradeConfig(this.userInfo.id).then(res => {
+				sheep.$store('user').setTradeConfig(res.data);
+			});
+		},
+		// 获得地区数据
+		getAreaData() {
+			if (_.isEmpty(uni.getStorageSync('areaData'))) {
+			  AreaApi.getAreaTree().then((res) => {
+				if (res.code === 0) {
+				  uni.setStorageSync('areaData', res.data);
+				}
+			  });
+			}
+		},
+		query(e) {
+			this.$refs.home.queryUser(e);
+		},
+		 
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.svga-box {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999999999;
+		width: 100%;
+		height: 100%;
+		background-color: black;
+		
+		.close-btn {
+			color: #fff;
+			position: absolute;
+			z-index: 999999999;
+			padding: 5px 10px;
+			
+			left: 0;
+			right: 0;
+			bottom: 100rpx;
+			
+			.bottom-box {
+				display: flex;
+				justify-content: center;
+				flex-direction: column;
+				align-items: center;
+				
+				.title {
+					font-size: 28rpx;
+					margin-bottom: 5px;
+					
+					.username {
+						color: pink;
+					}
+					
+					.unit {
+						margin: 10rpx;
+					}
+					
+					.nickname {
+						color: pink;
+					}
+					
+					.name {
+						color: yellow;
+						margin: 10rpx;
+					}
+					
+					.count {
+						font-size: 24px;
+					}
+					
+				}
+				
+				.price {
+					font-size: 24rpx;
+				}
+				
+				.btn-box {
+					display: flex;
+					align-items: center;
+					margin-top: 10px;
+					
+					.btn {
+						border: 1px solid #fff;
+						font-size: 28rpx;
+						padding: 20rpx 110rpx;
+						border-radius: 40px;
+						margin: 15px;
+						color: #fff;
+					}
+					
+					.active {
+						border: 1px solid var(--ui-BG-Main);
+						background-color: var(--ui-BG-Main);
+					}
+				}
+			}
+		}
+	}
+	
+	.svga-hide {
+		/* #ifdef MP */
+		transform: translate(-100%, 0);
+		/* #endif */
+		
+		/* #ifndef MP */
+		display: none;
+		/* #endif */
+	}
+	
+	.svga-show {
+		/* #ifdef MP */
+		transform: translate(0, 0);
+		/* #endif */
+		
+		/* #ifndef MP */
+		display: block;
+		/* #endif */
+	}
+</style>
diff --git a/pages/tabbar/message.vue b/pages/tabbar/message.vue
new file mode 100644
index 0000000..0a63119
--- /dev/null
+++ b/pages/tabbar/message.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="container"> 
+		<view class="content">
+			<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+			<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+			<z-paging ref="paging" :auto="false" defaultPageSize="20" use-virtual-list :auto-clean-list-when-reload="false" :force-close-inner-list="true" :paging-style="{ paddingTop: paddingTop + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @virtualListChange="virtualListChange" @query="queryList">
+				<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+				<template #top>
+					<nav-bar :tabList="tabList" @initNav="initNav" @change="change"></nav-bar>
+				</template>
+				
+				<friend v-if="tabType == 'friend'" :virtualList="virtualList" @reload="reload"></friend>
+				<peiwan v-if="tabType == 'peiwan'"></peiwan>
+				
+				<!-- 自定义没有更多数据view -->
+				<template #empty v-if="showLoad">
+					<view></view>
+				</template>
+				<!-- 自定义没有更多数据view -->
+				<template #loadingMoreNoMore v-if="showLoad">
+					<view></view>
+				</template>
+			</z-paging>
+			
+			
+		</view>
+	</view>
+</template>
+  
+<script>
+	import NavBar from '@/pages/tabbar/components/message/navBar.vue';
+	import friend from '@/pages/tabbar/components/message/friend.vue';
+	import peiwan from '@/pages/tabbar/components/message/peiwan.vue';
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	import TradeConfigApi from '@/sheep/api/trade/config';
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			NavBar, 
+			friend,
+			peiwan,
+		},
+		data() {
+			return {
+				tabList: [
+				{
+					name: '达人',
+					enabled: false,
+					type: 'peiwan',
+				},{
+					name: '交友',
+					enabled: false,
+					type: 'friend',
+				},],
+				
+				tabType: '',
+				
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				
+				paddingTop: 0,
+				paddingBottom: 100,
+			}
+		},
+		created() {
+			this.getTradeConfig();
+		},
+		computed: {
+			showLoad() {
+				return this.tabType == 'peiwan';
+			},
+			current: {
+				get() { 
+				  return sheep.$store('sys').messageTabIndex;
+				},
+			},
+		},
+		methods: {
+			initNav(e) {
+				this.height = e.height;
+				this.paddingTop = this.height;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				if(this.tabType == 'peiwan'){
+					this.$refs.paging.complete(true);
+					return;
+				}
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					random: this.tabIndex === 1
+				}
+				ImConversationApi.getMemberConversationPage(params).then(res => {
+					// 将请求的结果数组传递给z-paging
+					this.$refs.paging.complete(res.data.list);
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			change(e) {
+				sheep.$store('sys').setMessageTabIndex(e);
+				this.tabChange();
+			},
+			tabChange() {
+				this.tabList = this.tabList.filter(function(tab) {
+				    return tab.enabled;
+				}); 
+				if(this.tabList[this.current]){
+					this.tabType = this.tabList[this.current].type;
+				}else{
+					sheep.$store('sys').setMessageTabIndex(0);
+					this.tabType = this.tabList[0].type;
+				}
+			}, 
+			reload() {
+				this.$refs.paging.reload();
+			},
+			getTradeConfig() {
+				TradeConfigApi.getTradeConfig().then(res => {
+					this.tabList[0].enabled = res.data.peiwanEnabled;
+					this.tabList[1].enabled = res.data.friendEnabled;
+					this.tabChange(); 
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background-color: #fafafa;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/mine.vue b/pages/tabbar/mine.vue
new file mode 100644
index 0000000..ec77f11
--- /dev/null
+++ b/pages/tabbar/mine.vue
@@ -0,0 +1,38 @@
+<template>
+	<view class="container"> 
+		<layout>
+			
+		</layout>
+	</view>
+</template>
+  
+<script>
+	import layout from '@/pages/tabbar/components/mine/layout.vue';
+	export default { 
+		components: {  
+			layout,
+		},
+		data() {
+			return {
+				
+			}
+		}, 
+		created() {
+			
+		},
+		methods: {
+			
+	
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background-color: #fafafa;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/social.vue b/pages/tabbar/social.vue
new file mode 100644
index 0000000..69d947a
--- /dev/null
+++ b/pages/tabbar/social.vue
@@ -0,0 +1,38 @@
+<template>
+	<view class="container"> 
+		<layout title="用户列表">
+			
+		</layout>
+	</view>
+</template>
+  
+<script>
+	import layout from '@/pages/tabbar/components/member/layout.vue';
+	export default { 
+		components: {  
+			layout,
+		},
+		data() {
+			return {
+				
+			}
+		}, 
+		created() {
+			
+		},
+		methods: {
+			
+	
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background-color: #fafafa;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	
+</style>
\ No newline at end of file
diff --git a/pages/tabbar/trend.vue b/pages/tabbar/trend.vue
new file mode 100644
index 0000000..595bb2a
--- /dev/null
+++ b/pages/tabbar/trend.vue
@@ -0,0 +1,38 @@
+<template>
+	<view class="container"> 
+		<layout title="动态">
+			
+		</layout>
+	</view>
+</template>
+  
+<script>
+	import layout from '@/pages/tabbar/components/trend/layout.vue';
+	export default { 
+		components: {  
+			layout,
+		},
+		data() {
+			return {
+				
+			}
+		}, 
+		created() {
+			
+		},
+		methods: {
+			
+	
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background-color: #fff;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	
+</style>
\ No newline at end of file
diff --git a/pages/trend/city/components/orderList.vue b/pages/trend/city/components/orderList.vue
new file mode 100644
index 0000000..23dec4f
--- /dev/null
+++ b/pages/trend/city/components/orderList.vue
@@ -0,0 +1,510 @@
+<template>
+  <view>
+	  <view class="item" :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in orderList">
+		  <view class="card">
+		  	<view @click="detail(item)" class="left">
+		  		<view class="avatar-img">
+		  			<u-avatar class="img" :src="item.avatar"></u-avatar>
+		  		</view>
+		  		<!-- <view class="avatar" v-else>
+		  			<image class="img" :src="item.avatar"></image>
+		  			<image class="gif" src="@/static/images/avatar.gif"></image>
+		  		</view> -->
+		  	</view>
+		  	<view class="right">
+		  		<view class="card-header">
+		  			<view class="box3">
+		  				<view class="box1">
+		  					<view class="box2">
+		  						<view class="nickname">{{item.nickname}}</view>
+		  						<view class="sex-box" v-if="item.sex == 1">
+		  							<u-icon name="ziyuan2" custom-prefix="iconfont"></u-icon>
+		  							<view class="age">{{item.age}}</view>
+		  						</view>
+								<view class="sex-box nan" v-if="item.sex == 0">
+									<u-icon name="ziyuan3" custom-prefix="iconfont"></u-icon>
+									<view class="age">{{item.age}}</view>
+								</view>
+		  					</view>
+		  					<view class="tag-list">
+								<view class="tag" v-if="item.trendType == 1">Ta是店员</view>
+								<view class="tag">发布于 {{item.createTimeStr}}</view>
+		  					</view>
+		  				</view>
+		  				<!-- <view class="fans"  @click="fans(item)">
+							<u-icon v-if="item.fans" name="star-fill" size="40"></u-icon>
+							<u-icon v-else name="star" size="40"></u-icon>
+		  				</view> -->
+						
+						<view v-if="item.trendType == 0" class="chat-btn" @click="chat(item)">
+							 <u-icon name="chat" size="28" color="#fff"></u-icon>
+							 <view class="text">搭讪</view>
+						</view>
+						<view v-if="item.trendType == 1" class="chat-btn" @click="detail(item)">
+							 <u-icon name="phone" size="28" color="#fff"></u-icon>
+							 <view class="text">下单</view>
+						</view>
+		  			</view>
+		  		</view>
+		  		<view class="card-content"> 
+		  			<view class="text-box">  
+		  				<rich-text :nodes="item.content"></rich-text>
+		  			</view>
+		  		</view>
+		  		<view class="image-box" v-if="item.fileType == 0">
+		  			<img-box @preAd="preAd" :ad="item.adStatus" :file="item.file"></img-box>
+		  		</view>
+				<view class="voice-box" v-if="item.fileType == 1">
+					<voice-play :sec="item.seconds" @tap.stop="playAudio(item)" :isPlay="item.id == playId"></voice-play>
+				</view>
+				<view class="video-box" v-if="item.fileType == 2">
+					<video-box :file="item.file"></video-box>
+				</view>
+		  		<view class="topic-list">
+		  			<view class="topic" @click="toCity(item)">
+		  				<u-icon name="map-fill" size="40" color="#3cc9a4"></u-icon>
+		  				<view class="tag-text">{{item.city}}</view>
+						<u-icon name="arrow-right" size="24" color="#3cc9a4"></u-icon>
+		  			</view>
+		  		</view>
+		  		<view class="card-footer">
+		  			<!-- <view class="toolbar"> 
+		  				<u-icon color="#f880ab" name="presentfill" size="38" custom-prefix="iconfont"></u-icon>
+		  				<view class="toolbar-text">3</view>
+		  			</view> -->
+		  			<!-- <view class="toolbar">
+		  				<u-icon name="pinglun" size="38" custom-prefix="iconfont"></u-icon>
+		  				<view class="toolbar-text">22</view>
+		  			</view> -->
+		  			<view class="toolbar" @click="thumb(item)">
+						<u-icon v-if="item.like" name="thumb-up-fill" color="var(--ui-BG-Main)" size="40"></u-icon>
+		  				<u-icon v-else name="thumb-up" size="40"></u-icon>
+		  				<view class="toolbar-text" v-if="item.likeNum > 0">{{item.likeNum}}</view>
+						<view class="text" v-else>点赞</view>
+		  			</view>
+		  		</view>
+		  	</view>
+		  </view>
+	  </view>
+	  
+  </view>
+</template>
+
+<script>
+	import dayjs from 'dayjs';
+	import isToday from "dayjs/plugin/isToday";
+	import isYesterday from "dayjs/plugin/isYesterday";
+	dayjs.extend(isToday);
+	dayjs.extend(isYesterday);
+	import adVideoUtils from '@/sheep/util/adVideoUtils'; 
+	import ImgBox from '@/pages/tabbar/components/trend/imgBox.vue';
+	import VideoBox from '@/pages/tabbar/components/trend/videoBox.vue';
+	import VoicePlay from '@/pages/tabbar/components/trend/voicePlay.vue';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import sheep from '@/sheep';
+	import TrendApi from '@/sheep/api/worker/trend';
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	const audio = uni.createInnerAudioContext();
+	export default {
+		components: {
+			ImgBox,
+			VideoBox,
+			VoicePlay,
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				playId: null,
+			}
+		},
+		computed: {
+			orderList() {
+				this.virtualList.forEach((order) => order.createTimeStr = this.showDayTime(order.createTime));
+				return this.virtualList;
+			},
+			tradeConfig() {
+				return sheep.$store('user').tradeConfig;
+			},
+		},
+		methods: {
+			showDayTime(datetime) {
+			  if (!datetime) return "";
+			  const weeks = [
+			   "星期日",
+			   "星期一",
+			   "星期二",
+			   "星期三",
+			   "星期四",
+			   "星期五",
+			   "星期六",
+			  ];
+			  // 当天 显示时分
+			  if (dayjs(datetime).isToday()) {
+			    return dayjs(datetime).format("HH:mm");
+			  }
+			  // 昨天 昨天+时分
+			  if (dayjs(datetime).isYesterday()) {
+			    return `昨天 ${dayjs(datetime).format("HH:mm")}`;
+			  }
+			  // 本周 显示周几+时分
+			  if (dayjs().isSame(datetime, "week")) {
+			    const weekIndex = dayjs().day();
+			    return `${weeks[weekIndex]} ${dayjs(datetime).format("HH:mm")}`;
+			  }
+			  // 本周之前 显示年月日
+			  if (dayjs(datetime).isBefore(new Date(), "week")) {
+			    return dayjs(datetime).format("YYYY-MM-DD");
+			  }
+			},
+			playAudio(e) {
+				if(this.playId == e.id){
+					this.playId = null;
+					audio.stop();
+					return;
+				}
+				this.playId = e.id;
+				//语音自然播放结束
+				audio.onEnded((res) => {
+					this.playId = null;
+				});
+				audio.src = e.file;
+				audio.play();
+			},
+			thumb(e) {
+				TrendApi.createTrendLike({
+					trendId: e.id,
+				}).then((res) => {
+					if(res) {
+						if(e.like){
+							e.like = false;
+							e.likeNum = e.likeNum-1;
+							sheep.$helper.toast('取消点赞');
+						}else{
+							e.like = true;
+							e.likeNum = e.likeNum+1;
+							sheep.$helper.toast('点赞成功');
+						}
+					}
+				});
+			},
+			preAd(run) {
+				adVideoUtils.videoAdInit(this.tradeConfig.adUnitId);
+				adVideoUtils.videoAdShow()
+				.then((res) => {
+				  if (res) {
+					run(true);
+				  } else {
+					console.log('广告提前退出')
+					run(false);
+				  }
+				})
+				.catch((err) => {
+					console.log('广告加载失败')
+					run(false);
+				});  
+			},
+			fans(e) {
+				TrendApi.createClerkFans({
+					workerClerkId: e.workerClerkId,
+				}).then((res) => {
+					if(res){
+						if(e.fans){
+							sheep.$helper.toast('取消收藏');
+							e.fans = false;
+						}else{
+							sheep.$helper.toast('收藏成功');
+							e.fans = true;
+						}
+					}
+				});
+			},
+			detail(e) {
+				if(e.workerClerkId){
+					this.$u.route({
+						url: 'pages/clerk/detail/index',
+						params: {
+							id: e.workerClerkId,
+						}
+					});
+				}else{
+					sheep.$router.go('/pages/user/detail/index',{id: e.userId});
+				}
+			},
+			toCity(e) {
+				this.$u.route({
+					url: 'pages/trend/city/list',
+					params: {
+						city: e.city,
+					}
+				});
+			},
+			chat(e) {
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				
+				const userInfo = sheep.$store('user').userInfo;
+				// 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。
+				if(userInfo.visible) {
+					// #ifdef MP-WEIXIN
+					this.subscribeMessage();
+					// #endif
+					
+					ImConversationApi.createMemberConversation({
+						userId: e.userId,
+						groupType: 1,
+						lastMessageContentType: 1,
+					}).then(res => {
+						if(res.data){
+							sheep.$router.go('/pages/im/index',{groupId: res.data, receiveUserId: e.userId});
+						}
+					});
+					return;
+				}
+				// 触发小程序授权信息弹框
+				// #ifdef MP-WEIXIN
+				showAuthModal('mpAuthorization');
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				showAuthModal('h5Authorization');
+				// #endif
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			    uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+			  });
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item {
+		display: flex;
+		flex-direction: column;
+		padding: 0 30rpx;
+		margin-bottom: 30rpx;
+	}
+	
+	.card {
+		padding: 30rpx 0;
+		border-bottom: 1rpx solid #eeeeee;
+		padding-top: 0;
+		display: flex;
+		
+		.right {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+			padding-top: 10px;
+		}
+	}
+	
+	.avatar-img{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 8rpx;
+		
+		.img {
+			width: 100%;
+			height: 100%;
+			border-radius: 100%;
+		}
+	}
+	
+	.avatar{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.img {
+			width: 75%;
+			height: 75%;
+			border-radius: 100%;
+		}
+		.gif {
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	
+	.card-header {
+		display: flex;
+		align-items: center;
+		
+		.box1 {
+			.tag-list {
+				display: flex;
+				align-items: center;
+				font-size: 22rpx;
+				color: #666666;
+				margin-top: 4rpx;
+				
+				.tag::after {
+				  content: '·';
+				  padding: 0 10rpx; /* 添加一些间隔 */
+				}
+				
+			}
+			
+			.tag-list .tag:last-child::after {
+				content: unset;
+			}
+		}
+		
+		.box2 {
+			display: flex;
+			align-items: center;
+			line-height: 40rpx;
+			
+			.nickname {
+				font-size: 28rpx;
+				color: #333333;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+				max-width: 200rpx;
+			}
+			
+			.sex-box {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background-color: #d06b8d1f;
+				border-radius: 20px;
+				font-size: 20rpx;
+				padding: 4rpx 10rpx;
+				color: #d06b8d;
+				line-height: 24rpx;
+				margin: 0 5px;
+				
+				.age {
+					margin-left: 2px;
+				}
+			}
+			
+			.nan {
+				background-color: #007aff1a;
+				color: #007aff;
+			}
+		}
+		
+		.box3 {
+			display: flex;
+			justify-content: space-between;
+			flex: 1;
+			align-items: center;
+		}
+		
+		.fans {
+			width: 60rpx;
+			display: flex;
+			justify-content: flex-end;
+			height: 60rpx;
+			align-items: center;
+			color: var(--ui-BG-Main);
+			font-size: 24rpx;
+			padding-right: 3px;
+		}
+		
+		.chat-btn {
+			display: flex;
+			align-items: center;
+			background-color: var(--ui-BG-Main);
+			justify-content: center;
+			border-radius: 40px;
+			color: #fff;
+			font-size: 22rpx;
+			padding: 5px;
+			
+			.text {
+				margin-left: 2px;
+			}
+		}
+	}
+	
+	.card-content {
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		
+		.text-box {
+			font-size: 26rpx;
+			line-height: 180%;
+			white-space: pre-wrap;
+			letter-spacing: 2rpx;
+		}
+	}
+	
+	.topic-list { 
+		display: flex;
+		align-items: center;
+		margin-top: 10px;
+		
+		.topic {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 28rpx;
+			margin-right: 20rpx;
+			color: var(--ui-BG-Main);
+			font-weight: bold;
+			
+			.tag-text {
+				margin-left: 2px;
+			}
+		}
+	}
+	
+	.card-footer {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 30rpx;
+		
+		.toolbar {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			color: #666666;
+			width: 80rpx;
+			height: 40rpx;
+			flex: 1;
+		}
+		
+		.toolbar-text {
+			font-size: 26rpx;
+			margin-left: 5px;
+		}
+		
+		.text {
+			font-size: 24rpx;
+			margin-left: 5px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/trend/city/list.vue b/pages/trend/city/list.vue
new file mode 100644
index 0000000..93009b7
--- /dev/null
+++ b/pages/trend/city/list.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" :auto="true" use-virtual-list auto-show-back-to-top :force-close-inner-list="true" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @scroll="scroll" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<su-navbar color="var(--ui-BG-Main)" :title="queryParams.city" statusBar></su-navbar>
+			</template>  
+			   
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<view class="main-box">
+				<view class="tab-box">
+					<view class="right">
+						<tui-tabs :size="24" :tabs="tabs" :unlined="true" width="140" :height="55" :currentTab="currentTab" :sliderWidth="120" :sliderHeight="55"
+							bottom="50%" color="#888" selectedColor="var(--ui-BG-Main)" :bold="true" sliderBgColor="#7ea19e21" @change="change">
+						</tui-tabs>
+					</view>
+				</view>
+				<order-list :virtualList="virtualList"></order-list>
+			</view>
+			
+			<!-- 自定义返回顶部view -->
+			<template #backToTop>  
+				<custom-back-to-top></custom-back-to-top> 
+			</template> 
+			
+		</z-paging>
+		
+		<s-menu-tools />
+		<s-auth-modal />
+	</view>
+</template>
+
+<script>
+	import tuiTabs from "@/components/thorui/tui-tabs/tui-tabs.vue"
+	import OrderList from '@/pages/trend/city/components/orderList.vue';
+	import TrendApi from '@/sheep/api/worker/trend'; 
+	import sheep from '@/sheep';
+	export default { 
+		components: {
+			tuiTabs,
+			OrderList,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 0,
+				height: 0,
+				
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10,
+					userId: null,
+					city: '',
+					queryType: '2',
+				},
+				
+				currentTab: 0,
+				tabs: [{
+					name: "最新",
+					value: '2',
+				}, {
+					name: "最热",
+					value: '1',
+				}],
+			}
+		},
+		// 分享小程序
+		onShareAppMessage(res) {
+			return {
+				title: this.shareInfo.title,
+				path: this.shareInfo.path,
+				imageUrl: this.shareInfo.image,
+			};
+		},
+		onShareTimeline() {
+			return {
+				title: this.shareInfo.title,
+				path: this.shareInfo.path,
+				imageUrl: this.shareInfo.image,
+			}
+		},
+		onLoad(options) {
+			this.queryParams.city = options.city;
+		},
+		computed: {
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+			shareInfo() {
+				return sheep.$platform.share.getShareInfo();
+			},
+		},
+		methods: {
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				this.queryParams.pageNo = pageNo;
+				this.queryParams.pageSize = pageSize;
+				this.queryParams.queryType = this.tabs[this.currentTab].value;
+				this.queryParams.userId = this.userInfo.id;
+				
+				TrendApi.getTrendPage(this.queryParams).then(res => {
+					// 将请求的结果数组传递给z-paging
+					this.$refs.paging.complete(res.data.list); 
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			//切换tab，逻辑请自行处理
+			change(e) {
+				this.currentTab = e.index
+				this.$refs.paging.reload();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fff;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	.main-box {
+		.tab-box {
+			display: flex;
+			justify-content: end;
+			
+			.right {
+				
+			}
+	
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/trend/detail/components/card.vue b/pages/trend/detail/components/card.vue
new file mode 100644
index 0000000..9bff436
--- /dev/null
+++ b/pages/trend/detail/components/card.vue
@@ -0,0 +1,510 @@
+<template>
+  <view>
+	  <view class="item">
+		  <view class="card">
+		  	<view class="left">
+		  		<view class="avatar-img">
+		  			<u-avatar class="img" :src="item.avatar"></u-avatar>
+		  		</view>
+		  		<!-- <view class="avatar" v-else>
+		  			<image class="img" :src="item.avatar"></image>
+		  			<image class="gif" src="@/static/images/avatar.gif"></image>
+		  		</view> -->
+		  	</view>
+		  	<view class="right">
+		  		<view class="card-header">
+		  			<view class="box3">
+		  				<view class="box1">
+		  					<view class="box2">
+		  						<view class="nickname">{{item.nickname}}</view>
+		  						<view class="sex-box" v-if="item.sex == 1">
+		  							<u-icon name="ziyuan2" custom-prefix="iconfont"></u-icon>
+		  							<view class="age">{{item.age}}</view>
+		  						</view>
+								<view class="sex-box nan" v-if="item.sex == 0">
+									<u-icon name="ziyuan3" custom-prefix="iconfont"></u-icon>
+									<view class="age">{{item.age}}</view>
+								</view>
+		  					</view>
+		  					<view class="tag-list">
+								<view class="tag" v-if="item.trendType == 1">Ta是店员</view>
+								<view class="tag">发布于 {{item.createTimeStr}}</view>
+		  					</view>
+		  				</view>
+		  				<!-- <view class="fans"  @click="fans(item)">
+							<u-icon v-if="item.fans" name="star-fill" size="40"></u-icon>
+							<u-icon v-else name="star" size="40"></u-icon>
+		  				</view> -->
+						
+						<view v-if="item.trendType == 0" class="chat-btn" @click="chat(item)">
+							 <u-icon name="chat" size="28" color="#fff"></u-icon>
+							 <view class="text">助力</view>
+						</view>
+						<view v-if="item.trendType == 1" class="chat-btn" @click="detail(item)">
+							 <u-icon name="phone" size="28" color="#fff"></u-icon>
+							 <view class="text">下单</view>
+						</view>
+		  			</view>
+		  		</view>
+		  		<view class="card-content"> 
+		  			<view class="text-box">  
+		  				<rich-text :nodes="item.content"></rich-text>
+		  			</view>
+		  		</view>
+		  		<view class="image-box" v-if="item.fileType == 0">
+		  			<img-box @preAd="preAd" :ad="item.adStatus" :file="item.file"></img-box>
+		  		</view>
+				<view class="voice-box" v-if="item.fileType == 1">
+					<voice-play :sec="item.seconds" @tap.stop="playAudio(item)" :isPlay="item.id == playId"></voice-play>
+				</view>
+				<view class="video-box" v-if="item.fileType == 2">
+					<video-box :file="item.file"></video-box>
+				</view>
+		  		<view class="topic-list">
+		  			<view class="topic" @click="toCity(item)">
+		  				<u-icon name="map-fill" size="40" color="#3cc9a4"></u-icon>
+		  				<view class="tag-text">{{item.city}}</view>
+						<u-icon name="arrow-right" size="24" color="#3cc9a4"></u-icon>
+		  			</view>
+		  		</view>
+		  		<view class="card-footer">
+		  			<!-- <view class="toolbar"> 
+		  				<u-icon color="#f880ab" name="presentfill" size="38" custom-prefix="iconfont"></u-icon>
+		  				<view class="toolbar-text">3</view>
+		  			</view> -->
+		  			<!-- <view class="toolbar">
+		  				<u-icon name="pinglun" size="38" custom-prefix="iconfont"></u-icon>
+		  				<view class="toolbar-text">22</view>
+		  			</view> -->
+		  			<view class="toolbar" @click="thumb(item)">
+						<u-icon v-if="item.like" name="thumb-up-fill" color="var(--ui-BG-Main)" size="40"></u-icon>
+		  				<u-icon v-else name="thumb-up" size="40"></u-icon>
+		  				<view class="toolbar-text" v-if="item.likeNum > 0">{{item.likeNum}}</view>
+						<view class="text" v-else>分享</view>
+		  			</view>
+		  		</view>
+		  	</view>
+		  </view>
+	  </view>
+	  
+  </view>
+</template>
+
+<script>
+	import dayjs from 'dayjs';
+	import isToday from "dayjs/plugin/isToday";
+	import isYesterday from "dayjs/plugin/isYesterday";
+	dayjs.extend(isToday);
+	dayjs.extend(isYesterday);
+	import adVideoUtils from '@/sheep/util/adVideoUtils'; 
+	import ImgBox from '@/pages/tabbar/components/trend/imgBox.vue';
+	import VideoBox from '@/pages/tabbar/components/trend/videoBox.vue';
+	import VoicePlay from '@/pages/tabbar/components/trend/voicePlay.vue';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import sheep from '@/sheep';
+	import TrendApi from '@/sheep/api/worker/trend';
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	const audio = uni.createInnerAudioContext();
+	export default {
+		components: {
+			ImgBox,
+			VideoBox,
+			VoicePlay,
+		},
+		props: {
+			order: {
+				type: Object,
+				default: {},
+			},
+		},
+		data() {
+			return {
+				playId: null,
+			}
+		},
+		computed: {
+			item() {
+				this.order.createTimeStr = this.showDayTime(this.order.createTime);
+				return this.order; 
+			},
+			tradeConfig() {
+				return sheep.$store('user').tradeConfig;
+			},
+		},
+		methods: {
+			showDayTime(datetime) {
+			  if (!datetime) return "";
+			  const weeks = [
+			   "星期日",
+			   "星期一",
+			   "星期二",
+			   "星期三",
+			   "星期四",
+			   "星期五",
+			   "星期六",
+			  ];
+			  // 当天 显示时分
+			  if (dayjs(datetime).isToday()) {
+			    return dayjs(datetime).format("HH:mm");
+			  }
+			  // 昨天 昨天+时分
+			  if (dayjs(datetime).isYesterday()) {
+			    return `昨天 ${dayjs(datetime).format("HH:mm")}`;
+			  }
+			  // 本周 显示周几+时分
+			  if (dayjs().isSame(datetime, "week")) {
+			    const weekIndex = dayjs().day();
+			    return `${weeks[weekIndex]} ${dayjs(datetime).format("HH:mm")}`;
+			  }
+			  // 本周之前 显示年月日
+			  if (dayjs(datetime).isBefore(new Date(), "week")) {
+			    return dayjs(datetime).format("YYYY-MM-DD");
+			  }
+			},
+			playAudio(e) {
+				if(this.playId == e.id){
+					this.playId = null;
+					audio.stop();
+					return;
+				}
+				this.playId = e.id;
+				//语音自然播放结束
+				audio.onEnded((res) => {
+					this.playId = null;
+				});
+				audio.src = e.file;
+				audio.play();
+			},
+			thumb(e) {
+				TrendApi.createTrendLike({
+					trendId: e.id,
+				}).then((res) => {
+					if(res) {
+						if(e.like){
+							e.like = false;
+							e.likeNum = e.likeNum-1;
+							sheep.$helper.toast('取消点赞');
+						}else{
+							e.like = true;
+							e.likeNum = e.likeNum+1;
+							sheep.$helper.toast('点赞成功');
+						}
+					}
+				});
+			},
+			preAd(run) {
+				adVideoUtils.videoAdInit(this.tradeConfig.adUnitId);
+				adVideoUtils.videoAdShow()
+				.then((res) => {
+				  if (res) {
+					run(true);
+				  } else {
+					console.log('广告提前退出')
+					run(false);
+				  }
+				})
+				.catch((err) => {
+					console.log('广告加载失败')
+					run(false);
+				});  
+			},
+			fans(e) {
+				TrendApi.createClerkFans({
+					workerClerkId: e.workerClerkId,
+				}).then((res) => {
+					if(res){
+						if(e.fans){
+							sheep.$helper.toast('取消收藏');
+							e.fans = false;
+						}else{
+							sheep.$helper.toast('收藏成功');
+							e.fans = true;
+						}
+					}
+				});
+			},
+			detail(e) {
+				if(e.workerClerkId){
+					this.$u.route({
+						url: 'pages/clerk/detail/index',
+						params: {
+							id: e.workerClerkId,
+						}
+					});
+				}else{
+					sheep.$router.go('/pages/user/detail/index',{id: e.userId});
+				}
+			},
+			toCity(e) {
+				this.$u.route({
+					url: 'pages/trend/city/list',
+					params: {
+						city: e.city,
+					}
+				});
+			},
+			chat(e) {
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				
+				const userInfo = sheep.$store('user').userInfo;
+				// 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。
+				if(userInfo.visible) {
+					// #ifdef MP-WEIXIN
+					this.subscribeMessage();
+					// #endif
+					
+					ImConversationApi.createMemberConversation({
+						userId: e.userId,
+						groupType: 1,
+						lastMessageContentType: 1,
+					}).then(res => {
+						if(res.data){
+							sheep.$router.go('/pages/im/index',{groupId: res.data, receiveUserId: e.userId});
+						}
+					});
+					return;
+				}
+				// 触发小程序授权信息弹框
+				// #ifdef MP-WEIXIN
+				showAuthModal('mpAuthorization');
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				showAuthModal('h5Authorization');
+				// #endif
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			    uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+			  });
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item {
+		display: flex;
+		flex-direction: column;
+		padding: 0 30rpx;
+		margin-bottom: 30rpx;
+	}
+	
+	.card {
+		padding: 30rpx 0;
+		border-bottom: 1rpx solid #eeeeee;
+		padding-top: 0;
+		display: flex;
+		
+		.right {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+			padding-top: 10px;
+		}
+	}
+	
+	.avatar-img{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 8rpx;
+		
+		.img {
+			width: 100%;
+			height: 100%;
+			border-radius: 100%;
+		}
+	}
+	
+	.avatar{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.img {
+			width: 75%;
+			height: 75%;
+			border-radius: 100%;
+		}
+		.gif {
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	
+	.card-header {
+		display: flex;
+		align-items: center;
+		
+		.box1 {
+			.tag-list {
+				display: flex;
+				align-items: center;
+				font-size: 22rpx;
+				color: #666666;
+				margin-top: 4rpx;
+				
+				.tag::after {
+				  content: '·';
+				  padding: 0 10rpx; /* 添加一些间隔 */
+				}
+				
+			}
+			
+			.tag-list .tag:last-child::after {
+				content: unset;
+			}
+		}
+		
+		.box2 {
+			display: flex;
+			align-items: center;
+			line-height: 40rpx;
+			
+			.nickname {
+				font-size: 28rpx;
+				color: #333333;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+				max-width: 200rpx;
+			}
+			
+			.sex-box {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background-color: #d06b8d1f;
+				border-radius: 20px;
+				font-size: 20rpx;
+				padding: 4rpx 10rpx;
+				color: #d06b8d;
+				line-height: 24rpx;
+				margin: 0 5px;
+				
+				.age {
+					margin-left: 2px;
+				}
+			}
+			
+			.nan {
+				background-color: #007aff1a;
+				color: #007aff;
+			}
+		}
+		
+		.box3 {
+			display: flex;
+			justify-content: space-between;
+			flex: 1;
+			align-items: center;
+		}
+		
+		.fans {
+			width: 60rpx;
+			display: flex;
+			justify-content: flex-end;
+			height: 60rpx;
+			align-items: center;
+			color: var(--ui-BG-Main);
+			font-size: 24rpx;
+			padding-right: 3px;
+		}
+		
+		.chat-btn {
+			display: flex;
+			align-items: center;
+			background-color: var(--ui-BG-Main);
+			justify-content: center;
+			border-radius: 40px;
+			color: #fff;
+			font-size: 22rpx;
+			padding: 5px;
+			
+			.text {
+				margin-left: 2px;
+			}
+		}
+	}
+	
+	.card-content {
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		
+		.text-box {
+			font-size: 26rpx;
+			line-height: 180%;
+			white-space: pre-wrap;
+			letter-spacing: 2rpx;
+		}
+	}
+	
+	.topic-list { 
+		display: flex;
+		align-items: center;
+		margin-top: 10px;
+		
+		.topic {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 28rpx;
+			margin-right: 20rpx;
+			color: var(--ui-BG-Main);
+			font-weight: bold;
+			
+			.tag-text {
+				margin-left: 2px;
+			}
+		}
+	}
+	
+	.card-footer {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 30rpx;
+		
+		.toolbar {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			color: #666666;
+			width: 80rpx;
+			height: 40rpx;
+			flex: 1;
+		}
+		
+		.toolbar-text {
+			font-size: 26rpx;
+			margin-left: 5px;
+		}
+		
+		.text {
+			font-size: 24rpx;
+			margin-left: 5px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/trend/detail/index.vue b/pages/trend/detail/index.vue
new file mode 100644
index 0000000..c8237bb
--- /dev/null
+++ b/pages/trend/detail/index.vue
@@ -0,0 +1,76 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<su-navbar color="var(--ui-BG-Main)" title="详情" statusBar></su-navbar>
+		
+		<card :order="item"></card>
+		
+		<s-menu-tools />
+		<s-auth-modal />
+	</view>
+</template>
+
+<script>
+	import card from '@/pages/trend/detail/components/card.vue';
+	import TrendApi from '@/sheep/api/worker/trend'; 
+	import sheep from '@/sheep';
+	export default { 
+		components: {
+			card,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				id: 0,
+				item: {},
+			}
+		},
+		// 分享小程序
+		onShareAppMessage(res) {
+			return {
+				title: this.shareInfo.title,
+				path: this.shareInfo.path,
+				imageUrl: this.shareInfo.image,
+			};
+		},
+		onShareTimeline() {
+			return {
+				title: this.shareInfo.title,
+				path: this.shareInfo.path,
+				imageUrl: this.shareInfo.image,
+			}
+		},
+		onLoad(options) {
+			this.id = options.id;
+			this.getDetail();
+		},
+		computed: {
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+			shareInfo() {
+				return sheep.$platform.share.getShareInfo();
+			},
+		},
+		methods: {
+			getDetail() {
+				TrendApi.getTrend(this.id).then(res => {
+					this.item = res.data;
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fff;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/trend/my/components/orderList.vue b/pages/trend/my/components/orderList.vue
new file mode 100644
index 0000000..d0e266b
--- /dev/null
+++ b/pages/trend/my/components/orderList.vue
@@ -0,0 +1,500 @@
+<template>
+  <view>
+	  <view class="item" :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in orderList">
+		  <view class="card">
+		  	<view @click="detail(item)" class="left">
+		  		<view class="avatar-img">
+		  			<u-avatar class="img" :src="item.avatar"></u-avatar>
+		  		</view>
+		  		<!-- <view class="avatar" v-else>
+		  			<image class="img" :src="item.avatar"></image>
+		  			<image class="gif" src="@/static/images/avatar.gif"></image>
+		  		</view> -->
+		  	</view>
+		  	<view class="right">
+		  		<view class="card-header">
+		  			<view class="box3">
+		  				<view class="box1">
+		  					<view class="box2">
+		  						<view class="nickname">{{item.nickname}}</view>
+		  						<view class="sex-box" v-if="item.sex == 1">
+		  							<u-icon name="ziyuan2" custom-prefix="iconfont"></u-icon>
+		  							<view class="age">{{item.age}}</view>
+		  						</view>
+								<view class="sex-box nan" v-if="item.sex == 0">
+									<u-icon name="ziyuan3" custom-prefix="iconfont"></u-icon>
+									<view class="age">{{item.age}}</view>
+								</view>
+		  					</view>
+		  					<view class="tag-list">
+								<view class="tag">发布于 {{item.createTimeStr}}</view>
+		  					</view>
+		  				</view>
+		  				<!-- <view class="fans"  @click="fans(item)">
+							<u-icon v-if="item.fans" name="star-fill" size="40"></u-icon>
+							<u-icon v-else name="star" size="40"></u-icon>
+		  				</view> -->
+						
+						<view class="chat-btn" @click="doDelete(item)">
+							 <u-icon name="trash" size="28" color="#fff"></u-icon>
+							 <view class="text">删除</view>
+						</view>
+		  			</view>
+		  		</view>
+		  		<view class="card-content"> 
+		  			<view class="text-box">  
+		  				<rich-text :nodes="item.content"></rich-text>
+		  			</view>
+		  		</view>
+		  		<view class="image-box" v-if="item.fileType == 0">
+		  			<img-box :file="item.file"></img-box>
+		  		</view>
+				<view class="voice-box" v-if="item.fileType == 1">
+					<voice-play :sec="item.seconds" @tap.stop="playAudio(item)" :isPlay="item.id == playId"></voice-play>
+				</view>
+				<view class="video-box" v-if="item.fileType == 2">
+					<video-box :file="item.file"></video-box>
+				</view>
+		  		<view class="topic-list">
+		  			<view class="topic" @click="toCity(item)">
+		  				<u-icon name="map-fill" size="40" color="#3cc9a4"></u-icon>
+		  				<view class="tag-text">{{item.city}}</view>
+						<u-icon name="arrow-right" size="24" color="#3cc9a4"></u-icon>
+		  			</view>
+		  		</view>
+		  		<view class="card-footer">
+		  			<!-- <view class="toolbar"> 
+		  				<u-icon color="#f880ab" name="presentfill" size="38" custom-prefix="iconfont"></u-icon>
+		  				<view class="toolbar-text">3</view>
+		  			</view> -->
+		  			<!-- <view class="toolbar">
+		  				<u-icon name="pinglun" size="38" custom-prefix="iconfont"></u-icon>
+		  				<view class="toolbar-text">22</view>
+		  			</view> -->
+		  			<view class="toolbar" @click="thumb(item)">
+						<u-icon v-if="item.like" name="thumb-up-fill" color="var(--ui-BG-Main)" size="40"></u-icon>
+		  				<u-icon v-else name="thumb-up" size="40"></u-icon>
+		  				<view class="toolbar-text" v-if="item.likeNum > 0">{{item.likeNum}}</view>
+						<view class="text" v-else>点赞</view>
+		  			</view>
+		  		</view>
+		  	</view>
+		  </view>
+	  </view>
+	  
+  </view>
+</template>
+
+<script>
+	import dayjs from 'dayjs';
+	import isToday from "dayjs/plugin/isToday";
+	import isYesterday from "dayjs/plugin/isYesterday";
+	dayjs.extend(isToday);
+	dayjs.extend(isYesterday);
+	import ImgBox from '@/pages/tabbar/components/trend/imgBox.vue';
+	import VideoBox from '@/pages/tabbar/components/trend/videoBox.vue';
+	import VoicePlay from '@/pages/tabbar/components/trend/voicePlay.vue';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import sheep from '@/sheep';
+	import TrendApi from '@/sheep/api/worker/trend';
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	const audio = uni.createInnerAudioContext();
+	export default {
+		components: {
+			ImgBox,
+			VideoBox,
+			VoicePlay,
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				playId: null,
+			}
+		},
+		computed: {
+			orderList() {
+				this.virtualList.forEach((order) => order.createTimeStr = this.showDayTime(order.createTime));
+				return this.virtualList;
+			},
+		},
+		methods: {
+			showDayTime(datetime) {
+			  if (!datetime) return "";
+			  const weeks = [
+			   "星期日",
+			   "星期一",
+			   "星期二",
+			   "星期三",
+			   "星期四",
+			   "星期五",
+			   "星期六",
+			  ];
+			  // 当天 显示时分
+			  if (dayjs(datetime).isToday()) {
+			    return dayjs(datetime).format("HH:mm");
+			  }
+			  // 昨天 昨天+时分
+			  if (dayjs(datetime).isYesterday()) {
+			    return `昨天 ${dayjs(datetime).format("HH:mm")}`;
+			  }
+			  // 本周 显示周几+时分
+			  if (dayjs().isSame(datetime, "week")) {
+			    const weekIndex = dayjs().day();
+			    return `${weeks[weekIndex]} ${dayjs(datetime).format("HH:mm")}`;
+			  }
+			  // 本周之前 显示年月日
+			  if (dayjs(datetime).isBefore(new Date(), "week")) {
+			    return dayjs(datetime).format("YYYY-MM-DD");
+			  }
+			},
+			playAudio(e) {
+				if(this.playId == e.id){
+					this.playId = null;
+					audio.stop();
+					return;
+				}
+				this.playId = e.id;
+				//语音自然播放结束
+				audio.onEnded((res) => {
+					this.playId = null;
+				});
+				audio.src = e.file;
+				audio.play();
+			},
+			thumb(e) {
+				TrendApi.createTrendLike({
+					trendId: e.id,
+				}).then((res) => {
+					if(res) {
+						if(e.like){
+							e.like = false;
+							e.likeNum = e.likeNum-1;
+							sheep.$helper.toast('取消点赞');
+						}else{
+							e.like = true;
+							e.likeNum = e.likeNum+1;
+							sheep.$helper.toast('点赞成功');
+						}
+					}
+				});
+			},
+			fans(e) {
+				TrendApi.createClerkFans({
+					workerClerkId: e.workerClerkId,
+				}).then((res) => {
+					if(res){
+						if(e.fans){
+							sheep.$helper.toast('取消收藏');
+							e.fans = false;
+						}else{
+							sheep.$helper.toast('收藏成功');
+							e.fans = true;
+						}
+					}
+				});
+			},
+			detail(e) {
+				if(e.workerClerkId){
+					this.$u.route({
+						url: 'pages/clerk/detail/index',
+						params: {
+							id: e.workerClerkId,
+						}
+					});
+				}
+			},
+			delete(e) {
+				TrendApi.deleteTrendLike(e.id).then((res) => {
+					this.$emit('reload');
+				});
+			},
+			doDelete(e) {
+				var that = this;
+				uni.showModal({
+				  title: '删除动态',
+				  content: '确认删除此动态吗？',
+				  success: function (res) {
+				    if (res.confirm) {
+						that.delete(e);
+				    }
+				  },
+				});
+			},
+			toCity(e) {
+				this.$u.route({
+					url: 'pages/trend/city/list',
+					params: {
+						city: e.city,
+					}
+				});
+			},
+			chat(e) {
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				
+				const userInfo = sheep.$store('user').userInfo;
+				// 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。
+				if(userInfo.visible) {
+					// #ifdef MP-WEIXIN
+					this.subscribeMessage();
+					// #endif
+					
+					ImConversationApi.createMemberConversation({
+						userId: e.userId,
+						groupType: 1,
+						lastMessageContentType: 1,
+					}).then(res => {
+						if(res.data){
+							sheep.$router.go('/pages/im/index',{groupId: res.data, receiveUserId: e.userId});
+						}
+					});
+					return;
+				}
+				// 触发小程序授权信息弹框
+				// #ifdef MP-WEIXIN
+				showAuthModal('mpAuthorization');
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				showAuthModal('h5Authorization');
+				// #endif
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			    uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+			  });
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item {
+		display: flex;
+		flex-direction: column;
+		padding: 0 30rpx;
+		margin-bottom: 30rpx;
+	}
+	
+	.card {
+		padding: 30rpx 0;
+		border-bottom: 1rpx solid #eeeeee;
+		padding-top: 0;
+		display: flex;
+		
+		.right {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+			padding-top: 10px;
+		}
+	}
+	
+	.avatar-img{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 8rpx;
+		
+		.img {
+			width: 100%;
+			height: 100%;
+			border-radius: 100%;
+		}
+	}
+	
+	.avatar{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.img {
+			width: 75%;
+			height: 75%;
+			border-radius: 100%;
+		}
+		.gif {
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	
+	.card-header {
+		display: flex;
+		align-items: center;
+		
+		.box1 {
+			.tag-list {
+				display: flex;
+				align-items: center;
+				font-size: 22rpx;
+				color: #666666;
+				margin-top: 4rpx;
+				
+				.tag::after {
+				  content: '·';
+				  padding: 0 10rpx; /* 添加一些间隔 */
+				}
+				
+			}
+			
+			.tag-list .tag:last-child::after {
+				content: unset;
+			}
+		}
+		
+		.box2 {
+			display: flex;
+			align-items: center;
+			line-height: 40rpx;
+			
+			.nickname {
+				font-size: 28rpx;
+				color: #333333;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+				max-width: 200rpx;
+			}
+			
+			.sex-box {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background-color: #d06b8d1f;
+				border-radius: 20px;
+				font-size: 20rpx;
+				padding: 4rpx 10rpx;
+				color: #d06b8d;
+				line-height: 24rpx;
+				margin: 0 5px;
+				
+				.age {
+					margin-left: 2px;
+				}
+			}
+			
+			.nan {
+				background-color: #007aff1a;
+				color: #007aff;
+			}
+		}
+		
+		.box3 {
+			display: flex;
+			justify-content: space-between;
+			flex: 1;
+			align-items: center;
+		}
+		
+		.fans {
+			width: 60rpx;
+			display: flex;
+			justify-content: flex-end;
+			height: 60rpx;
+			align-items: center;
+			color: var(--ui-BG-Main);
+			font-size: 24rpx;
+			padding-right: 3px;
+		}
+		
+		.chat-btn {
+			display: flex;
+			align-items: center;
+			background-color: var(--ui-BG-Main);
+			justify-content: center;
+			border-radius: 40px;
+			color: #fff;
+			font-size: 22rpx;
+			padding: 5px;
+			
+			.text {
+				margin-left: 2px;
+			}
+		}
+	}
+	
+	.card-content {
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		
+		.text-box {
+			font-size: 26rpx;
+			line-height: 180%;
+			white-space: pre-wrap;
+			letter-spacing: 2rpx;
+		}
+	}
+	
+	.topic-list { 
+		display: flex;
+		align-items: center;
+		margin-top: 10px;
+		
+		.topic {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 28rpx;
+			margin-right: 20rpx;
+			color: var(--ui-BG-Main);
+			font-weight: bold;
+			
+			.tag-text {
+				margin-left: 2px;
+			}
+		}
+	}
+	
+	.card-footer {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 30rpx;
+		
+		.toolbar {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			color: #666666;
+			width: 80rpx;
+			height: 40rpx;
+			flex: 1;
+		}
+		
+		.toolbar-text {
+			font-size: 26rpx;
+			margin-left: 5px;
+		}
+		
+		.text {
+			font-size: 24rpx;
+			margin-left: 5px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/trend/my/list.vue b/pages/trend/my/list.vue
new file mode 100644
index 0000000..417b0b4
--- /dev/null
+++ b/pages/trend/my/list.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" :auto="true" use-virtual-list auto-show-back-to-top :force-close-inner-list="true" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @scroll="scroll" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<su-navbar color="var(--ui-BG-Main)" title="我的动态" statusBar></su-navbar>
+			</template>  
+			   
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<view class="main-box">
+				<view class="tab-box">
+					<view class="right">
+						<tui-tabs :size="24" :tabs="tabs" :unlined="true" width="140" :height="55" :currentTab="currentTab" :sliderWidth="120" :sliderHeight="55"
+							bottom="50%" color="#888" selectedColor="var(--ui-BG-Main)" :bold="true" sliderBgColor="#7ea19e21" @change="change">
+						</tui-tabs>
+					</view>
+				</view>
+				<order-list :virtualList="virtualList" @reload="reload"></order-list>
+			</view>
+			
+			<!-- 自定义返回顶部view -->
+			<template #backToTop>  
+				<custom-back-to-top></custom-back-to-top> 
+			</template> 
+			
+		</z-paging>
+		
+		<s-menu-tools />
+		<s-auth-modal />
+	</view>
+</template>
+
+<script>
+	import tuiTabs from "@/components/thorui/tui-tabs/tui-tabs.vue"
+	import OrderList from '@/pages/trend/my/components/orderList.vue';
+	import TrendApi from '@/sheep/api/worker/trend'; 
+	import sheep from '@/sheep';
+	export default { 
+		components: {
+			tuiTabs,
+			OrderList,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 0,
+				height: 0,
+				
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10,
+					userId: null,
+					city: '',
+					queryType: '2',
+				},
+				
+				currentTab: 0,
+				tabs: [{
+					name: "最新",
+					value: '2',
+				}, {
+					name: "最热",
+					value: '1',
+				}],
+			}
+		},
+		onLoad(options) {
+			this.queryParams.city = options.city;
+		},
+		computed: {
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+		},
+		methods: {
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				this.queryParams.pageNo = pageNo;
+				this.queryParams.pageSize = pageSize;
+				this.queryParams.queryType = this.tabs[this.currentTab].value;
+				
+				TrendApi.getMyTrendPage(this.queryParams).then(res => {
+					// 将请求的结果数组传递给z-paging
+					this.$refs.paging.complete(res.data.list); 
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			//切换tab，逻辑请自行处理
+			change(e) {
+				this.currentTab = e.index
+				this.$refs.paging.reload();
+			},
+			reload() {
+				this.$refs.paging.reload();
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fff;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	.main-box {
+		.tab-box {
+			display: flex;
+			justify-content: end;
+			
+			.right {
+				
+			}
+	
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/address/edit.vue b/pages/user/address/edit.vue
new file mode 100644
index 0000000..b88ee07
--- /dev/null
+++ b/pages/user/address/edit.vue
@@ -0,0 +1,305 @@
+<!-- 收货地址的新增/编辑 -->
+<template>
+  <s-layout :title="state.model.id ? '编辑地址' : '新增地址'">
+    <uni-forms
+      ref="addressFormRef"
+      v-model="state.model"
+      :rules="rules"
+      validateTrigger="bind"
+      labelWidth="160"
+      labelAlign="left"
+      border
+      :labelStyle="{ fontWeight: 'bold' }"
+    >
+      <view class="bg-white form-box ss-p-x-30">
+        <uni-forms-item name="name" label="收货人" class="form-item">
+          <uni-easyinput
+            v-model="state.model.name"
+            placeholder="请填写收货人姓名"
+            :inputBorder="false"
+            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
+          />
+        </uni-forms-item>
+
+        <uni-forms-item name="mobile" label="手机号" class="form-item">
+          <uni-easyinput
+            v-model="state.model.mobile"
+            type="number"
+            placeholder="请输入手机号"
+            :inputBorder="false"
+            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
+          >
+          </uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item
+          name="areaName"
+          label="省市区"
+          @tap="state.showRegion = true"
+          class="form-item"
+        >
+          <uni-easyinput
+            v-model="state.model.areaName"
+            disabled
+            :inputBorder="false"
+            :styles="{ disableColor: '#fff', color: '#333' }"
+            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
+            placeholder="请选择省市区"
+          >
+            <template v-slot:right>
+              <uni-icons type="right" />
+            </template>
+          </uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item
+          name="detailAddress"
+          label="详细地址"
+          :formItemStyle="{ alignItems: 'flex-start' }"
+          :labelStyle="{ lineHeight: '5em' }"
+          class="textarea-item"
+        >
+          <uni-easyinput
+            :inputBorder="false"
+            type="textarea"
+            v-model="state.model.detailAddress"
+            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
+            placeholder="请输入详细地址"
+            clearable
+          />
+        </uni-forms-item>
+      </view>
+      <view class="ss-m-y-20 bg-white ss-p-x-30 ss-flex ss-row-between ss-col-center default-box">
+        <view class="default-box-title"> 设为默认地址 </view>
+        <su-switch style="transform: scale(0.8)" v-model="state.model.defaultStatus" />
+      </view>
+    </uni-forms>
+    <su-fixed bottom :opacity="false" bg="" placeholder :noFixed="false" :index="10">
+      <view class="footer-box ss-flex-col ss-row-between ss-p-20">
+        <view class="ss-m-b-20">
+          <button class="ss-reset-button save-btn ui-Shadow-Main" @tap="onSave">保存</button>
+        </view>
+        <button v-if="state.model.id" class="ss-reset-button cancel-btn" @tap="onDelete">
+          删除
+        </button>
+      </view>
+    </su-fixed>
+
+    <!-- 省市区弹窗 -->
+    <su-region-picker
+      :show="state.showRegion"
+      @cancel="state.showRegion = false"
+      @confirm="onRegionConfirm"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import { ref, reactive, unref } from 'vue';
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import _ from 'lodash-es';
+  import { mobile } from '@/sheep/validate/form';
+  import AreaApi from '@/sheep/api/system/area';
+  import AddressApi from '@/sheep/api/member/address';
+
+  const addressFormRef = ref(null);
+  const state = reactive({
+    showRegion: false,
+    model: {
+      name: '',
+      mobile: '',
+      detailAddress: '',
+      defaultStatus: false,
+      areaName: '',
+    },
+    rules: {},
+  });
+
+  const rules = {
+    name: {
+      rules: [
+        {
+          required: true,
+          errorMessage: '请输入收货人姓名',
+        },
+      ],
+    },
+    mobile,
+    detailAddress: {
+      rules: [
+        {
+          required: true,
+          errorMessage: '请输入详细地址',
+        },
+      ],
+    },
+    areaName: {
+      rules: [
+        {
+          required: true,
+          errorMessage: '请选择您的位置',
+        },
+      ],
+    },
+  };
+
+  // 确认选择地区
+  const onRegionConfirm = (e) => {
+    state.model.areaName = `${e.province_name} ${e.city_name} ${e.district_name}`;
+    state.model.areaId = e.district_id;
+    state.showRegion = false;
+  };
+
+  // 获得地区数据
+  const getAreaData = () => {
+    if (_.isEmpty(uni.getStorageSync('areaData'))) {
+      AreaApi.getAreaTree().then((res) => {
+        if (res.code === 0) {
+          uni.setStorageSync('areaData', res.data);
+        }
+      });
+    }
+  };
+
+  // 保存收货地址
+  const onSave = async () => {
+    // 参数校验
+    const validate = await unref(addressFormRef)
+      .validate()
+      .catch((error) => {
+        console.log('error: ', error);
+      });
+    if (!validate) {
+      return;
+    }
+
+    // 提交请求
+    const formData = {
+      ...state.model,
+    };
+    const { code } =
+      state.model.id > 0
+        ? await AddressApi.updateAddress(formData)
+        : await AddressApi.createAddress(formData);
+    if (code === 0) {
+      sheep.$router.back();
+    }
+  };
+
+  // 删除收货地址
+  const onDelete = () => {
+    uni.showModal({
+      title: '提示',
+      content: '确认删除此收货地址吗？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        const { code } = await AddressApi.deleteAddress(state.model.id);
+        if (code === 0) {
+          sheep.$router.back();
+        }
+      },
+    });
+  };
+
+  onLoad(async (options) => {
+    // 获得地区数据
+    getAreaData();
+    // 情况一：基于 id 获得收件地址
+    if (options.id) {
+      let { code, data } = await AddressApi.getAddress(options.id);
+      if (code !== 0) {
+        return;
+      }
+      state.model = data;
+    }
+    // 情况二：微信导入
+    if (options.data) {
+      let data = JSON.parse(options.data);
+      const areaData = uni.getStorageSync('areaData');
+      const findAreaByName = (areas, name) => areas.find((item) => item.name === name);
+
+      let provinceObj = findAreaByName(areaData, data.province_name);
+      let cityObj = provinceObj ? findAreaByName(provinceObj.children, data.city_name) : undefined;
+      let districtObj = cityObj ? findAreaByName(cityObj.children, data.district_name) : undefined;
+      let areaId = (districtObj || cityObj || provinceObj).id;
+
+      state.model = {
+        ...state.model,
+        areaId,
+        areaName: [data.province_name, data.city_name, data.district_name]
+          .filter(Boolean)
+          .join(' '),
+        defaultStatus: false,
+        detailAddress: data.address,
+        mobile: data.mobile,
+        name: data.consignee,
+      };
+    }
+  });
+</script>
+
+<style lang="scss" scoped>
+  :deep() {
+    .uni-forms-item__label .label-text {
+      font-size: 28rpx !important;
+      color: #333333 !important;
+      line-height: normal !important;
+    }
+
+    .uni-easyinput__content-input {
+      font-size: 28rpx !important;
+      color: #333333 !important;
+      line-height: normal !important;
+      padding-left: 0 !important;
+    }
+
+    .uni-easyinput__content-textarea {
+      font-size: 28rpx !important;
+      color: #333333 !important;
+      line-height: normal !important;
+      margin-top: 8rpx !important;
+    }
+
+    .uni-icons {
+      font-size: 40rpx !important;
+    }
+
+    .is-textarea-icon {
+      margin-top: 22rpx;
+    }
+
+    .is-disabled {
+      color: #333333;
+    }
+  }
+
+  .default-box {
+    width: 100%;
+    box-sizing: border-box;
+    height: 100rpx;
+
+    .default-box-title {
+      font-size: 28rpx;
+      color: #333333;
+      line-height: normal;
+    }
+  }
+
+  .footer-box {
+    .save-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      color: $white;
+    }
+
+    .cancel-btn {
+      width: 710rpx;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: var(--ui-BG);
+    }
+  }
+</style>
diff --git a/pages/user/address/list.vue b/pages/user/address/list.vue
new file mode 100644
index 0000000..58b6214
--- /dev/null
+++ b/pages/user/address/list.vue
@@ -0,0 +1,165 @@
+<!-- 收件地址列表 -->
+<template>
+  <s-layout title="收货地址" :bgStyle="{ color: '#FFF' }">
+    <view v-if="state.list.length">
+      <s-address-item
+        hasBorderBottom
+        v-for="item in state.list"
+        :key="item.id"
+        :item="item"
+        @tap="onSelect(item)"
+      />
+    </view>
+
+    <su-fixed bottom placeholder>
+      <view class="footer-box ss-flex ss-row-between ss-p-20">
+        <!-- 微信小程序和微信H5 -->
+        <button
+          v-if="['WechatMiniProgram', 'WechatOfficialAccount'].includes(sheep.$platform.name)"
+          @tap="importWechatAddress"
+          class="border ss-reset-button sync-wxaddress ss-m-20 ss-flex ss-row-center ss-col-center"
+        >
+          <text class="cicon-weixin ss-p-r-10" style="color: #09bb07; font-size: 40rpx"></text>
+          导入微信地址
+        </button>
+        <button
+          class="add-btn ss-reset-button ui-Shadow-Main"
+          @tap="sheep.$router.go('/pages/user/address/edit')"
+        >
+          新增收货地址
+        </button>
+      </view>
+    </su-fixed>
+    <s-empty
+      v-if="state.list.length === 0 && !state.loading"
+      text="暂无收货地址"
+      icon="/static/data-empty.png"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import { onBeforeMount, reactive } from 'vue';
+  import { onShow, onLoad } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import { isEmpty } from 'lodash-es';
+  import AreaApi from '@/sheep/api/system/area';
+  import AddressApi from '@/sheep/api/member/address';
+
+  const state = reactive({
+    list: [], // 地址列表
+    loading: true,
+    openType: '', // 页面打开类型
+  });
+
+  // 选择收货地址
+  const onSelect = (addressInfo) => {
+    if (state.openType !== 'select'){ // 不作为选择组件时阻断操作
+      return
+    }
+    uni.$emit('SELECT_ADDRESS', {
+      addressInfo,
+    });
+    sheep.$router.back();
+  };
+
+  // 导入微信地址
+  function importWechatAddress() {
+    let wechatAddress = {};
+    // #ifdef MP
+    uni.chooseAddress({
+      success: (res) => {
+        wechatAddress = {
+          consignee: res.userName,
+          mobile: res.telNumber,
+          province_name: res.provinceName,
+          city_name: res.cityName,
+          district_name: res.countyName,
+          address: res.detailInfo,
+          region: '',
+          is_default: false,
+        };
+        if (!isEmpty(wechatAddress)) {
+          sheep.$router.go('/pages/user/address/edit', {
+            data: JSON.stringify(wechatAddress),
+          });
+        }
+      },
+      fail: (err) => {
+        console.log('%cuni.chooseAddress,调用失败', 'color:green;background:yellow');
+      },
+    });
+    // #endif
+    // #ifdef H5
+    sheep.$platform.useProvider('wechat').jssdk.openAddress({
+      success: (res) => {
+        wechatAddress = {
+          consignee: res.userName,
+          mobile: res.telNumber,
+          province_name: res.provinceName,
+          city_name: res.cityName,
+          district_name: res.countryName,
+          address: res.detailInfo,
+          region: '',
+          is_default: false,
+        };
+        if (!isEmpty(wechatAddress)) {
+          sheep.$router.go('/pages/user/address/edit', {
+            data: JSON.stringify(wechatAddress),
+          });
+        }
+      },
+    });
+    // #endif
+  }
+
+  onLoad((option) => {
+    if (option.type) {
+      state.openType = option.type;
+    }
+  });
+
+  onShow(async () => {
+    state.list = (await AddressApi.getAddressList()).data;
+    state.loading = false;
+  });
+
+  onBeforeMount(() => {
+    if (!!uni.getStorageSync('areaData')) {
+      return;
+    }
+    // 提前加载省市区数据
+    AreaApi.getAreaTree().then((res) => {
+      if (res.code === 0) {
+        uni.setStorageSync('areaData', res.data);
+      }
+    });
+  });
+</script>
+
+<style lang="scss" scoped>
+  .footer-box {
+    .add-btn {
+      flex: 1;
+      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+      border-radius: 80rpx;
+      font-size: 30rpx;
+      font-weight: 500;
+      line-height: 80rpx;
+      color: $white;
+      position: relative;
+      z-index: 1;
+    }
+
+    .sync-wxaddress {
+      flex: 1;
+      line-height: 80rpx;
+      background: $white;
+      border-radius: 80rpx;
+      font-size: 30rpx;
+      font-weight: 500;
+      color: $dark-6;
+      margin-right: 18rpx;
+    }
+  }
+</style>
diff --git a/pages/user/detail/components/detail-navbar.vue b/pages/user/detail/components/detail-navbar.vue
new file mode 100644
index 0000000..1723c51
--- /dev/null
+++ b/pages/user/detail/components/detail-navbar.vue
@@ -0,0 +1,221 @@
+<template>
+  <su-fixed alway :bgStyles="{ background: '#fff' }" :val="0" noNav opacity :placeholder="false">
+    <su-status-bar />
+    <view
+      class="ui-bar ss-flex ss-col-center ss-row-between ss-p-x-20"
+      :style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
+    >
+      <!-- 左 -->
+      <view class="icon-box ss-flex">
+        <view class="icon-button icon-button-left ss-flex ss-row-center" @tap="onClickLeft">
+          <text :class="tabOpacityVal > 0.4 ? 'black' : ''" class="sicon-back" v-if="hasHistory" />
+          <text :class="tabOpacityVal > 0.4 ? 'black' : ''" class="sicon-home" v-else />
+        </view>
+        <view class="line"></view>
+        <view class="icon-button icon-button-right ss-flex ss-row-center" @tap="onClickRight">
+          <text :class="tabOpacityVal > 0.4 ? 'black' : ''" class="sicon-more" />
+        </view>
+      </view>
+      <!-- 中 -->
+      <view class="detail-tab-card ss-flex-1" :style="[{ opacity: tabOpacityVal }]">
+        <view class="tab-box ss-flex ss-col-center ss-row-around">
+          <view
+            class="tab-item ss-flex-1 ss-flex ss-row-center ss-col-center"
+            v-for="item in tabList"
+            :key="item.value"
+            @tap="onTab(item)"
+          >
+            <view class="tab-title" :class="currentTab === item.value ? 'cur-tab-title' : ''">
+              {{ item.label }}
+            </view>
+            <view v-show="currentTab === item.value" class="tab-line"></view>
+          </view>
+        </view>
+      </view>
+      <!-- #ifdef MP -->
+      <view :style="[capsuleStyle]"></view>
+      <!-- #endif -->
+    </view>
+  </su-fixed>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import { showMenuTools, closeMenuTools } from '@/sheep/hooks/useModal';
+	export default {
+		components: {
+			
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			},
+			//滚动条滚动距离
+			scrollTop: {
+				type: [Number, String],
+				default: 0
+			},
+		},
+		data() {
+			return {
+				sys_navBar: sheep.$platform.navbar,
+				sys_statusBar: sheep.$platform.device.statusBarHeight,
+				hasHistory: sheep.$router.hasHistory(),
+				tabList: [
+				  {
+				    label: '礼物墙',
+				    value: 0,
+				  },
+				  {
+				    label: '动态',
+				    value: 1,
+				  },
+				],
+				capsuleStyle: {
+				  width: sheep.$platform.capsule.width + 'px',
+				  height: sheep.$platform.capsule.height + 'px',
+				},
+			}
+		},
+		computed: {
+			tabOpacityVal() {
+				return this.scrollTop > sheep.$platform.navbar ? 1 : this.scrollTop * 0.01;;
+			},
+			currentTab() {
+				return sheep.$store('sys').userTabIndex;
+			},
+		},
+		methods: {
+			onClickLeft() {
+				if (this.hasHistory) {
+					sheep.$router.back();
+				} else {
+					sheep.$router.go('/pages/tabbar/index');
+				}
+			},
+			onClickRight() {
+				showMenuTools();
+			},
+			onTab(e) {
+				this.$emit('onTab', e.value);
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.icon-box {
+	  box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
+	  border-radius: 30rpx;
+	  width: 134rpx;
+	  height: 56rpx;
+	  margin-left: 8rpx;
+	  border: 1px solid rgba(#fff, 0.4);
+	  .line {
+	    width: 2rpx;
+	    height: 24rpx;
+	    background: #e5e5e7;
+	  }
+	  .sicon-back {
+	    font-size: 32rpx;
+	    color: #fff;
+	  }
+	  .sicon-home {
+	    font-size: 32rpx;
+	    color: #fff;
+	  }
+	  .sicon-more {
+	    font-size: 32rpx;
+	    color: #fff;
+	  }
+	  
+	  .black {
+		  color: #000;
+	  }
+	  
+	  .icon-button {
+	    width: 67rpx;
+	    height: 56rpx;
+	    &-left:hover {
+	      background: rgba(0, 0, 0, 0.16);
+	      border-radius: 30rpx 0px 0px 30rpx;
+	    }
+	    &-right:hover {
+	      background: rgba(0, 0, 0, 0.16);
+	      border-radius: 0px 30rpx 30rpx 0px;
+	    }
+	  }
+	}
+	.left-box {
+	  position: relative;
+	  width: 60rpx;
+	  height: 60rpx;
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	  .circle {
+	    position: absolute;
+	    left: 0;
+	    top: 0;
+	    width: 60rpx;
+	    height: 60rpx;
+	    background: rgba(#fff, 0.6);
+	    border: 1rpx solid #ebebeb;
+	    border-radius: 50%;
+	    box-sizing: border-box;
+	    z-index: -1;
+	  }
+	}
+	.right {
+	  position: relative;
+	  width: 60rpx;
+	  height: 60rpx;
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	  .circle {
+	    position: absolute;
+	    left: 0;
+	    top: 0;
+	    width: 60rpx;
+	    height: 60rpx;
+	    background: rgba(#ffffff, 0.6);
+	    border: 1rpx solid #ebebeb;
+	    box-sizing: border-box;
+	    border-radius: 50%;
+	    z-index: -1;
+	  }
+	}
+	.detail-tab-card {
+	  width: 50%;
+	  .tab-item {
+	    height: 80rpx;
+	    position: relative;
+	    z-index: 11;
+	
+	    .tab-title {
+	      font-size: 30rpx;
+	    }
+	
+	    .cur-tab-title {
+	      font-weight: $font-weight-bold;
+	    }
+	
+	    .tab-line {
+	      width: 60rpx;
+	      height: 6rpx;
+	      border-radius: 6rpx;
+	      position: absolute;
+	      left: 50%;
+	      transform: translateX(-50%);
+	      bottom: 10rpx;
+	      background-color: var(--ui-BG-Main);
+	      z-index: 12;
+	    }
+	  }
+	}
+	
+
+</style>
\ No newline at end of file
diff --git a/pages/user/detail/components/giftList.vue b/pages/user/detail/components/giftList.vue
new file mode 100644
index 0000000..63eefff
--- /dev/null
+++ b/pages/user/detail/components/giftList.vue
@@ -0,0 +1,316 @@
+<template>
+	<view v-show="showPop" class="gift-box">
+		<scroll-view style="height: 100%;" scroll-y>
+			<view class="top-box">
+				<view class="title">选择礼物</view>
+				<view class="btn-box" @click="close">
+					<u-icon name="close"></u-icon>
+					<view class="text">取消</view>
+				</view>
+			</view>
+			<view class="list-box">
+				<view v-for="(item,index) in dataList" class="gift" @click="sendGift(item)">
+					<view class="img-box">
+						<img class="img" :src="item.img"></img>
+						<view class="tag" v-if="item.giftType == 1">
+							<text>特效</text>
+							<text v-if="item.tag">·{{item.tag}}</text>
+						</view>
+						<view class="tag" v-if="item.giftType == 0 && item.tag">
+							<text>{{item.tag}}</text>
+						</view>
+					</view>
+					<view class="name">{{item.name}}</view>
+					<view class="price">{{ fen2yuan(item.money) }} 钻石</view>
+				</view>
+			</view>
+		</scroll-view>
+		
+	</view>
+	
+	<view class="svga-box" :class="giftFlag ? 'svga-show': 'svga-hide'">
+		<c-svga ref="cSvgaRef" :canvasId='canvasId' :src="src" :loops='0' :auto-play="false" @frame='onFrame' @finished='onFinished' @percentage='onPercentage' @loaded='onLoaded'></c-svga>
+		<view class="close-btn">
+			<view class="bottom-box">
+				<view class="title">{{gift.name}}</view>
+				<view class="price">{{ fen2yuan(gift.money) }} 钻石</view>
+				<view class="btn-box">
+					<view class="btn" @click="cannel">取消</view>
+					<view class="btn active" @click="ok">确定</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			
+		},
+		props: {
+			modelValue: {
+			  type: Object,
+			  default: {}
+			},
+			showPop: {
+			  type: Boolean,
+			  default: false
+			},
+			dataList: {
+			  type: Array,
+			  default: []
+			},
+		},
+		emits: ["close", "update:modelValue"],
+		data() {
+			return { 
+				giftFlag: false,
+				src: '',
+				canvasId: 'myCanvas2',
+				
+				gift: {},
+				
+			}
+		},
+		methods: {
+			close() {
+				this.$emit('close');
+			},
+			sendGift(e) {
+				this.gift = e;
+				
+				if(e.giftType == 0){
+					// 普通礼物不播放
+					this.close();
+					this.$emit('update:modelValue', this.gift); 
+					return;
+				}
+				
+				this.src = e.pic;
+				this.giftFlag = true;
+			},
+			onFinished() {
+				this.giftFlag = false;
+				console.log('动画停止播放时回调');
+			},
+			onFrame(frame) {//动画播放至某帧后回调
+				// console.log(frame);
+			},
+			onPercentage(percentage) { //动画播放至某进度后回调
+				// console.log(percentage);
+			},
+			onLoaded() {
+				this.$refs.cSvgaRef.call('setContentMode', 'AspectFill');
+				console.log('加载完成');
+				this.$refs.cSvgaRef.call('startAnimation');
+			},
+			closeSvga() {
+				this.src = "";
+				this.$refs.cSvgaRef.call('stopAnimation');
+				this.giftFlag = false;
+			},
+			fen2yuan(price) {
+			  var f = 0;
+			  var p = (price / 100.0).toFixed(0);
+			  var p1 = (price / 100.0).toFixed(1);
+			  var p2 = (price / 100.0).toFixed(2);
+			  if(p*100 == price){
+				f = 0;  
+			  }else if(p1*100 == price){
+				  f = 1;
+			  }else if(p2*100 == price){
+				  f = 2;
+			  }
+			  return (price / 100.0).toFixed(f)
+			},
+			cannel() {
+				this.closeSvga();
+			},
+			ok() {
+				this.closeSvga();
+				this.close();
+				this.$emit('update:modelValue', this.gift); 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.gift-box {
+		background-color: #fff;
+		position: absolute;
+		top: 200rpx;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 9999;
+		padding: 15px;
+		border-top-right-radius: 20rpx;
+		border-top-left-radius: 20rpx;
+		padding-bottom: 0;
+		
+		.top-box {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			position: fixed;
+			left: 0;
+			right: 0;
+			background-color: #fff;
+			top: 200rpx;
+			padding: 0 15px;
+			border-top-right-radius: 20rpx;
+			border-top-left-radius: 20rpx;
+			height: 110rpx;
+			z-index: 1;
+			
+			.title {
+				font-size: 28rpx;
+			}
+			
+			.btn-box {
+				background-color: var(--ui-BG-Main);
+				padding: 7px 15px;
+				font-size: 24rpx;
+				border-radius: 40px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: #fff;
+				
+				.text {
+					margin-left: 5px;
+				}
+			}
+		}
+		
+		.list-box {
+			display: flex;
+			flex-wrap: wrap;
+			padding-top: 60rpx;
+			
+			.gift {
+				width: 25%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				margin: 20rpx 0px;
+				
+				.img-box {
+					position: relative;
+						
+					.img{
+						max-width: 160rpx;
+						height: 160rpx;
+					}
+					
+					.tag {
+						position: absolute;
+						top: 0;
+						right: 0;
+						font-size: 16rpx;
+						color: #fff;
+						background-color: var(--ui-BG-Main);
+						border-radius: 40px;
+						padding: 2rpx 8rpx;
+					}
+				}
+				
+				.name {
+					font-size: 24rpx;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					max-width: 160rpx;
+					margin-top: 2px;
+					margin-bottom: 7px;
+				}
+				
+				.price {
+					font-size: 20rpx;
+					color: var(--ui-BG-Main);
+				}
+			}
+		}
+	}
+	
+	.svga-box {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999999999;
+		width: 100%;
+		height: 100%;
+		background-color: black;
+		
+		.close-btn {
+			color: #fff;
+			position: absolute;
+			z-index: 999999999;
+			padding: 5px 10px;
+			
+			left: 0;
+			right: 0;
+			bottom: 100rpx;
+			
+			.bottom-box {
+				display: flex;
+				justify-content: center;
+				flex-direction: column;
+				align-items: center;
+				
+				.title {
+					font-size: 28rpx;
+					margin-bottom: 5px;
+				}
+				
+				.price {
+					font-size: 24rpx;
+				}
+				
+				.btn-box {
+					display: flex;
+					align-items: center;
+					margin-top: 10px;
+					
+					.btn {
+						border: 1px solid #fff;
+						font-size: 28rpx;
+						padding: 20rpx 110rpx;
+						border-radius: 40px;
+						margin: 15px;
+						color: #fff;
+					}
+					
+					.active {
+						border: 1px solid var(--ui-BG-Main);
+						background-color: var(--ui-BG-Main);
+					}
+				}
+			}
+		}
+	}
+	
+	.svga-hide {
+		/* #ifdef MP */
+		transform: translate(-100%, 0);
+		/* #endif */
+		
+		/* #ifndef MP */
+		display: none;
+		/* #endif */
+	}
+	
+	.svga-show {
+		/* #ifdef MP */
+		transform: translate(0, 0);
+		/* #endif */
+		
+		/* #ifndef MP */
+		display: block;
+		/* #endif */
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/detail/components/giftPopup.vue b/pages/user/detail/components/giftPopup.vue
new file mode 100644
index 0000000..8abb4d6
--- /dev/null
+++ b/pages/user/detail/components/giftPopup.vue
@@ -0,0 +1,445 @@
+<template>
+	<tui-bottom-popup :zIndex="1002" :maskZIndex="1001" :show="popupShow" @close="hiddenPopup">
+		<view class="order-box">
+			<view class="avatar-box">
+				<u-image width="140" height="140" border-radius="20" :src="clerk.avatar"></u-image>
+				<view class="close-span" @click="hiddenPopup">
+					<u-icon name="close-circle" color="#98a2a1" size="50"></u-icon>
+				</view>
+			</view>
+			<scroll-view style="height: 700rpx;" scroll-y>
+				<view class="page-box">
+					
+					<view class="form-box">
+						
+						<view class="input-box">
+							<view class="tag-box">
+								<view class="name">赠送类型</view>
+							</view>
+							<view class="tab-span">
+								<!-- <view @click="changeTab(0)" class="btn" :class="form.rewardType == 0 ? 'active' : ''">赠送</view> -->
+								<view @click="changeTab(1)" class="btn" :class="form.rewardType == 1 ? 'active' : ''">赠礼</view>
+							</view>
+						</view>
+						
+						
+						<view class="input-box" v-if="form.rewardType == 0">
+							<view class="tag-box">
+								<view class="name">打赏金额</view>
+							</view>
+							<view class="input-span">
+								<u-input v-model="payMoney" type="number" :placeholder-style="`fontSize: 24rpx; color: #cbced5;`" placeholder="请输入赠送金额"></u-input>
+							</view>
+						</view>
+						
+						<view class="input-box" v-if="form.rewardType == 1">
+							<view class="tag-box">
+								<view class="name">赠送礼物</view>
+							</view>
+							<view class="select-span" @click="openGift">
+								<view v-if="gift.id > 0">已选【{{gift.name}}】</view>
+								<view v-else>点击选择礼物</view>
+								<u-icon name="arrow-right"></u-icon>
+							</view>
+						</view>
+						
+						<view class="input-box" v-if="gift.id > 0">
+							<view class="tag-box">
+								<view class="name">礼物数量</view>
+							</view>
+							<view class="step-span">
+								<img class="img" :src="gift.img"></img>
+								<tui-numberbox iconBgColor="var(--ui-BG-Main)" iconColor="#fff" backgroundColor="#fff" :min="1" :value="form.count" @change="change"></tui-numberbox>
+							</view>
+						</view>
+						
+						<view class="input-box">
+							<view class="textarea-box">
+								<view class="name">心动留言</view>
+							</view>
+							<view class="textarea-span">
+								<u-input v-model="form.msg" type="textarea" :placeholder-style="`fontSize: 24rpx; color: #cbced5;`" placeholder="请输入心动留言"></u-input>
+							</view>
+						</view>
+						
+						<view class="input-box" v-if="isPass">
+							<view class="tag-box">
+								<view class="name">您的微信号</view>
+							</view>
+							<view class="input-span">
+								<u-input v-model="form.weixin" :placeholder-style="`fontSize: 24rpx; color: #cbced5;`" placeholder="请输入正确的微信号"></u-input>
+							</view>
+						</view>
+						
+					</view>
+					
+				</view>
+			</scroll-view>
+			<view class="bottom-box2" v-if="form.rewardType == 0">
+				<view class="btn-box">
+					<view class="pay-btn" @click="confirm">立即赠送</view>
+				</view>
+			</view>
+			
+			<view class="bottom-box" v-if="form.rewardType == 1">
+				<view class="price-box">
+					<text>总价：</text>
+					<text class="price">{{ fen2yuan(gift.money*form.count) }}</text>
+					<text>钻石</text>
+				</view>
+				<view class="btn-box">
+					<view class="pay-btn" @click="confirm">立即赠送</view>
+				</view>
+			</view>
+		</view>
+	</tui-bottom-popup>
+	
+	<gift-list :showPop="giftFlag" :dataList="giftList" v-model="gift" @close="closeGift"></gift-list>
+</template>
+
+<script>
+	import tuiBottomPopup from "@/components/thorui/tui-bottom-popup/tui-bottom-popup.vue"
+	import tuiNumberbox from "@/components/thorui/tui-numberbox/tui-numberbox.vue"
+	import GiftList from '@/pages/user/detail/components/giftList.vue';
+	import RewardApi from '@/sheep/api/worker/reward'; 
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			tuiBottomPopup,
+			tuiNumberbox,
+			GiftList,
+		},
+		props: {
+			
+		},
+		data() {
+			return { 
+				popupShow: false,
+				
+				gift: {
+					id: -1,
+					money: 0,
+				},
+				
+				giftFlag: false,
+				
+				giftList: [],
+				
+				payMoney: '',
+				
+				form: {
+					rewardType: 1,
+					count: 1,
+					giftId: -1,
+					money: '',
+					weixin: '',
+					msg: '',
+					workerUserId: 0,
+					payMoney: '',
+				},
+				
+	
+			}
+		},
+		computed: {
+			clerk() {
+				return sheep.$store('sys').user;
+			},
+			userInfo() {
+				return sheep.$store('user').userInfo;
+			},
+			isPass() {
+				return sheep.$store('user').tradeConfig.weixinEnabled;
+			},
+		},
+		methods: {
+			//调用此方法显示弹层
+			showPopup() {
+				this.form.weixin = this.userInfo.weixin;
+				RewardApi.getGiftList().then(res => {
+					this.giftList = res.data;
+					this.popupShow = true
+				});
+			},
+			showGiftPopup(e) {
+				this.gift = e;
+				this.form.rewardType = 1;
+				this.form.weixin = this.userInfo.weixin;
+				RewardApi.getGiftList().then(res => {
+					this.giftList = res.data;
+					this.popupShow = true
+				});
+			},
+			hiddenPopup() {
+				this.popupShow = false
+			},
+			change(e) {
+				this.form.count = e.value
+			},
+			changeTab(e) {
+				this.form.rewardType = e;
+				this.gift = {
+					id: -1,
+					money: 0,
+				};
+			},
+			fen2yuan(price) {
+			  var f = 0;
+			  var p = (price / 100.0).toFixed(0);
+			  var p1 = (price / 100.0).toFixed(1);
+			  var p2 = (price / 100.0).toFixed(2);
+			  if(p*100 == price){
+				f = 0;  
+			  }else if(p1*100 == price){
+				  f = 1;
+			  }else if(p2*100 == price){
+				  f = 2;
+			  }
+			  return (price / 100.0).toFixed(f)
+			},
+			yuan2fen(price) {
+			  return (price * 100.0).toFixed(0)
+			},
+			openGift() {
+				this.giftFlag = true;
+			},
+			closeGift() {
+				this.form.count = 1;
+				this.giftFlag = false;
+			},
+			confirm() {
+				if(this.isPass && !this.form.weixin){
+					sheep.$helper.toast('请输入正确的微信');
+					return;
+				}
+				if(this.form.rewardType == 0){
+					this.form.payMoney = this.yuan2fen(this.payMoney);
+					if(this.form.payMoney < 1){
+						sheep.$helper.toast('请输入打赏金额');
+						return; 
+					}
+				}else{
+					this.form.giftId = this.gift.id;
+					if(this.form.giftId < 1){
+						sheep.$helper.toast('请选择打赏礼物');
+						return;
+					}
+				}
+				this.form.workerUserId = this.clerk.id;
+				RewardApi.createRewardOrder(this.form).then(res => {
+					// 跳转到支付页面
+					this.$u.route({
+						url: 'pages/pay/reward/index',
+						params: {
+							id: res.data.payOrderId,
+						}
+					});
+				});
+				
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.avatar-box {
+		padding: 10px 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.close-span {
+			position: absolute;
+			right: 5px;
+			top: 5px;
+			width: 70rpx;
+			height: 70rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+	
+	.page-box {
+		padding: 15px;
+		padding-bottom: 10px;
+		
+		.form-box {
+			margin-bottom: 10px;
+			
+			.tag-box {
+				display: flex;
+				align-items: center;
+				width: 180rpx;
+				
+				.name {
+					font-size: 24rpx;
+					color: #333;
+					margin-left: 5px;
+				}
+			}
+			
+			.textarea-box {
+				height: 20px;
+				display: flex;
+				width: 180rpx;
+				
+				.name {
+					font-size: 24rpx;
+					color: #333;
+					margin-left: 5px;
+				}
+			}
+			
+			.input-box {
+				display: flex;
+				margin-bottom: 20px;
+				align-items: center;
+				
+				.input-span {
+					background-color: #f6f6f6;
+					margin-left: 15px;
+					display: flex;
+					flex: 1;
+					padding: 0 12px;
+					border-radius: 10rpx;
+				}
+				
+				.select-span {
+					font-size: 24rpx;
+					background-color: #f6f6f6;
+					margin-left: 15px;
+					display: flex;
+					flex: 1;
+					padding: 12px 12px;
+					border-radius: 10rpx;
+					color: #aaaaaa;
+					justify-content: space-between;
+				}
+				
+				.tab-span {
+					display: flex;
+					flex: 1;
+					padding: 0 12px;
+					align-items: center;
+					
+					.btn {
+						background-color: #f6f6f6;
+						font-size: 24rpx;
+						padding: 7px 0;
+						border-radius: 40px;
+						min-width: 120rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						margin-right: 15px;
+					}
+					
+					.active {
+						color: #fff;
+						background-color: var(--ui-BG-Main);
+					}
+				}
+				
+				.textarea-span {
+					background-color: #f6f6f6;
+					margin-left: 15px;
+					flex: 1;
+					padding: 2px 12px;
+					border-radius: 10px;
+				}
+				
+				.step-span {
+					display: flex;
+					justify-content: space-between;
+					flex: 1;
+					padding-left: 12px;
+					align-items: center;
+					
+					.img {
+						width: 80rpx;
+						height: 80rpx;
+						border-radius: 100%;
+						box-shadow: 0 0 8px rgba(0, 0, 0, 0.5);
+					}
+				}
+			}
+		}
+	}
+
+	.bottom-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 15px;
+		box-shadow: 0 0 6px 0 #ccc;
+		
+		.price-box {
+			color: #fb932c;
+			font-size: 28rpx;
+			width: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			
+			.price {
+				margin-right: 5px;
+			}
+		}
+		
+		.btn-box {
+			width: 50%;
+			padding-left: 15px;
+			
+			.pay-btn {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				font-size: 28rpx;
+				height: 70rpx;
+			}
+		}
+		
+	}
+	
+	.bottom-box2 {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 15px;
+		box-shadow: 0 0 6px 0 #ccc;
+		
+		.price-box {
+			color: #fb932c;
+			font-size: 28rpx;
+			width: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			
+			.price {
+				margin-right: 5px;
+			}
+		}
+		
+		.btn-box {
+			width: 50%;
+			
+			.pay-btn {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				font-size: 28rpx;
+				height: 70rpx;
+			}
+		}
+		
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages/user/detail/components/layout.vue b/pages/user/detail/components/layout.vue
new file mode 100644
index 0000000..0e1764e
--- /dev/null
+++ b/pages/user/detail/components/layout.vue
@@ -0,0 +1,286 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" :auto="false" :show-loading-more-no-more-view="showLoad" :show-default-loading-more-text="showLoad" use-virtual-list :force-close-inner-list="true" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @scroll="scroll" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<nav-bar :title="title" :scrollTop="scrollTop" @onTab="change" @initNav="initNav"></nav-bar>
+			</template>  
+			   
+			<view>  
+				<user-box :clerk="user" :paddingTop="paddingTop"></user-box>
+				<sticky-box :trendNum="total" @change="change"></sticky-box>
+			</view>
+			
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<view class="data-box">
+				<star-list v-if="currentTab == 0" @openGift="openGift" :virtualList="giftList"></star-list>
+				<post-list v-if="currentTab == 1" :virtualList="virtualList"></post-list>
+			</view>
+			
+			<template #bottom>
+				<view v-if="isGift" class="bottom-box">
+					<view class="order" @click="doGift">赠礼</view>
+					<view class="gift" @click="chat">密聊</view>
+				</view>
+				<view v-else class="bottom-box">
+					<view class="order-btn" @click="chat">密聊</view>
+				</view>
+			</template>  
+			
+		</z-paging>
+		
+		<gift-popup ref="giftPopup"></gift-popup>
+		
+	</view>
+</template>
+
+<script>
+	import UserBox from '@/pages/user/detail/components/userBox.vue';
+	import StickyBox from '@/pages/user/detail/components/stickyBox.vue';
+	import StarList from '@/pages/user/detail/components/starList.vue';
+	import PostList from '@/pages/user/detail/components/postList.vue';
+	import NavBar from '@/pages/user/detail/components/navBar.vue';
+	import GiftPopup from '@/pages/user/detail/components/giftPopup.vue';
+	import UserApi from '@/sheep/api/member/user';
+	import TrendApi from '@/sheep/api/worker/trend'; 
+	import RewardApi from '@/sheep/api/worker/reward'; 
+	import ImConversationApi from '@/sheep/api/im/memberConversation';
+	import { WxaSubscribeTemplate } from '@/sheep/util/const';
+	import { showAuthModal } from '@/sheep/hooks/useModal';
+	import dayjs from 'dayjs';
+	import relativeTime from "dayjs/plugin/relativeTime";
+	dayjs.extend(relativeTime);
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			UserBox,
+			StickyBox,
+			StarList,
+			PostList,
+			NavBar, 
+			GiftPopup,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			}
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 0,
+				height: 0,
+				
+				user: {},
+				userId: 0,
+				giftList: [],
+				
+				total: 0,
+			}
+		},
+		computed: {
+			currentTab() {
+				return sheep.$store('sys').userTabIndex;
+			},
+			showLoad() {
+				return sheep.$store('sys').userTabIndex > 1;
+			},
+			isLogin: {
+				get() {
+				  return sheep.$store('user').isLogin;
+				},
+			},
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+			isGift() {
+				return sheep.$store('user').tradeConfig.giftEnabled;
+			},
+		},
+		methods: {
+			initNav(e) {
+				this.height = e.height;
+				this.paddingTop = this.height;
+			},
+			initData(options) {
+				this.userId = options.id;
+				this.getUserInfo();
+				
+				RewardApi.getRewardGiftList({
+					workerUserId: options.id,
+				}).then(res => {
+					this.giftList = res.data;
+				});
+			},
+			getUserInfo() {
+				UserApi.getUserInfoById(this.userId).then(res => {
+					this.user = res.data;
+					this.user.time = this.showDayTime(this.user.updateTime);
+					sheep.$store('sys').setUser(this.user);
+					
+					this.$refs.paging.reload();
+				});
+			},
+			showDayTime(datetime) {
+			  if (!datetime) return "";
+			  return dayjs(datetime).fromNow();
+			},
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					queryType: '2',
+					workerUserId: this.userId,
+				}
+				
+				TrendApi.getTrendPage(params).then(res => {
+					this.total = res.data.total;
+					// 将请求的结果数组传递给z-paging
+					this.$refs.paging.complete(res.data.list);
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			change(e) {
+				sheep.$store('sys').setUserTabIndex(e);
+				this.scrollTop = 0;
+				this.$refs.paging.reload();
+			},
+			chat() {
+				const isLogin = sheep.$store('user').isLogin;
+				if(!isLogin) {
+					showAuthModal();
+					return;
+				}
+				
+				const userInfo = sheep.$store('user').userInfo;
+				// 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。
+				if(userInfo.visible) {
+					// #ifdef MP-WEIXIN
+					this.subscribeMessage();
+					// #endif
+					
+					ImConversationApi.createMemberConversation({
+						userId: this.userId,
+						groupType: 1,
+						lastMessageContentType: 1,
+					}).then(res => {
+						if(res.data){
+							sheep.$router.go('/pages/im/index',{groupId: res.data, receiveUserId: this.userId});
+						}
+					});
+					return;
+				}
+				// 触发小程序授权信息弹框
+				// #ifdef MP-WEIXIN
+				showAuthModal('mpAuthorization');
+				// #endif
+				
+				// #ifndef MP-WEIXIN
+				showAuthModal('h5Authorization');
+				// #endif
+			},
+			subscribeMessage() {
+			  const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+			  sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+			    // 订阅后记录一下订阅状态
+			    uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+			    uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+			  });
+			},
+			doGift() {
+				if(this.isLogin){
+					this.$refs.giftPopup.showPopup();
+				}else{
+					showAuthModal();
+				}
+			},
+			openGift(e) {
+				if(this.isLogin){
+					this.$refs.giftPopup.showGiftPopup(e);
+				}else{
+					showAuthModal();
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.data-box {
+		padding: 0 15px;
+	}
+	.bottom-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 10px 30px;
+		box-shadow: 0 0 6px 0 #ccc;
+		
+		.order {
+			background-color: var(--ui-BG-Main);
+			padding: 10px;
+			border-top-left-radius: 40px;
+			border-bottom-left-radius: 40px;
+			color: #fff;
+			width: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 88rpx;
+			font-size: 28rpx;
+		}
+		
+		.order-btn {
+			background-color: var(--ui-BG-Main);
+			padding: 10px;
+			border-radius: 40px;
+			color: #fff;
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 88rpx;
+			font-size: 28rpx;
+		}
+		
+		.gift {
+			background-color: #eef3f2;
+			padding: 10px;
+			border-top-right-radius: 40px;
+			border-bottom-right-radius: 40px;
+			width: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 88rpx;
+			color: #aaa;
+			font-size: 28rpx;
+		}
+	}
+</style>
diff --git a/pages/user/detail/components/navBar.vue b/pages/user/detail/components/navBar.vue
new file mode 100644
index 0000000..42ca85b
--- /dev/null
+++ b/pages/user/detail/components/navBar.vue
@@ -0,0 +1,89 @@
+<template>
+  <view>
+	 <tui-navigation-bar @init="initNavigation" @change="opacityChange" :scrollTop="scrollTop" backgroundColor="#fff" color="#333">
+	 	<detailNavbar @onTab="onTab" :scrollTop="scrollTop" />
+	 </tui-navigation-bar>
+  </view>
+</template>
+
+<script>
+	import tuiNavigationBar from "@/components/thorui/tui-navigation-bar/tui-navigation-bar.vue";
+	import detailNavbar from '@/pages/user/detail/components/detail-navbar.vue';
+	export default {
+		components: {
+			tuiNavigationBar,
+			detailNavbar,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			},
+			//滚动条滚动距离
+			scrollTop: {
+				type: [Number, String],
+				default: 0
+			},
+		},
+		data() {
+			return {
+				top: 0, //标题图标距离顶部距离
+				opacity: 0,
+				height: 0,
+			}
+		},
+		methods: {
+			initNavigation(e) {
+				this.height = e.height;
+				this.opacity = e.opacity;
+				this.top = e.top;
+				this.$emit('initNav', e);
+			},
+			opacityChange(e) {
+				this.opacity = e.opacity;
+			},
+			onTab(e) {
+				this.$emit('onTab', e);
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-bpx {
+		color: #fff;
+		display: flex;
+		align-items: center;
+		height: 44px;
+		justify-content: center;
+		
+		.left-box {
+			display: flex;
+			position: absolute;
+			left: 0;
+		}
+		
+		.nickname {
+			position: absolute;
+			width: 100px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 44px;
+			font-size: 15px;
+			font-weight: bolder;
+			color: #1f2122;
+		}
+		
+		.set-btn {
+			padding: 0 15px;
+			height: 44px;
+			display: flex;
+			align-items: center;
+		}
+		
+	}
+	
+
+</style>
\ No newline at end of file
diff --git a/pages/user/detail/components/photoBox.vue b/pages/user/detail/components/photoBox.vue
new file mode 100644
index 0000000..7d575ed
--- /dev/null
+++ b/pages/user/detail/components/photoBox.vue
@@ -0,0 +1,50 @@
+<template>
+	<view class="photo-box">
+		<scroll-view scroll-x>
+			<view class="scroll-box">
+				<view class="img-box" @click="showImage(item)" v-for="(item,index) in dataList">
+					<u-image border-radius="20" width="170rpx" height="170rpx" :src="item"></u-image>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			dataList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			showImage(src) {
+				uni.previewImage({
+					indicator: "none",
+					current: src,
+					urls: this.dataList,
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.photo-box {
+		.scroll-box {
+			display: flex;
+		}
+		.img-box {
+			margin-right: 15px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/detail/components/postList.vue b/pages/user/detail/components/postList.vue
new file mode 100644
index 0000000..5080775
--- /dev/null
+++ b/pages/user/detail/components/postList.vue
@@ -0,0 +1,362 @@
+<template>
+  <view>
+	  <view class="item" :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in orderList">
+		  <view class="card">
+		  	<view class="right">
+		  		<view class="card-header">
+		  			<view class="box3">
+		  				<view class="box1">
+		  					<view class="tag-list">
+		  						<!-- <view class="tag">Ta爱玩王者荣耀</view> -->
+		  						<view class="tag">发布于 {{item.createTimeStr}}</view>
+		  					</view>
+		  				</view>
+		  			</view>
+		  		</view>
+		  		<view class="card-content"> 
+		  			<view class="text-box">  
+		  				<rich-text :nodes="item.content"></rich-text>
+		  			</view>
+		  		</view>
+		  		<view class="image-box" v-if="item.fileType == 0">
+		  			<img-box @preAd="preAd" :ad="item.adStatus" :file="item.file"></img-box>
+		  		</view>
+				<view class="voice-box" v-if="item.fileType == 1">
+					<voice-play :sec="item.seconds" @tap.stop="playAudio(item)" :isPlay="item.id == playId"></voice-play>
+				</view>
+				<view class="video-box" v-if="item.fileType == 2">
+					<video-box :file="item.file"></video-box>
+				</view>
+		  		<view class="topic-list">
+		  			<view class="topic">
+		  				<u-icon name="map-fill" size="40" color="#3cc9a4"></u-icon>
+		  				<view class="tag-text">{{item.city}}</view>
+						<u-icon name="arrow-right" size="24" color="#3cc9a4"></u-icon>
+		  			</view>
+		  		</view>
+		  		<view class="card-footer">
+		  			<!-- <view class="toolbar"> 
+		  				<u-icon color="#f880ab" name="presentfill" size="38" custom-prefix="iconfont"></u-icon>
+		  				<view class="toolbar-text">3</view>
+		  			</view> -->
+		  			<!-- <view class="toolbar">
+		  				<u-icon name="pinglun" size="38" custom-prefix="iconfont"></u-icon>
+		  				<view class="toolbar-text">22</view>
+		  			</view> -->
+		  			<view class="toolbar" @click="thumb(item)">
+						<u-icon v-if="item.like" name="thumb-up-fill" color="var(--ui-BG-Main)" size="40"></u-icon>
+		  				<u-icon v-else name="thumb-up" size="40"></u-icon>
+		  				<view class="toolbar-text" v-if="item.likeNum > 0">{{item.likeNum}}</view>
+						<view class="text" v-else>点赞</view>
+		  			</view>
+		  		</view>
+		  	</view>
+		  </view>
+	  </view>
+	  
+  </view>
+</template>
+
+<script>
+	import ImgBox from '@/pages/tabbar/components/trend/imgBox.vue';
+	import VideoBox from '@/pages/tabbar/components/trend/videoBox.vue';
+	import VoicePlay from '@/pages/tabbar/components/trend/voicePlay.vue';
+	import adVideoUtils from '@/sheep/util/adVideoUtils'; 
+	import sheep from '@/sheep';
+	import TrendApi from '@/sheep/api/worker/trend';
+	const audio = uni.createInnerAudioContext();
+	export default {
+		components: {
+			ImgBox,
+			VideoBox,
+			VoicePlay,
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				playId: null,
+			}
+		},
+		computed: {
+			orderList() {
+				this.virtualList.forEach((order) => order.createTimeStr = sheep.$helper.timeFormat(order.createTime, 'yyyy-mm-dd hh:MM'));
+				return this.virtualList;
+			},
+			tradeConfig() {
+				return sheep.$store('user').tradeConfig;
+			},
+		},
+		methods: {
+			playAudio(e) {
+				if(this.playId == e.id){
+					this.playId = null;
+					audio.stop();
+					return;
+				}
+				this.playId = e.id;
+				//语音自然播放结束
+				audio.onEnded((res) => {
+					this.playId = null;
+				});
+				audio.src = e.file;
+				audio.play();
+			},
+			thumb(e) {
+				TrendApi.createTrendLike({
+					trendId: e.id,
+				}).then((res) => {
+					if(res) {
+						if(e.like){
+							e.like = false;
+							e.likeNum = e.likeNum-1;
+							sheep.$helper.toast('取消点赞');
+						}else{
+							e.like = true;
+							e.likeNum = e.likeNum+1;
+							sheep.$helper.toast('点赞成功');
+						}
+					}
+				});
+			},
+			preAd(run) {
+				adVideoUtils.videoAdInit(this.tradeConfig.adUnitId);
+				adVideoUtils.videoAdShow()
+				.then((res) => {
+				  if (res) {
+					run(true);
+				  } else {
+					console.log('广告提前退出')
+					run(false);
+				  }
+				})
+				.catch((err) => {
+					console.log('广告加载失败')
+					run(false);
+				});  
+			},
+			fans(e) {
+				TrendApi.createClerkFans({
+					workerClerkId: e.workerClerkId,
+				}).then((res) => {
+					if(res){
+						if(e.fans){
+							sheep.$helper.toast('取消收藏');
+							e.fans = false;
+						}else{
+							sheep.$helper.toast('收藏成功');
+							e.fans = true;
+						}
+					}
+				});
+			},
+			detail(e) {
+				this.$u.route({
+					url: 'pages/clerk/detail/index',
+					params: {
+						id: e.workerClerkId,
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item {
+		display: flex;
+		flex-direction: column;
+	}
+	
+	.card {
+		padding: 30rpx 20rpx;
+		border-bottom: 1rpx solid #f5f5f5;
+		display: flex;
+		
+		.right {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+		}
+	}
+	
+	.avatar-img{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 8rpx;
+		
+		.img {
+			width: 100%;
+			height: 100%;
+			border-radius: 100%;
+		}
+	}
+	
+	.avatar{
+		margin-right: 5px;
+		width: 110rpx;
+		height: 110rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		.img {
+			width: 75%;
+			height: 75%;
+			border-radius: 100%;
+		}
+		.gif {
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	
+	.card-header {
+		display: flex;
+		align-items: center;
+		
+		.box1 {
+			.tag-list {
+				display: flex;
+				align-items: center;
+				font-size: 22rpx;
+				margin-top: 4rpx;
+				
+				.tag::after {
+				  content: '·';
+				  padding: 0 10rpx; /* 添加一些间隔 */
+				}
+				
+			}
+			
+			.tag-list .tag:last-child::after {
+				content: unset;
+			}
+		}
+		
+		.box2 {
+			display: flex;
+			align-items: center;
+			line-height: 40rpx;
+			
+			.nickname {
+				font-size: 28rpx;
+				color: #333333;
+			}
+			
+			.sex-box {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background-color: #d06b8d1f;
+				border-radius: 20px;
+				font-size: 20rpx;
+				padding: 4rpx 10rpx;
+				color: #d06b8d;
+				line-height: 24rpx;
+				margin: 0 5px;
+				
+				.age {
+					margin-left: 2px;
+				}
+			}
+			
+			.nan {
+				background-color: #007aff1a;
+				color: #007aff;
+			}
+		}
+		
+		.box3 {
+			display: flex;
+			justify-content: space-between;
+			flex: 1;
+			align-items: center;
+		}
+		
+		.fans {
+			width: 60rpx;
+			display: flex;
+			justify-content: flex-end;
+			height: 60rpx;
+			align-items: center;
+			color: var(--ui-BG-Main);
+			font-size: 24rpx;
+			padding-right: 3px;
+		}
+	}
+	
+	.card-content {
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		
+		.text-box {
+			font-size: 26rpx;
+			line-height: 180%;
+			white-space: pre-wrap;
+			letter-spacing: 2rpx;
+		}
+	}
+	
+	.topic-list { 
+		display: flex;
+		align-items: center;
+		margin-top: 10px;
+		
+		.topic {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 28rpx;
+			margin-right: 20rpx;
+			color: var(--ui-BG-Main);
+			font-weight: bold;
+			
+			.tag-text {
+				margin-left: 2px;
+			}
+		}
+	}
+	
+	.card-footer {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 30rpx;
+		
+		.toolbar {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			color: #666666;
+			width: 80rpx;
+			height: 40rpx;
+			flex: 1;
+		}
+		
+		.toolbar-text {
+			font-size: 26rpx;
+			margin-left: 5px;
+		}
+		
+		.text {
+			font-size: 24rpx;
+			margin-left: 5px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/detail/components/starList.vue b/pages/user/detail/components/starList.vue
new file mode 100644
index 0000000..32ff751
--- /dev/null
+++ b/pages/user/detail/components/starList.vue
@@ -0,0 +1,310 @@
+<template>
+  <view>
+	  <view v-if="isGift" class="star-box">
+		 <view class="title-box">
+			 <view class="title">礼物墙</view>
+			 <view class="num">(已点亮：{{starNum}}/{{total}})</view>
+		 </view>
+		 
+		 <view class="list-box">
+			 <view @click="sendGift(item)" v-for="(item,index) in virtualList" :key="item.id" class="gift">
+			 	<view class="img-box">
+			 		<img class="img" :class="item.playStatus == 0 ? 'hui' : ''" :src="item.img"></img>
+					<view class="tag" v-if="item.giftType == 1">
+						<text>特效</text>
+						<text v-if="item.tag">·{{item.tag}}</text>
+					</view>
+					<view class="tag" v-if="item.giftType == 0 && item.tag">
+						<text>{{item.tag}}</text>
+					</view>
+			 	</view>
+			 	<view class="name">{{item.name}}</view>
+			 	<view class="price">x {{item.playNum}}</view>
+				<view class="btn" @tap.stop="openGift(item)" v-if="item.playStatus == 0">点亮</view>
+				<view class="btn" @tap.stop="openGift(item)" v-if="item.playStatus == 1">赠送</view>
+				<view class="btn" v-if="item.playStatus == 2">已下架</view>
+			 </view>
+		 </view>
+		 
+	  </view>
+	  
+	  
+	  <view class="svga-box" :class="giftFlag ? 'svga-show': 'svga-hide'">
+	  	<c-svga ref="cSvgaRef" :canvasId='canvasId' :src="src" :loops='0' :auto-play="false" @frame='onFrame' @finished='onFinished' @percentage='onPercentage' @loaded='onLoaded'></c-svga>
+	  	<view class="close-btn" @click="closeSvga">
+	  		<view class="bottom-box">
+	  			<view class="title">{{gift.name}}</view>
+	  			<view class="price">{{ fen2yuan(gift.money) }} 钻石</view>
+	  			<view class="btn-box">
+	  				<view class="btn" @click="cannel">取消</view>
+	  				<view v-if="gift.playStatus == 0" class="btn active" @click="ok">点亮</view>
+					<view v-if="gift.playStatus == 1" class="btn active" @click="ok">赠送</view>
+	  			</view>
+	  		</view>
+	  	</view>
+	  </view>
+  </view>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				giftFlag: false,
+				src: '',
+				canvasId: 'myCanvas',
+				
+				gift: {},
+			}
+		},
+		computed: {
+			starNum() {
+				var count = 0;
+				this.virtualList.forEach(e => {
+					if(e.playStatus > 0){
+						count ++;
+					}
+				});
+				return count;
+			},
+			total() {
+				return this.virtualList.length;
+			},
+			isGift() {
+				return sheep.$store('user').tradeConfig.giftEnabled;
+			},
+		},
+		methods: {
+			sendGift(e) {
+				this.gift = e;
+				
+				if(e.giftType == 0){
+					// 普通礼物不播放
+					this.$emit('openGift', this.gift); 
+					return;
+				}
+				
+				this.src = e.pic;
+				this.giftFlag = true;
+			},
+			onFinished() {
+				this.giftFlag = false;
+				console.log('动画停止播放时回调');
+			},
+			onFrame(frame) {//动画播放至某帧后回调
+				// console.log(frame);
+			},
+			onPercentage(percentage) { //动画播放至某进度后回调
+				// console.log(percentage);
+			},
+			onLoaded() {
+				this.$refs.cSvgaRef.call('setContentMode', 'AspectFill');
+				console.log('加载完成');
+				this.$refs.cSvgaRef.call('startAnimation');
+			},
+			closeSvga() {
+				this.src = "";
+				this.$refs.cSvgaRef.call('stopAnimation');
+				this.giftFlag = false;
+			},
+			fen2yuan(price) {
+			  var f = 0;
+			  var p = (price / 100.0).toFixed(0);
+			  var p1 = (price / 100.0).toFixed(1);
+			  var p2 = (price / 100.0).toFixed(2);
+			  if(p*100 == price){
+				f = 0;  
+			  }else if(p1*100 == price){
+				  f = 1;
+			  }else if(p2*100 == price){
+				  f = 2;
+			  }
+			  return (price / 100.0).toFixed(f)
+			},
+			cannel() {
+				this.closeSvga();
+			},
+			ok() {
+				this.closeSvga();
+				this.$emit('openGift', this.gift);
+			},
+			openGift(e) {
+				this.$emit('openGift', e);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.star-box {
+		padding: 30rpx 20rpx;
+		
+		.title-box {
+			display: flex;
+			align-items: center;
+			
+			.title {
+				font-size: 28rpx;
+				margin-right: 10px;
+			}
+			
+			.num {
+				font-size: 24rpx;
+				color: var(--ui-BG-Main);
+			}
+		}
+		
+		.list-box {
+			display: flex;
+			flex-wrap: wrap;
+			padding-top: 30rpx;
+			
+			.gift {
+				width: 25%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				margin: 20rpx 0px;
+				
+				.img-box {
+					position: relative;
+						
+					.img{
+						max-width: 150rpx;
+						height: 150rpx;
+					}
+					
+					.hui {
+						filter: grayscale(100%);
+					}
+					
+					.tag {
+						position: absolute;
+						top: 0;
+						right: 0;
+						font-size: 16rpx;
+						color: #fff;
+						background-color: var(--ui-BG-Main);
+						border-radius: 40px;
+						padding: 2rpx 8rpx;
+					}
+				}
+				
+				.name {
+					font-size: 24rpx;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					max-width: 150rpx;
+					margin-top: 2px;
+					margin-bottom: 7px;
+				}
+				
+				.price {
+					font-size: 20rpx;
+					color: var(--ui-BG-Main);
+					margin-bottom: 7px;
+				}
+				
+				.btn {
+					border: 1px solid var(--ui-BG-Main);
+					border-radius: 40px;
+					color: var(--ui-BG-Main);
+					padding: 8rpx 20rpx;
+					font-size: 24rpx;
+				}
+			}
+		}
+		
+		
+		
+	}
+	
+	.svga-box {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999999999;
+		width: 100%;
+		height: 100%;
+		background-color: black;
+		
+		.close-btn {
+			color: #fff;
+			position: absolute;
+			z-index: 999999999;
+			padding: 5px 10px;
+			
+			left: 0;
+			right: 0;
+			bottom: 100rpx;
+			
+			.bottom-box {
+				display: flex;
+				justify-content: center;
+				flex-direction: column;
+				align-items: center;
+				
+				.title {
+					font-size: 28rpx;
+					margin-bottom: 5px;
+				}
+				
+				.price {
+					font-size: 24rpx;
+				}
+				
+				.btn-box {
+					display: flex;
+					align-items: center;
+					margin-top: 10px;
+					
+					.btn {
+						border: 1px solid #fff;
+						font-size: 28rpx;
+						padding: 20rpx 110rpx;
+						border-radius: 40px;
+						margin: 15px;
+						color: #fff;
+					}
+					
+					.active {
+						border: 1px solid var(--ui-BG-Main);
+						background-color: var(--ui-BG-Main);
+					}
+				}
+			}
+		}
+	}
+	
+	.svga-hide {
+		/* #ifdef MP */
+		transform: translate(-100%, 0);
+		/* #endif */
+		
+		/* #ifndef MP */
+		display: none;
+		/* #endif */
+	}
+	
+	.svga-show {
+		/* #ifdef MP */
+		transform: translate(0, 0);
+		/* #endif */
+		
+		/* #ifndef MP */
+		display: block;
+		/* #endif */
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/detail/components/stickyBox.vue b/pages/user/detail/components/stickyBox.vue
new file mode 100644
index 0000000..7739659
--- /dev/null
+++ b/pages/user/detail/components/stickyBox.vue
@@ -0,0 +1,59 @@
+<template>
+	<view>
+		<view class="sticky-box">
+			<view>
+				<tui-tabs :tabs="tabList" badgeBgColor="var(--ui-BG-Main)" selectedColor="var(--ui-BG-Main)" sliderBgColor="var(--ui-BG-Main)" :currentTab="currentTab" @change="change"></tui-tabs>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import tuiTabs from "@/components/thorui/tui-tabs/tui-tabs.vue"
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			tuiTabs,
+		},
+		props: {
+			trendNum: {
+				type: Number,
+				default: 0,
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			tabList() {
+				var tabs = [{
+					name: '礼物墙'
+				},{
+					name: '动态',
+					num: this.trendNum,
+				}];
+				return tabs;
+			},
+			currentTab() {
+				return sheep.$store('sys').userTabIndex;
+			},
+		},
+		created() {
+			
+		},
+		methods: {
+			change(e) {
+				this.$emit('change', e.index);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.sticky-box {
+		background-color: #fff;
+		padding: 5px 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/detail/components/userBox.vue b/pages/user/detail/components/userBox.vue
new file mode 100644
index 0000000..3c8e75c
--- /dev/null
+++ b/pages/user/detail/components/userBox.vue
@@ -0,0 +1,308 @@
+<template>
+	<view class="user-box" :style="`background-size: contain;background-image: url(${clerk.avatar});`">
+		<view class="info-box" :style="{ paddingTop: paddingTop + 20 + 'px'}">
+			<view class="avatar-box">
+				<view class="avatar-span">
+					<u-image width="100%" height="100%" shape="circle" :src="clerk.avatar"></u-image>
+					<!-- <view class="fans-btn" @click="fans(clerk)">
+						<u-icon v-if="clerk.isFans" color="var(--ui-BG-Main)" name="checkmark-circle-fill" size="46"></u-icon>
+						<u-icon v-else color="var(--ui-BG-Main)" name="plus-circle-fill" size="46"></u-icon>
+					</view> -->
+				</view>
+				<view class="right-box">
+					<view class="nickname-box">
+						<view class="nickname">{{clerk.nickname}}</view>
+						<view class="icon">
+							 <u-icon name="wode_duanwei" size="36" custom-prefix="iconfont"></u-icon>
+							 <text>L1</text>
+						</view>
+					</view> 
+					<view class="badge-box">
+						 <view v-if="clerk.hasQrcode" class="weixin-btn" @click="getWeixin(clerk)">
+							 <u-icon name="weixin-fill" size="28" color="#fff"></u-icon>
+						 </view>
+					</view>
+				</view>
+			</view>
+			<view class="sex-box">
+				<view class="span" v-if="clerk.sex == 2">
+					<u-icon name="ziyuan2" color="#f898c5" size="34" custom-prefix="iconfont"></u-icon>
+				</view>
+				<view class="span" v-if="clerk.sex == 1">
+					<u-icon name="ziyuan3" color="#0081ff" size="34" custom-prefix="iconfont"></u-icon>
+				</view>
+				<view class="span">{{clerk.age}}</view>
+				<view class="span">{{clerk.city}}</view>
+			</view>
+			<view class="sign-box">{{clerk.intro}}</view>
+			<view class="voice-box">
+				<!-- <view class="voice-span">
+					<voice-play :sec="clerk.soundTime" :src="clerk.sound"></voice-play>
+				</view> -->
+				<view class="span">已注册{{clerk.day}}天</view>
+				<span class="span" v-if="clerk.hasQrcode">可交换名片</span>
+			</view>
+			<view class="tag-list">
+				 <view class="tag-box">
+					 <span class="tag" v-for="(categoryName,index) in clerk.categoryNameList">{{categoryName}}</span>
+				 </view>
+			</view>
+			
+			<!-- <view class="tags-box">
+				<view class="span">搞笑</view>
+				<view class="span">风骚走位</view>
+				<view class="span">乖巧懂事🍑 极致体验</view>
+			</view> -->
+			
+			<photo-box v-if="clerk.photo" :dataList="clerk.photo.split(',')"></photo-box>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	import PhotoBox from '@/pages/user/detail/components/photoBox.vue';
+	import sheep from '@/sheep'; 
+	import UserApi from '@/sheep/api/member/user';
+	import TrendApi from '@/sheep/api/worker/trend';
+	export default {
+		components: {
+			PhotoBox,
+		},
+		props: {
+			paddingTop: {
+				type: Number,
+				default: 0,
+			},
+			clerk: {
+				type: Object,
+				default: {},
+			},
+		},
+		data() {
+			return {
+				photo: 'http://cos.duopei.feiniaowangluo.com/34/clerk/1707236152609pJKyvtedS9.jpg,http://cos.duopei.feiniaowangluo.com/34/clerk/1720278125689P34fP9MU1c.jpg?imageView2/1/w/200/h/200',
+			}
+		},
+		methods: {
+			fans(e) {
+				TrendApi.createClerkFans({
+					workerClerkId: e.id,
+				}).then((res) => {
+					if(res){
+						if(e.isFans){
+							sheep.$helper.toast('取消关注');
+							e.isFans = false;
+						}else{
+							sheep.$helper.toast('关注成功');
+							e.isFans = true;
+						}
+					}
+				});
+			},
+			getWeixin(e) { 
+				var that = this;
+				uni.showModal({
+				  title: '交换名片',
+				  content: '确认交换名片吗？',
+				  success: function (res) {
+				    if (res.confirm) {
+						that.queryWeixin(e);
+				    }
+				  },
+				});
+				
+			},
+			queryWeixin(e) {
+				UserApi.getQrcodeByUserId(e.id).then(res => {
+					if(res.data){
+						uni.previewImage({
+							current: 0, //预览图片的下标
+							urls: [res.data], //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+							indicator: 'number',
+							loop: true
+						});
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.info-box {
+		backdrop-filter: blur(10px);
+		background-color: rgba(0, 0, 0, 0.5);
+		padding: 15px;
+		
+		.avatar-box {
+			display: flex;
+			align-items: center;
+			
+			.avatar-span {
+				border-radius: 100%;
+				width: 140rpx;
+				height: 140rpx;
+				border: 2px solid #fff;
+				position: relative;
+				
+				.fans-btn {
+					position: absolute;
+					right: 0;
+					bottom: 0;
+				}
+			}
+			
+			.right-box {
+				color: #fff;
+				display: flex;
+				justify-content: space-between;
+				flex: 1;
+				align-items: center;
+				margin-left: 10px;
+				
+				.nickname {
+					font-size: 34rpx;
+					font-weight: bold;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					white-space: nowrap;
+					max-width: 320rpx;
+				}
+				
+				.icon {
+					background-color: #ff5ebd;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border-radius: 40px;
+					font-weight: bold;
+					color: #fff;
+					font-size: 22rpx;
+					line-height: 22rpx;
+					padding: 5px 5px;
+					margin-top: 10px;
+					width: 110rpx;
+				}
+				
+				.online {
+					border-bottom: 1px solid #fff;
+					font-size: 28rpx;
+				}
+			}
+		}
+		
+		.sex-box {
+			color: #fff;
+			display: flex;
+			align-items: center;
+			line-height: 30px;
+			
+			.span {
+				margin-right: 5px;
+				font-size: 26rpx;
+			}
+		}
+		
+		.sign-box {
+			color: #cfcfcf;
+			font-size: 28rpx;
+			margin-top: 10px;
+			margin-bottom: 10px;
+		}
+		
+		.voice-box {
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+			
+			.voice-span {
+				margin-bottom: 10px;
+				margin-right: 10px;
+			}
+			
+			.span {
+				padding: 10rpx 20rpx;
+				background-color: rgba(132, 167, 164, .81);
+				border-radius: 20px;
+				font-size: 24rpx;
+				margin-bottom: 10px;
+				margin-right: 10px;
+				color: #fff;
+			}
+		}
+		
+		.tags-box {
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+			margin: 5px 0;
+			
+			.span {
+				font-size: 20rpx;
+				color: #fff;
+				background-color: #000000;
+				border-radius: 999px;
+				padding: 3px 10px;
+				margin: 0 10px 10px 0;
+			}
+		}
+		
+		.tag-list {
+			display: flex;
+			margin: 5px 0;
+		}
+		
+		.tag-box {
+			display: inline-block;
+			align-items: center;
+			margin-bottom: 5px;
+			background-color: #eef2f26e;
+			border-radius: 3px;
+			color: #fff;
+			font-size: 12px;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+			max-width: 100%;
+			padding: 5px 0;
+			
+			.tag {
+				white-space: nowrap;
+				padding: 5px 5px;
+				position: relative;
+			}
+			
+			.tag:after {
+				content: ' ';
+				border-left: 1px solid #fff;
+				display: inline-block;
+				height: 10px;
+				position: absolute;
+				top: 50%;
+				transform: translateY(-50%);
+				right: 0;
+			}
+			
+			.tag:last-child:after{
+				display: none;
+			}
+		}
+		
+	}
+	
+	.weixin-btn {
+		display: flex;
+		align-items: center;
+		background-color: #19be6b;
+		justify-content: center;
+		border-radius: 40px;
+		color: #fff;
+		font-size: 22rpx;
+		padding: 5px;
+		
+		.text {
+			margin-left: 2px;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/detail/index.vue b/pages/user/detail/index.vue
new file mode 100644
index 0000000..440f970
--- /dev/null
+++ b/pages/user/detail/index.vue
@@ -0,0 +1,61 @@
+<template>
+	<view class="container page-app theme-light main-green font-1"> 
+		<layout ref="skill" title="选人下单"> 
+			    
+		</layout> 
+		
+		<s-auth-modal />
+		<s-menu-tools />
+	</view>
+</template>
+   
+<script>
+	import layout from '@/pages/user/detail/components/layout.vue';
+	import sheep from '@/sheep';
+	export default { 
+		components: {  
+			layout,
+		}, 
+		data() {
+			return {
+				
+			} 
+		}, 
+		// 分享小程序
+		onShareAppMessage(res) {
+			return {
+				title: this.shareInfo.title,
+				imageUrl: this.shareInfo.image,
+			};
+		},
+		onShareTimeline() {
+			return {
+				title: this.shareInfo.title,
+				imageUrl: this.shareInfo.image,
+			}
+		},
+		onLoad(options) {
+			this.$nextTick(() => {
+				this.$refs.skill.initData(options);
+			});
+		},
+		computed: {
+			shareInfo() {
+				return sheep.$platform.share.getShareInfo();
+			},
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background-color: #fff;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	
+</style>
\ No newline at end of file
diff --git a/pages/user/goods-collect.vue b/pages/user/goods-collect.vue
new file mode 100644
index 0000000..af5e64a
--- /dev/null
+++ b/pages/user/goods-collect.vue
@@ -0,0 +1,233 @@
+<!-- 我的商品收藏 -->
+<template>
+  <s-layout title="商品收藏">
+    <view class="cart-box ss-flex ss-flex-col ss-row-between">
+      <!-- 头部 -->
+      <view class="cart-header ss-flex ss-col-center ss-row-between ss-p-x-30">
+        <view class="header-left ss-flex ss-col-center ss-font-26">
+          共
+          <text class="goods-number ui-TC-Main ss-flex">{{ state.pagination.total }}</text> 件商品
+        </view>
+        <view class="header-right">
+          <button
+            v-if="state.editMode && state.pagination.total"
+            class="ss-reset-button"
+            @tap="state.editMode = false"
+          >
+            取消
+          </button>
+          <button
+            v-if="!state.editMode && state.pagination.total"
+            class="ss-reset-button ui-TC-Main"
+            @tap="state.editMode = true"
+          >
+            编辑
+          </button>
+        </view>
+      </view>
+      <!-- 内容 -->
+      <view class="cart-content">
+        <view
+          class="goods-box ss-r-10 ss-m-b-14"
+          v-for="item in state.pagination.list"
+          :key="item.id"
+        >
+          <view class="ss-flex ss-col-center">
+            <label
+              class="check-box ss-flex ss-col-center ss-p-l-10"
+              v-if="state.editMode"
+              @tap="onSelect(item.spuId)"
+            >
+              <radio
+                :checked="state.selectedCollectList.includes(item.spuId)"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                @tap.stop="onSelect(item.spuId)"
+              />
+            </label>
+            <s-goods-item
+              :title="item.spuName"
+              :img="item.picUrl"
+              :price="item.price"
+              priceColor="#FF3000"
+              :titleWidth="400"
+              @tap="
+                sheep.$router.go('/pages/goods/index', {
+                  id: item.spuId,
+                })
+              "
+            />
+          </view>
+        </view>
+      </view>
+
+      <!-- 底部 -->
+      <su-fixed bottom :val="0" placeholder v-show="state.editMode">
+        <view class="cart-footer ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom">
+          <view class="footer-left ss-flex ss-col-center">
+            <label class="check-box ss-flex ss-col-center ss-p-r-30" @tap="onSelectAll">
+              <radio
+                :checked="state.selectAll"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.7)"
+                @tap.stop="onSelectAll"
+              />
+              <view> 全选 </view>
+            </label>
+          </view>
+          <view class="footer-right">
+            <button
+              class="ss-reset-button ui-BG-Main-Gradient pay-btn ss-font-28 ui-Shadow-Main"
+              @tap="onCancel"
+            >
+              取消收藏
+            </button>
+          </view>
+        </view>
+      </su-fixed>
+    </view>
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="loadMore"
+    />
+    <s-empty v-if="state.pagination.total === 0" text="暂无收藏" icon="/static/collect-empty.png" />
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { reactive } from 'vue';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import _ from 'lodash-es';
+  import FavoriteApi from '@/sheep/api/product/favorite';
+  import { resetPagination } from '@/sheep/util';
+
+  const sys_navBar = sheep.$platform.navbar;
+
+  const state = reactive({
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 6,
+    },
+    loadStatus: '',
+
+    editMode: false,
+    selectedCollectList: [], // 选中的 SPU 数组
+    selectAll: false,
+  });
+
+  async function getData() {
+    state.loadStatus = 'loading';
+    const { code, data } = await FavoriteApi.getFavoritePage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  // 单选选中
+  const onSelect = (spuId) => {
+    if (!state.selectedCollectList.includes(spuId)) {
+      state.selectedCollectList.push(spuId);
+    } else {
+      state.selectedCollectList.splice(state.selectedCollectList.indexOf(spuId), 1);
+    }
+    state.selectAll = state.selectedCollectList.length === state.pagination.list.length;
+  };
+
+  // 全选
+  const onSelectAll = () => {
+    state.selectAll = !state.selectAll;
+    if (!state.selectAll) {
+      state.selectedCollectList = [];
+    } else {
+      state.selectedCollectList = state.pagination.list.map((item) => item.spuId);
+    }
+  };
+
+  async function onCancel() {
+    if (!state.selectedCollectList) {
+      return;
+    }
+    // 取消收藏
+    for (const spuId of state.selectedCollectList) {
+      await FavoriteApi.deleteFavorite(spuId);
+    }
+
+    // 清空选择 + 重新加载
+    state.editMode = false;
+    state.selectedCollectList = [];
+    state.selectAll = false;
+    resetPagination(state.pagination);
+    await getData();
+  }
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getData();
+  }
+
+  onReachBottom(() => {
+    loadMore();
+  });
+
+  onLoad(() => {
+    getData();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .cart-box {
+    .cart-header {
+      height: 70rpx;
+      background-color: #f6f6f6;
+      width: 100%;
+      position: fixed;
+      left: 0;
+      top: v-bind('sys_navBar') rpx;
+      z-index: 1000;
+      box-sizing: border-box;
+    }
+
+    .cart-footer {
+      height: 100rpx;
+      background-color: #fff;
+
+      .pay-btn {
+        height: 80rpx;
+        line-height: 80rpx;
+        border-radius: 40rpx;
+        padding: 0 40rpx;
+        min-width: 200rpx;
+      }
+    }
+
+    .cart-content {
+      width: 100%;
+      margin-top: 70rpx;
+      padding: 0 20rpx;
+      box-sizing: border-box;
+      .goods-box {
+        background-color: #fff;
+        &:last-child {
+          margin-bottom: 40rpx;
+        }
+      }
+    }
+  }
+</style>
diff --git a/pages/user/goods-log.vue b/pages/user/goods-log.vue
new file mode 100644
index 0000000..b52efe3
--- /dev/null
+++ b/pages/user/goods-log.vue
@@ -0,0 +1,308 @@
+<!-- 商品浏览记录  -->
+<template>
+  <s-layout title="我的足迹" :bgStyle="{ color: '#f2f2f2' }">
+    <view class="cart-box ss-flex ss-flex-col ss-row-between">
+      <!-- 头部 -->
+      <view class="cart-header ss-flex ss-col-center ss-row-between ss-p-x-30">
+        <view class="header-left ss-flex ss-col-center ss-font-26">
+          共
+          <text class="goods-number ui-TC-Main ss-flex">
+            {{ state.pagination.total }}
+          </text>
+          件商品
+        </view>
+        <view class="header-right">
+          <button
+            v-if="state.editMode && state.pagination.total"
+            class="ss-reset-button"
+            @tap="state.editMode = false"
+          >
+            取消
+          </button>
+          <button
+            v-if="!state.editMode && state.pagination.total"
+            class="ss-reset-button ui-TC-Main"
+            @tap="state.editMode = true"
+          >
+            编辑
+          </button>
+        </view>
+      </view>
+      <!-- 内容 -->
+      <view class="cart-content">
+        <view
+          class="goods-box ss-r-10 ss-m-b-14"
+          v-for="item in state.pagination.list"
+          :key="item.id"
+        >
+          <view class="ss-flex ss-col-center">
+            <label
+              class="check-box ss-flex ss-col-center ss-p-l-10"
+              v-if="state.editMode"
+              @tap="onSelect(item.spuId)"
+            >
+              <radio
+                :checked="state.selectedSpuIdList.includes(item.spuId)"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.8)"
+                @tap.stop="onSelect(item.spuId)"
+              />
+            </label>
+            <s-goods-item
+              :title="item.spuName"
+              :img="item.picUrl"
+              :price="item.price"
+              :skuText="item.introduction"
+              priceColor="#FF3000"
+              :titleWidth="400"
+              @tap="
+                sheep.$router.go('/pages/goods/index', {
+                  id: item.spuId,
+                })
+              "
+            >
+            </s-goods-item>
+          </view>
+        </view>
+      </view>
+      <!-- 底部 -->
+      <su-fixed bottom :val="0" placeholder v-show="state.editMode">
+        <view class="cart-footer ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom">
+          <view class="footer-left ss-flex ss-col-center">
+            <label class="check-box ss-flex ss-col-center ss-p-r-30" @tap="onSelectAll">
+              <radio
+                :checked="state.selectAll"
+                color="var(--ui-BG-Main)"
+                style="transform: scale(0.7)"
+                @tap.stop="onSelectAll"
+              />
+              <view>全选</view>
+            </label>
+          </view>
+          <view class="footer-right ss-flex">
+            <button
+              :class="[
+                'ss-reset-button  pay-btn ss-font-28 ',
+                {
+                  'ui-BG-Main-Gradient': state.selectedSpuIdList.length > 0,
+                  'ui-Shadow-Main': state.selectedSpuIdList.length > 0,
+                },
+              ]"
+              @tap="onDelete"
+            >
+              删除足迹
+            </button>
+            <button
+              class="ss-reset-button ui-BG-Main-Gradient pay-btn ss-font-28 ui-Shadow-Main ml-2"
+              @tap="onClean"
+            >
+              清空
+            </button>
+          </view>
+        </view>
+      </su-fixed>
+    </view>
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="loadMore"
+    />
+    <s-empty
+      v-if="state.pagination.total === 0"
+      text="暂无浏览记录"
+      icon="/static/collect-empty.png"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { reactive } from 'vue';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import _ from 'lodash-es';
+  import SpuHistoryApi from '@/sheep/api/product/history';
+  import { cloneDeep } from '@/sheep/helper/utils';
+
+  const sys_navBar = sheep.$platform.navbar;
+  const pagination = {
+    list: [],
+    pageNo: 1,
+    total: 1,
+    pageSize: 10,
+  };
+  const state = reactive({
+    pagination: cloneDeep(pagination),
+    loadStatus: '',
+    editMode: false,
+    selectedSpuIdList: [],
+    selectAll: false,
+  });
+
+  async function getList() {
+    state.loadStatus = 'loading';
+    const { code, data } = await SpuHistoryApi.getBrowseHistoryPage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+    });
+    if (code !== 0) {
+      return;
+    }
+
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  // 单选选中
+  const onSelect = (id) => {
+    if (!state.selectedSpuIdList.includes(id)) {
+      state.selectedSpuIdList.push(id);
+    } else {
+      state.selectedSpuIdList.splice(state.selectedSpuIdList.indexOf(id), 1);
+    }
+    state.selectAll = state.selectedSpuIdList.length === state.pagination.list.length;
+  };
+
+  // 全选
+  const onSelectAll = () => {
+    state.selectAll = !state.selectAll;
+    if (!state.selectAll) {
+      state.selectedSpuIdList = [];
+    } else {
+      state.pagination.list.forEach((item) => {
+        if (state.selectedSpuIdList.includes(item.spuId)) {
+          state.selectedSpuIdList.splice(state.selectedSpuIdList.indexOf(item.spuId), 1);
+        }
+        state.selectedSpuIdList.push(item.spuId);
+      });
+    }
+  };
+
+  // 删除足迹
+  async function onDelete() {
+    if (state.selectedSpuIdList.length <= 0) {
+      return;
+    }
+
+    const { code } = await SpuHistoryApi.deleteBrowseHistory(state.selectedSpuIdList);
+    if (code === 0) {
+      reload();
+    }
+  }
+
+  // 清空
+  async function onClean() {
+    const { code } = await SpuHistoryApi.cleanBrowseHistory();
+    if (code === 0) {
+      reload();
+    }
+  }
+
+  function reload() {
+    state.editMode = false;
+    state.selectedSpuIdList = [];
+    state.selectAll = false;
+    state.pagination = pagination;
+    getList();
+  }
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus !== 'noMore') {
+      state.pagination.pageNo += 1;
+      getList();
+    }
+  }
+
+  onReachBottom(() => {
+    loadMore();
+  });
+
+  onLoad(() => {
+    getList();
+  });
+</script>
+
+<style lang="scss" scoped>
+  .cart-box {
+    .cart-header {
+      height: 70rpx;
+      background-color: #f6f6f6;
+      width: 100%;
+      position: fixed;
+      left: 0;
+      top: v-bind('sys_navBar') rpx;
+      z-index: 1000;
+      box-sizing: border-box;
+    }
+
+    .cart-footer {
+      height: 100rpx;
+      background-color: #fff;
+
+      .pay-btn {
+        height: 80rpx;
+        line-height: 80rpx;
+        border-radius: 40rpx;
+        padding: 0 40rpx;
+        min-width: 200rpx;
+      }
+    }
+
+    .cart-content {
+      width: 100%;
+      padding: 0 20rpx;
+      box-sizing: border-box;
+      margin-top: 70rpx;
+      .goods-box {
+        background-color: #fff;
+        &:last-child {
+          margin-bottom: 40rpx;
+        }
+      }
+    }
+  }
+
+  .title-card {
+    padding: 36rpx 0 46rpx 20rpx;
+
+    .img-box {
+      width: 164rpx;
+      height: 164rpx;
+
+      .order-img {
+        width: 164rpx;
+        height: 164rpx;
+      }
+    }
+
+    .check-box {
+      height: 100%;
+    }
+
+    .title-text {
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #333333;
+    }
+
+    .params-box {
+      .params-title {
+        height: 38rpx;
+        background: #f4f4f4;
+        border-radius: 2rpx;
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #666666;
+      }
+    }
+
+    .price-text {
+      color: $red;
+      font-family: OPPOSANS;
+    }
+  }
+</style>
diff --git a/pages/user/goods_details_store/index.vue b/pages/user/goods_details_store/index.vue
new file mode 100644
index 0000000..07b6850
--- /dev/null
+++ b/pages/user/goods_details_store/index.vue
@@ -0,0 +1,275 @@
+<template>
+  <s-layout title="选择自提门店" :bgStyle="{ color: '#FFF' }">
+    <view class="storeBox" ref="container">
+      <view class="storeBox-box" v-for="(item, index) in state.storeList" :key="index" @tap="checked(item)">
+        <view class="store-img">
+          <image :src="item.logo" class="img" />
+        </view>
+        <view class="store-cent-left">
+          <view class="store-name">{{ item.name }}</view>
+          <view class="store-address line1">
+            {{ item.areaName }}{{ ', ' + item.detailAddress }}
+          </view>
+        </view>
+        <view class="row-right ss-flex-col ss-col-center">
+          <view>
+            <!-- #ifdef H5 -->
+            <a class="store-phone" :href="'tel:' + item.phone">
+              <view class="iconfont">
+                <view class="ss-rest-button">
+                  <text class="_icon-forward" />
+                </view>
+              </view>
+            </a>
+            <!-- #endif -->
+            <!-- #ifdef MP -->
+            <view class="store-phone" @click="call(item.phone)">
+              <view class="iconfont">
+                <view class="ss-rest-button">
+                  <text class="_icon-forward" />
+                </view>
+              </view>
+            </view>
+            <!-- #endif -->
+          </view>
+          <view class="store-distance ss-flex ss-row-center" @tap.stop="showMaoLocation(item)">
+            <text class="addressTxt" v-if="item.distance">距离{{ item.distance.toFixed(2) }}千米</text>
+            <text class="addressTxt" v-else>查看地图</text>
+            <view class="iconfont">
+              <view class="ss-rest-button">
+                <text class="_icon-forward" />
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </s-layout>
+</template>
+
+<script setup>
+  import DeliveryApi from '@/sheep/api/trade/delivery';
+  import { onMounted, reactive } from 'vue';
+  import { onLoad } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+
+  const LONGITUDE = 'user_longitude';
+  const LATITUDE = 'user_latitude';
+  const state = reactive({
+    loaded: false,
+    loading: false,
+    storeList: [],
+    system_store: {},
+    locationShow: false,
+    user_latitude: 0,
+    user_longitude: 0,
+  });
+
+  const call = (phone) => {
+    uni.makePhoneCall({
+      phoneNumber: phone,
+    });
+  };
+  const selfLocation = () => {
+    // #ifdef H5
+    const jsWxSdk = sheep.$platform.useProvider('wechat').jsWxSdk;
+    if (jsWxSdk.isWechat()) {
+      jsWxSdk.getLocation((res) => {
+        console.log(res);
+        state.user_latitude = res.latitude;
+        state.user_longitude = res.longitude;
+        uni.setStorageSync(LATITUDE, res.latitude);
+        uni.setStorageSync(LONGITUDE, res.longitude);
+        getList();
+      });
+    } else {
+      // #endif
+      uni.getLocation({
+        type: 'gcj02',
+        success: (res) => {
+          try {
+            state.user_latitude = res.latitude;
+            state.user_longitude = res.longitude;
+            uni.setStorageSync(LATITUDE, res.latitude);
+            uni.setStorageSync(LONGITUDE, res.longitude);
+          } catch {
+          }
+          getList();
+        },
+        complete: () => {
+          getList();
+        },
+      });
+      // #ifdef H5
+    }
+    // #endif
+  };
+  const showMaoLocation = (e) => {
+    // #ifdef H5
+    const jsWxSdk = sheep.$platform.useProvider('wechat').jsWxSdk;
+    if (jsWxSdk.isWechat()) {
+      jsWxSdk.openLocation({
+        latitude: Number(e.latitude),
+        longitude: Number(e.longitude),
+        name: e.name,
+        address: `${e.areaName}-${e.detailAddress}`
+      });
+    } else {
+      // #endif
+      uni.openLocation({
+        latitude: Number(e.latitude),
+        longitude: Number(e.longitude),
+        name: e.name,
+        address: `${e.areaName}-${e.detailAddress}`,
+        success: function() {
+          console.log('success');
+        },
+      });
+      // #ifdef H5
+    }
+    // #endif
+  };
+
+  /**
+   * 选中门店
+   */
+  const checked = (addressInfo) => {
+    uni.$emit('SELECT_PICK_UP_INFO', {
+      addressInfo,
+    });
+    sheep.$router.back();
+  };
+
+  /**
+   * 获取门店列表数据
+   */
+  const getList = async () => {
+    if (state.loading || state.loaded) {
+      return;
+    }
+    state.loading = true;
+    const { data, code } = await DeliveryApi.getDeliveryPickUpStoreList({
+      latitude: state.user_latitude,
+      longitude: state.user_longitude,
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.loading = false;
+    state.storeList = data;
+  };
+
+  onMounted(() => {
+    if (state.user_latitude && state.user_longitude) {
+      getList();
+    } else {
+      selfLocation();
+      getList();
+    }
+  });
+  onLoad(() => {
+    try {
+      state.user_latitude = uni.getStorageSync(LATITUDE);
+      state.user_longitude = uni.getStorageSync(LONGITUDE);
+    } catch (e) {
+      // error
+    }
+  });
+</script>
+<style lang="scss" scoped>
+  .line1 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap
+  }
+
+  .geoPage {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    z-index: 10000;
+  }
+
+  .storeBox {
+    width: 100%;
+    background-color: #fff;
+    padding: 0 30rpx;
+  }
+
+  .storeBox-box {
+    width: 100%;
+    height: auto;
+    display: flex;
+    align-items: center;
+    padding: 23rpx 0;
+    justify-content: space-between;
+    border-bottom: 1px solid #eee;
+  }
+
+  .store-cent {
+    display: flex;
+    align-items: center;
+    width: 80%;
+  }
+
+  .store-cent-left {
+    //width: 45%;
+    flex: 2;
+  }
+
+  .store-img {
+    flex: 1;
+    width: 120rpx;
+    height: 120rpx;
+    border-radius: 6rpx;
+    margin-right: 22rpx;
+  }
+
+  .store-img .img {
+    width: 100%;
+    height: 100%;
+  }
+
+  .store-name {
+    color: #282828;
+    font-size: 30rpx;
+    margin-bottom: 22rpx;
+    font-weight: 800;
+  }
+
+  .store-address {
+    color: #666666;
+    font-size: 24rpx;
+  }
+
+  .store-phone {
+    width: 50rpx;
+    height: 50rpx;
+    color: #fff;
+    border-radius: 50%;
+    display: block;
+    text-align: center;
+    line-height: 48rpx;
+    background-color: #e83323;
+    margin-bottom: 22rpx;
+    text-decoration: none;
+  }
+
+  .store-distance {
+    font-size: 22rpx;
+    color: #e83323;
+  }
+
+  .iconfont {
+    font-size: 20rpx;
+  }
+
+  .row-right {
+    flex: 2;
+    //display: flex;
+    //flex-direction: column;
+    //align-items: flex-end;
+    //width: 33.5%;
+  }
+</style>
diff --git a/pages/user/info.vue b/pages/user/info.vue
new file mode 100644
index 0000000..3699790
--- /dev/null
+++ b/pages/user/info.vue
@@ -0,0 +1,475 @@
+<!-- 用户信息 -->
+<template>
+  <s-layout title="用户信息" class="set-userinfo-wrap">
+    <uni-forms
+      :model="state.model"
+      :rules="state.rules"
+      labelPosition="left"
+      border
+      class="form-box"
+    >
+      <!-- 头像 -->
+      <view class="ss-flex ss-row-center ss-col-center ss-p-t-60 ss-p-b-60 bg-white">
+        <view class="header-box-content">
+          <su-image
+            class="content-img"
+            isPreview
+            :current="0"
+            :src="state.model?.avatar"
+            :height="160"
+            :width="160"
+            :radius="80"
+            mode="scaleToFill"
+          />
+          <view class="avatar-action">
+            <button class="ss-reset-button avatar-action-btn" @tap="onChooseAvatar">修改</button>
+          </view>
+        </view>
+      </view>
+
+      <view class="bg-white ss-p-x-30">
+		<!-- <view class="form-item">
+		  <view class="label">昵称</view>
+		  <view class="input-box">
+			  <view>{{state.model.nickname}}</view>
+		  </view>
+		</view> -->
+		
+		<!-- 昵称 + 性别 -->
+		<uni-forms-item name="nickname" label="昵称">
+		  <uni-easyinput
+		    v-model="state.model.nickname"
+		    placeholder="设置昵称"
+		    :inputBorder="false"
+		    :placeholderStyle="placeholderStyle"
+		  />
+		</uni-forms-item>
+		
+		
+        <uni-forms-item name="sex" label="性别">
+          <view class="ss-flex ss-col-center ss-h-100">
+            <radio-group @change="onChangeGender" class="ss-flex ss-col-center">
+              <label class="radio" v-for="item in sexRadioMap" :key="item.value">
+                <view class="ss-flex ss-col-center ss-m-r-32">
+                  <radio
+                    :value="item.value"
+                    color="var(--ui-BG-Main)"
+                    style="transform: scale(0.8)"
+                    :checked="parseInt(item.value) === state.model?.sex"
+                  />
+                  <view class="gender-name">{{ item.name }}</view>
+                </view>
+              </label>
+            </radio-group>
+          </view>
+        </uni-forms-item>
+
+        <!-- <view class="form-item" @tap="onChangeMobile">
+		  <view class="label">手机号</view>
+		  <view class="input-box">
+			  <view v-if="userInfo.mobile">{{userInfo.mobile}}</view>
+			  <view v-else class="placeholder">请绑定手机号</view>
+			  <view class="ss-flex ss-col-center">
+			    <su-radio class="ss-flex" v-if="userInfo.mobile" :modelValue="true" />
+			    <button v-else class="ss-reset-button ss-flex ss-col-center ss-row-center">
+			      <text class="_icon-forward" style="color: #bbbbbb; font-size: 26rpx"></text>
+			    </button>
+			  </view>
+		  </view>
+        </view>
+		
+		<view class="form-item" @tap="onSetPassword">
+		  <view class="label">登录密码</view>
+		  <view class="input-box">
+			  <view v-if="userInfo.password">{{userInfo.password}}</view>
+			  <view v-else class="placeholder">点击修改登录密码</view>
+			  <view class="ss-flex ss-col-center">
+			    <su-radio class="ss-flex" v-if="userInfo.password" :modelValue="true" />
+			    <button v-else class="ss-reset-button ss-flex ss-col-center ss-row-center">
+			      <text class="_icon-forward" style="color: #bbbbbb; font-size: 26rpx"></text>
+			    </button>
+			  </view>
+		  </view>
+		</view>
+ -->
+        
+      </view>
+
+      
+    </uni-forms>
+
+    <!-- 当前社交平台的绑定关系，只处理 wechat 微信场景 -->
+    <!-- <view v-if="sheep.$platform.name !== 'H5'">
+      <view class="title-box ss-p-l-30">第三方账号绑定</view>
+      <view class="account-list ss-flex ss-row-between">
+        <view v-if="'WechatOfficialAccount' === sheep.$platform.name" class="ss-flex ss-col-center">
+          <image
+            class="list-img"
+            :src="sheep.$url.static('/static/img/shop/platform/WechatOfficialAccount.png')"
+          />
+          <text class="list-name">微信公众号</text>
+        </view>
+        <view v-if="'WechatMiniProgram' === sheep.$platform.name" class="ss-flex ss-col-center">
+          <image
+            class="list-img"
+            :src="sheep.$url.static('/static/img/shop/platform/WechatMiniProgram.png')"
+          />
+          <text class="list-name">微信小程序</text>
+        </view>
+        <view v-if="'App' === sheep.$platform.name" class="ss-flex ss-col-center">
+          <image
+            class="list-img"
+            :src="sheep.$url.static('/static/img/shop/platform/wechat.png')"
+          />
+          <text class="list-name">微信开放平台</text>
+        </view>
+        <view class="ss-flex ss-col-center">
+          <view class="info ss-flex ss-col-center" v-if="state.thirdInfo">
+            <image class="avatar ss-m-r-20" :src="sheep.$url.cdn(state.thirdInfo.avatar)" />
+            <text class="name">{{ state.thirdInfo.nickname }}</text>
+          </view>
+          <view class="bind-box ss-m-l-20">
+            <button
+              v-if="state.thirdInfo.openid"
+              class="ss-reset-button relieve-btn"
+              @tap="unBindThirdOauth"
+            >
+              解绑
+            </button>
+            <button v-else class="ss-reset-button bind-btn" @tap="bindThirdOauth">绑定</button>
+          </view>
+        </view>
+      </view>
+    </view> -->
+
+    <su-fixed bottom placeholder bg="none">
+      <view class="footer-box ss-p-20">
+        <button class="ss-rest-button logout-btn ui-Shadow-Main" @tap="onSubmit">保存</button>
+      </view>
+    </su-fixed>
+	
+	<qrcode-modal />
+	
+  </s-layout>
+</template>
+
+<script setup>
+  import qrcodeModal from '@/components/qrcode-modal/qrcode-modal.vue';
+  import { computed, reactive, ref, onBeforeMount } from 'vue';
+  import sheep from '@/sheep';
+  import { clone } from 'lodash-es';
+  import { showAuthModal } from '@/sheep/hooks/useModal';
+  import FileApi from '@/sheep/api/infra/file';
+  import UserApi from '@/sheep/api/member/user';
+  
+  const clerk = ref();
+
+  const state = reactive({
+    model: {}, // 个人信息
+    rules: {},
+    thirdInfo: {}, // 社交用户的信息
+  });
+
+  const placeholderStyle = 'color:#BBBBBB;font-size:28rpx;line-height:normal';
+
+  const sexRadioMap = [
+    {
+      name: '男',
+      value: '1',
+    },
+    {
+      name: '女',
+      value: '2',
+    },
+  ];
+
+  const userInfo = computed(() => sheep.$store('user').userInfo);
+
+  // 选择性别
+  function onChangeGender(e) {
+    state.model.sex = e.detail.value;
+  }
+
+  // 修改手机号
+  const onChangeMobile = () => {
+    showAuthModal('changeMobile');
+  };
+
+  function onChooseAvatar() {
+    uni.chooseImage({
+    	count: 1, //默认9
+    	sourceType: ['album', 'camera'],
+    	sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+    	success: (res) => {
+    		for (let i = 0; i < res.tempFilePaths.length; i++) {
+    			uni.getImageInfo({
+    				src: res.tempFilePaths[i],
+    				success: (image) => {
+    					uploadAvatar(image.path);
+    				}
+    			});
+    		}
+    	}
+    });
+  }
+
+  // 上传头像文件
+  async function uploadAvatar(tempUrl) {
+    if (!tempUrl) {
+      return;
+    }
+    let { data } = await FileApi.uploadFile(tempUrl);
+    state.model.avatar = data;
+  }
+
+  // 修改密码
+  function onSetPassword() {
+    showAuthModal('changePassword');
+  }
+
+  // 绑定第三方账号
+  async function bindThirdOauth() {
+    let result = await sheep.$platform.useProvider('wechat').bind();
+    if (result) {
+      await getUserInfo();
+    }
+  }
+
+  // 解绑第三方账号
+  function unBindThirdOauth() {
+    uni.showModal({
+      title: '解绑提醒',
+      content: '解绑后您将无法通过微信登录此账号',
+      cancelText: '再想想',
+      confirmText: '确定',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        const result = await sheep.$platform.useProvider('wechat').unbind(state.thirdInfo.openid);
+        if (result) {
+          await getUserInfo();
+        }
+      },
+    });
+  }
+
+  // 保存信息
+  async function onSubmit() {
+    const { code } = await UserApi.updateUser({
+      avatar: state.model.avatar,
+      nickname: state.model.nickname,
+      sex: state.model.sex,
+    });
+    if (code === 0) {
+      await getUserInfo();
+    }
+  }
+
+  // 获得用户信息
+  const getUserInfo = async () => {
+    // 个人信息
+    const userInfo = await sheep.$store('user').getInfo();
+    state.model = clone(userInfo);
+
+    // 获得社交用户的信息
+    if (sheep.$platform.name !== 'H5') {
+      const result = await sheep.$platform.useProvider('wechat').getInfo();
+      state.thirdInfo = result || {};
+    }
+  };
+
+  onBeforeMount(() => {
+    getUserInfo();
+  });
+</script>
+
+<style lang="scss" scoped>
+  :deep() {
+    .uni-file-picker {
+      border-radius: 50%;
+    }
+
+    .uni-file-picker__container {
+      margin: -14rpx -12rpx;
+    }
+
+    .file-picker__progress {
+      height: 0 !important;
+    }
+
+    .uni-list-item__content-title {
+      font-size: 28rpx !important;
+      color: #333333 !important;
+      line-height: normal !important;
+    }
+
+    .uni-icons {
+      font-size: 40rpx !important;
+    }
+
+    .is-disabled {
+      color: #333333;
+    }
+  }
+
+  :deep(.disabled) {
+    opacity: 1;
+  }
+
+  .gender-name {
+    font-size: 28rpx;
+    font-weight: 500;
+    line-height: normal;
+    color: #333333;
+  }
+
+  .title-box {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #666666;
+    line-height: 100rpx;
+  }
+
+  .logout-btn {
+    width: 710rpx;
+    height: 80rpx;
+    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    border-radius: 40rpx;
+    font-size: 30rpx;
+    font-weight: 500;
+    color: $white;
+  }
+
+  .radio-dark {
+    filter: grayscale(100%);
+    filter: gray;
+    opacity: 0.4;
+  }
+
+  .content-img {
+    border-radius: 50%;
+  }
+  .header-box-content {
+    position: relative;
+    width: 160rpx;
+    height: 160rpx;
+    overflow: hidden;
+    border-radius: 50%;
+	background-color: #f6f6f6;
+  }
+  .avatar-action {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    bottom: 0;
+    z-index: 1;
+    width: 160rpx;
+    height: 46rpx;
+    background: rgba(#000000, 0.3);
+
+    .avatar-action-btn {
+      width: 160rpx;
+      height: 46rpx;
+      font-weight: 500;
+      font-size: 24rpx;
+      color: #ffffff;
+    }
+  }
+
+  // 绑定项
+  .account-list {
+    background-color: $white;
+    height: 100rpx;
+    padding: 0 20rpx;
+
+    .list-img {
+      width: 40rpx;
+      height: 40rpx;
+      margin-right: 10rpx;
+    }
+
+    .list-name {
+      font-size: 28rpx;
+      color: #333333;
+    }
+
+    .info {
+      .avatar {
+        width: 38rpx;
+        height: 38rpx;
+        border-radius: 50%;
+        overflow: hidden;
+      }
+
+      .name {
+        font-size: 28rpx;
+        font-weight: 400;
+        color: $dark-9;
+      }
+    }
+
+    .bind-box {
+      width: 100rpx;
+      height: 50rpx;
+      line-height: normal;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      font-size: 24rpx;
+
+      .bind-btn {
+        width: 100%;
+        height: 100%;
+        border-radius: 25rpx;
+        background: #f4f4f4;
+        color: #999999;
+      }
+      .relieve-btn {
+        width: 100%;
+        height: 100%;
+        border-radius: 25rpx;
+        background: var(--ui-BG-Main-opacity-1);
+        color: var(--ui-BG-Main);
+      }
+    }
+  }
+
+  .list-border {
+    font-size: 28rpx;
+    font-weight: 400;
+    color: #333333;
+    border-bottom: 2rpx solid #eeeeee;
+  }
+
+  image {
+    width: 100%;
+    height: 100%;
+  }
+  
+  .form-item {
+	  display: flex;
+	  align-items: center;
+	  line-height: 110rpx;
+	  border-top: 1px #eee solid;
+	  
+	  .label {
+		  width: 140rpx;
+		  justify-content: flex-start;
+	  }
+	  
+	  .input-box {
+	  	  display: flex;
+	  	  align-items: center;
+	  	  justify-content: space-between;
+		  flex: 1;
+	  	  
+	  	  .placeholder {
+	  		  color:#BBBBBB;
+	  		  font-size:28rpx;
+	  		  line-height:normal
+	  	  }
+	  }
+  }
+  
+</style>
diff --git a/pages/user/vip.vue b/pages/user/vip.vue
new file mode 100644
index 0000000..ca0b0ba
--- /dev/null
+++ b/pages/user/vip.vue
@@ -0,0 +1,382 @@
+<template>
+	<s-layout title="我的特权">
+		<view class="page" v-if="isPass">
+			<view class="vip-box">
+				<view class="vip-name">VIP尊享会员</view>
+				<view class="vip-tip-box">
+					<u-avatar size="50" :src="userInfo.avatar"></u-avatar>
+					<view class="vip-tip" v-if="userInfo.isVip">VIP会员({{showDayTime(userInfo.vipEndTime)}}到期)</view>
+					<view class="vip-tip" v-else>暂未激活VIP会员</view>
+				</view>
+			</view>
+			<view class="price-tab-box">
+				<view class="price-tab"  v-for="(item, index) in dataList" :key="index">
+					<view @click="changeTab(index)" class="price-tab-border" :class="[currentIndex==index ? 'active' : '']">
+						<view class="price-texta">{{item.num}}{{item.unit}}</view>
+						<view class="price-textb">￥{{item.month}}/{{item.tip}}</view>
+						<view class="price-textc">￥{{item.pay}}</view>
+						<view class="tab-band" v-if="item.band">新人优惠</view>
+					</view>
+				</view>
+			</view>
+			<view class="vip-title">
+				VIP特权
+			</view>
+			<!-- <view class="vip-info">
+				<view class="vip-info-icon">
+					<u-icon name="star-fill" color="#ffd32f" size="36"></u-icon>
+				</view>
+				<view>
+					<view class="vip-info-title">拥有申请置顶推荐特权</view>
+					<view class="vip-info-text">每天可以免费申请置顶推荐</view>
+				</view>
+			</view> -->
+			<view class="vip-info">
+				<view class="vip-info-icon">
+					<u-icon name="edit-pen-fill" color="#ffd32f" size="36"></u-icon>
+				</view>
+				<view>
+					<view class="vip-info-title">每天3次发布动态无广告</view>
+					<view class="vip-info-text">每天免费发布3次无广告增加曝光</view>
+				</view>
+			</view>
+			<view class="vip-info">
+				<view class="vip-info-icon">
+					<u-icon name="weixin-fill" color="#ffd32f" size="36"></u-icon>
+				</view>
+				<view>
+					<view class="vip-info-title">每天5次交换名片</view>
+					<view class="vip-info-text">每天可以免费交换5次名片</view>
+				</view>
+			</view>
+			<view class="vip-info">
+				<view class="vip-info-icon">
+					<u-icon name="chat-fill" color="#ffd32f" size="36"></u-icon>
+				</view>
+				<view>
+					<view class="vip-info-title">打招呼聊天免费</view>
+					<view class="vip-info-text">打招呼聊天发送消息无限制</view>
+				</view>
+			</view>
+			<view class="vip-info">
+				<view class="vip-info-icon">
+					<u-icon name="star-fill" color="#ffd32f" size="36"></u-icon>
+				</view>
+				<view>
+					<view class="vip-info-title">每天3次首页置顶</view>
+					<view class="vip-info-text">每天可以免费置顶3次</view>
+				</view>
+			</view>
+			<view class="vip-info">
+				<view class="vip-info-icon">
+					<u-icon name="map-fill" color="#ffd32f" size="40"></u-icon>
+				</view>
+				<view>
+					<view class="vip-info-title">可查看同城的用户</view>
+					<view class="vip-info-text">离得近奔现的概率更高</view>
+				</view>
+			</view>
+			<view v-if="platform == 'android'">
+				<view class="btn-box" v-if="userInfo.isVip">
+					<view class="buy-btn">已开通</view>
+				</view>
+				<view class="btn-box" v-else>
+					<view class="btn-border" @click="payHandle">
+						<view class="buy-btn">￥{{pay.pay}} 立即购买</view>
+						<view class="btn-tip">每天不到￥{{pay.day}}</view>
+					</view>
+					
+					<!-- <view class="btn-border"  @click="goPay">
+						<view class="pay-btn">去充值趣豆</view>
+					</view> -->
+				</view>
+			</view>
+			<view v-else>
+				<view class="btn-box" v-if="userInfo.isVip">
+					<view class="buy-btn">已开通</view>
+				</view>
+				<view class="btn-box" v-else>
+					<view class="btn-border"  @click="payHot">
+						<view class="buy-btn">￥{{pay.pay}} 购买会员</view>
+						<view class="btn-tip">每天不到￥{{pay.day}}</view>
+					</view>
+					
+					<!-- <view class="btn-border"  @click="goPay">
+						<view class="pay-btn">去充值趣豆</view>
+					</view> -->
+				</view>
+			</view>
+		</view>
+	</s-layout>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import PayPointApi from '@/sheep/api/pay/point';
+	import dayjs from 'dayjs';
+	export default {
+		data() {
+			return {
+				currentIndex: 1,
+				dataList: [
+					{
+						band: false,
+						num: 1,
+						month: 5.7,
+						pay: 40,
+						day: 5.7,
+						unit: '个周',
+						tip: '天',
+					},
+					{
+						band: true,
+						num: 1,
+						month: 2.5,
+						pay: 80,
+						day: 2.5,
+						unit: '个月',
+						tip: '天',
+					},
+					{
+						band: false,
+						num: 6,
+						month: 40,
+						pay: 240,
+						day: 1.2,
+						unit: '个月',
+						tip: '月',
+					}
+				],
+				pay: {
+					
+				},
+				my: 'false',
+				platform: 'android',
+			}
+		},
+		onLoad(option) {
+			this.my = option.my;
+			this.pay = this.dataList[this.currentIndex];
+			
+			var that = this;
+			uni.getSystemInfo({
+				success: function(e) {
+					that.platform = e.platform;
+				}
+			});
+			sheep.$store('user').getInfo();
+		},
+		computed: {
+			userInfo: {
+			    get() {
+			      return sheep.$store('user').userInfo;
+			    },
+			},
+			isPass() {
+				return sheep.$store('user').tradeConfig.weixinEnabled;
+			},
+		},
+		methods: {
+			changeTab(index) {
+				this.currentIndex = index;
+				this.pay = this.dataList[index];
+			},
+			payHot() {
+				uni.showModal({
+					title: '温馨提示',
+					content: '苹果用户请联系客服充值，客服微信：rbtnet',
+					showCancel: false,
+					success: function(res) {
+						if (res.confirm) {
+							uni.setClipboardData({
+							    data: 'rbtnet' ,
+							    success: function (res) {
+									uni.showToast({
+										 title: '复制成功',
+									});
+							    }
+							});
+						}
+					}
+				});
+			},
+			goPay() {
+				this.$u.route({
+					url: 'pages/me/coin/pay',
+					params: {
+						my: 'true',
+					}
+				});
+			},
+			payHandle() {
+				var coinNum = 100*this.pay.pay;
+				PayPointApi.createPointRecharge({
+					payPrice: coinNum,
+				}).then(res => {
+					sheep.$router.go('/pages/pay/vip/index', {
+					  id: res.data.payOrderId,
+					  orderType: 'recharge',
+					});
+				});
+			},
+			showDayTime(datetime) {
+			  if (!datetime) return "";
+			  return dayjs(datetime).format('YYYY-MM-DD HH:mm:ss');
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss" scoped>
+	.page {
+		padding: 15px;
+		padding-bottom: 150px;
+		background-color: #fff;
+	}
+	.vip-box {
+		padding: 15px;
+		background-image: linear-gradient(180deg, #ffd32f, #db854e);
+		align-items: center;
+		justify-content: center;
+		display: flex;
+		flex-direction: column;
+		border-radius: 10px;
+		margin-bottom: 15px;
+	}
+	.vip-name {
+		color: #fff;
+		font-size: 32rpx;
+		font-weight: bold;
+		margin-bottom: 50rpx;
+	}
+	.vip-tip {
+		color: #fff;
+		font-size: 24rpx;
+		margin-left: 5px;
+	}
+	.price-tab-box {
+		display: flex;
+	}
+	.price-tab {
+		display: flex;
+		flex: 1;
+		padding-right: 5px;
+	}
+	.price-tab .active {
+		border: 8rpx solid #e09049;
+		color: #e09049;
+	}
+	.price-tab-box .price-tab:last-child {
+		padding-right: 0;
+	}
+	.price-tab-border {
+		border: 8rpx solid #f5e8e8;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 100%;
+		padding: 20px 0;
+		border-radius: 10px;
+		color: #858585;
+		position: relative;
+	}
+	.price-texta {
+		font-size: 36rpx;
+		margin-bottom: 5px;
+		font-weight: bold;
+	}
+	.price-textb {
+		font-size: 30rpx;
+		margin-bottom: 5px;
+	}
+	.price-textc {
+		font-size: 36rpx;
+	}
+	.vip-title {
+		font-size: 28rpx;
+		color: #9e9696ed;
+		padding: 15px 0;
+		font-weight: bold;
+	}
+	.vip-info {
+		display: flex;
+		align-items: center;
+		margin-bottom: 15px;
+	}
+	.vip-info-icon {
+		margin-right: 10px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border: 3px solid #f5e8e8;
+		padding: 15px;
+		border-radius: 10px;
+	}
+	.vip-info-title {
+		font-size: 30rpx;
+		margin-bottom: 5px;
+		font-weight: bold;
+	}
+	.vip-info-text {
+		font-size: 26rpx;
+		color: #858585;
+	}
+	.btn-box {
+		position: fixed;
+		bottom: 20px;
+		left: 0;
+		right: 0;
+		padding: 15px;
+	}
+	.buy-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #ffd32f;
+		padding: 15px;
+		border-radius: 10px;
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #fff;
+	}
+	.pay-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #18b566;
+		padding: 15px;
+		border-radius: 10px;
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #fff;
+	}
+	.btn-border {
+		position: relative;
+		margin-top: 30rpx;
+	}
+	.tab-band {
+		position: absolute;
+		background-color: #efc93c;
+		top: -10px;
+		border-radius: 5px;
+		padding: 5px 10px;
+		font-size: 22rpx;
+		color: #fff;
+	}
+	.vip-tip-box {
+		display: flex;
+		align-items: center;
+	}
+	.btn-tip {
+		position: absolute;
+		background-color: #efa3fa;
+		top: -10px;
+		right: -3px;
+		border: 3px solid #fff;
+		border-radius: 10px;
+		padding: 3px 5px;
+		font-size: 22rpx;
+		color: #fff;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/wallet/money.vue b/pages/user/wallet/money.vue
new file mode 100644
index 0000000..b6c9d0d
--- /dev/null
+++ b/pages/user/wallet/money.vue
@@ -0,0 +1,379 @@
+<!-- 我的钱包 -->
+<template>
+  <s-layout class="wallet-wrap" title="我的钻石">
+    <!-- 钱包卡片 -->
+    <view class="header-box ss-flex ss-row-center ss-col-center">
+      <view class="card-box ui-BG-Main ui-Shadow-Main">
+        <view class="card-head ss-flex ss-col-center">
+          <view class="card-title ss-m-r-10">钻石余额（钻）</view>
+          <view
+            @tap="state.showMoney = !state.showMoney"
+            class="ss-eye-icon"
+            :class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"
+          />
+        </view>
+        <view class="ss-flex ss-row-between ss-col-center ss-m-t-64">
+          <view class="money-num">{{
+            state.showMoney ? fen2yuan(userWallet.balance) : '*****'
+          }}</view>
+          <button class="ss-reset-button topup-btn" @tap="sheep.$router.go('/pages/pay/recharge')">
+            充值
+          </button>
+        </view>
+      </view>
+    </view>
+
+    <su-sticky>
+      <!-- 统计 -->
+      <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
+        <uni-datetime-picker
+          v-model="state.data"
+          type="daterange"
+          @change="onChangeTime"
+          :end="state.today"
+        >
+          <button class="ss-reset-button date-btn">
+            <text>{{ dateFilterText }}</text>
+            <text class="cicon-drop-down ss-seldate-icon"></text>
+          </button>
+        </uni-datetime-picker>
+        <view class="total-box">
+          <view class="ss-m-b-10">总收入￥{{ fen2yuan(state.summary.totalIncome) }}</view>
+          <view>总支出￥{{ fen2yuan(state.summary.totalExpense) }}</view>
+        </view>
+      </view>
+      <su-tabs
+        :list="tabMaps"
+        @change="onChange"
+        :scrollable="false"
+        :current="state.currentTab"
+      ></su-tabs>
+    </su-sticky>
+    <s-empty v-if="state.pagination.total === 0" text="暂无数据" icon="/static/data-empty.png" />
+
+    <!-- 钱包记录 -->
+    <view v-if="state.pagination.total > 0">
+      <view
+        class="wallet-list ss-flex border-bottom"
+        v-for="item in state.pagination.list"
+        :key="item.id"
+      >
+        <view class="list-content">
+          <view class="title-box ss-flex ss-row-between ss-m-b-20">
+            <text class="title ss-line-1">
+              {{ item.title }}
+            </text>
+            <view class="money">
+              <text v-if="item.price >= 0" class="add">+{{ fen2yuan(item.price) }}</text>
+              <text v-else class="minus">{{ fen2yuan(item.price) }}</text>
+            </view>
+          </view>
+          <text class="time">
+            {{ sheep.$helper.timeFormat(state.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+          </text>
+        </view>
+      </view>
+    </view>
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import { computed, reactive } from 'vue';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import dayjs from 'dayjs';
+  import _ from 'lodash-es';
+  import PayWalletApi from '@/sheep/api/pay/wallet';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import { resetPagination } from '@/sheep/util';
+
+  const headerBg = sheep.$url.css('/static/img/shop/user/wallet_card_bg.png');
+
+  // 数据
+  const state = reactive({
+    showMoney: false,
+    date: [], // 筛选的时间段
+    currentTab: 0,
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 8,
+    },
+    summary: {
+      totalIncome: 0,
+      totalExpense: 0,
+    },
+    loadStatus: '',
+    today: '',
+  });
+
+  const tabMaps = [
+    {
+      name: '全部',
+      value: '',
+    },
+    {
+      name: '收入',
+      value: '1',
+    },
+    {
+      name: '支出',
+      value: '2',
+    },
+  ];
+
+  const userWallet = computed(() => sheep.$store('user').userWallet);
+
+  // 格式化时间段
+  const dateFilterText = computed(() => {
+    if (state.date[0] === state.date[1]) {
+      return state.date[0];
+    } else {
+      return state.date.join('~');
+    }
+  });
+
+  // 获得钱包记录分页
+  async function getLogList() {
+    state.loadStatus = 'loading';
+    const { data, code } = await PayWalletApi.getWalletTransactionPage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+      type: tabMaps[state.currentTab].value,
+      'createTime[0]': state.date[0] + ' 00:00:00',
+      'createTime[1]': state.date[1] + ' 23:59:59',
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  // 获得钱包统计
+  async function getSummary() {
+    const { data, code } = await PayWalletApi.getWalletTransactionSummary({
+      createTime: [state.date[0] + ' 00:00:00', state.date[1] + ' 23:59:59'],
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.summary = data;
+  }
+
+  onLoad(() => {
+    state.today = dayjs().format('YYYY-MM-DD');
+    state.date = [state.today, state.today];
+    getLogList();
+    getSummary();
+    // 刷新钱包的缓存
+    sheep.$store('user').getWallet();
+  });
+
+  // 处理 tab 切换
+  function onChange(e) {
+    state.currentTab = e.index;
+    // 重新加载列表
+    resetPagination(state.pagination);
+    getLogList();
+    getSummary();
+  }
+
+  // 处理时间筛选
+  function onChangeTime(e) {
+    state.date[0] = e[0];
+    state.date[1] = e[e.length - 1];
+    // 重新加载列表
+    resetPagination(state.pagination);
+    getLogList();
+    getSummary();
+  }
+
+  onReachBottom(() => {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getLogList();
+  });
+</script>
+
+<style lang="scss" scoped>
+  // 钱包
+  .header-box {
+    background-color: $white;
+    padding: 30rpx;
+
+    .card-box {
+      width: 100%;
+      min-height: 300rpx;
+      padding: 40rpx;
+      background-size: 100% 100%;
+      border-radius: 30rpx;
+      overflow: hidden;
+      position: relative;
+      z-index: 1;
+      box-sizing: border-box;
+
+      &::after {
+        content: '';
+        display: block;
+        width: 100%;
+        height: 100%;
+        z-index: 2;
+        position: absolute;
+        top: 0;
+        left: 0;
+        background: v-bind(headerBg) no-repeat;
+        pointer-events: none;
+      }
+
+      .card-head {
+        color: $white;
+        font-size: 30rpx;
+      }
+
+      .ss-eye-icon {
+        font-size: 40rpx;
+        color: $white;
+      }
+
+      .money-num {
+        font-size: 70rpx;
+        line-height: 70rpx;
+        font-weight: 500;
+        color: $white;
+        font-family: OPPOSANS;
+      }
+
+      .reduce-num {
+        font-size: 26rpx;
+        font-weight: 400;
+        color: $white;
+      }
+
+      .topup-btn {
+        width: 120rpx;
+        height: 60rpx;
+        line-height: 60rpx;
+        border-radius: 30px;
+        font-size: 26rpx;
+        font-weight: 500;
+        background-color: $white;
+        color: var(--ui-BG-Main);
+      }
+    }
+  }
+
+  // 筛选
+
+  .filter-box {
+    height: 114rpx;
+    background-color: $bg-page;
+
+    .total-box {
+      font-size: 24rpx;
+      font-weight: 500;
+      color: $dark-9;
+    }
+
+    .date-btn {
+      background-color: $white;
+      line-height: 54rpx;
+      border-radius: 27rpx;
+      padding: 0 20rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      color: $dark-6;
+
+      .ss-seldate-icon {
+        font-size: 50rpx;
+        color: $dark-9;
+      }
+    }
+  }
+
+  .tabs-box {
+    background: $white;
+    border-bottom: 2rpx solid #eeeeee;
+  }
+
+  // tab
+  .wallet-tab-card {
+    .tab-item {
+      height: 80rpx;
+      position: relative;
+
+      .tab-title {
+        font-size: 30rpx;
+      }
+
+      .cur-tab-title {
+        font-weight: $font-weight-bold;
+      }
+
+      .tab-line {
+        width: 60rpx;
+        height: 6rpx;
+        border-radius: 6rpx;
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        bottom: 2rpx;
+        background-color: var(--ui-BG-Main);
+      }
+    }
+  }
+
+  // 钱包记录
+  .wallet-list {
+    padding: 30rpx;
+    background-color: #ffff;
+
+    .head-img {
+      width: 70rpx;
+      height: 70rpx;
+      border-radius: 50%;
+      background: $gray-c;
+    }
+
+    .list-content {
+      justify-content: space-between;
+      align-items: flex-start;
+      flex: 1;
+
+      .title {
+        font-size: 28rpx;
+        color: $dark-3;
+        width: 400rpx;
+      }
+
+      .time {
+        color: $gray-c;
+        font-size: 22rpx;
+      }
+    }
+
+    .money {
+      font-size: 28rpx;
+      font-weight: bold;
+      font-family: OPPOSANS;
+      .add {
+        color: var(--ui-BG-Main);
+      }
+
+      .minus {
+        color: $dark-3;
+      }
+    }
+  }
+</style>
diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue
new file mode 100644
index 0000000..f49866e
--- /dev/null
+++ b/pages/user/wallet/score.vue
@@ -0,0 +1,323 @@
+<!-- 我的积分 -->
+<template>
+  <s-layout class="wallet-wrap" title="我的积分">
+	<!-- 钱包卡片 -->
+	<view class="header-box ss-flex ss-row-center ss-col-center">
+	  <view class="card-box ui-BG-Main ui-Shadow-Main">
+	    <view class="card-head ss-flex ss-col-center">
+	      <view class="card-title ss-m-r-10">剩余积分（个）</view>
+	      <view
+	        @tap="state.showMoney = !state.showMoney"
+	        class="ss-eye-icon"
+	        :class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"
+	      />
+	    </view>
+	    <view class="ss-flex ss-row-between ss-col-center ss-m-t-64">
+	      <view class="money-num">{{
+	        state.showMoney ? (userInfo.point || 0) : '*****'
+	      }}</view>
+	      <button class="ss-reset-button topup-btn" @tap="sheep.$router.go('/pages/point/recharge')">
+	        充值
+	      </button>
+	    </view>
+	  </view>
+	</view>
+		
+    <!-- tab -->
+    <su-sticky>
+      <!-- 统计 -->
+      <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
+        <uni-datetime-picker
+          v-model="state.date"
+          type="daterange"
+          @change="onChangeTime"
+          :end="state.today"
+        >
+          <button class="ss-reset-button date-btn">
+            <text>{{ dateFilterText }}</text>
+            <text class="cicon-drop-down ss-seldate-icon"></text>
+          </button>
+        </uni-datetime-picker>
+
+        <!-- TODO 芋艿：【钱包】可优化 -->
+        <!--				<view class="total-box">-->
+        <!--					<view class="ss-m-b-10">总收入￥{{ state.pagination.income }}</view>-->
+        <!--					<view>总支出￥{{ -state.pagination.expense }}</view>-->
+        <!--				</view>-->
+      </view>
+      <su-tabs
+        :list="tabMaps"
+        @change="onChange"
+        :scrollable="false"
+        :current="state.currentTab"
+      ></su-tabs>
+    </su-sticky>
+
+    <!-- list -->
+    <view class="list-box">
+      <view v-if="state.pagination.total > 0">
+        <view
+          class="list-item ss-flex ss-col-center ss-row-between"
+          v-for="item in state.pagination.list"
+          :key="item.id"
+        >
+          <view class="ss-flex-col">
+            <view class="name"
+              >{{ item.title }}{{ item.description ? ' - ' + item.description : '' }}</view
+            >
+            <view class="time">{{
+              sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss')
+            }}</view>
+          </view>
+          <view class="add" v-if="item.point > 0">+{{ item.point }}</view>
+          <view class="minus" v-else>{{ item.point }}</view>
+        </view>
+      </view>
+      <s-empty v-else text="暂无数据" icon="/static/data-empty.png" />
+    </view>
+
+    <uni-load-more
+      v-if="state.pagination.total > 0"
+      :status="state.loadStatus"
+      :content-text="{
+        contentdown: '上拉加载更多',
+      }"
+      @tap="onLoadMore"
+    />
+  </s-layout>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { computed, reactive } from 'vue';
+  import _ from 'lodash-es';
+  import dayjs from 'dayjs';
+  import PointApi from '@/sheep/api/member/point';
+  import { resetPagination } from '@/sheep/util';
+
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const userInfo = computed(() => sheep.$store('user').userInfo);
+  const sys_navBar = sheep.$platform.navbar;
+
+  const state = reactive({
+	showMoney: true,
+    currentTab: 0,
+    pagination: {
+      list: 0,
+      total: 0,
+      pageSize: 20,
+      pageNo: 1,
+    },
+    loadStatus: '',
+    date: [],
+    today: '',
+  });
+
+  const tabMaps = [
+    {
+      name: '全部',
+      value: 'all',
+    },
+    {
+      name: '收入',
+      value: 'true',
+    },
+    {
+      name: '支出',
+      value: 'false',
+    },
+  ];
+
+  const dateFilterText = computed(() => {
+    if (state.date[0] === state.date[1]) {
+      return state.date[0];
+    } else {
+      return state.date.join('~');
+    }
+  });
+
+  async function getLogList() {
+    state.loadStatus = 'loading';
+    let { code, data } = await PointApi.getPointRecordPage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+      addStatus: state.currentTab > 0 ? tabMaps[state.currentTab].value : undefined,
+      'createTime[0]': state.date[0] + ' 00:00:00',
+      'createTime[1]': state.date[1] + ' 23:59:59',
+    });
+    if (code !== 0) {
+      return;
+    }
+    state.pagination.list = _.concat(state.pagination.list, data.list);
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
+
+  onLoad(() => {
+    state.today = dayjs().format('YYYY-MM-DD');
+    state.date = [state.today, state.today];
+    getLogList();
+	// 刷新积分缓存
+	sheep.$store('user').getInfo();
+  });
+
+  function onChange(e) {
+    state.currentTab = e.index;
+    resetPagination(state.pagination);
+    getLogList();
+  }
+
+  function onChangeTime(e) {
+    state.date[0] = e[0];
+    state.date[1] = e[e.length - 1];
+    resetPagination(state.pagination);
+    getLogList();
+  }
+
+  function onLoadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getLogList();
+  }
+
+  onReachBottom(() => {
+    onLoadMore();
+  });
+</script>
+
+<style lang="scss" scoped>
+  // 钱包
+  .header-box {
+    background-color: $white;
+    padding: 30rpx;
+  
+    .card-box {
+      width: 100%;
+      min-height: 300rpx;
+      padding: 40rpx;
+      background-size: 100% 100%;
+      border-radius: 30rpx;
+      overflow: hidden;
+      position: relative;
+      z-index: 1;
+      box-sizing: border-box;
+  
+      &::after {
+        content: '';
+        display: block;
+        width: 100%;
+        height: 100%;
+        z-index: 2;
+        position: absolute;
+        top: 0;
+        left: 0;
+        background: v-bind(headerBg) no-repeat;
+        pointer-events: none;
+      }
+  
+      .card-head {
+        color: $white;
+        font-size: 30rpx;
+      }
+  
+      .ss-eye-icon {
+        font-size: 40rpx;
+        color: $white;
+      }
+  
+      .money-num {
+        font-size: 70rpx;
+        line-height: 70rpx;
+        font-weight: 500;
+        color: $white;
+        font-family: OPPOSANS;
+      }
+  
+      .reduce-num {
+        font-size: 26rpx;
+        font-weight: 400;
+        color: $white;
+      }
+  
+      .topup-btn {
+        width: 120rpx;
+        height: 60rpx;
+        line-height: 60rpx;
+        border-radius: 30px;
+        font-size: 26rpx;
+        font-weight: 500;
+        background-color: $white;
+        color: var(--ui-BG-Main);
+      }
+    }
+  }
+ 
+  // 筛选
+  .filter-box {
+    height: 114rpx;
+    background-color: $bg-page;
+
+    .total-box {
+      font-size: 24rpx;
+      font-weight: 500;
+      color: $dark-9;
+    }
+
+    .date-btn {
+      background-color: $white;
+      line-height: 54rpx;
+      border-radius: 27rpx;
+      padding: 0 20rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      color: $dark-6;
+
+      .ss-seldate-icon {
+        font-size: 50rpx;
+        color: $dark-9;
+      }
+    }
+  }
+
+  .list-box {
+    .list-item {
+      background: #fff;
+      border-bottom: 1rpx solid #dfdfdf;
+      padding: 30rpx;
+
+      .name {
+        font-size: 28rpx;
+
+        font-weight: 500;
+        color: rgba(102, 102, 102, 1);
+        line-height: 28rpx;
+        margin-bottom: 20rpx;
+      }
+
+      .time {
+        font-size: 24rpx;
+
+        font-weight: 500;
+        color: rgba(196, 196, 196, 1);
+        line-height: 24px;
+      }
+
+      .add {
+        font-size: 30rpx;
+
+        font-weight: 500;
+        color: #e6b873;
+      }
+
+      .minus {
+        font-size: 30rpx;
+
+        font-weight: 500;
+        color: $dark-3;
+      }
+    }
+  }
+</style>
diff --git a/pages/worker/blind/components/gameBox.vue b/pages/worker/blind/components/gameBox.vue
new file mode 100644
index 0000000..4c4687b
--- /dev/null
+++ b/pages/worker/blind/components/gameBox.vue
@@ -0,0 +1,149 @@
+<template>
+	<view>
+		<view class="option-box">
+			<view class="tag-box">
+				<u-icon name="tags" color="#88e6b4" size="34"></u-icon>
+				<view class="name">技能类型</view>
+			</view>
+			<view class="span-box">
+				<view @click="changeGame(option)" class="span" :class="catId == option.id ? 'active': '' " v-for="(option,t) in optionList">{{option.name}}</view>
+			</view>
+		</view>
+		
+		<view class="option-box" v-if="categoryList.length > 0">
+			<view class="tag-box">
+				<u-icon name="tags" color="#88e6b4" size="34"></u-icon>
+				<view class="name">选项</view>
+			</view>
+			<view class="span-box">
+				<view @click="changeCategory(option)" class="span" :class="gameId == option.id ? 'active': '' " v-for="(option,t) in categoryList">{{option.name}}</view>
+			</view>
+		</view>
+		
+		<view class="option-box" v-if="goodsList.length > 0">
+			<view class="tag-box">
+				<u-icon name="tags" color="#88e6b4" size="34"></u-icon>
+				<view class="name">选项</view>
+			</view>
+			<view class="span-box">
+				<view @click="changeGoods(option)" class="span" :class="goodsId == option.id ? 'active': '' " v-for="(option,t) in goodsList">{{option.name}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			optionList: {
+				type: Array,
+				default: [],
+			},
+			modelValue: {
+			  type: Object,
+			  default: {}
+			},
+		},
+		data() {
+			return {
+				catId: -1,
+				gameId: -1,
+				goodsId: -1,
+				categoryList: [],
+				goodsList: [],
+				goodsList: [],
+			}
+		},
+		methods: {
+			changeGame(e) {
+				this.gameId = -1;
+				this.goodsId = -1;
+				
+				this.catId = e.id;
+				if(e.categoryList){
+					this.goodsList = [];
+					this.categoryList = e.categoryList;
+				}else{
+					this.categoryList = [];
+					this.goodsList = e.goodsList;
+				}
+				
+				var node = {
+					catId: this.catId,
+					gameId: this.gameId,
+					goodsId: this.goodsId,
+					price: 0,
+				}
+				this.$emit('update:modelValue', node); 
+			},
+			changeCategory(e) {
+				this.goodsId = -1;
+				this.gameId = e.id;
+				this.goodsList = e.goodsList;
+				
+				var node = {
+					catId: this.catId,
+					gameId: this.gameId,
+					goodsId: this.goodsId,
+					price: 0,
+				}
+				this.$emit('update:modelValue', node); 
+			},
+			changeGoods(e) {
+				this.goodsId = e.id;
+				var node = {
+					catId: this.catId,
+					gameId: this.gameId,
+					goodsId: this.goodsId,
+					price: e.price,
+				}
+				this.$emit('update:modelValue', node); 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.option-box {
+		margin-bottom: 10px;
+		
+		.tag-box {
+			display: flex;
+			align-items: center;
+			margin-bottom: 12px;
+			
+			.name {
+				font-size: 28rpx;
+				font-weight: 700;
+				color: #1a1a1a;
+				padding-left: 3px;
+			}
+		}
+		
+		.span-box {
+			display: flex;
+			flex-wrap: wrap;
+			
+			.span {
+				padding: 10rpx 30rpx;
+				font-size: 28rpx;
+				background-color: #f5f5f5;
+				min-width: 120rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				margin-right: 7px;
+				margin-bottom: 8px;
+			}
+			
+			.active {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/worker/blind/components/layout.vue b/pages/worker/blind/components/layout.vue
new file mode 100644
index 0000000..022d227
--- /dev/null
+++ b/pages/worker/blind/components/layout.vue
@@ -0,0 +1,357 @@
+<template>
+	<view class="content">
+		<su-navbar color="var(--ui-BG-Main)" :title="title" statusBar></su-navbar>
+		
+		<view :style="{paddingTop: paddingTop + 'px', paddingBottom: paddingBottom + 'rpx'}">
+			<view class="game-card">
+				<view class="title">
+					<u-icon name="tags" color="#f5736a" size="34"></u-icon>
+					<view class="name">达人性别</view>
+				</view>
+				
+				<view class="sex-option">
+					<view class="sex-tab" @click="sexChange(1)">
+						<view class="img-span">
+							<img v-if="form.sex == 1" class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/16d050d0b229f12a8997a8118ca815c936bdb9b580db48ab8b2737181ca8518a.png"></img>
+							<img v-else class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/15c4eb12397fb3374be6e8bf38854b708abb09f61fb076eaa0c23d5f92cc9583.png"></img>
+							<view class="sex-ok" v-if="form.sex == 1">
+								<u-icon name="checkmark-circle-fill" color="#fe8497" size="34"></u-icon>
+							</view>
+						</view>
+						<view class="name">小姐姐</view>
+					</view>
+					
+					<view class="sex-tab" @click="sexChange(0)">
+						<view class="img-span">
+							<img v-if="form.sex == 0" class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/74e49dd19affb2c8016df4805d3947bab3a93af83236e4f875b5ea18bf57d8b3.png"></img>
+							<img v-else class="img" src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/d0757757a5b4c0559f1bc1d373ab983902bd056bda7ca4be6c2fa04553b4665d.png"></img>
+							<view class="sex-ok" v-if="form.sex == 0">
+								<u-icon name="checkmark-circle-fill" color="#6497f8" size="34"></u-icon>
+							</view>
+						</view>
+						<view class="name">小哥哥</view>
+					</view>
+					
+				</view>
+				
+				<view class="title">
+					<u-icon name="tags" color="#e475e5" size="34"></u-icon>
+					<view class="name">达人等级</view>
+				</view>
+				
+				<view class="level-option">
+					<view @click="levelChange(option)" class="tab" :class="option.id == form.workerClerkLevelId ? 'active' : ''" v-for="(option,t) in levelList">{{option.name}}</view>
+				</view>
+				
+				<game-box v-model="game" :optionList="goodsList"></game-box>
+				
+				<view class="input-box">
+					<view class="title">
+						<u-icon name="tags" color="#e475e5" size="34"></u-icon>
+						<view class="name">购买数量</view>
+					</view>
+					<view class="step-span">
+						<tui-numberbox iconBgColor="var(--ui-BG-Main)" iconColor="#fff" backgroundColor="#fff" :min="1" :value="form.num" @change="change"></tui-numberbox>
+					</view>
+				</view>
+				
+				<view class="input-box">
+					<view class="title">
+						<u-icon name="tags" color="#e475e5" size="34"></u-icon>
+						<view class="name">排除下单过的达人</view>
+					</view>
+					<view class="step-span">
+						<u-switch active-color="var(--ui-BG-Main)" size="40" v-model="form.blind"></u-switch>
+					</view>
+				</view>
+				
+			</view>
+			
+			
+			<view class="bottom-box">
+				<view class="price-box">
+					<text>总价：</text>
+					<text class="price">{{ fen2yuan(game.price*form.num) }}</text>
+					<text>钻石</text>
+				</view>
+				<view class="btn-box">
+					<view class="pay-btn" @click="confirm">立即下单</view>
+				</view>
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	import gameBox from '@/pages/worker/blind/components/gameBox.vue';
+	import tuiNumberbox from "@/components/thorui/tui-numberbox/tui-numberbox.vue"
+	import ClerkApi from '@/sheep/api/worker/clerk'; 
+	import sheep from '@/sheep';
+	export default {
+		components: {
+			gameBox,
+			tuiNumberbox,
+		},
+		props: {
+			title: {
+				type: String,
+				default: '',
+			}
+		},
+		data() {
+			return {
+				paddingTop: 0,
+				paddingBottom: 200,
+				height: 0,
+				
+				form: {
+					num: 1,
+					goodsId: -1,
+					price: 0,
+					sex: 2,
+					workerClerkLevelId: 0,
+					blind: false,
+				},
+				
+				game: {
+					goodsId: -1,
+					price: 0,
+				},
+				
+				goodsList: [],
+				
+				levelList: [
+					{
+						id: 0,
+						name: '金牌',
+					},
+					{
+						id: 1,
+						name: '银牌',
+					},
+					{
+						id: 2,
+						name: '铜牌',
+					},
+				],
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods: {
+			initData() {
+				ClerkApi.getClerkBlind().then(res => {
+					this.goodsList = res.data.goodsList;
+					this.levelList = res.data.clerkLevelList;
+				});
+			},
+			sexChange(e) {
+				this.form.sex = e;
+			},
+			levelChange(e) {
+				this.form.workerClerkLevelId = e.id;
+			},
+			change(e) {
+				this.form.num = e.value
+			},
+			fen2yuan(price) {
+			  var f = 0;
+			  var p = (price / 100.0).toFixed(0);
+			  var p1 = (price / 100.0).toFixed(1);
+			  var p2 = (price / 100.0).toFixed(2);
+			  if(p*100 == price){
+			  				f = 0;  
+			  }else if(p1*100 == price){
+			  				  f = 1;
+			  }else if(p2*100 == price){
+			  				  f = 2;
+			  }
+			  return (price / 100.0).toFixed(f)
+			},
+			confirm() {
+				this.form.goodsId = this.game.goodsId,
+				this.form.price = this.game.price*this.form.num
+				if(this.form.sex > 1) {
+					sheep.$helper.toast('请选择店员性别');
+					return;
+				}
+				if(this.form.workerClerkLevelId < 1) {
+					sheep.$helper.toast('请选择店员等级');
+					return;
+				}
+				if(this.form.goodsId < 0) {
+					sheep.$helper.toast('请选择服务类型');
+					return;
+				}
+				if(this.form.price < 1) {
+					sheep.$helper.toast('价格不能为0');
+					return;
+				}
+				var data = {
+					workerClerkLevelId: this.form.workerClerkLevelId,
+					sex: this.form.sex,
+					blind: this.form.blind,
+					items : [
+						{
+							skuId: this.form.goodsId, 
+							count: this.form.num,
+						},
+					]
+				}
+				
+				sheep.$router.go('/pages/order/blind/confirm',{data: JSON.stringify(data)});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.game-card {
+		background-color: #fff;
+		padding: 15px;
+		
+		.title {
+			display: flex;
+			align-items: center;
+			
+			.name {
+				font-size: 28rpx;
+				font-weight: 700;
+				color: #1a1a1a;
+				padding-left: 3px;
+			}
+		}
+		
+		.sex-option {
+			display: flex;
+			align-items: center;
+			margin: 15px 0px;
+			
+			.sex-tab {
+				display: flex;
+				align-items: center;
+				flex-direction: column;
+				justify-content: center;
+				margin-right: 30px;
+				
+				.img-span {
+					width: 130rpx;
+					height: 130rpx;
+					position: relative;
+					display: flex;
+					justify-content: center;
+					
+					.img {
+						height: 100%;
+						width: 100%;
+					}
+					
+					.sex-ok {
+						background-color: #fff;
+						width: 34rpx;
+						height: 34rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						position: absolute;
+						bottom: 0;
+						border-radius: 100%;
+					}
+				}
+			}
+			
+			.name {
+				font-size: 28rpx;
+				font-weight: 400;
+				padding-top: 10px;
+				color: #333;
+			}
+			
+		}
+		
+		.level-option {
+			display: flex;
+			padding: 15px 0;
+			flex-wrap: wrap;
+			
+			.tab {
+				padding: 10rpx 30rpx;
+				font-size: 28rpx;
+				background-color: #f5f5f5;
+				min-width: 120rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				margin-right: 7px;
+				margin-bottom: 8px;
+			}
+			
+			.active {
+				color: #fff;
+				background: var(--ui-BG-Main);
+			}
+		}
+		
+		.input-box {
+			display: flex;
+			margin-bottom: 20px;
+			
+			.step-span {
+				display: flex;
+				justify-content: flex-end;
+				flex: 1;
+				align-items: center;
+			}
+		}
+		
+	}
+	
+	
+	.bottom-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 15px;
+		height: 100rpx;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: -1px;
+		background-color: #fff;
+		z-index: 9;
+		box-shadow: 0 0 6px 0 #ccc;
+		
+		.price-box {
+			color: #fb932c;
+			font-size: 28rpx;
+			width: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			
+			.price {
+				margin-right: 5px;
+			}
+		}
+		
+		.btn-box {
+			width: 50%;
+			padding-left: 15px;
+			
+			.pay-btn {
+				background-color: var(--ui-BG-Main);
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 40px;
+				font-size: 28rpx;
+				height: 64rpx;
+			}
+		}
+		
+	}
+</style>
diff --git a/pages/worker/blind/index.vue b/pages/worker/blind/index.vue
new file mode 100644
index 0000000..f4756f4
--- /dev/null
+++ b/pages/worker/blind/index.vue
@@ -0,0 +1,40 @@
+<template>
+  <view class="page-app theme-light main-green font-1">
+    <layout title="随机下单">
+
+    </layout>
+	
+	<s-menu-tools />
+	<s-auth-modal />
+  </view>
+</template> 
+
+<script>
+import layout from '@/pages/worker/blind/components/layout.vue';
+export default {
+  components: {
+    layout,
+  },
+  data() {
+    return {
+
+    }
+  },
+  created() {
+
+  },
+  methods: {
+
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page-app {
+  background-color: #fafafa;
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+
+</style>
\ No newline at end of file
diff --git a/pages/worker/levelList/components/layout.vue b/pages/worker/levelList/components/layout.vue
new file mode 100644
index 0000000..5823785
--- /dev/null
+++ b/pages/worker/levelList/components/layout.vue
@@ -0,0 +1,109 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<su-navbar :title="title" statusBar></su-navbar>
+		
+		<view class="main-box">
+			<view class="title">当前等级：{{clerkLevel}}</view>
+			<level-list :dataList="tableList"></level-list>
+		</view>
+		
+		<view class="bottom-box">
+			<view class="btn" @click="saveLevel">保存配置</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import LevelList from '@/pages/worker/levelList/components/levelList.vue';
+	import ClerkApi from '@/sheep/api/worker/clerk';
+	export default {
+		components: {
+			LevelList,
+		}, 
+		props: {
+			title: {
+				type: String,
+				default: '',
+			},
+		},
+		data() {
+			return {
+				tableList: [],
+				id: 0,
+				clerkLevel: '',
+			}
+		},
+		created() {
+			
+		},
+		methods: {
+			initData(id) {
+				this.id = id;
+				ClerkApi.getGoodsList(id).then(res => {
+					this.tableList = res.data;
+				});
+				
+				ClerkApi.getClerkLevel(id).then(res => {
+					this.clerkLevel = res.data;
+				});
+				
+			},
+			saveLevel() {
+				var params = {
+					id: this.id,
+					categoryList: this.tableList
+				}
+				ClerkApi.saveGoodsList(params).then(res => {
+					
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+	.main-box {
+		padding: 10px;
+		padding-bottom: 140rpx;
+		
+		.title {
+			display: flex;
+			justify-content: center;
+			font-size: 28rpx;
+			font-weight: bold;
+			margin-bottom: 20px;
+		}
+	}
+	
+	.bottom-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 7px 15px;
+		background-color: #fff;
+		box-shadow: 0 0 6px 0 #ccc;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 1;
+		
+		.btn {
+			background-color: var(--ui-BG-Main);;
+			padding: 10px;
+			border-radius: 40px;
+			color: #fff;
+			display: flex;
+			flex: 1;
+			justify-content: center;
+			align-items: center;
+			font-size: 28rpx;
+		}
+		
+	}
+</style>
diff --git a/pages/worker/levelList/components/levelList.vue b/pages/worker/levelList/components/levelList.vue
new file mode 100644
index 0000000..e26a464
--- /dev/null
+++ b/pages/worker/levelList/components/levelList.vue
@@ -0,0 +1,105 @@
+<template>
+	<view>
+		<table-bd style="width: 100%;">
+		  <table-tr>
+		    <table-td :span="18" height="60" :fontSize="30" :bold="true" fontColor="#01BEFF" alignItems="center">技能列表</table-td>
+			<table-td :span="6" height="60" :fontSize="30" :bold="true" fontColor="#01BEFF" alignItems="center">开关</table-td>
+		  </table-tr>
+		  
+		  <block v-for="(tb,t) in dataList">
+			  <table-tr>
+			    <table-td :span="6" alignItems="center">{{tb.name}}</table-td>
+				
+				<block v-if="tb.goodsList">
+					<table-td :span="12" :ellipsis="true" padding="0">
+						<block v-for="(tb2,t2) in tb.goodsList">
+						  <table-tr :borderWidth="t2 == tb.goodsList.length-1 ? 0 : 1">
+							<table-td height="60" :span="24" :borderRight="false" alignItems="center">{{tb2.name}}</table-td>
+						  </table-tr>
+						</block>
+					</table-td>
+					<table-td :span="6" :ellipsis="true" padding="0">
+						<block v-for="(tb2,t2) in tb.goodsList">
+							<table-tr :borderWidth="t2 == tb.goodsList.length-1 ? 0 : 1">
+							  <table-td height="60" :span="24" borderWidth="1rpx" :borderRight="false" alignItems="center">
+								  <view @click="changeLevel(tb2)"><u-switch active-color="var(--ui-BG-Main)" size="36" v-model="tb2.deleted"></u-switch></view>
+							  </table-td>
+							</table-tr>
+						</block>
+					</table-td>
+				</block>
+			  	
+			  	<block v-if="tb.categoryList">
+					<table-td :span="12" :ellipsis="true" padding="0">
+						<block v-for="(tb2,t2) in tb.categoryList">
+							<table-tr :borderWidth="t2 == tb.categoryList.length-1 ? 0 : 1">
+							  <table-td :span="12" borderWidth="1rpx" alignItems="center">{{tb2.name}}</table-td>
+							  <table-td :span="12" :ellipsis="true" :borderRight="false" padding="0">
+								  <block v-for="(tb3,t3) in tb2.goodsList">
+									  <table-tr :borderWidth="t3 == tb2.goodsList.length-1 ? 0 : 1">
+										<table-td height="60" :span="24" :borderRight="false" alignItems="center">{{tb3.name}}</table-td>
+									  </table-tr>
+								  </block>
+							  </table-td>
+							</table-tr>
+						</block>
+					</table-td>
+					
+					<table-td :span="6" :ellipsis="true" padding="0">
+						<block v-for="(tb2,t2) in tb.categoryList">
+							<block v-for="(tb3,t3) in tb2.goodsList">
+								<table-tr :borderWidth="t2 == tb.categoryList.length-1 && t3 == tb2.goodsList.length-1 ? 0 : 1">
+								  <table-td height="60" :span="24" borderWidth="1rpx" :borderRight="false" alignItems="center">
+									  <view @click="changeLevel(tb3)"><u-switch active-color="var(--ui-BG-Main)" size="36" v-model="tb3.deleted"></u-switch></view>
+								  </table-td>
+								</table-tr>
+							</block>
+						</block>
+					</table-td>
+				</block>
+				
+			  </table-tr>
+		  </block>
+		
+		</table-bd>
+		
+		
+	</view>
+</template>
+
+<script>
+	import TableBd from '@/pages/worker/levelList/components/table-bd.vue';
+	import TableTd from '@/pages/worker/levelList/components/table-td.vue';
+	import TableTr from '@/pages/worker/levelList/components/table-tr.vue';
+	export default {
+		components: {
+			TableBd,
+			TableTd,
+			TableTr,
+		},
+		props: {
+			dataList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			changeLevel(e) {
+				if(e.deleted){
+					e.deleted = true;
+				}else{
+					e.deleted = false;
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
\ No newline at end of file
diff --git a/pages/worker/levelList/components/table-bd.vue b/pages/worker/levelList/components/table-bd.vue
new file mode 100644
index 0000000..8819269
--- /dev/null
+++ b/pages/worker/levelList/components/table-bd.vue
@@ -0,0 +1,100 @@
+<template>
+  <view class="tn-table-class tn-table" :class="[tableClass]" :style="[tableStyle]">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'table-bd',
+    props: {
+      // 边框宽度
+      borderWidth: {
+        type: [String, Number],
+        default: ''
+      },
+      // 边框颜色
+      borderColor: {
+        type: String,
+        default: ''
+      },
+      // 显示上边框
+      borderTop: {
+        type: Boolean,
+        default: true
+      },
+      // 显示右边框
+      borderRight: {
+        type: Boolean,
+        default: false
+      },
+      // 显示下边框
+      borderBottom: {
+        type: Boolean,
+        default: false
+      },
+      // 显示左边框
+      borderLeft: {
+        type: Boolean,
+        default: true
+      }
+    },
+    computed: {
+      parentData() {
+        return [this.borderWidth, this.borderColor]
+      },
+      tableClass() {
+        let clazz = ''
+        return clazz
+      },
+      tableStyle() {
+        let style = {}
+        if (this.borderWidth !== '') {
+          style.borderWidth = this.borderWidth + 'rpx'
+        }
+        if (this.borderColor) {
+          style.borderColor = this.borderColor
+        }
+        if (this.borderLeft) {
+          style.borderLeftStyle = 'solid'
+        }
+        if (this.borderRight) {
+          style.borderRightStyle = 'solid'
+        }
+        if (this.borderTop) {
+          style.borderTopStyle = 'solid'
+        }
+        if (this.borderBottom) {
+          style.borderBottomStyle = 'solid'
+        }
+        return style
+      }
+    },
+    data() {
+      return {}
+    },
+    created() {
+      this.children = []
+    },
+    watch: {
+      parentData() {
+        // 更新子组件的数据
+        if (this.children.length) {
+          this.children.map((child) => {
+            typeof(child.updateParentData) === 'function' && child.updateParentData()
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-table {
+    box-sizing: border-box;
+    width: 100%;
+    border-width: 1rpx;
+    border-style: none;
+    border-color: var(--ui-BG-Main);;
+  }
+</style>
diff --git a/pages/worker/levelList/components/table-td.vue b/pages/worker/levelList/components/table-td.vue
new file mode 100644
index 0000000..13c6ea3
--- /dev/null
+++ b/pages/worker/levelList/components/table-td.vue
@@ -0,0 +1,305 @@
+<template>
+  <view class="tn-td-class tn-td" :class="[tdClass]" :style="[tdStyle]" @tap.stop="handleClick">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'table-td',
+    options: {
+    	// 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现(不会出现shadow节点下再去创建元素)
+    	virtualHost: true
+    },
+    props: {
+      // 占整个表格的宽度跨度
+      // [1-24]
+      span: {
+        type: Number,
+        default: 24
+      },
+      // 宽度
+      // 优先级比span高
+      width: {
+        type: [String, Number],
+        default: ''
+      },
+      // 高度
+      height: {
+        type: [String, Number],
+        default: ''
+      },
+      // 字体加粗
+      bold: {
+        type: Boolean,
+        default: false
+      },
+      // 格内边距
+      padding: {
+        type: String,
+        default: ''
+      },
+      // 边框颜色
+      borderColor: {
+        type: String,
+        default: ''
+      },
+      // 边框宽度
+      borderWidth: {
+        type: [String, Number],
+        default: ''
+      },
+      // 左边框
+      borderLeft: {
+        type: Boolean,
+        default: false
+      },
+      // 下边框
+      borderBottom: {
+        type: Boolean,
+        default: false
+      },
+      // 右边框
+      borderRight: {
+        type: Boolean,
+        default: true
+      },
+      // 文字超出隐藏
+      ellipsis: {
+        type: Boolean,
+        default: false
+      },
+      // 文本对齐方式
+      // left center right
+      textAlign: {
+        type: String,
+        default: 'left'
+      },
+      // 排列方式
+      // left center right
+      alignItems: {
+        type: String,
+        default: 'left'
+      },
+      // 收缩表格
+      shrink: {
+        type: Boolean,
+        default: true
+      },
+      // 铺满剩余空间
+      grow: {
+        type: Boolean,
+        default: false
+      },
+      // 隐藏
+      hidden: {
+        type: Boolean,
+        default: false
+      },
+      // 固定列数据
+      fixed: {
+        type: Boolean,
+        default: false
+      },
+      // zIndex
+      zIndex: {
+        type: Number,
+        default: 0
+      },
+      // 列数
+      index: {
+        type: [String, Number],
+        default: 0
+      },
+      // keys
+      keys: {
+        type: [String, Number],
+        default: ''
+      }
+    },
+    computed: {
+      tdClass() {
+        let clazz = ''
+        clazz += `${this.ellipsis ? 'tn-td--ellipsis' : 'tn-td--normal'}`
+       /* if (this.backgroundColorClass) {
+          clazz += ` ${this.backgroundColorClass}`
+        }
+        if (this.fontColorClass) {
+          clazz += ` ${this.fontColorClass}`
+        } */
+        if (this.alignItems) {
+          clazz += ` tn-td--${this.alignItems}`
+        }
+        if (this.textAlign) {
+          clazz += ` tn-td__text--${this.textAlign}`
+        }
+        if (!this.shrink) {
+          clazz += ' tn-td--shrink'
+        }
+        if (this.grow) {
+          clazz += ' tn-td--grow'
+        }
+        if (this.hidden) {
+          clazz += ' tn-td--hidden'
+        }
+        return clazz
+      },
+      tdStyle() {
+        let style = {}
+        /* if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        } */
+       /* if (this.fontColorStyle) {
+          style.color = this.fontColorStyle
+        } */
+        /* if (this.fontSizeStyle) {
+          style.fontSize = this.fontSizeStyle
+        } */
+        style.width = this.getWidth()
+        if (this.height) {
+          style.height = this.height + 'rpx';
+        }
+        style.fontWeight = this.bold ? 'bold' : 'normal'
+        if (this.padding) {
+          style.padding = this.padding
+        }
+        if (this.borderWidth !== '' || this.parentData.borderWidthValue !== '') {
+          style.borderWidth = this.borderWidth !== '' ? this.borderWidth+'rpx' : this.parentData.borderWidthValue + 'rpx'
+        }
+        if (this.borderColor || this.parentData.borderColorValue) {
+          style.borderColor = this.borderColor || this.parentData.borderColorValue
+        }
+        if (this.borderLeft) {
+          style.borderLeftStyle = 'solid'
+        }
+        if (this.borderRight) {
+          style.borderRightStyle = 'solid'
+        }
+        if (this.borderBottom) {
+          style.borderBottomStyle = 'solid'
+        }
+        if (this.fixed) {
+          style.zIndex = this.zIndex ? this.zIndex : 1000
+        }
+        return style
+      }
+    },
+    data() {
+      return {
+        parentData: {
+          borderColorValue: null,
+          borderWidthValue: null
+        }
+      }
+    },
+    created() {
+      this.parent = false
+      this.updateParentData()
+      this.parent && this.parent.children.push(this)
+    },
+    methods: {
+      // 获取表格宽度
+      getWidth() {
+        if (this.width) {
+          return this.width + 'rpx'
+        }
+        return [
+          '4.16666667%',
+          '8.33333333%',
+          '12.5%',
+          '16.66666667%',
+          '20.83333333%',
+          '25%',
+          '29.16666667%',
+          '33.33333333%',
+          '37.5%',
+          '41.66666667%',
+          '45.83333333%',
+          '50%',
+          '54.16666667%',
+          '58.33333333%',
+          '62.5%',
+          '66.66666667%',
+          '70.83333333%',
+          '75%',
+          '79.16666667%',
+          '83.33333333%',
+          '87.5%',
+          '91.66666667%',
+          '95.83333333%',
+          '100%'
+        ][this.span - 1]
+      },
+      // 点击事件
+      handleClick() {
+        this.$emit('click', {
+          index: this.index,
+          key: this.keys
+        })
+      },
+      // 更新父组件信息
+      updateParentData() {
+        this.getParentData('tn-tr')
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-td {
+    box-sizing: border-box;
+    position: relative;
+    word-break: break-all;
+    background-color: transparent;
+    height: auto;
+    padding: 12rpx;
+    
+    border-width: 1rpx;
+    border-style: none;
+    border-color: var(--ui-BG-Main);
+    
+    &--normal {
+      display: inline-flex;
+      align-items: center;
+    }
+    &--ellipsis {
+      display: inline-block;
+      overflow: hidden;
+      white-space: nowrap !important;
+      text-overflow: ellipsis;
+    }
+    
+    &--shrink {
+      flex-shrink: 0;
+    }
+    &--grow {
+      flex-grow: 1;
+    }
+    
+    &--left {
+      justify-content: flex-start;
+    }
+    &--center {
+      justify-content: center;
+    }
+    &--right {
+      justify-content: flex-end;
+    }
+    
+    &__text {
+      &--left {
+        text-align: left;
+      }
+      &--center {
+        text-align: center;
+      }
+      &--right {
+        text-align: right;
+      }
+    }
+    
+    &--hidden {
+      visibility: hidden;
+    }
+  }
+</style>
diff --git a/pages/worker/levelList/components/table-tr.vue b/pages/worker/levelList/components/table-tr.vue
new file mode 100644
index 0000000..2b12c95
--- /dev/null
+++ b/pages/worker/levelList/components/table-tr.vue
@@ -0,0 +1,208 @@
+<template>
+  <view class="tn-tr-class tn-tr" :class="[trClass]" :style="[trStyle]">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'table-tr',
+    options: {
+    	// 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现(不会出现shadow节点下再去创建元素)
+    	virtualHost: true
+    },
+    props: {
+      // 宽度
+      width: {
+        type: [String, Number],
+        default: ''
+      },
+      // 边框颜色
+      borderColor: {
+        type: String,
+        default: ''
+      },
+      // 边框宽度
+      borderWidth: {
+        type: [String, Number],
+        default: ''
+      },
+      // 左边框
+      borderLeft: {
+        type: Boolean,
+        default: false
+      },
+      // 上边框
+      borderTop: {
+        type: Boolean,
+        default: false
+      },
+      // 换行显示
+      wrap: {
+        type: Boolean,
+        default: false
+      },
+      // 固定表格
+      fixed: {
+        type: Boolean,
+        default: false
+      },
+      // left偏移值
+      left: {
+        type: [String, Number],
+        default: 0
+      },
+      // right偏移值
+      right: {
+        type: [String, Number],
+        default: 0
+      },
+      // top偏移值(自定义顶部导航栏时用到)
+      top: {
+        type: [String, Number],
+        default: 0
+      },
+      // 外边距
+      margin: {
+        type: String,
+        default: ''
+      },
+      // zIndex
+      zIndex: {
+        type: Number,
+        default: 0
+      },
+      // 行数索引
+      index: {
+        type: [String, Number],
+        default: 0
+      },
+      // 参数
+      params: {
+        type: String,
+        default: ''
+      }
+    },
+    computed: {
+      borderWidthValue() {
+        return this.borderWidth || this.parentData.borderWidth || ''
+      },
+      borderColorValue() {
+        return this.borderColor || this.parentData.borderColor || ''
+      },
+      trClass() {
+        let clazz = ''
+        /* if (this.backgroundColorClass) {
+          clazz += ` ${this.backgroundColorClass}`
+        }
+        if (this.fontColorClass) {
+          clazz += ` ${this.fontColorClass}`
+        } */
+        if (this.wrap) {
+          clazz += ' tn-tr--wrap'
+        }
+        if (this.fixed) {
+          clazz += ' tn-tr--fixed'
+        }
+        return clazz
+      },
+      trStyle() {
+        let style = {}
+        if (this.width) {
+          style.width = this.width + 'rpx'
+        }
+        /* if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        if (this.fontColorStyle) {
+          style.color = this.fontColorStyle
+        }
+        if (this.fontSizeStyle) {
+          style.fontSize = this.fontSizeStyle
+        } */
+        if (this.borderWidth !== '' || this.parentData.borderWidth !== '') {
+          style.borderWidth = this.borderWidth !== '' ? this.borderWidth + 'rpx' : this.parentData.borderWidth + 'rpx'
+        }
+        if (this.borderColor || this.parentData.borderColor) {
+          style.borderColor = this.borderColor || this.parentData.borderColor
+        }
+        if (this.borderLeft) {
+          style.borderLeftStyle = 'solid'
+        }
+        if (this.borderTop) {
+          style.borderTopStyle = 'solid'
+        }
+        if (this.fixed) {
+          style.left = this.left ? this.left + 'rpx' : 'auto'
+          style.right = this.right ? this.right + 'rpx' : 'auto'
+          style.top = this.top ? this.top + 'rpx' : 'auto'
+        }
+        if (this.margin) {
+          style.margin = this.margin
+        }
+        style.zIndex = this.zIndex ? this.zIndex : 1000
+        return style
+      }
+    },
+    data() {
+      return {
+        parentData: {
+          borderColor: null,
+          borderWidth: null
+        }
+      }
+    },
+    watch: {
+      parentData: {
+        handler() {
+          // 更新子组件的数据
+          if (this.children.length) {
+            this.children.map((child) => {
+              typeof(child.updateParentData) === 'function' && child.updateParentData()
+            })
+          }
+        },
+        deep: true
+      }
+    },
+    created() {
+      this.children = []
+      this.parent = false
+      this.updateParentData()
+      this.parent && this.parent.children.push(this)
+    },
+    methods: {
+      handleClick() {
+        this.$emit('click', {
+          index: this.index,
+          params: this.params
+        })
+      },
+      // 更新父组件信息
+      updateParentData() {
+        this.getParentData('tn-table')
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-tr {
+    width: 100%;
+    display: flex;
+    box-sizing: border-box;
+    background-color: #FFFFFF;
+    
+    border-width: 1rpx;
+    border-style: none none solid none;
+    border-color: var(--ui-BG-Main);;
+    
+    &--wrap {
+      flex-wrap: wrap;
+    }
+    
+    &--fixed {
+      position: fixed;
+    }
+  }
+</style>
diff --git a/pages/worker/levelList/index.vue b/pages/worker/levelList/index.vue
new file mode 100644
index 0000000..7737e8b
--- /dev/null
+++ b/pages/worker/levelList/index.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<layout ref="skill" title="技能管理"></layout>
+		
+		<s-menu-tools />
+	</view>
+</template>
+
+<script>
+	import layout from '@/pages/worker/levelList/components/layout.vue';
+	export default {
+		components: {
+			layout,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		onLoad(options) {
+			var id = options.id;
+			this.$nextTick(() => {
+				this.$refs.skill.initData(id);
+			});
+		},
+		created() {
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fff;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/worker/workerList/components/layout.vue b/pages/worker/workerList/components/layout.vue
new file mode 100644
index 0000000..ff333ca
--- /dev/null
+++ b/pages/worker/workerList/components/layout.vue
@@ -0,0 +1,115 @@
+<!-- 虚拟列表演示(不使用内置列表)(vue) -->
+<!-- 写法较简单，在页面中对当前需要渲染的虚拟列表数据进行for循环，在vue3中兼容性良好 -->
+<!-- 在各平台兼容性请查阅https://z-paging.zxlee.cn/module/virtual-list.html -->
+<template>
+	<view class="content">
+		<!-- 如果页面中的cell高度是固定不变的，则不需要设置cell-height-mode，如果页面中高度是动态改变的，则设置cell-height-mode="dynamic" -->
+		<!-- 原先的v-model修改为@virtualListChange="virtualListChange"并赋值处理后的虚拟列表 -->
+		<z-paging ref="paging" use-virtual-list :force-close-inner-list="true" :paging-style="{ paddingTop: 0 + 'px', paddingBottom: paddingBottom + 'rpx' }" cell-height-mode="dynamic" @scroll="scroll" @virtualListChange="virtualListChange" @query="queryList">
+			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+			<template #top>
+				<su-navbar :title="title" statusBar></su-navbar>
+			</template>  
+			   
+			<!-- :id="`zp-id-${item.zp_index}`"和:key="item.zp_index" 必须写，必须写！！！！ -->
+			<!-- 这里for循环的index不是数组中真实的index了，请使用item.zp_index获取真实的index -->
+			<worker-list :virtualList="virtualList"></worker-list>
+			
+			<template #bottom>
+				<view class="bottom-box">
+					<view class="btn" @click="addWorker">添加</view>
+				</view>
+			</template>  
+			
+		</z-paging>
+		
+	</view>
+</template>
+
+<script>
+	import WorkerList from '@/pages/worker/workerList/components/workerList.vue';
+	import ClerkApi from '@/sheep/api/worker/clerk';
+	export default {
+		components: {
+			WorkerList,
+		}, 
+		props: {
+			title: {
+				type: String,
+				default: '',
+			}
+		},
+		data() {
+			return {
+				// 虚拟列表数组，通过@virtualListChange监听获得最新数组
+				virtualList: [],
+				scrollTop: 0,
+				paddingTop: 0,
+				paddingBottom: 0,
+				height: 0,
+				
+				current: 0,
+			}
+		},
+		methods: {
+			initNav(e) {
+				this.height = e.height;
+				this.paddingTop = this.height;
+			},
+			scroll(e) {
+				this.scrollTop = e.detail.scrollTop;
+			},
+			// 监听虚拟列表数组改变并赋值给virtualList进行重新渲染
+			virtualListChange(vList) {
+				this.virtualList = vList;
+			},
+			queryList(pageNo, pageSize) {
+				// 组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+				// 这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+				// 模拟请求服务器获取分页数据，请替换成自己的网络请求
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+				}
+				ClerkApi.getClerkApplyPage(params).then(res => {
+					// 将请求的结果数组传递给z-paging
+					this.$refs.paging.complete(res.data.list);
+				}).catch(res => {
+					// 如果请求失败写this.$refs.paging.complete(false);
+					// 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+					// 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+					this.$refs.paging.complete(false);
+				})
+			},
+			addWorker() {
+				this.$u.route({
+					url: 'pages/clerk/apply/index',
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bottom-box {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 7px 15px;
+		background-color: #fff;
+		box-shadow: 0 0 6px 0 #ccc;
+		
+		.btn {
+			background-color: var(--ui-BG-Main);
+			padding: 10px;
+			border-radius: 40px;
+			color: #fff;
+			display: flex;
+			flex: 1;
+			justify-content: center;
+			align-items: center;
+			font-size: 28rpx;
+		}
+		
+	}
+</style>
diff --git a/pages/worker/workerList/components/workerList.vue b/pages/worker/workerList/components/workerList.vue
new file mode 100644
index 0000000..c3292e9
--- /dev/null
+++ b/pages/worker/workerList/components/workerList.vue
@@ -0,0 +1,208 @@
+<template>
+	  <view class="worker-box">
+		  
+		  <view :id="`zp-id-${item.zp_index}`" :key="item.zp_index" v-for="(item,index) in virtualList" class="worker-card">
+		  		
+		  		<view class="main-box">
+					<view class="avatar-box">
+						<u-avatar mode="square" size="120" :src="item.avatar"></u-avatar>
+						<view class="online-box" v-if="item.onlineStatus">在线</view>
+						<view class="online-box" v-else>离线</view>
+					</view>
+		  			
+		  			<view class="right-box">
+		  				<view class="nickname-box">
+		  					<view class="nickname">
+								<text class="name">{{item.nickname}}</text>
+								<view class="man-box" v-if="item.sex == 0">
+									<u-icon name="man"></u-icon>
+									<text>{{item.age}}</text>
+								</view>
+								<view class="woman-box" v-if="item.sex == 1">
+									<u-icon name="woman"></u-icon>
+									<text>{{item.age}}</text>
+								</view>
+							</view>
+							<view class="status" v-if="item.status == 0">待审核</view>
+							<view class="status" v-if="item.status == 1">已审核</view>
+		  				</view>
+						
+						<view class="btn-box">
+							<view class="btn" @click="editApply(item)">编辑资料</view>
+							<view class="btn" @click="levelList(item)">技能管理</view>
+							<view class="btn" @click="setOnline(item)">在线状态</view>
+						</view>
+		  				
+		  			</view>
+		  		</view>
+		  		
+		  </view>
+		  
+	  </view>
+  
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			virtualList: {
+				type: Array,
+				default: [],
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			editApply(e) {
+				this.$u.route({
+					url: 'pages/clerk/apply/edit',
+					params: {
+						id: e.id,
+					}
+				});
+			},
+			levelList(e) {
+				this.$u.route({
+					url: 'pages/worker/levelList/index',
+					params: {
+						id: e.id,
+					}
+				});
+			},
+			setOnline(e) {
+				this.$u.route({
+					url: 'pages/worker/workerList/set',
+					params: {
+						id: e.id,
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.worker-box {
+		padding: 0 10px;
+	}
+	
+	.worker-card {
+		padding: 10px;
+		margin-top: 10px;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		border-radius: 10px;
+		
+		.main-box {
+			display: flex;
+			align-items: center;
+			
+			.avatar-box {
+				position: relative;
+				width: 120rpx;
+				height: 120rpx;
+				
+				.online-box {
+					position: absolute;
+					bottom: 0;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					width: 100%;
+					color: #fff;
+					background-color: var(--ui-BG-Main);
+					font-size: 11px;
+					padding: 1px 0;
+					border-bottom-left-radius: 5px;
+					border-bottom-right-radius: 5px;
+				}
+			}
+			
+			.right-box {
+				display: flex;
+				flex: 1;
+				flex-direction: column;
+				margin-left: 10px;
+				
+				.nickname-box {
+					display: flex;
+					justify-content: space-between;
+					flex: 1;
+					align-items: center;
+				}
+				
+				.nickname {
+					display: flex;
+					align-items: center;
+					
+					.name {
+						font-size: 28rpx;
+						font-weight: bold;
+						margin-right: 5px;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						max-width: 300rpx;
+						overflow: hidden;
+					}
+				}
+				
+				.man-box {
+					background: linear-gradient(90deg,#2b99ca,#87b5e7);
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border-radius: 40px;
+					color: #fff;
+					font-size: 20rpx;
+					padding: 1px 5px;
+				}
+				
+				.woman-box {
+					background: linear-gradient(90deg,#c33239,#de8189);
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border-radius: 40px;
+					color: #fff;
+					font-size: 20rpx;
+					padding: 1px 5px;
+				}
+				
+				.status {
+					font-size: 24rpx;
+					font-weight: bold;
+					color: var(--ui-BG-Main);
+				}
+				
+				.btn-box {
+					display: flex;
+					justify-content: flex-end;
+					
+					.btn {
+						background-color: var(--ui-BG-Main);
+						color: #fff;
+						border-radius: 40px;
+						font-size: 22rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						padding: 10rpx 20rpx;
+						margin-left: 5px;
+						margin-top: 20rpx;
+					}
+				}
+				
+				
+			}
+		}
+		
+	}
+</style>
\ No newline at end of file
diff --git a/pages/worker/workerList/index.vue b/pages/worker/workerList/index.vue
new file mode 100644
index 0000000..37b091f
--- /dev/null
+++ b/pages/worker/workerList/index.vue
@@ -0,0 +1,40 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<layout title="达人列表"></layout>
+		
+		<s-menu-tools />
+		<s-auth-modal />
+	</view>
+</template>
+
+<script>
+	import layout from '@/pages/worker/workerList/components/layout.vue';
+	export default {
+		components: {
+			layout,
+		},
+		props: {
+			
+		},
+		data() {
+			return {
+				
+			}
+		},
+		created() {
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fafafa;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/worker/workerList/set.vue b/pages/worker/workerList/set.vue
new file mode 100644
index 0000000..e4f5d72
--- /dev/null
+++ b/pages/worker/workerList/set.vue
@@ -0,0 +1,148 @@
+<template>
+	<view class="page-app theme-light main-green font-1">
+		<su-navbar title="在线状态" statusBar></su-navbar>
+		<view class="form-card">
+			<view class="form-item">
+				<view class="label">接单时间段</view>
+				<view class="input">
+					<u-input input-align="right" placeholder="例如:8:00 - 21:00" v-model="form.onlineTime"></u-input>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="label">当前在线状态</view>
+				<view class="input">
+					<u-switch size="46" v-model="form.onlineStatus"></u-switch>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="label">盲盒订单提醒</view>
+				<view class="input">
+					<u-switch size="46" v-model="form.blindStatus"></u-switch>
+				</view>
+			</view>
+			
+			<view class="btn-box">
+				<view class="btn" @click="saveApply">保存</view>
+			</view>
+		</view>
+		
+		<s-menu-tools />
+	</view>
+</template>
+
+<script>
+	import sheep from '@/sheep';
+	import ClerkApi from '@/sheep/api/worker/clerk'; 
+	export default {
+		data() {
+			return {
+				show: false,
+				form: {
+					id: 0,
+					onlineTime: '',
+					onlineStatus: false,
+					blindStatus: false,
+				},
+				list: [
+					[
+						{
+							value: '8',
+							label: '8:00'
+						},
+						{
+							value: '9',
+							label: '9:00'
+						}
+					],
+					[
+						{
+							value: '8',
+							label: '8:00'
+						},
+						{
+							value: '9',
+							label: '9:00'
+						}
+					],
+					
+				],
+			}
+		},
+		onLoad(options) {
+			this.form.id = options.id;
+			this.init();  
+		},
+		methods: {
+			init() {
+				ClerkApi.getClerkApply(this.form.id).then((res) => {
+					this.form = res.data;
+				});
+			},
+			confirm(e) {
+				if(e[0].value >= e[1].value){
+					sheep.$helper.toast('开始时间不能大于结束时间');
+					return;
+				}
+				this.form.onlineTime = e[0].label+' - '+e[1].label;
+			},
+			timeSet() {
+				this.show = true;
+			},
+			saveApply() {
+				if(!this.form.onlineTime){
+					sheep.$helper.toast('请输入接单时间段');
+					return;
+				}
+				ClerkApi.updateOnlineStatus(this.form).then((res) => {
+					
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-app {
+		background-color: #fafafa;
+		padding-bottom: 140rpx;
+		height: calc(100vh);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	.form-card {
+		background-color: #fff;
+		margin: 10px;
+		padding: 15px;
+		border-radius: 10px;
+		
+		.form-item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-bottom: 15px;
+			
+			.label {
+				font-size: 24rpx;
+			}
+		}
+		
+		.btn-box {
+				display: flex;
+				justify-content: center;
+				margin-top: 40px;
+					
+				.btn {
+					background-color: var(--ui-BG-Main);
+					color: #fff;
+					font-size: 24rpx;
+					min-width: 75%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border-radius: 40px;
+					padding: 10px 0;
+				}
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/sheep/api/im/memberConversation.js b/sheep/api/im/memberConversation.js
new file mode 100644
index 0000000..17bb4a7
--- /dev/null
+++ b/sheep/api/im/memberConversation.js
@@ -0,0 +1,80 @@
+import request from '@/sheep/request';
+
+const ImConversationApi = {
+  // 获得会话列表
+  getMemberConversationPage: (params) => {
+    return request({
+      url: '/im/member-conversation/page',
+      method: 'GET',
+      params,
+      custom: {
+        auth: true,
+        showLoading: false,
+      },
+    });
+  },
+  getRandomMemberConversation: () => {
+    return request({
+      url: '/im/member-conversation/getRandom',
+      method: 'GET',
+      custom: {
+        auth: true,
+        showLoading: false,
+      },
+    });
+  },
+  // 创建会话
+  createMemberConversation: (data) => {
+    return request({
+      url: '/im/member-conversation/create',
+      method: 'POST',
+      data,
+      custom: {
+		auth: true,
+		showLoading: false,
+      },
+    });
+  },
+  // 删除会话
+  deleteMemberConversation: (id) => {
+    return request({
+      url: '/im/member-conversation/delete',
+      method: 'DELETE',
+      params: {
+		  id
+	  },
+      custom: {
+  		auth: true,
+  		showLoading: false,
+      },
+    });
+  },
+  // 拉黑
+  slashedMemberConversation: (id) => {
+    return request({
+      url: '/im/member-conversation/slashed',
+      method: 'DELETE',
+      params: {
+  		  id
+  	  },
+      custom: {
+  		auth: true,
+  		showLoading: false,
+      },
+    });
+  },
+  // 置顶会话
+  pinnedMemberConversation: (data) => {
+    return request({
+      url: '/im/member-conversation/pinned',
+      method: 'PUT',
+      data,
+      custom: {
+  		auth: true,
+  		showLoading: false,
+      },
+    });
+  },
+};
+
+export default ImConversationApi;
diff --git a/sheep/api/im/memberMessage.js b/sheep/api/im/memberMessage.js
new file mode 100644
index 0000000..f10bb64
--- /dev/null
+++ b/sheep/api/im/memberMessage.js
@@ -0,0 +1,44 @@
+import request from '@/sheep/request';
+
+const ImMessageApi = {
+  // 获得消息列表
+  getMemberMessagePage: (params) => {
+    return request({
+      url: '/im/member-message/page',
+      method: 'GET',
+      params,
+      custom: {
+        auth: true,
+        showLoading: false,
+      },
+    });
+  },
+  // 更新消息已读
+  updateReadStatus: (messageId) => {
+    return request({
+      url: '/im/member-message/update-read-status',
+      method: 'POST',
+      params: { messageId },
+	  custom: {
+	    auth: true,
+	    showLoading: false,
+	  },
+    });
+  },
+  // 发送消息
+  sendImMessage: (data) => {
+    return request({
+      url: '/im/member-message/send',
+      method: 'POST',
+      data,
+      custom: {
+		auth: true,
+		showLoading: false,
+		showSuccess: false,
+		successMsg: '保存成功'
+      },
+    });
+  },
+};
+
+export default ImMessageApi;
diff --git a/sheep/api/infra/file.js b/sheep/api/infra/file.js
new file mode 100644
index 0000000..f7f2a96
--- /dev/null
+++ b/sheep/api/infra/file.js
@@ -0,0 +1,45 @@
+import { baseUrl, apiPath, tenantId } from '@/sheep/config';
+
+const FileApi = {
+  // 上传文件
+  uploadFile: (file) => {
+    // TODO 芋艿：访问令牌的接入；
+    const token = uni.getStorageSync('token');
+    uni.showLoading({
+      title: '上传中',
+    });
+    return new Promise((resolve, reject) => {
+      uni.uploadFile({
+        url: baseUrl + apiPath + '/infra/file/upload',
+        filePath: file,
+        name: 'file',
+        header: {
+          // Accept: 'text/json',
+          Accept: '*/*',
+          'tenant-id': tenantId,
+          // Authorization:  'Bearer test247',
+        },
+        success: (uploadFileRes) => {
+          let result = JSON.parse(uploadFileRes.data);
+          if (result.error === 1) {
+            uni.showToast({
+              icon: 'none',
+              title: result.msg,
+            });
+          } else {
+            return resolve(result);
+          }
+        },
+        fail: (error) => {
+          console.log('上传失败：', error);
+          return resolve(false);
+        },
+        complete: () => {
+          uni.hideLoading();
+        },
+      });
+    });
+  },
+};
+
+export default FileApi;
diff --git a/sheep/api/member/address.js b/sheep/api/member/address.js
new file mode 100644
index 0000000..d0c16ce
--- /dev/null
+++ b/sheep/api/member/address.js
@@ -0,0 +1,53 @@
+import request from '@/sheep/request';
+
+const AddressApi = {
+  // 获得用户收件地址列表
+  getAddressList: () => {
+    return request({
+      url: '/member/address/list',
+      method: 'GET'
+    });
+  },
+  // 创建用户收件地址
+  createAddress: (data) => {
+    return request({
+      url: '/member/address/create',
+      method: 'POST',
+      data,
+      custom: {
+        showSuccess: true,
+        successMsg: '保存成功'
+      },
+    });
+  },
+  // 更新用户收件地址
+  updateAddress: (data) => {
+    return request({
+      url: '/member/address/update',
+      method: 'PUT',
+      data,
+      custom: {
+        showSuccess: true,
+        successMsg: '更新成功'
+      },
+    });
+  },
+  // 获得用户收件地址
+  getAddress: (id) => {
+    return request({
+      url: '/member/address/get',
+      method: 'GET',
+      params: { id }
+    });
+  },
+  // 删除用户收件地址
+  deleteAddress: (id) => {
+    return request({
+      url: '/member/address/delete',
+      method: 'DELETE',
+      params: { id }
+    });
+  },
+};
+
+export default AddressApi;
diff --git a/sheep/api/member/auth.js b/sheep/api/member/auth.js
new file mode 100644
index 0000000..a1c0660
--- /dev/null
+++ b/sheep/api/member/auth.js
@@ -0,0 +1,132 @@
+import request from '@/sheep/request';
+
+const AuthUtil = {
+  // 使用手机 + 密码登录
+  login: (data) => {
+    return request({
+      url: '/member/auth/login',
+      method: 'POST',
+      data,
+      custom: {
+        showSuccess: true,
+        loadingMsg: '登录中',
+        successMsg: '登录成功',
+      },
+    });
+  },
+  // 使用手机 + 验证码登录
+  smsLogin: (data) => {
+    return request({
+      url: '/member/auth/sms-login',
+      method: 'POST',
+      data,
+      custom: {
+        showSuccess: true,
+        loadingMsg: '登录中',
+        successMsg: '登录成功',
+      },
+    });
+  },
+  // 发送手机验证码
+  sendSmsCode: (mobile, scene) => {
+    return request({
+      url: '/member/auth/send-sms-code',
+      method: 'POST',
+      data: {
+        mobile,
+        scene,
+      },
+      custom: {
+        loadingMsg: '发送中',
+        showSuccess: true,
+        successMsg: '发送成功',
+      },
+    });
+  },
+  // 登出系统
+  logout: () => {
+    return request({
+      url: '/member/auth/logout',
+      method: 'POST',
+    });
+  },
+  // 刷新令牌
+  refreshToken: (refreshToken) => {
+    return request({
+      url: '/member/auth/refresh-token',
+      method: 'POST',
+      params: {
+        refreshToken
+      },
+      custom: {
+        loading: false, // 不用加载中
+        showError: false, // 不展示错误提示
+      },
+    });
+  },
+  // 社交授权的跳转
+  socialAuthRedirect: (type, redirectUri) => {
+    return request({
+      url: '/member/auth/social-auth-redirect',
+      method: 'GET',
+      params: {
+        type,
+        redirectUri,
+      },
+      custom: {
+        showSuccess: true,
+        loadingMsg: '登陆中',
+      },
+    });
+  },
+  // 社交快捷登录
+  socialLogin: (type, code, state) => {
+    return request({
+      url: '/member/auth/social-login',
+      method: 'POST',
+      data: {
+        type,
+        code,
+        state,
+      },
+      custom: {
+        showSuccess: true,
+        loadingMsg: '登陆中',
+      },
+    });
+  },
+  // 微信小程序的一键登录
+  weixinMiniAppLogin: (phoneCode, loginCode, state) => {
+    return request({
+      url: '/member/auth/weixin-mini-app-login',
+      method: 'POST',
+      data: {
+        phoneCode,
+        loginCode,
+        state
+      },
+      custom: {
+        showSuccess: true,
+        loadingMsg: '登陆中',
+        successMsg: '登录成功',
+      },
+    });
+  },
+  // 创建微信 JS SDK 初始化所需的签名
+  createWeixinMpJsapiSignature: (url) => {
+    return request({
+      url: '/member/auth/create-weixin-jsapi-signature',
+      method: 'POST',
+      params: {
+        url
+      },
+      custom: {
+        showError: false,
+        showLoading: false,
+      },
+    })
+  },
+  //
+};
+
+export default AuthUtil;
diff --git a/sheep/api/member/point.js b/sheep/api/member/point.js
new file mode 100644
index 0000000..188ffd4
--- /dev/null
+++ b/sheep/api/member/point.js
@@ -0,0 +1,19 @@
+import request from '@/sheep/request';
+
+const PointApi = {
+  // 获得用户积分记录分页
+  getPointRecordPage: (params) => {
+    if (params.addStatus === undefined) {
+      delete params.addStatus
+    }
+    const queryString = Object.keys(params)
+      .map((key) => encodeURIComponent(key) + '=' + params[key])
+      .join('&');
+    return request({
+      url: `/member/point/record/page?${queryString}`,
+      method: 'GET',
+    });
+  }
+};
+
+export default PointApi;
diff --git a/sheep/api/member/signin.js b/sheep/api/member/signin.js
new file mode 100644
index 0000000..35169ef
--- /dev/null
+++ b/sheep/api/member/signin.js
@@ -0,0 +1,37 @@
+import request from '@/sheep/request';
+
+const SignInApi = {
+  // 获得签到规则列表
+  getSignInConfigList: () => {
+    return request({
+      url: '/member/sign-in/config/list',
+      method: 'GET',
+    });
+  },
+  // 获得个人签到统计
+  getSignInRecordSummary: () => {
+    return request({
+      url: '/member/sign-in/record/get-summary',
+      method: 'GET',
+    });
+  },
+  // 签到
+  createSignInRecord: () => {
+    return request({
+      url: '/member/sign-in/record/create',
+      method: 'POST',
+    });
+  },
+  // 获得签到记录分页
+  getSignRecordPage: (params) => {
+    const queryString = Object.keys(params)
+      .map((key) => encodeURIComponent(key) + '=' + params[key])
+      .join('&');
+    return request({
+      url: `/member/sign-in/record/page?${queryString}`,
+      method: 'GET',
+    });
+  },
+};
+
+export default SignInApi;
\ No newline at end of file
diff --git a/sheep/api/member/social.js b/sheep/api/member/social.js
new file mode 100644
index 0000000..14e6edf
--- /dev/null
+++ b/sheep/api/member/social.js
@@ -0,0 +1,76 @@
+import request from '@/sheep/request';
+
+const SocialApi = {
+  // 获得社交用户
+  getSocialUser: (type) => {
+    return request({
+      url: '/member/social-user/get',
+      method: 'GET',
+      params: {
+        type
+      },
+      custom: {
+        showLoading: false,
+      },
+    });
+  },
+  // 社交绑定
+  socialBind: (type, code, state) => {
+    return request({
+      url: '/member/social-user/bind',
+      method: 'POST',
+      data: {
+        type,
+        code,
+        state
+      },
+      custom: {
+        custom: {
+          showSuccess: true,
+          loadingMsg: '绑定中',
+          successMsg: '绑定成功',
+        },
+      },
+    });
+  },
+  // 社交绑定
+  socialUnbind: (type, openid) => {
+    return request({
+      url: '/member/social-user/unbind',
+      method: 'DELETE',
+      data: {
+        type,
+        openid
+      },
+      custom: {
+        showLoading: false,
+        loadingMsg: '解除绑定',
+        successMsg: '解绑成功',
+      },
+    });
+  },
+  // 获取订阅消息模板列表
+  getSubscribeTemplateList: () =>
+    request({
+      url: '/member/social-user/get-subscribe-template-list',
+      method: 'GET',
+      custom: {
+        showError: false,
+        showLoading: false,
+      },
+    }),
+  // 获取微信小程序码
+  getWxaQrcode: async (path, query) => {
+    return await request({
+      url: '/member/social-user/wxa-qrcode',
+      method: 'POST',
+      data: {
+        scene: query,
+        path,
+        checkPath: false, // TODO 开发环境暂不检查 path 是否存在
+      },
+    });
+  },
+};
+
+export default SocialApi;
\ No newline at end of file
diff --git a/sheep/api/member/user.js b/sheep/api/member/user.js
new file mode 100644
index 0000000..671324c
--- /dev/null
+++ b/sheep/api/member/user.js
@@ -0,0 +1,166 @@
+import request from '@/sheep/request';
+
+const UserApi = {
+	// 获取会员列表
+	getUserPage: (params) => {
+	  return request({
+		url: '/member/user/page',
+		method: 'GET',
+		params,
+		custom: {
+		  auth: false,
+		  showLoading: false,
+		},
+	  });
+	},
+  // 获得基本信息
+  getUserInfo: () => {
+    return request({
+      url: '/member/user/get',
+      method: 'GET',
+      custom: {
+        showLoading: false,
+        auth: true,
+      },
+    });
+  },
+  // 获得榜单信息
+  getWeekTopList: () => {
+    return request({
+      url: '/member/user/getWeekTopList',
+      method: 'GET',
+      custom: {
+        auth: false,
+        showLoading: false,
+      },
+    });
+  },
+  // 获得首页信息
+  getHomeData: () => {
+    return request({
+      url: '/member/user/getHomeData',
+      method: 'GET',
+      custom: {
+        auth: false,
+        showLoading: false,
+      },
+    });
+  },
+  // 获得基本信息
+  getUserInfoById: (id) => {
+    return request({
+      url: '/member/user/getByUserId',
+      method: 'GET',
+	  params: { id },
+      custom: {
+        showLoading: false,
+        auth: false,
+      },
+    });
+  },
+  // 交换名片
+  getQrcodeByUserId: (id) => {
+    return request({
+      url: '/member/user/getQrcodeByUserId',
+      method: 'GET',
+  	  params: { id },
+      custom: {
+        showLoading: false,
+        auth: true,
+      },
+    });
+  },
+  // 判断是否关注公众号
+  getQrcode: () => {
+    return request({
+      url: '/mp/user/getQrcode',
+      method: 'GET',
+      custom: {
+        showLoading: false,
+        auth: true,
+      },
+    });
+  },
+  // 修改基本信息
+  updateUser: (data) => {
+    return request({
+      url: '/member/user/update',
+      method: 'PUT',
+      data,
+      custom: {
+        auth: true,
+        showSuccess: true,
+        successMsg: '更新成功'
+      },
+    });
+  },
+  // 首页置顶
+  slashed: () => {
+    return request({
+      url: '/member/user/slashed',
+      method: 'PUT',
+      custom: {
+        auth: true,
+        showSuccess: true,
+        successMsg: '置顶成功'
+      },
+    });
+  },
+  // 修改用户手机
+  updateUserMobile: (data) => {
+    return request({
+      url: '/member/user/update-mobile',
+      method: 'PUT',
+      data,
+      custom: {
+        loadingMsg: '验证中',
+        showSuccess: true,
+        successMsg: '修改成功'
+      },
+    });
+  },
+  // 基于微信小程序的授权码，修改用户手机
+  updateUserMobileByWeixin: (code) => {
+    return request({
+      url: '/member/user/update-mobile-by-weixin',
+      method: 'PUT',
+      data: {
+        code
+      },
+      custom: {
+        showSuccess: true,
+        loadingMsg: '获取中',
+        successMsg: '修改成功'
+      },
+    });
+  },
+  // 修改密码
+  updateUserPassword: (data) => {
+    return request({
+      url: '/member/user/update-password',
+      method: 'PUT',
+      data,
+      custom: {
+        loadingMsg: '验证中',
+        showSuccess: true,
+        successMsg: '修改成功'
+      },
+    });
+  },
+  // 重置密码
+  resetUserPassword: (data) => {
+    return request({
+      url: '/member/user/reset-password',
+      method: 'PUT',
+      data,
+      custom: {
+        loadingMsg: '验证中',
+        showSuccess: true,
+        successMsg: '修改成功'
+      }
+    });
+  },
+
+};
+
+export default UserApi;
diff --git a/sheep/api/migration/app.js b/sheep/api/migration/app.js
new file mode 100644
index 0000000..158414f
--- /dev/null
+++ b/sheep/api/migration/app.js
@@ -0,0 +1,21 @@
+import request from '@/sheep/request';
+
+// TODO 芋艿：小程序直播还不支持
+export default {
+  //小程序直播
+  mplive: {
+    getRoomList: (ids) =>
+      request({
+        url: 'app/mplive/getRoomList',
+        method: 'GET',
+        params: {
+          ids: ids.join(','),
+        }
+      }),
+    getMpLink: () =>
+      request({
+        url: 'app/mplive/getMpLink',
+        method: 'GET'
+      }),
+  },
+};
diff --git a/sheep/api/migration/index.js b/sheep/api/migration/index.js
new file mode 100644
index 0000000..31a85ef
--- /dev/null
+++ b/sheep/api/migration/index.js
@@ -0,0 +1,10 @@
+const files = import.meta.glob('./*.js', { eager: true });
+let api = {};
+Object.keys(files).forEach((key) => {
+  api = {
+    ...api,
+    [key.replace(/(.*\/)*([^.]+).*/gi, '$2')]: files[key].default,
+  };
+});
+
+export default api;
\ No newline at end of file
diff --git a/sheep/api/migration/third.js b/sheep/api/migration/third.js
new file mode 100644
index 0000000..325638c
--- /dev/null
+++ b/sheep/api/migration/third.js
@@ -0,0 +1,18 @@
+import request from '@/sheep/request';
+
+export default {
+  // 苹果相关
+  apple: {
+    // 第三方登录
+    login: (data) =>
+      request({
+        url: 'third/apple/login',
+        method: 'POST',
+        data,
+        custom: {
+          showSuccess: true,
+          loadingMsg: '登陆中',
+        },
+      }),
+  },
+};
diff --git a/sheep/api/pay/channel.js b/sheep/api/pay/channel.js
new file mode 100644
index 0000000..4e7bfc5
--- /dev/null
+++ b/sheep/api/pay/channel.js
@@ -0,0 +1,14 @@
+import request from '@/sheep/request';
+
+const PayChannelApi = {
+  // 获得指定应用的开启的支付渠道编码列表
+  getEnableChannelCodeList: (appId) => {
+    return request({
+      url: '/pay/channel/get-enable-code-list',
+      method: 'GET',
+      params: { appId }
+    });
+  },
+};
+
+export default PayChannelApi;
diff --git a/sheep/api/pay/order.js b/sheep/api/pay/order.js
new file mode 100644
index 0000000..f985359
--- /dev/null
+++ b/sheep/api/pay/order.js
@@ -0,0 +1,22 @@
+import request from '@/sheep/request';
+
+const PayOrderApi = {
+  // 获得支付订单
+  getOrder: (id) => {
+    return request({
+      url: '/pay/order/get',
+      method: 'GET',
+      params: { id }
+    });
+  },
+  // 提交支付订单
+  submitOrder: (data) => {
+    return request({
+      url: '/pay/order/submit',
+      method: 'POST',
+      data
+    });
+  }
+};
+
+export default PayOrderApi;
diff --git a/sheep/api/pay/point.js b/sheep/api/pay/point.js
new file mode 100644
index 0000000..09c7a1d
--- /dev/null
+++ b/sheep/api/pay/point.js
@@ -0,0 +1,37 @@
+import request from '@/sheep/request';
+
+const PayPointApi = {
+  // 获得钱包充值套餐列表
+  getPointRechargePackageList: () => {
+    return request({
+      url: '/pay/point-recharge-package/list',
+      method: 'GET',
+      custom: {
+        showError: false,
+        showLoading: false,
+      },
+    });
+  },
+  // 创建钱包充值记录（发起充值）
+  createPointRecharge: (data) => {
+    return request({
+      url: '/pay/point-recharge/create',
+      method: 'POST',
+      data,
+    });
+  },
+  // 获得钱包充值记录分页
+  getPointRechargePage: (params) => {
+    return request({
+      url: '/pay/point-recharge/page',
+      method: 'GET',
+      params,
+      custom: {
+        showError: false,
+        showLoading: false,
+      },
+    });
+  },
+};
+
+export default PayPointApi;
diff --git a/sheep/api/pay/wallet.js b/sheep/api/pay/wallet.js
new file mode 100644
index 0000000..023902a
--- /dev/null
+++ b/sheep/api/pay/wallet.js
@@ -0,0 +1,68 @@
+import request from '@/sheep/request';
+
+const PayWalletApi = {
+  // 获取钱包
+  getPayWallet() {
+    return request({
+      url: '/pay/wallet/get',
+      method: 'GET',
+      custom: {
+        showLoading: false,
+        auth: true,
+      },
+    });
+  },
+  // 获得钱包流水分页
+  getWalletTransactionPage: (params) => {
+    const queryString = Object.keys(params)
+      .map((key) => encodeURIComponent(key) + '=' + params[key])
+      .join('&');
+    return request({
+      url: `/pay/wallet-transaction/page?${queryString}`,
+      method: 'GET',
+    });
+  },
+  // 获得钱包流水统计
+  getWalletTransactionSummary: (params) => {
+    const queryString = `createTime=${params.createTime[0]}&createTime=${params.createTime[1]}`;
+    return request({
+      url: `/pay/wallet-transaction/get-summary?${queryString}`,
+      // url: `/pay/wallet-transaction/get-summary`,
+      method: 'GET',
+      // params: params
+    });
+  },
+  // 获得钱包充值套餐列表
+  getWalletRechargePackageList: () => {
+    return request({
+      url: '/pay/wallet-recharge-package/list',
+      method: 'GET',
+      custom: {
+        showError: false,
+        showLoading: false,
+      },
+    });
+  },
+  // 创建钱包充值记录（发起充值）
+  createWalletRecharge: (data) => {
+    return request({
+      url: '/pay/wallet-recharge/create',
+      method: 'POST',
+      data,
+    });
+  },
+  // 获得钱包充值记录分页
+  getWalletRechargePage: (params) => {
+    return request({
+      url: '/pay/wallet-recharge/page',
+      method: 'GET',
+      params,
+      custom: {
+        showError: false,
+        showLoading: false,
+      },
+    });
+  },
+};
+
+export default PayWalletApi;
diff --git a/sheep/api/product/category.js b/sheep/api/product/category.js
new file mode 100644
index 0000000..3b6f8f0
--- /dev/null
+++ b/sheep/api/product/category.js
@@ -0,0 +1,21 @@
+import request from '@/sheep/request';
+
+const CategoryApi = {
+  // 查询分类列表
+  getCategoryList: () => {
+    return request({
+      url: '/product/category/list',
+      method: 'GET',
+    });
+  },
+  // 查询分类列表，指定编号
+  getCategoryListByIds: (ids) => {
+    return request({
+      url: '/product/category/list-by-ids',
+      method: 'GET',
+      params: { ids },
+    });
+  },
+};
+
+export default CategoryApi;
diff --git a/sheep/api/product/comment.js b/sheep/api/product/comment.js
new file mode 100644
index 0000000..2bbffd1
--- /dev/null
+++ b/sheep/api/product/comment.js
@@ -0,0 +1,22 @@
+import request from '@/sheep/request';
+
+const CommentApi = {
+  // 获得商品评价分页
+  getCommentPage: (spuId, pageNo, pageSize, type) => {
+    return request({
+      url: '/product/comment/page',
+      method: 'GET',
+      params: {
+        spuId,
+        pageNo,
+        pageSize,
+        type,
+      },
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    });
+  },
+};
+export default CommentApi;
diff --git a/sheep/api/product/favorite.js b/sheep/api/product/favorite.js
new file mode 100644
index 0000000..134c231
--- /dev/null
+++ b/sheep/api/product/favorite.js
@@ -0,0 +1,54 @@
+import request from '@/sheep/request';
+
+const FavoriteApi = {
+  // 获得商品收藏分页
+  getFavoritePage: (data) => {
+    return request({
+      url: '/product/favorite/page',
+      method: 'GET',
+      params: data,
+    });
+  },
+  // 检查是否收藏过商品
+  isFavoriteExists: (spuId) => {
+    return request({
+      url: '/product/favorite/exits',
+      method: 'GET',
+      params: {
+        spuId,
+      },
+    });
+  },
+  // 添加商品收藏
+  createFavorite: (spuId) => {
+    return request({
+      url: '/product/favorite/create',
+      method: 'POST',
+      data: {
+        spuId,
+      },
+      custom: {
+        auth: true,
+        showSuccess: true,
+        successMsg: '收藏成功',
+      },
+    });
+  },
+  // 取消商品收藏
+  deleteFavorite: (spuId) => {
+    return request({
+      url: '/product/favorite/delete',
+      method: 'DELETE',
+      data: {
+        spuId,
+      },
+      custom: {
+        auth: true,
+        showSuccess: true,
+        successMsg: '取消成功',
+      },
+    });
+  },
+};
+
+export default FavoriteApi;
diff --git a/sheep/api/product/history.js b/sheep/api/product/history.js
new file mode 100644
index 0000000..9ed53e3
--- /dev/null
+++ b/sheep/api/product/history.js
@@ -0,0 +1,39 @@
+import request from '@/sheep/request';
+
+const SpuHistoryApi = {
+  // 删除商品浏览记录
+  deleteBrowseHistory: (spuIds) => {
+    return request({
+      url: '/product/browse-history/delete',
+      method: 'DELETE',
+      data: { spuIds },
+      custom: {
+        showSuccess: true,
+        successMsg: '删除成功',
+      },
+    });
+  },
+  // 清空商品浏览记录
+  cleanBrowseHistory: () => {
+    return request({
+      url: '/product/browse-history/clean',
+      method: 'DELETE',
+      custom: {
+        showSuccess: true,
+        successMsg: '清空成功',
+      },
+    });
+  },
+  // 获得商品浏览记录分页
+  getBrowseHistoryPage: (data) => {
+    return request({
+      url: '/product/browse-history/page',
+      method: 'GET',
+      data,
+      custom: {
+        showLoading: false
+      },
+    });
+  },
+};
+export default SpuHistoryApi;
diff --git a/sheep/api/product/spu.js b/sheep/api/product/spu.js
new file mode 100644
index 0000000..3b84c1d
--- /dev/null
+++ b/sheep/api/product/spu.js
@@ -0,0 +1,41 @@
+import request from '@/sheep/request';
+
+const SpuApi = {
+  // 获得商品 SPU 列表
+  getSpuListByIds: (ids) => {
+    return request({
+      url: '/product/spu/list-by-ids',
+      method: 'GET',
+      params: { ids },
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    });
+  },
+  // 获得商品 SPU 分页
+  getSpuPage: (params) => {
+    return request({
+      url: '/product/spu/page',
+      method: 'GET',
+      params,
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    });
+  },
+  // 查询商品
+  getSpuDetail: (id) => {
+    return request({
+      url: '/product/spu/get-detail',
+      method: 'GET',
+      params: { id },
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    });
+  },
+};
+export default SpuApi;
diff --git a/sheep/api/promotion/activity.js b/sheep/api/promotion/activity.js
new file mode 100644
index 0000000..eb47ce1
--- /dev/null
+++ b/sheep/api/promotion/activity.js
@@ -0,0 +1,16 @@
+import request from '@/sheep/request';
+
+const ActivityApi = {
+  // 获得单个商品，近期参与的每个活动
+  getActivityListBySpuId: (spuId) => {
+    return request({
+      url: '/promotion/activity/list-by-spu-id',
+      method: 'GET',
+      params: {
+        spuId,
+      },
+    });
+  },
+};
+
+export default ActivityApi;
diff --git a/sheep/api/promotion/article.js b/sheep/api/promotion/article.js
new file mode 100644
index 0000000..ded5fb1
--- /dev/null
+++ b/sheep/api/promotion/article.js
@@ -0,0 +1,12 @@
+import request from '@/sheep/request';
+
+export default {
+    // 获得文章详情
+    getArticle: (id, title) => {
+        return request({
+            url: '/promotion/article/get',
+            method: 'GET',
+            params: { id, title }
+        });
+    }
+}
diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
new file mode 100644
index 0000000..8dfa0c2
--- /dev/null
+++ b/sheep/api/promotion/combination.js
@@ -0,0 +1,68 @@
+import request from '@/sheep/request';
+
+// 拼团 API
+const CombinationApi = {
+
+  // 获得拼团活动分页
+  getCombinationActivityPage: (params) => {
+    return request({
+      url: '/promotion/combination-activity/page',
+      method: 'GET',
+      params,
+    });
+  },
+
+  // 获得拼团活动明细
+  getCombinationActivity: (id) => {
+    return request({
+      url: '/promotion/combination-activity/get-detail',
+      method: 'GET',
+      params: {
+        id,
+      },
+    });
+  },
+
+  // 获得最近 n 条拼团记录（团长发起的）
+  getHeadCombinationRecordList: (activityId, status, count) => {
+    return request({
+      url: '/promotion/combination-record/get-head-list',
+      method: 'GET',
+      params: {
+        activityId,
+        status,
+        count,
+      },
+    });
+  },
+
+  // 获得我的拼团记录分页
+  getCombinationRecordPage: (params) => {
+    return request({
+      url: "/promotion/combination-record/page",
+      method: 'GET',
+      params
+    });
+  },
+
+  // 获得拼团记录明细
+  getCombinationRecordDetail: (id) => {
+    return request({
+      url: '/promotion/combination-record/get-detail',
+      method: 'GET',
+      params: {
+        id,
+      },
+    });
+  },
+
+  // 获得拼团记录的概要信息
+  getCombinationRecordSummary: () => {
+    return request({
+      url: '/promotion/combination-record/get-summary',
+      method: 'GET',
+    });
+  },
+};
+
+export default CombinationApi;
diff --git a/sheep/api/promotion/coupon.js b/sheep/api/promotion/coupon.js
new file mode 100644
index 0000000..c9dfa52
--- /dev/null
+++ b/sheep/api/promotion/coupon.js
@@ -0,0 +1,101 @@
+import request from '@/sheep/request';
+
+const CouponApi = {
+  // 获得优惠劵模板列表
+  getCouponTemplateListByIds: (ids) => {
+    return request({
+      url: '/promotion/coupon-template/list-by-ids',
+      method: 'GET',
+      params: { ids },
+      custom: {
+        showLoading: false, // 不展示 Loading，避免领取优惠劵时，不成功提示
+        showError: false,
+      },
+    });
+  },
+  // 获得优惠劵模版列表
+  getCouponTemplateList: (spuId, productScope, count) => {
+    return request({
+      url: '/promotion/coupon-template/list',
+      method: 'GET',
+      params: { spuId, productScope, count },
+    });
+  },
+  // 获得优惠劵模版分页
+  getCouponTemplatePage: (params) => {
+    return request({
+      url: '/promotion/coupon-template/page',
+      method: 'GET',
+      params,
+    });
+  },
+  // 获得优惠劵模版
+  getCouponTemplate: (id) => {
+    return request({
+      url: '/promotion/coupon-template/get',
+      method: 'GET',
+      params: { id },
+    });
+  },
+  // 我的优惠劵列表
+  getCouponPage: (params) => {
+    return request({
+      url: '/promotion/coupon/page',
+      method: 'GET',
+      params,
+    });
+  },
+  // 领取优惠券
+  takeCoupon: (templateId) => {
+    return request({
+      url: '/promotion/coupon/take',
+      method: 'POST',
+      data: { templateId },
+      custom: {
+        auth: true,
+        showLoading: true,
+        loadingMsg: '领取中',
+        showSuccess: true,
+        successMsg: '领取成功',
+      },
+    });
+  },
+  // 获得优惠劵
+  getCoupon: (id) => {
+    return request({
+      url: '/promotion/coupon/get',
+      method: 'GET',
+      params: { id },
+    });
+  },
+  // 获得未使用的优惠劵数量
+  getUnusedCouponCount: () => {
+    return request({
+      url: '/promotion/coupon/get-unused-count',
+      method: 'GET',
+      custom: {
+        showLoading: false,
+        auth: true,
+      },
+    });
+  },
+  // 获得匹配指定商品的优惠劵列表
+  getMatchCouponList: (price, spuIds, skuIds, categoryIds) => {
+    return request({
+      url: '/promotion/coupon/match-list',
+      method: 'GET',
+      params: {
+        price,
+        spuIds: spuIds.join(','),
+        skuIds: skuIds.join(','),
+        categoryIds: categoryIds.join(','),
+      },
+      custom: {
+        showError: false,
+        showLoading: false, // 避免影响 settlementOrder 结算的结果
+      },
+    });
+  }
+};
+
+export default CouponApi;
diff --git a/sheep/api/promotion/diy.js b/sheep/api/promotion/diy.js
new file mode 100644
index 0000000..e524f69
--- /dev/null
+++ b/sheep/api/promotion/diy.js
@@ -0,0 +1,38 @@
+import request from '@/sheep/request';
+
+const DiyApi = {
+  getUsedDiyTemplate: () => {
+    return request({
+      url: '/promotion/diy-template/used',
+      method: 'GET',
+      custom: {
+        showError: false,
+        showLoading: false,
+      },
+    });
+  },
+  getDiyTemplate: (id) => {
+    return request({
+      url: '/promotion/diy-template/get',
+      method: 'GET',
+      params: {
+        id
+      },
+      custom: {
+        showError: false,
+        showLoading: false,
+      },
+    });
+  },
+  getDiyPage: (id) => {
+    return request({
+      url: '/promotion/diy-page/get',
+      method: 'GET',
+      params: {
+        id
+      }
+    });
+  },
+};
+
+export default DiyApi;
diff --git a/sheep/api/promotion/kefu.js b/sheep/api/promotion/kefu.js
new file mode 100644
index 0000000..86481ab
--- /dev/null
+++ b/sheep/api/promotion/kefu.js
@@ -0,0 +1,31 @@
+import request from '@/sheep/request';
+
+const KeFuApi = {
+  sendKefuMessage: (data) => {
+    return request({
+      url: '/promotion/kefu-message/send',
+      method: 'POST',
+      data,
+      custom: {
+        auth: true,
+        showLoading: true,
+        loadingMsg: '发送中',
+        showSuccess: true,
+        successMsg: '发送成功',
+      },
+    });
+  },
+  getKefuMessagePage: (params) => {
+    return request({
+      url: '/promotion/kefu-message/page',
+      method: 'GET',
+      params,
+      custom: {
+        auth: true,
+        showLoading: false,
+      },
+    });
+  },
+};
+
+export default KeFuApi;
diff --git a/sheep/api/promotion/rewardActivity.js b/sheep/api/promotion/rewardActivity.js
new file mode 100644
index 0000000..5f74db7
--- /dev/null
+++ b/sheep/api/promotion/rewardActivity.js
@@ -0,0 +1,14 @@
+import request from '@/sheep/request';
+
+const RewardActivityApi = {
+  // 获得满减送活动
+  getRewardActivity: (id) => {
+    return request({
+      url: '/promotion/reward-activity/get',
+      method: 'GET',
+      params: { id },
+    });
+  }
+};
+
+export default RewardActivityApi;
\ No newline at end of file
diff --git a/sheep/api/promotion/seckill.js b/sheep/api/promotion/seckill.js
new file mode 100644
index 0000000..4d41e8b
--- /dev/null
+++ b/sheep/api/promotion/seckill.js
@@ -0,0 +1,33 @@
+import request from "@/sheep/request";
+
+const SeckillApi = {
+  // 获得秒杀时间段列表
+  getSeckillConfigList: () => {
+    return request({ url: 'promotion/seckill-config/list', method: 'GET' });
+  },
+
+  // 获得当前秒杀活动
+  getNowSeckillActivity: () => {
+    return request({ url: 'promotion/seckill-activity/get-now', method: 'GET' });
+  },
+
+  // 获得秒杀活动分页
+  getSeckillActivityPage: (params) => {
+    return request({ url: 'promotion/seckill-activity/page', method: 'GET', params });
+  },
+
+  /**
+   * 获得秒杀活动明细
+   * @param {number} id 秒杀活动编号
+   * @return {*}
+   */
+  getSeckillActivity: (id) => {
+    return request({
+      url: 'promotion/seckill-activity/get-detail',
+      method: 'GET',
+      params: { id }
+    });
+  }
+}
+
+export default SeckillApi;
diff --git a/sheep/api/system/area.js b/sheep/api/system/area.js
new file mode 100644
index 0000000..7c41eff
--- /dev/null
+++ b/sheep/api/system/area.js
@@ -0,0 +1,13 @@
+import request from '@/sheep/request';
+
+const AreaApi = {
+  // 获得地区树
+  getAreaTree: () => {
+    return request({
+      url: '/system/area/tree',
+      method: 'GET'
+    });
+  },
+};
+
+export default AreaApi;
diff --git a/sheep/api/system/dict.js b/sheep/api/system/dict.js
new file mode 100644
index 0000000..cab64f7
--- /dev/null
+++ b/sheep/api/system/dict.js
@@ -0,0 +1,16 @@
+import request from '@/sheep/request';
+
+const DictApi = {
+  // 根据字典类型查询字典数据信息
+  getDictDataListByType: (type) => {
+    return request({
+      url: `/system/dict-data/type`,
+      method: 'GET',
+      params: {
+        type,
+      },
+    });
+  },
+};
+
+export default DictApi;
diff --git a/sheep/api/trade/afterSale.js b/sheep/api/trade/afterSale.js
new file mode 100644
index 0000000..44c4dd3
--- /dev/null
+++ b/sheep/api/trade/afterSale.js
@@ -0,0 +1,63 @@
+import request from '@/sheep/request';
+
+const AfterSaleApi = {
+  // 获得售后分页
+  getAfterSalePage: (params) => {
+    return request({
+      url: `/trade/after-sale/page`,
+      method: 'GET',
+      params,
+      custom: {
+        showLoading: false,
+      },
+    });
+  },
+  // 创建售后
+  createAfterSale: (data) => {
+    return request({
+      url: `/trade/after-sale/create`,
+      method: 'POST',
+      data,
+    });
+  },
+  // 获得售后
+  getAfterSale: (id) => {
+    return request({
+      url: `/trade/after-sale/get`,
+      method: 'GET',
+      params: {
+        id,
+      },
+    });
+  },
+  // 取消售后
+  cancelAfterSale: (id) => {
+    return request({
+      url: `/trade/after-sale/cancel`,
+      method: 'DELETE',
+      params: {
+        id,
+      },
+    });
+  },
+  // 获得售后日志列表
+  getAfterSaleLogList: (afterSaleId) => {
+    return request({
+      url: `/trade/after-sale-log/list`,
+      method: 'GET',
+      params: {
+        afterSaleId,
+      },
+    });
+  },
+  // 退回货物
+  deliveryAfterSale: (data) => {
+    return request({
+      url: `/trade/after-sale/delivery`,
+      method: 'PUT',
+      data,
+    });
+  }
+};
+
+export default AfterSaleApi;
diff --git a/sheep/api/trade/brokerage.js b/sheep/api/trade/brokerage.js
new file mode 100644
index 0000000..206e7ec
--- /dev/null
+++ b/sheep/api/trade/brokerage.js
@@ -0,0 +1,93 @@
+import request from '@/sheep/request';
+
+const BrokerageApi = {
+  // 绑定分销用户
+  bindBrokerageUser: (data)=>{
+    return request({
+      url: '/trade/brokerage-user/bind',
+      method: 'PUT',
+      data
+    });
+  },
+  // 获得个人分销信息
+  getBrokerageUser: () => {
+    return request({
+      url: '/trade/brokerage-user/get',
+      method: 'GET'
+    });
+  },
+  // 获得个人分销统计
+  getBrokerageUserSummary: () => {
+    return request({
+      url: '/trade/brokerage-user/get-summary',
+      method: 'GET',
+    });
+  },
+  // 获得分销记录分页
+  getBrokerageRecordPage: params => {
+    if (params.status === undefined) {
+      delete params.status
+    }
+    const queryString = Object.keys(params)
+      .map(key => encodeURIComponent(key) + '=' + params[key])
+      .join('&');
+    return request({
+      url: `/trade/brokerage-record/page?${queryString}`,
+      method: 'GET',
+    });
+  },
+  // 创建分销提现
+  createBrokerageWithdraw: data => {
+    return request({
+      url: '/trade/brokerage-withdraw/create',
+      method: 'POST',
+      data,
+    });
+  },
+  // 获得商品的分销金额
+  getProductBrokeragePrice: spuId => {
+    return request({
+      url: '/trade/brokerage-record/get-product-brokerage-price',
+      method: 'GET',
+      params: { spuId }
+    });
+  },
+  // 获得分销用户排行（基于佣金）
+  getRankByPrice: params => {
+    const queryString = `times=${params.times[0]}&times=${params.times[1]}`;
+    return request({
+      url: `/trade/brokerage-user/get-rank-by-price?${queryString}`,
+      method: 'GET',
+    });
+  },
+  // 获得分销用户排行分页（基于佣金）
+  getBrokerageUserChildSummaryPageByPrice: params => {
+    const queryString = Object.keys(params)
+      .map(key => encodeURIComponent(key) + '=' + params[key])
+      .join('&');
+    return request({
+      url: `/trade/brokerage-user/rank-page-by-price?${queryString}`,
+      method: 'GET',
+    });
+  },
+  // 获得分销用户排行分页（基于用户量）
+  getBrokerageUserRankPageByUserCount: params => {
+    const queryString = Object.keys(params)
+      .map(key => encodeURIComponent(key) + '=' + params[key])
+      .join('&');
+    return request({
+      url: `/trade/brokerage-user/rank-page-by-user-count?${queryString}`,
+      method: 'GET',
+    });
+  },
+  // 获得下级分销统计分页
+  getBrokerageUserChildSummaryPage: params => {
+    return request({
+      url: '/trade/brokerage-user/child-summary-page',
+      method: 'GET',
+      params,
+    })
+  }
+}
+
+export default BrokerageApi
diff --git a/sheep/api/trade/cart.js b/sheep/api/trade/cart.js
new file mode 100644
index 0000000..63cea18
--- /dev/null
+++ b/sheep/api/trade/cart.js
@@ -0,0 +1,50 @@
+import request from '@/sheep/request';
+
+const CartApi = {
+  addCart: (data) => {
+    return request({
+      url: '/trade/cart/add',
+      method: 'POST',
+      data: data,
+      custom: {
+        showSuccess: true,
+        successMsg: '已添加到购物车~',
+      }
+    });
+  },
+  updateCartCount: (data) => {
+    return request({
+      url: '/trade/cart/update-count',
+      method: 'PUT',
+      data: data
+    });
+  },
+  updateCartSelected: (data) => {
+    return request({
+      url: '/trade/cart/update-selected',
+      method: 'PUT',
+      data: data
+    });
+  },
+  deleteCart: (ids) => {
+    return request({
+      url: '/trade/cart/delete',
+      method: 'DELETE',
+      params: {
+        ids
+      }
+    });
+  },
+  getCartList: () => {
+    return request({
+      url: '/trade/cart/list',
+      method: 'GET',
+      custom: {
+        showLoading: false,
+        auth: true,
+      },
+    });
+  },
+};
+
+export default CartApi;
\ No newline at end of file
diff --git a/sheep/api/trade/config.js b/sheep/api/trade/config.js
new file mode 100644
index 0000000..92dccae
--- /dev/null
+++ b/sheep/api/trade/config.js
@@ -0,0 +1,20 @@
+import request from '@/sheep/request';
+
+const TradeConfigApi = {
+  // 获得交易配置
+  getTradeConfig: (userId) => {
+    return request({
+      url: `/trade/config/get`,
+	  params: {
+	    userId,
+	  },
+	  custom: {
+	    auth: false,
+	    showLoading: false,
+	  },
+      method: 'GET',
+    });
+  },
+};
+
+export default TradeConfigApi;
diff --git a/sheep/api/trade/delivery.js b/sheep/api/trade/delivery.js
new file mode 100644
index 0000000..a6551da
--- /dev/null
+++ b/sheep/api/trade/delivery.js
@@ -0,0 +1,31 @@
+import request from '@/sheep/request';
+
+const DeliveryApi = {
+  // 获得快递公司列表
+  getDeliveryExpressList: () => {
+    return request({
+      url: `/trade/delivery/express/list`,
+      method: 'get',
+    });
+  },
+  // 获得自提门店列表
+  getDeliveryPickUpStoreList: (params) => {
+    return request({
+      url: `/trade/delivery/pick-up-store/list`,
+      method: 'GET',
+      params,
+    });
+  },
+  // 获得自提门店
+  getDeliveryPickUpStore: (id) => {
+    return request({
+      url: `/trade/delivery/pick-up-store/get`,
+      method: 'GET',
+      params: {
+        id,
+      },
+    });
+  },
+};
+
+export default DeliveryApi;
diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js
new file mode 100644
index 0000000..77118ba
--- /dev/null
+++ b/sheep/api/trade/order.js
@@ -0,0 +1,247 @@
+import request from '@/sheep/request';
+import { isEmpty } from '@/sheep/helper/utils';
+
+const OrderApi = {
+  // 计算订单信息
+  settlementOrder: (data) => {
+    const data2 = {
+      ...data,
+    };
+    // 移除多余字段
+    if (!(data.couponId > 0)) {
+      delete data2.couponId;
+    }
+    if (!(data.addressId > 0)) {
+      delete data2.addressId;
+    }
+    if (!(data.pickUpStoreId > 0)) {
+      delete data2.pickUpStoreId;
+    }
+    if (isEmpty(data.receiverName)) {
+      delete data2.receiverName;
+    }
+    if (isEmpty(data.receiverMobile)) {
+      delete data2.receiverMobile;
+    }
+    if (!(data.combinationActivityId > 0)) {
+      delete data2.combinationActivityId;
+    }
+    if (!(data.combinationHeadId > 0)) {
+      delete data2.combinationHeadId;
+    }
+    if (!(data.seckillActivityId > 0)) {
+      delete data2.seckillActivityId;
+    }
+    // 解决 SpringMVC 接受 List<Item> 参数的问题
+    delete data2.items;
+    for (let i = 0; i < data.items.length; i++) {
+      data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
+      data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
+      if (data.items[i].cartId) {
+        data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
+      }
+    }
+    const queryString = Object.keys(data2)
+      .map((key) => key + '=' + data2[key])
+      .join('&');
+    return request({
+      url: `/trade/order/settlement?${queryString}`,
+      method: 'GET',
+      custom: {
+        showError: true,
+        showLoading: true,
+      },
+    });
+  },
+  clerkOrder: (data) => {
+    const data2 = {
+      ...data,
+    };
+    // 移除多余字段
+    if (!(data.couponId > 0)) {
+      delete data2.couponId;
+    }
+    if (!(data.addressId > 0)) {
+      delete data2.addressId;
+    }
+    if (!(data.pickUpStoreId > 0)) {
+      delete data2.pickUpStoreId;
+    }
+    if (isEmpty(data.receiverName)) {
+      delete data2.receiverName;
+    }
+    if (isEmpty(data.receiverMobile)) {
+      delete data2.receiverMobile;
+    }
+    if (!(data.combinationActivityId > 0)) {
+      delete data2.combinationActivityId;
+    }
+    if (!(data.combinationHeadId > 0)) {
+      delete data2.combinationHeadId;
+    }
+    if (!(data.seckillActivityId > 0)) {
+      delete data2.seckillActivityId;
+    }
+    // 解决 SpringMVC 接受 List<Item> 参数的问题
+    delete data2.items;
+    for (let i = 0; i < data.items.length; i++) {
+      data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
+      data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
+      if (data.items[i].cartId) {
+        data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
+      }
+    }
+    const queryString = Object.keys(data2)
+      .map((key) => key + '=' + data2[key])
+      .join('&');
+    return request({
+      url: `/trade/order/clerkOrder?${queryString}`,
+      method: 'GET',
+      custom: {
+        showError: true,
+        showLoading: true,
+      },
+    });
+  },
+  // 创建订单
+  createOrder: (data) => {
+    return request({
+      url: `/trade/order/create`,
+      method: 'POST',
+      data,
+    });
+  },
+  // 创建陪玩订单
+  createWorkerOrder: (data) => {
+    return request({
+      url: `/trade/order/createWorkerOrder`,
+      method: 'POST',
+      data,
+    });
+  },
+  // 获得订单
+  getOrder: (id) => {
+    return request({
+      url: `/trade/order/get-detail`,
+      method: 'GET',
+      params: {
+        id,
+      },
+      custom: {
+        showLoading: false,
+      },
+    });
+  },
+  // 订单列表
+  getOrderPage: (params) => {
+    return request({
+      url: '/trade/order/page',
+      method: 'GET',
+      params,
+      custom: {
+		auth: true,
+        showLoading: false,
+      },
+    });
+  },
+  // 订单列表
+  getWorkerOrderPage: (params) => {
+    return request({
+      url: '/trade/order/worker/page',
+      method: 'GET',
+      params,
+      custom: {
+		auth: true,
+        showLoading: false,
+      },
+    });
+  },
+  // 订单列表
+  getBlindOrderPage: (params) => {
+    return request({
+      url: '/trade/order/blind/page',
+      method: 'GET',
+      params,
+      custom: {
+		auth: true,
+        showLoading: false,
+      },
+    });
+  },
+  // 确认收货
+  receiveOrder: (id) => {
+    return request({
+      url: `/trade/order/receive`,
+      method: 'PUT',
+      params: {
+        id,
+      },
+    });
+  },
+  // 确认接单
+  deliveryOrder: (id) => {
+    return request({
+      url: `/trade/order/delivery`,
+      method: 'PUT',
+      data: { 
+        id: id,
+		logisticsId: 0
+      },
+    });
+  },
+  // 取消订单
+  cancelOrder: (id) => {
+    return request({
+      url: `/trade/order/cancel`,
+      method: 'DELETE',
+      params: {
+        id,
+      },
+    });
+  },
+  // 删除订单
+  deleteOrder: (id) => {
+    return request({
+      url: `/trade/order/delete`,
+      method: 'DELETE',
+      params: {
+        id,
+      },
+    });
+  },
+  // 获得交易订单的物流轨迹
+  getOrderExpressTrackList: (id) => {
+    return request({
+      url: `/trade/order/get-express-track-list`,
+      method: 'GET',
+      params: {
+        id,
+      },
+    });
+  },
+  // 获得交易订单数量
+  getOrderCount: () => {
+    return request({
+      url: '/trade/order/get-count',
+      method: 'GET',
+      custom: {
+        showLoading: false,
+        auth: true,
+      },
+    });
+  },
+  // 创建单个评论
+  createOrderItemComment: (data) => {
+    return request({
+      url: `/trade/order/item/create-comment`,
+      method: 'POST',
+      data,
+	  custom: {
+		showSuccess: true,
+		successMsg: '评价成功'
+	  },
+    });
+  },
+};
+
+export default OrderApi;
diff --git a/sheep/api/worker/clerk.js b/sheep/api/worker/clerk.js
new file mode 100644
index 0000000..cf2c7be
--- /dev/null
+++ b/sheep/api/worker/clerk.js
@@ -0,0 +1,195 @@
+import request from '@/sheep/request';
+
+const ClerkApi = {
+  // 创建店员申请
+  createClerkApply: (data) => {
+    return request({
+      url: '/worker/clerk-apply/create',
+      method: 'POST',
+      data,
+      custom: {
+  		showSuccess: true,
+  		successMsg: '提交成功'
+      },
+    });
+  },
+  // 更新店员申请
+  updateClerkApply: (data) => {
+    return request({
+      url: '/worker/clerk-apply/update',
+      method: 'PUT',
+      data,
+      custom: {
+  		showSuccess: true,
+  		successMsg: '提交成功'
+      },
+    });
+  },
+  // 更新店员在线状态
+  updateOnlineStatus: (data) => {
+    return request({
+      url: '/worker/clerk-apply/updateOnlineStatus',
+      method: 'PUT',
+      data,
+      custom: {
+  		showSuccess: true,
+  		successMsg: '提交成功'
+      },
+    });
+  },
+  // 获得店员申请
+  getClerkApply: (id) => {
+    return request({
+      url: '/worker/clerk-apply/get',
+      method: 'GET',
+      params: { id },
+  	  custom: {
+  	    auth: true,
+  	    showLoading: false,
+  	  },
+    });
+  },
+  // 获得店员等级
+  getClerkLevel: (id) => {
+    return request({
+      url: '/worker/clerk-apply/getClerkLevel',
+      method: 'GET',
+      params: { id },
+  	  custom: {
+  	    auth: true,
+  	    showLoading: false,
+  	  },
+    });
+  },
+  // 获得店员申请
+  getClerk: (params) => {
+    return request({
+      url: '/worker/clerk/get',
+      method: 'GET',
+	  params, 
+  	  custom: {
+  	    auth: false,
+  	    showLoading: false,
+  	  },
+    });
+  },
+  // 获得店员盲盒
+  getClerkBlind: () => {
+    return request({
+      url: '/worker/clerk/getClerkBlind',
+      method: 'GET',
+  	  custom: {
+  	    auth: false,
+  	    showLoading: false,
+  	  },
+    });
+  },
+  // 获得商品分类列表
+  getCategoryListByParentId: (parentId) => {
+    return request({
+      url: '/worker/category/getCategoryListByParentId',
+      method: 'GET',
+      params: { parentId },
+  	  custom: {
+  	    auth: false,
+  	    showLoading: false,
+  	  },
+    });
+  },
+  
+  // 保存技能管理
+  saveGoodsList: (data) => {
+    return request({
+      url: '/worker/clerk-apply/save',
+      method: 'PUT',
+      data,
+      custom: {
+  		showSuccess: true,
+  		successMsg: '保存成功'
+      },
+    });
+  },
+  // 获得店员列表
+  getClerkPage: (params) => {
+    return request({
+      url: '/worker/clerk/page',
+      method: 'GET',
+      params,
+      custom: {
+        auth: false,
+        showLoading: false,
+      },
+    });
+  },
+  // 获得店员关注列表
+  getClerkFansPage: (params) => {
+    return request({
+      url: '/worker/clerk-fans/page',
+      method: 'GET',
+      params,
+      custom: {
+        auth: false,
+        showLoading: false,
+      },
+    });
+  },
+  // 获得首页信息
+  getHomeData: () => {
+    return request({
+      url: '/worker/clerk/getHomeData',
+      method: 'GET',
+      custom: {
+        auth: false,
+        showLoading: false,
+      },
+    });
+  },
+  // 获得首页信息
+  getClerkList: () => {
+    return request({
+      url: '/worker/clerk/getClerkList',
+      method: 'GET',
+      custom: {
+        auth: true,
+        showLoading: false,
+      },
+    });
+  },
+  // 获得榜单信息
+  getWeekTopList: () => {
+    return request({
+      url: '/worker/clerk/getWeekTopList',
+      method: 'GET',
+      custom: {
+        auth: false,
+        showLoading: false,
+      },
+    });
+  },
+  // 获得店员申请列表
+  getClerkApplyPage: (params) => {
+    return request({
+      url: '/worker/clerk-apply/page',
+      method: 'GET',
+      params,
+      custom: {
+        auth: true,
+        showLoading: false,
+      },
+    });
+  },
+  // 获得商品列表
+  getGoodsList: (id) => {
+    return request({
+      url: '/worker/clerk-apply/list',
+      method: 'GET',
+      params: { id },
+  	  custom: {
+  	    auth: true,
+  	    showLoading: false,
+  	  },
+    });
+  },
+};
+
+export default ClerkApi;
diff --git a/sheep/api/worker/reward.js b/sheep/api/worker/reward.js
new file mode 100644
index 0000000..d269732
--- /dev/null
+++ b/sheep/api/worker/reward.js
@@ -0,0 +1,60 @@
+import request from '@/sheep/request';
+
+const RewardApi = {
+  // 获得礼物列表
+  getGiftList: () => {
+    return request({
+      url: '/worker/gift/getList',
+      method: 'GET',
+  	  custom: {
+  	    auth: true,
+  	    showLoading: false,
+  	  },
+    });
+  },
+  // 获得打赏礼物列表
+  getRewardGiftList: (params) => {
+    return request({
+      url: '/worker/reward/getGiftList',
+      method: 'GET',
+	  params: params,
+  	  custom: {
+  	    auth: false,
+  	    showLoading: false,
+  	  },
+    });
+  },
+  // 获得礼物列表
+  getTopList: () => {
+    return request({
+      url: '/worker/reward/getTopList',
+      method: 'GET',
+  	  custom: {
+  	    auth: false,
+  	    showLoading: false,
+  	  },
+    });
+  },
+  // 创建打赏订单
+  createRewardOrder: (data) => {
+    return request({
+      url: `/worker/reward/createOrder`,
+      method: 'POST',
+      data,
+    });
+  },
+  // 获得打赏分页
+  getRewardPage: (params) => {
+    return request({
+      url: '/worker/reward/page',
+      method: 'GET',
+      params,
+      custom: {
+        auth: true,
+        showLoading: false,
+      },
+    });
+  },
+};
+
+export default RewardApi;
diff --git a/sheep/api/worker/trend.js b/sheep/api/worker/trend.js
new file mode 100644
index 0000000..3e33e73
--- /dev/null
+++ b/sheep/api/worker/trend.js
@@ -0,0 +1,100 @@
+import request from '@/sheep/request';
+
+const TrendApi = {
+  // 发布动态
+  createTrend: (data) => {
+    return request({
+      url: '/worker/trend/create',
+      method: 'POST',
+      data,
+      custom: {
+		auth: true,
+  		showSuccess: true,
+  		successMsg: '发布成功，请等待管理员审核'
+      },
+    });
+  },
+  // 动态点赞
+  createTrendLike: (data) => {
+    return request({
+      url: '/worker/trend-like/create',
+      method: 'POST',
+      data,
+      custom: {
+  		auth: true,
+  		showSuccess: false,
+		showLoading: false,
+  		successMsg: '点赞成功'
+      },
+    });
+  },
+  // 删除动态
+  deleteTrendLike: (id) => {
+	return request({
+		url: '/worker/trend/delete',
+		method: 'DELETE',
+		params: {
+		  id,
+		},
+		custom: {
+		  	auth: true,
+		  	showSuccess: true,
+			showLoading: false,
+			successMsg: '删除成功'
+		},
+	});
+  },
+  // 获得动态详情
+  getTrend: (id) => {
+    return request({
+      url: '/worker/trend/get',
+      method: 'GET',
+      params: { id },
+  	  custom: {
+  	    auth: false,
+  	    showLoading: false,
+  	  },
+    });
+  },
+  // 店员关注
+  createClerkFans: (data) => {
+    return request({
+      url: '/worker/clerk-fans/create',
+      method: 'POST',
+      data,
+      custom: {
+  		auth: true,
+  		showSuccess: false,
+		showLoading: false,
+  		successMsg: '关注成功'
+      },
+    });
+  },
+  // 获得动态分页
+  getTrendPage: (params) => {
+    return request({
+      url: '/worker/trend/page',
+      method: 'GET',
+      params,
+      custom: {
+        auth: false,
+        showLoading: false,
+      },
+    });
+  },
+  // 获得动态分页
+  getMyTrendPage: (params) => {
+    return request({
+      url: '/worker/trend/myPage',
+      method: 'GET',
+      params,
+      custom: {
+        auth: true,
+        showLoading: false,
+      },
+    });
+  },
+ 
+};
+
+export default TrendApi;
diff --git a/sheep/components/s-activity-pop/s-activity-pop.vue b/sheep/components/s-activity-pop/s-activity-pop.vue
new file mode 100644
index 0000000..432dc45
--- /dev/null
+++ b/sheep/components/s-activity-pop/s-activity-pop.vue
@@ -0,0 +1,105 @@
+<!-- 商品信息：满减送等营销活动的弹窗 -->
+<template>
+  <su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose>
+    <view class="model-box">
+      <view class="title ss-m-t-16 ss-m-l-20 ss-flex">营销活动</view>
+      <scroll-view
+        class="model-content ss-m-t-50"
+        scroll-y
+        :scroll-with-animation="false"
+        :enable-back-to-top="true"
+      >
+        <view v-for="item in state.activityInfo" :key="item.id">
+          <view class="ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(item)">
+            <view class="model-content-tag ss-flex ss-row-center">满减</view>
+            <view class="ss-m-l-20 model-content-title ss-flex-1">
+              <view class="ss-m-b-24" v-for="rule in state.activityMap[item.id]?.rules" :key="rule">
+                {{ formatRewardActivityRule(state.activityMap[item.id], rule) }}
+              </view>
+            </view>
+            <text class="cicon-forward" />
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </su-popup>
+</template>
+<script setup>
+  import sheep from '@/sheep';
+  import { computed, reactive, watch } from 'vue';
+  import RewardActivityApi from '@/sheep/api/promotion/rewardActivity';
+  import { formatRewardActivityRule } from '@/sheep/hooks/useGoods';
+
+  const props = defineProps({
+    modelValue: {
+      type: Object,
+      default() {},
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    },
+  });
+  const emits = defineEmits(['close']);
+  const state = reactive({
+    activityInfo: computed(() => props.modelValue),
+    activityMap: {}
+  });
+
+  watch(
+    () => props.show,
+    () => {
+      // 展示的情况下，加载每个活动的详细信息
+      if (props.show) {
+        state.activityInfo?.forEach(activity => {
+          RewardActivityApi.getRewardActivity(activity.id).then(res => {
+            if (res.code !== 0) {
+              return;
+            }
+            state.activityMap[activity.id] = res.data;
+          })
+        });
+      }
+    },
+  );
+
+  function onGoodsList(e) {
+    sheep.$router.go('/pages/activity/index', {
+      activityId: e.id,
+    });
+  }
+</script>
+<style lang="scss" scoped>
+  .model-box {
+    height: 60vh;
+    .title {
+      font-size: 36rpx;
+      height: 80rpx;
+      font-weight: bold;
+      color: #333333;
+    }
+  }
+  .model-content {
+    padding: 0 20rpx;
+    box-sizing: border-box;
+    .model-content-tag {
+      background: rgba(#ff6911, 0.1);
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #ff6911;
+      line-height: 42rpx;
+      width: 68rpx;
+      height: 32rpx;
+      border-radius: 5rpx;
+    }
+    .model-content-title {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+    }
+    .cicon-forward {
+      font-size: 28rpx;
+      color: #999999;
+    }
+  }
+</style>
diff --git a/sheep/components/s-address-item/s-address-item.vue b/sheep/components/s-address-item/s-address-item.vue
new file mode 100644
index 0000000..45e361f
--- /dev/null
+++ b/sheep/components/s-address-item/s-address-item.vue
@@ -0,0 +1,110 @@
+<!-- 地址卡片 -->
+<template>
+  <view
+    class="address-item ss-flex ss-row-between ss-col-center"
+    :class="[{ 'border-bottom': props.hasBorderBottom }]"
+  >
+    <view class="item-left" v-if="!isEmpty(props.item)">
+      <view class="area-text ss-flex ss-col-center">
+        <uni-tag
+          class="ss-m-r-10"
+          size="small"
+          custom-style="background-color: var(--ui-BG-Main); border-color: var(--ui-BG-Main); color: #fff;"
+          v-if="props.item.defaultStatus"
+          text="默认"
+        />
+        {{ props.item.areaName }}
+      </view>
+      <view class="address-text">
+        {{ props.item.detailAddress }}
+      </view>
+      <view class="person-text"> {{ props.item.name }} {{ props.item.mobile }} </view>
+    </view>
+    <view v-else>
+      <view class="address-text ss-m-b-10">请选择收货地址</view>
+    </view>
+    <slot>
+      <button class="ss-reset-button edit-btn" @tap.stop="onEdit">
+        <view class="edit-icon ss-flex ss-row-center ss-col-center">
+          <image :src="sheep.$url.static('/static/img/shop/user/address/edit.png')" />
+        </view>
+      </button>
+    </slot>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 基础组件 - 地址卡片
+   *
+   * @param {String}  icon = _icon-edit    - icon
+   *
+   * @event {Function()} click			 - 点击
+   * @event {Function()} actionClick		 - 点击工具栏
+   *
+   * @slot 								 - 默认插槽
+   */
+  import sheep from '@/sheep';
+  import { isEmpty } from 'lodash-es';
+  const props = defineProps({
+    item: {
+      type: Object,
+      default() {},
+    },
+    hasBorderBottom: {
+      type: Boolean,
+      defult: true,
+    },
+  });
+
+  const onEdit = () => {
+    sheep.$router.go('/pages/user/address/edit', {
+      id: props.item.id,
+    });
+  };
+</script>
+
+<style lang="scss" scoped>
+  .address-item {
+    padding: 24rpx 30rpx;
+
+    .item-left {
+      width: 600rpx;
+    }
+
+    .area-text {
+      font-size: 26rpx;
+      font-weight: 400;
+      color: $dark-9;
+    }
+
+    .address-text {
+      font-size: 32rpx;
+      font-weight: 500;
+      color: #333333;
+      line-height: 48rpx;
+    }
+
+    .person-text {
+      font-size: 28rpx;
+      font-weight: 400;
+      color: $dark-9;
+    }
+  }
+
+  .edit-btn {
+    width: 44rpx;
+    height: 44rpx;
+    background: $gray-f;
+    border-radius: 50%;
+
+    .edit-icon {
+      width: 24rpx;
+      height: 24rpx;
+    }
+  }
+  image {
+    width: 100%;
+    height: 100%;
+  }
+</style>
diff --git a/sheep/components/s-auth-modal/components/account-login.vue b/sheep/components/s-auth-modal/components/account-login.vue
new file mode 100644
index 0000000..579614c
--- /dev/null
+++ b/sheep/components/s-auth-modal/components/account-login.vue
@@ -0,0 +1,107 @@
+<!-- 账号密码登录 accountLogin  -->
+<template>
+  <view>
+    <!-- 标题栏 -->
+    <view class="head-box ss-m-b-60 ss-flex-col">
+      <view class="ss-flex ss-m-b-20">
+        <view class="head-title-active head-title-line" @tap="showAuthModal('smsLogin')">
+          短信登录
+        </view>
+        <view class="head-title ss-m-r-40 head-title-animation">账号登录</view>
+      </view>
+      <view class="head-subtitle">如果未设置过密码，请点击忘记密码</view>
+    </view>
+
+    <!-- 表单项 -->
+    <uni-forms
+      ref="accountLoginRef"
+      v-model="state.model"
+      :rules="state.rules"
+      validateTrigger="bind"
+      labelWidth="140"
+      labelAlign="center"
+    >
+      <uni-forms-item name="mobile" label="账号">
+        <uni-easyinput placeholder="请输入账号" v-model="state.model.mobile" :inputBorder="false">
+          <template v-slot:right>
+            <button class="ss-reset-button forgot-btn" @tap="showAuthModal('resetPassword')">
+              忘记密码
+            </button>
+          </template>
+        </uni-easyinput>
+      </uni-forms-item>
+
+      <uni-forms-item name="password" label="密码">
+        <uni-easyinput
+          type="password"
+          placeholder="请输入密码"
+          v-model="state.model.password"
+          :inputBorder="false"
+        >
+          <template v-slot:right>
+            <button class="ss-reset-button login-btn-start" @tap="accountLoginSubmit">登录</button>
+          </template>
+        </uni-easyinput>
+      </uni-forms-item>
+    </uni-forms>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive, unref } from 'vue';
+  import sheep from '@/sheep';
+  import { mobile, password } from '@/sheep/validate/form';
+  import { showAuthModal, closeAuthModal } from '@/sheep/hooks/useModal';
+  import AuthUtil from '@/sheep/api/member/auth';
+
+  const accountLoginRef = ref(null);
+
+  const emits = defineEmits(['onConfirm']);
+
+  const props = defineProps({
+    agreeStatus: {
+      type: Boolean,
+      default: false,
+    },
+  });
+
+  // 数据
+  const state = reactive({
+    model: {
+      mobile: '', // 账号
+      password: '', // 密码
+    },
+    rules: {
+      mobile,
+      password,
+    },
+  });
+
+  // 账号登录
+  async function accountLoginSubmit() {
+    // 表单验证
+    const validate = await unref(accountLoginRef)
+      .validate()
+      .catch((error) => {
+        console.log('error: ', error);
+      });
+    if (!validate) return;
+
+    // 同意协议
+    if (!props.agreeStatus) {
+      emits('onConfirm', true)
+      sheep.$helper.toast('请勾选同意');
+      return;
+    }
+
+    // 提交数据
+    const { code, data } = await AuthUtil.login(state.model);
+    if (code === 0) {
+      closeAuthModal();
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import '../index.scss';
+</style>
diff --git a/sheep/components/s-auth-modal/components/change-mobile.vue b/sheep/components/s-auth-modal/components/change-mobile.vue
new file mode 100644
index 0000000..f4dd5f1
--- /dev/null
+++ b/sheep/components/s-auth-modal/components/change-mobile.vue
@@ -0,0 +1,127 @@
+<!-- 绑定/更换手机号 changeMobile  -->
+<template>
+  <view>
+    <!-- 标题栏 -->
+    <view class="head-box ss-m-b-60">
+      <view class="head-title ss-m-b-20">
+        {{ userInfo.mobile ? '更换手机号' : '绑定手机号' }}
+      </view>
+      <view class="head-subtitle">为了您的账号安全，请使用本人手机号码</view>
+    </view>
+
+    <!-- 表单项 -->
+    <uni-forms
+      ref="changeMobileRef"
+      v-model="state.model"
+      :rules="state.rules"
+      validateTrigger="bind"
+      labelWidth="140"
+      labelAlign="center"
+    >
+      <uni-forms-item name="mobile" label="手机号">
+        <uni-easyinput
+          placeholder="请输入手机号"
+          v-model="state.model.mobile"
+          :inputBorder="false"
+          type="number"
+        >
+          <template v-slot:right>
+            <button
+              class="ss-reset-button code-btn-start"
+              :disabled="state.isMobileEnd"
+              :class="{ 'code-btn-end': state.isMobileEnd }"
+              @tap="getSmsCode('changeMobile', state.model.mobile)"
+            >
+              {{ getSmsTimer('changeMobile') }}
+            </button>
+          </template>
+        </uni-easyinput>
+      </uni-forms-item>
+
+      <uni-forms-item name="code" label="验证码">
+        <uni-easyinput
+          placeholder="请输入验证码"
+          v-model="state.model.code"
+          :inputBorder="false"
+          type="number"
+          maxlength="4"
+        >
+          <template v-slot:right>
+            <button class="ss-reset-button login-btn-start" @tap="changeMobileSubmit">
+              确认
+            </button>
+          </template>
+        </uni-easyinput>
+      </uni-forms-item>
+    </uni-forms>
+
+    <!-- 微信独有：读取手机号 -->
+    <button
+      v-if="'WechatMiniProgram' === sheep.$platform.name"
+      class="ss-reset-button type-btn"
+      open-type="getPhoneNumber"
+      @getphonenumber="getPhoneNumber"
+    >
+      使用微信手机号
+    </button>
+  </view>
+</template>
+
+<script setup>
+  import { computed, ref, reactive, unref } from 'vue';
+  import sheep from '@/sheep';
+  import { code, mobile } from '@/sheep/validate/form';
+  import { closeAuthModal, getSmsCode, getSmsTimer } from '@/sheep/hooks/useModal';
+  import UserApi from '@/sheep/api/member/user';
+
+  const changeMobileRef = ref(null);
+  const userInfo = computed(() => sheep.$store('user').userInfo);
+
+  // 数据
+  const state = reactive({
+    isMobileEnd: false, // 手机号输入完毕
+    model: {
+      mobile: '', // 手机号
+      code: '', // 验证码
+    },
+    rules: {
+      code,
+      mobile,
+    },
+  });
+
+  // 绑定手机号
+  async function changeMobileSubmit() {
+    const validate = await unref(changeMobileRef)
+      .validate()
+      .catch((error) => {
+        console.log('error: ', error);
+      });
+    if (!validate) {
+      return;
+    }
+    // 提交更新请求
+    const { code } = await UserApi.updateUserMobile(state.model);
+    if (code !== 0) {
+      return;
+    }
+    sheep.$store('user').getInfo();
+    closeAuthModal();
+  }
+
+  // 使用微信手机号
+  async function getPhoneNumber(e) {
+    if (e.detail.errMsg !== 'getPhoneNumber:ok') {
+      return;
+    }
+    const result = await sheep.$platform.useProvider().bindUserPhoneNumber(e.detail);
+    if (result) {
+      sheep.$store('user').getInfo();
+      closeAuthModal();
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import '../index.scss';
+</style>
diff --git a/sheep/components/s-auth-modal/components/change-password.vue b/sheep/components/s-auth-modal/components/change-password.vue
new file mode 100644
index 0000000..b02ea02
--- /dev/null
+++ b/sheep/components/s-auth-modal/components/change-password.vue
@@ -0,0 +1,106 @@
+<!-- 修改密码（登录时）  -->
+<template>
+  <view>
+    <!-- 标题栏 -->
+    <view class="head-box ss-m-b-60">
+      <view class="head-title ss-m-b-20">修改密码</view>
+      <view class="head-subtitle">如密码丢失或未设置,请点击忘记密码重新设置</view>
+    </view>
+
+    <!-- 表单项 -->
+    <uni-forms
+      ref="changePasswordRef"
+      v-model="state.model"
+      :rules="state.rules"
+      validateTrigger="bind"
+      labelWidth="140"
+      labelAlign="center"
+    >
+      <uni-forms-item name="code" label="验证码">
+        <uni-easyinput
+          placeholder="请输入验证码"
+          v-model="state.model.code"
+          type="number"
+          maxlength="4"
+          :inputBorder="false"
+        >
+          <template v-slot:right>
+            <button
+              class="ss-reset-button code-btn code-btn-start"
+              :disabled="state.isMobileEnd"
+              :class="{ 'code-btn-end': state.isMobileEnd }"
+              @tap="getSmsCode('changePassword')"
+            >
+              {{ getSmsTimer('resetPassword') }}
+            </button>
+          </template>
+        </uni-easyinput>
+      </uni-forms-item>
+
+      <uni-forms-item name="reNewPassword" label="密码">
+        <uni-easyinput
+          type="password"
+          placeholder="请输入密码"
+          v-model="state.model.password"
+          :inputBorder="false"
+        >
+          <template v-slot:right>
+            <button class="ss-reset-button login-btn-start" @tap="changePasswordSubmit">
+              确认
+            </button>
+          </template>
+        </uni-easyinput>
+      </uni-forms-item>
+    </uni-forms>
+
+    <button class="ss-reset-button type-btn" @tap="closeAuthModal">
+      取消修改
+    </button>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive, unref } from 'vue';
+  import { code, password } from '@/sheep/validate/form';
+  import { closeAuthModal, getSmsCode, getSmsTimer } from '@/sheep/hooks/useModal';
+  import UserApi from '@/sheep/api/member/user';
+
+  const changePasswordRef = ref(null);
+
+  // 数据
+  const state = reactive({
+    model: {
+      mobile: '', // 手机号
+      code: '', // 验证码
+      password: '', // 密码
+    },
+    rules: {
+      code,
+      password,
+    },
+  });
+
+  // 更改密码
+  async function changePasswordSubmit() {
+    // 参数校验
+    const validate = await unref(changePasswordRef)
+      .validate()
+      .catch((error) => {
+        console.log('error: ', error);
+      });
+    if (!validate) {
+      return;
+    }
+    // 发起请求
+    const { code } = await UserApi.updateUserPassword(state.model);
+    if (code !== 0) {
+      return;
+    }
+    // 成功后，只需要关闭弹窗
+    closeAuthModal();
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import '../index.scss';
+</style>
diff --git a/sheep/components/s-auth-modal/components/chat-authorization.vue b/sheep/components/s-auth-modal/components/chat-authorization.vue
new file mode 100644
index 0000000..b2fc774
--- /dev/null
+++ b/sheep/components/s-auth-modal/components/chat-authorization.vue
@@ -0,0 +1,170 @@
+<!-- 微信授权信息 mpAuthorization  -->
+<template>
+  <view>
+    <!-- 标题栏 -->
+    <view class="head-box ss-m-b-60 ss-flex-col">
+      <view class="ss-flex ss-m-b-20">
+        <view class="head-title ss-m-r-40 head-title-animation">完善资料</view>
+      </view>
+      <view class="head-subtitle">完善您的交友名片、个人相册</view>
+    </view>
+
+    <!-- 表单项 -->
+    <uni-forms
+      ref="accountLoginRef"
+      v-model="state.model"
+      :rules="state.rules"
+      validateTrigger="bind"
+      labelWidth="140"
+      labelAlign="center"
+    >
+      <!-- 获取头像昵称：https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/userProfile.html -->
+      <uni-forms-item name="qrcode" label="微信名片">
+        <button
+          class="ss-reset-button avatar-btn"
+          @click="onChooseAvatar"
+        >
+          <image
+            class="avatar-img"
+            :src="sheep.$url.cdn(state.model.qrcode)"
+            mode="aspectFill"
+          />
+          <text class="cicon-forward" />
+        </button>
+      </uni-forms-item>
+	  <form-qrcode v-model="state.model.qrcodeShow"></form-qrcode>
+	  <form-image :number="5" v-model="state.imgList"></form-image>
+      <view class="foot-box">
+        <button class="ss-reset-button authorization-btn" @tap="onConfirm"> 确认保存 </button>
+      </view>
+    </uni-forms>
+  </view>
+</template>
+
+<script setup>
+  import { computed, ref, reactive } from 'vue';
+  import sheep from '@/sheep';
+  import { closeAuthModal } from '@/sheep/hooks/useModal';
+  import formQrcode from '@/sheep/components/s-auth-modal/components/formQrcode.vue';
+  import formImage from '@/sheep/components/s-auth-modal/components/formImage.vue';
+  import FileApi from '@/sheep/api/infra/file';
+  import UserApi from '@/sheep/api/member/user';
+
+  const props = defineProps({
+    agreeStatus: {
+      type: Boolean,
+      default: false,
+    },
+  });
+
+  const userInfo = computed(() => sheep.$store('user').userInfo);
+
+  const accountLoginRef = ref(null);
+  
+  // 数据
+  const state = reactive({
+    model: {
+      nickname: userInfo.value.nickname,
+      avatar: userInfo.value.avatar,
+	  sex: userInfo.value.sex,
+	  age: userInfo.value.age,
+	  qrcode: userInfo.value.qrcode,
+	  photo: userInfo.value.photo,
+	  qrcodeShow: userInfo.value.qrcodeShow,
+    },
+	imgList: userInfo.value.photo ? userInfo.value.photo.split(',') : [],
+    rules: {},
+    disabledStyle: {
+      color: '#999',
+      disableColor: '#fff',
+    },
+  });
+
+  function onChooseAvatar() {
+	uni.chooseImage({
+		count: 1, //默认9
+		sourceType: ['album', 'camera'],
+		sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+		success: (res) => {
+			for (let i = 0; i < res.tempFilePaths.length; i++) {
+				uni.getImageInfo({
+					src: res.tempFilePaths[i],
+					success: (image) => {
+						uploadAvatar(image.path);
+					}
+				});
+			}
+		}
+	});
+    
+  }
+
+  // 选择头像（来自文件系统）
+  async function uploadAvatar(tempUrl) {
+    if (!tempUrl) {
+      return;
+    }
+    let { data } = await FileApi.uploadFile(tempUrl);
+    state.model.qrcode = data;
+  }
+
+  // 确认授权
+  async function onConfirm() {
+    const { model, imgList } = state;
+    const { qrcode } = model;
+	if (!qrcode) {
+	  sheep.$helper.toast('请上传微信名片');
+	  return;
+	}
+	if (imgList.length < 1) {
+	  sheep.$helper.toast('请上传相册');
+	  return;
+	}
+	
+    // 发起更新
+    const { code } = await UserApi.updateUser({
+      photo: imgList.join(','),
+      qrcode: state.model.qrcode,
+	  qrcodeShow: state.model.qrcodeShow,
+    });
+    // 更新成功
+    if (code === 0) {
+      sheep.$helper.toast('保存成功');
+      await sheep.$store('user').getInfo();
+      closeAuthModal();
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import '../index.scss';
+
+  .foot-box {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+  }
+  .authorization-btn {
+    width: 686rpx;
+    height: 80rpx;
+    background-color: var(--ui-BG-Main);
+    border-radius: 40rpx;
+    color: #fff;
+  }
+  .avatar-img {
+    width: 72rpx;
+    height: 72rpx;
+  }
+  .cicon-forward {
+    font-size: 30rpx;
+    color: #595959;
+  }
+  .avatar-btn {
+    width: 100%;
+    justify-content: space-between;
+  }
+  
+  .form-item {
+	  
+  }
+</style>
diff --git a/sheep/components/s-auth-modal/components/formImage.vue b/sheep/components/s-auth-modal/components/formImage.vue
new file mode 100644
index 0000000..a6045f6
--- /dev/null
+++ b/sheep/components/s-auth-modal/components/formImage.vue
@@ -0,0 +1,73 @@
+<template>
+	<view>
+		<view class="form-item">
+			<view class="label">上传相册</view>
+			<view>{{imgList.length}}/{{number}}</view>
+		</view>
+		<view class="upload-box">
+			<shmily-drag-image :number="number" :cols="5" v-model="imgList"></shmily-drag-image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			number: {
+			  type: Number,
+			  default: 6
+			},
+			modelValue: {
+			  type: Array,
+			  default: []
+			},
+		},
+		data() {
+			return {
+				imgList: [],
+			}
+		},
+		created() {
+			this.imgList = this.modelValue;
+		},
+		computed: {
+			
+		},
+		watch: {
+			imgList: {
+				handler: function(newVal, oldVal) {
+					this.$emit('update:modelValue', newVal); 
+				}
+			},
+			modelValue: {
+				handler: function(newVal, oldVal) {
+					this.imgList = newVal;
+				}
+			},
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		
+		.label {
+			font-size: 28rpx;
+			min-width: 200rpx;
+			padding-left: 2px;
+		}
+	}
+	
+	.upload-box {
+		padding: 15px 0;
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-auth-modal/components/formQrcode.vue b/sheep/components/s-auth-modal/components/formQrcode.vue
new file mode 100644
index 0000000..5f2ded4
--- /dev/null
+++ b/sheep/components/s-auth-modal/components/formQrcode.vue
@@ -0,0 +1,88 @@
+<template>
+	<view class="form-item">
+		<view class="label">交换名片</view>
+		<view class="radio-box">
+			<view @click="change(item)" class="text" :class="item.value == valueDom ? 'active' : ''"  v-for="(item,index) in list">{{item.name}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			modelValue: '',
+		},
+		data() {
+			return {
+				list: [
+					{
+						name: '打开',
+						value: 0,
+					},
+					{
+						name: '关闭',
+						value: 1,
+					},
+				],
+			}
+		},
+		created() {
+			
+		},
+		computed: {
+			valueDom() {
+				return this.modelValue;
+			},
+		},
+		watch: {
+			
+		},
+		methods: {
+			change(e) {
+				this.$emit('update:modelValue', e.value); 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form-item {
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-left: 2px;
+		padding-bottom: 22px;
+		
+		.label {
+			font-size: 28rpx;
+			min-width: 200rpx;
+		}
+	}
+	
+	.radio-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		
+		.text {
+			width: 100rpx;
+			height: 50rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background-color: #ececec;
+			color: #949494;
+			border-radius: 10rpx;
+			margin-left: 10px; 
+		}
+		
+		.active {
+			color: #fff;
+			background-color: #949494;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-auth-modal/components/formSex.vue b/sheep/components/s-auth-modal/components/formSex.vue
new file mode 100644
index 0000000..34b84e0
--- /dev/null
+++ b/sheep/components/s-auth-modal/components/formSex.vue
@@ -0,0 +1,88 @@
+<template>
+	<view class="form-item">
+		<view class="label">性别</view>
+		<view class="radio-box">
+			<view @click="change(item)" class="text" :class="item.value == valueDom ? 'active' : ''"  v-for="(item,index) in list">{{item.name}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		props: {
+			modelValue: '',
+		},
+		data() {
+			return {
+				list: [
+					{
+						name: '男',
+						value: '1',
+					},
+					{
+						name: '女',
+						value: '2',
+					},
+				],
+			}
+		},
+		created() {
+			
+		},
+		computed: {
+			valueDom() {
+				return this.modelValue;
+			},
+		},
+		watch: {
+			
+		},
+		methods: {
+			change(e) {
+				this.$emit('update:modelValue', e.value); 
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form-item {
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-left: 17px;
+		padding-bottom: 22px;
+		
+		.label {
+			font-size: 28rpx;
+			min-width: 200rpx;
+		}
+	}
+	
+	.radio-box {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		
+		.text {
+			width: 70rpx;
+			height: 70rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background-color: #ececec;
+			color: #949494;
+			border-radius: 100%;
+			margin-left: 10px; 
+		}
+		
+		.active {
+			color: #fff;
+			background-color: #949494;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-auth-modal/components/h5-authorization.vue b/sheep/components/s-auth-modal/components/h5-authorization.vue
new file mode 100644
index 0000000..2a907f3
--- /dev/null
+++ b/sheep/components/s-auth-modal/components/h5-authorization.vue
@@ -0,0 +1,194 @@
+<!-- 微信授权信息 mpAuthorization  -->
+<template>
+  <view>
+    <!-- 标题栏 -->
+    <view class="head-box ss-m-b-60 ss-flex-col">
+      <view class="ss-flex ss-m-b-20">
+        <view class="head-title ss-m-r-40 head-title-animation">授权信息</view>
+      </view>
+      <view class="head-subtitle">完善您的头像、昵称、性别、年龄</view>
+    </view>
+
+    <!-- 表单项 -->
+    <uni-forms
+      ref="accountLoginRef"
+      v-model="state.model"
+      :rules="state.rules"
+      validateTrigger="bind"
+      labelWidth="140"
+      labelAlign="center"
+    >
+      <!-- 获取头像昵称：https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/userProfile.html -->
+      <uni-forms-item name="avatar" label="头像">
+        <button
+          class="ss-reset-button avatar-btn"
+          @click="onChooseAvatar"
+        >
+          <image
+            class="avatar-img"
+            :src="sheep.$url.cdn(state.model.avatar)"
+            mode="aspectFill"
+          />
+          <text class="cicon-forward" />
+        </button>
+      </uni-forms-item>
+      <uni-forms-item name="nickname" label="昵称">
+        <uni-easyinput
+          type="text"
+          placeholder="请输入昵称"
+          v-model="state.model.nickname"
+          :inputBorder="false"
+        />
+      </uni-forms-item>
+	  <form-sex v-model="state.model.sex"></form-sex>
+	  <uni-forms-item name="age" label="年龄">
+	    <uni-easyinput
+	      type="number"
+	      placeholder="请输入年龄"
+	      v-model="state.model.age"
+	      :inputBorder="false"
+	    />
+	  </uni-forms-item>
+      <view class="foot-box">
+        <button class="ss-reset-button authorization-btn" @tap="onConfirm"> 确认授权 </button>
+      </view>
+    </uni-forms>
+  </view>
+</template>
+
+<script setup>
+  import { computed, ref, reactive } from 'vue';
+  import sheep from '@/sheep';
+  import $store from '@/sheep/store';
+  import { closeAuthModal, showAuthModal } from '@/sheep/hooks/useModal';
+  import formSex from '@/sheep/components/s-auth-modal/components/formSex.vue';
+  import FileApi from '@/sheep/api/infra/file';
+  import UserApi from '@/sheep/api/member/user';
+
+  const props = defineProps({
+    agreeStatus: {
+      type: Boolean,
+      default: false,
+    },
+  });
+
+  const userInfo = computed(() => sheep.$store('user').userInfo);
+  
+  const isPass = computed(() => sheep.$store('user').tradeConfig.weixinEnabled);
+  
+  const friendEnabled = computed(() => sheep.$store('user').tradeConfig.friendEnabled);
+
+  const accountLoginRef = ref(null);
+
+  // 数据
+  const state = reactive({
+    model: {
+      nickname: userInfo.value.nickname,
+      avatar: userInfo.value.avatar,
+	  sex: userInfo.value.sex,
+	  age: userInfo.value.age,
+    },
+    rules: {},
+    disabledStyle: {
+      color: '#999',
+      disableColor: '#fff',
+    },
+  });
+
+  function onChooseAvatar() {
+	uni.chooseImage({
+		count: 1, //默认9
+		sourceType: ['album', 'camera'],
+		sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+		success: (res) => {
+			for (let i = 0; i < res.tempFilePaths.length; i++) {
+				uni.getImageInfo({
+					src: res.tempFilePaths[i],
+					success: (image) => {
+						uploadAvatar(image.path);
+					}
+				});
+			}
+		}
+	});
+    
+  }
+
+  // 选择头像（来自文件系统）
+  async function uploadAvatar(tempUrl) {
+    if (!tempUrl) {
+      return;
+    }
+    let { data } = await FileApi.uploadFile(tempUrl);
+    state.model.avatar = data;
+  }
+
+  // 确认授权
+  async function onConfirm() {
+    const { model } = state;
+    const { nickname, avatar, sex, age } = model;
+	if (!avatar) {
+	  sheep.$helper.toast('请选择头像');
+	  return;
+	}
+    if (!nickname) {
+      sheep.$helper.toast('请输入昵称');
+      return;
+    }
+	if (!sex) {
+	  sheep.$helper.toast('请选择性别');
+	  return;
+	}
+	if (!age || age < 18 || age > 100) {
+	  sheep.$helper.toast('请输入正确的年龄');
+	  return;
+	}
+	if (age < 18) {
+	  sheep.$helper.toast('未成年禁止注册');
+	  return;
+	}
+    // 发起更新
+    const { code } = await UserApi.updateUser({
+      avatar: state.model.avatar,
+      nickname: state.model.nickname,
+	  sex: state.model.sex,
+	  age: state.model.age,
+    });
+    // 更新成功
+    if (code === 0) {
+      sheep.$helper.toast('授权成功');
+      await sheep.$store('user').getInfo();
+	  closeAuthModal();
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import '../index.scss';
+
+  .foot-box {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+  }
+  .authorization-btn {
+    width: 686rpx;
+    height: 80rpx;
+    background-color: var(--ui-BG-Main);
+    border-radius: 40rpx;
+    color: #fff;
+  }
+  .avatar-img {
+    width: 72rpx;
+    height: 72rpx;
+    border-radius: 36rpx;
+  }
+  .cicon-forward {
+    font-size: 30rpx;
+    color: #595959;
+  }
+  .avatar-btn {
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/sheep/components/s-auth-modal/components/mp-authorization.vue b/sheep/components/s-auth-modal/components/mp-authorization.vue
new file mode 100644
index 0000000..65efd16
--- /dev/null
+++ b/sheep/components/s-auth-modal/components/mp-authorization.vue
@@ -0,0 +1,203 @@
+<!-- 微信授权信息 mpAuthorization  -->
+<template>
+  <view>
+    <!-- 标题栏 -->
+    <view class="head-box ss-m-b-60 ss-flex-col">
+      <view class="ss-flex ss-m-b-20">
+        <view class="head-title ss-m-r-40 head-title-animation">授权信息</view>
+      </view>
+      <view class="head-subtitle">完善您的头像、昵称、手机号</view>
+    </view>
+
+    <!-- 表单项 -->
+    <uni-forms
+      ref="accountLoginRef"
+      v-model="state.model"
+      :rules="state.rules"
+      validateTrigger="bind"
+      labelWidth="140"
+      labelAlign="center"
+    >
+      <!-- 获取头像昵称：https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/userProfile.html -->
+      <uni-forms-item name="avatar" label="头像">
+        <button
+          class="ss-reset-button avatar-btn"
+          open-type="chooseAvatar"
+          @chooseavatar="onChooseAvatar"
+        >
+          <image
+            class="avatar-img"
+            :src="sheep.$url.cdn(state.model.avatar)"
+            mode="aspectFill"
+            @tap="sheep.$router.go('/pages/user/info')"
+          />
+          <text class="cicon-forward" />
+        </button>
+      </uni-forms-item>
+      <uni-forms-item name="nickname" label="昵称">
+        <uni-easyinput
+          type="nickname"
+          placeholder="请输入昵称"
+          v-model="state.model.nickname"
+          :inputBorder="false"
+        />
+      </uni-forms-item>
+	  <form-sex v-model="state.model.sex"></form-sex>
+	  <uni-forms-item name="age" label="年龄">
+	    <uni-easyinput
+	      type="number"
+	      placeholder="请输入年龄"
+	      v-model="state.model.age"
+	      :inputBorder="false"
+	    />
+	  </uni-forms-item>
+      <view class="foot-box">
+        <button class="ss-reset-button authorization-btn" @tap="onConfirm"> 确认授权 </button>
+      </view>
+    </uni-forms>
+  </view>
+</template>
+
+<script setup>
+  import { computed, ref, reactive } from 'vue';
+  import sheep from '@/sheep';
+  import { closeAuthModal, showAuthModal } from '@/sheep/hooks/useModal';
+  import { WxaSubscribeTemplate } from '@/sheep/util/const';
+  import formSex from '@/sheep/components/s-auth-modal/components/formSex.vue';
+  import FileApi from '@/sheep/api/infra/file';
+  import UserApi from '@/sheep/api/member/user';
+
+  const props = defineProps({
+    agreeStatus: {
+      type: Boolean,
+      default: false,
+    },
+  });
+
+  const userInfo = computed(() => sheep.$store('user').userInfo);
+  
+  const isPass = computed(() => sheep.$store('user').tradeConfig.weixinEnabled);
+  
+  const friendEnabled = computed(() => sheep.$store('user').tradeConfig.friendEnabled);
+
+  const accountLoginRef = ref(null);
+
+  // 数据
+  const state = reactive({
+    model: {
+      nickname: userInfo.value.nickname,
+      avatar: userInfo.value.avatar,
+	  sex: userInfo.value.sex,
+	  age: userInfo.value.age,
+    },
+    rules: {},
+    disabledStyle: {
+      color: '#999',
+      disableColor: '#fff',
+    },
+  });
+
+  // 选择头像（来自微信）
+  function onChooseAvatar(e) {
+    const tempUrl = e.detail.avatarUrl || '';
+    uploadAvatar(tempUrl);
+  }
+
+  // 选择头像（来自文件系统）
+  async function uploadAvatar(tempUrl) {
+    if (!tempUrl) {
+      return;
+    }
+    let { data } = await FileApi.uploadFile(tempUrl);
+    state.model.avatar = data;
+  }
+  
+  // #ifdef MP
+  function subscribeMessage() {
+      const event = [WxaSubscribeTemplate.UNREAD_MESSAGE];
+      sheep.$platform.useProvider('wechat').subscribeMessage(event, () => {
+        // 订阅后记录一下订阅状态
+        uni.removeStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE);
+        uni.setStorageSync(WxaSubscribeTemplate.UNREAD_MESSAGE, '已订阅');
+      });
+  }
+   
+  async function autoSubscribeMessage() {
+      // 2. 订阅消息
+      subscribeMessage();
+  }
+  // #endif
+
+  // 确认授权
+  async function onConfirm() {
+	// #ifdef MP
+	autoSubscribeMessage();
+	// #endif
+	  
+    const { model } = state;
+    const { nickname, avatar, sex, age } = model;
+    if (!avatar) {
+      sheep.$helper.toast('请选择头像');
+      return;
+    }
+    if (!nickname) {
+      sheep.$helper.toast('请输入昵称');
+      return;
+    }
+    if (!sex) {
+      sheep.$helper.toast('请选择性别');
+      return;
+    }
+    if (!age || age < 18 || age > 100) {
+      sheep.$helper.toast('请输入正确的年龄');
+      return;
+    }
+	if (age < 18) {
+	  sheep.$helper.toast('未成年禁止注册');
+	  return;
+	}
+    // 发起更新
+    const { code } = await UserApi.updateUser({
+      avatar: state.model.avatar,
+      nickname: state.model.nickname,
+	  sex: state.model.sex,
+	  age: state.model.age,
+    });
+    // 更新成功
+    if (code === 0) {
+      sheep.$helper.toast('授权成功');
+      await sheep.$store('user').getInfo();
+	  closeAuthModal();
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import '../index.scss';
+
+  .foot-box {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+  }
+  .authorization-btn {
+    width: 686rpx;
+    height: 80rpx;
+    background-color: var(--ui-BG-Main);
+    border-radius: 40rpx;
+    color: #fff;
+  }
+  .avatar-img {
+    width: 72rpx;
+    height: 72rpx;
+    border-radius: 36rpx;
+  }
+  .cicon-forward {
+    font-size: 30rpx;
+    color: #595959;
+  }
+  .avatar-btn {
+    width: 100%;
+    justify-content: space-between;
+  }
+</style>
diff --git a/sheep/components/s-auth-modal/components/reset-password.vue b/sheep/components/s-auth-modal/components/reset-password.vue
new file mode 100644
index 0000000..bc1be8b
--- /dev/null
+++ b/sheep/components/s-auth-modal/components/reset-password.vue
@@ -0,0 +1,119 @@
+<!-- 重置密码（未登录时）  -->
+<template>
+  <view>
+    <!-- 标题栏 -->
+    <view class="head-box ss-m-b-60">
+      <view class="head-title ss-m-b-20">重置密码</view>
+      <view class="head-subtitle">为了您的账号安全，设置密码前请先进行安全验证</view>
+    </view>
+
+    <!-- 表单项 -->
+    <uni-forms
+      ref="resetPasswordRef"
+      v-model="state.model"
+      :rules="state.rules"
+      validateTrigger="bind"
+      labelWidth="140"
+      labelAlign="center"
+    >
+      <uni-forms-item name="mobile" label="手机号">
+        <uni-easyinput
+          placeholder="请输入手机号"
+          v-model="state.model.mobile"
+          type="number"
+          :inputBorder="false"
+        >
+          <template v-slot:right>
+            <button
+              class="ss-reset-button code-btn code-btn-start"
+              :disabled="state.isMobileEnd"
+              :class="{ 'code-btn-end': state.isMobileEnd }"
+              @tap="getSmsCode('resetPassword', state.model.mobile)"
+            >
+              {{ getSmsTimer('resetPassword') }}
+            </button>
+          </template>
+        </uni-easyinput>
+      </uni-forms-item>
+
+      <uni-forms-item name="code" label="验证码">
+        <uni-easyinput
+          placeholder="请输入验证码"
+          v-model="state.model.code"
+          type="number"
+          maxlength="4"
+          :inputBorder="false"
+        />
+      </uni-forms-item>
+
+      <uni-forms-item name="password" label="密码">
+        <uni-easyinput
+          type="password"
+          placeholder="请输入密码"
+          v-model="state.model.password"
+          :inputBorder="false"
+        >
+          <template v-slot:right>
+            <button class="ss-reset-button login-btn-start" @tap="resetPasswordSubmit">
+              确认
+            </button>
+          </template>
+        </uni-easyinput>
+      </uni-forms-item>
+    </uni-forms>
+
+    <button v-if="!isLogin" class="ss-reset-button type-btn" @tap="showAuthModal('accountLogin')">
+      返回登录
+    </button>
+  </view>
+</template>
+
+<script setup>
+  import { computed, ref, reactive, unref } from 'vue';
+  import sheep from '@/sheep';
+  import { code, mobile, password } from '@/sheep/validate/form';
+  import { showAuthModal, closeAuthModal, getSmsCode, getSmsTimer } from '@/sheep/hooks/useModal';
+  import UserApi from '@/sheep/api/member/user';
+
+  const resetPasswordRef = ref(null);
+  const isLogin = computed(() => sheep.$store('user').isLogin);
+
+  // 数据
+  const state = reactive({
+    isMobileEnd: false, // 手机号输入完毕
+    model: {
+      mobile: '', // 手机号
+      code: '', // 验证码
+      password: '', // 密码
+    },
+    rules: {
+      code,
+      mobile,
+      password,
+    },
+  });
+
+  // 重置密码
+  const resetPasswordSubmit = async () => {
+    // 参数校验
+    const validate = await unref(resetPasswordRef)
+      .validate()
+      .catch((error) => {
+        console.log('error: ', error);
+      });
+    if (!validate) {
+      return;
+    }
+    // 发起请求
+    const { code } = await UserApi.resetUserPassword(state.model);
+    if (code !== 0) {
+      return;
+    }
+    // 成功后，用户重新登录
+    showAuthModal('accountLogin')
+  };
+</script>
+
+<style lang="scss" scoped>
+  @import '../index.scss';
+</style>
diff --git a/sheep/components/s-auth-modal/components/sms-login.vue b/sheep/components/s-auth-modal/components/sms-login.vue
new file mode 100644
index 0000000..0651b78
--- /dev/null
+++ b/sheep/components/s-auth-modal/components/sms-login.vue
@@ -0,0 +1,119 @@
+<!-- 短信登录 - smsLogin  -->
+<template>
+  <view>
+    <!-- 标题栏 -->
+    <view class="head-box ss-m-b-60">
+      <view class="ss-flex ss-m-b-20">
+        <view class="head-title head-title-line head-title-animation">短信登录</view>
+        <view class="head-title-active ss-m-r-40" @tap="showAuthModal('accountLogin')">
+          账号登录
+        </view>
+      </view>
+      <view class="head-subtitle">未注册的手机号，验证后自动注册账号</view>
+    </view>
+
+    <!-- 表单项 -->
+    <uni-forms
+      ref="smsLoginRef"
+      v-model="state.model"
+      :rules="state.rules"
+      validateTrigger="bind"
+      labelWidth="140"
+      labelAlign="center"
+    >
+      <uni-forms-item name="mobile" label="手机号">
+        <uni-easyinput
+          placeholder="请输入手机号"
+          v-model="state.model.mobile"
+          :inputBorder="false"
+          type="number"
+        >
+          <template v-slot:right>
+            <button
+              class="ss-reset-button code-btn code-btn-start"
+              :disabled="state.isMobileEnd"
+              :class="{ 'code-btn-end': state.isMobileEnd }"
+              @tap="getSmsCode('smsLogin', state.model.mobile)"
+            >
+              {{ getSmsTimer('smsLogin') }}
+            </button>
+          </template>
+        </uni-easyinput>
+      </uni-forms-item>
+
+      <uni-forms-item name="code" label="验证码">
+        <uni-easyinput
+          placeholder="请输入验证码"
+          v-model="state.model.code"
+          :inputBorder="false"
+          type="number"
+          maxlength="4"
+        >
+          <template v-slot:right>
+            <button class="ss-reset-button login-btn-start" @tap="smsLoginSubmit"> 登录 </button>
+          </template>
+        </uni-easyinput>
+      </uni-forms-item>
+    </uni-forms>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive, unref } from 'vue';
+  import sheep from '@/sheep';
+  import { code, mobile } from '@/sheep/validate/form';
+  import { showAuthModal, closeAuthModal, getSmsCode, getSmsTimer } from '@/sheep/hooks/useModal';
+  import AuthUtil from '@/sheep/api/member/auth';
+
+  const smsLoginRef = ref(null);
+
+  const emits = defineEmits(['onConfirm']);
+
+  const props = defineProps({
+    agreeStatus: {
+      type: Boolean,
+      default: false,
+    },
+  });
+
+  // 数据
+  const state = reactive({
+    isMobileEnd: false, // 手机号输入完毕
+    codeText: '获取验证码',
+    model: {
+      mobile: '', // 手机号
+      code: '', // 验证码
+    },
+    rules: {
+      code,
+      mobile,
+    },
+  });
+
+  // 短信登录
+  async function smsLoginSubmit() {
+    // 参数校验
+    const validate = await unref(smsLoginRef)
+      .validate()
+      .catch((error) => {
+        console.log('error: ', error);
+      });
+    if (!validate) {
+      return;
+    }
+    if (!props.agreeStatus) {
+      emits('onConfirm', true)
+      sheep.$helper.toast('请勾选同意');
+      return;
+    }
+    // 提交数据
+    const { code } = await AuthUtil.smsLogin(state.model);
+    if (code === 0) {
+      closeAuthModal();
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import '../index.scss';
+</style>
diff --git a/sheep/components/s-auth-modal/index.scss b/sheep/components/s-auth-modal/index.scss
new file mode 100644
index 0000000..c4424e7
--- /dev/null
+++ b/sheep/components/s-auth-modal/index.scss
@@ -0,0 +1,151 @@
+@keyframes title-animation {
+  0% {
+    font-size: 32rpx;
+  }
+  100% {
+    font-size: 36rpx;
+  }
+}
+
+.login-wrap {
+  padding: 50rpx 34rpx;
+  min-height: 500rpx;
+  background-color: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+}
+
+.head-box {
+  .head-title {
+    min-width: 160rpx;
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333333;
+    line-height: 36rpx;
+  }
+  .head-title-active {
+    width: 160rpx;
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #999;
+    line-height: 36rpx;
+  }
+  .head-title-animation {
+    animation-name: title-animation;
+    animation-duration: 0.1s;
+    animation-timing-function: ease-out;
+    animation-fill-mode: forwards;
+  }
+  .head-title-line {
+    position: relative;
+    &::before {
+      content: '';
+      width: 1rpx;
+      height: 34rpx;
+      background-color: #e4e7ed;
+      position: absolute;
+      left: -30rpx;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+  .head-subtitle {
+    font-size: 26rpx;
+    font-weight: 400;
+    color: #afb6c0;
+    text-align: left;
+    display: flex;
+  }
+}
+
+// .code-btn[disabled] {
+// 	background-color: #fff;
+// }
+.code-btn-start {
+  width: 160rpx;
+  height: 56rpx;
+  line-height: normal;
+  border: 2rpx solid var(--ui-BG-Main);
+  border-radius: 28rpx;
+  font-size: 26rpx;
+  font-weight: 400;
+  color: var(--ui-BG-Main);
+  opacity: 1;
+}
+
+.forgot-btn {
+  width: 160rpx;
+  line-height: 56rpx;
+  font-size: 30rpx;
+  font-weight: 500;
+  color: #999;
+}
+
+.login-btn-start {
+  width: 158rpx;
+  height: 56rpx;
+  line-height: normal;
+  background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+  border-radius: 28rpx;
+  font-size: 26rpx;
+  font-weight: 500;
+  color: #fff;
+}
+
+.type-btn {
+  padding: 20rpx;
+  margin: 40rpx auto;
+  width: 200rpx;
+  font-size: 30rpx;
+  font-weight: 500;
+  color: #999999;
+}
+
+.auto-login-box {
+  width: 100%;
+  .auto-login-btn {
+    width: 68rpx;
+    height: 68rpx;
+    border-radius: 50%;
+    margin: 0 30rpx;
+  }
+  .auto-login-img {
+    width: 68rpx;
+    height: 68rpx;
+    border-radius: 50%;
+  }
+}
+
+.agreement-box {
+  margin: 80rpx auto 0;
+  .protocol-check {
+    transform: scale(0.7);
+  }
+  .agreement-text {
+    font-size: 26rpx;
+    font-weight: 500;
+    color: #999999;
+    .tcp-text {
+      color: var(--ui-BG-Main);
+    }
+  }
+}
+
+// 修改密码
+.editPwd-btn-box {
+  .save-btn {
+    width: 690rpx;
+    line-height: 70rpx;
+    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    border-radius: 35rpx;
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #ffffff;
+  }
+  .forgot-btn {
+    width: 690rpx;
+    line-height: 70rpx;
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #999999;
+  }
+}
diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue
new file mode 100644
index 0000000..0d591a9
--- /dev/null
+++ b/sheep/components/s-auth-modal/s-auth-modal.vue
@@ -0,0 +1,256 @@
+<template>
+  <!-- 规格弹窗 -->
+  <su-popup :show="authType !== ''" round="10" :showClose="true" @close="closeAuthModal">
+    <view class="login-wrap">
+      <!-- 1. 账号密码登录 accountLogin -->
+      <account-login
+        v-if="authType === 'accountLogin'"
+        :agreeStatus="state.protocol"
+        @onConfirm="onConfirm"
+      />
+
+	  <block v-if="['H5', 'App'].includes(sheep.$platform.name)">
+		  <!-- 2. 短信登录  smsLogin -->
+		  <sms-login v-if="authType === 'smsLogin'" :agreeStatus="state.protocol" @onConfirm="onConfirm" />
+	  </block>
+
+      <!-- 3. 忘记密码 resetPassword-->
+      <reset-password v-if="authType === 'resetPassword'" />
+
+      <!-- 4. 绑定手机号 changeMobile -->
+      <change-mobile v-if="authType === 'changeMobile'" />
+
+      <!-- 5. 修改密码 changePassword-->
+      <changePassword v-if="authType === 'changePassword'" />
+
+      <!-- 6. 微信小程序授权 -->
+      <mp-authorization v-if="authType === 'mpAuthorization'" />
+	  
+	  <!-- h5授权 -->
+	  <h5-authorization v-if="authType === 'h5Authorization'" />
+	  
+	  <!-- 完善资料 -->
+	  <chat-authorization v-if="authType === 'chatAuthorization'" />
+
+      <!-- 7. 第三方登录 -->
+      <view
+        v-if="['accountLogin', 'smsLogin'].includes(authType)"
+        class="auto-login-box ss-flex ss-flex-col ss-row-center ss-col-center"
+      >
+        <!-- 7.1 微信小程序的快捷登录 -->
+        <!-- <view v-if="sheep.$platform.name === 'WechatMiniProgram'" class="ss-flex register-box">
+          <view class="register-title">还没有账号?</view>
+          <button class="ss-reset-button login-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+            快捷登录
+          </button>
+          <view class="circle" />
+        </view> -->
+
+        <!-- 7.2 微信的公众号、App、小程序的登录，基于 openid + code -->
+        <button
+          v-if="
+            ['WechatOfficialAccount', 'WechatMiniProgram', 'App'].includes(sheep.$platform.name) &&
+            sheep.$platform.isWechatInstalled
+          "
+          @tap="thirdLogin('wechat')"
+          class="ss-reset-button auto-login-btn"
+        >
+          <image
+            class="auto-login-img"
+            src="https://rbtnet.oss-cn-hangzhou.aliyuncs.com/1a2e97b866fd3de0b3c5c225a9cd3c705a645b0f76ad2ad8b0e25c8e6e20ab38.png"
+          />
+        </button>
+
+        <!-- 7.3 iOS 登录 TODO 芋艿：等后面搞 App 再弄 -->
+        <button
+          v-if="sheep.$platform.os === 'ios' && sheep.$platform.name === 'App'"
+          @tap="thirdLogin('apple')"
+          class="ss-reset-button auto-login-btn"
+        >
+          <image
+            class="auto-login-img"
+            :src="sheep.$url.static('/static/img/shop/platform/apple.png')"
+          />
+        </button>
+      </view>
+
+      <!-- 用户协议的勾选 -->
+      <view
+        v-if="['accountLogin', 'smsLogin'].includes(authType)"
+        class="agreement-box ss-flex ss-row-center"
+        :class="{ shake: currentProtocol }"
+      >
+        <label class="radio ss-flex ss-col-center" @tap="onChange">
+          <radio
+            :checked="state.protocol"
+            color="var(--ui-BG-Main)"
+            style="transform: scale(0.8)"
+            @tap.stop="onChange"
+          />
+          <view class="agreement-text ss-flex ss-col-center ss-m-l-8">
+            我已阅读并遵守
+            <view class="tcp-text" @tap.stop="onProtocol('用户协议')">
+              《用户协议》
+            </view>
+            <view class="agreement-text">与</view>
+            <view class="tcp-text" @tap.stop="onProtocol('隐私协议')">
+              《隐私协议》
+            </view>
+          </view>
+        </label>
+      </view>
+      <view class="safe-box"/>
+    </view>
+  </su-popup>
+</template>
+
+<script setup>
+  import { computed, reactive, ref } from 'vue';
+  import sheep from '@/sheep';
+  import accountLogin from './components/account-login.vue';
+  import smsLogin from './components/sms-login.vue';
+  import resetPassword from './components/reset-password.vue';
+  import changeMobile from './components/change-mobile.vue';
+  import changePassword from './components/change-password.vue';
+  import mpAuthorization from './components/mp-authorization.vue';
+  import h5Authorization from './components/h5-authorization.vue';
+  import chatAuthorization from './components/chat-authorization.vue';
+  import { closeAuthModal, showAuthModal } from '@/sheep/hooks/useModal';
+
+  const appInfo = computed(() => sheep.$store('app').info);
+
+  const modalStore = sheep.$store('modal');
+  // 授权弹窗类型
+  const authType = computed(() => modalStore.auth);
+
+  const state = reactive({
+    protocol: false,
+  });
+
+  const currentProtocol = ref(false);
+  
+  // 勾选协议
+  function onChange() {
+    state.protocol = !state.protocol;
+  }
+  
+  // 查看协议
+  function onProtocol(title) {
+    closeAuthModal();
+    sheep.$router.go('/pages/public/richtext', {
+      title,
+    });
+  }
+
+  // 点击登录 / 注册事件
+  function onConfirm(e) {
+    currentProtocol.value = e;
+    setTimeout(() => {
+      currentProtocol.value = false;
+    }, 1000);
+  }
+
+  // 第三方授权登陆（微信小程序、Apple）
+  const thirdLogin = async (provider) => {
+    if (!state.protocol) {
+      currentProtocol.value = true;
+      setTimeout(() => {
+        currentProtocol.value = false;
+      }, 1000);
+      sheep.$helper.toast('请勾选同意');
+      return;
+    }
+    const loginRes = await sheep.$platform.useProvider(provider).login();
+    if (loginRes) {
+	  const userInfo = await sheep.$store('user').getInfo();
+	  closeAuthModal();
+	  // 如果用户已经有头像和昵称,不要每次登录都要重新上传头像。	   
+	  if(userInfo.visible) return;
+      // 触发小程序授权信息弹框
+      // #ifdef MP-WEIXIN
+      showAuthModal('mpAuthorization');
+      // #endif
+	  
+	  // #ifndef MP-WEIXIN
+	  showAuthModal('h5Authorization');
+	  // #endif
+    }
+  };
+
+  // 微信小程序的“手机号快速验证”：https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/getPhoneNumber.html
+  const getPhoneNumber = async (e) => {
+    if (e.detail.errMsg !== 'getPhoneNumber:ok') {
+      sheep.$helper.toast('快捷登录失败');
+      return;
+    }
+    let result = await sheep.$platform.useProvider().mobileLogin(e.detail);
+    if (result) {
+      closeAuthModal();
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  @import './index.scss';
+
+  .shake {
+    animation: shake 0.05s linear 4 alternate;
+  }
+
+  @keyframes shake {
+    from {
+      transform: translateX(-10rpx);
+    }
+    to {
+      transform: translateX(10rpx);
+    }
+  }
+
+  .register-box {
+    position: relative;
+    justify-content: center;
+    .register-btn {
+      color: #999999;
+      font-size: 30rpx;
+      font-weight: 500;
+    }
+    .register-title {
+      color: #999999;
+      font-size: 30rpx;
+      font-weight: 400;
+      margin-right: 24rpx;
+    }
+    .or-title {
+      margin: 0 16rpx;
+      color: #999999;
+      font-size: 30rpx;
+      font-weight: 400;
+    }
+    .login-btn {
+      color: var(--ui-BG-Main);
+      font-size: 30rpx;
+      font-weight: 500;
+    }
+    .circle {
+      position: absolute;
+      right: 0rpx;
+      top: 18rpx;
+      width: 8rpx;
+      height: 8rpx;
+      border-radius: 8rpx;
+      background: var(--ui-BG-Main);
+    }
+  }
+  .safe-box {
+    height: calc(constant(safe-area-inset-bottom) / 5 * 3);
+    height: calc(env(safe-area-inset-bottom) / 5 * 3);
+  }
+
+  .tcp-text {
+    color: var(--ui-BG-Main);
+  }
+
+  .agreement-text {
+    color: $dark-9;
+  }
+</style>
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
new file mode 100644
index 0000000..5e65b36
--- /dev/null
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -0,0 +1,81 @@
+<template>
+  <view>
+    <!-- 基础组件：搜索框 -->
+    <s-search-block v-if="type === 'SearchBar'" :data="data" :styles="styles" :navbar="false" />
+    <!-- 基础组件：公告栏 -->
+    <s-notice-block v-if="type === 'NoticeBar'" :data="data" />
+    <!-- 基础组件：菜单导航 -->
+    <s-menu-button v-if="type === 'MenuSwiper'" :data="data" :styles="styles" />
+    <!-- 基础组件：列表导航 -->
+    <s-menu-list v-if="type === 'MenuList'" :data="data" />
+    <!-- 基础组件：宫格导航 -->
+    <s-menu-grid v-if="type === 'MenuGrid'" :data="data" :styles="styles" />
+    <!-- 基础组件：弹窗广告 -->
+    <s-popup-image v-if="type === 'Popover'" :data="data" />
+    <!-- 基础组件：悬浮按钮 -->
+    <s-float-menu v-if="type === 'FloatingActionButton'" :data="data" />
+
+    <!-- 图文组件：图片展示 -->
+    <s-image-block v-if="type === 'ImageBar'" :data="data" :styles="styles" />
+    <!-- 图文组件：图片轮播 -->
+    <s-image-banner v-if="type === 'Carousel'" :data="data" :styles="styles" />
+    <!-- 基础组件：标题栏 -->
+    <s-title-block v-if="type === 'TitleBar'" :data="data" :styles="styles" />
+    <!-- 图文组件：广告魔方 -->
+    <s-image-cube v-if="type === 'MagicCube'" :data="data" :styles="styles" />
+    <!-- 图文组件：视频播放 -->
+    <s-video-block v-if="type === 'VideoPlayer'" :data="data" :styles="styles" />
+    <!-- 基础组件：分割线 -->
+    <s-line-block v-if="type === 'Divider'" :data="data" />
+    <!-- 图文组件：热区 -->
+    <s-hotzone-block v-if="type === 'HotZone'" :data="data" :styles="styles" />
+
+    <!-- 商品组件：商品卡片 -->
+    <s-goods-card v-if="type === 'ProductCard'" :data="data" :styles="styles" />
+    <!-- 商品组件：商品栏 -->
+    <s-goods-shelves v-if="type === 'ProductList'" :data="data" :styles="styles" />
+
+    <!-- 营销组件：拼团 -->
+    <s-groupon-block v-if="type === 'PromotionCombination'" :data="data" :styles="styles" />
+    <!-- 营销组件：秒杀 -->
+    <s-seckill-block v-if="type === 'PromotionSeckill'" :data="data" :styles="styles" />
+    <!-- 营销组件：小程序直播（暂时没有这个功能） -->
+    <s-live-block v-if="type === 'MpLive'" :data="data" :styles="styles" />
+    <!-- 营销组件：优惠券 -->
+    <s-coupon-block v-if="type === 'CouponCard'" :data="data" :styles="styles" />
+    <!-- 营销组件：文章 -->
+    <s-richtext-block v-if="type === 'PromotionArticle'" :data="data" :styles="styles" />
+
+    <!-- 用户组件：用户卡片 -->
+    <s-user-card v-if="type === 'UserCard'" :data="data" :styles="styles" />
+    <!-- 用户组件：用户订单 -->
+    <s-order-card v-if="type === 'UserOrder'" :data="data" :styles="styles" />
+    <!-- 用户组件：用户资产 -->
+    <s-wallet-card v-if="type === 'UserWallet'" :data="data" :styles="styles" />
+    <!-- 用户组件：用户卡券 -->
+    <s-coupon-card v-if="type === 'UserCoupon'" :data="data" :styles="styles" />
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 装修组件 - 组件集
+   */
+  const props = defineProps({
+    type: {
+      type: String,
+      default: '',
+    },
+    data: {
+      type: Object,
+      default() {},
+    },
+    styles: {
+      type: Object,
+      default() {},
+    },
+  });
+  function onSearch() {}
+</script>
+
+<style></style>
diff --git a/sheep/components/s-block/s-block.vue b/sheep/components/s-block/s-block.vue
new file mode 100644
index 0000000..152b8a6
--- /dev/null
+++ b/sheep/components/s-block/s-block.vue
@@ -0,0 +1,54 @@
+<!-- 装修组件容器 -->
+<template>
+  <view :style="[elStyles, elBackground]"><slot /></view>
+</template>
+
+<script setup>
+  /**
+   * 容器组件 - 装修组件的样式容器
+   */
+  import { computed, provide, unref } from 'vue';
+  import sheep from '@/sheep';
+
+  const props = defineProps({
+    styles: {
+      type: Object,
+      default() {},
+    },
+  });
+
+  // 组件样式
+
+  const elBackground = computed(() => {
+    if (props.styles) {
+      if (props.styles.bgType === 'color')
+        return { background: props.styles.bgColor };
+      if (props.styles.bgType === 'img')
+        return {
+          background: `url(${sheep.$url.cdn(
+            props.styles.bgImage,
+          )}) no-repeat top center / 100% auto`,
+        };
+    }
+  });
+
+  const elStyles = computed(() => {
+    if (props.styles) {
+      return {
+        marginTop: `${props.styles.marginTop || 0}px`,
+        marginBottom: `${props.styles.marginBottom || 0}px`,
+        marginLeft: `${props.styles.marginLeft || 0}px`,
+        marginRight: `${props.styles.marginRight || 0}px`,
+        paddingTop: `${props.styles.paddingTop || 0}px`,
+        paddingRight: `${props.styles.paddingRight || 0}px`,
+        paddingBottom: `${props.styles.paddingBottom || 0}px`,
+        paddingLeft: `${props.styles.paddingLeft || 0}px`,
+        borderTopLeftRadius: `${props.styles.borderTopLeftRadius || 0}px`,
+        borderTopRightRadius: `${props.styles.borderTopRightRadius || 0}px`,
+        borderBottomRightRadius: `${props.styles.borderBottomRightRadius || 0}px`,
+        borderBottomLeftRadius: `${props.styles.borderBottomLeftRadius || 0}px`,
+        overflow: 'hidden',
+      };
+    }
+  });
+</script>
diff --git a/sheep/components/s-count-down/s-count-down.vue b/sheep/components/s-count-down/s-count-down.vue
new file mode 100644
index 0000000..98b3a1f
--- /dev/null
+++ b/sheep/components/s-count-down/s-count-down.vue
@@ -0,0 +1,173 @@
+<template>
+	<view class="time" :style="justifyLeft">
+		<text class="" v-if="tipText">{{ tipText }}</text>
+		<text class="styleAll p6" v-if="isDay === true"
+			:style="{background:bgColor.bgColor,color:bgColor.Color}">{{ day }}{{bgColor.isDay?'天':''}}</text>
+		<text class="timeTxt" v-if="dayText"
+			:style="{width:bgColor.timeTxtwidth,color:bgColor.bgColor}">{{ dayText }}</text>
+		<text class="styleAll" :class='isCol?"timeCol":""'
+			:style="{background:bgColor.bgColor,color:bgColor.Color,width:bgColor.width}">{{ hour }}</text>
+		<text class="timeTxt" v-if="hourText" :class='isCol?"whit":""'
+			:style="{width:bgColor.timeTxtwidth,color:bgColor.bgColor}">{{ hourText }}</text>
+		<text class="styleAll" :class='isCol?"timeCol":""'
+			:style="{background:bgColor.bgColor,color:bgColor.Color,width:bgColor.width}">{{ minute }}</text>
+		<text class="timeTxt" v-if="minuteText" :class='isCol?"whit":""'
+			:style="{width:bgColor.timeTxtwidth,color:bgColor.bgColor}">{{ minuteText }}</text>
+		<text class="styleAll" :class='isCol?"timeCol":""'
+			:style="{background:bgColor.bgColor,color:bgColor.Color,width:bgColor.width}">{{ second }}</text>
+		<text class="timeTxt" v-if="secondText">{{ secondText }}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "countDown",
+		props: {
+			justifyLeft: {
+				type: String,
+				default: ""
+			},
+			//距离开始提示文字
+			tipText: {
+				type: String,
+				default: "倒计时"
+			},
+			dayText: {
+				type: String,
+				default: "天"
+			},
+			hourText: {
+				type: String,
+				default: "时"
+			},
+			minuteText: {
+				type: String,
+				default: "分"
+			},
+			secondText: {
+				type: String,
+				default: "秒"
+			},
+			datatime: {
+				type: Number,
+				default: 0
+			},
+			isDay: {
+				type: Boolean,
+				default: true
+			},
+			isCol: {
+				type: Boolean,
+				default: false
+			},
+			bgColor: {
+				type: Object,
+				default: null
+			}
+		},
+		data: function() {
+			return {
+				day: "00",
+				hour: "00",
+				minute: "00",
+				second: "00"
+			};
+		},
+		created: function() {
+			this.show_time();
+		},
+		mounted: function() {},
+		methods: {
+			show_time: function() {
+				let that = this;
+
+				function runTime() {
+					//时间函数
+					let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差；
+					let day = 0,
+						hour = 0,
+						minute = 0,
+						second = 0;
+					if (intDiff > 0) {
+						//转换时间
+						if (that.isDay === true) {
+							day = Math.floor(intDiff / (60 * 60 * 24));
+						} else {
+							day = 0;
+						}
+						hour = Math.floor(intDiff / (60 * 60)) - day * 24;
+						minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60;
+						second =
+							Math.floor(intDiff) -
+							day * 24 * 60 * 60 -
+							hour * 60 * 60 -
+							minute * 60;
+						if (hour <= 9) hour = "0" + hour;
+						if (minute <= 9) minute = "0" + minute;
+						if (second <= 9) second = "0" + second;
+						that.day = day;
+						that.hour = hour;
+						that.minute = minute;
+						that.second = second;
+					} else {
+						that.day = "00";
+						that.hour = "00";
+						that.minute = "00";
+						that.second = "00";
+					}
+				}
+				runTime();
+				setInterval(runTime, 1000);
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.p6 {
+		padding: 0 8rpx;
+	}
+
+	.styleAll {
+		/* color: #fff; */
+		font-size: 24rpx;
+		height: 36rpx;
+		line-height: 36rpx;
+		border-radius: 6rpx;
+		text-align: center;
+		/* padding: 0 6rpx; */
+	}
+
+	.timeTxt {
+		text-align: center;
+		/* width: 16rpx; */
+		height: 36rpx;
+		line-height: 36rpx;
+		display: inline-block;
+	}
+
+	.whit {
+		color: #fff !important;
+	}
+
+	.time {
+		display: flex;
+		justify-content: center;
+	}
+
+	.red {
+		color: #fc4141;
+		margin: 0 4rpx;
+	}
+
+	.timeCol {
+		/* width: 40rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		text-align:center;
+		border-radius: 6px;
+		background: #fff;
+		font-size: 24rpx; */
+		color: #E93323;
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
new file mode 100644
index 0000000..89a0f0e
--- /dev/null
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -0,0 +1,176 @@
+<!-- 装修营销组件：优惠券  -->
+<template>
+	<scroll-view class="scroll-box" scroll-x scroll-anchoring :style="[bgStyle, { marginLeft: `${data.space}px` }]">
+		<view class="coupon-box ss-flex" :style="couponList.length === 2 ? couponBoxStyleTwo : couponBoxStyleNormal">
+			<view class="coupon-item" :style="[couponBg, { marginLeft: `${data.space}px` }]"
+				v-for="(item, index) in couponList" :key="index">
+				<su-coupon :size="SIZE_LIST[columns - 1]" :textColor="data.textColor" background="" :couponId="item.id"
+					:title="item.name" :type="formatCouponDiscountType(item)" :value="formatCouponDiscountValue(item)"
+					:sellBy="formatValidityType(item)">
+					<template v-slot:btn>
+						<!-- 两列时，领取按钮坚排 -->
+						<button v-if="columns === 2" @click.stop="onGetCoupon(item.id)"
+							class="ss-reset-button card-btn vertical" :style="[btnStyles]">
+							<view class="btn-text">立即领取</view>
+						</button>
+						<button v-else class="ss-reset-button card-btn" :style="[btnStyles]"
+							@click.stop="onGetCoupon(item.id)">
+							立即领取
+						</button>
+					</template>
+				</su-coupon>
+			</view>
+		</view>
+	</scroll-view>
+</template>
+
+<script setup>
+	import sheep from '@/sheep';
+	import CouponApi from '@/sheep/api/promotion/coupon';
+	import {
+		ref,
+		onMounted,
+		computed
+	} from 'vue';
+	import {
+		CouponTemplateValidityTypeEnum,
+		PromotionDiscountTypeEnum
+	} from "@/sheep/util/const";
+	import {
+		floatToFixed2,
+		formatDate
+	} from "@/sheep/util";
+
+	const props = defineProps({
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		styles: {
+			type: Object,
+			default: () => ({}),
+		},
+	});
+	const {
+		columns,
+		button
+	} = props.data;
+	const SIZE_LIST = ['lg', 'md', 'xs']
+	const couponBg = {
+		background: `url(${sheep.$url.cdn(props.data.bgImg)}) no-repeat top center / 100% 100%`,
+	};
+	const btnStyles = {
+		background: button.bgColor,
+		color: button.color,
+	};
+	// 两列优惠券时的排版方式
+	const couponBoxStyleNormal = {
+		'display': 'flex',
+		'justify-content': 'space-between'
+	};
+	// 非两列优惠券时的排版方式
+	const couponBoxStyleTwo = {
+		'display': 'flex',
+		'justify-content': 'space-around'
+	};
+	// 设置背景样式
+	const bgStyle = computed(() => {
+		// 直接从 props.styles 解构
+		const {
+			bgType,
+			bgImg,
+			bgColor
+		} = props.styles;
+
+		// 根据 bgType 返回相应的样式
+		return {
+			background: bgType === 'img' ? `url(${bgImg}) no-repeat top center / 100% 100%` : bgColor
+		};
+	});
+	// 格式化【折扣类型】
+	const formatCouponDiscountType = (coupon) => {
+		if (coupon.discountType === PromotionDiscountTypeEnum.PRICE.type) {
+			return 'reduce'
+		}
+		if (coupon.discountType === PromotionDiscountTypeEnum.PERCENT.type) {
+			return 'percent'
+		}
+		return `未知【${coupon.discountType}】`
+	}
+
+	// 格式化【折扣】
+	const formatCouponDiscountValue = (coupon) => {
+		if (coupon.discountType === PromotionDiscountTypeEnum.PRICE.type) {
+			return floatToFixed2(coupon.discountPrice)
+		}
+		if (coupon.discountType === PromotionDiscountTypeEnum.PERCENT.type) {
+			return coupon.discountPercent
+		}
+		return `未知【${coupon.discountType}】`
+	}
+
+	// 格式化【有效期限】
+	const formatValidityType = (row) => {
+		if (row.validityType === CouponTemplateValidityTypeEnum.DATE.type) {
+			return `${formatDate(row.validStartTime)} 至 ${formatDate(row.validEndTime)}`
+		}
+		if (row.validityType === CouponTemplateValidityTypeEnum.TERM.type) {
+			return `领取后第 ${row.fixedStartTerm} - ${row.fixedEndTerm} 天内可用`
+		}
+		return '未知【' + row.validityType + '】'
+	}
+
+	const couponList = ref([]);
+	// 立即领取优惠券
+	async function onGetCoupon(id) {
+		const {
+			error,
+			msg
+		} = await CouponApi.takeCoupon(id);
+		if (error === 0) {
+			uni.showToast({
+				title: msg,
+				icon: 'none',
+			});
+			return
+		}
+		await getCouponTemplateList()
+	}
+	const getCouponTemplateList = async () => {
+		const {
+			data
+		} = await CouponApi.getCouponTemplateListByIds(props.data.couponIds.join(','));
+		couponList.value = data;
+	}
+	onMounted(() => {
+		getCouponTemplateList()
+	});
+</script>
+
+<style lang="scss" scoped>
+	.card-btn {
+		width: 140rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		font-size: 24rpx;
+		line-height: 50rpx;
+
+		&.vertical {
+			width: 50rpx;
+			height: 140rpx;
+			margin: auto 20rpx auto 0;
+
+			.btn-text {
+				font-size: 24rpx;
+				text-align: center;
+				writing-mode: vertical-lr;
+			}
+		}
+	}
+
+	.coupon-item {
+		&:nth-of-type(1) {
+			margin-left: 0 !important;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-coupon-card/s-coupon-card.vue b/sheep/components/s-coupon-card/s-coupon-card.vue
new file mode 100644
index 0000000..dac69e3
--- /dev/null
+++ b/sheep/components/s-coupon-card/s-coupon-card.vue
@@ -0,0 +1,102 @@
+<!-- 装修用户组件：用户卡券 -->
+<template>
+	<view class="ss-coupon-menu-wrap ss-flex ss-col-center" :style="[bgStyle, { marginLeft: `${data.space}px` }]">
+		<view class="menu-item ss-flex-col ss-row-center ss-col-center" v-for="item in props.list" :key="item.title"
+			@tap="sheep.$router.go(item.path, { type: item.type })"
+			:class="item.type === 'all' ? 'menu-wallet' : 'ss-flex-1'">
+			<image class="item-icon" :src="sheep.$url.static(item.icon)" mode="aspectFit"></image>
+			<view class="menu-title ss-m-t-28">{{ item.title }}</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	/**
+	 * 装修组件 - 优惠券菜单
+	 */
+	import sheep from '@/sheep';
+	import { computed } from 'vue';
+
+	// 接收参数
+	const props = defineProps({
+		list: {
+			type: Array,
+			default () {
+				return [{
+						title: '已领取',
+						value: '0',
+						icon: '/static/img/shop/order/nouse_coupon.png',
+						path: '/pages/coupon/list',
+						type: 'geted',
+					},
+					{
+						title: '已使用',
+						value: '0',
+						icon: '/static/img/shop/order/useend_coupon.png',
+						path: '/pages/coupon/list',
+						type: 'used',
+					},
+					{
+						title: '已失效',
+						value: '0',
+						icon: '/static/img/shop/order/out_coupon.png',
+						path: '/pages/coupon/list',
+						type: 'expired',
+					},
+					{
+					  title: '领券中心',
+					  value: '0',
+					  icon: '/static/img/shop/order/all_coupon.png',
+					  path: '/pages/coupon/list',
+					  type: 'all',
+					},
+				];
+			},
+		},
+		// 装修数据
+		data: {
+		  type: Object,
+		  default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+		  type: Object,
+		  default: () => ({}),
+		},
+	});
+	// 设置背景样式
+	const bgStyle = computed(() => {
+	  // 直接从 props.styles 解构
+	  const { bgType, bgImg, bgColor } = props.styles; 
+	
+	  // 根据 bgType 返回相应的样式
+	  return {
+		background: bgType === 'img'
+			? `url(${bgImg}) no-repeat top center / 100% 100%`
+			: bgColor
+		};
+	});
+</script>
+
+<style lang="scss" scoped>
+	.ss-coupon-menu-wrap {
+		.menu-item {
+			height: 160rpx;
+
+			.menu-title {
+				font-size: 24rpx;
+				line-height: 24rpx;
+				color: #333333;
+			}
+
+			.item-icon {
+				width: 44rpx;
+				height: 44rpx;
+			}
+		}
+
+		.menu-wallet {
+			width: 144rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-coupon-get/s-coupon-get.vue b/sheep/components/s-coupon-get/s-coupon-get.vue
new file mode 100644
index 0000000..6df6b55
--- /dev/null
+++ b/sheep/components/s-coupon-get/s-coupon-get.vue
@@ -0,0 +1,109 @@
+<!-- 商品详情 - 优惠劵领取 -->
+<template>
+  <su-popup
+    :show="show"
+    type="bottom"
+    round="20"
+    @close="emits('close')"
+    showClose
+    backgroundColor="#f2f2f2"
+  >
+    <view class="model-box">
+      <view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠券</view>
+      <scroll-view
+        class="model-content"
+        scroll-y
+        :scroll-with-animation="false"
+        :enable-back-to-top="true"
+      >
+        <view class="subtitle ss-m-l-20">可使用优惠券</view>
+        <view v-for="item in state.couponInfo" :key="item.id">
+          <s-coupon-list :data="item">
+            <template #default>
+              <button
+                class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center"
+                :class="!item.canTake ? 'boder-btn' : ''"
+                @click.stop="getBuy(item.id)"
+                :disabled="!item.canTake"
+              >
+                {{ item.canTake ? '立即领取' : '已领取' }}
+              </button>
+            </template>
+          </s-coupon-list>
+        </view>
+      </scroll-view>
+    </view>
+  </su-popup>
+</template>
+<script setup>
+  import { computed, reactive } from 'vue';
+
+  const props = defineProps({
+    modelValue: {
+      type: Object,
+      default() {},
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    },
+  });
+
+  const emits = defineEmits(['get', 'close']);
+
+  const state = reactive({
+    couponInfo: computed(() => props.modelValue)
+  });
+
+  // 领取优惠劵
+  const getBuy = (id) => {
+    emits('get', id);
+  };
+</script>
+<style lang="scss" scoped>
+  .model-box {
+    height: 60vh;
+    .title {
+      font-size: 36rpx;
+      height: 80rpx;
+      font-weight: bold;
+      color: #333333;
+    }
+    .subtitle {
+      font-size: 26rpx;
+      font-weight: 500;
+      color: #333333;
+    }
+  }
+  .model-content {
+    height: 54vh;
+  }
+  .modal-footer {
+    width: 100%;
+    height: 120rpx;
+    background: #fff;
+  }
+  .confirm-btn {
+    width: 710rpx;
+    margin-left: 20rpx;
+    height: 80rpx;
+    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    border-radius: 40rpx;
+    color: #fff;
+  }
+  // 优惠券按钮
+  .card-btn {
+    // width: 144rpx;
+    padding: 0 16rpx;
+    height: 50rpx;
+    border-radius: 40rpx;
+    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    color: #ffffff;
+    font-size: 24rpx;
+    font-weight: 400;
+  }
+  .boder-btn {
+    background: linear-gradient(90deg, var(--ui-BG-Main-opacity-4), var(--ui-BG-Main-light));
+    color: #fff !important;
+  }
+</style>
diff --git a/sheep/components/s-coupon-list/s-coupon-list.vue b/sheep/components/s-coupon-list/s-coupon-list.vue
new file mode 100644
index 0000000..411a4c0
--- /dev/null
+++ b/sheep/components/s-coupon-list/s-coupon-list.vue
@@ -0,0 +1,205 @@
+<template>
+  <view class="ss-m-20" :style="{ opacity: disabled ? '0.5' : '1' }">
+    <view class="content">
+      <view
+        class="tag ss-flex ss-row-center"
+        :class="isDisable ? 'disabled-bg-color' : 'info-bg-color'"
+      >
+        {{ data.discountType === 1 ? '满减券' : '折扣券' }}
+      </view>
+      <view class="title ss-m-x-30 ss-p-t-18">
+        <view class="ss-flex ss-row-between">
+          <view
+            class="value-text ss-flex-1 ss-m-r-10"
+            :class="isDisable ? 'disabled-color' : 'info-color'"
+          >
+            {{ data.name }}
+          </view>
+          <view>
+            <view
+              class="ss-flex ss-col-bottom"
+              :class="isDisable ? 'disabled-color' : 'price-text'"
+            >
+              <view class="value-reduce ss-m-b-10" v-if="data.discountType === 1">￥</view>
+              <view class="value-price">
+                {{
+                  data.discountType === 1
+                    ? fen2yuan(data.discountPrice)
+                    : data.discountPercent / 10.0
+                }}
+              </view>
+              <view class="value-discount ss-m-b-10 ss-m-l-4" v-if="data.discountType === 2"
+                >折</view
+              >
+            </view>
+          </view>
+        </view>
+        <view class="ss-flex ss-row-between ss-m-t-16">
+          <view
+            class="sellby-text"
+            :class=" isDisable ? 'disabled-color' : 'subtitle-color'"
+            v-if="data.validityType === 2"
+          >
+            有效期：领取后 {{ data.fixedEndTerm }} 天内可用
+          </view>
+          <view
+            class="sellby-text"
+            :class=" isDisable ? 'disabled-color' : 'subtitle-color'"
+            v-else
+          >
+            有效期: {{ sheep.$helper.timeFormat(data.validStartTime, 'yyyy-mm-dd') }} 至
+            {{ sheep.$helper.timeFormat(data.validEndTime, 'yyyy-mm-dd') }}
+          </view>
+          <view
+            class="value-enough"
+            :class="isDisable ? 'disabled-color' : 'subtitle-color'"
+          >
+            满 {{ fen2yuan(data.usePrice) }} 可用
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- TODO 芋艿：可优化，增加优惠劵的描述 -->
+    <view class="desc ss-flex ss-row-between">
+      <view>
+        <view class="desc-title">{{ data.description }}</view>
+        <view>
+          <slot name="reason" />
+        </view>
+      </view>
+      <view>
+        <slot />
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { computed, reactive } from 'vue';
+  import { fen2yuan } from '../../hooks/useGoods';
+  import sheep from '../../index';
+
+  const state = reactive({});
+
+  const isDisable = computed(() => {
+    if (props.type === 'coupon') {
+      return false;
+    }
+    return props.data.status !== 1;
+  });
+
+  // 接受参数
+  const props = defineProps({
+    data: {
+      type: Object,
+      default: {},
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    type: {
+      type: String,
+      default: 'coupon', // coupon 优惠劵模版；user 用户优惠劵
+    },
+  });
+</script>
+
+<style lang="scss" scoped>
+  .info-bg-color {
+    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+  }
+
+  .disabled-bg-color {
+    background: #999;
+  }
+
+  .info-color {
+    color: #333;
+  }
+
+  .subtitle-color {
+    color: #666;
+  }
+
+  .disabled-color {
+    color: #999;
+  }
+
+  .content {
+    width: 100%;
+    background: #fff;
+    border-radius: 20rpx 20rpx 0 0;
+    -webkit-mask: radial-gradient(circle at 12rpx 100%, #0000 12rpx, red 0) -12rpx;
+    box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.04);
+
+    .tag {
+      width: 100rpx;
+
+      color: #fff;
+      height: 40rpx;
+      font-size: 24rpx;
+      border-radius: 20rpx 0 20rpx 0;
+    }
+
+    .title {
+      padding-bottom: 22rpx;
+      border-bottom: 2rpx dashed #d3d3d3;
+
+      .value-text {
+        font-size: 32rpx;
+        font-weight: 600;
+      }
+
+      .sellby-text {
+        font-size: 24rpx;
+        font-weight: 400;
+      }
+
+      .value-price {
+        font-size: 64rpx;
+        font-weight: 500;
+        line-height: normal;
+        font-family: OPPOSANS;
+      }
+
+      .value-reduce {
+        line-height: normal;
+        font-size: 32rpx;
+      }
+
+      .value-discount {
+        line-height: normal;
+        font-size: 28rpx;
+      }
+
+      .value-enough {
+        font-size: 24rpx;
+        font-weight: 400;
+        font-family: OPPOSANS;
+      }
+    }
+  }
+
+  .desc {
+    width: 100%;
+    background: #fff;
+    -webkit-mask: radial-gradient(circle at 12rpx 0%, #0000 12rpx, red 0) -12rpx;
+    box-shadow: rgba(#000, 0.1);
+    box-sizing: border-box;
+    padding: 24rpx 30rpx;
+    box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.04);
+    border-radius: 0 0 20rpx 20rpx;
+
+    .desc-title {
+      font-size: 24rpx;
+      color: #999;
+      font-weight: 400;
+    }
+  }
+
+  .price-text {
+    color: #ff0000;
+  }
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-coupon-select/s-coupon-select.vue b/sheep/components/s-coupon-select/s-coupon-select.vue
new file mode 100644
index 0000000..3572e1b
--- /dev/null
+++ b/sheep/components/s-coupon-select/s-coupon-select.vue
@@ -0,0 +1,140 @@
+<!-- 订单确认的优惠劵选择弹窗 -->
+<template>
+  <su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose backgroundColor="#f2f2f2">
+    <view class="model-box">
+      <view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠券</view>
+      <scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
+        <!--可使用的优惠券区域-->
+        <!-- <view class="subtitle ss-m-l-20">可使用优惠券</view> -->
+        <view v-for="(item, index) in state.couponInfo" :key="index">
+          <s-coupon-list :data="item" type="user" :disabled="false">
+            <template v-slot:reason>
+              <view class="ss-flex ss-m-t-24">
+                <view class="reason-title">可用原因：</view>
+                <view class="reason-desc">{{ item.description || '已达到使用门槛' }}</view>
+              </view>
+            </template>
+            <template #default>
+              <label class="ss-flex ss-col-center" @tap="radioChange(item.id)">
+                <radio
+                  color="var(--ui-BG-Main)"
+                  style="transform: scale(0.8)"
+                  :checked="state.couponId === item.id"
+                  @tap.stop="radioChange(item.id)"
+                />
+              </label>
+            </template>
+          </s-coupon-list>
+        </view>
+        <!--不可使用的优惠券区域-->
+        <!-- <view class="subtitle ss-m-t-40 ss-m-l-20">不可使用优惠券</view>
+        <view v-for="item in state.couponInfo.filter(coupon => !coupon.match)" :key="item.id">
+          <s-coupon-list :data="item" type="user" :disabled="true">
+            <template v-slot:reason>
+              <view class="ss-flex ss-m-t-24">
+                <view class="reason-title"> 不可用原因：</view>
+                <view class="reason-desc">{{ item.description || '未达到使用门槛' }}</view>
+              </view>
+            </template>
+          </s-coupon-list>
+        </view> -->
+      </scroll-view>
+    </view>
+    <view class="modal-footer ss-flex">
+      <button class="confirm-btn ss-reset-button" @tap="onConfirm">确认</button>
+    </view>
+  </su-popup>
+</template>
+<script setup>
+  import { computed, reactive } from 'vue';
+
+  const props = defineProps({
+    modelValue: { // 优惠劵列表
+      type: Object,
+      default() {
+      },
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    },
+  });
+
+  const emits = defineEmits(['confirm', 'close']);
+
+  const state = reactive({
+    couponInfo: computed(() => props.modelValue), // 优惠劵列表
+    couponId: undefined, // 选中的优惠劵编号
+  });
+
+  // 选中优惠劵
+  function radioChange(couponId) {
+    if (state.couponId === couponId) {
+      state.couponId = undefined;
+    } else {
+      state.couponId = couponId;
+    }
+  }
+
+  // 确认优惠劵
+  const onConfirm = () => {
+    emits('confirm', state.couponId);
+  };
+</script>
+<style lang="scss" scoped>
+  :deep() {
+    .uni-checkbox-input {
+      background-color: var(--ui-BG-Main);
+    }
+  }
+
+  .model-box {
+    height: 60vh;
+  }
+
+  .title {
+    font-size: 36rpx;
+    height: 80rpx;
+    font-weight: bold;
+    color: #333333;
+  }
+
+  .subtitle {
+    font-size: 26rpx;
+    font-weight: 500;
+    color: #333333;
+  }
+
+  .model-content {
+    height: 54vh;
+  }
+
+  .modal-footer {
+    width: 100%;
+    height: 120rpx;
+    background: #fff;
+  }
+
+  .confirm-btn {
+    width: 710rpx;
+    margin-left: 20rpx;
+    height: 80rpx;
+    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    border-radius: 40rpx;
+    color: #fff;
+  }
+
+  .reason-title {
+    font-weight: 600;
+    font-size: 20rpx;
+    line-height: 26rpx;
+    color: #ff0003;
+  }
+
+  .reason-desc {
+    font-weight: 600;
+    font-size: 20rpx;
+    line-height: 26rpx;
+    color: #434343;
+  }
+</style>
diff --git a/sheep/components/s-custom-navbar/components/navbar-item.vue b/sheep/components/s-custom-navbar/components/navbar-item.vue
new file mode 100644
index 0000000..fce7ce7
--- /dev/null
+++ b/sheep/components/s-custom-navbar/components/navbar-item.vue
@@ -0,0 +1,66 @@
+<!-- 顶部导航栏 - 单元格 -->
+<template>
+  <view class="ss-flex ss-col-center">
+    <!-- 类型一： 文字 -->
+    <view
+      v-if="data.type === 'text'"
+      class="nav-title inline"
+      :style="[{ color: data.textColor, width: width }]"
+    >
+      {{ data.text }}
+    </view>
+    <!-- 类型二： 图片 -->
+    <view
+      v-if="data.type === 'image'"
+      :style="[{ width: width }]"
+      class="menu-icon-wrap ss-flex ss-row-center ss-col-center"
+      @tap="sheep.$router.go(data.url)"
+    >
+      <image class="nav-image" :src="sheep.$url.cdn(data.imgUrl)" mode="aspectFit"></image>
+    </view>
+    <!-- 类型三： 搜索框 -->
+    <view class="ss-flex-1" v-if="data.type === 'search'" :style="[{ width: width }]">
+      <s-search-block
+        :placeholder="data.placeholder || '搜索关键字'"
+        :radius="data.borderRadius"
+        elBackground="#fff"
+        :height="height"
+        :width="width"
+        @click="sheep.$router.go('/pages/index/search')"
+      ></s-search-block>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { computed } from 'vue';
+
+  // 接收参数
+  const props = defineProps({
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+    width: {
+      type: String,
+      default: '1px',
+    },
+  });
+
+  const height = computed(() => sheep.$platform.capsule.height);
+</script>
+
+<style lang="scss" scoped>
+  .nav-title {
+    font-size: 36rpx;
+    color: #333;
+    text-align: center;
+  }
+
+  .menu-icon-wrap {
+    .nav-image {
+      height: 24px;
+    }
+  }
+</style>
diff --git a/sheep/components/s-custom-navbar/components/navbar.vue b/sheep/components/s-custom-navbar/components/navbar.vue
new file mode 100644
index 0000000..36050ec
--- /dev/null
+++ b/sheep/components/s-custom-navbar/components/navbar.vue
@@ -0,0 +1,314 @@
+<template>
+  <su-fixed
+    :noFixed="props.noFixed"
+    :alway="props.alway"
+    :bgStyles="props.bgStyles"
+    :val="0"
+    :index="props.zIndex"
+    noNav
+    :bg="props.bg"
+    :ui="props.ui"
+    :opacity="props.opacity"
+    :placeholder="props.placeholder"
+    :sticky="props.sticky"
+  >
+    <su-status-bar />
+    <!-- 
+      :class="[{ 'border-bottom': !props.opacity && props.bg != 'bg-none' }]"
+     -->
+    <view class="ui-navbar-box">
+      <view
+        class="ui-bar"
+        :class="
+          props.status == '' ? `text-a` : props.status == 'light' ? 'text-white' : 'text-black'
+        "
+        :style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
+      >
+        <slot name="item"></slot>
+        <view class="right">
+          <!-- #ifdef MP -->
+          <view :style="[state.capsuleStyle]"></view>
+          <!-- #endif -->
+        </view>
+      </view>
+    </view>
+  </su-fixed>
+</template>
+
+<script setup>
+  /**
+   * 标题栏 - 基础组件navbar
+   *
+   * @param {Number}  zIndex = 100  							- 层级
+   * @param {Boolean}  back = true 							- 是否返回上一页
+   * @param {String}  backtext = ''  							- 返回文本
+   * @param {String}  bg = 'bg-white'  						- 公共Class
+   * @param {String}  status = ''  							- 状态栏颜色
+   * @param {Boolean}  alway = true							- 是否常驻
+   * @param {Boolean}  opacity = false  						- 是否开启透明渐变
+   * @param {Boolean}  opacityBg = false  					- 开启滑动渐变后，返回按钮是否添加背景
+   * @param {Boolean}  noFixed = false  						- 是否浮动
+   * @param {String}  ui = ''									- 公共Class
+   * @param {Boolean}  capsule = false  						- 是否开启胶囊返回
+   * @param {Boolean}  stopBack = false 					    - 是否禁用返回
+   * @param {Boolean}  placeholder = true 					- 是否开启占位
+   * @param {Object}   bgStyles = {} 					    	- 背景样式
+   *
+   */
+
+  import { computed, reactive, onBeforeMount } from 'vue';
+  import sheep from '@/sheep';
+
+  // 本地数据
+  const state = reactive({
+    statusCur: '',
+    capsuleStyle: {},
+    capsuleBack: {},
+  });
+
+  const sys_statusBar = sheep.$platform.device.statusBarHeight;
+  const sys_navBar = sheep.$platform.navbar;
+
+  const props = defineProps({
+    sticky: Boolean,
+    zIndex: {
+      type: Number,
+      default: 100,
+    },
+    back: {
+      //是否返回上一页
+      type: Boolean,
+      default: true,
+    },
+    backtext: {
+      //返回文本
+      type: String,
+      default: '',
+    },
+    bg: {
+      type: String,
+      default: 'bg-white',
+    },
+    status: {
+      //状态栏颜色 可以选择light dark/其他字符串视为黑色
+      type: String,
+      default: '',
+    },
+    // 常驻
+    alway: {
+      type: Boolean,
+      default: true,
+    },
+    opacity: {
+      //是否开启滑动渐变
+      type: Boolean,
+      default: false,
+    },
+    opacityBg: {
+      //开启滑动渐变后 返回按钮是否添加背景
+      type: Boolean,
+      default: false,
+    },
+    noFixed: {
+      //是否浮动
+      type: Boolean,
+      default: false,
+    },
+    ui: {
+      type: String,
+      default: '',
+    },
+    capsule: {
+      //是否开启胶囊返回
+      type: Boolean,
+      default: false,
+    },
+    stopBack: {
+      type: Boolean,
+      default: false,
+    },
+    placeholder: {
+      type: [Boolean],
+      default: true,
+    },
+    bgStyles: {
+      type: Object,
+      default() {},
+    },
+  });
+
+  const emits = defineEmits(['navback']);
+
+  onBeforeMount(() => {
+    init();
+  });
+
+  // 返回
+  const onNavback = () => {
+    sheep.$router.back();
+  };
+
+  // 初始化
+  const init = () => {
+    state.capsuleStyle = {
+      width: sheep.$platform.capsule.width + 'px',
+      height: sheep.$platform.capsule.height + 'px',
+      margin: '0 ' + (sheep.$platform.device.windowWidth - sheep.$platform.capsule.right) + 'px',
+    };
+
+    state.capsuleBack = state.capsuleStyle;
+  };
+</script>
+
+<style lang="scss" scoped>
+  .ui-navbar-box {
+    background-color: transparent;
+    width: 100%;
+
+    .ui-bar {
+      position: relative;
+      z-index: 2;
+      white-space: nowrap;
+      display: flex;
+      position: relative;
+      align-items: center;
+      justify-content: space-between;
+
+      .left {
+        @include flex-bar;
+
+        .back {
+          @include flex-bar;
+
+          .back-icon {
+            @include flex-center;
+            width: 56rpx;
+            height: 56rpx;
+            margin: 0 10rpx;
+            font-size: 46rpx !important;
+
+            &.opacityIcon {
+              position: relative;
+              border-radius: 50%;
+              background-color: rgba(127, 127, 127, 0.5);
+
+              &::after {
+                content: '';
+                display: block;
+                position: absolute;
+                height: 200%;
+                width: 200%;
+                left: 0;
+                top: 0;
+                border-radius: inherit;
+                transform: scale(0.5);
+                transform-origin: 0 0;
+                opacity: 0.1;
+                border: 1px solid currentColor;
+                pointer-events: none;
+              }
+
+              &::before {
+                transform: scale(0.9);
+              }
+            }
+          }
+
+          /* #ifdef  MP-ALIPAY */
+          ._icon-back {
+            opacity: 0;
+          }
+
+          /* #endif */
+        }
+
+        .capsule {
+          @include flex-bar;
+          border-radius: 100px;
+          position: relative;
+
+          &.dark {
+            background-color: rgba(255, 255, 255, 0.5);
+          }
+
+          &.light {
+            background-color: rgba(0, 0, 0, 0.15);
+          }
+
+          &::after {
+            content: '';
+            display: block;
+            position: absolute;
+            height: 60%;
+            width: 1px;
+            left: 50%;
+            top: 20%;
+            background-color: currentColor;
+            opacity: 0.1;
+            pointer-events: none;
+          }
+
+          &::before {
+            content: '';
+            display: block;
+            position: absolute;
+            height: 200%;
+            width: 200%;
+            left: 0;
+            top: 0;
+            border-radius: inherit;
+            transform: scale(0.5);
+            transform-origin: 0 0;
+            opacity: 0.1;
+            border: 1px solid currentColor;
+            pointer-events: none;
+          }
+
+          .capsule-back,
+          .capsule-home {
+            @include flex-center;
+            flex: 1;
+          }
+
+          &.isFristPage {
+            .capsule-back,
+            &::after {
+              display: none;
+            }
+          }
+        }
+      }
+
+      .right {
+        @include flex-bar;
+
+        .right-content {
+          @include flex;
+          flex-direction: row-reverse;
+        }
+      }
+
+      .center {
+        @include flex-center;
+        text-overflow: ellipsis;
+        text-align: center;
+        flex: 1;
+
+        .image {
+          display: block;
+          height: 36px;
+          max-width: calc(100vw - 200px);
+        }
+      }
+    }
+
+    .ui-bar-bg {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      top: 0;
+      z-index: 1;
+      pointer-events: none;
+    }
+  }
+</style>
diff --git a/sheep/components/s-custom-navbar/s-custom-navbar.vue b/sheep/components/s-custom-navbar/s-custom-navbar.vue
new file mode 100644
index 0000000..aabc215
--- /dev/null
+++ b/sheep/components/s-custom-navbar/s-custom-navbar.vue
@@ -0,0 +1,207 @@
+<!-- 顶部导航栏 -->
+<template>
+  <navbar
+    :alway="isAlways"
+    :back="false"
+    bg=""
+    :placeholder="isPlaceholder"
+    :bgStyles="bgStyles"
+    :opacity="isOpacity"
+    :sticky="sticky"
+  >
+    <template #item>
+      <view class="nav-box">
+        <view class="nav-icon" v-if="showLeftButton">
+          <view class="icon-box ss-flex" :class="{ 'inner-icon-box': data.styleType === 'inner' }">
+            <view class="icon-button icon-button-left ss-flex ss-row-center" @tap="onClickLeft">
+              <text class="sicon-back" v-if="hasHistory" />
+              <text class="sicon-home" v-else />
+            </view>
+            <view class="line"></view>
+            <view class="icon-button icon-button-right ss-flex ss-row-center" @tap="onClickRight">
+              <text class="sicon-more" />
+            </view>
+          </view>
+        </view>
+        <view
+          class="nav-item"
+          v-for="(item, index) in navList"
+          :key="index"
+          :style="[parseImgStyle(item)]"
+          :class="[{ 'ss-flex ss-col-center ss-row-center': item.type !== 'search' }]"
+        >
+          <navbar-item :data="item" :width="parseImgStyle(item).width" />
+        </view>
+      </view>
+    </template>
+  </navbar>
+</template>
+
+<script setup>
+  /**
+   *  装修组件 - 自定义标题栏
+   *
+   *
+   * @property {Number | String}  alwaysShow = [0,1]			    - 是否常驻
+   * @property {Number | String}  styleType = [inner]			   	- 是否沉浸式
+   * @property {String | Number} type              - 标题背景模式
+   * @property {String} color                  - 页面背景色
+   * @property {String} src                    - 页面背景图片
+   */
+  import { computed, unref } from 'vue';
+  import sheep from '@/sheep';
+  import Navbar from './components/navbar.vue';
+  import NavbarItem from './components/navbar-item.vue';
+  import { showMenuTools } from '@/sheep/hooks/useModal';
+
+  const props = defineProps({
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+    showLeftButton: {
+      type: Boolean,
+      default: false,
+    },
+  });
+  const hasHistory = sheep.$router.hasHistory();
+  const sticky = computed(() => {
+    if (props.data.styleType === 'inner') {
+      if (props.data.alwaysShow) {
+        return false;
+      }
+    }
+    if (props.data.styleType === 'normal') {
+      return false;
+    }
+  });
+  const navList = computed(() => {
+    // #ifdef MP
+    return props.data.mpCells || [];
+    // #endif
+    return props.data.otherCells || [];
+  });
+  // 页面宽度
+  const windowWidth = sheep.$platform.device.windowWidth;
+  // 单元格宽度
+  const cell = computed(() => {
+    if (unref(navList).length) {
+      // 默认宽度为8个格子，微信公众号右上角有胶囊按钮所以是6个格子
+      let cell = (windowWidth - 90) / 8;
+      // #ifdef MP
+      cell = (windowWidth - 80 - unref(sheep.$platform.capsule).width) / 6;
+      // #endif
+      return cell;
+    }
+  });
+  // 解析位置
+  const parseImgStyle = (item) => {
+    let obj = {
+      width: item.width * cell.value + (item.width - 1) * 10 + 'px',
+      left: item.left * cell.value + (item.left + 1) * 10 + 'px',
+      'border-radius': item.borderRadius + 'px',
+    };
+    return obj;
+  };
+  const isAlways = computed(() =>
+    props.data.styleType === 'inner' ? Boolean(props.data.alwaysShow) : true,
+  );
+  const isOpacity = computed(() =>
+    props.data.styleType === 'normal'
+      ? false
+      : props.showLeftButton
+      ? false
+      : props.data.styleType === 'inner',
+  );
+  const isPlaceholder = computed(() => props.data.styleType === 'normal');
+  const bgStyles = computed(() => {
+    return {
+      background:
+        props.data.bgType === 'img' && props.data.bgImg
+          ? `url(${sheep.$url.cdn(props.data.bgImg)}) no-repeat top center / 100% 100%`
+          : props.data.bgColor,
+    };
+  });
+
+  // 左侧按钮：返回上一页或首页
+  function onClickLeft() {
+    if (hasHistory) {
+      sheep.$router.back();
+    } else {
+      sheep.$router.go('/pages/tabbar/index');
+    }
+  }
+
+  // 右侧按钮：打开快捷菜单
+  function onClickRight() {
+    showMenuTools();
+  }
+</script>
+
+<style lang="scss" scoped>
+  .nav-box {
+    width: 750rpx;
+    position: relative;
+    height: 100%;
+
+    .nav-item {
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .nav-icon {
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      left: 20rpx;
+
+      .inner-icon-box {
+        border: 1px solid rgba(#fff, 0.4);
+        background: none !important;
+      }
+
+      .icon-box {
+        background: #ffffff;
+        box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
+        border-radius: 30rpx;
+        width: 134rpx;
+        height: 56rpx;
+        margin-left: 8rpx;
+
+        .line {
+          width: 2rpx;
+          height: 24rpx;
+          background: #e5e5e7;
+        }
+
+        .sicon-back {
+          font-size: 32rpx;
+        }
+
+        .sicon-home {
+          font-size: 32rpx;
+        }
+
+        .sicon-more {
+          font-size: 32rpx;
+        }
+
+        .icon-button {
+          width: 67rpx;
+          height: 56rpx;
+
+          &-left:hover {
+            background: rgba(0, 0, 0, 0.16);
+            border-radius: 30rpx 0px 0px 30rpx;
+          }
+
+          &-right:hover {
+            background: rgba(0, 0, 0, 0.16);
+            border-radius: 0px 30rpx 30rpx 0px;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/sheep/components/s-discount-list/s-discount-list.vue b/sheep/components/s-discount-list/s-discount-list.vue
new file mode 100644
index 0000000..22fbd43
--- /dev/null
+++ b/sheep/components/s-discount-list/s-discount-list.vue
@@ -0,0 +1,114 @@
+<template>
+  <su-popup
+    :show="show"
+    type="bottom"
+    round="20"
+    @close="emits('close')"
+    showClose
+    backgroundColor="#f2f2f2"
+  >
+    <view class="model-box">
+      <view class="title ss-m-t-38 ss-m-l-20 ss-m-b-40">活动优惠</view>
+      <scroll-view
+        class="model-content ss-m-l-20"
+        scroll-y
+        :scroll-with-animation="false"
+        :enable-back-to-top="true"
+      >
+        <view v-for="(item, index) in state.orderInfo.promo_infos" :key="index">
+          <view class="ss-flex ss-m-b-40 subtitle">
+            <view>共{{ item.goods_ids.length }}件，</view>
+            <view v-if="item.activity_type === 'full_discount'">
+              满{{ item.discount_rule.full }}打{{ item.discount_rule.discount }}折,已减
+            </view>
+            <view v-if="item.activity_type === 'full_gift'">满赠</view>
+            <view v-if="item.activity_type === 'full_reduce'">
+              满{{ item.discount_rule.full }}减{{ item.discount_rule.discount }},已减
+            </view>
+            <view class="price-text">￥{{ item.promo_discount_money || '0.00' }}</view>
+          </view>
+          <scroll-view class="scroll-box" scroll-x scroll-anchoring>
+            <view class="ss-flex">
+              <view v-for="i in item.goods_ids" :key="i">
+                <image class="content-img" :src="sheep.$url.cdn(getGoodsImg(i))" />
+              </view>
+            </view>
+          </scroll-view>
+        </view>
+      </scroll-view>
+    </view>
+    <view class="modal-footer ss-flex">
+      <button class="confirm-btn ss-reset-button" @tap="emits('close')">确认</button>
+    </view>
+  </su-popup>
+</template>
+<script setup>
+  import { computed, reactive } from 'vue';
+  import sheep from '@/sheep';
+  const props = defineProps({
+    promoInfo: {
+      type: Array,
+      default: () => [],
+    },
+    goodsList: {
+      type: Array,
+      default: () => [],
+    },
+    modelValue: {
+      type: Object,
+      default() {},
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    },
+  });
+  const emits = defineEmits(['close']);
+  const state = reactive({
+    orderInfo: computed(() => props.modelValue),
+  });
+  const getGoodsImg = (e) => {
+    let goodsImg = '';
+    state.orderInfo.goods_list.forEach((i) => {
+      if (e == i.goods_id) {
+        goodsImg = i.goods.image;
+      }
+    });
+    return goodsImg;
+  };
+</script>
+<style lang="scss" scoped>
+  .model-box {
+    height: 60vh;
+  }
+  .model-content {
+    height: 54vh;
+  }
+  .modal-footer {
+    width: 100%;
+    height: 120rpx;
+    background: #fff;
+  }
+  .confirm-btn {
+    width: 710rpx;
+    margin-left: 20rpx;
+    height: 80rpx;
+    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    border-radius: 40rpx;
+    color: #fff;
+  }
+  .content-img {
+    width: 140rpx;
+    height: 140rpx;
+    margin-right: 20rpx;
+    margin-bottom: 20rpx;
+  }
+  .subtitle {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #333333;
+  }
+  .price-text {
+    color: #ff3000;
+  }
+</style>
diff --git a/sheep/components/s-empty/s-empty.vue b/sheep/components/s-empty/s-empty.vue
new file mode 100644
index 0000000..16e40ed
--- /dev/null
+++ b/sheep/components/s-empty/s-empty.vue
@@ -0,0 +1,93 @@
+<template>
+  <view
+    class="ss-flex-col ss-col-center ss-row-center empty-box"
+    :style="[{ paddingTop: paddingTop + 'rpx' }]"
+  >
+    <view class=""><img class="empty-icon" :src="icon" mode="widthFix"></img></view>
+    <view class="empty-text ss-m-t-28 ss-m-b-40">
+      <text v-if="text !== ''">{{ text }}</text>
+    </view>
+    <button class="ss-reset-button empty-btn" v-if="showAction" @tap="clickAction">
+      {{ actionText }}
+    </button>
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  /**
+   * 容器组件 - 装修组件的样式容器
+   */
+
+  const props = defineProps({
+    // 图标
+    icon: {
+      type: String,
+      default: '',
+    },
+    // 描述
+    text: {
+      type: String,
+      default: '',
+    },
+    // 是否显示button
+    showAction: {
+      type: Boolean,
+      default: false,
+    },
+    // button 文字
+    actionText: {
+      type: String,
+      default: '',
+    },
+    // 链接
+    actionUrl: {
+      type: String,
+      default: '',
+    },
+    // 间距
+    paddingTop: {
+      type: String,
+      default: '260',
+    },
+    //主题色
+    buttonColor: {
+      type: String,
+      default: 'var(--ui-BG-Main)',
+    },
+  });
+
+  const emits = defineEmits(['clickAction']);
+
+  function clickAction() {
+    if (props.actionUrl !== '') {
+      sheep.$router.go(props.actionUrl);
+    }
+    emits('clickAction');
+  }
+</script>
+
+<style lang="scss" scoped>
+  .empty-box {
+    width: 100%;
+  }
+  .empty-icon {
+    width: 240rpx;
+  }
+
+  .empty-text {
+    font-size: 26rpx;
+    font-weight: 500;
+    color: #aaa;
+  }
+
+  .empty-btn {
+    width: 320rpx;
+    height: 70rpx;
+    border: 2rpx solid v-bind('buttonColor');
+    border-radius: 35rpx;
+    font-weight: 500;
+    color: v-bind('buttonColor');
+    font-size: 28rpx;
+  }
+</style>
diff --git a/sheep/components/s-float-menu/s-float-menu.vue b/sheep/components/s-float-menu/s-float-menu.vue
new file mode 100644
index 0000000..b53db00
--- /dev/null
+++ b/sheep/components/s-float-menu/s-float-menu.vue
@@ -0,0 +1,88 @@
+<!-- 装修基础组件：悬浮按钮 -->
+<template>
+  <!-- 模态背景：展开时显示，点击后折叠 -->
+  <view class="modal-bg" v-if="fabRef?.isShow" @click="handleCollapseFab"></view>
+  <!-- 悬浮按钮 -->
+  <uni-fab
+    ref="fabRef"
+    horizontal="right"
+    vertical="bottom"
+    :direction="state.direction"
+    :pattern="state.pattern"
+    :content="state.content"
+    @trigger="handleOpenLink"
+  />
+</template>
+<script setup>
+  /**
+   * 悬浮按钮
+   */
+
+  import sheep from '@/sheep';
+  import { reactive, ref, unref } from 'vue';
+  import { onBackPress } from '@dcloudio/uni-app';
+
+  // 定义属性
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {},
+    }
+  })
+
+  // 悬浮按钮配置： https://uniapp.dcloud.net.cn/component/uniui/uni-fab.html#fab-props
+  const state = reactive({
+    // 可选样式配置项
+    pattern: [],
+    // 展开菜单内容配置项
+    content: [],
+    // 展开菜单显示方式：horizontal-水平显示，vertical-垂直显示
+    direction: '',
+  });
+
+  // 悬浮按钮引用
+  const fabRef = ref(null);
+  // 按钮方向
+  state.direction = props.data.direction;
+  props.data?.list.forEach((item) => {
+    // 按钮文字
+    const text = props.data?.showText ? item.text : ''
+    // 生成内容配置项
+    state.content.push({ iconPath: sheep.$url.cdn(item.imgUrl), url: item.url, text });
+    // 生成样式配置项
+    state.pattern.push({ color: item.textColor });
+  });
+
+  // 处理链接跳转
+  function handleOpenLink(e) {
+    sheep.$router.go(e.item.url);
+  }
+
+  // 折叠
+  function handleCollapseFab() {
+    if (unref(fabRef)?.isShow) {
+      unref(fabRef)?.close();
+    }
+  }
+
+  // 按返回值后，折叠悬浮按钮
+  onBackPress(() => {
+    if (unref(fabRef)?.isShow) {
+      unref(fabRef)?.close();
+      return true;
+    }
+    return false;
+  });
+</script>
+<style lang="scss" scoped>
+  /* 模态背景 */
+  .modal-bg {
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 11;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(#000000, 0.4);
+  }
+</style>
diff --git a/sheep/components/s-goods-card/s-goods-card.vue b/sheep/components/s-goods-card/s-goods-card.vue
new file mode 100644
index 0000000..59f2bf1
--- /dev/null
+++ b/sheep/components/s-goods-card/s-goods-card.vue
@@ -0,0 +1,286 @@
+<!-- 装修商品组件：商品卡片 -->
+<template>
+  <!-- 商品卡片 -->
+  <view>
+    <!-- 布局1. 单列大图（上图，下内容）-->
+    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.goodsList.length" class="goods-sl-box">
+      <view
+        class="goods-box"
+        v-for="item in state.goodsList"
+        :key="item.id"
+        :style="[{ marginBottom: data.space * 2 + 'rpx' }]"
+      >
+        <s-goods-column
+          class=""
+          size="sl"
+          :goodsFields="data.fields"
+          :tagStyle="data.badge"
+          :data="item"
+          :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+        >
+          <!-- 购买按钮 -->
+          <template v-slot:cart>
+            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+            </button>
+          </template>
+        </s-goods-column>
+      </view>
+    </view>
+
+    <!-- 布局2. 双列（每一列：上图，下内容）-->
+    <view
+      v-if="layoutType === LayoutTypeEnum.TWO_COL && state.goodsList.length"
+      class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top"
+    >
+      <view class="goods-list-box">
+        <view
+          class="left-list"
+          :style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+          v-for="item in state.leftGoodsList"
+          :key="item.id"
+        >
+          <s-goods-column
+            class="goods-md-box"
+            size="md"
+            :goodsFields="data.fields"
+            :tagStyle="data.badge"
+            :data="item"
+            :titleColor="data.fields.name?.color"
+            :subTitleColor="data.fields.introduction.color"
+            :topRadius="data.borderRadiusTop"
+            :bottomRadius="data.borderRadiusBottom"
+            :titleWidth="330 - marginLeft - marginRight"
+            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+            @getHeight="calculateGoodsColumn($event, 'left')"
+          >
+            <!-- 购买按钮 -->
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+              </button>
+            </template>
+          </s-goods-column>
+        </view>
+      </view>
+      <view class="goods-list-box">
+        <view
+          class="right-list"
+          :style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+          v-for="item in state.rightGoodsList"
+          :key="item.id"
+        >
+          <s-goods-column
+            class="goods-md-box"
+            size="md"
+            :goodsFields="data.fields"
+            :tagStyle="data.badge"
+            :data="item"
+            :titleColor="data.fields.name?.color"
+            :subTitleColor="data.fields.introduction.color"
+            :topRadius="data.borderRadiusTop"
+            :bottomRadius="data.borderRadiusBottom"
+            :titleWidth="330 - marginLeft - marginRight"
+            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+            @getHeight="calculateGoodsColumn($event, 'right')"
+          >
+            <!-- 购买按钮 -->
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+              </button>
+            </template>
+          </s-goods-column>
+        </view>
+      </view>
+    </view>
+
+    <!-- 布局3. 单列小图（左图，右内容） -->
+    <view v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.goodsList.length" class="goods-lg-box">
+      <view
+        class="goods-box"
+        :style="[{ marginBottom: data.space + 'px' }]"
+        v-for="item in state.goodsList"
+        :key="item.id"
+      >
+        <s-goods-column
+          class="goods-card"
+          size="lg"
+          :goodsFields="data.fields"
+          :data="item"
+          :tagStyle="data.badge"
+          :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @tap="sheep.$router.go('/pages/goods/index', { id: item.id })"
+        >
+          <!-- 购买按钮 -->
+          <template v-slot:cart>
+            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+            </button>
+          </template>
+        </s-goods-column>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 商品卡片
+   */
+  import { computed, reactive, onMounted } from 'vue';
+  import sheep from '@/sheep';
+  import SpuApi from '@/sheep/api/product/spu';
+
+  // 布局类型
+  const LayoutTypeEnum = {
+    // 单列大图
+    ONE_COL_BIG_IMG: 'oneColBigImg',
+    // 双列
+    TWO_COL: 'twoCol',
+    // 单列小图
+    ONE_COL_SMALL_IMG: 'oneColSmallImg',
+  }
+
+  const state = reactive({
+    goodsList: [],
+    leftGoodsList: [],
+    rightGoodsList: [],
+  });
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {},
+    },
+    styles: {
+      type: Object,
+      default() {},
+    },
+  });
+
+  const { layoutType, btnBuy, spuIds } = props.data ?? {};
+  const { marginLeft, marginRight } = props.styles ?? {};
+
+  // 购买按钮样式
+  const buyStyle = computed(() => {
+    if (btnBuy.type === 'text') {
+      // 文字按钮：线性渐变背景颜色
+      return {
+        background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
+      };
+    }
+    if (btnBuy.type === 'img') {
+      // 图片按钮
+      return {
+        width: '54rpx',
+        height: '54rpx',
+        background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
+        backgroundSize: '100% 100%',
+      };
+    }
+  });
+
+  //region 商品瀑布流布局
+  // 下一个要处理的商品索引
+  let count = 0;
+  // 左列的高度
+  let leftHeight = 0;
+  // 右列的高度
+  let rightHeight = 0;
+
+  /**
+   * 计算商品在左列还是右列
+   * @param height 商品的高度
+   * @param where 添加到哪一列
+   */
+  function calculateGoodsColumn(height = 0, where = 'left') {
+    // 处理完
+    if (!state.goodsList[count]) return;
+    // 增加列的高度
+    if (where === 'left') leftHeight += height;
+    if (where === 'right') rightHeight += height;
+    // 添加到矮的一列
+    if (leftHeight <= rightHeight) {
+      state.leftGoodsList.push(state.goodsList[count]);
+    } else {
+      state.rightGoodsList.push(state.goodsList[count]);
+    }
+    // 计数
+    count++;
+  }
+  //endregion
+
+  /**
+   * 根据商品编号列表，获取商品列表
+   * @param ids 商品编号列表
+   * @return {Promise<undefined>} 商品列表
+   */
+  async function getGoodsListByIds(ids) {
+    const { data } = await SpuApi.getSpuListByIds(ids);
+    return data;
+  }
+
+  // 初始化
+  onMounted(async () => {
+    // 加载商品列表
+    state.goodsList = await getGoodsListByIds(spuIds.join(','));
+    // 只有双列布局时需要
+    if (layoutType === LayoutTypeEnum.TWO_COL){
+      // 分列
+      calculateGoodsColumn();
+    }
+  });
+</script>
+
+<style lang="scss" scoped>
+  .goods-md-wrap {
+    width: 100%;
+  }
+
+  .goods-list-box {
+    width: 50%;
+    box-sizing: border-box;
+    .left-list {
+      &:nth-last-child(1) {
+        margin-bottom: 0 !important;
+      }
+    }
+    .right-list {
+      &:nth-last-child(1) {
+        margin-bottom: 0 !important;
+      }
+    }
+  }
+
+  .goods-box {
+    &:nth-last-of-type(1) {
+      margin-bottom: 0 !important;
+    }
+  }
+
+  .goods-md-box,
+  .goods-sl-box,
+  .goods-lg-box {
+    position: relative;
+
+    .cart-btn {
+      position: absolute;
+      bottom: 18rpx;
+      right: 20rpx;
+      z-index: 11;
+      height: 50rpx;
+      line-height: 50rpx;
+      padding: 0 20rpx;
+      border-radius: 25rpx;
+      font-size: 24rpx;
+      color: #fff;
+    }
+  }
+</style>
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
new file mode 100644
index 0000000..228c64e
--- /dev/null
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -0,0 +1,751 @@
+<!-- 页面 -->
+<template>
+  <view class="ss-goods-wrap">
+    <!-- xs卡片：横向紧凑型，一行放两个，图片左内容右边  -->
+    <view
+      v-if="size === 'xs'"
+      class="xs-goods-card ss-flex ss-col-stretch"
+      :style="[elStyles]"
+      @tap="onClick"
+    >
+      <view v-if="tagStyle.show" class="tag-icon-box">
+        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+      </view>
+      <image
+        class="xs-img-box"
+        :src="sheep.$url.cdn(data.image || data.picUrl)"
+        mode="aspectFit"
+      ></image>
+      <view
+        v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
+        class="xs-goods-content ss-flex-col ss-row-around"
+      >
+        <view
+          v-if="goodsFields.title?.show || goodsFields.name?.show"
+          class="xs-goods-title ss-line-1"
+          :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
+        >
+          {{ data.title || data.name }}
+        </view>
+        <view
+          v-if="goodsFields.price?.show"
+          class="xs-goods-price font-OPPOSANS"
+          :style="[{ color: goodsFields.price.color }]"
+        >
+          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+          {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+        </view>
+      </view>
+    </view>
+
+    <!-- sm卡片：竖向紧凑，一行放三个，图上内容下 -->
+    <view v-if="size === 'sm'" class="sm-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+      <view v-if="tagStyle.show" class="tag-icon-box">
+        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+      </view>
+      <image
+        class="sm-img-box"
+        :src="sheep.$url.cdn(data.image || data.picUrl)"
+        mode="aspectFill"
+      ></image>
+
+      <view
+        v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
+        class="sm-goods-content"
+        :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
+      >
+        <view
+          v-if="goodsFields.title?.show || goodsFields.name?.show"
+          class="sm-goods-title ss-line-1 ss-m-b-16"
+        >
+          {{ data.title || data.name }}
+        </view>
+        <view
+          v-if="goodsFields.price?.show"
+          class="sm-goods-price font-OPPOSANS"
+          :style="[{ color: goodsFields.price.color }]"
+        >
+          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+          {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+        </view>
+      </view>
+    </view>
+
+    <!-- md卡片：竖向，一行放两个，图上内容下 -->
+    <view v-if="size === 'md'" class="md-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+      <view v-if="tagStyle.show" class="tag-icon-box">
+        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+      </view>
+      <image
+        class="md-img-box"
+        :src="sheep.$url.cdn(data.image || data.picUrl)"
+        mode="widthFix"
+      ></image>
+      <view
+        class="md-goods-content ss-flex-col ss-row-around ss-p-b-20 ss-p-t-20 ss-p-x-16"
+        :id="elId"
+      >
+        <view
+          v-if="goodsFields.title?.show || goodsFields.name?.show"
+          class="md-goods-title ss-line-1"
+          :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
+        >
+          {{ data.title || data.name }}
+        </view>
+        <view
+          v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+          class="md-goods-subtitle ss-m-t-16 ss-line-1"
+          :style="[{ color: subTitleColor, background: subTitleBackground }]"
+        >
+          {{ data.subtitle || data.introduction }}
+        </view>
+        <slot name="activity">
+          <view v-if="data.promos?.length" class="tag-box ss-flex-wrap ss-flex ss-col-center">
+            <view
+              class="activity-tag ss-m-r-10 ss-m-t-16"
+              v-for="item in data.promos"
+              :key="item.id"
+            >
+              {{ item.title }}
+            </view>
+          </view>
+        </slot>
+        <view class="ss-flex ss-col-bottom">
+          <view
+            v-if="goodsFields.price?.show"
+            class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10"
+            :style="[{ color: goodsFields.price.color }]"
+          >
+            <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          </view>
+
+          <view
+            v-if="
+              (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
+              (data.original_price > 0 || data.marketPrice > 0)
+            "
+            class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
+            :style="[{ color: originPriceColor }]"
+          >
+            <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+            <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+          </view>
+        </view>
+
+        <view class="ss-m-t-16 ss-flex ss-col-center ss-flex-wrap">
+          <view class="sales-text">{{ salesAndStock }}</view>
+        </view>
+      </view>
+
+      <slot name="cart">
+        <view class="cart-box ss-flex ss-col-center ss-row-center">
+          <image class="cart-icon" src="/static/img/shop/tabbar/category2.png" mode="" />
+        </view>
+      </slot>
+    </view>
+
+    <!-- lg卡片：横向型，一行放一个，图片左内容右边  -->
+    <view
+      v-if="size === 'lg'"
+      class="lg-goods-card ss-flex ss-col-stretch"
+      :style="[elStyles]"
+      @tap="onClick"
+    >
+      <view v-if="tagStyle.show" class="tag-icon-box">
+        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+      </view>
+      <view v-if="seckillTag" class="seckill-tag ss-flex ss-row-center"> 秒杀 </view>
+      <view v-if="grouponTag" class="groupon-tag ss-flex ss-row-center">
+        <view class="tag-icon">拼团</view>
+      </view>
+      <image
+        class="lg-img-box"
+        :src="sheep.$url.cdn(data.image || data.picUrl)"
+        mode="aspectFill"
+      ></image>
+      <view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
+        <view>
+          <view
+            v-if="goodsFields.title?.show || goodsFields.name?.show"
+            class="lg-goods-title ss-line-2"
+            :style="[{ color: titleColor }]"
+          >
+            {{ data.title || data.name }}
+          </view>
+          <view
+            v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+            class="lg-goods-subtitle ss-m-t-10 ss-line-1"
+            :style="[{ color: subTitleColor, background: subTitleBackground }]"
+          >
+            {{ data.subtitle || data.introduction }}
+          </view>
+        </view>
+        <view>
+          <slot name="activity">
+            <view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center">
+              <view class="activity-tag ss-m-r-10" v-for="item in data.promos" :key="item.id">
+                {{ item.title }}
+              </view>
+            </view>
+          </slot>
+          <view class="ss-flex ss-col-bottom ss-m-t-10">
+            <view
+              v-if="goodsFields.price?.show"
+              class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
+              :style="[{ color: goodsFields.price.color }]"
+            >
+              <text class="ss-font-24">{{ priceUnit }}</text>
+              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+            </view>
+            <view
+              v-if="
+                (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
+                (data.original_price > 0 || data.marketPrice > 0)
+              "
+              class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
+              :style="[{ color: originPriceColor }]"
+            >
+              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+              <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+            </view>
+          </view>
+          <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
+            <view class="sales-text">{{ salesAndStock }}</view>
+          </view>
+        </view>
+      </view>
+
+      <slot name="cart">
+        <view class="buy-box ss-flex ss-col-center ss-row-center" v-if="buttonShow"> 去购买 </view>
+      </slot>
+    </view>
+
+    <!-- sl卡片：竖向型，一行放一个，图片上内容下边 -->
+    <view v-if="size === 'sl'" class="sl-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+      <view v-if="tagStyle.show" class="tag-icon-box">
+        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+      </view>
+
+      <image
+        class="sl-img-box"
+        :src="sheep.$url.cdn(data.image || data.picUrl)"
+        mode="aspectFill"
+      ></image>
+
+      <view class="sl-goods-content">
+        <view>
+          <view
+            v-if="goodsFields.title?.show || goodsFields.name?.show"
+            class="sl-goods-title ss-line-1"
+            :style="[{ color: titleColor }]"
+          >
+            {{ data.title || data.name }}
+          </view>
+          <view
+            v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+            class="sl-goods-subtitle ss-m-t-16"
+            :style="[{ color: subTitleColor, background: subTitleBackground }]"
+          >
+            {{ data.subtitle || data.introduction }}
+          </view>
+        </view>
+        <view>
+          <slot name="activity">
+            <view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center ss-flex-wrap">
+              <view
+                class="activity-tag ss-m-r-10 ss-m-t-16"
+                v-for="item in data.promos"
+                :key="item.id"
+              >
+                {{ item.title }}
+              </view>
+            </view>
+          </slot>
+          <view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
+            <view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
+              <text class="price-unit ss-font-24">{{ priceUnit }}</text>
+              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+            </view>
+            <view
+              v-if="
+                (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
+                (data.original_price > 0 || data.marketPrice > 0)
+              "
+              class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
+              :style="[{ color: originPriceColor }]"
+            >
+              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+              <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+            </view>
+          </view>
+          <view class="ss-m-t-16 ss-flex ss-flex-wrap">
+            <view class="sales-text">{{ salesAndStock }}</view>
+          </view>
+        </view>
+      </view>
+
+      <slot name="cart"
+        ><view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view></slot
+      >
+    </view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 商品卡片
+   *
+   * @property {Array} size = [xs | sm | md | lg | sl ] 			 	- 列表数据
+   * @property {String} tag 											- md及以上才有
+   * @property {String} img 											- 图片
+   * @property {String} background 									- 背景色
+   * @property {String} topRadius 									- 上圆角
+   * @property {String} bottomRadius 									- 下圆角
+   * @property {String} title 										- 标题
+   * @property {String} titleColor 									- 标题颜色
+   * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
+   * @property {String} subTitle 										- 副标题
+   * @property {String} subTitleColor									- 副标题颜色
+   * @property {String} subTitleBackground 							- 副标题背景
+   * @property {String | Number} price 								- 价格
+   * @property {String} priceColor 									- 价格颜色
+   * @property {String | Number} originPrice 							- 原价/划线价
+   * @property {String} originPriceColor 								- 原价颜色
+   * @property {String | Number} sales 								- 销售数量
+   * @property {String} salesColor									- 销售数量颜色
+   *
+   * @slots activity												 	- 活动插槽
+   * @slots cart														- 购物车插槽，默认包含文字，背景色，文字颜色 || 图片 || 行为
+   *
+   * @event {Function()} click 										- 点击卡片
+   *
+   */
+  import { computed, reactive, getCurrentInstance, onMounted, nextTick } from 'vue';
+  import sheep from '@/sheep';
+  import { fen2yuan, formatSales } from '@/sheep/hooks/useGoods';
+  import { formatStock } from '@/sheep/hooks/useGoods';
+  import goodsCollectVue from '@/pages/user/goods-collect.vue';
+  import { isArray } from 'lodash-es';
+
+  // 数据
+  const state = reactive({});
+
+  // 接收参数
+  const props = defineProps({
+    goodsFields: {
+      type: [Array, Object],
+      default() {
+        return {
+          // 商品价格
+          price: { show: true },
+          // 库存
+          stock: { show: true },
+          // 商品名称
+          name: { show: true },
+          // 商品介绍
+          introduction: { show: true },
+          // 市场价
+          marketPrice: { show: true },
+          // 销量
+          salesCount: { show: true },
+        };
+      },
+    },
+    tagStyle: {
+      type: Object,
+      default: {},
+    },
+    data: {
+      type: Object,
+      default: {},
+    },
+    size: {
+      type: String,
+      default: 'sl',
+    },
+    background: {
+      type: String,
+      default: '',
+    },
+    topRadius: {
+      type: Number,
+      default: 0,
+    },
+    bottomRadius: {
+      type: Number,
+      default: 0,
+    },
+    titleWidth: {
+      type: Number,
+      default: 0,
+    },
+    titleColor: {
+      type: String,
+      default: '#333',
+    },
+    priceColor: {
+      type: String,
+      default: '',
+    },
+    originPriceColor: {
+      type: String,
+      default: '#C4C4C4',
+    },
+    priceUnit: {
+      type: String,
+      default: '￥',
+    },
+    subTitleColor: {
+      type: String,
+      default: '#999999',
+    },
+    subTitleBackground: {
+      type: String,
+      default: '',
+    },
+    buttonShow: {
+      type: Boolean,
+      default: true,
+    },
+    seckillTag: {
+      type: Boolean,
+      default: false,
+    },
+    grouponTag: {
+      type: Boolean,
+      default: false,
+    },
+  });
+
+  // 组件样式
+  const elStyles = computed(() => {
+    return {
+      background: props.background,
+      'border-top-left-radius': props.topRadius + 'px',
+      'border-top-right-radius': props.topRadius + 'px',
+      'border-bottom-left-radius': props.bottomRadius + 'px',
+      'border-bottom-right-radius': props.bottomRadius + 'px',
+    };
+  });
+
+  // 格式化销量、库存信息
+  const salesAndStock = computed(() => {
+    let text = [];
+    if (props.goodsFields.salesCount?.show) {
+      text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
+    }
+    if (props.goodsFields.stock?.show) {
+      text.push(formatStock(props.data.stock_show_type, props.data.stock));
+    }
+    return text.join(' | ');
+  });
+
+  // 返回事件
+  const emits = defineEmits(['click', 'getHeight']);
+
+  const onClick = () => {
+    emits('click');
+  };
+
+  // 获取卡片实时高度
+  const { proxy } = getCurrentInstance();
+  const elId = `sheep_${Math.ceil(Math.random() * 10e5).toString(36)}`;
+  function getGoodsPriceCardWH() {
+    if (props.size === 'md') {
+      const view = uni.createSelectorQuery().in(proxy);
+      view.select(`#${elId}`).fields({ size: true, scrollOffset: true });
+      view.exec((data) => {
+        let totalHeight = 0;
+        const goodsPriceCard = data[0];
+        if (props.data.image_wh) {
+          totalHeight =
+            (goodsPriceCard.width / props.data.image_wh.w) * props.data.image_wh.h +
+            goodsPriceCard.height;
+        } else {
+          totalHeight = goodsPriceCard.width;
+        }
+        emits('getHeight', totalHeight);
+      });
+    }
+  }
+  onMounted(() => {
+    nextTick(() => {
+      getGoodsPriceCardWH();
+    });
+  });
+</script>
+
+<style lang="scss" scoped>
+  .tag-icon-box {
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 2;
+    .tag-icon {
+      width: 72rpx;
+      height: 44rpx;
+    }
+  }
+  .seckill-tag {
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 2;
+    width: 68rpx;
+    height: 38rpx;
+    background: linear-gradient(90deg, #ff5854 0%, #ff2621 100%);
+    border-radius: 10rpx 0px 10rpx 0px;
+    font-size: 24rpx;
+    font-weight: 500;
+    color: #ffffff;
+    line-height: 32rpx;
+  }
+  .groupon-tag {
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 2;
+    width: 68rpx;
+    height: 38rpx;
+    background: linear-gradient(90deg, #fe832a 0%, #ff6600 100%);
+    border-radius: 10rpx 0px 10rpx 0px;
+    font-size: 24rpx;
+    font-weight: 500;
+    color: #ffffff;
+    line-height: 32rpx;
+  }
+  .goods-img {
+    width: 100%;
+    height: 100%;
+    background-color: #f5f5f5;
+  }
+  .price-unit {
+    margin-right: -4px;
+  }
+  .sales-text {
+    display: table;
+    font-size: 24rpx;
+    transform: scale(0.8);
+    margin-left: 0rpx;
+    color: #c4c4c4;
+  }
+
+  .activity-tag {
+    font-size: 20rpx;
+    color: #ff0000;
+    line-height: 30rpx;
+    padding: 0 10rpx;
+    border: 1px solid rgba(#ff0000, 0.25);
+    border-radius: 4px;
+    flex-shrink: 0;
+  }
+
+  .goods-origin-price {
+    font-size: 20rpx;
+    color: #c4c4c4;
+    line-height: 36rpx;
+    text-decoration: line-through;
+  }
+
+  // xs
+  .xs-goods-card {
+    overflow: hidden;
+    // max-width: 375rpx;
+    background-color: $white;
+    position: relative;
+
+    .xs-img-box {
+      width: 128rpx;
+      height: 128rpx;
+      margin-right: 20rpx;
+    }
+
+    .xs-goods-title {
+      font-size: 26rpx;
+      color: #333;
+      font-weight: 500;
+    }
+
+    .xs-goods-price {
+      font-size: 30rpx;
+      color: $red;
+    }
+  }
+
+  // sm
+  .sm-goods-card {
+    overflow: hidden;
+    // width: 223rpx;
+    // width: 100%;
+    background-color: $white;
+    position: relative;
+
+    .sm-img-box {
+      // width: 228rpx;
+      width: 100%;
+      height: 208rpx;
+    }
+    .sm-goods-content {
+      padding: 20rpx 16rpx;
+      box-sizing: border-box;
+    }
+    .sm-goods-title {
+      font-size: 26rpx;
+      color: #333;
+    }
+
+    .sm-goods-price {
+      font-size: 30rpx;
+      color: $red;
+    }
+  }
+
+  // md
+  .md-goods-card {
+    overflow: hidden;
+    width: 100%;
+    position: relative;
+    z-index: 1;
+    background-color: $white;
+    position: relative;
+
+    .md-img-box {
+      width: 100%;
+    }
+
+    .md-goods-title {
+      font-size: 26rpx;
+      color: #333;
+      width: 100%;
+    }
+    .md-goods-subtitle {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+    }
+
+    .md-goods-price {
+      font-size: 30rpx;
+      color: $red;
+      line-height: 36rpx;
+    }
+
+    .cart-box {
+      width: 54rpx;
+      height: 54rpx;
+      background: linear-gradient(90deg, #fe8900, #ff5e00);
+      border-radius: 50%;
+      position: absolute;
+      bottom: 50rpx;
+      right: 20rpx;
+      z-index: 2;
+
+      .cart-icon {
+        width: 30rpx;
+        height: 30rpx;
+      }
+    }
+  }
+
+  // lg
+  .lg-goods-card {
+    overflow: hidden;
+    position: relative;
+    z-index: 1;
+    background-color: $white;
+    height: 280rpx;
+
+    .lg-img-box {
+      width: 280rpx;
+      height: 280rpx;
+      margin-right: 20rpx;
+    }
+
+    .lg-goods-title {
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #333333;
+      // line-height: 36rpx;
+      // width: 410rpx;
+    }
+    .lg-goods-subtitle {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+      // line-height: 30rpx;
+      // width: 410rpx;
+    }
+
+    .lg-goods-price {
+      font-size: 30rpx;
+      color: $red;
+      line-height: 36rpx;
+    }
+
+    .buy-box {
+      position: absolute;
+      bottom: 20rpx;
+      right: 20rpx;
+      z-index: 2;
+      width: 120rpx;
+      height: 50rpx;
+      background: linear-gradient(90deg, #fe8900, #ff5e00);
+      border-radius: 25rpx;
+      font-size: 24rpx;
+      color: #ffffff;
+    }
+    .tag-box {
+      width: 100%;
+    }
+  }
+
+  // sl
+
+  .sl-goods-card {
+    overflow: hidden;
+    position: relative;
+    z-index: 1;
+    width: 100%;
+    background-color: $white;
+    .sl-goods-content {
+      padding: 20rpx 20rpx;
+      box-sizing: border-box;
+    }
+    .sl-img-box {
+      width: 100%;
+      height: 360rpx;
+    }
+
+    .sl-goods-title {
+      font-size: 26rpx;
+      color: #333;
+      font-weight: 500;
+    }
+    .sl-goods-subtitle {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+      line-height: 30rpx;
+    }
+
+    .sl-goods-price {
+      font-size: 30rpx;
+      color: $red;
+      line-height: 36rpx;
+    }
+
+    .buy-box {
+      position: absolute;
+      bottom: 20rpx;
+      right: 20rpx;
+      z-index: 2;
+      width: 148rpx;
+      height: 50rpx;
+      background: linear-gradient(90deg, #fe8900, #ff5e00);
+      border-radius: 25rpx;
+      font-size: 24rpx;
+      color: #ffffff;
+    }
+  }
+</style>
diff --git a/sheep/components/s-goods-item/s-goods-item.vue b/sheep/components/s-goods-item/s-goods-item.vue
new file mode 100644
index 0000000..456bb16
--- /dev/null
+++ b/sheep/components/s-goods-item/s-goods-item.vue
@@ -0,0 +1,181 @@
+<template>
+  <view>
+    <view>
+      <slot name="top"></slot>
+    </view>
+    <view
+      class="ss-order-card-warp ss-flex ss-col-stretch ss-row-between bg-white"
+      :style="[{ borderRadius: radius + 'rpx', marginBottom: marginBottom + 'rpx' }]"
+    >
+      <view class="img-box ss-m-r-24">
+        <image class="order-img" :src="sheep.$url.cdn(img)" mode="aspectFill"></image>
+      </view>
+      <view
+        class="box-right ss-flex-col ss-row-between"
+        :style="[{ width: titleWidth ? titleWidth + 'rpx' : '' }]"
+      >
+        <view class="title-text ss-line-2" v-if="title">{{ title }}</view>
+        <view v-if="skuString" class="spec-text ss-m-t-8 ss-m-b-12">{{ skuString }}</view>
+        <view class="groupon-box">
+          <slot name="groupon"></slot>
+        </view>
+        <view class="ss-flex">
+          <view class="ss-flex ss-col-center">
+            <view
+              class="price-text ss-flex ss-col-center"
+              :style="[{ color: priceColor }]"
+              v-if="price && Number(price) > 0"
+            >
+              ￥{{ fen2yuan(price) }}
+            </view>
+            <view v-if="num" class="total-text ss-flex ss-col-center">x {{ num }}</view>
+            <slot name="priceSuffix"></slot>
+          </view>
+        </view>
+        <view class="tool-box">
+          <slot name="tool"></slot>
+        </view>
+        <view>
+          <slot name="rightBottom"></slot>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { computed } from 'vue';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  /**
+   * 订单卡片
+   *
+   * @property {String} img 											- 图片
+   * @property {String} title 										- 标题
+   * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
+   * @property {String} skuText 										- 规格
+   * @property {String | Number} price 								- 价格
+   * @property {String} priceColor 									- 价格颜色
+   * @property {Number | String} num									- 数量
+   *
+   */
+  const props = defineProps({
+    img: {
+      type: String,
+      default: 'https://img1.baidu.com/it/u=1601695551,235775011&fm=26&fmt=auto',
+    },
+    title: {
+      type: String,
+      default: '',
+    },
+    titleWidth: {
+      type: Number,
+      default: 0,
+    },
+    skuText: {
+      type: [String, Array],
+      default: '',
+    },
+    price: {
+      type: [String, Number],
+      default: '',
+    },
+    priceColor: {
+      type: [String],
+      default: '',
+    },
+    num: {
+      type: [String, Number],
+      default: 0,
+    },
+    score: {
+      type: [String, Number],
+      default: '',
+    },
+    radius: {
+      type: [String],
+      default: '',
+    },
+    marginBottom: {
+      type: [String],
+      default: '',
+    },
+  });
+  const skuString = computed(() => {
+    if (!props.skuText) {
+      return '';
+    }
+    if (typeof props.skuText === 'object') {
+      return props.skuText.join(',');
+    }
+    return props.skuText;
+  });
+</script>
+
+<style lang="scss" scoped>
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+  .ss-order-card-warp {
+    padding: 20rpx;
+
+    .img-box {
+      width: 164rpx;
+      height: 164rpx;
+      border-radius: 10rpx;
+      overflow: hidden;
+
+      .order-img {
+        width: 164rpx;
+        height: 164rpx;
+      }
+    }
+
+    .box-right {
+      flex: 1;
+      // width: 500rpx;
+      // height: 164rpx;
+      position: relative;
+
+      .tool-box {
+        position: absolute;
+        right: 0rpx;
+        bottom: -10rpx;
+      }
+    }
+
+    .title-text {
+      font-size: 28rpx;
+      font-weight: 500;
+      line-height: 40rpx;
+    }
+
+    .spec-text {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: $dark-9;
+      min-width: 0;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+    }
+
+    .price-text {
+      font-size: 24rpx;
+      font-weight: 500;
+      font-family: OPPOSANS;
+    }
+
+    .total-text {
+      font-size: 24rpx;
+      font-weight: 400;
+      line-height: 24rpx;
+      color: $dark-9;
+      margin-left: 8rpx;
+    }
+  }
+</style>
diff --git a/sheep/components/s-goods-scroll/s-goods-scroll.vue b/sheep/components/s-goods-scroll/s-goods-scroll.vue
new file mode 100644
index 0000000..175cc66
--- /dev/null
+++ b/sheep/components/s-goods-scroll/s-goods-scroll.vue
@@ -0,0 +1,33 @@
+<!-- 商品组 - 横向滚动商品（目前暂时没用到） -->
+<template>
+  <view class="goods-scroll-box">
+    <scroll-view class="scroll-box" scroll-x scroll-anchoring>
+      <view class="goods-box ss-flex">
+        <view v-for="(item, index) in list" :key="index">
+          <s-goods-column
+            class="goods-card ss-m-l-20"
+            size="sm"
+            :data="item"
+            :titleWidth="200 - marginLeft - marginRight"
+          />
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 商品组 - 横向滚动商品
+   */
+  const props = defineProps({
+    list: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+  });
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/sheep/components/s-goods-shelves/s-goods-shelves.vue b/sheep/components/s-goods-shelves/s-goods-shelves.vue
new file mode 100644
index 0000000..e2ce60a
--- /dev/null
+++ b/sheep/components/s-goods-shelves/s-goods-shelves.vue
@@ -0,0 +1,147 @@
+<!-- 装修商品组件：商品栏 -->
+<template>
+  <view>
+    <!-- 布局1. 两列商品，图片左文案右 -->
+    <view
+      v-if="layoutType === 'twoCol'"
+      class="goods-xs-box ss-flex ss-flex-wrap"
+      :style="[{ margin: '-' + data.space + 'rpx' }]"
+    >
+      <view
+        class="goods-xs-list"
+        v-for="item in goodsList"
+        :key="item.id"
+        :style="[
+          {
+            padding: data.space + 'rpx',
+          },
+        ]"
+      >
+        <s-goods-column
+          class="goods-card"
+          size="xs"
+          :goodsFields="data.fields"
+          :tagStyle="data.badge"
+          :data="item"
+          :titleColor="data.fields.name?.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          :titleWidth="(454 - marginRight * 2 - data.space * 2 - marginLeft * 2) / 2"
+          @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+        />
+      </view>
+    </view>
+    <!-- 布局. 三列商品：图片上文案下 -->
+    <view
+      v-if="layoutType === 'threeCol'"
+      class="goods-sm-box ss-flex ss-flex-wrap"
+      :style="[{ margin: '-' + data.space + 'rpx' }]"
+    >
+      <view
+        v-for="item in goodsList"
+        :key="item.id"
+        class="goods-card-box"
+        :style="[
+          {
+            padding: data.space + 'rpx',
+          },
+        ]"
+      >
+        <s-goods-column
+          class="goods-card"
+          size="sm"
+          :goodsFields="data.fields"
+          :tagStyle="data.badge"
+          :data="item"
+          :titleColor="data.fields.name?.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+        />
+      </view>
+    </view>
+
+    <!-- 布局3. 一行商品，水平滑动 -->
+    <view v-if="layoutType === 'horizSwiper'" class="">
+      <scroll-view class="scroll-box goods-scroll-box" scroll-x scroll-anchoring>
+        <view class="goods-box ss-flex">
+          <view
+            class="goods-card-box"
+            v-for="item in goodsList"
+            :key="item.id"
+            :style="[{ marginRight: data.space * 2 + 'rpx' }]"
+          >
+            <s-goods-column
+              class="goods-card"
+              size="sm"
+              :goodsFields="data.fields"
+              :tagStyle="data.badge"
+              :data="item"
+              :titleColor="data.fields.name?.color"
+              :titleWidth="(750 - marginRight * 2 - data.space * 4 - marginLeft * 2) / 3"
+              @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+            />
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 商品栏
+   */
+  import { onMounted, ref, computed } from 'vue';
+  import sheep from '@/sheep';
+  import SpuApi from "@/sheep/api/product/spu";
+
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {},
+    },
+    styles: {
+      type: Object,
+      default() {},
+    },
+  });
+  const { layoutType, spuIds } = props.data;
+  let { marginLeft, marginRight } = props.styles;
+  const goodsList = ref([]);
+  onMounted(async () => {
+    if (spuIds.length > 0) {
+      let { data } = await SpuApi.getSpuListByIds(spuIds.join(','));
+      goodsList.value = data;
+    }
+  });
+</script>
+
+<style lang="scss" scoped>
+  .goods-xs-box {
+    // margin: 0 auto;
+    width: 100%;
+    .goods-xs-list {
+      box-sizing: border-box;
+      flex-shrink: 0;
+      overflow: hidden;
+      width: 50%;
+    }
+  }
+
+  .goods-sm-box {
+    margin: 0 auto;
+    box-sizing: border-box;
+    .goods-card-box {
+      flex-shrink: 0;
+      overflow: hidden;
+      width: 33.3%;
+      box-sizing: border-box;
+    }
+  }
+  .goods-scroll-box {
+    margin: 0 auto;
+    width: 100%;
+    box-sizing: border-box;
+  }
+</style>
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
new file mode 100644
index 0000000..d7e6fcf
--- /dev/null
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -0,0 +1,171 @@
+<!-- 装修组件 - 拼团 -->
+<template>
+	<view>
+		<view v-if="layoutType === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap" :style="[{ margin: '-' + data.space + 'rpx' }]">
+			<view v-for="product in productList" class="goods-card-box" :key="product.id" :style="[{padding: data.space + 'rpx',},]">
+				<s-goods-column
+					class="goods-card"
+					size="sm"
+					:goodsFields="goodsFields"
+					:tagStyle="badge"
+					:data="product"
+					:titleColor="data.fields.name?.color"
+					:topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom"
+					@click="sheep.$router.go('/pages/goods/groupon', { id: props.data.activityId, })">
+				</s-goods-column>
+			</view>
+		</view>
+		<!-- 样式2 一行一个 图片左 文案右 -->
+		<view class="goods-box" v-if="layoutType === 'oneCol'">
+			<view class="goods-list" v-for="(product, index) in productList" :key="index" :style="[{ marginBottom: space + 'px' }]">
+				<s-goods-column
+					class="goods-card" size="lg"
+					:grouponTag="true"
+					:goodsFields="goodsFields"
+					:tagStyle="badge"
+					:data="product"
+					:titleColor="data.fields.name?.color"
+					:subTitleColor="data.fields.introduction?.color"
+					:topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom"
+					@click="sheep.$router.go('/pages/goods/groupon', { id: props.data.activityId, })">
+					<template v-slot:cart>
+						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+							{{ btnBuy?.type === 'text' ? btnBuy.text : '去拼团' }}
+						</button>
+					</template>
+				</s-goods-column>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	/**
+	 * 拼团
+	 */
+	import {
+		computed,
+		onMounted,
+		reactive,
+		ref
+	} from 'vue';
+	import sheep from '@/sheep';
+	import SpuApi from "@/sheep/api/product/spu";
+	import CombinationApi from "@/sheep/api/promotion/combination";
+
+	// 接收参数
+	const props = defineProps({
+		// 装修数据
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+			type: Object,
+			default: () => ({}),
+		},
+	});
+	
+	// 设置相关信息是否显示
+	const goodsFields = reactive({
+	  // 商品价格
+	  price: { show: true },
+	  // 库存
+	  stock: { show: true },
+	  // 商品名称
+	  name: { show: true },
+	  // 商品介绍
+	  introduction: { show: true },
+	  // 市场价
+	  marketPrice: { show: true },
+	  // 销量
+	  salesCount: { show: true },
+	});
+
+	let {
+		layoutType,
+		badge,
+		btnBuy,
+		space,
+	} = props.data;
+	let {
+		marginLeft,
+		marginRight
+	} = props.styles;
+
+	// 购买按钮样式（暂未实现）
+	const buyStyle = computed(() => {
+		let btnBuy = props.data.btnBuy;
+		if (btnBuy?.type === 'text') {
+			return {
+				background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
+			};
+		}
+
+		if (btnBuy?.type === 'img') {
+			return {
+				width: '54rpx',
+				height: '54rpx',
+				background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
+				backgroundSize: '100% 100%',
+			};
+		}
+	});
+
+	const productList = ref([]);
+	onMounted(async () => {
+		// todo：@owen 与Yudao结构不一致，待重构
+		const {
+			data: activity
+		} = await CombinationApi.getCombinationActivity(props.data.activityId);
+		const {
+			data: spu
+		} = await SpuApi.getSpuDetail(activity.spuId)
+		// 循环活动信息，赋值拼团最低价格
+		activity.products.forEach((product) => {
+			spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
+		});
+		productList.value = [spu];
+	});
+</script>
+
+<style lang="scss" scoped>
+	.goods-list {
+		position: relative;
+
+		.cart-btn {
+			position: absolute;
+			bottom: 10rpx;
+			right: 20rpx;
+			z-index: 11;
+			height: 50rpx;
+			line-height: 50rpx;
+			padding: 0 20rpx;
+			border-radius: 25rpx;
+			font-size: 24rpx;
+			color: #fff;
+			background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
+		}
+	}
+
+	.goods-list {
+		&:nth-last-of-type(1) {
+			margin-bottom: 0 !important;
+		}
+	}
+
+	.goods-sm-box {
+		margin: 0 auto;
+		box-sizing: border-box;
+
+		.goods-card-box {
+			flex-shrink: 0;
+			overflow: hidden;
+			width: 33.3%;
+			box-sizing: border-box;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-hotzone-block/s-hotzone-block.vue b/sheep/components/s-hotzone-block/s-hotzone-block.vue
new file mode 100644
index 0000000..246d6d4
--- /dev/null
+++ b/sheep/components/s-hotzone-block/s-hotzone-block.vue
@@ -0,0 +1,46 @@
+<!-- 装修图文组件：热区 -->
+<template>
+  <view class="hotzone-wrap">
+    <image :src="sheep.$url.cdn(data.imgUrl)" style="width: 100%" mode="widthFix"></image>
+    <view
+      class="hotzone-box"
+      v-for="(item, index) in data.list"
+      :key="index"
+      :style="[
+        {
+          top: `${item.top}px`,
+          left: `${item.left}px`,
+          width: `${item.width}px`,
+          height: `${item.height}px`,
+        },
+      ]"
+      @tap.stop="sheep.$router.go(item.url)"
+    >
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+
+  // 接收参数
+  const props = defineProps({
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+    styles: {
+      type: Object,
+      default: () => ({}),
+    },
+  });
+</script>
+
+<style lang="scss" scoped>
+  .hotzone-wrap {
+    position: relative;
+  }
+  .hotzone-box {
+    position: absolute;
+  }
+</style>
diff --git a/sheep/components/s-image-banner/s-image-banner.vue b/sheep/components/s-image-banner/s-image-banner.vue
new file mode 100644
index 0000000..478e7af
--- /dev/null
+++ b/sheep/components/s-image-banner/s-image-banner.vue
@@ -0,0 +1,44 @@
+<!-- 装修图文组件：图片轮播 -->
+<template>
+  <su-swiper
+    :list="imgList"
+    :dotStyle="data.indicator === 'dot' ? 'long' : 'tag'"
+    imageMode="scaleToFill"
+    dotCur="bg-mask-40"
+    :seizeHeight="300"
+    :autoplay="data.autoplay"
+    :interval="data.interval * 1000"
+    :mode="data.type"
+  />
+</template>
+
+<script setup>
+  import { computed } from 'vue';
+  import sheep from '@/sheep';
+
+  // 轮播图
+  const props = defineProps({
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+    styles: {
+      type: Object,
+      default: () => ({}),
+    },
+  });
+
+  const imgList = computed(() =>
+      props.data.items.map((item) => {
+        const src = item.type === 'img' ? item.imgUrl : item.videoUrl;
+        return {
+          ...item,
+          type: item.type === 'img' ? 'image' : 'video',
+          src: sheep.$url.cdn(src),
+          poster: sheep.$url.cdn(item.imgUrl),
+        };
+      }),
+  );
+</script>
+
+<style></style>
diff --git a/sheep/components/s-image-block/s-image-block.vue b/sheep/components/s-image-block/s-image-block.vue
new file mode 100644
index 0000000..c898749
--- /dev/null
+++ b/sheep/components/s-image-block/s-image-block.vue
@@ -0,0 +1,27 @@
+<!-- 装修图文组件：图片展示 -->
+<template>
+  <view @tap="sheep.$router.go(data?.url)">
+    <su-image :src="sheep.$url.cdn(data.imgUrl)" mode="widthFix" />
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 图片组件
+   */
+  import sheep from '@/sheep';
+
+  // 接收参数
+  const props = defineProps({
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+    styles: {
+      type: Object,
+      default: () => ({}),
+    },
+  });
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/sheep/components/s-image-cube/s-image-cube.vue b/sheep/components/s-image-cube/s-image-cube.vue
new file mode 100644
index 0000000..9794d8f
--- /dev/null
+++ b/sheep/components/s-image-cube/s-image-cube.vue
@@ -0,0 +1,110 @@
+<!-- 装修图文组件：广告魔方 -->
+<template>
+  <view class="ss-cube-wrap" :style="[parseAdWrap]">
+    <view v-for="(item, index) in data.list" :key="index">
+      <view
+        class="cube-img-wrap"
+        :style="[parseImgStyle(item), { margin: data.space + 'px' }]"
+        @tap="sheep.$router.go(item.url)"
+      >
+        <image class="cube-img" :src="sheep.$url.cdn(item.imgUrl)" mode="aspectFill"></image>
+      </view>
+    </view>
+  </view>
+</template>
+<script setup>
+  /**
+/**
+ * 广告魔方
+ *
+ * @property {Array<Object>} list 			- 魔方列表
+ * @property {Object} styles 				- 组件样式
+ * @property {String} background 			- 组件背景色
+ * @property {Number} topSpace 				- 组件顶部间距
+ * @property {Number} bottomSpace 			- 组件底部间距
+ * @property {Number} leftSpace 			- 容器左间距
+ * @property {Number} rightSpace 			- 容器右间距
+ * @property {Number} imgSpace 				- 图片间距
+ * @property {Number} imgTopRadius 			- 图片上圆角
+ * @property {Number} imgBottomRadius 		- 图片下圆角
+ *
+ */
+
+  import { computed, inject, unref } from 'vue';
+  import sheep from '@/sheep';
+
+  // 参数
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {},
+    },
+    styles: {
+      type: Object,
+      default() {},
+    },
+  });
+
+  // 单元格大小
+  const windowWidth = sheep.$platform.device.windowWidth;
+  const cell = computed(() => {
+    return (
+      (windowWidth -
+        ((props.styles.marginLeft || 0) + (props.styles.marginRight || 0) + (props.styles.padding || 0) * 2)) /
+      4
+    );
+  });
+
+  //包裹容器高度
+  const parseAdWrap = computed(() => {
+    let heightArr = props.data.list.reduce(
+      (prev, cur) => (prev.includes(cur.height + cur.top) ? prev : [...prev, cur.height + cur.top]),
+      [],
+    );
+    let heightMax = Math.max(...heightArr);
+    return {
+      height: heightMax * cell.value + 'px',
+      width:
+        windowWidth -
+        (props.data?.style?.marginLeft +
+          props.data?.style?.marginRight +
+          props.styles.padding * 2) *
+          2 +
+        'px',
+    };
+  });
+
+  // 解析图片大小位置
+  const parseImgStyle = (item) => {
+    let obj = {
+      width: item.width * cell.value - props.data.space + 'px',
+      height: item.height * cell.value - props.data.space + 'px',
+      left: item.left * cell.value + 'px',
+      top: item.top * cell.value + 'px',
+      'border-top-left-radius': props.data.borderRadiusTop + 'px',
+      'border-top-right-radius': props.data.borderRadiusTop + 'px',
+      'border-bottom-left-radius': props.data.borderRadiusBottom + 'px',
+      'border-bottom-right-radius': props.data.borderRadiusBottom + 'px',
+    };
+    return obj;
+  };
+</script>
+
+<style lang="scss" scoped>
+  .ss-cube-wrap {
+    position: relative;
+    z-index: 2;
+    width: 750rpx;
+  }
+
+  .cube-img-wrap {
+    position: absolute;
+    z-index: 3;
+    overflow: hidden;
+  }
+
+  .cube-img {
+    width: 100%;
+    height: 100%;
+  }
+</style>
diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue
new file mode 100644
index 0000000..3fc666f
--- /dev/null
+++ b/sheep/components/s-layout/s-layout.vue
@@ -0,0 +1,246 @@
+<template>
+  <view
+    class="page-app"
+    :class="['theme-' + sys.mode, 'main-' + sys.theme, 'font-' + sys.fontSize]"
+  >
+    <view class="page-main" :style="[bgMain]">
+      <!-- 顶部导航栏-情况1：默认通用顶部导航栏 -->
+      <su-navbar
+        v-if="navbar === 'normal'"
+        :title="title"
+        statusBar
+        :color="color"
+        :tools="tools"
+        :opacityBgUi="opacityBgUi"
+        @search="(e) => emits('search', e)"
+        :defaultSearch="defaultSearch"
+      />
+
+      <!-- 顶部导航栏-情况2：装修组件导航栏-标准 -->
+      <s-custom-navbar
+        v-else-if="navbar === 'custom' && navbarMode === 'normal'"
+        :data="navbarStyle"
+        :showLeftButton="showLeftButton"
+      />
+      <view class="page-body" :style="[bgBody]">
+        <!-- 顶部导航栏-情况3：沉浸式头部 -->
+        <su-inner-navbar v-if="navbar === 'inner'" :title="title" />
+        <view
+          v-if="navbar === 'inner'"
+          :style="[{ paddingTop: sheep.$platform.navbar + 'px' }]"
+        ></view>
+
+        <!-- 顶部导航栏-情况4：装修组件导航栏-沉浸式 -->
+        <s-custom-navbar
+          v-if="navbar === 'custom' && navbarMode === 'inner'"
+          :data="navbarStyle"
+          :showLeftButton="showLeftButton"
+        />
+
+        <!-- 页面内容插槽 -->
+        <slot />
+
+        <!-- 底部导航 -->
+        <s-tabbar v-if="tabbar !== ''" :path="tabbar" />
+      </view>
+    </view>
+
+    <view class="page-modal">
+      <!-- 全局授权弹窗 -->
+      <s-auth-modal />
+      <!-- 全局分享弹窗 -->
+      <s-share-modal :shareInfo="shareInfo" />
+      <!-- 全局快捷入口 -->
+      <s-menu-tools />
+    </view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 模板组件 - 提供页面公共组件，属性，方法
+   */
+  import { computed, reactive, ref } from 'vue';
+  import sheep from '@/sheep';
+  import { isEmpty } from 'lodash-es';
+  import { onShow } from '@dcloudio/uni-app';
+  // #ifdef MP-WEIXIN
+  import { onShareAppMessage } from '@dcloudio/uni-app';
+  // #endif
+
+  const props = defineProps({
+    title: {
+      type: String,
+      default: '',
+    },
+    navbar: {
+      type: String,
+      default: 'normal',
+    },
+    opacityBgUi: {
+      type: String,
+      default: 'bg-white',
+    },
+    color: {
+      type: String,
+      default: '',
+    },
+    tools: {
+      type: String,
+      default: 'title',
+    },
+    keyword: {
+      type: String,
+      default: '',
+    },
+    navbarStyle: {
+      type: Object,
+      default: () => ({
+        styleType: '',
+        type: '',
+        color: '',
+        src: '',
+        list: [],
+        alwaysShow: 0,
+      }),
+    },
+    bgStyle: {
+      type: Object,
+      default: () => ({
+        src: '',
+        color: 'var(--ui-BG-1)',
+      }),
+    },
+    tabbar: {
+      type: [String, Boolean],
+      default: '',
+    },
+    onShareAppMessage: {
+      type: [Boolean, Object],
+      default: true,
+    },
+    leftWidth: {
+      type: [Number, String],
+      default: 100,
+    },
+    rightWidth: {
+      type: [Number, String],
+      default: 100,
+    },
+    defaultSearch: {
+      type: String,
+      default: '',
+    },
+    //展示返回按钮
+    showLeftButton: {
+      type: Boolean,
+      default: false,
+    },
+  });
+  const emits = defineEmits(['search']);
+
+  const sysStore = sheep.$store('sys');
+  const userStore = sheep.$store('user');
+  const appStore = sheep.$store('app');
+  const modalStore = sheep.$store('modal');
+  const sys = computed(() => sysStore);
+
+  // 导航栏模式(因为有自定义导航栏 需要计算)
+  const navbarMode = computed(() => {
+    if (props.navbar === 'normal' || props.navbarStyle.styleType === 'normal') {
+      return 'normal';
+    }
+    return 'inner';
+  });
+
+  // 背景1
+  const bgMain = computed(() => {
+    if (navbarMode.value === 'inner') {
+      return {
+        background: `${props.bgStyle.backgroundColor} url(${sheep.$url.cdn(
+          props.bgStyle.backgroundImage,
+        )}) no-repeat top center / 100% auto`,
+      };
+    }
+    return {};
+  });
+
+  // 背景2
+  const bgBody = computed(() => {
+    if (navbarMode.value === 'normal') {
+      return {
+        background: `${props.bgStyle.backgroundColor} url(${sheep.$url.cdn(
+          props.bgStyle.backgroundImage,
+        )}) no-repeat top center / 100% auto`,
+      };
+    }
+    return {};
+  });
+
+  // 分享信息
+  const shareInfo = computed(() => {
+    if (props.onShareAppMessage === true) {
+      return sheep.$platform.share.getShareInfo();
+    } else {
+      if (!isEmpty(props.onShareAppMessage)) {
+        sheep.$platform.share.updateShareInfo(props.onShareAppMessage);
+        return props.onShareAppMessage;
+      }
+    }
+    return {};
+  });
+
+  // #ifdef MP-WEIXIN
+  // 微信小程序分享
+  onShareAppMessage(() => {
+    return {
+      title: shareInfo.value.title,
+      path: shareInfo.value.path,
+      imageUrl: shareInfo.value.image,
+    };
+  });
+  // #endif
+
+  onShow(() => {
+    if (!isEmpty(shareInfo.value)) {
+      sheep.$platform.share.updateShareInfo(shareInfo.value);
+    }
+  });
+</script>
+
+<style lang="scss" scoped>
+  .page-app {
+    position: relative;
+    color: var(--ui-TC);
+    background-color: var(--ui-BG-1) !important;
+    z-index: 2;
+    display: flex;
+    width: 100%;
+    height: 100vh;
+
+    .page-main {
+      position: absolute;
+      z-index: 1;
+      width: 100%;
+      min-height: 100%;
+      display: flex;
+      flex-direction: column;
+
+      .page-body {
+        width: 100%;
+        position: relative;
+        z-index: 1;
+        flex: 1;
+      }
+
+      .page-img {
+        width: 100vw;
+        height: 100vh;
+        position: absolute;
+        top: 0;
+        left: 0;
+        z-index: 0;
+      }
+    }
+  }
+</style>
diff --git a/sheep/components/s-line-block/s-line-block.vue b/sheep/components/s-line-block/s-line-block.vue
new file mode 100644
index 0000000..c0628f9
--- /dev/null
+++ b/sheep/components/s-line-block/s-line-block.vue
@@ -0,0 +1,15 @@
+<!-- 装修基础组件：分割线 -->
+<template>
+  <su-subline v-bind="data"></su-subline>
+</template>
+
+<script setup>
+  const props = defineProps({
+    data: {
+      type: Object,
+      default: {},
+    },
+  });
+</script>
+
+<style></style>
diff --git a/sheep/components/s-live-block/s-live-block.vue b/sheep/components/s-live-block/s-live-block.vue
new file mode 100644
index 0000000..9d1ad03
--- /dev/null
+++ b/sheep/components/s-live-block/s-live-block.vue
@@ -0,0 +1,144 @@
+<template>
+  <view>
+    <view
+      v-if="mode === 2 && state.liveList.length"
+      class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top"
+      :style="[{ margin: '-' + data.space + 'rpx' }]"
+    >
+      <view
+        :style="[
+          {
+            padding: data.space + 'rpx',
+          },
+        ]"
+        class="goods-list-box"
+        v-for="item in state.liveList"
+        :key="item.id"
+      >
+        <s-live-card
+          class="goods-md-box"
+          size="md"
+          :goodsFields="goodsFields"
+          :data="item"
+          :titleColor="goodsFields.name?.color"
+          :subTitleColor="goodsFields.anchor_name?.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @click="goRoom(item.roomid)"
+        >
+        </s-live-card>
+      </view>
+    </view>
+    <view v-if="mode === 1 && state.liveList.length" class="goods-lg-box">
+      <view
+        class="goods-box"
+        :style="[{ marginBottom: data.space + 'px' }]"
+        v-for="item in state.liveList"
+        :key="item.id"
+      >
+        <s-live-card
+          class="goods-card"
+          size="sl"
+          :goodsFields="goodsFields"
+          :data="item"
+          :titleColor="goodsFields.name?.color"
+          :subTitleColor="goodsFields.anchor_name.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @tap="goRoom(item.roomid)"
+        >
+        </s-live-card>
+      </view>
+    </view>
+  </view>
+</template>
+<script setup>
+  import { reactive, onMounted } from 'vue';
+  import sheep from '@/sheep';
+
+  const state = reactive({
+    liveList: [],
+    mpLink: '',
+  });
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {},
+    },
+    styles: {
+      type: Object,
+      default() {},
+    },
+  });
+  const { mode, goodsFields, mpliveIds } = props.data ?? {};
+  const { marginLeft, marginRight } = props.styles ?? {};
+
+  async function getLiveListByIds(ids) {
+    const { data } = await sheep.$api.app.mplive.getRoomList(ids);
+    return data;
+  }
+  function goRoom(id) {
+    // #ifdef MP-WEIXIN
+    uni.navigateTo({
+      url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${id}`,
+    });
+    // #endif
+
+    // #ifndef MP-WEIXIN
+    uni.showModal({
+      title: '提示',
+      confirmText: '允许',
+      content: '将打开小程序访问',
+      success: async function (res) {
+        if (res.confirm) {
+          getMpLink();
+        }
+      },
+    });
+    // #endif
+  }
+
+  function goMpLink() {
+    // #ifdef H5
+    window.location = state.mpLink;
+    // #endif
+    // #ifdef APP-PLUS
+    plus.runtime.openURL(state.mpLink);
+    // #endif
+  }
+
+  async function getMpLink() {
+    // #ifndef MP-WEIXIN
+    if (state.mpLink === '') {
+      const { error, data } = await sheep.$api.app.mplive.getMpLink();
+      if (error === 0) {
+        state.mpLink = data;
+      }
+    }
+    goMpLink();
+    // #endif
+  }
+
+  onMounted(async () => {
+    state.liveList = await getLiveListByIds(mpliveIds);
+  });
+</script>
+<style lang="scss" scoped>
+  .goods-list-box {
+    width: 50%;
+    flex-shrink: 0;
+    box-sizing: border-box;
+    overflow: hidden;
+  }
+
+  .goods-box {
+    &:nth-last-of-type(1) {
+      margin-bottom: 0 !important;
+    }
+  }
+
+  .goods-md-box,
+  .goods-sl-box {
+    position: relative;
+  }
+</style>
diff --git a/sheep/components/s-live-card/s-live-card.vue b/sheep/components/s-live-card/s-live-card.vue
new file mode 100644
index 0000000..9cefee0
--- /dev/null
+++ b/sheep/components/s-live-card/s-live-card.vue
@@ -0,0 +1,234 @@
+<template>
+  <view>
+    <!-- md卡片：竖向，一行放两个，图上内容下 -->
+    <view v-if="size === 'md'" class="md-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+      <view class="icon-box ss-flex">
+        <image class="icon" :src="state.liveStatus[data.status].img"></image>
+        <view class="title ss-m-l-16">{{ state.liveStatus[data.status].title }}</view>
+      </view>
+      <img class="md-img-box" :src="sheep.$url.cdn(data.feeds_img)" referrerpolicy="no-referrer">
+      <view class="md-goods-content">
+        <view class="md-goods-title ss-line-1" :style="[{ color: titleColor }]">
+          {{ data.name }}
+        </view>
+        <view class="md-goods-subtitle ss-m-t-14 ss-line-1" :style="[{ color: subTitleColor }]">
+          主播：{{ data.anchor_name }}
+        </view>
+      </view>
+    </view>
+    <!-- sl卡片：竖向型，一行放一个，图片上内容下边 -->
+    <view v-if="size === 'sl'" class="sl-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+      <view class="icon-box ss-flex">
+        <image class="icon" :src="state.liveStatus[data.status].img"></image>
+        <view class="title ss-m-l-16">{{ state.liveStatus[data.status].title }}</view>
+      </view>
+      <img class="sl-img-box" :src="sheep.$url.cdn(data.feeds_img)" referrerpolicy="no-referrer">
+      <view class="sl-goods-content">
+        <view class="sl-goods-title ss-line-1" :style="[{ color: titleColor }]">
+          {{ data.name }}
+        </view>
+        <view class="sl-goods-subtitle ss-m-t-14 ss-line-1" :style="[{ color: subTitleColor }]">
+          主播：{{ data.anchor_name }}
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+<script setup>
+  import { computed, reactive } from 'vue';
+  import sheep from '@/sheep';
+  /**
+   * 直播卡片
+   *
+   * @property {String} img 											- 图片
+   * @property {String} title 										- 标题
+   * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
+   * @property {String} skuText 										- 规格
+   * @property {String | Number} score 								- 积分
+   * @property {String | Number} price 								- 价格
+   * @property {String | Number} originalPrice 						- 单购价
+   * @property {String} priceColor 									- 价格颜色
+   * @property {Number | String} num									- 数量
+   *
+   */
+  const props = defineProps({
+    goodsFields: {
+      type: [Array, Object],
+      default() {
+        return {};
+      },
+    },
+    tagStyle: {
+      type: Object,
+      default: {},
+    },
+    data: {
+      type: Object,
+      default: {},
+    },
+    size: {
+      type: String,
+      default: 'sl',
+    },
+    background: {
+      type: String,
+      default: '',
+    },
+    topRadius: {
+      type: Number,
+      default: 0,
+    },
+    bottomRadius: {
+      type: Number,
+      default: 0,
+    },
+    titleColor: {
+      type: String,
+      default: '#333',
+    },
+    subTitleColor: {
+      type: String,
+      default: '#999999',
+    },
+  });
+  // 组件样式
+  const elStyles = computed(() => {
+    return {
+      background: props.background,
+      'border-top-left-radius': props.topRadius + 'px',
+      'border-top-right-radius': props.topRadius + 'px',
+      'border-bottom-left-radius': props.bottomRadius + 'px',
+      'border-bottom-right-radius': props.bottomRadius + 'px',
+    };
+  });
+  const state = reactive({
+    liveStatus: {
+      101: {
+        img: sheep.$url.static('/static/img/shop/app/mplive/living.png'),
+        title: '直播中',
+      },
+      102: {
+        img: sheep.$url.static('/static/img/shop/app/mplive/start.png'),
+        title: '未开始',
+      },
+      103: {
+        img: sheep.$url.static('/static/img/shop/app/mplive/ended.png'),
+        title: '已结束',
+      },
+    },
+  });
+  const emits = defineEmits(['click', 'getHeight']);
+  const onClick = () => {
+    emits('click');
+  };
+</script>
+
+<style lang="scss" scoped>
+  // md
+  .md-goods-card {
+    overflow: hidden;
+    width: 100%;
+    height: 424rpx;
+    position: relative;
+    z-index: 1;
+    background-color: $white;
+    .icon-box {
+      position: absolute;
+      left: 20rpx;
+      top: 10rpx;
+      width: 136rpx;
+      height: 40rpx;
+      background: rgba(#000000, 0.5);
+      border-radius: 20rpx;
+      z-index: 1;
+      .icon {
+        width: 40rpx;
+        height: 40rpx;
+        border-radius: 20rpx 0px 20rpx 20rpx;
+      }
+      .title {
+        font-size: 24rpx;
+        font-weight: 500;
+        color: #ffffff;
+      }
+    }
+    .md-goods-content {
+      position: absolute;
+      left: 0;
+      bottom: 0;
+      padding: 20rpx;
+      width: 100%;
+      background: linear-gradient(360deg, rgba(0, 0, 0, 0.8) 0%, rgba(0, 0, 0, 0.02) 100%);
+    }
+
+    .md-img-box {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+
+    .md-goods-title {
+      font-size: 26rpx;
+      color: #333;
+      width: 100%;
+    }
+    .md-goods-subtitle {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+    }
+  }
+  .sl-goods-card {
+    overflow: hidden;
+    position: relative;
+    z-index: 1;
+    width: 100%;
+    height: 400rpx;
+    background-color: $white;
+    .icon-box {
+      position: absolute;
+      left: 20rpx;
+      top: 10rpx;
+      width: 136rpx;
+      height: 40rpx;
+      background: rgba(#000000, 0.5);
+      border-radius: 20rpx;
+      z-index: 1;
+      .icon {
+        width: 40rpx;
+        height: 40rpx;
+        border-radius: 20rpx 0px 20rpx 20rpx;
+      }
+      .title {
+        font-size: 24rpx;
+        font-weight: 500;
+        color: #ffffff;
+      }
+    }
+    .sl-goods-content {
+      position: absolute;
+      left: 0;
+      bottom: 0;
+      padding: 20rpx;
+      width: 100%;
+      background: linear-gradient(360deg, rgba(0, 0, 0, 0.8) 0%, rgba(0, 0, 0, 0.02) 100%);
+    }
+
+    .sl-img-box {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+
+    .sl-goods-title {
+      font-size: 26rpx;
+      color: #333;
+      width: 100%;
+    }
+    .sl-goods-subtitle {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #999999;
+    }
+  }
+</style>
diff --git a/sheep/components/s-menu-button/s-menu-button.vue b/sheep/components/s-menu-button/s-menu-button.vue
new file mode 100644
index 0000000..ef647b8
--- /dev/null
+++ b/sheep/components/s-menu-button/s-menu-button.vue
@@ -0,0 +1,343 @@
+<!-- 装修基础组件：菜单导航（金刚区） -->
+<template>
+	<!-- 包裹层 -->
+	<view class="ui-swiper" :class="[props.mode, props.ui]"
+		:style="[bgStyle, { height: swiperHeight + (menuList.length > 1 ? 50 : 0) + 'rpx' }]">
+		<!-- 轮播 -->
+		<swiper :circular="props.circular" :current="state.cur" :autoplay="props.autoplay" :interval="props.interval"
+			:duration="props.duration" :style="[{ height: swiperHeight + 'rpx' }]" @change="swiperChange">
+			<swiper-item v-for="(arr, index) in menuList" :key="index" :class="{ cur: state.cur == index }">
+				<!-- 宫格 -->
+				<view class="grid-wrap">
+					<view v-for="(item, index) in arr" :key="index"
+						class="grid-item ss-flex ss-flex-col ss-col-center ss-row-center"
+						:style="[{ width: `${100 * (1 / data.column)}%`, height: '200rpx' }]" hover-class="ss-hover-btn"
+						@tap="sheep.$router.go(item.url)">
+						<view class="menu-box ss-flex ss-flex-col ss-col-center ss-row-center">
+							<view v-if="item.badge.show" class="tag-box"
+								:style="[{ background: item.badge.bgColor, color: item.badge.textColor }]">
+								{{ item.badge.text }}
+							</view>
+							<image v-if="item.iconUrl" class="menu-icon" :style="[
+                  {
+                    width: props.iconSize + 'rpx',
+                    height: props.iconSize + 'rpx',
+                  },
+                ]" :src="sheep.$url.cdn(item.iconUrl)" mode="aspectFill"></image>
+							<view v-if="data.layout === 'iconText'" class="menu-title"
+								:style="[{ color: item.titleColor }]">
+								{{ item.title }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+		<!-- 指示点 -->
+		<template v-if="menuList.length > 1">
+			<view class="ui-swiper-dot" :class="props.dotStyle" v-if="props.dotStyle != 'tag'">
+				<view class="line-box" v-for="(item, index) in menuList.length" :key="index"
+					:class="[state.cur == index ? 'cur' : '', props.dotCur]"></view>
+			</view>
+			<view class="ui-swiper-dot" :class="props.dotStyle" v-if="props.dotStyle == 'tag'">
+				<view class="ui-tag radius" :class="[props.dotCur]" style="pointer-events: none">
+					<view style="transform: scale(0.7)">{{ state.cur + 1 }} / {{ menuList.length }}</view>
+				</view>
+			</view>
+		</template>
+	</view>
+</template>
+
+<script setup>
+	/**
+	 * 轮播menu
+	 *
+	 * @property {Boolean} circular = false  		- 是否采用衔接滑动，即播放到末尾后重新回到开头
+	 * @property {Boolean} autoplay = true  		- 是否自动切换
+	 * @property {Number} interval = 5000  			- 自动切换时间间隔
+	 * @property {Number} duration = 500  			- 滑动动画时长,app-nvue不支持
+	 * @property {Array} list = [] 					- 轮播数据
+	 * @property {String} ui = ''  					- 样式class
+	 * @property {String} mode  					- 模式
+	 * @property {String} dotStyle  				- 指示点样式
+	 * @property {String} dotCur= 'ui-BG-Main' 		- 当前指示点样式,默认主题色
+	 * @property {String} bg  						- 背景
+	 *
+	 * @property {String|Number} col = 4  			- 一行数量
+	 * @property {String|Number} row = 1 			- 几行
+	 * @property {String} hasBorder 				- 是否有边框
+	 * @property {String} borderColor 				- 边框颜色
+	 * @property {String} background		  		- 背景
+	 * @property {String} hoverClass 				- 按压样式类
+	 * @property {String} hoverStayTime 		  	- 动画时间
+	 *
+	 * @property {Array} list 		  				- 导航列表
+	 * @property {Number} iconSize 		  			- 图标大小
+	 * @property {String} color 		  			- 标题颜色
+	 *
+	 */
+
+	import {
+		reactive,
+		computed
+	} from 'vue';
+	import sheep from '@/sheep';
+
+	// 数据
+	const state = reactive({
+		cur: 0,
+	});
+
+	// 接收参数
+
+	const props = defineProps({
+		// 装修数据
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+			type: Object,
+			default: () => ({}),
+		},
+		circular: {
+			type: Boolean,
+			default: true,
+		},
+		autoplay: {
+			type: Boolean,
+			default: false,
+		},
+		interval: {
+			type: Number,
+			default: 5000,
+		},
+		duration: {
+			type: Number,
+			default: 500,
+		},
+		ui: {
+			type: String,
+			default: '',
+		},
+		mode: {
+			//default
+			type: String,
+			default: 'default',
+		},
+		dotStyle: {
+			type: String,
+			default: 'long', //default long tag
+		},
+		dotCur: {
+			type: String,
+			default: 'ui-BG-Main',
+		},
+		height: {
+			type: Number,
+			default: 300,
+		},
+		// 是否有边框
+		hasBorder: {
+			type: Boolean,
+			default: true,
+		},
+		// 边框颜色
+		borderColor: {
+			type: String,
+			default: 'red',
+		},
+		background: {
+			type: String,
+			default: 'blue',
+		},
+		hoverClass: {
+			type: String,
+			default: 'ss-hover-class', //'none'为没有hover效果
+		},
+		// 一排宫格数
+		col: {
+			type: [Number, String],
+			default: 3,
+		},
+		iconSize: {
+			type: Number,
+			default: 80,
+		},
+		color: {
+			type: String,
+			default: '#000',
+		},
+	});
+
+	// 设置背景样式
+	const bgStyle = computed(() => {
+		// 直接从 props.styles 解构
+		const {
+			bgType,
+			bgImg,
+			bgColor
+		} = props.styles;
+
+		// 根据 bgType 返回相应的样式
+		return {
+			background: bgType === 'img' ? `url(${bgImg}) no-repeat top center / 100% 100%` : bgColor
+		};
+	});
+
+	// 生成数据
+	const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.column));
+	const swiperHeight = computed(() => props.data.row * (props.data.layout === 'iconText' ? 200 : 180));
+	const windowWidth = sheep.$platform.device.windowWidth;
+
+	// current 改变时会触发 change 事件
+	const swiperChange = (e) => {
+		state.cur = e.detail.current;
+	};
+
+	// 重组数据
+	const splitData = (oArr = [], length = 1) => {
+		let arr = [];
+		let minArr = [];
+		oArr.forEach((c) => {
+			if (minArr.length === length) {
+				minArr = [];
+			}
+			if (minArr.length === 0) {
+				arr.push(minArr);
+			}
+			minArr.push(c);
+		});
+
+		return arr;
+	};
+</script>
+
+<style lang="scss" scoped>
+	.grid-wrap {
+		width: 100%;
+		display: flex;
+		position: relative;
+		box-sizing: border-box;
+		overflow: hidden;
+		flex-wrap: wrap;
+		align-items: center;
+	}
+
+	.menu-box {
+		position: relative;
+		z-index: 1;
+		transform: translate(0, 0);
+
+		.tag-box {
+			position: absolute;
+			z-index: 2;
+			top: 0;
+			right: -6rpx;
+			font-size: 2em;
+			line-height: 1;
+			padding: 0.4em 0.6em 0.3em;
+			transform: scale(0.4) translateX(0.5em) translatey(-0.6em);
+			transform-origin: 100% 0;
+			border-radius: 200rpx;
+			white-space: nowrap;
+		}
+
+		.menu-icon {
+			transform: translate(0, 0);
+			width: 80rpx;
+			height: 80rpx;
+			padding-bottom: 10rpx;
+		}
+
+		.menu-title {
+			font-size: 24rpx;
+			color: #333;
+		}
+	}
+
+	::v-deep(.ui-swiper) {
+		position: relative;
+		z-index: 1;
+
+		.ui-swiper-dot {
+			position: absolute;
+			width: 100%;
+			bottom: 20rpx;
+			height: 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			z-index: 2;
+
+			&.default .line-box {
+				display: inline-flex;
+				border-radius: 50rpx;
+				width: 6px;
+				height: 6px;
+				border: 2px solid transparent;
+				margin: 0 10rpx;
+				opacity: 0.3;
+				position: relative;
+				justify-content: center;
+				align-items: center;
+
+				&.cur {
+					width: 8px;
+					height: 8px;
+					opacity: 1;
+					border: 0px solid transparent;
+				}
+
+				&.cur::after {
+					content: '';
+					border-radius: 50rpx;
+					width: 4px;
+					height: 4px;
+					background-color: #fff;
+				}
+			}
+
+			&.long .line-box {
+				display: inline-block;
+				border-radius: 100rpx;
+				width: 6px;
+				height: 6px;
+				margin: 0 10rpx;
+				opacity: 0.3;
+				position: relative;
+
+				&.cur {
+					width: 24rpx;
+					opacity: 1;
+				}
+
+				&.cur::after {}
+			}
+
+			&.line {
+				bottom: 20rpx;
+
+				.line-box {
+					display: inline-block;
+					width: 30px;
+					height: 3px;
+					opacity: 0.3;
+					position: relative;
+
+					&.cur {
+						opacity: 1;
+					}
+				}
+			}
+
+			&.tag {
+				justify-content: flex-end;
+				position: absolute;
+				bottom: 20rpx;
+				right: 20rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-menu-grid/s-menu-grid.vue b/sheep/components/s-menu-grid/s-menu-grid.vue
new file mode 100644
index 0000000..d05a49d
--- /dev/null
+++ b/sheep/components/s-menu-grid/s-menu-grid.vue
@@ -0,0 +1,104 @@
+<!-- 装修基础组件：宫格导航 -->
+<template>
+	<view :style="[bgStyle, { marginLeft: `${data.space}px` }]">
+		<uni-grid :showBorder="Boolean(data.border)" :column="data.column">
+			<uni-grid-item v-for="(item, index) in data.list" :key="index" @tap="sheep.$router.go(item.url)">
+				<view class="grid-item-box ss-flex ss-flex-col ss-row-center ss-col-center">
+					<view class="img-box">
+						<view class="tag-box" v-if="item.badge.show"
+							:style="[{ background: item.badge.bgColor, color: item.badge.textColor }]">
+							{{ item.badge.text }}
+						</view>
+						<image class="menu-image" :src="sheep.$url.cdn(item.iconUrl)"></image>
+					</view>
+
+					<view class="title-box ss-flex ss-flex-col ss-row-center ss-col-center">
+						<view class="grid-text" :style="[{ color: item.titleColor }]">
+							{{ item.title }}
+						</view>
+						<view class="grid-tip" :style="[{ color: item.subtitleColor }]">
+							{{ item.subtitle }}
+						</view>
+					</view>
+				</view>
+			</uni-grid-item>
+		</uni-grid>
+	</view>
+
+</template>
+
+<script setup>
+	import sheep from '@/sheep';
+	import {
+		computed
+	} from 'vue';
+
+	const props = defineProps({
+		// 装修数据
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+			type: Object,
+			default: () => ({}),
+		},
+	});
+	// 设置背景样式
+	const bgStyle = computed(() => {
+		// 直接从 props.styles 解构
+		const {
+			bgType,
+			bgImg,
+			bgColor
+		} = props.styles;
+
+		// 根据 bgType 返回相应的样式
+		return {
+			background: bgType === 'img' ? `url(${bgImg}) no-repeat top center / 100% 100%` : bgColor
+		};
+	});
+</script>
+
+<style lang="scss" scoped>
+	.menu-image {
+		width: 24px;
+		height: 24px;
+	}
+
+	.grid-item-box {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+
+		.img-box {
+			position: relative;
+
+			.tag-box {
+				position: absolute;
+				z-index: 2;
+				top: 0;
+				right: 0;
+				font-size: 2em;
+				line-height: 1;
+				padding: 0.4em 0.6em 0.3em;
+				transform: scale(0.4) translateX(0.5em) translatey(-0.6em);
+				transform-origin: 100% 0;
+				border-radius: 200rpx;
+				white-space: nowrap;
+			}
+		}
+
+		.title-box {
+			.grid-tip {
+				font-size: 24rpx;
+				white-space: nowrap;
+				text-align: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-menu-list/s-menu-list.vue b/sheep/components/s-menu-list/s-menu-list.vue
new file mode 100644
index 0000000..ecbb396
--- /dev/null
+++ b/sheep/components/s-menu-list/s-menu-list.vue
@@ -0,0 +1,66 @@
+<!-- 装修基础组件：列表导航 -->
+<template>
+  <view class="menu-list-wrap">
+    <uni-list :border="true">
+      <uni-list-item
+        v-for="(item, index) in data.list"
+        :key="index"
+        showArrow
+        clickable
+        @tap="sheep.$router.go(item.url)"
+      >
+        <template v-slot:header>
+          <view class="ss-flex ss-col-center">
+            <image
+              v-if="item.iconUrl"
+              class="list-icon"
+              :src="sheep.$url.cdn(item.iconUrl)"
+              mode="aspectFit"
+            ></image>
+            <view
+              class="title-text ss-flex ss-row-center ss-col-center ss-m-l-20"
+              :style="[{ color: item.titleColor }]"
+            >
+              {{ item.title }}
+            </view>
+          </view>
+        </template>
+        <template v-slot:footer>
+          <view
+            class="notice-text ss-flex ss-row-center ss-col-center"
+            :style="[{ color: item.subtitleColor }]"
+          >
+            {{ item.subtitle }}
+          </view>
+        </template>
+      </uni-list-item>
+    </uni-list>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * cell
+   */
+  import sheep from '@/sheep';
+  const props = defineProps({
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+  });
+</script>
+
+<style lang="scss">
+  .list-icon {
+    width: 20px;
+    height: 20px;
+  }
+  .notice-text {
+  }
+  .menu-list-wrap {
+    ::v-deep .uni-list {
+      background-color: transparent;
+    }
+  }
+</style>
diff --git a/sheep/components/s-menu-tools/s-menu-tools.vue b/sheep/components/s-menu-tools/s-menu-tools.vue
new file mode 100644
index 0000000..147ead2
--- /dev/null
+++ b/sheep/components/s-menu-tools/s-menu-tools.vue
@@ -0,0 +1,118 @@
+<!-- 全局 - 快捷入口 -->
+<template>
+  <su-popup :show="show" type="top" round="20" backgroundColor="#F0F0F0" @close="closeMenuTools">
+    <su-status-bar />
+    <view class="tools-wrap ss-m-x-30 ss-m-b-16">
+      <view class="title ss-m-b-34 ss-p-t-20">快捷菜单</view>
+      <view class="container-list ss-flex ss-flex-wrap">
+        <view class="list-item ss-m-b-24" v-for="item in list" :key="item.title">
+          <view class="ss-flex-col ss-col-center">
+            <button
+              class="ss-reset-button list-image ss-flex ss-row-center ss-col-center"
+              @tap="onClick(item)"
+            >
+              <image v-if="show" :src="sheep.$url.static(item.icon)" class="list-icon" />
+            </button>
+            <view class="list-title ss-m-t-20">{{ item.title }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </su-popup>
+</template>
+
+<script setup>
+  import { reactive, computed } from 'vue';
+  import sheep from '@/sheep';
+  import { showMenuTools, closeMenuTools } from '@/sheep/hooks/useModal';
+
+  const show = computed(() => sheep.$store('modal').menu);
+
+  function onClick(item) {
+    closeMenuTools();
+    if (item.url) sheep.$router.go(item.url);
+  }
+
+  const list = [
+    {
+      url: '/pages/tabbar/index',
+      icon: '/static/img/shop/tools/home.png',
+      title: '首页',
+    },
+    /* {
+      url: '/pages/index/search',
+      icon: '/static/img/shop/tools/search.png',
+      title: '搜索',
+    }, */
+	{
+	  url: '/pages/clerk/fans/list',
+	  icon: '/static/img/shop/tools/collect.png',
+	  title: '我的收藏',
+	},
+    {
+      url: '/pages/tabbar/index?index=3',
+      icon: '/static/img/shop/tools/user.png',
+      title: '个人中心',
+    },
+    /* {
+      url: '/pages/index/cart',
+      icon: '/static/img/shop/tools/cart.png',
+      title: '购物车',
+    }, */
+    /* {
+      url: '/pages/user/goods-log',
+      icon: '/static/img/shop/tools/browse.png',
+      title: '浏览记录',
+    }, */
+    {
+      url: '/pages/chat/index',
+      icon: '/static/img/shop/tools/service.png',
+      title: '客服',
+    },
+  ];
+</script>
+
+<style lang="scss" scoped>
+  .tools-wrap {
+    // background: #F0F0F0;
+    // box-shadow: 0px 0px 28rpx 7rpx rgba(0, 0, 0, 0.13);
+    // opacity: 0.98;
+    // border-radius: 0 0 20rpx 20rpx;
+
+    .title {
+      font-size: 36rpx;
+      font-weight: bold;
+      color: #333333;
+    }
+
+    .list-item {
+      width: calc(25vw - 20rpx);
+
+      .list-image {
+        width: 104rpx;
+        height: 104rpx;
+        border-radius: 52rpx;
+        background: var(--ui-BG);
+
+        .list-icon {
+          width: 54rpx;
+          height: 54rpx;
+        }
+      }
+
+      .list-title {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #333333;
+      }
+    }
+  }
+
+  .uni-popup {
+    top: 0 !important;
+  }
+
+  :deep(.button-hover) {
+    background: #fafafa !important;
+  }
+</style>
diff --git a/sheep/components/s-notice-block/s-notice-block.vue b/sheep/components/s-notice-block/s-notice-block.vue
new file mode 100644
index 0000000..e7d74a0
--- /dev/null
+++ b/sheep/components/s-notice-block/s-notice-block.vue
@@ -0,0 +1,38 @@
+<template>
+  <view class="ss-flex ss-col-center notice-wrap">
+    <image class="icon-img" :src="sheep.$url.cdn(data.iconUrl)" mode="heightFix"></image>
+    <!-- todo：@owen 暂时只支持一个公告   -->
+    <su-notice-bar
+      style="flex: 1"
+      :showIcon="false"
+      scrollable
+      single
+      :text="data.contents[0].text"
+      :speed="50"
+      :color="data.textColor"
+      @tap="sheep.$router.go(data.contents[0].url)"
+    />
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 装修组件  - 通知栏
+   *
+   */
+  import sheep from '@/sheep';
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {},
+    },
+  });
+</script>
+
+<style lang="scss" scoped>
+  .notice-wrap {
+    .icon-img {
+      height: 56rpx;
+    }
+  }
+</style>
diff --git a/sheep/components/s-order-card/s-order-card.vue b/sheep/components/s-order-card/s-order-card.vue
new file mode 100644
index 0000000..b3d851b
--- /dev/null
+++ b/sheep/components/s-order-card/s-order-card.vue
@@ -0,0 +1,132 @@
+<!-- 装修用户组件：用户订单 -->
+<template>
+  <view class="ss-order-menu-wrap ss-flex ss-col-center" :style="[style, { marginLeft: `${data.space}px` }]">
+    <view
+      class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
+      v-for="item in orderMap"
+      :key="item.title"
+      @tap="sheep.$router.go(item.path, { type: item.value })"
+    >
+      <uni-badge
+        class="uni-badge-left-margin"
+        :text="numData.orderCount[item.count]"
+        absolute="rightTop"
+        size="small"
+      >
+        <image class="item-icon" :src="sheep.$url.static(item.icon)" mode="aspectFit" />
+      </uni-badge>
+      <view class="menu-title ss-m-t-28">{{ item.title }}</view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 装修组件 - 订单菜单组
+   */
+  import sheep from '@/sheep';
+  import { computed } from 'vue';
+
+  const orderMap = [
+    {
+      title: '待付款',
+      value: '1',
+      icon: '/static/img/shop/order/no_pay.png',
+      path: '/pages/order/list',
+      type: 'unpaid',
+      count: 'unpaidCount',
+    },
+    {
+      title: '待收货',
+      value: '3',
+      icon: '/static/img/shop/order/no_take.png',
+      path: '/pages/order/list',
+      type: 'noget',
+      count: 'deliveredCount',
+    },
+    {
+      title: '待评价',
+      value: '4',
+      icon: '/static/img/shop/order/no_comment.png',
+      path: '/pages/order/list',
+      type: 'nocomment',
+      count: 'uncommentedCount',
+    },
+    {
+      title: '售后单',
+      value: '0',
+      icon: '/static/img/shop/order/change_order.png',
+      path: '/pages/order/aftersale/list',
+      type: 'aftersale',
+      count: 'afterSaleCount',
+    },
+    {
+      title: '全部订单',
+      value: '0',
+      icon: '/static/img/shop/order/all_order.png',
+      path: '/pages/order/list',
+    },
+  ];
+  // 接收参数
+  const props = defineProps({
+  	// 装修数据
+  	data: {
+  	  type: Object,
+  	  default: () => ({}),
+  	},
+  	// 装修样式
+  	styles: {
+  	  type: Object,
+  	  default: () => ({}),
+  	},
+  });
+  // 设置角标
+  const numData = computed(() => sheep.$store('user').numData);
+  // 设置背景样式
+  const style = computed(() => {
+    // 直接从 props.styles 解构
+    const { bgType, bgImg, bgColor } = props.styles; 
+    // 根据 bgType 返回相应的样式
+    return {
+  		background: bgType === 'img'
+  			? `url(${bgImg}) no-repeat top center / 100% 100%`
+  			: bgColor
+  	};
+  });
+</script>
+
+<style lang="scss" scoped>
+  .ss-order-menu-wrap {
+    .menu-item {
+      height: 160rpx;
+      position: relative;
+      z-index: 10;
+      .menu-title {
+        font-size: 24rpx;
+        line-height: 24rpx;
+        color: #333333;
+      }
+      .item-icon {
+        width: 44rpx;
+        height: 44rpx;
+      }
+      .num-icon {
+        position: absolute;
+        right: 18rpx;
+        top: 18rpx;
+        // width: 40rpx;
+        padding: 0 8rpx;
+        height: 26rpx;
+        background: #ff4d4f;
+        border-radius: 13rpx;
+        color: #fefefe;
+        display: flex;
+        align-items: center;
+        .num {
+          font-size: 24rpx;
+          transform: scale(0.8);
+        }
+      }
+    }
+  }
+</style>
diff --git a/sheep/components/s-popup-image/s-popup-image.vue b/sheep/components/s-popup-image/s-popup-image.vue
new file mode 100644
index 0000000..b10f477
--- /dev/null
+++ b/sheep/components/s-popup-image/s-popup-image.vue
@@ -0,0 +1,85 @@
+<template>
+  <view>
+    <view v-for="(item, index) in popupList" :key="index">
+      <su-popup
+        v-if="index === currentIndex"
+        :show="item.isShow"
+        type="center"
+        backgroundColor="none"
+        round="0"
+        :showClose="true"
+        :isMaskClick="false"
+        @close="onClose(index)"
+      >
+        <view class="img-box">
+          <image
+            class="modal-img"
+            :src="sheep.$url.cdn(item.imgUrl)"
+            mode="widthFix"
+            @tap.stop="onPopup(item.url)"
+          />
+        </view>
+      </su-popup>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { computed, ref } from 'vue';
+  import { saveAdvHistory } from '@/sheep/hooks/useModal';
+
+  // 定义属性
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {},
+    }
+  })
+
+  // const modalStore = sheep.$store('modal');
+  const modalStore = JSON.parse(uni.getStorageSync('modal-store') || '{}');
+  console.log(modalStore)
+  const advHistory = modalStore.advHistory || [];
+  const currentIndex = ref(0);
+  const popupList = computed(() => {
+    const list = props.data.list || [];
+    const newList = [];
+    if (list.length > 0) {
+      list.forEach((adv) => {
+        if (adv.showType === 'once' && advHistory.includes(adv.imgUrl)) {
+          adv.isShow = false;
+        } else {
+          adv.isShow = true;
+          newList.push(adv);
+        }
+
+        // 记录弹窗已显示过
+        saveAdvHistory(adv);
+      });
+    }
+    return newList;
+  });
+
+  // 跳转链接
+  function onPopup(path) {
+    sheep.$router.go(path);
+  }
+
+  // 关闭
+  function onClose(index) {
+    currentIndex.value = index + 1;
+    popupList.value[index].isShow = false;
+  }
+</script>
+
+<style lang="scss" scoped>
+  .img-box {
+    width: 610rpx;
+    // height: 800rpx;
+  }
+  .modal-img {
+    width: 100%;
+    height: 100%;
+  }
+</style>
diff --git a/sheep/components/s-richtext-block/s-richtext-block.vue b/sheep/components/s-richtext-block/s-richtext-block.vue
new file mode 100644
index 0000000..4daa264
--- /dev/null
+++ b/sheep/components/s-richtext-block/s-richtext-block.vue
@@ -0,0 +1,40 @@
+<!-- 装修营销组件：营销文章 -->
+<template>
+  <view
+    :style="[
+      {
+        marginLeft: styles.marginLeft + 'px',
+        marginRight: styles.marginRight + 'px',
+        marginBottom: styles.marginBottom + 'px',
+        marginTop: styles.marginTop + 'px',
+        padding: styles.padding + 'px',
+      },
+    ]"
+  >
+    <mp-html class="richtext" :content="state.content"></mp-html>
+  </view>
+</template>
+<script setup>
+  import { reactive, onMounted } from 'vue';
+  import ArticleApi from '@/sheep/api/promotion/article';
+
+  const props = defineProps({
+    data: {
+      type: Object,
+      default: {},
+    },
+    styles: {
+      type: Object,
+      default() {},
+    },
+  });
+
+  const state = reactive({
+    content: '',
+  });
+
+  onMounted(async () => {
+    const { data } = await ArticleApi.getArticle(props.data.id);
+    state.content = data.content;
+  });
+</script>
diff --git a/sheep/components/s-search-block/s-search-block.vue b/sheep/components/s-search-block/s-search-block.vue
new file mode 100644
index 0000000..1e9c2b5
--- /dev/null
+++ b/sheep/components/s-search-block/s-search-block.vue
@@ -0,0 +1,164 @@
+<template>
+  <view
+    class="search-content ss-flex ss-col-center ss-row-between"
+    @tap="click"
+    :style="[
+      {
+        borderRadius: radius + 'px',
+        background: elBackground,
+        height: height + 'px',
+        width: width,
+      },
+    ]"
+    :class="[{ 'border-content': navbar }]"
+  >
+    <view class="ss-flex ss-col-center" v-if="navbar">
+      <view class="search-icon _icon-search ss-m-l-10" :style="[{ color: props.iconColor }]"></view>
+      <view class="search-input ss-flex-1 ss-line-1" :style="[{ color: fontColor, width: width }]">
+        {{ placeholder }}
+      </view>
+    </view>
+    <uni-search-bar
+      v-if="!navbar"
+      class="ss-flex-1"
+      :radius="data.borderRadius"
+      :placeholder="data.placeholder"
+      cancelButton="none"
+      clearButton="none"
+      @confirm="onSearch"
+      v-model="state.searchVal"
+    />
+    <view class="keyword-link ss-flex">
+      <view v-for="(item, index) in data.hotKeywords" :key="index">
+        <view
+          class="ss-m-r-16"
+          :style="[{ color: data.textColor }]"
+          @tap.stop="sheep.$router.go('/pages/goods/list', { keyword: item })"
+          >{{ item }}</view
+        >
+      </view>
+    </view>
+    <view v-if="data.hotKeywords && data.hotKeywords.length && navbar" class="ss-flex">
+      <button
+        class="ss-reset-button keyword-btn"
+        v-for="(item, index) in data.hotKeywords"
+        :key="index"
+        :style="[{ color: data.textColor, marginRight: '10rpx' }]"
+      >
+        {{ item }}
+      </button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 基础组件 - 搜索栏
+   *
+   * @property {String} elBackground 			- 输入框背景色
+   * @property {String} iconColor 			- 图标颜色
+   * @property {String} fontColor 		  	- 字体颜色
+   * @property {Number} placeholder 			- 默认placeholder
+   * @property {Number} topRadius 			- 组件上圆角
+   * @property {Number} bottomRadius 			- 组件下圆角
+   *
+   * @slot keywords							- 关键字
+   * @event {Function} click 					- 点击组件时触发
+   */
+
+  import { computed, reactive } from 'vue';
+  import sheep from '@/sheep';
+
+  // 组件数据
+  const state = reactive({
+    searchVal: '',
+  });
+
+  // 事件页面
+  const emits = defineEmits(['click']);
+
+  // 接收参数
+  const props = defineProps({
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+    // 输入框背景色
+    elBackground: {
+      type: String,
+      default: '',
+    },
+    height: {
+      type: Number,
+      default: 36,
+    },
+    // 图标颜色
+    iconColor: {
+      type: String,
+      default: '#b0b3bf',
+    },
+    // 字体颜色
+    fontColor: {
+      type: String,
+      default: '#b0b3bf',
+    },
+    // placeholder
+    placeholder: {
+      type: String,
+      default: '这是一个搜索框',
+    },
+    radius: {
+      type: Number,
+      default: 10,
+    },
+    width: {
+      type: String,
+      default: '100%',
+    },
+    navbar: {
+      type: Boolean,
+      default: true,
+    },
+  });
+
+  // 点击
+  const click = () => {
+    emits('click');
+  };
+
+  function onSearch(e) {
+    if (e.value) {
+      sheep.$router.go('/pages/goods/list', { keyword: e.value });
+      setTimeout(() => {
+        state.searchVal = '';
+      }, 100);
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .border-content {
+    border: 2rpx solid #eee;
+  }
+
+  .search-content {
+    flex: 1;
+    // height: 80rpx;
+    position: relative;
+
+    .search-icon {
+      font-size: 38rpx;
+      margin-right: 20rpx;
+    }
+
+    .keyword-link {
+      position: absolute;
+      right: 16rpx;
+      top: 18rpx;
+    }
+
+    .search-input {
+      font-size: 28rpx;
+    }
+  }
+</style>
diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
new file mode 100644
index 0000000..bfc61be
--- /dev/null
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -0,0 +1,182 @@
+<!-- 装修组件 - 秒杀 -->
+<template>
+	<view>
+		<!-- 样式一：三列 - 上图下文 -->
+		<view v-if="layoutType === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap" :style="[{ margin: '-' + data.space + 'rpx' }]">
+			<view v-for="product in productList" :key="product.id" class="goods-card-box" :style="[{padding: data.space + 'rpx',},]">
+				<s-goods-column
+					class="goods-card" size="sm"
+					:goodsFields="goodsFields"
+					:tagStyle="badge"
+					:data="product"
+					:titleColor="data.fields.name?.color"
+					:topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom"
+					@click="sheep.$router.go('/pages/goods/seckill', { id: props.data.activityId, })">
+				</s-goods-column>
+			</view>
+		</view>
+		<!-- 样式二：一列 - 左图右文 -->
+		<view class="goods-box" v-if="layoutType === 'oneCol'">
+			<view class="goods-list" v-for="(product, index) in productList" :key="index"
+				:style="[{ marginBottom: space + 'px' }]">
+				<s-goods-column
+					class="goods-card"
+					size="lg"
+					:goodsFields="goodsFields"
+					:seckillTag="true"
+					:tagStyle="badge"
+					:data="product"
+					:titleColor="data.fields.name?.color"
+					:subTitleColor="data.fields.introduction?.color"
+					:topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom"
+					@click="sheep.$router.go('/pages/goods/seckill', { id: props.data.activityId, })">
+					<template v-slot:cart>
+						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+							{{ btnBuy?.type === 'text' ? btnBuy.text : '立即秒杀' }}
+						</button>
+					</template>
+				</s-goods-column>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	/**
+	 * 秒杀商品列表
+	 *
+	 * @property {Array} list 商品列表
+	 */
+	import {
+		computed,
+		onMounted,
+		reactive,
+		ref
+	} from 'vue';
+	import sheep from '@/sheep';
+	import SeckillApi from "@/sheep/api/promotion/seckill";
+	import SpuApi from "@/sheep/api/product/spu";
+
+	// 接收参数
+	const props = defineProps({
+		// 装修数据
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+			type: Object,
+			default: () => ({}),
+		},
+	});
+	
+	// 设置相关信息是否显示
+	const goodsFields = reactive({
+	  // 商品价格
+	  price: { show: true },
+	  // 库存
+	  stock: { show: true },
+	  // 商品名称
+	  name: { show: true },
+	  // 商品介绍
+	  introduction: { show: true },
+	  // 市场价
+	  marketPrice: { show: true },
+	  // 销量
+	  salesCount: { show: true },
+	});
+	
+	let {
+		layoutType,
+		badge,
+		btnBuy,
+		space,
+	} = props.data;
+	let {
+		marginLeft,
+		marginRight
+	} = props.styles;
+
+	// 购买按钮样式
+	const buyStyle = computed(() => {
+		let btnBuy = props.data.btnBuy;
+		if (btnBuy?.type === 'text') {
+			return {
+				background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
+			};
+		}
+		if (btnBuy?.type === 'img') {
+			return {
+				width: '54rpx',
+				height: '54rpx',
+				background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
+				backgroundSize: '100% 100%',
+			};
+		}
+	});
+
+	// 商品列表
+	const productList = ref([]);
+	// 查询秒杀活动商品
+	onMounted(async () => {
+		// todo：@owen 与Yudao结构不一致，待重构
+		const {
+			data: activity
+		} = await SeckillApi.getSeckillActivity(props.data.activityId);
+		const {
+			data: spu
+		} = await SpuApi.getSpuDetail(activity.spuId)
+		// 循环活动信息，赋值秒杀最低价格
+		activity.products.forEach((product) => {
+			spu.price = Math.min(spu.price, product.seckillPrice); // 设置 SPU 的最低价格
+		});
+    // 将活动库存赋值给商品库存
+    spu.stock = activity.stock
+    // 活动总库存 - 活动库存 = 销量
+    spu.salesCount = activity.totalStock - activity.stock
+		productList.value = [spu];
+	});
+</script>
+
+<style lang="scss" scoped>
+	.header-box {
+		height: 100rpx;
+	}
+
+	.goods-list {
+		position: relative;
+
+		&:nth-last-child(1) {
+			margin-bottom: 0 !important;
+		}
+
+		.cart-btn {
+			position: absolute;
+			bottom: 10rpx;
+			right: 20rpx;
+			z-index: 11;
+			height: 50rpx;
+			line-height: 50rpx;
+			padding: 0 20rpx;
+			border-radius: 25rpx;
+			font-size: 24rpx;
+			color: #fff;
+			background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
+		}
+	}
+
+	.goods-sm-box {
+		margin: 0 auto;
+		box-sizing: border-box;
+
+		.goods-card-box {
+			flex-shrink: 0;
+			overflow: hidden;
+			width: 33.3%;
+			box-sizing: border-box;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
new file mode 100644
index 0000000..6259a08
--- /dev/null
+++ b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
@@ -0,0 +1,472 @@
+<template>
+  <!-- 拼团商品规格弹窗 -->
+  <su-popup :show="show" round="10" @close="emits('close')">
+    <!-- SKU 信息 -->
+    <view class="ss-modal-box bg-white ss-flex-col">
+      <view class="modal-header ss-flex ss-col-center">
+        <view class="header-left ss-m-r-30">
+          <image class="sku-image" :src="sheep.$url.cdn(state.selectedSku.picUrl || goodsInfo.picUrl)" mode="aspectFill" />
+        </view>
+        <view class="header-right ss-flex-col ss-row-between ss-flex-1">
+          <view class="goods-title ss-line-2">
+            <view class="tig ss-flex ss-col-center">
+              <view class="tig-icon ss-flex ss-col-center ss-row-center">
+                <view class="groupon-tag">
+                  <image :src="sheep.$url.static('/static/img/shop/goods/groupon-tag-white.png')" />
+                </view>
+              </view>
+              <view class="tig-title">拼团价</view>
+            </view>
+            <view class="info-title">
+              {{ goodsInfo.name }}
+            </view>
+          </view>
+          <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
+            <view class="price-text"> {{ fen2yuan(state.selectedSku.price || goodsInfo.price || state.selectedSku.marketPrice) }}</view>
+
+            <view class="stock-text ss-m-l-20">
+              库存{{ state.selectedSku.stock || goodsInfo.stock }}件
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="modal-content ss-flex-1">
+        <scroll-view scroll-y="true" class="modal-content-scroll">
+          <view class="sku-item ss-m-b-20" v-for="property in propertyList" :key="property.id">
+            <view class="label-text ss-m-b-20">{{ property.name }}</view>
+            <view class="ss-flex ss-col-center ss-flex-wrap">
+              <button class="ss-reset-button spec-btn" v-for="value in property.values" :class="[
+                  {
+                    'checked-btn': state.currentPropertyArray[property.id] === value.id,
+                  },
+                  {
+                    'disabled-btn': value.disabled === true,
+                  },
+                ]" :key="value.id" :disabled="value.disabled === true" @tap="onSelectSku(property.id, value.id)">
+                {{ value.name }}
+              </button>
+            </view>
+          </view>
+          <view class="buy-num-box ss-flex ss-col-center ss-row-between">
+            <view class="label-text">购买数量</view>
+            <su-number-box :min="1" :max="state.selectedSku.stock" :step="1"
+                           v-model="state.selectedSku.count" @change="onNumberChange($event)" activity="groupon" />
+          </view>
+        </scroll-view>
+      </view>
+
+      <!-- 操作区 -->
+      <view class="modal-footer ss-p-y-20">
+        <view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center">
+          <view class="ss-flex">
+            <button class="ss-reset-button origin-price-btn ss-flex-col">
+              <view class="btn-title">{{ grouponNum + '人团' }}</view>
+            </button>
+            <button class="ss-reset-button btn-tox ss-flex-col" @tap="onBuy">
+              <view class="btn-price">{{ fen2yuan(state.selectedSku.price * state.selectedSku.count || goodsInfo.price * state.selectedSku.count || state.selectedSku.marketPrice * state.selectedSku.count || goodsInfo.price) }}</view>
+              <view v-if="grouponAction === 'create'">立即开团</view>
+              <view v-else-if="grouponAction === 'join'">参与拼团</view>
+            </button>
+          </view>
+        </view>
+      </view>
+    </view>
+  </su-popup>
+</template>
+
+<script setup>
+  import { computed, reactive, watch } from 'vue';
+  import sheep from '@/sheep';
+  import {convertProductPropertyList, fen2yuan} from '@/sheep/hooks/useGoods';
+
+  const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-btn-long.png');
+  const emits = defineEmits(['change', 'addCart', 'buy', 'close', 'ladder']);
+  const props = defineProps({
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    goodsInfo: {
+      type: Object,
+      default () {},
+    },
+    grouponAction: {
+      type: String,
+      default: 'create',
+    },
+    grouponNum: {
+      type: [Number, String],
+      default: 0,
+    },
+  });
+  const state = reactive({
+    selectedSku: {}, // 选中的 SKU
+    currentPropertyArray: [], // 当前选中的属性，实际是个 Map。key 是 property 编号，value 是 value 编号
+    grouponNum: props.grouponNum,
+  });
+
+  const propertyList = convertProductPropertyList(props.goodsInfo.skus);
+
+  // SKU 列表
+  const skuList = computed(() => {
+    let skuPrices = props.goodsInfo.skus;
+    for (let price of skuPrices) {
+      price.value_id_array = price.properties.map((item) => item.valueId)
+    }
+    return skuPrices;
+  });
+
+  watch(
+    () => state.selectedSku,
+    (newVal) => {
+      emits('change', newVal);
+    }, {
+      immediate: true, // 立即执行
+      deep: true, // 深度监听
+    },
+  );
+
+  // 输入框改变数量
+  function onNumberChange(e) {
+    if (e === 0) return;
+    if (state.selectedSku.count === e) return;
+    state.selectedSku.count = e;
+  }
+
+  // 点击购买
+  function onBuy() {
+    if (!state.selectedSku.id || state.selectedSku.id <= 0) {
+      sheep.$helper.toast('请选择规格');
+      return;
+    }
+    if (state.selectedSku.stock <= 0) {
+      sheep.$helper.toast('库存不足');
+      return;
+    }
+    emits('buy', state.selectedSku);
+  }
+
+  // 改变禁用状态：计算每个 property 属性值的按钮，是否禁用
+  function changeDisabled(isChecked = false, propertyId = 0, valueId = 0) {
+    let newSkus = []; // 所有可以选择的 sku 数组
+    if (isChecked) {
+      // 情况一：选中 property
+      // 获得当前点击选中 property 的、所有可用 SKU
+      for (let price of skuList.value) {
+        if (price.stock <= 0) {
+          continue;
+        }
+        if (price.value_id_array.indexOf(valueId) >= 0) {
+          newSkus.push(price);
+        }
+      }
+    } else {
+      // 情况二：取消选中 property
+      // 当前所选 property 下，所有可以选择的 SKU
+      newSkus = getCanUseSkuList();
+    }
+
+    // 所有存在并且有库存未选择的 SKU 的 value 属性值 id
+    let noChooseValueIds = [];
+    for (let price of newSkus) {
+      noChooseValueIds = noChooseValueIds.concat(price.value_id_array);
+    }
+    noChooseValueIds = Array.from(new Set(noChooseValueIds)); // 去重
+
+    if (isChecked) {
+      // 去除当前选中的 value 属性值 id
+      let index = noChooseValueIds.indexOf(valueId);
+      noChooseValueIds.splice(index, 1);
+    } else {
+      // 循环去除当前已选择的 value 属性值 id
+      state.currentPropertyArray.forEach((currentPropertyId) => {
+        if (currentPropertyId.toString() !== '') {
+          return;
+        }
+        // currentPropertyId 为空是反选 填充的
+        let index = noChooseValueIds.indexOf(currentPropertyId);
+        if (index >= 0) {
+          // currentPropertyId 存在于 noChooseValueIds
+          noChooseValueIds.splice(index, 1);
+        }
+      });
+    }
+
+    // 当前已选择的 property 数组
+    let choosePropertyIds = [];
+    if (!isChecked) {
+      // 当前已选择的 property
+      state.currentPropertyArray.forEach((currentPropertyId, currentValueId) => {
+        if (currentPropertyId !== '') {
+          // currentPropertyId 为空是反选 填充的
+          choosePropertyIds.push(currentValueId);
+        }
+      });
+    } else {
+      // 当前点击选择的 property
+      choosePropertyIds = [propertyId];
+    }
+
+    for (let propertyIndex in propertyList) {
+      // 当前点击的 property、或者取消选择时候，已选中的 property 不进行处理
+      if (choosePropertyIds.indexOf(propertyList[propertyIndex]['id']) >= 0) {
+        continue;
+      }
+      // 如果当前 property id 不存在于有库存的 SKU 中，则禁用
+      for (let valueIndex in propertyList[propertyIndex]['values']) {
+        propertyList[propertyIndex]['values'][valueIndex]['disabled'] =
+            noChooseValueIds.indexOf(propertyList[propertyIndex]['values'][valueIndex]['id']) < 0; // true 禁用 or false 不禁用
+      }
+    }
+  }
+
+  // 当前所选属性下，获取所有有库存的 SKU 们
+  function getCanUseSkuList() {
+    let newSkus = [];
+    for (let sku of skuList.value) {
+      if (sku.stock <= 0) {
+        continue;
+      }
+      let isOk = true;
+      state.currentPropertyArray.forEach((propertyId) => {
+        // propertyId 不为空，并且，这个 条 sku 没有被选中，则排除
+        if (propertyId.toString() !== '' && sku.value_id_array.indexOf(propertyId) < 0) {
+          isOk = false;
+        }
+      });
+      if (isOk) {
+        newSkus.push(sku);
+      }
+    }
+    return newSkus;
+  }
+
+  // 选择规格
+  function onSelectSku(propertyId, valueId) {
+    // 清空已选择
+    let isChecked = true; // 选中 or 取消选中
+    if (state.currentPropertyArray[propertyId] !== undefined && state.currentPropertyArray[propertyId] === valueId) {
+      // 点击已被选中的，删除并填充 ''
+      isChecked = false;
+      state.currentPropertyArray.splice(propertyId, 1, '');
+    } else {
+      // 选中
+      state.currentPropertyArray[propertyId] = valueId;
+    }
+
+    // 选中的 property 大类
+    let choosePropertyId = [];
+    state.currentPropertyArray.forEach((currentPropertyId) => {
+      if (currentPropertyId !== '') {
+        // currentPropertyId 为空是反选 填充的
+        choosePropertyId.push(currentPropertyId);
+      }
+    });
+
+    // 当前所选 property 下，所有可以选择的 SKU 们
+    let newSkuList = getCanUseSkuList();
+
+    // 判断所有 property 大类是否选择完成
+    if (choosePropertyId.length === propertyList.length && newSkuList.length) {
+      newSkuList[0].count = state.selectedSku.count || 1;
+      state.selectedSku = newSkuList[0];
+    } else {
+      state.selectedSku = {};
+    }
+
+    // 改变 property 禁用状态
+    changeDisabled(isChecked, propertyId, valueId);
+  }
+
+  changeDisabled(false);
+  // TODO 芋艿：待讨论的优化点：1）单规格，要不要默认选中；2）默认要不要选中第一个规格
+</script>
+
+<style lang="scss" scoped>
+  // 购买
+  .buy-btn {
+    margin: 0 20rpx;
+    width: 100%;
+    height: 80rpx;
+    border-radius: 40rpx;
+    background: linear-gradient(90deg, #ff6000, #fe832a);
+    color: #fff;
+  }
+  .btn-tox {
+    width: 382rpx;
+    height: 80rpx;
+    font-size: 24rpx;
+    font-weight: 600;
+    margin-left: -50rpx;
+    background-image: v-bind(headerBg);
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    color: #ffffff;
+    line-height: normal;
+    border-radius: 0px 40rpx 40rpx 0px;
+
+    .btn-price {
+      font-family: OPPOSANS;
+
+      &::before {
+        content: '￥';
+      }
+    }
+  }
+  .origin-price-btn {
+    width: 370rpx;
+    height: 80rpx;
+    background: rgba(#ff5651, 0.1);
+    color: #ff6000;
+    border-radius: 40rpx 0px 0px 40rpx;
+    line-height: normal;
+    font-size: 24rpx;
+    font-weight: 500;
+
+    .btn-price {
+      font-family: OPPOSANS;
+
+      &::before {
+        content: '￥';
+      }
+    }
+
+    .btn-title {
+      font-size: 28rpx;
+    }
+  }
+
+  .ss-modal-box {
+    border-radius: 30rpx 30rpx 0 0;
+    max-height: 1000rpx;
+
+    .modal-header {
+      position: relative;
+      padding: 80rpx 20rpx 40rpx;
+
+      .sku-image {
+        width: 160rpx;
+        height: 160rpx;
+        border-radius: 10rpx;
+      }
+
+      .header-right {
+        height: 160rpx;
+      }
+
+      .close-icon {
+        position: absolute;
+        top: 10rpx;
+        right: 20rpx;
+        font-size: 46rpx;
+        opacity: 0.2;
+      }
+
+      .goods-title {
+        font-size: 28rpx;
+        font-weight: 500;
+        line-height: 42rpx;
+        position: relative;
+        .tig {
+          border: 2rpx solid #ff6000;
+          border-radius: 4rpx;
+          width: 126rpx;
+          height: 38rpx;
+          position: absolute;
+          left: 0;
+          top: 0;
+
+          .tig-icon {
+            width: 40rpx;
+            height: 40rpx;
+            background: #ff6000;
+            margin-left: -2rpx;
+            border-radius: 4rpx 0 0 4rpx;
+
+            .groupon-tag {
+              width: 32rpx;
+              height: 32rpx;
+            }
+          }
+
+          .tig-title {
+            font-size: 24rpx;
+            font-weight: 500;
+            line-height: normal;
+            color: #ff6000;
+            width: 86rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+        }
+        .info-title {
+          text-indent: 132rpx;
+        }
+      }
+
+      .price-text {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: $red;
+        font-family: OPPOSANS;
+
+        &::before {
+          content: '￥';
+          font-size: 24rpx;
+        }
+      }
+
+      .stock-text {
+        font-size: 26rpx;
+        color: #999999;
+      }
+    }
+
+    .modal-content {
+      padding: 0 20rpx;
+
+      .modal-content-scroll {
+        max-height: 600rpx;
+
+        .label-text {
+          font-size: 26rpx;
+          font-weight: 500;
+        }
+
+        .buy-num-box {
+          height: 100rpx;
+        }
+
+        .spec-btn {
+          height: 60rpx;
+          min-width: 100rpx;
+          padding: 0 30rpx;
+          background: #f4f4f4;
+          border-radius: 30rpx;
+          color: #434343;
+          font-size: 26rpx;
+          margin-right: 10rpx;
+          margin-bottom: 10rpx;
+        }
+
+        .checked-btn {
+          background: linear-gradient(90deg, #ff6000, #fe832a);
+          font-weight: 500;
+          color: #ffffff;
+        }
+
+        .disabled-btn {
+          font-weight: 400;
+          color: #c6c6c6;
+          background: #f8f8f8;
+        }
+      }
+    }
+  }
+
+  image {
+    width: 100%;
+    height: 100%;
+  }
+</style>
diff --git a/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue b/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
new file mode 100644
index 0000000..99b28a5
--- /dev/null
+++ b/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
@@ -0,0 +1,431 @@
+<!-- 秒杀商品的 SKU 选择，和 s-select-sku.vue 类似 -->
+<template>
+  <!-- 规格弹窗 -->
+  <su-popup :show="show" round="10" @close="emits('close')">
+    <!-- SKU 信息 -->
+    <view class="ss-modal-box bg-white ss-flex-col">
+      <view class="modal-header ss-flex ss-col-center">
+        <!-- 规格图片 -->
+        <view class="header-left ss-m-r-30">
+          <image
+            class="sku-image"
+            :src="sheep.$url.cdn(state.selectedSku.picUrl || state.goodsInfo.picUrl)"
+            mode="aspectFill"
+          >
+          </image>
+        </view>
+        <view class="header-right ss-flex-col ss-row-between ss-flex-1">
+          <!-- 名称 -->
+          <view class="goods-title ss-line-2">{{ state.goodsInfo.name }}</view>
+          <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
+            <!-- 价格 -->
+            <view class="price-text">
+              {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
+            </view>
+            <!-- 秒杀价格标签 -->
+            <view class="tig ss-flex ss-col-center">
+              <view class="tig-icon ss-flex ss-col-center ss-row-center">
+                <text class="cicon-alarm"></text>
+              </view>
+              <view class="tig-title">秒杀价</view>
+            </view>
+            <!-- 库存 -->
+            <view class="stock-text ss-m-l-20">
+              库存{{ state.selectedSku.stock || state.goodsInfo.stock }}件
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="modal-content ss-flex-1">
+        <scroll-view scroll-y="true" class="modal-content-scroll">
+          <view class="sku-item ss-m-b-20" v-for="property in propertyList" :key="property.id">
+            <view class="label-text ss-m-b-20">{{ property.name }}</view>
+            <view class="ss-flex ss-col-center ss-flex-wrap">
+              <button
+                class="ss-reset-button spec-btn"
+                v-for="value in property.values"
+                :class="[
+                  {
+                    'checked-btn': state.currentPropertyArray[property.id] === value.id,
+                  },
+                  {
+                    'disabled-btn': value.disabled === true,
+                  },
+                ]"
+                :key="value.id"
+                :disabled="value.disabled === true"
+                @tap="onSelectSku(property.id, value.id)"
+              >
+                {{ value.name }}
+              </button>
+            </view>
+          </view>
+          <view class="buy-num-box ss-flex ss-col-center ss-row-between">
+            <view class="label-text">购买数量</view>
+            <su-number-box
+              :min="1"
+              :max="min([singleLimitCount, state.selectedSku.stock])"
+              :step="1"
+              v-model="state.selectedSku.count"
+              @change="onBuyCountChange($event)"
+              activity="seckill"
+            ></su-number-box>
+          </view>
+        </scroll-view>
+      </view>
+      <view class="modal-footer">
+        <view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center">
+          <button class="ss-reset-button buy-btn" @tap="onBuy">确认</button>
+        </view>
+      </view>
+    </view>
+  </su-popup>
+</template>
+
+<script setup>
+  /**
+   * 秒杀活动SKU选择，
+   * 与s-select-sku的区别：多一个秒杀价的标签、没有加入购物车按钮、立即购买按钮叫确认、秒杀有最大购买数量限制
+   * 差别不大，可以考虑合并 todo @芋艿
+   */
+  // 按钮状态： active,nostock
+  import { computed, reactive, watch } from 'vue';
+  import sheep from '@/sheep';
+  import { convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
+  import { min } from 'lodash-es';
+  const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
+  const props = defineProps({
+    modelValue: {
+      type: Object,
+      default() {},
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    // 单次限购数量
+    singleLimitCount: {
+      type: Number,
+      default: 1,
+    },
+  });
+  const state = reactive({
+    goodsInfo: computed(() => props.modelValue),
+    selectedSku: {},
+    currentPropertyArray: [],
+  });
+
+  const propertyList = convertProductPropertyList(state.goodsInfo.skus);
+  // SKU 列表
+  const skuList = computed(() => {
+    let skuPrices = state.goodsInfo.skus;
+    for (let price of skuPrices) {
+      price.value_id_array = price.properties.map((item) => item.valueId);
+    }
+    return skuPrices;
+  });
+
+  watch(
+    () => state.selectedSku,
+    (newVal) => {
+      emits('change', newVal);
+    },
+    {
+      immediate: true, // 立即执行
+      deep: true, // 深度监听
+    },
+  );
+
+  const onBuy = () => {
+    if (state.selectedSku.id) {
+      if (state.selectedSku.stock <= 0) {
+        sheep.$helper.toast('库存不足');
+      } else {
+        emits('buy', state.selectedSku);
+      }
+    } else {
+      sheep.$helper.toast('请选择规格');
+    }
+  };
+
+  // 购买数量改变
+  function onBuyCountChange(buyCount) {
+    if (buyCount > 0 && state.selectedSku.count !== buyCount) {
+      state.selectedSku.count = buyCount;
+    }
+  }
+
+  // 改变禁用状态
+  const changeDisabled = (isChecked = false, propertyId = 0, valueId = 0) => {
+    let newSkus = []; // 所有可以选择的 sku 数组
+    if (isChecked) {
+      // 情况一：选中 property
+      // 获得当前点击选中 property 的、所有可用 SKU
+      for (let price of skuList.value) {
+        if (price.stock <= 0) {
+          continue;
+        }
+        if (price.value_id_array.indexOf(valueId) >= 0) {
+          newSkus.push(price);
+        }
+      }
+    } else {
+      // 情况二：取消选中 property
+      // 当前所选 property 下，所有可以选择的 SKU
+      newSkus = getCanUseSkuList();
+    }
+
+    // 所有存在并且有库存未选择的 SKU 的 value 属性值 id
+    let noChooseValueIds = [];
+    for (let price of newSkus) {
+      noChooseValueIds = noChooseValueIds.concat(price.value_id_array);
+    }
+    noChooseValueIds = Array.from(new Set(noChooseValueIds)); // 去重
+
+    if (isChecked) {
+      // 去除当前选中的 value 属性值 id
+      let index = noChooseValueIds.indexOf(valueId);
+      noChooseValueIds.splice(index, 1);
+    } else {
+      // 循环去除当前已选择的 value 属性值 id
+      state.currentPropertyArray.forEach((currentPropertyId) => {
+        if (currentPropertyId.toString() !== '') {
+          return;
+        }
+        // currentPropertyId 为空是反选 填充的
+        let index = noChooseValueIds.indexOf(currentPropertyId);
+        if (index >= 0) {
+          // currentPropertyId 存在于 noChooseValueIds
+          noChooseValueIds.splice(index, 1);
+        }
+      });
+    }
+
+    // 当前已选择的 property 数组
+    let choosePropertyIds = [];
+    if (!isChecked) {
+      // 当前已选择的 property
+      state.currentPropertyArray.forEach((currentPropertyId, currentValueId) => {
+        if (currentPropertyId !== '') {
+          // currentPropertyId 为空是反选 填充的
+          choosePropertyIds.push(currentValueId);
+        }
+      });
+    } else {
+      // 当前点击选择的 property
+      choosePropertyIds = [propertyId];
+    }
+
+    for (let propertyIndex in propertyList) {
+      // 当前点击的 property、或者取消选择时候，已选中的 property 不进行处理
+      if (choosePropertyIds.indexOf(propertyList[propertyIndex]['id']) >= 0) {
+        continue;
+      }
+      // 如果当前 property id 不存在于有库存的 SKU 中，则禁用
+      for (let valueIndex in propertyList[propertyIndex]['values']) {
+        propertyList[propertyIndex]['values'][valueIndex]['disabled'] =
+          noChooseValueIds.indexOf(propertyList[propertyIndex]['values'][valueIndex]['id']) < 0; // true 禁用 or false 不禁用
+      }
+    }
+  };
+
+  // 获取可用的（有库存的）SKU 列表
+  const getCanUseSkuList = () => {
+    let newSkus = [];
+    for (let sku of skuList.value) {
+      if (sku.stock <= 0) {
+        continue;
+      }
+      let isOk = true;
+      state.currentPropertyArray.forEach((propertyId) => {
+        // propertyId 不为空，并且，这个 条 sku 没有被选中，则排除
+        if (propertyId.toString() !== '' && sku.value_id_array.indexOf(propertyId) < 0) {
+          isOk = false;
+        }
+      });
+      if (isOk) {
+        newSkus.push(sku);
+      }
+    }
+    return newSkus;
+  };
+
+  // 选择规格
+  const onSelectSku = (propertyId, valueId) => {
+    // 清空已选择
+    let isChecked = true; // 选中 or 取消选中
+    if (
+      state.currentPropertyArray[propertyId] !== undefined &&
+      state.currentPropertyArray[propertyId] === valueId
+    ) {
+      // 点击已被选中的，删除并填充 ''
+      isChecked = false;
+      state.currentPropertyArray.splice(propertyId, 1, '');
+    } else {
+      // 选中
+      state.currentPropertyArray[propertyId] = valueId;
+    }
+
+    // 选中的 property 大类
+    let choosePropertyId = [];
+    state.currentPropertyArray.forEach((currentPropertyId) => {
+      if (currentPropertyId !== '') {
+        // currentPropertyId 为空是反选 填充的
+        choosePropertyId.push(currentPropertyId);
+      }
+    });
+
+    // 当前所选 property 下，所有可以选择的 SKU 们
+    let newSkuList = getCanUseSkuList();
+
+    // 判断所有 property 大类是否选择完成
+    if (choosePropertyId.length === propertyList.length && newSkuList.length) {
+      newSkuList[0].count = state.selectedSku.count || 1;
+      state.selectedSku = newSkuList[0];
+    } else {
+      state.selectedSku = {};
+    }
+
+    // 改变 property 禁用状态
+    changeDisabled(isChecked, propertyId, valueId);
+  };
+
+  changeDisabled(false);
+</script>
+
+<style lang="scss" scoped>
+  // 购买
+  .buy-box {
+    padding: 10rpx 20rpx;
+
+    .buy-btn {
+      width: 100%;
+      height: 80rpx;
+      border-radius: 40rpx;
+      background: linear-gradient(90deg, #ff5854, #ff2621);
+      color: #fff;
+    }
+  }
+
+  .ss-modal-box {
+    border-radius: 30rpx 30rpx 0 0;
+    max-height: 1000rpx;
+
+    .modal-header {
+      position: relative;
+      padding: 80rpx 20rpx 40rpx;
+
+      .sku-image {
+        width: 160rpx;
+        height: 160rpx;
+        border-radius: 10rpx;
+      }
+
+      .header-right {
+        height: 160rpx;
+      }
+
+      .close-icon {
+        position: absolute;
+        top: 10rpx;
+        right: 20rpx;
+        font-size: 46rpx;
+        opacity: 0.2;
+      }
+
+      .goods-title {
+        font-size: 28rpx;
+        font-weight: 500;
+        line-height: 42rpx;
+      }
+
+      .price-text {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: $red;
+        font-family: OPPOSANS;
+
+        &::before {
+          content: '￥';
+          font-size: 24rpx;
+        }
+      }
+
+      .stock-text {
+        font-size: 26rpx;
+        color: #999999;
+      }
+    }
+
+    .modal-content {
+      padding: 0 20rpx;
+
+      .modal-content-scroll {
+        max-height: 600rpx;
+
+        .label-text {
+          font-size: 26rpx;
+          font-weight: 500;
+        }
+
+        .buy-num-box {
+          height: 100rpx;
+        }
+
+        .spec-btn {
+          height: 60rpx;
+          min-width: 100rpx;
+          padding: 0 30rpx;
+          background: #f4f4f4;
+          border-radius: 30rpx;
+          color: #434343;
+          font-size: 26rpx;
+          margin-right: 10rpx;
+          margin-bottom: 10rpx;
+        }
+
+        .checked-btn {
+          background: linear-gradient(90deg, #ff5854, #ff2621);
+          font-weight: 500;
+          color: #ffffff;
+        }
+
+        .disabled-btn {
+          font-weight: 400;
+          color: #c6c6c6;
+          background: #f8f8f8;
+        }
+      }
+    }
+  }
+
+  .tig {
+    border: 2rpx solid #ff5854;
+    border-radius: 4rpx;
+    width: 126rpx;
+    height: 38rpx;
+
+    .tig-icon {
+      width: 40rpx;
+      height: 40rpx;
+      background: #ff5854;
+      border-radius: 4rpx 0 0 4rpx;
+
+      .cicon-alarm {
+        font-size: 32rpx;
+        color: #fff;
+      }
+    }
+
+    .tig-title {
+      font-size: 24rpx;
+      font-weight: 500;
+      line-height: normal;
+      color: #ff6000;
+      width: 86rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+</style>
diff --git a/sheep/components/s-select-sku/s-select-sku.vue b/sheep/components/s-select-sku/s-select-sku.vue
new file mode 100644
index 0000000..b339d4a
--- /dev/null
+++ b/sheep/components/s-select-sku/s-select-sku.vue
@@ -0,0 +1,406 @@
+<template>
+	<!-- 规格弹窗 -->
+	<su-popup :show="show" round="10" @close="emits('close')">
+    <!-- SKU 信息 -->
+		<view class="ss-modal-box bg-white ss-flex-col">
+			<view class="modal-header ss-flex ss-col-center">
+				<view class="header-left ss-m-r-30">
+					<image class="sku-image" :src="state.selectedSku.picUrl || goodsInfo.picUrl" mode="aspectFill" />
+				</view>
+				<view class="header-right ss-flex-col ss-row-between ss-flex-1">
+					<view class="goods-title ss-line-2">{{ goodsInfo.name }}</view>
+					<view class="header-right-bottom ss-flex ss-col-center ss-row-between">
+						<view class="ss-flex">
+							<view class="price-text">
+								{{ fen2yuan( state.selectedSku.price || goodsInfo.price) }}
+							</view>
+						</view>
+						<view class="stock-text ss-m-l-20">
+							{{ formatStock('exact', state.selectedSku.stock || goodsInfo.stock) }}
+						</view>
+					</view>
+				</view>
+			</view>
+
+      <!-- 属性选择 -->
+			<view class="modal-content ss-flex-1">
+				<scroll-view scroll-y="true" class="modal-content-scroll" @touchmove.stop>
+					<view class="sku-item ss-m-b-20" v-for="property in propertyList" :key="property.id">
+						<view class="label-text ss-m-b-20">{{ property.name }}</view>
+						<view class="ss-flex ss-col-center ss-flex-wrap">
+							<button class="ss-reset-button spec-btn" v-for="value in property.values" :class="[
+                  {
+                    'ui-BG-Main-Gradient': state.currentPropertyArray[property.id] === value.id,
+                  },
+                  {
+                    'disabled-btn': value.disabled === true,
+                  },
+                ]" :key="value.id" :disabled="value.disabled === true" @tap="onSelectSku(property.id, value.id)">
+								{{ value.name }}
+							</button>
+						</view>
+					</view>
+					<view class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-40">
+						<view class="label-text">购买数量</view>
+						<su-number-box :min="1" :max="state.selectedSku.stock" :step="1"
+                           v-model="state.selectedSku.goods_num" @change="onNumberChange($event)" />
+					</view>
+				</scroll-view>
+			</view>
+
+      <!-- 操作区 -->
+			<view class="modal-footer border-top">
+				<view class="buy-box ss-flex ss-col-center ss-flex ss-col-center ss-row-center">
+					<button class="ss-reset-button add-btn ui-Shadow-Main" @tap="onAddCart">加入购物车</button>
+					<button class="ss-reset-button buy-btn ui-Shadow-Main" @tap="onBuy">立即购买</button>
+				</view>
+			</view>
+		</view>
+	</su-popup>
+</template>
+
+<script setup>
+	import { computed, reactive, watch } from 'vue';
+	import sheep from '@/sheep';
+  import { formatStock, convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
+
+	const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
+	const props = defineProps({
+		goodsInfo: {
+			type: Object,
+			default () {},
+		},
+		show: {
+			type: Boolean,
+			default: false,
+		}
+	});
+
+	const state = reactive({
+		selectedSku: {}, // 选中的 SKU
+		currentPropertyArray: [], // 当前选中的属性，实际是个 Map。key 是 property 编号，value 是 value 编号
+	});
+
+	const propertyList = convertProductPropertyList(props.goodsInfo.skus);
+
+	// SKU 列表
+	const skuList = computed(() => {
+		let skuPrices = props.goodsInfo.skus;
+    for (let price of skuPrices) {
+      price.value_id_array = price.properties.map((item) => item.valueId)
+    }
+		return skuPrices;
+	});
+
+	watch(
+		() => state.selectedSku,
+		(newVal) => {
+			emits('change', newVal);
+		}, {
+			immediate: true, // 立即执行
+			deep: true, // 深度监听
+		},
+	);
+
+  // 输入框改变数量
+  function onNumberChange(e) {
+    if (e === 0) return;
+    if (state.selectedSku.goods_num === e) return;
+    state.selectedSku.goods_num = e;
+  }
+
+  // 加入购物车
+	function onAddCart() {
+		if (state.selectedSku.id <= 0) {
+      sheep.$helper.toast('请选择规格');
+      return;
+		}
+    if (state.selectedSku.stock <= 0) {
+      sheep.$helper.toast('库存不足');
+      return;
+    }
+
+    emits('addCart', state.selectedSku);
+	}
+
+  // 立即购买
+	function onBuy() {
+    if (state.selectedSku.id <= 0) {
+      sheep.$helper.toast('请选择规格');
+      return;
+    }
+    if (state.selectedSku.stock <= 0) {
+      sheep.$helper.toast('库存不足');
+      return;
+    }
+    emits('buy', state.selectedSku);
+	}
+
+	// 改变禁用状态：计算每个 property 属性值的按钮，是否禁用
+	function changeDisabled(isChecked = false, propertyId = 0, valueId = 0) {
+    let newSkus = []; // 所有可以选择的 sku 数组
+		if (isChecked) {
+			// 情况一：选中 property
+			// 获得当前点击选中 property 的、所有可用 SKU
+			for (let price of skuList.value) {
+				if (price.stock <= 0) {
+					continue;
+				}
+				if (price.value_id_array.indexOf(valueId) >= 0) {
+					newSkus.push(price);
+				}
+			}
+		} else {
+			// 情况二：取消选中 property
+			// 当前所选 property 下，所有可以选择的 SKU
+			newSkus = getCanUseSkuList();
+		}
+
+		// 所有存在并且有库存未选择的 SKU 的 value 属性值 id
+		let noChooseValueIds = [];
+		for (let price of newSkus) {
+			noChooseValueIds = noChooseValueIds.concat(price.value_id_array);
+		}
+		noChooseValueIds = Array.from(new Set(noChooseValueIds)); // 去重
+
+		if (isChecked) {
+			// 去除当前选中的 value 属性值 id
+			let index = noChooseValueIds.indexOf(valueId);
+			noChooseValueIds.splice(index, 1);
+		} else {
+			// 循环去除当前已选择的 value 属性值 id
+			state.currentPropertyArray.forEach((currentPropertyId) => {
+				if (currentPropertyId.toString() !== '') {
+          return;
+				}
+        // currentPropertyId 为空是反选 填充的
+        let index = noChooseValueIds.indexOf(currentPropertyId);
+        if (index >= 0) {
+          // currentPropertyId 存在于 noChooseValueIds
+          noChooseValueIds.splice(index, 1);
+        }
+			});
+		}
+
+    // 当前已选择的 property 数组
+		let choosePropertyIds = [];
+		if (!isChecked) {
+			// 当前已选择的 property
+			state.currentPropertyArray.forEach((currentPropertyId, currentValueId) => {
+				if (currentPropertyId !== '') {
+					// currentPropertyId 为空是反选 填充的
+					choosePropertyIds.push(currentValueId);
+				}
+			});
+		} else {
+			// 当前点击选择的 property
+			choosePropertyIds = [propertyId];
+		}
+
+    for (let propertyIndex in propertyList) {
+			// 当前点击的 property、或者取消选择时候，已选中的 property 不进行处理
+			if (choosePropertyIds.indexOf(propertyList[propertyIndex]['id']) >= 0) {
+				continue;
+			}
+      // 如果当前 property id 不存在于有库存的 SKU 中，则禁用
+      for (let valueIndex in propertyList[propertyIndex]['values']) {
+				propertyList[propertyIndex]['values'][valueIndex]['disabled'] =
+          noChooseValueIds.indexOf(propertyList[propertyIndex]['values'][valueIndex]['id']) < 0; // true 禁用 or false 不禁用
+			}
+		}
+	}
+
+	// 当前所选属性下，获取所有有库存的 SKU 们
+	function getCanUseSkuList() {
+		let newSkus = [];
+		for (let sku of skuList.value) {
+			if (sku.stock <= 0) {
+				continue;
+			}
+      let isOk = true;
+      state.currentPropertyArray.forEach((propertyId) => {
+				// propertyId 不为空，并且，这个 条 sku 没有被选中，则排除
+				if (propertyId.toString() !== '' && sku.value_id_array.indexOf(propertyId) < 0) {
+					isOk = false;
+				}
+			});
+			if (isOk) {
+				newSkus.push(sku);
+			}
+		}
+		return newSkus;
+	}
+
+	// 选择规格
+	function onSelectSku(propertyId, valueId) {
+		// 清空已选择
+		let isChecked = true; // 选中 or 取消选中
+		if (state.currentPropertyArray[propertyId] !== undefined && state.currentPropertyArray[propertyId] === valueId) {
+			// 点击已被选中的，删除并填充 ''
+			isChecked = false;
+			state.currentPropertyArray.splice(propertyId, 1, '');
+		} else {
+			// 选中
+			state.currentPropertyArray[propertyId] = valueId;
+		}
+
+    // 选中的 property 大类
+		let choosePropertyId = [];
+		state.currentPropertyArray.forEach((currentPropertyId) => {
+			if (currentPropertyId !== '') {
+				// currentPropertyId 为空是反选 填充的
+				choosePropertyId.push(currentPropertyId);
+			}
+		});
+
+		// 当前所选 property 下，所有可以选择的 SKU 们
+		let newSkuList = getCanUseSkuList();
+
+		// 判断所有 property 大类是否选择完成
+		if (choosePropertyId.length === propertyList.length && newSkuList.length) {
+			newSkuList[0].goods_num = state.selectedSku.goods_num || 1;
+			state.selectedSku = newSkuList[0];
+		} else {
+			state.selectedSku = {};
+		}
+
+		// 改变 property 禁用状态
+		changeDisabled(isChecked, propertyId, valueId);
+	}
+
+	changeDisabled(false);
+  // TODO 芋艿：待讨论的优化点：1）单规格，要不要默认选中；2）默认要不要选中第一个规格
+</script>
+
+<style lang="scss" scoped>
+	// 购买
+	.buy-box {
+		padding: 10rpx 0;
+
+		.add-btn {
+			width: 356rpx;
+			height: 80rpx;
+			border-radius: 40rpx 0 0 40rpx;
+			background-color: var(--ui-BG-Main-light);
+			color: var(--ui-BG-Main);
+		}
+
+		.buy-btn {
+			width: 356rpx;
+			height: 80rpx;
+			border-radius: 0 40rpx 40rpx 0;
+			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+			color: #fff;
+		}
+
+		.score-btn {
+			width: 100%;
+			margin: 0 20rpx;
+			height: 80rpx;
+			border-radius: 40rpx;
+			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+			color: #fff;
+		}
+	}
+
+	.ss-modal-box {
+		border-radius: 30rpx 30rpx 0 0;
+		max-height: 1000rpx;
+
+		.modal-header {
+			position: relative;
+			padding: 80rpx 20rpx 40rpx;
+
+			.sku-image {
+				width: 160rpx;
+				height: 160rpx;
+				border-radius: 10rpx;
+			}
+
+			.header-right {
+				height: 160rpx;
+			}
+
+			.close-icon {
+				position: absolute;
+				top: 10rpx;
+				right: 20rpx;
+				font-size: 46rpx;
+				opacity: 0.2;
+			}
+
+			.goods-title {
+				font-size: 28rpx;
+				font-weight: 500;
+				line-height: 42rpx;
+			}
+
+			.score-img {
+				width: 36rpx;
+				height: 36rpx;
+				margin: 0 4rpx;
+			}
+
+			.score-text {
+				font-size: 30rpx;
+				font-weight: 500;
+				color: $red;
+				font-family: OPPOSANS;
+			}
+
+			.price-text {
+				font-size: 30rpx;
+				font-weight: 500;
+				color: $red;
+				font-family: OPPOSANS;
+
+				&::before {
+					content: '￥';
+					font-size: 30rpx;
+					font-weight: 500;
+					color: $red;
+				}
+			}
+
+			.stock-text {
+				font-size: 26rpx;
+				color: #999999;
+			}
+		}
+
+		.modal-content {
+			padding: 0 20rpx;
+
+			.modal-content-scroll {
+				max-height: 600rpx;
+
+				.label-text {
+					font-size: 26rpx;
+					font-weight: 500;
+				}
+
+				.buy-num-box {
+					height: 100rpx;
+				}
+
+				.spec-btn {
+					height: 60rpx;
+					min-width: 100rpx;
+					padding: 0 30rpx;
+					background: #f4f4f4;
+					border-radius: 30rpx;
+					color: #434343;
+					font-size: 26rpx;
+					margin-right: 10rpx;
+					margin-bottom: 10rpx;
+				}
+
+				.disabled-btn {
+					font-weight: 400;
+					color: #c6c6c6;
+					background: #f8f8f8;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-share-modal/canvas-poster/index.vue b/sheep/components/s-share-modal/canvas-poster/index.vue
new file mode 100644
index 0000000..9e67943
--- /dev/null
+++ b/sheep/components/s-share-modal/canvas-poster/index.vue
@@ -0,0 +1,168 @@
+<!-- 海报弹窗 -->
+<template>
+  <su-popup :show="show" round="10" @close="onClosePoster" type="center" class="popup-box">
+    <view class="ss-flex-col ss-col-center ss-row-center">
+      <image
+        v-if="!!painterImageUrl"
+        class="poster-img"
+        :src="painterImageUrl"
+        :style="{
+          height: poster.css.height+ 'px',
+          width: poster.css.width + 'px',
+        }"
+        :show-menu-by-longpress="true"
+      />
+    </view>
+    <view
+      class="poster-btn-box ss-m-t-20 ss-flex ss-row-between ss-col-center"
+      v-if="!!painterImageUrl"
+    >
+      <button class="cancel-btn ss-reset-button" @tap="onClosePoster">取消</button>
+      <button class="save-btn ss-reset-button ui-BG-Main" @tap="onSavePoster">
+        {{
+          ['wechatOfficialAccount', 'H5'].includes(sheep.$platform.name)
+            ? '长按图片保存'
+            : '保存图片'
+        }}
+      </button>
+    </view>
+    <!--  海报画板：默认隐藏只用来生成海报。生成方式为主动调用  -->
+    <l-painter
+      isCanvasToTempFilePath
+      pathType="url"
+      @success="setPainterImageUrl"
+      hidden
+      ref="painterRef"
+    />
+  </su-popup>
+</template>
+
+<script setup>
+  /**
+   * 海报生成和展示
+   * 提示：小程序码默认跳转首页，由首页进行 spm 参数解析后跳转到对应的分享页面
+   * @description 用于生成分享海报，如：分享商品海报。
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=2389
+   * @property {Boolean} show   弹出层控制
+   * @property {Object}  shareInfo 分享信息
+   */
+  import { reactive, ref, unref } from 'vue';
+  import sheep from '@/sheep';
+  import { getPosterData } from '@/sheep/components/s-share-modal/canvas-poster/poster';
+
+  const props = defineProps({
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    shareInfo: {
+      type: Object,
+      default: () => {
+      },
+    },
+  });
+
+  const poster = reactive({
+    css: {
+      // 根节点若无尺寸，自动获取父级节点
+      width: sheep.$platform.device.windowWidth * 0.9,
+      height: 600,
+    },
+    views: [],
+  });
+
+  const emits = defineEmits(['success', 'close']);
+
+  const onClosePoster = () => {
+    emits('close');
+  };
+
+  const painterRef = ref(); // 海报画板
+  const painterImageUrl = ref(); // 海报 url
+  // 渲染海报
+  const renderPoster = async () => {
+    await painterRef.value.render(unref(poster));
+  };
+  // 获得生成的图片
+  const setPainterImageUrl = (path) => {
+    painterImageUrl.value = path;
+  };
+  // 保存海报图片
+  const onSavePoster = () => {
+    if (['WechatOfficialAccount', 'H5'].includes(sheep.$platform.name)) {
+      sheep.$helper.toast('请长按图片保存');
+      return;
+    }
+
+    // 非H5 保存到相册
+    uni.saveImageToPhotosAlbum({
+      filePath: painterImageUrl.value,
+      success: (res) => {
+        onClosePoster();
+        sheep.$helper.toast('保存成功');
+      },
+      fail: (err) => {
+        sheep.$helper.toast('保存失败');
+        console.log('图片保存失败:', err);
+      },
+    });
+  };
+
+  // 获得海报数据
+  async function getPoster() {
+    painterImageUrl.value = undefined
+    poster.views = await getPosterData({
+      width: poster.css.width,
+      shareInfo: props.shareInfo,
+    });
+    await renderPoster();
+  }
+
+  defineExpose({
+    getPoster,
+  });
+</script>
+
+<style lang="scss" scoped>
+  .popup-box {
+    position: relative;
+  }
+
+  .poster-title {
+    color: #999;
+  }
+
+  // 分享海报
+  .poster-btn-box {
+    width: 600rpx;
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    bottom: -80rpx;
+
+    .cancel-btn {
+      width: 240rpx;
+      height: 70rpx;
+      line-height: 70rpx;
+      background: $white;
+      border-radius: 35rpx;
+      font-size: 28rpx;
+      font-weight: 500;
+      color: $dark-9;
+    }
+
+    .save-btn {
+      width: 240rpx;
+      height: 70rpx;
+      line-height: 70rpx;
+      border-radius: 35rpx;
+      font-size: 28rpx;
+      font-weight: 500;
+    }
+  }
+
+  .poster-img {
+    border-radius: 20rpx;
+  }
+
+</style>
diff --git a/sheep/components/s-share-modal/canvas-poster/poster/goods.js b/sheep/components/s-share-modal/canvas-poster/poster/goods.js
new file mode 100644
index 0000000..883e4be
--- /dev/null
+++ b/sheep/components/s-share-modal/canvas-poster/poster/goods.js
@@ -0,0 +1,125 @@
+import sheep from '@/sheep';
+import { formatImageUrlProtocol, getWxaQrcode } from './index';
+
+const goods = async (poster) => {
+  const width = poster.width;
+  const userInfo = sheep.$store('user').userInfo;
+  const wxa_qrcode = await getWxaQrcode(poster.shareInfo.path, poster.shareInfo.query);
+  return [
+    {
+      type: 'image',
+      src: formatImageUrlProtocol(sheep.$url.cdn(sheep.$store('app').platform.share.posterInfo.goods_bg)),
+      css: {
+        width,
+        position: 'fixed',
+        'object-fit': 'contain',
+        top: '0',
+        left: '0',
+        zIndex: -1,
+      },
+    },
+    {
+      type: 'text',
+      text: userInfo.nickname,
+      css: {
+        color: '#333',
+        fontSize: 16,
+        fontFamily: 'sans-serif',
+        position: 'fixed',
+        top: width * 0.06,
+        left: width * 0.22,
+      },
+    },
+    {
+      type: 'image',
+      src: formatImageUrlProtocol(sheep.$url.cdn(userInfo.avatar)),
+      css: {
+        position: 'fixed',
+        left: width * 0.04,
+        top: width * 0.04,
+        width: width * 0.14,
+        height: width * 0.14,
+      },
+    },
+    {
+      type: 'image',
+      src: formatImageUrlProtocol(poster.shareInfo.poster.image),
+      css: {
+        position: 'fixed',
+        left: width * 0.03,
+        top: width * 0.21,
+        width: width * 0.94,
+        height: width * 0.94,
+      },
+    },
+    {
+      type: 'text',
+      text: poster.shareInfo.poster.title,
+      css: {
+        position: 'fixed',
+        left: width * 0.04,
+        top: width * 1.18,
+        color: '#333',
+        fontSize: 14,
+        lineHeight: 15,
+        maxWidth: width * 0.91,
+      },
+    },
+    {
+      type: 'text',
+      text: '￥' + poster.shareInfo.poster.price,
+      css: {
+        position: 'fixed',
+        left: width * 0.04,
+        top: width * 1.31,
+        fontSize: 20,
+        fontFamily: 'OPPOSANS',
+        color: '#333',
+      },
+    },
+    {
+      type: 'text',
+      text:
+        poster.shareInfo.poster.original_price > 0
+          ? '￥' + poster.shareInfo.poster.original_price
+          : '',
+      css: {
+        position: 'fixed',
+        left: width * 0.3,
+        top: width * 1.33,
+        color: '#999',
+        fontSize: 10,
+        fontFamily: 'OPPOSANS',
+        textDecoration: 'line-through',
+      },
+    },
+    // #ifndef MP-WEIXIN
+    {
+      type: 'qrcode',
+      text: poster.shareInfo.link,
+      css: {
+        position: 'fixed',
+        left: width * 0.75,
+        top: width * 1.3,
+        width: width * 0.2,
+        height: width * 0.2,
+      },
+    },
+    // #endif
+    // #ifdef MP-WEIXIN
+    {
+      type: 'image',
+      src: wxa_qrcode,
+      css: {
+        position: 'fixed',
+        left: width * 0.75,
+        top: width * 1.3,
+        width: width * 0.2,
+        height: width * 0.2,
+      },
+    },
+    // #endif
+  ];
+};
+
+export default goods;
diff --git a/sheep/components/s-share-modal/canvas-poster/poster/groupon.js b/sheep/components/s-share-modal/canvas-poster/poster/groupon.js
new file mode 100644
index 0000000..4b33c8c
--- /dev/null
+++ b/sheep/components/s-share-modal/canvas-poster/poster/groupon.js
@@ -0,0 +1,122 @@
+import sheep from '@/sheep';
+import { formatImageUrlProtocol, getWxaQrcode } from './index';
+
+const groupon = async (poster) => {
+  const width = poster.width;
+  const userInfo = sheep.$store('user').userInfo;
+  const wxa_qrcode = await getWxaQrcode(poster.shareInfo.path, poster.shareInfo.query);
+  return [
+    {
+      type: 'image',
+      src: formatImageUrlProtocol(sheep.$url.cdn(sheep.$store('app').platform.share.posterInfo.groupon_bg)),
+      css: {
+        width,
+        position: 'fixed',
+        'object-fit': 'contain',
+        top: '0',
+        left: '0',
+        zIndex: -1,
+      },
+    },
+    {
+      type: 'text',
+      text: userInfo.nickname,
+      css: {
+        color: '#333',
+        fontSize: 16,
+        fontFamily: 'sans-serif',
+        position: 'fixed',
+        top: width * 0.06,
+        left: width * 0.22,
+      },
+    },
+    {
+      type: 'image',
+      src: formatImageUrlProtocol(sheep.$url.cdn(userInfo.avatar)),
+      css: {
+        position: 'fixed',
+        left: width * 0.04,
+        top: width * 0.04,
+        width: width * 0.14,
+        height: width * 0.14,
+      },
+    },
+    {
+      type: 'image',
+      src: formatImageUrlProtocol(poster.shareInfo.poster.image),
+      css: {
+        position: 'fixed',
+        left: width * 0.03,
+        top: width * 0.21,
+        width: width * 0.94,
+        height: width * 0.94,
+        borderRadius: 10,
+      },
+    },
+    {
+      type: 'text',
+      text: poster.shareInfo.poster.title,
+      css: {
+        color: '#333',
+        fontSize: 14,
+        position: 'fixed',
+        top: width * 1.18,
+        left: width * 0.04,
+        maxWidth: width * 0.91,
+        lineHeight: 5,
+      },
+    },
+    {
+      type: 'text',
+      text: '￥' + poster.shareInfo.poster.price,
+      css: {
+        color: '#ff0000',
+        fontSize: 20,
+        fontFamily: 'OPPOSANS',
+        position: 'fixed',
+        top: width * 1.3,
+        left: width * 0.04,
+      },
+    },
+    {
+      type: 'text',
+      text: '2人团',
+      css: {
+        color: '#fff',
+        fontSize: 12,
+        fontFamily: 'OPPOSANS',
+        position: 'fixed',
+        left: width * 0.84,
+        top: width * 1.3,
+      },
+    },
+    // #ifndef MP-WEIXIN
+    {
+      type: 'qrcode',
+      text: poster.shareInfo.link,
+      css: {
+        position: 'fixed',
+        left: width * 0.5,
+        top: width * 1.3,
+        width: width * 0.2,
+        height: width * 0.2,
+      },
+    },
+    // #endif
+    // #ifdef MP-WEIXIN
+    {
+      type: 'image',
+      src: wxa_qrcode,
+      css: {
+        position: 'fixed',
+        left: width * 0.75,
+        top: width * 1.3,
+        width: width * 0.2,
+        height: width * 0.2,
+      },
+    },
+    // #endif
+  ];
+};
+
+export default groupon;
diff --git a/sheep/components/s-share-modal/canvas-poster/poster/index.js b/sheep/components/s-share-modal/canvas-poster/poster/index.js
new file mode 100644
index 0000000..0724e7f
--- /dev/null
+++ b/sheep/components/s-share-modal/canvas-poster/poster/index.js
@@ -0,0 +1,39 @@
+import user from './user';
+import goods from './goods';
+import groupon from './groupon';
+import SocialApi from '@/sheep/api/member/social';
+
+export function getPosterData(options) {
+  switch (options.shareInfo.poster.type) {
+    case 'user':
+      return user(options);
+    case 'goods':
+      return goods(options);
+    case 'groupon':
+      return groupon(options);
+  }
+}
+
+export function formatImageUrlProtocol(url) {
+  // #ifdef H5
+  // H5平台 https协议下需要转换
+  if (window.location.protocol === 'https:' && url.indexOf('http:') === 0) {
+    url = url.replace('http:', 'https:');
+  }
+  // #endif
+
+  // #ifdef MP-WEIXIN
+  // 小程序平台 需要强制转换为https协议
+  if (url.indexOf('http:') === 0) {
+    url = url.replace('http:', 'https:');
+  }
+  // #endif
+
+  return url;
+}
+
+// 获得微信小程序码 （Base64 image）
+export async function getWxaQrcode(path, query) {
+  const res = await SocialApi.getWxaQrcode(path, query);
+  return 'data:image/png;base64,' + res.data;
+}
diff --git a/sheep/components/s-share-modal/canvas-poster/poster/user.js b/sheep/components/s-share-modal/canvas-poster/poster/user.js
new file mode 100644
index 0000000..5c4d3b9
--- /dev/null
+++ b/sheep/components/s-share-modal/canvas-poster/poster/user.js
@@ -0,0 +1,74 @@
+import sheep from '@/sheep';
+import { formatImageUrlProtocol, getWxaQrcode } from './index';
+
+const user = async (poster) => {
+  const width = poster.width;
+  const userInfo = sheep.$store('user').userInfo;
+  const wxa_qrcode = await getWxaQrcode(poster.shareInfo.path, poster.shareInfo.query);
+  return [
+    {
+      type: 'image',
+      src: formatImageUrlProtocol(sheep.$url.cdn(sheep.$store('app').platform.share.posterInfo.user_bg)),
+      css: {
+        width,
+        position: 'fixed',
+        'object-fit': 'contain',
+        top: '0',
+        left: '0',
+        zIndex: -1,
+      },
+    },
+    {
+      type: 'text',
+      text: userInfo.nickname,
+      css: {
+        color: '#333',
+        fontSize: 14,
+        textAlign: 'center',
+        fontFamily: 'sans-serif',
+        position: 'fixed',
+        top: width * 0.4,
+        left: width / 2,
+      },
+    },
+    {
+      type: 'image',
+      src: formatImageUrlProtocol(sheep.$url.cdn(userInfo.avatar)),
+      css: {
+        position: 'fixed',
+        left: width * 0.4,
+        top: width * 0.16,
+        width: width * 0.2,
+        height: width * 0.2,
+      },
+    },
+    // #ifndef MP-WEIXIN
+    {
+      type: 'qrcode',
+      text: poster.shareInfo.link,
+      css: {
+        position: 'fixed',
+        left: width * 0.35,
+        top: width * 0.84,
+        width: width * 0.3,
+        height: width * 0.3,
+      },
+    },
+    // #endif
+    // #ifdef MP-WEIXIN
+    {
+      type: 'image',
+      src: wxa_qrcode,
+      css: {
+        position: 'fixed',
+        left: width * 0.35,
+        top: width * 0.84,
+        width: width * 0.3,
+        height: width * 0.3,
+      },
+    },
+    // #endif
+  ];
+};
+
+export default user;
diff --git a/sheep/components/s-share-modal/s-share-modal.vue b/sheep/components/s-share-modal/s-share-modal.vue
new file mode 100644
index 0000000..717940e
--- /dev/null
+++ b/sheep/components/s-share-modal/s-share-modal.vue
@@ -0,0 +1,196 @@
+<!-- 全局分享弹框 -->
+<template>
+  <view>
+    <su-popup :show="state.showShareGuide" :showClose="false" @close="onCloseGuide" />
+    <view v-if="state.showShareGuide" class="guide-wrap">
+      <image class="guide-image" :src="sheep.$url.static('/static/img/shop/share/share_guide.png')" />
+    </view>
+
+    <su-popup :show="show" round="10" :showClose="false" @close="closeShareModal">
+      <!-- 分享 tools -->
+      <view class="share-box">
+        <view class="share-list-box ss-flex">
+          <!-- 操作 ①：发送给微信好友 -->
+          <button
+            v-if="shareConfig.methods.includes('forward')"
+            class="share-item share-btn ss-flex-col ss-col-center"
+            open-type="share"
+            @tap="onShareByForward"
+          >
+            <image class="share-img" :src="sheep.$url.static('/static/img/shop/share/share_wx.png')" mode="" />
+            <text class="share-title">微信好友</text>
+          </button>
+
+          <!-- 操作 ②：生成海报图片 -->
+          <button
+            v-if="shareConfig.methods.includes('poster')"
+            class="share-item share-btn ss-flex-col ss-col-center"
+            @tap="onShareByPoster"
+          >
+            <image
+              class="share-img"
+              :src="sheep.$url.static('/static/img/shop/share/share_poster.png')"
+              mode=""
+            />
+            <text class="share-title">生成海报</text>
+          </button>
+
+          <!-- 操作 ③：生成链接 -->
+          <button
+            v-if="shareConfig.methods.includes('link')"
+            class="share-item share-btn ss-flex-col ss-col-center"
+            @tap="onShareByCopyLink"
+          >
+            <image class="share-img" :src="sheep.$url.static('/static/img/shop/share/share_link.png')" mode="" />
+            <text class="share-title">复制链接</text>
+          </button>
+        </view>
+        <view class="share-foot ss-flex ss-row-center ss-col-center" @tap="closeShareModal">
+          取消
+        </view>
+      </view>
+    </su-popup>
+
+    <!-- 分享海报，对应操作 ② -->
+    <canvas-poster
+      ref="SharePosterRef"
+      :show="state.showPosterModal"
+      :shareInfo="shareInfo"
+      @close="state.showPosterModal = false"
+    />
+  </view>
+</template>
+<script setup>
+  /**
+   * 分享弹窗
+   */
+  import { ref, unref, reactive, computed } from 'vue';
+  import sheep from '@/sheep';
+  import canvasPoster from './canvas-poster/index.vue';
+  import { closeShareModal, showAuthModal } from '@/sheep/hooks/useModal';
+
+  const show = computed(() => sheep.$store('modal').share);
+  const shareConfig = computed(() => sheep.$store('app').platform.share);
+  const SharePosterRef = ref('');
+
+  const props = defineProps({
+    shareInfo: {
+      type: Object,
+      default() {},
+    },
+  });
+
+  const state = reactive({
+    showShareGuide: false, // H5 的指引
+    showPosterModal: false, // 海报弹窗
+  });
+
+  // 操作 ②：生成海报分享
+  const onShareByPoster = () => {
+    closeShareModal();
+    if (!sheep.$store('user').isLogin) {
+      showAuthModal();
+      return;
+    }
+    console.log(props.shareInfo);
+    unref(SharePosterRef).getPoster();
+    state.showPosterModal = true;
+  };
+
+  // 操作 ①：直接转发分享
+  const onShareByForward = () => {
+    closeShareModal();
+
+    // #ifdef H5
+    if (['WechatOfficialAccount', 'H5'].includes(sheep.$platform.name)) {
+      state.showShareGuide = true;
+      return;
+    }
+    // #endif
+
+    // #ifdef APP-PLUS
+    uni.share({
+      provider: 'weixin',
+      scene: 'WXSceneSession',
+      type: 0,
+      href: props.shareInfo.link,
+      title: props.shareInfo.title,
+      summary: props.shareInfo.desc,
+      imageUrl: props.shareInfo.image,
+      success: (res) => {
+        console.log('success:' + JSON.stringify(res));
+      },
+      fail: (err) => {
+        console.log('fail:' + JSON.stringify(err));
+      },
+    });
+    // #endif
+  };
+
+  // 操作 ③：复制链接分享
+  const onShareByCopyLink = () => {
+    sheep.$helper.copyText(props.shareInfo.link);
+    closeShareModal();
+  };
+
+  function onCloseGuide() {
+    state.showShareGuide = false;
+  }
+</script>
+
+<style lang="scss" scoped>
+  .guide-image {
+    right: 30rpx;
+    top: 0;
+    position: fixed;
+    width: 580rpx;
+    height: 430rpx;
+    z-index: 10080;
+  }
+
+  // 分享tool
+  .share-box {
+    background: $white;
+    width: 750rpx;
+    border-radius: 30rpx 30rpx 0 0;
+    padding-top: 30rpx;
+
+    .share-foot {
+      font-size: 24rpx;
+      color: $gray-b;
+      height: 80rpx;
+      border-top: 1rpx solid $gray-e;
+    }
+
+    .share-list-box {
+      .share-btn {
+        background: none;
+        border: none;
+        line-height: 1;
+        padding: 0;
+
+        &::after {
+          border: none;
+        }
+      }
+
+      .share-item {
+        flex: 1;
+        padding-bottom: 20rpx;
+
+        .share-img {
+          width: 70rpx;
+          height: 70rpx;
+          background: $gray-f;
+          border-radius: 50%;
+          margin-bottom: 20rpx;
+        }
+
+        .share-title {
+          font-size: 24rpx;
+          color: $dark-6;
+        }
+      }
+    }
+  }
+</style>
diff --git a/sheep/components/s-statusbar/s-statusbar.vue b/sheep/components/s-statusbar/s-statusbar.vue
new file mode 100644
index 0000000..8b58c97
--- /dev/null
+++ b/sheep/components/s-statusbar/s-statusbar.vue
@@ -0,0 +1,10 @@
+<template>
+  <view class="status_bar" />
+</template>
+
+<style>
+  .status_bar {
+    height: var(--status-bar-height);
+    width: 100%;
+  }
+</style>
diff --git a/sheep/components/s-tabbar/s-tabbar.vue b/sheep/components/s-tabbar/s-tabbar.vue
new file mode 100644
index 0000000..369a823
--- /dev/null
+++ b/sheep/components/s-tabbar/s-tabbar.vue
@@ -0,0 +1,90 @@
+<template>
+  <view class="u-page__item" v-if="tabbar?.items?.length > 0">
+    <su-tabbar
+      :value="path"
+      :fixed="true"
+      :placeholder="true"
+      :safeAreaInsetBottom="true"
+      :inactiveColor="tabbar.style.color"
+      :activeColor="tabbar.style.activeColor"
+      :midTabBar="tabbar.mode === 2"
+      :customStyle="tabbarStyle"
+    >
+      <su-tabbar-item
+        v-for="(item, index) in tabbar.items"
+        :key="item.text"
+        :text="item.text"
+        :name="item.url"
+        :isCenter="getTabbarCenter(index)"
+        :centerImage="sheep.$url.cdn(item.iconUrl)"
+        @tap="sheep.$router.go(item.url)"
+      >
+        <template v-slot:active-icon>
+          <image class="u-page__item__slot-icon" :src="sheep.$url.cdn(item.activeIconUrl)"></image>
+        </template>
+        <template v-slot:inactive-icon>
+          <image class="u-page__item__slot-icon" :src="sheep.$url.cdn(item.iconUrl)"></image>
+        </template>
+      </su-tabbar-item>
+    </su-tabbar>
+  </view>
+</template>
+
+<script setup>
+  import { computed, unref } from 'vue';
+  import sheep from '@/sheep';
+
+  const tabbar = computed(() => {
+    return sheep.$store('app').template.basic?.tabbar;
+  });
+
+  const tabbarStyle = computed(() => {
+    const backgroundStyle = tabbar.value.style;
+    if (backgroundStyle.bgType === 'color') {
+      return { background: backgroundStyle.bgColor };
+    }
+    if (backgroundStyle.bgType === 'img')
+      return {
+        background: `url(${sheep.$url.cdn(
+          backgroundStyle.bgImg,
+        )}) no-repeat top center / 100% auto`,
+      };
+  });
+
+  const getTabbarCenter = (index) => {
+    if (unref(tabbar).mode !== 2) return false;
+    return unref(tabbar).items % 2 > 0
+      ? Math.ceil(unref(tabbar).items.length / 2) === index + 1
+      : false;
+  };
+
+  const props = defineProps({
+    path: String,
+    default: '',
+  });
+</script>
+
+<style lang="scss">
+  .u-page {
+    padding: 0;
+
+    &__item {
+      &__title {
+        color: var(--textSize);
+        background-color: #fff;
+        padding: 15px;
+        font-size: 15px;
+
+        &__slot-title {
+          color: var(--textSize);
+          font-size: 14px;
+        }
+      }
+
+      &__slot-icon {
+        width: 25px;
+        height: 25px;
+      }
+    }
+  }
+</style>
diff --git a/sheep/components/s-title-block/s-title-block.vue b/sheep/components/s-title-block/s-title-block.vue
new file mode 100644
index 0000000..cb61033
--- /dev/null
+++ b/sheep/components/s-title-block/s-title-block.vue
@@ -0,0 +1,108 @@
+<!-- 装修商品组件：标题栏 -->
+<template>
+	<view class="ss-title-wrap ss-flex ss-col-center" :class="[state.typeMap[data.textAlign]]" :style="[bgStyle, { marginLeft: `${data.space}px` }]">
+		<view class="title-content">
+			<!-- 主标题 -->
+			<view v-if="data.title" class="title-text" :style="[titleStyles]">{{ data.title }}</view>
+			<!-- 副标题 -->
+			<view v-if="data.description" :style="[descStyles]" class="sub-title-text">{{ data.description }}</view>
+		</view>
+		<!-- 查看更多 -->
+		<view v-if="data.more?.show" class="more-box ss-flex ss-col-center" @tap="sheep.$router.go(data.more.url)"
+			:style="{color: data.descriptionColor}">
+			<view class="more-text" v-if="data.more.type !== 'icon'">{{ data.more.text }} </view>
+			<text class="_icon-forward" v-if="data.more.type !== 'text'"></text>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	/**
+	 * 标题栏
+	 */
+	import {
+		reactive,
+		computed
+	} from 'vue';
+	import sheep from '@/sheep';
+
+	// 数据
+	const state = reactive({
+		typeMap: {
+			left: 'ss-row-left',
+			center: 'ss-row-center',
+		},
+	});
+
+	// 接收参数
+	const props = defineProps({
+		// 装修数据
+		data: {
+			type: Object,
+			default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+			type: Object,
+			default: () => ({}),
+		},
+	});
+	// 设置背景样式
+	const bgStyle = computed(() => {
+		// 直接从 props.styles 解构
+		const {
+			bgType,
+			bgImg,
+			bgColor
+		} = props.styles;
+
+		// 根据 bgType 返回相应的样式
+		return {
+			background: bgType === 'img' ? `url(${bgImg}) no-repeat top center / 100% 100%` : bgColor
+		};
+	});
+
+	// 标题样式
+	const titleStyles = {
+		color: props.data.titleColor,
+		fontSize: `${props.data.titleSize}px`,
+		textAlign: props.data.textAlign
+	};
+
+	// 副标题
+	const descStyles = {
+		color: props.data.descriptionColor,
+		textAlign: props.data.textAlign,
+		fontSize: `${props.data.descriptionSize}px`,
+		fontWeight: `${props.data.descriptionWeight}px`,
+	};
+</script>
+
+<style lang="scss" scoped>
+	.ss-title-wrap {
+		height: 80rpx;
+		position: relative;
+
+		.title-content {
+			.title-text {
+				font-size: 30rpx;
+				color: #333;
+			}
+
+			.sub-title-text {
+				font-size: 22rpx;
+				color: #999;
+			}
+		}
+
+		.more-box {
+			white-space: nowrap;
+			font-size: 22rpx;
+			color: #999;
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			right: 20rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-uploader/choose-and-upload-file.js b/sheep/components/s-uploader/choose-and-upload-file.js
new file mode 100644
index 0000000..604ff9d
--- /dev/null
+++ b/sheep/components/s-uploader/choose-and-upload-file.js
@@ -0,0 +1,213 @@
+'use strict';
+import FileApi from '@/sheep/api/infra/file';
+
+const ERR_MSG_OK = 'chooseAndUploadFile:ok';
+const ERR_MSG_FAIL = 'chooseAndUploadFile:fail';
+
+function chooseImage(opts) {
+  const {
+    count,
+    sizeType = ['original', 'compressed'],
+    sourceType = ['album', 'camera'],
+    extension,
+  } = opts;
+  return new Promise((resolve, reject) => {
+    uni.chooseImage({
+      count,
+      sizeType,
+      sourceType,
+      extension,
+      success(res) {
+        resolve(normalizeChooseAndUploadFileRes(res, 'image'));
+      },
+      fail(res) {
+        reject({
+          errMsg: res.errMsg.replace('chooseImage:fail', ERR_MSG_FAIL),
+        });
+      },
+    });
+  });
+}
+
+function chooseVideo(opts) {
+  const { camera, compressed, maxDuration, sourceType = ['album', 'camera'], extension } = opts;
+  return new Promise((resolve, reject) => {
+    uni.chooseVideo({
+      camera,
+      compressed,
+      maxDuration,
+      sourceType,
+      extension,
+      success(res) {
+        const { tempFilePath, duration, size, height, width } = res;
+        resolve(
+          normalizeChooseAndUploadFileRes(
+            {
+              errMsg: 'chooseVideo:ok',
+              tempFilePaths: [tempFilePath],
+              tempFiles: [
+                {
+                  name: (res.tempFile && res.tempFile.name) || '',
+                  path: tempFilePath,
+                  size,
+                  type: (res.tempFile && res.tempFile.type) || '',
+                  width,
+                  height,
+                  duration,
+                  fileType: 'video',
+                  cloudPath: '',
+                },
+              ],
+            },
+            'video',
+          ),
+        );
+      },
+      fail(res) {
+        reject({
+          errMsg: res.errMsg.replace('chooseVideo:fail', ERR_MSG_FAIL),
+        });
+      },
+    });
+  });
+}
+
+function chooseAll(opts) {
+  const { count, extension } = opts;
+  return new Promise((resolve, reject) => {
+    let chooseFile = uni.chooseFile;
+    if (typeof wx !== 'undefined' && typeof wx.chooseMessageFile === 'function') {
+      chooseFile = wx.chooseMessageFile;
+    }
+    if (typeof chooseFile !== 'function') {
+      return reject({
+        errMsg: ERR_MSG_FAIL + ' 请指定 type 类型，该平台仅支持选择 image 或 video。',
+      });
+    }
+    chooseFile({
+      type: 'all',
+      count,
+      extension,
+      success(res) {
+        resolve(normalizeChooseAndUploadFileRes(res));
+      },
+      fail(res) {
+        reject({
+          errMsg: res.errMsg.replace('chooseFile:fail', ERR_MSG_FAIL),
+        });
+      },
+    });
+  });
+}
+
+function normalizeChooseAndUploadFileRes(res, fileType) {
+  res.tempFiles.forEach((item, index) => {
+    if (!item.name) {
+      item.name = item.path.substring(item.path.lastIndexOf('/') + 1);
+    }
+    if (fileType) {
+      item.fileType = fileType;
+    }
+    item.cloudPath = Date.now() + '_' + index + item.name.substring(item.name.lastIndexOf('.'));
+  });
+  if (!res.tempFilePaths) {
+    res.tempFilePaths = res.tempFiles.map((file) => file.path);
+  }
+  return res;
+}
+
+function uploadCloudFiles(files, max = 5, onUploadProgress) {
+  files = JSON.parse(JSON.stringify(files));
+  const len = files.length;
+  let count = 0;
+  let self = this;
+  return new Promise((resolve) => {
+    while (count < max) {
+      next();
+    }
+
+    function next() {
+      let cur = count++;
+      if (cur >= len) {
+        !files.find((item) => !item.url && !item.errMsg) && resolve(files);
+        return;
+      }
+      const fileItem = files[cur];
+      const index = self.files.findIndex((v) => v.uuid === fileItem.uuid);
+      fileItem.url = '';
+      delete fileItem.errMsg;
+
+      uniCloud
+        .uploadFile({
+          filePath: fileItem.path,
+          cloudPath: fileItem.cloudPath,
+          fileType: fileItem.fileType,
+          onUploadProgress: (res) => {
+            res.index = index;
+            onUploadProgress && onUploadProgress(res);
+          },
+        })
+        .then((res) => {
+          fileItem.url = res.fileID;
+          fileItem.index = index;
+          if (cur < len) {
+            next();
+          }
+        })
+        .catch((res) => {
+          fileItem.errMsg = res.errMsg || res.message;
+          fileItem.index = index;
+          if (cur < len) {
+            next();
+          }
+        });
+    }
+  });
+}
+
+function uploadFiles(choosePromise, { onChooseFile, onUploadProgress }) {
+  return choosePromise
+    .then((res) => {
+      if (onChooseFile) {
+        const customChooseRes = onChooseFile(res);
+        if (typeof customChooseRes !== 'undefined') {
+          return Promise.resolve(customChooseRes).then((chooseRes) =>
+            typeof chooseRes === 'undefined' ? res : chooseRes,
+          );
+        }
+      }
+      return res;
+    })
+    .then((res) => {
+      if (res === false) {
+        return {
+          errMsg: ERR_MSG_OK,
+          tempFilePaths: [],
+          tempFiles: [],
+        };
+      }
+      return res;
+    })
+    .then(async (files) => {
+      for (let file of files.tempFiles) {
+        const { data } = await FileApi.uploadFile(file.path);
+        file.url = data;
+      }
+      return files;
+    });
+}
+
+function chooseAndUploadFile(
+  opts = {
+    type: 'all',
+  },
+) {
+  if (opts.type === 'image') {
+    return uploadFiles(chooseImage(opts), opts);
+  } else if (opts.type === 'video') {
+    return uploadFiles(chooseVideo(opts), opts);
+  }
+  return uploadFiles(chooseAll(opts), opts);
+}
+
+export { chooseAndUploadFile, uploadCloudFiles };
diff --git a/sheep/components/s-uploader/s-uploader.vue b/sheep/components/s-uploader/s-uploader.vue
new file mode 100644
index 0000000..95cfb05
--- /dev/null
+++ b/sheep/components/s-uploader/s-uploader.vue
@@ -0,0 +1,675 @@
+<!-- 文件上传，基于 upload-file 和 upload-image 实现 -->
+<template>
+  <view class="uni-file-picker">
+    <view v-if="title" class="uni-file-picker__header">
+      <text class="file-title">{{ title }}</text>
+      <text class="file-count">{{ filesList.length }}/{{ limitLength }}</text>
+    </view>
+    <view v-if="subtitle" class="file-subtitle">
+      <view>{{ subtitle }}</view>
+    </view>
+    <upload-image
+      v-if="fileMediatype === 'image' && showType === 'grid'"
+      :readonly="readonly"
+      :image-styles="imageStyles"
+      :files-list="url"
+      :limit="limitLength"
+      :disablePreview="disablePreview"
+      :delIcon="delIcon"
+      @uploadFiles="uploadFiles"
+      @choose="choose"
+      @delFile="delFile"
+    >
+      <slot>
+        <view class="is-add">
+          <image :src="imgsrc" class="add-icon"></image>
+        </view>
+      </slot>
+    </upload-image>
+    <upload-file
+      v-if="fileMediatype !== 'image' || showType !== 'grid'"
+      :readonly="readonly"
+      :list-styles="listStyles"
+      :files-list="filesList"
+      :showType="showType"
+      :delIcon="delIcon"
+      @uploadFiles="uploadFiles"
+      @choose="choose"
+      @delFile="delFile"
+    >
+      <slot><button type="primary" size="mini">选择文件</button></slot>
+    </upload-file>
+  </view>
+</template>
+
+<script>
+  import { chooseAndUploadFile, uploadCloudFiles } from './choose-and-upload-file.js';
+  import {
+    get_file_ext,
+    get_extname,
+    get_files_and_is_max,
+    get_file_info,
+    get_file_data,
+  } from './utils.js';
+  import uploadImage from './upload-image.vue';
+  import uploadFile from './upload-file.vue';
+  import sheep from '@/sheep';
+  let fileInput = null;
+  /**
+   * FilePicker 文件选择上传
+   * @description 文件选择上传组件，可以选择图片、视频等任意文件并上传到当前绑定的服务空间
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=4079
+   * @property {Object|Array}	value	组件数据，通常用来回显 ,类型由return-type属性决定
+   * @property {String|Array}	url	  url数据
+   * @property {Boolean}	disabled = [true|false]	组件禁用
+   * 	@value true 	禁用
+   * 	@value false 	取消禁用
+   * @property {Boolean}	readonly = [true|false]	组件只读，不可选择，不显示进度，不显示删除按钮
+   * 	@value true 	只读
+   * 	@value false 	取消只读
+   * @property {Boolean}	disable-preview = [true|false]	禁用图片预览，仅 mode:grid 时生效
+   * 	@value true 	禁用图片预览
+   * 	@value false 	取消禁用图片预览
+   * @property {Boolean}	del-icon = [true|false]	是否显示删除按钮
+   * 	@value true 	显示删除按钮
+   * 	@value false 	不显示删除按钮
+   * @property {Boolean}	auto-upload = [true|false]	是否自动上传，值为true则只触发@select,可自行上传
+   * 	@value true 	自动上传
+   * 	@value false 	取消自动上传
+   * @property {Number|String}	limit	最大选择个数 ，h5 会自动忽略多选的部分
+   * @property {String}	title	组件标题，右侧显示上传计数
+   * @property {String}	mode = [list|grid]	选择文件后的文件列表样式
+   * 	@value list 	列表显示
+   * 	@value grid 	宫格显示
+   * @property {String}	file-mediatype = [image|video|all]	选择文件类型
+   * 	@value image	只选择图片
+   * 	@value video	只选择视频
+   * 	@value all		选择所有文件
+   * @property {Array}	file-extname	选择文件后缀，根据 file-mediatype 属性而不同
+   * @property {Object}	list-style	mode:list 时的样式
+   * @property {Object}	image-styles	选择文件后缀，根据 file-mediatype 属性而不同
+   * @event {Function} select 	选择文件后触发
+   * @event {Function} progress 文件上传时触发
+   * @event {Function} success 	上传成功触发
+   * @event {Function} fail 		上传失败触发
+   * @event {Function} delete 	文件从列表移除时触发
+   */
+  export default {
+    name: 'sUploader',
+    components: {
+      uploadImage,
+      uploadFile,
+    },
+    options: {
+      virtualHost: true,
+    },
+    emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'update:url'],
+    props: {
+      modelValue: {
+        type: [Array, Object],
+        default() {
+          return [];
+        },
+      },
+      url: {
+        type: [Array, String],
+        default() {
+          return [];
+        },
+      },
+      disabled: {
+        type: Boolean,
+        default: false,
+      },
+      disablePreview: {
+        type: Boolean,
+        default: false,
+      },
+      delIcon: {
+        type: Boolean,
+        default: true,
+      },
+      // 自动上传
+      autoUpload: {
+        type: Boolean,
+        default: true,
+      },
+      // 最大选择个数 ，h5只能限制单选或是多选
+      limit: {
+        type: [Number, String],
+        default: 9,
+      },
+      // 列表样式 grid | list | list-card
+      mode: {
+        type: String,
+        default: 'grid',
+      },
+      // 选择文件类型  image/video/all
+      fileMediatype: {
+        type: String,
+        default: 'image',
+      },
+      // 文件类型筛选
+      fileExtname: {
+        type: [Array, String],
+        default() {
+          return [];
+        },
+      },
+      title: {
+        type: String,
+        default: '',
+      },
+      listStyles: {
+        type: Object,
+        default() {
+          return {
+            // 是否显示边框
+            border: true,
+            // 是否显示分隔线
+            dividline: true,
+            // 线条样式
+            borderStyle: {},
+          };
+        },
+      },
+      imageStyles: {
+        type: Object,
+        default() {
+          return {
+            width: 'auto',
+            height: 'auto',
+          };
+        },
+      },
+      readonly: {
+        type: Boolean,
+        default: false,
+      },
+      sizeType: {
+        type: Array,
+        default() {
+          return ['original', 'compressed'];
+        },
+      },
+      driver: {
+        type: String,
+        default: 'local', // local=本地 | oss | unicloud
+      },
+      subtitle: {
+        type: String,
+        default: '',
+      },
+    },
+    data() {
+      return {
+        files: [],
+        localValue: [],
+        imgsrc: sheep.$url.static('/static/img/shop/upload-camera.png'),
+      };
+    },
+    watch: {
+      modelValue: {
+        handler(newVal, oldVal) {
+          this.setValue(newVal, oldVal);
+        },
+        immediate: true,
+      },
+    },
+    computed: {
+      returnType() {
+        if (this.limit > 1) {
+          return 'array';
+        }
+        return 'object';
+      },
+      filesList() {
+        let files = [];
+        this.files.forEach((v) => {
+          files.push(v);
+        });
+        return files;
+      },
+      showType() {
+        if (this.fileMediatype === 'image') {
+          return this.mode;
+        }
+        return 'list';
+      },
+      limitLength() {
+        if (this.returnType === 'object') {
+          return 1;
+        }
+        if (!this.limit) {
+          return 1;
+        }
+        if (this.limit >= 9) {
+          return 9;
+        }
+        return this.limit;
+      },
+    },
+    created() {
+      if (this.driver === 'local') {
+        uniCloud.chooseAndUploadFile = chooseAndUploadFile;
+      }
+      this.form = this.getForm('uniForms');
+      this.formItem = this.getForm('uniFormsItem');
+      if (this.form && this.formItem) {
+        if (this.formItem.name) {
+          this.rename = this.formItem.name;
+          this.form.inputChildrens.push(this);
+        }
+      }
+    },
+    methods: {
+      /**
+       * 公开用户使用，清空文件
+       * @param {Object} index
+       */
+      clearFiles(index) {
+        if (index !== 0 && !index) {
+          this.files = [];
+          this.$nextTick(() => {
+            this.setEmit();
+          });
+        } else {
+          this.files.splice(index, 1);
+        }
+        this.$nextTick(() => {
+          this.setEmit();
+        });
+      },
+      /**
+       * 公开用户使用，继续上传
+       */
+      upload() {
+        let files = [];
+        this.files.forEach((v, index) => {
+          if (v.status === 'ready' || v.status === 'error') {
+            files.push(Object.assign({}, v));
+          }
+        });
+        return this.uploadFiles(files);
+      },
+      async setValue(newVal, oldVal) {
+        const newData = async (v) => {
+          const reg = /cloud:\/\/([\w.]+\/?)\S*/;
+          let url = '';
+          if (v.fileID) {
+            url = v.fileID;
+          } else {
+            url = v.url;
+          }
+          if (reg.test(url)) {
+            v.fileID = url;
+            v.url = await this.getTempFileURL(url);
+          }
+          if (v.url) v.path = v.url;
+          return v;
+        };
+        if (this.returnType === 'object') {
+          if (newVal) {
+            await newData(newVal);
+          } else {
+            newVal = {};
+          }
+        } else {
+          if (!newVal) newVal = [];
+          for (let i = 0; i < newVal.length; i++) {
+            let v = newVal[i];
+            await newData(v);
+          }
+        }
+        this.localValue = newVal;
+        if (this.form && this.formItem && !this.is_reset) {
+          this.is_reset = false;
+          this.formItem.setValue(this.localValue);
+        }
+        let filesData = Object.keys(newVal).length > 0 ? newVal : [];
+        this.files = [].concat(filesData);
+      },
+
+      /**
+       * 选择文件
+       */
+      choose() {
+        if (this.disabled) return;
+        if (
+          this.files.length >= Number(this.limitLength) &&
+          this.showType !== 'grid' &&
+          this.returnType === 'array'
+        ) {
+          uni.showToast({
+            title: `您最多选择 ${this.limitLength} 个文件`,
+            icon: 'none',
+          });
+          return;
+        }
+        this.chooseFiles();
+      },
+
+      /**
+       * 选择文件并上传
+       */
+      chooseFiles() {
+        const _extname = get_extname(this.fileExtname);
+        // 获取后缀
+        uniCloud
+          .chooseAndUploadFile({
+            type: this.fileMediatype,
+            compressed: false,
+            sizeType: this.sizeType,
+            // TODO 如果为空，video 有问题
+            extension: _extname.length > 0 ? _extname : undefined,
+            count: this.limitLength - this.files.length, //默认9
+            onChooseFile: this.chooseFileCallback,
+            onUploadProgress: (progressEvent) => {
+              this.setProgress(progressEvent, progressEvent.index);
+            },
+          })
+          .then((result) => {
+            this.setSuccessAndError(result.tempFiles);
+          })
+          .catch((err) => {
+            console.log('选择失败', err);
+          });
+      },
+
+      /**
+       * 选择文件回调
+       * @param {Object} res
+       */
+      async chooseFileCallback(res) {
+        const _extname = get_extname(this.fileExtname);
+        const is_one =
+          (Number(this.limitLength) === 1 && this.disablePreview && !this.disabled) ||
+          this.returnType === 'object';
+        // 如果这有一个文件 ，需要清空本地缓存数据
+        if (is_one) {
+          this.files = [];
+        }
+
+        let { filePaths, files } = get_files_and_is_max(res, _extname);
+        if (!(_extname && _extname.length > 0)) {
+          filePaths = res.tempFilePaths;
+          files = res.tempFiles;
+        }
+
+        let currentData = [];
+        for (let i = 0; i < files.length; i++) {
+          if (this.limitLength - this.files.length <= 0) break;
+          files[i].uuid = Date.now();
+          let filedata = await get_file_data(files[i], this.fileMediatype);
+          filedata.progress = 0;
+          filedata.status = 'ready';
+          this.files.push(filedata);
+          currentData.push({
+            ...filedata,
+            file: files[i],
+          });
+        }
+        this.$emit('select', {
+          tempFiles: currentData,
+          tempFilePaths: filePaths,
+        });
+        res.tempFiles = files;
+        // 停止自动上传
+        if (!this.autoUpload) {
+          res.tempFiles = [];
+        }
+      },
+
+      /**
+       * 批传
+       * @param {Object} e
+       */
+      uploadFiles(files) {
+        files = [].concat(files);
+        return uploadCloudFiles
+          .call(this, files, 5, (res) => {
+            this.setProgress(res, res.index, true);
+          })
+          .then((result) => {
+            this.setSuccessAndError(result);
+            return result;
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      },
+
+      /**
+       * 成功或失败
+       */
+      async setSuccessAndError(res, fn) {
+        let successData = [];
+        let errorData = [];
+        let tempFilePath = [];
+        let errorTempFilePath = [];
+        for (let i = 0; i < res.length; i++) {
+          const item = res[i];
+          const index = item.uuid ? this.files.findIndex((p) => p.uuid === item.uuid) : item.index;
+
+          if (index === -1 || !this.files) break;
+          if (item.errMsg === 'request:fail') {
+            this.files[index].url = item.path;
+            this.files[index].status = 'error';
+            this.files[index].errMsg = item.errMsg;
+            // this.files[index].progress = -1
+            errorData.push(this.files[index]);
+            errorTempFilePath.push(this.files[index].url);
+          } else {
+            this.files[index].errMsg = '';
+            this.files[index].fileID = item.url;
+            const reg = /cloud:\/\/([\w.]+\/?)\S*/;
+            if (reg.test(item.url)) {
+              this.files[index].url = await this.getTempFileURL(item.url);
+            } else {
+              this.files[index].url = item.url;
+            }
+
+            this.files[index].status = 'success';
+            this.files[index].progress += 1;
+            successData.push(this.files[index]);
+            tempFilePath.push(this.files[index].fileID);
+          }
+        }
+
+        if (successData.length > 0) {
+          this.setEmit();
+          // 状态改变返回
+          this.$emit('success', {
+            tempFiles: this.backObject(successData),
+            tempFilePaths: tempFilePath,
+          });
+        }
+
+        if (errorData.length > 0) {
+          this.$emit('fail', {
+            tempFiles: this.backObject(errorData),
+            tempFilePaths: errorTempFilePath,
+          });
+        }
+      },
+
+      /**
+       * 获取进度
+       * @param {Object} progressEvent
+       * @param {Object} index
+       * @param {Object} type
+       */
+      setProgress(progressEvent, index, type) {
+        const fileLenth = this.files.length;
+        const percentNum = (index / fileLenth) * 100;
+        const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+        let idx = index;
+        if (!type) {
+          idx = this.files.findIndex((p) => p.uuid === progressEvent.tempFile.uuid);
+        }
+        if (idx === -1 || !this.files[idx]) return;
+        // fix by mehaotian 100 就会消失，-1 是为了让进度条消失
+        this.files[idx].progress = percentCompleted - 1;
+        // 上传中
+        this.$emit('progress', {
+          index: idx,
+          progress: parseInt(percentCompleted),
+          tempFile: this.files[idx],
+        });
+      },
+
+      /**
+       * 删除文件
+       * @param {Object} index
+       */
+      delFile(index) {
+        this.$emit('delete', {
+          tempFile: this.files[index],
+          tempFilePath: this.files[index].url,
+        });
+        this.files.splice(index, 1);
+        this.$nextTick(() => {
+          this.setEmit();
+        });
+      },
+
+      /**
+       * 获取文件名和后缀
+       * @param {Object} name
+       */
+      getFileExt(name) {
+        const last_len = name.lastIndexOf('.');
+        const len = name.length;
+        return {
+          name: name.substring(0, last_len),
+          ext: name.substring(last_len + 1, len),
+        };
+      },
+
+      /**
+       * 处理返回事件
+       */
+      setEmit() {
+        let data = [];
+        let updateUrl = [];
+        if (this.returnType === 'object') {
+          data = this.backObject(this.files)[0];
+          this.localValue = data ? data : null;
+          updateUrl = data ? data.url : '';
+        } else {
+          data = this.backObject(this.files);
+          if (!this.localValue) {
+            this.localValue = [];
+          }
+          this.localValue = [...data];
+          if (this.localValue.length > 0) {
+            this.localValue.forEach((item) => {
+              updateUrl.push(item.url);
+            });
+          }
+        }
+        this.$emit('update:modelValue', this.localValue);
+        this.$emit('update:url', updateUrl);
+      },
+
+      /**
+       * 处理返回参数
+       * @param {Object} files
+       */
+      backObject(files) {
+        let newFilesData = [];
+        files.forEach((v) => {
+          newFilesData.push({
+            extname: v.extname,
+            fileType: v.fileType,
+            image: v.image,
+            name: v.name,
+            path: v.path,
+            size: v.size,
+            fileID: v.fileID,
+            url: v.url,
+          });
+        });
+        return newFilesData;
+      },
+      async getTempFileURL(fileList) {
+        fileList = {
+          fileList: [].concat(fileList),
+        };
+        const urls = await uniCloud.getTempFileURL(fileList);
+        return urls.fileList[0].tempFileURL || '';
+      },
+      /**
+       * 获取父元素实例
+       */
+      getForm(name = 'uniForms') {
+        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;
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .uni-file-picker {
+    /* #ifndef APP-NVUE */
+    box-sizing: border-box;
+    overflow: hidden;
+    /* width: 100%; */
+    /* #endif */
+    /* flex: 1; */
+    position: relative;
+  }
+
+  .uni-file-picker__header {
+    padding-top: 5px;
+    padding-bottom: 10px;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    justify-content: space-between;
+  }
+
+  .file-title {
+    font-size: 14px;
+    color: #333;
+  }
+
+  .file-count {
+    font-size: 14px;
+    color: #999;
+  }
+
+  .is-add {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    align-items: center;
+    justify-content: center;
+  }
+  .add-icon {
+    width: 57rpx;
+    height: 49rpx;
+  }
+  .file-subtitle {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    bottom: 0;
+    width: 140rpx;
+    height: 36rpx;
+    z-index: 1;
+    display: flex;
+    justify-content: center;
+    color: #fff;
+    font-weight: 500;
+    background: rgba(#000, 0.3);
+    font-size: 24rpx;
+  }
+</style>
diff --git a/sheep/components/s-uploader/upload-file.vue b/sheep/components/s-uploader/upload-file.vue
new file mode 100644
index 0000000..233d281
--- /dev/null
+++ b/sheep/components/s-uploader/upload-file.vue
@@ -0,0 +1,335 @@
+<template>
+  <view class="uni-file-picker__files">
+    <view v-if="!readonly" class="files-button" @click="choose">
+      <slot></slot>
+    </view>
+    <!-- :class="{'is-text-box':showType === 'list'}" -->
+    <view v-if="list.length > 0" class="uni-file-picker__lists is-text-box" :style="borderStyle">
+      <!-- ,'is-list-card':showType === 'list-card' -->
+
+      <view
+        class="uni-file-picker__lists-box"
+        v-for="(item, index) in list"
+        :key="index"
+        :class="{
+          'files-border': index !== 0 && styles.dividline,
+        }"
+        :style="index !== 0 && styles.dividline && borderLineStyle"
+      >
+        <view class="uni-file-picker__item">
+          <!-- :class="{'is-text-image':showType === 'list'}" -->
+          <!-- 	<view class="files__image is-text-image">
+						<image class="header-image" :src="item.logo" mode="aspectFit"></image>
+					</view> -->
+          <view class="files__name">{{ item.name }}</view>
+          <view v-if="delIcon && !readonly" class="icon-del-box icon-files" @click="delFile(index)">
+            <view class="icon-del icon-files"></view>
+            <view class="icon-del rotate"></view>
+          </view>
+        </view>
+        <view
+          v-if="(item.progress && item.progress !== 100) || item.progress === 0"
+          class="file-picker__progress"
+        >
+          <progress
+            class="file-picker__progress-item"
+            :percent="item.progress === -1 ? 0 : item.progress"
+            stroke-width="4"
+            :backgroundColor="item.errMsg ? '#ff5a5f' : '#EBEBEB'"
+          />
+        </view>
+        <view
+          v-if="item.status === 'error'"
+          class="file-picker__mask"
+          @click.stop="uploadFiles(item, index)"
+        >
+          点击重试
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'uploadFile',
+    emits: ['uploadFiles', 'choose', 'delFile'],
+    props: {
+      filesList: {
+        type: Array,
+        default() {
+          return [];
+        },
+      },
+      delIcon: {
+        type: Boolean,
+        default: true,
+      },
+      limit: {
+        type: [Number, String],
+        default: 9,
+      },
+      showType: {
+        type: String,
+        default: '',
+      },
+      listStyles: {
+        type: Object,
+        default() {
+          return {
+            // 是否显示边框
+            border: true,
+            // 是否显示分隔线
+            dividline: true,
+            // 线条样式
+            borderStyle: {},
+          };
+        },
+      },
+      readonly: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    computed: {
+      list() {
+        let files = [];
+        this.filesList.forEach((v) => {
+          files.push(v);
+        });
+        return files;
+      },
+      styles() {
+        let styles = {
+          border: true,
+          dividline: true,
+          'border-style': {},
+        };
+        return Object.assign(styles, this.listStyles);
+      },
+      borderStyle() {
+        let { borderStyle, border } = this.styles;
+        let obj = {};
+        if (!border) {
+          obj.border = 'none';
+        } else {
+          let width = (borderStyle && borderStyle.width) || 1;
+          width = this.value2px(width);
+          let radius = (borderStyle && borderStyle.radius) || 5;
+          radius = this.value2px(radius);
+          obj = {
+            'border-width': width,
+            'border-style': (borderStyle && borderStyle.style) || 'solid',
+            'border-color': (borderStyle && borderStyle.color) || '#eee',
+            'border-radius': radius,
+          };
+        }
+        let classles = '';
+        for (let i in obj) {
+          classles += `${i}:${obj[i]};`;
+        }
+        return classles;
+      },
+      borderLineStyle() {
+        let obj = {};
+        let { borderStyle } = this.styles;
+        if (borderStyle && borderStyle.color) {
+          obj['border-color'] = borderStyle.color;
+        }
+        if (borderStyle && borderStyle.width) {
+          let width = (borderStyle && borderStyle.width) || 1;
+          let style = (borderStyle && borderStyle.style) || 0;
+          if (typeof width === 'number') {
+            width += 'px';
+          } else {
+            width = width.indexOf('px') ? width : width + 'px';
+          }
+          obj['border-width'] = width;
+
+          if (typeof style === 'number') {
+            style += 'px';
+          } else {
+            style = style.indexOf('px') ? style : style + 'px';
+          }
+          obj['border-top-style'] = style;
+        }
+        let classles = '';
+        for (let i in obj) {
+          classles += `${i}:${obj[i]};`;
+        }
+        return classles;
+      },
+    },
+
+    methods: {
+      uploadFiles(item, index) {
+        this.$emit('uploadFiles', {
+          item,
+          index,
+        });
+      },
+      choose() {
+        this.$emit('choose');
+      },
+      delFile(index) {
+        this.$emit('delFile', index);
+      },
+      value2px(value) {
+        if (typeof value === 'number') {
+          value += 'px';
+        } else {
+          value = value.indexOf('px') !== -1 ? value : value + 'px';
+        }
+        return value;
+      },
+    },
+  };
+</script>
+
+<style lang="scss">
+  .uni-file-picker__files {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+    justify-content: flex-start;
+  }
+
+  .files-button {
+    // border: 1px red solid;
+  }
+
+  .uni-file-picker__lists {
+    position: relative;
+    margin-top: 5px;
+    overflow: hidden;
+  }
+
+  .file-picker__mask {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    color: #fff;
+    font-size: 14px;
+    background-color: rgba(0, 0, 0, 0.4);
+  }
+
+  .uni-file-picker__lists-box {
+    position: relative;
+  }
+
+  .uni-file-picker__item {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    align-items: center;
+    padding: 8px 10px;
+    padding-right: 5px;
+    padding-left: 10px;
+  }
+
+  .files-border {
+    border-top: 1px #eee solid;
+  }
+
+  .files__name {
+    flex: 1;
+    font-size: 14px;
+    color: #666;
+    margin-right: 25px;
+    /* #ifndef APP-NVUE */
+    word-break: break-all;
+    word-wrap: break-word;
+    /* #endif */
+  }
+
+  .icon-files {
+    /* #ifndef APP-NVUE */
+    position: static;
+    background-color: initial;
+    /* #endif */
+  }
+
+  // .icon-files .icon-del {
+  // 	background-color: #333;
+  // 	width: 12px;
+  // 	height: 1px;
+  // }
+
+  .is-list-card {
+    border: 1px #eee solid;
+    margin-bottom: 5px;
+    border-radius: 5px;
+    box-shadow: 0 0 2px 0px rgba(0, 0, 0, 0.1);
+    padding: 5px;
+  }
+
+  .files__image {
+    width: 40px;
+    height: 40px;
+    margin-right: 10px;
+  }
+
+  .header-image {
+    width: 100%;
+    height: 100%;
+  }
+
+  .is-text-box {
+    border: 1px #eee solid;
+    border-radius: 5px;
+  }
+
+  .is-text-image {
+    width: 25px;
+    height: 25px;
+    margin-left: 5px;
+  }
+
+  .rotate {
+    position: absolute;
+    transform: rotate(90deg);
+  }
+
+  .icon-del-box {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    margin: auto 0;
+    /* #endif */
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    top: 0px;
+    bottom: 0;
+    right: 5px;
+    height: 26px;
+    width: 26px;
+    // border-radius: 50%;
+    // background-color: rgba(0, 0, 0, 0.5);
+    z-index: 2;
+    transform: rotate(-45deg);
+  }
+
+  .icon-del {
+    width: 15px;
+    height: 1px;
+    background-color: #333;
+    // border-radius: 1px;
+  }
+
+  /* #ifdef H5 */
+  @media all and (min-width: 768px) {
+    .uni-file-picker__files {
+      max-width: 375px;
+    }
+  }
+
+  /* #endif */
+</style>
diff --git a/sheep/components/s-uploader/upload-image.vue b/sheep/components/s-uploader/upload-image.vue
new file mode 100644
index 0000000..b66956a
--- /dev/null
+++ b/sheep/components/s-uploader/upload-image.vue
@@ -0,0 +1,306 @@
+<template>
+  <view class="uni-file-picker__container">
+    <view class="file-picker__box" v-for="(url, index) in list" :key="index" :style="boxStyle">
+      <view class="file-picker__box-content" :style="borderStyle">
+        <image
+          class="file-image"
+          :src="getImageUrl(url)"
+          mode="aspectFill"
+          @click.stop="previewImage(url, index)"
+        ></image>
+        <view v-if="delIcon && !readonly" class="icon-del-box" @click.stop="delFile(index)">
+          <view class="icon-del"></view>
+          <view class="icon-del rotate"></view>
+        </view>
+        <!-- <view v-if="item.errMsg" class="file-picker__mask" @click.stop="uploadFiles(item, index)">
+          点击重试
+        </view> -->
+      </view>
+    </view>
+    <view v-if="list.length < limit && !readonly" class="file-picker__box" :style="boxStyle">
+      <view class="file-picker__box-content is-add" :style="borderStyle" @click="choose">
+        <slot>
+          <view class="icon-add"></view>
+          <view class="icon-add rotate"></view>
+        </slot>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import sheep from '@/sheep';
+  export default {
+    name: 'uploadImage',
+    emits: ['uploadFiles', 'choose', 'delFile'],
+    props: {
+      filesList: {
+        type: [Array, String],
+        default() {
+          return [];
+        },
+      },
+      disabled: {
+        type: Boolean,
+        default: false,
+      },
+      disablePreview: {
+        type: Boolean,
+        default: false,
+      },
+      limit: {
+        type: [Number, String],
+        default: 9,
+      },
+      imageStyles: {
+        type: Object,
+        default() {
+          return {
+            width: 'auto',
+            height: 'auto',
+            border: {},
+          };
+        },
+      },
+      delIcon: {
+        type: Boolean,
+        default: true,
+      },
+      readonly: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    computed: {
+      list() {
+        if (typeof this.filesList === 'string') {
+          if (this.filesList) {
+            return [this.filesList];
+          } else {
+            return [];
+          }
+        }
+        return this.filesList;
+      },
+      styles() {
+        let styles = {
+          width: 'auto',
+          height: 'auto',
+          border: {},
+        };
+        return Object.assign(styles, this.imageStyles);
+      },
+      boxStyle() {
+        const { width = 'auto', height = 'auto' } = this.styles;
+        let obj = {};
+        if (height === 'auto') {
+          if (width !== 'auto') {
+            obj.height = this.value2px(width);
+            obj['padding-top'] = 0;
+          } else {
+            obj.height = 0;
+          }
+        } else {
+          obj.height = this.value2px(height);
+          obj['padding-top'] = 0;
+        }
+
+        if (width === 'auto') {
+          if (height !== 'auto') {
+            obj.width = this.value2px(height);
+          } else {
+            obj.width = '33.3%';
+          }
+        } else {
+          obj.width = this.value2px(width);
+        }
+
+        let classles = '';
+        for (let i in obj) {
+          classles += `${i}:${obj[i]};`;
+        }
+        return classles;
+      },
+      borderStyle() {
+        let { border } = this.styles;
+        let obj = {};
+        const widthDefaultValue = 1;
+        const radiusDefaultValue = 3;
+        if (typeof border === 'boolean') {
+          obj.border = border ? '1px #eee solid' : 'none';
+        } else {
+          let width = (border && border.width) || widthDefaultValue;
+          width = this.value2px(width);
+          let radius = (border && border.radius) || radiusDefaultValue;
+          radius = this.value2px(radius);
+          obj = {
+            'border-width': width,
+            'border-style': (border && border.style) || 'solid',
+            'border-color': (border && border.color) || '#eee',
+            'border-radius': radius,
+          };
+        }
+        let classles = '';
+        for (let i in obj) {
+          classles += `${i}:${obj[i]};`;
+        }
+        return classles;
+      },
+    },
+    methods: {
+      getImageUrl(url) {
+        if ('blob:http:' === url.substr(0, 10)) {
+          return url;
+        } else {
+          return sheep.$url.cdn(url);
+        }
+      },
+      uploadFiles(item, index) {
+        this.$emit('uploadFiles', item);
+      },
+      choose() {
+        this.$emit('choose');
+      },
+      delFile(index) {
+        this.$emit('delFile', index);
+      },
+      previewImage(img, index) {
+        let urls = [];
+        if (Number(this.limit) === 1 && this.disablePreview && !this.disabled) {
+          this.$emit('choose');
+        }
+        if (this.disablePreview) return;
+        this.list.forEach((i) => {
+          urls.push(this.getImageUrl(i));
+        });
+
+        uni.previewImage({
+          urls: urls,
+          current: index,
+        });
+      },
+      value2px(value) {
+        if (typeof value === 'number') {
+          value += 'px';
+        } else {
+          if (value.indexOf('%') === -1) {
+            value = value.indexOf('px') !== -1 ? value : value + 'px';
+          }
+        }
+        return value;
+      },
+    },
+  };
+</script>
+
+<style lang="scss">
+  .uni-file-picker__container {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    box-sizing: border-box;
+    /* #endif */
+    flex-wrap: wrap;
+    margin: -5px;
+  }
+
+  .file-picker__box {
+    position: relative;
+    // flex: 0 0 33.3%;
+    width: 33.3%;
+    height: 0;
+    padding-top: 33.33%;
+    /* #ifndef APP-NVUE */
+    box-sizing: border-box;
+    /* #endif */
+  }
+
+  .file-picker__box-content {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    margin: 5px;
+    border: 1px #eee solid;
+    border-radius: 5px;
+    overflow: hidden;
+  }
+
+  .file-picker__progress {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    /* border: 1px red solid; */
+    z-index: 2;
+  }
+
+  .file-picker__progress-item {
+    width: 100%;
+  }
+
+  .file-picker__mask {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    color: #fff;
+    font-size: 12px;
+    background-color: rgba(0, 0, 0, 0.4);
+  }
+
+  .file-image {
+    width: 100%;
+    height: 100%;
+  }
+
+  .is-add {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    align-items: center;
+    justify-content: center;
+  }
+
+  .icon-add {
+    width: 50px;
+    height: 5px;
+    background-color: #f1f1f1;
+    border-radius: 2px;
+  }
+
+  .rotate {
+    position: absolute;
+    transform: rotate(90deg);
+  }
+
+  .icon-del-box {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    top: 3px;
+    right: 3px;
+    height: 26px;
+    width: 26px;
+    border-radius: 50%;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 2;
+    transform: rotate(-45deg);
+  }
+
+  .icon-del {
+    width: 15px;
+    height: 2px;
+    background-color: #fff;
+    border-radius: 2px;
+  }
+</style>
diff --git a/sheep/components/s-uploader/utils.js b/sheep/components/s-uploader/utils.js
new file mode 100644
index 0000000..c1e8073
--- /dev/null
+++ b/sheep/components/s-uploader/utils.js
@@ -0,0 +1,110 @@
+/**
+ * 获取文件名和后缀
+ * @param {String} name
+ */
+export const get_file_ext = (name) => {
+  const last_len = name.lastIndexOf('.');
+  const len = name.length;
+  return {
+    name: name.substring(0, last_len),
+    ext: name.substring(last_len + 1, len),
+  };
+};
+
+/**
+ * 获取扩展名
+ * @param {Array} fileExtname
+ */
+export const get_extname = (fileExtname) => {
+  if (!Array.isArray(fileExtname)) {
+    let extname = fileExtname.replace(/(\[|\])/g, '');
+    return extname.split(',');
+  } else {
+    return fileExtname;
+  }
+  return [];
+};
+
+/**
+ * 获取文件和检测是否可选
+ */
+export const get_files_and_is_max = (res, _extname) => {
+  let filePaths = [];
+  let files = [];
+  if (!_extname || _extname.length === 0) {
+    return {
+      filePaths,
+      files,
+    };
+  }
+  res.tempFiles.forEach((v) => {
+    let fileFullName = get_file_ext(v.name);
+    const extname = fileFullName.ext.toLowerCase();
+    if (_extname.indexOf(extname) !== -1) {
+      files.push(v);
+      filePaths.push(v.path);
+    }
+  });
+  if (files.length !== res.tempFiles.length) {
+    uni.showToast({
+      title: `当前选择了${res.tempFiles.length}个文件 ，${
+        res.tempFiles.length - files.length
+      } 个文件格式不正确`,
+      icon: 'none',
+      duration: 5000,
+    });
+  }
+
+  return {
+    filePaths,
+    files,
+  };
+};
+
+/**
+ * 获取图片信息
+ * @param {Object} filepath
+ */
+export const get_file_info = (filepath) => {
+  return new Promise((resolve, reject) => {
+    uni.getImageInfo({
+      src: filepath,
+      success(res) {
+        resolve(res);
+      },
+      fail(err) {
+        reject(err);
+      },
+    });
+  });
+};
+/**
+ * 获取封装数据
+ */
+export const get_file_data = async (files, type = 'image') => {
+  // 最终需要上传数据库的数据
+  let fileFullName = get_file_ext(files.name);
+  const extname = fileFullName.ext.toLowerCase();
+  let filedata = {
+    name: files.name,
+    uuid: files.uuid,
+    extname: extname || '',
+    cloudPath: files.cloudPath,
+    fileType: files.fileType,
+    url: files.path || files.path,
+    size: files.size, //单位是字节
+    image: {},
+    path: files.path,
+    video: {},
+  };
+  if (type === 'image') {
+    const imageinfo = await get_file_info(files.path);
+    delete filedata.video;
+    filedata.image.width = imageinfo.width;
+    filedata.image.height = imageinfo.height;
+    filedata.image.location = imageinfo.path;
+  } else {
+    delete filedata.image;
+  }
+  return filedata;
+};
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
new file mode 100644
index 0000000..754d536
--- /dev/null
+++ b/sheep/components/s-user-card/s-user-card.vue
@@ -0,0 +1,185 @@
+<!-- 装修用户组件：用户卡片 -->
+<template>
+  <view class="ss-user-info-wrap ss-p-t-50" :style="[bgStyle, { marginLeft: `${data.space}px` }]">
+    <view class="ss-flex ss-col-center ss-row-between ss-m-b-20">
+      <view class="left-box ss-flex ss-col-center ss-m-l-36">
+        <view class="avatar-box ss-m-r-24">
+          <image class="avatar-img" :src="
+              isLogin
+                ? sheep.$url.cdn(userInfo.avatar)
+                : sheep.$url.static('/static/img/shop/default_avatar.png')"
+                 mode="aspectFill" @tap="sheep.$router.go('/pages/user/info')">
+          </image>
+        </view>
+        <view>
+          <view class="nickname-box ss-flex ss-col-center">
+            <view class="nick-name ss-m-r-20">{{ userInfo?.nickname || nickname }}</view>
+          </view>
+        </view>
+      </view>
+      <view class="right-box ss-m-r-52">
+        <button class="ss-reset-button" @tap="showShareModal">
+          <text class="sicon-qrcode"></text>
+        </button>
+      </view>
+    </view>
+
+    <!-- 提示绑定手机号 先隐藏 yudao 需要再修改 -->
+    <view
+      class="bind-mobile-box ss-flex ss-row-between ss-col-center"
+      v-if="isLogin && !userInfo.mobile"
+    >
+      <view class="ss-flex">
+        <text class="cicon-mobile-o" />
+        <view class="mobile-title ss-m-l-20"> 点击绑定手机号确保账户安全</view>
+      </view>
+      <button class="ss-reset-button bind-btn" @tap="onBind">去绑定</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 用户卡片
+   *
+   * @property {Number} leftSpace                  - 容器左间距
+   * @property {Number} rightSpace                  - 容器右间距
+   *
+   * @property {String} avatar          - 头像
+   * @property {String} nickname          - 昵称
+   * @property {String} vip              - 等级
+   * @property {String} collectNum        - 收藏数
+   * @property {String} likeNum          - 点赞数
+   *
+   *
+   */
+  import { computed } from 'vue';
+  import sheep from '@/sheep';
+  import {
+    showShareModal,
+    showAuthModal,
+  } from '@/sheep/hooks/useModal';
+
+  // 用户信息
+  const userInfo = computed(() => sheep.$store('user').userInfo);
+  console.log('用户信息', userInfo);
+
+  // 是否登录
+  const isLogin = computed(() => sheep.$store('user').isLogin);
+  // 接收参数
+  const props = defineProps({
+    // 装修数据
+    data: {
+      type: Object,
+      default: () => ({}),
+    },
+    // 装修样式
+    styles: {
+      type: Object,
+      default: () => ({}),
+    },
+    // 头像
+    avatar: {
+      type: String,
+      default: '',
+    },
+    nickname: {
+      type: String,
+      default: '请先登录',
+    },
+    vip: {
+      type: [String, Number],
+      default: '1',
+    },
+    collectNum: {
+      type: [String, Number],
+      default: '1',
+    },
+    likeNum: {
+      type: [String, Number],
+      default: '1',
+    },
+  });
+
+  // 设置背景样式
+  const bgStyle = computed(() => {
+    // 直接从 props.styles 解构
+    const { bgType, bgImg, bgColor } = props.styles;
+
+    // 根据 bgType 返回相应的样式
+    return {
+      background: bgType === 'img'
+        ? `url(${bgImg}) no-repeat top center / 100% 100%`
+        : bgColor,
+    };
+  });
+
+  // 绑定手机号
+  function onBind() {
+    showAuthModal('changeMobile');
+  }
+</script>
+
+<style lang="scss" scoped>
+  .ss-user-info-wrap {
+    box-sizing: border-box;
+
+    .avatar-box {
+      width: 100rpx;
+      height: 100rpx;
+      border-radius: 50%;
+      overflow: hidden;
+
+      .avatar-img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .nick-name {
+      font-size: 34rpx;
+      font-weight: 400;
+      color: #333333;
+      line-height: normal;
+    }
+
+    .vip-img {
+      width: 30rpx;
+      height: 30rpx;
+    }
+
+    .sicon-qrcode {
+      font-size: 40rpx;
+    }
+  }
+
+  .bind-mobile-box {
+    width: 100%;
+    height: 84rpx;
+    padding: 0 34rpx 0 44rpx;
+    box-sizing: border-box;
+    background: #ffffff;
+    box-shadow: 0px -8rpx 9rpx 0px rgba(#e0e0e0, 0.3);
+
+    .cicon-mobile-o {
+      font-size: 30rpx;
+      color: #ff690d;
+    }
+
+    .mobile-title {
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #ff690d;
+    }
+
+    .bind-btn {
+      width: 100rpx;
+      height: 50rpx;
+      background: #ff6100;
+      border-radius: 25rpx;
+      font-size: 24rpx;
+      font-weight: 500;
+      color: #ffffff;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-video-block/s-video-block.vue b/sheep/components/s-video-block/s-video-block.vue
new file mode 100644
index 0000000..38e5b84
--- /dev/null
+++ b/sheep/components/s-video-block/s-video-block.vue
@@ -0,0 +1,32 @@
+<!-- 装修图文组件：视频播放 -->
+<template>
+  <su-video
+    class="sss"
+    :uid="guid()"
+    :src="sheep.$url.cdn(data.videoUrl)"
+    :poster="sheep.$url.cdn(data.posterUrl)"
+    :height="styles.height * 2"
+    :autoplay="data.autoplay"
+  ></su-video>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { guid } from '@/sheep/helper';
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {},
+    },
+    styles: {
+      type: Object,
+      default() {},
+    },
+  });
+</script>
+
+<style lang="scss" scoped>
+  .sss {
+    z-index: -100;
+  }
+</style>
diff --git a/sheep/components/s-wallet-card/s-wallet-card.vue b/sheep/components/s-wallet-card/s-wallet-card.vue
new file mode 100644
index 0000000..aff0bf8
--- /dev/null
+++ b/sheep/components/s-wallet-card/s-wallet-card.vue
@@ -0,0 +1,119 @@
+<!-- 装修用户组件：用户资产 -->
+<template>
+	<view class="ss-wallet-menu-wrap ss-flex ss-col-center" :style="[bgStyle, { marginLeft: `${data.space}px` }]">
+		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
+			@tap="sheep.$router.go('/pages/user/wallet/money')">
+			<view class="value-box ss-flex ss-col-bottom">
+				<view class="value-text ss-line-1">{{ fen2yuan(userWallet.balance) || '0.00' }}</view>
+				<view class="unit-text ss-m-l-6">元</view>
+			</view>
+			<view class="menu-title ss-m-t-28">账户余额</view>
+		</view>
+		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
+			@tap="sheep.$router.go('/pages/user/wallet/score')">
+			<view class="value-box ss-flex ss-col-bottom">
+				<view class="value-text">{{ userInfo.point || 0 }}</view>
+				<view class="unit-text ss-m-l-6">个</view>
+			</view>
+			<view class="menu-title ss-m-t-28">积分</view>
+		</view>
+		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center" @tap="
+        sheep.$router.go('/pages/coupon/list', {
+          type: 'geted',
+        })
+      ">
+			<view class="value-box ss-flex ss-col-bottom">
+				<view class="value-text">{{ numData.unusedCouponCount }}</view>
+				<view class="unit-text ss-m-l-6">张</view>
+			</view>
+			<view class="menu-title ss-m-t-28">优惠券</view>
+		</view>
+		<view class="menu-item ss-flex-col ss-row-center ss-col-center menu-wallet"
+          @tap="sheep.$router.go('/pages/user/wallet/money')">
+			<image class="item-icon" :src="sheep.$url.static('/static/img/shop/user/wallet_icon.png')" mode="aspectFit" />
+			<view class="menu-title ss-m-t-30">我的钱包</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	/**
+	 * 装修组件 - 订单菜单组
+	 */
+	import { computed } from 'vue';
+	import sheep from '@/sheep';
+	import { fen2yuan } from '../../hooks/useGoods';
+
+	// 接收参数
+	const props = defineProps({
+		// 装修数据
+		data: {
+		  type: Object,
+		  default: () => ({}),
+		},
+		// 装修样式
+		styles: {
+		  type: Object,
+		  default: () => ({}),
+		},
+	});
+	// 设置背景样式
+	const bgStyle = computed(() => {
+	  // 直接从 props.styles 解构
+	  const { bgType, bgImg, bgColor } = props.styles; 
+	
+	  // 根据 bgType 返回相应的样式
+	  return {
+		background: bgType === 'img'
+			? `url(${bgImg}) no-repeat top center / 100% 100%`
+			: bgColor
+		};
+	});
+	
+	const userWallet = computed(() => sheep.$store('user').userWallet);
+	const userInfo = computed(() => sheep.$store('user').userInfo);
+	const numData = computed(() => sheep.$store('user').numData);
+</script>
+
+<style lang="scss" scoped>
+	.ss-wallet-menu-wrap {
+		.menu-wallet {
+			width: 144rpx;
+		}
+
+		.menu-item {
+			height: 160rpx;
+
+			.menu-title {
+				font-size: 24rpx;
+				line-height: 24rpx;
+				color: #333333;
+			}
+
+			.item-icon {
+				width: 44rpx;
+				height: 44rpx;
+			}
+
+			.value-box {
+				height: 50rpx;
+				text-align: center;
+
+				.value-text {
+					font-size: 28rpx;
+					color: #000000;
+					line-height: 28rpx;
+					vertical-align: text-bottom;
+					font-family: OPPOSANS;
+				}
+
+				.unit-text {
+					font-size: 24rpx;
+					color: #343434;
+					line-height: 24rpx;
+				}
+			}
+		}
+	}
+</style>
+
diff --git a/sheep/components/s-worker-item/s-worker-item.vue b/sheep/components/s-worker-item/s-worker-item.vue
new file mode 100644
index 0000000..1c304e6
--- /dev/null
+++ b/sheep/components/s-worker-item/s-worker-item.vue
@@ -0,0 +1,198 @@
+<template>
+  <view>
+    <view>
+      <slot name="top"></slot>
+    </view>
+    <view
+      class="ss-order-card-warp ss-flex ss-col-stretch ss-row-between bg-white"
+      :style="[{ borderRadius: radius + 'rpx', marginBottom: marginBottom + 'rpx' }]"
+    >
+      <view class="img-box ss-m-r-24">
+        <image class="order-img" :src="sheep.$url.cdn(img)" mode="aspectFill"></image>
+      </view>
+      <view
+        class="box-right ss-flex-col ss-row-between"
+        :style="[{ width: titleWidth ? titleWidth + 'rpx' : '' }]"
+      >
+	    <view class="nickname-box">
+			<view class="title-text ss-line-2" v-if="title">{{ title }}</view>
+			<view v-if="skuString" class="spec-text">{{ skuString }}</view>
+		</view>
+		<view class="time-text">开始服务时间：</view>
+		<view class="time-text">剩余时间：</view>
+        <view class="groupon-box">
+          <slot name="groupon"></slot>
+        </view>
+        <view class="ss-flex">
+          <view class="ss-flex ss-col-center">
+            <view
+              class="price-text ss-flex ss-col-center"
+              :style="[{ color: priceColor }]"
+              v-if="price && Number(price) > 0"
+            >
+              ￥{{ fen2yuan(price) }}
+            </view>
+            <view v-if="num" class="total-text ss-flex ss-col-center">x {{ num }}</view>
+            <slot name="priceSuffix"></slot>
+          </view>
+        </view>
+        <view class="tool-box">
+          <slot name="tool"></slot>
+        </view>
+        <view>
+          <slot name="rightBottom"></slot>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { computed } from 'vue';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  /**
+   * 订单卡片
+   *
+   * @property {String} img 											- 图片
+   * @property {String} title 										- 标题
+   * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
+   * @property {String} skuText 										- 规格
+   * @property {String | Number} price 								- 价格
+   * @property {String} priceColor 									- 价格颜色
+   * @property {Number | String} num									- 数量
+   *
+   */
+  const props = defineProps({
+    img: {
+      type: String,
+      default: 'https://img1.baidu.com/it/u=1601695551,235775011&fm=26&fmt=auto',
+    },
+    title: {
+      type: String,
+      default: '',
+    },
+    titleWidth: {
+      type: Number,
+      default: 0,
+    },
+    skuText: {
+      type: [String, Array],
+      default: '',
+    },
+    price: {
+      type: [String, Number],
+      default: '',
+    },
+    priceColor: {
+      type: [String],
+      default: '',
+    },
+    num: {
+      type: [String, Number],
+      default: 0,
+    },
+    score: {
+      type: [String, Number],
+      default: '',
+    },
+    radius: {
+      type: [String],
+      default: '',
+    },
+    marginBottom: {
+      type: [String],
+      default: '',
+    },
+  });
+  const skuString = computed(() => {
+    if (!props.skuText) {
+      return '';
+    }
+    if (typeof props.skuText === 'object') {
+      return props.skuText.join(',');
+    }
+    return props.skuText;
+  });
+</script>
+
+<style lang="scss" scoped>
+  .nickname-box {
+	display: flex;
+	align-items: center;
+	
+	.spec-text {
+		margin-left: 5px;
+	}
+  }	
+  
+  .time-text {
+	  font-size: 12px;
+  }
+	
+  .score-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+  .ss-order-card-warp {
+    padding: 20rpx;
+
+    .img-box {
+      width: 164rpx;
+      height: 164rpx;
+      border-radius: 10rpx;
+      overflow: hidden;
+
+      .order-img {
+        width: 164rpx;
+        height: 164rpx;
+      }
+    }
+
+    .box-right {
+      flex: 1;
+      // width: 500rpx;
+      // height: 164rpx;
+      position: relative;
+
+      .tool-box {
+        position: absolute;
+        right: 0rpx;
+        bottom: -10rpx;
+      }
+    }
+
+    .title-text {
+      font-size: 28rpx;
+      font-weight: 500;
+      line-height: 40rpx;
+    }
+
+    .spec-text {
+      font-size: 24rpx;
+      font-weight: 400;
+      color: $dark-9;
+      min-width: 0;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+    }
+
+    .price-text {
+      font-size: 24rpx;
+      font-weight: 500;
+      font-family: OPPOSANS;
+    }
+
+    .total-text {
+      font-size: 24rpx;
+      font-weight: 400;
+      line-height: 24rpx;
+      color: $dark-9;
+      margin-left: 8rpx;
+    }
+  }
+</style>
diff --git a/sheep/config/index.js b/sheep/config/index.js
new file mode 100644
index 0000000..f6669a3
--- /dev/null
+++ b/sheep/config/index.js
@@ -0,0 +1,23 @@
+// 开发环境配置
+export let baseUrl;
+export let version;
+if (process.env.NODE_ENV === 'development') {
+  baseUrl = import.meta.env.SHOPRO_DEV_BASE_URL;
+} else {
+  baseUrl = import.meta.env.SHOPRO_BASE_URL;
+}
+version = import.meta.env.SHOPRO_VERSION;
+console.log(`[晚趣语音 ${version}]`);
+
+export const apiPath = import.meta.env.SHOPRO_API_PATH;
+export const staticUrl = import.meta.env.SHOPRO_STATIC_URL;
+export const tenantId = import.meta.env.SHOPRO_TENANT_ID;
+export const websocketPath = import.meta.env.SHOPRO_WEBSOCKET_PATH;
+
+export default {
+  baseUrl,
+  apiPath,
+  staticUrl,
+  tenantId,
+  websocketPath,
+};
diff --git a/sheep/config/zIndex.js b/sheep/config/zIndex.js
new file mode 100644
index 0000000..6652d48
--- /dev/null
+++ b/sheep/config/zIndex.js
@@ -0,0 +1,20 @@
+// uniapp在H5中各API的z-index值如下：
+/**
+ * actionsheet: 999
+ * modal: 999
+ * navigate: 998
+ * tabbar: 998
+ * toast: 999
+ */
+
+export default {
+  toast: 10090,
+  noNetwork: 10080,
+  popup: 10075, // popup包含popup，actionsheet，keyboard，picker的值
+  mask: 10070,
+  navbar: 980,
+  topTips: 975,
+  sticky: 970,
+  indexListSticky: 965,
+  popover: 960,
+};
diff --git a/sheep/helper/digit.js b/sheep/helper/digit.js
new file mode 100644
index 0000000..be50b32
--- /dev/null
+++ b/sheep/helper/digit.js
@@ -0,0 +1,168 @@
+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/sheep/helper/index.js b/sheep/helper/index.js
new file mode 100644
index 0000000..bdd0134
--- /dev/null
+++ b/sheep/helper/index.js
@@ -0,0 +1,714 @@
+import test 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}
+ */
+export function getPx(value, unit = false) {
+  if (test.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 进行延时，以达到可以简写代码的目的
+ * @param {number} value 堵塞时间 单位ms 毫秒
+ * @returns {Promise} 返回promise
+ */
+export function sleep(value = 30) {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve();
+    }, value);
+  });
+}
+/**
+ * @description 运行期判断平台
+ * @returns {string} 返回所在平台(小写)
+ * @link 运行期判断平台 https://uniapp.dcloud.io/frame?id=判断平台
+ */
+export function os() {
+  return uni.getSystemInfoSync().platform.toLowerCase();
+}
+/**
+ * @description 获取系统信息同步接口
+ * @link 获取系统信息同步接口 https://uniapp.dcloud.io/api/system/info?id=getsysteminfosync
+ */
+export 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-十六进制
+ */
+export 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 父组件的参数名
+*/
+export 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}
+ */
+export function addStyle(customStyle, target = 'object') {
+  // 字符串转字符串，对象转对象情形，直接返回
+  if (
+    test.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
+ */
+export function addUnit(value = 'auto', unit = 'px') {
+  value = String(value);
+  return test.number(value) ? `${value}${unit}` : value;
+}
+
+/**
+ * @description 深度克隆
+ * @param {object} obj 需要深度克隆的对象
+ * @returns {*} 克隆后的对象或者原值（不是对象）
+ */
+function deepClone(obj) {
+  // 对常见的“非”值，直接返回原来值
+  if ([null, undefined, NaN, false].includes(obj)) return obj;
+  if (typeof obj !== 'object' && typeof obj !== 'function') {
+    // 原始类型直接返回
+    return obj;
+  }
+  const o = test.array(obj) ? [] : {};
+  for (const i in obj) {
+    if (obj.hasOwnProperty(i)) {
+      o[i] = typeof obj[i] === 'object' ? deepClone(obj[i]) : obj[i];
+    }
+  }
+  return o;
+}
+
+/**
+ * @description JS对象深度合并
+ * @param {object} target 需要拷贝的对象
+ * @param {object} source 拷贝的来源对象
+ * @returns {object|boolean} 深度合并后的对象或者false（入参有不是对象）
+ */
+export function deepMerge(target = {}, source = {}) {
+  target = deepClone(target);
+  if (typeof target !== 'object' || typeof source !== 'object') return false;
+  for (const prop in source) {
+    if (!source.hasOwnProperty(prop)) continue;
+    if (prop in target) {
+      if (typeof target[prop] !== 'object') {
+        target[prop] = source[prop];
+      } else if (typeof source[prop] !== 'object') {
+        target[prop] = source[prop];
+      } else if (target[prop].concat && source[prop].concat) {
+        target[prop] = target[prop].concat(source[prop]);
+      } else {
+        target[prop] = deepMerge(target[prop], source[prop]);
+      }
+    } else {
+      target[prop] = source[prop];
+    }
+  }
+  return target;
+}
+
+/**
+ * @description error提示
+ * @param {*} err 错误内容
+ */
+function error(err) {
+  // 开发环境才提示，生产环境不会提示
+  if (process.env.NODE_ENV === 'development') {
+    console.error(`SheepJS:${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));
+  }
+  // 其他都认为符合 RFC 2822 规范
+  else {
+    // 处理平台性差异，在Safari/Webkit中，new Date仅支持/作为分割符的字符串时间
+    date = new Date(typeof dateTime === 'string' ? dateTime.replace(/-/g, '/') : 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;
+}
+
+export function parseTimeData(time) {
+	time = time - new Date().getTime();
+	return time
+}
+
+/**
+ * @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 获取某个对象下的属性，用于通过类似'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();
+  // 某些特殊情况下(比如页面进行redirectTo时的一些时机)，pages可能为空数组
+  return `/${pages[pages.length - 1]?.route ?? ''}`;
+}
+
+/**
+ * @description 获取当前路由栈实例数组
+ */
+function pages() {
+  const pages = getCurrentPages();
+  return pages;
+}
+
+/**
+ * 获取H5-真实根地址 兼容hash+history模式
+ */
+export function getRootUrl() {
+  let url = '';
+  // #ifdef H5
+  url = location.origin + '/h5';
+
+  if (location.hash !== '') {
+    url += '/#/';
+  }
+  // #endif
+  return url;
+}
+
+/**
+ * copyText 多端复制文本
+ */
+export function copyText(text) {
+  // #ifndef H5
+  uni.setClipboardData({
+    data: text,
+    success: function () {
+      toast('复制成功!');
+    },
+    fail: function () {
+      toast('复制失败!');
+    },
+  });
+  // #endif
+  // #ifdef H5
+  var createInput = document.createElement('textarea');
+  createInput.value = text;
+  document.body.appendChild(createInput);
+  createInput.select();
+  document.execCommand('Copy');
+  createInput.className = 'createInput';
+  createInput.style.display = 'none';
+  toast('复制成功');
+  // #endif
+}
+
+export default {
+  range,
+  getPx,
+  sleep,
+  os,
+  sys,
+  random,
+  guid,
+  $parent,
+  addStyle,
+  addUnit,
+  deepClone,
+  deepMerge,
+  error,
+  randomArray,
+  timeFormat,
+  parseTimeData,
+  timeFrom,
+  trim,
+  queryParams,
+  toast,
+  type2icon,
+  priceFormat,
+  getDuration,
+  padZero,
+  getProperty,
+  setProperty,
+  page,
+  pages,
+  test,
+  getRootUrl,
+  copyText,
+};
diff --git a/sheep/helper/test.js b/sheep/helper/test.js
new file mode 100644
index 0000000..ca550a1
--- /dev/null
+++ b/sheep/helper/test.js
@@ -0,0 +1,285 @@
+/**
+ * 验证电子邮箱格式
+ */
+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[23456789]\d{9}$/.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 default {
+  email,
+  mobile,
+  url,
+  date,
+  dateISO,
+  number,
+  digits,
+  idCard,
+  carNo,
+  amount,
+  chinese,
+  letter,
+  enOrNum,
+  contains,
+  range,
+  rangeLength,
+  empty,
+  isEmpty: empty,
+  isNumber: number,
+  jsonString,
+  landline,
+  object,
+  array,
+  code,
+};
diff --git a/sheep/helper/throttle.js b/sheep/helper/throttle.js
new file mode 100644
index 0000000..c318127
--- /dev/null
+++ b/sheep/helper/throttle.js
@@ -0,0 +1,31 @@
+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 {
+    }
+  } else if (!flag) {
+    flag = true;
+    // 如果是非立即执行，则在wait毫秒内的结束处执行
+    timer = setTimeout(() => {
+      flag = false;
+      typeof func === 'function' && func();
+    }, wait);
+  }
+}
+export default throttle;
diff --git a/sheep/helper/tools.js b/sheep/helper/tools.js
new file mode 100644
index 0000000..49efcec
--- /dev/null
+++ b/sheep/helper/tools.js
@@ -0,0 +1,67 @@
+import router from '@/sheep/router';
+export default {
+  /**
+   * 打电话
+   * @param {String<Number>} phoneNumber - 数字字符串
+   */
+  callPhone(phoneNumber = '') {
+    let num = phoneNumber.toString();
+    uni.makePhoneCall({
+      phoneNumber: num,
+      fail(err) {
+        console.log('makePhoneCall出错', err);
+      },
+    });
+  },
+
+  /**
+   * 微信头像
+   * @param {String} url -图片地址
+   */
+  checkMPUrl(url) {
+    // #ifdef MP
+    if (
+      url.substring(0, 4) === 'http' &&
+      url.substring(0, 5) !== 'https' &&
+      url.substring(0, 12) !== 'http://store' &&
+      url.substring(0, 10) !== 'http://tmp' &&
+      url.substring(0, 10) !== 'http://usr'
+    ) {
+      url = 'https' + url.substring(4, url.length);
+    }
+    // #endif
+    return url;
+  },
+
+  /**
+   * getUuid 生成唯一id
+   */
+  getUuid(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('');
+  },
+};
diff --git a/sheep/helper/utils.js b/sheep/helper/utils.js
new file mode 100644
index 0000000..a0dd86f
--- /dev/null
+++ b/sheep/helper/utils.js
@@ -0,0 +1,172 @@
+export function isArray(value) {
+  if (typeof Array.isArray === 'function') {
+    return Array.isArray(value);
+  } else {
+    return Object.prototype.toString.call(value) === '[object Array]';
+  }
+}
+
+export function isObject(value) {
+  return Object.prototype.toString.call(value) === '[object Object]';
+}
+
+export function isNumber(value) {
+  return !isNaN(Number(value));
+}
+
+export function isFunction(value) {
+  return typeof value == 'function';
+}
+
+export function isString(value) {
+  return typeof value == 'string';
+}
+
+export function isEmpty(value) {
+  if (value === '' || value === undefined || value === null){
+    return true;
+  }
+
+  if (isArray(value)) {
+    return value.length === 0;
+  }
+
+  if (isObject(value)) {
+    return Object.keys(value).length === 0;
+  }
+
+  return false
+}
+
+export function isBoolean(value) {
+  return typeof value === 'boolean';
+}
+
+export function last(data) {
+  if (isArray(data) || isString(data)) {
+    return data[data.length - 1];
+  }
+}
+
+export function cloneDeep(obj) {
+  const d = isArray(obj) ? [...obj] : {};
+
+  if (isObject(obj)) {
+    for (const key in obj) {
+      if (obj[key]) {
+        if (obj[key] && typeof obj[key] === 'object') {
+          d[key] = cloneDeep(obj[key]);
+        } else {
+          d[key] = obj[key];
+        }
+      }
+    }
+  }
+
+  return d;
+}
+
+export function clone(obj) {
+  return Object.create(Object.getPrototypeOf(obj), Object.getOwnPropertyDescriptors(obj));
+}
+
+export function deepMerge(a, b) {
+  let k;
+  for (k in b) {
+    a[k] = a[k] && a[k].toString() === '[object Object]' ? deepMerge(a[k], b[k]) : (a[k] = b[k]);
+  }
+  return a;
+}
+
+export function contains(parent, node) {
+  while (node && (node = node.parentNode)) if (node === parent) return true;
+  return false;
+}
+
+export function orderBy(list, key) {
+  return list.sort((a, b) => a[key] - b[key]);
+}
+
+export function deepTree(list) {
+  const newList = [];
+  const map = {};
+
+  list.forEach((e) => (map[e.id] = e));
+
+  list.forEach((e) => {
+    const parent = map[e.parentId];
+
+    if (parent) {
+      (parent.children || (parent.children = [])).push(e);
+    } else {
+      newList.push(e);
+    }
+  });
+
+  const fn = (list) => {
+    list.map((e) => {
+      if (e.children instanceof Array) {
+        e.children = orderBy(e.children, 'orderNum');
+
+        fn(e.children);
+      }
+    });
+  };
+
+  fn(newList);
+
+  return orderBy(newList, 'orderNum');
+}
+
+export function revDeepTree(list = []) {
+  const d = [];
+  let id = 0;
+
+  const deep = (list, parentId) => {
+    list.forEach((e) => {
+      if (!e.id) {
+        e.id = id++;
+      }
+
+      e.parentId = parentId;
+
+      d.push(e);
+
+      if (e.children && isArray(e.children)) {
+        deep(e.children, e.id);
+      }
+    });
+  };
+
+  deep(list || [], null);
+
+  return d;
+}
+
+export function basename(path) {
+  let index = path.lastIndexOf('/');
+  index = index > -1 ? index : path.lastIndexOf('\\');
+  if (index < 0) {
+    return path;
+  }
+  return path.substring(index + 1);
+}
+
+export function isWxBrowser() {
+  const ua = navigator.userAgent.toLowerCase();
+  if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+/**
+ * @description 如果value小于min，取min；如果value大于max，取max
+ * @param {number} min
+ * @param {number} max
+ * @param {number} value
+ */
+export function range(min = 0, max = 0, value = 0) {
+  return Math.max(min, Math.min(max, Number(value)));
+}
diff --git a/sheep/hooks/useApp.js b/sheep/hooks/useApp.js
new file mode 100644
index 0000000..e69de29
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
new file mode 100644
index 0000000..1969da9
--- /dev/null
+++ b/sheep/hooks/useGoods.js
@@ -0,0 +1,655 @@
+import { ref } from 'vue';
+import dayjs from 'dayjs';
+import $url from '@/sheep/url';
+import { formatDate } from '@/sheep/util';
+
+/**
+ * 格式化销量
+ * @param {'exact' | string} type 格式类型：exact=精确值，其它=大致数量
+ * @param {number} num 销量
+ * @return {string} 格式化后的销量字符串
+ */
+export function formatSales(type, num) {
+  let prefix = type !== 'exact' && num < 10 ? '销量' : '已售';
+  return formatNum(prefix, type, num)
+}
+
+/**
+ * 格式化兑换量
+ * @param {'exact' | string} type 格式类型：exact=精确值，其它=大致数量
+ * @param {number} num 销量
+ * @return {string} 格式化后的销量字符串
+ */
+export function formatExchange(type, num) {
+  return formatNum('已兑换', type, num)
+}
+
+
+/**
+ * 格式化库存
+ * @param {'exact' | any} type 格式类型：exact=精确值，其它=大致数量
+ * @param {number} num 销量
+ * @return {string} 格式化后的销量字符串
+ */
+export function formatStock(type, num) {
+  return formatNum('库存', type, num)
+}
+
+/**
+ * 格式化数字
+ * @param {string} prefix 前缀
+ * @param {'exact' | string} type 格式类型：exact=精确值，其它=大致数量
+ * @param {number} num 销量
+ * @return {string} 格式化后的销量字符串
+ */
+export function formatNum(prefix, type, num) {
+  num = (num || 0);
+  // 情况一：精确数值
+  if (type === 'exact') {
+    return prefix + num;
+  }
+  // 情况二：小于等于 10
+  if (num < 10) {
+    return `${prefix}≤10`;
+  }
+  // 情况三：大于 10，除第一位外，其它位都显示为0
+  // 例如：100  - 199  显示为 100+
+  //      9000 - 9999 显示为 9000+
+  const numStr = num.toString();
+  const first = numStr[0];
+  const other = '0'.repeat(numStr.length - 1);
+  return `${prefix}${first}${other}+`;
+}
+
+// 格式化价格
+export function formatPrice(e) {
+  return e.length === 1 ? e[0] : e.join('~');
+}
+
+// 视频格式后缀列表
+const VIDEO_SUFFIX_LIST = ['.avi', '.mp4']
+
+/**
+ * 转换商品轮播的链接列表：根据链接的后缀，判断是视频链接还是图片链接
+ *
+ * @param {string[]} urlList 链接列表
+ * @return {{src: string, type: 'video' | 'image' }[]}  转换后的链接列表
+ */
+export function formatGoodsSwiper(urlList) {
+  return urlList?.filter(url => url).map((url, key) => {
+    const isVideo = VIDEO_SUFFIX_LIST.some(suffix => url.includes(suffix));
+    const type = isVideo ? 'video' : 'image'
+    const src = $url.cdn(url);
+    return { type, src }
+  }) || [];
+}
+
+/**
+ * 格式化订单状态的颜色
+ *
+ * @param order 订单
+ * @return {string} 颜色的 class 名称
+ */
+export function formatOrderColor(order) {
+  if (order.status === 0) {
+    return 'info-color';
+  }
+  if (order.status === 10
+    || order.status === 20
+    || (order.status === 30 && !order.commentStatus)) {
+    return 'warning-color';
+  }
+  if (order.status === 30 && order.commentStatus) {
+    return 'success-color';
+  }
+  return 'danger-color';
+}
+
+/**
+ * 格式化订单状态
+ *
+ * @param order 订单
+ */
+export function formatOrderStatus(order) {
+  if (order.status === 0) {
+    return '待付款';
+  }
+  if (order.status === 10 && order.deliveryType === 1) {
+    return '待发货';
+  }
+  if (order.status === 10 && order.deliveryType === 2) {
+    return '待核销';
+  }
+  if (order.status === 20) {
+    return '待收货';
+  }
+  if (order.status === 30 && !order.commentStatus) {
+    return '待评价';
+  }
+  if (order.status === 30 && order.commentStatus) {
+    return '已完成';
+  }
+  return '已关闭';
+}
+
+/**
+ * 格式化订单状态
+ *
+ * @param order 订单
+ */
+export function formatWorkerOrderStatus(order) {
+  if (order.status === 0) {
+	order.statusStr = '待付款';
+    return order.statusStr;
+  }
+  if (order.status === 10) {
+	order.statusStr = '待服务';
+    return order.statusStr;
+  }
+  if (order.status === 20) {
+	order.statusStr = '服务中';
+    return order.statusStr;
+  }
+  if (order.status === 30) {
+	order.statusStr = '已完成';
+    return order.statusStr;
+  }
+  
+  order.statusStr = '已取消';
+  return order.statusStr;
+}
+
+/**
+ * 格式化订单状态
+ *
+ * @param order 订单
+ */
+export function formatBlindOrderStatus(order) {
+  if (order.status === 0) {
+	order.statusStr = '待付款';
+    return order.statusStr;
+  }
+  if (order.status === 10) {
+	order.statusStr = '待抢单';
+    return order.statusStr;
+  }
+  if (order.status === 20) {
+	order.statusStr = '服务中';
+    return order.statusStr;
+  }
+  if (order.status === 30) {
+	order.statusStr = '已完成';
+    return order.statusStr;
+  }
+  
+  order.statusStr = '已取消';
+  return order.statusStr;
+}
+
+/**
+ * 格式化订单状态
+ *
+ * @param order 订单
+ */
+export function formatMyOrderStatus(order) {
+  if (order.status === 0) {
+	order.statusStr = '待付款';
+    return order.statusStr;
+  }
+  if (order.status === 10) {
+	order.statusStr = '待服务';
+    return order.statusStr;
+  }
+  if (order.status === 20) {
+	order.statusStr = '服务中';
+    return order.statusStr;
+  }
+  if (order.status === 30 && !order.commentStatus) {
+	order.statusStr = '待评价';
+	return order.statusStr;
+  }
+  if (order.status === 30 && order.commentStatus) {
+	order.statusStr = '已完成';
+	return order.statusStr;
+  }
+  
+  order.statusStr = '已取消';
+  return order.statusStr;
+}
+
+/**
+ * 格式化订单状态的描述
+ *
+ * @param order 订单
+ */
+export function formatOrderStatusDescription(order) {
+  if (order.status === 0) {
+    return `请在 ${ formatDate(order.payExpireTime) } 前完成支付`;
+  }
+  if (order.status === 10) {
+    return '商家未发货，请耐心等待';
+  }
+  if (order.status === 20) {
+    return '商家已发货，请耐心等待';
+  }
+  if (order.status === 30 && !order.commentStatus) {
+    return '已收货，快去评价一下吧';
+  }
+  if (order.status === 30 && order.commentStatus) {
+    return '交易完成，感谢您的支持';
+  }
+  return '订单取消';
+}
+
+/**
+ * 格式化订单状态的描述
+ *
+ * @param order 订单
+ */
+export function formatMyOrderStatusDescription(order) {
+  if (order.status === 0) {
+    return `请在 ${ formatDate(order.payExpireTime) } 前完成支付`;
+  }
+  if (order.status === 10) {
+    return '店员未接单，请耐心等待';
+  }
+  if (order.status === 20) {
+    return '店员已接单，请打开微信搜索权限，等待添加';
+  }
+  if (order.status === 30 && !order.commentStatus) {
+    return '店员已完成服务，快去评价一下吧';
+  }
+  if (order.status === 30 && order.commentStatus) {
+    return '店员已完成服务，感谢您的支持';
+  }
+  return '订单已取消，有缘自会相遇';
+}
+
+
+/**
+ * 格式化订单状态的描述
+ *
+ * @param order 订单
+ */
+export function formatWorkerOrderStatusDescription(order) {
+  if (order.status === 0) {
+    return `老板未付款，可以主动联系老板下单`;
+  }
+  if (order.status === 10) {
+    return '老板已付款，请尽快添加老板，开始服务';
+  }
+  if (order.status === 20) {
+    return '已抢单成功，快去添加老板，开始服务';
+  }
+  if (order.status === 30 && !order.commentStatus) {
+    return '已完成服务，快去邀请老板评价一下吧';
+  }
+  if (order.status === 30 && order.commentStatus) {
+    return '已完成服务，做的很好';
+  }
+  return '交易关闭';
+}
+
+/**
+ * 格式化订单状态的描述
+ *
+ * @param order 订单
+ */
+export function formatBlindOrderStatusDescription(order) {
+  if (order.status === 0) {
+    return `老板未付款，可以主动联系老板下单`;
+  }
+  if (order.status === 10) {
+    return '老板已付款，抢单成功后添加老板，开始服务';
+  }
+  if (order.status === 20) {
+    return '已抢单成功，快去添加老板，开始服务';
+  }
+  if (order.status === 30 && !order.commentStatus) {
+    return '已完成服务，快去邀请老板评价一下吧';
+  }
+  if (order.status === 30 && order.commentStatus) {
+    return '已完成服务，做的很好';
+  }
+  return '交易关闭';
+}
+
+/**
+ * 处理订单的 button 操作按钮数组
+ *
+ * @param order 订单
+ */
+export function handleOrderButtons(order) {
+  order.buttons = []
+  if (order.type === 3) { // 查看拼团
+    order.buttons.push('combination');
+  }
+  if (order.status === 20) { // 确认收货
+    order.buttons.push('confirm');
+  }
+  if (order.logisticsId > 0) { // 查看物流
+    order.buttons.push('express');
+  }
+  if (order.status === 0) { // 取消订单 / 发起支付
+    order.buttons.push('cancel');
+    order.buttons.push('pay');
+  }
+  if (order.status === 30 && !order.commentStatus) { // 发起评价
+    order.buttons.push('comment');
+  }
+  if (order.status === 40) { // 删除订单
+    order.buttons.push('delete');
+  }
+}
+
+/**
+ * 处理订单的 button 操作按钮数组
+ *
+ * @param order 订单
+ */
+export function handleWorkerOrderButtons(order) {
+  order.buttons = []
+  if (order.status === 10) { // 待服务
+	order.buttons.push('unpay');
+	order.buttons.push('agree');
+  }
+  if (order.status === 20) { // 服务中
+    order.buttons.push('unpay');
+    order.buttons.push('confirm');
+  }
+  if (order.status === 0) { // 取消订单 / 发起支付
+    order.buttons.push('detail');
+    order.buttons.push('invite');
+  }
+  if (order.status === 30) { // 已完成
+    order.buttons.push('detail');
+	order.buttons.push('invite');
+  }
+  if (order.status === 40) { // 取消订单
+    order.buttons.push('detail');
+	order.buttons.push('invite');
+  }
+  
+}
+
+/**
+ * 处理订单的 button 操作按钮数组
+ *
+ * @param order 订单
+ */
+export function handleBlindOrderButtons(order, userId) {
+  order.buttons = []
+  if (order.status === 10) { // 待服务
+	order.buttons.push('detail');
+	order.buttons.push('agree');
+	//order.buttons.push('invite');
+  }
+  if (order.status === 20) { // 服务中
+    // 抢单后
+    if(order.workerUserId == userId){
+    	order.buttons.push('unpay');
+    	order.buttons.push('confirm');
+    }else{
+    	order.buttons.push('other');
+    }
+  }
+  if (order.status === 0) { // 取消订单 / 发起支付
+    order.buttons.push('detail');
+    //order.buttons.push('invite');
+  }
+  if (order.status === 30) { // 已完成
+    order.buttons.push('detail');
+	if(order.workerUserId == userId){
+		order.buttons.push('invite2');
+	}
+  }
+  if (order.status === 40) { // 取消订单
+    order.buttons.push('detail');
+	//order.buttons.push('invite');
+  }
+  
+}
+
+/**
+ * 处理订单的 button 操作按钮数组
+ *
+ * @param order 订单
+ */
+export function handleMyOrderButtons(order) {
+  order.buttons = []
+  if (order.type === 3) { // 查看拼团
+    order.buttons.push('combination');
+  }
+  if (order.status === 10) { // 待服务
+	order.buttons.push('unpay');
+	order.buttons.push('buy');
+  }
+  if (order.status === 20) { // 服务中
+    order.buttons.push('detail');
+    order.buttons.push('buy');
+  }
+  if (order.logisticsId > 0) { // 查看物流
+    order.buttons.push('express');
+  }
+  if (order.status === 0) { // 取消订单 / 发起支付
+    order.buttons.push('cancel');
+    order.buttons.push('pay');
+  }
+  if (order.status === 30 && !order.commentStatus) { // 发起评价
+    order.buttons.push('comment');
+	order.buttons.push('buy');
+  }
+  if (order.status === 30 && order.commentStatus) { // 发起评价
+	order.buttons.push('detail');
+  	order.buttons.push('buy');
+  }
+  if (order.status === 40) { // 删除订单
+    //order.buttons.push('delete');
+	order.buttons.push('detail');
+	order.buttons.push('buy');
+  }
+}
+
+/**
+ * 格式化售后状态
+ *
+ * @param afterSale 售后
+ */
+export function formatAfterSaleStatus(afterSale) {
+  if (afterSale.status === 10) {
+    return '申请售后';
+  }
+  if (afterSale.status === 20) {
+    return '商品待退货';
+  }
+  if (afterSale.status === 30) {
+    return '商家待收货';
+  }
+  if (afterSale.status === 40) {
+    return '等待退款';
+  }
+  if (afterSale.status === 50) {
+    return '取消成功';
+  }
+  if (afterSale.status === 61) {
+    return '买家取消';
+  }
+  if (afterSale.status === 62) {
+    return '商家拒绝';
+  }
+  if (afterSale.status === 63) {
+    return '商家拒收货';
+  }
+  return '未知状态';
+}
+
+/**
+ * 格式化售后状态的描述
+ *
+ * @param afterSale 售后
+ */
+export function formatAfterSaleStatusDescription(afterSale) {
+  if (afterSale.status === 10) {
+    return '退款申请待商家处理';
+  }
+  if (afterSale.status === 20) {
+    return '请退货并填写物流信息';
+  }
+  if (afterSale.status === 30) {
+    return '退货退款申请待商家处理';
+  }
+  if (afterSale.status === 40) {
+    return '等待退款';
+  }
+  if (afterSale.status === 50) {
+    return '退款成功';
+  }
+  if (afterSale.status === 61) {
+    return '退款关闭';
+  }
+  if (afterSale.status === 62) {
+    return `商家不同意退款申请，拒绝原因：${afterSale.auditReason}`;
+  }
+  if (afterSale.status === 63) {
+    return `商家拒绝收货，不同意退款，拒绝原因：${afterSale.auditReason}`;
+  }
+  return '未知状态';
+}
+
+/**
+ * 处理售后的 button 操作按钮数组
+ *
+ * @param afterSale 售后
+ */
+export function handleAfterSaleButtons(afterSale) {
+  afterSale.buttons = [];
+  if ([10, 20, 30].includes(afterSale.status)) { // 取消订单
+    afterSale.buttons.push('cancel');
+  }
+  if (afterSale.status === 20) { // 退货信息
+    afterSale.buttons.push('delivery');
+  }
+}
+
+/**
+ * 倒计时
+ * @param toTime   截止时间
+ * @param fromTime 起始时间，默认当前时间
+ * @return {{s: string, ms: number, h: string, m: string}} 持续时间
+ */
+export function useDurationTime(toTime, fromTime = '') {
+  toTime = getDayjsTime(toTime);
+  if (fromTime === '') {
+    fromTime = dayjs();
+  }
+  let duration = ref(toTime - fromTime);
+  if (duration.value > 0) {
+    setTimeout(() => {
+      if (duration.value > 0) {
+        duration.value -= 1000;
+      }
+    }, 1000);
+  }
+
+  let durationTime = dayjs.duration(duration.value);
+  return {
+    h: (durationTime.months() * 30 * 24 + durationTime.days() * 24 + durationTime.hours())
+      .toString()
+      .padStart(2, '0'),
+    m: durationTime.minutes().toString().padStart(2, '0'),
+    s: durationTime.seconds().toString().padStart(2, '0'),
+    ms: durationTime.$ms,
+  };
+}
+
+/**
+ * 转换为 Dayjs
+ * @param {any} time 时间
+ * @return {dayjs.Dayjs}
+ */
+function getDayjsTime(time) {
+  time = time.toString();
+  if (time.indexOf('-') > 0) {
+    // 'date'
+    return dayjs(time);
+  }
+  if (time.length > 10) {
+    // 'timestamp'
+    return dayjs(parseInt(time));
+  }
+  if (time.length === 10) {
+    // 'unixTime'
+    return dayjs.unix(parseInt(time));
+  }
+}
+
+/**
+ * 将分转成元
+ *
+ * @param price 分，例如说 100 分
+ * @returns {string} 元，例如说 1.00 元
+ */
+export function fen2yuan(price) {
+  return (price / 100.0).toFixed(2)
+}
+
+/**
+ * 从商品 SKU 数组中，转换出商品属性的数组
+ *
+ * 类似结构：[{
+ *    id: // 属性的编号
+ *    name: // 属性的名字
+ *    values: [{
+ *      id: // 属性值的编号
+ *      name: // 属性值的名字
+ *    }]
+ * }]
+ *
+ * @param skus 商品 SKU 数组
+ */
+export function convertProductPropertyList(skus) {
+  let result = [];
+  for (const sku of skus) {
+    if (!sku.properties) {
+      continue
+    }
+    for (const property of sku.properties) {
+      // ① 先处理属性
+      let resultProperty = result.find(item => item.id === property.propertyId)
+      if (!resultProperty) {
+        resultProperty = {
+          id: property.propertyId,
+          name: property.propertyName,
+          values: []
+        }
+        result.push(resultProperty)
+      }
+      // ② 再处理属性值
+      let resultValue = resultProperty.values.find(item => item.id === property.valueId)
+      if (!resultValue) {
+        resultProperty.values.push({
+          id: property.valueId,
+          name: property.valueName
+        })
+      }
+    }
+  }
+  return result;
+}
+
+/**
+ * 格式化满减送活动的规则
+ *
+ * @param activity 活动信息
+ * @param rule 优惠规格
+ * @returns {string} 规格字符串
+ */
+export function formatRewardActivityRule(activity, rule) {
+  if (activity.conditionType === 10) {
+    return `满 ${fen2yuan(rule.limit)} 元减 ${fen2yuan(rule.discountPrice)} 元`;
+  }
+  if (activity.conditionType === 20) {
+    return `满 ${rule.limit} 件减 ${fen2yuan(rule.discountPrice)} 元`;
+  }
+  return '';
+}
diff --git a/sheep/hooks/useModal.js b/sheep/hooks/useModal.js
new file mode 100644
index 0000000..003fe80
--- /dev/null
+++ b/sheep/hooks/useModal.js
@@ -0,0 +1,141 @@
+import $store from '@/sheep/store';
+import $helper from '@/sheep/helper';
+import dayjs from 'dayjs';
+import { ref } from 'vue';
+import test from '@/sheep/helper/test.js';
+import AuthUtil from '@/sheep/api/member/auth';
+
+// 打开授权弹框
+export function showAuthModal(type = 'smsLogin') {
+  const modal = $store('modal');
+  if (modal.auth !== '') {
+    // 注意：延迟修改，保证下面的 closeAuthModal 先执行掉
+    setTimeout(() => {
+      modal.$patch((state) => {
+        state.auth = type;
+      });
+    }, 500);
+    closeAuthModal();
+  } else {
+    modal.$patch((state) => {
+      state.auth = type;
+    });
+  }
+}
+
+// 关闭授权弹框
+export function closeAuthModal() {
+  $store('modal').$patch((state) => {
+    state.auth = '';
+  });
+}
+
+// 打开分享弹框
+export function showShareModal() {
+  $store('modal').$patch((state) => {
+    state.share = true;
+  });
+}
+
+// 关闭分享弹框
+export function closeShareModal() {
+  $store('modal').$patch((state) => {
+    state.share = false;
+  });
+}
+
+// 打开快捷菜单
+export function showMenuTools() {
+  $store('modal').$patch((state) => {
+    state.menu = true;
+  });
+}
+
+// 关闭快捷菜单
+export function closeMenuTools() {
+  $store('modal').$patch((state) => {
+    state.menu = false;
+  });
+}
+
+// 发送短信验证码  60秒
+export function getSmsCode(event, mobile) {
+  const modalStore = $store('modal');
+  const lastSendTimer = modalStore.lastTimer[event];
+  if (typeof lastSendTimer === 'undefined') {
+    $helper.toast('短信发送事件错误');
+    return;
+  }
+
+  const duration = dayjs().unix() - lastSendTimer;
+  const canSend = duration >= 60;
+  if (!canSend) {
+    $helper.toast('请稍后再试');
+    return;
+  }
+  // 只有 mobile 非空时才校验。因为部分场景（修改密码），不需要输入手机
+  if (mobile && !test.mobile(mobile)) {
+    $helper.toast('手机号码格式不正确');
+    return;
+  }
+
+  // 发送验证码 + 更新上次发送验证码时间
+  let scene = -1;
+  switch (event) {
+    case 'resetPassword':
+      scene = 4;
+      break;
+    case 'changePassword':
+      scene = 3;
+      break;
+    case 'changeMobile':
+      scene = 2;
+      break;
+    case 'smsLogin':
+      scene = 1;
+      break;
+  }
+  AuthUtil.sendSmsCode(mobile, scene).then((res) => {
+    if (res.code === 0) {
+      modalStore.$patch((state) => {
+        state.lastTimer[event] = dayjs().unix();
+      });
+    }
+  });
+}
+
+// 获取短信验证码倒计时 -- 60秒
+export function getSmsTimer(event, mobile = '') {
+  const modalStore = $store('modal');
+  const lastSendTimer = modalStore.lastTimer[event];
+
+  if (typeof lastSendTimer === 'undefined') {
+    $helper.toast('短信发送事件错误');
+    return;
+  }
+
+  const duration = ref(dayjs().unix() - lastSendTimer - 60);
+  const canSend = duration.value >= 0;
+
+  if (canSend) {
+    return '获取验证码';
+  }
+
+  if (!canSend) {
+    setTimeout(() => {
+      duration.value++;
+    }, 1000);
+    return -duration.value.toString() + ' 秒';
+  }
+}
+
+// 记录广告弹框历史
+export function saveAdvHistory(adv) {
+  const modal = $store('modal');
+
+  modal.$patch((state) => {
+    if (!state.advHistory.includes(adv.imgUrl)) {
+      state.advHistory.push(adv.imgUrl);
+    }
+  });
+}
diff --git a/sheep/hooks/useWebSocket.js b/sheep/hooks/useWebSocket.js
new file mode 100644
index 0000000..c3980c4
--- /dev/null
+++ b/sheep/hooks/useWebSocket.js
@@ -0,0 +1,163 @@
+import { onBeforeUnmount, reactive, ref, getCurrentInstance } from 'vue';
+import { baseUrl, websocketPath } from '@/sheep/config';
+import { copyValueToTarget } from '@/sheep/util';
+
+/**
+ * WebSocket 创建 hook
+ * @param opt 连接配置
+ * @return {{options: *}}
+ */
+export function useWebSocket(opt) {
+  const { proxy } = getCurrentInstance();
+   
+  const getAccessToken = () => {
+    return uni.getStorageSync('token');
+  };
+  
+  const getUrl = () => {
+	  return (baseUrl + websocketPath).replace('http', 'ws') + '?token=' + getAccessToken();
+  };
+  
+  const options = reactive({
+    url: getUrl(), // ws 地址
+    isReconnecting: false, // 正在重新连接
+    reconnectInterval: 3000, // 重连间隔，单位毫秒
+    heartBeatInterval: 5000, // 心跳间隔，单位毫秒
+    pingTimeoutDuration: 1000, // 超过这个时间，后端没有返回pong，则判定后端断线了。
+    heartBeatTimer: null, // 心跳计时器
+    destroy: false, // 是否销毁
+    pingTimeout: null, // 心跳检测定时器
+    reconnectTimeout: null, // 重连定时器ID的属性
+    onConnected: () => {
+    }, // 连接成功时触发
+    onClosed: () => {
+    }, // 连接关闭时触发
+    onMessage: (data) => {
+    }, // 收到消息
+  });
+  const SocketTask = ref(null); // SocketTask 由 uni.connectSocket() 接口创建
+
+  const initEventListeners = () => {
+    // 监听 WebSocket 连接打开事件
+    SocketTask.value.onOpen(() => {
+      console.log('WebSocket 连接成功');
+      // 连接成功时触发
+      options.onConnected();
+      // 开启心跳检查
+      startHeartBeat();
+    });
+    // 监听 WebSocket 接受到服务器的消息事件
+    SocketTask.value.onMessage((res) => {
+      try {
+        if (res.data === 'pong') {
+          // 收到心跳重置心跳超时检查
+          resetPingTimeout();
+        } else {
+          options.onMessage(JSON.parse(res.data));
+        }
+      } catch (error) {
+        console.error(error);
+      }
+    });
+    // 监听 WebSocket 连接关闭事件
+    SocketTask.value.onClose((event) => {
+      // 情况一：实例销毁
+      if (options.destroy) {
+        options.onClosed();
+      } else { // 情况二：连接失败重连
+        // 停止心跳检查
+        stopHeartBeat();
+        // 重连
+        reconnect();
+      }
+    });
+  };
+
+  // 发送消息
+  const sendMessage = (message) => {
+    if (SocketTask.value && !options.destroy) {
+      SocketTask.value.send({ data: message });
+    }
+  };
+  // 开始心跳检查
+  const startHeartBeat = () => {
+    options.heartBeatTimer = setInterval(() => {
+      sendMessage('ping');
+      options.pingTimeout = setTimeout(() => {
+        // 如果在超时时间内没有收到 pong，则认为连接断开
+        reconnect();
+      }, options.pingTimeoutDuration);
+    }, options.heartBeatInterval);
+  };
+  // 停止心跳检查
+  const stopHeartBeat = () => {
+    clearInterval(options.heartBeatTimer);
+    resetPingTimeout();
+  };
+
+  // WebSocket 重连
+  const reconnect = () => {
+    if (options.destroy || !SocketTask.value) {
+      // 如果WebSocket已被销毁或尚未完全关闭，不进行重连
+      return;
+    }
+
+    // 重连中
+    options.isReconnecting = true;
+
+    // 清除现有的重连标志，以避免多次重连
+    if (options.reconnectTimeout) {
+      clearTimeout(options.reconnectTimeout);
+    }
+
+    // 设置重连延迟
+    options.reconnectTimeout = setTimeout(() => {
+      // 检查组件是否仍在运行和WebSocket是否关闭
+      if (!options.destroy) {
+        // 重置重连标志
+        options.isReconnecting = false;
+        // 初始化新的WebSocket连接
+        initSocket();
+      }
+    }, options.reconnectInterval);
+  };
+
+  const resetPingTimeout = () => {
+    if (options.pingTimeout) {
+      clearTimeout(options.pingTimeout);
+      options.pingTimeout = null; // 清除超时ID
+    }
+  };
+
+  const close = () => {
+    options.destroy = true;
+    stopHeartBeat();
+    if (options.reconnectTimeout) {
+      clearTimeout(options.reconnectTimeout);
+    }
+    if (SocketTask.value) {
+      SocketTask.value.close();
+      SocketTask.value = null;
+    }
+  };
+
+  const initSocket = () => {
+    options.destroy = false;
+    copyValueToTarget(options, opt);
+    SocketTask.value = uni.connectSocket({
+      url: getUrl(),
+      complete: () => {
+      },
+      success: () => {
+      },
+    });
+    initEventListeners();
+  };
+
+  initSocket();
+
+  onBeforeUnmount(() => {
+    close();
+  });
+  return { options };
+}
diff --git a/sheep/index.js b/sheep/index.js
new file mode 100644
index 0000000..f00fd29
--- /dev/null
+++ b/sheep/index.js
@@ -0,0 +1,61 @@
+import $url from '@/sheep/url';
+import $router from '@/sheep/router';
+import $platform from '@/sheep/platform';
+import $helper from '@/sheep/helper';
+import zIndex from '@/sheep/config/zIndex.js';
+import $store from '@/sheep/store';
+import dayjs from 'dayjs';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import duration from 'dayjs/plugin/duration';
+import 'dayjs/locale/zh-cn';
+
+dayjs.locale('zh-cn');
+dayjs.extend(relativeTime);
+dayjs.extend(duration);
+
+const sheep = {
+  $store,
+  $url,
+  $router,
+  $platform,
+  $helper,
+  $zIndex: zIndex,
+};
+
+// 加载Shopro底层依赖
+export async function ShoproInit() {
+  // 应用初始化
+  await $store('app').init();
+  await $store('user').getTradeConfig();
+  
+  // #ifdef MP
+  // 小程序场景值
+  const config = uni.getLaunchOptionsSync();
+  if(config.scene){
+  	$store('sys').setScene(config.scene);
+  }
+  // #endif
+
+  // 平台初始化加载(各平台provider提供不同的加载流程)
+  $platform.load();
+
+  if (process.env.NODE_ENV === 'development') {
+    ShoproDebug();
+  }
+}
+
+// 开发模式
+function ShoproDebug() {
+  // 开发环境引入vconsole调试
+  // #ifdef H5
+  // import("vconsole").then(vconsole => {
+  // 	new vconsole.default();
+  // });
+  // #endif
+
+  // TODO 芋艿：可以打印路由
+  // 同步前端页面到后端
+  // console.log(ROUTES)
+}
+
+export default sheep;
diff --git a/sheep/libs/mplive-manifest-plugin.js b/sheep/libs/mplive-manifest-plugin.js
new file mode 100644
index 0000000..d1df9bf
--- /dev/null
+++ b/sheep/libs/mplive-manifest-plugin.js
@@ -0,0 +1,32 @@
+const fs = require('fs');
+
+const manifestPath = process.env.UNI_INPUT_DIR + '/manifest.json';
+
+let Manifest = fs.readFileSync(manifestPath, {
+	encoding: 'utf-8'
+});
+
+function mpliveMainfestPlugin(isOpen) {
+	if (process.env.UNI_PLATFORM !== 'mp-weixin') return;
+
+	const manifestData = JSON.parse(Manifest)
+
+	if (isOpen === '0') {
+		delete manifestData['mp-weixin'].plugins['live-player-plugin'];
+	}
+
+	if (isOpen === '1') {
+		manifestData['mp-weixin'].plugins['live-player-plugin'] = {
+			"version": "1.3.5",
+			"provider": "wx2b03c6e691cd7370"
+		}
+	}
+
+	Manifest = JSON.stringify(manifestData, null, 2)
+
+	fs.writeFileSync(manifestPath, Manifest, {
+		"flag": "w"
+	})
+}
+
+export default mpliveMainfestPlugin
diff --git a/sheep/libs/permission.js b/sheep/libs/permission.js
new file mode 100644
index 0000000..59f9413
--- /dev/null
+++ b/sheep/libs/permission.js
@@ -0,0 +1,246 @@
+/// null = 未请求，1 = 已允许，0 = 拒绝|受限, 2 = 系统未开启
+
+var isIOS;
+
+function album() {
+  var result = 0;
+  var PHPhotoLibrary = plus.ios.import('PHPhotoLibrary');
+  var authStatus = PHPhotoLibrary.authorizationStatus();
+  if (authStatus === 0) {
+    result = null;
+  } else if (authStatus == 3) {
+    result = 1;
+  } else {
+    result = 0;
+  }
+  plus.ios.deleteObject(PHPhotoLibrary);
+  return result;
+}
+
+function camera() {
+  var result = 0;
+  var AVCaptureDevice = plus.ios.import('AVCaptureDevice');
+  var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
+  if (authStatus === 0) {
+    result = null;
+  } else if (authStatus == 3) {
+    result = 1;
+  } else {
+    result = 0;
+  }
+  plus.ios.deleteObject(AVCaptureDevice);
+  return result;
+}
+
+function location() {
+  var result = 0;
+  var cllocationManger = plus.ios.import('CLLocationManager');
+  var enable = cllocationManger.locationServicesEnabled();
+  var status = cllocationManger.authorizationStatus();
+  if (!enable) {
+    result = 2;
+  } else if (status === 0) {
+    result = null;
+  } else if (status === 3 || status === 4) {
+    result = 1;
+  } else {
+    result = 0;
+  }
+  plus.ios.deleteObject(cllocationManger);
+  return result;
+}
+
+function push() {
+  var result = 0;
+  var UIApplication = plus.ios.import('UIApplication');
+  var app = UIApplication.sharedApplication();
+  var enabledTypes = 0;
+  if (app.currentUserNotificationSettings) {
+    var settings = app.currentUserNotificationSettings();
+    enabledTypes = settings.plusGetAttribute('types');
+    if (enabledTypes == 0) {
+      result = 0;
+      console.log('推送权限没有开启');
+    } else {
+      result = 1;
+      console.log('已经开启推送功能!');
+    }
+    plus.ios.deleteObject(settings);
+  } else {
+    enabledTypes = app.enabledRemoteNotificationTypes();
+    if (enabledTypes == 0) {
+      result = 3;
+      console.log('推送权限没有开启!');
+    } else {
+      result = 4;
+      console.log('已经开启推送功能!');
+    }
+  }
+  plus.ios.deleteObject(app);
+  plus.ios.deleteObject(UIApplication);
+  return result;
+}
+
+function contact() {
+  var result = 0;
+  var CNContactStore = plus.ios.import('CNContactStore');
+  var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
+  if (cnAuthStatus === 0) {
+    result = null;
+  } else if (cnAuthStatus == 3) {
+    result = 1;
+  } else {
+    result = 0;
+  }
+  plus.ios.deleteObject(CNContactStore);
+  return result;
+}
+
+function record() {
+  var result = null;
+  var avaudiosession = plus.ios.import('AVAudioSession');
+  var avaudio = avaudiosession.sharedInstance();
+  var status = avaudio.recordPermission();
+  console.log('permissionStatus:' + status);
+  if (status === 1970168948) {
+    result = null;
+  } else if (status === 1735552628) {
+    result = 1;
+  } else {
+    result = 0;
+  }
+  plus.ios.deleteObject(avaudiosession);
+  return result;
+}
+
+function calendar() {
+  var result = null;
+  var EKEventStore = plus.ios.import('EKEventStore');
+  var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
+  if (ekAuthStatus == 3) {
+    result = 1;
+    console.log('日历权限已经开启');
+  } else {
+    console.log('日历权限没有开启');
+  }
+  plus.ios.deleteObject(EKEventStore);
+  return result;
+}
+
+function memo() {
+  var result = null;
+  var EKEventStore = plus.ios.import('EKEventStore');
+  var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
+  if (ekAuthStatus == 3) {
+    result = 1;
+    console.log('备忘录权限已经开启');
+  } else {
+    console.log('备忘录权限没有开启');
+  }
+  plus.ios.deleteObject(EKEventStore);
+  return result;
+}
+
+function requestIOS(permissionID) {
+  return new Promise((resolve, reject) => {
+    switch (permissionID) {
+      case 'push':
+        resolve(push());
+        break;
+      case 'location':
+        resolve(location());
+        break;
+      case 'record':
+        resolve(record());
+        break;
+      case 'camera':
+        resolve(camera());
+        break;
+      case 'album':
+        resolve(album());
+        break;
+      case 'contact':
+        resolve(contact());
+        break;
+      case 'calendar':
+        resolve(calendar());
+        break;
+      case 'memo':
+        resolve(memo());
+        break;
+      default:
+        resolve(0);
+        break;
+    }
+  });
+}
+
+function requestAndroid(permissionID) {
+  return new Promise((resolve, reject) => {
+    plus.android.requestPermissions(
+      [permissionID],
+      function (resultObj) {
+        var result = 0;
+        for (var i = 0; i < resultObj.granted.length; i++) {
+          var grantedPermission = resultObj.granted[i];
+          console.log('已获取的权限：' + grantedPermission);
+          result = 1;
+        }
+        for (var i = 0; i < resultObj.deniedPresent.length; i++) {
+          var deniedPresentPermission = resultObj.deniedPresent[i];
+          console.log('拒绝本次申请的权限：' + deniedPresentPermission);
+          result = 0;
+        }
+        for (var i = 0; i < resultObj.deniedAlways.length; i++) {
+          var deniedAlwaysPermission = resultObj.deniedAlways[i];
+          console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
+          result = -1;
+        }
+        resolve(result);
+      },
+      function (error) {
+        console.log('result error: ' + error.message);
+        resolve({
+          code: error.code,
+          message: error.message,
+        });
+      },
+    );
+  });
+}
+
+function gotoAppPermissionSetting() {
+  if (permission.isIOS) {
+    var UIApplication = plus.ios.import('UIApplication');
+    var application2 = UIApplication.sharedApplication();
+    var NSURL2 = plus.ios.import('NSURL');
+    var setting2 = NSURL2.URLWithString('app-settings:');
+    application2.openURL(setting2);
+    plus.ios.deleteObject(setting2);
+    plus.ios.deleteObject(NSURL2);
+    plus.ios.deleteObject(application2);
+  } else {
+    var Intent = plus.android.importClass('android.content.Intent');
+    var Settings = plus.android.importClass('android.provider.Settings');
+    var Uri = plus.android.importClass('android.net.Uri');
+    var mainActivity = plus.android.runtimeMainActivity();
+    var intent = new Intent();
+    intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+    var uri = Uri.fromParts('package', mainActivity.getPackageName(), null);
+    intent.setData(uri);
+    mainActivity.startActivity(intent);
+  }
+}
+
+const permission = {
+  get isIOS() {
+    return typeof isIOS === 'boolean'
+      ? isIOS
+      : (isIOS = uni.getSystemInfoSync().platform === 'ios');
+  },
+  requestIOS: requestIOS,
+  requestAndroid: requestAndroid,
+  gotoAppSetting: gotoAppPermissionSetting,
+};
+
+export default permission;
diff --git a/sheep/libs/sdk-h5-weixin.js b/sheep/libs/sdk-h5-weixin.js
new file mode 100644
index 0000000..984b8db
--- /dev/null
+++ b/sheep/libs/sdk-h5-weixin.js
@@ -0,0 +1,184 @@
+/**
+ * 本模块封装微信浏览器下的一些方法。
+ * 更多微信网页开发sdk方法,详见:https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html
+ * 有 the permission value is offline verifying 报错请参考 @see https://segmentfault.com/a/1190000042289419 解决
+ */
+
+import jweixin from 'weixin-js-sdk';
+import $helper from '@/sheep/helper';
+import AuthUtil from '@/sheep/api/member/auth';
+
+let configSuccess = false;
+
+export default {
+  // 判断是否在微信中
+  isWechat() {
+    const ua = window.navigator.userAgent.toLowerCase();
+    // noinspection EqualityComparisonWithCoercionJS
+    return ua.match(/micromessenger/i) == 'micromessenger';
+  },
+
+  isReady(api) {
+    jweixin.ready(api);
+  },
+
+  // 初始化 JSSDK
+  async init(callback) {
+    if (!this.isWechat()) {
+      $helper.toast('请使用微信网页浏览器打开');
+      return;
+    }
+
+    // 调用后端接口，获得 JSSDK 初始化所需的签名
+    const url = location.href.split('#')[0];
+    const { code, data } = await AuthUtil.createWeixinMpJsapiSignature(url);
+    if (code === 0) {
+      jweixin.config({
+        debug: false,
+        appId: data.appId,
+        timestamp: data.timestamp,
+        nonceStr: data.nonceStr,
+        signature: data.signature,
+        jsApiList: ['chooseWXPay', 'openLocation', 'getLocation','updateTimelineShareData','scanQRCode'], // TODO 芋艿：后续可以设置更多权限；
+        openTagList: data.openTagList
+      });
+    }
+
+    // 监听结果
+    configSuccess = true;
+    jweixin.error((err) => {
+      configSuccess = false;
+      console.error('微信 JSSDK 初始化失败', err);
+      // $helper.toast('微信JSSDK:' + err.errMsg);
+    });
+    jweixin.ready(() => {
+      if (configSuccess) {
+        console.log('微信 JSSDK 初始化成功');
+      }
+    })
+
+    // 回调
+    if (callback) {
+      callback(data);
+    }
+  },
+
+  //在需要定位页面调用 TODO 芋艿：未测试
+  getLocation(callback) {
+    this.isReady(() => {
+      jweixin.getLocation({
+        type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+        success: function (res) {
+          callback(res);
+        },
+        fail: function (res) {
+          console.log('%c微信H5sdk,getLocation失败：', 'color:green;background:yellow');
+        },
+      });
+    });
+  },
+
+  // 获取微信收货地址
+  openAddress(callback) {
+    this.isReady(() => {
+      jweixin.openAddress({
+        success: function (res) {
+          callback.success && callback.success(res);
+        },
+        fail: function (err) {
+          callback.error && callback.error(err);
+          console.log('%c微信H5sdk,openAddress失败：', 'color:green;background:yellow');
+        },
+        complete: function (res) {},
+      });
+    });
+  },
+
+  // 微信扫码 TODO 芋艿：未测试
+  scanQRCode(callback) {
+    this.isReady(() => {
+      jweixin.scanQRCode({
+        needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+        scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+        success: function (res) {
+          callback(res);
+        },
+        fail: function (res) {
+          console.log('%c微信H5sdk,scanQRCode失败：', 'color:green;background:yellow');
+        },
+      });
+    });
+  },
+
+  // 更新微信分享信息 TODO 芋艿：未测试
+  updateShareInfo(data, callback = null) {
+    this.isReady(() => {
+      const shareData = {
+        title: data.title,
+        desc: data.desc,
+        link: data.link,
+        imgUrl: data.image,
+        success: function (res) {
+          if (callback) {
+            callback(res);
+          }
+          // 分享后的一些操作,比如分享统计等等
+        },
+        cancel: function (res) {},
+      };
+
+      // 新版 分享聊天api
+      jweixin.updateAppMessageShareData(shareData);
+      // 新版 分享到朋友圈api
+      jweixin.updateTimelineShareData(shareData);
+    });
+  },
+
+  // 打开坐标位置 TODO 芋艿：未测试
+  openLocation(data, callback) {
+    this.isReady(() => {
+      jweixin.openLocation({
+        ...data,
+        success: function (res) {
+          console.log(res);
+        }
+      });
+    });
+  },
+
+  // 选择图片 TODO 芋艿：未测试
+  chooseImage(callback) {
+    this.isReady(() => {
+      jweixin.chooseImage({
+        count: 1,
+        sizeType: ['compressed'],
+        sourceType: ['album'],
+        success: function (rs) {
+          callback(rs);
+        },
+      });
+    });
+  },
+
+  // 微信支付
+  wxpay(data, callback) {
+    this.isReady(() => {
+      jweixin.chooseWXPay({
+        timestamp: data.timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+        nonceStr: data.nonceStr, // 支付签名随机串，不长于 32 位
+        package: data.packageValue, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=\*\*\*）
+        signType: data.signType, // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
+        paySign: data.paySign, // 支付签名
+        success: function (res) {
+          callback.success && callback.success(res);
+        },
+        fail: function (err) {
+          callback.fail && callback.fail(err);
+        },
+        cancel: function (err) {
+          callback.cancel && callback.cancel(err);
+        },
+      });
+    });
+  },
+};
diff --git a/sheep/platform/index.js b/sheep/platform/index.js
new file mode 100644
index 0000000..50e4b8a
--- /dev/null
+++ b/sheep/platform/index.js
@@ -0,0 +1,175 @@
+/**
+ * Shopro 第三方平台功能聚合
+ * @version 1.0.3
+ * @author lidongtony
+ * @param {String} name - 厂商+平台名称
+ * @param {String} provider - 厂商
+ * @param {String} platform - 平台名称
+ * @param {String} os - 系统型号
+ * @param {Object} device - 设备信息
+ */
+
+import { isEmpty } from 'lodash-es';
+// #ifdef H5
+import { isWxBrowser } from '@/sheep/helper/utils';
+// #endif
+import wechat from './provider/wechat/index.js';
+import apple from './provider/apple';
+import share from './share';
+import Pay from './pay';
+
+const device = uni.getSystemInfoSync();
+
+const os = device.platform;
+
+let name = '';
+let provider = '';
+let platform = '';
+let isWechatInstalled = true;
+
+// #ifdef H5
+if (isWxBrowser()) {
+  name = 'WechatOfficialAccount';
+  provider = 'wechat';
+  platform = 'officialAccount';
+} else {
+  name = 'H5';
+  platform = 'h5';
+}
+// #endif
+
+// #ifdef APP-PLUS
+name = 'App';
+platform = 'openPlatform';
+// 检查微信客户端是否安装，否则AppleStore会因此拒绝上架
+if (os === 'ios') {
+  isWechatInstalled = plus.ios.import('WXApi').isWXAppInstalled();
+}
+// #endif
+
+// #ifdef MP-WEIXIN
+name = 'WechatMiniProgram';
+platform = 'miniProgram';
+provider = 'wechat';
+// #endif
+
+if (isEmpty(name)) {
+  uni.showToast({
+    title: '暂不支持该平台',
+    icon: 'none',
+  });
+}
+
+// 加载当前平台前置行为
+const load = () => {
+  if (provider === 'wechat') {
+    wechat.load();
+  }
+};
+
+// 使用厂商独占sdk name = 'wechat' | 'alipay' | 'apple'
+const useProvider = (_provider = '') => {
+  if (_provider === '') _provider = provider;
+  if (_provider === 'wechat') return wechat;
+  if (_provider === 'apple') return apple;
+};
+
+// 支付服务转发
+const pay = (payment, orderType, orderSN, flag) => {
+  return new Pay(payment, orderType, orderSN, flag);
+};
+
+/**
+ * 检查更新 (只检查小程序和App)
+ * @param {Boolean} silence - 静默检查
+ */
+const checkUpdate = (silence = false) => {
+  let canUpdate;
+  // #ifdef MP-WEIXIN
+  useProvider().checkUpdate(silence);
+  // #endif
+
+  // #ifdef APP-PLUS
+  // TODO: 热更新
+  // #endif
+};
+
+/**
+ * 检查网络
+ * @param {Boolean} silence - 静默检查
+ */
+async function checkNetwork() {
+  const networkStatus = await uni.getNetworkType();
+  if (networkStatus.networkType == 'none') {
+    return Promise.resolve(false);
+  }
+  return Promise.resolve(true);
+}
+
+// 获取小程序胶囊信息
+const getCapsule = () => {
+  // #ifdef MP
+  let capsule = uni.getMenuButtonBoundingClientRect();
+  if (!capsule) {
+    capsule = {
+      bottom: 56,
+      height: 32,
+      left: 278,
+      right: 365,
+      top: 24,
+      width: 87,
+    };
+  }
+  return capsule;
+  // #endif
+
+  // #ifndef MP
+  return {
+    bottom: 56,
+    height: 32,
+    left: 278,
+    right: 365,
+    top: 24,
+    width: 87,
+  };
+  // #endif
+};
+
+const capsule = getCapsule();
+
+// 标题栏高度
+const getNavBar = () => {
+  return device.statusBarHeight + 44;
+};
+const navbar = getNavBar();
+
+function getLandingPage() {
+  let page = '';
+  // #ifdef H5
+  page = location.href.split('?')[0];
+  // #endif
+  return page;
+}
+
+// 设置ios+公众号网页落地页 解决微信sdk签名问题
+const landingPage = getLandingPage();
+
+const _platform = {
+  name,
+  device,
+  os,
+  provider,
+  platform,
+  useProvider,
+  checkUpdate,
+  checkNetwork,
+  pay,
+  share,
+  load,
+  capsule,
+  navbar,
+  landingPage,
+  isWechatInstalled,
+};
+
+export default _platform;
diff --git a/sheep/platform/pay.js b/sheep/platform/pay.js
new file mode 100644
index 0000000..9f6206b
--- /dev/null
+++ b/sheep/platform/pay.js
@@ -0,0 +1,372 @@
+import sheep from '@/sheep';
+// #ifdef H5
+import $wxsdk from '@/sheep/libs/sdk-h5-weixin';
+// #endif
+import { getRootUrl } from '@/sheep/helper';
+import PayOrderApi from '@/sheep/api/pay/order';
+
+/**
+ * 支付
+ *
+ * @param {String} payment = ['wechat','alipay','wallet','mock']  	- 支付方式
+ * @param {String} orderType = ['goods','recharge','groupon']  	- 订单类型
+ * @param {String} id					- 订单号
+ */
+
+export default class SheepPay {
+  constructor(payment, orderType, id, flag) {
+    this.payment = payment;
+    this.id = id;
+    this.orderType = orderType;
+	this.flag = flag;
+    this.payAction();
+  }
+
+  payAction() {
+    const payAction = {
+      WechatOfficialAccount: {
+        wechat: () => {
+          this.wechatOfficialAccountPay();
+        },
+        alipay: () => {
+          this.redirectPay(); // 现在公众号可以直接跳转支付宝页面
+        },
+        wallet: () => {
+          this.walletPay();
+        },
+        mock: () => {
+          this.mockPay();
+        }
+      },
+      WechatMiniProgram: {
+        wechat: () => {
+          this.wechatMiniProgramPay();
+        },
+        alipay: () => {
+          this.copyPayLink();
+        },
+        wallet: () => {
+          this.walletPay();
+        },
+        mock: () => {
+          this.mockPay();
+        }
+      },
+      App: {
+        wechat: () => {
+          this.wechatAppPay();
+        },
+        alipay: () => {
+          this.alipay();
+        },
+        wallet: () => {
+          this.walletPay();
+        },
+        mock: () => {
+          this.mockPay();
+        }
+      },
+      H5: {
+        wechat: () => {
+          this.wechatWapPay();
+        },
+        alipay: () => {
+          this.redirectPay();
+        },
+        wallet: () => {
+          this.walletPay();
+        },
+        mock: () => {
+          this.mockPay();
+        }
+      },
+    };
+    return payAction[sheep.$platform.name][this.payment]();
+  }
+
+  // 预支付
+  prepay(channel) {
+    return new Promise(async (resolve, reject) => {
+      let data = {
+        id: this.id,
+        channelCode: channel,
+        channelExtras: {}
+      };
+      // 特殊逻辑：微信公众号、小程序支付时，必须传入 openid
+      if (['wx_pub', 'wx_lite'].includes(channel)) {
+        const openid = await sheep.$platform.useProvider('wechat').getOpenid();
+        // 如果获取不到 openid，微信无法发起支付，此时需要引导
+        if (!openid) {
+          this.bindWeixin();
+          return;
+        }
+        data.channelExtras.openid = openid;
+      }
+      // 发起预支付 API 调用
+      PayOrderApi.submitOrder(data).then((res) => {
+        // 成功时
+        res.code === 0 && resolve(res);
+        // 失败时
+        if (res.code !== 0 && res.msg.indexOf('无效的openid') >= 0) {
+          // 特殊逻辑：微信公众号、小程序支付时，必须传入 openid 不正确的情况
+          if (res.msg.indexOf('无效的openid') >= 0 // 获取的 openid 不正确时，或者随便输入了个 openid
+            || res.msg.indexOf('下单账号与支付账号不一致') >= 0) { // https://developers.weixin.qq.com/community/develop/doc/00008c53c347804beec82aed051c00
+            this.bindWeixin();
+          }
+        }
+      });
+    });
+  }
+  // #ifdef H5
+  // 微信公众号 JSSDK 支付
+  async wechatOfficialAccountPay() {
+    let { code, data } = await this.prepay('wx_pub');
+    if (code !== 0) {
+      return;
+    }
+    const payConfig = JSON.parse(data.displayContent);
+    $wxsdk.wxpay(payConfig, {
+      success: () => {
+        this.payResult('success');
+      },
+      cancel: () => {
+        sheep.$helper.toast('支付已手动取消');
+      },
+      fail: (error) => {
+        if (error.errMsg.indexOf('chooseWXPay:没有此SDK或暂不支持此SDK模拟') >= 0) {
+          sheep.$helper.toast('发起微信支付失败，原因：可能是微信开发者工具不支持，建议使用微信打开网页后支付');
+          return
+        }
+        this.payResult('fail');
+      },
+    });
+  }
+
+  // 浏览器微信 H5 支付 TODO 芋艿：待接入
+  async wechatWapPay() {
+    const { error, data } = await this.prepay();
+    if (error === 0) {
+      const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${this.payment}&orderType=${this.orderType}`;
+      location.href = `${data.pay_data.h5_url}&redirect_url=${encodeURIComponent(redirect_url)}`;
+    }
+  }
+
+  // 支付链接  TODO 芋艿：待接入
+  async redirectPay() {
+    let { error, data } = await this.prepay();
+    if (error === 0) {
+      const redirect_url = `${getRootUrl()}pages/pay/result?id=${this.id}&payment=${this.payment}&orderType=${this.orderType}`;
+      location.href = data.pay_data + encodeURIComponent(redirect_url);
+    }
+  }
+
+  // #endif
+
+  // 微信小程序支付
+  async wechatMiniProgramPay() {
+    // let that = this;
+    let { code, data } = await this.prepay('wx_lite');
+    if (code !== 0) {
+      return;
+    }
+    // 调用微信小程序支付
+    const payConfig = JSON.parse(data.displayContent);
+    uni.requestPayment({
+      provider: 'wxpay',
+      timeStamp: payConfig.timeStamp,
+      nonceStr: payConfig.nonceStr,
+      package: payConfig.packageValue,
+      signType: payConfig.signType,
+      paySign: payConfig.paySign,
+      success: (res) => {
+        this.payResult('success');
+      },
+      fail: (err) => {
+        if (err.errMsg === 'requestPayment:fail cancel') {
+          sheep.$helper.toast('支付已手动取消');
+        } else {
+          this.payResult('fail');
+        }
+      },
+    });
+  }
+
+  // 余额支付
+  async walletPay() {
+    const { code } = await this.prepay('wallet');
+    code === 0 && this.payResult('success');
+  }
+
+  // 模拟支付
+  async mockPay() {
+    const { code } = await this.prepay('mock');
+    code === 0 && this.payResult('success');
+  }
+
+  // 支付宝复制链接支付  TODO 芋艿：待接入
+  async copyPayLink() {
+    let that = this;
+    let { error, data } = await this.prepay();
+    if (error === 0) {
+      // 引入showModal 点击确认 复制链接；
+      uni.showModal({
+        title: '支付宝支付',
+        content: '复制链接到外部浏览器',
+        confirmText: '复制链接',
+        success: (res) => {
+          if (res.confirm) {
+            sheep.$helper.copyText(data.pay_data);
+          }
+        },
+      });
+    }
+  }
+
+  // 支付宝支付  TODO 芋艿：待接入
+  async alipay() {
+    let that = this;
+    const { error, data } = await this.prepay();
+    if (error === 0) {
+      uni.requestPayment({
+        provider: 'alipay',
+        orderInfo: data.pay_data, //支付宝订单数据
+        success: (res) => {
+          that.payResult('success');
+        },
+        fail: (err) => {
+          if (err.errMsg === 'requestPayment:fail [paymentAlipay:62001]user cancel') {
+            sheep.$helper.toast('支付已手动取消');
+          } else {
+            that.payResult('fail');
+          }
+        },
+      });
+    }
+  }
+
+  // 微信支付  TODO 芋艿：待接入
+  async wechatAppPay() {
+    let that = this;
+    let { error, data } = await this.prepay();
+    if (error === 0) {
+      uni.requestPayment({
+        provider: 'wxpay',
+        orderInfo: data.pay_data, //微信订单数据(官方说是string。实测为object)
+        success: (res) => {
+          that.payResult('success');
+        },
+        fail: (err) => {
+          err.errMsg !== 'requestPayment:fail cancel' && that.payResult('fail');
+        },
+      });
+    }
+  }
+
+  // 支付结果跳转,success:成功，fail:失败
+  payResult(resultType) {
+	if(this.flag == 'worker'){
+		sheep.$router.redirect('/pages/pay/worker/result', {
+		  id: this.id,
+		  orderType: this.orderType,
+		  payState: resultType
+		});
+	}else if(this.flag == 'reward'){
+		sheep.$helper.toast('打赏成功');
+		uni.navigateBack();
+	}else if(this.flag == 'point'){
+		sheep.$router.redirect('/pages/point/result', {
+		  id: this.id,
+		  orderType: this.orderType,
+		  payState: resultType
+		});
+	}else if(this.flag == 'vip'){
+		sheep.$helper.toast('开通成功');
+		sheep.$router.redirect('/pages/user/vip');
+	}else {
+		sheep.$router.redirect('/pages/pay/result', {
+		  id: this.id,
+		  orderType: this.orderType,
+		  payState: resultType
+		});
+	}
+  }
+
+  // 引导绑定微信
+  bindWeixin() {
+    uni.showModal({
+      title: '微信支付',
+      content: '请先绑定微信再使用微信支付',
+      success: function (res) {
+        if (res.confirm) {
+          sheep.$platform.useProvider('wechat').bind();
+        }
+      },
+    });
+  }
+
+}
+
+export function getPayMethods(channels) {
+  const payMethods = [
+    {
+      icon: '/static/img/shop/pay/wechat.png',
+      title: '微信支付',
+      value: 'wechat',
+      disabled: true,
+    },
+    {
+      icon: '/static/img/shop/pay/alipay.png',
+      title: '支付宝支付',
+      value: 'alipay',
+      disabled: true,
+    },
+    {
+      icon: '/static/img/shop/pay/wallet.png',
+      title: '余额支付',
+      value: 'wallet',
+      disabled: true,
+    },
+    {
+      icon: '/static/img/shop/pay/apple.png',
+      title: 'Apple Pay',
+      value: 'apple',
+      disabled: true,
+    },
+    {
+      icon: '/static/img/shop/pay/wallet.png',
+      title: '模拟支付',
+      value: 'mock',
+      disabled: true,
+    }
+  ];
+  const platform = sheep.$platform.name
+
+  // 1. 处理【微信支付】
+  const wechatMethod = payMethods[0];
+  if ((platform === 'WechatOfficialAccount' && channels.includes('wx_pub'))
+    || (platform === 'WechatMiniProgram' && channels.includes('wx_lite'))
+	|| (platform === 'H5' && channels.includes('wx_pub'))
+    || (platform === 'App' && channels.includes('wx_app'))) {
+    wechatMethod.disabled = false;
+  }
+
+  // 2. 处理【支付宝支付】
+  const alipayMethod = payMethods[1];
+  if ((platform === 'WechatOfficialAccount' && channels.includes('alipay_wap'))
+    || platform === 'WechatMiniProgram' && channels.includes('alipay_wap')
+    || platform === 'App' && channels.includes('alipay_app')) {
+    alipayMethod.disabled = false;
+  }
+  // 3. 处理【余额支付】
+  const walletMethod = payMethods[2];
+  if (channels.includes('wallet')) {
+    walletMethod.disabled = false;
+  }
+  // 4. 处理【苹果支付】TODO 芋艿：未来接入
+  // 5. 处理【模拟支付】
+  const mockMethod = payMethods[4];
+  if (channels.includes('mock')) {
+    mockMethod.disabled = false;
+  }
+  return payMethods;
+}
\ No newline at end of file
diff --git a/sheep/platform/provider/apple/app.js b/sheep/platform/provider/apple/app.js
new file mode 100644
index 0000000..c1c9149
--- /dev/null
+++ b/sheep/platform/provider/apple/app.js
@@ -0,0 +1,36 @@
+// import third from '@/sheep/api/third';
+// TODO 芋艿：等后面搞 App 再弄
+
+const login = () => {
+  return new Promise(async (resolve, reject) => {
+    const loginRes = await uni.login({
+      provider: 'apple',
+      success: () => {
+        uni.getUserInfo({
+          provider: 'apple',
+          success: async (res) => {
+            if (res.errMsg === 'getUserInfo:ok') {
+              const payload = res.userInfo;
+              const { error } = await third.apple.login({
+                payload,
+                shareInfo: uni.getStorageSync('shareLog') || {},
+              });
+              if (error === 0) {
+                resolve(true);
+              } else {
+                resolve(false);
+              }
+            }
+          },
+        });
+      },
+      fail: (err) => {
+        resolve(false);
+      },
+    });
+  });
+};
+
+export default {
+  login,
+};
diff --git a/sheep/platform/provider/apple/index.js b/sheep/platform/provider/apple/index.js
new file mode 100644
index 0000000..388c093
--- /dev/null
+++ b/sheep/platform/provider/apple/index.js
@@ -0,0 +1,9 @@
+// #ifdef APP-PLUS
+import service from './app';
+// #endif
+
+let apple = {};
+if (typeof service !== 'undefined') {
+  apple = service;
+}
+export default apple;
diff --git a/sheep/platform/provider/wechat/index.js b/sheep/platform/provider/wechat/index.js
new file mode 100644
index 0000000..3bb2c7f
--- /dev/null
+++ b/sheep/platform/provider/wechat/index.js
@@ -0,0 +1,15 @@
+// #ifdef H5
+import service from './officialAccount';
+// #endif
+
+// #ifdef MP-WEIXIN
+import service from './miniProgram';
+// #endif
+
+// #ifdef APP-PLUS
+import service from './openPlatform';
+// #endif
+
+const wechat = service;
+
+export default wechat;
diff --git a/sheep/platform/provider/wechat/miniProgram.js b/sheep/platform/provider/wechat/miniProgram.js
new file mode 100644
index 0000000..5e95eda
--- /dev/null
+++ b/sheep/platform/provider/wechat/miniProgram.js
@@ -0,0 +1,213 @@
+import AuthUtil from '@/sheep/api/member/auth';
+import SocialApi from '@/sheep/api/member/social';
+import UserApi from '@/sheep/api/member/user';
+
+const socialType = 34; // 社交类型 - 微信小程序
+
+let subscribeEventList = [];
+
+// 加载微信小程序
+function load() {
+  checkUpdate();
+  getSubscribeTemplate();
+}
+
+// 微信小程序静默授权登陆
+const login = async () => {
+  return new Promise(async (resolve, reject) => {
+    // 1. 获得微信 code
+    const codeResult = await uni.login();
+    if (codeResult.errMsg !== 'login:ok') {
+      return resolve(false);
+    }
+
+    // 2. 社交登录
+    const loginResult = await AuthUtil.socialLogin(socialType, codeResult.code, 'default');
+    if (loginResult.code === 0) {
+      setOpenid(loginResult.data.openid);
+      return resolve(true);
+    } else {
+      return resolve(false);
+    }
+  });
+};
+
+// 微信小程序手机号授权登陆
+const mobileLogin = async (e) => {
+  return new Promise(async (resolve, reject) => {
+    if (e.errMsg !== 'getPhoneNumber:ok') {
+      return resolve(false);
+    }
+
+    // 1. 获得微信 code
+    const codeResult = await uni.login();
+    if (codeResult.errMsg !== 'login:ok') {
+      return resolve(false);
+    }
+
+    // 2. 一键登录
+    const loginResult = await AuthUtil.weixinMiniAppLogin(e.code, codeResult.code, 'default');
+    if (loginResult.code === 0) {
+      setOpenid(loginResult.data.openid);
+      return resolve(true);
+    } else {
+      return resolve(false);
+    }
+  });
+};
+
+// 微信小程序绑定
+const bind = () => {
+  return new Promise(async (resolve, reject) => {
+    // 1. 获得微信 code
+    const codeResult = await uni.login();
+    if (codeResult.errMsg !== 'login:ok') {
+      return resolve(false);
+    }
+
+    // 2. 绑定账号
+    const bindResult = await SocialApi.socialBind(socialType, codeResult.code, 'default');
+    if (bindResult.code === 0) {
+      setOpenid(bindResult.data);
+      return resolve(true);
+    } else {
+      return resolve(false);
+    }
+  });
+};
+
+// 微信小程序解除绑定
+const unbind = async (openid) => {
+  const { code } = await SocialApi.socialUnbind(socialType, openid);
+  return code === 0;
+};
+
+// 绑定用户手机号
+const bindUserPhoneNumber = (e) => {
+  return new Promise(async (resolve, reject) => {
+    const { code } = await UserApi.updateUserMobileByWeixin(e.code);
+    if (code === 0) {
+      resolve(true);
+    }
+    resolve(false);
+  });
+};
+
+// 设置 openid 到本地存储，目前只有 pay 支付时会使用
+function setOpenid(openid) {
+  uni.setStorageSync('openid', openid);
+}
+
+// 获得 openid
+async function getOpenid(force = false) {
+  let openid = uni.getStorageSync('openid');
+  if (!openid && force) {
+    const info = await getInfo();
+    if (info && info.openid) {
+      openid = info.openid;
+      setOpenid(openid);
+    }
+  }
+  return openid;
+}
+
+// 获得社交信息
+async function getInfo() {
+  const { code, data } = await SocialApi.getSocialUser(socialType);
+  if (code !== 0) {
+    return undefined;
+  }
+  return data;
+}
+
+// ========== 非登录相关的逻辑 ==========
+
+// 小程序更新
+const checkUpdate = async (silence = true) => {
+  if (uni.canIUse('getUpdateManager')) {
+    const updateManager = uni.getUpdateManager();
+    updateManager.onCheckForUpdate(function(res) {
+      // 请求完新版本信息的回调
+      if (res.hasUpdate) {
+        updateManager.onUpdateReady(function() {
+          uni.showModal({
+            title: '更新提示',
+            content: '新版本已经准备好，是否重启应用？',
+            success: function(res) {
+              if (res.confirm) {
+                // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+                updateManager.applyUpdate();
+              }
+            },
+          });
+        });
+        updateManager.onUpdateFailed(function() {
+          // 新的版本下载失败
+          // uni.showModal({
+          //   title: '已经有新版本了哟~',
+          //   content: '新版本已经上线啦，请您删除当前小程序，重新搜索打开~',
+          // });
+        });
+      } else {
+        if (!silence) {
+          uni.showModal({
+            title: '当前为最新版本',
+            showCancel: false,
+          });
+        }
+      }
+    });
+  }
+};
+
+// 获取订阅消息模板
+async function getSubscribeTemplate() {
+  const { code, data } = await SocialApi.getSubscribeTemplateList();
+  if (code === 0) {
+    subscribeEventList = data;
+  }
+}
+
+// 订阅消息
+function subscribeMessage(event, callback= undefined) {
+  let tmplIds = [];
+  if (typeof event === 'string') {
+    const temp = subscribeEventList.find(item => item.title.includes(event));
+    if (temp) {
+      tmplIds.push(temp.id);
+    }
+  }
+  if (typeof event === 'object') {
+    event.forEach((e) => {
+      const temp = subscribeEventList.find(item => item.title.includes(e));
+      if (temp) {
+        tmplIds.push(temp.id);
+      }
+    });
+  }
+  if (tmplIds.length === 0) return;
+
+  uni.requestSubscribeMessage({
+    tmplIds,
+		success: ()=>{
+      // 不管是拒绝还是同意都触发
+      callback && callback()
+		},
+    fail: (err) => {
+      console.log(err);
+    },
+  });
+}
+
+export default {
+  load,
+  login,
+  bind,
+  unbind,
+  bindUserPhoneNumber,
+  mobileLogin,
+  getInfo,
+  getOpenid,
+  subscribeMessage,
+  checkUpdate,
+};
diff --git a/sheep/platform/provider/wechat/officialAccount.js b/sheep/platform/provider/wechat/officialAccount.js
new file mode 100644
index 0000000..ed7beb3
--- /dev/null
+++ b/sheep/platform/provider/wechat/officialAccount.js
@@ -0,0 +1,106 @@
+import $wxsdk from '@/sheep/libs/sdk-h5-weixin';
+import { getRootUrl } from '@/sheep/helper';
+import AuthUtil from '@/sheep/api/member/auth';
+import SocialApi from '@/sheep/api/member/social';
+
+const socialType = 31; // 社交类型 - 微信公众号
+
+// 加载微信公众号JSSDK
+async function load() {
+  $wxsdk.init();
+}
+
+// 微信公众号登陆
+async function login(code = '', state = '') {
+  // 情况一：没有 code 时，去获取 code
+  if (!code) {
+    const loginUrl = await getLoginUrl();
+    if (loginUrl) {
+      uni.setStorageSync('returnUrl', location.href);
+      window.location = loginUrl;
+    }
+  // 情况二：有 code 时，使用 code 去自动登录
+  } else {
+    // 解密 code 发起登陆
+    const loginResult = await AuthUtil.socialLogin(socialType, code, state);
+    if (loginResult.code === 0) {
+      setOpenid(loginResult.data.openid);
+      return loginResult;
+    }
+  }
+  return false;
+}
+
+// 微信公众号绑定
+async function bind(code = '', state = '') {
+  // 情况一：没有 code 时，去获取 code
+  if (code === '') {
+    const loginUrl = await getLoginUrl('bind');
+    if (loginUrl) {
+      uni.setStorageSync('returnUrl', location.href);
+      window.location = loginUrl;
+    }
+  } else {
+    // 情况二：有 code 时，使用 code 去自动绑定
+    const loginResult = await SocialApi.socialBind(socialType, code, state);
+    if (loginResult.code === 0) {
+      setOpenid(loginResult.data);
+      return loginResult;
+    }
+  }
+  return false;
+}
+
+// 微信公众号解除绑定
+const unbind = async (openid) => {
+  const { code } = await SocialApi.socialUnbind(socialType, openid);
+  return code === 0;
+};
+
+// 获取公众号登陆地址
+async function getLoginUrl(event = 'login') {
+  const page = getRootUrl() + 'pages/index/login'
+    + '?event=' + event; // event 目的，区分是 login 还是 bind
+  const { code, data } = await AuthUtil.socialAuthRedirect(socialType, page);
+  if (code !== 0) {
+    return undefined;
+  }
+  return data;
+}
+
+// 设置 openid 到本地存储，目前只有 pay 支付时会使用
+function setOpenid(openid) {
+  uni.setStorageSync('openid', openid);
+}
+
+// 获得 openid
+async function getOpenid(force = false) {
+  let openid = uni.getStorageSync('openid');
+  if (!openid && force) {
+    const info = await getInfo();
+    if (info && info.openid) {
+      openid = info.openid;
+      setOpenid(openid);
+    }
+  }
+  return openid;
+}
+
+// 获得社交信息
+async function getInfo() {
+  const { code, data } = await SocialApi.getSocialUser(socialType);
+  if (code !== 0) {
+    return undefined;
+  }
+  return data;
+}
+
+export default {
+  load,
+  login,
+  bind,
+  unbind,
+  getInfo,
+  getOpenid,
+  jsWxSdk: $wxsdk,
+};
diff --git a/sheep/platform/provider/wechat/openPlatform.js b/sheep/platform/provider/wechat/openPlatform.js
new file mode 100644
index 0000000..a80f0d7
--- /dev/null
+++ b/sheep/platform/provider/wechat/openPlatform.js
@@ -0,0 +1,64 @@
+// 登录
+import third from '@/sheep/api/migration/third';
+import SocialApi from '@/sheep/api/member/social';
+import $share from '@/sheep/platform/share';
+
+// TODO 芋艿：等后面搞 App 再弄
+const socialType = 32; // 社交类型 - 微信开放平台
+
+const load = async () => {};
+
+// 微信开放平台移动应用授权登陆
+const login = () => {
+  return new Promise(async (resolve, reject) => {
+    const loginRes = await uni.login({
+      provider: 'weixin',
+      onlyAuthorize: true,
+    });
+    debugger
+    if (loginRes.errMsg == 'login:ok') {
+      // TODO third.wechat.login 函数未实现
+      const res = await third.wechat.login({
+        platform: 'openPlatform',
+        shareInfo: uni.getStorageSync('shareLog') || {},
+        payload: encodeURIComponent(
+          JSON.stringify({
+            code: loginRes.code,
+          }),
+        ),
+      });
+
+      if (res.error === 0) {
+        $share.bindBrokerageUser()
+        resolve(true);
+      }
+    } else {
+      uni.showToast({
+        icon: 'none',
+        title: loginRes.errMsg,
+      });
+    }
+    resolve(false);
+  });
+};
+
+// 微信 App 解除绑定
+const unbind = async (openid) => {
+  const { code } = await SocialApi.socialUnbind(socialType, openid);
+  return code === 0;
+};
+
+// 获得社交信息
+async function getInfo() {
+  const { code, data } = await SocialApi.getSocialUser(socialType);
+  if (code !== 0) {
+    return undefined;
+  }
+  return data;
+}
+
+export default {
+  load,
+  login,
+  getInfo
+};
diff --git a/sheep/platform/share.js b/sheep/platform/share.js
new file mode 100644
index 0000000..50f70bc
--- /dev/null
+++ b/sheep/platform/share.js
@@ -0,0 +1,207 @@
+import $store from '@/sheep/store';
+import $platform from '@/sheep/platform';
+import $router from '@/sheep/router';
+import $url from '@/sheep/url';
+import BrokerageApi from '@/sheep/api/trade/brokerage';
+// #ifdef H5
+import $wxsdk from '@/sheep/libs/sdk-h5-weixin';
+// #endif
+
+// 设置分享的平台渠道: 1=H5,2=微信公众号网页,3=微信小程序,4=App,...按需扩展
+const platformMap = ['H5', 'WechatOfficialAccount', 'WechatMiniProgram', 'App'];
+
+// 设置分享方式: 1=直接转发,2=海报,3=复制链接,...按需扩展
+const fromMap = ['forward', 'poster', 'link'];
+
+// TODO 芋艿：分享的接入
+// 设置分享信息参数
+const getShareInfo = (
+  scene = {
+    title: '', // 自定义分享标题
+    desc: '', // 自定义描述
+    image: '', // 自定义分享图片
+    params: {}, // 自定义分享参数
+  },
+  poster = {
+    // 自定义海报数据
+    type: 'user',
+  },
+) => {
+  const shareInfo = {
+    title: '', // 分享标题
+    desc: '', // 描述
+    image: '', // 分享图片
+    path: '', // 分享页面+参数
+    link: '', // 分享Url+参数
+    query: '', // 分享参数
+    poster, // 海报所需数据
+  };
+
+  const app = $store('app');
+  const shareConfig = app.platform.share;
+
+  // 自动拼接分享用户参数
+  const query = buildSpmQuery(scene.params);
+  shareInfo.query = query;
+
+  // 配置分享链接地址
+  shareInfo.link = buildSpmLink(query, shareConfig.linkAddress);
+  // 配置页面地址带参数
+  shareInfo.path = buildSpmPath(query);
+
+  // 配置转发参数
+  if (shareConfig.methods.includes('forward')) {
+    // TODO puhui999: forward 这块有点问题
+    if (shareConfig.forwardInfo.title === '' || shareConfig.forwardInfo.image === '') {
+      console.log('请在平台设置中配置转发信息');
+    }
+    // 设置自定义分享信息
+    shareInfo.title = scene.title || shareConfig.forwardInfo.title;
+    shareInfo.image = $url.cdn(scene.image || shareConfig.forwardInfo.image);
+    shareInfo.desc = scene.desc || shareConfig.forwardInfo.subtitle;
+    shareInfo.path = buildSpmPath(scene.path, query);
+  }
+
+  return shareInfo;
+};
+
+/**
+ * 构造 spm 分享参数
+ *
+ * @param params json 格式，其中包含：1）shareId 分享用户的编号；2）page 页面类型；3）query 页面 ID（参数）；4）platform 平台类型；5）from 分享来源类型。
+ * @return 分享串 `spm=${shareId}.${page}.${query}.${platform}.${from}`
+ */
+const buildSpmQuery = (params) => {
+  const user = $store('user');
+  let shareId = '0'; // 设置分享者用户ID
+  if (typeof params.shareId === 'undefined') {
+    if (user.isLogin) {
+      shareId = user.userInfo.id;
+    }
+  }
+  let page = '1'; // 页面类型: 1=首页(默认),2=商品,3=拼团商品,4=秒杀商品,5=邀请参团,6=分销邀请...按需扩展
+  if (typeof params.page !== 'undefined') {
+    page = params.page;
+  }
+  let query = '0'; // 设置页面ID: 如商品ID、拼团ID等
+  if (typeof params.query !== 'undefined') {
+    query = params.query;
+  }
+  let platform = platformMap.indexOf($platform.name) + 1;
+  let from = '1';
+  if (typeof params.from !== 'undefined') {
+    from = platformMap.indexOf(params.from) + 1;
+  }
+  // spmParams = ...  可按需扩展
+  return `spm=${shareId}.${page}.${query}.${platform}.${from}`;
+};
+
+// 构造页面分享参数: 所有的分享都先到首页进行 spm 参数解析
+const buildSpmPath = (query) => {
+  // 默认是主页，页面 page，例如 pages/index/index，根路径前不要填加 /，
+  // 不能携带参数（参数请放在scene字段里），如果不填写这个字段，默认跳主页面。scancode_time为系统保留参数，不允许配置
+  return `pages/tabbar/index`;
+};
+
+// 构造分享链接
+const buildSpmLink = (query, linkAddress = '') => {
+  return `${linkAddress}?${query}`;
+};
+
+// 解析Spm
+const decryptSpm = (spm) => {
+  const user = $store('user');
+  let shareParamsArray = spm.split('.');
+  let shareParams = {
+    spm,
+    shareId: 0,
+    page: '',
+    query: {},
+    platform: '',
+    from: '',
+  };
+  let query;
+  shareParams.shareId = shareParamsArray[0];
+  switch (shareParamsArray[1]) {
+    case '1':
+      // 默认首页不跳转
+      shareParams.page = '/pages/tabbar/index';
+      break;
+    case '2':
+      // 普通商品
+      shareParams.page = '/pages/goods/index';
+      shareParams.query = {
+        id: shareParamsArray[2],
+      };
+      break;
+    case '3':
+      // 拼团商品
+      shareParams.page = '/pages/goods/groupon';
+      query = shareParamsArray[2].split(',');
+      shareParams.query = {
+        id: query[0],
+        activity_id: query[1], // TODO 芋艿：接入分享后，应该统一成 id 参数
+      };
+      break;
+    case '4':
+      // 秒杀商品
+      shareParams.page = '/pages/goods/seckill';
+      query = shareParamsArray[2].split(',');
+      shareParams.query = {
+        id: query[1],
+      };
+      break;
+    case '5':
+      // 参与拼团
+      shareParams.page = '/pages/activity/groupon/detail';
+      shareParams.query = {
+        id: shareParamsArray[2],
+      };
+      break;
+  }
+  shareParams.platform = platformMap[shareParamsArray[3] - 1];
+  shareParams.from = fromMap[shareParamsArray[4] - 1];
+  if (shareParams.shareId !== 0) {
+    // 已登录 绑定推广员
+    if (user.isLogin) {
+      bindBrokerageUser(shareParams.shareId);
+    } else {
+      // 记录分享者编号
+      uni.setStorageSync('shareId', shareParams.shareId);
+    }
+  }
+
+  if (shareParams.page !== '/pages/tabbar/index') {
+    $router.go(shareParams.page, shareParams.query);
+  }
+  return shareParams;
+};
+
+// 绑定推广员
+const bindBrokerageUser = async (val= undefined) => {
+  try {
+    const shareId = val || uni.getStorageSync('shareId');
+    if (!shareId) {
+      return;
+    }
+    await BrokerageApi.bindBrokerageUser({ bindUserId: shareId });
+    uni.removeStorageSync('shareId');
+  } catch {
+  }
+};
+
+// 更新公众号分享sdk
+const updateShareInfo = (shareInfo) => {
+  // #ifdef H5
+  if ($platform.name === 'WechatOfficialAccount') {
+    $wxsdk.updateShareInfo(shareInfo);
+  }
+  // #endif
+};
+
+export default {
+  getShareInfo,
+  updateShareInfo,
+  decryptSpm,
+  bindBrokerageUser,
+};
diff --git a/sheep/request/index.js b/sheep/request/index.js
new file mode 100644
index 0000000..f436f61
--- /dev/null
+++ b/sheep/request/index.js
@@ -0,0 +1,341 @@
+/**
+ * Shopro-request
+ * @description api模块管理，loading配置，请求拦截，错误处理
+ */
+
+import Request from 'luch-request';
+import { apiPath, baseUrl, tenantId } from '@/sheep/config';
+import $store from '@/sheep/store';
+import sheep from '@/sheep';
+import $platform from '@/sheep/platform';
+import { showAuthModal } from '@/sheep/hooks/useModal';
+import AuthUtil from '@/sheep/api/member/auth';
+import { getTerminal } from '@/sheep/util/const';
+
+const options = {
+	// 显示操作成功消息 默认不显示
+	showSuccess: false,
+	// 成功提醒 默认使用后端返回值
+	successMsg: '',
+	// 显示失败消息 默认显示
+	showError: true,
+	// 失败提醒 默认使用后端返回信息
+	errorMsg: '',
+	// 显示请求时loading模态框 默认显示
+	showLoading: true,
+	// loading提醒文字
+	loadingMsg: '加载中',
+	// 需要授权才能请求 默认放开
+	auth: false,
+	// ...
+};
+
+// Loading全局实例
+let LoadingInstance = {
+	target: null,
+	count: 0,
+};
+
+/**
+ * 关闭loading
+ */
+function closeLoading() {
+	if (LoadingInstance.count > 0) LoadingInstance.count--;
+	if (LoadingInstance.count === 0) uni.hideLoading();
+}
+
+/**
+ * @description 请求基础配置 可直接使用访问自定义请求
+ */
+const http = new Request({
+	baseURL: baseUrl + apiPath,
+	timeout: 8000,
+	method: 'GET',
+	header: {
+		Accept: 'text/json',
+		'Content-Type': 'application/json;charset=UTF-8',
+		platform: $platform.name,
+	},
+	// #ifdef APP-PLUS
+	sslVerify: false,
+	// #endif
+	// #ifdef H5
+	// 跨域请求时是否携带凭证（cookies）仅H5支持（HBuilderX 2.6.15+）
+	withCredentials: false,
+	// #endif
+	custom: options,
+});
+
+/**
+ * @description 请求拦截器
+ */
+http.interceptors.request.use(
+	(config) => {
+    // 自定义处理【auth 授权】：必须登录的接口，则跳出 AuthModal 登录弹窗
+		if (config.custom.auth && !$store('user').isLogin) {
+			showAuthModal();
+			return Promise.reject();
+		}
+
+    // 自定义处理【loading 加载中】：如果需要显示 loading，则显示 loading
+		if (config.custom.showLoading) {
+			LoadingInstance.count++;
+			LoadingInstance.count === 1 &&
+				uni.showLoading({
+					title: config.custom.loadingMsg,
+					mask: true,
+					fail: () => {
+						uni.hideLoading();
+					},
+				});
+		}
+
+    // 增加 token 令牌、terminal 终端、tenant 租户的请求头
+		const token = getAccessToken();
+		if (token) {
+			config.header['Authorization'] = token;
+		}
+		config.header['terminal'] = getTerminal();
+
+    config.header['Accept'] = '*/*';
+    config.header['tenant-id'] = tenantId;
+		return config;
+	},
+	(error) => {
+		return Promise.reject(error);
+	},
+);
+
+/**
+ * @description 响应拦截器
+ */
+http.interceptors.response.use(
+	(response) => {
+		// 约定：如果是 /auth/ 下的 URL 地址，并且返回了 accessToken 说明是登录相关的接口，则自动设置登陆令牌
+		if (response.config.url.indexOf('/member/auth/') >= 0 && response.data?.data?.accessToken) {
+			$store('user').setToken(response.data.data.accessToken, response.data.data.refreshToken);
+		}
+
+    // 自定处理【loading 加载中】：如果需要显示 loading，则关闭 loading
+		response.config.custom.showLoading && closeLoading();
+
+    // 自定义处理【error 错误提示】：如果需要显示错误提示，则显示错误提示
+		if (response.data.code !== 0) {
+		  // 特殊：如果 401 错误码，则跳转到登录页 or 刷新令牌
+		  if (response.data.code === 401) {
+			return refreshToken(response.config);
+		  }
+		  
+		  if (response.data.code === -149) {
+			  uni.showModal({
+			  	title: '积分不足',
+			  	content: response.data.msg,
+			  	confirmText: '去充值',
+			  	success: function (res) {
+			  	  if (res.confirm) {
+			  		  sheep.$router.go('/pages/point/recharge');
+			  	  }
+			  	},
+			  });
+		  	 return;
+		  }
+		  
+		  if (response.data.code === 1004001009){
+			  showAuthModal('chatAuthorization');
+			  return;
+		  }
+		  
+		  if (response.data.code === -151){
+			uni.showModal({
+			 	title: '会员特权',
+			 	content: response.data.msg,
+				showCancel: false,
+			 	success: function (res) {
+			 	  if (res.confirm) {
+			 		  sheep.$router.go('/pages/user/vip');
+			 	  }
+			 	},
+			 });
+			return;
+		  }
+		  
+		  if (response.data.code === 1004001015){
+			  $store('modal').$patch((state) => {
+			  	state.qrcode = true;
+			  });
+			  return;
+		  }
+
+		  // 错误提示
+		  if (response.config.custom.showError) {
+					uni.showToast({
+						title: response.data.msg || '服务器开小差啦,请稍后再试~',
+						icon: 'none',
+						mask: true,
+					});
+		  }
+		}
+
+		// 自定义处理【showSuccess 成功提示】：如果需要显示成功提示，则显示成功提示
+		if (response.config.custom.showSuccess
+      && response.config.custom.successMsg !== ''
+      &&  response.data.code === 0) {
+      uni.showToast({
+				title: response.config.custom.successMsg,
+				icon: 'none',
+			});
+		}
+
+    // 返回结果：包括 code + data + msg
+		return Promise.resolve(response.data);
+	},
+	(error) => {
+		const userStore = $store('user');
+		const isLogin = userStore.isLogin;
+		let errorMessage = '网络请求出错';
+		if (error !== undefined) {
+			switch (error.statusCode) {
+				case 400:
+					errorMessage = '请求错误';
+					break;
+				case 401:
+          errorMessage = isLogin ? '您的登陆已过期' : '请先登录';
+          // 正常情况下，后端不会返回 401 错误，所以这里不处理 handleAuthorized
+          break;
+				case 403:
+					errorMessage = '拒绝访问';
+					break;
+				case 404:
+					errorMessage = '请求出错';
+					break;
+				case 408:
+					errorMessage = '请求超时';
+					break;
+				case 429:
+					errorMessage = '请求频繁, 请稍后再访问';
+					break;
+				case 500:
+					errorMessage = '服务器开小差啦,请稍后再试~';
+					break;
+				case 501:
+					errorMessage = '服务未实现';
+					break;
+				case 502:
+					errorMessage = '网络错误';
+					break;
+				case 503:
+					errorMessage = '服务不可用';
+					break;
+				case 504:
+					errorMessage = '网络超时';
+					break;
+				case 505:
+					errorMessage = 'HTTP 版本不受支持';
+					break;
+			}
+			if (error.errMsg.includes('timeout')) errorMessage = '请求超时';
+			// #ifdef H5
+			if (error.errMsg.includes('Network'))
+				errorMessage = window.navigator.onLine ? '服务器异常' : '请检查您的网络连接';
+			// #endif
+		}
+
+		if (error && error.config) {
+			if (error.config.custom.showError === false) {
+				uni.showToast({
+					title: error.data?.msg || errorMessage,
+					icon: 'none',
+					mask: true,
+				});
+			}
+			error.config.custom.showLoading && closeLoading();
+		}
+
+		return false;
+	},
+);
+
+// Axios 无感知刷新令牌，参考 https://www.dashingdog.cn/article/11 与 https://segmentfault.com/a/1190000020210980 实现
+let requestList = [] // 请求队列
+let isRefreshToken = false // 是否正在刷新中
+const refreshToken = async (config) => {
+  // 如果当前已经是 refresh-token 的 URL 地址，并且还是 401 错误，说明是刷新令牌失败了，直接返回 Promise.reject(error)
+  if (config.url.indexOf('/member/auth/refresh-token') >= 0) {
+    return Promise.reject('error')
+  }
+
+  // 如果未认证，并且未进行刷新令牌，说明可能是访问令牌过期了
+  if (!isRefreshToken) {
+    isRefreshToken = true
+    // 1. 如果获取不到刷新令牌，则只能执行登出操作
+    const refreshToken = getRefreshToken()
+    if (!refreshToken) {
+      return handleAuthorized()
+    }
+    // 2. 进行刷新访问令牌
+    try {
+      const refreshTokenResult = await AuthUtil.refreshToken(refreshToken);
+      if (refreshTokenResult.code !== 0) {
+        // 如果刷新不成功，直接抛出 e 触发 2.2 的逻辑
+        // noinspection ExceptionCaughtLocallyJS
+        throw new Error('刷新令牌失败');
+      }
+      // 2.1 刷新成功，则回放队列的请求 + 当前请求
+      config.header.Authorization = 'Bearer ' + getAccessToken()
+      requestList.forEach((cb) => {
+        cb()
+      })
+      requestList = []
+      return request(config)
+    } catch (e) {
+      // 为什么需要 catch 异常呢？刷新失败时，请求因为 Promise.reject 触发异常。
+      // 2.2 刷新失败，只回放队列的请求
+      requestList.forEach((cb) => {
+        cb()
+      })
+      // 提示是否要登出。即不回放当前请求！不然会形成递归
+      return handleAuthorized()
+    } finally {
+      requestList = []
+      isRefreshToken = false
+    }
+  } else {
+    // 添加到队列，等待刷新获取到新的令牌
+    return new Promise((resolve) => {
+      requestList.push(() => {
+        config.header.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+        resolve(request(config))
+      })
+    })
+  }
+}
+
+/**
+ * 处理 401 未登录的错误
+ */
+const handleAuthorized = () => {
+  const userStore = $store('user');
+  userStore.logout(true);
+  showAuthModal();
+  // 登录超时
+  return Promise.reject({
+    code: 401,
+    msg: userStore.isLogin ? '您的登陆已过期' : '请先登录'
+  })
+}
+
+/** 获得访问令牌 */
+const getAccessToken = () => {
+  return uni.getStorageSync('token');
+}
+
+/** 获得刷新令牌 */
+const getRefreshToken = () => {
+  return uni.getStorageSync('refresh-token');
+}
+
+const request = (config) => {
+	return http.middleware(config);
+};
+
+export default request;
diff --git a/sheep/router/index.js b/sheep/router/index.js
new file mode 100644
index 0000000..0a4ecc3
--- /dev/null
+++ b/sheep/router/index.js
@@ -0,0 +1,185 @@
+import $store from '@/sheep/store';
+import { showAuthModal, showShareModal } from '@/sheep/hooks/useModal';
+import { isNumber, isString, isEmpty, startsWith, isObject, isNil, clone } from 'lodash-es';
+import throttle from '@/sheep/helper/throttle';
+
+const _go = (
+  path,
+  params = {},
+  options = {
+    redirect: false,
+  },
+) => {
+  let page = ''; // 跳转页面
+  let query = ''; // 页面参数
+  let url = ''; // 跳转页面完整路径
+
+  if (isString(path)) {
+    // 判断跳转类型是 path ｜ 还是http
+    if (startsWith(path, 'http')) {
+      // #ifdef H5
+      window.location = path;
+      return;
+      // #endif
+      // #ifndef H5
+      page = `/pages/public/webview`;
+      query = `url=${encodeURIComponent(path)}`;
+      // #endif
+    } else if (startsWith(path, 'action:')) {
+      handleAction(path);
+      return;
+    } else {
+      [page, query] = path.split('?');
+    }
+    if (!isEmpty(params)) {
+      let query2 = paramsToQuery(params);
+      if (isEmpty(query)) {
+        query = query2;
+      } else {
+        query += '&' + query2;
+      }
+    }
+  }
+
+  if (isObject(path)) {
+    page = path.url;
+    if (!isNil(path.params)) {
+      query = paramsToQuery(path.params);
+    }
+  }
+
+  const nextRoute = ROUTES_MAP[page];
+
+  // 未找到指定跳转页面
+  // mark: 跳转404页
+  if (!nextRoute) {
+    console.log(`%c跳转路径参数错误<${page || 'EMPTY'}>`, 'color:red;background:yellow');
+    return;
+  }
+
+  // 页面登录拦截
+  if (nextRoute.meta?.auth && !$store('user').isLogin) {
+    showAuthModal();
+    return;
+  }
+
+  url = page;
+  if (!isEmpty(query)) {
+    url += `?${query}`;
+  }
+
+  // 跳转底部导航
+  if (TABBAR.includes(page)) {
+    uni.switchTab({
+      url,
+    });
+    return;
+  }
+
+  // 使用redirect跳转
+  if (options.redirect) {
+    uni.redirectTo({
+      url,
+    });
+    return;
+  }
+
+  uni.navigateTo({
+    url,
+  });
+};
+
+// 限流 防止重复点击跳转
+function go(...args) {
+  throttle(() => {
+    _go(...args);
+  });
+}
+
+function paramsToQuery(params) {
+  if (isEmpty(params)) {
+    return '';
+  }
+  // return new URLSearchParams(Object.entries(params)).toString();
+  let query = [];
+  for (let key in params) {
+    query.push(key + '=' + params[key]);
+  }
+
+  return query.join('&');
+}
+
+function back() {
+  // #ifdef H5
+  history.back();
+  // #endif
+
+  // #ifndef H5
+  uni.navigateBack();
+  // #endif
+}
+
+function redirect(path, params = {}) {
+  go(path, params, {
+    redirect: true,
+  });
+}
+
+// 检测是否有浏览器历史
+function hasHistory() {
+  // #ifndef H5
+  const pages = getCurrentPages();
+  if (pages.length > 1) {
+    return true;
+  }
+  return false;
+  // #endif
+
+  // #ifdef H5
+  return !!history.state.back;
+  // #endif
+}
+
+function getCurrentRoute(field = '') {
+  let currentPage = getCurrentPage();
+  // #ifdef MP
+  currentPage.$page['route'] = currentPage.route;
+  currentPage.$page['options'] = currentPage.options;
+  // #endif
+  if (field !== '') {
+    return currentPage.$page[field];
+  } else {
+    return currentPage.$page;
+  }
+}
+
+function getCurrentPage() {
+  let pages = getCurrentPages();
+  return pages[pages.length - 1];
+}
+
+function handleAction(path) {
+  const action = path.split(':');
+  switch (action[1]) {
+    case 'showShareModal':
+      showShareModal();
+      break;
+  }
+}
+
+function error(errCode, errMsg = '') {
+  redirect('/pages/public/error', {
+    errCode,
+    errMsg,
+  });
+}
+
+export default {
+  go,
+  back,
+  hasHistory,
+  redirect,
+  getCurrentPage,
+  getCurrentRoute,
+  error,
+};
diff --git a/sheep/router/utils/strip-json-comments.js b/sheep/router/utils/strip-json-comments.js
new file mode 100644
index 0000000..5995992
--- /dev/null
+++ b/sheep/router/utils/strip-json-comments.js
@@ -0,0 +1,79 @@
+const singleComment = Symbol('singleComment');
+const multiComment = Symbol('multiComment');
+
+const stripWithoutWhitespace = () => '';
+const stripWithWhitespace = (string, start, end) => string.slice(start, end).replace(/\S/g, ' ');
+
+const isEscaped = (jsonString, quotePosition) => {
+  let index = quotePosition - 1;
+  let backslashCount = 0;
+
+  while (jsonString[index] === '\\') {
+    index -= 1;
+    backslashCount += 1;
+  }
+
+  return Boolean(backslashCount % 2);
+};
+
+export default function stripJsonComments(jsonString, { whitespace = true } = {}) {
+  if (typeof jsonString !== 'string') {
+    throw new TypeError(
+      `Expected argument \`jsonString\` to be a \`string\`, got \`${typeof jsonString}\``,
+    );
+  }
+
+  const strip = whitespace ? stripWithWhitespace : stripWithoutWhitespace;
+
+  let isInsideString = false;
+  let isInsideComment = false;
+  let offset = 0;
+  let result = '';
+
+  for (let index = 0; index < jsonString.length; index++) {
+    const currentCharacter = jsonString[index];
+    const nextCharacter = jsonString[index + 1];
+
+    if (!isInsideComment && currentCharacter === '"') {
+      const escaped = isEscaped(jsonString, index);
+      if (!escaped) {
+        isInsideString = !isInsideString;
+      }
+    }
+
+    if (isInsideString) {
+      continue;
+    }
+
+    if (!isInsideComment && currentCharacter + nextCharacter === '//') {
+      result += jsonString.slice(offset, index);
+      offset = index;
+      isInsideComment = singleComment;
+      index++;
+    } else if (isInsideComment === singleComment && currentCharacter + nextCharacter === '\r\n') {
+      index++;
+      isInsideComment = false;
+      result += strip(jsonString, offset, index);
+      offset = index;
+      continue;
+    } else if (isInsideComment === singleComment && currentCharacter === '\n') {
+      isInsideComment = false;
+      result += strip(jsonString, offset, index);
+      offset = index;
+    } else if (!isInsideComment && currentCharacter + nextCharacter === '/*') {
+      result += jsonString.slice(offset, index);
+      offset = index;
+      isInsideComment = multiComment;
+      index++;
+      continue;
+    } else if (isInsideComment === multiComment && currentCharacter + nextCharacter === '*/') {
+      index++;
+      isInsideComment = false;
+      result += strip(jsonString, offset, index + 1);
+      offset = index + 1;
+      continue;
+    }
+  }
+
+  return result + (isInsideComment ? strip(jsonString.slice(offset)) : jsonString.slice(offset));
+}
diff --git a/sheep/router/utils/uni-read-pages-v3.js b/sheep/router/utils/uni-read-pages-v3.js
new file mode 100644
index 0000000..303f10a
--- /dev/null
+++ b/sheep/router/utils/uni-read-pages-v3.js
@@ -0,0 +1,103 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', {
+  value: true,
+});
+const fs = require('fs');
+import stripJsonComments from './strip-json-comments';
+import { isArray, isEmpty } from 'lodash';
+
+class TransformPages {
+  constructor({ includes, pagesJsonDir }) {
+    this.includes = includes;
+    this.uniPagesJSON = JSON.parse(stripJsonComments(fs.readFileSync(pagesJsonDir, 'utf-8')));
+    this.routes = this.getPagesRoutes().concat(this.getSubPackagesRoutes());
+    this.tabbar = this.getTabbarRoutes();
+    this.routesMap = this.transformPathToKey(this.routes);
+  }
+  /**
+   * 通过读取pages.json文件 生成直接可用的routes
+   */
+  getPagesRoutes(pages = this.uniPagesJSON.pages, rootPath = null) {
+    let routes = [];
+    for (let i = 0; i < pages.length; i++) {
+      const item = pages[i];
+      let route = {};
+      for (let j = 0; j < this.includes.length; j++) {
+        const key = this.includes[j];
+        let value = item[key];
+        if (key === 'path') {
+          value = rootPath ? `/${rootPath}/${value}` : `/${value}`;
+        }
+        if (key === 'aliasPath' && i == 0 && rootPath == null) {
+          route[key] = route[key] || '/';
+        } else if (value !== undefined) {
+          route[key] = value;
+        }
+      }
+      routes.push(route);
+    }
+    return routes;
+  }
+  /**
+   * 解析小程序分包路径
+   */
+  getSubPackagesRoutes() {
+    if (!(this.uniPagesJSON && this.uniPagesJSON.subPackages)) {
+      return [];
+    }
+    const subPackages = this.uniPagesJSON.subPackages;
+    let routes = [];
+    for (let i = 0; i < subPackages.length; i++) {
+      const subPages = subPackages[i].pages;
+      const root = subPackages[i].root;
+      const subRoutes = this.getPagesRoutes(subPages, root);
+      routes = routes.concat(subRoutes);
+    }
+    return routes;
+  }
+
+  getTabbarRoutes() {
+    if (!(this.uniPagesJSON && this.uniPagesJSON.tabBar && this.uniPagesJSON.tabBar.list)) {
+      return [];
+    }
+    const tabbar = this.uniPagesJSON.tabBar.list;
+    let tabbarMap = [];
+    tabbar.forEach((bar) => {
+      tabbarMap.push('/' + bar.pagePath);
+    });
+    return tabbarMap;
+  }
+
+  transformPathToKey(list) {
+    if (!isArray(list) || isEmpty(list)) {
+      return [];
+    }
+    let map = {};
+    list.forEach((i) => {
+      map[i.path] = i;
+    });
+    return map;
+  }
+}
+
+function uniReadPagesV3Plugin({ pagesJsonDir, includes }) {
+  let defaultIncludes = ['path', 'aliasPath', 'name'];
+  includes = [...defaultIncludes, ...includes];
+  let pages = new TransformPages({
+    pagesJsonDir,
+    includes,
+  });
+  return {
+    name: 'uni-read-pages-v3',
+    config(config) {
+      return {
+        define: {
+          ROUTES: pages.routes,
+          ROUTES_MAP: pages.routesMap,
+          TABBAR: pages.tabbar,
+        },
+      };
+    },
+  };
+}
+exports.default = uniReadPagesV3Plugin;
diff --git a/sheep/scss/_main.scss b/sheep/scss/_main.scss
new file mode 100644
index 0000000..999513a
--- /dev/null
+++ b/sheep/scss/_main.scss
@@ -0,0 +1,354 @@
+body {
+  color: var(--text-a);
+  background-color: var(--ui-BG-1) !important;
+  font-family: system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans',
+    sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+}
+
+/* ==================
+         初始化
+ ==================== */
+.ui-link {
+  cursor: pointer;
+}
+navigator {
+  display: inline-flex;
+}
+navigator.navigator-hover {
+  background-color: inherit;
+  transform: translate(1rpx, 1rpx);
+  // opacity: 1;
+}
+
+/* ==================
+         辅助类
+ ==================== */
+.none {
+  display: none !important;
+}
+.inline {
+  display: inline !important;
+}
+.inline-block {
+  display: inline-block !important;
+}
+.block {
+  display: block !important;
+}
+.touch-none {
+  pointer-events: none;
+}
+.touch-all {
+  pointer-events: all;
+}
+.flex {
+  display: flex !important;
+}
+.inline-flex {
+  display: inline-flex !important;
+}
+.w-100 {
+  width: 100%;
+}
+/* -- 浮动 -- */
+.cf::after,
+.cf::before {
+  content: '';
+  display: table;
+}
+.cf::after {
+  clear: both;
+}
+.fl {
+  float: left;
+}
+.fr {
+  float: right;
+}
+.position-center {
+  @include position-center;
+}
+.position-relative {
+  position: relative;
+}
+/* -- 工具类 -- */
+@function negativify-map($map) {
+  $result: ();
+  @each $key, $value in $map {
+    @if $key != 0 {
+      $result: map-merge($result, ('n' + $key: (-$value)));
+    }
+  }
+  @return $result;
+}
+
+$utilities: () !default;
+$utilities: map-merge(
+  (
+    'margin': (
+      responsive: true,
+      property: margin,
+      class: m,
+      values:
+        map-merge(
+          $spacers,
+          (
+            auto: auto,
+          )
+        ),
+    ),
+    'margin-x': (
+      property: margin-right margin-left,
+      class: mx,
+      values:
+        map-merge(
+          $spacers,
+          (
+            auto: auto,
+          )
+        ),
+    ),
+    'margin-y': (
+      property: margin-top margin-bottom,
+      class: my,
+      values:
+        map-merge(
+          $spacers,
+          (
+            auto: auto,
+          )
+        ),
+    ),
+    'margin-top': (
+      property: margin-top,
+      class: mt,
+      values:
+        map-merge(
+          $spacers,
+          (
+            auto: auto,
+          )
+        ),
+    ),
+    'margin-right': (
+      property: margin-right,
+      class: mr,
+      values:
+        map-merge(
+          $spacers,
+          (
+            auto: auto,
+          )
+        ),
+    ),
+    'margin-bottom': (
+      property: margin-bottom,
+      class: mb,
+      values:
+        map-merge(
+          $spacers,
+          (
+            auto: auto,
+          )
+        ),
+    ),
+    'margin-left': (
+      property: margin-left,
+      class: ml,
+      values:
+        map-merge(
+          $spacers,
+          (
+            auto: auto,
+          )
+        ),
+    ),
+    'padding': (
+      responsive: true,
+      property: padding,
+      class: p,
+      values: $spacers,
+    ),
+    'padding-x': (
+      property: padding-right padding-left,
+      class: px,
+      values: $spacers,
+    ),
+    'padding-y': (
+      property: padding-top padding-bottom,
+      class: py,
+      values: $spacers,
+    ),
+    'padding-top': (
+      property: padding-top,
+      class: pt,
+      values: $spacers,
+    ),
+    'padding-right': (
+      property: padding-right,
+      class: pr,
+      values: $spacers,
+    ),
+    'padding-bottom': (
+      property: padding-bottom,
+      class: pb,
+      values: $spacers,
+    ),
+    'padding-left': (
+      property: padding-left,
+      class: pl,
+      values: $spacers,
+    ),
+    'font-weight': (
+      property: font-weight,
+      class: text,
+      values: (
+        light: $font-weight-light,
+        lighter: $font-weight-lighter,
+        normal: $font-weight-normal,
+        bold: $font-weight-bold,
+        bolder: $font-weight-bolder,
+      ),
+    ),
+    'text-align': (
+      property: text-align,
+      class: text,
+      values: left right center,
+    ),
+    'font-color': (
+      property: color,
+      class: text,
+      values:
+        map-merge(
+          $colors,
+          map-merge(
+            $grays,
+            map-merge(
+              $darks,
+              (
+                'reset': inherit,
+              )
+            )
+          )
+        ),
+    ),
+    'line-height': (
+      property: line-height,
+      class: lh,
+      values: (
+        1: 1,
+        sm: $line-height-sm,
+        base: $line-height-base,
+        lg: $line-height-lg,
+      ),
+    ),
+    'white-space': (
+      property: white-space,
+      class: text,
+      values: (
+        nowrap: nowrap,
+      ),
+    ),
+    'radius': (
+      property: border-radius,
+      class: radius,
+      values: (
+        null: $radius,
+        sm: $radius-sm,
+        lg: $radius-lg,
+        0: 0,
+      ),
+    ),
+    'round': (
+      property: border-radius,
+      class: round,
+      values: (
+        null: $round-pill,
+        circle: 50%,
+      ),
+    ),
+    'radius-top': (
+      property: border-top-left-radius border-top-right-radius,
+      class: radius-top,
+      values: (
+        null: $radius,
+      ),
+    ),
+    'radius-right': (
+      property: border-top-right-radius border-bottom-right-radius,
+      class: radius-right,
+      values: (
+        null: $radius,
+      ),
+    ),
+    'radius-bottom': (
+      property: border-bottom-right-radius border-bottom-left-radius,
+      class: radius-bottom,
+      values: (
+        null: $radius,
+      ),
+    ),
+    'radius-left': (
+      property: border-bottom-left-radius border-top-left-radius,
+      class: radius-left,
+      values: (
+        null: $radius,
+      ),
+    ),
+    'radius-lr': (
+      property: border-top-left-radius border-bottom-right-radius,
+      class: radius-lr,
+      values: (
+        null: $radius,
+      ),
+    ),
+    'radius-lrs': (
+      property: border-top-right-radius border-bottom-left-radius,
+      class: radius-lr,
+      values: (
+        null: 0,
+      ),
+    ),
+    'radius-rl': (
+      property: border-top-right-radius border-bottom-left-radius,
+      class: radius-rl,
+      values: (
+        null: $radius,
+      ),
+    ),
+    'radius-rls': (
+      property: border-top-left-radius border-bottom-right-radius,
+      class: radius-rl,
+      values: (
+        null: 0,
+      ),
+    ),
+  ),
+  $utilities
+);
+@each $key, $utility in $utilities {
+  @if type-of($utility) == 'map' {
+    $values: map-get($utility, values);
+    @if type-of($values) == 'string' or type-of(nth($values, 1)) != 'list' {
+      $values: zip($values, $values);
+    }
+    @each $key, $value in $values {
+      $properties: map-get($utility, property);
+      @if type-of($properties) == 'string' {
+        $properties: append((), $properties);
+      }
+      $property-class: if(
+        map-has-key($utility, class),
+        map-get($utility, class),
+        nth($properties, 1)
+      );
+      $property-class: if($property-class == null, '', $property-class);
+      $property-class-modifier: if($key, if($property-class == '', '', '-') + $key, '');
+      .#{$property-class + $property-class-modifier} {
+        @each $property in $properties {
+          #{$property}: $value !important;
+        }
+      }
+    }
+  }
+}
diff --git a/sheep/scss/_mixins.scss b/sheep/scss/_mixins.scss
new file mode 100644
index 0000000..299f7b1
--- /dev/null
+++ b/sheep/scss/_mixins.scss
@@ -0,0 +1,61 @@
+@mixin bg-square {
+  background: {
+    color: #fff;
+    image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%),
+      linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%);
+    size: 40rpx 40rpx;
+    position: 0 0, 20rpx 20rpx;
+  }
+}
+
+@mixin flex($direction: row) {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: $direction;
+}
+@mixin flex-bar {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+@mixin flex-center {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+@mixin arrow {
+  content: '';
+  height: 0;
+  width: 0;
+  position: absolute;
+}
+@mixin arrow-top {
+  @include arrow;
+  // border-color: transparent transparent $ui-BG;
+  border-style: none solid solid;
+  border-width: 0 20rpx 20rpx;
+}
+
+@mixin arrow-right {
+  @include arrow;
+  // border-color: transparent  $ui-BG transparent;
+  border-style: solid solid solid none;
+  border-width: 20rpx 20rpx 20rpx 0;
+}
+@mixin position-center {
+  position: absolute !important;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  margin: auto;
+}
+
+@mixin blur {
+  -webkit-backdrop-filter: blur(20px);
+  backdrop-filter: blur(20px);
+  color: var(--ui-TC);
+}
diff --git a/sheep/scss/_tools.scss b/sheep/scss/_tools.scss
new file mode 100644
index 0000000..e1fb636
--- /dev/null
+++ b/sheep/scss/_tools.scss
@@ -0,0 +1,286 @@
+/* ==================
+          常用工具
+ ==================== */
+
+.ss-bg-opactity-block {
+  background-color: rgba(#000, 0.2);
+  color: #fff;
+}
+
+/* ==================
+          flex布局
+ ==================== */
+
+.ss-flex {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.ss-flex-1 {
+  flex: 1;
+}
+
+.ss-flex-col {
+  display: flex;
+  flex-direction: column;
+}
+
+.ss-flex-wrap {
+  flex-wrap: wrap;
+}
+
+.ss-flex-nowrap {
+  flex-wrap: nowrap;
+}
+
+.ss-col-center {
+  align-items: center;
+}
+
+.ss-col-top {
+  align-items: flex-start;
+}
+
+.ss-col-bottom {
+  align-items: flex-end;
+}
+
+.ss-col-stretch {
+  align-items: stretch;
+}
+
+.ss-row-center {
+  justify-content: center;
+}
+
+.ss-row-left {
+  justify-content: flex-start;
+}
+
+.ss-row-right {
+  justify-content: flex-end;
+}
+
+.ss-row-between {
+  justify-content: space-between;
+}
+
+.ss-row-around {
+  justify-content: space-around;
+}
+
+.ss-self-start {
+  align-self: flex-start;
+}
+
+.ss-self-end {
+  align-self: flex-end;
+}
+
+.ss-self-center {
+  align-self: center;
+}
+.ss-h-100 {
+  height: 100%;
+}
+.ss-w-100 {
+  width: 100%;
+}
+
+/* ==================
+
+    margin padding: 内外边距
+	
+ ==================== */
+@for $i from 0 through 100 {
+  // 只要双数和能被5除尽的数
+  @if $i % 2==0 or $i % 5==0 {
+    // 得出：u-margin-30或者u-m-30
+    .ss-margin-#{$i},
+    .ss-m-#{$i} {
+      margin: $i + rpx;
+    }
+    .ss-m-x-#{$i} {
+      margin-left: $i + rpx;
+      margin-right: $i + rpx;
+    }
+    .ss-m-y-#{$i} {
+      margin-top: $i + rpx;
+      margin-bottom: $i + rpx;
+    }
+
+    // 得出：u-padding-30或者u-p-30
+    .ss-padding-#{$i},
+    .ss-p-#{$i} {
+      padding: $i + rpx;
+    }
+    .ss-p-x-#{$i} {
+      padding-left: $i + rpx;
+      padding-right: $i + rpx;
+    }
+    .ss-p-y-#{$i} {
+      padding-top: $i + rpx;
+      padding-bottom: $i + rpx;
+    }
+
+    @each $short, $long in l left, t top, r right, b bottom {
+      // 缩写版，结果如： u-m-l-30
+      // 定义外边距
+      .ss-m-#{$short}-#{$i} {
+        margin-#{$long}: $i + rpx;
+      }
+
+      // 定义内边距
+      .ss-p-#{$short}-#{$i} {
+        padding-#{$long}: $i + rpx;
+      }
+
+      // 完整版，结果如：u-margin-left-30
+      // 定义外边距
+      .ss-margin-#{$long}-#{$i} {
+        margin-#{$long}: $i + rpx;
+      }
+
+      // 定义内边距
+      .ss-padding-#{$long}-#{$i} {
+        padding-#{$long}: $i + rpx;
+      }
+    }
+  }
+}
+
+/* ==================
+
+    radius
+	
+ ==================== */
+@for $i from 0 through 100 {
+  // 只要双数和能被5除尽的数
+  @if $i % 2==0 or $i % 5==0 {
+    .ss-radius-#{$i},
+    .ss-r-#{$i} {
+      border-radius: $i + rpx;
+    }
+
+    .ss-r-t-#{$i} {
+      border-top-left-radius: $i + rpx;
+      border-top-right-radius: $i + rpx;
+    }
+
+    .ss-r-b-#{$i} {
+      border-bottom-left-radius: $i + rpx;
+      border-bottom-right-radius: $i + rpx;
+    }
+
+    @each $short, $long in tl 'top-left', tr 'top-right', bl 'bottom-right', br 'bottom-right' {
+      // 定义外边距
+      .ss-r-#{$short}-#{$i} {
+        border-#{$long}-radius: $i + rpx;
+      }
+
+      // 定义内边距
+      .ss-radius-#{$long}-#{$i} {
+        border-#{$long}-radius: $i + rpx;
+      }
+    }
+  }
+}
+
+/* ==================
+
+    溢出省略号
+    @param {Number} 行数
+	
+ ==================== */
+@mixin ellipsis($rowCount: 1) {
+  // @if $rowCount <=1 {
+  //   overflow: hidden;
+  //   text-overflow: ellipsis;
+  //   white-space: nowrap;
+  // } @else {
+  //   min-width: 0;
+  //   overflow: hidden;
+  //   text-overflow: ellipsis;
+  //   display: -webkit-box;
+  //   -webkit-line-clamp: $rowCount;
+  //   -webkit-box-orient: vertical;
+  // }
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: $rowCount;
+  -webkit-box-orient: vertical;
+}
+
+@for $i from 1 through 6 {
+  .ss-line-#{$i} {
+    @include ellipsis($i);
+  }
+}
+
+/* ==================
+    hover
+ ==================== */
+.ss-hover-class {
+  background-color: $gray-c;
+  opacity: 0.6;
+}
+.ss-hover-btn {
+  transform: translate(1px, 1px);
+}
+
+/* ==================
+    底部安全区域
+ ==================== */
+
+.ss-safe-bottom {
+  padding-bottom: 0;
+  padding-bottom: calc(constant(safe-area-inset-bottom) / 5 * 3);
+  padding-bottom: calc(env(safe-area-inset-bottom) / 5 * 3);
+}
+
+/* ==================
+
+    字体大小
+	
+ ==================== */
+
+@for $i from 20 through 50 {
+  .ss-font-#{$i} {
+    font-size: $i + rpx;
+  }
+}
+
+/* ==================
+    按钮
+ ==================== */
+.ss-reset-button {
+  padding: 0;
+  margin: 0;
+  font-size: inherit;
+  background-color: transparent;
+  color: inherit;
+  position: relative;
+  border: 0rpx;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  text-align: center;
+  text-decoration: none;
+  white-space: nowrap;
+  vertical-align: baseline;
+  transform: translate(0, 0);
+}
+.ss-reset-button.button-hover {
+  transform: translate(1px, 1px);
+  background: none;
+}
+
+.ss-reset-button::after {
+  border: none;
+}
diff --git a/sheep/scss/_var.scss b/sheep/scss/_var.scss
new file mode 100644
index 0000000..b9986cc
--- /dev/null
+++ b/sheep/scss/_var.scss
@@ -0,0 +1,162 @@
+@import './mixins';
+
+//颜色 ，渐变背景60%
+$yellow: #ffc300; //ss-黄
+$orange: #ff6000; //ss-橘
+$red: #ff3000; //ss-红
+$pink: #e03997;
+$mauve: #b745cb;
+$purple: #652abf; //rgba(101, 42, 191, 1); // ss-紫
+$blue: #0081ff;
+$cyan: #37c0fe;
+$green: #7ea19e; //ss-绿
+$olive: #8dc63f;
+$grey: #8799a3;
+$brown: #a5673f;
+$black: #484848; //ss-黑
+$golden: #e9b461; //ss-金
+
+$colors: ();
+$colors: map-merge(
+  (
+    'yellow': $yellow,
+    'orange': $orange,
+    'red': $red,
+    'pink': $pink,
+    'mauve': $mauve,
+    'purple': $purple,
+    'violet': $purple,
+    'blue': $blue,
+    'cyan': $cyan,
+    'green': $green,
+    'olive': $olive,
+    'grey': $grey,
+    'brown': $brown,
+    'black': $black,
+    'golden': $golden,
+  ),
+  $colors
+);
+
+//灰度
+$bg-page: #f6f6f6;
+$white: #ffffff;
+$gray-f: #f8f9fa;
+$gray-e: #eeeeee;
+$gray-d: #dddddd;
+$gray-c: #cccccc;
+$gray-b: #bbbbbb;
+$gray-a: #aaaaaa;
+$dark-9: #999999;
+$dark-8: #888888;
+$dark-7: #777777;
+$dark-6: #666666;
+$dark-5: #555555;
+$dark-4: #484848; //ss-黑
+$dark-3: #333333;
+$dark-2: #222222;
+$dark-1: #111111;
+$black: #000000;
+
+$grays: ();
+$grays: map-merge(
+  (
+    'white': $white,
+    'gray-f': $gray-f,
+    'gray-e': $gray-e,
+    'gray-d': $gray-d,
+    'gray-c': $gray-c,
+    'gray-b': $gray-b,
+    'gray-a': $gray-a,
+    'gray': $gray-a,
+  ),
+  $grays
+);
+
+$darks: ();
+$darks: map-merge(
+  (
+    'dark-9': $dark-9,
+    'dark-8': $dark-8,
+    'dark-7': $dark-7,
+    'dark-6': $dark-6,
+    'dark-5': $dark-5,
+    'dark-4': $dark-4,
+    'dark-3': $dark-3,
+    'dark-2': $dark-2,
+    'dark-1': $dark-1,
+    'black': $black,
+  ),
+  $darks
+);
+
+// 边框
+$border-width: 1rpx !default; // 边框大小
+$border-color: $gray-d !default; // 边框颜色
+
+// 圆角
+$radius: 10rpx !default; // 默认圆角大小
+$radius-lg: 40rpx !default; // 大圆角
+$radius-sm: 6rpx !default; // 小圆角
+$round-pill: 1000rpx !default; // 半圆
+
+// 动画过渡
+$transition-base: all 0.2s ease-in-out !default; // 默认过渡
+$transition-base-out: all 0.04s ease-in-out !default; // 进场过渡
+$transition-fade: opacity 0.15s linear !default; // 透明过渡
+$transition-collapse: height 0.35s ease !default; // 收缩过渡
+
+// 间距
+$spacer: 20rpx !default;
+$spacers: () !default;
+$spacers: map-merge(
+  (
+    0: 0,
+    1: $spacer * 0.25,
+    2: $spacer * 0.5,
+    3: $spacer,
+    4: $spacer * 1.5,
+    5: $spacer * 3,
+    6: $spacer * 5,
+  ),
+  $spacers
+);
+// 字形
+$font-weight-lighter: lighter !default;
+$font-weight-light: 300 !default;
+$font-weight-normal: 400 !default;
+$font-weight-bold: 700 !default;
+$font-weight-bolder: 900 !default;
+$fontsize: () !default;
+$fontsize: map-merge(
+  (
+    xs: 20,
+    sm: 24,
+    df: 28,
+    lg: 32,
+    xl: 36,
+    xxl: 44,
+    sl: 80,
+    xsl: 120,
+  ),
+  $fontsize
+);
+// 段落
+$line-height-base: 1.5 !default;
+$line-height-lg: 2 !default;
+$line-height-sm: 1.25 !default;
+// 图标
+$iconsize: () !default;
+$iconsize: map-merge(
+  (
+    xs: 0.5,
+    sm: 0.75,
+    df: 1,
+    lg: 1.25,
+    xl: 1.5,
+    xxl: 2,
+    sl: 6,
+    xsl: 10,
+  ),
+  $iconsize
+);
diff --git a/sheep/scss/font/OPPOSANS-M-subfont.ttf b/sheep/scss/font/OPPOSANS-M-subfont.ttf
new file mode 100644
index 0000000..88ff835
Binary files /dev/null and b/sheep/scss/font/OPPOSANS-M-subfont.ttf differ
diff --git a/sheep/scss/icon/_coloricon.scss b/sheep/scss/icon/_coloricon.scss
new file mode 100644
index 0000000..f391ca4
--- /dev/null
+++ b/sheep/scss/icon/_coloricon.scss
@@ -0,0 +1,1340 @@
+@font-face {
+  font-family: 'coloricon';
+  src: url('data:application/x-font-woff2;charset=utf-8;base64,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')
+    format('woff2');
+  /* #ifdef MP-ALIPAY */
+  src: url('//at.alicdn.com/t/font_1656945_d66u4pxvlq6.woff2') format('woff2'),
+    url('//at.alicdn.com/t/font_1656945_d66u4pxvlq6.woff') format('woff'),
+    url('//at.alicdn.com/t/font_1656945_d66u4pxvlq6.ttf') format('truetype');
+  /* #endif */
+  font-weight: normal;
+  font-style: normal;
+}
+[class*='cicon-'] {
+  font-family: 'coloricon';
+  display: inline-block;
+}
+
+.cicon-Aa:before {
+  content: '\e7a1';
+}
+.cicon-accounts:before {
+  content: '\e681';
+}
+.cicon-accounts-o:before {
+  content: '\e686';
+}
+.cicon-add:before {
+  content: '\e6e4';
+}
+.cicon-add-round:before {
+  content: '\e717';
+}
+.cicon-add-round-o:before {
+  content: '\e718';
+}
+.cicon-alarm:before {
+  content: '\e61e';
+}
+.cicon-album:before {
+  content: '\e759';
+}
+.cicon-alipay:before {
+  content: '\e6e1';
+}
+.cicon-android:before {
+  content: '\e6e2';
+}
+.cicon-angle:before {
+  content: '\e605';
+}
+.cicon-apple:before {
+  content: '\e8e7';
+}
+.cicon-apps:before {
+  content: '\e737';
+}
+.cicon-archive:before {
+  content: '\e7ae';
+}
+.cicon-archive-o:before {
+  content: '\e7ad';
+}
+.cicon-arrow:before {
+  content: '\e608';
+}
+.cicon-at-line:before {
+  content: '\e75c';
+}
+.cicon-avatar:before {
+  content: '\e663';
+}
+.cicon-avatar-o:before {
+  content: '\e665';
+}
+.cicon-avatars:before {
+  content: '\e67e';
+}
+.cicon-avatars-o:before {
+  content: '\e680';
+}
+.cicon-back:before {
+  content: '\e600';
+}
+.cicon-backspace:before {
+  content: '\e6a9';
+}
+.cicon-backup:before {
+  content: '\e61f';
+}
+.cicon-backup-restore:before {
+  content: '\e62d';
+}
+.cicon-barcode:before {
+  content: '\e71f';
+}
+.cicon-book:before {
+  content: '\e6a2';
+}
+.cicon-bookmark:before {
+  content: '\e6a3';
+}
+.cicon-bookmark-o:before {
+  content: '\e697';
+}
+.cicon-bookmarks:before {
+  content: '\e6a6';
+}
+.cicon-box:before {
+  content: '\e714';
+}
+.cicon-box-block:before {
+  content: '\e6ac';
+}
+.cicon-box-right:before {
+  content: '\e6a0';
+}
+.cicon-brand:before {
+  content: '\e726';
+}
+.cicon-brand-o:before {
+  content: '\e727';
+}
+.cicon-building:before {
+  content: '\e6c3';
+}
+.cicon-building-o:before {
+  content: '\e6c7';
+}
+.cicon-camera:before {
+  content: '\e6fa';
+}
+.cicon-camera-add:before {
+  content: '\e736';
+}
+.cicon-camera-add-o:before {
+  content: '\e735';
+}
+.cicon-camera-lens:before {
+  content: '\e68f';
+}
+.cicon-camera-lens-o:before {
+  content: '\e68e';
+}
+.cicon-camera-o:before {
+  content: '\e6fb';
+}
+.cicon-camera-rotate:before {
+  content: '\e71e';
+}
+.cicon-card:before {
+  content: '\e744';
+}
+.cicon-cardboard:before {
+  content: '\e7a9';
+}
+.cicon-cardboard-o:before {
+  content: '\e7aa';
+}
+.cicon-cardboard-off-o:before {
+  content: '\e7af';
+}
+.cicon-cart:before {
+  content: '\e70b';
+}
+.cicon-cart-o:before {
+  content: '\e708';
+}
+.cicon-chat:before {
+  content: '\e739';
+}
+.cicon-chat-bubble:before {
+  content: '\e69b';
+}
+.cicon-chat-bubble-o:before {
+  content: '\e6a7';
+}
+.cicon-chat-list:before {
+  content: '\e69d';
+}
+.cicon-chat-list-o:before {
+  content: '\e6aa';
+}
+.cicon-chat-o:before {
+  content: '\e73c';
+}
+.cicon-chat-smile:before {
+  content: '\e779';
+}
+.cicon-chat-smile-o:before {
+  content: '\e78e';
+}
+.cicon-chat-smiles:before {
+  content: '\e76b';
+}
+.cicon-chat-smiles-o:before {
+  content: '\e74a';
+}
+.cicon-check:before {
+  content: '\e69f';
+}
+.cicon-checkbox:before {
+  content: '\e713';
+}
+.cicon-checkbox-o:before {
+  content: '\e715';
+}
+.cicon-check-round:before {
+  content: '\e6f1';
+}
+.cicon-check-round-o:before {
+  content: '\e6f2';
+}
+.cicon-choiceness:before {
+  content: '\e728';
+}
+.cicon-choiceness-o:before {
+  content: '\e729';
+}
+.cicon-chrome:before {
+  content: '\e6e3';
+}
+.cicon-circle:before {
+  content: '\e7b0';
+}
+.cicon-circle-o:before {
+  content: '\e7b1';
+}
+.cicon-close:before {
+  content: '\e6ed';
+}
+.cicon-close-round:before {
+  content: '\e6f3';
+}
+.cicon-close-round-o:before {
+  content: '\e6f4';
+}
+.cicon-clothes:before {
+  content: '\e72a';
+}
+.cicon-clothes-o:before {
+  content: '\e72b';
+}
+.cicon-cloud:before {
+  content: '\e64e';
+}
+.cicon-cloud-done:before {
+  content: '\e641';
+}
+.cicon-cloud-download:before {
+  content: '\e647';
+}
+.cicon-cloud-o:before {
+  content: '\e646';
+}
+.cicon-cloud-off:before {
+  content: '\e64b';
+}
+.cicon-cloud-upload:before {
+  content: '\e687';
+}
+.cicon-code-box:before {
+  content: '\e7c3';
+}
+.cicon-coin:before {
+  content: '\e78a';
+}
+.cicon-coin-o:before {
+  content: '\e79d';
+}
+.cicon-comment:before {
+  content: '\e738';
+}
+.cicon-comment-o:before {
+  content: '\e70e';
+}
+.cicon-community:before {
+  content: '\e742';
+}
+.cicon-community-o:before {
+  content: '\e743';
+}
+.cicon-countdown:before {
+  content: '\e722';
+}
+.cicon-countdown-o:before {
+  content: '\e723';
+}
+.cicon-creative:before {
+  content: '\e72c';
+}
+.cicon-creative-o:before {
+  content: '\e72d';
+}
+.cicon-crop:before {
+  content: '\e6d9';
+}
+.cicon-crown:before {
+  content: '\e776';
+}
+.cicon-crown-o:before {
+  content: '\e777';
+}
+.cicon-cut:before {
+  content: '\e74b';
+}
+.cicon-DarkMode:before {
+  content: '\e7c4';
+}
+.cicon-dashboard:before {
+  content: '\e62e';
+}
+.cicon-delete:before {
+  content: '\e6bd';
+}
+.cicon-delete-close:before {
+  content: '\e6ae';
+}
+.cicon-delete-line:before {
+  content: '\e707';
+}
+.cicon-delete-line-o:before {
+  content: '\e709';
+}
+.cicon-delete-o:before {
+  content: '\e69a';
+}
+.cicon-deliver:before {
+  content: '\e7f7';
+}
+.cicon-deliver-o:before {
+  content: '\e6ff';
+}
+.cicon-demo:before {
+  content: '\e916';
+}
+.cicon-discover:before {
+  content: '\e70c';
+}
+.cicon-discover-o:before {
+  content: '\e702';
+}
+.cicon-discuss-fill:before {
+  content: '\e790';
+}
+.cicon-discuss-line:before {
+  content: '\e78f';
+}
+.cicon-dollar:before {
+  content: '\e79f';
+}
+.cicon-dollar-o:before {
+  content: '\e79e';
+}
+.cicon-done:before {
+  content: '\e633';
+}
+.cicon-done-all:before {
+  content: '\e62a';
+}
+.cicon-douyin:before {
+  content: '\e6e7';
+}
+.cicon-drop-down:before {
+  content: '\e61c';
+}
+.cicon-drop-up:before {
+  content: '\e61d';
+}
+.cicon-eject:before {
+  content: '\e63a';
+}
+.cicon-ellipse:before {
+  content: '\e74c';
+}
+.cicon-emoji:before {
+  content: '\e78d';
+}
+.cicon-emoji-o:before {
+  content: '\e6ee';
+}
+.cicon-equalizer:before {
+  content: '\e802';
+}
+.cicon-eraser:before {
+  content: '\e770';
+}
+.cicon-eraser-o:before {
+  content: '\e772';
+}
+.cicon-evaluate:before {
+  content: '\e7f0';
+}
+.cicon-evaluate-o:before {
+  content: '\e700';
+}
+.cicon-event-close:before {
+  content: '\e6a5';
+}
+.cicon-event-done:before {
+  content: '\e6b2';
+}
+.cicon-event-list:before {
+  content: '\e6b8';
+}
+.cicon-explore:before {
+  content: '\e628';
+}
+.cicon-explore-line:before {
+  content: '\e719';
+}
+.cicon-explore-line-o:before {
+  content: '\e710';
+}
+.cicon-explore-o:before {
+  content: '\e626';
+}
+.cicon-extension:before {
+  content: '\e620';
+}
+.cicon-extension-o:before {
+  content: '\e63f';
+}
+.cicon-eye:before {
+  content: '\e740';
+}
+.cicon-eye-favor:before {
+  content: '\e7b4';
+}
+.cicon-eye-favor-o:before {
+  content: '\e7b5';
+}
+.cicon-eye-o:before {
+  content: '\e741';
+}
+.cicon-eye-off:before {
+  content: '\e7b3';
+}
+.cicon-eye-off-o:before {
+  content: '\e7b2';
+}
+.cicon-facebook:before {
+  content: '\e6ea';
+}
+.cicon-favorite:before {
+  content: '\e623';
+}
+.cicon-favorite-o:before {
+  content: '\e621';
+}
+.cicon-female:before {
+  content: '\e72f';
+}
+.cicon-file:before {
+  content: '\e857';
+}
+.cicon-file-copy:before {
+  content: '\e85c';
+}
+.cicon-file-copy-o:before {
+  content: '\e7bc';
+}
+.cicon-file-o:before {
+  content: '\e7bb';
+}
+.cicon-file-text:before {
+  content: '\e858';
+}
+.cicon-file-text-o:before {
+  content: '\e7b9';
+}
+.cicon-filter:before {
+  content: '\e6ec';
+}
+.cicon-fingerprint:before {
+  content: '\e63b';
+}
+.cicon-first-page:before {
+  content: '\e60c';
+}
+.cicon-flag:before {
+  content: '\e64d';
+}
+.cicon-flag-o:before {
+  content: '\e64c';
+}
+.cicon-flash-close:before {
+  content: '\e73b';
+}
+.cicon-flash-off:before {
+  content: '\e6d5';
+}
+.cicon-flash-on:before {
+  content: '\e6dc';
+}
+.cicon-flash-open:before {
+  content: '\e74f';
+}
+.cicon-folder:before {
+  content: '\e6a1';
+}
+.cicon-folder-add:before {
+  content: '\e6b4';
+}
+.cicon-folder-o:before {
+  content: '\e6b0';
+}
+.cicon-folder-special:before {
+  content: '\e65c';
+}
+.cicon-forward:before {
+  content: '\e601';
+}
+.cicon-fullscreen:before {
+  content: '\e915';
+}
+.cicon-fullscreen-exit:before {
+  content: '\e914';
+}
+.cicon-game:before {
+  content: '\e6c0';
+}
+.cicon-game-o:before {
+  content: '\e6d1';
+}
+.cicon-git-commit:before {
+  content: '\e7be';
+}
+.cicon-git-commit-o:before {
+  content: '\e7bd';
+}
+.cicon-github:before {
+  content: '\e6e9';
+}
+.cicon-github-circle:before {
+  content: '\ead8';
+}
+.cicon-goods:before {
+  content: '\e778';
+}
+.cicon-goodsnew:before {
+  content: '\e7bf';
+}
+.cicon-goodsnew-o:before {
+  content: '\e7c0';
+}
+.cicon-goods-o:before {
+  content: '\e70f';
+}
+.cicon-GooglePlaylogo:before {
+  content: '\e6e5';
+}
+.cicon-grid:before {
+  content: '\e6ce';
+}
+.cicon-grid-o:before {
+  content: '\e6cc';
+}
+.cicon-group:before {
+  content: '\e7f5';
+}
+.cicon-group-o:before {
+  content: '\e753';
+}
+.cicon-guanli:before {
+  content: '\e750';
+}
+.cicon-headset:before {
+  content: '\e6a4';
+}
+.cicon-headset-mic:before {
+  content: '\e6b1';
+}
+.cicon-help:before {
+  content: '\e66b';
+}
+.cicon-help-o:before {
+  content: '\e65e';
+}
+.cicon-home:before {
+  content: '\e70d';
+}
+.cicon-home-2:before {
+  content: '\e6fd';
+}
+.cicon-home-2-o:before {
+  content: '\e6cf';
+}
+.cicon-home-3:before {
+  content: '\e6fc';
+}
+.cicon-home-3-o:before {
+  content: '\e6e0';
+}
+.cicon-home-4:before {
+  content: '\e732';
+}
+.cicon-home-4-o:before {
+  content: '\e6e6';
+}
+.cicon-home-community:before {
+  content: '\e799';
+}
+.cicon-home-dot:before {
+  content: '\e794';
+}
+.cicon-home-dot-o:before {
+  content: '\e797';
+}
+.cicon-home-line:before {
+  content: '\e793';
+}
+.cicon-home-line-o:before {
+  content: '\e792';
+}
+.cicon-home-o:before {
+  content: '\e70a';
+}
+.cicon-home-sm:before {
+  content: '\e798';
+}
+.cicon-home-smile:before {
+  content: '\e79c';
+}
+.cicon-home-smile-o:before {
+  content: '\e7a0';
+}
+.cicon-home-smline:before {
+  content: '\e791';
+}
+.cicon-home-smline-o:before {
+  content: '\e731';
+}
+.cicon-home-sm-o:before {
+  content: '\e79b';
+}
+.cicon-hotel:before {
+  content: '\e7a8';
+}
+.cicon-hotel-o:before {
+  content: '\e7a3';
+}
+.cicon-huohu:before {
+  content: '\e72e';
+}
+.cicon-IE:before {
+  content: '\e922';
+}
+.cicon-image-text:before {
+  content: '\e781';
+}
+.cicon-image-text-o:before {
+  content: '\e758';
+}
+.cicon-import-export:before {
+  content: '\e615';
+}
+.cicon-info:before {
+  content: '\e6ef';
+}
+.cicon-info-o:before {
+  content: '\e705';
+}
+.cicon-input:before {
+  content: '\e75f';
+}
+.cicon-input-o:before {
+  content: '\e6c8';
+}
+.cicon-keyboard:before {
+  content: '\e6b6';
+}
+.cicon-kinds:before {
+  content: '\e748';
+}
+.cicon-last-page:before {
+  content: '\e60d';
+}
+.cicon-layout:before {
+  content: '\e7e8';
+}
+.cicon-layout-o:before {
+  content: '\e7e7';
+}
+.cicon-LightMode:before {
+  content: '\e7ba';
+}
+.cicon-link:before {
+  content: '\e6ab';
+}
+.cicon-link-off:before {
+  content: '\e6b9';
+}
+.cicon-loader-fill:before {
+  content: '\e76d';
+}
+.cicon-loading:before {
+  content: '\e746';
+}
+.cicon-loading1:before {
+  content: '\e749';
+}
+.cicon-loading2:before {
+  content: '\e7f1';
+}
+.cicon-location-off:before {
+  content: '\e671';
+}
+.cicon-location-off-o:before {
+  content: '\e66d';
+}
+.cicon-location-on:before {
+  content: '\e65f';
+}
+.cicon-location-on-o:before {
+  content: '\e661';
+}
+.cicon-lock:before {
+  content: '\e6ad';
+}
+.cicon-lock-o:before {
+  content: '\e6b3';
+}
+.cicon-lock-open:before {
+  content: '\e6ba';
+}
+.cicon-logout:before {
+  content: '\e76e';
+}
+.cicon-loop:before {
+  content: '\e616';
+}
+.cicon-magic:before {
+  content: '\e6b7';
+}
+.cicon-magic-o:before {
+  content: '\e6c2';
+}
+.cicon-mail:before {
+  content: '\e6be';
+}
+.cicon-mail-o:before {
+  content: '\e6bc';
+}
+.cicon-male:before {
+  content: '\e730';
+}
+.cicon-mic:before {
+  content: '\e656';
+}
+.cicon-mic-none:before {
+  content: '\e642';
+}
+.cicon-mic-off:before {
+  content: '\e652';
+}
+.cicon-miniprogram:before {
+  content: '\e7d6';
+}
+.cicon-mobile:before {
+  content: '\e854';
+}
+.cicon-mobile-o:before {
+  content: '\e7b6';
+}
+.cicon-moneybag:before {
+  content: '\e7ce';
+}
+.cicon-moneybag-o:before {
+  content: '\e7d1';
+}
+.cicon-more:before {
+  content: '\e688';
+}
+.cicon-more-tag:before {
+  content: '\e672';
+}
+.cicon-move:before {
+  content: '\e768';
+}
+.cicon-move-round:before {
+  content: '\e602';
+}
+.cicon-move-round-o:before {
+  content: '\e603';
+}
+.cicon-music:before {
+  content: '\e795';
+}
+.cicon-music-off:before {
+  content: '\e796';
+}
+.cicon-my:before {
+  content: '\e78c';
+}
+.cicon-my-o:before {
+  content: '\e78b';
+}
+.cicon-near-me:before {
+  content: '\e654';
+}
+.cicon-near-me-o:before {
+  content: '\e649';
+}
+.cicon-not:before {
+  content: '\e667';
+}
+.cicon-notice:before {
+  content: '\e666';
+}
+.cicon-notice-active:before {
+  content: '\e66f';
+}
+.cicon-notice-active-o:before {
+  content: '\e65d';
+}
+.cicon-notice-o:before {
+  content: '\e664';
+}
+.cicon-notice-off:before {
+  content: '\e6b5';
+}
+.cicon-notice-off-o:before {
+  content: '\e6bb';
+}
+.cicon-numcode:before {
+  content: '\e755';
+}
+.cicon-order:before {
+  content: '\e786';
+}
+.cicon-order-o:before {
+  content: '\e7b8';
+}
+.cicon-paint:before {
+  content: '\e75d';
+}
+.cicon-paint-o:before {
+  content: '\e75a';
+}
+.cicon-palette:before {
+  content: '\e696';
+}
+.cicon-palette-o:before {
+  content: '\e691';
+}
+.cicon-pause:before {
+  content: '\e669';
+}
+.cicon-pause-circle:before {
+  content: '\e678';
+}
+.cicon-person:before {
+  content: '\e679';
+}
+.cicon-person-add:before {
+  content: '\e668';
+}
+.cicon-person-add-o:before {
+  content: '\e66a';
+}
+.cicon-person-o:before {
+  content: '\e67d';
+}
+.cicon-person-pin-circle:before {
+  content: '\e66c';
+}
+.cicon-person-pin-circle-o:before {
+  content: '\e670';
+}
+.cicon-phone:before {
+  content: '\e6f0';
+}
+.cicon-phone-call:before {
+  content: '\e6d7';
+}
+.cicon-pic:before {
+  content: '\e756';
+}
+.cicon-pic-o:before {
+  content: '\e69e';
+}
+.cicon-pin-drop:before {
+  content: '\e648';
+}
+.cicon-pin-drop-o:before {
+  content: '\e655';
+}
+.cicon-place:before {
+  content: '\e651';
+}
+.cicon-place-o:before {
+  content: '\e650';
+}
+.cicon-play-arrow:before {
+  content: '\e66e';
+}
+.cicon-play-circle:before {
+  content: '\e674';
+}
+.cicon-play-circle-o:before {
+  content: '\e67f';
+}
+.cicon-popover:before {
+  content: '\e74e';
+}
+.cicon-popover-o:before {
+  content: '\e757';
+}
+.cicon-present:before {
+  content: '\e73a';
+}
+.cicon-present-o:before {
+  content: '\e711';
+}
+.cicon-progress:before {
+  content: '\e784';
+}
+.cicon-qq:before {
+  content: '\e7d9';
+}
+.cicon-qr-code-fill:before {
+  content: '\e767';
+}
+.cicon-qr-code-line:before {
+  content: '\e75e';
+}
+.cicon-quill:before {
+  content: '\e760';
+}
+.cicon-quill-o:before {
+  content: '\e761';
+}
+.cicon-radio:before {
+  content: '\e6d4';
+}
+.cicon-radiobox:before {
+  content: '\e763';
+}
+.cicon-radiobox-o:before {
+  content: '\e75b';
+}
+.cicon-recharge:before {
+  content: '\e71c';
+}
+.cicon-recharge-o:before {
+  content: '\e71d';
+}
+.cicon-record:before {
+  content: '\e7a4';
+}
+.cicon-record-o:before {
+  content: '\e7a6';
+}
+.cicon-redo:before {
+  content: '\e612';
+}
+.cicon-redpacket:before {
+  content: '\e7d3';
+}
+.cicon-redpacket-o:before {
+  content: '\e71a';
+}
+.cicon-refresh:before {
+  content: '\e611';
+}
+.cicon-repair:before {
+  content: '\e73f';
+}
+.cicon-repair-o:before {
+  content: '\e73e';
+}
+.cicon-repeat:before {
+  content: '\e617';
+}
+.cicon-replay:before {
+  content: '\e619';
+}
+.cicon-reply:before {
+  content: '\e618';
+}
+.cicon-reply-all:before {
+  content: '\e614';
+}
+.cicon-road-map:before {
+  content: '\e769';
+}
+.cicon-road-map-o:before {
+  content: '\e76a';
+}
+.cicon-round:before {
+  content: '\e716';
+}
+.cicon-round-angle:before {
+  content: '\e6f5';
+}
+.cicon-round-angle-o:before {
+  content: '\e6f6';
+}
+.cicon-round-arrow-line:before {
+  content: '\e734';
+}
+.cicon-round-box:before {
+  content: '\e604';
+}
+.cicon-safe:before {
+  content: '\e77f';
+}
+.cicon-safe-check:before {
+  content: '\e875';
+}
+.cicon-safe-check-o:before {
+  content: '\e876';
+}
+.cicon-safe-flash:before {
+  content: '\e783';
+}
+.cicon-safe-flash-o:before {
+  content: '\e775';
+}
+.cicon-safe-key:before {
+  content: '\e76c';
+}
+.cicon-safe-key-o:before {
+  content: '\e766';
+}
+.cicon-safe-o:before {
+  content: '\e77e';
+}
+.cicon-save:before {
+  content: '\e677';
+}
+.cicon-save-o:before {
+  content: '\e684';
+}
+.cicon-scan:before {
+  content: '\e703';
+}
+.cicon-scissors:before {
+  content: '\e762';
+}
+.cicon-search:before {
+  content: '\e6f7';
+}
+.cicon-search-line:before {
+  content: '\e771';
+}
+.cicon-searchlist:before {
+  content: '\e720';
+}
+.cicon-search-o:before {
+  content: '\e782';
+}
+.cicon-search-sm:before {
+  content: '\e631';
+}
+.cicon-service:before {
+  content: '\e73d';
+}
+.cicon-service-fill:before {
+  content: '\e704';
+}
+.cicon-service-o:before {
+  content: '\e721';
+}
+.cicon-set:before {
+  content: '\e773';
+}
+.cicon-set-list:before {
+  content: '\e76f';
+}
+.cicon-set-o:before {
+  content: '\e774';
+}
+.cicon-settings:before {
+  content: '\e77a';
+}
+.cicon-settings-o:before {
+  content: '\e780';
+}
+.cicon-share:before {
+  content: '\e6c5';
+}
+.cicon-share-line-o:before {
+  content: '\e74d';
+}
+.cicon-shengji:before {
+  content: '\e747';
+}
+.cicon-shopping-cart:before {
+  content: '\e685';
+}
+.cicon-shopping-cart-o:before {
+  content: '\e676';
+}
+.cicon-show:before {
+  content: '\e785';
+}
+.cicon-show-o:before {
+  content: '\e787';
+}
+.cicon-shuffle:before {
+  content: '\e61a';
+}
+.cicon-sip:before {
+  content: '\e764';
+}
+.cicon-sip-o:before {
+  content: '\e765';
+}
+.cicon-skip-next:before {
+  content: '\e6dd';
+}
+.cicon-skip-previous:before {
+  content: '\e6d6';
+}
+.cicon-slack:before {
+  content: '\e87b';
+}
+.cicon-slack-square:before {
+  content: '\e891';
+}
+.cicon-sort:before {
+  content: '\e6bf';
+}
+.cicon-sort-order:before {
+  content: '\e6fe';
+}
+.cicon-sound:before {
+  content: '\e77b';
+}
+.cicon-sponsor:before {
+  content: '\e77c';
+}
+.cicon-sponsor-o:before {
+  content: '\e77d';
+}
+.cicon-star:before {
+  content: '\e683';
+}
+.cicon-star-half:before {
+  content: '\e67c';
+}
+.cicon-star-o:before {
+  content: '\e67b';
+}
+.cicon-stock:before {
+  content: '\e789';
+}
+.cicon-stop:before {
+  content: '\e6db';
+}
+.cicon-store:before {
+  content: '\e7ac';
+}
+.cicon-store-0:before {
+  content: '\e7ab';
+}
+.cicon-store-2:before {
+  content: '\e7a7';
+}
+.cicon-store-2-o:before {
+  content: '\e7a5';
+}
+.cicon-sub-left:before {
+  content: '\e60b';
+}
+.cicon-sub-right:before {
+  content: '\e60f';
+}
+.cicon-subtitles:before {
+  content: '\e6da';
+}
+.cicon-subtitles-o:before {
+  content: '\e6d8';
+}
+.cicon-sync-alt:before {
+  content: '\e613';
+}
+.cicon-tag:before {
+  content: '\e751';
+}
+.cicon-tag-o:before {
+  content: '\e752';
+}
+.cicon-taobao:before {
+  content: '\e712';
+}
+.cicon-terminal:before {
+  content: '\e7c1';
+}
+.cicon-terminal-o:before {
+  content: '\e7c2';
+}
+.cicon-thumb-down:before {
+  content: '\e6c1';
+}
+.cicon-thumb-down-o:before {
+  content: '\e6c9';
+}
+.cicon-thumb-up:before {
+  content: '\e6c6';
+}
+.cicon-thumb-up-line:before {
+  content: '\e71b';
+}
+.cicon-thumb-up-line-o:before {
+  content: '\e6eb';
+}
+.cicon-thumb-up-o:before {
+  content: '\e6cb';
+}
+.cicon-ticket:before {
+  content: '\e800';
+}
+.cicon-ticket-o:before {
+  content: '\e701';
+}
+.cicon-time:before {
+  content: '\e6f8';
+}
+.cicon-time-o:before {
+  content: '\e6f9';
+}
+.cicon-timer:before {
+  content: '\e69c';
+}
+.cicon-title:before {
+  content: '\e82f';
+}
+.cicon-titles:before {
+  content: '\e745';
+}
+.cicon-toggle:before {
+  content: '\e706';
+}
+.cicon-toggle-o:before {
+  content: '\e733';
+}
+.cicon-topbar:before {
+  content: '\e788';
+}
+.cicon-translate:before {
+  content: '\e79a';
+}
+.cicon-tree:before {
+  content: '\e659';
+}
+.cicon-Tt:before {
+  content: '\e7a2';
+}
+.cicon-twiter:before {
+  content: '\e6e8';
+}
+.cicon-cicon-community-o:before {
+  content: '\e6df';
+}
+.cicon-undo:before {
+  content: '\e61b';
+}
+.cicon-unfold-less:before {
+  content: '\e60e';
+}
+.cicon-unfold-more:before {
+  content: '\e609';
+}
+.cicon-upstage:before {
+  content: '\e724';
+}
+.cicon-upstage-o:before {
+  content: '\e725';
+}
+.cicon-view-agenda:before {
+  content: '\e639';
+}
+.cicon-view-array:before {
+  content: '\e636';
+}
+.cicon-view-carousel:before {
+  content: '\e638';
+}
+.cicon-view-column:before {
+  content: '\e632';
+}
+.cicon-view-day:before {
+  content: '\e627';
+}
+.cicon-view-headline:before {
+  content: '\e62b';
+}
+.cicon-view-list:before {
+  content: '\e63c';
+}
+.cicon-view-module:before {
+  content: '\e629';
+}
+.cicon-view-quilt:before {
+  content: '\e630';
+}
+.cicon-volume:before {
+  content: '\e6c4';
+}
+.cicon-volume-off:before {
+  content: '\e6cd';
+}
+.cicon-warn:before {
+  content: '\e662';
+}
+.cicon-warn-o:before {
+  content: '\e675';
+}
+.cicon-wechat-pay:before {
+  content: '\e7e6';
+}
+.cicon-weibo-fill:before {
+  content: '\e7e4';
+}
+.cicon-weibo-o:before {
+  content: '\e7e3';
+}
+.cicon-weixin:before {
+  content: '\e6de';
+}
+.cicon-whatshot:before {
+  content: '\e6ca';
+}
+.cicon-whatshot-o:before {
+  content: '\e6d0';
+}
+.cicon-wifi:before {
+  content: '\e6d2';
+}
+.cicon-wifi-off:before {
+  content: '\e6d3';
+}
+.cicon-yamaxun:before {
+  content: '\e7b7';
+}
+.cicon-zuoji:before {
+  content: '\e754';
+}
diff --git a/sheep/scss/icon/_icon.scss b/sheep/scss/icon/_icon.scss
new file mode 100644
index 0000000..f277fc8
--- /dev/null
+++ b/sheep/scss/icon/_icon.scss
@@ -0,0 +1,181 @@
+@font-face {
+  font-family: 'colorui'; /* Project id 2620914 */
+  src: url('data:application/x-font-woff2;charset=utf-8;base64,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')
+    format('woff2');
+  /* #ifdef MP-ALIPAY */
+  src: url('//at.alicdn.com/t/font_2620914_57y9q5zpbel.woff?t=1624238023908') format('woff'),
+    url('//at.alicdn.com/t/font_2620914_57y9q5zpbel.ttf?t=1624238023908') format('truetype');
+  /* #endif */
+}
+
+[class*='_icon-'] {
+  font-family: 'colorui' !important;
+  display: inline-block;
+}
+@font-face {
+  font-family: 'ui-num';
+  src: url('data:application/x-font-ttf;base64,AAEAAAAKAIAAAwAgT1MvMla+dCkAAACsAAAAYGNtYXAQUxhKAAABDAAAAVJnbHlmS86JUQAAAmAAAAUUaGVhZA7I1xIAAAd0AAAANmhoZWEFqgF3AAAHrAAAACRobXR4BycBzgAAB9AAAAAibG9jYQZmB5wAAAf0AAAAHG1heHAAEQBDAAAIEAAAACBuYW1lGVKlzAAACDAAAAGtcG9zdADDAJYAAAngAAAAPAAEAewBkAAFAAACmQLMAAAAjwKZAswAAAHrADMBCQAAAgAGAwAAAAAAAAAAAAEQAAAAAAAAAAAAAABQZkVkAMAALAA5Ayz/LABcAywA1AAAAAEAAAAAAxgAAAAAACAAAQAAAAMAAAADAAAAHAABAAAAAABMAAMAAQAAABwABAAwAAAACAAIAAIAAAAsAC4AOf//AAAALAAuADD////V/9T/0wABAAAAAAAAAAAAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAgADBAUGBwgJCgsMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAiAAABMgKqAAMABwAANxEhESczESMiARDuzMwAAqr9ViICZgAAAAEAUP9hAMcAdwADAAAXNSMRx3c9tP7qAAEAUAAAAM0AfQADAAA3NSMVzX0AfX0AAAIAPv/6AeMC3wASACQAACUDJicmJwYHBgcRFhcWFzY3NjcHFAcGByYnJjURNDc2NxYXFhUB7wwCPDxZWTs7AwM7O1lZPDwOdB0bMzIbHBwbMjMbHdABPmM3NgEBNjdj/r1jNzYBATY3aAI2ICABASAgNgE9Nx8gAQEgHzcAAAAAAQB1AAABbALZAAYAACURIwcVNxEBbGmOjgAC2Xt0ff2ZAAAAAQBBAAAB6ALfAB4AACU1IRM2NzY1JicmJwYHBgczNjc2FxYXFhUUBwYHARUB6P7X5SIREQE5OV9fOjkCaAIfHywzGxwJCRX+6ABdARgoJCIvYDY2AQE3N189GhsBAR4dMxoYFhn+q10AAAAAAQAr//gB6QLgADUAACUmJyYnNjc2NSYnJicGBwYHMzY3NjMyFxYXFAcGByMVMxYXFhUGBwYjIicmJyMWFxY3Mjc2NwH1DRocLysYGAI5O15ZOzwGaQQcHTAuHh8BGxw4ERE+Hh4BISE0LyIhBWgGQD9aXkA/DtI+KioVFCcmOl03NwEBNDNeMRscHRw4Mh0eAVsBHyA4Oh8gGxk7azEyATU1bwABACQAAAH+AtkADgAAJTUjNSMVIwEjARUhFTM1Af5OZbUBAHH+/wEnZW5hqqoCCv32YW5uAAAAAAEAQf/5AewC2QA3AAAlJicmJyYnJiMiBwYHNSE1IREzNjc2NxYXFgcWBwYHBgcGIyInJicjFhcWFxYXFhc2NzY3Njc2NwH2Cg0MKBcgISsoHx8TASv+d18IGhosPRgWAQEHBhcOExMYMRkaBmgCDAwdFygoNDYmJRknDAwK+i4yMioXDAwLCxTBXf5yGxMSAQErKkIlIiIXDwcHGxkxJiQjHhgQDwEBDxEYKDAvQQAAAgA5//oB6ALZABcAKAAAJSYnJiciBwYHEyMDBgcGFRYXFhc2NzY3BwYHBgcmJyYnNjc2MxYXFhcB9A42NlERERAPnW+mGQ4QAjs7YGE6Og5rCh4eMzIdHgEBHh0yNR0eCd1cOTgBAgMGATn+ri8sLCxmOjkBATs8awJAISIBASIhOzshIgEjIzIAAAABAEEAAAHzAtkACAAAATUhFTM1MwMzAfP+TmTe9XECfF3Qc/2EAAAAAwAw//oB8gLfACAAMQBCAAAlJicmJzY3NjcmJyYnBgcGBxYXFhcGBwYHFhcWFzY3NjcnBgcGByYnJic2NzY3FhcWFwMGBwYHJicmJzY3NjcWFxYXAf4NHh4oJRkZAQI7PFxbOzwCARoZJCceHgECQD5gYT9ADmwLIiA1NCEhAQEhITQ1ICILDAoeHTEwHR0BAR0dMDEdHgrTOyoqFxUnJzpcNjYBATY2XDonJxUXKipAZTc3AQE3N2oCOSIiAQEiIjQ0IiMBASMiLwFKPh4eAQEeHjEyHh8BAR8eJQAAAAACADkAAAHoAt8AFwAoAAABJicmJwYHBgcWFxYXMjc2NwMzEzY3NjcHBgcGIyYnJjU2NzY3FhcWFwH0Djo7YWA6OwICNjZRERERDpxvphkODwxrCh4eMzQdHQEeHTIzHh4KAhJaOTkBATs8ZmE5OAEDAgb+xwFSLywsOQNHISIBIyM3OyIhAQEhIi8AAAEAAAABAADHiynwXw889QALBAAAAAAA1sTJ5wAAAADWxMntACL/YQH+AuAAAAAIAAIAAAAAAAAAAQAAAyz/LABcAiIAIgAkAf4AAQAAAAAAAAAAAAAAAAAAAAQBdgAiARcAUAEdAFACIgA+AHUAQQArACQAQQA5AEEAMAA5AAAAAAAUACAALABsAH4AtAEGASIBegHAAdQCRAKKAAEAAAANAEMAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAJYAAQAAAAAAAQAKAAAAAQAAAAAAAgAGAAoAAQAAAAAAAwAbABAAAQAAAAAABAAKACsAAQAAAAAABQAeADUAAQAAAAAABgAKAFMAAwABBAkAAQAUAF0AAwABBAkAAgAMAHEAAwABBAkAAwA2AH0AAwABBAkABAAUALMAAwABBAkABQA8AMcAAwABBAkABgAUAQNmb250ZWRpdG9yTWVkaXVtRm9udEVkaXRvciAxLjAgOiBmb250ZWRpdG9yZm9udGVkaXRvclZlcnNpb24gMS4wOyBGb250RWRpdG9yICh2MS4wKWZvbnRlZGl0b3IAZgBvAG4AdABlAGQAaQB0AG8AcgBNAGUAZABpAHUAbQBGAG8AbgB0AEUAZABpAHQAbwByACAAMQAuADAAIAA6ACAAZgBvAG4AdABlAGQAaQB0AG8AcgBmAG8AbgB0AGUAZABpAHQAbwByAFYAZQByAHMAaQBvAG4AIAAxAC4AMAA7ACAARgBvAG4AdABFAGQAaQB0AG8AcgAgACgAdgAxAC4AMAApAGYAbwBuAHQAZQBkAGkAdABvAHIAAAAAAgAAAAAAAAAyAAAAAAAAAAAAAAAAAAAAAAAAAAAADQANAAAADwARABMAFAAVABYAFwAYABkAGgAbABw=')
+    format('woff2');
+  font-weight: normal;
+  font-style: normal;
+}
+
+._icon-checkbox:before {
+  content: '\e713';
+}
+
+._icon-box:before {
+  content: '\e714';
+}
+
+._icon-checkbox-o:before {
+  content: '\e715';
+}
+
+._icon-round:before {
+  content: '\e716';
+}
+
+._icon-home-o:before {
+  content: '\e70a';
+}
+
+._icon-home:before {
+  content: '\e70d';
+}
+
+._icon-edit:before {
+  content: '\e649';
+}
+
+._icon-close:before {
+  content: '\e6ed';
+}
+
+._icon-check-round:before {
+  content: '\e6f1';
+}
+
+._icon-check-round-o:before {
+  content: '\e6f2';
+}
+
+._icon-close-round:before {
+  content: '\e6f3';
+}
+
+._icon-close-round-o:before {
+  content: '\e6f4';
+}
+
+._icon-waiting:before {
+  content: '\e6f8';
+}
+
+._icon-waiting-o:before {
+  content: '\e6f9';
+}
+
+._icon-warn:before {
+  content: '\e662';
+}
+
+._icon-warn-o:before {
+  content: '\e675';
+}
+
+._icon-more:before {
+  content: '\e688';
+}
+
+._icon-delete:before {
+  content: '\e707';
+}
+
+._icon-delete-o:before {
+  content: '\e709';
+}
+
+._icon-add-round:before {
+  content: '\e717';
+}
+
+._icon-add-round-o:before {
+  content: '\e718';
+}
+
+._icon-add:before {
+  content: '\e6e4';
+}
+
+._icon-info:before {
+  content: '\e6ef';
+}
+
+._icon-info-o:before {
+  content: '\e705';
+}
+
+._icon-move:before {
+  content: '\e768';
+}
+
+._icon-title:before {
+  content: '\e82f';
+}
+
+._icon-titles:before {
+  content: '\e745';
+}
+
+._icon-loading:before {
+  content: '\e746';
+}
+
+._icon-copy-o:before {
+  content: '\e7bc';
+}
+
+._icon-copy:before {
+  content: '\e85c';
+}
+
+._icon-loader:before {
+  content: '\e76d';
+}
+
+._icon-search:before {
+  content: '\e782';
+}
+
+._icon-back:before {
+  content: '\e600';
+}
+
+._icon-forward:before {
+  content: '\e601';
+}
+
+._icon-arrow:before {
+  content: '\e608';
+}
+
+._icon-drop-down:before {
+  content: '\e61c';
+}
+
+._icon-drop-up:before {
+  content: '\e61d';
+}
+
+._icon-check:before {
+  content: '\e69f';
+}
+
+._icon-move-round:before {
+  content: '\e602';
+}
+
+._icon-move-round-o:before {
+  content: '\e603';
+}
diff --git a/sheep/scss/icon/_sheepicon.scss b/sheep/scss/icon/_sheepicon.scss
new file mode 100644
index 0000000..cf7ea08
--- /dev/null
+++ b/sheep/scss/icon/_sheepicon.scss
@@ -0,0 +1,94 @@
+@font-face {
+  font-family: 'sheepicon';
+  src: url('data:application/x-font-woff2;charset=utf-8;base64,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')
+    format('woff2');
+}
+
+[class*='sicon-'] {
+  font-family: 'sheepicon';
+  display: inline-block;
+}
+
+.sicon-edit:before {
+  content: '\e711';
+}
+
+.sicon-basic:before {
+  content: '\e712';
+}
+
+.sicon-home:before {
+  content: '\e70c';
+}
+
+.sicon-more:before {
+  content: '\e707';
+}
+
+.sicon-check-line:before {
+  content: '\e708';
+}
+
+.sicon-transport:before {
+  content: '\e709';
+}
+
+.sicon-goods-card:before {
+  content: '\e70a';
+}
+
+.sicon-collect:before {
+  content: '\e70b';
+}
+
+.sicon-warning-line:before {
+  content: '\e70d';
+}
+
+.sicon-score1:before {
+  content: '\e70e';
+}
+
+.sicon-score2:before {
+  content: '\e70f';
+}
+
+.sicon-goods-list:before {
+  content: '\e710';
+}
+
+.sicon-back:before {
+  content: '\e706';
+}
+
+.sicon-unchecked:before {
+  content: '\e703';
+}
+
+.sicon-warning-outline:before {
+  content: '\e6ff';
+}
+
+.sicon-question-outline:before {
+  content: '\e700';
+}
+
+.sicon-circlecheck:before {
+  content: '\e701';
+}
+
+.sicon-circleclose:before {
+  content: '\e702';
+}
+
+.sicon-delivery:before {
+  content: '\e6fd';
+}
+
+.sicon-orders:before {
+  content: '\e6fe';
+}
+
+.sicon-qrcode:before {
+  content: '\e6f9';
+}
diff --git a/sheep/scss/icon/_style.scss b/sheep/scss/icon/_style.scss
new file mode 100644
index 0000000..a2c4dc8
--- /dev/null
+++ b/sheep/scss/icon/_style.scss
@@ -0,0 +1,43 @@
+@import './icon'; //核心图标库
+@import './coloricon'; //扩展图标库
+@import './sheepicon';
+.icon-spin {
+  animation: icon-spin 2s infinite linear;
+}
+
+.icon-pulse {
+  animation: icon-spin 1s infinite steps(8);
+}
+
+@keyframes icon-spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(359deg);
+  }
+}
+.icon-90 {
+  transform: rotate(90deg);
+}
+.icon-180 {
+  transform: rotate(180deg);
+}
+.icon-270 {
+  transform: rotate(270deg);
+}
+.icon-x {
+  transform: scale(-1, 1);
+}
+.icon-y {
+  transform: scale(1, -1);
+}
+.icon-fw {
+  width: calc(18em / 14);
+  text-align: center;
+}
+@each $class, $value in $iconsize {
+  .icon-#{$class} {
+    transform: scale(#{$value});
+  }
+}
diff --git a/sheep/scss/index.scss b/sheep/scss/index.scss
new file mode 100644
index 0000000..c841956
--- /dev/null
+++ b/sheep/scss/index.scss
@@ -0,0 +1,27 @@
+@import './tools';
+@import './ui';
+
+/* 字体文件 */
+@font-face {
+  font-family: OPPOSANS;
+  src: url('~@/sheep/scss/font/OPPOSANS-M-subfont.ttf');
+}
+.font-OPPOSANS {
+  font-family: OPPOSANS;
+}
+page {
+  -webkit-overflow-scrolling: touch; // 解决ios滑动不流畅
+  height: 100%;
+  width: 100%;
+  // font-family: OPPOSANS;
+  word-break: break-all; //英文文本不换行
+  white-space: normal;
+  background-color: $bg-page;
+  color: $dark-3;
+}
+::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  color: transparent;
+  display: none;
+}
diff --git a/sheep/scss/style/_avatar.scss b/sheep/scss/style/_avatar.scss
new file mode 100644
index 0000000..e69de29
diff --git a/sheep/scss/style/_background.scss b/sheep/scss/style/_background.scss
new file mode 100644
index 0000000..775f37f
--- /dev/null
+++ b/sheep/scss/style/_background.scss
@@ -0,0 +1,204 @@
+/* ==================
+          背景
+ ==================== */
+/* -- 基础色 -- */
+@each $color, $value in map-merge($colors, $darks) {
+  .bg-#{$color} {
+    background-color: $value !important;
+    @if $color == 'yellow' {
+      color: #333333 !important;
+    } @else {
+      color: #ffffff !important;
+    }
+  }
+}
+
+/* -- 浅色 -- */
+@each $color, $value in $colors {
+  .bg-#{$color}-light {
+    background-image: linear-gradient(45deg, white, mix(white, $value, 85%)) !important;
+    color: $value !important;
+  }
+
+  .bg-#{$color}-thin {
+    background-color: rgba($value, var(--ui-BG-opacity)) !important;
+    color: $value !important;
+  }
+}
+
+/* -- 渐变色 -- */
+
+@each $color, $value in $colors {
+  @each $colorsub, $valuesub in $colors {
+    @if $color != $colorsub {
+      .bg-#{$color}-#{$colorsub} {
+        // background-color: $value !important;
+        background-image: linear-gradient(130deg, $value, $valuesub) !important;
+        color: #ffffff !important;
+      }
+    }
+  }
+}
+.bg-yellow-gradient {
+  background-image: linear-gradient(45deg, #f5fe00, #ff6600) !important;
+  color: $dark-3 !important;
+}
+.bg-orange-gradient {
+  background-image: linear-gradient(90deg, #ff6000, #fe832a) !important;
+  color: $white !important;
+}
+.bg-red-gradient {
+  background-image: linear-gradient(45deg, #f33a41, #ed0586) !important;
+  color: $white !important;
+}
+.bg-pink-gradient {
+  background-image: linear-gradient(45deg, #fea894, #ff1047) !important;
+  color: $white !important;
+}
+.bg-mauve-gradient {
+  background-image: linear-gradient(45deg, #c01f95, #7115cc) !important;
+  color: $white !important;
+}
+.bg-purple-gradient {
+  background-image: linear-gradient(45deg, #9829ea, #5908fb) !important;
+  color: $white !important;
+}
+.bg-blue-gradient {
+  background-image: linear-gradient(45deg, #00b8f9, #0166eb) !important;
+  color: $white !important;
+}
+.bg-cyan-gradient {
+  background-image: linear-gradient(45deg, #06edfe, #48b2fe) !important;
+  color: $white !important;
+}
+.bg-green-gradient {
+  background-image: linear-gradient(45deg, #3ab54a, #8cc63f) !important;
+  color: $white !important;
+}
+.bg-olive-gradient {
+  background-image: linear-gradient(45deg, #90e630, #39d266) !important;
+  color: $white !important;
+}
+.bg-grey-gradient {
+  background-image: linear-gradient(45deg, #9aadb9, #354855) !important;
+  color: $white !important;
+}
+.bg-brown-gradient {
+  background-image: linear-gradient(45deg, #ca6f2e, #cb1413) !important;
+  color: $white !important;
+}
+
+@each $color, $value in $grays {
+  .bg-#{$color} {
+    background-color: $value !important;
+    color: #333333 !important;
+  }
+}
+
+.bg-square {
+  @include bg-square;
+}
+.bg-none {
+  background: transparent !important;
+  color: inherit !important;
+}
+
+[class*='bg-mask'] {
+  position: relative;
+  //background: transparent !important;
+  color: #ffffff !important;
+  > view,
+  > text {
+    position: relative;
+    z-index: 1;
+    color: #ffffff;
+  }
+  &::before {
+    content: '';
+    border-radius: inherit;
+    width: 100%;
+    height: 100%;
+    @include position-center;
+    background-color: rgba(0, 0, 0, 0.4);
+    z-index: 0;
+  }
+  @at-root .bg-mask-80::before {
+    background: rgba(0, 0, 0, 0.8) !important;
+  }
+  @at-root .bg-mask-50::before {
+    background: rgba(0, 0, 0, 0.5) !important;
+  }
+  @at-root .bg-mask-20::before {
+    background: rgba(0, 0, 0, 0.2) !important;
+  }
+  @at-root .bg-mask-top::before {
+    background-color: rgba(0, 0, 0, 0);
+    background-image: linear-gradient(rgba(0, 0, 0, 1), rgba(0, 0, 0, 0.618), rgba(0, 0, 0, 0.01));
+  }
+  @at-root .bg-white-top {
+    background-color: rgba(0, 0, 0, 0);
+    background-image: linear-gradient(rgba(255, 255, 255, 1), rgba(255, 255, 255, 0.3));
+  }
+  @at-root .bg-mask-bottom::before {
+    background-color: rgba(0, 0, 0, 0);
+    background-image: linear-gradient(rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 0.618), rgba(0, 0, 0, 1));
+  }
+}
+.bg-img {
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+[class*='bg-blur'] {
+  position: relative;
+  > view,
+  > text {
+    position: relative;
+    z-index: 1;
+  }
+  &::before {
+    content: '';
+    width: 100%;
+    height: 100%;
+    @include position-center;
+    border-radius: inherit;
+    transform-origin: 0 0;
+    pointer-events: none;
+    box-sizing: border-box;
+  }
+}
+@supports (-webkit-backdrop-filter: blur(20px)) or (backdrop-filter: blur(20px)) {
+  .bg-blur::before {
+    @include blur;
+    background-color: var(--ui-Blur-1);
+  }
+  .bg-blur-1::before {
+    @include blur;
+    background-color: var(--ui-Blur-2);
+  }
+  .bg-blur-2::before {
+    @include blur;
+    background-color: var(--ui-Blur-3);
+  }
+}
+@supports not (backdrop-filter: blur(5px)) {
+  .bg-blur {
+    color: var(--ui-TC);
+    &::before {
+      background-color: var(--ui-BG);
+    }
+  }
+  .bg-blur-1 {
+    color: var(--ui-TC);
+    &::before {
+      background-color: var(--ui-BG-1);
+    }
+  }
+  .bg-blur-2 {
+    color: var(--ui-TC);
+    &::before {
+      background-color: var(--ui-BG-2);
+    }
+  }
+}
diff --git a/sheep/scss/style/_border.scss b/sheep/scss/style/_border.scss
new file mode 100644
index 0000000..4ef1d54
--- /dev/null
+++ b/sheep/scss/style/_border.scss
@@ -0,0 +1,140 @@
+/* ==================
+          边框
+ ==================== */
+/* -- 实线 -- */
+.border {
+  overflow: initial !important;
+  @at-root [class*='border'],
+    [class*='dashed'] {
+    position: relative;
+    &.dline {
+      --ui-Border: var(--ui-BG-3);
+    }
+    &::after {
+      content: ' ';
+      width: 200%;
+      height: 200%;
+      position: absolute;
+      z-index: 0;
+      top: 0;
+      left: 0;
+      transform: scale(0.5);
+      transform-origin: 0 0;
+      pointer-events: none;
+      box-sizing: border-box;
+      border-radius: inherit;
+    }
+    &.radius::after {
+      border-radius: calc(#{$radius} * 2);
+    }
+    &.round::after {
+      border-radius: #{$round-pill};
+    }
+  }
+  &::after {
+    border: 1px solid var(--ui-Border);
+  }
+  &s::after {
+    border: 4rpx solid var(--ui-Border);
+  }
+  &ss::after {
+    border: 8rpx solid var(--ui-Border);
+  }
+  @each $value in (top, right, bottom, left) {
+    &-#{$value}::after {
+      border-#{$value}: 1px solid var(--ui-Border);
+    }
+    &s-#{$value}::after {
+      border-#{$value}: 4rpx solid var(--ui-Border);
+    }
+    &ss-#{$value}::after {
+      border-#{$value}: 8rpx solid var(--ui-Border);
+    }
+  }
+}
+/* -- 虚线 -- */
+.dashed {
+  &::after {
+    border: 4rpx dashed var(--ui-Border);
+  }
+  &s::after {
+    border: 6rpx dashed var(--ui-Border);
+  }
+  @each $value in (top, right, bottom, left) {
+    &-#{$value}::after {
+      border-#{$value}: 4rpx dashed var(--ui-Border);
+    }
+    &s-#{$value}::after {
+      border-#{$value}: 6rpx dashed var(--ui-Border);
+    }
+  }
+}
+@each $color, $value in map-merge($colors, map-merge($darks, $grays)) {
+  .border-#{$color}::after,
+  .border-#{$color}[class*='-shine']::before {
+    border-color: $value !important;
+  }
+}
+@each $value in (a, b, c, d, e) {
+  .main-#{$value}-border::after,
+  .main-#{$value}-border[class*='-shine']::before {
+    border-color: var(--main-#{$value}) !important;
+  }
+}
+.dashed-shine,
+.dasheds-shine {
+  position: relative;
+  overflow: hidden;
+  &::after,
+  &::before {
+    border-style: dashed;
+    border-color: var(--ui-Border);
+    animation: shineafter 1s infinite linear;
+    width: calc(200% + 40px);
+    height: 200%;
+    border-width: 2px 0;
+  }
+  &::before {
+    content: ' ';
+    position: absolute;
+    transform: scale(0.5);
+    transform-origin: 0 0;
+    pointer-events: none;
+    box-sizing: border-box;
+    animation: shinebefore 1s infinite linear;
+    width: 200%;
+    height: calc(200% + 40px);
+    border-width: 0 2px;
+  }
+}
+.dasheds-shine {
+  &::after,
+  &::before {
+    border-width: 4px 0;
+  }
+  &::before {
+    border-width: 0 4px;
+  }
+}
+
+@keyframes shineafter {
+  0% {
+    top: 0;
+    left: -22px;
+  }
+  100% {
+    top: 0px;
+    left: 0px;
+  }
+}
+
+@keyframes shinebefore {
+  0% {
+    top: -22px;
+    left: 0;
+  }
+  100% {
+    top: 0px;
+    left: 0px;
+  }
+}
diff --git a/sheep/scss/style/_button.scss b/sheep/scss/style/_button.scss
new file mode 100644
index 0000000..7069345
--- /dev/null
+++ b/sheep/scss/style/_button.scss
@@ -0,0 +1,87 @@
+.ui-btn-box {
+  display: inline-block;
+}
+.ui-btn {
+  position: relative;
+  border: 0rpx;
+  display: inline-block;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  padding: 0.7857em 1.5em 0.7857em;
+  font-size: 28rpx;
+  line-height: 1em;
+  text-align: center;
+  text-decoration: none;
+  overflow: visible;
+  margin: 0 0.25em 0 0;
+  transform: translate(0rpx, 0rpx);
+  border-radius: $radius;
+  white-space: nowrap;
+  color: var(--text-a);
+  background-color: var(--ui-BG);
+  vertical-align: baseline;
+  &:first-child:last-child {
+    margin: 0;
+  }
+  &:not([class*='round'])::after {
+    border-radius: calc(#{$radius} * 2);
+  }
+  &:not([class*='border'])::after {
+    // content: ' ';
+    // width: 200%;
+    // height: 200%;
+    // display: block;
+    // position: absolute;
+    // z-index: 0;
+    // top: 0;
+    // left: 0;
+    // transform: scale(0.5);
+    // transform-origin: 0 0;
+    // pointer-events: none;
+    // box-sizing: border-box;
+    display: none;
+  }
+  &.round::after {
+    border-radius: #{$round-pill};
+  }
+  &.icon {
+    padding: 0.8em 0.8em;
+  }
+
+  &.sm {
+    font-size: 24rpx;
+  }
+
+  &.lg {
+    font-size: 32rpx;
+  }
+
+  &.xl {
+    font-size: 36rpx;
+  }
+
+  &.block {
+    width: 100%;
+    display: block;
+    font-size: 32rpx;
+  }
+
+  &[disabled] {
+    opacity: 0.6;
+  }
+
+  &.none-style {
+    background-color: transparent !important;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    display: flex;
+  }
+}
+
+.ui-btn:not(.icon) [class*='icon-'] {
+  margin: 0 0.25em;
+}
diff --git a/sheep/scss/style/_card.scss b/sheep/scss/style/_card.scss
new file mode 100644
index 0000000..17aa6b3
--- /dev/null
+++ b/sheep/scss/style/_card.scss
@@ -0,0 +1,353 @@
+/* ==================
+         卡片
+ ==================== */
+
+.ui-cards {
+  display: block;
+  overflow: hidden;
+  & .ui-btn.badge {
+    top: 0;
+    right: 0;
+    font-size: 24rpx;
+    padding: 0rpx 15rpx;
+    height: 40rpx;
+  }
+  &.no-card > .ui-item {
+    margin: 0rpx;
+    border-radius: 0rpx;
+  }
+  & > .ui-item {
+    display: block;
+    overflow: hidden;
+    border-radius: 10rpx;
+    margin: 30rpx;
+  }
+  & > .ui-item.shadow-blur {
+    overflow: initial;
+  }
+  .grid.grid-square {
+    margin-bottom: -20rpx;
+  }
+  &.article {
+    display: block;
+    & > .ui-item {
+      padding: 30rpx;
+      background-color: var(--box-bg);
+      display: flex;
+      align-items: flex-start;
+    }
+    & > .time {
+      padding: 30rpx 0 0 30rpx;
+    }
+    & > .ui-item .title {
+      font-size: 30rpx;
+      font-weight: 900;
+      color: #333333;
+    }
+    & > .ui-item .content {
+      flex: 1;
+    }
+    & > .ui-item > image {
+      width: 240rpx;
+      height: 6.4em;
+      margin-left: 20rpx;
+      border-radius: 6rpx;
+    }
+    & > .ui-item .content .desc {
+      font-size: 12px;
+      color: var(--text-c);
+    }
+    & > .ui-item .content .text-content {
+      font-size: 28rpx;
+      color: #888;
+    }
+  }
+  &.case {
+    .image {
+      position: relative;
+      image {
+        width: 100%;
+        display: block;
+      }
+      .ui-tag {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+      .ui-bar {
+        position: absolute;
+        bottom: 0;
+        width: 100%;
+        background-color: transparent;
+        padding: 0rpx 30rpx;
+      }
+      .bg-black {
+        position: absolute;
+        bottom: 0;
+        width: 100%;
+        background-color: rgba(0, 0, 0, 0.6);
+      }
+    }
+    &.no-card .image {
+      margin: 30rpx 30rpx 0;
+      overflow: hidden;
+      border-radius: 10rpx;
+    }
+  }
+  &.dynamic {
+    display: block;
+    & > .ui-item {
+      display: block;
+      overflow: hidden;
+      & > .text-content {
+        padding: 0 30rpx 0;
+        font-size: 30rpx;
+        margin-bottom: 20rpx;
+      }
+      & .square-img {
+        width: 100%;
+        height: 200rpx;
+        border-radius: 6rpx;
+      }
+      & .only-img {
+        width: 100%;
+        height: 320rpx;
+        border-radius: 6rpx;
+      }
+    }
+  }
+  &.goods {
+    display: block;
+    & > .ui-item {
+      padding: 30rpx;
+      display: flex;
+      position: relative;
+      background-color: var(--ui-BG);
+      & + .ui-item {
+        border-top: 1rpx solid #eeeeee;
+      }
+      .content {
+        width: 410rpx;
+        padding: 0rpx;
+      }
+      .title {
+        font-size: 30rpx;
+        font-weight: 900;
+        color: #333333;
+        line-height: 1.4;
+        height: 1.4em;
+        overflow: hidden;
+      }
+    }
+    &.col-goods.col-twice {
+      display: flex;
+      flex-wrap: wrap;
+      padding-bottom: 30rpx;
+      & > .ui-item {
+        width: calc(50% - 30rpx);
+        margin: 20rpx 20rpx 0rpx 20rpx;
+        .content {
+          padding: 20rpx;
+        }
+      }
+      & > .ui-item:nth-child(2n) {
+        margin-left: 0rpx;
+      }
+    }
+    &.col-goods > .ui-item {
+      padding: 0rpx;
+      display: block;
+      border: 0px;
+      .content {
+        width: 100%;
+        padding: 30rpx;
+      }
+    }
+    &.no-card > .ui-item .content {
+      width: 470rpx;
+      padding: 0rpx;
+    }
+    &.no-card > .ui-item .title,
+    &.col-goods > .ui-item .title {
+      height: 3em;
+      overflow: hidden;
+    }
+    & > .ui-item .text-linecut-2 {
+      -webkit-line-clamp: 1;
+    }
+    &.no-card > .ui-item .text-linecut-2,
+    &.col-goods > .ui-item .text-linecut-2 {
+      -webkit-line-clamp: 2;
+      line-height: 1.6em;
+      height: 3.2em;
+    }
+    & > .ui-item > image {
+      width: 200rpx;
+      height: 200rpx;
+      margin-right: 20rpx;
+      border-radius: 6rpx;
+    }
+    &.no-card > .ui-item > image {
+      width: 220rpx;
+      height: 170rpx;
+    }
+    &.col-goods > .ui-item > image {
+      width: 100%;
+      height: 340rpx;
+      border-bottom-left-radius: 0rpx;
+      border-bottom-right-radius: 0rpx;
+      display: block;
+    }
+    &.col-goods.col-twice > .ui-item > image {
+      height: 236rpx;
+    }
+  }
+  &.loan {
+    display: block;
+    & > .ui-item {
+      padding: 30rpx 0 30rpx 30rpx;
+      display: flex;
+      position: relative;
+      background-color: var(--box-bg);
+
+      .content {
+        width: 450rpx;
+        padding: 0rpx;
+        .tag-list {
+          width: 450rpx;
+          display: flex;
+          flex-wrap: wrap;
+          font-size: 12px;
+          margin-top: 18rpx;
+        }
+      }
+      .action {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+      }
+    }
+  }
+  &.houses {
+    display: block;
+    & > .ui-item {
+      padding: 20rpx;
+      display: flex;
+      position: relative;
+      background-color: var(--box-bg);
+      .image {
+        width: 230rpx;
+        height: 180rpx;
+        margin-right: 20rpx;
+        border-radius: 6rpx;
+      }
+      .content {
+        width: 400rpx;
+        padding: 0rpx;
+        .tag-list {
+          width: 400rpx;
+          display: flex;
+          flex-wrap: wrap;
+          font-size: 12px;
+          margin-top: 10rpx;
+          .ui-item {
+            height: 20px;
+            line-height: 20px;
+          }
+        }
+      }
+      .action {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+      }
+    }
+  }
+
+  &.product {
+    display: flex;
+    flex-wrap: wrap;
+    padding-bottom: 30rpx;
+    & > .ui-item {
+      width: calc(100% - 15rpx);
+      margin: 20rpx 20rpx 0rpx 20rpx;
+      background-color: var(--box-bg);
+      position: relative;
+      box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+      // display: flex;
+      // flex-wrap: wrap;
+      .content {
+        padding: 20rpx;
+        // width: calc(100% - 345rpx);
+        .text-cut {
+          font-size: 16px;
+        }
+      }
+      .image {
+        width: 100%;
+        height: 240rpx;
+        border-radius: 6rpx 0 0 6rpx;
+        display: block;
+      }
+      .ui-progress-tag {
+        width: 4em;
+        text-align: right;
+        font-size: 12px;
+      }
+      .border-top {
+        width: 100%;
+      }
+      .ui-tag {
+        position: absolute;
+        top: 0;
+        left: 0;
+        border-radius: 6rpx 0 6rpx 0;
+      }
+    }
+    // & > .ui-item:nth-child(2n) {
+    // 	margin-left: 0rpx;
+    // }
+  }
+  &.shop {
+    display: flex;
+    flex-wrap: wrap;
+    padding-bottom: 30rpx;
+    & > .ui-item {
+      width: calc(50% - 30rpx);
+      margin: 20rpx 20rpx 0rpx 20rpx;
+      background-color: var(--box-bg);
+      padding: 20rpx;
+      .content {
+        margin-top: 15rpx;
+      }
+      .image {
+        width: 100%;
+        height: 285rpx;
+        border-radius: 6rpx;
+        display: block;
+      }
+    }
+    & > .ui-item:nth-child(2n) {
+      margin-left: 0rpx;
+    }
+  }
+
+  &.orders .ui-item {
+    margin-top: 30rpx;
+    .address-box {
+      padding: 15rpx;
+      margin: 0 30rpx 30rpx;
+      border: 1px solid;
+      border-color: var(--main-a);
+      border-radius: 10px;
+      position: relative;
+      .ui-form-group {
+        min-height: 10px;
+      }
+    }
+  }
+}
diff --git a/sheep/scss/style/_code.scss b/sheep/scss/style/_code.scss
new file mode 100644
index 0000000..5221c88
--- /dev/null
+++ b/sheep/scss/style/_code.scss
@@ -0,0 +1,55 @@
+.ui-code {
+  font-family: Monaco, Menlo, Consolas, 'Courier New';
+  font-size: 90%;
+  position: relative;
+  z-index: 1;
+  color: var(--ui-TC);
+  .ui-rich-text {
+    display: inline-block;
+  }
+
+  &.code {
+    display: inline-block;
+    padding: 0 10rpx;
+    margin: 0 10rpx;
+    border-radius: $radius-sm;
+    line-height: 1.6;
+    vertical-align: baseline;
+  }
+
+  &.pre {
+    display: block;
+    margin: 1em 0;
+    line-height: 1.6;
+    &.hasTitle {
+      margin: 3.2em 0 1em;
+    }
+    // border-radius: $radius-sm;
+    .ui-code-title {
+      position: absolute;
+      top: -2.2em;
+      color: var(--ui-TC-2);
+      left: 0;
+    }
+    .ui-rich-text {
+      padding: 40rpx;
+      white-space: pre-wrap;
+      word-break: break-all;
+      word-wrap: break-word;
+    }
+    .ui-scroll-view {
+      &.ui-scroll {
+        max-height: 500px;
+        white-space: pre;
+      }
+    }
+    .ui-copy-btn {
+      position: absolute;
+      z-index: 2;
+      top: 0;
+      right: 0;
+      padding: 0.8em;
+      border-radius: 0 $radius-sm 0 $radius-sm;
+    }
+  }
+}
diff --git a/sheep/scss/style/_flex.scss b/sheep/scss/style/_flex.scss
new file mode 100644
index 0000000..1daa45b
--- /dev/null
+++ b/sheep/scss/style/_flex.scss
@@ -0,0 +1,79 @@
+/* ==================
+		弹性布局
+ ==================== */
+.flex {
+  display: flex !important;
+  &-sub {
+    flex: 1 !important;
+  }
+  &-twice {
+    flex: 2 !important;
+  }
+  &-treble {
+    flex: 3 !important;
+  }
+  &-column {
+    flex-direction: column !important;
+  }
+  &-row {
+    flex-direction: row !important;
+  }
+  &-column-reverse {
+    flex-direction: column-reverse !important;
+  }
+  &-row-reverse {
+    flex-direction: row-reverse !important;
+  }
+  &-wrap {
+    flex-wrap: wrap !important;
+  }
+  &-center {
+    @include flex-center;
+  }
+  &-bar {
+    @include flex-bar;
+  }
+}
+.basis {
+  @each $class, $value in (xs: 20%, sm: 40%, df: 50%, lg: 60%, xl: 80%) {
+    &-#{$class} {
+      flex-basis: $value !important;
+    }
+  }
+}
+.align {
+  @each $class,
+    $value
+      in (start: flex-start, end: flex-end, center: center, stretch: stretch, baseline: baseline)
+  {
+    &-#{$class} {
+      align-items: $value !important;
+    }
+  }
+}
+.self {
+  @each $class,
+    $value
+      in (start: flex-start, end: flex-end, center: center, stretch: stretch, baseline: baseline)
+  {
+    &-#{$class} {
+      align-self: $value !important;
+    }
+  }
+}
+.justify {
+  @each $class,
+    $value
+      in (
+        start: flex-start,
+        end: flex-end,
+        center: center,
+        between: space-between,
+        around: space-around
+      )
+  {
+    &-#{$class} {
+      justify-content: $value !important;
+    }
+  }
+}
diff --git a/sheep/scss/style/_form.scss b/sheep/scss/style/_form.scss
new file mode 100644
index 0000000..91d3eb3
--- /dev/null
+++ b/sheep/scss/style/_form.scss
@@ -0,0 +1,121 @@
+/* ==================
+         表单
+ ==================== */
+.ui-form-item {
+  padding: 1rpx 24rpx;
+  display: flex;
+  align-items: center;
+  min-height: 100rpx;
+  justify-content: space-between;
+  .title {
+    text-align: justify;
+    padding-right: 30rpx;
+    font-size: 30rpx;
+    position: relative;
+    height: 60rpx;
+    line-height: 60rpx;
+  }
+  .content {
+    flex: 1;
+  }
+  input,
+  ui-input {
+    flex: 1;
+    font-size: 30rpx;
+    color: #555;
+    padding-right: 20rpx;
+  }
+  text[class*='icon-'] {
+    font-size: 36rpx;
+    padding: 0;
+    box-sizing: border-box;
+  }
+  textarea {
+    margin: 32rpx 0 30rpx;
+    height: 4.6em;
+    width: 100%;
+    line-height: 1.2em;
+    flex: 1;
+    font-size: 28rpx;
+    padding: 0;
+  }
+  picker,
+  .arrow {
+    flex: 1;
+    padding-right: 40rpx;
+    overflow: hidden;
+    position: relative;
+  }
+  picker .picker,
+  .arrow > view {
+    line-height: 100rpx;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    width: 100%;
+  }
+  picker::after,
+  .arrow::after {
+    font-family: 'ui';
+    display: block;
+    content: '\e605';
+    position: absolute;
+    font-size: 34rpx;
+    color: #8799a3;
+    line-height: 100rpx;
+    width: 60rpx;
+    text-align: center;
+    top: 0;
+    bottom: 0;
+    right: -20rpx;
+    margin: auto;
+  }
+  textarea[disabled],
+  textarea[disabled] .placeholder {
+    color: transparent;
+  }
+  &.align-start .title {
+    height: 1em;
+    margin-top: 32rpx;
+    line-height: 1em;
+  }
+  .grid-square {
+    > view {
+      background-color: #f8f8f8;
+      border-radius: 12rpx;
+      .mask {
+        background-color: rgba(0, 0, 0, 0.6);
+        position: absolute;
+        font-size: 20rpx;
+        color: #ffffff;
+        width: 100%;
+        bottom: 0;
+        text-align: center;
+        padding: 6rpx 0;
+        &.red-mask {
+          background-color: rgba(255, 80, 80, 0.6);
+        }
+      }
+      [class*='icon'] {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        transform: scale(1.5);
+        justify-content: center;
+      }
+      .text-gray {
+        position: absolute;
+        width: 100%;
+        font-size: 24rpx;
+        text-align: center;
+        bottom: 20rpx;
+      }
+    }
+  }
+}
+.disabled {
+  opacity: 0.6;
+  cursor: not-allowed !important;
+}
diff --git a/sheep/scss/style/_grid.scss b/sheep/scss/style/_grid.scss
new file mode 100644
index 0000000..b1b5230
--- /dev/null
+++ b/sheep/scss/style/_grid.scss
@@ -0,0 +1,103 @@
+/* ==================
+          栅栏
+ ==================== */
+@use 'sass:math';
+
+@mixin make_col($screen) {
+  @for $i from 1 through 12 {
+    .ui-col-#{$screen}-#{$i} {
+      width: calc(100% / 12 * #{$i});
+    }
+    .ui-cols-#{$screen}-#{$i} .ui-item {
+      width: calc(100% / #{$i});
+    }
+  }
+}
+.ui-container {
+  box-sizing: border-box;
+  margin-left: auto;
+  margin-right: auto;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  width: 100%;
+  max-width: 1440px;
+  &-fluid {
+    max-width: 100%;
+    padding-left: 0;
+    padding-right: 0;
+  }
+}
+.ui-grid {
+  display: flex;
+  flex-wrap: wrap;
+  &.multi-column {
+    display: block;
+    column-count: 2;
+    column-width: 0px;
+    column-gap: 0px;
+    > .ui-item {
+      break-inside: avoid;
+      padding: 0.001em;
+    }
+  }
+  &.grid-square {
+    overflow: hidden;
+    > .ui-item {
+      margin-right: 20rpx;
+      margin-bottom: 20rpx;
+      position: relative;
+      overflow: hidden;
+    }
+    @for $i from 1 through 12 {
+      &.ui-cols-#{$i} > .ui-item {
+        padding-bottom: calc((100% - #{20rpx * ($i - 1)}) / #{$i});
+        height: 0;
+        width: calc((100% - #{20rpx * ($i - 1)}) / #{$i});
+      }
+    }
+    @for $i from 1 through 12 {
+      &.ui-cols-#{$i} > .ui-item:nth-child(#{$i}n) {
+        margin-right: 0;
+      }
+    }
+  }
+}
+@for $i from 1 through 12 {
+  .ui-cols-#{$i} .ui-item {
+    width: calc(100% / #{$i});
+  }
+}
+@for $i from 1 through 12 {
+  .ui-col-#{$i} {
+    width: calc(100% / 12 * #{$i});
+  }
+}
+// 小屏
+@media screen and (min-width: 0px) {
+  @include make_col('xs');
+}
+
+// 小屏
+@media screen and (min-width: 320px) {
+  @include make_col('sm');
+}
+
+// 中屏
+@media screen and (min-width: 768px) {
+  @include make_col('md');
+}
+
+// 普通屏
+@media screen and (min-width: 1025px) {
+  @include make_col('lg');
+}
+
+// 大屏
+@media screen and (min-width: 1440px) {
+  @include make_col('xl');
+}
+
+// 超大屏
+@media screen and (min-width: 1920px) {
+  @include make_col('xxl');
+}
diff --git a/sheep/scss/style/_markdown.scss b/sheep/scss/style/_markdown.scss
new file mode 100644
index 0000000..37b023d
--- /dev/null
+++ b/sheep/scss/style/_markdown.scss
@@ -0,0 +1,62 @@
+.cu-markdown {
+  position: relative;
+  z-index: 1;
+  &.selectable {
+    cursor: auto;
+    user-select: text;
+  }
+  inline {
+    display: inline-block;
+  }
+
+  .list {
+    .list-item {
+      line-height: 1.8;
+      .list {
+        margin-left: 1.28571em;
+        .ui-title {
+          transform: scale(0.6);
+          &:before {
+            content: '\e716';
+          }
+        }
+      }
+    }
+    .list-item-p {
+      position: relative;
+      padding-left: 1.5em;
+      .list-item-t {
+        display: block;
+        width: 1.3em;
+        text-align: center;
+        position: absolute;
+        left: 0;
+      }
+    }
+  }
+  .md-table + .md-table {
+    margin-top: 30rpx;
+  }
+}
+
+.paragraph {
+  margin: 0 0 40rpx;
+  line-height: 1.8;
+}
+
+.blockquote {
+  @extend .paragraph;
+  padding: 20rpx 30rpx;
+  border-left-style: solid;
+  border-left-width: 10rpx;
+  border-color: var(--ui-Border);
+  background: none repeat scroll 0 0 rgba(102, 128, 153, 0.05);
+
+  .paragraph {
+    margin-bottom: 30rpx;
+  }
+
+  .paragraph:last-child {
+    margin-bottom: 0;
+  }
+}
diff --git a/sheep/scss/style/_menu.scss b/sheep/scss/style/_menu.scss
new file mode 100644
index 0000000..a4a8282
--- /dev/null
+++ b/sheep/scss/style/_menu.scss
@@ -0,0 +1,54 @@
+.ui-menu {
+  background-color: var(--ui-BG);
+}
+
+.ui-menu-item {
+  position: relative;
+  @include flex-bar;
+  min-height: 4em;
+  padding: 0 30rpx;
+  .ui-menu-item-icon {
+    width: 1.7em;
+    margin-right: 0.3em;
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transform: scale(1.3);
+  }
+  .ui-menu-item-icon .ui-menu-item-image {
+    width: 1.2em;
+    height: 1.2em;
+    display: inline-block;
+  }
+  .ui-menu-item-content {
+    flex: 1;
+    position: relative;
+    @include flex-bar;
+  }
+  .ui-menu-item-arrow {
+    width: 1.6em;
+    text-align: center;
+    color: var(--ui-TC-3);
+  }
+  &::after {
+    content: ' ';
+    width: calc(200% - 120rpx);
+    left: 30rpx;
+    position: absolute;
+    top: 0;
+    box-sizing: border-box;
+    height: 200%;
+    border-top: 1px solid var(--ui-Border);
+    border-radius: inherit;
+    transform: scale(1);
+    transform-origin: 0 0;
+    pointer-events: none;
+  }
+  &.first-item::after {
+    display: none;
+  }
+  &:first-child::after {
+    display: none;
+  }
+}
diff --git a/sheep/scss/style/_shadow.scss b/sheep/scss/style/_shadow.scss
new file mode 100644
index 0000000..27cb3f6
--- /dev/null
+++ b/sheep/scss/style/_shadow.scss
@@ -0,0 +1,90 @@
+/* ==================
+          阴影
+ ==================== */
+
+.shadow {
+  box-shadow: var(--ui-Shadow);
+  &-sm {
+    box-shadow: var(--ui-Shadow-sm);
+  }
+  &-lg {
+    box-shadow: var(--ui-Shadow-lg);
+  }
+  &-inset {
+    box-shadow: var(--ui-Shadow-inset);
+  }
+  @each $color, $value in $colors {
+    @at-root .shadow-#{$color} {
+      box-shadow: 0 0.5em 1em rgba($value, var(--ui-Shadow-opacity));
+    }
+    &-sm.shadow-#{$color} {
+      box-shadow: 0 0.125em 0.25em rgba($value, var(--ui-Shadow-opacity));
+    }
+    &-lg.shadow-#{$color} {
+      box-shadow: 0 1em 3em rgba($value, var(--ui-Shadow-opacity-lg));
+    }
+  }
+
+  &-warp {
+    position: relative;
+  }
+  &-warp:before,
+  &-warp:after {
+    position: absolute;
+    content: '';
+    bottom: -10rpx;
+    left: 20rpx;
+    width: calc(50% - #{40rpx});
+    height: 30rpx;
+    transform: skew(0deg, -6deg);
+    transform-origin: 50% 50%;
+    background-color: rgba(0, 0, 0, var(--ui-Shadow-opacity));
+    filter: blur(20rpx);
+    z-index: -1;
+    opacity: 0.5;
+  }
+  &-warp:after {
+    right: 20rpx;
+    left: auto;
+    transform: skew(0deg, 6deg);
+  }
+  &-blur {
+    position: relative;
+  }
+  &-blur::before {
+    content: '';
+    display: block;
+    background: inherit;
+    filter: blur(20rpx);
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0.5em;
+    left: 0.5em;
+    z-index: -1;
+    opacity: var(--ui-Shadow-opacity-lg);
+    transform-origin: 0 0;
+    border-radius: inherit;
+    transform: scale(1, 1);
+  }
+}
+.drop-shadow {
+  filter: drop-shadow(0 0 30rpx rgba(0, 0, 0, 0.1));
+  &-sm {
+    filter: drop-shadow(0 4rpx 4rpx rgba(0, 0, 0, 0.06));
+  }
+  &-lg {
+    filter: drop-shadow(0 30rpx 60rpx rgba(0, 0, 0, 0.2));
+  }
+  @each $color, $value in $colors {
+    @at-root .drop-shadow-#{$color} {
+      filter: drop-shadow(0 15rpx 15rpx rgba(darken($value, 10%), 0.3));
+    }
+    &-sm.drop-shadow-#{$color} {
+      filter: drop-shadow(0 4rpx 4rpx rgba(darken($value, 10%), 0.3));
+    }
+    &-lg.drop-shadow-#{$color} {
+      filter: drop-shadow(0 50rpx 100rpx rgba(darken($value, 10%), 0.2));
+    }
+  }
+}
diff --git a/sheep/scss/style/_table.scss b/sheep/scss/style/_table.scss
new file mode 100644
index 0000000..ad5effa
--- /dev/null
+++ b/sheep/scss/style/_table.scss
@@ -0,0 +1,133 @@
+.ui-table {
+  background-color: var(--ui-BG);
+  max-width: 100%;
+  display: table;
+  &.table-full {
+    width: 100%;
+  }
+  &.table-radius {
+    border-radius: $radius;
+    .ui-table-header {
+      .ui-table-tr {
+        border-top-left-radius: $radius;
+        border-top-right-radius: $radius;
+      }
+      .ui-table-th {
+        &:first-child {
+          border-top-left-radius: $radius;
+        }
+        &:last-child {
+          border-top-right-radius: $radius;
+        }
+      }
+    }
+  }
+  .ui-table-header {
+    display: table-header-group;
+    .ui-table-th {
+      font-weight: bold;
+      border-bottom: 1px solid var(--ui-Border);
+      white-space: nowrap;
+
+      padding: 1em 0.8em;
+    }
+  }
+
+  .ui-table-tr {
+    display: table-row;
+    z-index: 1;
+  }
+
+  .ui-table-body {
+    display: table-row-group;
+    position: relative;
+    .ui-table-tr:hover {
+      background-color: var(--ui-BG-1) !important;
+    }
+    .ui-table-loading {
+      min-height: 300px;
+      position: absolute !important;
+      width: 100%;
+      height: 100%;
+      z-index: 2;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border: 1px solid var(--ui-Border);
+    }
+  }
+
+  .ui-table-td,
+  .ui-table-th {
+    display: table-cell;
+    text-align: unset;
+    padding: 0.5em 0.8em;
+    // font-size: 90%;
+    vertical-align: middle;
+  }
+}
+
+.ui-table.table-border {
+  &,
+  & .ui-table-td,
+  & .ui-table-th {
+    position: relative;
+    &::after {
+      content: ' ';
+      width: 200%;
+      height: 200%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      border-radius: inherit;
+      transform: scale(0.5);
+      transform-origin: 0 0;
+      pointer-events: none;
+      box-sizing: border-box;
+      border: 1px solid var(--ui-Border);
+      z-index: 1;
+    }
+  }
+  .ui-table-td,
+  .ui-table-th {
+    &::after {
+      border-width: 1px 1px 0 0;
+    }
+    &:last-child::after {
+      border-right: none;
+    }
+  }
+}
+.ui-table.table-radius {
+  &::after {
+    border-radius: calc(#{$radius} * 2);
+  }
+  & .ui-table-tr .ui-table-th:first-child {
+    border-top-left-radius: calc(#{$radius} * 2);
+  }
+  & .ui-table-tr .ui-table-th:last-child {
+    border-top-right-radius: calc(#{$radius} * 2);
+  }
+  & .ui-table-tr:last-child .ui-table-td:first-child {
+    border-bottom-left-radius: #{$radius};
+  }
+  & .ui-table-tr:last-child .ui-table-td:last-child {
+    border-bottom-right-radius: #{$radius};
+  }
+}
+.ui-table.table-striped > .ui-table-body > .ui-table-tr:nth-child(2n + 1),
+.ui-table.table-striped > .ui-table-body > .ui-table-tr:nth-child(2n + 1) {
+  background-color: var(--ui-BG-1);
+}
+
+.table-responsive {
+  width: inherit;
+  height: 100%;
+  max-width: 100%;
+  overflow: hidden;
+  box-sizing: border-box;
+  .table-responsive-box {
+    position: relative;
+    overflow: hidden;
+  }
+}
diff --git a/sheep/scss/style/_tag.scss b/sheep/scss/style/_tag.scss
new file mode 100644
index 0000000..e69de29
diff --git a/sheep/scss/style/_text.scss b/sheep/scss/style/_text.scss
new file mode 100644
index 0000000..8249022
--- /dev/null
+++ b/sheep/scss/style/_text.scss
@@ -0,0 +1,104 @@
+/* ==================
+          文本
+ ==================== */
+@use 'sass:math';
+.font-0 {
+  font-size: 24rpx;
+  --textSize: -4rpx;
+}
+.font-1 {
+  font-size: 28rpx;
+  --textSize: 0rpx;
+}
+.font-2 {
+  font-size: 32rpx;
+  --textSize: 4rpx;
+}
+.font-3 {
+  font-size: 36rpx;
+  --textSize: 8rpx;
+}
+.font-4 {
+  font-size: 40rpx;
+  --textSize: 12rpx;
+}
+.text {
+  @each $class, $value in $fontsize {
+    &-#{$class},
+    &-#{math.div($value ,2)} {
+      font-size: calc(#{$value}rpx + var(--textSize)) !important;
+    }
+  }
+  &-cut {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  @at-root [class*='text-linecut'] {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+    word-break: break-all;
+  }
+  @for $i from 2 through 10 {
+    &-linecut-#{$i} {
+      -webkit-line-clamp: #{$i};
+    }
+  }
+  &-justify {
+    text-align: justify;
+  }
+  &-justify-line {
+    text-align: justify;
+    line-height: 0.5em;
+    margin-top: 0.5em;
+    &::after {
+      content: '.';
+      display: inline-block;
+      width: 100%;
+    }
+  }
+
+  &-Abc {
+    text-transform: Capitalize !important;
+  }
+  &-ABC {
+    text-transform: Uppercase !important;
+  }
+  &-abc {
+    text-transform: Lowercase !important;
+  }
+  &-del,
+  &-line {
+    text-decoration: line-through !important;
+  }
+  &-bottomline {
+    text-decoration: underline !important;
+  }
+  &-italic {
+    font-style: italic !important;
+  }
+  &-style-none {
+    text-decoration: none !important;
+  }
+  &-break {
+    word-break: break-word !important;
+    overflow-wrap: break-word !important;
+  }
+  &-reset {
+    color: inherit !important;
+  }
+  &-price::before {
+    content: '¥';
+    font-size: 80%;
+    margin-right: 4rpx;
+  }
+  &-hide {
+    font: 0/0 a;
+    color: transparent;
+    text-shadow: none;
+    background-color: transparent;
+    border: 0;
+  }
+}
diff --git a/sheep/scss/theme/_dark.scss b/sheep/scss/theme/_dark.scss
new file mode 100644
index 0000000..8caad17
--- /dev/null
+++ b/sheep/scss/theme/_dark.scss
@@ -0,0 +1,39 @@
+// 核心主题样式文件
+@mixin theme-dark {
+  // 背景色
+  --ui-BG: #393939;
+  --ui-BG-1: #333333;
+  --ui-BG-2: #2c2c2c;
+  --ui-BG-3: #292929;
+  --ui-BG-4: #222222;
+
+  // 文本色
+  --ui-TC: #ffffff;
+  --ui-TC-1: #d4d4d4;
+  --ui-TC-2: #919191;
+  --ui-TC-3: #6a6a6a;
+  --ui-TC-4: #474747;
+
+  // 模糊
+  --ui-Blur: rgba(38, 38, 38, 0.98);
+  --ui-Blur-1: rgba(38, 38, 38, 0.75);
+  --ui-Blur-2: rgba(38, 38, 38, 0.25);
+  --ui-Blur-3: rgba(38, 38, 38, 0.05);
+
+  // 边框
+  --ui-Border: rgba(119, 119, 119, 0.25);
+  --ui-Outline: rgba(255, 255, 255, 0.1);
+  --ui-Line: rgba(119, 119, 119, 0.25);
+
+  // 透明与阴影
+  --ui-Shadow: 0 0.5em 1em rgba(0, 0, 0, 0.45);
+  --ui-Shadow-sm: 0 0.125em 0.25em rgba(0, 0, 0, 0.475);
+  --ui-Shadow-lg: 0 1em 3em rgba(0, 0, 0, 0.475);
+  --ui-Shadow-inset: inset 0 1px 2px rgba(0, 0, 0, 0.475);
+
+  --ui-Shadow-opacity: 0.55;
+  --ui-Shadow-opacity-sm: 0.175;
+  --ui-Shadow-opacity-lg: 0.75;
+
+  --ui-BG-opacity: 0.1;
+}
diff --git a/sheep/scss/theme/_light.scss b/sheep/scss/theme/_light.scss
new file mode 100644
index 0000000..af5f245
--- /dev/null
+++ b/sheep/scss/theme/_light.scss
@@ -0,0 +1,39 @@
+// 核心主题样式文件
+@mixin theme-light {
+  // 背景色
+  --ui-BG: #ffffff;
+  --ui-BG-1: #f6f6f6;
+  --ui-BG-2: #f1f1f1;
+  --ui-BG-3: #e8e8e8;
+  --ui-BG-4: #e0e0e0;
+
+  // 文本色
+  --ui-TC: #303030;
+  --ui-TC-1: #525252;
+  --ui-TC-2: #777777;
+  --ui-TC-3: #9e9e9e;
+  --ui-TC-4: #c6c6c6;
+
+  // 模糊
+  --ui-Blur: rgba(255, 255, 255, 0.98);
+  --ui-Blur-1: rgba(255, 255, 255, 0.75);
+  --ui-Blur-2: rgba(255, 255, 255, 0.25);
+  --ui-Blur-3: rgba(255, 255, 255, 0.05);
+
+  // 边框
+  --ui-Border: rgba(119, 119, 119, 0.25);
+  --ui-Outline: rgba(0, 0, 0, 0.1);
+  --ui-Line: rgba(119, 119, 119, 0.25);
+
+  // 透明与阴影
+  --ui-Shadow: 0 0.5em 1em rgba(0, 0, 0, 0.15);
+  --ui-Shadow-sm: 0 0.125em 0.25em rgba(0, 0, 0, 0.075);
+  --ui-Shadow-lg: 0 1em 3em rgba(0, 0, 0, 0.175);
+  --ui-Shadow-inset: inset 0 0.1em 0.2em rgba(0, 0, 0, 0.075);
+
+  --ui-Shadow-opacity: 0.45;
+  --ui-Shadow-opacity-sm: 0.075;
+  --ui-Shadow-opacity-lg: 0.65;
+
+  --ui-BG-opacity: 0.1;
+}
diff --git a/sheep/scss/theme/_style.scss b/sheep/scss/theme/_style.scss
new file mode 100644
index 0000000..1eef587
--- /dev/null
+++ b/sheep/scss/theme/_style.scss
@@ -0,0 +1,68 @@
+@import './light'; //浅蓝主题
+@import './dark'; //深蓝主题
+// 多主题
+.theme-light {
+  @include theme-light;
+}
+.theme-dark {
+  @include theme-dark;
+}
+.theme-auto {
+  @include theme-light;
+}
+@media (prefers-color-scheme: dark) {
+  .theme-auto {
+    @include theme-dark;
+  }
+}
+
+@each $value in ('', '-1', '-2', '-3', '-4') {
+  // 背景色 + 文字色 ： 白色 + 默认色；
+  .ui-BG#{$value} {
+    background-color: var(--ui-BG#{$value}) !important;
+    color: var(--ui-TC);
+  }
+  // 文字颜色
+  .ui-TC#{$value} {
+    color: var(--ui-TC#{$value}) !important;
+  }
+  // 主题色背景
+  .ui-BG-Main#{$value} {
+    background-color: var(--ui-BG-Main#{$value}) !important;
+    color: var(--ui-BG-Main-TC) !important;
+  }
+  // 主题色渐变，横向
+  .ui-BG-Main-Gradient {
+    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)) !important;
+    color: var(--ui-BG-Main-TC) !important;
+  }
+  // 主题色文字
+  .ui-TC-Main#{$value} {
+    color: var(--ui-BG-Main#{$value}) !important;
+  }
+  // 主题色阴影
+  .ui-Shadow-Main {
+    box-shadow: var(--ui-Main-box-shadow) !important;
+  }
+  .ui-BG-Main-light {
+    background: var(----ui-BG-Main-light) !important;
+    color: var(--ui-BG-Main#{$value}) !important;
+  }
+}
+
+@each $color, $value in $colors {
+  .main-#{$color} {
+    --ui-BG-Main: #{$value};
+    --ui-BG-Main-tag: #{rgba($value, 0.05)};
+    --ui-BG-Main-gradient: #{rgba($value, 0.6)};
+    --ui-BG-Main-light: #{rgba($value, 0.2)};
+    --ui-BG-Main-opacity-1: #{rgba($value, 0.1)};
+    --ui-BG-Main-opacity-4: #{rgba($value, 0.4)};
+    --ui-Main-box-shadow: 0 0.2em 0.5em #{rgba($value, var(--ui-Shadow-opacity))};
+    --ui-BG-Main-1: #{mix(rgba(255, 255, 255, 0.7), desaturate($value, 20%), 10%)};
+    --ui-BG-Main-2: #{mix(rgba(255, 255, 255, 0.6), desaturate($value, 40%), 20%)};
+    --ui-BG-Main-3: #{mix(rgba(119, 119, 119, 0.2), desaturate($value, 40%), 40%)};
+    --ui-BG-Main-4: #{mix(rgba(119, 119, 119, 0.1), desaturate($value, 40%), 60%)};
+    --ui-BG-Main-TC: #ffffff !important;
+  }
+}
diff --git a/sheep/scss/ui.scss b/sheep/scss/ui.scss
new file mode 100644
index 0000000..b9b7381
--- /dev/null
+++ b/sheep/scss/ui.scss
@@ -0,0 +1,19 @@
+@import './theme/style'; //系统主题
+@import './main'; //主样式*
+
+@import './style/background'; //背景
+@import './style/grid'; //列
+@import './style/flex'; //布局
+@import './style/border'; //边框
+@import './style/text'; //文本
+@import './style/shadow'; //阴影
+@import './icon/style'; //图标
+@import './style/tag'; //标签
+@import './style/button'; //按钮
+@import './style/avatar'; //头像
+@import './style/table'; //表格
+@import './style/code'; //代码片段
+@import './style/form'; //表单
+@import './style/menu'; //表单
+@import './style/markdown'; //表单
+@import './style/card'; //表单
diff --git a/sheep/store/app.js b/sheep/store/app.js
new file mode 100644
index 0000000..2f95dbe
--- /dev/null
+++ b/sheep/store/app.js
@@ -0,0 +1,134 @@
+import DiyApi from '@/sheep/api/promotion/diy';
+import { defineStore } from 'pinia';
+import $platform from '@/sheep/platform';
+import $router from '@/sheep/router';
+import user from './user';
+import sys from './sys';
+
+const app = defineStore({
+  id: 'app',
+  state: () => ({
+    info: {
+      // 应用信息
+      name: '', // 商城名称
+      logo: '', // logo
+      version: '', // 版本号
+      copyright: '', // 版权信息 I
+      copytime: '', // 版权信息 II
+
+      cdnurl: '', // 云存储域名
+      filesystem: '', // 云存储平台
+    },
+    platform: {
+      share: {
+        methods: [], // 支持的分享方式
+        forwardInfo: {}, // 默认转发信息
+        posterInfo: {}, // 海报信息
+        linkAddress: '', // 复制链接地址
+      },
+      bind_mobile: 0, // 登陆后绑定手机号提醒 (弱提醒，可手动关闭)
+    },
+    template: {
+      // 店铺装修模板
+      basic: {}, // 基本信息
+      home: {
+        // 首页模板
+        style: {},
+        data: [],
+      },
+      user: {
+        // 个人中心模板
+        style: {},
+        data: [],
+      },
+    },
+    shareInfo: {}, // 全局分享信息
+    has_wechat_trade_managed: 0 // 小程序发货信息管理  0 没有 || 1 有
+  }),
+  actions: {
+    // 获取Shopro应用配置和模板
+    async init(templateId = null) {
+      // 检查网络
+      const networkStatus = await $platform.checkNetwork();
+      if (!networkStatus) {
+        $router.error('NetworkError');
+      }
+
+      // 加载装修配置
+      await adaptTemplate(this.template, templateId)
+
+      // TODO 芋艿：未来支持管理后台可配；对应 https://api.shopro.sheepjs.com/shop/api/init
+      if (true) {
+        this.info = {
+          name: '晚趣语音',
+          logo: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/aa361225849eeb86428e1a3d647d6f7b94354e74de212403bb968e6ad85e79b3.jpeg',
+          version: '2.2.0',
+          copyright: '上海尔加网络科技提供技术支持',
+          copytime: 'Copyright© 2018-2024',
+
+          cdnurl: 'https://file.sheepjs.com', // 云存储域名
+          filesystem: 'qcloud', // 云存储平台
+        };
+        this.platform = {
+          share: {
+            methods: ["poster", "link"],
+            linkAddress: 'https://peiwan.mfzt.site/h5', // TODO 芋艿：可以考虑改到 .env 那
+            posterInfo: {
+              "user_bg": "/static/img/shop/config/user-poster-bg.png",
+              "goods_bg": "/static/img/shop/config/goods-poster-bg.png",
+              "groupon_bg": "/static/img/shop/config/groupon-poster-bg.png"
+            }
+          },
+          bind_mobile: 0
+        };
+        this.has_wechat_trade_managed = 0;
+
+        // 加载主题
+        const sysStore = sys();
+        sysStore.setTheme();
+
+        // 模拟用户登录
+        const userStore = user();
+        if (userStore.isLogin) {
+          userStore.loginAfter();
+        }
+        return Promise.resolve(true);
+      } else {
+        $router.error('InitError', res.msg || '加载失败');
+      }
+    },
+  },
+  persist: {
+    enabled: true,
+    strategies: [
+      {
+        key: 'app-store',
+      },
+    ],
+  },
+});
+
+// todo: @owen 先做数据适配，后期重构
+const adaptTemplate = async (appTemplate, templateId) => {
+  const { data: diyTemplate } = templateId
+      // 查询指定模板，一般是预览时使用
+      ? await DiyApi.getDiyTemplate(templateId)
+      : await DiyApi.getUsedDiyTemplate();
+  // 模板不存在
+  if (!diyTemplate) {
+    $router.error('TemplateError');
+    return
+  }
+
+  const tabBar = diyTemplate?.property?.tabBar;
+  if (tabBar) {
+    appTemplate.basic.tabbar = tabBar
+    if (tabBar?.theme) {
+      appTemplate.basic.theme = tabBar?.theme;
+    }
+  }
+  appTemplate.home = diyTemplate?.home;
+  appTemplate.user = diyTemplate?.user;
+}
+
+export default app;
diff --git a/sheep/store/cart.js b/sheep/store/cart.js
new file mode 100644
index 0000000..edde779
--- /dev/null
+++ b/sheep/store/cart.js
@@ -0,0 +1,112 @@
+import { defineStore } from 'pinia';
+import CartApi from '@/sheep/api/trade/cart';
+
+const cart = defineStore({
+  id: 'cart',
+  state: () => ({
+    list: [], // 购物车列表
+    selectedIds: [], // 已选列表
+    isAllSelected: false, // 是否全选
+    totalPriceSelected: 0, // 选中项总金额
+  }),
+  actions: {
+    // 获取购物车列表
+    async getList() {
+      const { data, code } = await CartApi.getCartList();
+      if (code === 0) {
+        this.list = data.validList;
+
+        // 计算各种关联属性
+        this.selectedIds = [];
+        this.isAllSelected = true;
+        this.totalPriceSelected = 0;
+        this.list.forEach((item) => {
+          if (item.selected) {
+            this.selectedIds.push(item.id);
+            this.totalPriceSelected += item.count * item.sku.price;
+          } else {
+            this.isAllSelected = false;
+          }
+        });
+      }
+    },
+
+    // 添加购物车
+    async add(goodsInfo) {
+      // 添加购物项
+      const { code } = await CartApi.addCart({
+        skuId: goodsInfo.id,
+        count: goodsInfo.goods_num,
+      });
+      // 刷新购物车列表
+      if (code === 0) {
+        await this.getList();
+      }
+    },
+
+    // 更新购物车
+    async update(goodsInfo) {
+      const { code } = await CartApi.updateCartCount({
+        id: goodsInfo.goods_id,
+        count: goodsInfo.goods_num,
+      });
+      if (code === 0) {
+        await this.getList();
+      }
+    },
+
+    // 移除购物车
+    async delete(ids) {
+      let idsTemp = '';
+      if (Array.isArray(ids)) {
+        idsTemp = ids.join(',');
+      } else {
+        idsTemp = ids;
+      }
+      const { code } = await CartApi.deleteCart(idsTemp);
+      if (code === 0) {
+        await this.getList();
+      }
+    },
+
+    // 单选购物车商品
+    async selectSingle(goodsId) {
+      const { code } = await CartApi.updateCartSelected({
+        ids: [goodsId],
+        selected: !this.selectedIds.includes(goodsId), // 取反
+      });
+      if (code === 0) {
+        await this.getList();
+      }
+    },
+
+    // 全选购物车商品
+    async selectAll(flag) {
+      const { code } = await CartApi.updateCartSelected({
+        ids: this.list.map((item) => item.id),
+        selected: flag
+      });
+      if (code === 0) {
+        await this.getList();
+      }
+    },
+
+    // 清空购物车。注意，仅用于用户退出时，重置数据
+    emptyList() {
+      this.list = [];
+      this.selectedIds = [];
+      this.isAllSelected = true;
+      this.totalPriceSelected = 0;
+    },
+  },
+  persist: {
+    enabled: true,
+    strategies: [
+      {
+        key: 'cart-store',
+      },
+    ],
+  },
+});
+
+export default cart;
diff --git a/sheep/store/index.js b/sheep/store/index.js
new file mode 100644
index 0000000..3d06698
--- /dev/null
+++ b/sheep/store/index.js
@@ -0,0 +1,20 @@
+import { createPinia } from 'pinia';
+import piniaPersist from 'pinia-plugin-persist-uni';
+
+// 自动注入所有pinia模块
+const files = import.meta.glob('./*.js', { eager: true });
+const modules = {};
+Object.keys(files).forEach((key) => {
+  modules[key.replace(/(.*\/)*([^.]+).*/gi, '$2')] = files[key].default;
+});
+
+export const setupPinia = (app) => {
+  const pinia = createPinia();
+  pinia.use(piniaPersist);
+
+  app.use(pinia);
+};
+
+export default (name) => {
+  return modules[name]();
+};
diff --git a/sheep/store/modal.js b/sheep/store/modal.js
new file mode 100644
index 0000000..0cb8383
--- /dev/null
+++ b/sheep/store/modal.js
@@ -0,0 +1,31 @@
+import { defineStore } from 'pinia';
+
+const modal = defineStore({
+  id: 'modal',
+  state: () => ({
+    auth: '', // 授权弹框 accountLogin|smsLogin|resetPassword|changeMobile|changePassword|changeUsername
+    share: false, // 分享弹框
+    menu: false, // 快捷菜单弹框
+	qrcode: false, // 关注公众号
+	search: false, // 搜索弹窗
+    advHistory: [], // 广告弹框记录
+    lastTimer: {
+      // 短信验证码计时器，为了防止刷新请求做了持久化
+      smsLogin: 0,
+      changeMobile: 0,
+      resetPassword: 0,
+      changePassword: 0,
+    }
+  }),
+  persist: {
+    enabled: true,
+    strategies: [
+      {
+        key: 'modal-store',
+        paths: ['lastTimer', 'advHistory'],
+      },
+    ],
+  },
+});
+
+export default modal;
diff --git a/sheep/store/sys.js b/sheep/store/sys.js
new file mode 100644
index 0000000..0ed2240
--- /dev/null
+++ b/sheep/store/sys.js
@@ -0,0 +1,113 @@
+import { defineStore } from 'pinia';
+import app from './app';
+
+const sys = defineStore({
+  id: 'sys',
+  state: () => ({
+    theme: '', // 主题,
+    mode: 'light', // 明亮模式、暗黑模式（暂未支持）
+    modeAuto: false, // 跟随系统
+    fontSize: 1, // 设置默认字号等级(0-4)
+	searchTabs: {
+		sexLabel: '性别',
+		sex2Label: '性别',
+		cityLabel: '城市',
+		categoryLabel: '分类',
+	},
+	categoryList: [],
+	clerk: {},
+	clerkTabIndex: 1,
+	user: {},
+	userTabIndex: 0,
+	homeTabIndex: 0,
+	messageTabIndex: 0,
+	
+	currentClerk: {
+		id: -1,
+		avatar: 'https://rbtnet.oss-cn-hangzhou.aliyuncs.com/aa361225849eeb86428e1a3d647d6f7b94354e74de212403bb968e6ad85e79b3.jpeg',
+	},
+	clerkList: [],
+	gift: {
+		id: -1,
+	},
+	giftList: [],
+	scene: "0", // 小程序场景值
+	tradeConfig: {
+		brokerageEnabled: false,
+		weixinEnabled: false,
+		giftEnabled: false,
+		qrcode: '',
+	},
+  }),
+  getters: {},
+  actions: {
+    setTheme(theme = '') {
+      if (theme === '') {
+        this.theme = app().template?.basic.theme || 'orange';
+      } else {
+        this.theme = theme;
+      }
+    },
+	setSexLabel(label) {
+		this.searchTabs.sexLabel = label;
+	},
+	setSex2Label(label) {
+		this.searchTabs.sex2Label = label;
+	},
+	setCityLabel(label) {
+		this.searchTabs.cityLabel = label;
+	},
+	setClerkTabIndex(e) {
+		this.clerkTabIndex = e;
+	},
+	setUserTabIndex(e) {
+		this.userTabIndex = e;
+	},
+	setHomeTabIndex(e) {
+		this.homeTabIndex = e;
+	},
+	setMessageTabIndex(e) {
+		this.messageTabIndex = e;
+	},
+	setCategoryLabel(label) {
+		this.searchTabs.categoryLabel = label;
+	},
+	setCategoryList(list) {
+		this.categoryList = list;
+	},
+	setClerk(o) {
+		this.clerk = o;
+	},
+	setUser(o) {
+		this.user = o;
+	},
+	setCurrentClerk(o) {
+		this.currentClerk = o;
+	},
+	setClerkList(list) {
+		this.clerkList = list;
+	},
+	setGift(e) {
+		this.gift = e;
+	},
+	setGiftList(list) {
+		this.giftList = list;
+	},
+	setScene(scene) {
+		this.scene = scene;
+	},
+	setTradeConfig(config) {
+		this.tradeConfig = config;
+	},
+  },
+  persist: {
+    enabled: true,
+    strategies: [
+      {
+        key: 'sys-store',
+      },
+    ],
+  },
+});
+
+export default sys;
diff --git a/sheep/store/user.js b/sheep/store/user.js
new file mode 100644
index 0000000..25c71d2
--- /dev/null
+++ b/sheep/store/user.js
@@ -0,0 +1,196 @@
+import { defineStore } from 'pinia';
+import $share from '@/sheep/platform/share';
+import { clone, cloneDeep } from 'lodash-es';
+import cart from './cart';
+import app from './app';
+import { showAuthModal } from '@/sheep/hooks/useModal';
+import UserApi from '@/sheep/api/member/user';
+import PayWalletApi from '@/sheep/api/pay/wallet';
+import TradeConfigApi from '@/sheep/api/trade/config';
+import OrderApi from '@/sheep/api/trade/order';
+import CouponApi from '@/sheep/api/promotion/coupon';
+
+// 默认用户信息
+const defaultUserInfo = {
+  id: null,
+  avatar: '', // 头像
+  nickname: '', // 昵称
+  age: 0,
+  sex: 1,
+  visible: false,
+  qrcodeShow: 0,
+  photo: '',
+  gender: 0, // 性别
+  mobile: '', // 手机号
+  point: 0, // 积分
+  isVip: false,
+};
+
+const defaultTradeConfig = {
+  brokerageEnabled: false,
+  weixinEnabled: false,
+  giftEnabled: false,
+  friendEnabled: false,
+  peiwanEnabled: false,
+  adUnitId: '',
+  qrcode: '',
+};
+
+// 默认钱包信息
+const defaultUserWallet = {
+  balance: 0, // 余额
+};
+
+// 默认订单、优惠券等其他资产信息
+const defaultNumData = {
+  unusedCouponCount: 0,
+  orderCount: {
+    allCount: 0,
+    unpaidCount: 0,
+    undeliveredCount: 0,
+    deliveredCount: 0,
+    uncommentedCount: 0,
+    afterSaleCount: 0,
+  },
+};
+
+const user = defineStore({
+  id: 'user',
+  state: () => ({
+    userInfo: clone(defaultUserInfo), // 用户信息
+	tradeConfig: clone(defaultTradeConfig), // 系统配置
+    userWallet: clone(defaultUserWallet), // 用户钱包信息
+    isLogin: !!uni.getStorageSync('token'), // 登录状态
+    numData: cloneDeep(defaultNumData), // 用户其他数据
+    lastUpdateTime: 0, // 上次更新时间
+  }),
+
+  actions: {
+	setTradeConfig(config) {
+		this.tradeConfig = config;
+	},
+    // 获取用户信息
+    async getInfo() {
+      const { code, data } = await UserApi.getUserInfo();
+      if (code !== 0) {
+        return;
+      }
+      this.userInfo = data;
+      return Promise.resolve(data);
+    },
+	
+	async getTradeConfig() {
+		const { code, data } = await TradeConfigApi.getTradeConfig(this.userInfo.id);
+		if (code !== 0) {
+		  return;
+		}
+		this.tradeConfig = data;
+	},
+
+    // 获得用户钱包
+    async getWallet() {
+      const { code, data } = await PayWalletApi.getPayWallet();
+      if (code !== 0) {
+        return;
+      }
+      this.userWallet = data;
+    },
+
+    // 获取订单、优惠券等其他资产信息
+    getNumData() {
+      OrderApi.getOrderCount().then((res) => {
+        if (res.code === 0) {
+          this.numData.orderCount = res.data;
+        }
+      });
+      CouponApi.getUnusedCouponCount().then((res) => {
+        if (res.code === 0) {
+          this.numData.unusedCouponCount = res.data;
+        }
+      });
+    },
+
+    // 设置 token
+    setToken(token = '', refreshToken = '') {
+      if (token === '') {
+        this.isLogin = false;
+        uni.removeStorageSync('token');
+        uni.removeStorageSync('refresh-token');
+      } else {
+        this.isLogin = true;
+        uni.setStorageSync('token', token);
+        uni.setStorageSync('refresh-token', refreshToken);
+        this.loginAfter();
+      }
+      return this.isLogin;
+    },
+
+    // 更新用户相关信息 (手动限流，5 秒之内不刷新)
+    async updateUserData() {
+      if (!this.isLogin) {
+        this.resetUserData();
+        return;
+      }
+      // 防抖，5 秒之内不刷新
+      const nowTime = new Date().getTime();
+      if (this.lastUpdateTime + 5000 > nowTime) {
+        return;
+      }
+      this.lastUpdateTime = nowTime;
+
+      // 获取最新信息
+      await this.getInfo();
+	  this.getTradeConfig();
+      this.getWallet();
+      this.getNumData();
+      return this.userInfo;
+    },
+
+    // 重置用户默认数据
+    resetUserData() {
+      // 清空 token
+      this.setToken();
+      // 清空用户相关的缓存
+      this.userInfo = clone(defaultUserInfo);
+      this.userWallet = clone(defaultUserWallet);
+      this.numData = cloneDeep(defaultNumData);
+      // 清空购物车的缓存
+      cart().emptyList();
+    },
+
+    // 登录后，加载各种信息
+    // TODO 芋艿：整理下；
+    async loginAfter() {
+      await this.updateUserData();
+
+      // 加载购物车
+      cart().getList();
+      // 登录后设置全局分享参数
+      $share.getShareInfo();
+
+      // 提醒绑定手机号
+      if (app().platform.bind_mobile && !this.userInfo.mobile) {
+        showAuthModal('changeMobile');
+      }
+
+      // 绑定推广员
+      $share.bindBrokerageUser();
+    },
+
+    // 登出系统
+    async logout() {
+      this.resetUserData();
+      return !this.isLogin;
+    },
+  },
+  persist: {
+    enabled: true,
+    strategies: [
+      {
+        key: 'user-store',
+      },
+    ],
+  },
+});
+
+export default user;
diff --git a/sheep/ui/su-coupon/su-coupon.vue b/sheep/ui/su-coupon/su-coupon.vue
new file mode 100644
index 0000000..472d17f
--- /dev/null
+++ b/sheep/ui/su-coupon/su-coupon.vue
@@ -0,0 +1,319 @@
+<template>
+  <view class="ui-coupon-wrap">
+    <!-- xs: 一行三个，竖向 -->
+    <view
+      v-if="props.size === 'xs'"
+      class="xs-coupon-card ss-flex ss-flex-col ss-row-between"
+      :style="[cardStyle]"
+      @tap="
+        sheep.$router.go('/pages/coupon/detail', {
+          id: couponId,
+        })
+      "
+    >
+      <view class="ss-flex ss-flex-col ss-row-center ss-col-center">
+        <view class="face-value-box ss-flex ss-col-bottom ss-m-t-50 ss-m-b-28">
+          <view class="value-text ss-m-r-4">{{ type === 'reduce' ? value : Number(value) }}</view>
+          <view class="value-unit">{{ type === 'reduce' ? '元' : '折' }}</view>
+        </view>
+        <view class="title-text">{{ props.title }}</view>
+      </view>
+      <view class="card-bottom ss-m-b-30 ss-flex ss-row-center">
+        <slot name="btn">
+          <button class="ss-reset-button card-btn">{{ state.stateMap[props.state] }}</button>
+        </slot>
+      </view>
+    </view>
+
+    <!-- md: 一行两个，横向 -->
+    <view
+      v-if="props.size === 'md'"
+      class="md-coupon-card ss-flex ss-row-between"
+      :style="[cardStyle]"
+      @tap="
+        sheep.$router.go('/pages/coupon/detail', {
+          id: couponId,
+        })
+      "
+    >
+      <view class="card-left ss-flex ss-flex-col ss-row-between ss-col-top ss-m-l-40">
+        <view class="face-value-box ss-flex ss-col-bottom ss-m-t-28">
+          <view class="value-text ss-m-r-4">{{ type === 'reduce' ? value : Number(value) }}</view>
+          <view class="value-unit">{{ type === 'reduce' ? '元' : '折' }}</view>
+        </view>
+        <view class="ss-m-b-28">
+          <view class="title-text ss-m-b-10">{{ props.title }}</view>
+          <view class="surplus-text" v-if="props.surplus">仅剩：{{ props.surplus }}张</view>
+        </view>
+      </view>
+      <view class="card-right ss-flex ss-row-center">
+        <slot name="btn">
+          <button class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center">
+            <view class="btn-text">{{ state.stateMap[props.state] }}</view>
+          </button>
+        </slot>
+      </view>
+    </view>
+
+    <!-- lg: 一行一个，横向 -->
+    <view
+      v-if="props.size === 'lg'"
+      class="lg-coupon-card ss-flex ss-row-between"
+      :style="[cardStyle]"
+      @tap="
+        sheep.$router.go('/pages/coupon/detail', {
+          id: couponId,
+        })
+      "
+    >
+      <view class="card-left ss-flex ss-flex-col ss-row-between ss-col-top ss-m-l-40">
+        <view class="face-value-box ss-flex ss-col-bottom ss-m-t-28">
+          <view class="value-text ss-m-r-4">{{ type === 'reduce' ? value : Number(value) }}</view>
+          <view class="value-unit">{{ type === 'reduce' ? '元' : '折' }}</view>
+        </view>
+        <view class="ss-m-b-20">
+          <view class="title-text ss-m-b-10">{{ props.title }}</view>
+          <view class="sellby-text">有效期：{{ props.sellBy }}</view>
+        </view>
+      </view>
+      <view class="card-right ss-flex ss-flex-col ss-col-center ss-row-center">
+        <slot name="btn">
+          <button class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center">
+            {{ state.stateMap[props.state] }}
+          </button>
+        </slot>
+        <view class="surplus-text ss-m-t-24" v-if="props.surplus">仅剩：{{ props.surplus }}张</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 优惠券 卡片
+   *
+   * @property {String} size = ['xs','md','lg']					- 类型 xs:一行三个，md:一行两个，lg:一行一个
+   * @property {String} textColor 								- 文字颜色
+   * @property {String} background 								- 背景
+   * @property {String} btnBg										- 按钮背景
+   * @property {String} btnTextColor								- 按钮文字颜色
+   * @property {Number} state = [0,1]								- 状态，0:未领取，1:已领取
+   * @property {String} title										- 标题
+   * @property {String | Number} value							- 面值
+   * @property {String} sellBy									- 有效期
+   * @property {String | Number} surplus							- 剩余
+   *
+   */
+  import { computed, reactive } from 'vue';
+  import sheep from '@/sheep';
+
+  // 数据
+  const state = reactive({
+    stateMap: {
+      0: '立即领取',
+      1: '去使用',
+    },
+  });
+
+  // 接受参数
+  const props = defineProps({
+    size: {
+      type: String,
+      default: 'lg',
+    },
+    textColor: {
+      type: String,
+      default: '#FF6000',
+    },
+    background: {
+      type: String,
+      default: '#FFC19C',
+    },
+    btnBg: {
+      type: String,
+      default: '#fff',
+    },
+    btnTextColor: {
+      type: String,
+      default: '#FF6000',
+    },
+    state: {
+      type: Number,
+      default: 0,
+    },
+    couponId: {
+      type: Number,
+      default: 0,
+    },
+    title: {
+      type: String,
+      default: '这是优惠券',
+    },
+    value: {
+      type: [Number, String],
+      default: 50,
+    },
+    sellBy: {
+      type: String,
+      default: '2019.11.25至2019.12.25',
+    },
+    surplus: {
+      type: [Number, String],
+      default: 0,
+    },
+    type: {
+      type: String,
+      default: '',
+    },
+  });
+
+  const cardStyle = computed(() => {
+    return {
+      background: props.background,
+    };
+  });
+</script>
+
+<style lang="scss" scoped>
+  // xs
+  .xs-coupon-card {
+    width: 227rpx;
+    // height: 145px;
+    border-radius: 10rpx;
+    overflow: hidden;
+
+    .value-text {
+      font-size: 50rpx;
+      line-height: 50rpx;
+      font-weight: bold;
+      color: v-bind('textColor');
+      vertical-align: text-bottom;
+    }
+
+    .value-unit {
+      color: v-bind('textColor');
+      font-size: 24rpx;
+      line-height: 38rpx;
+    }
+
+    .title-text {
+      color: v-bind('textColor');
+      font-size: 24rpx;
+      line-height: 30rpx;
+      width: 150rpx;
+      text-align: center;
+    }
+
+    .card-btn {
+      width: 140rpx;
+      height: 50rpx;
+      border-radius: 25rpx;
+      border-style: solid;
+      border-color: v-bind('btnTextColor');
+      border-width: 1px;
+      color: v-bind('btnTextColor');
+      background-color: v-bind('btnBg');
+      font-size: 24rpx;
+      line-height: 50rpx;
+    }
+  }
+
+  // md
+
+  .md-coupon-card {
+    width: 330rpx;
+    height: 168rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+
+    .card-right,
+    .card-left {
+      height: 100%;
+    }
+
+    .value-text {
+      font-size: 36rpx;
+      line-height: 36rpx;
+      font-weight: bold;
+      color: v-bind('textColor');
+      vertical-align: text-bottom;
+    }
+
+    .value-unit {
+      color: v-bind('textColor');
+      font-size: 22rpx;
+      line-height: 28rpx;
+    }
+
+    .title-text,
+    .surplus-text {
+      color: v-bind('textColor');
+      font-size: 22rpx;
+      line-height: 22rpx;
+    }
+
+    .card-btn {
+      width: 60rpx;
+      height: 100%;
+
+      .btn-text {
+        color: v-bind('btnTextColor');
+        font-size: 24rpx;
+        text-align: center;
+        writing-mode: vertical-lr;
+        writing-mode: tb-lr;
+      }
+    }
+  }
+
+  // lg
+  .lg-coupon-card {
+    width: 708rpx;
+    height: 168rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+
+    .card-right,
+    .card-left {
+      height: 100%;
+    }
+
+    .value-text {
+      font-size: 50rpx;
+      line-height: 50rpx;
+      font-weight: bold;
+      color: v-bind('textColor');
+      vertical-align: text-bottom;
+    }
+
+    .value-unit {
+      color: v-bind('textColor');
+      font-size: 22rpx;
+      line-height: 32rpx;
+    }
+
+    .title-text,
+    .sellby-text,
+    .surplus-text {
+      color: v-bind('textColor');
+      font-size: 22rpx;
+      line-height: 22rpx;
+    }
+
+    .card-right {
+      width: 200rpx;
+      .card-btn {
+        width: 140rpx;
+        height: 50rpx;
+        border-radius: 25rpx;
+        border-style: solid;
+        border-color: v-bind('btnTextColor');
+        border-width: 1px;
+        color: v-bind('btnTextColor');
+        background-color: v-bind('btnBg');
+        font-size: 24rpx;
+        line-height: 50rpx;
+      }
+    }
+  }
+</style>
diff --git a/sheep/ui/su-data-checkbox/su-data-checkbox.vue b/sheep/ui/su-data-checkbox/su-data-checkbox.vue
new file mode 100644
index 0000000..537ead5
--- /dev/null
+++ b/sheep/ui/su-data-checkbox/su-data-checkbox.vue
@@ -0,0 +1,894 @@
+<template>
+  <view class="uni-data-checklist" :style="{ 'margin-top': isTop + 'px' }">
+    <template v-if="!isLocal">
+      <view class="uni-data-loading">
+        <uni-load-more
+          v-if="!mixinDatacomErrorMessage"
+          status="loading"
+          iconType="snow"
+          :iconSize="18"
+          :content-text="contentText"
+        ></uni-load-more>
+        <text v-else>{{ mixinDatacomErrorMessage }}</text>
+      </view>
+    </template>
+    <template v-else>
+      <checkbox-group
+        v-if="multiple"
+        class="checklist-group"
+        :class="{ 'is-list': mode === 'list' || wrap }"
+        @change="chagne"
+      >
+        <label
+          class="checklist-box"
+          :class="[
+            'is--' + mode,
+            item.selected ? 'is-checked' : '',
+            disabled || !!item.disabled ? 'is-disable' : '',
+            index !== 0 && mode === 'list' ? 'is-list-border' : '',
+          ]"
+          :style="item.styleBackgroud"
+          v-for="(item, index) in dataList"
+          :key="index"
+        >
+          <checkbox
+            class="hidden"
+            hidden
+            :disabled="disabled || !!item.disabled"
+            :value="item[map.value] + ''"
+            :checked="item.selected"
+          />
+          <view
+            v-if="(mode !== 'tag' && mode !== 'list') || (mode === 'list' && icon === 'left')"
+            class="checkbox__inner"
+            :style="item.styleIcon"
+          >
+            <view class="checkbox__inner-icon"></view>
+          </view>
+          <view
+            class="checklist-content"
+            :class="{ 'list-content': mode === 'list' && icon === 'left' }"
+          >
+            <text class="checklist-text" :style="item.styleIconText">{{ item[map.text] }}</text>
+            <view
+              v-if="mode === 'list' && icon === 'right'"
+              class="checkobx__list"
+              :style="item.styleBackgroud"
+            ></view>
+          </view>
+        </label>
+      </checkbox-group>
+      <radio-group
+        v-else
+        class="checklist-group"
+        :class="{ 'is-list': mode === 'list', 'is-wrap': wrap }"
+        @change="chagne"
+      >
+        <!-- -->
+        <label
+          class="checklist-box"
+          :class="[
+            'is--' + mode,
+            item.selected ? 'is-checked' : '',
+            disabled || !!item.disabled ? 'is-disable' : '',
+            index !== 0 && mode === 'list' ? 'is-list-border' : '',
+          ]"
+          :style="item.styleBackgroud"
+          v-for="(item, index) in dataList"
+          :key="index"
+        >
+          <radio
+            class="hidden"
+            hidden
+            :disabled="disabled || item.disabled"
+            :value="item[map.value] + ''"
+            :checked="item.selected"
+          />
+          <view
+            v-if="(mode !== 'tag' && mode !== 'list') || (mode === 'list' && icon === 'left')"
+            class="radio__inner"
+            :style="item.styleBackgroud"
+          >
+            <view class="radio__inner-icon" :style="item.styleIcon"></view>
+          </view>
+          <view
+            class="checklist-content"
+            :class="{ 'list-content': mode === 'list' && icon === 'left' }"
+          >
+            <text class="checklist-text" :style="item.styleIconText">{{ item[map.text] }}</text>
+            <view
+              v-if="mode === 'list' && icon === 'right'"
+              :style="item.styleRightIcon"
+              class="checkobx__list"
+            ></view>
+          </view>
+        </label>
+      </radio-group>
+    </template>
+  </view>
+</template>
+
+<script>
+  /**
+   * DataChecklist 数据选择器
+   * @description 通过数据渲染 checkbox 和 radio
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+   * @property {String} mode = [default| list | button | tag] 显示模式
+   * @value default  	默认横排模式
+   * @value list		列表模式
+   * @value button	按钮模式
+   * @value tag 		标签模式
+   * @property {Boolean} multiple = [true|false] 是否多选
+   * @property {Array|String|Number} value 默认值
+   * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+   * @property {Number|String} min 最小选择个数 ，multiple为true时生效
+   * @property {Number|String} max 最大选择个数 ，multiple为true时生效
+   * @property {Boolean} wrap 是否换行显示
+   * @property {String} icon = [left|right]  list 列表模式下icon显示位置
+   * @property {Boolean} selectedColor 选中颜色
+   * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+   * @property {Boolean} selectedTextColor 选中文本颜色，如不填写则自动显示
+   * @property {Object} map 字段映射， 默认 map={text:'text',value:'value'}
+   * @value left 左侧显示
+   * @value right 右侧显示
+   * @event {Function} change  选中发生变化触发
+   */
+
+  export default {
+    name: 'uniDataChecklist',
+    mixins: [uniCloud.mixinDatacom || {}],
+    emits: ['input', 'update:modelValue', 'change'],
+    props: {
+      mode: {
+        type: String,
+        default: 'default',
+      },
+
+      multiple: {
+        type: Boolean,
+        default: false,
+      },
+      value: {
+        type: [Array, String, Number],
+        default() {
+          return '';
+        },
+      },
+      // TODO vue3
+      modelValue: {
+        type: [Array, String, Number],
+        default() {
+          return '';
+        },
+      },
+      localdata: {
+        type: Array,
+        default() {
+          return [];
+        },
+      },
+      min: {
+        type: [Number, String],
+        default: '',
+      },
+      max: {
+        type: [Number, String],
+        default: '',
+      },
+      wrap: {
+        type: Boolean,
+        default: false,
+      },
+      icon: {
+        type: String,
+        default: 'left',
+      },
+      selectedColor: {
+        type: String,
+        default: '',
+      },
+      selectedTextColor: {
+        type: String,
+        default: '',
+      },
+      emptyText: {
+        type: String,
+        default: '暂无数据',
+      },
+      disabled: {
+        type: Boolean,
+        default: false,
+      },
+      map: {
+        type: Object,
+        default() {
+          return {
+            text: 'text',
+            value: 'value',
+          };
+        },
+      },
+    },
+    watch: {
+      localdata: {
+        handler(newVal) {
+          this.range = newVal;
+          this.dataList = this.getDataList(this.getSelectedValue(newVal));
+        },
+        deep: true,
+      },
+      mixinDatacomResData(newVal) {
+        this.range = newVal;
+        this.dataList = this.getDataList(this.getSelectedValue(newVal));
+      },
+      value(newVal) {
+        this.dataList = this.getDataList(newVal);
+        // fix by mehaotian is_reset 在 uni-forms 中定义
+        if (!this.is_reset) {
+          this.is_reset = false;
+          this.formItem && this.formItem.setValue(newVal);
+        }
+      },
+      modelValue(newVal) {
+        this.dataList = this.getDataList(newVal);
+        if (!this.is_reset) {
+          this.is_reset = false;
+          this.formItem && this.formItem.setValue(newVal);
+        }
+      },
+    },
+    data() {
+      return {
+        dataList: [],
+        range: [],
+        contentText: {
+          contentdown: '查看更多',
+          contentrefresh: '加载中',
+          contentnomore: '没有更多',
+        },
+        isLocal: true,
+        styles: {
+          selectedColor: '#2979ff',
+          selectedTextColor: '#666',
+        },
+        isTop: 0,
+      };
+    },
+    computed: {
+      dataValue() {
+        if (this.value === '') return this.modelValue;
+        if (this.modelValue === '') return this.value;
+        return this.value;
+      },
+    },
+    created() {
+      this.form = this.getForm('uniForms');
+      this.formItem = this.getForm('uniFormsItem');
+      // this.formItem && this.formItem.setValue(this.value)
+
+      if (this.formItem) {
+        this.isTop = 6;
+        if (this.formItem.name) {
+          // 如果存在name添加默认值,否则formData 中不存在这个字段不校验
+          if (!this.is_reset) {
+            this.is_reset = false;
+            this.formItem.setValue(this.dataValue);
+          }
+          this.rename = this.formItem.name;
+          this.form.inputChildrens.push(this);
+        }
+      }
+
+      if (this.localdata && this.localdata.length !== 0) {
+        this.isLocal = true;
+        this.range = this.localdata;
+        this.dataList = this.getDataList(this.getSelectedValue(this.range));
+      } else {
+        if (this.collection) {
+          this.isLocal = false;
+          this.loadData();
+        }
+      }
+    },
+    methods: {
+      loadData() {
+        this.mixinDatacomGet()
+          .then((res) => {
+            this.mixinDatacomResData = res.result.data;
+            if (this.mixinDatacomResData.length === 0) {
+              this.isLocal = false;
+              this.mixinDatacomErrorMessage = this.emptyText;
+            } else {
+              this.isLocal = true;
+            }
+          })
+          .catch((err) => {
+            this.mixinDatacomErrorMessage = err.message;
+          });
+      },
+      /**
+       * 获取父元素实例
+       */
+      getForm(name = 'uniForms') {
+        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;
+      },
+      chagne(e) {
+        const values = e.detail.value;
+
+        let detail = {
+          value: [],
+          data: [],
+        };
+
+        if (this.multiple) {
+          this.range.forEach((item) => {
+            if (values.includes(item[this.map.value] + '')) {
+              detail.value.push(item[this.map.value]);
+              detail.data.push(item);
+            }
+          });
+        } else {
+          const range = this.range.find((item) => item[this.map.value] + '' === values);
+          if (range) {
+            detail = {
+              value: range[this.map.value],
+              data: range,
+            };
+          }
+        }
+        this.formItem && this.formItem.setValue(detail.value);
+        // TODO 兼容 vue2
+        this.$emit('input', detail.value);
+        // // TOTO 兼容 vue3
+        this.$emit('update:modelValue', detail.value);
+        this.$emit('change', {
+          detail,
+        });
+        if (this.multiple) {
+          // 如果 v-model 没有绑定 ，则走内部逻辑
+          // if (this.value.length === 0) {
+          this.dataList = this.getDataList(detail.value, true);
+          // }
+        } else {
+          this.dataList = this.getDataList(detail.value);
+        }
+      },
+
+      /**
+       * 获取渲染的新数组
+       * @param {Object} value 选中内容
+       */
+      getDataList(value) {
+        // 解除引用关系，破坏原引用关系，避免污染源数据
+        let dataList = JSON.parse(JSON.stringify(this.range));
+        let list = [];
+        if (this.multiple) {
+          if (!Array.isArray(value)) {
+            value = [];
+          }
+        }
+        dataList.forEach((item, index) => {
+          item.disabled = item.disable || item.disabled || false;
+          if (this.multiple) {
+            if (value.length > 0) {
+              let have = value.find((val) => val === item[this.map.value]);
+              item.selected = have !== undefined;
+            } else {
+              item.selected = false;
+            }
+          } else {
+            item.selected = value === item[this.map.value];
+          }
+
+          list.push(item);
+        });
+        return this.setRange(list);
+      },
+      /**
+       * 处理最大最小值
+       * @param {Object} list
+       */
+      setRange(list) {
+        let selectList = list.filter((item) => item.selected);
+        let min = Number(this.min) || 0;
+        let max = Number(this.max) || '';
+        list.forEach((item, index) => {
+          if (this.multiple) {
+            if (selectList.length <= min) {
+              let have = selectList.find((val) => val[this.map.value] === item[this.map.value]);
+              if (have !== undefined) {
+                item.disabled = true;
+              }
+            }
+
+            if (selectList.length >= max && max !== '') {
+              let have = selectList.find((val) => val[this.map.value] === item[this.map.value]);
+              if (have === undefined) {
+                item.disabled = true;
+              }
+            }
+          }
+          this.setStyles(item, index);
+          list[index] = item;
+        });
+        return list;
+      },
+      /**
+       * 设置 class
+       * @param {Object} item
+       * @param {Object} index
+       */
+      setStyles(item, index) {
+        //  设置自定义样式
+        item.styleBackgroud = this.setStyleBackgroud(item);
+        item.styleIcon = this.setStyleIcon(item);
+        item.styleIconText = this.setStyleIconText(item);
+        item.styleRightIcon = this.setStyleRightIcon(item);
+      },
+
+      /**
+       * 获取选中值
+       * @param {Object} range
+       */
+      getSelectedValue(range) {
+        if (!this.multiple) return this.dataValue;
+        let selectedArr = [];
+        range.forEach((item) => {
+          if (item.selected) {
+            selectedArr.push(item[this.map.value]);
+          }
+        });
+        return this.dataValue && this.dataValue.length > 0 ? this.dataValue : selectedArr;
+      },
+
+      /**
+       * 设置背景样式
+       */
+      setStyleBackgroud(item) {
+        let styles = {};
+        let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff';
+        if (this.mode !== 'list') {
+          styles['border-color'] = item.selected ? selectedColor : '#DCDFE6';
+        }
+        if (this.mode === 'tag') {
+          styles['background-color'] = item.selected ? selectedColor : '#f5f5f5';
+        }
+        let classles = '';
+        for (let i in styles) {
+          classles += `${i}:${styles[i]};`;
+        }
+        return classles;
+      },
+      setStyleIcon(item) {
+        let styles = {};
+        let classles = '';
+        let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff';
+        styles['background-color'] = item.selected ? selectedColor : '#fff';
+        styles['border-color'] = item.selected ? selectedColor : '#DCDFE6';
+
+        if (!item.selected && item.disabled) {
+          styles['background-color'] = '#F2F6FC';
+          styles['border-color'] = item.selected ? selectedColor : '#DCDFE6';
+        }
+
+        for (let i in styles) {
+          classles += `${i}:${styles[i]};`;
+        }
+        return classles;
+      },
+      setStyleIconText(item) {
+        let styles = {};
+        let classles = '';
+        let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff';
+        if (this.mode === 'tag') {
+          styles.color = item.selected
+            ? this.selectedTextColor
+              ? this.selectedTextColor
+              : '#fff'
+            : '#666';
+        } else {
+          styles.color = item.selected
+            ? this.selectedTextColor
+              ? this.selectedTextColor
+              : selectedColor
+            : '#666';
+        }
+        if (!item.selected && item.disabled) {
+          styles.color = '#999';
+        }
+
+        for (let i in styles) {
+          classles += `${i}:${styles[i]};`;
+        }
+        return classles;
+      },
+      setStyleRightIcon(item) {
+        let styles = {};
+        let classles = '';
+        if (this.mode === 'list') {
+          styles['border-color'] = item.selected ? this.styles.selectedColor : '#DCDFE6';
+        }
+        for (let i in styles) {
+          classles += `${i}:${styles[i]};`;
+        }
+
+        return classles;
+      },
+    },
+  };
+</script>
+
+<style lang="scss">
+  $checked-color: var(--ui-BG-Main);
+  $border-color: #dcdfe6;
+  $disable: 0.4;
+
+  @mixin flex {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+  }
+
+  .uni-data-loading {
+    @include flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    height: 36px;
+    padding-left: 10px;
+    color: #999;
+  }
+
+  .uni-data-checklist {
+    position: relative;
+    z-index: 0;
+    flex: 1;
+    // 多选样式
+    .checklist-group {
+      @include flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+
+      &.is-list {
+        flex-direction: column;
+      }
+
+      .checklist-box {
+        @include flex;
+        flex-direction: row;
+        align-items: center;
+        position: relative;
+        margin: 5px 0;
+        margin-right: 25px;
+
+        .hidden {
+          position: absolute;
+          opacity: 0;
+        }
+
+        // 文字样式
+        .checklist-content {
+          @include flex;
+          flex: 1;
+          flex-direction: row;
+          align-items: center;
+          justify-content: space-between;
+          .checklist-text {
+            font-size: 14px;
+            color: #666;
+            margin-left: 5px;
+            line-height: 14px;
+          }
+
+          .checkobx__list {
+            border-right-width: 1px;
+            border-right-color: #007aff;
+            border-right-style: solid;
+            border-bottom-width: 1px;
+            border-bottom-color: #007aff;
+            border-bottom-style: solid;
+            height: 12px;
+            width: 6px;
+            left: -5px;
+            transform-origin: center;
+            transform: rotate(45deg);
+            opacity: 0;
+          }
+        }
+
+        // 多选样式
+        .checkbox__inner {
+          /* #ifndef APP-NVUE */
+          flex-shrink: 0;
+          box-sizing: border-box;
+          /* #endif */
+          position: relative;
+          width: 16px;
+          height: 16px;
+          border: 1px solid $border-color;
+          border-radius: 4px;
+          background-color: #fff;
+          z-index: 1;
+          .checkbox__inner-icon {
+            position: absolute;
+            /* #ifdef APP-NVUE */
+            top: 2px;
+            /* #endif */
+            /* #ifndef APP-NVUE */
+            top: 1px;
+            /* #endif */
+            left: 5px;
+            height: 8px;
+            width: 4px;
+            border-right-width: 1px;
+            border-right-color: #fff;
+            border-right-style: solid;
+            border-bottom-width: 1px;
+            border-bottom-color: #fff;
+            border-bottom-style: solid;
+            opacity: 0;
+            transform-origin: center;
+            transform: rotate(40deg);
+          }
+        }
+
+        // 单选样式
+        .radio__inner {
+          @include flex;
+          /* #ifndef APP-NVUE */
+          flex-shrink: 0;
+          box-sizing: border-box;
+          /* #endif */
+          justify-content: center;
+          align-items: center;
+          position: relative;
+          width: 16px;
+          height: 16px;
+          border: 1px solid $border-color;
+          border-radius: 16px;
+          background-color: #fff;
+          z-index: 1;
+
+          .radio__inner-icon {
+            width: 8px;
+            height: 8px;
+            border-radius: 10px;
+            opacity: 0;
+          }
+        }
+
+        // 默认样式
+        &.is--default {
+          // 禁用
+          &.is-disable {
+            /* #ifdef H5 */
+            cursor: not-allowed;
+            /* #endif */
+            .checkbox__inner {
+              background-color: #f2f6fc;
+              border-color: $border-color;
+              /* #ifdef H5 */
+              cursor: not-allowed;
+              /* #endif */
+            }
+
+            .radio__inner {
+              background-color: #f2f6fc;
+              border-color: $border-color;
+            }
+            .checklist-text {
+              color: #999;
+            }
+          }
+
+          // 选中
+          &.is-checked {
+            .checkbox__inner {
+              border-color: $checked-color;
+              background-color: $checked-color;
+
+              .checkbox__inner-icon {
+                opacity: 1;
+                transform: rotate(45deg);
+              }
+            }
+            .radio__inner {
+              border-color: $checked-color;
+              .radio__inner-icon {
+                opacity: 1;
+                background-color: $checked-color;
+              }
+            }
+            .checklist-text {
+              color: $checked-color;
+            }
+            // 选中禁用
+            &.is-disable {
+              .checkbox__inner {
+                opacity: $disable;
+              }
+
+              .checklist-text {
+                opacity: $disable;
+              }
+              .radio__inner {
+                opacity: $disable;
+              }
+            }
+          }
+        }
+
+        // 按钮样式
+        &.is--button {
+          margin-right: 10px;
+          padding: 5px 10px;
+          border: 1px $border-color solid;
+          border-radius: 3px;
+          transition: border-color 0.2s;
+
+          // 禁用
+          &.is-disable {
+            /* #ifdef H5 */
+            cursor: not-allowed;
+            /* #endif */
+            border: 1px #eee solid;
+            opacity: $disable;
+            .checkbox__inner {
+              background-color: #f2f6fc;
+              border-color: $border-color;
+              /* #ifdef H5 */
+              cursor: not-allowed;
+              /* #endif */
+            }
+            .radio__inner {
+              background-color: #f2f6fc;
+              border-color: $border-color;
+              /* #ifdef H5 */
+              cursor: not-allowed;
+              /* #endif */
+            }
+            .checklist-text {
+              color: #999;
+            }
+          }
+
+          &.is-checked {
+            border-color: $checked-color;
+            .checkbox__inner {
+              border-color: $checked-color;
+              background-color: $checked-color;
+              .checkbox__inner-icon {
+                opacity: 1;
+                transform: rotate(45deg);
+              }
+            }
+
+            .radio__inner {
+              border-color: $checked-color;
+
+              .radio__inner-icon {
+                opacity: 1;
+                background-color: $checked-color;
+              }
+            }
+
+            .checklist-text {
+              color: $checked-color;
+            }
+
+            // 选中禁用
+            &.is-disable {
+              opacity: $disable;
+            }
+          }
+        }
+
+        // 标签样式
+        &.is--tag {
+          margin-right: 10px;
+          padding: 5px 10px;
+          border: 1px $border-color solid;
+          border-radius: 3px;
+          background-color: #f5f5f5;
+
+          .checklist-text {
+            margin: 0;
+            color: #666;
+          }
+
+          // 禁用
+          &.is-disable {
+            /* #ifdef H5 */
+            cursor: not-allowed;
+            /* #endif */
+            opacity: $disable;
+          }
+
+          &.is-checked {
+            background-color: $checked-color;
+            border-color: $checked-color;
+
+            .checklist-text {
+              color: #fff;
+            }
+          }
+        }
+        // 列表样式
+        &.is--list {
+          /* #ifndef APP-NVUE */
+          display: flex;
+          /* #endif */
+          padding: 10px 15px;
+          padding-left: 0;
+          margin: 0;
+
+          &.is-list-border {
+            border-top: 1px #eee solid;
+          }
+
+          // 禁用
+          &.is-disable {
+            /* #ifdef H5 */
+            cursor: not-allowed;
+            /* #endif */
+            .checkbox__inner {
+              background-color: #f2f6fc;
+              border-color: $border-color;
+              /* #ifdef H5 */
+              cursor: not-allowed;
+              /* #endif */
+            }
+            .checklist-text {
+              color: #999;
+            }
+          }
+
+          &.is-checked {
+            .checkbox__inner {
+              border-color: $checked-color;
+              background-color: $checked-color;
+
+              .checkbox__inner-icon {
+                opacity: 1;
+                transform: rotate(45deg);
+              }
+            }
+            .radio__inner {
+              .radio__inner-icon {
+                opacity: 1;
+              }
+            }
+            .checklist-text {
+              color: $checked-color;
+            }
+
+            .checklist-content {
+              .checkobx__list {
+                opacity: 1;
+                border-color: $checked-color;
+              }
+            }
+
+            // 选中禁用
+            &.is-disable {
+              .checkbox__inner {
+                opacity: $disable;
+              }
+
+              .checklist-text {
+                opacity: $disable;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/sheep/ui/su-dialog/su-dialog.vue b/sheep/ui/su-dialog/su-dialog.vue
new file mode 100644
index 0000000..b53e9ce
--- /dev/null
+++ b/sheep/ui/su-dialog/su-dialog.vue
@@ -0,0 +1,269 @@
+<template>
+  <su-popup :show="show" type="center" @close="closeDialog">
+    <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"
+            v-model="val"
+            type="text"
+            :placeholder="placeholderText"
+            :focus="focus"
+          />
+        </slot>
+      </view>
+      <view class="uni-dialog-button-group">
+        <view class="uni-dialog-button" @click="closeDialog">
+          <text class="uni-dialog-button-text">{{ closeText }}</text>
+        </view>
+        <view class="uni-dialog-button uni-border-left" @click="onOk">
+          <text class="uni-dialog-button-text uni-button-color">{{ okText }}</text>
+        </view>
+      </view>
+    </view>
+  </su-popup>
+</template>
+
+<script>
+  /**
+   * PopUp 弹出层-对话框样式
+   * @description 弹出层-对话框样式
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+   * @property {String} value input 模式下的默认值
+   * @property {String} placeholder input 模式下输入提示
+   * @property {String} type = [success|warning|info|error] 主题样式
+   *  @value success 成功
+   * 	@value warning 提示
+   * 	@value info 消息
+   * 	@value error 错误
+   * @property {String} mode = [base|input] 模式、
+   * 	@value base 基础对话框
+   * 	@value input 可输入对话框
+   * @property {String} content 对话框内容
+   * @property {Boolean} beforeClose 是否拦截取消事件
+   * @event {Function} confirm 点击确认按钮触发
+   * @event {Function} close 点击取消按钮触发
+   */
+
+  export default {
+    name: 'SuDialog',
+    emits: ['confirm', 'close'],
+    props: {
+      show: {
+        type: Boolean,
+        default: false,
+      },
+      value: {
+        type: [String, Number],
+        default: '',
+      },
+      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: '',
+      },
+    },
+    data() {
+      return {
+        dialogType: 'error',
+        focus: false,
+        val: '',
+      };
+    },
+    computed: {
+      okText() {
+        return this.confirmText || '确认';
+      },
+      closeText() {
+        return this.cancelText || '取消';
+      },
+      placeholderText() {
+        return this.placeholder || '';
+      },
+      titleText() {
+        return this.title || '';
+      },
+    },
+    watch: {
+      type(val) {
+        this.dialogType = val;
+      },
+      mode(val) {
+        if (val === 'input') {
+          this.dialogType = 'info';
+        }
+      },
+      value(val) {
+        this.val = val;
+      },
+    },
+    created() {
+      if (this.mode === 'input') {
+        this.dialogType = 'info';
+        this.val = this.value;
+      } else {
+        this.dialogType = this.type;
+      }
+    },
+    mounted() {
+      this.focus = true;
+    },
+    methods: {
+      /**
+       * 点击确认按钮
+       */
+      onOk() {
+        if (this.mode === 'input') {
+          this.$emit('confirm', this.val);
+        } else {
+          this.$emit('confirm');
+        }
+        if (this.beforeClose) return;
+      },
+      /**
+       * 点击取消按钮
+       */
+      closeDialog() {
+        this.$emit('close');
+        if (this.beforeClose) return;
+      },
+    },
+  };
+</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/sheep/ui/su-fixed/su-fixed.vue b/sheep/ui/su-fixed/su-fixed.vue
new file mode 100644
index 0000000..e2a9808
--- /dev/null
+++ b/sheep/ui/su-fixed/su-fixed.vue
@@ -0,0 +1,217 @@
+<template>
+  <view class="ui-fixed">
+    <view
+      class="ui-fixed-box"
+      :id="`fixed-${uuid}`"
+      :class="[{ fixed: state.fixed }]"
+      :style="[
+        {
+          left: sticky ? 'auto' : '0px',
+          top: state.fixed && !bottom ? (noNav ? val : val + sys_navBar) + 'px' : 'auto',
+          bottom: insetHeight,
+          zIndex: index + sheep.$zIndex.navbar,
+        },
+        !alway ? { opacity: state.opacityVal } : '',
+      ]"
+    >
+      <view
+        class="ui-fixed-content"
+        @tap="toTop"
+        :style="[{ zIndex: index + sheep.$zIndex.navbar }]"
+      >
+        <slot></slot>
+        <view
+          v-if="safeAreaInsets.bottom && bottom && isInset"
+          class="inset-bottom"
+          :style="[{ height: safeAreaInsets.bottom + 'px' }]"
+        ></view>
+      </view>
+      <view class="ui-fixed-bottom" :class="[bg]" v-if="bottom"></view>
+      <view
+        class="ui-fixed-bg"
+        :class="[ui, bg]"
+        :style="[
+          { zIndex: index + sheep.$zIndex.navbar - 1 },
+          bgStyles,
+          opacity ? { opacity: state.opacityVal } : '',
+        ]"
+      ></view>
+    </view>
+    <view
+      class="skeleton"
+      :style="[{ height: state.content.height + 'px', width: width + 'px' }]"
+      v-if="sticky ? state.fixed : placeholder && state.fixed"
+    ></view>
+  </view>
+</template>
+
+<script setup>
+  import { onPageScroll } from '@dcloudio/uni-app';
+  import { getCurrentInstance, unref, onMounted, reactive, nextTick, computed } from 'vue';
+  import sheep from '@/sheep';
+  const { safeAreaInsets } = sheep.$platform.device;
+
+  const vm = getCurrentInstance();
+
+  const uuid = sheep.$helper.guid();
+  const sys_navBar = sheep.$platform.navbar;
+  const state = reactive({
+    content: {},
+    fixed: true,
+    scrollTop: 0,
+    opacityVal: 0,
+  });
+  const insetHeight = computed(() => {
+    if (state.fixed && props.bottom) {
+      if (props.isInset) {
+        return props.val + 'px';
+      } else {
+        return props.val + safeAreaInsets.bottom + 'px';
+      }
+    } else {
+      return 'auto';
+    }
+  });
+  const props = defineProps({
+    noNav: {
+      type: Boolean,
+      default: false,
+    },
+    bottom: {
+      type: Boolean,
+      default: false,
+    },
+    bg: {
+      type: String,
+      default: '',
+    },
+    bgStyles: {
+      type: Object,
+      default() {},
+    },
+    val: {
+      type: Number,
+      default: 0,
+    },
+    width: {
+      type: [String, Number],
+      default: 0,
+    },
+    alway: {
+      type: Boolean,
+      default: true,
+    },
+    opacity: {
+      type: Boolean,
+      default: false,
+    },
+    index: {
+      type: [Number, String],
+      default: 0,
+    },
+    placeholder: {
+      type: [Boolean],
+      default: false,
+    },
+    sticky: {
+      type: [Boolean],
+      default: false,
+    },
+    noFixed: {
+      type: Boolean,
+      default: false,
+    },
+    ui: {
+      type: String,
+      default: '',
+    },
+    clickTo: {
+      type: Boolean,
+      default: false,
+    },
+    //是否需要安全区
+    isInset: {
+      type: Boolean,
+      default: true,
+    },
+  });
+
+  state.fixed = !unref(props.sticky);
+  onPageScroll((e) => {
+    let top = e.scrollTop;
+    state.scrollTop = top;
+    state.opacityVal = top > sheep.$platform.navbar ? 1 : top * 0.01;
+  });
+
+  onMounted(() => {
+    nextTick(() => {
+      computedQuery();
+    });
+  });
+
+  const computedQuery = () => {
+    uni.createSelectorQuery()
+      .in(vm)
+      .select(`#fixed-${uuid}`)
+      .boundingClientRect((data) => {
+        if (data != null) {
+          state.content = data;
+          if (unref(props.sticky)) {
+            setFixed(state.scrollTop);
+          }
+        }
+      })
+      .exec();
+  };
+
+  const setFixed = (value) => {
+    if (unref(props.bottom)) {
+      state.fixed =
+        value >=
+        state.content.bottom -
+          sheep.$platform.device.windowHeight +
+          state.content.height +
+          unref(props.val);
+    } else {
+      state.fixed =
+        value >=
+        state.content.top -
+          (unref(props.noNav) ? unref(props.val) : unref(props.val) + sheep.$platform.navbar);
+    }
+  };
+
+  const toTop = () => {
+    if (props.hasToTop) {
+      uni.pageScrollTo({
+        scrollTop: state.content.top,
+        duration: 100,
+      });
+    }
+  };
+</script>
+
+<style lang="scss">
+  .ui-fixed {
+    .ui-fixed-box {
+      position: relative;
+      width: 100%;
+      &.fixed {
+        position: fixed;
+      }
+      .ui-fixed-content {
+        position: relative;
+      }
+      .ui-fixed-bg {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        z-index: 1;
+        pointer-events: none;
+      }
+    }
+  }
+  .inset-bottom {
+    background: #fff;
+  }
+</style>
diff --git a/sheep/ui/su-image/su-image.vue b/sheep/ui/su-image/su-image.vue
new file mode 100644
index 0000000..35f8410
--- /dev/null
+++ b/sheep/ui/su-image/su-image.vue
@@ -0,0 +1,130 @@
+<template>
+  <image
+    v-if="!state.isError"
+    class="su-img"
+    :style="customStyle"
+    :draggable="false"
+    :mode="mode"
+    :src="sheep.$url.cdn(src)"
+    @tap="onImgPreview"
+    @load="onImgLoad"
+    @error="onImgError"
+  ></image>
+</template>
+
+<script setup>
+  /**
+   * 图片组件
+   *
+   * @property {String} src 						- 图片地址
+   * @property {Number} mode 						- 裁剪方式
+   * @property {String} isPreview 		  		- 是否开启预览
+   * @property {Number} previewList 				- 预览列表
+   * @property {String} current 		  			- 预览首张下标
+   *
+   * @event {Function} load 						- 图片加载完毕触发
+   * @event {Function} error 						- 图片加载错误触发
+   *
+   */
+
+  import { reactive, computed } from 'vue';
+  import sheep from '@/sheep';
+
+  // 组件数据
+  const state = reactive({
+    isError: false,
+    imgHeight: 600,
+  });
+
+  // 接收参数
+  const props = defineProps({
+    src: {
+      type: String,
+      default: '',
+    },
+    errorSrc: {
+      type: String,
+      default: '/static/img/shop/empty_network.png',
+    },
+    mode: {
+      type: String,
+      default: 'widthFix',
+    },
+    isPreview: {
+      type: Boolean,
+      default: false,
+    },
+    previewList: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    current: {
+      type: Number,
+      default: -1,
+    },
+    height: {
+      type: Number,
+      default: 0,
+    },
+    width: {
+      type: Number,
+      default: 0,
+    },
+    radius: {
+      type: Number,
+      default: 0,
+    },
+  });
+
+  const emits = defineEmits(['load', 'error']);
+
+  const customStyle = computed(() => {
+    return {
+      height: (props.height || state.imgHeight) + 'rpx',
+      width: props.width ? props.width + 'rpx' : '100%',
+      borderRadius: props.radius ? props.radius + 'rpx' : '',
+    };
+  });
+
+  // 图片加载完成
+  function onImgLoad(e) {
+    if (props.height === 0) {
+      state.imgHeight = (e.detail.height / e.detail.width) * 750;
+    }
+  }
+
+  // 图片加载错误
+  function onImgError(e) {
+    state.isError = true;
+    emits('error', e);
+  }
+
+  // 预览图片
+  function onImgPreview() {
+    if (!props.isPreview) return;
+    uni.previewImage({
+      urls: props.previewList.length < 1 ? [props.src] : props.previewList,
+      current: props.current,
+      longPressActions: {
+        itemList: ['发送给朋友', '保存图片', '收藏'],
+        success: function (data) {
+          console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+        },
+        fail: function (err) {
+          console.log(err.errMsg);
+        },
+      },
+    });
+  }
+</script>
+
+<style lang="scss" scoped>
+  .su-img {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
+</style>
diff --git a/sheep/ui/su-inner-navbar/su-inner-navbar.vue b/sheep/ui/su-inner-navbar/su-inner-navbar.vue
new file mode 100644
index 0000000..8072032
--- /dev/null
+++ b/sheep/ui/su-inner-navbar/su-inner-navbar.vue
@@ -0,0 +1,365 @@
+<template>
+  <su-fixed
+    :noFixed="props.noFixed"
+    :alway="props.alway"
+    :bgStyles="props.bgStyles"
+    :val="0"
+    :index="props.zIndex"
+    noNav
+    :bg="props.bg"
+    :ui="props.ui"
+    :opacity="props.opacity"
+    :placeholder="props.placeholder"
+  >
+    <su-status-bar />
+    <!-- 
+      :class="[{ 'border-bottom': !props.opacity && props.bg != 'bg-none' }]"
+     -->
+    <view class="ui-navbar-box">
+      <view
+        class="ui-bar ss-p-x-20"
+        :class="state.isDark ? 'text-white' : 'text-black'"
+        :style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
+      >
+        <view class="icon-box ss-flex">
+          <view class="icon-button icon-button-left ss-flex ss-row-center" @tap="onClickLeft">
+            <text class="sicon-back" v-if="hasHistory" />
+            <text class="sicon-home" v-else />
+          </view>
+          <view class="line"></view>
+          <view class="icon-button icon-button-right ss-flex ss-row-center" @tap="onClickRight">
+            <text class="sicon-more" />
+          </view>
+        </view>
+        <slot name="center">
+          <view class="center navbar-title">{{ title }}</view>
+        </slot>
+        <!-- #ifdef MP -->
+        <view :style="[state.capsuleStyle]"></view>
+        <!-- #endif -->
+      </view>
+    </view>
+  </su-fixed>
+</template>
+
+<script setup>
+  /**
+   * 标题栏 - 基础组件navbar
+   *
+   * @param {Number}  zIndex = 100  							- 层级
+   * @param {Boolean}  back = true 							- 是否返回上一页
+   * @param {String}  backtext = ''  							- 返回文本
+   * @param {String}  bg = 'bg-white'  						- 公共Class
+   * @param {String}  status = ''  							- 状态栏颜色
+   * @param {Boolean}  alway = true							- 是否常驻
+   * @param {Boolean}  opacity = false  						- 是否开启透明渐变
+   * @param {Boolean}  noFixed = false  						- 是否浮动
+   * @param {String}  ui = ''									- 公共Class
+   * @param {Boolean}  capsule = false  						- 是否开启胶囊返回
+   * @param {Boolean}  stopBack = false 					    - 是否禁用返回
+   * @param {Boolean}  placeholder = true 					- 是否开启占位
+   * @param {Object}   bgStyles = {} 					    	- 背景样式
+   *
+   */
+
+  import { computed, reactive, onBeforeMount, ref } from 'vue';
+  import sheep from '@/sheep';
+  import { onPageScroll } from '@dcloudio/uni-app';
+  import { showMenuTools, closeMenuTools } from '@/sheep/hooks/useModal';
+
+  // 本地数据
+  const state = reactive({
+    statusCur: '',
+    capsuleStyle: {},
+    capsuleBack: {},
+    isDark: true,
+  });
+
+  const sys_statusBar = sheep.$platform.device.statusBarHeight;
+  const sys_navBar = sheep.$platform.navbar;
+
+  const props = defineProps({
+    zIndex: {
+      type: Number,
+      default: 100,
+    },
+
+    title: {
+      //返回文本
+      type: String,
+      default: '',
+    },
+    bg: {
+      type: String,
+      default: 'bg-white',
+    },
+    // 常驻
+    alway: {
+      type: Boolean,
+      default: true,
+    },
+    opacity: {
+      //是否开启滑动渐变
+      type: Boolean,
+      default: true,
+    },
+    noFixed: {
+      //是否浮动
+      type: Boolean,
+      default: true,
+    },
+    ui: {
+      type: String,
+      default: '',
+    },
+    capsule: {
+      //是否开启胶囊返回
+      type: Boolean,
+      default: false,
+    },
+    stopBack: {
+      type: Boolean,
+      default: false,
+    },
+    placeholder: {
+      type: [Boolean],
+      default: false,
+    },
+    bgStyles: {
+      type: Object,
+      default() {},
+    },
+  });
+
+  const emits = defineEmits(['navback', 'clickLeft']);
+  const hasHistory = sheep.$router.hasHistory();
+
+  onBeforeMount(() => {
+    init();
+  });
+
+  onPageScroll((e) => {
+    let top = e.scrollTop;
+    state.isDark = top < sheep.$platform.navbar;
+  });
+
+  function onClickLeft() {
+    if (hasHistory) {
+      sheep.$router.back();
+    } else {
+      sheep.$router.go('/pages/tabbar/index');
+    }
+    emits('clickLeft');
+  }
+  function onClickRight() {
+    showMenuTools();
+  }
+
+  // 初始化
+  const init = () => {
+    // #ifdef MP-ALIPAY
+    my.hideAllFavoriteMenu();
+    // #endif
+    state.capsuleStyle = {
+      width: sheep.$platform.capsule.width + 'px',
+      height: sheep.$platform.capsule.height + 'px',
+    };
+
+    state.capsuleBack = state.capsuleStyle;
+  };
+</script>
+
+<style lang="scss" scoped>
+  .icon-box {
+    box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
+    border-radius: 30rpx;
+    width: 134rpx;
+    height: 56rpx;
+    margin-left: 8rpx;
+    border: 1px solid rgba(#fff, 0.4);
+    .line {
+      width: 2rpx;
+      height: 24rpx;
+      background: #e5e5e7;
+    }
+    .sicon-back {
+      font-size: 32rpx;
+    }
+    .sicon-home {
+      font-size: 32rpx;
+    }
+    .sicon-more {
+      font-size: 32rpx;
+    }
+    .icon-button {
+      width: 67rpx;
+      height: 56rpx;
+      &-left:hover {
+        background: rgba(0, 0, 0, 0.16);
+        border-radius: 30rpx 0px 0px 30rpx;
+      }
+      &-right:hover {
+        background: rgba(0, 0, 0, 0.16);
+        border-radius: 0px 30rpx 30rpx 0px;
+      }
+    }
+  }
+  .navbar-title {
+    font-size: 36rpx;
+  }
+  .tools-icon {
+    font-size: 40rpx;
+  }
+  .ui-navbar-box {
+    background-color: transparent;
+    width: 100%;
+
+    .ui-bar {
+      position: relative;
+      z-index: 2;
+      white-space: nowrap;
+      display: flex;
+      position: relative;
+      align-items: center;
+      justify-content: space-between;
+
+      .left {
+        @include flex-bar;
+
+        .back {
+          @include flex-bar;
+
+          .back-icon {
+            @include flex-center;
+            width: 56rpx;
+            height: 56rpx;
+            margin: 0 10rpx;
+            font-size: 46rpx !important;
+
+            &.opacityIcon {
+              position: relative;
+              border-radius: 50%;
+              background-color: rgba(127, 127, 127, 0.5);
+
+              &::after {
+                content: '';
+                display: block;
+                position: absolute;
+                height: 200%;
+                width: 200%;
+                left: 0;
+                top: 0;
+                border-radius: inherit;
+                transform: scale(0.5);
+                transform-origin: 0 0;
+                opacity: 0.1;
+                border: 1px solid currentColor;
+                pointer-events: none;
+              }
+
+              &::before {
+                transform: scale(0.9);
+              }
+            }
+          }
+
+          /* #ifdef  MP-ALIPAY */
+          ._icon-back {
+            opacity: 0;
+          }
+
+          /* #endif */
+        }
+
+        .capsule {
+          @include flex-bar;
+          border-radius: 100px;
+          position: relative;
+
+          &.dark {
+            background-color: rgba(255, 255, 255, 0.5);
+          }
+
+          &.light {
+            background-color: rgba(0, 0, 0, 0.15);
+          }
+
+          &::after {
+            content: '';
+            display: block;
+            position: absolute;
+            height: 60%;
+            width: 1px;
+            left: 50%;
+            top: 20%;
+            background-color: currentColor;
+            opacity: 0.1;
+            pointer-events: none;
+          }
+
+          &::before {
+            content: '';
+            display: block;
+            position: absolute;
+            height: 200%;
+            width: 200%;
+            left: 0;
+            top: 0;
+            border-radius: inherit;
+            transform: scale(0.5);
+            transform-origin: 0 0;
+            opacity: 0.1;
+            border: 1px solid currentColor;
+            pointer-events: none;
+          }
+
+          .capsule-back,
+          .capsule-home {
+            @include flex-center;
+            flex: 1;
+          }
+
+          &.isFristPage {
+            .capsule-back,
+            &::after {
+              display: none;
+            }
+          }
+        }
+      }
+
+      .right {
+        @include flex-bar;
+
+        .right-content {
+          @include flex;
+          flex-direction: row-reverse;
+        }
+      }
+
+      .center {
+        @include flex-center;
+        text-overflow: ellipsis;
+        // text-align: center;
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+
+        .image {
+          display: block;
+          height: 36px;
+          max-width: calc(100vw - 200px);
+        }
+      }
+    }
+
+    .ui-bar-bg {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      top: 0;
+      z-index: 1;
+      pointer-events: none;
+    }
+  }
+</style>
diff --git a/sheep/ui/su-navbar/su-navbar.vue b/sheep/ui/su-navbar/su-navbar.vue
new file mode 100644
index 0000000..e02249a
--- /dev/null
+++ b/sheep/ui/su-navbar/su-navbar.vue
@@ -0,0 +1,483 @@
+<!-- 自定义导航栏 -->
+<template>
+  <view class="uni-navbar" :class="{ 'uni-dark': dark }">
+    <view
+      :class="{
+        'uni-navbar--fixed': fixed,
+        'uni-navbar--shadow': shadow,
+        'uni-navbar--border': border,
+      }"
+      class="uni-navbar__content"
+    >
+      <view class="fixed-bg" :class="[opacity ? '' : opacityBgUi]"></view>
+      <su-status-bar v-if="statusBar" />
+      <view
+        :style="{
+          color: themeColor,
+          height: navbarHeight,
+          background: backgroundColor,
+        }"
+        class="uni-navbar__header"
+      >
+        <view
+          class="uni-navbar__header-btns uni-navbar__header-btns-left"
+          :style="{ width: leftIconWidth }"
+        >
+          <slot name="left">
+            <view class="uni-navbar__content_view" v-if="leftIcon.length > 0">
+              <view class="icon-box ss-flex">
+                <view class="icon-button icon-button-left ss-flex ss-row-center" @tap="onClickLeft">
+                  <text class="sicon-back" v-if="hasHistory" />
+                  <text class="sicon-home" v-else />
+                </view>
+                <view class="line"></view>
+                <view
+                  class="icon-button icon-button-right ss-flex ss-row-center"
+                  @tap="showMenuTools"
+                >
+                  <text class="sicon-more" />
+                </view>
+              </view>
+            </view>
+            <view
+              :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length > 0 }"
+              class="uni-navbar-btn-text"
+              v-if="
+                titleAlign === 'left' &&
+                title.length &&
+                sheep.$platform.name !== 'WechatOfficialAccount'
+              "
+            >
+              <text :style="{ color: themeColor, fontSize: '18px' }">{{ title }}</text>
+            </view>
+          </slot>
+        </view>
+        <view v-if="tools === 'search'" class="ss-flex-1">
+          <slot name="center">
+            <uni-search-bar
+              class="ss-flex-1 search-box"
+              :radius="20"
+              placeholder="请输入关键词"
+              cancelButton="none"
+              v-model="searchModel"
+              @confirm="onSearch"
+            />
+          </slot>
+        </view>
+        <view v-else class="uni-navbar__header-container" @tap="onClickTitle">
+          <slot name="center">
+            <view
+              v-if="tools === 'title' && titleAlign === 'center' && title.length"
+              class="uni-navbar__header-container-inner"
+            >
+              <text :style="{ color: themeColor, fontSize: '36rpx' }" class="ss-line-1">{{
+                title
+              }}</text>
+            </view>
+          </slot>
+        </view>
+      </view>
+    </view>
+    <view class="uni-navbar__placeholder" v-if="placeholder">
+      <su-status-bar v-if="statusBar" />
+      <view class="uni-navbar__placeholder-view" :style="{ height: navbarHeight }" />
+    </view>
+    <!-- 头部问题 -->
+    <!-- #ifdef MP -->
+    <!-- <view :style="[capsuleStyle]"></view> -->
+    <!-- #endif -->
+  </view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad } from '@dcloudio/uni-app';
+  import { showMenuTools, closeMenuTools } from '@/sheep/hooks/useModal';
+  import { computed, ref } from 'vue';
+
+  /**
+   * NavBar 自定义导航栏
+   * @description 导航栏组件，主要用于头部导航
+   * @property {Boolean} dark 开启黑暗模式
+   * @property {String} title 标题文字
+   * @property {String} rightText 右侧按钮文本
+   * @property {String} leftIcon 左侧按钮图标
+   * @property {String} rightIcon 右侧按钮图标
+   * @property {String} color 图标和文字颜色
+   * @property {String} backgroundColor 导航栏背景颜色
+   * @property {Boolean} fixed = [true|false] 是否固定顶部
+   * @property {Boolean} statusBar = [true|false] 是否包含状态栏
+   * @property {Boolean} shadow = [true|false] 导航栏下是否有阴影
+   * @event {Function} clickLeft 左侧按钮点击时触发
+   * @event {Function} clickRight 右侧按钮点击时触发
+   * @event {Function} clickTitle 中间标题点击时触发
+   */
+
+  const getVal = (val) => (typeof val === 'number' ? val + 'px' : val);
+
+  const emits = defineEmits(['clickLeft', 'clickRight', 'clickTitle', 'search']);
+  const props = defineProps({
+    dark: {
+      type: Boolean,
+      default: false,
+    },
+    modelValue: {
+      type: String,
+      default: '',
+    },
+    title: {
+      type: String,
+      default: '',
+    },
+    titleAlign: {
+      type: String,
+      default: 'center', // left | center
+    },
+    rightText: {
+      type: String,
+      default: '',
+    },
+    leftIcon: {
+      type: String,
+      default: 'left',
+    },
+    rightIcon: {
+      type: String,
+      default: '',
+    },
+    fixed: {
+      type: [Boolean, String],
+      default: true,
+    },
+    placeholder: {
+      type: [Boolean, String],
+      default: true,
+    },
+    color: {
+      type: String,
+      default: '',
+    },
+    backgroundColor: {
+      type: String,
+      default: '',
+    },
+    opacity: {
+      type: [Boolean, String],
+      default: false,
+    },
+    opacityBgUi: {
+      type: String,
+      default: 'bg-white',
+    },
+    statusBar: {
+      type: [Boolean, String],
+      default: false,
+    },
+    shadow: {
+      type: [Boolean, String],
+      default: false,
+    },
+    border: {
+      type: [Boolean, String],
+      default: false,
+    },
+    height: {
+      type: [Number, String],
+      default: 44,
+    },
+    leftWidth: {
+      type: [Number, String],
+      default: 80,
+    },
+    rightWidth: {
+      type: [Number, String],
+      default: 0,
+    },
+    tools: {
+      type: String,
+      default: 'title',
+    },
+    defaultSearch: {
+      type: String,
+      default: '',
+    },
+  });
+
+  const capsuleStyle = computed(() => {
+    return {
+      width: sheep.$platform.capsule.width + 'px',
+      height: sheep.$platform.capsule.height + 'px',
+      margin: '0 ' + (sheep.$platform.device.windowWidth - sheep.$platform.capsule.right) + 'px',
+    };
+  });
+
+  const searchModel = computed(() => {
+		return props.defaultSearch
+	})
+
+  const themeBgColor = computed(() => {
+    if (props.dark) {
+      // 默认值
+      if (props.backgroundColor) {
+        return props.backgroundColor;
+      } else {
+        return props.dark ? '#333' : '#FFF';
+      }
+    }
+    return props.backgroundColor || '#FFF';
+  });
+  const themeColor = computed(() => {
+    if (props.dark) {
+      // 默认值
+      if (props.color) {
+        return props.color;
+      } else {
+        return props.dark ? '#fff' : '#333';
+      }
+    }
+    return props.color || '#333';
+  });
+  const navbarHeight = computed(() => {
+    return getVal(props.height);
+  });
+  const leftIconWidth = computed(() => {
+    return getVal(props.leftWidth);
+  });
+  const rightIconWidth = computed(() => {
+    return getVal(props.rightWidth);
+  });
+
+  function onSearch(e) {
+    emits('search', e.value);
+  }
+
+  onLoad(() => {
+    if (uni.report && props.title !== '') {
+      uni.report('title', props.title);
+    }
+  });
+
+  const hasHistory = sheep.$router.hasHistory();
+
+  function onClickLeft() {
+    if (hasHistory) {
+      sheep.$router.back();
+    } else {
+      sheep.$router.go('/pages/tabbar/index');
+    }
+    emits('clickLeft');
+  }
+  function onClickRight() {
+    showMenuTools();
+  }
+  function onClickTitle() {
+    emits('clickTitle');
+  }
+</script>
+
+<style lang="scss" scoped>
+  .bg-main {
+    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)) !important;
+    color: #fff !important;
+  }
+  .icon-box {
+    background: #ffffff;
+    box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
+    border-radius: 30rpx;
+    width: 134rpx;
+    height: 56rpx;
+    margin-left: 8rpx;
+    .line {
+      width: 2rpx;
+      height: 24rpx;
+      background: #e5e5e7;
+    }
+    .sicon-back {
+      font-size: 32rpx;
+      color: #000;
+    }
+    .sicon-home {
+      font-size: 32rpx;
+      color: #000;
+    }
+    .sicon-more {
+      font-size: 32rpx;
+      color: #000;
+    }
+    .icon-button {
+      width: 67rpx;
+      height: 56rpx;
+      &-left:hover {
+        background: rgba(0, 0, 0, 0.16);
+        border-radius: 30rpx 0px 0px 30rpx;
+      }
+      &-right:hover {
+        background: rgba(0, 0, 0, 0.16);
+        border-radius: 0px 30rpx 30rpx 0px;
+      }
+    }
+  }
+
+  $nav-height: 44px;
+
+  .fixed-bg {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    z-index: 1;
+    pointer-events: none;
+  }
+
+  .uni-nav-bar-text {
+    /* #ifdef APP-PLUS */
+    font-size: 34rpx;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    font-size: 14px;
+    /* #endif */
+  }
+
+  .uni-nav-bar-right-text {
+    font-size: 12px;
+  }
+
+  .uni-navbar__content {
+    position: relative;
+    // background-color: #fff;
+    // box-sizing: border-box;
+    background-color: transparent;
+  }
+
+  .uni-navbar__content_view {
+    // box-sizing: border-box;
+  }
+
+  .uni-navbar-btn-text {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: center;
+    line-height: 18px;
+  }
+
+  .uni-navbar__header {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    padding: 0 10px;
+    flex-direction: row;
+    justify-content: space-between;
+    height: $nav-height;
+    font-size: 12px;
+    position: relative;
+    z-index: 2;
+  }
+
+  .uni-navbar__header-btns {
+    /* #ifndef APP-NVUE */
+    overflow: hidden;
+    display: flex;
+    /* #endif */
+    flex-wrap: nowrap;
+    flex-direction: row;
+    // min-width: 120rpx;
+    min-width: 40rpx;
+    // padding: 0 6px;
+    justify-content: center;
+    align-items: center;
+    /* #ifdef H5 */
+    cursor: pointer;
+    /* #endif */
+  }
+
+  .uni-navbar__header-btns-left {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    width: 120rpx;
+    justify-content: flex-start;
+    align-items: center;
+  }
+
+  .uni-navbar__header-btns-right {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+    // width: 150rpx;
+    // padding-right: 30rpx;
+    justify-content: flex-end;
+    align-items: center;
+  }
+  .uni-navbar__header-container {
+    /* #ifndef APP-NVUE */
+    // display: flex;
+    /* #endif */
+    // flex: 1;
+    // padding: 0 10px;
+    // overflow: hidden;
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%) translateY(-50%);
+    top: 50%;
+  }
+
+  .uni-navbar__header-container-inner {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex: 1;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    font-size: 12px;
+    overflow: hidden;
+    // box-sizing: border-box;
+  }
+
+  .uni-navbar__placeholder-view {
+    height: $nav-height;
+  }
+
+  .uni-navbar--fixed {
+    position: fixed;
+    z-index: 998;
+    /* #ifdef H5 */
+    left: var(--window-left);
+    right: var(--window-right);
+    /* #endif */
+    /* #ifndef H5 */
+    left: 0;
+    right: 0;
+    /* #endif */
+  }
+
+  .uni-navbar--shadow {
+    box-shadow: 0 1px 6px #ccc;
+  }
+
+  .uni-navbar--border {
+    border-bottom-width: 1rpx;
+    border-bottom-style: solid;
+    border-bottom-color: #eee;
+  }
+
+  .uni-ellipsis-1 {
+    overflow: hidden;
+    /* #ifndef APP-NVUE */
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    /* #endif */
+    /* #ifdef APP-NVUE */
+    lines: 1;
+    text-overflow: ellipsis;
+    /* #endif */
+  }
+
+  // 暗主题配置
+  .uni-dark {
+  }
+</style>
diff --git a/sheep/ui/su-notice-bar/su-notice-bar.vue b/sheep/ui/su-notice-bar/su-notice-bar.vue
new file mode 100644
index 0000000..fc5075a
--- /dev/null
+++ b/sheep/ui/su-notice-bar/su-notice-bar.vue
@@ -0,0 +1,473 @@
+<!-- 公告栏组件 -->
+<template>
+  <view
+    v-if="show"
+    class="uni-noticebar"
+    :style="{ backgroundColor: backgroundColor }"
+    @click="onClick"
+  >
+    <slot name="icon">
+      <uni-icons
+        v-if="showIcon === true || showIcon === 'true'"
+        class="uni-noticebar-icon"
+        type="sound"
+        :color="color"
+        size="22"
+      />
+    </slot>
+    <view
+      ref="textBox"
+      class="uni-noticebar__content-wrapper"
+      :class="{
+        'uni-noticebar__content-wrapper--scrollable': scrollable,
+        'uni-noticebar__content-wrapper--single': !scrollable && (single || moreText),
+      }"
+    >
+      <view
+        :id="elIdBox"
+        class="uni-noticebar__content"
+        :class="{
+          'uni-noticebar__content--scrollable': scrollable,
+          'uni-noticebar__content--single': !scrollable && (single || moreText),
+        }"
+      >
+        <text
+          :id="elId"
+          ref="animationEle"
+          class="uni-noticebar__content-text"
+          :class="{
+            'uni-noticebar__content-text--scrollable': scrollable,
+            'uni-noticebar__content-text--single': !scrollable && (single || showGetMore),
+          }"
+          :style="{
+            color: color,
+            width: wrapWidth + 'px',
+            animationDuration: animationDuration,
+            '-webkit-animationDuration': animationDuration,
+            animationPlayState: webviewHide ? 'paused' : animationPlayState,
+            '-webkit-animationPlayState': webviewHide ? 'paused' : animationPlayState,
+            animationDelay: animationDelay,
+            '-webkit-animationDelay': animationDelay,
+          }"
+        >
+          {{ text }}
+        </text>
+      </view>
+    </view>
+    <view
+      v-if="showGetMore === true || showGetMore === 'true'"
+      class="uni-noticebar__more uni-cursor-point"
+      @click="clickMore"
+    >
+      <text
+        v-if="moreText.length > 0"
+        :style="{ color: moreColor }"
+        class="uni-noticebar__more-text"
+      >
+        {{ moreText }}
+      </text>
+      <uni-icons v-else type="right" :color="moreColor" size="16" />
+    </view>
+    <view
+      class="uni-noticebar-close uni-cursor-point"
+      v-if="
+        (showClose === true || showClose === 'true') &&
+        (showGetMore === false || showGetMore === 'false')
+      "
+    >
+      <view @click="close">
+        <slot name="close">
+          <uni-icons type="closeempty" :color="color" size="16" />
+        </slot>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import sheep from '@/sheep';
+  // #ifdef APP-NVUE
+  const dom = weex.requireModule('dom');
+  const animation = weex.requireModule('animation');
+  // #endif
+
+  /**
+   * NoticeBar 自定义导航栏
+   * @description 通告栏组件
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=30
+   * @property {Number} speed 文字滚动的速度，默认100px/秒
+   * @property {String} text 显示文字
+   * @property {String} backgroundColor 背景颜色
+   * @property {String} color 文字颜色
+   * @property {String} moreColor 查看更多文字的颜色
+   * @property {String} moreText 设置“查看更多”的文本
+   * @property {Boolean} single = [true|false] 是否单行
+   * @property {Boolean} scrollable = [true|false] 是否滚动，为true时，NoticeBar为单行
+   * @property {Boolean} showIcon = [true|false] 是否显示左侧喇叭图标
+   * @property {Boolean} showClose = [true|false] 是否显示左侧关闭按钮
+   * @property {Boolean} showGetMore = [true|false] 是否显示右侧查看更多图标，为true时，NoticeBar为单行
+   * @event {Function} click 点击 NoticeBar 触发事件
+   * @event {Function} close 关闭 NoticeBar 触发事件
+   * @event {Function} getmore 点击”查看更多“时触发事件
+   */
+
+  export default {
+    name: 'UniNoticeBar',
+    emits: ['click', 'getmore', 'close'],
+    props: {
+      text: {
+        type: String,
+        default: '',
+      },
+      moreText: {
+        type: String,
+        default: '',
+      },
+      backgroundColor: {
+        type: String,
+        default: '',
+      },
+      speed: {
+        // 默认1s滚动100px
+        type: Number,
+        default: 100,
+      },
+      color: {
+        type: String,
+        default: 'var(--ui-BG-Main)',
+      },
+      moreColor: {
+        type: String,
+        default: '#FF9A43',
+      },
+      single: {
+        // 是否单行
+        type: [Boolean, String],
+        default: false,
+      },
+      scrollable: {
+        // 是否滚动，添加后控制单行效果取消
+        type: [Boolean, String],
+        default: false,
+      },
+      showIcon: {
+        // 是否显示左侧icon
+        type: [Boolean, String],
+        default: false,
+      },
+      showGetMore: {
+        // 是否显示右侧查看更多
+        type: [Boolean, String],
+        default: false,
+      },
+      showClose: {
+        // 是否显示左侧关闭按钮
+        type: [Boolean, String],
+        default: false,
+      },
+    },
+    data() {
+      const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`;
+      const elIdBox = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`;
+      return {
+        textWidth: 0,
+        boxWidth: 0,
+        wrapWidth: '',
+        webviewHide: false,
+        // #ifdef APP-NVUE
+        stopAnimation: false,
+        // #endif
+        elId: elId,
+        elIdBox: elIdBox,
+        show: true,
+        animationDuration: 'none',
+        animationPlayState: 'paused',
+        animationDelay: '0s',
+      };
+    },
+    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
+      this.$nextTick(() => {
+        this.initSize();
+      });
+    },
+    // #ifdef APP-NVUE
+    beforeDestroy() {
+      this.stopAnimation = true;
+    },
+    // #endif
+    methods: {
+      initSize() {
+        if (this.scrollable) {
+          // #ifndef APP-NVUE
+          let query = [],
+            boxWidth = 0,
+            textWidth = 0;
+          let textQuery = new Promise((resolve, reject) => {
+            uni.createSelectorQuery()
+              // #ifndef MP-ALIPAY
+              .in(this)
+              // #endif
+              .select(`#${this.elId}`)
+              .boundingClientRect()
+              .exec((ret) => {
+                this.textWidth = ret[0].width;
+                resolve();
+              });
+          });
+          let boxQuery = new Promise((resolve, reject) => {
+            uni.createSelectorQuery()
+              // #ifndef MP-ALIPAY
+              .in(this)
+              // #endif
+              .select(`#${this.elIdBox}`)
+              .boundingClientRect()
+              .exec((ret) => {
+                this.boxWidth = ret[0].width;
+                resolve();
+              });
+          });
+          query.push(textQuery);
+          query.push(boxQuery);
+          Promise.all(query).then(() => {
+            this.animationDuration = `${this.textWidth / this.speed}s`;
+            this.animationDelay = `-${this.boxWidth / this.speed}s`;
+            setTimeout(() => {
+              this.animationPlayState = 'running';
+            }, 1000);
+          });
+          // #endif
+          // #ifdef APP-NVUE
+          dom.getComponentRect(this.$refs['animationEle'], (res) => {
+            let winWidth = sheep.$platform.device.windowWidth;
+            this.textWidth = res.size.width;
+            animation.transition(
+              this.$refs['animationEle'],
+              {
+                styles: {
+                  transform: `translateX(-${winWidth}px)`,
+                },
+                duration: 0,
+                timingFunction: 'linear',
+                delay: 0,
+              },
+              () => {
+                if (!this.stopAnimation) {
+                  animation.transition(
+                    this.$refs['animationEle'],
+                    {
+                      styles: {
+                        transform: `translateX(-${this.textWidth}px)`,
+                      },
+                      timingFunction: 'linear',
+                      duration: ((this.textWidth - winWidth) / this.speed) * 1000,
+                      delay: 1000,
+                    },
+                    () => {
+                      if (!this.stopAnimation) {
+                        this.loopAnimation();
+                      }
+                    },
+                  );
+                }
+              },
+            );
+          });
+          // #endif
+        }
+        // #ifdef APP-NVUE
+        if (!this.scrollable && (this.single || this.moreText)) {
+          dom.getComponentRect(this.$refs['textBox'], (res) => {
+            this.wrapWidth = res.size.width;
+          });
+        }
+        // #endif
+      },
+      loopAnimation() {
+        // #ifdef APP-NVUE
+        animation.transition(
+          this.$refs['animationEle'],
+          {
+            styles: {
+              transform: `translateX(0px)`,
+            },
+            duration: 0,
+          },
+          () => {
+            if (!this.stopAnimation) {
+              animation.transition(
+                this.$refs['animationEle'],
+                {
+                  styles: {
+                    transform: `translateX(-${this.textWidth}px)`,
+                  },
+                  duration: (this.textWidth / this.speed) * 1000,
+                  timingFunction: 'linear',
+                  delay: 0,
+                },
+                () => {
+                  if (!this.stopAnimation) {
+                    this.loopAnimation();
+                  }
+                },
+              );
+            }
+          },
+        );
+        // #endif
+      },
+      clickMore() {
+        this.$emit('getmore');
+      },
+      close() {
+        this.show = false;
+        this.$emit('close');
+      },
+      onClick() {
+        this.$emit('click');
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .uni-noticebar {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    width: 100%;
+    box-sizing: border-box;
+    /* #endif */
+    flex-direction: row;
+    align-items: center;
+    padding: 10px 12px;
+    // margin-bottom: 10px;
+  }
+
+  .uni-cursor-point {
+    /* #ifdef H5 */
+    cursor: pointer;
+    /* #endif */
+  }
+
+  .uni-noticebar-close {
+    margin-left: 8px;
+    margin-right: 5px;
+  }
+
+  .uni-noticebar-icon {
+    margin-right: 5px;
+  }
+
+  .uni-noticebar__content-wrapper {
+    flex: 1;
+    flex-direction: column;
+    overflow: hidden;
+  }
+
+  .uni-noticebar__content-wrapper--single {
+    /* #ifndef APP-NVUE */
+    line-height: 18px;
+    /* #endif */
+  }
+
+  .uni-noticebar__content-wrapper--single,
+  .uni-noticebar__content-wrapper--scrollable {
+    flex-direction: row;
+  }
+
+  /* #ifndef APP-NVUE */
+  .uni-noticebar__content-wrapper--scrollable {
+    position: relative;
+    height: 18px;
+  }
+
+  /* #endif */
+
+  .uni-noticebar__content--scrollable {
+    /* #ifdef APP-NVUE */
+    flex: 0;
+    /* #endif */
+    /* #ifndef APP-NVUE */
+    flex: 1;
+    display: block;
+    overflow: hidden;
+    /* #endif */
+  }
+
+  .uni-noticebar__content--single {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    flex: none;
+    width: 100%;
+    justify-content: center;
+    /* #endif */
+  }
+
+  .uni-noticebar__content-text {
+    font-size: 14px;
+    line-height: 18px;
+    /* #ifndef APP-NVUE */
+    word-break: break-all;
+    /* #endif */
+  }
+
+  .uni-noticebar__content-text--single {
+    /* #ifdef APP-NVUE */
+    lines: 1;
+    /* #endif */
+    /* #ifndef APP-NVUE */
+    display: block;
+    width: 100%;
+    white-space: nowrap;
+    /* #endif */
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .uni-noticebar__content-text--scrollable {
+    /* #ifdef APP-NVUE */
+    lines: 1;
+    padding-left: 750rpx;
+    /* #endif */
+    /* #ifndef APP-NVUE */
+    position: absolute;
+    display: block;
+    height: 18px;
+    line-height: 18px;
+    white-space: nowrap;
+    padding-left: 100%;
+    animation: notice 10s 0s linear infinite both;
+    animation-play-state: paused;
+    /* #endif */
+  }
+
+  .uni-noticebar__more {
+    /* #ifndef APP-NVUE */
+    display: inline-flex;
+    /* #endif */
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    padding-left: 5px;
+  }
+
+  .uni-noticebar__more-text {
+    font-size: 14px;
+  }
+
+  @keyframes notice {
+    100% {
+      transform: translate3d(-100%, 0, 0);
+    }
+  }
+</style>
diff --git a/sheep/ui/su-number-box/su-number-box.vue b/sheep/ui/su-number-box/su-number-box.vue
new file mode 100644
index 0000000..6b662cd
--- /dev/null
+++ b/sheep/ui/su-number-box/su-number-box.vue
@@ -0,0 +1,225 @@
+<template>
+  <view class="uni-numbox">
+    <!-- <view @click="_calcValue('minus')" class="uni-numbox__minus uni-numbox-btns" :style="{ background }"> -->
+    <!-- <text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }"
+				:style="{ color }">
+				-
+			</text> -->
+    <text
+      class="cicon-move-round"
+      :class="{
+        'uni-numbox--disabled': inputValue <= min || disabled,
+        'groupon-btn': activity === 'groupon',
+        'seckill-btn': activity === 'seckill',
+      }"
+      @click="_calcValue('minus')"
+    ></text>
+    <!-- </view> -->
+    <input
+      :disabled="disabled"
+      @focus="_onFocus"
+      @blur="_onBlur"
+      class="uni-numbox__value"
+      type="number"
+      v-model="inputValue"
+      :style="{ color }"
+    />
+    <!-- <view @click="_calcValue('plus')" class="uni-numbox__plus uni-numbox-btns">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }">+</text>
+		</view> -->
+    <text
+      class="cicon-add-round"
+      :class="{
+        'uni-numbox--disabled': inputValue >= max || disabled,
+        'groupon-btn': activity === 'groupon',
+        'seckill-btn': activity === 'seckill',
+      }"
+      @click="_calcValue('plus')"
+    ></text>
+  </view>
+</template>
+<script>
+  /**
+   * NumberBox 数字输入框
+   * @description 带加减按钮的数字输入框
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=31
+   * @property {Number} value 输入框当前值
+   * @property {Number} min 最小值
+   * @property {Number} max 最大值
+   * @property {Number} step 每次点击改变的间隔大小
+   * @property {String} background 背景色
+   * @property {String} color 字体颜色（前景色）
+   * @property {Boolean} disabled = [true|false] 是否为禁用状态
+   * @event {Function} change 输入框值改变时触发的事件，参数为输入框当前的 value
+   * @event {Function} focus 输入框聚焦时触发的事件，参数为 event 对象
+   * @event {Function} blur 输入框失焦时触发的事件，参数为 event 对象
+   */
+
+  export default {
+    name: 'UniNumberBox',
+    emits: ['change', 'input', 'update:modelValue', 'blur', 'focus'],
+    props: {
+      value: {
+        type: [Number, String],
+        default: 1,
+      },
+      modelValue: {
+        type: [Number, String],
+        default: 1,
+      },
+      min: {
+        type: Number,
+        default: 0,
+      },
+      max: {
+        type: Number,
+        default: 100,
+      },
+      step: {
+        type: Number,
+        default: 1,
+      },
+      background: {
+        type: String,
+        default: '#f5f5f5',
+      },
+      color: {
+        type: String,
+        default: '#333',
+      },
+      disabled: {
+        type: Boolean,
+        default: false,
+      },
+      activity: {
+        type: String,
+        default: 'none',
+      },
+    },
+    data() {
+      return {
+        inputValue: 0,
+      };
+    },
+    watch: {
+      value(val) {
+        this.inputValue = +val;
+      },
+      modelValue(val) {
+        this.inputValue = +val;
+      },
+    },
+    created() {
+      if (this.value === 1) {
+        this.inputValue = +this.modelValue;
+      }
+      if (this.modelValue === 1) {
+        this.inputValue = +this.value;
+      }
+    },
+    methods: {
+      _calcValue(type) {
+        if (this.disabled) {
+          return;
+        }
+        const scale = this._getDecimalScale();
+        let value = this.inputValue * scale;
+        let step = this.step * scale;
+        if (type === 'minus') {
+          value -= step;
+          if (value < this.min * scale) {
+            return;
+          }
+          if (value > this.max * scale) {
+            value = this.max * scale;
+          }
+        }
+
+        if (type === 'plus') {
+          value += step;
+          if (value > this.max * scale) {
+            return;
+          }
+          if (value < this.min * scale) {
+            value = this.min * scale;
+          }
+        }
+
+        this.inputValue = (value / scale).toFixed(String(scale).length - 1);
+        this.$emit('change', +this.inputValue);
+        // TODO vue2 兼容
+        this.$emit('input', +this.inputValue);
+        // TODO vue3 兼容
+        this.$emit('update:modelValue', +this.inputValue);
+      },
+      _getDecimalScale() {
+        let scale = 1;
+        // 浮点型
+        if (~~this.step !== this.step) {
+          scale = Math.pow(10, String(this.step).split('.')[1].length);
+        }
+        return scale;
+      },
+      _onBlur(event) {
+        this.$emit('blur', event);
+        let value = event.detail.value;
+        if (!value) {
+          // this.inputValue = 0;
+          return;
+        }
+        value = +value;
+        if (value > this.max) {
+          value = this.max;
+        } else if (value < this.min) {
+          value = this.min;
+        }
+        const scale = this._getDecimalScale();
+        this.inputValue = value.toFixed(String(scale).length - 1);
+        this.$emit('change', +this.inputValue);
+        this.$emit('input', +this.inputValue);
+      },
+      _onFocus(event) {
+        this.$emit('focus', event);
+      },
+    },
+  };
+</script>
+<style lang="scss" scoped>
+  .uni-numbox .uni-numbox--disabled {
+    color: #c0c0c0 !important;
+    /* #ifdef H5 */
+    cursor: not-allowed;
+    /* #endif */
+  }
+
+  .uni-numbox {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    align-items: center;
+  }
+
+  .uni-numbox__value {
+    width: 74rpx;
+    text-align: center;
+    font-size: 30rpx;
+  }
+
+  .cicon-move-round {
+    font-size: 44rpx;
+    color: var(--ui-BG-Main);
+  }
+
+  .cicon-add-round {
+    font-size: 44rpx;
+    color: var(--ui-BG-Main);
+  }
+
+  .groupon-btn {
+    color: #ff6000;
+  }
+
+  .seckill-btn {
+    color: #ff5854;
+  }
+</style>
diff --git a/sheep/ui/su-popover/su-popover.vue b/sheep/ui/su-popover/su-popover.vue
new file mode 100644
index 0000000..adff127
--- /dev/null
+++ b/sheep/ui/su-popover/su-popover.vue
@@ -0,0 +1,314 @@
+<template>
+  <view class="ui-popover" :class="popover ? 'show' : 'hide'">
+    <view
+      class="ui-popover-button"
+      :class="[ui]"
+      :id="'popover-button-' + elId"
+      :style="{ zIndex: index + zIndexConfig.popover }"
+      @tap="popoverClick"
+      @mouseleave="mouseleave"
+      @mouseover="mouseover"
+    >
+      <slot></slot>
+    </view>
+    <view class="ui-popover-box" :style="BoxStyle">
+      <view class="ui-popover-content-box" :id="'popover-content-' + elId" :style="contentStyle">
+        <view
+          class="ui-popover-content radius text-a"
+          :class="bg"
+          :style="{ zIndex: index + zIndexConfig.popover + 2 }"
+        >
+          <view class="p-3 text-sm" v-if="tips">{{ tips }}</view>
+          <block v-else><slot name="content" /></block>
+        </view>
+        <view class="ui-popover-arrow" :class="bg" :style="arrowStyle"></view>
+      </view>
+    </view>
+    <view
+      class="ui-popover-mask"
+      :class="mask ? 'bg-mask-50' : ''"
+      :style="{ zIndex: index + zIndexConfig.popover - 1 }"
+      @tap="popover = false"
+      v-if="(popover && tips == '' && time == 0) || mask"
+    ></view>
+  </view>
+</template>
+
+<script>
+  import { guid } from '@/sheep/helper';
+  import zIndexConfig from '@/sheep/config/zIndex.js';
+  import sheep from '@/sheep';
+
+  export default {
+    name: 'suPopover',
+    data() {
+      return {
+        elId: guid(),
+        zIndexConfig,
+        popover: false,
+        BoxStyle: '',
+        contentStyle: '',
+        arrowStyle: '',
+        button: {},
+        content: {},
+      };
+    },
+    props: {
+      ui: {
+        type: String,
+        default: '',
+      },
+      tips: {
+        type: String,
+        default: '',
+      },
+      bg: {
+        type: String,
+        default: 'ui-BG',
+      },
+      mask: {
+        type: Boolean,
+        default: false,
+      },
+      show: {
+        type: [Boolean, String],
+        default: 'change',
+      },
+      hover: {
+        type: Boolean,
+        default: false,
+      },
+      index: {
+        type: Number,
+        default: 0,
+      },
+      time: {
+        type: Number,
+        default: 0,
+      },
+      bottom: {
+        type: Boolean,
+        default: false,
+      },
+      isChange: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    watch: {
+      popover(val) {
+        this._computedQuery(
+          sheep.$platform.device.windowWidth,
+          sheep.$platform.device.windowHeight,
+        );
+        if (val) {
+          if (this.tips != '' || this.time > 0) {
+            setTimeout(
+              () => {
+                this.popover = false;
+              },
+              this.time == 0 ? 3000 : this.time,
+            );
+          }
+          this.sys_layer = this.sys_layer + 100;
+        } else {
+          this.sys_layer = this.sys_layer - 100;
+        }
+        this.$emit('update:show', val);
+      },
+      show(val) {
+        this.popover = val;
+      },
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this._computedQuery(
+          sheep.$platform.device.windowWidth,
+          sheep.$platform.device.windowHeight,
+        );
+        // #ifdef H5
+        uni.onWindowResize((res) => {
+          this._computedQuery(res.size.windowWidth, res.size.windowHeight);
+        });
+        // #endif
+      });
+    },
+    methods: {
+      _onHide() {
+        this.popover = false;
+      },
+      _computedQuery(w, h) {
+        uni
+          .createSelectorQuery()
+          .in(this)
+          .select('#popover-button-' + this.elId)
+          .boundingClientRect((button) => {
+            if (button != null) {
+              this.button = button;
+            } else {
+              console.log('popover-button-' + this.elId + ' data error');
+            }
+          })
+          .select('#popover-content-' + this.elId)
+          .boundingClientRect((content) => {
+            if (content != null) {
+              this.content = content;
+              let button = this.button;
+              //contentStyle
+              let contentStyle = '';
+              let arrowStyle = '';
+              this.BoxStyle = `width:${w}px; left:-${button.left}px;z-index: ${
+                this.index + this.sys_layer + 102
+              }`;
+              // 判断气泡在上面还是下面
+              if (button.bottom < h / 2 || this.bottom) {
+                // '下';
+                contentStyle = contentStyle + `top:10px;`;
+                arrowStyle = arrowStyle + `top:${-5}px;`;
+              } else {
+                // '上';
+                contentStyle = contentStyle + `bottom:${button.height + 10}px;`;
+                arrowStyle = arrowStyle + `bottom:${-5}px;`;
+              }
+
+              // 判断气泡箭头在左中右
+              let btnCenter = button.right - button.width / 2;
+              let contentCenter = content.right - content.width / 2;
+              if (
+                (btnCenter < w / 3 && content.width > btnCenter) ||
+                (content.width > w / 2 && btnCenter < w / 2)
+              ) {
+                // '左';
+                contentStyle = contentStyle + `left:10px;`;
+                arrowStyle = arrowStyle + `left:${btnCenter - 17}px;`;
+              } else if (
+                (btnCenter > (w / 6) * 4 && content.width > w - btnCenter) ||
+                (content.width > w / 2 && btnCenter > w / 2)
+              ) {
+                // '右';
+                contentStyle = contentStyle + `right:10px;`;
+                arrowStyle = arrowStyle + `right:${w - btnCenter - 17}px;`;
+              } else {
+                // '中';
+                contentStyle =
+                  contentStyle + `left:${button.left - content.width / 2 + button.width / 2}px;`;
+                arrowStyle = arrowStyle + `left:0px;right:0px;margin:auto;`;
+              }
+
+              this.arrowStyle = arrowStyle + `z-index:${this.index + this.sys_layer + 1};`;
+              this.contentStyle = contentStyle + `z-index:${this.index + this.sys_layer + 2};`;
+            } else {
+              console.log('popover-content-' + this.elId + ' data error');
+            }
+          })
+          .exec();
+      },
+      popoverClick() {
+        if (this.isChange) {
+          return false;
+        }
+        if (this.tips == '') {
+          this.popover = !this.popover;
+        } else {
+          this.popover = true;
+        }
+      },
+      mouseover() {
+        if (this.hover && (this.tips != '' || this.content.height != 0)) {
+          this.popover = true;
+        }
+      },
+      mouseleave() {
+        if (this.hover) {
+          this.popover = false;
+        }
+      },
+    },
+  };
+</script>
+
+<style lang="scss">
+  .ui-popover {
+    position: relative;
+
+    .ui-popover-button {
+      position: relative;
+    }
+
+    .ui-popover-box {
+      position: absolute;
+
+      .ui-popover-content-box {
+        position: absolute;
+
+        .ui-popover-content {
+          position: relative;
+        }
+
+        .ui-popover-arrow {
+          position: absolute;
+          height: 15px;
+          width: 15px;
+          border-radius: 2px;
+          transform: rotate(45deg);
+        }
+
+        &::after {
+          content: '';
+          width: 100%;
+          height: 110%;
+          position: absolute;
+          background-color: #000000;
+          top: 5%;
+          left: 0;
+          filter: blur(15px);
+          opacity: 0.15;
+        }
+      }
+    }
+
+    .ui-popover-mask {
+      position: fixed;
+      width: 100%;
+      height: 100%;
+      top: 0;
+      left: 0;
+    }
+
+    &.show {
+      .ui-popover-button {
+      }
+
+      .ui-popover-content-box {
+        opacity: 1;
+        pointer-events: auto;
+      }
+
+      .ui-popover-arrow {
+        display: block;
+      }
+
+      .ui-popover-mask {
+        display: block;
+      }
+    }
+
+    &.hide {
+      .ui-popover-button {
+      }
+
+      .ui-popover-content-box {
+        opacity: 0;
+        pointer-events: none;
+      }
+
+      .ui-popover-arrow {
+        display: none;
+      }
+
+      .ui-popover-mask {
+        display: none;
+      }
+    }
+  }
+</style>
diff --git a/sheep/ui/su-popup/keypress.js b/sheep/ui/su-popup/keypress.js
new file mode 100644
index 0000000..6141c4c
--- /dev/null
+++ b/sheep/ui/su-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/sheep/ui/su-popup/su-popup.vue b/sheep/ui/su-popup/su-popup.vue
new file mode 100644
index 0000000..b55b007
--- /dev/null
+++ b/sheep/ui/su-popup/su-popup.vue
@@ -0,0 +1,589 @@
+<template>
+  <view
+    v-if="showPopup"
+    class="uni-popup"
+    :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']"
+    :style="[{ zIndex: zIndex }]"
+    @touchmove.stop.prevent="clear"
+  >
+    <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, ...borderRadius }"
+        :duration="duration"
+        :show="showTrans"
+        @click="onTap"
+      >
+        <view
+          v-if="showPopup"
+          class="uni-popup__wrapper"
+          :style="[{ backgroundColor: bg }, borderRadius]"
+          :class="[popupstyle]"
+          @click="clear"
+        >
+          <uni-icons
+            v-if="showClose"
+            class="close-icon"
+            color="#F6F6F6"
+            type="closeempty"
+            size="32"
+            @click="close"
+          ></uni-icons>
+          <slot />
+        </view>
+      </uni-transition>
+    </view>
+    <!-- #ifdef H5 -->
+    <keypress v-if="maskShow" @esc="onTap" />
+    <!-- #endif -->
+  </view>
+  <!-- #ifdef MP -->
+  <view v-else style="display: none">
+    <slot></slot>
+  </view>
+  <!-- #endif -->
+</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 {Boolean} safeArea		   是否适配底部安全区
+   * @event {Function} change 打开关闭弹窗触发，e={show: false}
+   * @event {Function} maskClick 点击遮罩触发
+   */
+  import sheep from '@/sheep';
+
+  export default {
+    name: 'SuPopup',
+    components: {
+      // #ifdef H5
+      keypress,
+      // #endif
+    },
+    emits: ['change', 'maskClick', 'close'],
+    props: {
+      // 开启状态
+      show: {
+        type: Boolean,
+        default: false,
+      },
+      // 顶部，底部时有效
+      space: {
+        type: Number,
+        default: 0,
+      },
+      // 默认圆角
+      round: {
+        type: [String, Number],
+        default: 0,
+      },
+      // 是否显示关闭
+      showClose: {
+        type: Boolean,
+        default: false,
+      },
+      // 开启动画
+      animation: {
+        type: Boolean,
+        default: true,
+      },
+      // 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+      // message: 消息提示 ; dialog : 对话框
+      type: {
+        type: String,
+        default: 'bottom',
+      },
+      // maskClick
+      isMaskClick: {
+        type: Boolean,
+        default: null,
+      },
+      // TODO 2 个版本后废弃属性 ，使用 isMaskClick
+      maskClick: {
+        type: Boolean,
+        default: null,
+      },
+      // 可设置none
+      backgroundColor: {
+        type: String,
+        default: '#ffffff',
+      },
+      backgroundImage: {
+        type: String,
+        default: '',
+      },
+      safeArea: {
+        type: Boolean,
+        default: true,
+      },
+      maskBackgroundColor: {
+        type: String,
+        default: 'rgba(0, 0, 0, 0.4)',
+      },
+      zIndex: {
+        type: [String, Number],
+        default: 10075,
+      },
+    },
+
+    watch: {
+      show: {
+        handler: function (newValue, oldValue) {
+          if (typeof oldValue === 'undefined' && !newValue) {
+            return;
+          }
+          if (newValue) {
+            this.open();
+          } else {
+            this.close();
+          }
+        },
+        immediate: true,
+      },
+      /**
+       * 监听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 {
+        sheep,
+        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: {
+          position: 'fixed',
+          left: 0,
+          right: 0,
+        },
+        maskShow: true,
+        mkclick: true,
+        popupstyle: this.isDesktop ? 'fixforpc-top' : 'top',
+      };
+    },
+    computed: {
+      isDesktop() {
+        return this.popupWidth >= 500 && this.popupHeight >= 500;
+      },
+      bg() {
+        if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+          return 'transparent';
+        }
+        return this.backgroundColor;
+      },
+      borderRadius() {
+        if (this.round) {
+          if (this.type === 'bottom') {
+            return {
+              'border-top-left-radius': parseFloat(this.round) + 'px',
+              'border-top-right-radius': parseFloat(this.round) + 'px',
+            };
+          }
+          if (this.type === 'center') {
+            return {
+              'border-top-left-radius': parseFloat(this.round) + 'px',
+              'border-top-right-radius': parseFloat(this.round) + 'px',
+              'border-bottom-left-radius': parseFloat(this.round) + 'px',
+              'border-bottom-right-radius': parseFloat(this.round) + 'px',
+            };
+          }
+          if (this.type === 'top') {
+            return {
+              'border-bottom-left-radius': parseFloat(this.round) + 'px',
+              'border-bottom-right-radius': parseFloat(this.round) + 'px',
+            };
+          }
+        }
+      },
+    },
+    mounted() {
+      const fixSize = () => {
+        const { windowWidth, windowHeight, windowTop, safeArea, screenHeight, safeAreaInsets } =
+          sheep.$platform.device;
+        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
+    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() {
+        // #ifdef H5
+        // fix by mehaotian 处理 h5 滚动穿透的问题
+        document.getElementsByTagName('body')[0].style.overflow = 'visible';
+        // #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) {
+          clearTimeout(this.timer);
+          this.showPopup = false;
+        }
+        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,
+        });
+        this.$emit('close');
+        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,
+          top: this.space + 'px',
+          backgroundColor: this.bg,
+        };
+        // 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 + this.space + 'px',
+          backgroundColor: this.bg,
+        };
+        // TODO 兼容 type 属性 ，后续会废弃
+        if (type) return;
+        this.showPopup = true;
+        this.showTrans = true;
+      },
+      /**
+       * 中间弹出样式处理
+       */
+      center(type) {
+        this.popupstyle = 'center';
+        this.ani = ['zoom-out', 'fade'];
+        this.transClass = {
+          position: 'fixed',
+          /* #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.popupstyle = 'left';
+        this.ani = ['slide-left'];
+        this.transClass = {
+          position: 'fixed',
+          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.popupstyle = 'right';
+        this.ani = ['slide-right'];
+        this.transClass = {
+          position: 'fixed',
+          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">
+  // 关闭icon
+  .close-icon {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    bottom: -80rpx;
+    z-index: 100;
+  }
+
+  .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;
+      background: v-bind(backgroundImage) no-repeat;
+      background-size: 100% 100%;
+
+      /* 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/sheep/ui/su-progress/su-progress.vue b/sheep/ui/su-progress/su-progress.vue
new file mode 100644
index 0000000..4612705
--- /dev/null
+++ b/sheep/ui/su-progress/su-progress.vue
@@ -0,0 +1,203 @@
+<template>
+  <view>
+    <view class="flex a-center content" v-if="lineData">
+      <view>
+        <slot name="content"></slot>
+      </view>
+    </view>
+    <view class="flex a-center" style="padding-right: 10rpx">
+      <view
+        class="progress-container"
+        id="container"
+        ref="progressContainer"
+        :style="{ background: inBgColor }"
+      >
+        <view
+          class="progress-content flex j-end"
+          id="content"
+          ref="progressContent"
+          :style="{
+            height: strokeWidth + 'px',
+            background: bgColor,
+            width: contentWidth,
+            transition: `width ${duration / 1000}s ease`,
+          }"
+          v-if="isAnimate"
+        >
+          <view class="textInside flex a-center j-center" v-if="textInside && !noData">
+            <view class="text">{{ percentage }}%</view>
+          </view>
+        </view>
+        <view
+          v-if="!isAnimate"
+          class="progress-content flex j-end"
+          :style="{ width: percentage + '%', height: strokeWidth + 'px', background: bgColor }"
+        >
+          <view class="textInside flex a-center j-center" v-if="textInside && !noData">
+            <view class="text">{{ percentage }}%</view>
+          </view>
+        </view>
+      </view>
+      <view>
+        <view class="percentage" v-if="!textInside && !lineData && !noData && !isAnimate"
+          >{{ percentage }}%
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'AiProgress',
+    components: {},
+    props: {
+      // 进度条的值
+      percentage: {
+        type: [Number, String],
+        required: true,
+      },
+      // 是否内联显示数据
+      textInside: {
+        type: Boolean,
+        default: false,
+      },
+      // 进度条高度
+      strokeWidth: {
+        type: [Number, String],
+        default: 6,
+      },
+      // 默认动画时长
+      duration: {
+        type: [Number, String],
+        default: 2000,
+      },
+      // 是否有动画
+      isAnimate: {
+        type: Boolean,
+        default: false,
+      },
+      // 背景颜色
+      bgColor: {
+        type: String,
+        default: 'linear-gradient(90deg, var(--ui-BG-Main) 0%, var(--ui-BG-Main-gradient) 100%)',
+      },
+      // 是否不显示数据
+      noData: {
+        type: Boolean,
+        default: false,
+      },
+      // 是否自定义显示内容
+      lineData: {
+        type: Boolean,
+        default: false,
+      },
+      // 自定义底色
+      inBgColor: {
+        type: String,
+        default: '#ebeef5',
+      },
+    },
+    data() {
+      return {
+        width: 0,
+        timer: null,
+        containerWidth: 0,
+        contentWidth: 0,
+      };
+    },
+    methods: {
+      start() {
+        if (this.isAnimate) {
+          // #ifdef H5
+          this.$nextTick(() => {
+            let progressContainer = this.$refs.progressContainer.$el;
+            let progressContent = this.$refs.progressContent.$el;
+            let style = window.getComputedStyle(progressContainer, null);
+            let width = style.width.replace('px', '') * ((this.percentage * 1) / 100);
+            progressContent.style.width = width.toFixed(2) + 'px';
+            progressContent.style.transition = `width ${this.duration / 1000}s ease`;
+          });
+          // #endif
+          const container = uni.createSelectorQuery().in(this).selectAll('#container');
+          const content = uni.createSelectorQuery().in(this).selectAll('#content');
+          container.boundingClientRect().exec((res1) => {
+            this.contentWidth =
+              res1[0][0].width * 1 * ((this.percentage * 1) / 100).toFixed(2) + 'px';
+          });
+        }
+      },
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.start();
+      });
+    },
+    created() {},
+    filters: {},
+    computed: {},
+    watch: {},
+    directives: {},
+  };
+</script>
+
+<style scoped lang="scss">
+  .content {
+    margin-bottom: 10px;
+
+    .c-per {
+      font-size: 26px;
+    }
+  }
+
+  .progress-container {
+    width: 100%;
+    border-radius: 100px;
+
+    .progress-content {
+      border-radius: 100px;
+      width: 0;
+    }
+
+    .textInside {
+      color: #fff;
+      margin-right: 10rpx;
+      position: relative;
+    }
+  }
+
+  .text {
+    margin-left: 10rpx;
+    font-size: 16rpx;
+    width: 100rpx;
+    color: #FFB9B9;
+  }
+
+  .percentage {
+    margin-left: 6px;
+    font-size: 12px;
+    width: 30px;
+  }
+
+  .flex {
+    display: flex;
+  }
+
+  .a-center {
+    align-items: center;
+  }
+
+  .j-center {
+    justify-content: center;
+  }
+
+  .j-between {
+    justify-content: space-between;
+  }
+
+  .content {
+    margin-bottom: 10px;
+    color: #666;
+    font-size: 32rpx;
+  }
+</style>
diff --git a/sheep/ui/su-radio/su-radio.vue b/sheep/ui/su-radio/su-radio.vue
new file mode 100644
index 0000000..6fc4f74
--- /dev/null
+++ b/sheep/ui/su-radio/su-radio.vue
@@ -0,0 +1,301 @@
+<template>
+  <view
+    class="ui-radio ss-flex ss-col-center"
+    @tap="onRaido"
+    :class="[{ disabled: disabled }, { img: src }, ui]"
+    :style="[customStyle]"
+  >
+    <slot name="leftLabel"></slot>
+    <view
+      v-if="!none"
+      class="ui-radio-input"
+      :class="[isChecked ? 'cur ' + bg : unbg, src ? 'radius' : 'round']"
+    ></view>
+    <image class="ui-radio-img radius" v-if="src" :src="src" mode="aspectFill"></image>
+    <view class="ui-radio-content" v-else>
+      <slot>
+        <view class="ui-label-text" :style="[labelStyle]">{{ label }}</view>
+      </slot>
+    </view>
+    <view
+      v-if="ui.includes('card')"
+      class="ui-radio-bg round"
+      :class="[isChecked ? 'cur ' + bg : '']"
+    ></view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 单选 - radio
+   *
+   *
+   * property {Object} customStyle 												- 自定义样式
+   * property {String} ui 														- radio样式Class
+   * property {String} modelValue													- 绑定值
+   * property {Boolean} disabled													- 是否禁用
+   * property {String} bg															- 选中时背景Class
+   * property {String} unbg														- 未选中时背景Class
+   * property {String} src														- 图片选中radio
+   * property {String} label														- label文本
+   * property {Boolean} none														- 是否隐藏raido按钮
+   *
+   * @slot default																- 自定义label样式
+   * @event {Function} change														- change事件
+   *
+   */
+  import { computed, reactive, watchPostEffect, getCurrentInstance } from 'vue';
+  const vm = getCurrentInstance();
+
+  // 组件数据
+  const state = reactive({
+    currentValue: false,
+  });
+
+  // 定义事件
+  const emits = defineEmits(['change', 'update:modelValue']);
+
+  // 接收参数
+  const props = defineProps({
+    customStyle: {
+      type: Object,
+      default: () => ({}),
+    },
+    ui: {
+      type: String,
+      default: 'check', //check line
+    },
+    modelValue: {
+      type: [String, Number, Boolean],
+      default: false,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    bg: {
+      type: String,
+      default: 'ui-BG-Main',
+    },
+    unbg: {
+      type: String,
+      default: 'borderss',
+    },
+    src: {
+      type: String,
+      default: '',
+    },
+    label: {
+      type: String,
+      default: '',
+    },
+    labelStyle: {
+      type: Object,
+      default: () => ({}),
+    },
+    none: {
+      type: Boolean,
+      default: false,
+    },
+  });
+
+  watchPostEffect(() => {
+    state.currentValue = props.modelValue;
+    emits('update:modelValue', state.currentValue);
+  });
+
+  // 是否选中
+  const isChecked = computed(() => state.currentValue);
+
+  // 点击
+  const onRaido = () => {
+    if (props.disabled) return;
+    state.currentValue = !state.currentValue;
+    emits('update:modelValue', state.currentValue);
+    emits('change', {
+      label: props.label,
+      value: state.currentValue,
+    });
+  };
+</script>
+
+<style lang="scss" scoped>
+  .ui-radio {
+    display: flex;
+    align-items: center;
+    margin: 0 0.5em 0 0;
+    height: 18px;
+    .ui-radio-input {
+      margin: 0 0.5em 0 0;
+      display: inline-block;
+      width: 18px;
+      height: 18px;
+      vertical-align: middle;
+      line-height: 18px;
+
+      &::before {
+        content: '';
+        position: absolute;
+        width: 0;
+        height: 0;
+        background-color: currentColor;
+        border-radius: 18px;
+        @include position-center;
+      }
+    }
+
+    .ui-radio-input.cur {
+      position: relative;
+
+      &::before {
+        width: 10px;
+        height: 10px;
+        transition: $transition-base;
+      }
+    }
+
+    &:last-child {
+      margin: 0 0.14286em;
+    }
+
+    &.check {
+      .ui-radio-input {
+        &::before {
+          font-family: 'colorui';
+          content: '\e69f';
+          width: 18px;
+          height: 18px;
+          font-size: 0;
+          background-color: transparent;
+        }
+      }
+
+      .ui-radio-input.cur {
+        &::before {
+          width: 18px;
+          height: 18px;
+          font-size: 1em;
+          transform: scale(0.8);
+          text-align: center;
+          line-height: 18px;
+        }
+      }
+    }
+
+    &.line {
+      .ui-radio-input.cur {
+        &::before {
+          width: calc(100% - 2px);
+          height: calc(100% - 2px);
+          background-color: var(--ui-BG);
+        }
+
+        &::after {
+          content: '';
+          position: absolute;
+          width: 10px;
+          height: 10px;
+          background-color: inherit;
+          border-radius: 50%;
+          @include position-center;
+        }
+      }
+    }
+
+    &.lg {
+      .ui-radio-input {
+        font-size: 18px;
+      }
+    }
+
+    &.img {
+      position: relative;
+      margin: 0 0.28572em 0;
+
+      .ui-radio-input {
+        width: 42px;
+        height: 42px;
+        border-radius: 0px;
+        position: absolute;
+        margin: 0;
+        left: -1px;
+        top: -1px;
+
+        &::before {
+          width: 40px;
+          height: 40px;
+          border-radius: $radius;
+        }
+
+        &.cur {
+          width: 44px;
+          height: 44px;
+          top: -2px;
+          left: -2px;
+          border-radius: 7px !important;
+          opacity: 0.8;
+        }
+      }
+
+      .ui-radio-img {
+        width: 40px;
+        height: 40px;
+        display: block;
+        overflow: hidden;
+        border-radius: 10px;
+      }
+    }
+
+    &.card {
+      display: flex;
+      margin: 30rpx;
+      padding: 30rpx;
+      position: relative;
+      border-radius: $radius !important;
+      flex-direction: row-reverse;
+      justify-content: space-between;
+
+      .ui-radio-bg {
+        content: '';
+        position: absolute;
+        width: 200%;
+        height: 200%;
+        transform: scale(0.5);
+        border-radius: #{$radius * 2} !important;
+        z-index: 0;
+        left: 0;
+        top: 0;
+        transform-origin: 0 0;
+        background-color: var(--ui-BG);
+      }
+
+      .ui-radio-input {
+        position: relative;
+        z-index: 1;
+        margin-right: 0;
+      }
+
+      .ui-radio-bg::after {
+        content: '';
+        position: absolute;
+        width: calc(200% - 16px);
+        height: calc(200% - 16px);
+        transform: scale(0.5);
+        transform-origin: 0 0;
+        background-color: var(--ui-BG) !important;
+        left: 4px;
+        top: 4px;
+        border-radius: #{$radius * 2 + 8} !important;
+        z-index: 0;
+      }
+
+      .ui-radio-content {
+        position: relative;
+        z-index: 1;
+        display: flex;
+        align-items: center;
+        flex: 1;
+      }
+    }
+  }
+</style>
diff --git a/sheep/ui/su-region-picker/su-region-picker.vue b/sheep/ui/su-region-picker/su-region-picker.vue
new file mode 100644
index 0000000..1f8d89e
--- /dev/null
+++ b/sheep/ui/su-region-picker/su-region-picker.vue
@@ -0,0 +1,247 @@
+<!-- 省市区选择弹窗 -->
+<template>
+  <su-popup :show="show" @close="onCancel" round="20">
+    <view class="ui-region-picker">
+      <su-toolbar
+        :cancelColor="cancelColor"
+        :confirmColor="confirmColor"
+        :cancelText="cancelText"
+        :confirmText="confirmText"
+        title="选择区域"
+        @cancel="onCancel"
+        @confirm="onConfirm('confirm')"
+      />
+      <view class="ui-picker-body">
+        <picker-view
+          :value="state.currentIndex"
+          @change="change"
+          class="ui-picker-view"
+          @pickstart="pickstart"
+          @pickend="pickend"
+        >
+          <picker-view-column>
+            <view class="ui-column-item" v-for="province in provinceList" :key="province.id">
+              <view :style="getSizeByNameLength(province.name)">{{ province.name }}</view>
+            </view>
+          </picker-view-column>
+          <picker-view-column>
+            <view class="ui-column-item" v-for="city in cityList" :key="city.id">
+              <view :style="getSizeByNameLength(city.name)">{{ city.name }}</view>
+            </view>
+          </picker-view-column>
+<!--          <picker-view-column>
+            <view class="ui-column-item" v-for="district in districtList" :key="district.id">
+              <view :style="getSizeByNameLength(district.name)">{{ district.name }}</view>
+            </view>
+          </picker-view-column> -->
+        </picker-view>
+      </view>
+    </view>
+  </su-popup>
+</template>
+
+<script setup>
+  /**
+   * picker picker弹出选择器
+   * @property {Object} params 需要显示的参
+   * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+   * @property {Boolean} show-time-tag 时间模式时，是否显示后面的年月日中文提示
+   * @property {String} cancel-color 取消按钮的颜色
+   * @property {String} confirm-color 确认按钮的颜色
+   * @property {String} confirm-text 确认按钮的文字
+   * @property {String} cancel-text 取消按钮的文字
+   * @property {String} default-region 默认选中的地区，
+   * @property {String} default-code 默认选中的地区
+   * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭Picker（默认true）
+   * @property {String Number} z-index 弹出时的z-index值（默认1075）
+   * @property {Array} default-selector 数组形式，其中每一项表示选择了range对应项中的第几个
+   * @property {String} range-key 当range参数的元素为对象时，指定Object中的哪个key的值作为选择器显示内容
+   * @event {Function} confirm 点击确定按钮，返回当前选择的值
+   * @event {Function} cancel 点击取消按钮，返回当前选择的值
+   */
+  import { computed, reactive } from 'vue';
+  const props = defineProps({
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    // "取消"按钮的颜色
+    cancelColor: {
+      type: String,
+      default: '#6666',
+    },
+    // "确定"按钮的颜色
+    confirmColor: {
+      type: String,
+      default: 'var(--ui-BG-Main)',
+    },
+    // 取消按钮的文字
+    cancelText: {
+      type: String,
+      default: '取消',
+    },
+    // 确认按钮的文字
+    confirmText: {
+      type: String,
+      default: '确认',
+    },
+  });
+  const areaData = uni.getStorageSync('areaData');
+
+  const getSizeByNameLength = (name) => {
+    let length = name.length;
+    if (length <= 7) return '';
+    if (length < 9) {
+      return 'font-size:28rpx';
+    } else {
+      return 'font-size: 24rpx';
+    }
+  };
+  const state = reactive({
+    currentIndex: [0, 0, 0],
+    moving: false, // 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
+  });
+  const emits = defineEmits(['confirm', 'cancel', 'change']);
+
+  const provinceList = areaData;
+
+  const cityList = computed(() => {
+    return areaData[state.currentIndex[0]].children;
+  });
+  const districtList = computed(() => {
+    return cityList.value[state.currentIndex[1]]?.children;
+  });
+  // 标识滑动开始，只有微信小程序才有这样的事件
+  const pickstart = () => {
+    // #ifdef MP-WEIXIN
+    state.moving = true;
+    // #endif
+  };
+
+  // 标识滑动结束
+  const pickend = () => {
+    // #ifdef MP-WEIXIN
+    state.moving = false;
+    // #endif
+  };
+  const init = () => {};
+
+  const onCancel = () => {
+    emits('cancel');
+  };
+
+  // 用户更改picker的列选项
+  const change = (e) => {
+    if (
+      state.currentIndex[0] === e.detail.value[0] &&
+      state.currentIndex[1] === e.detail.value[1]
+    ) {
+      // 不更改省市区列表
+      state.currentIndex[2] = e.detail.value[2];
+      return;
+    } else {
+      // 更改省市区列表
+      if (state.currentIndex[0] !== e.detail.value[0]) {
+        e.detail.value[1] = 0;
+      }
+      e.detail.value[2] = 0;
+      state.currentIndex = e.detail.value;
+    }
+    emits('change', state.currentIndex);
+  };
+
+  // 用户点击确定按钮
+  const onConfirm = (event = null) => {
+    // #ifdef MP-WEIXIN
+    if (state.moving) return;
+    // #endif
+    let index = state.currentIndex;
+    let province = provinceList[index[0]];
+    let city = cityList.value[index[1]];
+    let district = districtList.value[index[2]];
+    let result = {
+      province_name: province.name,
+      province_id: province.id,
+      city_name: city.name,
+      city_id: city.id,
+      district_name: district.name,
+      district_id: district.id,
+    };
+
+    if (event) emits(event, result);
+  };
+</script>
+
+<style lang="scss" scoped>
+  .ui-region-picker {
+    position: relative;
+    z-index: 999;
+  }
+
+  .ui-picker-view {
+    height: 100%;
+    box-sizing: border-box;
+  }
+  .ui-picker-header {
+    width: 100%;
+    height: 90rpx;
+    padding: 0 40rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    font-size: 30rpx;
+    background: #fff;
+    position: relative;
+  }
+
+  .ui-picker-header::after {
+    content: '';
+    position: absolute;
+    border-bottom: 1rpx solid #eaeef1;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+    bottom: 0;
+    right: 0;
+    left: 0;
+  }
+
+  .ui-picker__title {
+    color: #333;
+  }
+
+  .ui-picker-body {
+    width: 100%;
+    height: 500rpx;
+    overflow: hidden;
+    background-color: #fff;
+  }
+
+  .ui-column-item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    color: #333;
+    padding: 0 8rpx;
+  }
+
+  .ui-btn-picker {
+    padding: 16rpx;
+    box-sizing: border-box;
+    text-align: center;
+    text-decoration: none;
+  }
+
+  .ui-opacity {
+    opacity: 0.5;
+  }
+
+  .ui-btn-picker--primary {
+    color: blue;
+  }
+
+  .ui-btn-picker--tips {
+    color: red;
+  }
+</style>
diff --git a/sheep/ui/su-status-bar/su-status-bar.vue b/sheep/ui/su-status-bar/su-status-bar.vue
new file mode 100644
index 0000000..9af07f9
--- /dev/null
+++ b/sheep/ui/su-status-bar/su-status-bar.vue
@@ -0,0 +1,16 @@
+<!-- 自定义状态栏 -->
+<template>
+  <view :style="{ height: statusBarHeight }" class="uni-status-bar"><slot /></view>
+</template>
+
+<script setup>
+  import sheep from '@/sheep';
+
+  const statusBarHeight = sheep.$platform.device.statusBarHeight + 'px';
+</script>
+<style lang="scss">
+  .uni-status-bar {
+    // width: 750rpx;
+    height: var(--status-bar-height);
+  }
+</style>
diff --git a/sheep/ui/su-sticky/su-sticky.vue b/sheep/ui/su-sticky/su-sticky.vue
new file mode 100644
index 0000000..a8831a2
--- /dev/null
+++ b/sheep/ui/su-sticky/su-sticky.vue
@@ -0,0 +1,264 @@
+<template>
+  <view class="u-sticky" :id="elId" :style="[style]">
+    <view :style="[stickyContent]" class="u-sticky__content"><slot /></view>
+  </view>
+</template>
+
+<script>
+  import { deepMerge, addStyle, addUnit, sleep, guid, getPx, os, sys } from '@/sheep/helper';
+  import sheep from '@/sheep';
+  /**
+   * sticky 吸顶
+   * @description 该组件与CSS中position: sticky属性实现的效果一致，当组件达到预设的到顶部距离时， 就会固定在指定位置，组件位置大于预设的顶部距离时，会重新按照正常的布局排列。
+   * @property {String ｜ Number}	offsetTop		吸顶时与顶部的距离，单位px（默认 0 ）
+   * @property {String ｜ Number}	customNavHeight	自定义导航栏的高度 （h5 默认44  其他默认 0 ）
+   * @property {Boolean}			stickyToTop		是否开启吸顶功能 （默认 false ）
+   * @property {String}			bgColor			组件背景颜色（默认 '#ffffff' ）
+   * @property {String ｜ Number}	zIndex			吸顶时的z-index值
+   * @property {String ｜ Number}	index			自定义标识，用于区分是哪一个组件
+   * @property {Object}			customStyle		组件的样式，对象形式
+   * @event {Function} fixed		组件吸顶时触发
+   * @event {Function} unfixed	组件取消吸顶时触发
+   * @example <u-sticky offsetTop="200"><view>塞下秋来风景异，衡阳雁去无留意</view></u-sticky>
+   */
+  export default {
+    name: 'su-sticky',
+    props: {
+      // 吸顶容器到顶部某个距离的时候，进行吸顶，在H5平台，NavigationBar为44px
+      offsetTop: {
+        type: [String, Number],
+        default: 0,
+      },
+      // 自定义导航栏的高度
+      customNavHeight: {
+        type: [String, Number],
+        // #ifdef H5
+        // H5端的导航栏属于“自定义”导航栏的范畴，因为它是非原生的，与普通元素一致
+        default: 44,
+        // #endif
+        // #ifndef H5
+        default: sheep.$platform.navbar,
+        // #endif
+      },
+      // 是否开启吸顶功能
+      stickyToTop: {
+        type: Boolean,
+        default: false,
+      },
+      // 吸顶区域的背景颜色
+      bgColor: {
+        type: String,
+        default: 'transparent',
+      },
+      // z-index值
+      zIndex: {
+        type: [String, Number],
+        default: '',
+      },
+      // 列表中的索引值
+      index: {
+        type: [String, Number],
+        default: '',
+      },
+      customStyle: {
+        type: [Object, String],
+        default: () => ({}),
+      },
+    },
+    data() {
+      return {
+        cssSticky: false, // 是否使用css的sticky实现
+        stickyTop: 0, // 吸顶的top值，因为可能受自定义导航栏影响，最终的吸顶值非offsetTop值
+        elId: guid(),
+        left: 0, // js模式时，吸顶的内容因为处于postition: fixed模式，为了和原来保持一致的样式，需要记录并重新设置它的left，height，width属性
+        width: 'auto',
+        height: 'auto',
+        fixed: false, // js模式时，是否处于吸顶模式
+      };
+    },
+    computed: {
+      style() {
+        const style = {};
+        if (!this.stickyToTop) {
+          if (this.cssSticky) {
+            style.position = 'sticky';
+            style.zIndex = this.uZindex;
+            style.top = addUnit(this.stickyTop);
+          } else {
+            style.height = this.fixed ? this.height + 'px' : 'auto';
+          }
+        } else {
+          // 无需吸顶时，设置会默认的relative(nvue)和非nvue的static静态模式即可
+          // #ifdef APP-NVUE
+          style.position = 'relative';
+          // #endif
+          // #ifndef APP-NVUE
+          style.position = 'static';
+          // #endif
+        }
+        style.backgroundColor = this.bgColor;
+        return deepMerge(addStyle(this.customStyle), style);
+      },
+      // 吸顶内容的样式
+      stickyContent() {
+        const style = {};
+        if (!this.cssSticky) {
+          style.position = this.fixed ? 'fixed' : 'static';
+          style.top = this.stickyTop + 'px';
+          style.left = this.left + 'px';
+          style.width = this.width == 'auto' ? 'auto' : this.width + 'px';
+          style.zIndex = this.uZindex;
+        }
+        return style;
+      },
+      uZindex() {
+        return this.zIndex ? this.zIndex : 970;
+      },
+    },
+    mounted() {
+      this.init();
+    },
+    methods: {
+      init() {
+        this.getStickyTop();
+        // 判断使用的模式
+        this.checkSupportCssSticky();
+        // 如果不支持css sticky，则使用js方案，此方案性能比不上css方案
+        if (!this.cssSticky) {
+          !this.stickyToTop && this.initObserveContent();
+        }
+      },
+      $uGetRect(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();
+        });
+      },
+      initObserveContent() {
+        // 获取吸顶内容的高度，用于在js吸顶模式时，给父元素一个填充高度，防止"塌陷"
+        this.$uGetRect('#' + this.elId).then((res) => {
+          this.height = res.height;
+          this.left = res.left;
+          this.width = res.width;
+          this.$nextTick(() => {
+            this.observeContent();
+          });
+        });
+      },
+      observeContent() {
+        // 先断掉之前的观察
+        this.disconnectObserver('contentObserver');
+        const contentObserver = uni.createIntersectionObserver({
+          // 检测的区间范围
+          thresholds: [0.95, 0.98, 1],
+        });
+        // 到屏幕顶部的高度时触发
+        contentObserver.relativeToViewport({
+          top: -this.stickyTop,
+        });
+        // 绑定观察的元素
+        contentObserver.observe(`#${this.elId}`, (res) => {
+          this.setFixed(res.boundingClientRect.top);
+        });
+        this.contentObserver = contentObserver;
+      },
+      setFixed(top) {
+        // 判断是否出于吸顶条件范围
+        const fixed = top <= this.stickyTop;
+        this.fixed = fixed;
+      },
+      disconnectObserver(observerName) {
+        // 断掉观察，释放资源
+        const observer = this[observerName];
+        observer && observer.disconnect();
+      },
+      getStickyTop() {
+        this.stickyTop = getPx(this.offsetTop) + getPx(this.customNavHeight);
+      },
+      async checkSupportCssSticky() {
+        // #ifdef H5
+        // H5，一般都是现代浏览器，是支持css sticky的，这里使用创建元素嗅探的形式判断
+        if (this.checkCssStickyForH5()) {
+          this.cssSticky = true;
+        }
+        // #endif
+
+        // 如果安卓版本高于8.0，依然认为是支持css sticky的(因为安卓7在某些机型，可能不支持sticky)
+        if (os() === 'android' && Number(sys().system) > 8) {
+          this.cssSticky = true;
+        }
+
+        // APP-Vue和微信平台，通过computedStyle判断是否支持css sticky
+        // #ifdef APP-VUE || MP-WEIXIN
+        this.cssSticky = await this.checkComputedStyle();
+        // #endif
+
+        // ios上，从ios6开始，都是支持css sticky的
+        if (os() === 'ios') {
+          this.cssSticky = true;
+        }
+
+        // nvue，是支持css sticky的
+        // #ifdef APP-NVUE
+        this.cssSticky = true;
+        // #endif
+      },
+      // 在APP和微信小程序上，通过uni.createSelectorQuery可以判断是否支持css sticky
+      checkComputedStyle() {
+        // 方法内进行判断，避免在其他平台生成无用代码
+        // #ifdef APP-VUE || MP-WEIXIN
+        return new Promise((resolve) => {
+          uni.createSelectorQuery()
+            .in(this)
+            .select('.u-sticky')
+            .fields({
+              computedStyle: ['position'],
+            })
+            .exec((e) => {
+              resolve('sticky' === e[0].position);
+            });
+        });
+        // #endif
+      },
+      // H5通过创建元素的形式嗅探是否支持css sticky
+      // 判断浏览器是否支持sticky属性
+      checkCssStickyForH5() {
+        // 方法内进行判断，避免在其他平台生成无用代码
+        // #ifdef H5
+        const vendorList = ['', '-webkit-', '-ms-', '-moz-', '-o-'],
+          vendorListLength = vendorList.length,
+          stickyElement = document.createElement('div');
+        for (let i = 0; i < vendorListLength; i++) {
+          stickyElement.style.position = vendorList[i] + 'sticky';
+          if (stickyElement.style.position !== '') {
+            return true;
+          }
+        }
+        return false;
+        // #endif
+      },
+    },
+    beforeDestroy() {
+      this.disconnectObserver('contentObserver');
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .u-sticky {
+    /* #ifdef APP-VUE || MP-WEIXIN */
+    // 此处默认写sticky属性，是为了给微信和APP通过uni.createSelectorQuery查询是否支持css sticky使用
+    position: sticky;
+    /* #endif */
+  }
+</style>
diff --git a/sheep/ui/su-subline/su-subline.vue b/sheep/ui/su-subline/su-subline.vue
new file mode 100644
index 0000000..c11d176
--- /dev/null
+++ b/sheep/ui/su-subline/su-subline.vue
@@ -0,0 +1,62 @@
+<template>
+  <view class="wrap" :style="{height: `${height}px`}">
+    <view class="divider" :style="[elStyle]"></view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 分割线
+   */
+
+  import { computed } from 'vue';
+
+  // 接收参数
+  const props = defineProps({
+    // 线条颜色
+    lineColor: {
+      type: String,
+      default: '#000',
+    },
+    // 线条样式：'dotted', 'solid', 'double', 'dashed'
+    borderType: {
+      type: String,
+      default: 'dashed',
+    },
+    // 线条宽度
+    lineWidth: {
+      type: Number,
+      default: 1,
+    },
+    // 高度
+    height: {
+      type: [Number, String],
+      default: 'auto'
+    },
+    // 左右边距：none - 无边距，horizontal - 左右留边
+    paddingType: {
+      type: String,
+      default: 'none'
+    }
+  });
+
+  const elStyle = computed(() => {
+    return {
+      'border-top-width': `${props.lineWidth}px`,
+      'border-top-color': props.lineColor,
+      'border-top-style': props.borderType,
+      margin: props.paddingType === 'none' ? '0' : '0px 16px'
+    };
+  });
+</script>
+
+<style lang="scss" scoped>
+.wrap {
+  display: flex;
+  align-items: center;
+
+  .divider {
+    width: 100%;
+  }
+}
+</style>
diff --git a/sheep/ui/su-swiper/su-swiper.vue b/sheep/ui/su-swiper/su-swiper.vue
new file mode 100644
index 0000000..7465db1
--- /dev/null
+++ b/sheep/ui/su-swiper/su-swiper.vue
@@ -0,0 +1,502 @@
+<template>
+  <view>
+    <view class="ui-swiper" :class="[props.mode, props.bg, props.ui]">
+      <swiper
+        :circular="props.circular"
+        :current="state.cur"
+        :autoplay="props.autoplay && !state.videoPlaySataus"
+        :interval="props.interval"
+        :duration="props.duration"
+        @transition="transition"
+        @animationfinish="animationfinish"
+        :style="customStyle"
+        @change="swiperChange"
+      >
+        <swiper-item
+          class="swiper-item"
+          v-for="(item, index) in props.list"
+          :key="index"
+          :class="{ cur: state.cur == index }"
+          @tap="onSwiperItem(item)"
+        >
+          <view class="ui-swiper-main">
+            <image
+              v-if="item.type === 'image'"
+              class="swiper-image"
+              :mode="props.imageMode"
+              :src="item.src"
+              width="100%"
+              height="100%"
+              @load="onImgLoad"
+            ></image>
+            <su-video
+              v-else
+              :ref="(el) => (refs.videoRef[`video_${index}`] = el)"
+              :poster="sheep.$url.cdn(item.poster)"
+              :src="sheep.$url.cdn(item.src)"
+              :index="index"
+              :moveX="state.moveX"
+              :initialTime="item.currentTime || 0"
+              :height="seizeHeight"
+              @videoTimeupdate="videoTimeupdate"
+            ></su-video>
+          </view>
+        </swiper-item>
+      </swiper>
+      <template v-if="!state.videoPlaySataus">
+        <view class="ui-swiper-dot" :class="props.dotStyle" v-if="props.dotStyle != 'tag'">
+          <view
+            class="line-box"
+            v-for="(item, index) in props.list"
+            :key="index"
+            :class="[state.cur == index ? 'cur' : '', props.dotCur]"
+          ></view>
+        </view>
+        <view class="ui-swiper-dot" :class="props.dotStyle" v-if="props.dotStyle == 'tag'">
+          <view
+            class="ui-tag radius-lg"
+            :class="[props.dotCur]"
+            style="pointer-events: none; padding: 0 10rpx"
+          >
+            <view style="transform: scale(0.7)">{{ state.cur + 1 }} / {{ props.list.length }}</view>
+          </view>
+        </view>
+      </template>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  /**
+   * 轮播组件
+   *
+   * @property {Boolean} circular = false  	- 是否采用衔接滑动，即播放到末尾后重新回到开头
+   * @property {Boolean} autoplay = true  	- 是否自动切换
+   * @property {Number} interval = 5000  		- 自动切换时间间隔
+   * @property {Number} duration = 500  		- 滑动动画时长,app-nvue不支持
+   * @property {Array} list = [] 				- 轮播数据
+   * @property {String} ui = ''  				- 样式class
+   * @property {String} mode  				- 模式
+   * @property {String} dotStyle  			- 指示点样式
+   * @property {String} dotCur= 'ui-BG-Main' 	- 当前指示点样式,默认主题色
+   * @property {String} bg  					- 背景
+   * @property {String} height = 300  		- 组件高度
+   * @property {String} imgHeight = 300   	- 图片高度
+   *
+   * @example list = [{url:'跳转路径',urlType:'跳转方式',type:'轮播类型',src:'轮播内容地址',poster:'视频必传'}]
+   */
+
+  import { reactive, computed } from 'vue';
+  import sheep from '@/sheep';
+  import { clone } from 'lodash-es';
+
+  // 数据
+  const state = reactive({
+    imgHeight: 0,
+    cur: 0,
+    moveX: 0,
+    videoPlaySataus: false,
+    heightList: [],
+  });
+
+  const refs = reactive({
+    videoRef: {},
+  });
+
+  // 接收参数
+
+  const props = defineProps({
+    circular: {
+      type: Boolean,
+      default: true,
+    },
+    autoplay: {
+      type: Boolean,
+      default: false,
+    },
+    interval: {
+      type: Number,
+      default: 3000,
+    },
+    duration: {
+      type: Number,
+      default: 500,
+    },
+    mode: {
+      type: String,
+      default: 'default',
+    },
+    imageMode: {
+      type: String,
+      default: 'scaleToFill',
+    },
+    list: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    dotStyle: {
+      type: String,
+      default: 'long', //default long tag
+    },
+    dotCur: {
+      type: String,
+      default: 'ss-bg-opactity-block',
+    },
+    bg: {
+      type: String,
+      default: 'bg-none',
+    },
+    height: {
+      type: Number,
+      default: 0,
+    },
+    imgHeight: {
+      type: Number,
+      default: 0,
+    },
+    imgTopRadius: {
+      type: Number,
+      default: 0,
+    },
+    imgBottomRadius: {
+      type: Number,
+      default: 0,
+    },
+    isPreview: {
+      type: Boolean,
+      default: false,
+    },
+    seizeHeight: {
+      type: Number,
+      default: 200,
+    },
+  });
+
+  // current 改变时会触发 change 事件
+  const swiperChange = (e) => {
+    if (e.detail.source !== 'touch' && e.detail.source !== 'autoplay') return;
+    state.cur = e.detail.current;
+    state.videoPlaySataus = false;
+    if (props.list[state.cur].type === 'video') {
+      refs.videoRef[`video_${state.cur}`].pausePlay();
+    }
+  };
+  // 点击轮播组件
+  const onSwiperItem = (item) => {
+    if (item.type === 'video') {
+      state.videoPlaySataus = true;
+    } else {
+      sheep.$router.go(item.url);
+      onPreview();
+    }
+  };
+
+  const onPreview = () => {
+    if (!props.isPreview) return;
+    let previewImage = clone(props.list);
+    previewImage.forEach((item, index) => {
+      if (item.type === 'video') {
+        previewImage.splice(index, 1);
+      }
+    });
+    uni.previewImage({
+      urls:
+        previewImage.length < 1
+          ? [props.src]
+          : previewImage.reduce((pre, cur) => {
+              pre.push(cur.src);
+              return pre;
+            }, []),
+      current: state.cur,
+      // longPressActions: {
+      //   itemList: ['发送给朋友', '保存图片', '收藏'],
+      //   success: function (data) {
+      //     console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+      //   },
+      //   fail: function (err) {
+      //     console.log(err.errMsg);
+      //   },
+      // },
+    });
+  };
+  //
+
+  // swiper-item 的位置发生改变时会触发 transition
+  const transition = (e) => {
+    // #ifdef APP-PLUS
+    state.moveX = e.detail.dx;
+    // #endif
+  };
+
+  // 动画结束时会触发 animationfinish
+  const animationfinish = (e) => {
+    state.moveX = 0;
+  };
+
+  const videoTimeupdate = (e) => {
+    props.list[state.cur].currentTime = e.detail.currentTime;
+  };
+
+  // 自动计算高度
+  const customStyle = computed(() => {
+    let height;
+
+    // 固定高度情况
+    if (props.height !== 0) {
+      height = props.height;
+    }
+
+    // 自动高度情况
+    if (props.height === 0) {
+      // 图片预加载占位高度
+      if (state.imgHeight !== 0) {
+        height = state.imgHeight;
+      } else if (props.seizeHeight !== 0) {
+        height = props.seizeHeight;
+      }
+    }
+
+    return {
+      height: height + 'rpx',
+    };
+  });
+
+  // 计算轮播图片最大高度
+  function onImgLoad(e) {
+    if (props.height === 0) {
+      let newHeight = (e.detail.height / e.detail.width) * 750;
+      if (state.imgHeight < newHeight) {
+        state.imgHeight = newHeight;
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .ui-swiper {
+    position: relative;
+
+    .ui-swiper-main {
+      width: 100%;
+      height: 100%;
+    }
+
+    .ui-swiper-main .swiper-image {
+      width: 100%;
+      height: 100%;
+    }
+
+    .ui-swiper-dot {
+      position: absolute;
+      width: 100%;
+      bottom: 20rpx;
+      height: 30rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      &.default .line-box {
+        display: inline-flex;
+        border-radius: 50rpx;
+        width: 6px;
+        height: 6px;
+        border: 2px solid transparent;
+        margin: 0 10rpx;
+        opacity: 0.3;
+        position: relative;
+        justify-content: center;
+        align-items: center;
+
+        &.cur {
+          width: 8px;
+          height: 8px;
+          opacity: 1;
+          border: 0px solid transparent;
+        }
+
+        &.cur::after {
+          content: '';
+          border-radius: 50rpx;
+          width: 4px;
+          height: 4px;
+          background-color: #fff;
+        }
+      }
+
+      &.long .line-box {
+        display: inline-block;
+        border-radius: 100rpx;
+        width: 6px;
+        height: 6px;
+        margin: 0 10rpx;
+        opacity: 0.3;
+        position: relative;
+
+        &.cur {
+          width: 24rpx;
+          opacity: 1;
+        }
+
+        &.cur::after {
+        }
+      }
+
+      &.line {
+        bottom: 20rpx;
+
+        .line-box {
+          display: inline-block;
+          width: 30px;
+          height: 3px;
+          opacity: 0.3;
+          position: relative;
+
+          &.cur {
+            opacity: 1;
+          }
+        }
+      }
+
+      &.tag {
+        justify-content: flex-end;
+        position: absolute;
+        bottom: 20rpx;
+        right: 20rpx;
+      }
+    }
+
+    &.card {
+      .swiper-item {
+        width: 610rpx !important;
+        left: 70rpx;
+        box-sizing: border-box;
+        padding: 20rpx 0rpx 60rpx;
+        overflow: initial;
+      }
+
+      .swiper-item .ui-swiper-main {
+        width: 100%;
+        display: block;
+        height: 100%;
+        transform: scale(0.9);
+        transition: all 0.2s ease-in 0s;
+        position: relative;
+        background-size: cover;
+
+        .swiper-image {
+          height: 100%;
+        }
+      }
+
+      .swiper-item .ui-swiper-main::before {
+        content: '';
+        display: block;
+        background: inherit;
+        filter: blur(5px);
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        top: 10rpx;
+        left: 10rpx;
+        z-index: -1;
+        opacity: 0.3;
+        transform-origin: 0 0;
+        transform: scale(1, 1);
+      }
+
+      .swiper-item.cur .ui-swiper-main {
+        transform: scale(1);
+        transition: all 0.2s ease-in 0s;
+      }
+
+      .ui-swiper-dot.tag {
+        position: absolute;
+        bottom: 85rpx;
+        right: 75rpx;
+      }
+    }
+
+    &.hotelCard {
+      .swiper-item {
+        width: 650rpx !important;
+        left: 30rpx;
+        box-sizing: border-box;
+        padding: 0rpx 0rpx 50rpx;
+        overflow: initial;
+      }
+
+      .swiper-item .ui-swiper-main {
+        width: 100%;
+        display: block;
+        height: 100%;
+        transform: scale(0.9);
+        opacity: 0.8;
+        transition: all 0.2s ease-in 0s;
+        position: relative;
+        background-size: cover;
+
+        .swiper-image {
+          width: 100%;
+          height: 400rpx;
+        }
+      }
+
+      .swiper-item .ui-swiper-main::before {
+        content: '';
+        display: block;
+        background: inherit;
+        filter: blur(5px);
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        top: 10rpx;
+        left: 10rpx;
+        z-index: -1;
+        opacity: 0.3;
+        transform-origin: 0 0;
+        transform: scale(1, 1);
+      }
+
+      .swiper-item.cur .ui-swiper-main {
+        transform: scale(1);
+        transition: all 0.2s ease-in 0s;
+        opacity: 1;
+      }
+
+      .ui-swiper-dot {
+        display: none;
+      }
+    }
+
+    &.hotelDetail {
+      .swiper-item {
+        width: 690rpx !important;
+        left: 30rpx;
+        box-sizing: border-box;
+        padding: 20rpx 0rpx;
+        overflow: initial;
+      }
+
+      .swiper-item .ui-swiper-main {
+        width: 100%;
+        display: block;
+        height: 100%;
+        transform: scale(0.96);
+        transition: all 0.2s ease-in 0s;
+        position: relative;
+        background-size: cover;
+
+        .swiper-image {
+          height: 100%;
+        }
+      }
+
+      .swiper-item.cur .ui-swiper-main {
+        transform: scale(0.96);
+        transition: all 0.2s ease-in 0s;
+      }
+    }
+  }
+</style>
diff --git a/sheep/ui/su-switch/su-switch.vue b/sheep/ui/su-switch/su-switch.vue
new file mode 100644
index 0000000..d63e800
--- /dev/null
+++ b/sheep/ui/su-switch/su-switch.vue
@@ -0,0 +1,100 @@
+<template>
+  <view class="ui-switch" :class="[{ disabled: props.disabled }, props.ui]">
+    <view class="ui-switch-wrapper" @tap="change">
+      <view
+        class="ui-switch-input"
+        :class="[
+          { 'ui-switch-input-checked': props.modelValue },
+          props.modelValue ? props.bg : '',
+          props.text,
+          props.size,
+        ]"
+      ></view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'UiSwitch',
+  };
+</script>
+<script setup>
+  const props = defineProps({
+    modelValue: {
+      type: [Boolean, Number],
+      default: false,
+    },
+    ui: {
+      type: String,
+      default: '',
+    },
+    bg: {
+      type: String,
+      default: 'ui-BG-Main',
+    },
+    text: {
+      type: String,
+      default: '',
+    },
+    size: {
+      type: String,
+      default: 'sm',
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  });
+  const emits = defineEmits(['update:modelValue']);
+
+  const change = () => {
+    emits('update:modelValue', !props.modelValue);
+  };
+</script>
+
+<style lang="scss" scoped>
+  .ui-switch {
+    display: inline-block;
+    cursor: pointer;
+    .ui-switch-wrapper {
+      display: inline-flex;
+      align-items: center;
+      vertical-align: middle;
+    }
+    .ui-switch-input {
+      appearance: none;
+      position: relative;
+      width: 47px;
+      height: 26px;
+      outline: 0;
+      border-radius: 16px;
+      box-sizing: border-box;
+      background-color: rgba(119, 119, 119, 0.3);
+      transition: background-color 0.1s, border 0.1s;
+      &:after {
+        content: ' ';
+        position: absolute;
+        top: 0;
+        left: 0;
+        border-radius: 200px;
+        transition: transform 0.3s;
+        width: 20px;
+        height: 20px;
+        margin: 3px;
+        background-color: #fff;
+      }
+      &.ui-switch-input-checked {
+        &:after {
+          transform: translateX(21px);
+        }
+      }
+    }
+    &.disabled {
+      cursor: not-allowed;
+      .ui-switch-input {
+        opacity: 0.7;
+      }
+    }
+  }
+</style>
diff --git a/sheep/ui/su-tab-item/su-tab-item.vue b/sheep/ui/su-tab-item/su-tab-item.vue
new file mode 100644
index 0000000..615df2f
--- /dev/null
+++ b/sheep/ui/su-tab-item/su-tab-item.vue
@@ -0,0 +1,169 @@
+<template>
+  <view>
+    <view :id="'tab-' + props.index" class="ui-tab-item" :class="[{ cur: cur }, tpl]">
+      <view class="ui-tab-icon" :class="props.data.icon" v-if="props.data.icon"></view>
+      <view
+        class="ui-tab-text"
+        :class="[cur ? 'curColor cur' : 'default-color']"
+        :style="[{ color: cur ? titleStyle.activeColor : titleStyle.color }]"
+      >
+        {{ props.data.title }}
+      </view>
+
+      <view class="ui-tag badge ml-2" v-if="props.data.tag != null">{{ props.data.tag }}</view>
+    </view>
+    <view
+      v-if="tpl === 'subtitle'"
+      class="item-subtitle ss-flex ss-col-bottom ss-row-center"
+      :style="[{ color: cur ? subtitleStyle.activeColor : subtitleStyle.color }]"
+    >
+      {{ props.data.subtitle }}
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'UiTabItem',
+  };
+</script>
+
+<script setup>
+  /**
+   * 基础组件 - uiTabItem
+   */
+  import { computed, onMounted, getCurrentInstance, inject } from 'vue';
+  import sheep from '@/sheep';
+  const vm = getCurrentInstance();
+
+  const props = defineProps({
+    data: {
+      type: [Object, String, Number],
+      default() {},
+    },
+    index: {
+      type: Number,
+      default: 0,
+    },
+  });
+
+  const emits = defineEmits(['up']);
+
+  onMounted(() => {
+    computedQuery();
+    uni.onWindowResize((res) => {
+      computedQuery();
+    });
+  });
+
+  function getParent(name) {
+    let parent = vm?.parent;
+    // 无父级返回null
+    if (parent) {
+      let parentName = parent?.type?.name;
+      // 父组件name 为真返回父级，为假循环
+      while (parentName !== name) {
+        parent = parent?.parent;
+        // 存在父级循环，不存在打断循环
+        if (parent) {
+          parentName = parent?.type?.name;
+        } else {
+          return null;
+        }
+      }
+      return parent;
+    }
+    return null;
+  }
+
+  const UiTab = getParent('SuTab');
+
+  // 获取抛出的数据和方法
+  let uiTabProvide;
+  if (UiTab) {
+    uiTabProvide = inject('suTabProvide');
+  }
+  const cur = computed(() => uiTabProvide?.curValue.value === props.index);
+  const tpl = computed(() => uiTabProvide?.props?.tpl);
+  const subtitleStyle = computed(() => uiTabProvide?.props?.subtitleStyle);
+  const titleStyle = computed(() => uiTabProvide?.props?.titleStyle);
+
+  const computedQuery = () => {
+    uni.createSelectorQuery()
+      .in(vm)
+      .select('#tab-' + props.index)
+      .boundingClientRect((data) => {
+        if (data != null) {
+          // 传递到父组件进行计算
+          emits('up', props.index, data);
+        } else {
+          console.log('tab-item data error');
+        }
+      })
+      .exec();
+  };
+</script>
+
+<style lang="scss" scoped>
+  .default-color {
+    color: $black;
+  }
+  .ui-tab-item {
+    display: inline-flex;
+    align-items: center;
+    padding: 0 1em;
+    min-height: 1.5em;
+    line-height: 1.5em;
+    position: relative;
+    z-index: 1;
+    opacity: 0.6;
+    transition: opacity 0.3s;
+    min-width: 60px;
+
+    .ui-tab-text {
+      width: 100%;
+      text-align: center;
+    }
+
+    .ui-tab-icon {
+      margin: 0 0.25em;
+      font-size: 120%;
+    }
+
+    &.cur {
+      opacity: 1;
+      font-weight: bold;
+    }
+
+    &.btn {
+      .ui-tab-text {
+        transform: scale(0.9);
+        transition: color 0.3s;
+        font-weight: bold;
+      }
+    }
+
+    &.subtitle {
+      .ui-tab-text {
+        transform: scale(0.9);
+        transition: color 0.3s;
+        font-weight: bold;
+        height: calc(100% - 2.6em);
+        line-height: calc(100% - 2.6em);
+        margin-top: 1.2em;
+        color: $white;
+      }
+    }
+  }
+
+  .item-subtitle {
+    height: 2em;
+    font-size: 22rpx;
+    color: $dark-9;
+    margin-bottom: 0.6em;
+  }
+
+  .cur-subtitle {
+    color: var(--ui-BG-Main);
+  }
+</style>
diff --git a/sheep/ui/su-tab/su-tab.vue b/sheep/ui/su-tab/su-tab.vue
new file mode 100644
index 0000000..17a7983
--- /dev/null
+++ b/sheep/ui/su-tab/su-tab.vue
@@ -0,0 +1,474 @@
+<template>
+  <view
+    class="ui-tab"
+    ref="tabRef"
+    :id="'tab-' + vm.uid"
+    :class="[
+      props.ui,
+      props.tpl,
+      props.bg,
+      props.align,
+      { 'ui-tab-inline': props.inline },
+      { 'ui-tab-scrolls': props.scroll },
+    ]"
+  >
+    <block v-if="scroll">
+      <view class="ui-tab-scroll-warp">
+        <scroll-view
+          scroll-x="true"
+          class="ui-tab-scroll"
+          :scroll-left="state.curValue > 1 ? state.tabNodeList[state.curValue - 1].left : 0"
+          scroll-with-animation
+          :style="{ width: `${state.content.width}px` }"
+        >
+          <view class="ss-flex ss-col-center">
+            <su-tab-item
+              v-for="(item, index) in props.tab"
+              :data="item"
+              :index="index"
+              :key="index"
+              @up="upitem"
+              @tap.native="click(index, item)"
+            ></su-tab-item>
+            <view
+              class="ui-tab-mark-warp"
+              :class="[{ over: state.over }]"
+              :style="[{ left: state.markLeft + 'px' }, { width: state.markWidth + 'px' }]"
+            >
+              <view
+                class="ui-tab-mark"
+                :class="[props.mark, { 'ui-btn': props.tpl == 'btn' || props.tpl == 'subtitle' }]"
+                :style="[
+                  {
+                    background:
+                      props.tpl == 'btn' || props.tpl == 'subtitle' ? titleStyle.activeBg : 'none',
+                  },
+                ]"
+              ></view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </block>
+    <block v-else>
+      <su-tab-item
+        v-for="(item, index) in props.tab"
+        :data="item"
+        :index="index"
+        :key="index"
+        @up="upitem"
+        @tap.native="click(index, item)"
+      ></su-tab-item>
+      <view
+        class="ui-tab-mark-warp"
+        :class="[{ over: state.over }]"
+        :style="[{ left: state.markLeft + 'px' }, { width: state.markWidth + 'px' }]"
+      >
+        <view
+          class="ui-tab-mark"
+          :class="[props.mark, { 'ui-btn': props.tpl == 'btn' || props.tpl == 'subtitle' }]"
+        ></view>
+      </view>
+    </block>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'SuTab',
+  };
+</script>
+
+<script setup>
+  /**
+   * 基础组件 - suTab
+   */
+
+  import {
+    toRef,
+    ref,
+    reactive,
+    unref,
+    onMounted,
+    nextTick,
+    getCurrentInstance,
+    provide,
+  } from 'vue';
+  const vm = getCurrentInstance();
+
+  // 数据
+  const state = reactive({
+    curValue: 0,
+    tabNodeList: [],
+    scrollLeft: 0,
+    markLeft: 0,
+    markWidth: 0,
+    content: {
+      width: 100,
+    },
+    over: false,
+  });
+
+  const tabRef = ref(null);
+  // 参数
+  const props = defineProps({
+    modelValue: {
+      type: Number,
+      default: 0,
+    },
+    ui: {
+      type: String,
+      default: '',
+    },
+    bg: {
+      type: String,
+      default: '',
+    },
+    tab: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    // line dot long,subtitle,trapezoid
+    tpl: {
+      type: String,
+      default: 'line',
+    },
+    mark: {
+      type: String,
+      default: '',
+    },
+    align: {
+      type: String,
+      default: '',
+    },
+    curColor: {
+      type: String,
+      default: 'ui-TC',
+    },
+    defaultColor: {
+      type: String,
+      default: 'ui-TC',
+    },
+    scroll: {
+      type: Boolean,
+      default: false,
+    },
+    inline: {
+      type: Boolean,
+      default: false,
+    },
+    titleStyle: {
+      type: Object,
+      default: () => ({
+        activeBg: '#DA2B10',
+        activeColor: '#FEFEFE',
+        color: '#D70000',
+      }),
+    },
+    subtitleStyle: {
+      type: Object,
+      default: () => ({
+        activeColor: '#333',
+        color: '#C42222',
+      }),
+    },
+  });
+
+  const emits = defineEmits(['update:modelValue', 'change']);
+
+  onMounted(() => {
+    state.curValue = props.modelValue;
+    setCurValue(props.modelValue);
+    nextTick(() => {
+      computedQuery();
+    });
+    uni.onWindowResize((res) => {
+      computedQuery();
+    });
+  });
+
+  const computedQuery = () => {
+    uni.createSelectorQuery()
+      .in(vm)
+      .select('#tab-' + vm.uid)
+      .boundingClientRect((data) => {
+        if (data != null) {
+          if (data.left == 0 && data.right == 0) {
+            // setTimeout(() => {
+            computedQuery();
+            // }, 300);
+          } else {
+            state.content = data;
+            setTimeout(() => {
+              state.over = true;
+            }, 300);
+          }
+        } else {
+          console.log('tab-' + vm.uid + ' data error');
+        }
+      })
+      .exec();
+  };
+
+  const setCurValue = (value) => {
+    if (value == state.curValue) return;
+    state.curValue = value;
+    computedMark();
+  };
+
+  const click = (index, item) => {
+    setCurValue(index);
+    emits('update:modelValue', index);
+    emits('change', {
+      index: index,
+      data: item,
+    });
+  };
+
+  const upitem = (index, e) => {
+    state.tabNodeList[index] = e;
+    if (index == state.curValue) {
+      computedMark();
+    }
+  };
+
+  const computedMark = () => {
+    if (state.tabNodeList.length == 0) return;
+    let left = 0;
+    let list = unref(state.tabNodeList);
+    let cur = state.curValue;
+    state.markLeft = list[cur].left - state.content.left;
+    state.markWidth = list[cur].width;
+  };
+
+  const computedScroll = () => {
+    if (state.curValue == 0 || state.curValue == state.tabNodeList.length - 1) {
+      return false;
+    }
+    let i = 0;
+    let left = 0;
+    let list = state.tabNodeList;
+    for (i in list) {
+      if (i == state.curValue && i != 0) {
+        left = left - list[i - 1].width;
+        break;
+      }
+      left = left + list[i].width;
+    }
+    state.scrollLeft = left;
+  };
+
+  provide('suTabProvide', {
+    props,
+    curValue: toRef(state, 'curValue'),
+  });
+</script>
+
+<style lang="scss">
+  .ui-tab {
+    position: relative;
+    display: flex;
+    height: 4em;
+    align-items: center;
+
+    &.ui-tab-scrolls {
+      width: 100%;
+      /* #ifdef MP-WEIXIN */
+      padding-bottom: 10px;
+      /* #endif */
+      .ui-tab-scroll-warp {
+        overflow: hidden;
+        height: inherit;
+        width: 100%;
+        .ui-tab-scroll {
+          position: relative;
+          display: block;
+          white-space: nowrap;
+          overflow: auto;
+          min-height: 4em;
+          line-height: 4em;
+          width: 100% !important;
+          .ui-tab-mark-warp {
+            display: flex;
+            align-items: top;
+            justify-content: center;
+            .ui-tab-mark.ui-btn {
+              /* #ifndef MP-WEIXIN */
+              height: 2em;
+              width: calc(100% - 0.6em);
+              margin-top: 4px;
+              /* #endif */
+              /* #ifdef MP-WEIXIN */
+              height: 2em;
+              width: calc(100% - 0.6em);
+              margin-top: 4px;
+              /* #endif */
+            }
+          }
+        }
+      }
+    }
+
+    .ui-tab-mark-warp {
+      color: inherit;
+      position: absolute;
+      top: 0;
+      height: 100%;
+      z-index: 0;
+
+      &.over {
+        transition: 0.3s;
+      }
+
+      .ui-tab-mark {
+        color: var(--ui-BG-Main);
+        height: 100%;
+      }
+    }
+
+    &.line {
+      .ui-tab-mark {
+        border-bottom: 2px solid currentColor;
+      }
+    }
+
+    &.topline {
+      .ui-tab-mark {
+        border-top: 2px solid currentColor;
+      }
+    }
+
+    &.dot {
+      .ui-tab-mark::after {
+        content: '';
+        width: 0.5em;
+        height: 0.5em;
+        background-color: currentColor;
+        border-radius: 50%;
+        display: block;
+        position: absolute;
+        bottom: 0.3em;
+        left: 0;
+        right: 0;
+        margin: auto;
+      }
+    }
+
+    &.long {
+      .ui-tab-mark::after {
+        content: '';
+        width: 2em;
+        height: 0.35em;
+        background-color: currentColor;
+        border-radius: 5em;
+        display: block;
+        position: absolute;
+        bottom: 0.3em;
+        left: 0;
+        right: 0;
+        margin: auto;
+      }
+    }
+
+    &.trapezoid {
+      .ui-tab-mark::after {
+        content: '';
+        width: calc(100% - 2em);
+        height: 0.35em;
+        background-color: currentColor;
+        border-radius: 5em 5em 0 0;
+        display: block;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        margin: auto;
+      }
+    }
+
+    &.btn {
+      .ui-tab-mark-warp {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .ui-tab-mark.ui-btn {
+          height: calc(100% - 1.6em);
+          width: calc(100% - 0.6em);
+        }
+      }
+
+      &.sm .ui-tab-mark.ui-btn {
+        height: calc(100% - 2px);
+        width: calc(100% - 2px);
+        border-radius: #{$radius - 2};
+      }
+    }
+
+    &.subtitle {
+      .ui-tab-mark-warp {
+        display: flex;
+        align-items: top;
+        justify-content: center;
+        padding-top: 0.6em;
+
+        .ui-tab-mark.ui-btn {
+          height: calc(100% - 2.8em);
+          width: calc(100% - 0.6em);
+        }
+      }
+    }
+
+    &.ui-tab-inline {
+      display: inline-flex;
+      height: 3.5em;
+
+      &.ui-tab-scrolls {
+        .ui-tab-scroll {
+          height: calc(3.5em + 17px);
+          line-height: 3.5em;
+
+          .ui-tab-mark-warp {
+            height: 3.5em;
+          }
+        }
+      }
+
+      &.btn {
+        .ui-tab-mark-warp {
+          .ui-tab-mark.ui-btn {
+            height: calc(100% - 10px);
+            width: calc(100% - 10px);
+          }
+        }
+      }
+    }
+
+    &.sm {
+      height: 70rpx !important;
+
+      &.ui-tab-inline {
+        height: 70rpx;
+
+        &.ui-tab-scrolls {
+          .ui-tab-scroll {
+            height: calc(70rpx + 17px);
+            line-height: 70rpx;
+
+            .ui-tab-mark-warp {
+              height: 70rpx;
+            }
+          }
+        }
+
+        &.btn .ui-tab-mark.ui-btn {
+          height: calc(100% - 2px);
+          width: calc(100% - 2px);
+          border-radius: #{$radius - 2};
+        }
+      }
+    }
+  }
+</style>
diff --git a/sheep/ui/su-tabbar-item/su-tabbar-item.vue b/sheep/ui/su-tabbar-item/su-tabbar-item.vue
new file mode 100644
index 0000000..cc55ac1
--- /dev/null
+++ b/sheep/ui/su-tabbar-item/su-tabbar-item.vue
@@ -0,0 +1,234 @@
+<!-- 自定义底部导航项 -->
+<template>
+  <view class="u-tabbar-item" :style="[addStyle(customStyle)]">
+    <view v-if="isCenter" class="tabbar-center-item">
+      <image class="center-image" :src="centerImage" mode="aspectFill"></image>
+    </view>
+    <template v-else>
+      <view class="u-tabbar-item__icon">
+        <image
+          v-if="icon"
+          :name="icon"
+          :color="isActive ? parentData.activeColor : parentData.color"
+          :size="20"
+        ></image>
+        <block v-else>
+          <slot v-if="isActive" name="active-icon" />
+          <slot v-else name="inactive-icon" />
+        </block>
+        <!-- <u-badge
+					absolute
+					:offset="[0, dot ? '34rpx' : badge > 9 ? '14rpx' : '20rpx']"
+					:customStyle="badgeStyle"
+					:isDot="dot"
+					:value="badge || (dot ? 1 : null)"
+					:show="dot || badge > 0"
+				></u-badge> -->
+      </view>
+
+      <slot name="text">
+        <text
+          class="u-tabbar-item__text"
+          :style="{
+            color: isActive ? parentData.activeColor : parentData.color,
+          }"
+        >
+          {{ text }}
+        </text>
+      </slot>
+    </template>
+  </view>
+</template>
+
+<script>
+  /**
+   * TabbarItem 底部导航栏子组件
+   * @description 此组件提供了自定义tabbar的能力。
+   * @property {String | Number}	name		item标签的名称，作为与u-tabbar的value参数匹配的标识符
+   * @property {String}			icon		uView内置图标或者绝对路径的图片
+   * @property {String | Number}	badge		右上角的角标提示信息
+   * @property {Boolean}			dot			是否显示圆点，将会覆盖badge参数（默认 false ）
+   * @property {String}			text		描述文本
+   * @property {Object | String}	badgeStyle	控制徽标的位置，对象或者字符串形式，可以设置top和right属性（默认 'top: 6px;right:2px;' ）
+   * @property {Object}			customStyle	定义需要用到的外部样式
+   *
+   */
+  import { deepMerge, addStyle, sleep, $parent } from '@/sheep/helper';
+  export default {
+    name: 'su-tabbar-item',
+    props: {
+      customStyle: {
+        type: [Object, String],
+        default: () => ({}),
+      },
+      customClass: {
+        type: String,
+        default: '',
+      },
+      // 跳转的页面路径
+      url: {
+        type: String,
+        default: '',
+      },
+      // 页面跳转的类型
+      linkType: {
+        type: String,
+        default: 'navigateTo',
+      },
+      // item标签的名称，作为与u-tabbar的value参数匹配的标识符
+      name: {
+        type: [String, Number, null],
+        default: '',
+      },
+      // uView内置图标或者绝对路径的图片
+      icon: {
+        icon: String,
+        default: '',
+      },
+      // 右上角的角标提示信息
+      badge: {
+        type: [String, Number, null],
+        default: '',
+      },
+      // 是否显示圆点，将会覆盖badge参数
+      dot: {
+        type: Boolean,
+        default: false,
+      },
+      // 描述文本
+      text: {
+        type: String,
+        default: '',
+      },
+      // 控制徽标的位置，对象或者字符串形式，可以设置top和right属性
+      badgeStyle: {
+        type: [Object, String],
+        default: '',
+      },
+      isCenter: {
+        type: Boolean,
+        default: false,
+      },
+      centerImage: {
+        type: String,
+        default: '',
+      },
+    },
+    data() {
+      return {
+        isActive: false, // 是否处于激活状态
+        addStyle,
+        parentData: {
+          value: null,
+          activeColor: '',
+          color: '',
+        },
+        parent: {},
+      };
+    },
+    created() {
+      this.init();
+    },
+    methods: {
+      getParentData(parentName = '') {
+        // 避免在created中去定义parent变量
+        if (!this.parent) this.parent = {};
+        // 这里的本质原理是，通过获取父组件实例(也即类似u-radio的父组件u-radio-group的this)
+        // 将父组件this中对应的参数，赋值给本组件(u-radio的this)的parentData对象中对应的属性
+        // 之所以需要这么做，是因为所有端中，头条小程序不支持通过this.parent.xxx去监听父组件参数的变化
+        // 此处并不会自动更新子组件的数据，而是依赖父组件u-radio-group去监听data的变化，手动调用更新子组件的方法去重新获取
+        this.parent = $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];
+          });
+        }
+      },
+      init() {
+        // 支付宝小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环引用
+        this.updateParentData();
+        if (!this.parent) {
+          console.log('u-tabbar-item必须搭配u-tabbar组件使用');
+        }
+        // 本子组件在u-tabbar的children数组中的索引
+        const index = this.parent.children.indexOf(this);
+        // 判断本组件的name(如果没有定义name，就用index索引)是否等于父组件的value参数
+        this.isActive = (this.name.split('?')[0] || index) === this.parentData.value;
+      },
+      updateParentData() {
+        // 此方法在mixin中
+        this.getParentData('su-tabbar');
+      },
+      // 此方法将会被父组件u-tabbar调用
+      updateFromParent() {
+        // 重新初始化
+        this.init();
+      },
+      clickHandler() {
+        this.$nextTick(() => {
+          const index = this.parent.children.indexOf(this);
+          const name = this.name || index;
+          // 点击的item为非激活的item才发出change事件
+          if (name !== this.parent.value) {
+            this.parent.$emit('change', name);
+          }
+          this.$emit('click', name);
+        });
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .tabbar-center-item {
+    height: 40px;
+    width: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 50%;
+    background-color: rebeccapurple;
+    transform: scale(1.3) translateY(-6px);
+    position: absolute;
+    z-index: 2;
+
+    .center-image {
+      width: 25px;
+      height: 25px;
+    }
+  }
+  .u-tabbar-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    flex: 1;
+    position: relative;
+    z-index: 1;
+
+    &__icon {
+      display: flex;
+      position: relative;
+      width: 150rpx;
+      justify-content: center;
+    }
+
+    &__text {
+      margin-top: 2px;
+      font-size: 12px;
+      color: var(--textSize);
+    }
+  }
+
+  /* #ifdef MP */
+  // 由于小程序都使用shadow DOM形式实现，需要给影子宿主设置flex: 1才能让其撑开
+  :host {
+    flex: 1;
+  }
+  /* #endif */
+</style>
diff --git a/sheep/ui/su-tabbar/su-tabbar.vue b/sheep/ui/su-tabbar/su-tabbar.vue
new file mode 100644
index 0000000..92e0352
--- /dev/null
+++ b/sheep/ui/su-tabbar/su-tabbar.vue
@@ -0,0 +1,227 @@
+<!-- 底部导航栏 -->
+<template>
+  <view class="u-tabbar">
+    <view
+      class="u-tabbar__content"
+      ref="u-tabbar__content"
+      @touchmove.stop.prevent=""
+      :class="[border && 'u-border-top', fixed && 'u-tabbar--fixed', { 'mid-tabbar': midTabBar }]"
+      :style="[tabbarStyle]"
+    >
+      <view class="u-tabbar__content__item-wrapper">
+        <slot></slot>
+      </view>
+      <view v-if="safeAreaInsetBottom" :style="[{ height: safeBottomHeight + 'px' }]"></view>
+    </view>
+    <view
+      class="u-tabbar__placeholder"
+      v-if="placeholder"
+      :style="{
+        height: placeholderHeight + 'px',
+      }"
+    ></view>
+  </view>
+</template>
+
+<script>
+  // #ifdef APP-NVUE
+  const dom = uni.requireNativePlugin('dom');
+  // #endif
+  /**
+   * Tabbar 底部导航栏
+   * @description 此组件提供了自定义tabbar的能力。
+   * @property {String | Number}	value				当前匹配项的name
+   * @property {Boolean}			safeAreaInsetBottom	是否为iPhoneX留出底部安全距离（默认 true ）
+   * @property {Boolean}			border				是否显示上方边框（默认 true ）
+   * @property {String | Number}	zIndex				元素层级z-index（默认 1 ）
+   * @property {String}			activeColor			选中标签的颜色（默认 '#1989fa' ）
+   * @property {String}			inactiveColor		未选中标签的颜色（默认 '#7d7e80' ）
+   * @property {Boolean}			fixed				是否固定在底部（默认 true ）
+   * @property {Boolean}			placeholder			fixed定位固定在底部时，是否生成一个等高元素防止塌陷（默认 true ）
+   * @property {Object}			customStyle			定义需要用到的外部样式
+   *
+   */
+
+  import { deepMerge, addStyle, sleep } from '@/sheep/helper';
+  import sheep from '@/sheep';
+
+  export default {
+    name: 'su-tabbar',
+    props: {
+      customStyle: {
+        type: [Object, String],
+        default: () => ({}),
+      },
+      customClass: {
+        type: String,
+        default: '',
+      },
+      // 跳转的页面路径
+      url: {
+        type: String,
+        default: '',
+      },
+      // 页面跳转的类型
+      linkType: {
+        type: String,
+        default: 'navigateTo',
+      },
+      // 当前匹配项的name
+      value: {
+        type: [String, Number, null],
+        default: '',
+      },
+      // 是否为iPhoneX留出底部安全距离
+      safeAreaInsetBottom: {
+        type: Boolean,
+        default: true,
+      },
+      // 是否显示上方边框
+      border: {
+        type: Boolean,
+        default: true,
+      },
+      // 元素层级z-index
+      zIndex: {
+        type: [String, Number],
+        default: 10,
+      },
+      // 选中标签的颜色
+      activeColor: {
+        type: String,
+        default: '#1989fa',
+      },
+      // 未选中标签的颜色
+      inactiveColor: {
+        type: String,
+        default: '#7d7e80',
+      },
+      // 是否固定在底部
+      fixed: {
+        type: Boolean,
+        default: true,
+      },
+      // fixed定位固定在底部时，是否生成一个等高元素防止塌陷
+      placeholder: {
+        type: Boolean,
+        default: true,
+      },
+      midTabBar: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    data() {
+      return {
+        placeholderHeight: 0,
+        safeBottomHeight: sheep.$platform.device.safeAreaInsets.bottom,
+      };
+    },
+    computed: {
+      tabbarStyle() {
+        const style = {
+          zIndex: this.zIndex,
+        };
+        // 合并来自父组件的customStyle样式
+        return deepMerge(style, addStyle(this.customStyle));
+      },
+      // 监听多个参数的变化，通过在computed执行对应的操作
+      updateChild() {
+        return [this.value, this.activeColor, this.inactiveColor];
+      },
+      updatePlaceholder() {
+        return [this.fixed, this.placeholder];
+      },
+    },
+    watch: {
+      updateChild() {
+        // 如果updateChildren中的元素发生了变化，则执行子元素初始化操作
+        this.updateChildren();
+      },
+      updatePlaceholder() {
+        // 如果fixed，placeholder等参数发生变化，重新计算占位元素的高度
+        this.setPlaceholderHeight();
+      },
+    },
+    created() {
+      this.children = [];
+    },
+    mounted() {
+      this.setPlaceholderHeight();
+    },
+    methods: {
+      updateChildren() {
+        // 如果存在子元素，则执行子元素的updateFromParent进行更新数据
+        this.children.length && this.children.map((child) => child.updateFromParent());
+      },
+      getRect(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();
+        });
+      },
+      // 设置用于防止塌陷元素的高度
+      async setPlaceholderHeight() {
+        if (!this.fixed || !this.placeholder) return;
+        // 延时一定时间
+        await sleep(20);
+        // #ifndef APP-NVUE
+        this.getRect('.u-tabbar__content').then(({ height = 50 }) => {
+          // 修复IOS safearea bottom 未填充高度
+          this.placeholderHeight = height;
+        });
+        // #endif
+
+        // #ifdef APP-NVUE
+        dom.getComponentRect(this.$refs['u-tabbar__content'], (res) => {
+          const { size } = res;
+          this.placeholderHeight = size.height;
+        });
+        // #endif
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .u-tabbar {
+    display: flex;
+    flex: 1;
+    justify-content: center;
+
+    &__content {
+      display: flex;
+      flex-direction: column;
+      background-color: #fff;
+      box-shadow: 0px -2px 4px 0px rgba(51, 51, 51, 0.06);
+
+      &__item-wrapper {
+        height: 50px;
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+      }
+    }
+
+    .mid-tabbar {
+      border-radius: 30rpx 30rpx 0 0;
+    }
+
+    &--fixed {
+      position: fixed;
+      bottom: -1px;
+      left: 0;
+      right: 0;
+    }
+  }
+</style>
diff --git a/sheep/ui/su-tabs-item/props.js b/sheep/ui/su-tabs-item/props.js
new file mode 100644
index 0000000..3908c36
--- /dev/null
+++ b/sheep/ui/su-tabs-item/props.js
@@ -0,0 +1,3 @@
+export default {
+  props: {},
+};
diff --git a/sheep/ui/su-tabs-item/su-tabs-item.vue b/sheep/ui/su-tabs-item/su-tabs-item.vue
new file mode 100644
index 0000000..7139684
--- /dev/null
+++ b/sheep/ui/su-tabs-item/su-tabs-item.vue
@@ -0,0 +1,26 @@
+<template>
+  <swiper-item>
+    <slot />
+  </swiper-item>
+</template>
+
+<script>
+  import props from './props.js';
+  /**
+   * TabsItem  tabs标签组件的自组件
+   * @description tabs标签组件，在标签多的时候，可以配置为左右滑动，标签少的时候，可以禁止滑动。 该组件的一个特点是配置为滚动模式时，激活的tab会自动移动到组件的中间位置。
+   * @tutorial https://www.uviewui.com/components/tabs.html
+   * @property {type}	prop_name
+   * @event {Function()}
+   * @example
+   */
+  export default {
+    name: 'u-tabs-item',
+    mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+    data() {
+      return {};
+    },
+  };
+</script>
+
+<style></style>
diff --git a/sheep/ui/su-tabs/su-tabs.vue b/sheep/ui/su-tabs/su-tabs.vue
new file mode 100644
index 0000000..05d7dcb
--- /dev/null
+++ b/sheep/ui/su-tabs/su-tabs.vue
@@ -0,0 +1,434 @@
+<template>
+  <view class="u-tabs">
+    <view class="u-tabs__wrapper">
+      <slot name="left" />
+      <view class="u-tabs__wrapper__scroll-view-wrapper">
+        <scroll-view
+          :scroll-x="scrollable"
+          :scroll-left="scrollLeft"
+          scroll-with-animation
+          enable-flex
+          class="u-tabs__wrapper__scroll-view white-space"
+          :show-scrollbar="false"
+          ref="u-tabs__wrapper__scroll-view"
+        >
+          <view class="u-tabs__wrapper__nav" ref="u-tabs__wrapper__nav">
+            <view
+              class="u-tabs__wrapper__nav__item"
+              v-for="(item, index) in list"
+              :key="index"
+              @tap="clickHandler(item, index)"
+              :ref="`u-tabs__wrapper__nav__item-${index}`"
+              :style="[addStyle(itemStyle), { flex: scrollable ? '' : 1 }]"
+              :class="[
+                `u-tabs__wrapper__nav__item-${index}`,
+                item.disabled && 'u-tabs__wrapper__nav__item--disabled',
+              ]"
+            >
+              <text
+                :class="[item.disabled && 'u-tabs__wrapper__nav__item__text--disabled']"
+                class="u-tabs__wrapper__nav__item__text"
+                :style="[textStyle(index)]"
+                >{{ item[keyName] }}</text
+              >
+            </view>
+            <!-- #ifdef APP-NVUE -->
+            <view
+              class="u-tabs__wrapper__nav__line"
+              ref="u-tabs__wrapper__nav__line"
+              :style="[
+                {
+                  width: addUnit(lineWidth),
+                  height: addUnit(lineHeight),
+                  background: lineColor ? lineColor : 'var(--ui-BG-Main)',
+                  backgroundSize: lineBgSize,
+                },
+              ]"
+            ></view>
+            <!-- #endif -->
+            <!-- #ifndef APP-NVUE -->
+            <view
+              class="u-tabs__wrapper__nav__line"
+              ref="u-tabs__wrapper__nav__line"
+              :style="[
+                {
+                  width: addUnit(lineWidth),
+                  transform: `translate(${lineOffsetLeft}px)`,
+                  transitionDuration: `${firstTime ? 0 : duration}ms`,
+                  height: addUnit(lineHeight),
+                  background: lineColor ? lineColor : 'var(--ui-BG-Main)',
+                  backgroundSize: lineBgSize,
+                },
+              ]"
+            >
+            </view>
+            <!-- #endif -->
+          </view>
+        </scroll-view>
+      </view>
+      <slot name="right" />
+    </view>
+  </view>
+</template>
+
+<script>
+  import { deepMerge, addStyle, addUnit, sleep, getPx, sys } from '@/sheep/helper';
+  // #ifdef APP-NVUE
+  const animation = uni.requireNativePlugin('animation');
+  const dom = uni.requireNativePlugin('dom');
+  // #endif
+
+  /**
+   * Tabs 标签
+   * @description tabs标签组件，在标签多的时候，可以配置为左右滑动，标签少的时候，可以禁止滑动。 该组件的一个特点是配置为滚动模式时，激活的tab会自动移动到组件的中间位置。
+   * @tutorial https://www.uviewui.com/components/tabs.html
+   * @property {String | Number}	duration			滑块移动一次所需的时间，单位秒（默认 200 ）
+   * @property {String | Number}	swierWidth			swiper的宽度（默认 '750rpx' ）
+   * @property {String}	keyName	 从`list`元素对象中读取的键名（默认 'name' ）
+   * @event {Function(index)} change 标签改变时触发 index: 点击了第几个tab，索引从0开始
+   * @event {Function(index)} click 点击标签时触发 index: 点击了第几个tab，索引从0开始
+   * @example <u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+   */
+  export default {
+    name: 'su-tabs',
+    data() {
+      return {
+        addStyle,
+        addUnit,
+        firstTime: true,
+        scrollLeft: 0,
+        scrollViewWidth: 0,
+        lineOffsetLeft: 0,
+        tabsRect: {
+          left: 0,
+        },
+        innerCurrent: 0,
+        moving: false,
+      };
+    },
+    props: {
+      // 滑块的移动过渡时间，单位ms
+      duration: {
+        type: Number,
+        default: 300,
+      },
+      // tabs标签数组
+      list: {
+        type: Array,
+        default: [],
+      },
+      // 滑块颜色
+      lineColor: {
+        type: String,
+        default: '',
+      },
+      // 菜单选择中时的样式
+      activeStyle: {
+        type: [String, Object],
+        default() {
+          return {
+            color: '#303133',
+          };
+        },
+      },
+      // 菜单非选中时的样式
+      inactiveStyle: {
+        type: [String, Object],
+        default() {
+          return {
+            color: '#606266',
+          };
+        },
+      },
+      // 滑块长度
+      lineWidth: {
+        type: [String, Number],
+        default: 20,
+      },
+      // 滑块高度
+      lineHeight: {
+        type: [String, Number],
+        default: 3,
+      },
+      // 滑块背景显示大小，当滑块背景设置为图片时使用
+      lineBgSize: {
+        type: String,
+        default: 'cover',
+      },
+      // 菜单item的样式
+      itemStyle: {
+        type: [String, Object],
+        default() {
+          return {
+            height: '44px',
+          };
+        },
+      },
+      // 菜单是否可滚动
+      scrollable: {
+        type: Boolean,
+        default: true,
+      },
+      // 当前选中标签的索引
+      current: {
+        type: [Number, String],
+        default: 0,
+      },
+      // 默认读取的键名
+      keyName: {
+        type: String,
+        default: 'name',
+      },
+    },
+    watch: {
+      current: {
+        immediate: true,
+        handler(newValue, oldValue) {
+          // 内外部值不相等时，才尝试移动滑块
+          if (newValue !== this.innerCurrent) {
+            this.innerCurrent = newValue;
+            this.$nextTick(() => {
+              this.resize();
+            });
+          }
+        },
+      },
+      // list变化时，重新渲染list各项信息
+      list() {
+        this.$nextTick(() => {
+          this.resize();
+        });
+      },
+    },
+    computed: {
+      textStyle() {
+        return (index) => {
+          const style = {};
+          // 取当期是否激活的样式
+          const customeStyle =
+            index === this.innerCurrent ? addStyle(this.activeStyle) : addStyle(this.inactiveStyle);
+          // 如果当前菜单被禁用，则加上对应颜色，需要在此做处理，是因为nvue下，无法在style样式中通过!import覆盖标签的内联样式
+          if (this.list[index].disabled) {
+            style.color = '#c8c9cc';
+          }
+          return deepMerge(customeStyle, style);
+        };
+      },
+    },
+    async mounted() {
+      this.init();
+    },
+    methods: {
+      $uGetRect(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();
+        });
+      },
+      setLineLeft() {
+        const tabItem = this.list[this.innerCurrent];
+        if (!tabItem) {
+          return;
+        }
+        // 获取滑块该移动的位置
+        let lineOffsetLeft = this.list
+          .slice(0, this.innerCurrent)
+          .reduce((total, curr) => total + curr.rect.width, 0);
+        // 获取下划线的数值px表示法
+        const lineWidth = getPx(this.lineWidth);
+        this.lineOffsetLeft = lineOffsetLeft + (tabItem.rect.width - lineWidth) / 2;
+        // #ifdef APP-NVUE
+        // 第一次移动滑块，无需过渡时间
+        this.animation(this.lineOffsetLeft, this.firstTime ? 0 : parseInt(this.duration));
+        // #endif
+
+        // 如果是第一次执行此方法，让滑块在初始化时，瞬间滑动到第一个tab item的中间
+        // 这里需要一个定时器，因为在非nvue下，是直接通过style绑定过渡时间，需要等其过渡完成后，再设置为false(非第一次移动滑块)
+        if (this.firstTime) {
+          setTimeout(() => {
+            this.firstTime = false;
+          }, 10);
+        }
+      },
+      // nvue下设置滑块的位置
+      animation(x, duration = 0) {
+        // #ifdef APP-NVUE
+        const ref = this.$refs['u-tabs__wrapper__nav__line'];
+        animation.transition(ref, {
+          styles: {
+            transform: `translateX(${x}px)`,
+          },
+          duration,
+        });
+        // #endif
+      },
+      // 点击某一个标签
+      clickHandler(item, index) {
+        // 因为标签可能为disabled状态，所以click是一定会发出的，但是change事件是需要可用的状态才发出
+        this.$emit('click', {
+          ...item,
+          index,
+        });
+        // 如果disabled状态，返回
+        if (item.disabled) return;
+        this.innerCurrent = index;
+        this.resize();
+        this.$emit('change', {
+          ...item,
+          index,
+        });
+      },
+      init() {
+        sleep().then(() => {
+          this.resize();
+        });
+      },
+      setScrollLeft() {
+        // 当前活动tab的布局信息，有tab菜单的width和left(为元素左边界到父元素左边界的距离)等信息
+        const tabRect = this.list[this.innerCurrent];
+        // 累加得到当前item到左边的距离
+        const offsetLeft = this.list.slice(0, this.innerCurrent).reduce((total, curr) => {
+          return total + curr.rect.width;
+        }, 0);
+        // 此处为屏幕宽度
+        const windowWidth = sys().windowWidth;
+        // 将活动的tabs-item移动到屏幕正中间，实际上是对scroll-view的移动
+        let scrollLeft =
+          offsetLeft -
+          (this.tabsRect.width - tabRect.rect.width) / 2 -
+          (windowWidth - this.tabsRect.right) / 2 +
+          this.tabsRect.left / 2;
+        // 这里做一个限制，限制scrollLeft的最大值为整个scroll-view宽度减去tabs组件的宽度
+        scrollLeft = Math.min(scrollLeft, this.scrollViewWidth - this.tabsRect.width);
+        this.scrollLeft = Math.max(0, scrollLeft);
+      },
+      // 获取所有标签的尺寸
+      resize() {
+        // 如果不存在list，则不处理
+        if (this.list.length === 0) {
+          return;
+        }
+        Promise.all([this.getTabsRect(), this.getAllItemRect()]).then(
+          ([tabsRect, itemRect = []]) => {
+            this.tabsRect = tabsRect;
+            this.scrollViewWidth = 0;
+            itemRect.map((item, index) => {
+              // 计算scroll-view的宽度，这里
+              this.scrollViewWidth += item.width;
+              // 另外计算每一个item的中心点X轴坐标
+              this.list[index].rect = item;
+            });
+            // 获取了tabs的尺寸之后，设置滑块的位置
+            this.setLineLeft();
+            this.setScrollLeft();
+          },
+        );
+      },
+      // 获取导航菜单的尺寸
+      getTabsRect() {
+        return new Promise((resolve) => {
+          this.queryRect('u-tabs__wrapper__scroll-view').then((size) => resolve(size));
+        });
+      },
+      // 获取所有标签的尺寸
+      getAllItemRect() {
+        return new Promise((resolve) => {
+          const promiseAllArr = this.list.map((item, index) =>
+            this.queryRect(`u-tabs__wrapper__nav__item-${index}`, true),
+          );
+          Promise.all(promiseAllArr).then((sizes) => resolve(sizes));
+        });
+      },
+      // 获取各个标签的尺寸
+      queryRect(el, item) {
+        // #ifndef APP-NVUE
+        // $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://www.uviewui.com/js/getRect.html
+        // 组件内部一般用this.$uGetRect，对外的为uni.$u.getRect，二者功能一致，名称不同
+        return new Promise((resolve) => {
+          this.$uGetRect(`.${el}`).then((size) => {
+            resolve(size);
+          });
+        });
+        // #endif
+
+        // #ifdef APP-NVUE
+        // nvue下，使用dom模块查询元素高度
+        // 返回一个promise，让调用此方法的主体能使用then回调
+        return new Promise((resolve) => {
+          dom.getComponentRect(item ? this.$refs[el][0] : this.$refs[el], (res) => {
+            resolve(res.size);
+          });
+        });
+        // #endif
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .u-tabs {
+    background: #fff;
+    border-bottom: 2rpx solid #eee;
+
+    &__wrapper {
+      @include flex;
+      align-items: center;
+
+      &__scroll-view-wrapper {
+        flex: 1;
+        /* #ifndef APP-NVUE */
+        overflow: auto hidden;
+        /* #endif */
+      }
+
+      &__nav {
+        @include flex;
+        position: relative;
+
+        &__item {
+          padding: 0 11px;
+          @include flex;
+          align-items: center;
+          justify-content: center;
+
+          &--disabled {
+            /* #ifndef APP-NVUE */
+            cursor: not-allowed;
+            /* #endif */
+          }
+
+          &__text {
+            font-size: 14px;
+            color: #606266;
+            white-space: nowrap !important;
+
+            &--disabled {
+              color: #c8c9cc !important;
+            }
+          }
+        }
+
+        &__line {
+          height: 3px;
+          background: #3c9cff;
+          width: 30px;
+          position: absolute;
+          bottom: 2px;
+          border-radius: 100px;
+          transition-property: transform;
+          transition-duration: 300ms;
+        }
+      }
+    }
+  }
+</style>
diff --git a/sheep/ui/su-time-line/su-time-line.vue b/sheep/ui/su-time-line/su-time-line.vue
new file mode 100644
index 0000000..9c3f8c1
--- /dev/null
+++ b/sheep/ui/su-time-line/su-time-line.vue
@@ -0,0 +1,37 @@
+<template>
+  <view class="u-time-axis"><slot /></view>
+</template>
+
+<script>
+  /**
+   * timeLine 时间轴
+   * @description 时间轴组件一般用于物流信息展示，各种跟时间相关的记录等场景。
+   * @tutorial https://www.uviewui.com/components/timeLine.html
+   * @example <u-time-line></u-time-line>
+   */
+  export default {
+    name: 'u-time-line',
+    data() {
+      return {};
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .u-time-axis {
+    padding-left: 40rpx;
+    position: relative;
+  }
+
+  .u-time-axis::before {
+    content: ' ';
+    position: absolute;
+    left: 0;
+    top: 12rpx;
+    width: 1px;
+    bottom: 0;
+    border-left: 1px solid #ddd;
+    transform-origin: 0 0;
+    transform: scaleX(0.5);
+  }
+</style>
diff --git a/sheep/ui/su-timeline-item/su-timeline-item.vue b/sheep/ui/su-timeline-item/su-timeline-item.vue
new file mode 100644
index 0000000..ddf7a0b
--- /dev/null
+++ b/sheep/ui/su-timeline-item/su-timeline-item.vue
@@ -0,0 +1,76 @@
+<template>
+  <view class="u-time-axis-item">
+    <slot name="content" />
+    <view class="u-time-axis-node" :style="[nodeStyle]">
+      <slot name="node"><view class="u-dot"></view></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  /**
+   * timeLineItem 时间轴Item
+   * @description 时间轴组件一般用于物流信息展示，各种跟时间相关的记录等场景。(搭配u-time-line使用)
+   * @tutorial https://www.uviewui.com/components/timeLine.html
+   * @property {String} bg-color 左边节点的背景颜色，一般通过slot内容自定义背景颜色即可（默认#ffffff）
+   * @property {String Number} node-top 节点左边图标绝对定位的top值，单位rpx
+   * @example <u-time-line-item node-top="2">...</u-time-line-item>
+   */
+  export default {
+    name: 'u-time-line-item',
+    props: {
+      // 节点的背景颜色
+      bgColor: {
+        type: String,
+        default: '#ffffff',
+      },
+      // 节点左边图标绝对定位的top值
+      nodeTop: {
+        type: [String, Number],
+        default: '',
+      },
+    },
+    data() {
+      return {};
+    },
+    computed: {
+      nodeStyle() {
+        let style = {
+          backgroundColor: this.bgColor,
+        };
+        if (this.nodeTop != '') style.top = this.nodeTop + 'rpx';
+        return style;
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .u-time-axis-item {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    position: relative;
+    margin-bottom: 32rpx;
+  }
+
+  .u-time-axis-node {
+    position: absolute;
+    top: 12rpx;
+    left: -40rpx;
+    transform-origin: 0;
+    transform: translateX(-50%);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1;
+    font-size: 24rpx;
+  }
+
+  .u-dot {
+    height: 16rpx;
+    width: 16rpx;
+    border-radius: 100rpx;
+    background: #ddd;
+  }
+</style>
diff --git a/sheep/ui/su-toolbar/su-toolbar.vue b/sheep/ui/su-toolbar/su-toolbar.vue
new file mode 100644
index 0000000..17351ec
--- /dev/null
+++ b/sheep/ui/su-toolbar/su-toolbar.vue
@@ -0,0 +1,129 @@
+<template>
+  <view class="u-toolbar" @touchmove.stop.prevent="noop" v-if="show">
+    <view class="u-toolbar__cancel__wrapper" hover-class="u-hover-class">
+      <text
+        class="u-toolbar__wrapper__cancel"
+        @tap="cancel"
+        :style="{
+          color: cancelColor,
+        }"
+      >
+        {{ cancelText }}
+      </text>
+    </view>
+    <text class="u-toolbar__title u-line-1" v-if="title">{{ title }}</text>
+    <view class="u-toolbar__confirm__wrapper" hover-class="u-hover-class">
+      <text
+        class="u-toolbar__wrapper__confirm"
+        @tap="confirm"
+        :style="{
+          color: confirmColor,
+        }"
+      >
+        {{ confirmText }}
+      </text>
+    </view>
+  </view>
+</template>
+
+<script>
+  /**
+   * Toolbar 工具条
+   * @description
+   * @tutorial https://www.uviewui.com/components/toolbar.html
+   * @property {Boolean}	show			是否展示工具条（默认 true ）
+   * @property {String}	cancelText		取消按钮的文字（默认 '取消' ）
+   * @property {String}	confirmText		确认按钮的文字（默认 '确认' ）
+   * @property {String}	cancelColor		取消按钮的颜色（默认 '#909193' ）
+   * @property {String}	confirmColor	确认按钮的颜色（默认 '#3c9cff' ）
+   * @property {String}	title			标题文字
+   * @event {Function}
+   * @example
+   */
+  export default {
+    name: 'SuToolbar',
+    props: {
+      // 是否展示工具条
+      show: {
+        type: Boolean,
+        default: true,
+      },
+      // 取消按钮的文字
+      cancelText: {
+        type: String,
+        default: '取消',
+      },
+      // 确认按钮的文字
+      confirmText: {
+        type: String,
+        default: '确认',
+      },
+      // 取消按钮的颜色
+      cancelColor: {
+        type: String,
+        default: '#909193',
+      },
+      // 确认按钮的颜色
+      confirmColor: {
+        type: String,
+        default: '#3c9cff',
+      },
+      // 标题文字
+      title: {
+        type: String,
+        default: '',
+      },
+    },
+    methods: {
+      // 点击取消按钮
+      cancel() {
+        this.$emit('cancel');
+      },
+      // 点击确定按钮
+      confirm() {
+        this.$emit('confirm');
+      },
+      // 阻止事件冒泡
+      preventEvent(e) {
+        e && typeof e.stopPropagation === 'function' && e.stopPropagation();
+      },
+      // 空操作
+      noop(e) {
+        this.preventEvent(e);
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+  .u-toolbar {
+    height: 42px;
+    @include flex;
+    justify-content: space-between;
+    align-items: center;
+
+    &__wrapper {
+      &__cancel {
+        color: #111111;
+        font-size: 15px;
+        padding: 0 15px;
+      }
+    }
+
+    &__title {
+      color: #000000;
+      padding: 0 60rpx;
+      font-size: 16px;
+      flex: 1;
+      text-align: center;
+    }
+
+    &__wrapper {
+      &__confirm {
+        color: #ffffff;
+        font-size: 15px;
+        padding: 0 15px;
+      }
+    }
+  }
+</style>
diff --git a/sheep/ui/su-video/su-video.vue b/sheep/ui/su-video/su-video.vue
new file mode 100644
index 0000000..a75a79c
--- /dev/null
+++ b/sheep/ui/su-video/su-video.vue
@@ -0,0 +1,199 @@
+<template>
+  <view class="ui-video-wrap">
+    <video
+      :id="`sVideo${uid}`"
+      class="radius"
+      :style="[{ height: height + 'rpx' }]"
+      :src="src"
+      controls
+      object-fit="contain"
+      :enable-progress-gesture="state.enableProgressGesture"
+      :initial-time="initialTime"
+      x5-video-player-type="h5"
+      x-webkit-airplay="allow"
+      webkit-playsinline="true"
+      @error="videoErrorCallback"
+      @timeupdate="timeupdate"
+      @play="play"
+      @pause="pause"
+      @ended="end"
+      :poster="poster"
+      :autoplay="autoplay"
+    >
+      <!-- #ifdef APP-PLUS -->
+      <cover-view :style="{ transform: 'translateX(' + moveX + 'px)' }" />
+      <!-- #endif -->
+    </video>
+  </view>
+</template>
+<script setup>
+  /**
+   * 视频组件
+   *
+   * @property {Number} uid = 0 						- 当前轮播下标,还用来标记视频Id
+   * @property {Number} moveX = 0 					- app端轮播滑动距离
+   * @property {String} height = 300 					- 高度（rpx)
+   * @property {String} width = 750 					- 宽度（rpx)
+   * @property {Number} initialTime = 0 				- 指定视频播放位置
+   * @property {String} videoSize						- 视频大小
+   * @property {String} src 							- 视频播放地址
+   * @property {String} poster 						- 视频封面
+   *
+   *
+   */
+
+  import { reactive, nextTick, getCurrentInstance } from 'vue';
+  import sheep from '@/sheep';
+  const vm = getCurrentInstance();
+
+  // 数据
+  const state = reactive({
+    // #ifdef APP-PLUS
+    enableProgressGesture: true, // 手势滑动
+    // #endif
+    // #ifndef APP-PLUS
+    enableProgressGesture: false, // 手势滑动
+    // #endif
+    showModal: false, // 弹框
+  });
+
+  // 接收参数
+  const props = defineProps({
+    moveX: {
+      type: [Number],
+      default: 0,
+    },
+    // 下标索引
+    uid: {
+      type: [Number, String],
+      default: 0,
+    },
+    // 视频高度
+    height: {
+      type: Number,
+      default: 300,
+    },
+    // 视频宽度
+    width: {
+      type: Number,
+      default: 750,
+    },
+    // 指定视频初始播放位置，单位为秒（s）
+    initialTime: {
+      type: Number,
+      default: 1,
+    },
+    src: {
+      type: String,
+      default: '',
+    },
+    poster: {
+      type: String,
+      default: 'https://img1.baidu.com/it/u=1601695551,235775011&fm=26&fmt=auto',
+    },
+    autoplay: {
+      type: Boolean,
+      default: false,
+    }
+  });
+
+  // 事件
+  const emits = defineEmits(['videoTimeupdate']);
+
+  // 播放进度变化时触发,播放进度传给父组件
+  const timeupdate = (e) => {
+    emits('videoTimeupdate', e);
+  };
+  const videoErrorCallback = (e) => {
+    console.log('视频错误信息:', e.target.errMsg);
+  };
+  // 当开始/继续播放时触发play事件
+  const play = () => {
+    console.log('视频开始');
+  };
+  // 当暂停播放时触发 pause 事件
+  const pause = () => {
+    console.log('视频暂停');
+  };
+  // 视频结束触发end 时间
+  const end = () => {
+    console.log('视频结束');
+  };
+  // 开始播放
+  const startPlay = () => {
+    nextTick(() => {
+      const video = uni.createVideoContext(`sVideo${props.index}`, vm);
+      video.play();
+    });
+  };
+
+  //暂停播放
+  const pausePlay = () => {
+    const video = uni.createVideoContext(`sVideo${props.index}`, vm);
+    video.pause();
+  };
+
+  // 播放前拦截
+  const beforePlay = () => {
+    uni.getNetworkType({
+      success: (res) => {
+        const networkType = res.networkType;
+        // if (networkType === 'wifi' || networkType === 'ethernet') {
+        //   startPlay();
+        // } else {
+        //   uni.showModal({
+        //     title: '提示',
+        //     content: `当前为移动网络，播放视频需消耗手机流量，是否继续播放？${networkType}`,
+        //     success: (res) => {
+        //       if (res.confirm) {
+        //         startPlay();
+        //       } else {
+        //         state.isplay = false;
+        //       }
+        //     },
+        //   });
+        //   sheep.$helper.toast('正在消耗流量播放');
+        //   startPlay();
+        // }
+        startPlay();
+      },
+    });
+  };
+
+  // 抛出方法供父组件调用
+  defineExpose({
+    pausePlay,
+  });
+</script>
+<style lang="scss" scoped>
+  .radius {
+    width: 100%;
+  }
+  .ui-video-wrap {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .poster-wrap {
+      position: relative;
+      width: 100%;
+      height: 100%;
+
+      .poster-image {
+        width: 100%;
+        height: 100%;
+      }
+
+      .play-icon {
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        width: 80rpx;
+        height: 80rpx;
+        transform: translate(-50%, -50%);
+        background-color: rgba($color: #000000, $alpha: 0.1);
+        border-radius: 50%;
+      }
+    }
+  }
+</style>
diff --git a/sheep/url/index.js b/sheep/url/index.js
new file mode 100644
index 0000000..d216f83
--- /dev/null
+++ b/sheep/url/index.js
@@ -0,0 +1,199 @@
+import $store from '@/sheep/store';
+import { staticUrl } from '@/sheep/config';
+
+const cdn = (url = '', cdnurl = '') => {
+  if (!url) return '';
+  if (url.indexOf('http') === 0) {
+    return url;
+  }
+  if (cdnurl === '') {
+    cdnurl = $store('app').info.cdnurl;
+  }
+  return cdnurl + url;
+};
+export default {
+  // 添加cdn域名前缀
+  cdn,
+  // 对象存储自动剪裁缩略图
+  thumb: (url = '', params) => {
+    url = cdn(url);
+    return append_thumbnail_params(url, params);
+  },
+  // 静态资源地址
+  static: (url = '', staticurl = '') => {
+    if (staticurl === '') {
+      staticurl = staticUrl;
+    }
+    if (staticurl !== 'local') {
+      url = cdn(url, staticurl);
+    }
+    return url;
+  },
+  // css背景图片地址
+  css: (url = '', staticurl = '') => {
+    if (staticurl === '') {
+      staticurl = staticUrl;
+    }
+    if (staticurl !== 'local') {
+      url = cdn(url, staticurl);
+    }
+    // #ifdef APP-PLUS
+    if (staticurl === 'local') {
+      url = plus.io.convertLocalFileSystemURL(url);
+    }
+    // #endif
+    return `url(${url})`;
+  },
+};
+
+/**
+ * 追加对象存储自动裁剪/压缩参数
+ *
+ * @return string
+ */
+function append_thumbnail_params(url, params) {
+  const filesystem = $store('app').info.filesystem;
+  if (filesystem === 'public') {
+    return url;
+  }
+  let width = params.width || '200'; // 宽度
+  let height = params.height || '200'; // 高度
+  let mode = params.mode || 'lfit'; // 缩放模式
+  let quality = params.quality || 90; // 压缩质量
+  let gravity = params.gravity || 'center'; // 剪裁质量
+  let suffix = '';
+  let crop_str = '';
+  let quality_str = '';
+  let size = width + 'x' + height;
+  switch (filesystem) {
+    case 'aliyun':
+      // 裁剪
+      if (!gravity && gravity != 'center') {
+        // 指定了裁剪区域
+        mode = 'mfit';
+        crop_str = '/crop,g_' + gravityFormatMap('aliyun', gravity) + ',w_' + width + ',h_' + height;
+      }
+
+      // 质量压缩
+      if (quality > 0 && quality < 100) {
+        quality_str = '/quality,q_' + quality;
+      }
+
+      // 缩放参数
+      suffix = 'x-oss-process=image/resize,m_' + mode + ',w_' + width + ',h_' + height;
+
+      // 拼接裁剪和质量压缩
+      suffix += crop_str + quality_str;
+      break;
+    case 'qcloud':
+      let mode_str = 'thumbnail';
+      if (mode == 'fill' || (!gravity && gravity != 'center')) {
+        // 指定了裁剪区域
+        mode_str = 'crop';
+        mode = 'fill';
+        crop_str = '/gravity/' + gravityFormatMap('qcloud', gravity);
+      }
+
+      // 质量压缩
+      if (quality > 0 && quality < 100) {
+        quality_str = '/rquality/' + quality;
+      }
+
+      switch (mode) {
+        case 'lfit':
+          size = '' + size + '>';
+          break;
+        case 'mfit':
+          size = '!' + size + 'r';
+        case 'fill':
+          break;
+        case 'pad':
+          size = size + '/pad/1';
+          break;
+        case 'fixed':
+          size = size + '!';
+          break;
+      }
+
+      suffix = 'imageMogr2/' + mode_str + '/' + size + crop_str + quality_str;
+      break;
+    case 'qiniu':
+      if (mode == 'fill' || (!gravity && gravity != 'center')) {
+        // 指定了裁剪区域,全部转为 mfit
+        mode = 'mfit';
+        crop_str = '/gravity/' + gravityFormatMap('qiniu', gravity) + '/crop/' + size;
+      }
+      // 质量压缩
+      if (quality > 0 && quality < 100) {
+        quality_str = '/quality/' + quality;
+      }
+
+      switch (mode) {
+        case 'lfit':
+        case 'pad': // 七牛不支持在缩放之后，尺寸不足时，填充背景色,所以这里和 lfit 模式一样
+          size = size + '>';
+          break;
+        case 'mfit':
+          size = '!' + size + 'r';
+          break;
+        case 'fill':
+          // 会被转为 mfit
+          break;
+        case 'fixed':
+          size = size + '!';
+          break;
+      }
+
+      suffix = 'imageMogr2/thumbnail/' + size + crop_str + quality_str;
+      break;
+  }
+  return url + '?' + suffix;
+}
+
+/**
+ * 裁剪区域格式转换
+ *
+ * @param string $type aliyun|qcloud|qiniu
+ * @param string $gravity 统一的裁剪区域字符
+ *
+ * @return string
+ */
+function gravityFormatMap(type, gravity) {
+  let gravityFormat = {
+    aliyun: {
+      north_west: 'nw', // 左上
+      north: 'north', // 中上
+      north_east: 'ne', // 右上
+      west: 'west', // 左中
+      center: 'center', // 中部
+      east: 'east', // 右中
+      south_west: 'sw', // 左下
+      south: 'south', // 中下
+      south_east: 'se', // 右下
+    },
+    qcloud: {
+      northwest: 'nw', // 左上
+      north: 'north', // 中上
+      northeast: 'ne', // 右上
+      west: 'west', // 左中
+      center: 'center', // 中部
+      east: 'east', // 右中
+      southwest: 'sw', // 左下
+      south: 'south', // 中下
+      southeast: 'se', // 右下
+    },
+    qiniu: {
+      NorthWest: 'nw', // 左上
+      North: 'north', // 中上
+      NorthEast: 'ne', // 右上
+      West: 'west', // 左中
+      Center: 'center', // 中部
+      East: 'east', // 右中
+      SouthWest: 'sw', // 左下
+      South: 'south', // 中下
+      SouthEast: 'se', // 右下
+    },
+  };
+
+  return gravityFormat[type][gravity];
+}
diff --git a/sheep/util/adVideoUtils.js b/sheep/util/adVideoUtils.js
new file mode 100644
index 0000000..2696826
--- /dev/null
+++ b/sheep/util/adVideoUtils.js
@@ -0,0 +1,107 @@
+let videoAd = null;
+let adVideoUtils = {
+  /**
+   * @param {String} adUnitId 小程序广告视频id
+   * videoAdInit 初始化激励广告
+   */
+  videoAdInit(adUnitId) {
+    if (videoAd) {
+      videoAd = null;
+    }
+    if (uni.createRewardedVideoAd) {
+      videoAd = uni.createRewardedVideoAd({
+        adUnitId: adUnitId,
+      });
+      if (videoAd) {
+		videoAd.onLoad(() => {
+			console.log('激励视频 广告加载成功');
+		});
+		videoAd.onError((err) => {
+			console.log('onError event emit');
+		});
+      }
+      // return videoAd;
+    }
+  },
+  /**
+   * @param {String} adUnitId 小程序广告视频id
+   * videoAdInit 初始化插屏广告
+   */
+  insertVideoAdInit(adUnitId) {
+    if (videoAd) {
+      videoAd = null;
+    }
+    if (uni.createInterstitialAd) {
+      videoAd = uni.createInterstitialAd({
+        adUnitId: adUnitId,
+      });
+      if (videoAd) {
+  		videoAd.onLoad(() => {
+  			console.log('插屏视频 广告加载成功');
+  		});
+  		videoAd.onError((err) => {
+  			console.log('onError event emit');
+  		});
+      }
+      // return videoAd;
+    }
+  },
+  /* 显示广告 ture为播放完成 */
+  videoAdShow() {
+    return new Promise((resolve, reject) => {
+      adVideoUtils._showAd().then((val) => {
+        if (val) {
+          videoAd.onClose((res) => {
+			videoAd.offClose();
+            if (res.isEnded) {
+              //成功 给予奖励
+			  resolve(true);
+            } else {
+              resolve(false);
+            }
+          });
+          videoAd.onError((err) => {
+            if (err.errCode == "1004") {
+              reject("1004");
+            } else {
+              reject(err);
+            }
+          });
+        } else {
+			resolve(true);
+          //reject(err);
+        }
+      });
+    });
+  },
+  _showAd() {
+    return new Promise((resolve) => {
+      videoAd
+        .show()
+        .then(() => {
+          console.log("广告显示成功");
+		  uni.setStorageSync("adClick", false);
+          resolve(true);
+        })
+        .catch((err) => {
+          console.log("广告组件出现问题", err);
+          // 可以手动加载一次
+          videoAd
+            .load()
+            .then(() => {
+              console.log("手动加载成功");
+			  uni.setStorageSync("adClick", false);
+              resolve(true);
+              // 加载成功后需要再显示广告
+              return videoAd.show();
+            })
+            .catch((err) => {
+              resolve(false);
+              console.log("广告组件出现问题2次加载", err);
+              // this.showUToast("加载失败啦，请稍后在试", "error");
+            });
+        });
+    });
+  },
+};
+export default adVideoUtils;
\ No newline at end of file
diff --git a/sheep/util/const.js b/sheep/util/const.js
new file mode 100644
index 0000000..ad36845
--- /dev/null
+++ b/sheep/util/const.js
@@ -0,0 +1,122 @@
+// ========== COMMON - 公共模块 ==========
+
+/**
+ * 与后端Terminal枚举一一对应
+ */
+export const TerminalEnum = {
+  UNKNOWN: 0, // 未知, 目的：在无法解析到 terminal 时，使用它
+  WECHAT_MINI_PROGRAM: 10, //微信小程序
+  WECHAT_WAP: 11, // 微信公众号
+  H5: 20, // H5 网页
+  APP: 31, // 手机 App
+};
+
+/**
+ * 将 uni-app 提供的平台转换为后端所需的 terminal值
+ *
+ * @return 终端
+ */
+export const getTerminal = () => {
+  const platformType = uni.getSystemInfoSync().uniPlatform;
+  // 与后端terminal枚举一一对应
+  switch (platformType) {
+    case 'app':
+      return TerminalEnum.APP;
+    case 'web':
+      return TerminalEnum.H5;
+    case 'mp-weixin':
+      return TerminalEnum.WECHAT_MINI_PROGRAM;
+    default:
+      return TerminalEnum.UNKNOWN;
+  }
+};
+
+// ========== MALL - 营销模块 ==========
+
+import dayjs from "dayjs";
+
+/**
+ * 优惠类型枚举
+ */
+export const PromotionDiscountTypeEnum = {
+    PRICE: {
+        type: 1,
+        name: '满减'
+    },
+    PERCENT: {
+        type: 2,
+        name: '折扣'
+    }
+}
+
+/**
+ * 优惠劵模板的有限期类型的枚举
+ */
+export const CouponTemplateValidityTypeEnum = {
+    DATE: {
+        type: 1,
+        name: '固定日期可用'
+    },
+    TERM: {
+        type: 2,
+        name: '领取之后可用'
+    }
+}
+
+/**
+ * 营销的商品范围枚举
+ */
+export const PromotionProductScopeEnum = {
+    ALL: {
+        scope: 1,
+        name: '通用劵'
+    },
+    SPU: {
+        scope: 2,
+        name: '商品劵'
+    },
+    CATEGORY: {
+        scope: 3,
+        name: '品类劵'
+    }
+}
+
+
+// 时间段的状态枚举
+export const TimeStatusEnum = {
+    WAIT_START: '即将开始',
+    STARTED: '进行中',
+    END: '已结束',
+}
+
+// Promotion 的 WebSocket 消息类型枚举类
+export const WebSocketMessageTypeConstants = {
+  IM_MESSAGE_READ: 'im_message_read_status_change', // IM消息已读
+  IM_MESSAGE_NEWS: 'im_message_news', // IM新消息
+}
+
+/**
+ * 微信小程序的订阅模版
+ */
+export const WxaSubscribeTemplate = {
+  TRADE_ORDER_DELIVERY: "订单已接单提醒",
+  CLERK_APPLY_SUCCESS: "认证审核通知",
+  CLERK_BLIND: "抢单提醒",
+  CLERK_ORDER: "新订单通知",
+  TREND_APPLY_SUCCESS: "审核通过提醒",
+  REWARD_SUCCESS: "收到打赏通知",
+  UNREAD_MESSAGE: "未读回信提醒",
+  PROMOTION_COMBINATION_SUCCESS: "拼团结果通知",
+  PAY_WALLET_RECHARGER_SUCCESS: "充值成功通知",
+}
+
+export const getTimeStatusEnum = (startTime, endTime) => {
+    const now = dayjs();
+    if (now.isBefore(startTime)) {
+        return TimeStatusEnum.WAIT_START;
+    } else if (now.isAfter(endTime)) {
+        return TimeStatusEnum.END;
+    } else {
+        return TimeStatusEnum.STARTED;
+    }
+}
diff --git a/sheep/util/index.js b/sheep/util/index.js
new file mode 100644
index 0000000..e2d8ff7
--- /dev/null
+++ b/sheep/util/index.js
@@ -0,0 +1,133 @@
+import dayjs from "dayjs";
+
+/**
+ * 将一个整数转换为分数保留两位小数
+ * @param {number | string | undefined} num 整数
+ * @return {number} 分数
+ */
+export const formatToFraction = (num) => {
+  if (typeof num === 'undefined') return 0
+  const parsedNumber = typeof num === 'string' ? parseFloat(num) : num
+  return parseFloat((parsedNumber / 100).toFixed(2))
+}
+
+/**
+ * 将一个数转换为 1.00 这样
+ * 数据呈现的时候使用
+ *
+ * @param {number | string | undefined} num 整数
+ * @return {string} 分数
+ */
+export const floatToFixed2 = (num) => {
+  let str = '0.00'
+  if (typeof num === 'undefined') {
+    return str
+  }
+  const f = formatToFraction(num)
+  const decimalPart = f.toString().split('.')[1]
+  const len = decimalPart ? decimalPart.length : 0
+  switch (len) {
+    case 0:
+      str = f.toString() + '.00'
+      break
+    case 1:
+      str = f.toString() + '.0'
+      break
+    case 2:
+      str = f.toString()
+      break
+  }
+  return str
+}
+
+/**
+ * 将一个分数转换为整数
+ *
+ * @param {number | string | undefined} num 分数
+ * @return {number} 整数
+ */
+export const convertToInteger = (num) => {
+  if (typeof num === 'undefined') return 0
+  const parsedNumber = typeof num === 'string' ? parseFloat(num) : num
+  // TODO 分转元后还有小数则四舍五入
+  return Math.round(parsedNumber * 100)
+}
+
+/**
+ * 时间日期转换
+ * @param {dayjs.ConfigType} date 当前时间，new Date() 格式
+ * @param {string} format 需要转换的时间格式字符串
+ * @description format 字符串随意，如 `YYYY-mm、YYYY-mm-dd`
+ * @description format 季度："YYYY-mm-dd HH:MM:SS QQQQ"
+ * @description format 星期："YYYY-mm-dd HH:MM:SS WWW"
+ * @description format 几周："YYYY-mm-dd HH:MM:SS ZZZ"
+ * @description format 季度 + 星期 + 几周："YYYY-mm-dd HH:MM:SS WWW QQQQ ZZZ"
+ * @returns {string} 返回拼接后的时间字符串
+ */
+export function formatDate(date, format= 'YYYY-MM-DD HH:mm:ss') {
+  // 日期不存在，则返回空
+  if (!date) {
+    return ''
+  }
+  // 日期存在，则进行格式化
+  if (format === undefined) {
+    format = 'YYYY-MM-DD HH:mm:ss'
+  }
+  return dayjs(date).format(format)
+}
+
+/**
+ * 构造树型结构数据
+ *
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ * @param {*} rootId 根Id 默认 0
+ */
+export function handleTree(data, id = 'id', parentId = 'parentId', children = 'children', rootId = 0) {
+  // 对源数据深度克隆
+  const cloneData = JSON.parse(JSON.stringify(data))
+  // 循环所有项
+  const treeData = cloneData.filter(father => {
+    let branchArr = cloneData.filter(child => {
+      //返回每一项的子级数组
+      return father[id] === child[parentId]
+    });
+    branchArr.length > 0 ? father.children = branchArr : '';
+    //返回第一层
+    return father[parentId] === rootId;
+  });
+  return treeData !== '' ? treeData : data;
+}
+
+/**
+ * 重置分页对象
+ *
+ * TODO 芋艿：需要处理其它页面
+ *
+ * @param pagination 分页对象
+ */
+export function resetPagination(pagination) {
+  pagination.list = [];
+  pagination.total = 0;
+  pagination.pageNo = 1;
+}
+
+/**
+ * 将值复制到目标对象，且以目标对象属性为准，例：target: {a:1} source:{a:2,b:3} 结果为：{a:2}
+ * @param target 目标对象
+ * @param source 源对象
+ */
+export const copyValueToTarget = (target, source) => {
+  const newObj = Object.assign({}, target, source)
+  // 删除多余属性
+  Object.keys(newObj).forEach((key) => {
+    // 如果不是target中的属性则删除
+    if (Object.keys(target).indexOf(key) === -1) {
+      delete newObj[key]
+    }
+  })
+  // 更新目标对象值
+  Object.assign(target, newObj)
+}
diff --git a/sheep/validate/form.js b/sheep/validate/form.js
new file mode 100644
index 0000000..07b5725
--- /dev/null
+++ b/sheep/validate/form.js
@@ -0,0 +1,164 @@
+/**
+ * Validate v1.0.0 通用验证
+ * @description 项目中用到的表单验证规则
+ */
+import test from '@/sheep/helper/test.js';
+
+// 手机号
+export const mobile = {
+  rules: [
+    {
+      required: true,
+      errorMessage: '请输入手机号',
+    },
+    {
+      validateFunction: function (rule, value, data, callback) {
+        if (!test.mobile(value)) {
+          callback('手机号码格式不正确');
+        }
+        return true;
+      },
+    },
+  ],
+};
+
+// 密码
+export const password = {
+  rules: [
+    {
+      required: true,
+      errorMessage: '请输入密码',
+    },
+    {
+      validateFunction: function (rule, value, data, callback) {
+        if (!/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]+\S{5,12}$/.test(value)) {
+          callback('需包含字母和数字,长度在6-12之间');
+        }
+        return true;
+      },
+    },
+  ],
+};
+
+// 短信验证码
+export const code = {
+  rules: [
+    {
+      required: true,
+      errorMessage: '请输入验证码',
+    },
+  ],
+};
+
+// 真实姓名
+export const realName = {
+  rules: [
+    {
+      required: true,
+      errorMessage: '请输入姓名',
+    },
+    {
+      validateFunction: function (rule, value, data, callback) {
+        if (!test.chinese(value)) {
+          callback('请输入汉字');
+        }
+        return true;
+      },
+    },
+  ],
+};
+
+export const taxName = {
+  rules: [
+    {
+      required: true,
+      errorMessage: '请输入发票抬头名称',
+    },
+    {
+      validateFunction: function (rule, value, data, callback) {
+        if (!test.chinese(value)) {
+          callback('请输入汉字');
+        }
+        return true;
+      },
+    },
+  ],
+};
+
+// 税号
+export const taxNo = {
+  rules: [
+    {
+      required: true,
+      errorMessage: '请输入税号',
+    },
+  ],
+};
+
+// 开户行
+export const bankName = {
+  rules: [
+    {
+      required: true,
+      errorMessage: '请输入开户行',
+    },
+    {
+      validateFunction: function (rule, value, data, callback) {
+        if (!test.chinese(value)) {
+          callback('请输入汉字');
+        }
+        return true;
+      },
+    },
+  ],
+};
+// 银行卡号
+export const bankCode = {
+  rules: [
+    {
+      required: true,
+      errorMessage: '请输入银行卡号',
+    },
+    {
+      validateFunction: function (rule, value, data, callback) {
+        if (!test.number(value)) {
+          callback('请输入正确账号');
+        }
+        return true;
+      },
+    },
+  ],
+};
+
+// 支付宝账号
+export const alipayAccount = {
+  rules: [
+    {
+      required: true,
+      errorMessage: '请输入支付宝账号',
+    },
+    {
+      validateFunction: function (rule, value, data, callback) {
+        let isEmail = test.email(value);
+        let isMobile = test.mobile(value);
+
+        if (!isEmail && !isMobile) {
+          callback('请输入正确账号');
+        }
+        return true;
+      },
+    },
+  ],
+};
+
+export default {
+  mobile,
+  alipayAccount,
+  bankCode,
+  bankName,
+  realName,
+  password,
+  code,
+  taxNo,
+  taxName,
+};
diff --git a/static/activity-left.png b/static/activity-left.png
new file mode 100644
index 0000000..62e3b83
Binary files /dev/null and b/static/activity-left.png differ
diff --git a/static/activity-right.png b/static/activity-right.png
new file mode 100644
index 0000000..e18a96c
Binary files /dev/null and b/static/activity-right.png differ
diff --git a/static/cart-empty.png b/static/cart-empty.png
new file mode 100644
index 0000000..355d182
Binary files /dev/null and b/static/cart-empty.png differ
diff --git a/static/collect-empty.png b/static/collect-empty.png
new file mode 100644
index 0000000..300bd21
Binary files /dev/null and b/static/collect-empty.png differ
diff --git a/static/comment-empty.png b/static/comment-empty.png
new file mode 100644
index 0000000..810a3b1
Binary files /dev/null and b/static/comment-empty.png differ
diff --git a/static/coupon-empty.png b/static/coupon-empty.png
new file mode 100644
index 0000000..9e14d9d
Binary files /dev/null and b/static/coupon-empty.png differ
diff --git a/static/css/iconfont.css b/static/css/iconfont.css
new file mode 100644
index 0000000..27dfb7c
--- /dev/null
+++ b/static/css/iconfont.css
@@ -0,0 +1,558 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 578560 */
+  src: 
+       url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.iconfont-qiehuan1:before {
+  content: "\e620";
+}
+
+.iconfont-qiehuanyonghu:before {
+  content: "\e6ed";
+}
+
+.iconfont-follow:before {
+  content: "\e60d";
+}
+
+.iconfont-following:before {
+  content: "\e653";
+}
+
+.iconfont-yiguanzhu:before {
+  content: "\e67c";
+}
+
+.iconfont-snatch:before {
+  content: "\e835";
+}
+
+.iconfont-outline-empty-wallet-time:before {
+  content: "\e6f6";
+}
+
+.iconfont-pingtaidengji:before {
+  content: "\e636";
+}
+
+.iconfont-tingkebiji:before {
+  content: "\e62d";
+}
+
+.iconfont-tuijian:before {
+  content: "\e62c";
+}
+
+.iconfont-mianfei-liwutujian:before {
+  content: "\e668";
+}
+
+.iconfont-kaidian:before {
+  content: "\e6e8";
+}
+
+.iconfont-xingxing:before {
+  content: "\e625";
+}
+
+.iconfont-youhuiquan:before {
+  content: "\e686";
+}
+
+.iconfont-dianyuan1:before {
+  content: "\e606";
+}
+
+.iconfont-fenxiaozhongxin2:before {
+  content: "\e603";
+}
+
+.iconfont-quanbudingdan:before {
+  content: "\e640";
+}
+
+.iconfont-dashang:before {
+  content: "\e604";
+}
+
+.iconfont-kefuzhongxin:before {
+  content: "\e63b";
+}
+
+.iconfont-tixian:before {
+  content: "\e60e";
+}
+
+.iconfont-dianyuan:before {
+  content: "\e689";
+}
+
+.iconfont-jiedan:before {
+  content: "\e629";
+}
+
+.iconfont-shimingrenzheng:before {
+  content: "\e6a3";
+}
+
+.iconfont-zhaopiandashangjilu:before {
+  content: "\e602";
+}
+
+.iconfont-vuesax-outline-task-square:before {
+  content: "\e69a";
+}
+
+.iconfont-vuesax-outline-note:before {
+  content: "\e69b";
+}
+
+.iconfont-outline-timer-start:before {
+  content: "\e6bb";
+}
+
+.iconfont-outline-timer-1:before {
+  content: "\e6bc";
+}
+
+.iconfont-gouwudai:before {
+  content: "\e60c";
+}
+
+.iconfont-jinbi:before {
+  content: "\e613";
+}
+
+.iconfont-outline-copy:before {
+  content: "\e6e6";
+}
+
+.iconfont-chat_voice:before {
+  content: "\e690";
+}
+
+.iconfont-voice1:before {
+  content: "\e601";
+}
+
+.iconfont-outline-microphone:before {
+  content: "\e6c2";
+}
+
+.iconfont-outline-image:before {
+  content: "\e6c3";
+}
+
+.iconfont-outline-camera:before {
+  content: "\e6cc";
+}
+
+.iconfont-outline-map:before {
+  content: "\e6d4";
+}
+
+.iconfont-vuesax-outline-slash:before {
+  content: "\e679";
+}
+
+.iconfont-outline-keyboard:before {
+  content: "\e6a7";
+}
+
+.iconfont-bell-slash:before {
+  content: "\eb97";
+}
+
+.iconfont-outline-gift:before {
+  content: "\e6df";
+}
+
+.iconfont-outline-heart:before {
+  content: "\e67a";
+}
+
+.iconfont-vuesax-outline-add-circle:before {
+  content: "\e66f";
+}
+
+.iconfont-vuesax-outline-happyemoji:before {
+  content: "\e678";
+}
+
+.iconfont-outline-voice-cricle:before {
+  content: "\e6c9";
+}
+
+.iconfont-emoji-good:before {
+  content: "\e773";
+}
+
+.iconfont-weixinbiaoqing:before {
+  content: "\e608";
+}
+
+.iconfont-wurao:before {
+  content: "\e644";
+}
+
+.iconfont-fanhuidingbu:before {
+  content: "\e635";
+}
+
+.iconfont-huidaodingbu:before {
+  content: "\e652";
+}
+
+.iconfont-bofang:before {
+  content: "\e624";
+}
+
+.iconfont-voice:before {
+  content: "\e6ef";
+}
+
+.iconfont-phone:before {
+  content: "\e71d";
+}
+
+.iconfont-timefill:before {
+  content: "\e65e";
+}
+
+.iconfont-creativefill:before {
+  content: "\e718";
+}
+
+.iconfont-servicefill:before {
+  content: "\e737";
+}
+
+.iconfont-emoji:before {
+  content: "\e64b";
+}
+
+.iconfont-locationfill:before {
+  content: "\e651";
+}
+
+.iconfont-warnfill:before {
+  content: "\e662";
+}
+
+.iconfont-roundadd:before {
+  content: "\e6d9";
+}
+
+.iconfont-voicefill:before {
+  content: "\e6f0";
+}
+
+.iconfont-keyboard:before {
+  content: "\e71b";
+}
+
+.iconfont-picfill:before {
+  content: "\e72c";
+}
+
+.iconfont-presentfill:before {
+  content: "\e732";
+}
+
+.iconfont-repeal:before {
+  content: "\e733";
+}
+
+.iconfont-goodsfavor:before {
+  content: "\e794";
+}
+
+.iconfont-jubao:before {
+  content: "\e6c4";
+}
+
+.iconfont-dizhi:before {
+  content: "\e670";
+}
+
+.iconfont-faqiqunliaobeifen:before {
+  content: "\e672";
+}
+
+.iconfont-jilu:before {
+  content: "\e675";
+}
+
+.iconfont-tupian3:before {
+  content: "\e676";
+}
+
+.iconfont-quanbubeifen2:before {
+  content: "\e677";
+}
+
+.iconfont-kuozhan:before {
+  content: "\e673";
+}
+
+.iconfont-jianpan:before {
+  content: "\e674";
+}
+
+.iconfont-biaoqing:before {
+  content: "\e671";
+}
+
+.iconfont-yuyinshuohua:before {
+  content: "\e67d";
+}
+
+.iconfont-jiahao:before {
+  content: "\e726";
+}
+
+.iconfont-liwu:before {
+  content: "\e64e";
+}
+
+.iconfont-xiaolian:before {
+  content: "\ec80";
+}
+
+.iconfont-fanhui:before {
+  content: "\e634";
+}
+
+.iconfont-weizhi:before {
+  content: "\e628";
+}
+
+.iconfont-hai:before {
+  content: "\e727";
+}
+
+.iconfont-holiday:before {
+  content: "\e605";
+}
+
+.iconfont-daifukuan:before {
+  content: "\e612";
+}
+
+.iconfont-daipingjia:before {
+  content: "\ee90";
+}
+
+.iconfont-jinhangzhong2:before {
+  content: "\eb2f";
+}
+
+.iconfont-bianji:before {
+  content: "\e65d";
+}
+
+.iconfont-fabu:before {
+  content: "\e68f";
+}
+
+.iconfont-remen:before {
+  content: "\e617";
+}
+
+.iconfont-dianhuahover:before {
+  content: "\e61f";
+}
+
+.iconfont-weixin:before {
+  content: "\e607";
+}
+
+.iconfont-a-Asset54:before {
+  content: "\e60b";
+}
+
+.iconfont-renzhengguanli:before {
+  content: "\e650";
+}
+
+.iconfont-shouye1:before {
+  content: "\e66a";
+}
+
+.iconfont-taocan-suoxiao:before {
+  content: "\e8cd";
+}
+
+.iconfont-shafakongwei:before {
+  content: "\e688";
+}
+
+.iconfont-wode_duanwei:before {
+  content: "\e619";
+}
+
+.iconfont-lightning:before {
+  content: "\e655";
+}
+
+.iconfont-game:before {
+  content: "\e627";
+}
+
+.iconfont-shengboyuyinxiaoxi:before {
+  content: "\e8c5";
+}
+
+.iconfont-yonghu:before {
+  content: "\e63f";
+}
+
+.iconfont-fenxiang1:before {
+  content: "\e633";
+}
+
+.iconfont-zhuye:before {
+  content: "\e618";
+}
+
+.iconfont-withdraw-fill:before {
+  content: "\e642";
+}
+
+.iconfont-fenxiang:before {
+  content: "\e64d";
+}
+
+.iconfont-shangchuan:before {
+  content: "\e639";
+}
+
+.iconfont-shaixuan:before {
+  content: "\e61d";
+}
+
+.iconfont-yirenzheng:before {
+  content: "\e68c";
+}
+
+.iconfont-qiandai:before {
+  content: "\e600";
+}
+
+.iconfont-erweima:before {
+  content: "\e61e";
+}
+
+.iconfont-shouye:before {
+  content: "\e62b";
+}
+
+.iconfont-xianxinghuiyuan:before {
+  content: "\e6b4";
+}
+
+.iconfont-renzheng1:before {
+  content: "\e811";
+}
+
+.iconfont-ziyuan2:before {
+  content: "\e78c";
+}
+
+.iconfont-ziyuan3:before {
+  content: "\e78d";
+}
+
+.iconfont-nan:before {
+  content: "\e64a";
+}
+
+.iconfont-nv:before {
+  content: "\e63a";
+}
+
+.iconfont-xiaoxi:before {
+  content: "\ed59";
+}
+
+.iconfont-shoucang:before {
+  content: "\ed5a";
+}
+
+.iconfont-renzheng:before {
+  content: "\ed5d";
+}
+
+.iconfont-qianbao:before {
+  content: "\ed5f";
+}
+
+.iconfont-zijin:before {
+  content: "\ed61";
+}
+
+.iconfont-zhengjian:before {
+  content: "\ed65";
+}
+
+.iconfont-daohang:before {
+  content: "\ed69";
+}
+
+.iconfont-tongzhi:before {
+  content: "\ed54";
+}
+
+.iconfont-bianpinghuatubiaosheji-:before {
+  content: "\e62a";
+}
+
+.iconfont-wenhao:before {
+  content: "\e616";
+}
+
+.iconfont-icfemale:before {
+  content: "\e768";
+}
+
+.iconfont-icmale:before {
+  content: "\e769";
+}
+
+.iconfont-leimuxigengduo:before {
+  content: "\e64c";
+}
+
+.iconfont-aixin:before {
+  content: "\e8ab";
+}
+
+.iconfont-pinglun:before {
+  content: "\e8b4";
+}
+
+.iconfont-yiwancheng:before {
+  content: "\e615";
+}
+
+.iconfont-guanbi1:before {
+  content: "\e614";
+}
+
+.iconfont-huati:before {
+  content: "\e8c4";
+}
+
+.iconfont-huo:before {
+  content: "\e64f";
+}
+
diff --git a/static/data-empty.png b/static/data-empty.png
new file mode 100644
index 0000000..a682ff7
Binary files /dev/null and b/static/data-empty.png differ
diff --git a/static/goods-empty.png b/static/goods-empty.png
new file mode 100644
index 0000000..bd42eca
Binary files /dev/null and b/static/goods-empty.png differ
diff --git a/static/images/audio.png b/static/images/audio.png
new file mode 100644
index 0000000..885164b
Binary files /dev/null and b/static/images/audio.png differ
diff --git a/static/images/line.png b/static/images/line.png
new file mode 100644
index 0000000..d4b633d
Binary files /dev/null and b/static/images/line.png differ
diff --git a/static/images/writeOff.png b/static/images/writeOff.png
new file mode 100644
index 0000000..68749d8
Binary files /dev/null and b/static/images/writeOff.png differ
diff --git a/static/internet-empty.png b/static/internet-empty.png
new file mode 100644
index 0000000..55ac2f6
Binary files /dev/null and b/static/internet-empty.png differ
diff --git a/static/order-empty.png b/static/order-empty.png
new file mode 100644
index 0000000..a7b46fe
Binary files /dev/null and b/static/order-empty.png differ
diff --git a/static/soldout-empty.png b/static/soldout-empty.png
new file mode 100644
index 0000000..1761466
Binary files /dev/null and b/static/soldout-empty.png differ
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..e4f9098
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,77 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+@import '@/sheep/scss/_var.scss';
+@import "@/uni_modules/vk-uview-ui/theme.scss";
+/**
+ * 如果你是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:#e5e5e5;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm:12px;
+$uni-font-size-base:14px;
+$uni-font-size-lg:16;
+
+/* 图片尺寸 */
+$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/all-speech/changelog.md b/uni_modules/all-speech/changelog.md
new file mode 100644
index 0000000..8818514
--- /dev/null
+++ b/uni_modules/all-speech/changelog.md
@@ -0,0 +1,25 @@
+## 1.1.1（2024-05-22）
+1.新增node后端方便测试
+2.修复H5及H5上传示例
+## 1.0.7（2024-05-22）
+更新H5上传示例，新增node后端测试 自行进行测试
+## 1.0.6（2024-03-19）
+上传示例项目
+## 1.0.5（2024-03-19）
+修复PC语音录制
+## 1.0.4（2024-03-19）
+兼容pc
+## 1.0.0（2024-03-19）
+兼容PC
+## 1.0.3（2024-03-15）
+修复安卓导入失败
+## 1.0.2（2024-03-14）
+修复小程序报错，支持vue3
+## 1.0.1（2024-03-05）
+补充说明，原作者信息。本人只是补充
+
+
+## 1.0.0（2024-03-05）
+### 首次发布
+1.原地址 https://ext.dcloud.net.cn/plugin?id=9595
+2.原有基础上兼容H5,如有侵权联系立刻下架
diff --git a/uni_modules/all-speech/components/all-speech/all-speech.vue b/uni_modules/all-speech/components/all-speech/all-speech.vue
new file mode 100644
index 0000000..4095b73
--- /dev/null
+++ b/uni_modules/all-speech/components/all-speech/all-speech.vue
@@ -0,0 +1,652 @@
+<template>
+	<view>
+			<view  class="cbb-record">
+				<view class="conbox record">
+					<!-- 此处可放置倒计时，可根据需要自行添加 -->
+					<view class="time"> 
+						{{showRecordTime}}
+					</view>
+					
+					<view class="c999">
+						最短{{minTime}}秒，最长{{maxTime}}秒
+					</view>
+					  
+					<view class="record-box">
+						<view class="stop" @tap.stop="stopVoice" v-if="_voicePath && playing==1 && recordTime1 > minTime-1">
+							<u-icon color="#3cc9a4" name="pause-circle" size="80"></u-icon>
+						</view>
+						<view class="paly" @tap.stop="playVoice" v-if="_voicePath && playing==0 && recordTime1 > minTime-1">
+							<u-icon color="#3cc9a4" name="play-circle" size="80"></u-icon>
+						</view>
+						<!-- #ifdef APP-PLUS ||MP-WEIXIN -->
+						<view class="circle-box"
+						@longpress="startRecord"
+						@touchend="endRecord">
+							<view class="voice-btn">
+								<view class="progress-icon">
+									<u-icon name="mic" color="#fff" size="70"></u-icon>
+								</view>
+							</view>
+							
+							<!-- <u-circle-progress width="170" active-color="#2979ff" :percent="percent" :duration="duration">
+								<view class="u-progress-content">
+									<view class="u-progress-dot">
+										<u-icon name="mic" size="60"></u-icon>
+									</view>
+								</view>
+							</u-circle-progress> -->
+						</view>
+						<!-- #endif -->
+						
+						<!-- #ifdef H5 -->
+						<view class="circle-box" @click="startRecord">
+							<view class="voice-btn">
+								<view class="progress-icon">
+									<u-icon name="mic" color="#fff" size="70"></u-icon>
+								</view>
+							</view>
+							
+							<!-- <u-circle-progress width="170" active-color="#2979ff" :percent="percent" :duration="duration">
+								<view class="u-progress-content">
+									<view class="u-progress-dot">
+										<u-icon name="mic" size="60"></u-icon>
+									</view>
+								</view>
+							</u-circle-progress> -->
+						</view>
+						<!-- #endif -->
+						
+						<view class="confirm" @tap.stop="okClick" v-if="_voicePath && recordTime1 > minTime-1">
+							<u-icon color="#3cc9a4" name="checkmark-circle" size="80"></u-icon>
+						</view>
+					</view>
+					
+					<view class="c666 fz32 domess">{{ btnTextContent }}</view>
+				</view>
+			</view>
+	</view>
+</template>
+<script>
+var that;
+var innerAudioContext;//播放
+// #ifdef APP-PLUS || MP-WEIXIN
+const recorderManager = uni.getRecorderManager();
+// #endif
+
+// #ifdef H5
+import speech from '../../js_sdk/h5-speech/speech.js';
+
+const recorderManager = new speech(8000);
+// #endif
+
+// #ifdef APP-PLUS
+// 引入权限判断
+import permision from '../../js_sdk/wa-permission/permission.js';
+// #endif
+
+import tuiCircularProgress from "@/components/thorui/tui-circular-progress/tui-circular-progress.vue"
+ 
+export default {
+	name: 'nbVoiceRecord',
+	components:{
+		tuiCircularProgress,
+	},  
+	/**
+	 * 录音交互动效组件
+	 * @property {Object} recordOptions 录音配置
+	 * @property {Object} btnStyle 按钮样式
+	 * @property {Object} btnHoverFontcolor 按钮长按时字体颜色
+	 * @property {String} btnHoverBgcolor 按钮长按时背景颜色
+	 * @property {String} btnDefaultText 按钮初始文字
+	 * @property {String} btnRecordingText 录制时按钮文字
+	 * @property {Boolean} vibrate 弹窗时是否震动
+	 * @property {String} popupTitle 弹窗顶部文字
+	 * @property {String} popupDefaultTips 录制时弹窗底部提示
+	 * @property {String} popupCancelTips 滑动取消时弹窗底部提示
+	 * @property {String} popupMaxWidth 弹窗展开后宽度
+	 * @property {String} popupMaxHeight 弹窗展开后高度
+	 * @property {String} popupFixBottom 弹窗展开后距底部高度
+	 * @property {String} popupBgColor 弹窗背景颜色
+	 * @property {String} lineHeight 声波高度
+	 * @property {String} lineStartColor 声波波谷时颜色色值
+	 * @property {String} lineEndColor 声波波峰时颜色色值
+	 * @event {Function} startRecord 开始录音回调
+	 * @event {Function} endRecord 结束录音回调
+	 * @event {Function} cancelRecord 滑动取消录音回调
+	 * @event {Function} stopRecord 主动停止录音
+	 */
+	props: {
+		recordOptions: {
+			type: Object,
+			default() {
+				return {
+					duration: 600000
+				}; // 请自行查看各端的的支持情况，这里全部使用默认配置
+			}
+		},
+		btnStyle: {
+			type: Object,
+			default() {
+				return {
+					width: '300rpx',
+					height: '80rpx',
+					borderRadius: '20rpx',
+					backgroundColor: '#fff',
+					border: '1rpx solid whitesmoke',
+					permisionState: false
+				};
+			}
+		},
+		btnHoverFontcolor: {
+			type: String,
+			default: '#000' // 颜色名称或16进制色值
+		},
+		btnHoverBgcolor: {
+			type: String,
+			default: 'whitesmoke' // 颜色名称或16进制色值
+		},
+		btnDefaultText: {
+			type: String,
+			default: '长按开始录音'
+		},
+		btnRecordingText: {
+			type: String,
+			default: '录音中'
+		},
+		vibrate: {
+			type: Boolean,
+			default: true
+		},
+		// #ifdef APP-PLUS || MP-WEIXIN
+		popupTitle: {
+			type: String,
+			default: '正在录制音频'
+		},
+		popupDefaultTips: {
+			type: String,
+			default: '左右滑动后松手完成录音'
+		},
+		// #endif
+		// #ifdef H5
+		popupTitle: {
+			type: String,
+			default: '点击录制音频'
+		},
+		popupDefaultTips: {
+			type: String,
+			default: '点击完成录音'
+		},
+		// #endif
+		popupCancelTips: {
+			type: String,
+			default: '松手取消录音'
+		},
+		popupMaxWidth: {
+			type: Number,
+			default: 600 // 单位为rpx
+		},
+		popupMaxHeight: {
+			type: Number,
+			default: 300 // 单位为rpx
+		},
+		popupFixBottom: {
+			type: Number,
+			default: 200 // 单位为rpx
+		},
+		popupBgColor: { 
+			type: String,
+			default: 'whitesmoke'
+		},
+		lineHeight: {
+			type: Number,
+			default: 50 // 单位为rpx
+		},
+		lineStartColor: {
+			type: String,
+			default: 'royalblue' // 颜色名称或16进制色值
+		},
+		lineEndColor: {
+			type: String,
+			default: 'indianred' // 颜色名称或16进制色值
+		},
+		voicePath: { //默认地址
+			type: String,
+			default: '' 
+		},
+		maxTime: { // 录音最大时长，单位秒
+			type: Number,
+			default: 15
+		},
+		minTime: { // 录音最小时长，单位毫秒
+			type:Number ,
+			default: 5
+		},
+	},
+	data() {
+		return {
+			stopStatus: true, // 是否已被父页面通知主动结束录音
+			btnTextContent: this.btnDefaultText,
+			startTouchData: {},
+			popupHeight: '0px', // 这是初始的高度
+			recording: true, // 录音中
+			recordPopupShow: false,
+			recordTimeout: null, // 录音定时器
+			h5start: false,
+			isShow:false,	
+			playing:0,//是否播放中
+			timeObj: null, //计时id
+			countdownObj: null,		//倒计时id
+			recordTime: 0,//录音时长
+			recordTime1:0,//播放录音倒计时
+			percent: 0,
+			duration1: true,
+			newViocePath: '',
+		};
+	},
+	created() {
+		that = this;
+		innerAudioContext = uni.createInnerAudioContext();//播放
+
+		// 请求权限
+		this.checkPermission();
+		// #ifdef APP-PLUS || MP-WEIXIN
+		recorderManager.onStop((res) => {
+			that.newViocePath = res.tempFilePath;
+			that.endRecord();
+			that.$emit('endRecord', res);
+		});
+		recorderManager.onStart((err) => {
+			console.log('开始:', err);
+		});
+		recorderManager.onError((err) => {
+			console.log('err:', err);
+		});
+		// #endif
+	},
+	computed: {
+		showRecordTime() {
+			var strs = "";
+			var m = Math.floor(this.recordTime/60);
+			if(m<10) strs = "0"+m;
+			
+			var s = this.recordTime%60;
+			strs += (s<10) ? ":0"+s : ":"+s;
+							
+			return strs
+		},
+		duration() {
+			return this.duration1 ? this.maxTime*1000 : 0;
+		},
+		_voicePath(){
+			return this.newViocePath || this.voicePath;
+		}
+	},
+	methods: {
+		upx2px(upx) {
+			return uni.upx2px(upx) + 'px';
+		},
+		async checkPermission() {
+			var that = this;
+			// #ifdef APP-PLUS
+			// 先判断os
+			let os = uni.getSystemInfoSync().osName;
+			if (os == 'ios') {
+				this.permisionState = await permision.judgeIosPermission('record');
+			} else {
+				this.permisionState = await permision.requestAndroidPermission('android.permission.RECORD_AUDIO');
+			}
+			if (this.permisionState !== true && this.permisionState !== 1) {
+				uni.showToast({
+					title: '请先授权使用录音',
+					icon: 'none'
+				});
+				return;
+			}
+			// #endif
+			// #ifdef H5
+			if (!window.navigator?.mediaDevices?.getUserMedia) {
+				this.permisionState = false;
+				uni.showToast({
+					title: '请先授权使用录音',
+					icon: 'none'
+				});
+				return;
+			} else {
+				this.permisionState = true;
+			}
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			uni.authorize({
+				scope: 'scope.record',
+				success(e) {
+					that.permisionState = true;
+					// that.startRecord();
+				},
+				fail() {
+					uni.showToast({
+						title: '请授权使用录音',
+						icon: 'none'
+					});
+				}
+			});
+			// #endif
+		},
+
+		startRecord() {
+			this.percent = 0;
+			this.duration1 = true;
+			
+			if (!this.permisionState) {
+				this.checkPermission();
+				return;
+			}
+			if (this.h5start) {
+				this.duration1 = false;
+				this.h5start = false;
+				this.endRecord();
+				return;
+			}
+			this.h5start = true;
+			this.stopStatus = false;
+			
+			this.stopVoice();
+			this.percent = 100;
+			this.recordTime = 0;
+			this.newViocePath = "";//音频地址	
+			this.btnTextContent = this.btnRecordingText;
+			this.timeObj = setInterval(() => {
+				this.recordTime ++;		
+				if(this.recordTime  == this.maxTime) {
+					this.endRecord();
+				}
+			},1000);
+			
+			setTimeout(() => {
+				setTimeout(() => {
+					if (this.vibrate) {
+						// #ifdef APP-PLUS
+						// 震动
+						plus.device.vibrate(35);
+						// #endif
+						// #ifdef MP-WEIXIN
+						uni.vibrateShort();
+						// #endif
+					}
+					// 开始录音
+					recorderManager.start(this.recordOptions);
+
+					this.$emit('startRecord');
+				}, 100);
+			}, 200);
+		},
+		endRecord() {
+			this.percent = 0;
+			this.h5start = false;
+			
+			let recordTime = this.recordTime;
+			this.recordTime1 = this.recordTime;
+			clearInterval(this.timeObj); //清除计时器
+			
+			var that = this;
+			if (this.stopStatus) {
+				return;
+			}
+			//this.popupHeight = '0px';
+			//this.recordPopupShow = false;
+			this.btnTextContent = this.btnDefaultText;
+			// #ifdef APP-PLUS || MP-WEIXIN
+			recorderManager.stop();
+			// #endif
+			// #ifdef H5
+			const res = recorderManager.stop();
+			that.newViocePath = res;
+			that.$emit('endRecord', res);
+			// #endif
+		},
+		stopRecord() {
+			// 用法如你录音限制了时间，那么将在结束时强制停止组件的显示
+			this.endRecord();
+			this.stopStatus = true;
+		},
+		touchStart(e) {
+			this.startTouchData.clientX = e.changedTouches[0].clientX; //手指按下时的X坐标
+			this.startTouchData.clientY = e.changedTouches[0].clientY; //手指按下时的Y坐标
+		},
+		touchMove(e) {
+			let touchData = e.touches[0]; //滑动过程中，手指滑动的坐标信息 返回的是Objcet对象
+			let moveX = touchData.clientX - this.startTouchData.clientX;
+			let moveY = touchData.clientY - this.startTouchData.clientY;
+			if (moveY < -50) {
+				if (this.vibrate && this.recording) {
+					// #ifdef APP-PLUS
+					plus.device.vibrate(35);
+					// #endif
+					// #ifdef MP-WEIXIN
+					uni.vibrateShort();
+					// #endif
+				}
+				this.recording = false;
+			} else {
+				this.recording = true;
+			}
+		},
+		playVoice() {
+			if (this._voicePath && this.playing === 0) {
+				console.log('playVoice', this._voicePath)
+				innerAudioContext.src = this._voicePath;
+				
+				innerAudioContext.stop();		//todo 第一次play时若不先stop则播放不出来,未知原因
+				innerAudioContext.play();
+				
+				this.playing = 1;
+				
+				this.recordTime = this.recordTime1;
+				
+				this.countdownObj = setInterval(() => {
+					this.recordTime--;
+					if(this.recordTime === 0){
+						this.recordTime = this.recordTime1;
+						this.stopVoice()
+						return;
+					}
+				}, 1000)
+			}
+		},
+		startVoice() {
+			this.isShow = true;
+			this.percent = 0;
+			this.recordTime = 0;
+			this.newViocePath = "";//音频地址
+		},
+		//关闭组件
+		closePicker(){				
+			this.isShow = false;
+			this.endRecord();
+			this.stopVoice();
+		},	
+		stopVoice() {
+			innerAudioContext.stop();
+			this.playing = 0;			
+			//this.recordTime = 0;
+			clearInterval(this.countdownObj);
+		},
+		//点击确定
+		okClick(){
+			var data = {
+				path: this._voicePath,
+				sec: this.recordTime1,
+			}
+			this.stopVoice();
+			this.$emit('okClick', data);
+		},
+	}
+};
+</script>
+<style lang="scss">
+	
+.cbb-record {
+	.conbox{
+		background: #fff;
+	}	
+	.record{	
+		text-align: center;
+		
+		.time {
+			text-align: center;
+			font-size: 60upx;
+			color: #000;
+			line-height: 100upx;
+			//margin-top:50upx;
+		}
+		.domess{margin-bottom:50upx;}
+		
+		.c666{color:#aaa;}
+		.c999{color:#999;}
+		.fz28{font-size: 28upx;}
+		.fz32{font-size: 32upx;}
+		.record-box {
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+			padding: 10px 0;
+		}
+		.btncom{
+			width: 80upx;
+			height: 80upx;	
+			border-radius: 80upx;
+		}
+		.stop{
+			 @extend .btncom;
+		}
+		.paly{
+			 @extend .btncom;
+		}	
+		.confirm{
+			 @extend .btncom;
+		}
+	}
+	
+	.circle-box {
+		margin: 0 80rpx;
+	}
+}	
+
+.record-popup {
+	position: absolute;
+	bottom: var(--popup-bottom);
+	left: calc(50vw - calc(var(--popup-width) / 2));
+	z-index: 1;
+	width: var(--popup-width);
+	height: var(--popup-height);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 10rpx;
+	box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
+	background: var(--popup-bg-color);
+	color: #000;
+	transition: 0.2s height;
+
+	.inner-content {
+		height: var(--popup-height);
+		font-size: 24rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-between;
+
+		.title {
+			font-weight: bold;
+			padding: 20rpx 0;
+		}
+
+		.tips {
+			color: #999;
+			padding: 20rpx 0;
+		}
+	}
+}
+
+.voice-btn {
+	width: 170rpx;
+	height: 170rpx;
+}
+
+.progress-icon {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background-color: #3cc9a4;
+	border-radius: 100%;
+	width: 100%;
+	height: 100%;
+}
+
+.cancel-icon {
+	width: 100rpx;
+	height: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: #fff;
+	font-size: 44rpx;
+	line-height: 44rpx;
+	background-color: pink;
+	border-radius: 50%;
+	transform: rotate(45deg);
+}
+
+.voice-line-wrap {
+	display: flex;
+	align-items: center;
+
+	.voice-line {
+		width: 5rpx;
+		height: var(--line-height);
+		border-radius: 3rpx;
+		margin: 0 5rpx;
+	}
+
+	.one {
+		animation: wave 0.4s 1s linear infinite alternate;
+	}
+
+	.two {
+		animation: wave 0.4s 0.9s linear infinite alternate;
+	}
+
+	.three {
+		animation: wave 0.4s 0.8s linear infinite alternate;
+	}
+
+	.four {
+		animation: wave 0.4s 0.7s linear infinite alternate;
+	}
+
+	.five {
+		animation: wave 0.4s 0.6s linear infinite alternate;
+	}
+
+	.six {
+		animation: wave 0.4s 0.5s linear infinite alternate;
+	}
+
+	.seven {
+		animation: wave 0.4s linear infinite alternate;
+	}
+}
+
+@keyframes wave {
+	0% {
+		transform: scale(1, 1);
+		background-color: var(--line-start-color);
+	}
+
+	100% {
+		transform: scale(1, 0.2);
+		background-color: var(--line-end-color);
+	}
+}
+</style>
diff --git a/uni_modules/all-speech/js_sdk/h5-speech/speech.js b/uni_modules/all-speech/js_sdk/h5-speech/speech.js
new file mode 100644
index 0000000..d6acbd9
--- /dev/null
+++ b/uni_modules/all-speech/js_sdk/h5-speech/speech.js
@@ -0,0 +1,226 @@
+class Recoder {
+	constructor(sampleRate) {
+		this.leftDataList = []
+		this.rightDataList = []
+		this.mediaPlayer = null
+		this.audioContext = null
+		this.source = null
+		this.sampleRate = sampleRate || 44100
+	}
+	start() {
+		return new Promise((resolve, reject) => {
+			window.navigator.mediaDevices.getUserMedia({
+				audio: {
+					sampleRate: 8000, // 采样率
+					channelCount: 1, // 声道
+					audioBitsPerSecond: 64,
+					volume: 1.0, // 音量
+					autoGainControl: true
+				}
+			}).then(mediaStream => {
+				console.log(mediaStream, 'mediaStream')
+				this.mediaPlayer = mediaStream
+				this.beginRecord(mediaStream)
+				resolve()
+			}).catch(err => {
+				// 如果用户电脑没有麦克风设备或者用户拒绝了，或者连接出问题了等
+				// 这里都会抛异常，并且通过err.name可以知道是哪种类型的错误
+				console.error(err)
+				reject(err)
+			})
+		})
+	}
+
+	beginRecord(mediaStream) {
+		let audioContext = new(window.AudioContext || window.webkitAudioContext)()
+		// mediaNode包含 mediaStream，audioContext
+		let mediaNode = audioContext.createMediaStreamSource(mediaStream)
+		console.log(mediaNode, 'mediaNode')
+		// 创建一个jsNode
+		// audioContext.sampleRate = 8000
+		console.log(audioContext, 'audioContext')
+		let jsNode = this.createJSNode(audioContext)
+		console.log(jsNode, 'jsnode')
+		// 需要连到扬声器消费掉outputBuffer，process回调才能触发
+		// 并且由于不给outputBuffer设置内容，所以扬声器不会播放出声音
+		jsNode.connect(audioContext.destination)
+		jsNode.onaudioprocess = this.onAudioProcess.bind(this)
+		// 把mediaNode连接到jsNode
+		mediaNode.connect(jsNode)
+		this.audioContext = audioContext
+	}
+
+	onAudioProcess(event) {
+		console.log('is recording')
+		// 拿到输入buffer Float32Array 
+		let audioBuffer = event.inputBuffer
+		let leftChannelData = audioBuffer.getChannelData(0)
+		// let rightChannelData = audioBuffer.getChannelData(1)
+
+		// 需要克隆一下
+		this.leftDataList.push(leftChannelData.slice(0))
+		//this.rightDataList.push(rightChannelData.slice(0))
+	}
+
+	createJSNode(audioContext) {
+		const BUFFER_SIZE = 4096
+		const INPUT_CHANNEL_COUNT = 1
+		const OUTPUT_CHANNEL_COUNT = 1
+		// createJavaScriptNode已被废弃
+		let creator = audioContext.createScriptProcessor || audioContext.createJavaScriptNode
+		creator = creator.bind(audioContext)
+		return creator(BUFFER_SIZE, INPUT_CHANNEL_COUNT, OUTPUT_CHANNEL_COUNT)
+	}
+
+	playRecord(arrayBuffer) {
+		let blob = new Blob([new Int8Array(arrayBuffer)], {
+			type: 'audio/mp3' // files[0].type
+		})
+		let blobUrl = URL.createObjectURL(blob)
+		this.source = blob
+		this.blobUrl = blobUrl
+		// document.querySelector(‘.audio-node‘).src = blobUrl
+		return blobUrl
+	}
+
+	stop() {
+		// 停止录音
+		let leftData = this.mergeArray(this.leftDataList)
+		//let rightData = this.mergeArray(this.rightDataList)
+		let allData = this.interSingleData(leftData)
+		let wavBuffer = this.createWavFile(allData)
+
+		//  转到播放
+		let source = this.playRecord(wavBuffer)
+		// if (source) {
+		// 	source = source.slice(5)
+		// }
+		console.log("我最后转换完播放的---------------------", source);
+		this.resetRecord()
+		return source
+	}
+
+	transformArrayBufferToBase64(buffer) {
+		var binary = ''
+		var bytes = new Uint8Array(buffer)
+		for (var len = bytes.byteLength, i = 0; i < len; i++) {
+			binary += String.fromCharCode(bytes[i])
+		}
+		return window.btoa(binary)
+	}
+
+	// 停止控件录音
+	resetRecord() {
+		this.leftDataList = []
+		this.rightDataList = []
+		this.audioContext.close()
+		this.mediaPlayer.getAudioTracks().forEach(track => {
+			track.stop()
+			this.mediaPlayer.removeTrack(track)
+		})
+	}
+
+	createWavFile(audioData) {
+		let channelCount = 1
+		const WAV_HEAD_SIZE = 44
+		const sampleBits = 16
+		let sampleRate = this.sampleRate
+
+		let buffer = new ArrayBuffer(audioData.length * 2 + WAV_HEAD_SIZE)
+		// 需要用一个view来操控buffer
+		let view = new DataView(buffer)
+		// 写入wav头部信息
+		// RIFF chunk descriptor/identifier
+		this.writeUTFBytes(view, 0, 'RIFF')
+		// RIFF chunk length
+		view.setUint32(4, 44 + audioData.length * channelCount, true)
+		// RIFF type
+		this.writeUTFBytes(view, 8, 'WAVE')
+		// format chunk identifier
+		// FMT sub-chunk
+		this.writeUTFBytes(view, 12, 'fmt ')
+		// format chunk length
+		view.setUint32(16, 16, true)
+		// sample format (raw)
+		view.setUint16(20, 1, true)
+		// stereo (2 channels)
+		view.setUint16(22, channelCount, true)
+		// sample rate
+		view.setUint32(24, sampleRate, true)
+		// byte rate (sample rate * block align)
+		view.setUint32(28, sampleRate * 2, true)
+		// block align (channel count * bytes per sample)
+		view.setUint16(32, 2 * 2, true)
+		// bits per sample
+		view.setUint16(34, 16, true)
+		// data sub-chunk
+		// data chunk identifier
+		this.writeUTFBytes(view, 36, 'data')
+		// data chunk length
+		view.setUint32(40, audioData.length * 2, true)
+
+		console.log(view, 'view')
+		let length = audioData.length
+		let index = 44
+		let volume = 1
+		for (let i = 0; i < length; i++) {
+			view.setInt16(index, audioData[i] * (0x7FFF * volume), true)
+			index += 2
+		}
+		return buffer
+	}
+
+	writeUTFBytes(view, offset, string) {
+		var lng = string.length
+		for (var i = 0; i < lng; i++) {
+			view.setUint8(offset + i, string.charCodeAt(i))
+		}
+	}
+
+	interSingleData(left) {
+		var t = left.length;
+		let sampleRate = this.audioContext.sampleRate,
+			outputSampleRate = this.sampleRate
+		sampleRate += 0.0;
+		outputSampleRate += 0.0;
+		var s = 0,
+			o = sampleRate / outputSampleRate,
+			u = Math.ceil(t * outputSampleRate / sampleRate),
+			a = new Float32Array(u);
+		for (let i = 0; i < u; i++) {
+			a[i] = left[Math.floor(s)];
+			s += o;
+		}
+		return a;
+	}
+
+	// 交叉合并左右声道的数据
+	interleaveLeftAndRight(left, right) {
+		let totalLength = left.length + right.length
+		let data = new Float32Array(totalLength)
+		for (let i = 0; i < left.length; i++) {
+			let k = i * 2
+			data[k] = left[i]
+			data[k + 1] = right[i]
+		}
+		return data
+	}
+
+	mergeArray(list) {
+		let length = list.length * list[0].length
+		let data = new Float32Array(length)
+		let offset = 0
+		for (let i = 0; i < list.length; i++) {
+			data.set(list[i], offset)
+			offset += list[i].length
+		}
+		return data
+	}
+
+
+
+
+}
+
+
+export default Recoder
\ No newline at end of file
diff --git a/uni_modules/all-speech/js_sdk/wa-permission/permission.js b/uni_modules/all-speech/js_sdk/wa-permission/permission.js
new file mode 100644
index 0000000..543f035
--- /dev/null
+++ b/uni_modules/all-speech/js_sdk/wa-permission/permission.js
@@ -0,0 +1,272 @@
+/**
+ * 本模块封装了Android、iOS的应用权限判断、打开应用权限设置界面、以及位置系统服务是否开启
+ */
+
+var isIos
+// #ifdef APP-PLUS
+isIos = (plus.os.name == "iOS")
+// #endif
+
+// 判断推送权限是否开启
+function judgeIosPermissionPush() {
+	var result = false;
+	var UIApplication = plus.ios.import("UIApplication");
+	var app = UIApplication.sharedApplication();
+	var enabledTypes = 0;
+	if (app.currentUserNotificationSettings) {
+		var settings = app.currentUserNotificationSettings();
+		enabledTypes = settings.plusGetAttribute("types");
+		console.log("enabledTypes1:" + enabledTypes);
+		if (enabledTypes == 0) {
+			console.log("推送权限没有开启");
+		} else {
+			result = true;
+			console.log("已经开启推送功能!")
+		}
+		plus.ios.deleteObject(settings);
+	} else {
+		enabledTypes = app.enabledRemoteNotificationTypes();
+		if (enabledTypes == 0) {
+			console.log("推送权限没有开启!");
+		} else {
+			result = true;
+			console.log("已经开启推送功能!")
+		}
+		console.log("enabledTypes2:" + enabledTypes);
+	}
+	plus.ios.deleteObject(app);
+	plus.ios.deleteObject(UIApplication);
+	return result;
+}
+
+// 判断定位权限是否开启
+function judgeIosPermissionLocation() {
+	var result = false;
+	var cllocationManger = plus.ios.import("CLLocationManager");
+	var status = cllocationManger.authorizationStatus();
+	result = (status != 2)
+	console.log("定位权限开启：" + result);
+	// 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation
+	/* var enable = cllocationManger.locationServicesEnabled();
+	var status = cllocationManger.authorizationStatus();
+	console.log("enable:" + enable);
+	console.log("status:" + status);
+	if (enable && status != 2) {
+		result = true;
+		console.log("手机定位服务已开启且已授予定位权限");
+	} else {
+		console.log("手机系统的定位没有打开或未给予定位权限");
+	} */
+	plus.ios.deleteObject(cllocationManger);
+	return result;
+}
+
+// 判断麦克风权限是否开启
+function judgeIosPermissionRecord() {
+	var result = false;
+	var avaudiosession = plus.ios.import("AVAudioSession");
+	var avaudio = avaudiosession.sharedInstance();
+	var permissionStatus = avaudio.recordPermission();
+	console.log("permissionStatus:" + permissionStatus);
+	if (permissionStatus == 1684369017 || permissionStatus == 1970168948) {
+		console.log("麦克风权限没有开启");
+	} else {
+		result = true;
+		console.log("麦克风权限已经开启");
+	}
+	plus.ios.deleteObject(avaudiosession);
+	return result;
+}
+
+// 判断相机权限是否开启
+function judgeIosPermissionCamera() {
+	var result = false;
+	var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
+	var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
+	console.log("authStatus:" + authStatus);
+	if (authStatus == 3) {
+		result = true;
+		console.log("相机权限已经开启");
+	} else {
+		console.log("相机权限没有开启");
+	}
+	plus.ios.deleteObject(AVCaptureDevice);
+	return result;
+}
+
+// 判断相册权限是否开启
+function judgeIosPermissionPhotoLibrary() {
+	var result = false;
+	var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
+	var authStatus = PHPhotoLibrary.authorizationStatus();
+	console.log("authStatus:" + authStatus);
+	if (authStatus == 3) {
+		result = true;
+		console.log("相册权限已经开启");
+	} else {
+		console.log("相册权限没有开启");
+	}
+	plus.ios.deleteObject(PHPhotoLibrary);
+	return result;
+}
+
+// 判断通讯录权限是否开启
+function judgeIosPermissionContact() {
+	var result = false;
+	var CNContactStore = plus.ios.import("CNContactStore");
+	var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
+	if (cnAuthStatus == 3) {
+		result = true;
+		console.log("通讯录权限已经开启");
+	} else {
+		console.log("通讯录权限没有开启");
+	}
+	plus.ios.deleteObject(CNContactStore);
+	return result;
+}
+
+// 判断日历权限是否开启
+function judgeIosPermissionCalendar() {
+	var result = false;
+	var EKEventStore = plus.ios.import("EKEventStore");
+	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
+	if (ekAuthStatus == 3) {
+		result = true;
+		console.log("日历权限已经开启");
+	} else {
+		console.log("日历权限没有开启");
+	}
+	plus.ios.deleteObject(EKEventStore);
+	return result;
+}
+
+// 判断备忘录权限是否开启
+function judgeIosPermissionMemo() {
+	var result = false;
+	var EKEventStore = plus.ios.import("EKEventStore");
+	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
+	if (ekAuthStatus == 3) {
+		result = true;
+		console.log("备忘录权限已经开启");
+	} else {
+		console.log("备忘录权限没有开启");
+	}
+	plus.ios.deleteObject(EKEventStore);
+	return result;
+}
+
+// Android权限查询
+function requestAndroidPermission(permissionID) {
+	return new Promise((resolve, reject) => {
+		plus.android.requestPermissions(
+			[permissionID], // 理论上支持多个权限同时查询，但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装
+			function(resultObj) {
+				var result = 0;
+				for (var i = 0; i < resultObj.granted.length; i++) {
+					var grantedPermission = resultObj.granted[i];
+					console.log('已获取的权限：' + grantedPermission);
+					result = 1
+				}
+				for (var i = 0; i < resultObj.deniedPresent.length; i++) {
+					var deniedPresentPermission = resultObj.deniedPresent[i];
+					console.log('拒绝本次申请的权限：' + deniedPresentPermission);
+					result = 0
+				}
+				for (var i = 0; i < resultObj.deniedAlways.length; i++) {
+					var deniedAlwaysPermission = resultObj.deniedAlways[i];
+					console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
+					result = -1
+				}
+				resolve(result);
+				// 若所需权限被拒绝,则打开APP设置界面,可以在APP设置界面打开相应权限
+				// if (result != 1) {
+				// gotoAppPermissionSetting()
+				// }
+			},
+			function(error) {
+				console.log('申请权限错误：' + error.code + " = " + error.message);
+				resolve({
+					code: error.code,
+					message: error.message
+				});
+			}
+		);
+	});
+}
+
+// 使用一个方法，根据参数判断权限
+function judgeIosPermission(permissionID) {
+	if (permissionID == "location") {
+		return judgeIosPermissionLocation()
+	} else if (permissionID == "camera") {
+		return judgeIosPermissionCamera()
+	} else if (permissionID == "photoLibrary") {
+		return judgeIosPermissionPhotoLibrary()
+	} else if (permissionID == "record") {
+		return judgeIosPermissionRecord()
+	} else if (permissionID == "push") {
+		return judgeIosPermissionPush()
+	} else if (permissionID == "contact") {
+		return judgeIosPermissionContact()
+	} else if (permissionID == "calendar") {
+		return judgeIosPermissionCalendar()
+	} else if (permissionID == "memo") {
+		return judgeIosPermissionMemo()
+	}
+	return false;
+}
+
+// 跳转到**应用**的权限页面
+function gotoAppPermissionSetting() {
+	if (isIos) {
+		var UIApplication = plus.ios.import("UIApplication");
+		var application2 = UIApplication.sharedApplication();
+		var NSURL2 = plus.ios.import("NSURL");
+		// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");		
+		var setting2 = NSURL2.URLWithString("app-settings:");
+		application2.openURL(setting2);
+
+		plus.ios.deleteObject(setting2);
+		plus.ios.deleteObject(NSURL2);
+		plus.ios.deleteObject(application2);
+	} else {
+		// console.log(plus.device.vendor);
+		var Intent = plus.android.importClass("android.content.Intent");
+		var Settings = plus.android.importClass("android.provider.Settings");
+		var Uri = plus.android.importClass("android.net.Uri");
+		var mainActivity = plus.android.runtimeMainActivity();
+		var intent = new Intent();
+		intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+		var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+		intent.setData(uri);
+		mainActivity.startActivity(intent);
+	}
+}
+
+// 检查系统的设备服务是否开启
+// var checkSystemEnableLocation = async function () {
+function checkSystemEnableLocation() {
+	if (isIos) {
+		var result = false;
+		var cllocationManger = plus.ios.import("CLLocationManager");
+		var result = cllocationManger.locationServicesEnabled();
+		console.log("系统定位开启:" + result);
+		plus.ios.deleteObject(cllocationManger);
+		return result;
+	} else {
+		var context = plus.android.importClass("android.content.Context");
+		var locationManager = plus.android.importClass("android.location.LocationManager");
+		var main = plus.android.runtimeMainActivity();
+		var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+		var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER);
+		console.log("系统定位开启:" + result);
+		return result
+	}
+}
+
+export default  {
+	judgeIosPermission: judgeIosPermission,
+	requestAndroidPermission: requestAndroidPermission,
+	checkSystemEnableLocation: checkSystemEnableLocation,
+	gotoAppPermissionSetting: gotoAppPermissionSetting
+}
diff --git a/uni_modules/all-speech/package.json b/uni_modules/all-speech/package.json
new file mode 100644
index 0000000..1eaa4c5
--- /dev/null
+++ b/uni_modules/all-speech/package.json
@@ -0,0 +1,82 @@
+{
+	"id": "all-speech",
+	"displayName": "allspeech长按录音动画组件，多端权限判断，可监听开始、结束、取消事件",
+	"version": "1.1.1",
+	"description": "https://ext.dcloud.net.cn/plugin?id=9595这个是原项目，本人再次基础上兼容了H5",
+	"keywords": [
+        "长按,录音,动画组件"
+    ],
+	"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": "https://gitee.com/imboya/nb-voice-record"
+	},
+	"uni_modules": {
+		"dependencies": [],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+                "aliyun": "y",
+                "alipay": "n"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "u"
+				},
+				"H5-mobile": {
+					"Safari": "u",
+					"Android Browser": "u",
+					"微信浏览器(Android)": "n",
+					"QQ浏览器(Android)": "n"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "n",
+					"Edge": "n",
+					"Firefox": "y",
+					"Safari": "n"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "u",
+					"百度": "u",
+					"字节跳动": "u",
+					"QQ": "u",
+					"钉钉": "u",
+					"快手": "u",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}
diff --git a/uni_modules/all-speech/readme.md b/uni_modules/all-speech/readme.md
new file mode 100644
index 0000000..2722046
--- /dev/null
+++ b/uni_modules/all-speech/readme.md
@@ -0,0 +1,89 @@
+### nbVoiceRecord概述
+ - 这是个基于uni-app 符合uni_modules 的插件
+ - 无任何依赖、纯css动画
+ - nb是NeverBug的意思
+
+### 主要功能
+ - 长按组件后弹出录音弹窗，松手完成录音，手指向上滑动可取消；
+ - 支持各种自定义，如弹窗高度、宽度、各处文字甚至声纹波形的尺寸和颜色；
+ - 已完成多端适配，自动根据授权情况提示完成授权、已获得授权才开始录音
+ - endRecord回调事件附带录音文件
+
+### 动画预览
+
+ - 默认样式
+ 
+![默认样式](https://vkceyugu.cdn.bspapp.com/VKCEYUGU-613ff9e2-568b-4845-987f-93626e21bcde/84cf3c4f-f4f2-41e6-bb82-1414465a944d.gif)
+
+ - 自定义按钮为圆形(红背景、白字)、弹窗为正方形
+
+![正方形](https://vkceyugu.cdn.bspapp.com/VKCEYUGU-613ff9e2-568b-4845-987f-93626e21bcde/893bf1d6-593f-40e6-aeff-12afe4ebbc37.gif)
+
+### 基本用法：
+
+```
+<template>
+	<view>
+		<all-speech @startRecord="start" @endRecord="end" @cancelRecord="cancel"></all-speech>
+	</view>
+</template>
+
+<script>
+	methods: {
+		start() {
+			// 开始录音
+		},
+		end(event) {
+			// 结束录音并处理得到的录音文件
+			// event中，app端仅有tempFilePath字段，微信小程序还有duration和fileSize两个字段
+		},
+		cancel() {
+			// 用户取消录音
+		}
+	}
+</script>
+
+```
+
+### 全部支持参数
+
+| 参数名			| 类型		| 默认值			| 作用						| 注意事项																												|
+| -----				| -----		| ------			| -------					| ---																													|
+| recordOptions		| Object	| {duration:60000}	| 录音配置					|各端支持情况不同，请自行查看[官方说明](https://uniapp.dcloud.net.cn/api/media/record-manager.html#getrecordermanager)	|
+| btnStyle			| Object	| 请查看源码		| 按钮样式					|对象格式																												|
+| btnHoverFontcolor	| String	| #000				| 按钮长按时文字颜色		|																														|
+| btnHoverBgcolor	| String	| whitesmoke		| 按钮长按时背景颜色		|																														|
+| btnDefaultText	| String	| 长按开始录音		| 初始按钮文字				|																														|
+| btnRecordingText	| String	| 录音中			|  录制时按钮文字			|																														|
+| vibrate			| Boolean	| true				|  震动反馈					| 弹窗、滑动取消时																										|
+| popupTitle		| String	| 正在录制音频		|  弹窗顶部文字				|																														|
+| popupDefaultTips	| String	| 松手完成录音		| 录制时弹窗底部提示		|																														|
+| popupCancelTips	| String	| 松手取消录音		|  滑动取消时弹窗底部提示	|																														|
+| popupMaxWidth		| Number	| 600				|  弹窗展开后宽度			|注意这里几个单位都是rpx																								|
+| popupMaxHeight	| Number	| 300				|  弹窗展开后高度			|																														|
+| popupFixBottom	| Number	| 200				|   弹窗展开后距底部高度	|																														|
+| popupBgColor		| String	| whitesmoke		|   弹窗背景颜色			|																														|
+| lineHeight		| Number	| 50				|  声波高度					|																														|
+| lineStartColor	| String	| royalblue			|  声波波谷时颜色色值		| 色值或者颜色名均可																									|
+| lineEndColor		| String	| indianred			| 声波波峰时颜色色值		|																														|
+
+### 原作者其他插件
+
+ - [bwinBrand多端自适应企业官网、uniCloud云端一体【用户端】](https://ext.dcloud.net.cn/plugin?id=7821)
+ - [bwinBrand多端自适应企业官网、uniCloud云端一体【管理端】](https://ext.dcloud.net.cn/plugin?id=7822)
+ - [bwinAgent多端、多项目全民经纪人、uniCloud云端一体【经纪人端】](https://ext.dcloud.net.cn/plugin?id=8606)
+ - [bwinAgent多端、多项目全民经纪人、uniCloud云端一体【管理员端】](https://ext.dcloud.net.cn/plugin?id=8607)
+ - [必闻优学，教育培训机构模板（单校区版，纯模板）](https://ext.dcloud.net.cn/plugin?id=7709)
+ 
+### 一个有趣的社区
+
+ - [NeverBug.cn 弹幕式互动社区](https://neverbug.cn)
+ 
+### 原作者
+ - QQ：123060128
+ - Email：karma.zhao@gmail.com
+ - 官网：https://brand.neverbug.cn
+
+### 补充作者
+ - QQ：27836407
+ - Email：zgdabao.zhao@gmail.com
diff --git a/uni_modules/c-svga/changelog.md b/uni_modules/c-svga/changelog.md
new file mode 100644
index 0000000..491186d
--- /dev/null
+++ b/uni_modules/c-svga/changelog.md
@@ -0,0 +1,35 @@
+## 1.0.16（2023-04-18）
+优化实现细节
+## 1.0.15（2023-04-18）
+修复已知问题
+## 1.0.14（2023-04-18）
+修复条件编译导致的编译异常
+## 1.0.13（2023-04-10）
+修复vue3 小程序端依赖查找失败的问题
+## 1.0.12（2023-04-10）
+H5、APP端支持音频 小程序暂不支持
+## 1.0.11（2023-04-04）
+修复vue2编译到H5平台加载异常的问题
+## 1.0.10（2023-03-29）
+兼容vue2
+## 1.0.9（2023-03-08）
+修复props响应性丢失问题
+## 1.0.8（2023-03-04）
+新增svga文件加载完成事件 loaded
+## 1.0.7（2023-03-02）
+去除监听事件的on前缀
+## 1.0.6（2023-03-01）
+由于Hbuilderx上传插件无法上传node_odules依赖 导入插件后进入插件目录/uni_modules/c-svga   使用npm i 进行依赖安装 
+上两个版本请忽略
+## 1.0.5（2023-03-01）
+预置相关node_modules
+## 1.0.4（2023-03-01）
+预置相关node_modules
+## 1.0.3（2023-03-01）
+修改为node_modules依赖
+## 1.0.2（2023-02-28）
+优化APP端加载速度
+## 1.0.1（2023-01-11）
+修复已知问题
+## 1.0.0（2023-01-10）
+初次提交
diff --git a/uni_modules/c-svga/components/c-svga/c-svga.vue b/uni_modules/c-svga/components/c-svga/c-svga.vue
new file mode 100644
index 0000000..6f71098
--- /dev/null
+++ b/uni_modules/c-svga/components/c-svga/c-svga.vue
@@ -0,0 +1,267 @@
+<template>
+	<!-- #ifdef H5||APP-PLUS -->
+	<view class="c-svga" :style="{width,height}" :svgaData="svgaData" :change:svgaData="svga.render" :fun='fun' :change:fun='svga.callPlayer'>
+		<div :id='myCanvasId'></div>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef MP -->
+	<view class="c-svga" :style="{width,height}">
+		<canvas class="canvas" style="height: 100vh;"  :id="myCanvasId" type="2d"></canvas>
+	</view>
+	<!-- #endif -->
+</template>
+<script>
+	/**
+	 * c-svga svga组件
+	 * @property {String} canvasId 画布id
+	 * @property {String} width 图像宽度 默认750rpx 单位rpx/px
+	 * @property {String} height 图像高度 默认750rpx 单位rpx/px
+	 * @property {String} src svga文件地址
+	 * @property {Boolean} autoPlay 是否自动播放 默认true
+	 * @property {Number} loops 动画循环次数，默认值为 0，表示无限循环
+	 * @property {Boolean} clearsAfterStop 默认值为 true，表示当动画结束时，清空画布
+	 * @property {String} fillMode 默认值为 Forward，可选值 Forward / Backward，当 clearsAfterStop 为 false 时，Forward 表示动画会在结束后停留在最后一帧，Backward 则会在动画结束后停留在第一帧。
+	 * @property {Boolean} isOnChange 是否开启播放进度监听 默认false false时不触发Frame Percentage监听
+	 * @event {Function()} loaded 监听svga文件加载完成
+	 * @event {Function()} finished 监听动画停止播放 loop!=0时生效
+	 * @event {Function()} frame 监听动画播放至某帧
+	 * @event {Function()} percentage 监听动画播放至某进度
+	 * 组件内方法统一使用 call(funName, args) 调用player实例方法 详见文档
+	 * */
+	import uuid from './js/uuid.js'
+	// #ifdef MP&VUE2
+	import {Parser,Player} from '../../node_modules/svgaplayer-weapp'
+	// #endif
+	// #ifdef MP&VUE3
+	import {Parser,Player} from 'svgaplayer-weapp'
+	// #endif
+	export default {
+		name:"c-svga",
+		props: {
+			canvasId: {
+				type: String
+			},
+			width: {
+				type: String,
+				default: '750rpx'
+			},
+			height: {
+				type: String,
+				default: '750rpx'
+			},
+			src: {
+				type: String,
+				required: true
+			},
+			autoPlay: { //是否自动播放
+				type: Boolean,
+				default: true
+			},
+			loops: { //动画循环次数，默认值为 0，表示无限循环。
+				type: Number,
+				default: 0
+			},
+			clearsAfterStop: { //默认值为 true，表示当动画结束时，清空画布。
+				type: Boolean,
+				default: true
+			},
+			fillMode: { //默认值为 Forward，可选值 Forward / Backward，当 clearsAfterStop 为 false 时，Forward 表示动画会在结束后停留在最后一帧，Backward 则会在动画结束后停留在第一帧。
+				type: String,
+				default: 'Forward'
+			},
+			isOnChange: {
+				type: Boolean,
+				default: false
+			}
+		},
+		emits: ['loaded', 'finished', 'frame', 'percentage'],
+		data() {
+			return {
+				fun:{}
+			}
+		},
+		computed: {
+			myCanvasId() {
+				if (!this.canvasId) {
+					return 'c' + uuid(18)
+				} else {
+					return this.canvasId
+				}
+			},
+			svgaData(){
+				return {
+					myCanvasId: this.myCanvasId,
+					width: this.width,
+					height:this.height,
+					src: this.src,
+					autoPlay:this.autoPlay,
+					loops: this.loops,
+					clearsAfterStop:this.clearsAfterStop,
+					fillMode:this.fillMode,
+					isOnChange:this.isOnChange
+				}
+			}
+		},
+		watch:{
+			svgaData(){
+				// #ifdef MP
+				this.render()
+				// #endif
+			}
+		},
+		methods: {
+			call(name, args) {
+				this.fun = {name,args}
+				// #ifdef MP
+				this.callPlayer(this.fun)
+				// #endif
+			},
+			// #ifdef MP
+			getContext(){
+				return new Promise((resolve) => {
+					const {
+						pixelRatio
+					} = uni.getSystemInfoSync()
+					uni.createSelectorQuery()
+						.in(this)
+						.select(`#${this.myCanvasId}`)
+						.fields({
+							node: true,
+							size: true
+						})
+						.exec(res => {
+							const {
+								width,
+								height
+							} = res[0]
+							const canvas = res[0].node
+							resolve({
+								canvas,
+								width,
+								height,
+								pixelRatio
+							})
+						})
+				})
+			},
+			async render(){
+				if (!this.player) {
+					this.parser = new Parser;
+					this.player = new Player;
+					await this.player.setCanvas('#' +this.myCanvasId,this)
+				}
+				this.player.stopAnimation()
+				this.player.loops = this.loops
+				this.player.clearsAfterStop = this.clearsAfterStop
+				this.player.fillMode = this.fillMode
+				// console.time("test");
+				const videoItem = await this.parser.load(this.src);
+				await this.player.setVideoItem(videoItem);
+				// console.timeEnd("test");
+				this.$emit('loaded')
+				if (this.autoPlay) {
+					this.player.startAnimation();
+				}
+				this.player.onFinished(() => { //只有在loop不为0时候触发
+					// console.log('动画停止播放时回调');
+					this.$emit('finished')
+				})
+				if (this.isOnChange) {
+					this.player.onFrame(frame => { //动画播放至某帧后回调
+						// console.log(frame);
+						try {
+							this.$emit('frame', frame)
+						} catch (e) {
+							//TODO handle the exception
+							console.error(e);
+						}
+					})
+					this.player.onPercentage(percentage => { //动画播放至某进度后回调
+						// console.log(percentage);
+						try {
+							this.$emit('percentage', percentage)
+						} catch (e) {
+							//TODO handle the exception
+							console.error(e);
+						}
+					})
+				}
+			
+			},
+			callPlayer(val){
+				if (!val.name) return;
+				let {
+					name,
+					args
+				} = val
+				// console.log(name, args);
+				if (Array.isArray(args)) {
+					this.player[name](...args)
+				} else {
+					this.player[name](args)
+				}
+			},
+			// #endif
+			// #ifndef MP
+			receiveRenderData(val) {
+				// console.log(val);
+				this.$emit(val.name, val.val)
+			}
+			// #endif
+		},
+		mounted() {
+			// #ifdef MP
+			this.render()
+			// #endif
+		},
+		
+	}
+</script>
+
+
+<!-- #ifndef MP -->
+
+	<!-- #ifdef VUE3 -->
+	<script lang="renderjs" src='./js/render.js' module='svga'></script>
+	<!-- #endif -->
+	
+	<!-- #ifdef VUE2 -->
+	<script lang="renderjs" module='svga'>
+	import svgaRender from "./js/render.js"
+	export default {
+		mixins:[svgaRender]
+	}
+	</script>
+	<!-- #endif -->
+
+	
+<!-- #endif -->
+<style lang="scss" scoped>
+	.c-svga {
+		// width: v-bind(width);
+		// height: v-bind(height);
+
+		/* #ifndef MP */
+		div {
+			width: 100%;
+			height: 100%;
+			
+			position: absolute;
+			height: 100%;
+			width: 100%;
+			z-index: 9999;
+			left: 0;
+			bottom: calc(0px + constant(safe-area-inset-bottom));
+			bottom: calc(0px + env(safe-area-inset-bottom));
+			pointer-events: none;
+			text-align: left;
+		}
+
+		/* #endif */
+
+		.canvas {
+			width: 100%;
+			height: 100%;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/c-svga/components/c-svga/js/getfile.js b/uni_modules/c-svga/components/c-svga/js/getfile.js
new file mode 100644
index 0000000..e8cc366
--- /dev/null
+++ b/uni_modules/c-svga/components/c-svga/js/getfile.js
@@ -0,0 +1,67 @@
+export default function getfile(e,isIosDown=false) {
+	// #ifdef APP-PLUS
+	let isIOS = plus.os.name==='iOS'
+	let url = plus.io.convertLocalFileSystemURL(e)
+	return new Promise((resolve, reject) => {
+		if (/(http|https):\/\/([\w.]+\/?)\S*/.test(url)) {
+			if(!isIosDown||!isIOS){
+				resolve(e)
+				return
+			}
+			if(isIOS){
+				let dtask = plus.downloader.createDownload(url, {}, function(d, status) {
+					// 下载完成
+					if (status == 200) {
+						let newurl = plus.io.convertLocalFileSystemURL(d.filename);
+						// console.log("Download success: " + newurl);
+						plus.io.resolveLocalFileSystemURL(newurl, entry => {
+							let reader = null;
+							entry.file(file => {
+								reader = new plus.io.FileReader();
+								reader.onloadend = (read) => {
+									resolve(read.target.result)
+								};
+								reader.readAsDataURL(file);
+							}, function(error) {
+								 console.log(error.message);
+							});
+						}, err => {
+							resolve(e)
+						})
+
+					} else {
+						console.log("Download failed: " + status);
+						reject(status)
+					}
+				})
+				dtask.start();
+			}
+		} else {
+
+			plus.io.resolveLocalFileSystemURL(url, entry => {
+				let reader = null;
+				entry.file(file => {
+					reader = new plus.io.FileReader();
+					reader.onloadend = (read) => {
+						resolve(read.target.result)
+					};
+					reader.readAsDataURL(file);
+				}, function(error) {
+					 console.log(error.message);
+				});
+			}, err => {
+				resolve(e)
+			})
+
+		}
+
+	})
+	// #endif
+	// #ifdef H5
+
+	return new Promise((resolve, reject) => {
+		resolve(e)
+	})
+
+	// #endif
+}
diff --git a/uni_modules/c-svga/components/c-svga/js/render.js b/uni_modules/c-svga/components/c-svga/js/render.js
new file mode 100644
index 0000000..283ed1a
--- /dev/null
+++ b/uni_modules/c-svga/components/c-svga/js/render.js
@@ -0,0 +1,120 @@
+// #ifdef VUE3
+import { Howl } from 'howler';
+import SVGA from 'svgaplayerweb'
+// #endif
+
+// #ifdef VUE2
+import SVGA from '../../../node_modules/svgaplayerweb'
+import { Howl } from '../../../node_modules/howler';
+// #endif
+import getfile from './getfile.js'
+export default {
+	data() {
+		return {
+			player:null,
+			parser:null,
+			pdata:{}
+		}
+	},
+	methods: {
+		dataURLtoBlob(dataURL) {
+		  // 获取 Data URL 的数据部分，去掉头信息
+		  let parts = dataURL.split(',');
+		  let contentType = parts[0].split(':')[1];
+		  let raw = parts[1];
+		
+		  // 将 Data URL 转换为 Blob 对象
+		  let byteString = atob(raw);
+		  let arrayBuffer = new ArrayBuffer(byteString.length);
+		  let uint8Array = new Uint8Array(arrayBuffer);
+		  for (let i = 0; i < byteString.length; i++) {
+		    uint8Array[i] = byteString.charCodeAt(i);
+		  }
+		  return new Blob([arrayBuffer], {type: contentType});
+		},
+		async render(val,oldValue,vm) {
+			this.$nextTick(async()=>{
+					let data,player,parser;
+					if(val){
+						data =val
+						this.pdata=data
+					}else{
+						data=this.pdata
+					}
+					if(!data.src){
+						//console.error('缺少src');
+						return 
+					} 
+					if(!this.player){
+						player = new SVGA.Player('#'+data.myCanvasId);
+						parser = new SVGA.Parser();
+					}else{
+						player=this.player
+						parser=this.parser
+						player.stopAnimation()
+					}
+					player.loops=data.loops
+					player.clearsAfterStop=data.clearsAfterStop
+					player.fillMode=data.fillMode
+					// console.time("test");
+					// console.log(await getfile(data.src));
+					// return
+					parser.load(await getfile(data.src),(videoItem)=>{
+						player.setVideoItem(videoItem);
+						// console.log(player,videoItem);
+						// let {audios,images} = videoItem
+						// let audioFile="data:audio/x-mpeg;base64," + images[audios[0].audioKey] 
+						// console.log(URL.createObjectURL(this.dataURLtoBlob(audioFile)));
+						// console.timeEnd("test");
+						
+						this.$ownerInstance.callMethod('receiveRenderData',{name:'loaded'})
+						if(data.autoPlay){
+							player.startAnimation();
+						}
+					},err=>{
+						console.error(err);
+					})
+					
+					player.onFinished(()=>{ //只有在loop不为0时候触发
+						// console.log('动画停止播放时回调');
+						vm.callMethod('receiveRenderData',{name:'finished'})
+					})
+					if(data.isOnChange){
+						player.onFrame(frame=>{ //动画播放至某帧后回调
+							// console.log(frame);
+							vm.callMethod('receiveRenderData',{name:'frame',val:frame})
+						})
+						player.onPercentage(percentage=>{ //动画播放至某进度后回调
+							// console.log(percentage);
+							vm.callMethod('receiveRenderData',{name:'percentage',val:percentage})
+						})
+					}
+					this.player=player
+					this.parser=parser
+			});
+		},
+		async callPlayer(val){
+			if(!val.name)return;
+			let {name, args} = val
+			// console.log(name, args);
+			if(name=='setImage'){
+				args[0]=await getfile(args[0])
+			}
+			if(name=='clearDynamicObjects'){
+				const parser = new SVGA.Parser();
+				parser.load(await getfile(this.pdata.src),(videoItem)=>{
+					this.player.setVideoItem(videoItem);
+					this.player.startAnimation();
+				})
+			}
+			if(Array.isArray(args)){
+				this.player[name](...args)
+			}else{
+				this.player[name](args)
+			}
+		}
+		
+	},
+	mounted() {
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/components/c-svga/js/uuid.js b/uni_modules/c-svga/components/c-svga/js/uuid.js
new file mode 100644
index 0000000..d9c4505
--- /dev/null
+++ b/uni_modules/c-svga/components/c-svga/js/uuid.js
@@ -0,0 +1,23 @@
+
+export default (len = 32, radix = null) => {
+	let chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+	let 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];
+			}
+		}
+	}
+	return uuid.join('');
+}
diff --git a/uni_modules/c-svga/node_modules/howler/LICENSE.md b/uni_modules/c-svga/node_modules/howler/LICENSE.md
new file mode 100644
index 0000000..29686f5
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/howler/LICENSE.md
@@ -0,0 +1,20 @@
+Copyright (c) 2013-2020 James Simpson and GoldFire Studios, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/howler/README.md b/uni_modules/c-svga/node_modules/howler/README.md
new file mode 100644
index 0000000..4a4766f
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/howler/README.md
@@ -0,0 +1,564 @@
+[![howler.js](https://s3.amazonaws.com/howler.js/howler-logo.png "howler.js")](https://howlerjs.com)
+
+# Description
+[howler.js](https://howlerjs.com) is an audio library for the modern web. It defaults to [Web Audio API](http://webaudio.github.io/web-audio-api/) and falls back to [HTML5 Audio](https://html.spec.whatwg.org/multipage/embedded-content.html#the-audio-element). This makes working with audio in JavaScript easy and reliable across all platforms.
+
+Additional information, live demos and a user showcase are available at [howlerjs.com](https://howlerjs.com).
+
+Follow on Twitter for howler.js and development-related discussion: [@GoldFireStudios](https://twitter.com/goldfirestudios).
+
+### Features
+* Single API for all audio needs
+* Defaults to Web Audio API and falls back to HTML5 Audio
+* Handles edge cases and bugs across environments
+* Supports all codecs for full cross-browser support
+* Automatic caching for improved performance
+* Control sounds individually, in groups or globally
+* Playback of multiple sounds at once
+* Easy sound sprite definition and playback
+* Full control for fading, rate, seek, volume, etc.
+* Easily add 3D spatial sound or stereo panning
+* Modular - use what you want and easy to extend
+* No outside dependencies, just pure JavaScript
+* As light as 7kb gzipped
+
+### Browser Compatibility
+Tested in the following browsers/versions:
+* Google Chrome 7.0+
+* Internet Explorer 9.0+
+* Firefox 4.0+
+* Safari 5.1.4+
+* Mobile Safari 6.0+ (after user input)
+* Opera 12.0+
+* Microsoft Edge
+
+### Live Demos
+* [Audio Player](https://howlerjs.com/#player)
+* [Radio](https://howlerjs.com/#radio)
+* [Spatial Audio](https://howlerjs.com/#spatial)
+* [Audio Sprites](https://howlerjs.com/#sprite)
+
+# Documentation
+
+### Contents
+* [Quick Start](#quick-start)
+* [Examples](#examples)
+* [Core](#core)
+  * [Options](#options)
+  * [Methods](#methods)
+  * [Global Options](#global-options)
+  * [Global Methods](#global-methods)
+* [Plugin: Spatial](#plugin-spatial)
+  * [Options](#options-1)
+  * [Methods](#methods-1)
+  * [Global Methods](#global-methods-1)
+* [Group Playback](#group-playback)
+* [Mobile Playback](#mobilechrome-playback)
+* [Dolby Audio Playback](#dolby-audio-playback)
+* [Facebook Instant Games](#facebook-instant-games)
+* [Format Recommendations](#format-recommendations)
+* [License](#license)
+
+### Quick Start
+
+Several options to get up and running:
+
+* Clone the repo: `git clone https://github.com/goldfire/howler.js.git`
+* Install with [npm](https://www.npmjs.com/package/howler): `npm install howler`
+* Install with [Yarn](https://yarnpkg.com/en/package/howler): `yarn add howler`
+* Install with [Bower](http://bower.io/): `bower install howler`
+* Hosted CDN: [`cdnjs`](https://cdnjs.com/libraries/howler) [`jsDelivr`](https://www.jsdelivr.com/projects/howler.js)
+
+In the browser:
+
+```html
+<script src="/path/to/howler.js"></script>
+<script>
+    var sound = new Howl({
+      src: ['sound.webm', 'sound.mp3']
+    });
+</script>
+```
+
+As a dependency:
+
+```javascript
+import {Howl, Howler} from 'howler';
+```
+
+```javascript
+const {Howl, Howler} = require('howler');
+```
+
+Included distribution files:
+
+* **howler**: This is the default and fully bundled source that includes `howler.core` and `howler.spatial`. It includes all functionality that howler comes with.
+* **howler.core**: This includes only the core functionality that aims to create parity between Web Audio and HTML5 Audio. It doesn't include any of the spatial/stereo audio functionality.
+* **howler.spatial**: This is a plugin that adds spatial/stereo audio functionality. It requires `howler.core` to operate as it is simply an add-on to the core.
+
+
+### Examples
+
+##### Most basic, play an MP3:
+```javascript
+var sound = new Howl({
+  src: ['sound.mp3']
+});
+
+sound.play();
+```
+
+##### Streaming audio (for live audio or large files):
+```javascript
+var sound = new Howl({
+  src: ['stream.mp3'],
+  html5: true
+});
+
+sound.play();
+```
+
+##### More playback options:
+```javascript
+var sound = new Howl({
+  src: ['sound.webm', 'sound.mp3', 'sound.wav'],
+  autoplay: true,
+  loop: true,
+  volume: 0.5,
+  onend: function() {
+    console.log('Finished!');
+  }
+});
+```
+
+##### Define and play a sound sprite:
+```javascript
+var sound = new Howl({
+  src: ['sounds.webm', 'sounds.mp3'],
+  sprite: {
+    blast: [0, 3000],
+    laser: [4000, 1000],
+    winner: [6000, 5000]
+  }
+});
+
+// Shoot the laser!
+sound.play('laser');
+```
+
+##### Listen for events:
+```javascript
+var sound = new Howl({
+  src: ['sound.webm', 'sound.mp3']
+});
+
+// Clear listener after first call.
+sound.once('load', function(){
+  sound.play();
+});
+
+// Fires when the sound finishes playing.
+sound.on('end', function(){
+  console.log('Finished!');
+});
+```
+
+##### Control multiple sounds:
+```javascript
+var sound = new Howl({
+  src: ['sound.webm', 'sound.mp3']
+});
+
+// Play returns a unique Sound ID that can be passed
+// into any method on Howl to control that specific sound.
+var id1 = sound.play();
+var id2 = sound.play();
+
+// Fade out the first sound and speed up the second.
+sound.fade(1, 0, 1000, id1);
+sound.rate(1.5, id2);
+```
+
+##### ES6:
+```javascript
+import {Howl, Howler} from 'howler';
+
+// Setup the new Howl.
+const sound = new Howl({
+  src: ['sound.webm', 'sound.mp3']
+});
+
+// Play the sound.
+sound.play();
+
+// Change global volume.
+Howler.volume(0.5);
+```
+
+
+More in-depth examples (with accompanying live demos) can be found in the [examples directory](https://github.com/goldfire/howler.js/tree/master/examples).
+
+
+## Core
+
+### Options
+#### src `Array/String` `[]` *`required`*
+The sources to the track(s) to be loaded for the sound (URLs or base64 data URIs). These should be in order of preference, howler.js will automatically load the first one that is compatible with the current browser. If your files have no extensions, you will need to explicitly specify the extension using the `format` property.
+#### volume `Number` `1.0`
+The volume of the specific track, from `0.0` to `1.0`.
+#### html5 `Boolean` `false`
+Set to `true` to force HTML5 Audio. This should be used for large audio files so that you don't have to wait for the full file to be downloaded and decoded before playing.
+#### loop `Boolean` `false`
+Set to `true` to automatically loop the sound forever.
+#### preload `Boolean|String` `true`
+Automatically begin downloading the audio file when the `Howl` is defined. If using HTML5 Audio, you can set this to `'metadata'` to only preload the file's metadata (to get its duration without download the entire file, for example). 
+#### autoplay `Boolean` `false`
+Set to `true` to automatically start playback when sound is loaded.
+#### mute `Boolean` `false`
+Set to `true` to load the audio muted.
+#### sprite `Object` `{}`
+Define a sound sprite for the sound. The offset and duration are defined in milliseconds. A third (optional) parameter is available to set a sprite as looping. An easy way to generate compatible sound sprites is with [audiosprite](https://github.com/tonistiigi/audiosprite).
+```javascript
+new Howl({
+  sprite: {
+    key1: [offset, duration, (loop)]
+  },
+});
+```
+#### rate `Number` `1.0`
+The rate of playback. 0.5 to 4.0, with 1.0 being normal speed.
+#### pool `Number` `5`
+The size of the inactive sounds pool. Once sounds are stopped or finish playing, they are marked as ended and ready for cleanup. We keep a pool of these to recycle for improved performance. Generally this doesn't need to be changed. It is important to keep in mind that when a sound is paused, it won't be removed from the pool and will still be considered active so that it can be resumed later.
+#### format `Array` `[]`
+howler.js automatically detects your file format from the extension, but you may also specify a format in situations where extraction won't work (such as with a SoundCloud stream).
+#### xhr `Object` `null`
+When using Web Audio, howler.js uses an XHR request to load the audio files. If you need to send custom headers, set the HTTP method or enable `withCredentials` ([see reference](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/withCredentials)), include them with this parameter. Each is optional (method defaults to `GET`, headers default to `null` and withCredentials defaults to `false`). For example:
+```javascript
+// Using each of the properties.
+new Howl({
+  xhr: {
+    method: 'POST',
+    headers: {
+      Authorization: 'Bearer:' + token,
+    },
+    withCredentials: true,
+  }
+});
+
+// Only changing the method.
+new Howl({
+  xhr: {
+    method: 'POST',
+  }
+});
+```
+#### onload `Function`
+Fires when the sound is loaded.
+#### onloaderror `Function`
+Fires when the sound is unable to load. The first parameter is the ID of the sound (if it exists) and the second is the error message/code.
+
+The load error codes are [defined in the spec](http://dev.w3.org/html5/spec-author-view/spec.html#mediaerror):
+* **1** - The fetching process for the media resource was aborted by the user agent at the user's request.
+* **2** - A network error of some description caused the user agent to stop fetching the media resource, after the resource was established to be usable.
+* **3** - An error of some description occurred while decoding the media resource, after the resource was established to be usable.
+* **4** - The media resource indicated by the src attribute or assigned media provider object was not suitable.
+#### onplayerror `Function`
+Fires when the sound is unable to play. The first parameter is the ID of the sound and the second is the error message/code.
+#### onplay `Function`
+Fires when the sound begins playing. The first parameter is the ID of the sound.
+#### onend `Function`
+Fires when the sound finishes playing (if it is looping, it'll fire at the end of each loop). The first parameter is the ID of the sound.
+#### onpause `Function`
+Fires when the sound has been paused. The first parameter is the ID of the sound.
+#### onstop `Function`
+Fires when the sound has been stopped. The first parameter is the ID of the sound.
+#### onmute `Function`
+Fires when the sound has been muted/unmuted. The first parameter is the ID of the sound.
+#### onvolume `Function`
+Fires when the sound's volume has changed. The first parameter is the ID of the sound.
+#### onrate `Function`
+Fires when the sound's playback rate has changed. The first parameter is the ID of the sound.
+#### onseek `Function`
+Fires when the sound has been seeked. The first parameter is the ID of the sound.
+#### onfade `Function`
+Fires when the current sound finishes fading in/out. The first parameter is the ID of the sound.
+#### onunlock `Function`
+Fires when audio has been automatically unlocked through a touch/click event.
+
+
+### Methods
+#### play([sprite/id])
+Begins playback of a sound. Returns the sound id to be used with other methods. Only method that can't be chained.
+* **sprite/id**: `String/Number` `optional` Takes one parameter that can either be a sprite or sound ID. If a sprite is passed, a new sound will play based on the sprite's definition. If a sound ID is passed, the previously played sound will be played (for example, after pausing it). However, if an ID of a sound that has been drained from the pool is passed, nothing will play.
+
+#### pause([id])
+Pauses playback of sound or group, saving the `seek` of playback.
+* **id**: `Number` `optional` The sound ID. If none is passed, all sounds in group are paused.
+
+#### stop([id])
+Stops playback of sound, resetting `seek` to `0`.
+* **id**: `Number` `optional` The sound ID. If none is passed, all sounds in group are stopped.
+
+#### mute([muted], [id])
+Mutes the sound, but doesn't pause the playback.
+* **muted**: `Boolean` `optional` True to mute and false to unmute.
+* **id**: `Number` `optional` The sound ID. If none is passed, all sounds in group are stopped.
+
+#### volume([volume], [id])
+Get/set volume of this sound or the group. This method optionally takes 0, 1 or 2 arguments.
+* **volume**: `Number` `optional` Volume from `0.0` to `1.0`.
+* **id**: `Number` `optional` The sound ID. If none is passed, all sounds in group have volume altered relative to their own volume.
+
+#### fade(from, to, duration, [id])
+Fade a currently playing sound between two volumes. Fires the `fade` event when complete.
+* **from**: `Number` Volume to fade from (`0.0` to `1.0`).
+* **to**: `Number` Volume to fade to (`0.0` to `1.0`).
+* **duration**: `Number` Time in milliseconds to fade.
+* **id**: `Number` `optional` The sound ID. If none is passed, all sounds in group will fade.
+
+#### rate([rate], [id])
+Get/set the rate of playback for a sound. This method optionally takes 0, 1 or 2 arguments.
+* **rate**: `Number` `optional` The rate of playback. 0.5 to 4.0, with 1.0 being normal speed.
+* **id**: `Number` `optional` The sound ID. If none is passed, playback rate of all sounds in group will change.
+
+#### seek([seek], [id])
+Get/set the position of playback for a sound. This method optionally takes 0, 1 or 2 arguments.
+* **seek**: `Number` `optional` The position to move current playback to (in seconds).
+* **id**: `Number` `optional` The sound ID. If none is passed, the first sound will seek.
+
+#### loop([loop], [id])
+Get/set whether to loop the sound or group. This method can optionally take 0, 1 or 2 arguments.
+* **loop**: `Boolean` `optional` To loop or not to loop, that is the question.
+* **id**: `Number` `optional` The sound ID. If none is passed, all sounds in group will have their `loop` property updated.
+
+#### state()
+Check the load status of the `Howl`, returns a `unloaded`, `loading` or `loaded`.
+
+#### playing([id])
+Check if a sound is currently playing or not, returns a `Boolean`. If no sound ID is passed, check if any sound in the `Howl` group is playing.
+* **id**: `Number` `optional` The sound ID to check.
+
+#### duration([id])
+Get the duration of the audio source (in seconds). Will return 0 until after the `load` event fires.
+* **id**: `Number` `optional` The sound ID to check. Passing an ID will return the duration of the sprite being played on this instance; otherwise, the full source duration is returned.
+
+#### on(event, function, [id])
+Listen for events. Multiple events can be added by calling this multiple times.
+* **event**: `String` Name of event to fire/set (`load`, `loaderror`, `playerror`, `play`, `end`, `pause`, `stop`, `mute`, `volume`, `rate`, `seek`, `fade`, `unlock`).
+* **function**: `Function` Define function to fire on event.
+* **id**: `Number` `optional` Only listen to events for this sound id.
+
+#### once(event, function, [id])
+Same as `on`, but it removes itself after the callback is fired.
+* **event**: `String` Name of event to fire/set (`load`, `loaderror`, `playerror`, `play`, `end`, `pause`, `stop`, `mute`, `volume`, `rate`, `seek`, `fade`, `unlock`).
+* **function**: `Function` Define function to fire on event.
+* **id**: `Number` `optional` Only listen to events for this sound id.
+
+#### off(event, [function], [id])
+Remove event listener that you've set. Call without parameters to remove all events.
+* **event**: `String` Name of event (`load`, `loaderror`, `playerror`, `play`, `end`, `pause`, `stop`, `mute`, `volume`, `rate`, `seek`, `fade`, `unlock`).
+* **function**: `Function` `optional` The listener to remove. Omit this to remove all events of type.
+* **id**: `Number` `optional` Only remove events for this sound id.
+
+#### load()
+This is called by default, but if you set `preload` to false, you must call `load` before you can play any sounds.
+
+#### unload()
+Unload and destroy a Howl object. This will immediately stop all sounds attached to this sound and remove it from the cache.
+
+
+### Global Options
+#### usingWebAudio `Boolean`
+`true` if the Web Audio API is available.
+#### noAudio `Boolean`
+`true` if no audio is available.
+#### autoUnlock `Boolean` `true`
+Automatically attempts to enable audio on mobile (iOS, Android, etc) devices and desktop Chrome/Safari.
+#### html5PoolSize `Number` `10`
+Each HTML5 Audio object must be unlocked individually, so we keep a global pool of unlocked nodes to share between all `Howl` instances. This pool gets created on the first user interaction and is set to the size of this property.
+#### autoSuspend `Boolean` `true`
+Automatically suspends the Web Audio AudioContext after 30 seconds of inactivity to decrease processing and energy usage. Automatically resumes upon new playback. Set this property to `false` to disable this behavior.
+#### ctx `Boolean` *`Web Audio Only`*
+Exposes the `AudioContext` with Web Audio API.
+#### masterGain `Boolean` *`Web Audio Only`*
+Exposes the master `GainNode` with Web Audio API. This can be useful for writing plugins or advanced usage.
+
+
+### Global Methods
+The following methods are used to modify all sounds globally, and are called from the `Howler` object.
+#### mute(muted)
+Mute or unmute all sounds.
+* **muted**: `Boolean` True to mute and false to unmute.
+
+#### volume([volume])
+Get/set the global volume for all sounds, relative to their own volume.
+* **volume**: `Number` `optional` Volume from `0.0` to `1.0`.
+
+#### stop()
+Stop all sounds and reset their seek position to the beginning.
+
+#### codecs(ext)
+Check supported audio codecs. Returns `true` if the codec is supported in the current browser.
+* **ext**: `String` File extension. One of: "mp3", "mpeg", "opus", "ogg", "oga", "wav", "aac", "caf", "m4a", "m4b", "mp4", "weba", "webm", "dolby", "flac".
+
+#### unload()
+Unload and destroy all currently loaded Howl objects. This will immediately stop all sounds and remove them from cache.
+
+
+## Plugin: Spatial
+
+### Options
+#### orientation `Array` `[1, 0, 0]`
+Sets the direction the audio source is pointing in the 3D cartesian coordinate space. Depending on how directional the sound is, based on the `cone` attributes, a sound pointing away from the listener can be quiet or silent.
+#### stereo `Number` `null`
+Sets the stereo panning value of the audio source for this sound or group. This makes it easy to setup left/right panning with a value of `-1.0` being far left and a value of `1.0` being far right.
+#### pos `Array` `null`
+Sets the 3D spatial position of the audio source for this sound or group relative to the global listener.
+#### pannerAttr `Object`
+Sets the panner node's attributes for a sound or group of sounds. See the `pannerAttr` method for all available options.
+#### onstereo `Function`
+Fires when the current sound has the stereo panning changed. The first parameter is the ID of the sound.
+#### onpos `Function`
+Fires when the current sound has the listener position changed. The first parameter is the ID of the sound.
+#### onorientation `Function`
+Fires when the current sound has the direction of the listener changed. The first parameter is the ID of the sound.
+
+
+### Methods
+#### stereo(pan, [id])
+Get/set the stereo panning of the audio source for this sound or all in the group.
+* **pan**: `Number` A value of `-1.0` is all the way left and `1.0` is all the way right.
+* **id**: `Number` `optional` The sound ID. If none is passed, all in group will be updated.
+
+#### pos(x, y, z, [id])
+Get/set the 3D spatial position of the audio source for this sound or group relative to the global listener.
+* **x**: `Number` The x-position of the audio source.
+* **y**: `Number` The y-position of the audio source.
+* **z**: `Number` The z-position of the audio source.
+* **id**: `Number` `optional` The sound ID. If none is passed, all in group will be updated.
+
+#### orientation(x, y, z, [id])
+Get/set the direction the audio source is pointing in the 3D cartesian coordinate space. Depending on how directional the sound is, based on the `cone` attributes, a sound pointing away from the listener can be quiet or silent.
+* **x**: `Number` The x-orientation of the source.
+* **y**: `Number` The y-orientation of the source.
+* **z**: `Number` The z-orientation of the source.
+* **id**: `Number` `optional` The sound ID. If none is passed, all in group will be updated.
+
+#### pannerAttr(o, [id])
+Get/set the panner node's attributes for a sound or group of sounds.
+* **o**: `Object` All values to update.
+  * **coneInnerAngle** `360` A parameter for directional audio sources, this is an angle, in degrees, inside of which there will be no volume reduction.
+  * **coneOuterAngle** `360` A parameter for directional audio sources, this is an angle, in degrees, outside of which the volume will be reduced to a constant value of `coneOuterGain`.
+  * **coneOuterGain** `0` A parameter for directional audio sources, this is the gain outside of the `coneOuterAngle`. It is a linear value in the range `[0, 1]`.
+  * **distanceModel** `inverse` Determines algorithm used to reduce volume as audio moves away from listener. Can be `linear`, `inverse` or `exponential`. You can find the implementations of each in the [spec](https://webaudio.github.io/web-audio-api/#idl-def-DistanceModelType).
+  * **maxDistance** `10000` The maximum distance between source and listener, after which the volume will not be reduced any further.
+  * **refDistance** `1` A reference distance for reducing volume as source moves further from the listener. This is simply a variable of the distance model and has a different effect depending on which model is used and the scale of your coordinates. Generally, volume will be equal to 1 at this distance.
+  * **rolloffFactor** `1` How quickly the volume reduces as source moves from listener. This is simply a variable of the distance model and can be in the range of `[0, 1]` with `linear` and `[0, ∞]` with `inverse` and `exponential`.
+  * **panningModel** `HRTF` Determines which spatialization algorithm is used to position audio. Can be `HRTF` or `equalpower`.
+* **id**: `Number` `optional` The sound ID. If none is passed, all in group will be updated.
+
+
+### Global Methods
+#### stereo(pan)
+Helper method to update the stereo panning position of all current `Howls`. Future `Howls` will not use this value unless explicitly set.
+* **pan**: `Number` A value of -1.0 is all the way left and 1.0 is all the way right.
+
+#### pos(x, y, z)
+Get/set the position of the listener in 3D cartesian space. Sounds using 3D position will be relative to the listener's position.
+* **x**: `Number` The x-position of the listener.
+* **y**: `Number` The y-position of the listener.
+* **z**: `Number` The z-position of the listener.
+
+#### orientation(x, y, z, xUp, yUp, zUp)
+Get/set the direction the listener is pointing in the 3D cartesian space. A front and up vector must be provided. The front is the direction the face of the listener is pointing, and up is the direction the top of the listener is pointing. Thus, these values are expected to be at right angles from each other.
+* **x**: `Number` The x-orientation of listener.
+* **y**: `Number` The y-orientation of listener.
+* **z**: `Number` The z-orientation of listener.
+* **xUp**: `Number` The x-orientation of the top of the listener.
+* **yUp**: `Number` The y-orientation of the top of the listener.
+* **zUp**: `Number` The z-orientation of the top of the listener.
+
+
+### Group Playback
+Each `new Howl()` instance is also a group. You can play multiple sound instances from the `Howl` and control them individually or as a group (note: each `Howl` can only contain a single audio file). For example, the following plays two sounds from a sprite, changes their volume together and then pauses both of them at the same time.
+
+```javascript
+var sound = new Howl({
+  src: ['sound.webm', 'sound.mp3'],
+  sprite: {
+    track01: [0, 20000],
+    track02: [21000, 41000]
+  }
+});
+
+// Play each of the track.s
+sound.play('track01');
+sound.play('track02');
+
+// Change the volume of both tracks.
+sound.volume(0.5);
+
+// After a second, pause both sounds in the group.
+setTimeout(function() {
+  sound.pause();
+}, 1000);
+```
+
+
+### Mobile/Chrome Playback
+By default, audio on mobile browsers and Chrome/Safari is locked until a sound is played within a user interaction, and then it plays normally the rest of the page session ([Apple documentation](https://developer.apple.com/library/safari/documentation/audiovideo/conceptual/using_html5_audio_video/PlayingandSynthesizingSounds/PlayingandSynthesizingSounds.html)). The default behavior of howler.js is to attempt to silently unlock audio playback by playing an empty buffer on the first `touchend` event. This behavior can be disabled by calling:
+
+```javascript
+Howler.autoUnlock = false;
+```
+
+If you try to play audio automatically on page load, you can listen to a `playerror` event and then wait for the `unlock` event to try and play the audio again:
+
+```javascript
+var sound = new Howl({
+  src: ['sound.webm', 'sound.mp3'],
+  onplayerror: function() {
+    sound.once('unlock', function() {
+      sound.play();
+    });
+  }
+});
+
+sound.play();
+```
+
+
+### Dolby Audio Playback
+Full support for playback of the Dolby Audio format (currently support in Edge and Safari) is included. However, you must specify that the file you are loading is `dolby` since it is in a `mp4` container.
+
+```javascript
+var dolbySound = new Howl({
+  src: ['sound.mp4', 'sound.webm', 'sound.mp3'],
+  format: ['dolby', 'webm', 'mp3']
+});
+```
+
+### Facebook Instant Games
+Howler.js provides audio support for the new [Facebook Instant Games](https://developers.facebook.com/docs/games/instant-games/engine-recommendations) platform. If you encounter any issues while developing for Instant Games, open an issue with the tag `[IG]`.
+
+### Format Recommendations
+Howler.js supports a wide array of audio codecs that have varying browser support ("mp3", "opus", "ogg", "wav", "aac", "m4a", "m4b", "mp4", "webm", ...), but if you want full browser coverage you still need to use at least two of them. If your goal is to have the best balance of small filesize and high quality, based on extensive production testing, your best bet is to default to `webm` and fallback to `mp3`. `webm` has nearly full browser coverage with a great combination of compression and quality. You'll need the `mp3` fallback for Internet Explorer.
+
+It is important to remember that howler.js selects the first compatible sound from your array of sources. So if you want `webm` to be used before `mp3`, you need to put the sources in that order.
+
+If you want your `webm` files to be seekable in Firefox, be sure to encode them with the cues element. One way to do this is by using the `dash` flag in [ffmpeg](https://www.ffmpeg.org/):
+
+```
+ffmpeg -i sound1.wav -dash 1 sound1.webm
+```
+
+### Sponsors
+Support the ongoing development of howler.js and get your logo on our README with a link to your site [[become a sponsor](https://github.com/sponsors/goldfire)]. You can also become a backer at a lower tier and get your name in the [BACKERS](https://github.com/goldfire/howler.js/blob/master/BACKERS.md) list. All support is greatly appreciated!
+
+[![GoldFire Studios](https://s3.amazonaws.com/howler.js/sponsors/goldfire_studios.png "GoldFire Studios")](https://goldfirestudios.com)
+
+### License
+
+Copyright (c) 2013-2021 [James Simpson](https://twitter.com/GoldFireStudios) and [GoldFire Studios, Inc.](http://goldfirestudios.com)
+
+Released under the [MIT License](https://github.com/goldfire/howler.js/blob/master/LICENSE.md).
diff --git a/uni_modules/c-svga/node_modules/howler/dist/howler.core.min.js b/uni_modules/c-svga/node_modules/howler/dist/howler.core.min.js
new file mode 100644
index 0000000..3901ac4
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/howler/dist/howler.core.min.js
@@ -0,0 +1,2 @@
+/*! howler.js v2.2.4 | (c) 2013-2020, James Simpson of GoldFire Studios | MIT License | howlerjs.com */
+!function(){"use strict";var e=function(){this.init()};e.prototype={init:function(){var e=this||n;return e._counter=1e3,e._html5AudioPool=[],e.html5PoolSize=10,e._codecs={},e._howls=[],e._muted=!1,e._volume=1,e._canPlayEvent="canplaythrough",e._navigator="undefined"!=typeof window&&window.navigator?window.navigator:null,e.masterGain=null,e.noAudio=!1,e.usingWebAudio=!0,e.autoSuspend=!0,e.ctx=null,e.autoUnlock=!0,e._setup(),e},volume:function(e){var o=this||n;if(e=parseFloat(e),o.ctx||_(),void 0!==e&&e>=0&&e<=1){if(o._volume=e,o._muted)return o;o.usingWebAudio&&o.masterGain.gain.setValueAtTime(e,n.ctx.currentTime);for(var t=0;t<o._howls.length;t++)if(!o._howls[t]._webAudio)for(var r=o._howls[t]._getSoundIds(),a=0;a<r.length;a++){var u=o._howls[t]._soundById(r[a]);u&&u._node&&(u._node.volume=u._volume*e)}return o}return o._volume},mute:function(e){var o=this||n;o.ctx||_(),o._muted=e,o.usingWebAudio&&o.masterGain.gain.setValueAtTime(e?0:o._volume,n.ctx.currentTime);for(var t=0;t<o._howls.length;t++)if(!o._howls[t]._webAudio)for(var r=o._howls[t]._getSoundIds(),a=0;a<r.length;a++){var u=o._howls[t]._soundById(r[a]);u&&u._node&&(u._node.muted=!!e||u._muted)}return o},stop:function(){for(var e=this||n,o=0;o<e._howls.length;o++)e._howls[o].stop();return e},unload:function(){for(var e=this||n,o=e._howls.length-1;o>=0;o--)e._howls[o].unload();return e.usingWebAudio&&e.ctx&&void 0!==e.ctx.close&&(e.ctx.close(),e.ctx=null,_()),e},codecs:function(e){return(this||n)._codecs[e.replace(/^x-/,"")]},_setup:function(){var e=this||n;if(e.state=e.ctx?e.ctx.state||"suspended":"suspended",e._autoSuspend(),!e.usingWebAudio)if("undefined"!=typeof Audio)try{var o=new Audio;void 0===o.oncanplaythrough&&(e._canPlayEvent="canplay")}catch(n){e.noAudio=!0}else e.noAudio=!0;try{var o=new Audio;o.muted&&(e.noAudio=!0)}catch(e){}return e.noAudio||e._setupCodecs(),e},_setupCodecs:function(){var e=this||n,o=null;try{o="undefined"!=typeof Audio?new Audio:null}catch(n){return e}if(!o||"function"!=typeof o.canPlayType)return e;var t=o.canPlayType("audio/mpeg;").replace(/^no$/,""),r=e._navigator?e._navigator.userAgent:"",a=r.match(/OPR\/(\d+)/g),u=a&&parseInt(a[0].split("/")[1],10)<33,d=-1!==r.indexOf("Safari")&&-1===r.indexOf("Chrome"),i=r.match(/Version\/(.*?) /),_=d&&i&&parseInt(i[1],10)<15;return e._codecs={mp3:!(u||!t&&!o.canPlayType("audio/mp3;").replace(/^no$/,"")),mpeg:!!t,opus:!!o.canPlayType('audio/ogg; codecs="opus"').replace(/^no$/,""),ogg:!!o.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),oga:!!o.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),wav:!!(o.canPlayType('audio/wav; codecs="1"')||o.canPlayType("audio/wav")).replace(/^no$/,""),aac:!!o.canPlayType("audio/aac;").replace(/^no$/,""),caf:!!o.canPlayType("audio/x-caf;").replace(/^no$/,""),m4a:!!(o.canPlayType("audio/x-m4a;")||o.canPlayType("audio/m4a;")||o.canPlayType("audio/aac;")).replace(/^no$/,""),m4b:!!(o.canPlayType("audio/x-m4b;")||o.canPlayType("audio/m4b;")||o.canPlayType("audio/aac;")).replace(/^no$/,""),mp4:!!(o.canPlayType("audio/x-mp4;")||o.canPlayType("audio/mp4;")||o.canPlayType("audio/aac;")).replace(/^no$/,""),weba:!(_||!o.canPlayType('audio/webm; codecs="vorbis"').replace(/^no$/,"")),webm:!(_||!o.canPlayType('audio/webm; codecs="vorbis"').replace(/^no$/,"")),dolby:!!o.canPlayType('audio/mp4; codecs="ec-3"').replace(/^no$/,""),flac:!!(o.canPlayType("audio/x-flac;")||o.canPlayType("audio/flac;")).replace(/^no$/,"")},e},_unlockAudio:function(){var e=this||n;if(!e._audioUnlocked&&e.ctx){e._audioUnlocked=!1,e.autoUnlock=!1,e._mobileUnloaded||44100===e.ctx.sampleRate||(e._mobileUnloaded=!0,e.unload()),e._scratchBuffer=e.ctx.createBuffer(1,1,22050);var o=function(n){for(;e._html5AudioPool.length<e.html5PoolSize;)try{var t=new Audio;t._unlocked=!0,e._releaseHtml5Audio(t)}catch(n){e.noAudio=!0;break}for(var r=0;r<e._howls.length;r++)if(!e._howls[r]._webAudio)for(var a=e._howls[r]._getSoundIds(),u=0;u<a.length;u++){var d=e._howls[r]._soundById(a[u]);d&&d._node&&!d._node._unlocked&&(d._node._unlocked=!0,d._node.load())}e._autoResume();var i=e.ctx.createBufferSource();i.buffer=e._scratchBuffer,i.connect(e.ctx.destination),void 0===i.start?i.noteOn(0):i.start(0),"function"==typeof e.ctx.resume&&e.ctx.resume(),i.onended=function(){i.disconnect(0),e._audioUnlocked=!0,document.removeEventListener("touchstart",o,!0),document.removeEventListener("touchend",o,!0),document.removeEventListener("click",o,!0),document.removeEventListener("keydown",o,!0);for(var n=0;n<e._howls.length;n++)e._howls[n]._emit("unlock")}};return document.addEventListener("touchstart",o,!0),document.addEventListener("touchend",o,!0),document.addEventListener("click",o,!0),document.addEventListener("keydown",o,!0),e}},_obtainHtml5Audio:function(){var e=this||n;if(e._html5AudioPool.length)return e._html5AudioPool.pop();var o=(new Audio).play();return o&&"undefined"!=typeof Promise&&(o instanceof Promise||"function"==typeof o.then)&&o.catch(function(){console.warn("HTML5 Audio pool exhausted, returning potentially locked audio object.")}),new Audio},_releaseHtml5Audio:function(e){var o=this||n;return e._unlocked&&o._html5AudioPool.push(e),o},_autoSuspend:function(){var e=this;if(e.autoSuspend&&e.ctx&&void 0!==e.ctx.suspend&&n.usingWebAudio){for(var o=0;o<e._howls.length;o++)if(e._howls[o]._webAudio)for(var t=0;t<e._howls[o]._sounds.length;t++)if(!e._howls[o]._sounds[t]._paused)return e;return e._suspendTimer&&clearTimeout(e._suspendTimer),e._suspendTimer=setTimeout(function(){if(e.autoSuspend){e._suspendTimer=null,e.state="suspending";var n=function(){e.state="suspended",e._resumeAfterSuspend&&(delete e._resumeAfterSuspend,e._autoResume())};e.ctx.suspend().then(n,n)}},3e4),e}},_autoResume:function(){var e=this;if(e.ctx&&void 0!==e.ctx.resume&&n.usingWebAudio)return"running"===e.state&&"interrupted"!==e.ctx.state&&e._suspendTimer?(clearTimeout(e._suspendTimer),e._suspendTimer=null):"suspended"===e.state||"running"===e.state&&"interrupted"===e.ctx.state?(e.ctx.resume().then(function(){e.state="running";for(var n=0;n<e._howls.length;n++)e._howls[n]._emit("resume")}),e._suspendTimer&&(clearTimeout(e._suspendTimer),e._suspendTimer=null)):"suspending"===e.state&&(e._resumeAfterSuspend=!0),e}};var n=new e,o=function(e){var n=this;if(!e.src||0===e.src.length)return void console.error("An array of source files must be passed with any new Howl.");n.init(e)};o.prototype={init:function(e){var o=this;return n.ctx||_(),o._autoplay=e.autoplay||!1,o._format="string"!=typeof e.format?e.format:[e.format],o._html5=e.html5||!1,o._muted=e.mute||!1,o._loop=e.loop||!1,o._pool=e.pool||5,o._preload="boolean"!=typeof e.preload&&"metadata"!==e.preload||e.preload,o._rate=e.rate||1,o._sprite=e.sprite||{},o._src="string"!=typeof e.src?e.src:[e.src],o._volume=void 0!==e.volume?e.volume:1,o._xhr={method:e.xhr&&e.xhr.method?e.xhr.method:"GET",headers:e.xhr&&e.xhr.headers?e.xhr.headers:null,withCredentials:!(!e.xhr||!e.xhr.withCredentials)&&e.xhr.withCredentials},o._duration=0,o._state="unloaded",o._sounds=[],o._endTimers={},o._queue=[],o._playLock=!1,o._onend=e.onend?[{fn:e.onend}]:[],o._onfade=e.onfade?[{fn:e.onfade}]:[],o._onload=e.onload?[{fn:e.onload}]:[],o._onloaderror=e.onloaderror?[{fn:e.onloaderror}]:[],o._onplayerror=e.onplayerror?[{fn:e.onplayerror}]:[],o._onpause=e.onpause?[{fn:e.onpause}]:[],o._onplay=e.onplay?[{fn:e.onplay}]:[],o._onstop=e.onstop?[{fn:e.onstop}]:[],o._onmute=e.onmute?[{fn:e.onmute}]:[],o._onvolume=e.onvolume?[{fn:e.onvolume}]:[],o._onrate=e.onrate?[{fn:e.onrate}]:[],o._onseek=e.onseek?[{fn:e.onseek}]:[],o._onunlock=e.onunlock?[{fn:e.onunlock}]:[],o._onresume=[],o._webAudio=n.usingWebAudio&&!o._html5,void 0!==n.ctx&&n.ctx&&n.autoUnlock&&n._unlockAudio(),n._howls.push(o),o._autoplay&&o._queue.push({event:"play",action:function(){o.play()}}),o._preload&&"none"!==o._preload&&o.load(),o},load:function(){var e=this,o=null;if(n.noAudio)return void e._emit("loaderror",null,"No audio support.");"string"==typeof e._src&&(e._src=[e._src]);for(var r=0;r<e._src.length;r++){var u,d;if(e._format&&e._format[r])u=e._format[r];else{if("string"!=typeof(d=e._src[r])){e._emit("loaderror",null,"Non-string found in selected audio sources - ignoring.");continue}u=/^data:audio\/([^;,]+);/i.exec(d),u||(u=/\.([^.]+)$/.exec(d.split("?",1)[0])),u&&(u=u[1].toLowerCase())}if(u||console.warn('No file extension was found. Consider using the "format" property or specify an extension.'),u&&n.codecs(u)){o=e._src[r];break}}return o?(e._src=o,e._state="loading","https:"===window.location.protocol&&"http:"===o.slice(0,5)&&(e._html5=!0,e._webAudio=!1),new t(e),e._webAudio&&a(e),e):void e._emit("loaderror",null,"No codec support for selected audio sources.")},play:function(e,o){var t=this,r=null;if("number"==typeof e)r=e,e=null;else{if("string"==typeof e&&"loaded"===t._state&&!t._sprite[e])return null;if(void 0===e&&(e="__default",!t._playLock)){for(var a=0,u=0;u<t._sounds.length;u++)t._sounds[u]._paused&&!t._sounds[u]._ended&&(a++,r=t._sounds[u]._id);1===a?e=null:r=null}}var d=r?t._soundById(r):t._inactiveSound();if(!d)return null;if(r&&!e&&(e=d._sprite||"__default"),"loaded"!==t._state){d._sprite=e,d._ended=!1;var i=d._id;return t._queue.push({event:"play",action:function(){t.play(i)}}),i}if(r&&!d._paused)return o||t._loadQueue("play"),d._id;t._webAudio&&n._autoResume();var _=Math.max(0,d._seek>0?d._seek:t._sprite[e][0]/1e3),s=Math.max(0,(t._sprite[e][0]+t._sprite[e][1])/1e3-_),l=1e3*s/Math.abs(d._rate),c=t._sprite[e][0]/1e3,f=(t._sprite[e][0]+t._sprite[e][1])/1e3;d._sprite=e,d._ended=!1;var p=function(){d._paused=!1,d._seek=_,d._start=c,d._stop=f,d._loop=!(!d._loop&&!t._sprite[e][2])};if(_>=f)return void t._ended(d);var m=d._node;if(t._webAudio){var v=function(){t._playLock=!1,p(),t._refreshBuffer(d);var e=d._muted||t._muted?0:d._volume;m.gain.setValueAtTime(e,n.ctx.currentTime),d._playStart=n.ctx.currentTime,void 0===m.bufferSource.start?d._loop?m.bufferSource.noteGrainOn(0,_,86400):m.bufferSource.noteGrainOn(0,_,s):d._loop?m.bufferSource.start(0,_,86400):m.bufferSource.start(0,_,s),l!==1/0&&(t._endTimers[d._id]=setTimeout(t._ended.bind(t,d),l)),o||setTimeout(function(){t._emit("play",d._id),t._loadQueue()},0)};"running"===n.state&&"interrupted"!==n.ctx.state?v():(t._playLock=!0,t.once("resume",v),t._clearTimer(d._id))}else{var h=function(){m.currentTime=_,m.muted=d._muted||t._muted||n._muted||m.muted,m.volume=d._volume*n.volume(),m.playbackRate=d._rate;try{var r=m.play();if(r&&"undefined"!=typeof Promise&&(r instanceof Promise||"function"==typeof r.then)?(t._playLock=!0,p(),r.then(function(){t._playLock=!1,m._unlocked=!0,o?t._loadQueue():t._emit("play",d._id)}).catch(function(){t._playLock=!1,t._emit("playerror",d._id,"Playback was unable to start. This is most commonly an issue on mobile devices and Chrome where playback was not within a user interaction."),d._ended=!0,d._paused=!0})):o||(t._playLock=!1,p(),t._emit("play",d._id)),m.playbackRate=d._rate,m.paused)return void t._emit("playerror",d._id,"Playback was unable to start. This is most commonly an issue on mobile devices and Chrome where playback was not within a user interaction.");"__default"!==e||d._loop?t._endTimers[d._id]=setTimeout(t._ended.bind(t,d),l):(t._endTimers[d._id]=function(){t._ended(d),m.removeEventListener("ended",t._endTimers[d._id],!1)},m.addEventListener("ended",t._endTimers[d._id],!1))}catch(e){t._emit("playerror",d._id,e)}};"data:audio/wav;base64,UklGRigAAABXQVZFZm10IBIAAAABAAEARKwAAIhYAQACABAAAABkYXRhAgAAAAEA"===m.src&&(m.src=t._src,m.load());var y=window&&window.ejecta||!m.readyState&&n._navigator.isCocoonJS;if(m.readyState>=3||y)h();else{t._playLock=!0,t._state="loading";var g=function(){t._state="loaded",h(),m.removeEventListener(n._canPlayEvent,g,!1)};m.addEventListener(n._canPlayEvent,g,!1),t._clearTimer(d._id)}}return d._id},pause:function(e){var n=this;if("loaded"!==n._state||n._playLock)return n._queue.push({event:"pause",action:function(){n.pause(e)}}),n;for(var o=n._getSoundIds(e),t=0;t<o.length;t++){n._clearTimer(o[t]);var r=n._soundById(o[t]);if(r&&!r._paused&&(r._seek=n.seek(o[t]),r._rateSeek=0,r._paused=!0,n._stopFade(o[t]),r._node))if(n._webAudio){if(!r._node.bufferSource)continue;void 0===r._node.bufferSource.stop?r._node.bufferSource.noteOff(0):r._node.bufferSource.stop(0),n._cleanBuffer(r._node)}else isNaN(r._node.duration)&&r._node.duration!==1/0||r._node.pause();arguments[1]||n._emit("pause",r?r._id:null)}return n},stop:function(e,n){var o=this;if("loaded"!==o._state||o._playLock)return o._queue.push({event:"stop",action:function(){o.stop(e)}}),o;for(var t=o._getSoundIds(e),r=0;r<t.length;r++){o._clearTimer(t[r]);var a=o._soundById(t[r]);a&&(a._seek=a._start||0,a._rateSeek=0,a._paused=!0,a._ended=!0,o._stopFade(t[r]),a._node&&(o._webAudio?a._node.bufferSource&&(void 0===a._node.bufferSource.stop?a._node.bufferSource.noteOff(0):a._node.bufferSource.stop(0),o._cleanBuffer(a._node)):isNaN(a._node.duration)&&a._node.duration!==1/0||(a._node.currentTime=a._start||0,a._node.pause(),a._node.duration===1/0&&o._clearSound(a._node))),n||o._emit("stop",a._id))}return o},mute:function(e,o){var t=this;if("loaded"!==t._state||t._playLock)return t._queue.push({event:"mute",action:function(){t.mute(e,o)}}),t;if(void 0===o){if("boolean"!=typeof e)return t._muted;t._muted=e}for(var r=t._getSoundIds(o),a=0;a<r.length;a++){var u=t._soundById(r[a]);u&&(u._muted=e,u._interval&&t._stopFade(u._id),t._webAudio&&u._node?u._node.gain.setValueAtTime(e?0:u._volume,n.ctx.currentTime):u._node&&(u._node.muted=!!n._muted||e),t._emit("mute",u._id))}return t},volume:function(){var e,o,t=this,r=arguments;if(0===r.length)return t._volume;if(1===r.length||2===r.length&&void 0===r[1]){t._getSoundIds().indexOf(r[0])>=0?o=parseInt(r[0],10):e=parseFloat(r[0])}else r.length>=2&&(e=parseFloat(r[0]),o=parseInt(r[1],10));var a;if(!(void 0!==e&&e>=0&&e<=1))return a=o?t._soundById(o):t._sounds[0],a?a._volume:0;if("loaded"!==t._state||t._playLock)return t._queue.push({event:"volume",action:function(){t.volume.apply(t,r)}}),t;void 0===o&&(t._volume=e),o=t._getSoundIds(o);for(var u=0;u<o.length;u++)(a=t._soundById(o[u]))&&(a._volume=e,r[2]||t._stopFade(o[u]),t._webAudio&&a._node&&!a._muted?a._node.gain.setValueAtTime(e,n.ctx.currentTime):a._node&&!a._muted&&(a._node.volume=e*n.volume()),t._emit("volume",a._id));return t},fade:function(e,o,t,r){var a=this;if("loaded"!==a._state||a._playLock)return a._queue.push({event:"fade",action:function(){a.fade(e,o,t,r)}}),a;e=Math.min(Math.max(0,parseFloat(e)),1),o=Math.min(Math.max(0,parseFloat(o)),1),t=parseFloat(t),a.volume(e,r);for(var u=a._getSoundIds(r),d=0;d<u.length;d++){var i=a._soundById(u[d]);if(i){if(r||a._stopFade(u[d]),a._webAudio&&!i._muted){var _=n.ctx.currentTime,s=_+t/1e3;i._volume=e,i._node.gain.setValueAtTime(e,_),i._node.gain.linearRampToValueAtTime(o,s)}a._startFadeInterval(i,e,o,t,u[d],void 0===r)}}return a},_startFadeInterval:function(e,n,o,t,r,a){var u=this,d=n,i=o-n,_=Math.abs(i/.01),s=Math.max(4,_>0?t/_:t),l=Date.now();e._fadeTo=o,e._interval=setInterval(function(){var r=(Date.now()-l)/t;l=Date.now(),d+=i*r,d=Math.round(100*d)/100,d=i<0?Math.max(o,d):Math.min(o,d),u._webAudio?e._volume=d:u.volume(d,e._id,!0),a&&(u._volume=d),(o<n&&d<=o||o>n&&d>=o)&&(clearInterval(e._interval),e._interval=null,e._fadeTo=null,u.volume(o,e._id),u._emit("fade",e._id))},s)},_stopFade:function(e){var o=this,t=o._soundById(e);return t&&t._interval&&(o._webAudio&&t._node.gain.cancelScheduledValues(n.ctx.currentTime),clearInterval(t._interval),t._interval=null,o.volume(t._fadeTo,e),t._fadeTo=null,o._emit("fade",e)),o},loop:function(){var e,n,o,t=this,r=arguments;if(0===r.length)return t._loop;if(1===r.length){if("boolean"!=typeof r[0])return!!(o=t._soundById(parseInt(r[0],10)))&&o._loop;e=r[0],t._loop=e}else 2===r.length&&(e=r[0],n=parseInt(r[1],10));for(var a=t._getSoundIds(n),u=0;u<a.length;u++)(o=t._soundById(a[u]))&&(o._loop=e,t._webAudio&&o._node&&o._node.bufferSource&&(o._node.bufferSource.loop=e,e&&(o._node.bufferSource.loopStart=o._start||0,o._node.bufferSource.loopEnd=o._stop,t.playing(a[u])&&(t.pause(a[u],!0),t.play(a[u],!0)))));return t},rate:function(){var e,o,t=this,r=arguments;if(0===r.length)o=t._sounds[0]._id;else if(1===r.length){var a=t._getSoundIds(),u=a.indexOf(r[0]);u>=0?o=parseInt(r[0],10):e=parseFloat(r[0])}else 2===r.length&&(e=parseFloat(r[0]),o=parseInt(r[1],10));var d;if("number"!=typeof e)return d=t._soundById(o),d?d._rate:t._rate;if("loaded"!==t._state||t._playLock)return t._queue.push({event:"rate",action:function(){t.rate.apply(t,r)}}),t;void 0===o&&(t._rate=e),o=t._getSoundIds(o);for(var i=0;i<o.length;i++)if(d=t._soundById(o[i])){t.playing(o[i])&&(d._rateSeek=t.seek(o[i]),d._playStart=t._webAudio?n.ctx.currentTime:d._playStart),d._rate=e,t._webAudio&&d._node&&d._node.bufferSource?d._node.bufferSource.playbackRate.setValueAtTime(e,n.ctx.currentTime):d._node&&(d._node.playbackRate=e);var _=t.seek(o[i]),s=(t._sprite[d._sprite][0]+t._sprite[d._sprite][1])/1e3-_,l=1e3*s/Math.abs(d._rate);!t._endTimers[o[i]]&&d._paused||(t._clearTimer(o[i]),t._endTimers[o[i]]=setTimeout(t._ended.bind(t,d),l)),t._emit("rate",d._id)}return t},seek:function(){var e,o,t=this,r=arguments;if(0===r.length)t._sounds.length&&(o=t._sounds[0]._id);else if(1===r.length){var a=t._getSoundIds(),u=a.indexOf(r[0]);u>=0?o=parseInt(r[0],10):t._sounds.length&&(o=t._sounds[0]._id,e=parseFloat(r[0]))}else 2===r.length&&(e=parseFloat(r[0]),o=parseInt(r[1],10));if(void 0===o)return 0;if("number"==typeof e&&("loaded"!==t._state||t._playLock))return t._queue.push({event:"seek",action:function(){t.seek.apply(t,r)}}),t;var d=t._soundById(o);if(d){if(!("number"==typeof e&&e>=0)){if(t._webAudio){var i=t.playing(o)?n.ctx.currentTime-d._playStart:0,_=d._rateSeek?d._rateSeek-d._seek:0;return d._seek+(_+i*Math.abs(d._rate))}return d._node.currentTime}var s=t.playing(o);s&&t.pause(o,!0),d._seek=e,d._ended=!1,t._clearTimer(o),t._webAudio||!d._node||isNaN(d._node.duration)||(d._node.currentTime=e);var l=function(){s&&t.play(o,!0),t._emit("seek",o)};if(s&&!t._webAudio){var c=function(){t._playLock?setTimeout(c,0):l()};setTimeout(c,0)}else l()}return t},playing:function(e){var n=this;if("number"==typeof e){var o=n._soundById(e);return!!o&&!o._paused}for(var t=0;t<n._sounds.length;t++)if(!n._sounds[t]._paused)return!0;return!1},duration:function(e){var n=this,o=n._duration,t=n._soundById(e);return t&&(o=n._sprite[t._sprite][1]/1e3),o},state:function(){return this._state},unload:function(){for(var e=this,o=e._sounds,t=0;t<o.length;t++)o[t]._paused||e.stop(o[t]._id),e._webAudio||(e._clearSound(o[t]._node),o[t]._node.removeEventListener("error",o[t]._errorFn,!1),o[t]._node.removeEventListener(n._canPlayEvent,o[t]._loadFn,!1),o[t]._node.removeEventListener("ended",o[t]._endFn,!1),n._releaseHtml5Audio(o[t]._node)),delete o[t]._node,e._clearTimer(o[t]._id);var a=n._howls.indexOf(e);a>=0&&n._howls.splice(a,1);var u=!0;for(t=0;t<n._howls.length;t++)if(n._howls[t]._src===e._src||e._src.indexOf(n._howls[t]._src)>=0){u=!1;break}return r&&u&&delete r[e._src],n.noAudio=!1,e._state="unloaded",e._sounds=[],e=null,null},on:function(e,n,o,t){var r=this,a=r["_on"+e];return"function"==typeof n&&a.push(t?{id:o,fn:n,once:t}:{id:o,fn:n}),r},off:function(e,n,o){var t=this,r=t["_on"+e],a=0;if("number"==typeof n&&(o=n,n=null),n||o)for(a=0;a<r.length;a++){var u=o===r[a].id;if(n===r[a].fn&&u||!n&&u){r.splice(a,1);break}}else if(e)t["_on"+e]=[];else{var d=Object.keys(t);for(a=0;a<d.length;a++)0===d[a].indexOf("_on")&&Array.isArray(t[d[a]])&&(t[d[a]]=[])}return t},once:function(e,n,o){var t=this;return t.on(e,n,o,1),t},_emit:function(e,n,o){for(var t=this,r=t["_on"+e],a=r.length-1;a>=0;a--)r[a].id&&r[a].id!==n&&"load"!==e||(setTimeout(function(e){e.call(this,n,o)}.bind(t,r[a].fn),0),r[a].once&&t.off(e,r[a].fn,r[a].id));return t._loadQueue(e),t},_loadQueue:function(e){var n=this;if(n._queue.length>0){var o=n._queue[0];o.event===e&&(n._queue.shift(),n._loadQueue()),e||o.action()}return n},_ended:function(e){var o=this,t=e._sprite;if(!o._webAudio&&e._node&&!e._node.paused&&!e._node.ended&&e._node.currentTime<e._stop)return setTimeout(o._ended.bind(o,e),100),o;var r=!(!e._loop&&!o._sprite[t][2]);if(o._emit("end",e._id),!o._webAudio&&r&&o.stop(e._id,!0).play(e._id),o._webAudio&&r){o._emit("play",e._id),e._seek=e._start||0,e._rateSeek=0,e._playStart=n.ctx.currentTime;var a=1e3*(e._stop-e._start)/Math.abs(e._rate);o._endTimers[e._id]=setTimeout(o._ended.bind(o,e),a)}return o._webAudio&&!r&&(e._paused=!0,e._ended=!0,e._seek=e._start||0,e._rateSeek=0,o._clearTimer(e._id),o._cleanBuffer(e._node),n._autoSuspend()),o._webAudio||r||o.stop(e._id,!0),o},_clearTimer:function(e){var n=this;if(n._endTimers[e]){if("function"!=typeof n._endTimers[e])clearTimeout(n._endTimers[e]);else{var o=n._soundById(e);o&&o._node&&o._node.removeEventListener("ended",n._endTimers[e],!1)}delete n._endTimers[e]}return n},_soundById:function(e){for(var n=this,o=0;o<n._sounds.length;o++)if(e===n._sounds[o]._id)return n._sounds[o];return null},_inactiveSound:function(){var e=this;e._drain();for(var n=0;n<e._sounds.length;n++)if(e._sounds[n]._ended)return e._sounds[n].reset();return new t(e)},_drain:function(){var e=this,n=e._pool,o=0,t=0;if(!(e._sounds.length<n)){for(t=0;t<e._sounds.length;t++)e._sounds[t]._ended&&o++;for(t=e._sounds.length-1;t>=0;t--){if(o<=n)return;e._sounds[t]._ended&&(e._webAudio&&e._sounds[t]._node&&e._sounds[t]._node.disconnect(0),e._sounds.splice(t,1),o--)}}},_getSoundIds:function(e){var n=this;if(void 0===e){for(var o=[],t=0;t<n._sounds.length;t++)o.push(n._sounds[t]._id);return o}return[e]},_refreshBuffer:function(e){var o=this;return e._node.bufferSource=n.ctx.createBufferSource(),e._node.bufferSource.buffer=r[o._src],e._panner?e._node.bufferSource.connect(e._panner):e._node.bufferSource.connect(e._node),e._node.bufferSource.loop=e._loop,e._loop&&(e._node.bufferSource.loopStart=e._start||0,e._node.bufferSource.loopEnd=e._stop||0),e._node.bufferSource.playbackRate.setValueAtTime(e._rate,n.ctx.currentTime),o},_cleanBuffer:function(e){var o=this,t=n._navigator&&n._navigator.vendor.indexOf("Apple")>=0;if(!e.bufferSource)return o;if(n._scratchBuffer&&e.bufferSource&&(e.bufferSource.onended=null,e.bufferSource.disconnect(0),t))try{e.bufferSource.buffer=n._scratchBuffer}catch(e){}return e.bufferSource=null,o},_clearSound:function(e){/MSIE |Trident\//.test(n._navigator&&n._navigator.userAgent)||(e.src="data:audio/wav;base64,UklGRigAAABXQVZFZm10IBIAAAABAAEARKwAAIhYAQACABAAAABkYXRhAgAAAAEA")}};var t=function(e){this._parent=e,this.init()};t.prototype={init:function(){var e=this,o=e._parent;return e._muted=o._muted,e._loop=o._loop,e._volume=o._volume,e._rate=o._rate,e._seek=0,e._paused=!0,e._ended=!0,e._sprite="__default",e._id=++n._counter,o._sounds.push(e),e.create(),e},create:function(){var e=this,o=e._parent,t=n._muted||e._muted||e._parent._muted?0:e._volume;return o._webAudio?(e._node=void 0===n.ctx.createGain?n.ctx.createGainNode():n.ctx.createGain(),e._node.gain.setValueAtTime(t,n.ctx.currentTime),e._node.paused=!0,e._node.connect(n.masterGain)):n.noAudio||(e._node=n._obtainHtml5Audio(),e._errorFn=e._errorListener.bind(e),e._node.addEventListener("error",e._errorFn,!1),e._loadFn=e._loadListener.bind(e),e._node.addEventListener(n._canPlayEvent,e._loadFn,!1),e._endFn=e._endListener.bind(e),e._node.addEventListener("ended",e._endFn,!1),e._node.src=o._src,e._node.preload=!0===o._preload?"auto":o._preload,e._node.volume=t*n.volume(),e._node.load()),e},reset:function(){var e=this,o=e._parent;return e._muted=o._muted,e._loop=o._loop,e._volume=o._volume,e._rate=o._rate,e._seek=0,e._rateSeek=0,e._paused=!0,e._ended=!0,e._sprite="__default",e._id=++n._counter,e},_errorListener:function(){var e=this;e._parent._emit("loaderror",e._id,e._node.error?e._node.error.code:0),e._node.removeEventListener("error",e._errorFn,!1)},_loadListener:function(){var e=this,o=e._parent;o._duration=Math.ceil(10*e._node.duration)/10,0===Object.keys(o._sprite).length&&(o._sprite={__default:[0,1e3*o._duration]}),"loaded"!==o._state&&(o._state="loaded",o._emit("load"),o._loadQueue()),e._node.removeEventListener(n._canPlayEvent,e._loadFn,!1)},_endListener:function(){var e=this,n=e._parent;n._duration===1/0&&(n._duration=Math.ceil(10*e._node.duration)/10,n._sprite.__default[1]===1/0&&(n._sprite.__default[1]=1e3*n._duration),n._ended(e)),e._node.removeEventListener("ended",e._endFn,!1)}};var r={},a=function(e){var n=e._src;if(r[n])return e._duration=r[n].duration,void i(e);if(/^data:[^;]+;base64,/.test(n)){for(var o=atob(n.split(",")[1]),t=new Uint8Array(o.length),a=0;a<o.length;++a)t[a]=o.charCodeAt(a);d(t.buffer,e)}else{var _=new XMLHttpRequest;_.open(e._xhr.method,n,!0),_.withCredentials=e._xhr.withCredentials,_.responseType="arraybuffer",e._xhr.headers&&Object.keys(e._xhr.headers).forEach(function(n){_.setRequestHeader(n,e._xhr.headers[n])}),_.onload=function(){var n=(_.status+"")[0];if("0"!==n&&"2"!==n&&"3"!==n)return void e._emit("loaderror",null,"Failed loading audio file with status: "+_.status+".");d(_.response,e)},_.onerror=function(){e._webAudio&&(e._html5=!0,e._webAudio=!1,e._sounds=[],delete r[n],e.load())},u(_)}},u=function(e){try{e.send()}catch(n){e.onerror()}},d=function(e,o){var t=function(){o._emit("loaderror",null,"Decoding audio data failed.")},a=function(e){e&&o._sounds.length>0?(r[o._src]=e,i(o,e)):t()};"undefined"!=typeof Promise&&1===n.ctx.decodeAudioData.length?n.ctx.decodeAudioData(e).then(a).catch(t):n.ctx.decodeAudioData(e,a,t)},i=function(e,n){n&&!e._duration&&(e._duration=n.duration),0===Object.keys(e._sprite).length&&(e._sprite={__default:[0,1e3*e._duration]}),"loaded"!==e._state&&(e._state="loaded",e._emit("load"),e._loadQueue())},_=function(){if(n.usingWebAudio){try{"undefined"!=typeof AudioContext?n.ctx=new AudioContext:"undefined"!=typeof webkitAudioContext?n.ctx=new webkitAudioContext:n.usingWebAudio=!1}catch(e){n.usingWebAudio=!1}n.ctx||(n.usingWebAudio=!1);var e=/iP(hone|od|ad)/.test(n._navigator&&n._navigator.platform),o=n._navigator&&n._navigator.appVersion.match(/OS (\d+)_(\d+)_?(\d+)?/),t=o?parseInt(o[1],10):null;if(e&&t&&t<9){var r=/safari/.test(n._navigator&&n._navigator.userAgent.toLowerCase());n._navigator&&!r&&(n.usingWebAudio=!1)}n.usingWebAudio&&(n.masterGain=void 0===n.ctx.createGain?n.ctx.createGainNode():n.ctx.createGain(),n.masterGain.gain.setValueAtTime(n._muted?0:n._volume,n.ctx.currentTime),n.masterGain.connect(n.ctx.destination)),n._setup()}};"function"==typeof define&&define.amd&&define([],function(){return{Howler:n,Howl:o}}),"undefined"!=typeof exports&&(exports.Howler=n,exports.Howl=o),"undefined"!=typeof global?(global.HowlerGlobal=e,global.Howler=n,global.Howl=o,global.Sound=t):"undefined"!=typeof window&&(window.HowlerGlobal=e,window.Howler=n,window.Howl=o,window.Sound=t)}();
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/howler/dist/howler.js b/uni_modules/c-svga/node_modules/howler/dist/howler.js
new file mode 100644
index 0000000..bb5a463
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/howler/dist/howler.js
@@ -0,0 +1,3248 @@
+/*!
+ *  howler.js v2.2.4
+ *  howlerjs.com
+ *
+ *  (c) 2013-2020, James Simpson of GoldFire Studios
+ *  goldfirestudios.com
+ *
+ *  MIT License
+ */
+
+(function() {
+
+  'use strict';
+
+  /** Global Methods **/
+  /***************************************************************************/
+
+  /**
+   * Create the global controller. All contained methods and properties apply
+   * to all sounds that are currently playing or will be in the future.
+   */
+  var HowlerGlobal = function() {
+    this.init();
+  };
+  HowlerGlobal.prototype = {
+    /**
+     * Initialize the global Howler object.
+     * @return {Howler}
+     */
+    init: function() {
+      var self = this || Howler;
+
+      // Create a global ID counter.
+      self._counter = 1000;
+
+      // Pool of unlocked HTML5 Audio objects.
+      self._html5AudioPool = [];
+      self.html5PoolSize = 10;
+
+      // Internal properties.
+      self._codecs = {};
+      self._howls = [];
+      self._muted = false;
+      self._volume = 1;
+      self._canPlayEvent = 'canplaythrough';
+      self._navigator = (typeof window !== 'undefined' && window.navigator) ? window.navigator : null;
+
+      // Public properties.
+      self.masterGain = null;
+      self.noAudio = false;
+      self.usingWebAudio = true;
+      self.autoSuspend = true;
+      self.ctx = null;
+
+      // Set to false to disable the auto audio unlocker.
+      self.autoUnlock = true;
+
+      // Setup the various state values for global tracking.
+      self._setup();
+
+      return self;
+    },
+
+    /**
+     * Get/set the global volume for all sounds.
+     * @param  {Float} vol Volume from 0.0 to 1.0.
+     * @return {Howler/Float}     Returns self or current volume.
+     */
+    volume: function(vol) {
+      var self = this || Howler;
+      vol = parseFloat(vol);
+
+      // If we don't have an AudioContext created yet, run the setup.
+      if (!self.ctx) {
+        setupAudioContext();
+      }
+
+      if (typeof vol !== 'undefined' && vol >= 0 && vol <= 1) {
+        self._volume = vol;
+
+        // Don't update any of the nodes if we are muted.
+        if (self._muted) {
+          return self;
+        }
+
+        // When using Web Audio, we just need to adjust the master gain.
+        if (self.usingWebAudio) {
+          self.masterGain.gain.setValueAtTime(vol, Howler.ctx.currentTime);
+        }
+
+        // Loop through and change volume for all HTML5 audio nodes.
+        for (var i=0; i<self._howls.length; i++) {
+          if (!self._howls[i]._webAudio) {
+            // Get all of the sounds in this Howl group.
+            var ids = self._howls[i]._getSoundIds();
+
+            // Loop through all sounds and change the volumes.
+            for (var j=0; j<ids.length; j++) {
+              var sound = self._howls[i]._soundById(ids[j]);
+
+              if (sound && sound._node) {
+                sound._node.volume = sound._volume * vol;
+              }
+            }
+          }
+        }
+
+        return self;
+      }
+
+      return self._volume;
+    },
+
+    /**
+     * Handle muting and unmuting globally.
+     * @param  {Boolean} muted Is muted or not.
+     */
+    mute: function(muted) {
+      var self = this || Howler;
+
+      // If we don't have an AudioContext created yet, run the setup.
+      if (!self.ctx) {
+        setupAudioContext();
+      }
+
+      self._muted = muted;
+
+      // With Web Audio, we just need to mute the master gain.
+      if (self.usingWebAudio) {
+        self.masterGain.gain.setValueAtTime(muted ? 0 : self._volume, Howler.ctx.currentTime);
+      }
+
+      // Loop through and mute all HTML5 Audio nodes.
+      for (var i=0; i<self._howls.length; i++) {
+        if (!self._howls[i]._webAudio) {
+          // Get all of the sounds in this Howl group.
+          var ids = self._howls[i]._getSoundIds();
+
+          // Loop through all sounds and mark the audio node as muted.
+          for (var j=0; j<ids.length; j++) {
+            var sound = self._howls[i]._soundById(ids[j]);
+
+            if (sound && sound._node) {
+              sound._node.muted = (muted) ? true : sound._muted;
+            }
+          }
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Handle stopping all sounds globally.
+     */
+    stop: function() {
+      var self = this || Howler;
+
+      // Loop through all Howls and stop them.
+      for (var i=0; i<self._howls.length; i++) {
+        self._howls[i].stop();
+      }
+
+      return self;
+    },
+
+    /**
+     * Unload and destroy all currently loaded Howl objects.
+     * @return {Howler}
+     */
+    unload: function() {
+      var self = this || Howler;
+
+      for (var i=self._howls.length-1; i>=0; i--) {
+        self._howls[i].unload();
+      }
+
+      // Create a new AudioContext to make sure it is fully reset.
+      if (self.usingWebAudio && self.ctx && typeof self.ctx.close !== 'undefined') {
+        self.ctx.close();
+        self.ctx = null;
+        setupAudioContext();
+      }
+
+      return self;
+    },
+
+    /**
+     * Check for codec support of specific extension.
+     * @param  {String} ext Audio file extention.
+     * @return {Boolean}
+     */
+    codecs: function(ext) {
+      return (this || Howler)._codecs[ext.replace(/^x-/, '')];
+    },
+
+    /**
+     * Setup various state values for global tracking.
+     * @return {Howler}
+     */
+    _setup: function() {
+      var self = this || Howler;
+
+      // Keeps track of the suspend/resume state of the AudioContext.
+      self.state = self.ctx ? self.ctx.state || 'suspended' : 'suspended';
+
+      // Automatically begin the 30-second suspend process
+      self._autoSuspend();
+
+      // Check if audio is available.
+      if (!self.usingWebAudio) {
+        // No audio is available on this system if noAudio is set to true.
+        if (typeof Audio !== 'undefined') {
+          try {
+            var test = new Audio();
+
+            // Check if the canplaythrough event is available.
+            if (typeof test.oncanplaythrough === 'undefined') {
+              self._canPlayEvent = 'canplay';
+            }
+          } catch(e) {
+            self.noAudio = true;
+          }
+        } else {
+          self.noAudio = true;
+        }
+      }
+
+      // Test to make sure audio isn't disabled in Internet Explorer.
+      try {
+        var test = new Audio();
+        if (test.muted) {
+          self.noAudio = true;
+        }
+      } catch (e) {}
+
+      // Check for supported codecs.
+      if (!self.noAudio) {
+        self._setupCodecs();
+      }
+
+      return self;
+    },
+
+    /**
+     * Check for browser support for various codecs and cache the results.
+     * @return {Howler}
+     */
+    _setupCodecs: function() {
+      var self = this || Howler;
+      var audioTest = null;
+
+      // Must wrap in a try/catch because IE11 in server mode throws an error.
+      try {
+        audioTest = (typeof Audio !== 'undefined') ? new Audio() : null;
+      } catch (err) {
+        return self;
+      }
+
+      if (!audioTest || typeof audioTest.canPlayType !== 'function') {
+        return self;
+      }
+
+      var mpegTest = audioTest.canPlayType('audio/mpeg;').replace(/^no$/, '');
+
+      // Opera version <33 has mixed MP3 support, so we need to check for and block it.
+      var ua = self._navigator ? self._navigator.userAgent : '';
+      var checkOpera = ua.match(/OPR\/(\d+)/g);
+      var isOldOpera = (checkOpera && parseInt(checkOpera[0].split('/')[1], 10) < 33);
+      var checkSafari = ua.indexOf('Safari') !== -1 && ua.indexOf('Chrome') === -1;
+      var safariVersion = ua.match(/Version\/(.*?) /);
+      var isOldSafari = (checkSafari && safariVersion && parseInt(safariVersion[1], 10) < 15);
+
+      self._codecs = {
+        mp3: !!(!isOldOpera && (mpegTest || audioTest.canPlayType('audio/mp3;').replace(/^no$/, ''))),
+        mpeg: !!mpegTest,
+        opus: !!audioTest.canPlayType('audio/ogg; codecs="opus"').replace(/^no$/, ''),
+        ogg: !!audioTest.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/, ''),
+        oga: !!audioTest.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/, ''),
+        wav: !!(audioTest.canPlayType('audio/wav; codecs="1"') || audioTest.canPlayType('audio/wav')).replace(/^no$/, ''),
+        aac: !!audioTest.canPlayType('audio/aac;').replace(/^no$/, ''),
+        caf: !!audioTest.canPlayType('audio/x-caf;').replace(/^no$/, ''),
+        m4a: !!(audioTest.canPlayType('audio/x-m4a;') || audioTest.canPlayType('audio/m4a;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''),
+        m4b: !!(audioTest.canPlayType('audio/x-m4b;') || audioTest.canPlayType('audio/m4b;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''),
+        mp4: !!(audioTest.canPlayType('audio/x-mp4;') || audioTest.canPlayType('audio/mp4;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''),
+        weba: !!(!isOldSafari && audioTest.canPlayType('audio/webm; codecs="vorbis"').replace(/^no$/, '')),
+        webm: !!(!isOldSafari && audioTest.canPlayType('audio/webm; codecs="vorbis"').replace(/^no$/, '')),
+        dolby: !!audioTest.canPlayType('audio/mp4; codecs="ec-3"').replace(/^no$/, ''),
+        flac: !!(audioTest.canPlayType('audio/x-flac;') || audioTest.canPlayType('audio/flac;')).replace(/^no$/, '')
+      };
+
+      return self;
+    },
+
+    /**
+     * Some browsers/devices will only allow audio to be played after a user interaction.
+     * Attempt to automatically unlock audio on the first user interaction.
+     * Concept from: http://paulbakaus.com/tutorials/html5/web-audio-on-ios/
+     * @return {Howler}
+     */
+    _unlockAudio: function() {
+      var self = this || Howler;
+
+      // Only run this if Web Audio is supported and it hasn't already been unlocked.
+      if (self._audioUnlocked || !self.ctx) {
+        return;
+      }
+
+      self._audioUnlocked = false;
+      self.autoUnlock = false;
+
+      // Some mobile devices/platforms have distortion issues when opening/closing tabs and/or web views.
+      // Bugs in the browser (especially Mobile Safari) can cause the sampleRate to change from 44100 to 48000.
+      // By calling Howler.unload(), we create a new AudioContext with the correct sampleRate.
+      if (!self._mobileUnloaded && self.ctx.sampleRate !== 44100) {
+        self._mobileUnloaded = true;
+        self.unload();
+      }
+
+      // Scratch buffer for enabling iOS to dispose of web audio buffers correctly, as per:
+      // http://stackoverflow.com/questions/24119684
+      self._scratchBuffer = self.ctx.createBuffer(1, 1, 22050);
+
+      // Call this method on touch start to create and play a buffer,
+      // then check if the audio actually played to determine if
+      // audio has now been unlocked on iOS, Android, etc.
+      var unlock = function(e) {
+        // Create a pool of unlocked HTML5 Audio objects that can
+        // be used for playing sounds without user interaction. HTML5
+        // Audio objects must be individually unlocked, as opposed
+        // to the WebAudio API which only needs a single activation.
+        // This must occur before WebAudio setup or the source.onended
+        // event will not fire.
+        while (self._html5AudioPool.length < self.html5PoolSize) {
+          try {
+            var audioNode = new Audio();
+
+            // Mark this Audio object as unlocked to ensure it can get returned
+            // to the unlocked pool when released.
+            audioNode._unlocked = true;
+
+            // Add the audio node to the pool.
+            self._releaseHtml5Audio(audioNode);
+          } catch (e) {
+            self.noAudio = true;
+            break;
+          }
+        }
+
+        // Loop through any assigned audio nodes and unlock them.
+        for (var i=0; i<self._howls.length; i++) {
+          if (!self._howls[i]._webAudio) {
+            // Get all of the sounds in this Howl group.
+            var ids = self._howls[i]._getSoundIds();
+
+            // Loop through all sounds and unlock the audio nodes.
+            for (var j=0; j<ids.length; j++) {
+              var sound = self._howls[i]._soundById(ids[j]);
+
+              if (sound && sound._node && !sound._node._unlocked) {
+                sound._node._unlocked = true;
+                sound._node.load();
+              }
+            }
+          }
+        }
+
+        // Fix Android can not play in suspend state.
+        self._autoResume();
+
+        // Create an empty buffer.
+        var source = self.ctx.createBufferSource();
+        source.buffer = self._scratchBuffer;
+        source.connect(self.ctx.destination);
+
+        // Play the empty buffer.
+        if (typeof source.start === 'undefined') {
+          source.noteOn(0);
+        } else {
+          source.start(0);
+        }
+
+        // Calling resume() on a stack initiated by user gesture is what actually unlocks the audio on Android Chrome >= 55.
+        if (typeof self.ctx.resume === 'function') {
+          self.ctx.resume();
+        }
+
+        // Setup a timeout to check that we are unlocked on the next event loop.
+        source.onended = function() {
+          source.disconnect(0);
+
+          // Update the unlocked state and prevent this check from happening again.
+          self._audioUnlocked = true;
+
+          // Remove the touch start listener.
+          document.removeEventListener('touchstart', unlock, true);
+          document.removeEventListener('touchend', unlock, true);
+          document.removeEventListener('click', unlock, true);
+          document.removeEventListener('keydown', unlock, true);
+
+          // Let all sounds know that audio has been unlocked.
+          for (var i=0; i<self._howls.length; i++) {
+            self._howls[i]._emit('unlock');
+          }
+        };
+      };
+
+      // Setup a touch start listener to attempt an unlock in.
+      document.addEventListener('touchstart', unlock, true);
+      document.addEventListener('touchend', unlock, true);
+      document.addEventListener('click', unlock, true);
+      document.addEventListener('keydown', unlock, true);
+
+      return self;
+    },
+
+    /**
+     * Get an unlocked HTML5 Audio object from the pool. If none are left,
+     * return a new Audio object and throw a warning.
+     * @return {Audio} HTML5 Audio object.
+     */
+    _obtainHtml5Audio: function() {
+      var self = this || Howler;
+
+      // Return the next object from the pool if one exists.
+      if (self._html5AudioPool.length) {
+        return self._html5AudioPool.pop();
+      }
+
+      //.Check if the audio is locked and throw a warning.
+      var testPlay = new Audio().play();
+      if (testPlay && typeof Promise !== 'undefined' && (testPlay instanceof Promise || typeof testPlay.then === 'function')) {
+        testPlay.catch(function() {
+          console.warn('HTML5 Audio pool exhausted, returning potentially locked audio object.');
+        });
+      }
+
+      return new Audio();
+    },
+
+    /**
+     * Return an activated HTML5 Audio object to the pool.
+     * @return {Howler}
+     */
+    _releaseHtml5Audio: function(audio) {
+      var self = this || Howler;
+
+      // Don't add audio to the pool if we don't know if it has been unlocked.
+      if (audio._unlocked) {
+        self._html5AudioPool.push(audio);
+      }
+
+      return self;
+    },
+
+    /**
+     * Automatically suspend the Web Audio AudioContext after no sound has played for 30 seconds.
+     * This saves processing/energy and fixes various browser-specific bugs with audio getting stuck.
+     * @return {Howler}
+     */
+    _autoSuspend: function() {
+      var self = this;
+
+      if (!self.autoSuspend || !self.ctx || typeof self.ctx.suspend === 'undefined' || !Howler.usingWebAudio) {
+        return;
+      }
+
+      // Check if any sounds are playing.
+      for (var i=0; i<self._howls.length; i++) {
+        if (self._howls[i]._webAudio) {
+          for (var j=0; j<self._howls[i]._sounds.length; j++) {
+            if (!self._howls[i]._sounds[j]._paused) {
+              return self;
+            }
+          }
+        }
+      }
+
+      if (self._suspendTimer) {
+        clearTimeout(self._suspendTimer);
+      }
+
+      // If no sound has played after 30 seconds, suspend the context.
+      self._suspendTimer = setTimeout(function() {
+        if (!self.autoSuspend) {
+          return;
+        }
+
+        self._suspendTimer = null;
+        self.state = 'suspending';
+
+        // Handle updating the state of the audio context after suspending.
+        var handleSuspension = function() {
+          self.state = 'suspended';
+
+          if (self._resumeAfterSuspend) {
+            delete self._resumeAfterSuspend;
+            self._autoResume();
+          }
+        };
+
+        // Either the state gets suspended or it is interrupted.
+        // Either way, we need to update the state to suspended.
+        self.ctx.suspend().then(handleSuspension, handleSuspension);
+      }, 30000);
+
+      return self;
+    },
+
+    /**
+     * Automatically resume the Web Audio AudioContext when a new sound is played.
+     * @return {Howler}
+     */
+    _autoResume: function() {
+      var self = this;
+
+      if (!self.ctx || typeof self.ctx.resume === 'undefined' || !Howler.usingWebAudio) {
+        return;
+      }
+
+      if (self.state === 'running' && self.ctx.state !== 'interrupted' && self._suspendTimer) {
+        clearTimeout(self._suspendTimer);
+        self._suspendTimer = null;
+      } else if (self.state === 'suspended' || self.state === 'running' && self.ctx.state === 'interrupted') {
+        self.ctx.resume().then(function() {
+          self.state = 'running';
+
+          // Emit to all Howls that the audio has resumed.
+          for (var i=0; i<self._howls.length; i++) {
+            self._howls[i]._emit('resume');
+          }
+        });
+
+        if (self._suspendTimer) {
+          clearTimeout(self._suspendTimer);
+          self._suspendTimer = null;
+        }
+      } else if (self.state === 'suspending') {
+        self._resumeAfterSuspend = true;
+      }
+
+      return self;
+    }
+  };
+
+  // Setup the global audio controller.
+  var Howler = new HowlerGlobal();
+
+  /** Group Methods **/
+  /***************************************************************************/
+
+  /**
+   * Create an audio group controller.
+   * @param {Object} o Passed in properties for this group.
+   */
+  var Howl = function(o) {
+    var self = this;
+
+    // Throw an error if no source is provided.
+    if (!o.src || o.src.length === 0) {
+      console.error('An array of source files must be passed with any new Howl.');
+      return;
+    }
+
+    self.init(o);
+  };
+  Howl.prototype = {
+    /**
+     * Initialize a new Howl group object.
+     * @param  {Object} o Passed in properties for this group.
+     * @return {Howl}
+     */
+    init: function(o) {
+      var self = this;
+
+      // If we don't have an AudioContext created yet, run the setup.
+      if (!Howler.ctx) {
+        setupAudioContext();
+      }
+
+      // Setup user-defined default properties.
+      self._autoplay = o.autoplay || false;
+      self._format = (typeof o.format !== 'string') ? o.format : [o.format];
+      self._html5 = o.html5 || false;
+      self._muted = o.mute || false;
+      self._loop = o.loop || false;
+      self._pool = o.pool || 5;
+      self._preload = (typeof o.preload === 'boolean' || o.preload === 'metadata') ? o.preload : true;
+      self._rate = o.rate || 1;
+      self._sprite = o.sprite || {};
+      self._src = (typeof o.src !== 'string') ? o.src : [o.src];
+      self._volume = o.volume !== undefined ? o.volume : 1;
+      self._xhr = {
+        method: o.xhr && o.xhr.method ? o.xhr.method : 'GET',
+        headers: o.xhr && o.xhr.headers ? o.xhr.headers : null,
+        withCredentials: o.xhr && o.xhr.withCredentials ? o.xhr.withCredentials : false,
+      };
+
+      // Setup all other default properties.
+      self._duration = 0;
+      self._state = 'unloaded';
+      self._sounds = [];
+      self._endTimers = {};
+      self._queue = [];
+      self._playLock = false;
+
+      // Setup event listeners.
+      self._onend = o.onend ? [{fn: o.onend}] : [];
+      self._onfade = o.onfade ? [{fn: o.onfade}] : [];
+      self._onload = o.onload ? [{fn: o.onload}] : [];
+      self._onloaderror = o.onloaderror ? [{fn: o.onloaderror}] : [];
+      self._onplayerror = o.onplayerror ? [{fn: o.onplayerror}] : [];
+      self._onpause = o.onpause ? [{fn: o.onpause}] : [];
+      self._onplay = o.onplay ? [{fn: o.onplay}] : [];
+      self._onstop = o.onstop ? [{fn: o.onstop}] : [];
+      self._onmute = o.onmute ? [{fn: o.onmute}] : [];
+      self._onvolume = o.onvolume ? [{fn: o.onvolume}] : [];
+      self._onrate = o.onrate ? [{fn: o.onrate}] : [];
+      self._onseek = o.onseek ? [{fn: o.onseek}] : [];
+      self._onunlock = o.onunlock ? [{fn: o.onunlock}] : [];
+      self._onresume = [];
+
+      // Web Audio or HTML5 Audio?
+      self._webAudio = Howler.usingWebAudio && !self._html5;
+
+      // Automatically try to enable audio.
+      if (typeof Howler.ctx !== 'undefined' && Howler.ctx && Howler.autoUnlock) {
+        Howler._unlockAudio();
+      }
+
+      // Keep track of this Howl group in the global controller.
+      Howler._howls.push(self);
+
+      // If they selected autoplay, add a play event to the load queue.
+      if (self._autoplay) {
+        self._queue.push({
+          event: 'play',
+          action: function() {
+            self.play();
+          }
+        });
+      }
+
+      // Load the source file unless otherwise specified.
+      if (self._preload && self._preload !== 'none') {
+        self.load();
+      }
+
+      return self;
+    },
+
+    /**
+     * Load the audio file.
+     * @return {Howler}
+     */
+    load: function() {
+      var self = this;
+      var url = null;
+
+      // If no audio is available, quit immediately.
+      if (Howler.noAudio) {
+        self._emit('loaderror', null, 'No audio support.');
+        return;
+      }
+
+      // Make sure our source is in an array.
+      if (typeof self._src === 'string') {
+        self._src = [self._src];
+      }
+
+      // Loop through the sources and pick the first one that is compatible.
+      for (var i=0; i<self._src.length; i++) {
+        var ext, str;
+
+        if (self._format && self._format[i]) {
+          // If an extension was specified, use that instead.
+          ext = self._format[i];
+        } else {
+          // Make sure the source is a string.
+          str = self._src[i];
+          if (typeof str !== 'string') {
+            self._emit('loaderror', null, 'Non-string found in selected audio sources - ignoring.');
+            continue;
+          }
+
+          // Extract the file extension from the URL or base64 data URI.
+          ext = /^data:audio\/([^;,]+);/i.exec(str);
+          if (!ext) {
+            ext = /\.([^.]+)$/.exec(str.split('?', 1)[0]);
+          }
+
+          if (ext) {
+            ext = ext[1].toLowerCase();
+          }
+        }
+
+        // Log a warning if no extension was found.
+        if (!ext) {
+          console.warn('No file extension was found. Consider using the "format" property or specify an extension.');
+        }
+
+        // Check if this extension is available.
+        if (ext && Howler.codecs(ext)) {
+          url = self._src[i];
+          break;
+        }
+      }
+
+      if (!url) {
+        self._emit('loaderror', null, 'No codec support for selected audio sources.');
+        return;
+      }
+
+      self._src = url;
+      self._state = 'loading';
+
+      // If the hosting page is HTTPS and the source isn't,
+      // drop down to HTML5 Audio to avoid Mixed Content errors.
+      if (window.location.protocol === 'https:' && url.slice(0, 5) === 'http:') {
+        self._html5 = true;
+        self._webAudio = false;
+      }
+
+      // Create a new sound object and add it to the pool.
+      new Sound(self);
+
+      // Load and decode the audio data for playback.
+      if (self._webAudio) {
+        loadBuffer(self);
+      }
+
+      return self;
+    },
+
+    /**
+     * Play a sound or resume previous playback.
+     * @param  {String/Number} sprite   Sprite name for sprite playback or sound id to continue previous.
+     * @param  {Boolean} internal Internal Use: true prevents event firing.
+     * @return {Number}          Sound ID.
+     */
+    play: function(sprite, internal) {
+      var self = this;
+      var id = null;
+
+      // Determine if a sprite, sound id or nothing was passed
+      if (typeof sprite === 'number') {
+        id = sprite;
+        sprite = null;
+      } else if (typeof sprite === 'string' && self._state === 'loaded' && !self._sprite[sprite]) {
+        // If the passed sprite doesn't exist, do nothing.
+        return null;
+      } else if (typeof sprite === 'undefined') {
+        // Use the default sound sprite (plays the full audio length).
+        sprite = '__default';
+
+        // Check if there is a single paused sound that isn't ended.
+        // If there is, play that sound. If not, continue as usual.
+        if (!self._playLock) {
+          var num = 0;
+          for (var i=0; i<self._sounds.length; i++) {
+            if (self._sounds[i]._paused && !self._sounds[i]._ended) {
+              num++;
+              id = self._sounds[i]._id;
+            }
+          }
+
+          if (num === 1) {
+            sprite = null;
+          } else {
+            id = null;
+          }
+        }
+      }
+
+      // Get the selected node, or get one from the pool.
+      var sound = id ? self._soundById(id) : self._inactiveSound();
+
+      // If the sound doesn't exist, do nothing.
+      if (!sound) {
+        return null;
+      }
+
+      // Select the sprite definition.
+      if (id && !sprite) {
+        sprite = sound._sprite || '__default';
+      }
+
+      // If the sound hasn't loaded, we must wait to get the audio's duration.
+      // We also need to wait to make sure we don't run into race conditions with
+      // the order of function calls.
+      if (self._state !== 'loaded') {
+        // Set the sprite value on this sound.
+        sound._sprite = sprite;
+
+        // Mark this sound as not ended in case another sound is played before this one loads.
+        sound._ended = false;
+
+        // Add the sound to the queue to be played on load.
+        var soundId = sound._id;
+        self._queue.push({
+          event: 'play',
+          action: function() {
+            self.play(soundId);
+          }
+        });
+
+        return soundId;
+      }
+
+      // Don't play the sound if an id was passed and it is already playing.
+      if (id && !sound._paused) {
+        // Trigger the play event, in order to keep iterating through queue.
+        if (!internal) {
+          self._loadQueue('play');
+        }
+
+        return sound._id;
+      }
+
+      // Make sure the AudioContext isn't suspended, and resume it if it is.
+      if (self._webAudio) {
+        Howler._autoResume();
+      }
+
+      // Determine how long to play for and where to start playing.
+      var seek = Math.max(0, sound._seek > 0 ? sound._seek : self._sprite[sprite][0] / 1000);
+      var duration = Math.max(0, ((self._sprite[sprite][0] + self._sprite[sprite][1]) / 1000) - seek);
+      var timeout = (duration * 1000) / Math.abs(sound._rate);
+      var start = self._sprite[sprite][0] / 1000;
+      var stop = (self._sprite[sprite][0] + self._sprite[sprite][1]) / 1000;
+      sound._sprite = sprite;
+
+      // Mark the sound as ended instantly so that this async playback
+      // doesn't get grabbed by another call to play while this one waits to start.
+      sound._ended = false;
+
+      // Update the parameters of the sound.
+      var setParams = function() {
+        sound._paused = false;
+        sound._seek = seek;
+        sound._start = start;
+        sound._stop = stop;
+        sound._loop = !!(sound._loop || self._sprite[sprite][2]);
+      };
+
+      // End the sound instantly if seek is at the end.
+      if (seek >= stop) {
+        self._ended(sound);
+        return;
+      }
+
+      // Begin the actual playback.
+      var node = sound._node;
+      if (self._webAudio) {
+        // Fire this when the sound is ready to play to begin Web Audio playback.
+        var playWebAudio = function() {
+          self._playLock = false;
+          setParams();
+          self._refreshBuffer(sound);
+
+          // Setup the playback params.
+          var vol = (sound._muted || self._muted) ? 0 : sound._volume;
+          node.gain.setValueAtTime(vol, Howler.ctx.currentTime);
+          sound._playStart = Howler.ctx.currentTime;
+
+          // Play the sound using the supported method.
+          if (typeof node.bufferSource.start === 'undefined') {
+            sound._loop ? node.bufferSource.noteGrainOn(0, seek, 86400) : node.bufferSource.noteGrainOn(0, seek, duration);
+          } else {
+            sound._loop ? node.bufferSource.start(0, seek, 86400) : node.bufferSource.start(0, seek, duration);
+          }
+
+          // Start a new timer if none is present.
+          if (timeout !== Infinity) {
+            self._endTimers[sound._id] = setTimeout(self._ended.bind(self, sound), timeout);
+          }
+
+          if (!internal) {
+            setTimeout(function() {
+              self._emit('play', sound._id);
+              self._loadQueue();
+            }, 0);
+          }
+        };
+
+        if (Howler.state === 'running' && Howler.ctx.state !== 'interrupted') {
+          playWebAudio();
+        } else {
+          self._playLock = true;
+
+          // Wait for the audio context to resume before playing.
+          self.once('resume', playWebAudio);
+
+          // Cancel the end timer.
+          self._clearTimer(sound._id);
+        }
+      } else {
+        // Fire this when the sound is ready to play to begin HTML5 Audio playback.
+        var playHtml5 = function() {
+          node.currentTime = seek;
+          node.muted = sound._muted || self._muted || Howler._muted || node.muted;
+          node.volume = sound._volume * Howler.volume();
+          node.playbackRate = sound._rate;
+
+          // Some browsers will throw an error if this is called without user interaction.
+          try {
+            var play = node.play();
+
+            // Support older browsers that don't support promises, and thus don't have this issue.
+            if (play && typeof Promise !== 'undefined' && (play instanceof Promise || typeof play.then === 'function')) {
+              // Implements a lock to prevent DOMException: The play() request was interrupted by a call to pause().
+              self._playLock = true;
+
+              // Set param values immediately.
+              setParams();
+
+              // Releases the lock and executes queued actions.
+              play
+                .then(function() {
+                  self._playLock = false;
+                  node._unlocked = true;
+                  if (!internal) {
+                    self._emit('play', sound._id);
+                  } else {
+                    self._loadQueue();
+                  }
+                })
+                .catch(function() {
+                  self._playLock = false;
+                  self._emit('playerror', sound._id, 'Playback was unable to start. This is most commonly an issue ' +
+                    'on mobile devices and Chrome where playback was not within a user interaction.');
+
+                  // Reset the ended and paused values.
+                  sound._ended = true;
+                  sound._paused = true;
+                });
+            } else if (!internal) {
+              self._playLock = false;
+              setParams();
+              self._emit('play', sound._id);
+            }
+
+            // Setting rate before playing won't work in IE, so we set it again here.
+            node.playbackRate = sound._rate;
+
+            // If the node is still paused, then we can assume there was a playback issue.
+            if (node.paused) {
+              self._emit('playerror', sound._id, 'Playback was unable to start. This is most commonly an issue ' +
+                'on mobile devices and Chrome where playback was not within a user interaction.');
+              return;
+            }
+
+            // Setup the end timer on sprites or listen for the ended event.
+            if (sprite !== '__default' || sound._loop) {
+              self._endTimers[sound._id] = setTimeout(self._ended.bind(self, sound), timeout);
+            } else {
+              self._endTimers[sound._id] = function() {
+                // Fire ended on this audio node.
+                self._ended(sound);
+
+                // Clear this listener.
+                node.removeEventListener('ended', self._endTimers[sound._id], false);
+              };
+              node.addEventListener('ended', self._endTimers[sound._id], false);
+            }
+          } catch (err) {
+            self._emit('playerror', sound._id, err);
+          }
+        };
+
+        // If this is streaming audio, make sure the src is set and load again.
+        if (node.src === 'data:audio/wav;base64,UklGRigAAABXQVZFZm10IBIAAAABAAEARKwAAIhYAQACABAAAABkYXRhAgAAAAEA') {
+          node.src = self._src;
+          node.load();
+        }
+
+        // Play immediately if ready, or wait for the 'canplaythrough'e vent.
+        var loadedNoReadyState = (window && window.ejecta) || (!node.readyState && Howler._navigator.isCocoonJS);
+        if (node.readyState >= 3 || loadedNoReadyState) {
+          playHtml5();
+        } else {
+          self._playLock = true;
+          self._state = 'loading';
+
+          var listener = function() {
+            self._state = 'loaded';
+            
+            // Begin playback.
+            playHtml5();
+
+            // Clear this listener.
+            node.removeEventListener(Howler._canPlayEvent, listener, false);
+          };
+          node.addEventListener(Howler._canPlayEvent, listener, false);
+
+          // Cancel the end timer.
+          self._clearTimer(sound._id);
+        }
+      }
+
+      return sound._id;
+    },
+
+    /**
+     * Pause playback and save current position.
+     * @param  {Number} id The sound ID (empty to pause all in group).
+     * @return {Howl}
+     */
+    pause: function(id) {
+      var self = this;
+
+      // If the sound hasn't loaded or a play() promise is pending, add it to the load queue to pause when capable.
+      if (self._state !== 'loaded' || self._playLock) {
+        self._queue.push({
+          event: 'pause',
+          action: function() {
+            self.pause(id);
+          }
+        });
+
+        return self;
+      }
+
+      // If no id is passed, get all ID's to be paused.
+      var ids = self._getSoundIds(id);
+
+      for (var i=0; i<ids.length; i++) {
+        // Clear the end timer.
+        self._clearTimer(ids[i]);
+
+        // Get the sound.
+        var sound = self._soundById(ids[i]);
+
+        if (sound && !sound._paused) {
+          // Reset the seek position.
+          sound._seek = self.seek(ids[i]);
+          sound._rateSeek = 0;
+          sound._paused = true;
+
+          // Stop currently running fades.
+          self._stopFade(ids[i]);
+
+          if (sound._node) {
+            if (self._webAudio) {
+              // Make sure the sound has been created.
+              if (!sound._node.bufferSource) {
+                continue;
+              }
+
+              if (typeof sound._node.bufferSource.stop === 'undefined') {
+                sound._node.bufferSource.noteOff(0);
+              } else {
+                sound._node.bufferSource.stop(0);
+              }
+
+              // Clean up the buffer source.
+              self._cleanBuffer(sound._node);
+            } else if (!isNaN(sound._node.duration) || sound._node.duration === Infinity) {
+              sound._node.pause();
+            }
+          }
+        }
+
+        // Fire the pause event, unless `true` is passed as the 2nd argument.
+        if (!arguments[1]) {
+          self._emit('pause', sound ? sound._id : null);
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Stop playback and reset to start.
+     * @param  {Number} id The sound ID (empty to stop all in group).
+     * @param  {Boolean} internal Internal Use: true prevents event firing.
+     * @return {Howl}
+     */
+    stop: function(id, internal) {
+      var self = this;
+
+      // If the sound hasn't loaded, add it to the load queue to stop when capable.
+      if (self._state !== 'loaded' || self._playLock) {
+        self._queue.push({
+          event: 'stop',
+          action: function() {
+            self.stop(id);
+          }
+        });
+
+        return self;
+      }
+
+      // If no id is passed, get all ID's to be stopped.
+      var ids = self._getSoundIds(id);
+
+      for (var i=0; i<ids.length; i++) {
+        // Clear the end timer.
+        self._clearTimer(ids[i]);
+
+        // Get the sound.
+        var sound = self._soundById(ids[i]);
+
+        if (sound) {
+          // Reset the seek position.
+          sound._seek = sound._start || 0;
+          sound._rateSeek = 0;
+          sound._paused = true;
+          sound._ended = true;
+
+          // Stop currently running fades.
+          self._stopFade(ids[i]);
+
+          if (sound._node) {
+            if (self._webAudio) {
+              // Make sure the sound's AudioBufferSourceNode has been created.
+              if (sound._node.bufferSource) {
+                if (typeof sound._node.bufferSource.stop === 'undefined') {
+                  sound._node.bufferSource.noteOff(0);
+                } else {
+                  sound._node.bufferSource.stop(0);
+                }
+
+                // Clean up the buffer source.
+                self._cleanBuffer(sound._node);
+              }
+            } else if (!isNaN(sound._node.duration) || sound._node.duration === Infinity) {
+              sound._node.currentTime = sound._start || 0;
+              sound._node.pause();
+
+              // If this is a live stream, stop download once the audio is stopped.
+              if (sound._node.duration === Infinity) {
+                self._clearSound(sound._node);
+              }
+            }
+          }
+
+          if (!internal) {
+            self._emit('stop', sound._id);
+          }
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Mute/unmute a single sound or all sounds in this Howl group.
+     * @param  {Boolean} muted Set to true to mute and false to unmute.
+     * @param  {Number} id    The sound ID to update (omit to mute/unmute all).
+     * @return {Howl}
+     */
+    mute: function(muted, id) {
+      var self = this;
+
+      // If the sound hasn't loaded, add it to the load queue to mute when capable.
+      if (self._state !== 'loaded'|| self._playLock) {
+        self._queue.push({
+          event: 'mute',
+          action: function() {
+            self.mute(muted, id);
+          }
+        });
+
+        return self;
+      }
+
+      // If applying mute/unmute to all sounds, update the group's value.
+      if (typeof id === 'undefined') {
+        if (typeof muted === 'boolean') {
+          self._muted = muted;
+        } else {
+          return self._muted;
+        }
+      }
+
+      // If no id is passed, get all ID's to be muted.
+      var ids = self._getSoundIds(id);
+
+      for (var i=0; i<ids.length; i++) {
+        // Get the sound.
+        var sound = self._soundById(ids[i]);
+
+        if (sound) {
+          sound._muted = muted;
+
+          // Cancel active fade and set the volume to the end value.
+          if (sound._interval) {
+            self._stopFade(sound._id);
+          }
+
+          if (self._webAudio && sound._node) {
+            sound._node.gain.setValueAtTime(muted ? 0 : sound._volume, Howler.ctx.currentTime);
+          } else if (sound._node) {
+            sound._node.muted = Howler._muted ? true : muted;
+          }
+
+          self._emit('mute', sound._id);
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Get/set the volume of this sound or of the Howl group. This method can optionally take 0, 1 or 2 arguments.
+     *   volume() -> Returns the group's volume value.
+     *   volume(id) -> Returns the sound id's current volume.
+     *   volume(vol) -> Sets the volume of all sounds in this Howl group.
+     *   volume(vol, id) -> Sets the volume of passed sound id.
+     * @return {Howl/Number} Returns self or current volume.
+     */
+    volume: function() {
+      var self = this;
+      var args = arguments;
+      var vol, id;
+
+      // Determine the values based on arguments.
+      if (args.length === 0) {
+        // Return the value of the groups' volume.
+        return self._volume;
+      } else if (args.length === 1 || args.length === 2 && typeof args[1] === 'undefined') {
+        // First check if this is an ID, and if not, assume it is a new volume.
+        var ids = self._getSoundIds();
+        var index = ids.indexOf(args[0]);
+        if (index >= 0) {
+          id = parseInt(args[0], 10);
+        } else {
+          vol = parseFloat(args[0]);
+        }
+      } else if (args.length >= 2) {
+        vol = parseFloat(args[0]);
+        id = parseInt(args[1], 10);
+      }
+
+      // Update the volume or return the current volume.
+      var sound;
+      if (typeof vol !== 'undefined' && vol >= 0 && vol <= 1) {
+        // If the sound hasn't loaded, add it to the load queue to change volume when capable.
+        if (self._state !== 'loaded'|| self._playLock) {
+          self._queue.push({
+            event: 'volume',
+            action: function() {
+              self.volume.apply(self, args);
+            }
+          });
+
+          return self;
+        }
+
+        // Set the group volume.
+        if (typeof id === 'undefined') {
+          self._volume = vol;
+        }
+
+        // Update one or all volumes.
+        id = self._getSoundIds(id);
+        for (var i=0; i<id.length; i++) {
+          // Get the sound.
+          sound = self._soundById(id[i]);
+
+          if (sound) {
+            sound._volume = vol;
+
+            // Stop currently running fades.
+            if (!args[2]) {
+              self._stopFade(id[i]);
+            }
+
+            if (self._webAudio && sound._node && !sound._muted) {
+              sound._node.gain.setValueAtTime(vol, Howler.ctx.currentTime);
+            } else if (sound._node && !sound._muted) {
+              sound._node.volume = vol * Howler.volume();
+            }
+
+            self._emit('volume', sound._id);
+          }
+        }
+      } else {
+        sound = id ? self._soundById(id) : self._sounds[0];
+        return sound ? sound._volume : 0;
+      }
+
+      return self;
+    },
+
+    /**
+     * Fade a currently playing sound between two volumes (if no id is passed, all sounds will fade).
+     * @param  {Number} from The value to fade from (0.0 to 1.0).
+     * @param  {Number} to   The volume to fade to (0.0 to 1.0).
+     * @param  {Number} len  Time in milliseconds to fade.
+     * @param  {Number} id   The sound id (omit to fade all sounds).
+     * @return {Howl}
+     */
+    fade: function(from, to, len, id) {
+      var self = this;
+
+      // If the sound hasn't loaded, add it to the load queue to fade when capable.
+      if (self._state !== 'loaded' || self._playLock) {
+        self._queue.push({
+          event: 'fade',
+          action: function() {
+            self.fade(from, to, len, id);
+          }
+        });
+
+        return self;
+      }
+
+      // Make sure the to/from/len values are numbers.
+      from = Math.min(Math.max(0, parseFloat(from)), 1);
+      to = Math.min(Math.max(0, parseFloat(to)), 1);
+      len = parseFloat(len);
+
+      // Set the volume to the start position.
+      self.volume(from, id);
+
+      // Fade the volume of one or all sounds.
+      var ids = self._getSoundIds(id);
+      for (var i=0; i<ids.length; i++) {
+        // Get the sound.
+        var sound = self._soundById(ids[i]);
+
+        // Create a linear fade or fall back to timeouts with HTML5 Audio.
+        if (sound) {
+          // Stop the previous fade if no sprite is being used (otherwise, volume handles this).
+          if (!id) {
+            self._stopFade(ids[i]);
+          }
+
+          // If we are using Web Audio, let the native methods do the actual fade.
+          if (self._webAudio && !sound._muted) {
+            var currentTime = Howler.ctx.currentTime;
+            var end = currentTime + (len / 1000);
+            sound._volume = from;
+            sound._node.gain.setValueAtTime(from, currentTime);
+            sound._node.gain.linearRampToValueAtTime(to, end);
+          }
+
+          self._startFadeInterval(sound, from, to, len, ids[i], typeof id === 'undefined');
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Starts the internal interval to fade a sound.
+     * @param  {Object} sound Reference to sound to fade.
+     * @param  {Number} from The value to fade from (0.0 to 1.0).
+     * @param  {Number} to   The volume to fade to (0.0 to 1.0).
+     * @param  {Number} len  Time in milliseconds to fade.
+     * @param  {Number} id   The sound id to fade.
+     * @param  {Boolean} isGroup   If true, set the volume on the group.
+     */
+    _startFadeInterval: function(sound, from, to, len, id, isGroup) {
+      var self = this;
+      var vol = from;
+      var diff = to - from;
+      var steps = Math.abs(diff / 0.01);
+      var stepLen = Math.max(4, (steps > 0) ? len / steps : len);
+      var lastTick = Date.now();
+
+      // Store the value being faded to.
+      sound._fadeTo = to;
+
+      // Update the volume value on each interval tick.
+      sound._interval = setInterval(function() {
+        // Update the volume based on the time since the last tick.
+        var tick = (Date.now() - lastTick) / len;
+        lastTick = Date.now();
+        vol += diff * tick;
+
+        // Round to within 2 decimal points.
+        vol = Math.round(vol * 100) / 100;
+
+        // Make sure the volume is in the right bounds.
+        if (diff < 0) {
+          vol = Math.max(to, vol);
+        } else {
+          vol = Math.min(to, vol);
+        }
+
+        // Change the volume.
+        if (self._webAudio) {
+          sound._volume = vol;
+        } else {
+          self.volume(vol, sound._id, true);
+        }
+
+        // Set the group's volume.
+        if (isGroup) {
+          self._volume = vol;
+        }
+
+        // When the fade is complete, stop it and fire event.
+        if ((to < from && vol <= to) || (to > from && vol >= to)) {
+          clearInterval(sound._interval);
+          sound._interval = null;
+          sound._fadeTo = null;
+          self.volume(to, sound._id);
+          self._emit('fade', sound._id);
+        }
+      }, stepLen);
+    },
+
+    /**
+     * Internal method that stops the currently playing fade when
+     * a new fade starts, volume is changed or the sound is stopped.
+     * @param  {Number} id The sound id.
+     * @return {Howl}
+     */
+    _stopFade: function(id) {
+      var self = this;
+      var sound = self._soundById(id);
+
+      if (sound && sound._interval) {
+        if (self._webAudio) {
+          sound._node.gain.cancelScheduledValues(Howler.ctx.currentTime);
+        }
+
+        clearInterval(sound._interval);
+        sound._interval = null;
+        self.volume(sound._fadeTo, id);
+        sound._fadeTo = null;
+        self._emit('fade', id);
+      }
+
+      return self;
+    },
+
+    /**
+     * Get/set the loop parameter on a sound. This method can optionally take 0, 1 or 2 arguments.
+     *   loop() -> Returns the group's loop value.
+     *   loop(id) -> Returns the sound id's loop value.
+     *   loop(loop) -> Sets the loop value for all sounds in this Howl group.
+     *   loop(loop, id) -> Sets the loop value of passed sound id.
+     * @return {Howl/Boolean} Returns self or current loop value.
+     */
+    loop: function() {
+      var self = this;
+      var args = arguments;
+      var loop, id, sound;
+
+      // Determine the values for loop and id.
+      if (args.length === 0) {
+        // Return the grou's loop value.
+        return self._loop;
+      } else if (args.length === 1) {
+        if (typeof args[0] === 'boolean') {
+          loop = args[0];
+          self._loop = loop;
+        } else {
+          // Return this sound's loop value.
+          sound = self._soundById(parseInt(args[0], 10));
+          return sound ? sound._loop : false;
+        }
+      } else if (args.length === 2) {
+        loop = args[0];
+        id = parseInt(args[1], 10);
+      }
+
+      // If no id is passed, get all ID's to be looped.
+      var ids = self._getSoundIds(id);
+      for (var i=0; i<ids.length; i++) {
+        sound = self._soundById(ids[i]);
+
+        if (sound) {
+          sound._loop = loop;
+          if (self._webAudio && sound._node && sound._node.bufferSource) {
+            sound._node.bufferSource.loop = loop;
+            if (loop) {
+              sound._node.bufferSource.loopStart = sound._start || 0;
+              sound._node.bufferSource.loopEnd = sound._stop;
+
+              // If playing, restart playback to ensure looping updates.
+              if (self.playing(ids[i])) {
+                self.pause(ids[i], true);
+                self.play(ids[i], true);
+              }
+            }
+          }
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Get/set the playback rate of a sound. This method can optionally take 0, 1 or 2 arguments.
+     *   rate() -> Returns the first sound node's current playback rate.
+     *   rate(id) -> Returns the sound id's current playback rate.
+     *   rate(rate) -> Sets the playback rate of all sounds in this Howl group.
+     *   rate(rate, id) -> Sets the playback rate of passed sound id.
+     * @return {Howl/Number} Returns self or the current playback rate.
+     */
+    rate: function() {
+      var self = this;
+      var args = arguments;
+      var rate, id;
+
+      // Determine the values based on arguments.
+      if (args.length === 0) {
+        // We will simply return the current rate of the first node.
+        id = self._sounds[0]._id;
+      } else if (args.length === 1) {
+        // First check if this is an ID, and if not, assume it is a new rate value.
+        var ids = self._getSoundIds();
+        var index = ids.indexOf(args[0]);
+        if (index >= 0) {
+          id = parseInt(args[0], 10);
+        } else {
+          rate = parseFloat(args[0]);
+        }
+      } else if (args.length === 2) {
+        rate = parseFloat(args[0]);
+        id = parseInt(args[1], 10);
+      }
+
+      // Update the playback rate or return the current value.
+      var sound;
+      if (typeof rate === 'number') {
+        // If the sound hasn't loaded, add it to the load queue to change playback rate when capable.
+        if (self._state !== 'loaded' || self._playLock) {
+          self._queue.push({
+            event: 'rate',
+            action: function() {
+              self.rate.apply(self, args);
+            }
+          });
+
+          return self;
+        }
+
+        // Set the group rate.
+        if (typeof id === 'undefined') {
+          self._rate = rate;
+        }
+
+        // Update one or all volumes.
+        id = self._getSoundIds(id);
+        for (var i=0; i<id.length; i++) {
+          // Get the sound.
+          sound = self._soundById(id[i]);
+
+          if (sound) {
+            // Keep track of our position when the rate changed and update the playback
+            // start position so we can properly adjust the seek position for time elapsed.
+            if (self.playing(id[i])) {
+              sound._rateSeek = self.seek(id[i]);
+              sound._playStart = self._webAudio ? Howler.ctx.currentTime : sound._playStart;
+            }
+            sound._rate = rate;
+
+            // Change the playback rate.
+            if (self._webAudio && sound._node && sound._node.bufferSource) {
+              sound._node.bufferSource.playbackRate.setValueAtTime(rate, Howler.ctx.currentTime);
+            } else if (sound._node) {
+              sound._node.playbackRate = rate;
+            }
+
+            // Reset the timers.
+            var seek = self.seek(id[i]);
+            var duration = ((self._sprite[sound._sprite][0] + self._sprite[sound._sprite][1]) / 1000) - seek;
+            var timeout = (duration * 1000) / Math.abs(sound._rate);
+
+            // Start a new end timer if sound is already playing.
+            if (self._endTimers[id[i]] || !sound._paused) {
+              self._clearTimer(id[i]);
+              self._endTimers[id[i]] = setTimeout(self._ended.bind(self, sound), timeout);
+            }
+
+            self._emit('rate', sound._id);
+          }
+        }
+      } else {
+        sound = self._soundById(id);
+        return sound ? sound._rate : self._rate;
+      }
+
+      return self;
+    },
+
+    /**
+     * Get/set the seek position of a sound. This method can optionally take 0, 1 or 2 arguments.
+     *   seek() -> Returns the first sound node's current seek position.
+     *   seek(id) -> Returns the sound id's current seek position.
+     *   seek(seek) -> Sets the seek position of the first sound node.
+     *   seek(seek, id) -> Sets the seek position of passed sound id.
+     * @return {Howl/Number} Returns self or the current seek position.
+     */
+    seek: function() {
+      var self = this;
+      var args = arguments;
+      var seek, id;
+
+      // Determine the values based on arguments.
+      if (args.length === 0) {
+        // We will simply return the current position of the first node.
+        if (self._sounds.length) {
+          id = self._sounds[0]._id;
+        }
+      } else if (args.length === 1) {
+        // First check if this is an ID, and if not, assume it is a new seek position.
+        var ids = self._getSoundIds();
+        var index = ids.indexOf(args[0]);
+        if (index >= 0) {
+          id = parseInt(args[0], 10);
+        } else if (self._sounds.length) {
+          id = self._sounds[0]._id;
+          seek = parseFloat(args[0]);
+        }
+      } else if (args.length === 2) {
+        seek = parseFloat(args[0]);
+        id = parseInt(args[1], 10);
+      }
+
+      // If there is no ID, bail out.
+      if (typeof id === 'undefined') {
+        return 0;
+      }
+
+      // If the sound hasn't loaded, add it to the load queue to seek when capable.
+      if (typeof seek === 'number' && (self._state !== 'loaded' || self._playLock)) {
+        self._queue.push({
+          event: 'seek',
+          action: function() {
+            self.seek.apply(self, args);
+          }
+        });
+
+        return self;
+      }
+
+      // Get the sound.
+      var sound = self._soundById(id);
+
+      if (sound) {
+        if (typeof seek === 'number' && seek >= 0) {
+          // Pause the sound and update position for restarting playback.
+          var playing = self.playing(id);
+          if (playing) {
+            self.pause(id, true);
+          }
+
+          // Move the position of the track and cancel timer.
+          sound._seek = seek;
+          sound._ended = false;
+          self._clearTimer(id);
+
+          // Update the seek position for HTML5 Audio.
+          if (!self._webAudio && sound._node && !isNaN(sound._node.duration)) {
+            sound._node.currentTime = seek;
+          }
+
+          // Seek and emit when ready.
+          var seekAndEmit = function() {
+            // Restart the playback if the sound was playing.
+            if (playing) {
+              self.play(id, true);
+            }
+
+            self._emit('seek', id);
+          };
+
+          // Wait for the play lock to be unset before emitting (HTML5 Audio).
+          if (playing && !self._webAudio) {
+            var emitSeek = function() {
+              if (!self._playLock) {
+                seekAndEmit();
+              } else {
+                setTimeout(emitSeek, 0);
+              }
+            };
+            setTimeout(emitSeek, 0);
+          } else {
+            seekAndEmit();
+          }
+        } else {
+          if (self._webAudio) {
+            var realTime = self.playing(id) ? Howler.ctx.currentTime - sound._playStart : 0;
+            var rateSeek = sound._rateSeek ? sound._rateSeek - sound._seek : 0;
+            return sound._seek + (rateSeek + realTime * Math.abs(sound._rate));
+          } else {
+            return sound._node.currentTime;
+          }
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Check if a specific sound is currently playing or not (if id is provided), or check if at least one of the sounds in the group is playing or not.
+     * @param  {Number}  id The sound id to check. If none is passed, the whole sound group is checked.
+     * @return {Boolean} True if playing and false if not.
+     */
+    playing: function(id) {
+      var self = this;
+
+      // Check the passed sound ID (if any).
+      if (typeof id === 'number') {
+        var sound = self._soundById(id);
+        return sound ? !sound._paused : false;
+      }
+
+      // Otherwise, loop through all sounds and check if any are playing.
+      for (var i=0; i<self._sounds.length; i++) {
+        if (!self._sounds[i]._paused) {
+          return true;
+        }
+      }
+
+      return false;
+    },
+
+    /**
+     * Get the duration of this sound. Passing a sound id will return the sprite duration.
+     * @param  {Number} id The sound id to check. If none is passed, return full source duration.
+     * @return {Number} Audio duration in seconds.
+     */
+    duration: function(id) {
+      var self = this;
+      var duration = self._duration;
+
+      // If we pass an ID, get the sound and return the sprite length.
+      var sound = self._soundById(id);
+      if (sound) {
+        duration = self._sprite[sound._sprite][1] / 1000;
+      }
+
+      return duration;
+    },
+
+    /**
+     * Returns the current loaded state of this Howl.
+     * @return {String} 'unloaded', 'loading', 'loaded'
+     */
+    state: function() {
+      return this._state;
+    },
+
+    /**
+     * Unload and destroy the current Howl object.
+     * This will immediately stop all sound instances attached to this group.
+     */
+    unload: function() {
+      var self = this;
+
+      // Stop playing any active sounds.
+      var sounds = self._sounds;
+      for (var i=0; i<sounds.length; i++) {
+        // Stop the sound if it is currently playing.
+        if (!sounds[i]._paused) {
+          self.stop(sounds[i]._id);
+        }
+
+        // Remove the source or disconnect.
+        if (!self._webAudio) {
+          // Set the source to 0-second silence to stop any downloading (except in IE).
+          self._clearSound(sounds[i]._node);
+
+          // Remove any event listeners.
+          sounds[i]._node.removeEventListener('error', sounds[i]._errorFn, false);
+          sounds[i]._node.removeEventListener(Howler._canPlayEvent, sounds[i]._loadFn, false);
+          sounds[i]._node.removeEventListener('ended', sounds[i]._endFn, false);
+
+          // Release the Audio object back to the pool.
+          Howler._releaseHtml5Audio(sounds[i]._node);
+        }
+
+        // Empty out all of the nodes.
+        delete sounds[i]._node;
+
+        // Make sure all timers are cleared out.
+        self._clearTimer(sounds[i]._id);
+      }
+
+      // Remove the references in the global Howler object.
+      var index = Howler._howls.indexOf(self);
+      if (index >= 0) {
+        Howler._howls.splice(index, 1);
+      }
+
+      // Delete this sound from the cache (if no other Howl is using it).
+      var remCache = true;
+      for (i=0; i<Howler._howls.length; i++) {
+        if (Howler._howls[i]._src === self._src || self._src.indexOf(Howler._howls[i]._src) >= 0) {
+          remCache = false;
+          break;
+        }
+      }
+
+      if (cache && remCache) {
+        delete cache[self._src];
+      }
+
+      // Clear global errors.
+      Howler.noAudio = false;
+
+      // Clear out `self`.
+      self._state = 'unloaded';
+      self._sounds = [];
+      self = null;
+
+      return null;
+    },
+
+    /**
+     * Listen to a custom event.
+     * @param  {String}   event Event name.
+     * @param  {Function} fn    Listener to call.
+     * @param  {Number}   id    (optional) Only listen to events for this sound.
+     * @param  {Number}   once  (INTERNAL) Marks event to fire only once.
+     * @return {Howl}
+     */
+    on: function(event, fn, id, once) {
+      var self = this;
+      var events = self['_on' + event];
+
+      if (typeof fn === 'function') {
+        events.push(once ? {id: id, fn: fn, once: once} : {id: id, fn: fn});
+      }
+
+      return self;
+    },
+
+    /**
+     * Remove a custom event. Call without parameters to remove all events.
+     * @param  {String}   event Event name.
+     * @param  {Function} fn    Listener to remove. Leave empty to remove all.
+     * @param  {Number}   id    (optional) Only remove events for this sound.
+     * @return {Howl}
+     */
+    off: function(event, fn, id) {
+      var self = this;
+      var events = self['_on' + event];
+      var i = 0;
+
+      // Allow passing just an event and ID.
+      if (typeof fn === 'number') {
+        id = fn;
+        fn = null;
+      }
+
+      if (fn || id) {
+        // Loop through event store and remove the passed function.
+        for (i=0; i<events.length; i++) {
+          var isId = (id === events[i].id);
+          if (fn === events[i].fn && isId || !fn && isId) {
+            events.splice(i, 1);
+            break;
+          }
+        }
+      } else if (event) {
+        // Clear out all events of this type.
+        self['_on' + event] = [];
+      } else {
+        // Clear out all events of every type.
+        var keys = Object.keys(self);
+        for (i=0; i<keys.length; i++) {
+          if ((keys[i].indexOf('_on') === 0) && Array.isArray(self[keys[i]])) {
+            self[keys[i]] = [];
+          }
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Listen to a custom event and remove it once fired.
+     * @param  {String}   event Event name.
+     * @param  {Function} fn    Listener to call.
+     * @param  {Number}   id    (optional) Only listen to events for this sound.
+     * @return {Howl}
+     */
+    once: function(event, fn, id) {
+      var self = this;
+
+      // Setup the event listener.
+      self.on(event, fn, id, 1);
+
+      return self;
+    },
+
+    /**
+     * Emit all events of a specific type and pass the sound id.
+     * @param  {String} event Event name.
+     * @param  {Number} id    Sound ID.
+     * @param  {Number} msg   Message to go with event.
+     * @return {Howl}
+     */
+    _emit: function(event, id, msg) {
+      var self = this;
+      var events = self['_on' + event];
+
+      // Loop through event store and fire all functions.
+      for (var i=events.length-1; i>=0; i--) {
+        // Only fire the listener if the correct ID is used.
+        if (!events[i].id || events[i].id === id || event === 'load') {
+          setTimeout(function(fn) {
+            fn.call(this, id, msg);
+          }.bind(self, events[i].fn), 0);
+
+          // If this event was setup with `once`, remove it.
+          if (events[i].once) {
+            self.off(event, events[i].fn, events[i].id);
+          }
+        }
+      }
+
+      // Pass the event type into load queue so that it can continue stepping.
+      self._loadQueue(event);
+
+      return self;
+    },
+
+    /**
+     * Queue of actions initiated before the sound has loaded.
+     * These will be called in sequence, with the next only firing
+     * after the previous has finished executing (even if async like play).
+     * @return {Howl}
+     */
+    _loadQueue: function(event) {
+      var self = this;
+
+      if (self._queue.length > 0) {
+        var task = self._queue[0];
+
+        // Remove this task if a matching event was passed.
+        if (task.event === event) {
+          self._queue.shift();
+          self._loadQueue();
+        }
+
+        // Run the task if no event type is passed.
+        if (!event) {
+          task.action();
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Fired when playback ends at the end of the duration.
+     * @param  {Sound} sound The sound object to work with.
+     * @return {Howl}
+     */
+    _ended: function(sound) {
+      var self = this;
+      var sprite = sound._sprite;
+
+      // If we are using IE and there was network latency we may be clipping
+      // audio before it completes playing. Lets check the node to make sure it
+      // believes it has completed, before ending the playback.
+      if (!self._webAudio && sound._node && !sound._node.paused && !sound._node.ended && sound._node.currentTime < sound._stop) {
+        setTimeout(self._ended.bind(self, sound), 100);
+        return self;
+      }
+
+      // Should this sound loop?
+      var loop = !!(sound._loop || self._sprite[sprite][2]);
+
+      // Fire the ended event.
+      self._emit('end', sound._id);
+
+      // Restart the playback for HTML5 Audio loop.
+      if (!self._webAudio && loop) {
+        self.stop(sound._id, true).play(sound._id);
+      }
+
+      // Restart this timer if on a Web Audio loop.
+      if (self._webAudio && loop) {
+        self._emit('play', sound._id);
+        sound._seek = sound._start || 0;
+        sound._rateSeek = 0;
+        sound._playStart = Howler.ctx.currentTime;
+
+        var timeout = ((sound._stop - sound._start) * 1000) / Math.abs(sound._rate);
+        self._endTimers[sound._id] = setTimeout(self._ended.bind(self, sound), timeout);
+      }
+
+      // Mark the node as paused.
+      if (self._webAudio && !loop) {
+        sound._paused = true;
+        sound._ended = true;
+        sound._seek = sound._start || 0;
+        sound._rateSeek = 0;
+        self._clearTimer(sound._id);
+
+        // Clean up the buffer source.
+        self._cleanBuffer(sound._node);
+
+        // Attempt to auto-suspend AudioContext if no sounds are still playing.
+        Howler._autoSuspend();
+      }
+
+      // When using a sprite, end the track.
+      if (!self._webAudio && !loop) {
+        self.stop(sound._id, true);
+      }
+
+      return self;
+    },
+
+    /**
+     * Clear the end timer for a sound playback.
+     * @param  {Number} id The sound ID.
+     * @return {Howl}
+     */
+    _clearTimer: function(id) {
+      var self = this;
+
+      if (self._endTimers[id]) {
+        // Clear the timeout or remove the ended listener.
+        if (typeof self._endTimers[id] !== 'function') {
+          clearTimeout(self._endTimers[id]);
+        } else {
+          var sound = self._soundById(id);
+          if (sound && sound._node) {
+            sound._node.removeEventListener('ended', self._endTimers[id], false);
+          }
+        }
+
+        delete self._endTimers[id];
+      }
+
+      return self;
+    },
+
+    /**
+     * Return the sound identified by this ID, or return null.
+     * @param  {Number} id Sound ID
+     * @return {Object}    Sound object or null.
+     */
+    _soundById: function(id) {
+      var self = this;
+
+      // Loop through all sounds and find the one with this ID.
+      for (var i=0; i<self._sounds.length; i++) {
+        if (id === self._sounds[i]._id) {
+          return self._sounds[i];
+        }
+      }
+
+      return null;
+    },
+
+    /**
+     * Return an inactive sound from the pool or create a new one.
+     * @return {Sound} Sound playback object.
+     */
+    _inactiveSound: function() {
+      var self = this;
+
+      self._drain();
+
+      // Find the first inactive node to recycle.
+      for (var i=0; i<self._sounds.length; i++) {
+        if (self._sounds[i]._ended) {
+          return self._sounds[i].reset();
+        }
+      }
+
+      // If no inactive node was found, create a new one.
+      return new Sound(self);
+    },
+
+    /**
+     * Drain excess inactive sounds from the pool.
+     */
+    _drain: function() {
+      var self = this;
+      var limit = self._pool;
+      var cnt = 0;
+      var i = 0;
+
+      // If there are less sounds than the max pool size, we are done.
+      if (self._sounds.length < limit) {
+        return;
+      }
+
+      // Count the number of inactive sounds.
+      for (i=0; i<self._sounds.length; i++) {
+        if (self._sounds[i]._ended) {
+          cnt++;
+        }
+      }
+
+      // Remove excess inactive sounds, going in reverse order.
+      for (i=self._sounds.length - 1; i>=0; i--) {
+        if (cnt <= limit) {
+          return;
+        }
+
+        if (self._sounds[i]._ended) {
+          // Disconnect the audio source when using Web Audio.
+          if (self._webAudio && self._sounds[i]._node) {
+            self._sounds[i]._node.disconnect(0);
+          }
+
+          // Remove sounds until we have the pool size.
+          self._sounds.splice(i, 1);
+          cnt--;
+        }
+      }
+    },
+
+    /**
+     * Get all ID's from the sounds pool.
+     * @param  {Number} id Only return one ID if one is passed.
+     * @return {Array}    Array of IDs.
+     */
+    _getSoundIds: function(id) {
+      var self = this;
+
+      if (typeof id === 'undefined') {
+        var ids = [];
+        for (var i=0; i<self._sounds.length; i++) {
+          ids.push(self._sounds[i]._id);
+        }
+
+        return ids;
+      } else {
+        return [id];
+      }
+    },
+
+    /**
+     * Load the sound back into the buffer source.
+     * @param  {Sound} sound The sound object to work with.
+     * @return {Howl}
+     */
+    _refreshBuffer: function(sound) {
+      var self = this;
+
+      // Setup the buffer source for playback.
+      sound._node.bufferSource = Howler.ctx.createBufferSource();
+      sound._node.bufferSource.buffer = cache[self._src];
+
+      // Connect to the correct node.
+      if (sound._panner) {
+        sound._node.bufferSource.connect(sound._panner);
+      } else {
+        sound._node.bufferSource.connect(sound._node);
+      }
+
+      // Setup looping and playback rate.
+      sound._node.bufferSource.loop = sound._loop;
+      if (sound._loop) {
+        sound._node.bufferSource.loopStart = sound._start || 0;
+        sound._node.bufferSource.loopEnd = sound._stop || 0;
+      }
+      sound._node.bufferSource.playbackRate.setValueAtTime(sound._rate, Howler.ctx.currentTime);
+
+      return self;
+    },
+
+    /**
+     * Prevent memory leaks by cleaning up the buffer source after playback.
+     * @param  {Object} node Sound's audio node containing the buffer source.
+     * @return {Howl}
+     */
+    _cleanBuffer: function(node) {
+      var self = this;
+      var isIOS = Howler._navigator && Howler._navigator.vendor.indexOf('Apple') >= 0;
+
+      if (!node.bufferSource) {
+        return self;
+      }
+
+      if (Howler._scratchBuffer && node.bufferSource) {
+        node.bufferSource.onended = null;
+        node.bufferSource.disconnect(0);
+        if (isIOS) {
+          try { node.bufferSource.buffer = Howler._scratchBuffer; } catch(e) {}
+        }
+      }
+      node.bufferSource = null;
+
+      return self;
+    },
+
+    /**
+     * Set the source to a 0-second silence to stop any downloading (except in IE).
+     * @param  {Object} node Audio node to clear.
+     */
+    _clearSound: function(node) {
+      var checkIE = /MSIE |Trident\//.test(Howler._navigator && Howler._navigator.userAgent);
+      if (!checkIE) {
+        node.src = 'data:audio/wav;base64,UklGRigAAABXQVZFZm10IBIAAAABAAEARKwAAIhYAQACABAAAABkYXRhAgAAAAEA';
+      }
+    }
+  };
+
+  /** Single Sound Methods **/
+  /***************************************************************************/
+
+  /**
+   * Setup the sound object, which each node attached to a Howl group is contained in.
+   * @param {Object} howl The Howl parent group.
+   */
+  var Sound = function(howl) {
+    this._parent = howl;
+    this.init();
+  };
+  Sound.prototype = {
+    /**
+     * Initialize a new Sound object.
+     * @return {Sound}
+     */
+    init: function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Setup the default parameters.
+      self._muted = parent._muted;
+      self._loop = parent._loop;
+      self._volume = parent._volume;
+      self._rate = parent._rate;
+      self._seek = 0;
+      self._paused = true;
+      self._ended = true;
+      self._sprite = '__default';
+
+      // Generate a unique ID for this sound.
+      self._id = ++Howler._counter;
+
+      // Add itself to the parent's pool.
+      parent._sounds.push(self);
+
+      // Create the new node.
+      self.create();
+
+      return self;
+    },
+
+    /**
+     * Create and setup a new sound object, whether HTML5 Audio or Web Audio.
+     * @return {Sound}
+     */
+    create: function() {
+      var self = this;
+      var parent = self._parent;
+      var volume = (Howler._muted || self._muted || self._parent._muted) ? 0 : self._volume;
+
+      if (parent._webAudio) {
+        // Create the gain node for controlling volume (the source will connect to this).
+        self._node = (typeof Howler.ctx.createGain === 'undefined') ? Howler.ctx.createGainNode() : Howler.ctx.createGain();
+        self._node.gain.setValueAtTime(volume, Howler.ctx.currentTime);
+        self._node.paused = true;
+        self._node.connect(Howler.masterGain);
+      } else if (!Howler.noAudio) {
+        // Get an unlocked Audio object from the pool.
+        self._node = Howler._obtainHtml5Audio();
+
+        // Listen for errors (http://dev.w3.org/html5/spec-author-view/spec.html#mediaerror).
+        self._errorFn = self._errorListener.bind(self);
+        self._node.addEventListener('error', self._errorFn, false);
+
+        // Listen for 'canplaythrough' event to let us know the sound is ready.
+        self._loadFn = self._loadListener.bind(self);
+        self._node.addEventListener(Howler._canPlayEvent, self._loadFn, false);
+
+        // Listen for the 'ended' event on the sound to account for edge-case where
+        // a finite sound has a duration of Infinity.
+        self._endFn = self._endListener.bind(self);
+        self._node.addEventListener('ended', self._endFn, false);
+
+        // Setup the new audio node.
+        self._node.src = parent._src;
+        self._node.preload = parent._preload === true ? 'auto' : parent._preload;
+        self._node.volume = volume * Howler.volume();
+
+        // Begin loading the source.
+        self._node.load();
+      }
+
+      return self;
+    },
+
+    /**
+     * Reset the parameters of this sound to the original state (for recycle).
+     * @return {Sound}
+     */
+    reset: function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Reset all of the parameters of this sound.
+      self._muted = parent._muted;
+      self._loop = parent._loop;
+      self._volume = parent._volume;
+      self._rate = parent._rate;
+      self._seek = 0;
+      self._rateSeek = 0;
+      self._paused = true;
+      self._ended = true;
+      self._sprite = '__default';
+
+      // Generate a new ID so that it isn't confused with the previous sound.
+      self._id = ++Howler._counter;
+
+      return self;
+    },
+
+    /**
+     * HTML5 Audio error listener callback.
+     */
+    _errorListener: function() {
+      var self = this;
+
+      // Fire an error event and pass back the code.
+      self._parent._emit('loaderror', self._id, self._node.error ? self._node.error.code : 0);
+
+      // Clear the event listener.
+      self._node.removeEventListener('error', self._errorFn, false);
+    },
+
+    /**
+     * HTML5 Audio canplaythrough listener callback.
+     */
+    _loadListener: function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Round up the duration to account for the lower precision in HTML5 Audio.
+      parent._duration = Math.ceil(self._node.duration * 10) / 10;
+
+      // Setup a sprite if none is defined.
+      if (Object.keys(parent._sprite).length === 0) {
+        parent._sprite = {__default: [0, parent._duration * 1000]};
+      }
+
+      if (parent._state !== 'loaded') {
+        parent._state = 'loaded';
+        parent._emit('load');
+        parent._loadQueue();
+      }
+
+      // Clear the event listener.
+      self._node.removeEventListener(Howler._canPlayEvent, self._loadFn, false);
+    },
+
+    /**
+     * HTML5 Audio ended listener callback.
+     */
+    _endListener: function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Only handle the `ended`` event if the duration is Infinity.
+      if (parent._duration === Infinity) {
+        // Update the parent duration to match the real audio duration.
+        // Round up the duration to account for the lower precision in HTML5 Audio.
+        parent._duration = Math.ceil(self._node.duration * 10) / 10;
+
+        // Update the sprite that corresponds to the real duration.
+        if (parent._sprite.__default[1] === Infinity) {
+          parent._sprite.__default[1] = parent._duration * 1000;
+        }
+
+        // Run the regular ended method.
+        parent._ended(self);
+      }
+
+      // Clear the event listener since the duration is now correct.
+      self._node.removeEventListener('ended', self._endFn, false);
+    }
+  };
+
+  /** Helper Methods **/
+  /***************************************************************************/
+
+  var cache = {};
+
+  /**
+   * Buffer a sound from URL, Data URI or cache and decode to audio source (Web Audio API).
+   * @param  {Howl} self
+   */
+  var loadBuffer = function(self) {
+    var url = self._src;
+
+    // Check if the buffer has already been cached and use it instead.
+    if (cache[url]) {
+      // Set the duration from the cache.
+      self._duration = cache[url].duration;
+
+      // Load the sound into this Howl.
+      loadSound(self);
+
+      return;
+    }
+
+    if (/^data:[^;]+;base64,/.test(url)) {
+      // Decode the base64 data URI without XHR, since some browsers don't support it.
+      var data = atob(url.split(',')[1]);
+      var dataView = new Uint8Array(data.length);
+      for (var i=0; i<data.length; ++i) {
+        dataView[i] = data.charCodeAt(i);
+      }
+
+      decodeAudioData(dataView.buffer, self);
+    } else {
+      // Load the buffer from the URL.
+      var xhr = new XMLHttpRequest();
+      xhr.open(self._xhr.method, url, true);
+      xhr.withCredentials = self._xhr.withCredentials;
+      xhr.responseType = 'arraybuffer';
+
+      // Apply any custom headers to the request.
+      if (self._xhr.headers) {
+        Object.keys(self._xhr.headers).forEach(function(key) {
+          xhr.setRequestHeader(key, self._xhr.headers[key]);
+        });
+      }
+
+      xhr.onload = function() {
+        // Make sure we get a successful response back.
+        var code = (xhr.status + '')[0];
+        if (code !== '0' && code !== '2' && code !== '3') {
+          self._emit('loaderror', null, 'Failed loading audio file with status: ' + xhr.status + '.');
+          return;
+        }
+
+        decodeAudioData(xhr.response, self);
+      };
+      xhr.onerror = function() {
+        // If there is an error, switch to HTML5 Audio.
+        if (self._webAudio) {
+          self._html5 = true;
+          self._webAudio = false;
+          self._sounds = [];
+          delete cache[url];
+          self.load();
+        }
+      };
+      safeXhrSend(xhr);
+    }
+  };
+
+  /**
+   * Send the XHR request wrapped in a try/catch.
+   * @param  {Object} xhr XHR to send.
+   */
+  var safeXhrSend = function(xhr) {
+    try {
+      xhr.send();
+    } catch (e) {
+      xhr.onerror();
+    }
+  };
+
+  /**
+   * Decode audio data from an array buffer.
+   * @param  {ArrayBuffer} arraybuffer The audio data.
+   * @param  {Howl}        self
+   */
+  var decodeAudioData = function(arraybuffer, self) {
+    // Fire a load error if something broke.
+    var error = function() {
+      self._emit('loaderror', null, 'Decoding audio data failed.');
+    };
+
+    // Load the sound on success.
+    var success = function(buffer) {
+      if (buffer && self._sounds.length > 0) {
+        cache[self._src] = buffer;
+        loadSound(self, buffer);
+      } else {
+        error();
+      }
+    };
+
+    // Decode the buffer into an audio source.
+    if (typeof Promise !== 'undefined' && Howler.ctx.decodeAudioData.length === 1) {
+      Howler.ctx.decodeAudioData(arraybuffer).then(success).catch(error);
+    } else {
+      Howler.ctx.decodeAudioData(arraybuffer, success, error);
+    }
+  }
+
+  /**
+   * Sound is now loaded, so finish setting everything up and fire the loaded event.
+   * @param  {Howl} self
+   * @param  {Object} buffer The decoded buffer sound source.
+   */
+  var loadSound = function(self, buffer) {
+    // Set the duration.
+    if (buffer && !self._duration) {
+      self._duration = buffer.duration;
+    }
+
+    // Setup a sprite if none is defined.
+    if (Object.keys(self._sprite).length === 0) {
+      self._sprite = {__default: [0, self._duration * 1000]};
+    }
+
+    // Fire the loaded event.
+    if (self._state !== 'loaded') {
+      self._state = 'loaded';
+      self._emit('load');
+      self._loadQueue();
+    }
+  };
+
+  /**
+   * Setup the audio context when available, or switch to HTML5 Audio mode.
+   */
+  var setupAudioContext = function() {
+    // If we have already detected that Web Audio isn't supported, don't run this step again.
+    if (!Howler.usingWebAudio) {
+      return;
+    }
+
+    // Check if we are using Web Audio and setup the AudioContext if we are.
+    try {
+      if (typeof AudioContext !== 'undefined') {
+        Howler.ctx = new AudioContext();
+      } else if (typeof webkitAudioContext !== 'undefined') {
+        Howler.ctx = new webkitAudioContext();
+      } else {
+        Howler.usingWebAudio = false;
+      }
+    } catch(e) {
+      Howler.usingWebAudio = false;
+    }
+
+    // If the audio context creation still failed, set using web audio to false.
+    if (!Howler.ctx) {
+      Howler.usingWebAudio = false;
+    }
+
+    // Check if a webview is being used on iOS8 or earlier (rather than the browser).
+    // If it is, disable Web Audio as it causes crashing.
+    var iOS = (/iP(hone|od|ad)/.test(Howler._navigator && Howler._navigator.platform));
+    var appVersion = Howler._navigator && Howler._navigator.appVersion.match(/OS (\d+)_(\d+)_?(\d+)?/);
+    var version = appVersion ? parseInt(appVersion[1], 10) : null;
+    if (iOS && version && version < 9) {
+      var safari = /safari/.test(Howler._navigator && Howler._navigator.userAgent.toLowerCase());
+      if (Howler._navigator && !safari) {
+        Howler.usingWebAudio = false;
+      }
+    }
+
+    // Create and expose the master GainNode when using Web Audio (useful for plugins or advanced usage).
+    if (Howler.usingWebAudio) {
+      Howler.masterGain = (typeof Howler.ctx.createGain === 'undefined') ? Howler.ctx.createGainNode() : Howler.ctx.createGain();
+      Howler.masterGain.gain.setValueAtTime(Howler._muted ? 0 : Howler._volume, Howler.ctx.currentTime);
+      Howler.masterGain.connect(Howler.ctx.destination);
+    }
+
+    // Re-run the setup on Howler.
+    Howler._setup();
+  };
+
+  // Add support for AMD (Asynchronous Module Definition) libraries such as require.js.
+  if (typeof define === 'function' && define.amd) {
+    define([], function() {
+      return {
+        Howler: Howler,
+        Howl: Howl
+      };
+    });
+  }
+
+  // Add support for CommonJS libraries such as browserify.
+  if (typeof exports !== 'undefined') {
+    exports.Howler = Howler;
+    exports.Howl = Howl;
+  }
+
+  // Add to global in Node.js (for testing, etc).
+  if (typeof global !== 'undefined') {
+    global.HowlerGlobal = HowlerGlobal;
+    global.Howler = Howler;
+    global.Howl = Howl;
+    global.Sound = Sound;
+  } else if (typeof window !== 'undefined') {  // Define globally in case AMD is not available or unused.
+    window.HowlerGlobal = HowlerGlobal;
+    window.Howler = Howler;
+    window.Howl = Howl;
+    window.Sound = Sound;
+  }
+})();
+
+
+/*!
+ *  Spatial Plugin - Adds support for stereo and 3D audio where Web Audio is supported.
+ *  
+ *  howler.js v2.2.4
+ *  howlerjs.com
+ *
+ *  (c) 2013-2020, James Simpson of GoldFire Studios
+ *  goldfirestudios.com
+ *
+ *  MIT License
+ */
+
+(function() {
+
+  'use strict';
+
+  // Setup default properties.
+  HowlerGlobal.prototype._pos = [0, 0, 0];
+  HowlerGlobal.prototype._orientation = [0, 0, -1, 0, 1, 0];
+
+  /** Global Methods **/
+  /***************************************************************************/
+
+  /**
+   * Helper method to update the stereo panning position of all current Howls.
+   * Future Howls will not use this value unless explicitly set.
+   * @param  {Number} pan A value of -1.0 is all the way left and 1.0 is all the way right.
+   * @return {Howler/Number}     Self or current stereo panning value.
+   */
+  HowlerGlobal.prototype.stereo = function(pan) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self.ctx || !self.ctx.listener) {
+      return self;
+    }
+
+    // Loop through all Howls and update their stereo panning.
+    for (var i=self._howls.length-1; i>=0; i--) {
+      self._howls[i].stereo(pan);
+    }
+
+    return self;
+  };
+
+  /**
+   * Get/set the position of the listener in 3D cartesian space. Sounds using
+   * 3D position will be relative to the listener's position.
+   * @param  {Number} x The x-position of the listener.
+   * @param  {Number} y The y-position of the listener.
+   * @param  {Number} z The z-position of the listener.
+   * @return {Howler/Array}   Self or current listener position.
+   */
+  HowlerGlobal.prototype.pos = function(x, y, z) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self.ctx || !self.ctx.listener) {
+      return self;
+    }
+
+    // Set the defaults for optional 'y' & 'z'.
+    y = (typeof y !== 'number') ? self._pos[1] : y;
+    z = (typeof z !== 'number') ? self._pos[2] : z;
+
+    if (typeof x === 'number') {
+      self._pos = [x, y, z];
+
+      if (typeof self.ctx.listener.positionX !== 'undefined') {
+        self.ctx.listener.positionX.setTargetAtTime(self._pos[0], Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.positionY.setTargetAtTime(self._pos[1], Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.positionZ.setTargetAtTime(self._pos[2], Howler.ctx.currentTime, 0.1);
+      } else {
+        self.ctx.listener.setPosition(self._pos[0], self._pos[1], self._pos[2]);
+      }
+    } else {
+      return self._pos;
+    }
+
+    return self;
+  };
+
+  /**
+   * Get/set the direction the listener is pointing in the 3D cartesian space.
+   * A front and up vector must be provided. The front is the direction the
+   * face of the listener is pointing, and up is the direction the top of the
+   * listener is pointing. Thus, these values are expected to be at right angles
+   * from each other.
+   * @param  {Number} x   The x-orientation of the listener.
+   * @param  {Number} y   The y-orientation of the listener.
+   * @param  {Number} z   The z-orientation of the listener.
+   * @param  {Number} xUp The x-orientation of the top of the listener.
+   * @param  {Number} yUp The y-orientation of the top of the listener.
+   * @param  {Number} zUp The z-orientation of the top of the listener.
+   * @return {Howler/Array}     Returns self or the current orientation vectors.
+   */
+  HowlerGlobal.prototype.orientation = function(x, y, z, xUp, yUp, zUp) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self.ctx || !self.ctx.listener) {
+      return self;
+    }
+
+    // Set the defaults for optional 'y' & 'z'.
+    var or = self._orientation;
+    y = (typeof y !== 'number') ? or[1] : y;
+    z = (typeof z !== 'number') ? or[2] : z;
+    xUp = (typeof xUp !== 'number') ? or[3] : xUp;
+    yUp = (typeof yUp !== 'number') ? or[4] : yUp;
+    zUp = (typeof zUp !== 'number') ? or[5] : zUp;
+
+    if (typeof x === 'number') {
+      self._orientation = [x, y, z, xUp, yUp, zUp];
+
+      if (typeof self.ctx.listener.forwardX !== 'undefined') {
+        self.ctx.listener.forwardX.setTargetAtTime(x, Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.forwardY.setTargetAtTime(y, Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.forwardZ.setTargetAtTime(z, Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.upX.setTargetAtTime(xUp, Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.upY.setTargetAtTime(yUp, Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.upZ.setTargetAtTime(zUp, Howler.ctx.currentTime, 0.1);
+      } else {
+        self.ctx.listener.setOrientation(x, y, z, xUp, yUp, zUp);
+      }
+    } else {
+      return or;
+    }
+
+    return self;
+  };
+
+  /** Group Methods **/
+  /***************************************************************************/
+
+  /**
+   * Add new properties to the core init.
+   * @param  {Function} _super Core init method.
+   * @return {Howl}
+   */
+  Howl.prototype.init = (function(_super) {
+    return function(o) {
+      var self = this;
+
+      // Setup user-defined default properties.
+      self._orientation = o.orientation || [1, 0, 0];
+      self._stereo = o.stereo || null;
+      self._pos = o.pos || null;
+      self._pannerAttr = {
+        coneInnerAngle: typeof o.coneInnerAngle !== 'undefined' ? o.coneInnerAngle : 360,
+        coneOuterAngle: typeof o.coneOuterAngle !== 'undefined' ? o.coneOuterAngle : 360,
+        coneOuterGain: typeof o.coneOuterGain !== 'undefined' ? o.coneOuterGain : 0,
+        distanceModel: typeof o.distanceModel !== 'undefined' ? o.distanceModel : 'inverse',
+        maxDistance: typeof o.maxDistance !== 'undefined' ? o.maxDistance : 10000,
+        panningModel: typeof o.panningModel !== 'undefined' ? o.panningModel : 'HRTF',
+        refDistance: typeof o.refDistance !== 'undefined' ? o.refDistance : 1,
+        rolloffFactor: typeof o.rolloffFactor !== 'undefined' ? o.rolloffFactor : 1
+      };
+
+      // Setup event listeners.
+      self._onstereo = o.onstereo ? [{fn: o.onstereo}] : [];
+      self._onpos = o.onpos ? [{fn: o.onpos}] : [];
+      self._onorientation = o.onorientation ? [{fn: o.onorientation}] : [];
+
+      // Complete initilization with howler.js core's init function.
+      return _super.call(this, o);
+    };
+  })(Howl.prototype.init);
+
+  /**
+   * Get/set the stereo panning of the audio source for this sound or all in the group.
+   * @param  {Number} pan  A value of -1.0 is all the way left and 1.0 is all the way right.
+   * @param  {Number} id (optional) The sound ID. If none is passed, all in group will be updated.
+   * @return {Howl/Number}    Returns self or the current stereo panning value.
+   */
+  Howl.prototype.stereo = function(pan, id) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self._webAudio) {
+      return self;
+    }
+
+    // If the sound hasn't loaded, add it to the load queue to change stereo pan when capable.
+    if (self._state !== 'loaded') {
+      self._queue.push({
+        event: 'stereo',
+        action: function() {
+          self.stereo(pan, id);
+        }
+      });
+
+      return self;
+    }
+
+    // Check for PannerStereoNode support and fallback to PannerNode if it doesn't exist.
+    var pannerType = (typeof Howler.ctx.createStereoPanner === 'undefined') ? 'spatial' : 'stereo';
+
+    // Setup the group's stereo panning if no ID is passed.
+    if (typeof id === 'undefined') {
+      // Return the group's stereo panning if no parameters are passed.
+      if (typeof pan === 'number') {
+        self._stereo = pan;
+        self._pos = [pan, 0, 0];
+      } else {
+        return self._stereo;
+      }
+    }
+
+    // Change the streo panning of one or all sounds in group.
+    var ids = self._getSoundIds(id);
+    for (var i=0; i<ids.length; i++) {
+      // Get the sound.
+      var sound = self._soundById(ids[i]);
+
+      if (sound) {
+        if (typeof pan === 'number') {
+          sound._stereo = pan;
+          sound._pos = [pan, 0, 0];
+
+          if (sound._node) {
+            // If we are falling back, make sure the panningModel is equalpower.
+            sound._pannerAttr.panningModel = 'equalpower';
+
+            // Check if there is a panner setup and create a new one if not.
+            if (!sound._panner || !sound._panner.pan) {
+              setupPanner(sound, pannerType);
+            }
+
+            if (pannerType === 'spatial') {
+              if (typeof sound._panner.positionX !== 'undefined') {
+                sound._panner.positionX.setValueAtTime(pan, Howler.ctx.currentTime);
+                sound._panner.positionY.setValueAtTime(0, Howler.ctx.currentTime);
+                sound._panner.positionZ.setValueAtTime(0, Howler.ctx.currentTime);
+              } else {
+                sound._panner.setPosition(pan, 0, 0);
+              }
+            } else {
+              sound._panner.pan.setValueAtTime(pan, Howler.ctx.currentTime);
+            }
+          }
+
+          self._emit('stereo', sound._id);
+        } else {
+          return sound._stereo;
+        }
+      }
+    }
+
+    return self;
+  };
+
+  /**
+   * Get/set the 3D spatial position of the audio source for this sound or group relative to the global listener.
+   * @param  {Number} x  The x-position of the audio source.
+   * @param  {Number} y  The y-position of the audio source.
+   * @param  {Number} z  The z-position of the audio source.
+   * @param  {Number} id (optional) The sound ID. If none is passed, all in group will be updated.
+   * @return {Howl/Array}    Returns self or the current 3D spatial position: [x, y, z].
+   */
+  Howl.prototype.pos = function(x, y, z, id) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self._webAudio) {
+      return self;
+    }
+
+    // If the sound hasn't loaded, add it to the load queue to change position when capable.
+    if (self._state !== 'loaded') {
+      self._queue.push({
+        event: 'pos',
+        action: function() {
+          self.pos(x, y, z, id);
+        }
+      });
+
+      return self;
+    }
+
+    // Set the defaults for optional 'y' & 'z'.
+    y = (typeof y !== 'number') ? 0 : y;
+    z = (typeof z !== 'number') ? -0.5 : z;
+
+    // Setup the group's spatial position if no ID is passed.
+    if (typeof id === 'undefined') {
+      // Return the group's spatial position if no parameters are passed.
+      if (typeof x === 'number') {
+        self._pos = [x, y, z];
+      } else {
+        return self._pos;
+      }
+    }
+
+    // Change the spatial position of one or all sounds in group.
+    var ids = self._getSoundIds(id);
+    for (var i=0; i<ids.length; i++) {
+      // Get the sound.
+      var sound = self._soundById(ids[i]);
+
+      if (sound) {
+        if (typeof x === 'number') {
+          sound._pos = [x, y, z];
+
+          if (sound._node) {
+            // Check if there is a panner setup and create a new one if not.
+            if (!sound._panner || sound._panner.pan) {
+              setupPanner(sound, 'spatial');
+            }
+
+            if (typeof sound._panner.positionX !== 'undefined') {
+              sound._panner.positionX.setValueAtTime(x, Howler.ctx.currentTime);
+              sound._panner.positionY.setValueAtTime(y, Howler.ctx.currentTime);
+              sound._panner.positionZ.setValueAtTime(z, Howler.ctx.currentTime);
+            } else {
+              sound._panner.setPosition(x, y, z);
+            }
+          }
+
+          self._emit('pos', sound._id);
+        } else {
+          return sound._pos;
+        }
+      }
+    }
+
+    return self;
+  };
+
+  /**
+   * Get/set the direction the audio source is pointing in the 3D cartesian coordinate
+   * space. Depending on how direction the sound is, based on the `cone` attributes,
+   * a sound pointing away from the listener can be quiet or silent.
+   * @param  {Number} x  The x-orientation of the source.
+   * @param  {Number} y  The y-orientation of the source.
+   * @param  {Number} z  The z-orientation of the source.
+   * @param  {Number} id (optional) The sound ID. If none is passed, all in group will be updated.
+   * @return {Howl/Array}    Returns self or the current 3D spatial orientation: [x, y, z].
+   */
+  Howl.prototype.orientation = function(x, y, z, id) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self._webAudio) {
+      return self;
+    }
+
+    // If the sound hasn't loaded, add it to the load queue to change orientation when capable.
+    if (self._state !== 'loaded') {
+      self._queue.push({
+        event: 'orientation',
+        action: function() {
+          self.orientation(x, y, z, id);
+        }
+      });
+
+      return self;
+    }
+
+    // Set the defaults for optional 'y' & 'z'.
+    y = (typeof y !== 'number') ? self._orientation[1] : y;
+    z = (typeof z !== 'number') ? self._orientation[2] : z;
+
+    // Setup the group's spatial orientation if no ID is passed.
+    if (typeof id === 'undefined') {
+      // Return the group's spatial orientation if no parameters are passed.
+      if (typeof x === 'number') {
+        self._orientation = [x, y, z];
+      } else {
+        return self._orientation;
+      }
+    }
+
+    // Change the spatial orientation of one or all sounds in group.
+    var ids = self._getSoundIds(id);
+    for (var i=0; i<ids.length; i++) {
+      // Get the sound.
+      var sound = self._soundById(ids[i]);
+
+      if (sound) {
+        if (typeof x === 'number') {
+          sound._orientation = [x, y, z];
+
+          if (sound._node) {
+            // Check if there is a panner setup and create a new one if not.
+            if (!sound._panner) {
+              // Make sure we have a position to setup the node with.
+              if (!sound._pos) {
+                sound._pos = self._pos || [0, 0, -0.5];
+              }
+
+              setupPanner(sound, 'spatial');
+            }
+
+            if (typeof sound._panner.orientationX !== 'undefined') {
+              sound._panner.orientationX.setValueAtTime(x, Howler.ctx.currentTime);
+              sound._panner.orientationY.setValueAtTime(y, Howler.ctx.currentTime);
+              sound._panner.orientationZ.setValueAtTime(z, Howler.ctx.currentTime);
+            } else {
+              sound._panner.setOrientation(x, y, z);
+            }
+          }
+
+          self._emit('orientation', sound._id);
+        } else {
+          return sound._orientation;
+        }
+      }
+    }
+
+    return self;
+  };
+
+  /**
+   * Get/set the panner node's attributes for a sound or group of sounds.
+   * This method can optionall take 0, 1 or 2 arguments.
+   *   pannerAttr() -> Returns the group's values.
+   *   pannerAttr(id) -> Returns the sound id's values.
+   *   pannerAttr(o) -> Set's the values of all sounds in this Howl group.
+   *   pannerAttr(o, id) -> Set's the values of passed sound id.
+   *
+   *   Attributes:
+   *     coneInnerAngle - (360 by default) A parameter for directional audio sources, this is an angle, in degrees,
+   *                      inside of which there will be no volume reduction.
+   *     coneOuterAngle - (360 by default) A parameter for directional audio sources, this is an angle, in degrees,
+   *                      outside of which the volume will be reduced to a constant value of `coneOuterGain`.
+   *     coneOuterGain - (0 by default) A parameter for directional audio sources, this is the gain outside of the
+   *                     `coneOuterAngle`. It is a linear value in the range `[0, 1]`.
+   *     distanceModel - ('inverse' by default) Determines algorithm used to reduce volume as audio moves away from
+   *                     listener. Can be `linear`, `inverse` or `exponential.
+   *     maxDistance - (10000 by default) The maximum distance between source and listener, after which the volume
+   *                   will not be reduced any further.
+   *     refDistance - (1 by default) A reference distance for reducing volume as source moves further from the listener.
+   *                   This is simply a variable of the distance model and has a different effect depending on which model
+   *                   is used and the scale of your coordinates. Generally, volume will be equal to 1 at this distance.
+   *     rolloffFactor - (1 by default) How quickly the volume reduces as source moves from listener. This is simply a
+   *                     variable of the distance model and can be in the range of `[0, 1]` with `linear` and `[0, ∞]`
+   *                     with `inverse` and `exponential`.
+   *     panningModel - ('HRTF' by default) Determines which spatialization algorithm is used to position audio.
+   *                     Can be `HRTF` or `equalpower`.
+   *
+   * @return {Howl/Object} Returns self or current panner attributes.
+   */
+  Howl.prototype.pannerAttr = function() {
+    var self = this;
+    var args = arguments;
+    var o, id, sound;
+
+    // Stop right here if not using Web Audio.
+    if (!self._webAudio) {
+      return self;
+    }
+
+    // Determine the values based on arguments.
+    if (args.length === 0) {
+      // Return the group's panner attribute values.
+      return self._pannerAttr;
+    } else if (args.length === 1) {
+      if (typeof args[0] === 'object') {
+        o = args[0];
+
+        // Set the grou's panner attribute values.
+        if (typeof id === 'undefined') {
+          if (!o.pannerAttr) {
+            o.pannerAttr = {
+              coneInnerAngle: o.coneInnerAngle,
+              coneOuterAngle: o.coneOuterAngle,
+              coneOuterGain: o.coneOuterGain,
+              distanceModel: o.distanceModel,
+              maxDistance: o.maxDistance,
+              refDistance: o.refDistance,
+              rolloffFactor: o.rolloffFactor,
+              panningModel: o.panningModel
+            };
+          }
+
+          self._pannerAttr = {
+            coneInnerAngle: typeof o.pannerAttr.coneInnerAngle !== 'undefined' ? o.pannerAttr.coneInnerAngle : self._coneInnerAngle,
+            coneOuterAngle: typeof o.pannerAttr.coneOuterAngle !== 'undefined' ? o.pannerAttr.coneOuterAngle : self._coneOuterAngle,
+            coneOuterGain: typeof o.pannerAttr.coneOuterGain !== 'undefined' ? o.pannerAttr.coneOuterGain : self._coneOuterGain,
+            distanceModel: typeof o.pannerAttr.distanceModel !== 'undefined' ? o.pannerAttr.distanceModel : self._distanceModel,
+            maxDistance: typeof o.pannerAttr.maxDistance !== 'undefined' ? o.pannerAttr.maxDistance : self._maxDistance,
+            refDistance: typeof o.pannerAttr.refDistance !== 'undefined' ? o.pannerAttr.refDistance : self._refDistance,
+            rolloffFactor: typeof o.pannerAttr.rolloffFactor !== 'undefined' ? o.pannerAttr.rolloffFactor : self._rolloffFactor,
+            panningModel: typeof o.pannerAttr.panningModel !== 'undefined' ? o.pannerAttr.panningModel : self._panningModel
+          };
+        }
+      } else {
+        // Return this sound's panner attribute values.
+        sound = self._soundById(parseInt(args[0], 10));
+        return sound ? sound._pannerAttr : self._pannerAttr;
+      }
+    } else if (args.length === 2) {
+      o = args[0];
+      id = parseInt(args[1], 10);
+    }
+
+    // Update the values of the specified sounds.
+    var ids = self._getSoundIds(id);
+    for (var i=0; i<ids.length; i++) {
+      sound = self._soundById(ids[i]);
+
+      if (sound) {
+        // Merge the new values into the sound.
+        var pa = sound._pannerAttr;
+        pa = {
+          coneInnerAngle: typeof o.coneInnerAngle !== 'undefined' ? o.coneInnerAngle : pa.coneInnerAngle,
+          coneOuterAngle: typeof o.coneOuterAngle !== 'undefined' ? o.coneOuterAngle : pa.coneOuterAngle,
+          coneOuterGain: typeof o.coneOuterGain !== 'undefined' ? o.coneOuterGain : pa.coneOuterGain,
+          distanceModel: typeof o.distanceModel !== 'undefined' ? o.distanceModel : pa.distanceModel,
+          maxDistance: typeof o.maxDistance !== 'undefined' ? o.maxDistance : pa.maxDistance,
+          refDistance: typeof o.refDistance !== 'undefined' ? o.refDistance : pa.refDistance,
+          rolloffFactor: typeof o.rolloffFactor !== 'undefined' ? o.rolloffFactor : pa.rolloffFactor,
+          panningModel: typeof o.panningModel !== 'undefined' ? o.panningModel : pa.panningModel
+        };
+
+        // Create a new panner node if one doesn't already exist.
+        var panner = sound._panner;
+        if (!panner) {
+          // Make sure we have a position to setup the node with.
+          if (!sound._pos) {
+            sound._pos = self._pos || [0, 0, -0.5];
+          }
+
+          // Create a new panner node.
+          setupPanner(sound, 'spatial');
+          panner = sound._panner
+        }
+
+        // Update the panner values or create a new panner if none exists.
+        panner.coneInnerAngle = pa.coneInnerAngle;
+        panner.coneOuterAngle = pa.coneOuterAngle;
+        panner.coneOuterGain = pa.coneOuterGain;
+        panner.distanceModel = pa.distanceModel;
+        panner.maxDistance = pa.maxDistance;
+        panner.refDistance = pa.refDistance;
+        panner.rolloffFactor = pa.rolloffFactor;
+        panner.panningModel = pa.panningModel;
+      }
+    }
+
+    return self;
+  };
+
+  /** Single Sound Methods **/
+  /***************************************************************************/
+
+  /**
+   * Add new properties to the core Sound init.
+   * @param  {Function} _super Core Sound init method.
+   * @return {Sound}
+   */
+  Sound.prototype.init = (function(_super) {
+    return function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Setup user-defined default properties.
+      self._orientation = parent._orientation;
+      self._stereo = parent._stereo;
+      self._pos = parent._pos;
+      self._pannerAttr = parent._pannerAttr;
+
+      // Complete initilization with howler.js core Sound's init function.
+      _super.call(this);
+
+      // If a stereo or position was specified, set it up.
+      if (self._stereo) {
+        parent.stereo(self._stereo);
+      } else if (self._pos) {
+        parent.pos(self._pos[0], self._pos[1], self._pos[2], self._id);
+      }
+    };
+  })(Sound.prototype.init);
+
+  /**
+   * Override the Sound.reset method to clean up properties from the spatial plugin.
+   * @param  {Function} _super Sound reset method.
+   * @return {Sound}
+   */
+  Sound.prototype.reset = (function(_super) {
+    return function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Reset all spatial plugin properties on this sound.
+      self._orientation = parent._orientation;
+      self._stereo = parent._stereo;
+      self._pos = parent._pos;
+      self._pannerAttr = parent._pannerAttr;
+
+      // If a stereo or position was specified, set it up.
+      if (self._stereo) {
+        parent.stereo(self._stereo);
+      } else if (self._pos) {
+        parent.pos(self._pos[0], self._pos[1], self._pos[2], self._id);
+      } else if (self._panner) {
+        // Disconnect the panner.
+        self._panner.disconnect(0);
+        self._panner = undefined;
+        parent._refreshBuffer(self);
+      }
+
+      // Complete resetting of the sound.
+      return _super.call(this);
+    };
+  })(Sound.prototype.reset);
+
+  /** Helper Methods **/
+  /***************************************************************************/
+
+  /**
+   * Create a new panner node and save it on the sound.
+   * @param  {Sound} sound Specific sound to setup panning on.
+   * @param {String} type Type of panner to create: 'stereo' or 'spatial'.
+   */
+  var setupPanner = function(sound, type) {
+    type = type || 'spatial';
+
+    // Create the new panner node.
+    if (type === 'spatial') {
+      sound._panner = Howler.ctx.createPanner();
+      sound._panner.coneInnerAngle = sound._pannerAttr.coneInnerAngle;
+      sound._panner.coneOuterAngle = sound._pannerAttr.coneOuterAngle;
+      sound._panner.coneOuterGain = sound._pannerAttr.coneOuterGain;
+      sound._panner.distanceModel = sound._pannerAttr.distanceModel;
+      sound._panner.maxDistance = sound._pannerAttr.maxDistance;
+      sound._panner.refDistance = sound._pannerAttr.refDistance;
+      sound._panner.rolloffFactor = sound._pannerAttr.rolloffFactor;
+      sound._panner.panningModel = sound._pannerAttr.panningModel;
+
+      if (typeof sound._panner.positionX !== 'undefined') {
+        sound._panner.positionX.setValueAtTime(sound._pos[0], Howler.ctx.currentTime);
+        sound._panner.positionY.setValueAtTime(sound._pos[1], Howler.ctx.currentTime);
+        sound._panner.positionZ.setValueAtTime(sound._pos[2], Howler.ctx.currentTime);
+      } else {
+        sound._panner.setPosition(sound._pos[0], sound._pos[1], sound._pos[2]);
+      }
+
+      if (typeof sound._panner.orientationX !== 'undefined') {
+        sound._panner.orientationX.setValueAtTime(sound._orientation[0], Howler.ctx.currentTime);
+        sound._panner.orientationY.setValueAtTime(sound._orientation[1], Howler.ctx.currentTime);
+        sound._panner.orientationZ.setValueAtTime(sound._orientation[2], Howler.ctx.currentTime);
+      } else {
+        sound._panner.setOrientation(sound._orientation[0], sound._orientation[1], sound._orientation[2]);
+      }
+    } else {
+      sound._panner = Howler.ctx.createStereoPanner();
+      sound._panner.pan.setValueAtTime(sound._stereo, Howler.ctx.currentTime);
+    }
+
+    sound._panner.connect(sound._node);
+
+    // Update the connections.
+    if (!sound._paused) {
+      sound._parent.pause(sound._id, true).play(sound._id, true);
+    }
+  };
+})();
diff --git a/uni_modules/c-svga/node_modules/howler/dist/howler.min.js b/uni_modules/c-svga/node_modules/howler/dist/howler.min.js
new file mode 100644
index 0000000..40f9a2f
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/howler/dist/howler.min.js
@@ -0,0 +1,4 @@
+/*! howler.js v2.2.4 | (c) 2013-2020, James Simpson of GoldFire Studios | MIT License | howlerjs.com */
+!function(){"use strict";var e=function(){this.init()};e.prototype={init:function(){var e=this||n;return e._counter=1e3,e._html5AudioPool=[],e.html5PoolSize=10,e._codecs={},e._howls=[],e._muted=!1,e._volume=1,e._canPlayEvent="canplaythrough",e._navigator="undefined"!=typeof window&&window.navigator?window.navigator:null,e.masterGain=null,e.noAudio=!1,e.usingWebAudio=!0,e.autoSuspend=!0,e.ctx=null,e.autoUnlock=!0,e._setup(),e},volume:function(e){var o=this||n;if(e=parseFloat(e),o.ctx||_(),void 0!==e&&e>=0&&e<=1){if(o._volume=e,o._muted)return o;o.usingWebAudio&&o.masterGain.gain.setValueAtTime(e,n.ctx.currentTime);for(var t=0;t<o._howls.length;t++)if(!o._howls[t]._webAudio)for(var r=o._howls[t]._getSoundIds(),a=0;a<r.length;a++){var u=o._howls[t]._soundById(r[a]);u&&u._node&&(u._node.volume=u._volume*e)}return o}return o._volume},mute:function(e){var o=this||n;o.ctx||_(),o._muted=e,o.usingWebAudio&&o.masterGain.gain.setValueAtTime(e?0:o._volume,n.ctx.currentTime);for(var t=0;t<o._howls.length;t++)if(!o._howls[t]._webAudio)for(var r=o._howls[t]._getSoundIds(),a=0;a<r.length;a++){var u=o._howls[t]._soundById(r[a]);u&&u._node&&(u._node.muted=!!e||u._muted)}return o},stop:function(){for(var e=this||n,o=0;o<e._howls.length;o++)e._howls[o].stop();return e},unload:function(){for(var e=this||n,o=e._howls.length-1;o>=0;o--)e._howls[o].unload();return e.usingWebAudio&&e.ctx&&void 0!==e.ctx.close&&(e.ctx.close(),e.ctx=null,_()),e},codecs:function(e){return(this||n)._codecs[e.replace(/^x-/,"")]},_setup:function(){var e=this||n;if(e.state=e.ctx?e.ctx.state||"suspended":"suspended",e._autoSuspend(),!e.usingWebAudio)if("undefined"!=typeof Audio)try{var o=new Audio;void 0===o.oncanplaythrough&&(e._canPlayEvent="canplay")}catch(n){e.noAudio=!0}else e.noAudio=!0;try{var o=new Audio;o.muted&&(e.noAudio=!0)}catch(e){}return e.noAudio||e._setupCodecs(),e},_setupCodecs:function(){var e=this||n,o=null;try{o="undefined"!=typeof Audio?new Audio:null}catch(n){return e}if(!o||"function"!=typeof o.canPlayType)return e;var t=o.canPlayType("audio/mpeg;").replace(/^no$/,""),r=e._navigator?e._navigator.userAgent:"",a=r.match(/OPR\/(\d+)/g),u=a&&parseInt(a[0].split("/")[1],10)<33,d=-1!==r.indexOf("Safari")&&-1===r.indexOf("Chrome"),i=r.match(/Version\/(.*?) /),_=d&&i&&parseInt(i[1],10)<15;return e._codecs={mp3:!(u||!t&&!o.canPlayType("audio/mp3;").replace(/^no$/,"")),mpeg:!!t,opus:!!o.canPlayType('audio/ogg; codecs="opus"').replace(/^no$/,""),ogg:!!o.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),oga:!!o.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),wav:!!(o.canPlayType('audio/wav; codecs="1"')||o.canPlayType("audio/wav")).replace(/^no$/,""),aac:!!o.canPlayType("audio/aac;").replace(/^no$/,""),caf:!!o.canPlayType("audio/x-caf;").replace(/^no$/,""),m4a:!!(o.canPlayType("audio/x-m4a;")||o.canPlayType("audio/m4a;")||o.canPlayType("audio/aac;")).replace(/^no$/,""),m4b:!!(o.canPlayType("audio/x-m4b;")||o.canPlayType("audio/m4b;")||o.canPlayType("audio/aac;")).replace(/^no$/,""),mp4:!!(o.canPlayType("audio/x-mp4;")||o.canPlayType("audio/mp4;")||o.canPlayType("audio/aac;")).replace(/^no$/,""),weba:!(_||!o.canPlayType('audio/webm; codecs="vorbis"').replace(/^no$/,"")),webm:!(_||!o.canPlayType('audio/webm; codecs="vorbis"').replace(/^no$/,"")),dolby:!!o.canPlayType('audio/mp4; codecs="ec-3"').replace(/^no$/,""),flac:!!(o.canPlayType("audio/x-flac;")||o.canPlayType("audio/flac;")).replace(/^no$/,"")},e},_unlockAudio:function(){var e=this||n;if(!e._audioUnlocked&&e.ctx){e._audioUnlocked=!1,e.autoUnlock=!1,e._mobileUnloaded||44100===e.ctx.sampleRate||(e._mobileUnloaded=!0,e.unload()),e._scratchBuffer=e.ctx.createBuffer(1,1,22050);var o=function(n){for(;e._html5AudioPool.length<e.html5PoolSize;)try{var t=new Audio;t._unlocked=!0,e._releaseHtml5Audio(t)}catch(n){e.noAudio=!0;break}for(var r=0;r<e._howls.length;r++)if(!e._howls[r]._webAudio)for(var a=e._howls[r]._getSoundIds(),u=0;u<a.length;u++){var d=e._howls[r]._soundById(a[u]);d&&d._node&&!d._node._unlocked&&(d._node._unlocked=!0,d._node.load())}e._autoResume();var i=e.ctx.createBufferSource();i.buffer=e._scratchBuffer,i.connect(e.ctx.destination),void 0===i.start?i.noteOn(0):i.start(0),"function"==typeof e.ctx.resume&&e.ctx.resume(),i.onended=function(){i.disconnect(0),e._audioUnlocked=!0,document.removeEventListener("touchstart",o,!0),document.removeEventListener("touchend",o,!0),document.removeEventListener("click",o,!0),document.removeEventListener("keydown",o,!0);for(var n=0;n<e._howls.length;n++)e._howls[n]._emit("unlock")}};return document.addEventListener("touchstart",o,!0),document.addEventListener("touchend",o,!0),document.addEventListener("click",o,!0),document.addEventListener("keydown",o,!0),e}},_obtainHtml5Audio:function(){var e=this||n;if(e._html5AudioPool.length)return e._html5AudioPool.pop();var o=(new Audio).play();return o&&"undefined"!=typeof Promise&&(o instanceof Promise||"function"==typeof o.then)&&o.catch(function(){console.warn("HTML5 Audio pool exhausted, returning potentially locked audio object.")}),new Audio},_releaseHtml5Audio:function(e){var o=this||n;return e._unlocked&&o._html5AudioPool.push(e),o},_autoSuspend:function(){var e=this;if(e.autoSuspend&&e.ctx&&void 0!==e.ctx.suspend&&n.usingWebAudio){for(var o=0;o<e._howls.length;o++)if(e._howls[o]._webAudio)for(var t=0;t<e._howls[o]._sounds.length;t++)if(!e._howls[o]._sounds[t]._paused)return e;return e._suspendTimer&&clearTimeout(e._suspendTimer),e._suspendTimer=setTimeout(function(){if(e.autoSuspend){e._suspendTimer=null,e.state="suspending";var n=function(){e.state="suspended",e._resumeAfterSuspend&&(delete e._resumeAfterSuspend,e._autoResume())};e.ctx.suspend().then(n,n)}},3e4),e}},_autoResume:function(){var e=this;if(e.ctx&&void 0!==e.ctx.resume&&n.usingWebAudio)return"running"===e.state&&"interrupted"!==e.ctx.state&&e._suspendTimer?(clearTimeout(e._suspendTimer),e._suspendTimer=null):"suspended"===e.state||"running"===e.state&&"interrupted"===e.ctx.state?(e.ctx.resume().then(function(){e.state="running";for(var n=0;n<e._howls.length;n++)e._howls[n]._emit("resume")}),e._suspendTimer&&(clearTimeout(e._suspendTimer),e._suspendTimer=null)):"suspending"===e.state&&(e._resumeAfterSuspend=!0),e}};var n=new e,o=function(e){var n=this;if(!e.src||0===e.src.length)return void console.error("An array of source files must be passed with any new Howl.");n.init(e)};o.prototype={init:function(e){var o=this;return n.ctx||_(),o._autoplay=e.autoplay||!1,o._format="string"!=typeof e.format?e.format:[e.format],o._html5=e.html5||!1,o._muted=e.mute||!1,o._loop=e.loop||!1,o._pool=e.pool||5,o._preload="boolean"!=typeof e.preload&&"metadata"!==e.preload||e.preload,o._rate=e.rate||1,o._sprite=e.sprite||{},o._src="string"!=typeof e.src?e.src:[e.src],o._volume=void 0!==e.volume?e.volume:1,o._xhr={method:e.xhr&&e.xhr.method?e.xhr.method:"GET",headers:e.xhr&&e.xhr.headers?e.xhr.headers:null,withCredentials:!(!e.xhr||!e.xhr.withCredentials)&&e.xhr.withCredentials},o._duration=0,o._state="unloaded",o._sounds=[],o._endTimers={},o._queue=[],o._playLock=!1,o._onend=e.onend?[{fn:e.onend}]:[],o._onfade=e.onfade?[{fn:e.onfade}]:[],o._onload=e.onload?[{fn:e.onload}]:[],o._onloaderror=e.onloaderror?[{fn:e.onloaderror}]:[],o._onplayerror=e.onplayerror?[{fn:e.onplayerror}]:[],o._onpause=e.onpause?[{fn:e.onpause}]:[],o._onplay=e.onplay?[{fn:e.onplay}]:[],o._onstop=e.onstop?[{fn:e.onstop}]:[],o._onmute=e.onmute?[{fn:e.onmute}]:[],o._onvolume=e.onvolume?[{fn:e.onvolume}]:[],o._onrate=e.onrate?[{fn:e.onrate}]:[],o._onseek=e.onseek?[{fn:e.onseek}]:[],o._onunlock=e.onunlock?[{fn:e.onunlock}]:[],o._onresume=[],o._webAudio=n.usingWebAudio&&!o._html5,void 0!==n.ctx&&n.ctx&&n.autoUnlock&&n._unlockAudio(),n._howls.push(o),o._autoplay&&o._queue.push({event:"play",action:function(){o.play()}}),o._preload&&"none"!==o._preload&&o.load(),o},load:function(){var e=this,o=null;if(n.noAudio)return void e._emit("loaderror",null,"No audio support.");"string"==typeof e._src&&(e._src=[e._src]);for(var r=0;r<e._src.length;r++){var u,d;if(e._format&&e._format[r])u=e._format[r];else{if("string"!=typeof(d=e._src[r])){e._emit("loaderror",null,"Non-string found in selected audio sources - ignoring.");continue}u=/^data:audio\/([^;,]+);/i.exec(d),u||(u=/\.([^.]+)$/.exec(d.split("?",1)[0])),u&&(u=u[1].toLowerCase())}if(u||console.warn('No file extension was found. Consider using the "format" property or specify an extension.'),u&&n.codecs(u)){o=e._src[r];break}}return o?(e._src=o,e._state="loading","https:"===window.location.protocol&&"http:"===o.slice(0,5)&&(e._html5=!0,e._webAudio=!1),new t(e),e._webAudio&&a(e),e):void e._emit("loaderror",null,"No codec support for selected audio sources.")},play:function(e,o){var t=this,r=null;if("number"==typeof e)r=e,e=null;else{if("string"==typeof e&&"loaded"===t._state&&!t._sprite[e])return null;if(void 0===e&&(e="__default",!t._playLock)){for(var a=0,u=0;u<t._sounds.length;u++)t._sounds[u]._paused&&!t._sounds[u]._ended&&(a++,r=t._sounds[u]._id);1===a?e=null:r=null}}var d=r?t._soundById(r):t._inactiveSound();if(!d)return null;if(r&&!e&&(e=d._sprite||"__default"),"loaded"!==t._state){d._sprite=e,d._ended=!1;var i=d._id;return t._queue.push({event:"play",action:function(){t.play(i)}}),i}if(r&&!d._paused)return o||t._loadQueue("play"),d._id;t._webAudio&&n._autoResume();var _=Math.max(0,d._seek>0?d._seek:t._sprite[e][0]/1e3),s=Math.max(0,(t._sprite[e][0]+t._sprite[e][1])/1e3-_),l=1e3*s/Math.abs(d._rate),c=t._sprite[e][0]/1e3,f=(t._sprite[e][0]+t._sprite[e][1])/1e3;d._sprite=e,d._ended=!1;var p=function(){d._paused=!1,d._seek=_,d._start=c,d._stop=f,d._loop=!(!d._loop&&!t._sprite[e][2])};if(_>=f)return void t._ended(d);var m=d._node;if(t._webAudio){var v=function(){t._playLock=!1,p(),t._refreshBuffer(d);var e=d._muted||t._muted?0:d._volume;m.gain.setValueAtTime(e,n.ctx.currentTime),d._playStart=n.ctx.currentTime,void 0===m.bufferSource.start?d._loop?m.bufferSource.noteGrainOn(0,_,86400):m.bufferSource.noteGrainOn(0,_,s):d._loop?m.bufferSource.start(0,_,86400):m.bufferSource.start(0,_,s),l!==1/0&&(t._endTimers[d._id]=setTimeout(t._ended.bind(t,d),l)),o||setTimeout(function(){t._emit("play",d._id),t._loadQueue()},0)};"running"===n.state&&"interrupted"!==n.ctx.state?v():(t._playLock=!0,t.once("resume",v),t._clearTimer(d._id))}else{var h=function(){m.currentTime=_,m.muted=d._muted||t._muted||n._muted||m.muted,m.volume=d._volume*n.volume(),m.playbackRate=d._rate;try{var r=m.play();if(r&&"undefined"!=typeof Promise&&(r instanceof Promise||"function"==typeof r.then)?(t._playLock=!0,p(),r.then(function(){t._playLock=!1,m._unlocked=!0,o?t._loadQueue():t._emit("play",d._id)}).catch(function(){t._playLock=!1,t._emit("playerror",d._id,"Playback was unable to start. This is most commonly an issue on mobile devices and Chrome where playback was not within a user interaction."),d._ended=!0,d._paused=!0})):o||(t._playLock=!1,p(),t._emit("play",d._id)),m.playbackRate=d._rate,m.paused)return void t._emit("playerror",d._id,"Playback was unable to start. This is most commonly an issue on mobile devices and Chrome where playback was not within a user interaction.");"__default"!==e||d._loop?t._endTimers[d._id]=setTimeout(t._ended.bind(t,d),l):(t._endTimers[d._id]=function(){t._ended(d),m.removeEventListener("ended",t._endTimers[d._id],!1)},m.addEventListener("ended",t._endTimers[d._id],!1))}catch(e){t._emit("playerror",d._id,e)}};"data:audio/wav;base64,UklGRigAAABXQVZFZm10IBIAAAABAAEARKwAAIhYAQACABAAAABkYXRhAgAAAAEA"===m.src&&(m.src=t._src,m.load());var y=window&&window.ejecta||!m.readyState&&n._navigator.isCocoonJS;if(m.readyState>=3||y)h();else{t._playLock=!0,t._state="loading";var g=function(){t._state="loaded",h(),m.removeEventListener(n._canPlayEvent,g,!1)};m.addEventListener(n._canPlayEvent,g,!1),t._clearTimer(d._id)}}return d._id},pause:function(e){var n=this;if("loaded"!==n._state||n._playLock)return n._queue.push({event:"pause",action:function(){n.pause(e)}}),n;for(var o=n._getSoundIds(e),t=0;t<o.length;t++){n._clearTimer(o[t]);var r=n._soundById(o[t]);if(r&&!r._paused&&(r._seek=n.seek(o[t]),r._rateSeek=0,r._paused=!0,n._stopFade(o[t]),r._node))if(n._webAudio){if(!r._node.bufferSource)continue;void 0===r._node.bufferSource.stop?r._node.bufferSource.noteOff(0):r._node.bufferSource.stop(0),n._cleanBuffer(r._node)}else isNaN(r._node.duration)&&r._node.duration!==1/0||r._node.pause();arguments[1]||n._emit("pause",r?r._id:null)}return n},stop:function(e,n){var o=this;if("loaded"!==o._state||o._playLock)return o._queue.push({event:"stop",action:function(){o.stop(e)}}),o;for(var t=o._getSoundIds(e),r=0;r<t.length;r++){o._clearTimer(t[r]);var a=o._soundById(t[r]);a&&(a._seek=a._start||0,a._rateSeek=0,a._paused=!0,a._ended=!0,o._stopFade(t[r]),a._node&&(o._webAudio?a._node.bufferSource&&(void 0===a._node.bufferSource.stop?a._node.bufferSource.noteOff(0):a._node.bufferSource.stop(0),o._cleanBuffer(a._node)):isNaN(a._node.duration)&&a._node.duration!==1/0||(a._node.currentTime=a._start||0,a._node.pause(),a._node.duration===1/0&&o._clearSound(a._node))),n||o._emit("stop",a._id))}return o},mute:function(e,o){var t=this;if("loaded"!==t._state||t._playLock)return t._queue.push({event:"mute",action:function(){t.mute(e,o)}}),t;if(void 0===o){if("boolean"!=typeof e)return t._muted;t._muted=e}for(var r=t._getSoundIds(o),a=0;a<r.length;a++){var u=t._soundById(r[a]);u&&(u._muted=e,u._interval&&t._stopFade(u._id),t._webAudio&&u._node?u._node.gain.setValueAtTime(e?0:u._volume,n.ctx.currentTime):u._node&&(u._node.muted=!!n._muted||e),t._emit("mute",u._id))}return t},volume:function(){var e,o,t=this,r=arguments;if(0===r.length)return t._volume;if(1===r.length||2===r.length&&void 0===r[1]){t._getSoundIds().indexOf(r[0])>=0?o=parseInt(r[0],10):e=parseFloat(r[0])}else r.length>=2&&(e=parseFloat(r[0]),o=parseInt(r[1],10));var a;if(!(void 0!==e&&e>=0&&e<=1))return a=o?t._soundById(o):t._sounds[0],a?a._volume:0;if("loaded"!==t._state||t._playLock)return t._queue.push({event:"volume",action:function(){t.volume.apply(t,r)}}),t;void 0===o&&(t._volume=e),o=t._getSoundIds(o);for(var u=0;u<o.length;u++)(a=t._soundById(o[u]))&&(a._volume=e,r[2]||t._stopFade(o[u]),t._webAudio&&a._node&&!a._muted?a._node.gain.setValueAtTime(e,n.ctx.currentTime):a._node&&!a._muted&&(a._node.volume=e*n.volume()),t._emit("volume",a._id));return t},fade:function(e,o,t,r){var a=this;if("loaded"!==a._state||a._playLock)return a._queue.push({event:"fade",action:function(){a.fade(e,o,t,r)}}),a;e=Math.min(Math.max(0,parseFloat(e)),1),o=Math.min(Math.max(0,parseFloat(o)),1),t=parseFloat(t),a.volume(e,r);for(var u=a._getSoundIds(r),d=0;d<u.length;d++){var i=a._soundById(u[d]);if(i){if(r||a._stopFade(u[d]),a._webAudio&&!i._muted){var _=n.ctx.currentTime,s=_+t/1e3;i._volume=e,i._node.gain.setValueAtTime(e,_),i._node.gain.linearRampToValueAtTime(o,s)}a._startFadeInterval(i,e,o,t,u[d],void 0===r)}}return a},_startFadeInterval:function(e,n,o,t,r,a){var u=this,d=n,i=o-n,_=Math.abs(i/.01),s=Math.max(4,_>0?t/_:t),l=Date.now();e._fadeTo=o,e._interval=setInterval(function(){var r=(Date.now()-l)/t;l=Date.now(),d+=i*r,d=Math.round(100*d)/100,d=i<0?Math.max(o,d):Math.min(o,d),u._webAudio?e._volume=d:u.volume(d,e._id,!0),a&&(u._volume=d),(o<n&&d<=o||o>n&&d>=o)&&(clearInterval(e._interval),e._interval=null,e._fadeTo=null,u.volume(o,e._id),u._emit("fade",e._id))},s)},_stopFade:function(e){var o=this,t=o._soundById(e);return t&&t._interval&&(o._webAudio&&t._node.gain.cancelScheduledValues(n.ctx.currentTime),clearInterval(t._interval),t._interval=null,o.volume(t._fadeTo,e),t._fadeTo=null,o._emit("fade",e)),o},loop:function(){var e,n,o,t=this,r=arguments;if(0===r.length)return t._loop;if(1===r.length){if("boolean"!=typeof r[0])return!!(o=t._soundById(parseInt(r[0],10)))&&o._loop;e=r[0],t._loop=e}else 2===r.length&&(e=r[0],n=parseInt(r[1],10));for(var a=t._getSoundIds(n),u=0;u<a.length;u++)(o=t._soundById(a[u]))&&(o._loop=e,t._webAudio&&o._node&&o._node.bufferSource&&(o._node.bufferSource.loop=e,e&&(o._node.bufferSource.loopStart=o._start||0,o._node.bufferSource.loopEnd=o._stop,t.playing(a[u])&&(t.pause(a[u],!0),t.play(a[u],!0)))));return t},rate:function(){var e,o,t=this,r=arguments;if(0===r.length)o=t._sounds[0]._id;else if(1===r.length){var a=t._getSoundIds(),u=a.indexOf(r[0]);u>=0?o=parseInt(r[0],10):e=parseFloat(r[0])}else 2===r.length&&(e=parseFloat(r[0]),o=parseInt(r[1],10));var d;if("number"!=typeof e)return d=t._soundById(o),d?d._rate:t._rate;if("loaded"!==t._state||t._playLock)return t._queue.push({event:"rate",action:function(){t.rate.apply(t,r)}}),t;void 0===o&&(t._rate=e),o=t._getSoundIds(o);for(var i=0;i<o.length;i++)if(d=t._soundById(o[i])){t.playing(o[i])&&(d._rateSeek=t.seek(o[i]),d._playStart=t._webAudio?n.ctx.currentTime:d._playStart),d._rate=e,t._webAudio&&d._node&&d._node.bufferSource?d._node.bufferSource.playbackRate.setValueAtTime(e,n.ctx.currentTime):d._node&&(d._node.playbackRate=e);var _=t.seek(o[i]),s=(t._sprite[d._sprite][0]+t._sprite[d._sprite][1])/1e3-_,l=1e3*s/Math.abs(d._rate);!t._endTimers[o[i]]&&d._paused||(t._clearTimer(o[i]),t._endTimers[o[i]]=setTimeout(t._ended.bind(t,d),l)),t._emit("rate",d._id)}return t},seek:function(){var e,o,t=this,r=arguments;if(0===r.length)t._sounds.length&&(o=t._sounds[0]._id);else if(1===r.length){var a=t._getSoundIds(),u=a.indexOf(r[0]);u>=0?o=parseInt(r[0],10):t._sounds.length&&(o=t._sounds[0]._id,e=parseFloat(r[0]))}else 2===r.length&&(e=parseFloat(r[0]),o=parseInt(r[1],10));if(void 0===o)return 0;if("number"==typeof e&&("loaded"!==t._state||t._playLock))return t._queue.push({event:"seek",action:function(){t.seek.apply(t,r)}}),t;var d=t._soundById(o);if(d){if(!("number"==typeof e&&e>=0)){if(t._webAudio){var i=t.playing(o)?n.ctx.currentTime-d._playStart:0,_=d._rateSeek?d._rateSeek-d._seek:0;return d._seek+(_+i*Math.abs(d._rate))}return d._node.currentTime}var s=t.playing(o);s&&t.pause(o,!0),d._seek=e,d._ended=!1,t._clearTimer(o),t._webAudio||!d._node||isNaN(d._node.duration)||(d._node.currentTime=e);var l=function(){s&&t.play(o,!0),t._emit("seek",o)};if(s&&!t._webAudio){var c=function(){t._playLock?setTimeout(c,0):l()};setTimeout(c,0)}else l()}return t},playing:function(e){var n=this;if("number"==typeof e){var o=n._soundById(e);return!!o&&!o._paused}for(var t=0;t<n._sounds.length;t++)if(!n._sounds[t]._paused)return!0;return!1},duration:function(e){var n=this,o=n._duration,t=n._soundById(e);return t&&(o=n._sprite[t._sprite][1]/1e3),o},state:function(){return this._state},unload:function(){for(var e=this,o=e._sounds,t=0;t<o.length;t++)o[t]._paused||e.stop(o[t]._id),e._webAudio||(e._clearSound(o[t]._node),o[t]._node.removeEventListener("error",o[t]._errorFn,!1),o[t]._node.removeEventListener(n._canPlayEvent,o[t]._loadFn,!1),o[t]._node.removeEventListener("ended",o[t]._endFn,!1),n._releaseHtml5Audio(o[t]._node)),delete o[t]._node,e._clearTimer(o[t]._id);var a=n._howls.indexOf(e);a>=0&&n._howls.splice(a,1);var u=!0;for(t=0;t<n._howls.length;t++)if(n._howls[t]._src===e._src||e._src.indexOf(n._howls[t]._src)>=0){u=!1;break}return r&&u&&delete r[e._src],n.noAudio=!1,e._state="unloaded",e._sounds=[],e=null,null},on:function(e,n,o,t){var r=this,a=r["_on"+e];return"function"==typeof n&&a.push(t?{id:o,fn:n,once:t}:{id:o,fn:n}),r},off:function(e,n,o){var t=this,r=t["_on"+e],a=0;if("number"==typeof n&&(o=n,n=null),n||o)for(a=0;a<r.length;a++){var u=o===r[a].id;if(n===r[a].fn&&u||!n&&u){r.splice(a,1);break}}else if(e)t["_on"+e]=[];else{var d=Object.keys(t);for(a=0;a<d.length;a++)0===d[a].indexOf("_on")&&Array.isArray(t[d[a]])&&(t[d[a]]=[])}return t},once:function(e,n,o){var t=this;return t.on(e,n,o,1),t},_emit:function(e,n,o){for(var t=this,r=t["_on"+e],a=r.length-1;a>=0;a--)r[a].id&&r[a].id!==n&&"load"!==e||(setTimeout(function(e){e.call(this,n,o)}.bind(t,r[a].fn),0),r[a].once&&t.off(e,r[a].fn,r[a].id));return t._loadQueue(e),t},_loadQueue:function(e){var n=this;if(n._queue.length>0){var o=n._queue[0];o.event===e&&(n._queue.shift(),n._loadQueue()),e||o.action()}return n},_ended:function(e){var o=this,t=e._sprite;if(!o._webAudio&&e._node&&!e._node.paused&&!e._node.ended&&e._node.currentTime<e._stop)return setTimeout(o._ended.bind(o,e),100),o;var r=!(!e._loop&&!o._sprite[t][2]);if(o._emit("end",e._id),!o._webAudio&&r&&o.stop(e._id,!0).play(e._id),o._webAudio&&r){o._emit("play",e._id),e._seek=e._start||0,e._rateSeek=0,e._playStart=n.ctx.currentTime;var a=1e3*(e._stop-e._start)/Math.abs(e._rate);o._endTimers[e._id]=setTimeout(o._ended.bind(o,e),a)}return o._webAudio&&!r&&(e._paused=!0,e._ended=!0,e._seek=e._start||0,e._rateSeek=0,o._clearTimer(e._id),o._cleanBuffer(e._node),n._autoSuspend()),o._webAudio||r||o.stop(e._id,!0),o},_clearTimer:function(e){var n=this;if(n._endTimers[e]){if("function"!=typeof n._endTimers[e])clearTimeout(n._endTimers[e]);else{var o=n._soundById(e);o&&o._node&&o._node.removeEventListener("ended",n._endTimers[e],!1)}delete n._endTimers[e]}return n},_soundById:function(e){for(var n=this,o=0;o<n._sounds.length;o++)if(e===n._sounds[o]._id)return n._sounds[o];return null},_inactiveSound:function(){var e=this;e._drain();for(var n=0;n<e._sounds.length;n++)if(e._sounds[n]._ended)return e._sounds[n].reset();return new t(e)},_drain:function(){var e=this,n=e._pool,o=0,t=0;if(!(e._sounds.length<n)){for(t=0;t<e._sounds.length;t++)e._sounds[t]._ended&&o++;for(t=e._sounds.length-1;t>=0;t--){if(o<=n)return;e._sounds[t]._ended&&(e._webAudio&&e._sounds[t]._node&&e._sounds[t]._node.disconnect(0),e._sounds.splice(t,1),o--)}}},_getSoundIds:function(e){var n=this;if(void 0===e){for(var o=[],t=0;t<n._sounds.length;t++)o.push(n._sounds[t]._id);return o}return[e]},_refreshBuffer:function(e){var o=this;return e._node.bufferSource=n.ctx.createBufferSource(),e._node.bufferSource.buffer=r[o._src],e._panner?e._node.bufferSource.connect(e._panner):e._node.bufferSource.connect(e._node),e._node.bufferSource.loop=e._loop,e._loop&&(e._node.bufferSource.loopStart=e._start||0,e._node.bufferSource.loopEnd=e._stop||0),e._node.bufferSource.playbackRate.setValueAtTime(e._rate,n.ctx.currentTime),o},_cleanBuffer:function(e){var o=this,t=n._navigator&&n._navigator.vendor.indexOf("Apple")>=0;if(!e.bufferSource)return o;if(n._scratchBuffer&&e.bufferSource&&(e.bufferSource.onended=null,e.bufferSource.disconnect(0),t))try{e.bufferSource.buffer=n._scratchBuffer}catch(e){}return e.bufferSource=null,o},_clearSound:function(e){/MSIE |Trident\//.test(n._navigator&&n._navigator.userAgent)||(e.src="data:audio/wav;base64,UklGRigAAABXQVZFZm10IBIAAAABAAEARKwAAIhYAQACABAAAABkYXRhAgAAAAEA")}};var t=function(e){this._parent=e,this.init()};t.prototype={init:function(){var e=this,o=e._parent;return e._muted=o._muted,e._loop=o._loop,e._volume=o._volume,e._rate=o._rate,e._seek=0,e._paused=!0,e._ended=!0,e._sprite="__default",e._id=++n._counter,o._sounds.push(e),e.create(),e},create:function(){var e=this,o=e._parent,t=n._muted||e._muted||e._parent._muted?0:e._volume;return o._webAudio?(e._node=void 0===n.ctx.createGain?n.ctx.createGainNode():n.ctx.createGain(),e._node.gain.setValueAtTime(t,n.ctx.currentTime),e._node.paused=!0,e._node.connect(n.masterGain)):n.noAudio||(e._node=n._obtainHtml5Audio(),e._errorFn=e._errorListener.bind(e),e._node.addEventListener("error",e._errorFn,!1),e._loadFn=e._loadListener.bind(e),e._node.addEventListener(n._canPlayEvent,e._loadFn,!1),e._endFn=e._endListener.bind(e),e._node.addEventListener("ended",e._endFn,!1),e._node.src=o._src,e._node.preload=!0===o._preload?"auto":o._preload,e._node.volume=t*n.volume(),e._node.load()),e},reset:function(){var e=this,o=e._parent;return e._muted=o._muted,e._loop=o._loop,e._volume=o._volume,e._rate=o._rate,e._seek=0,e._rateSeek=0,e._paused=!0,e._ended=!0,e._sprite="__default",e._id=++n._counter,e},_errorListener:function(){var e=this;e._parent._emit("loaderror",e._id,e._node.error?e._node.error.code:0),e._node.removeEventListener("error",e._errorFn,!1)},_loadListener:function(){var e=this,o=e._parent;o._duration=Math.ceil(10*e._node.duration)/10,0===Object.keys(o._sprite).length&&(o._sprite={__default:[0,1e3*o._duration]}),"loaded"!==o._state&&(o._state="loaded",o._emit("load"),o._loadQueue()),e._node.removeEventListener(n._canPlayEvent,e._loadFn,!1)},_endListener:function(){var e=this,n=e._parent;n._duration===1/0&&(n._duration=Math.ceil(10*e._node.duration)/10,n._sprite.__default[1]===1/0&&(n._sprite.__default[1]=1e3*n._duration),n._ended(e)),e._node.removeEventListener("ended",e._endFn,!1)}};var r={},a=function(e){var n=e._src;if(r[n])return e._duration=r[n].duration,void i(e);if(/^data:[^;]+;base64,/.test(n)){for(var o=atob(n.split(",")[1]),t=new Uint8Array(o.length),a=0;a<o.length;++a)t[a]=o.charCodeAt(a);d(t.buffer,e)}else{var _=new XMLHttpRequest;_.open(e._xhr.method,n,!0),_.withCredentials=e._xhr.withCredentials,_.responseType="arraybuffer",e._xhr.headers&&Object.keys(e._xhr.headers).forEach(function(n){_.setRequestHeader(n,e._xhr.headers[n])}),_.onload=function(){var n=(_.status+"")[0];if("0"!==n&&"2"!==n&&"3"!==n)return void e._emit("loaderror",null,"Failed loading audio file with status: "+_.status+".");d(_.response,e)},_.onerror=function(){e._webAudio&&(e._html5=!0,e._webAudio=!1,e._sounds=[],delete r[n],e.load())},u(_)}},u=function(e){try{e.send()}catch(n){e.onerror()}},d=function(e,o){var t=function(){o._emit("loaderror",null,"Decoding audio data failed.")},a=function(e){e&&o._sounds.length>0?(r[o._src]=e,i(o,e)):t()};"undefined"!=typeof Promise&&1===n.ctx.decodeAudioData.length?n.ctx.decodeAudioData(e).then(a).catch(t):n.ctx.decodeAudioData(e,a,t)},i=function(e,n){n&&!e._duration&&(e._duration=n.duration),0===Object.keys(e._sprite).length&&(e._sprite={__default:[0,1e3*e._duration]}),"loaded"!==e._state&&(e._state="loaded",e._emit("load"),e._loadQueue())},_=function(){if(n.usingWebAudio){try{"undefined"!=typeof AudioContext?n.ctx=new AudioContext:"undefined"!=typeof webkitAudioContext?n.ctx=new webkitAudioContext:n.usingWebAudio=!1}catch(e){n.usingWebAudio=!1}n.ctx||(n.usingWebAudio=!1);var e=/iP(hone|od|ad)/.test(n._navigator&&n._navigator.platform),o=n._navigator&&n._navigator.appVersion.match(/OS (\d+)_(\d+)_?(\d+)?/),t=o?parseInt(o[1],10):null;if(e&&t&&t<9){var r=/safari/.test(n._navigator&&n._navigator.userAgent.toLowerCase());n._navigator&&!r&&(n.usingWebAudio=!1)}n.usingWebAudio&&(n.masterGain=void 0===n.ctx.createGain?n.ctx.createGainNode():n.ctx.createGain(),n.masterGain.gain.setValueAtTime(n._muted?0:n._volume,n.ctx.currentTime),n.masterGain.connect(n.ctx.destination)),n._setup()}};"function"==typeof define&&define.amd&&define([],function(){return{Howler:n,Howl:o}}),"undefined"!=typeof exports&&(exports.Howler=n,exports.Howl=o),"undefined"!=typeof global?(global.HowlerGlobal=e,global.Howler=n,global.Howl=o,global.Sound=t):"undefined"!=typeof window&&(window.HowlerGlobal=e,window.Howler=n,window.Howl=o,window.Sound=t)}();
+/*! Spatial Plugin */
+!function(){"use strict";HowlerGlobal.prototype._pos=[0,0,0],HowlerGlobal.prototype._orientation=[0,0,-1,0,1,0],HowlerGlobal.prototype.stereo=function(e){var n=this;if(!n.ctx||!n.ctx.listener)return n;for(var t=n._howls.length-1;t>=0;t--)n._howls[t].stereo(e);return n},HowlerGlobal.prototype.pos=function(e,n,t){var r=this;return r.ctx&&r.ctx.listener?(n="number"!=typeof n?r._pos[1]:n,t="number"!=typeof t?r._pos[2]:t,"number"!=typeof e?r._pos:(r._pos=[e,n,t],void 0!==r.ctx.listener.positionX?(r.ctx.listener.positionX.setTargetAtTime(r._pos[0],Howler.ctx.currentTime,.1),r.ctx.listener.positionY.setTargetAtTime(r._pos[1],Howler.ctx.currentTime,.1),r.ctx.listener.positionZ.setTargetAtTime(r._pos[2],Howler.ctx.currentTime,.1)):r.ctx.listener.setPosition(r._pos[0],r._pos[1],r._pos[2]),r)):r},HowlerGlobal.prototype.orientation=function(e,n,t,r,o,i){var a=this;if(!a.ctx||!a.ctx.listener)return a;var p=a._orientation;return n="number"!=typeof n?p[1]:n,t="number"!=typeof t?p[2]:t,r="number"!=typeof r?p[3]:r,o="number"!=typeof o?p[4]:o,i="number"!=typeof i?p[5]:i,"number"!=typeof e?p:(a._orientation=[e,n,t,r,o,i],void 0!==a.ctx.listener.forwardX?(a.ctx.listener.forwardX.setTargetAtTime(e,Howler.ctx.currentTime,.1),a.ctx.listener.forwardY.setTargetAtTime(n,Howler.ctx.currentTime,.1),a.ctx.listener.forwardZ.setTargetAtTime(t,Howler.ctx.currentTime,.1),a.ctx.listener.upX.setTargetAtTime(r,Howler.ctx.currentTime,.1),a.ctx.listener.upY.setTargetAtTime(o,Howler.ctx.currentTime,.1),a.ctx.listener.upZ.setTargetAtTime(i,Howler.ctx.currentTime,.1)):a.ctx.listener.setOrientation(e,n,t,r,o,i),a)},Howl.prototype.init=function(e){return function(n){var t=this;return t._orientation=n.orientation||[1,0,0],t._stereo=n.stereo||null,t._pos=n.pos||null,t._pannerAttr={coneInnerAngle:void 0!==n.coneInnerAngle?n.coneInnerAngle:360,coneOuterAngle:void 0!==n.coneOuterAngle?n.coneOuterAngle:360,coneOuterGain:void 0!==n.coneOuterGain?n.coneOuterGain:0,distanceModel:void 0!==n.distanceModel?n.distanceModel:"inverse",maxDistance:void 0!==n.maxDistance?n.maxDistance:1e4,panningModel:void 0!==n.panningModel?n.panningModel:"HRTF",refDistance:void 0!==n.refDistance?n.refDistance:1,rolloffFactor:void 0!==n.rolloffFactor?n.rolloffFactor:1},t._onstereo=n.onstereo?[{fn:n.onstereo}]:[],t._onpos=n.onpos?[{fn:n.onpos}]:[],t._onorientation=n.onorientation?[{fn:n.onorientation}]:[],e.call(this,n)}}(Howl.prototype.init),Howl.prototype.stereo=function(n,t){var r=this;if(!r._webAudio)return r;if("loaded"!==r._state)return r._queue.push({event:"stereo",action:function(){r.stereo(n,t)}}),r;var o=void 0===Howler.ctx.createStereoPanner?"spatial":"stereo";if(void 0===t){if("number"!=typeof n)return r._stereo;r._stereo=n,r._pos=[n,0,0]}for(var i=r._getSoundIds(t),a=0;a<i.length;a++){var p=r._soundById(i[a]);if(p){if("number"!=typeof n)return p._stereo;p._stereo=n,p._pos=[n,0,0],p._node&&(p._pannerAttr.panningModel="equalpower",p._panner&&p._panner.pan||e(p,o),"spatial"===o?void 0!==p._panner.positionX?(p._panner.positionX.setValueAtTime(n,Howler.ctx.currentTime),p._panner.positionY.setValueAtTime(0,Howler.ctx.currentTime),p._panner.positionZ.setValueAtTime(0,Howler.ctx.currentTime)):p._panner.setPosition(n,0,0):p._panner.pan.setValueAtTime(n,Howler.ctx.currentTime)),r._emit("stereo",p._id)}}return r},Howl.prototype.pos=function(n,t,r,o){var i=this;if(!i._webAudio)return i;if("loaded"!==i._state)return i._queue.push({event:"pos",action:function(){i.pos(n,t,r,o)}}),i;if(t="number"!=typeof t?0:t,r="number"!=typeof r?-.5:r,void 0===o){if("number"!=typeof n)return i._pos;i._pos=[n,t,r]}for(var a=i._getSoundIds(o),p=0;p<a.length;p++){var s=i._soundById(a[p]);if(s){if("number"!=typeof n)return s._pos;s._pos=[n,t,r],s._node&&(s._panner&&!s._panner.pan||e(s,"spatial"),void 0!==s._panner.positionX?(s._panner.positionX.setValueAtTime(n,Howler.ctx.currentTime),s._panner.positionY.setValueAtTime(t,Howler.ctx.currentTime),s._panner.positionZ.setValueAtTime(r,Howler.ctx.currentTime)):s._panner.setPosition(n,t,r)),i._emit("pos",s._id)}}return i},Howl.prototype.orientation=function(n,t,r,o){var i=this;if(!i._webAudio)return i;if("loaded"!==i._state)return i._queue.push({event:"orientation",action:function(){i.orientation(n,t,r,o)}}),i;if(t="number"!=typeof t?i._orientation[1]:t,r="number"!=typeof r?i._orientation[2]:r,void 0===o){if("number"!=typeof n)return i._orientation;i._orientation=[n,t,r]}for(var a=i._getSoundIds(o),p=0;p<a.length;p++){var s=i._soundById(a[p]);if(s){if("number"!=typeof n)return s._orientation;s._orientation=[n,t,r],s._node&&(s._panner||(s._pos||(s._pos=i._pos||[0,0,-.5]),e(s,"spatial")),void 0!==s._panner.orientationX?(s._panner.orientationX.setValueAtTime(n,Howler.ctx.currentTime),s._panner.orientationY.setValueAtTime(t,Howler.ctx.currentTime),s._panner.orientationZ.setValueAtTime(r,Howler.ctx.currentTime)):s._panner.setOrientation(n,t,r)),i._emit("orientation",s._id)}}return i},Howl.prototype.pannerAttr=function(){var n,t,r,o=this,i=arguments;if(!o._webAudio)return o;if(0===i.length)return o._pannerAttr;if(1===i.length){if("object"!=typeof i[0])return r=o._soundById(parseInt(i[0],10)),r?r._pannerAttr:o._pannerAttr;n=i[0],void 0===t&&(n.pannerAttr||(n.pannerAttr={coneInnerAngle:n.coneInnerAngle,coneOuterAngle:n.coneOuterAngle,coneOuterGain:n.coneOuterGain,distanceModel:n.distanceModel,maxDistance:n.maxDistance,refDistance:n.refDistance,rolloffFactor:n.rolloffFactor,panningModel:n.panningModel}),o._pannerAttr={coneInnerAngle:void 0!==n.pannerAttr.coneInnerAngle?n.pannerAttr.coneInnerAngle:o._coneInnerAngle,coneOuterAngle:void 0!==n.pannerAttr.coneOuterAngle?n.pannerAttr.coneOuterAngle:o._coneOuterAngle,coneOuterGain:void 0!==n.pannerAttr.coneOuterGain?n.pannerAttr.coneOuterGain:o._coneOuterGain,distanceModel:void 0!==n.pannerAttr.distanceModel?n.pannerAttr.distanceModel:o._distanceModel,maxDistance:void 0!==n.pannerAttr.maxDistance?n.pannerAttr.maxDistance:o._maxDistance,refDistance:void 0!==n.pannerAttr.refDistance?n.pannerAttr.refDistance:o._refDistance,rolloffFactor:void 0!==n.pannerAttr.rolloffFactor?n.pannerAttr.rolloffFactor:o._rolloffFactor,panningModel:void 0!==n.pannerAttr.panningModel?n.pannerAttr.panningModel:o._panningModel})}else 2===i.length&&(n=i[0],t=parseInt(i[1],10));for(var a=o._getSoundIds(t),p=0;p<a.length;p++)if(r=o._soundById(a[p])){var s=r._pannerAttr;s={coneInnerAngle:void 0!==n.coneInnerAngle?n.coneInnerAngle:s.coneInnerAngle,coneOuterAngle:void 0!==n.coneOuterAngle?n.coneOuterAngle:s.coneOuterAngle,coneOuterGain:void 0!==n.coneOuterGain?n.coneOuterGain:s.coneOuterGain,distanceModel:void 0!==n.distanceModel?n.distanceModel:s.distanceModel,maxDistance:void 0!==n.maxDistance?n.maxDistance:s.maxDistance,refDistance:void 0!==n.refDistance?n.refDistance:s.refDistance,rolloffFactor:void 0!==n.rolloffFactor?n.rolloffFactor:s.rolloffFactor,panningModel:void 0!==n.panningModel?n.panningModel:s.panningModel};var c=r._panner;c||(r._pos||(r._pos=o._pos||[0,0,-.5]),e(r,"spatial"),c=r._panner),c.coneInnerAngle=s.coneInnerAngle,c.coneOuterAngle=s.coneOuterAngle,c.coneOuterGain=s.coneOuterGain,c.distanceModel=s.distanceModel,c.maxDistance=s.maxDistance,c.refDistance=s.refDistance,c.rolloffFactor=s.rolloffFactor,c.panningModel=s.panningModel}return o},Sound.prototype.init=function(e){return function(){var n=this,t=n._parent;n._orientation=t._orientation,n._stereo=t._stereo,n._pos=t._pos,n._pannerAttr=t._pannerAttr,e.call(this),n._stereo?t.stereo(n._stereo):n._pos&&t.pos(n._pos[0],n._pos[1],n._pos[2],n._id)}}(Sound.prototype.init),Sound.prototype.reset=function(e){return function(){var n=this,t=n._parent;return n._orientation=t._orientation,n._stereo=t._stereo,n._pos=t._pos,n._pannerAttr=t._pannerAttr,n._stereo?t.stereo(n._stereo):n._pos?t.pos(n._pos[0],n._pos[1],n._pos[2],n._id):n._panner&&(n._panner.disconnect(0),n._panner=void 0,t._refreshBuffer(n)),e.call(this)}}(Sound.prototype.reset);var e=function(e,n){n=n||"spatial","spatial"===n?(e._panner=Howler.ctx.createPanner(),e._panner.coneInnerAngle=e._pannerAttr.coneInnerAngle,e._panner.coneOuterAngle=e._pannerAttr.coneOuterAngle,e._panner.coneOuterGain=e._pannerAttr.coneOuterGain,e._panner.distanceModel=e._pannerAttr.distanceModel,e._panner.maxDistance=e._pannerAttr.maxDistance,e._panner.refDistance=e._pannerAttr.refDistance,e._panner.rolloffFactor=e._pannerAttr.rolloffFactor,e._panner.panningModel=e._pannerAttr.panningModel,void 0!==e._panner.positionX?(e._panner.positionX.setValueAtTime(e._pos[0],Howler.ctx.currentTime),e._panner.positionY.setValueAtTime(e._pos[1],Howler.ctx.currentTime),e._panner.positionZ.setValueAtTime(e._pos[2],Howler.ctx.currentTime)):e._panner.setPosition(e._pos[0],e._pos[1],e._pos[2]),void 0!==e._panner.orientationX?(e._panner.orientationX.setValueAtTime(e._orientation[0],Howler.ctx.currentTime),e._panner.orientationY.setValueAtTime(e._orientation[1],Howler.ctx.currentTime),e._panner.orientationZ.setValueAtTime(e._orientation[2],Howler.ctx.currentTime)):e._panner.setOrientation(e._orientation[0],e._orientation[1],e._orientation[2])):(e._panner=Howler.ctx.createStereoPanner(),e._panner.pan.setValueAtTime(e._stereo,Howler.ctx.currentTime)),e._panner.connect(e._node),e._paused||e._parent.pause(e._id,!0).play(e._id,!0)}}();
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/howler/dist/howler.spatial.min.js b/uni_modules/c-svga/node_modules/howler/dist/howler.spatial.min.js
new file mode 100644
index 0000000..c7a5901
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/howler/dist/howler.spatial.min.js
@@ -0,0 +1,2 @@
+/*! howler.js v2.2.4 | Spatial Plugin | (c) 2013-2020, James Simpson of GoldFire Studios | MIT License | howlerjs.com */
+!function(){"use strict";HowlerGlobal.prototype._pos=[0,0,0],HowlerGlobal.prototype._orientation=[0,0,-1,0,1,0],HowlerGlobal.prototype.stereo=function(e){var n=this;if(!n.ctx||!n.ctx.listener)return n;for(var t=n._howls.length-1;t>=0;t--)n._howls[t].stereo(e);return n},HowlerGlobal.prototype.pos=function(e,n,t){var r=this;return r.ctx&&r.ctx.listener?(n="number"!=typeof n?r._pos[1]:n,t="number"!=typeof t?r._pos[2]:t,"number"!=typeof e?r._pos:(r._pos=[e,n,t],void 0!==r.ctx.listener.positionX?(r.ctx.listener.positionX.setTargetAtTime(r._pos[0],Howler.ctx.currentTime,.1),r.ctx.listener.positionY.setTargetAtTime(r._pos[1],Howler.ctx.currentTime,.1),r.ctx.listener.positionZ.setTargetAtTime(r._pos[2],Howler.ctx.currentTime,.1)):r.ctx.listener.setPosition(r._pos[0],r._pos[1],r._pos[2]),r)):r},HowlerGlobal.prototype.orientation=function(e,n,t,r,o,i){var a=this;if(!a.ctx||!a.ctx.listener)return a;var p=a._orientation;return n="number"!=typeof n?p[1]:n,t="number"!=typeof t?p[2]:t,r="number"!=typeof r?p[3]:r,o="number"!=typeof o?p[4]:o,i="number"!=typeof i?p[5]:i,"number"!=typeof e?p:(a._orientation=[e,n,t,r,o,i],void 0!==a.ctx.listener.forwardX?(a.ctx.listener.forwardX.setTargetAtTime(e,Howler.ctx.currentTime,.1),a.ctx.listener.forwardY.setTargetAtTime(n,Howler.ctx.currentTime,.1),a.ctx.listener.forwardZ.setTargetAtTime(t,Howler.ctx.currentTime,.1),a.ctx.listener.upX.setTargetAtTime(r,Howler.ctx.currentTime,.1),a.ctx.listener.upY.setTargetAtTime(o,Howler.ctx.currentTime,.1),a.ctx.listener.upZ.setTargetAtTime(i,Howler.ctx.currentTime,.1)):a.ctx.listener.setOrientation(e,n,t,r,o,i),a)},Howl.prototype.init=function(e){return function(n){var t=this;return t._orientation=n.orientation||[1,0,0],t._stereo=n.stereo||null,t._pos=n.pos||null,t._pannerAttr={coneInnerAngle:void 0!==n.coneInnerAngle?n.coneInnerAngle:360,coneOuterAngle:void 0!==n.coneOuterAngle?n.coneOuterAngle:360,coneOuterGain:void 0!==n.coneOuterGain?n.coneOuterGain:0,distanceModel:void 0!==n.distanceModel?n.distanceModel:"inverse",maxDistance:void 0!==n.maxDistance?n.maxDistance:1e4,panningModel:void 0!==n.panningModel?n.panningModel:"HRTF",refDistance:void 0!==n.refDistance?n.refDistance:1,rolloffFactor:void 0!==n.rolloffFactor?n.rolloffFactor:1},t._onstereo=n.onstereo?[{fn:n.onstereo}]:[],t._onpos=n.onpos?[{fn:n.onpos}]:[],t._onorientation=n.onorientation?[{fn:n.onorientation}]:[],e.call(this,n)}}(Howl.prototype.init),Howl.prototype.stereo=function(n,t){var r=this;if(!r._webAudio)return r;if("loaded"!==r._state)return r._queue.push({event:"stereo",action:function(){r.stereo(n,t)}}),r;var o=void 0===Howler.ctx.createStereoPanner?"spatial":"stereo";if(void 0===t){if("number"!=typeof n)return r._stereo;r._stereo=n,r._pos=[n,0,0]}for(var i=r._getSoundIds(t),a=0;a<i.length;a++){var p=r._soundById(i[a]);if(p){if("number"!=typeof n)return p._stereo;p._stereo=n,p._pos=[n,0,0],p._node&&(p._pannerAttr.panningModel="equalpower",p._panner&&p._panner.pan||e(p,o),"spatial"===o?void 0!==p._panner.positionX?(p._panner.positionX.setValueAtTime(n,Howler.ctx.currentTime),p._panner.positionY.setValueAtTime(0,Howler.ctx.currentTime),p._panner.positionZ.setValueAtTime(0,Howler.ctx.currentTime)):p._panner.setPosition(n,0,0):p._panner.pan.setValueAtTime(n,Howler.ctx.currentTime)),r._emit("stereo",p._id)}}return r},Howl.prototype.pos=function(n,t,r,o){var i=this;if(!i._webAudio)return i;if("loaded"!==i._state)return i._queue.push({event:"pos",action:function(){i.pos(n,t,r,o)}}),i;if(t="number"!=typeof t?0:t,r="number"!=typeof r?-.5:r,void 0===o){if("number"!=typeof n)return i._pos;i._pos=[n,t,r]}for(var a=i._getSoundIds(o),p=0;p<a.length;p++){var s=i._soundById(a[p]);if(s){if("number"!=typeof n)return s._pos;s._pos=[n,t,r],s._node&&(s._panner&&!s._panner.pan||e(s,"spatial"),void 0!==s._panner.positionX?(s._panner.positionX.setValueAtTime(n,Howler.ctx.currentTime),s._panner.positionY.setValueAtTime(t,Howler.ctx.currentTime),s._panner.positionZ.setValueAtTime(r,Howler.ctx.currentTime)):s._panner.setPosition(n,t,r)),i._emit("pos",s._id)}}return i},Howl.prototype.orientation=function(n,t,r,o){var i=this;if(!i._webAudio)return i;if("loaded"!==i._state)return i._queue.push({event:"orientation",action:function(){i.orientation(n,t,r,o)}}),i;if(t="number"!=typeof t?i._orientation[1]:t,r="number"!=typeof r?i._orientation[2]:r,void 0===o){if("number"!=typeof n)return i._orientation;i._orientation=[n,t,r]}for(var a=i._getSoundIds(o),p=0;p<a.length;p++){var s=i._soundById(a[p]);if(s){if("number"!=typeof n)return s._orientation;s._orientation=[n,t,r],s._node&&(s._panner||(s._pos||(s._pos=i._pos||[0,0,-.5]),e(s,"spatial")),void 0!==s._panner.orientationX?(s._panner.orientationX.setValueAtTime(n,Howler.ctx.currentTime),s._panner.orientationY.setValueAtTime(t,Howler.ctx.currentTime),s._panner.orientationZ.setValueAtTime(r,Howler.ctx.currentTime)):s._panner.setOrientation(n,t,r)),i._emit("orientation",s._id)}}return i},Howl.prototype.pannerAttr=function(){var n,t,r,o=this,i=arguments;if(!o._webAudio)return o;if(0===i.length)return o._pannerAttr;if(1===i.length){if("object"!=typeof i[0])return r=o._soundById(parseInt(i[0],10)),r?r._pannerAttr:o._pannerAttr;n=i[0],void 0===t&&(n.pannerAttr||(n.pannerAttr={coneInnerAngle:n.coneInnerAngle,coneOuterAngle:n.coneOuterAngle,coneOuterGain:n.coneOuterGain,distanceModel:n.distanceModel,maxDistance:n.maxDistance,refDistance:n.refDistance,rolloffFactor:n.rolloffFactor,panningModel:n.panningModel}),o._pannerAttr={coneInnerAngle:void 0!==n.pannerAttr.coneInnerAngle?n.pannerAttr.coneInnerAngle:o._coneInnerAngle,coneOuterAngle:void 0!==n.pannerAttr.coneOuterAngle?n.pannerAttr.coneOuterAngle:o._coneOuterAngle,coneOuterGain:void 0!==n.pannerAttr.coneOuterGain?n.pannerAttr.coneOuterGain:o._coneOuterGain,distanceModel:void 0!==n.pannerAttr.distanceModel?n.pannerAttr.distanceModel:o._distanceModel,maxDistance:void 0!==n.pannerAttr.maxDistance?n.pannerAttr.maxDistance:o._maxDistance,refDistance:void 0!==n.pannerAttr.refDistance?n.pannerAttr.refDistance:o._refDistance,rolloffFactor:void 0!==n.pannerAttr.rolloffFactor?n.pannerAttr.rolloffFactor:o._rolloffFactor,panningModel:void 0!==n.pannerAttr.panningModel?n.pannerAttr.panningModel:o._panningModel})}else 2===i.length&&(n=i[0],t=parseInt(i[1],10));for(var a=o._getSoundIds(t),p=0;p<a.length;p++)if(r=o._soundById(a[p])){var s=r._pannerAttr;s={coneInnerAngle:void 0!==n.coneInnerAngle?n.coneInnerAngle:s.coneInnerAngle,coneOuterAngle:void 0!==n.coneOuterAngle?n.coneOuterAngle:s.coneOuterAngle,coneOuterGain:void 0!==n.coneOuterGain?n.coneOuterGain:s.coneOuterGain,distanceModel:void 0!==n.distanceModel?n.distanceModel:s.distanceModel,maxDistance:void 0!==n.maxDistance?n.maxDistance:s.maxDistance,refDistance:void 0!==n.refDistance?n.refDistance:s.refDistance,rolloffFactor:void 0!==n.rolloffFactor?n.rolloffFactor:s.rolloffFactor,panningModel:void 0!==n.panningModel?n.panningModel:s.panningModel};var c=r._panner;c||(r._pos||(r._pos=o._pos||[0,0,-.5]),e(r,"spatial"),c=r._panner),c.coneInnerAngle=s.coneInnerAngle,c.coneOuterAngle=s.coneOuterAngle,c.coneOuterGain=s.coneOuterGain,c.distanceModel=s.distanceModel,c.maxDistance=s.maxDistance,c.refDistance=s.refDistance,c.rolloffFactor=s.rolloffFactor,c.panningModel=s.panningModel}return o},Sound.prototype.init=function(e){return function(){var n=this,t=n._parent;n._orientation=t._orientation,n._stereo=t._stereo,n._pos=t._pos,n._pannerAttr=t._pannerAttr,e.call(this),n._stereo?t.stereo(n._stereo):n._pos&&t.pos(n._pos[0],n._pos[1],n._pos[2],n._id)}}(Sound.prototype.init),Sound.prototype.reset=function(e){return function(){var n=this,t=n._parent;return n._orientation=t._orientation,n._stereo=t._stereo,n._pos=t._pos,n._pannerAttr=t._pannerAttr,n._stereo?t.stereo(n._stereo):n._pos?t.pos(n._pos[0],n._pos[1],n._pos[2],n._id):n._panner&&(n._panner.disconnect(0),n._panner=void 0,t._refreshBuffer(n)),e.call(this)}}(Sound.prototype.reset);var e=function(e,n){n=n||"spatial","spatial"===n?(e._panner=Howler.ctx.createPanner(),e._panner.coneInnerAngle=e._pannerAttr.coneInnerAngle,e._panner.coneOuterAngle=e._pannerAttr.coneOuterAngle,e._panner.coneOuterGain=e._pannerAttr.coneOuterGain,e._panner.distanceModel=e._pannerAttr.distanceModel,e._panner.maxDistance=e._pannerAttr.maxDistance,e._panner.refDistance=e._pannerAttr.refDistance,e._panner.rolloffFactor=e._pannerAttr.rolloffFactor,e._panner.panningModel=e._pannerAttr.panningModel,void 0!==e._panner.positionX?(e._panner.positionX.setValueAtTime(e._pos[0],Howler.ctx.currentTime),e._panner.positionY.setValueAtTime(e._pos[1],Howler.ctx.currentTime),e._panner.positionZ.setValueAtTime(e._pos[2],Howler.ctx.currentTime)):e._panner.setPosition(e._pos[0],e._pos[1],e._pos[2]),void 0!==e._panner.orientationX?(e._panner.orientationX.setValueAtTime(e._orientation[0],Howler.ctx.currentTime),e._panner.orientationY.setValueAtTime(e._orientation[1],Howler.ctx.currentTime),e._panner.orientationZ.setValueAtTime(e._orientation[2],Howler.ctx.currentTime)):e._panner.setOrientation(e._orientation[0],e._orientation[1],e._orientation[2])):(e._panner=Howler.ctx.createStereoPanner(),e._panner.pan.setValueAtTime(e._stereo,Howler.ctx.currentTime)),e._panner.connect(e._node),e._paused||e._parent.pause(e._id,!0).play(e._id,!0)}}();
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/howler/package.json b/uni_modules/c-svga/node_modules/howler/package.json
new file mode 100644
index 0000000..2b75473
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/howler/package.json
@@ -0,0 +1,73 @@
+{
+  "_from": "howler@^2.2.3",
+  "_id": "howler@2.2.4",
+  "_inBundle": false,
+  "_integrity": "sha512-iARIBPgcQrwtEr+tALF+rapJ8qSc+Set2GJQl7xT1MQzWaVkFebdJhR3alVlSiUf5U7nAANKuj3aWpwerocD5w==",
+  "_location": "/howler",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "howler@^2.2.3",
+    "name": "howler",
+    "escapedName": "howler",
+    "rawSpec": "^2.2.3",
+    "saveSpec": null,
+    "fetchSpec": "^2.2.3"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmmirror.com/howler/-/howler-2.2.4.tgz",
+  "_shasum": "bd3df4a4f68a0118a51e4bd84a2bfc2e93e6e5a1",
+  "_spec": "howler@^2.2.3",
+  "_where": "C:\\Users\\pc\\Documents\\HBuilderProjects\\Sapp\\uni_modules\\c-svga",
+  "author": {
+    "name": "James Simpson",
+    "email": "james@goldfirestudios.com",
+    "url": "http://goldfirestudios.com"
+  },
+  "bugs": {
+    "url": "https://github.com/goldfire/howler.js/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "Javascript audio library for the modern web.",
+  "devDependencies": {
+    "uglify-js": "2.x"
+  },
+  "files": [
+    "src",
+    "dist/howler.js",
+    "dist/howler.min.js",
+    "dist/howler.core.min.js",
+    "dist/howler.spatial.min.js",
+    "LICENSE.md"
+  ],
+  "homepage": "https://howlerjs.com",
+  "keywords": [
+    "howler",
+    "howler.js",
+    "audio",
+    "sound",
+    "web audio",
+    "webaudio",
+    "browser",
+    "html5",
+    "html5 audio",
+    "audio sprite",
+    "audiosprite"
+  ],
+  "license": "MIT",
+  "main": "dist/howler.js",
+  "name": "howler",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/goldfire/howler.js.git"
+  },
+  "scripts": {
+    "build": "VERSION=`printf 'v' && node -e 'console.log(require(\"./package.json\").version)'` && sed -i '' '2s/.*/ *  howler.js '\"$VERSION\"'/' src/howler.core.js && sed -i '' '4s/.*/ *  howler.js '\"$VERSION\"'/' src/plugins/howler.spatial.js && uglifyjs --preamble \"/*! howler.js $VERSION | (c) 2013-2020, James Simpson of GoldFire Studios | MIT License | howlerjs.com */\" src/howler.core.js -c -m --screw-ie8 -o dist/howler.core.min.js && uglifyjs --preamble \"/*! howler.js $VERSION | Spatial Plugin | (c) 2013-2020, James Simpson of GoldFire Studios | MIT License | howlerjs.com */\" src/plugins/howler.spatial.js -c -m --screw-ie8 -o dist/howler.spatial.min.js && awk 'FNR==1{echo \"\"}1' dist/howler.core.min.js dist/howler.spatial.min.js | sed '3s~.*~/*! Spatial Plugin */~' | perl -pe 'chomp if eof' > dist/howler.min.js && awk '(NR>1 && FNR==1){printf (\"\\n\\n\")};1' src/howler.core.js src/plugins/howler.spatial.js > dist/howler.js",
+    "release": "VERSION=`printf 'v' && node -e 'console.log(require(\"./package.json\").version)'` && git tag $VERSION && git push && git push origin $VERSION && npm publish"
+  },
+  "version": "2.2.4"
+}
diff --git a/uni_modules/c-svga/node_modules/howler/src/howler.core.js b/uni_modules/c-svga/node_modules/howler/src/howler.core.js
new file mode 100644
index 0000000..5198bdf
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/howler/src/howler.core.js
@@ -0,0 +1,2587 @@
+/*!
+ *  howler.js v2.2.4
+ *  howlerjs.com
+ *
+ *  (c) 2013-2020, James Simpson of GoldFire Studios
+ *  goldfirestudios.com
+ *
+ *  MIT License
+ */
+
+(function() {
+
+  'use strict';
+
+  /** Global Methods **/
+  /***************************************************************************/
+
+  /**
+   * Create the global controller. All contained methods and properties apply
+   * to all sounds that are currently playing or will be in the future.
+   */
+  var HowlerGlobal = function() {
+    this.init();
+  };
+  HowlerGlobal.prototype = {
+    /**
+     * Initialize the global Howler object.
+     * @return {Howler}
+     */
+    init: function() {
+      var self = this || Howler;
+
+      // Create a global ID counter.
+      self._counter = 1000;
+
+      // Pool of unlocked HTML5 Audio objects.
+      self._html5AudioPool = [];
+      self.html5PoolSize = 10;
+
+      // Internal properties.
+      self._codecs = {};
+      self._howls = [];
+      self._muted = false;
+      self._volume = 1;
+      self._canPlayEvent = 'canplaythrough';
+      self._navigator = (typeof window !== 'undefined' && window.navigator) ? window.navigator : null;
+
+      // Public properties.
+      self.masterGain = null;
+      self.noAudio = false;
+      self.usingWebAudio = true;
+      self.autoSuspend = true;
+      self.ctx = null;
+
+      // Set to false to disable the auto audio unlocker.
+      self.autoUnlock = true;
+
+      // Setup the various state values for global tracking.
+      self._setup();
+
+      return self;
+    },
+
+    /**
+     * Get/set the global volume for all sounds.
+     * @param  {Float} vol Volume from 0.0 to 1.0.
+     * @return {Howler/Float}     Returns self or current volume.
+     */
+    volume: function(vol) {
+      var self = this || Howler;
+      vol = parseFloat(vol);
+
+      // If we don't have an AudioContext created yet, run the setup.
+      if (!self.ctx) {
+        setupAudioContext();
+      }
+
+      if (typeof vol !== 'undefined' && vol >= 0 && vol <= 1) {
+        self._volume = vol;
+
+        // Don't update any of the nodes if we are muted.
+        if (self._muted) {
+          return self;
+        }
+
+        // When using Web Audio, we just need to adjust the master gain.
+        if (self.usingWebAudio) {
+          self.masterGain.gain.setValueAtTime(vol, Howler.ctx.currentTime);
+        }
+
+        // Loop through and change volume for all HTML5 audio nodes.
+        for (var i=0; i<self._howls.length; i++) {
+          if (!self._howls[i]._webAudio) {
+            // Get all of the sounds in this Howl group.
+            var ids = self._howls[i]._getSoundIds();
+
+            // Loop through all sounds and change the volumes.
+            for (var j=0; j<ids.length; j++) {
+              var sound = self._howls[i]._soundById(ids[j]);
+
+              if (sound && sound._node) {
+                sound._node.volume = sound._volume * vol;
+              }
+            }
+          }
+        }
+
+        return self;
+      }
+
+      return self._volume;
+    },
+
+    /**
+     * Handle muting and unmuting globally.
+     * @param  {Boolean} muted Is muted or not.
+     */
+    mute: function(muted) {
+      var self = this || Howler;
+
+      // If we don't have an AudioContext created yet, run the setup.
+      if (!self.ctx) {
+        setupAudioContext();
+      }
+
+      self._muted = muted;
+
+      // With Web Audio, we just need to mute the master gain.
+      if (self.usingWebAudio) {
+        self.masterGain.gain.setValueAtTime(muted ? 0 : self._volume, Howler.ctx.currentTime);
+      }
+
+      // Loop through and mute all HTML5 Audio nodes.
+      for (var i=0; i<self._howls.length; i++) {
+        if (!self._howls[i]._webAudio) {
+          // Get all of the sounds in this Howl group.
+          var ids = self._howls[i]._getSoundIds();
+
+          // Loop through all sounds and mark the audio node as muted.
+          for (var j=0; j<ids.length; j++) {
+            var sound = self._howls[i]._soundById(ids[j]);
+
+            if (sound && sound._node) {
+              sound._node.muted = (muted) ? true : sound._muted;
+            }
+          }
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Handle stopping all sounds globally.
+     */
+    stop: function() {
+      var self = this || Howler;
+
+      // Loop through all Howls and stop them.
+      for (var i=0; i<self._howls.length; i++) {
+        self._howls[i].stop();
+      }
+
+      return self;
+    },
+
+    /**
+     * Unload and destroy all currently loaded Howl objects.
+     * @return {Howler}
+     */
+    unload: function() {
+      var self = this || Howler;
+
+      for (var i=self._howls.length-1; i>=0; i--) {
+        self._howls[i].unload();
+      }
+
+      // Create a new AudioContext to make sure it is fully reset.
+      if (self.usingWebAudio && self.ctx && typeof self.ctx.close !== 'undefined') {
+        self.ctx.close();
+        self.ctx = null;
+        setupAudioContext();
+      }
+
+      return self;
+    },
+
+    /**
+     * Check for codec support of specific extension.
+     * @param  {String} ext Audio file extention.
+     * @return {Boolean}
+     */
+    codecs: function(ext) {
+      return (this || Howler)._codecs[ext.replace(/^x-/, '')];
+    },
+
+    /**
+     * Setup various state values for global tracking.
+     * @return {Howler}
+     */
+    _setup: function() {
+      var self = this || Howler;
+
+      // Keeps track of the suspend/resume state of the AudioContext.
+      self.state = self.ctx ? self.ctx.state || 'suspended' : 'suspended';
+
+      // Automatically begin the 30-second suspend process
+      self._autoSuspend();
+
+      // Check if audio is available.
+      if (!self.usingWebAudio) {
+        // No audio is available on this system if noAudio is set to true.
+        if (typeof Audio !== 'undefined') {
+          try {
+            var test = new Audio();
+
+            // Check if the canplaythrough event is available.
+            if (typeof test.oncanplaythrough === 'undefined') {
+              self._canPlayEvent = 'canplay';
+            }
+          } catch(e) {
+            self.noAudio = true;
+          }
+        } else {
+          self.noAudio = true;
+        }
+      }
+
+      // Test to make sure audio isn't disabled in Internet Explorer.
+      try {
+        var test = new Audio();
+        if (test.muted) {
+          self.noAudio = true;
+        }
+      } catch (e) {}
+
+      // Check for supported codecs.
+      if (!self.noAudio) {
+        self._setupCodecs();
+      }
+
+      return self;
+    },
+
+    /**
+     * Check for browser support for various codecs and cache the results.
+     * @return {Howler}
+     */
+    _setupCodecs: function() {
+      var self = this || Howler;
+      var audioTest = null;
+
+      // Must wrap in a try/catch because IE11 in server mode throws an error.
+      try {
+        audioTest = (typeof Audio !== 'undefined') ? new Audio() : null;
+      } catch (err) {
+        return self;
+      }
+
+      if (!audioTest || typeof audioTest.canPlayType !== 'function') {
+        return self;
+      }
+
+      var mpegTest = audioTest.canPlayType('audio/mpeg;').replace(/^no$/, '');
+
+      // Opera version <33 has mixed MP3 support, so we need to check for and block it.
+      var ua = self._navigator ? self._navigator.userAgent : '';
+      var checkOpera = ua.match(/OPR\/(\d+)/g);
+      var isOldOpera = (checkOpera && parseInt(checkOpera[0].split('/')[1], 10) < 33);
+      var checkSafari = ua.indexOf('Safari') !== -1 && ua.indexOf('Chrome') === -1;
+      var safariVersion = ua.match(/Version\/(.*?) /);
+      var isOldSafari = (checkSafari && safariVersion && parseInt(safariVersion[1], 10) < 15);
+
+      self._codecs = {
+        mp3: !!(!isOldOpera && (mpegTest || audioTest.canPlayType('audio/mp3;').replace(/^no$/, ''))),
+        mpeg: !!mpegTest,
+        opus: !!audioTest.canPlayType('audio/ogg; codecs="opus"').replace(/^no$/, ''),
+        ogg: !!audioTest.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/, ''),
+        oga: !!audioTest.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/, ''),
+        wav: !!(audioTest.canPlayType('audio/wav; codecs="1"') || audioTest.canPlayType('audio/wav')).replace(/^no$/, ''),
+        aac: !!audioTest.canPlayType('audio/aac;').replace(/^no$/, ''),
+        caf: !!audioTest.canPlayType('audio/x-caf;').replace(/^no$/, ''),
+        m4a: !!(audioTest.canPlayType('audio/x-m4a;') || audioTest.canPlayType('audio/m4a;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''),
+        m4b: !!(audioTest.canPlayType('audio/x-m4b;') || audioTest.canPlayType('audio/m4b;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''),
+        mp4: !!(audioTest.canPlayType('audio/x-mp4;') || audioTest.canPlayType('audio/mp4;') || audioTest.canPlayType('audio/aac;')).replace(/^no$/, ''),
+        weba: !!(!isOldSafari && audioTest.canPlayType('audio/webm; codecs="vorbis"').replace(/^no$/, '')),
+        webm: !!(!isOldSafari && audioTest.canPlayType('audio/webm; codecs="vorbis"').replace(/^no$/, '')),
+        dolby: !!audioTest.canPlayType('audio/mp4; codecs="ec-3"').replace(/^no$/, ''),
+        flac: !!(audioTest.canPlayType('audio/x-flac;') || audioTest.canPlayType('audio/flac;')).replace(/^no$/, '')
+      };
+
+      return self;
+    },
+
+    /**
+     * Some browsers/devices will only allow audio to be played after a user interaction.
+     * Attempt to automatically unlock audio on the first user interaction.
+     * Concept from: http://paulbakaus.com/tutorials/html5/web-audio-on-ios/
+     * @return {Howler}
+     */
+    _unlockAudio: function() {
+      var self = this || Howler;
+
+      // Only run this if Web Audio is supported and it hasn't already been unlocked.
+      if (self._audioUnlocked || !self.ctx) {
+        return;
+      }
+
+      self._audioUnlocked = false;
+      self.autoUnlock = false;
+
+      // Some mobile devices/platforms have distortion issues when opening/closing tabs and/or web views.
+      // Bugs in the browser (especially Mobile Safari) can cause the sampleRate to change from 44100 to 48000.
+      // By calling Howler.unload(), we create a new AudioContext with the correct sampleRate.
+      if (!self._mobileUnloaded && self.ctx.sampleRate !== 44100) {
+        self._mobileUnloaded = true;
+        self.unload();
+      }
+
+      // Scratch buffer for enabling iOS to dispose of web audio buffers correctly, as per:
+      // http://stackoverflow.com/questions/24119684
+      self._scratchBuffer = self.ctx.createBuffer(1, 1, 22050);
+
+      // Call this method on touch start to create and play a buffer,
+      // then check if the audio actually played to determine if
+      // audio has now been unlocked on iOS, Android, etc.
+      var unlock = function(e) {
+        // Create a pool of unlocked HTML5 Audio objects that can
+        // be used for playing sounds without user interaction. HTML5
+        // Audio objects must be individually unlocked, as opposed
+        // to the WebAudio API which only needs a single activation.
+        // This must occur before WebAudio setup or the source.onended
+        // event will not fire.
+        while (self._html5AudioPool.length < self.html5PoolSize) {
+          try {
+            var audioNode = new Audio();
+
+            // Mark this Audio object as unlocked to ensure it can get returned
+            // to the unlocked pool when released.
+            audioNode._unlocked = true;
+
+            // Add the audio node to the pool.
+            self._releaseHtml5Audio(audioNode);
+          } catch (e) {
+            self.noAudio = true;
+            break;
+          }
+        }
+
+        // Loop through any assigned audio nodes and unlock them.
+        for (var i=0; i<self._howls.length; i++) {
+          if (!self._howls[i]._webAudio) {
+            // Get all of the sounds in this Howl group.
+            var ids = self._howls[i]._getSoundIds();
+
+            // Loop through all sounds and unlock the audio nodes.
+            for (var j=0; j<ids.length; j++) {
+              var sound = self._howls[i]._soundById(ids[j]);
+
+              if (sound && sound._node && !sound._node._unlocked) {
+                sound._node._unlocked = true;
+                sound._node.load();
+              }
+            }
+          }
+        }
+
+        // Fix Android can not play in suspend state.
+        self._autoResume();
+
+        // Create an empty buffer.
+        var source = self.ctx.createBufferSource();
+        source.buffer = self._scratchBuffer;
+        source.connect(self.ctx.destination);
+
+        // Play the empty buffer.
+        if (typeof source.start === 'undefined') {
+          source.noteOn(0);
+        } else {
+          source.start(0);
+        }
+
+        // Calling resume() on a stack initiated by user gesture is what actually unlocks the audio on Android Chrome >= 55.
+        if (typeof self.ctx.resume === 'function') {
+          self.ctx.resume();
+        }
+
+        // Setup a timeout to check that we are unlocked on the next event loop.
+        source.onended = function() {
+          source.disconnect(0);
+
+          // Update the unlocked state and prevent this check from happening again.
+          self._audioUnlocked = true;
+
+          // Remove the touch start listener.
+          document.removeEventListener('touchstart', unlock, true);
+          document.removeEventListener('touchend', unlock, true);
+          document.removeEventListener('click', unlock, true);
+          document.removeEventListener('keydown', unlock, true);
+
+          // Let all sounds know that audio has been unlocked.
+          for (var i=0; i<self._howls.length; i++) {
+            self._howls[i]._emit('unlock');
+          }
+        };
+      };
+
+      // Setup a touch start listener to attempt an unlock in.
+      document.addEventListener('touchstart', unlock, true);
+      document.addEventListener('touchend', unlock, true);
+      document.addEventListener('click', unlock, true);
+      document.addEventListener('keydown', unlock, true);
+
+      return self;
+    },
+
+    /**
+     * Get an unlocked HTML5 Audio object from the pool. If none are left,
+     * return a new Audio object and throw a warning.
+     * @return {Audio} HTML5 Audio object.
+     */
+    _obtainHtml5Audio: function() {
+      var self = this || Howler;
+
+      // Return the next object from the pool if one exists.
+      if (self._html5AudioPool.length) {
+        return self._html5AudioPool.pop();
+      }
+
+      //.Check if the audio is locked and throw a warning.
+      var testPlay = new Audio().play();
+      if (testPlay && typeof Promise !== 'undefined' && (testPlay instanceof Promise || typeof testPlay.then === 'function')) {
+        testPlay.catch(function() {
+          console.warn('HTML5 Audio pool exhausted, returning potentially locked audio object.');
+        });
+      }
+
+      return new Audio();
+    },
+
+    /**
+     * Return an activated HTML5 Audio object to the pool.
+     * @return {Howler}
+     */
+    _releaseHtml5Audio: function(audio) {
+      var self = this || Howler;
+
+      // Don't add audio to the pool if we don't know if it has been unlocked.
+      if (audio._unlocked) {
+        self._html5AudioPool.push(audio);
+      }
+
+      return self;
+    },
+
+    /**
+     * Automatically suspend the Web Audio AudioContext after no sound has played for 30 seconds.
+     * This saves processing/energy and fixes various browser-specific bugs with audio getting stuck.
+     * @return {Howler}
+     */
+    _autoSuspend: function() {
+      var self = this;
+
+      if (!self.autoSuspend || !self.ctx || typeof self.ctx.suspend === 'undefined' || !Howler.usingWebAudio) {
+        return;
+      }
+
+      // Check if any sounds are playing.
+      for (var i=0; i<self._howls.length; i++) {
+        if (self._howls[i]._webAudio) {
+          for (var j=0; j<self._howls[i]._sounds.length; j++) {
+            if (!self._howls[i]._sounds[j]._paused) {
+              return self;
+            }
+          }
+        }
+      }
+
+      if (self._suspendTimer) {
+        clearTimeout(self._suspendTimer);
+      }
+
+      // If no sound has played after 30 seconds, suspend the context.
+      self._suspendTimer = setTimeout(function() {
+        if (!self.autoSuspend) {
+          return;
+        }
+
+        self._suspendTimer = null;
+        self.state = 'suspending';
+
+        // Handle updating the state of the audio context after suspending.
+        var handleSuspension = function() {
+          self.state = 'suspended';
+
+          if (self._resumeAfterSuspend) {
+            delete self._resumeAfterSuspend;
+            self._autoResume();
+          }
+        };
+
+        // Either the state gets suspended or it is interrupted.
+        // Either way, we need to update the state to suspended.
+        self.ctx.suspend().then(handleSuspension, handleSuspension);
+      }, 30000);
+
+      return self;
+    },
+
+    /**
+     * Automatically resume the Web Audio AudioContext when a new sound is played.
+     * @return {Howler}
+     */
+    _autoResume: function() {
+      var self = this;
+
+      if (!self.ctx || typeof self.ctx.resume === 'undefined' || !Howler.usingWebAudio) {
+        return;
+      }
+
+      if (self.state === 'running' && self.ctx.state !== 'interrupted' && self._suspendTimer) {
+        clearTimeout(self._suspendTimer);
+        self._suspendTimer = null;
+      } else if (self.state === 'suspended' || self.state === 'running' && self.ctx.state === 'interrupted') {
+        self.ctx.resume().then(function() {
+          self.state = 'running';
+
+          // Emit to all Howls that the audio has resumed.
+          for (var i=0; i<self._howls.length; i++) {
+            self._howls[i]._emit('resume');
+          }
+        });
+
+        if (self._suspendTimer) {
+          clearTimeout(self._suspendTimer);
+          self._suspendTimer = null;
+        }
+      } else if (self.state === 'suspending') {
+        self._resumeAfterSuspend = true;
+      }
+
+      return self;
+    }
+  };
+
+  // Setup the global audio controller.
+  var Howler = new HowlerGlobal();
+
+  /** Group Methods **/
+  /***************************************************************************/
+
+  /**
+   * Create an audio group controller.
+   * @param {Object} o Passed in properties for this group.
+   */
+  var Howl = function(o) {
+    var self = this;
+
+    // Throw an error if no source is provided.
+    if (!o.src || o.src.length === 0) {
+      console.error('An array of source files must be passed with any new Howl.');
+      return;
+    }
+
+    self.init(o);
+  };
+  Howl.prototype = {
+    /**
+     * Initialize a new Howl group object.
+     * @param  {Object} o Passed in properties for this group.
+     * @return {Howl}
+     */
+    init: function(o) {
+      var self = this;
+
+      // If we don't have an AudioContext created yet, run the setup.
+      if (!Howler.ctx) {
+        setupAudioContext();
+      }
+
+      // Setup user-defined default properties.
+      self._autoplay = o.autoplay || false;
+      self._format = (typeof o.format !== 'string') ? o.format : [o.format];
+      self._html5 = o.html5 || false;
+      self._muted = o.mute || false;
+      self._loop = o.loop || false;
+      self._pool = o.pool || 5;
+      self._preload = (typeof o.preload === 'boolean' || o.preload === 'metadata') ? o.preload : true;
+      self._rate = o.rate || 1;
+      self._sprite = o.sprite || {};
+      self._src = (typeof o.src !== 'string') ? o.src : [o.src];
+      self._volume = o.volume !== undefined ? o.volume : 1;
+      self._xhr = {
+        method: o.xhr && o.xhr.method ? o.xhr.method : 'GET',
+        headers: o.xhr && o.xhr.headers ? o.xhr.headers : null,
+        withCredentials: o.xhr && o.xhr.withCredentials ? o.xhr.withCredentials : false,
+      };
+
+      // Setup all other default properties.
+      self._duration = 0;
+      self._state = 'unloaded';
+      self._sounds = [];
+      self._endTimers = {};
+      self._queue = [];
+      self._playLock = false;
+
+      // Setup event listeners.
+      self._onend = o.onend ? [{fn: o.onend}] : [];
+      self._onfade = o.onfade ? [{fn: o.onfade}] : [];
+      self._onload = o.onload ? [{fn: o.onload}] : [];
+      self._onloaderror = o.onloaderror ? [{fn: o.onloaderror}] : [];
+      self._onplayerror = o.onplayerror ? [{fn: o.onplayerror}] : [];
+      self._onpause = o.onpause ? [{fn: o.onpause}] : [];
+      self._onplay = o.onplay ? [{fn: o.onplay}] : [];
+      self._onstop = o.onstop ? [{fn: o.onstop}] : [];
+      self._onmute = o.onmute ? [{fn: o.onmute}] : [];
+      self._onvolume = o.onvolume ? [{fn: o.onvolume}] : [];
+      self._onrate = o.onrate ? [{fn: o.onrate}] : [];
+      self._onseek = o.onseek ? [{fn: o.onseek}] : [];
+      self._onunlock = o.onunlock ? [{fn: o.onunlock}] : [];
+      self._onresume = [];
+
+      // Web Audio or HTML5 Audio?
+      self._webAudio = Howler.usingWebAudio && !self._html5;
+
+      // Automatically try to enable audio.
+      if (typeof Howler.ctx !== 'undefined' && Howler.ctx && Howler.autoUnlock) {
+        Howler._unlockAudio();
+      }
+
+      // Keep track of this Howl group in the global controller.
+      Howler._howls.push(self);
+
+      // If they selected autoplay, add a play event to the load queue.
+      if (self._autoplay) {
+        self._queue.push({
+          event: 'play',
+          action: function() {
+            self.play();
+          }
+        });
+      }
+
+      // Load the source file unless otherwise specified.
+      if (self._preload && self._preload !== 'none') {
+        self.load();
+      }
+
+      return self;
+    },
+
+    /**
+     * Load the audio file.
+     * @return {Howler}
+     */
+    load: function() {
+      var self = this;
+      var url = null;
+
+      // If no audio is available, quit immediately.
+      if (Howler.noAudio) {
+        self._emit('loaderror', null, 'No audio support.');
+        return;
+      }
+
+      // Make sure our source is in an array.
+      if (typeof self._src === 'string') {
+        self._src = [self._src];
+      }
+
+      // Loop through the sources and pick the first one that is compatible.
+      for (var i=0; i<self._src.length; i++) {
+        var ext, str;
+
+        if (self._format && self._format[i]) {
+          // If an extension was specified, use that instead.
+          ext = self._format[i];
+        } else {
+          // Make sure the source is a string.
+          str = self._src[i];
+          if (typeof str !== 'string') {
+            self._emit('loaderror', null, 'Non-string found in selected audio sources - ignoring.');
+            continue;
+          }
+
+          // Extract the file extension from the URL or base64 data URI.
+          ext = /^data:audio\/([^;,]+);/i.exec(str);
+          if (!ext) {
+            ext = /\.([^.]+)$/.exec(str.split('?', 1)[0]);
+          }
+
+          if (ext) {
+            ext = ext[1].toLowerCase();
+          }
+        }
+
+        // Log a warning if no extension was found.
+        if (!ext) {
+          console.warn('No file extension was found. Consider using the "format" property or specify an extension.');
+        }
+
+        // Check if this extension is available.
+        if (ext && Howler.codecs(ext)) {
+          url = self._src[i];
+          break;
+        }
+      }
+
+      if (!url) {
+        self._emit('loaderror', null, 'No codec support for selected audio sources.');
+        return;
+      }
+
+      self._src = url;
+      self._state = 'loading';
+
+      // If the hosting page is HTTPS and the source isn't,
+      // drop down to HTML5 Audio to avoid Mixed Content errors.
+      if (window.location.protocol === 'https:' && url.slice(0, 5) === 'http:') {
+        self._html5 = true;
+        self._webAudio = false;
+      }
+
+      // Create a new sound object and add it to the pool.
+      new Sound(self);
+
+      // Load and decode the audio data for playback.
+      if (self._webAudio) {
+        loadBuffer(self);
+      }
+
+      return self;
+    },
+
+    /**
+     * Play a sound or resume previous playback.
+     * @param  {String/Number} sprite   Sprite name for sprite playback or sound id to continue previous.
+     * @param  {Boolean} internal Internal Use: true prevents event firing.
+     * @return {Number}          Sound ID.
+     */
+    play: function(sprite, internal) {
+      var self = this;
+      var id = null;
+
+      // Determine if a sprite, sound id or nothing was passed
+      if (typeof sprite === 'number') {
+        id = sprite;
+        sprite = null;
+      } else if (typeof sprite === 'string' && self._state === 'loaded' && !self._sprite[sprite]) {
+        // If the passed sprite doesn't exist, do nothing.
+        return null;
+      } else if (typeof sprite === 'undefined') {
+        // Use the default sound sprite (plays the full audio length).
+        sprite = '__default';
+
+        // Check if there is a single paused sound that isn't ended.
+        // If there is, play that sound. If not, continue as usual.
+        if (!self._playLock) {
+          var num = 0;
+          for (var i=0; i<self._sounds.length; i++) {
+            if (self._sounds[i]._paused && !self._sounds[i]._ended) {
+              num++;
+              id = self._sounds[i]._id;
+            }
+          }
+
+          if (num === 1) {
+            sprite = null;
+          } else {
+            id = null;
+          }
+        }
+      }
+
+      // Get the selected node, or get one from the pool.
+      var sound = id ? self._soundById(id) : self._inactiveSound();
+
+      // If the sound doesn't exist, do nothing.
+      if (!sound) {
+        return null;
+      }
+
+      // Select the sprite definition.
+      if (id && !sprite) {
+        sprite = sound._sprite || '__default';
+      }
+
+      // If the sound hasn't loaded, we must wait to get the audio's duration.
+      // We also need to wait to make sure we don't run into race conditions with
+      // the order of function calls.
+      if (self._state !== 'loaded') {
+        // Set the sprite value on this sound.
+        sound._sprite = sprite;
+
+        // Mark this sound as not ended in case another sound is played before this one loads.
+        sound._ended = false;
+
+        // Add the sound to the queue to be played on load.
+        var soundId = sound._id;
+        self._queue.push({
+          event: 'play',
+          action: function() {
+            self.play(soundId);
+          }
+        });
+
+        return soundId;
+      }
+
+      // Don't play the sound if an id was passed and it is already playing.
+      if (id && !sound._paused) {
+        // Trigger the play event, in order to keep iterating through queue.
+        if (!internal) {
+          self._loadQueue('play');
+        }
+
+        return sound._id;
+      }
+
+      // Make sure the AudioContext isn't suspended, and resume it if it is.
+      if (self._webAudio) {
+        Howler._autoResume();
+      }
+
+      // Determine how long to play for and where to start playing.
+      var seek = Math.max(0, sound._seek > 0 ? sound._seek : self._sprite[sprite][0] / 1000);
+      var duration = Math.max(0, ((self._sprite[sprite][0] + self._sprite[sprite][1]) / 1000) - seek);
+      var timeout = (duration * 1000) / Math.abs(sound._rate);
+      var start = self._sprite[sprite][0] / 1000;
+      var stop = (self._sprite[sprite][0] + self._sprite[sprite][1]) / 1000;
+      sound._sprite = sprite;
+
+      // Mark the sound as ended instantly so that this async playback
+      // doesn't get grabbed by another call to play while this one waits to start.
+      sound._ended = false;
+
+      // Update the parameters of the sound.
+      var setParams = function() {
+        sound._paused = false;
+        sound._seek = seek;
+        sound._start = start;
+        sound._stop = stop;
+        sound._loop = !!(sound._loop || self._sprite[sprite][2]);
+      };
+
+      // End the sound instantly if seek is at the end.
+      if (seek >= stop) {
+        self._ended(sound);
+        return;
+      }
+
+      // Begin the actual playback.
+      var node = sound._node;
+      if (self._webAudio) {
+        // Fire this when the sound is ready to play to begin Web Audio playback.
+        var playWebAudio = function() {
+          self._playLock = false;
+          setParams();
+          self._refreshBuffer(sound);
+
+          // Setup the playback params.
+          var vol = (sound._muted || self._muted) ? 0 : sound._volume;
+          node.gain.setValueAtTime(vol, Howler.ctx.currentTime);
+          sound._playStart = Howler.ctx.currentTime;
+
+          // Play the sound using the supported method.
+          if (typeof node.bufferSource.start === 'undefined') {
+            sound._loop ? node.bufferSource.noteGrainOn(0, seek, 86400) : node.bufferSource.noteGrainOn(0, seek, duration);
+          } else {
+            sound._loop ? node.bufferSource.start(0, seek, 86400) : node.bufferSource.start(0, seek, duration);
+          }
+
+          // Start a new timer if none is present.
+          if (timeout !== Infinity) {
+            self._endTimers[sound._id] = setTimeout(self._ended.bind(self, sound), timeout);
+          }
+
+          if (!internal) {
+            setTimeout(function() {
+              self._emit('play', sound._id);
+              self._loadQueue();
+            }, 0);
+          }
+        };
+
+        if (Howler.state === 'running' && Howler.ctx.state !== 'interrupted') {
+          playWebAudio();
+        } else {
+          self._playLock = true;
+
+          // Wait for the audio context to resume before playing.
+          self.once('resume', playWebAudio);
+
+          // Cancel the end timer.
+          self._clearTimer(sound._id);
+        }
+      } else {
+        // Fire this when the sound is ready to play to begin HTML5 Audio playback.
+        var playHtml5 = function() {
+          node.currentTime = seek;
+          node.muted = sound._muted || self._muted || Howler._muted || node.muted;
+          node.volume = sound._volume * Howler.volume();
+          node.playbackRate = sound._rate;
+
+          // Some browsers will throw an error if this is called without user interaction.
+          try {
+            var play = node.play();
+
+            // Support older browsers that don't support promises, and thus don't have this issue.
+            if (play && typeof Promise !== 'undefined' && (play instanceof Promise || typeof play.then === 'function')) {
+              // Implements a lock to prevent DOMException: The play() request was interrupted by a call to pause().
+              self._playLock = true;
+
+              // Set param values immediately.
+              setParams();
+
+              // Releases the lock and executes queued actions.
+              play
+                .then(function() {
+                  self._playLock = false;
+                  node._unlocked = true;
+                  if (!internal) {
+                    self._emit('play', sound._id);
+                  } else {
+                    self._loadQueue();
+                  }
+                })
+                .catch(function() {
+                  self._playLock = false;
+                  self._emit('playerror', sound._id, 'Playback was unable to start. This is most commonly an issue ' +
+                    'on mobile devices and Chrome where playback was not within a user interaction.');
+
+                  // Reset the ended and paused values.
+                  sound._ended = true;
+                  sound._paused = true;
+                });
+            } else if (!internal) {
+              self._playLock = false;
+              setParams();
+              self._emit('play', sound._id);
+            }
+
+            // Setting rate before playing won't work in IE, so we set it again here.
+            node.playbackRate = sound._rate;
+
+            // If the node is still paused, then we can assume there was a playback issue.
+            if (node.paused) {
+              self._emit('playerror', sound._id, 'Playback was unable to start. This is most commonly an issue ' +
+                'on mobile devices and Chrome where playback was not within a user interaction.');
+              return;
+            }
+
+            // Setup the end timer on sprites or listen for the ended event.
+            if (sprite !== '__default' || sound._loop) {
+              self._endTimers[sound._id] = setTimeout(self._ended.bind(self, sound), timeout);
+            } else {
+              self._endTimers[sound._id] = function() {
+                // Fire ended on this audio node.
+                self._ended(sound);
+
+                // Clear this listener.
+                node.removeEventListener('ended', self._endTimers[sound._id], false);
+              };
+              node.addEventListener('ended', self._endTimers[sound._id], false);
+            }
+          } catch (err) {
+            self._emit('playerror', sound._id, err);
+          }
+        };
+
+        // If this is streaming audio, make sure the src is set and load again.
+        if (node.src === 'data:audio/wav;base64,UklGRigAAABXQVZFZm10IBIAAAABAAEARKwAAIhYAQACABAAAABkYXRhAgAAAAEA') {
+          node.src = self._src;
+          node.load();
+        }
+
+        // Play immediately if ready, or wait for the 'canplaythrough'e vent.
+        var loadedNoReadyState = (window && window.ejecta) || (!node.readyState && Howler._navigator.isCocoonJS);
+        if (node.readyState >= 3 || loadedNoReadyState) {
+          playHtml5();
+        } else {
+          self._playLock = true;
+          self._state = 'loading';
+
+          var listener = function() {
+            self._state = 'loaded';
+            
+            // Begin playback.
+            playHtml5();
+
+            // Clear this listener.
+            node.removeEventListener(Howler._canPlayEvent, listener, false);
+          };
+          node.addEventListener(Howler._canPlayEvent, listener, false);
+
+          // Cancel the end timer.
+          self._clearTimer(sound._id);
+        }
+      }
+
+      return sound._id;
+    },
+
+    /**
+     * Pause playback and save current position.
+     * @param  {Number} id The sound ID (empty to pause all in group).
+     * @return {Howl}
+     */
+    pause: function(id) {
+      var self = this;
+
+      // If the sound hasn't loaded or a play() promise is pending, add it to the load queue to pause when capable.
+      if (self._state !== 'loaded' || self._playLock) {
+        self._queue.push({
+          event: 'pause',
+          action: function() {
+            self.pause(id);
+          }
+        });
+
+        return self;
+      }
+
+      // If no id is passed, get all ID's to be paused.
+      var ids = self._getSoundIds(id);
+
+      for (var i=0; i<ids.length; i++) {
+        // Clear the end timer.
+        self._clearTimer(ids[i]);
+
+        // Get the sound.
+        var sound = self._soundById(ids[i]);
+
+        if (sound && !sound._paused) {
+          // Reset the seek position.
+          sound._seek = self.seek(ids[i]);
+          sound._rateSeek = 0;
+          sound._paused = true;
+
+          // Stop currently running fades.
+          self._stopFade(ids[i]);
+
+          if (sound._node) {
+            if (self._webAudio) {
+              // Make sure the sound has been created.
+              if (!sound._node.bufferSource) {
+                continue;
+              }
+
+              if (typeof sound._node.bufferSource.stop === 'undefined') {
+                sound._node.bufferSource.noteOff(0);
+              } else {
+                sound._node.bufferSource.stop(0);
+              }
+
+              // Clean up the buffer source.
+              self._cleanBuffer(sound._node);
+            } else if (!isNaN(sound._node.duration) || sound._node.duration === Infinity) {
+              sound._node.pause();
+            }
+          }
+        }
+
+        // Fire the pause event, unless `true` is passed as the 2nd argument.
+        if (!arguments[1]) {
+          self._emit('pause', sound ? sound._id : null);
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Stop playback and reset to start.
+     * @param  {Number} id The sound ID (empty to stop all in group).
+     * @param  {Boolean} internal Internal Use: true prevents event firing.
+     * @return {Howl}
+     */
+    stop: function(id, internal) {
+      var self = this;
+
+      // If the sound hasn't loaded, add it to the load queue to stop when capable.
+      if (self._state !== 'loaded' || self._playLock) {
+        self._queue.push({
+          event: 'stop',
+          action: function() {
+            self.stop(id);
+          }
+        });
+
+        return self;
+      }
+
+      // If no id is passed, get all ID's to be stopped.
+      var ids = self._getSoundIds(id);
+
+      for (var i=0; i<ids.length; i++) {
+        // Clear the end timer.
+        self._clearTimer(ids[i]);
+
+        // Get the sound.
+        var sound = self._soundById(ids[i]);
+
+        if (sound) {
+          // Reset the seek position.
+          sound._seek = sound._start || 0;
+          sound._rateSeek = 0;
+          sound._paused = true;
+          sound._ended = true;
+
+          // Stop currently running fades.
+          self._stopFade(ids[i]);
+
+          if (sound._node) {
+            if (self._webAudio) {
+              // Make sure the sound's AudioBufferSourceNode has been created.
+              if (sound._node.bufferSource) {
+                if (typeof sound._node.bufferSource.stop === 'undefined') {
+                  sound._node.bufferSource.noteOff(0);
+                } else {
+                  sound._node.bufferSource.stop(0);
+                }
+
+                // Clean up the buffer source.
+                self._cleanBuffer(sound._node);
+              }
+            } else if (!isNaN(sound._node.duration) || sound._node.duration === Infinity) {
+              sound._node.currentTime = sound._start || 0;
+              sound._node.pause();
+
+              // If this is a live stream, stop download once the audio is stopped.
+              if (sound._node.duration === Infinity) {
+                self._clearSound(sound._node);
+              }
+            }
+          }
+
+          if (!internal) {
+            self._emit('stop', sound._id);
+          }
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Mute/unmute a single sound or all sounds in this Howl group.
+     * @param  {Boolean} muted Set to true to mute and false to unmute.
+     * @param  {Number} id    The sound ID to update (omit to mute/unmute all).
+     * @return {Howl}
+     */
+    mute: function(muted, id) {
+      var self = this;
+
+      // If the sound hasn't loaded, add it to the load queue to mute when capable.
+      if (self._state !== 'loaded'|| self._playLock) {
+        self._queue.push({
+          event: 'mute',
+          action: function() {
+            self.mute(muted, id);
+          }
+        });
+
+        return self;
+      }
+
+      // If applying mute/unmute to all sounds, update the group's value.
+      if (typeof id === 'undefined') {
+        if (typeof muted === 'boolean') {
+          self._muted = muted;
+        } else {
+          return self._muted;
+        }
+      }
+
+      // If no id is passed, get all ID's to be muted.
+      var ids = self._getSoundIds(id);
+
+      for (var i=0; i<ids.length; i++) {
+        // Get the sound.
+        var sound = self._soundById(ids[i]);
+
+        if (sound) {
+          sound._muted = muted;
+
+          // Cancel active fade and set the volume to the end value.
+          if (sound._interval) {
+            self._stopFade(sound._id);
+          }
+
+          if (self._webAudio && sound._node) {
+            sound._node.gain.setValueAtTime(muted ? 0 : sound._volume, Howler.ctx.currentTime);
+          } else if (sound._node) {
+            sound._node.muted = Howler._muted ? true : muted;
+          }
+
+          self._emit('mute', sound._id);
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Get/set the volume of this sound or of the Howl group. This method can optionally take 0, 1 or 2 arguments.
+     *   volume() -> Returns the group's volume value.
+     *   volume(id) -> Returns the sound id's current volume.
+     *   volume(vol) -> Sets the volume of all sounds in this Howl group.
+     *   volume(vol, id) -> Sets the volume of passed sound id.
+     * @return {Howl/Number} Returns self or current volume.
+     */
+    volume: function() {
+      var self = this;
+      var args = arguments;
+      var vol, id;
+
+      // Determine the values based on arguments.
+      if (args.length === 0) {
+        // Return the value of the groups' volume.
+        return self._volume;
+      } else if (args.length === 1 || args.length === 2 && typeof args[1] === 'undefined') {
+        // First check if this is an ID, and if not, assume it is a new volume.
+        var ids = self._getSoundIds();
+        var index = ids.indexOf(args[0]);
+        if (index >= 0) {
+          id = parseInt(args[0], 10);
+        } else {
+          vol = parseFloat(args[0]);
+        }
+      } else if (args.length >= 2) {
+        vol = parseFloat(args[0]);
+        id = parseInt(args[1], 10);
+      }
+
+      // Update the volume or return the current volume.
+      var sound;
+      if (typeof vol !== 'undefined' && vol >= 0 && vol <= 1) {
+        // If the sound hasn't loaded, add it to the load queue to change volume when capable.
+        if (self._state !== 'loaded'|| self._playLock) {
+          self._queue.push({
+            event: 'volume',
+            action: function() {
+              self.volume.apply(self, args);
+            }
+          });
+
+          return self;
+        }
+
+        // Set the group volume.
+        if (typeof id === 'undefined') {
+          self._volume = vol;
+        }
+
+        // Update one or all volumes.
+        id = self._getSoundIds(id);
+        for (var i=0; i<id.length; i++) {
+          // Get the sound.
+          sound = self._soundById(id[i]);
+
+          if (sound) {
+            sound._volume = vol;
+
+            // Stop currently running fades.
+            if (!args[2]) {
+              self._stopFade(id[i]);
+            }
+
+            if (self._webAudio && sound._node && !sound._muted) {
+              sound._node.gain.setValueAtTime(vol, Howler.ctx.currentTime);
+            } else if (sound._node && !sound._muted) {
+              sound._node.volume = vol * Howler.volume();
+            }
+
+            self._emit('volume', sound._id);
+          }
+        }
+      } else {
+        sound = id ? self._soundById(id) : self._sounds[0];
+        return sound ? sound._volume : 0;
+      }
+
+      return self;
+    },
+
+    /**
+     * Fade a currently playing sound between two volumes (if no id is passed, all sounds will fade).
+     * @param  {Number} from The value to fade from (0.0 to 1.0).
+     * @param  {Number} to   The volume to fade to (0.0 to 1.0).
+     * @param  {Number} len  Time in milliseconds to fade.
+     * @param  {Number} id   The sound id (omit to fade all sounds).
+     * @return {Howl}
+     */
+    fade: function(from, to, len, id) {
+      var self = this;
+
+      // If the sound hasn't loaded, add it to the load queue to fade when capable.
+      if (self._state !== 'loaded' || self._playLock) {
+        self._queue.push({
+          event: 'fade',
+          action: function() {
+            self.fade(from, to, len, id);
+          }
+        });
+
+        return self;
+      }
+
+      // Make sure the to/from/len values are numbers.
+      from = Math.min(Math.max(0, parseFloat(from)), 1);
+      to = Math.min(Math.max(0, parseFloat(to)), 1);
+      len = parseFloat(len);
+
+      // Set the volume to the start position.
+      self.volume(from, id);
+
+      // Fade the volume of one or all sounds.
+      var ids = self._getSoundIds(id);
+      for (var i=0; i<ids.length; i++) {
+        // Get the sound.
+        var sound = self._soundById(ids[i]);
+
+        // Create a linear fade or fall back to timeouts with HTML5 Audio.
+        if (sound) {
+          // Stop the previous fade if no sprite is being used (otherwise, volume handles this).
+          if (!id) {
+            self._stopFade(ids[i]);
+          }
+
+          // If we are using Web Audio, let the native methods do the actual fade.
+          if (self._webAudio && !sound._muted) {
+            var currentTime = Howler.ctx.currentTime;
+            var end = currentTime + (len / 1000);
+            sound._volume = from;
+            sound._node.gain.setValueAtTime(from, currentTime);
+            sound._node.gain.linearRampToValueAtTime(to, end);
+          }
+
+          self._startFadeInterval(sound, from, to, len, ids[i], typeof id === 'undefined');
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Starts the internal interval to fade a sound.
+     * @param  {Object} sound Reference to sound to fade.
+     * @param  {Number} from The value to fade from (0.0 to 1.0).
+     * @param  {Number} to   The volume to fade to (0.0 to 1.0).
+     * @param  {Number} len  Time in milliseconds to fade.
+     * @param  {Number} id   The sound id to fade.
+     * @param  {Boolean} isGroup   If true, set the volume on the group.
+     */
+    _startFadeInterval: function(sound, from, to, len, id, isGroup) {
+      var self = this;
+      var vol = from;
+      var diff = to - from;
+      var steps = Math.abs(diff / 0.01);
+      var stepLen = Math.max(4, (steps > 0) ? len / steps : len);
+      var lastTick = Date.now();
+
+      // Store the value being faded to.
+      sound._fadeTo = to;
+
+      // Update the volume value on each interval tick.
+      sound._interval = setInterval(function() {
+        // Update the volume based on the time since the last tick.
+        var tick = (Date.now() - lastTick) / len;
+        lastTick = Date.now();
+        vol += diff * tick;
+
+        // Round to within 2 decimal points.
+        vol = Math.round(vol * 100) / 100;
+
+        // Make sure the volume is in the right bounds.
+        if (diff < 0) {
+          vol = Math.max(to, vol);
+        } else {
+          vol = Math.min(to, vol);
+        }
+
+        // Change the volume.
+        if (self._webAudio) {
+          sound._volume = vol;
+        } else {
+          self.volume(vol, sound._id, true);
+        }
+
+        // Set the group's volume.
+        if (isGroup) {
+          self._volume = vol;
+        }
+
+        // When the fade is complete, stop it and fire event.
+        if ((to < from && vol <= to) || (to > from && vol >= to)) {
+          clearInterval(sound._interval);
+          sound._interval = null;
+          sound._fadeTo = null;
+          self.volume(to, sound._id);
+          self._emit('fade', sound._id);
+        }
+      }, stepLen);
+    },
+
+    /**
+     * Internal method that stops the currently playing fade when
+     * a new fade starts, volume is changed or the sound is stopped.
+     * @param  {Number} id The sound id.
+     * @return {Howl}
+     */
+    _stopFade: function(id) {
+      var self = this;
+      var sound = self._soundById(id);
+
+      if (sound && sound._interval) {
+        if (self._webAudio) {
+          sound._node.gain.cancelScheduledValues(Howler.ctx.currentTime);
+        }
+
+        clearInterval(sound._interval);
+        sound._interval = null;
+        self.volume(sound._fadeTo, id);
+        sound._fadeTo = null;
+        self._emit('fade', id);
+      }
+
+      return self;
+    },
+
+    /**
+     * Get/set the loop parameter on a sound. This method can optionally take 0, 1 or 2 arguments.
+     *   loop() -> Returns the group's loop value.
+     *   loop(id) -> Returns the sound id's loop value.
+     *   loop(loop) -> Sets the loop value for all sounds in this Howl group.
+     *   loop(loop, id) -> Sets the loop value of passed sound id.
+     * @return {Howl/Boolean} Returns self or current loop value.
+     */
+    loop: function() {
+      var self = this;
+      var args = arguments;
+      var loop, id, sound;
+
+      // Determine the values for loop and id.
+      if (args.length === 0) {
+        // Return the grou's loop value.
+        return self._loop;
+      } else if (args.length === 1) {
+        if (typeof args[0] === 'boolean') {
+          loop = args[0];
+          self._loop = loop;
+        } else {
+          // Return this sound's loop value.
+          sound = self._soundById(parseInt(args[0], 10));
+          return sound ? sound._loop : false;
+        }
+      } else if (args.length === 2) {
+        loop = args[0];
+        id = parseInt(args[1], 10);
+      }
+
+      // If no id is passed, get all ID's to be looped.
+      var ids = self._getSoundIds(id);
+      for (var i=0; i<ids.length; i++) {
+        sound = self._soundById(ids[i]);
+
+        if (sound) {
+          sound._loop = loop;
+          if (self._webAudio && sound._node && sound._node.bufferSource) {
+            sound._node.bufferSource.loop = loop;
+            if (loop) {
+              sound._node.bufferSource.loopStart = sound._start || 0;
+              sound._node.bufferSource.loopEnd = sound._stop;
+
+              // If playing, restart playback to ensure looping updates.
+              if (self.playing(ids[i])) {
+                self.pause(ids[i], true);
+                self.play(ids[i], true);
+              }
+            }
+          }
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Get/set the playback rate of a sound. This method can optionally take 0, 1 or 2 arguments.
+     *   rate() -> Returns the first sound node's current playback rate.
+     *   rate(id) -> Returns the sound id's current playback rate.
+     *   rate(rate) -> Sets the playback rate of all sounds in this Howl group.
+     *   rate(rate, id) -> Sets the playback rate of passed sound id.
+     * @return {Howl/Number} Returns self or the current playback rate.
+     */
+    rate: function() {
+      var self = this;
+      var args = arguments;
+      var rate, id;
+
+      // Determine the values based on arguments.
+      if (args.length === 0) {
+        // We will simply return the current rate of the first node.
+        id = self._sounds[0]._id;
+      } else if (args.length === 1) {
+        // First check if this is an ID, and if not, assume it is a new rate value.
+        var ids = self._getSoundIds();
+        var index = ids.indexOf(args[0]);
+        if (index >= 0) {
+          id = parseInt(args[0], 10);
+        } else {
+          rate = parseFloat(args[0]);
+        }
+      } else if (args.length === 2) {
+        rate = parseFloat(args[0]);
+        id = parseInt(args[1], 10);
+      }
+
+      // Update the playback rate or return the current value.
+      var sound;
+      if (typeof rate === 'number') {
+        // If the sound hasn't loaded, add it to the load queue to change playback rate when capable.
+        if (self._state !== 'loaded' || self._playLock) {
+          self._queue.push({
+            event: 'rate',
+            action: function() {
+              self.rate.apply(self, args);
+            }
+          });
+
+          return self;
+        }
+
+        // Set the group rate.
+        if (typeof id === 'undefined') {
+          self._rate = rate;
+        }
+
+        // Update one or all volumes.
+        id = self._getSoundIds(id);
+        for (var i=0; i<id.length; i++) {
+          // Get the sound.
+          sound = self._soundById(id[i]);
+
+          if (sound) {
+            // Keep track of our position when the rate changed and update the playback
+            // start position so we can properly adjust the seek position for time elapsed.
+            if (self.playing(id[i])) {
+              sound._rateSeek = self.seek(id[i]);
+              sound._playStart = self._webAudio ? Howler.ctx.currentTime : sound._playStart;
+            }
+            sound._rate = rate;
+
+            // Change the playback rate.
+            if (self._webAudio && sound._node && sound._node.bufferSource) {
+              sound._node.bufferSource.playbackRate.setValueAtTime(rate, Howler.ctx.currentTime);
+            } else if (sound._node) {
+              sound._node.playbackRate = rate;
+            }
+
+            // Reset the timers.
+            var seek = self.seek(id[i]);
+            var duration = ((self._sprite[sound._sprite][0] + self._sprite[sound._sprite][1]) / 1000) - seek;
+            var timeout = (duration * 1000) / Math.abs(sound._rate);
+
+            // Start a new end timer if sound is already playing.
+            if (self._endTimers[id[i]] || !sound._paused) {
+              self._clearTimer(id[i]);
+              self._endTimers[id[i]] = setTimeout(self._ended.bind(self, sound), timeout);
+            }
+
+            self._emit('rate', sound._id);
+          }
+        }
+      } else {
+        sound = self._soundById(id);
+        return sound ? sound._rate : self._rate;
+      }
+
+      return self;
+    },
+
+    /**
+     * Get/set the seek position of a sound. This method can optionally take 0, 1 or 2 arguments.
+     *   seek() -> Returns the first sound node's current seek position.
+     *   seek(id) -> Returns the sound id's current seek position.
+     *   seek(seek) -> Sets the seek position of the first sound node.
+     *   seek(seek, id) -> Sets the seek position of passed sound id.
+     * @return {Howl/Number} Returns self or the current seek position.
+     */
+    seek: function() {
+      var self = this;
+      var args = arguments;
+      var seek, id;
+
+      // Determine the values based on arguments.
+      if (args.length === 0) {
+        // We will simply return the current position of the first node.
+        if (self._sounds.length) {
+          id = self._sounds[0]._id;
+        }
+      } else if (args.length === 1) {
+        // First check if this is an ID, and if not, assume it is a new seek position.
+        var ids = self._getSoundIds();
+        var index = ids.indexOf(args[0]);
+        if (index >= 0) {
+          id = parseInt(args[0], 10);
+        } else if (self._sounds.length) {
+          id = self._sounds[0]._id;
+          seek = parseFloat(args[0]);
+        }
+      } else if (args.length === 2) {
+        seek = parseFloat(args[0]);
+        id = parseInt(args[1], 10);
+      }
+
+      // If there is no ID, bail out.
+      if (typeof id === 'undefined') {
+        return 0;
+      }
+
+      // If the sound hasn't loaded, add it to the load queue to seek when capable.
+      if (typeof seek === 'number' && (self._state !== 'loaded' || self._playLock)) {
+        self._queue.push({
+          event: 'seek',
+          action: function() {
+            self.seek.apply(self, args);
+          }
+        });
+
+        return self;
+      }
+
+      // Get the sound.
+      var sound = self._soundById(id);
+
+      if (sound) {
+        if (typeof seek === 'number' && seek >= 0) {
+          // Pause the sound and update position for restarting playback.
+          var playing = self.playing(id);
+          if (playing) {
+            self.pause(id, true);
+          }
+
+          // Move the position of the track and cancel timer.
+          sound._seek = seek;
+          sound._ended = false;
+          self._clearTimer(id);
+
+          // Update the seek position for HTML5 Audio.
+          if (!self._webAudio && sound._node && !isNaN(sound._node.duration)) {
+            sound._node.currentTime = seek;
+          }
+
+          // Seek and emit when ready.
+          var seekAndEmit = function() {
+            // Restart the playback if the sound was playing.
+            if (playing) {
+              self.play(id, true);
+            }
+
+            self._emit('seek', id);
+          };
+
+          // Wait for the play lock to be unset before emitting (HTML5 Audio).
+          if (playing && !self._webAudio) {
+            var emitSeek = function() {
+              if (!self._playLock) {
+                seekAndEmit();
+              } else {
+                setTimeout(emitSeek, 0);
+              }
+            };
+            setTimeout(emitSeek, 0);
+          } else {
+            seekAndEmit();
+          }
+        } else {
+          if (self._webAudio) {
+            var realTime = self.playing(id) ? Howler.ctx.currentTime - sound._playStart : 0;
+            var rateSeek = sound._rateSeek ? sound._rateSeek - sound._seek : 0;
+            return sound._seek + (rateSeek + realTime * Math.abs(sound._rate));
+          } else {
+            return sound._node.currentTime;
+          }
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Check if a specific sound is currently playing or not (if id is provided), or check if at least one of the sounds in the group is playing or not.
+     * @param  {Number}  id The sound id to check. If none is passed, the whole sound group is checked.
+     * @return {Boolean} True if playing and false if not.
+     */
+    playing: function(id) {
+      var self = this;
+
+      // Check the passed sound ID (if any).
+      if (typeof id === 'number') {
+        var sound = self._soundById(id);
+        return sound ? !sound._paused : false;
+      }
+
+      // Otherwise, loop through all sounds and check if any are playing.
+      for (var i=0; i<self._sounds.length; i++) {
+        if (!self._sounds[i]._paused) {
+          return true;
+        }
+      }
+
+      return false;
+    },
+
+    /**
+     * Get the duration of this sound. Passing a sound id will return the sprite duration.
+     * @param  {Number} id The sound id to check. If none is passed, return full source duration.
+     * @return {Number} Audio duration in seconds.
+     */
+    duration: function(id) {
+      var self = this;
+      var duration = self._duration;
+
+      // If we pass an ID, get the sound and return the sprite length.
+      var sound = self._soundById(id);
+      if (sound) {
+        duration = self._sprite[sound._sprite][1] / 1000;
+      }
+
+      return duration;
+    },
+
+    /**
+     * Returns the current loaded state of this Howl.
+     * @return {String} 'unloaded', 'loading', 'loaded'
+     */
+    state: function() {
+      return this._state;
+    },
+
+    /**
+     * Unload and destroy the current Howl object.
+     * This will immediately stop all sound instances attached to this group.
+     */
+    unload: function() {
+      var self = this;
+
+      // Stop playing any active sounds.
+      var sounds = self._sounds;
+      for (var i=0; i<sounds.length; i++) {
+        // Stop the sound if it is currently playing.
+        if (!sounds[i]._paused) {
+          self.stop(sounds[i]._id);
+        }
+
+        // Remove the source or disconnect.
+        if (!self._webAudio) {
+          // Set the source to 0-second silence to stop any downloading (except in IE).
+          self._clearSound(sounds[i]._node);
+
+          // Remove any event listeners.
+          sounds[i]._node.removeEventListener('error', sounds[i]._errorFn, false);
+          sounds[i]._node.removeEventListener(Howler._canPlayEvent, sounds[i]._loadFn, false);
+          sounds[i]._node.removeEventListener('ended', sounds[i]._endFn, false);
+
+          // Release the Audio object back to the pool.
+          Howler._releaseHtml5Audio(sounds[i]._node);
+        }
+
+        // Empty out all of the nodes.
+        delete sounds[i]._node;
+
+        // Make sure all timers are cleared out.
+        self._clearTimer(sounds[i]._id);
+      }
+
+      // Remove the references in the global Howler object.
+      var index = Howler._howls.indexOf(self);
+      if (index >= 0) {
+        Howler._howls.splice(index, 1);
+      }
+
+      // Delete this sound from the cache (if no other Howl is using it).
+      var remCache = true;
+      for (i=0; i<Howler._howls.length; i++) {
+        if (Howler._howls[i]._src === self._src || self._src.indexOf(Howler._howls[i]._src) >= 0) {
+          remCache = false;
+          break;
+        }
+      }
+
+      if (cache && remCache) {
+        delete cache[self._src];
+      }
+
+      // Clear global errors.
+      Howler.noAudio = false;
+
+      // Clear out `self`.
+      self._state = 'unloaded';
+      self._sounds = [];
+      self = null;
+
+      return null;
+    },
+
+    /**
+     * Listen to a custom event.
+     * @param  {String}   event Event name.
+     * @param  {Function} fn    Listener to call.
+     * @param  {Number}   id    (optional) Only listen to events for this sound.
+     * @param  {Number}   once  (INTERNAL) Marks event to fire only once.
+     * @return {Howl}
+     */
+    on: function(event, fn, id, once) {
+      var self = this;
+      var events = self['_on' + event];
+
+      if (typeof fn === 'function') {
+        events.push(once ? {id: id, fn: fn, once: once} : {id: id, fn: fn});
+      }
+
+      return self;
+    },
+
+    /**
+     * Remove a custom event. Call without parameters to remove all events.
+     * @param  {String}   event Event name.
+     * @param  {Function} fn    Listener to remove. Leave empty to remove all.
+     * @param  {Number}   id    (optional) Only remove events for this sound.
+     * @return {Howl}
+     */
+    off: function(event, fn, id) {
+      var self = this;
+      var events = self['_on' + event];
+      var i = 0;
+
+      // Allow passing just an event and ID.
+      if (typeof fn === 'number') {
+        id = fn;
+        fn = null;
+      }
+
+      if (fn || id) {
+        // Loop through event store and remove the passed function.
+        for (i=0; i<events.length; i++) {
+          var isId = (id === events[i].id);
+          if (fn === events[i].fn && isId || !fn && isId) {
+            events.splice(i, 1);
+            break;
+          }
+        }
+      } else if (event) {
+        // Clear out all events of this type.
+        self['_on' + event] = [];
+      } else {
+        // Clear out all events of every type.
+        var keys = Object.keys(self);
+        for (i=0; i<keys.length; i++) {
+          if ((keys[i].indexOf('_on') === 0) && Array.isArray(self[keys[i]])) {
+            self[keys[i]] = [];
+          }
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Listen to a custom event and remove it once fired.
+     * @param  {String}   event Event name.
+     * @param  {Function} fn    Listener to call.
+     * @param  {Number}   id    (optional) Only listen to events for this sound.
+     * @return {Howl}
+     */
+    once: function(event, fn, id) {
+      var self = this;
+
+      // Setup the event listener.
+      self.on(event, fn, id, 1);
+
+      return self;
+    },
+
+    /**
+     * Emit all events of a specific type and pass the sound id.
+     * @param  {String} event Event name.
+     * @param  {Number} id    Sound ID.
+     * @param  {Number} msg   Message to go with event.
+     * @return {Howl}
+     */
+    _emit: function(event, id, msg) {
+      var self = this;
+      var events = self['_on' + event];
+
+      // Loop through event store and fire all functions.
+      for (var i=events.length-1; i>=0; i--) {
+        // Only fire the listener if the correct ID is used.
+        if (!events[i].id || events[i].id === id || event === 'load') {
+          setTimeout(function(fn) {
+            fn.call(this, id, msg);
+          }.bind(self, events[i].fn), 0);
+
+          // If this event was setup with `once`, remove it.
+          if (events[i].once) {
+            self.off(event, events[i].fn, events[i].id);
+          }
+        }
+      }
+
+      // Pass the event type into load queue so that it can continue stepping.
+      self._loadQueue(event);
+
+      return self;
+    },
+
+    /**
+     * Queue of actions initiated before the sound has loaded.
+     * These will be called in sequence, with the next only firing
+     * after the previous has finished executing (even if async like play).
+     * @return {Howl}
+     */
+    _loadQueue: function(event) {
+      var self = this;
+
+      if (self._queue.length > 0) {
+        var task = self._queue[0];
+
+        // Remove this task if a matching event was passed.
+        if (task.event === event) {
+          self._queue.shift();
+          self._loadQueue();
+        }
+
+        // Run the task if no event type is passed.
+        if (!event) {
+          task.action();
+        }
+      }
+
+      return self;
+    },
+
+    /**
+     * Fired when playback ends at the end of the duration.
+     * @param  {Sound} sound The sound object to work with.
+     * @return {Howl}
+     */
+    _ended: function(sound) {
+      var self = this;
+      var sprite = sound._sprite;
+
+      // If we are using IE and there was network latency we may be clipping
+      // audio before it completes playing. Lets check the node to make sure it
+      // believes it has completed, before ending the playback.
+      if (!self._webAudio && sound._node && !sound._node.paused && !sound._node.ended && sound._node.currentTime < sound._stop) {
+        setTimeout(self._ended.bind(self, sound), 100);
+        return self;
+      }
+
+      // Should this sound loop?
+      var loop = !!(sound._loop || self._sprite[sprite][2]);
+
+      // Fire the ended event.
+      self._emit('end', sound._id);
+
+      // Restart the playback for HTML5 Audio loop.
+      if (!self._webAudio && loop) {
+        self.stop(sound._id, true).play(sound._id);
+      }
+
+      // Restart this timer if on a Web Audio loop.
+      if (self._webAudio && loop) {
+        self._emit('play', sound._id);
+        sound._seek = sound._start || 0;
+        sound._rateSeek = 0;
+        sound._playStart = Howler.ctx.currentTime;
+
+        var timeout = ((sound._stop - sound._start) * 1000) / Math.abs(sound._rate);
+        self._endTimers[sound._id] = setTimeout(self._ended.bind(self, sound), timeout);
+      }
+
+      // Mark the node as paused.
+      if (self._webAudio && !loop) {
+        sound._paused = true;
+        sound._ended = true;
+        sound._seek = sound._start || 0;
+        sound._rateSeek = 0;
+        self._clearTimer(sound._id);
+
+        // Clean up the buffer source.
+        self._cleanBuffer(sound._node);
+
+        // Attempt to auto-suspend AudioContext if no sounds are still playing.
+        Howler._autoSuspend();
+      }
+
+      // When using a sprite, end the track.
+      if (!self._webAudio && !loop) {
+        self.stop(sound._id, true);
+      }
+
+      return self;
+    },
+
+    /**
+     * Clear the end timer for a sound playback.
+     * @param  {Number} id The sound ID.
+     * @return {Howl}
+     */
+    _clearTimer: function(id) {
+      var self = this;
+
+      if (self._endTimers[id]) {
+        // Clear the timeout or remove the ended listener.
+        if (typeof self._endTimers[id] !== 'function') {
+          clearTimeout(self._endTimers[id]);
+        } else {
+          var sound = self._soundById(id);
+          if (sound && sound._node) {
+            sound._node.removeEventListener('ended', self._endTimers[id], false);
+          }
+        }
+
+        delete self._endTimers[id];
+      }
+
+      return self;
+    },
+
+    /**
+     * Return the sound identified by this ID, or return null.
+     * @param  {Number} id Sound ID
+     * @return {Object}    Sound object or null.
+     */
+    _soundById: function(id) {
+      var self = this;
+
+      // Loop through all sounds and find the one with this ID.
+      for (var i=0; i<self._sounds.length; i++) {
+        if (id === self._sounds[i]._id) {
+          return self._sounds[i];
+        }
+      }
+
+      return null;
+    },
+
+    /**
+     * Return an inactive sound from the pool or create a new one.
+     * @return {Sound} Sound playback object.
+     */
+    _inactiveSound: function() {
+      var self = this;
+
+      self._drain();
+
+      // Find the first inactive node to recycle.
+      for (var i=0; i<self._sounds.length; i++) {
+        if (self._sounds[i]._ended) {
+          return self._sounds[i].reset();
+        }
+      }
+
+      // If no inactive node was found, create a new one.
+      return new Sound(self);
+    },
+
+    /**
+     * Drain excess inactive sounds from the pool.
+     */
+    _drain: function() {
+      var self = this;
+      var limit = self._pool;
+      var cnt = 0;
+      var i = 0;
+
+      // If there are less sounds than the max pool size, we are done.
+      if (self._sounds.length < limit) {
+        return;
+      }
+
+      // Count the number of inactive sounds.
+      for (i=0; i<self._sounds.length; i++) {
+        if (self._sounds[i]._ended) {
+          cnt++;
+        }
+      }
+
+      // Remove excess inactive sounds, going in reverse order.
+      for (i=self._sounds.length - 1; i>=0; i--) {
+        if (cnt <= limit) {
+          return;
+        }
+
+        if (self._sounds[i]._ended) {
+          // Disconnect the audio source when using Web Audio.
+          if (self._webAudio && self._sounds[i]._node) {
+            self._sounds[i]._node.disconnect(0);
+          }
+
+          // Remove sounds until we have the pool size.
+          self._sounds.splice(i, 1);
+          cnt--;
+        }
+      }
+    },
+
+    /**
+     * Get all ID's from the sounds pool.
+     * @param  {Number} id Only return one ID if one is passed.
+     * @return {Array}    Array of IDs.
+     */
+    _getSoundIds: function(id) {
+      var self = this;
+
+      if (typeof id === 'undefined') {
+        var ids = [];
+        for (var i=0; i<self._sounds.length; i++) {
+          ids.push(self._sounds[i]._id);
+        }
+
+        return ids;
+      } else {
+        return [id];
+      }
+    },
+
+    /**
+     * Load the sound back into the buffer source.
+     * @param  {Sound} sound The sound object to work with.
+     * @return {Howl}
+     */
+    _refreshBuffer: function(sound) {
+      var self = this;
+
+      // Setup the buffer source for playback.
+      sound._node.bufferSource = Howler.ctx.createBufferSource();
+      sound._node.bufferSource.buffer = cache[self._src];
+
+      // Connect to the correct node.
+      if (sound._panner) {
+        sound._node.bufferSource.connect(sound._panner);
+      } else {
+        sound._node.bufferSource.connect(sound._node);
+      }
+
+      // Setup looping and playback rate.
+      sound._node.bufferSource.loop = sound._loop;
+      if (sound._loop) {
+        sound._node.bufferSource.loopStart = sound._start || 0;
+        sound._node.bufferSource.loopEnd = sound._stop || 0;
+      }
+      sound._node.bufferSource.playbackRate.setValueAtTime(sound._rate, Howler.ctx.currentTime);
+
+      return self;
+    },
+
+    /**
+     * Prevent memory leaks by cleaning up the buffer source after playback.
+     * @param  {Object} node Sound's audio node containing the buffer source.
+     * @return {Howl}
+     */
+    _cleanBuffer: function(node) {
+      var self = this;
+      var isIOS = Howler._navigator && Howler._navigator.vendor.indexOf('Apple') >= 0;
+
+      if (!node.bufferSource) {
+        return self;
+      }
+
+      if (Howler._scratchBuffer && node.bufferSource) {
+        node.bufferSource.onended = null;
+        node.bufferSource.disconnect(0);
+        if (isIOS) {
+          try { node.bufferSource.buffer = Howler._scratchBuffer; } catch(e) {}
+        }
+      }
+      node.bufferSource = null;
+
+      return self;
+    },
+
+    /**
+     * Set the source to a 0-second silence to stop any downloading (except in IE).
+     * @param  {Object} node Audio node to clear.
+     */
+    _clearSound: function(node) {
+      var checkIE = /MSIE |Trident\//.test(Howler._navigator && Howler._navigator.userAgent);
+      if (!checkIE) {
+        node.src = 'data:audio/wav;base64,UklGRigAAABXQVZFZm10IBIAAAABAAEARKwAAIhYAQACABAAAABkYXRhAgAAAAEA';
+      }
+    }
+  };
+
+  /** Single Sound Methods **/
+  /***************************************************************************/
+
+  /**
+   * Setup the sound object, which each node attached to a Howl group is contained in.
+   * @param {Object} howl The Howl parent group.
+   */
+  var Sound = function(howl) {
+    this._parent = howl;
+    this.init();
+  };
+  Sound.prototype = {
+    /**
+     * Initialize a new Sound object.
+     * @return {Sound}
+     */
+    init: function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Setup the default parameters.
+      self._muted = parent._muted;
+      self._loop = parent._loop;
+      self._volume = parent._volume;
+      self._rate = parent._rate;
+      self._seek = 0;
+      self._paused = true;
+      self._ended = true;
+      self._sprite = '__default';
+
+      // Generate a unique ID for this sound.
+      self._id = ++Howler._counter;
+
+      // Add itself to the parent's pool.
+      parent._sounds.push(self);
+
+      // Create the new node.
+      self.create();
+
+      return self;
+    },
+
+    /**
+     * Create and setup a new sound object, whether HTML5 Audio or Web Audio.
+     * @return {Sound}
+     */
+    create: function() {
+      var self = this;
+      var parent = self._parent;
+      var volume = (Howler._muted || self._muted || self._parent._muted) ? 0 : self._volume;
+
+      if (parent._webAudio) {
+        // Create the gain node for controlling volume (the source will connect to this).
+        self._node = (typeof Howler.ctx.createGain === 'undefined') ? Howler.ctx.createGainNode() : Howler.ctx.createGain();
+        self._node.gain.setValueAtTime(volume, Howler.ctx.currentTime);
+        self._node.paused = true;
+        self._node.connect(Howler.masterGain);
+      } else if (!Howler.noAudio) {
+        // Get an unlocked Audio object from the pool.
+        self._node = Howler._obtainHtml5Audio();
+
+        // Listen for errors (http://dev.w3.org/html5/spec-author-view/spec.html#mediaerror).
+        self._errorFn = self._errorListener.bind(self);
+        self._node.addEventListener('error', self._errorFn, false);
+
+        // Listen for 'canplaythrough' event to let us know the sound is ready.
+        self._loadFn = self._loadListener.bind(self);
+        self._node.addEventListener(Howler._canPlayEvent, self._loadFn, false);
+
+        // Listen for the 'ended' event on the sound to account for edge-case where
+        // a finite sound has a duration of Infinity.
+        self._endFn = self._endListener.bind(self);
+        self._node.addEventListener('ended', self._endFn, false);
+
+        // Setup the new audio node.
+        self._node.src = parent._src;
+        self._node.preload = parent._preload === true ? 'auto' : parent._preload;
+        self._node.volume = volume * Howler.volume();
+
+        // Begin loading the source.
+        self._node.load();
+      }
+
+      return self;
+    },
+
+    /**
+     * Reset the parameters of this sound to the original state (for recycle).
+     * @return {Sound}
+     */
+    reset: function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Reset all of the parameters of this sound.
+      self._muted = parent._muted;
+      self._loop = parent._loop;
+      self._volume = parent._volume;
+      self._rate = parent._rate;
+      self._seek = 0;
+      self._rateSeek = 0;
+      self._paused = true;
+      self._ended = true;
+      self._sprite = '__default';
+
+      // Generate a new ID so that it isn't confused with the previous sound.
+      self._id = ++Howler._counter;
+
+      return self;
+    },
+
+    /**
+     * HTML5 Audio error listener callback.
+     */
+    _errorListener: function() {
+      var self = this;
+
+      // Fire an error event and pass back the code.
+      self._parent._emit('loaderror', self._id, self._node.error ? self._node.error.code : 0);
+
+      // Clear the event listener.
+      self._node.removeEventListener('error', self._errorFn, false);
+    },
+
+    /**
+     * HTML5 Audio canplaythrough listener callback.
+     */
+    _loadListener: function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Round up the duration to account for the lower precision in HTML5 Audio.
+      parent._duration = Math.ceil(self._node.duration * 10) / 10;
+
+      // Setup a sprite if none is defined.
+      if (Object.keys(parent._sprite).length === 0) {
+        parent._sprite = {__default: [0, parent._duration * 1000]};
+      }
+
+      if (parent._state !== 'loaded') {
+        parent._state = 'loaded';
+        parent._emit('load');
+        parent._loadQueue();
+      }
+
+      // Clear the event listener.
+      self._node.removeEventListener(Howler._canPlayEvent, self._loadFn, false);
+    },
+
+    /**
+     * HTML5 Audio ended listener callback.
+     */
+    _endListener: function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Only handle the `ended`` event if the duration is Infinity.
+      if (parent._duration === Infinity) {
+        // Update the parent duration to match the real audio duration.
+        // Round up the duration to account for the lower precision in HTML5 Audio.
+        parent._duration = Math.ceil(self._node.duration * 10) / 10;
+
+        // Update the sprite that corresponds to the real duration.
+        if (parent._sprite.__default[1] === Infinity) {
+          parent._sprite.__default[1] = parent._duration * 1000;
+        }
+
+        // Run the regular ended method.
+        parent._ended(self);
+      }
+
+      // Clear the event listener since the duration is now correct.
+      self._node.removeEventListener('ended', self._endFn, false);
+    }
+  };
+
+  /** Helper Methods **/
+  /***************************************************************************/
+
+  var cache = {};
+
+  /**
+   * Buffer a sound from URL, Data URI or cache and decode to audio source (Web Audio API).
+   * @param  {Howl} self
+   */
+  var loadBuffer = function(self) {
+    var url = self._src;
+
+    // Check if the buffer has already been cached and use it instead.
+    if (cache[url]) {
+      // Set the duration from the cache.
+      self._duration = cache[url].duration;
+
+      // Load the sound into this Howl.
+      loadSound(self);
+
+      return;
+    }
+
+    if (/^data:[^;]+;base64,/.test(url)) {
+      // Decode the base64 data URI without XHR, since some browsers don't support it.
+      var data = atob(url.split(',')[1]);
+      var dataView = new Uint8Array(data.length);
+      for (var i=0; i<data.length; ++i) {
+        dataView[i] = data.charCodeAt(i);
+      }
+
+      decodeAudioData(dataView.buffer, self);
+    } else {
+      // Load the buffer from the URL.
+      var xhr = new XMLHttpRequest();
+      xhr.open(self._xhr.method, url, true);
+      xhr.withCredentials = self._xhr.withCredentials;
+      xhr.responseType = 'arraybuffer';
+
+      // Apply any custom headers to the request.
+      if (self._xhr.headers) {
+        Object.keys(self._xhr.headers).forEach(function(key) {
+          xhr.setRequestHeader(key, self._xhr.headers[key]);
+        });
+      }
+
+      xhr.onload = function() {
+        // Make sure we get a successful response back.
+        var code = (xhr.status + '')[0];
+        if (code !== '0' && code !== '2' && code !== '3') {
+          self._emit('loaderror', null, 'Failed loading audio file with status: ' + xhr.status + '.');
+          return;
+        }
+
+        decodeAudioData(xhr.response, self);
+      };
+      xhr.onerror = function() {
+        // If there is an error, switch to HTML5 Audio.
+        if (self._webAudio) {
+          self._html5 = true;
+          self._webAudio = false;
+          self._sounds = [];
+          delete cache[url];
+          self.load();
+        }
+      };
+      safeXhrSend(xhr);
+    }
+  };
+
+  /**
+   * Send the XHR request wrapped in a try/catch.
+   * @param  {Object} xhr XHR to send.
+   */
+  var safeXhrSend = function(xhr) {
+    try {
+      xhr.send();
+    } catch (e) {
+      xhr.onerror();
+    }
+  };
+
+  /**
+   * Decode audio data from an array buffer.
+   * @param  {ArrayBuffer} arraybuffer The audio data.
+   * @param  {Howl}        self
+   */
+  var decodeAudioData = function(arraybuffer, self) {
+    // Fire a load error if something broke.
+    var error = function() {
+      self._emit('loaderror', null, 'Decoding audio data failed.');
+    };
+
+    // Load the sound on success.
+    var success = function(buffer) {
+      if (buffer && self._sounds.length > 0) {
+        cache[self._src] = buffer;
+        loadSound(self, buffer);
+      } else {
+        error();
+      }
+    };
+
+    // Decode the buffer into an audio source.
+    if (typeof Promise !== 'undefined' && Howler.ctx.decodeAudioData.length === 1) {
+      Howler.ctx.decodeAudioData(arraybuffer).then(success).catch(error);
+    } else {
+      Howler.ctx.decodeAudioData(arraybuffer, success, error);
+    }
+  }
+
+  /**
+   * Sound is now loaded, so finish setting everything up and fire the loaded event.
+   * @param  {Howl} self
+   * @param  {Object} buffer The decoded buffer sound source.
+   */
+  var loadSound = function(self, buffer) {
+    // Set the duration.
+    if (buffer && !self._duration) {
+      self._duration = buffer.duration;
+    }
+
+    // Setup a sprite if none is defined.
+    if (Object.keys(self._sprite).length === 0) {
+      self._sprite = {__default: [0, self._duration * 1000]};
+    }
+
+    // Fire the loaded event.
+    if (self._state !== 'loaded') {
+      self._state = 'loaded';
+      self._emit('load');
+      self._loadQueue();
+    }
+  };
+
+  /**
+   * Setup the audio context when available, or switch to HTML5 Audio mode.
+   */
+  var setupAudioContext = function() {
+    // If we have already detected that Web Audio isn't supported, don't run this step again.
+    if (!Howler.usingWebAudio) {
+      return;
+    }
+
+    // Check if we are using Web Audio and setup the AudioContext if we are.
+    try {
+      if (typeof AudioContext !== 'undefined') {
+        Howler.ctx = new AudioContext();
+      } else if (typeof webkitAudioContext !== 'undefined') {
+        Howler.ctx = new webkitAudioContext();
+      } else {
+        Howler.usingWebAudio = false;
+      }
+    } catch(e) {
+      Howler.usingWebAudio = false;
+    }
+
+    // If the audio context creation still failed, set using web audio to false.
+    if (!Howler.ctx) {
+      Howler.usingWebAudio = false;
+    }
+
+    // Check if a webview is being used on iOS8 or earlier (rather than the browser).
+    // If it is, disable Web Audio as it causes crashing.
+    var iOS = (/iP(hone|od|ad)/.test(Howler._navigator && Howler._navigator.platform));
+    var appVersion = Howler._navigator && Howler._navigator.appVersion.match(/OS (\d+)_(\d+)_?(\d+)?/);
+    var version = appVersion ? parseInt(appVersion[1], 10) : null;
+    if (iOS && version && version < 9) {
+      var safari = /safari/.test(Howler._navigator && Howler._navigator.userAgent.toLowerCase());
+      if (Howler._navigator && !safari) {
+        Howler.usingWebAudio = false;
+      }
+    }
+
+    // Create and expose the master GainNode when using Web Audio (useful for plugins or advanced usage).
+    if (Howler.usingWebAudio) {
+      Howler.masterGain = (typeof Howler.ctx.createGain === 'undefined') ? Howler.ctx.createGainNode() : Howler.ctx.createGain();
+      Howler.masterGain.gain.setValueAtTime(Howler._muted ? 0 : Howler._volume, Howler.ctx.currentTime);
+      Howler.masterGain.connect(Howler.ctx.destination);
+    }
+
+    // Re-run the setup on Howler.
+    Howler._setup();
+  };
+
+  // Add support for AMD (Asynchronous Module Definition) libraries such as require.js.
+  if (typeof define === 'function' && define.amd) {
+    define([], function() {
+      return {
+        Howler: Howler,
+        Howl: Howl
+      };
+    });
+  }
+
+  // Add support for CommonJS libraries such as browserify.
+  if (typeof exports !== 'undefined') {
+    exports.Howler = Howler;
+    exports.Howl = Howl;
+  }
+
+  // Add to global in Node.js (for testing, etc).
+  if (typeof global !== 'undefined') {
+    global.HowlerGlobal = HowlerGlobal;
+    global.Howler = Howler;
+    global.Howl = Howl;
+    global.Sound = Sound;
+  } else if (typeof window !== 'undefined') {  // Define globally in case AMD is not available or unused.
+    window.HowlerGlobal = HowlerGlobal;
+    window.Howler = Howler;
+    window.Howl = Howl;
+    window.Sound = Sound;
+  }
+})();
diff --git a/uni_modules/c-svga/node_modules/howler/src/plugins/howler.spatial.js b/uni_modules/c-svga/node_modules/howler/src/plugins/howler.spatial.js
new file mode 100644
index 0000000..6ae0fdc
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/howler/src/plugins/howler.spatial.js
@@ -0,0 +1,659 @@
+/*!
+ *  Spatial Plugin - Adds support for stereo and 3D audio where Web Audio is supported.
+ *  
+ *  howler.js v2.2.4
+ *  howlerjs.com
+ *
+ *  (c) 2013-2020, James Simpson of GoldFire Studios
+ *  goldfirestudios.com
+ *
+ *  MIT License
+ */
+
+(function() {
+
+  'use strict';
+
+  // Setup default properties.
+  HowlerGlobal.prototype._pos = [0, 0, 0];
+  HowlerGlobal.prototype._orientation = [0, 0, -1, 0, 1, 0];
+
+  /** Global Methods **/
+  /***************************************************************************/
+
+  /**
+   * Helper method to update the stereo panning position of all current Howls.
+   * Future Howls will not use this value unless explicitly set.
+   * @param  {Number} pan A value of -1.0 is all the way left and 1.0 is all the way right.
+   * @return {Howler/Number}     Self or current stereo panning value.
+   */
+  HowlerGlobal.prototype.stereo = function(pan) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self.ctx || !self.ctx.listener) {
+      return self;
+    }
+
+    // Loop through all Howls and update their stereo panning.
+    for (var i=self._howls.length-1; i>=0; i--) {
+      self._howls[i].stereo(pan);
+    }
+
+    return self;
+  };
+
+  /**
+   * Get/set the position of the listener in 3D cartesian space. Sounds using
+   * 3D position will be relative to the listener's position.
+   * @param  {Number} x The x-position of the listener.
+   * @param  {Number} y The y-position of the listener.
+   * @param  {Number} z The z-position of the listener.
+   * @return {Howler/Array}   Self or current listener position.
+   */
+  HowlerGlobal.prototype.pos = function(x, y, z) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self.ctx || !self.ctx.listener) {
+      return self;
+    }
+
+    // Set the defaults for optional 'y' & 'z'.
+    y = (typeof y !== 'number') ? self._pos[1] : y;
+    z = (typeof z !== 'number') ? self._pos[2] : z;
+
+    if (typeof x === 'number') {
+      self._pos = [x, y, z];
+
+      if (typeof self.ctx.listener.positionX !== 'undefined') {
+        self.ctx.listener.positionX.setTargetAtTime(self._pos[0], Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.positionY.setTargetAtTime(self._pos[1], Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.positionZ.setTargetAtTime(self._pos[2], Howler.ctx.currentTime, 0.1);
+      } else {
+        self.ctx.listener.setPosition(self._pos[0], self._pos[1], self._pos[2]);
+      }
+    } else {
+      return self._pos;
+    }
+
+    return self;
+  };
+
+  /**
+   * Get/set the direction the listener is pointing in the 3D cartesian space.
+   * A front and up vector must be provided. The front is the direction the
+   * face of the listener is pointing, and up is the direction the top of the
+   * listener is pointing. Thus, these values are expected to be at right angles
+   * from each other.
+   * @param  {Number} x   The x-orientation of the listener.
+   * @param  {Number} y   The y-orientation of the listener.
+   * @param  {Number} z   The z-orientation of the listener.
+   * @param  {Number} xUp The x-orientation of the top of the listener.
+   * @param  {Number} yUp The y-orientation of the top of the listener.
+   * @param  {Number} zUp The z-orientation of the top of the listener.
+   * @return {Howler/Array}     Returns self or the current orientation vectors.
+   */
+  HowlerGlobal.prototype.orientation = function(x, y, z, xUp, yUp, zUp) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self.ctx || !self.ctx.listener) {
+      return self;
+    }
+
+    // Set the defaults for optional 'y' & 'z'.
+    var or = self._orientation;
+    y = (typeof y !== 'number') ? or[1] : y;
+    z = (typeof z !== 'number') ? or[2] : z;
+    xUp = (typeof xUp !== 'number') ? or[3] : xUp;
+    yUp = (typeof yUp !== 'number') ? or[4] : yUp;
+    zUp = (typeof zUp !== 'number') ? or[5] : zUp;
+
+    if (typeof x === 'number') {
+      self._orientation = [x, y, z, xUp, yUp, zUp];
+
+      if (typeof self.ctx.listener.forwardX !== 'undefined') {
+        self.ctx.listener.forwardX.setTargetAtTime(x, Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.forwardY.setTargetAtTime(y, Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.forwardZ.setTargetAtTime(z, Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.upX.setTargetAtTime(xUp, Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.upY.setTargetAtTime(yUp, Howler.ctx.currentTime, 0.1);
+        self.ctx.listener.upZ.setTargetAtTime(zUp, Howler.ctx.currentTime, 0.1);
+      } else {
+        self.ctx.listener.setOrientation(x, y, z, xUp, yUp, zUp);
+      }
+    } else {
+      return or;
+    }
+
+    return self;
+  };
+
+  /** Group Methods **/
+  /***************************************************************************/
+
+  /**
+   * Add new properties to the core init.
+   * @param  {Function} _super Core init method.
+   * @return {Howl}
+   */
+  Howl.prototype.init = (function(_super) {
+    return function(o) {
+      var self = this;
+
+      // Setup user-defined default properties.
+      self._orientation = o.orientation || [1, 0, 0];
+      self._stereo = o.stereo || null;
+      self._pos = o.pos || null;
+      self._pannerAttr = {
+        coneInnerAngle: typeof o.coneInnerAngle !== 'undefined' ? o.coneInnerAngle : 360,
+        coneOuterAngle: typeof o.coneOuterAngle !== 'undefined' ? o.coneOuterAngle : 360,
+        coneOuterGain: typeof o.coneOuterGain !== 'undefined' ? o.coneOuterGain : 0,
+        distanceModel: typeof o.distanceModel !== 'undefined' ? o.distanceModel : 'inverse',
+        maxDistance: typeof o.maxDistance !== 'undefined' ? o.maxDistance : 10000,
+        panningModel: typeof o.panningModel !== 'undefined' ? o.panningModel : 'HRTF',
+        refDistance: typeof o.refDistance !== 'undefined' ? o.refDistance : 1,
+        rolloffFactor: typeof o.rolloffFactor !== 'undefined' ? o.rolloffFactor : 1
+      };
+
+      // Setup event listeners.
+      self._onstereo = o.onstereo ? [{fn: o.onstereo}] : [];
+      self._onpos = o.onpos ? [{fn: o.onpos}] : [];
+      self._onorientation = o.onorientation ? [{fn: o.onorientation}] : [];
+
+      // Complete initilization with howler.js core's init function.
+      return _super.call(this, o);
+    };
+  })(Howl.prototype.init);
+
+  /**
+   * Get/set the stereo panning of the audio source for this sound or all in the group.
+   * @param  {Number} pan  A value of -1.0 is all the way left and 1.0 is all the way right.
+   * @param  {Number} id (optional) The sound ID. If none is passed, all in group will be updated.
+   * @return {Howl/Number}    Returns self or the current stereo panning value.
+   */
+  Howl.prototype.stereo = function(pan, id) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self._webAudio) {
+      return self;
+    }
+
+    // If the sound hasn't loaded, add it to the load queue to change stereo pan when capable.
+    if (self._state !== 'loaded') {
+      self._queue.push({
+        event: 'stereo',
+        action: function() {
+          self.stereo(pan, id);
+        }
+      });
+
+      return self;
+    }
+
+    // Check for PannerStereoNode support and fallback to PannerNode if it doesn't exist.
+    var pannerType = (typeof Howler.ctx.createStereoPanner === 'undefined') ? 'spatial' : 'stereo';
+
+    // Setup the group's stereo panning if no ID is passed.
+    if (typeof id === 'undefined') {
+      // Return the group's stereo panning if no parameters are passed.
+      if (typeof pan === 'number') {
+        self._stereo = pan;
+        self._pos = [pan, 0, 0];
+      } else {
+        return self._stereo;
+      }
+    }
+
+    // Change the streo panning of one or all sounds in group.
+    var ids = self._getSoundIds(id);
+    for (var i=0; i<ids.length; i++) {
+      // Get the sound.
+      var sound = self._soundById(ids[i]);
+
+      if (sound) {
+        if (typeof pan === 'number') {
+          sound._stereo = pan;
+          sound._pos = [pan, 0, 0];
+
+          if (sound._node) {
+            // If we are falling back, make sure the panningModel is equalpower.
+            sound._pannerAttr.panningModel = 'equalpower';
+
+            // Check if there is a panner setup and create a new one if not.
+            if (!sound._panner || !sound._panner.pan) {
+              setupPanner(sound, pannerType);
+            }
+
+            if (pannerType === 'spatial') {
+              if (typeof sound._panner.positionX !== 'undefined') {
+                sound._panner.positionX.setValueAtTime(pan, Howler.ctx.currentTime);
+                sound._panner.positionY.setValueAtTime(0, Howler.ctx.currentTime);
+                sound._panner.positionZ.setValueAtTime(0, Howler.ctx.currentTime);
+              } else {
+                sound._panner.setPosition(pan, 0, 0);
+              }
+            } else {
+              sound._panner.pan.setValueAtTime(pan, Howler.ctx.currentTime);
+            }
+          }
+
+          self._emit('stereo', sound._id);
+        } else {
+          return sound._stereo;
+        }
+      }
+    }
+
+    return self;
+  };
+
+  /**
+   * Get/set the 3D spatial position of the audio source for this sound or group relative to the global listener.
+   * @param  {Number} x  The x-position of the audio source.
+   * @param  {Number} y  The y-position of the audio source.
+   * @param  {Number} z  The z-position of the audio source.
+   * @param  {Number} id (optional) The sound ID. If none is passed, all in group will be updated.
+   * @return {Howl/Array}    Returns self or the current 3D spatial position: [x, y, z].
+   */
+  Howl.prototype.pos = function(x, y, z, id) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self._webAudio) {
+      return self;
+    }
+
+    // If the sound hasn't loaded, add it to the load queue to change position when capable.
+    if (self._state !== 'loaded') {
+      self._queue.push({
+        event: 'pos',
+        action: function() {
+          self.pos(x, y, z, id);
+        }
+      });
+
+      return self;
+    }
+
+    // Set the defaults for optional 'y' & 'z'.
+    y = (typeof y !== 'number') ? 0 : y;
+    z = (typeof z !== 'number') ? -0.5 : z;
+
+    // Setup the group's spatial position if no ID is passed.
+    if (typeof id === 'undefined') {
+      // Return the group's spatial position if no parameters are passed.
+      if (typeof x === 'number') {
+        self._pos = [x, y, z];
+      } else {
+        return self._pos;
+      }
+    }
+
+    // Change the spatial position of one or all sounds in group.
+    var ids = self._getSoundIds(id);
+    for (var i=0; i<ids.length; i++) {
+      // Get the sound.
+      var sound = self._soundById(ids[i]);
+
+      if (sound) {
+        if (typeof x === 'number') {
+          sound._pos = [x, y, z];
+
+          if (sound._node) {
+            // Check if there is a panner setup and create a new one if not.
+            if (!sound._panner || sound._panner.pan) {
+              setupPanner(sound, 'spatial');
+            }
+
+            if (typeof sound._panner.positionX !== 'undefined') {
+              sound._panner.positionX.setValueAtTime(x, Howler.ctx.currentTime);
+              sound._panner.positionY.setValueAtTime(y, Howler.ctx.currentTime);
+              sound._panner.positionZ.setValueAtTime(z, Howler.ctx.currentTime);
+            } else {
+              sound._panner.setPosition(x, y, z);
+            }
+          }
+
+          self._emit('pos', sound._id);
+        } else {
+          return sound._pos;
+        }
+      }
+    }
+
+    return self;
+  };
+
+  /**
+   * Get/set the direction the audio source is pointing in the 3D cartesian coordinate
+   * space. Depending on how direction the sound is, based on the `cone` attributes,
+   * a sound pointing away from the listener can be quiet or silent.
+   * @param  {Number} x  The x-orientation of the source.
+   * @param  {Number} y  The y-orientation of the source.
+   * @param  {Number} z  The z-orientation of the source.
+   * @param  {Number} id (optional) The sound ID. If none is passed, all in group will be updated.
+   * @return {Howl/Array}    Returns self or the current 3D spatial orientation: [x, y, z].
+   */
+  Howl.prototype.orientation = function(x, y, z, id) {
+    var self = this;
+
+    // Stop right here if not using Web Audio.
+    if (!self._webAudio) {
+      return self;
+    }
+
+    // If the sound hasn't loaded, add it to the load queue to change orientation when capable.
+    if (self._state !== 'loaded') {
+      self._queue.push({
+        event: 'orientation',
+        action: function() {
+          self.orientation(x, y, z, id);
+        }
+      });
+
+      return self;
+    }
+
+    // Set the defaults for optional 'y' & 'z'.
+    y = (typeof y !== 'number') ? self._orientation[1] : y;
+    z = (typeof z !== 'number') ? self._orientation[2] : z;
+
+    // Setup the group's spatial orientation if no ID is passed.
+    if (typeof id === 'undefined') {
+      // Return the group's spatial orientation if no parameters are passed.
+      if (typeof x === 'number') {
+        self._orientation = [x, y, z];
+      } else {
+        return self._orientation;
+      }
+    }
+
+    // Change the spatial orientation of one or all sounds in group.
+    var ids = self._getSoundIds(id);
+    for (var i=0; i<ids.length; i++) {
+      // Get the sound.
+      var sound = self._soundById(ids[i]);
+
+      if (sound) {
+        if (typeof x === 'number') {
+          sound._orientation = [x, y, z];
+
+          if (sound._node) {
+            // Check if there is a panner setup and create a new one if not.
+            if (!sound._panner) {
+              // Make sure we have a position to setup the node with.
+              if (!sound._pos) {
+                sound._pos = self._pos || [0, 0, -0.5];
+              }
+
+              setupPanner(sound, 'spatial');
+            }
+
+            if (typeof sound._panner.orientationX !== 'undefined') {
+              sound._panner.orientationX.setValueAtTime(x, Howler.ctx.currentTime);
+              sound._panner.orientationY.setValueAtTime(y, Howler.ctx.currentTime);
+              sound._panner.orientationZ.setValueAtTime(z, Howler.ctx.currentTime);
+            } else {
+              sound._panner.setOrientation(x, y, z);
+            }
+          }
+
+          self._emit('orientation', sound._id);
+        } else {
+          return sound._orientation;
+        }
+      }
+    }
+
+    return self;
+  };
+
+  /**
+   * Get/set the panner node's attributes for a sound or group of sounds.
+   * This method can optionall take 0, 1 or 2 arguments.
+   *   pannerAttr() -> Returns the group's values.
+   *   pannerAttr(id) -> Returns the sound id's values.
+   *   pannerAttr(o) -> Set's the values of all sounds in this Howl group.
+   *   pannerAttr(o, id) -> Set's the values of passed sound id.
+   *
+   *   Attributes:
+   *     coneInnerAngle - (360 by default) A parameter for directional audio sources, this is an angle, in degrees,
+   *                      inside of which there will be no volume reduction.
+   *     coneOuterAngle - (360 by default) A parameter for directional audio sources, this is an angle, in degrees,
+   *                      outside of which the volume will be reduced to a constant value of `coneOuterGain`.
+   *     coneOuterGain - (0 by default) A parameter for directional audio sources, this is the gain outside of the
+   *                     `coneOuterAngle`. It is a linear value in the range `[0, 1]`.
+   *     distanceModel - ('inverse' by default) Determines algorithm used to reduce volume as audio moves away from
+   *                     listener. Can be `linear`, `inverse` or `exponential.
+   *     maxDistance - (10000 by default) The maximum distance between source and listener, after which the volume
+   *                   will not be reduced any further.
+   *     refDistance - (1 by default) A reference distance for reducing volume as source moves further from the listener.
+   *                   This is simply a variable of the distance model and has a different effect depending on which model
+   *                   is used and the scale of your coordinates. Generally, volume will be equal to 1 at this distance.
+   *     rolloffFactor - (1 by default) How quickly the volume reduces as source moves from listener. This is simply a
+   *                     variable of the distance model and can be in the range of `[0, 1]` with `linear` and `[0, ∞]`
+   *                     with `inverse` and `exponential`.
+   *     panningModel - ('HRTF' by default) Determines which spatialization algorithm is used to position audio.
+   *                     Can be `HRTF` or `equalpower`.
+   *
+   * @return {Howl/Object} Returns self or current panner attributes.
+   */
+  Howl.prototype.pannerAttr = function() {
+    var self = this;
+    var args = arguments;
+    var o, id, sound;
+
+    // Stop right here if not using Web Audio.
+    if (!self._webAudio) {
+      return self;
+    }
+
+    // Determine the values based on arguments.
+    if (args.length === 0) {
+      // Return the group's panner attribute values.
+      return self._pannerAttr;
+    } else if (args.length === 1) {
+      if (typeof args[0] === 'object') {
+        o = args[0];
+
+        // Set the grou's panner attribute values.
+        if (typeof id === 'undefined') {
+          if (!o.pannerAttr) {
+            o.pannerAttr = {
+              coneInnerAngle: o.coneInnerAngle,
+              coneOuterAngle: o.coneOuterAngle,
+              coneOuterGain: o.coneOuterGain,
+              distanceModel: o.distanceModel,
+              maxDistance: o.maxDistance,
+              refDistance: o.refDistance,
+              rolloffFactor: o.rolloffFactor,
+              panningModel: o.panningModel
+            };
+          }
+
+          self._pannerAttr = {
+            coneInnerAngle: typeof o.pannerAttr.coneInnerAngle !== 'undefined' ? o.pannerAttr.coneInnerAngle : self._coneInnerAngle,
+            coneOuterAngle: typeof o.pannerAttr.coneOuterAngle !== 'undefined' ? o.pannerAttr.coneOuterAngle : self._coneOuterAngle,
+            coneOuterGain: typeof o.pannerAttr.coneOuterGain !== 'undefined' ? o.pannerAttr.coneOuterGain : self._coneOuterGain,
+            distanceModel: typeof o.pannerAttr.distanceModel !== 'undefined' ? o.pannerAttr.distanceModel : self._distanceModel,
+            maxDistance: typeof o.pannerAttr.maxDistance !== 'undefined' ? o.pannerAttr.maxDistance : self._maxDistance,
+            refDistance: typeof o.pannerAttr.refDistance !== 'undefined' ? o.pannerAttr.refDistance : self._refDistance,
+            rolloffFactor: typeof o.pannerAttr.rolloffFactor !== 'undefined' ? o.pannerAttr.rolloffFactor : self._rolloffFactor,
+            panningModel: typeof o.pannerAttr.panningModel !== 'undefined' ? o.pannerAttr.panningModel : self._panningModel
+          };
+        }
+      } else {
+        // Return this sound's panner attribute values.
+        sound = self._soundById(parseInt(args[0], 10));
+        return sound ? sound._pannerAttr : self._pannerAttr;
+      }
+    } else if (args.length === 2) {
+      o = args[0];
+      id = parseInt(args[1], 10);
+    }
+
+    // Update the values of the specified sounds.
+    var ids = self._getSoundIds(id);
+    for (var i=0; i<ids.length; i++) {
+      sound = self._soundById(ids[i]);
+
+      if (sound) {
+        // Merge the new values into the sound.
+        var pa = sound._pannerAttr;
+        pa = {
+          coneInnerAngle: typeof o.coneInnerAngle !== 'undefined' ? o.coneInnerAngle : pa.coneInnerAngle,
+          coneOuterAngle: typeof o.coneOuterAngle !== 'undefined' ? o.coneOuterAngle : pa.coneOuterAngle,
+          coneOuterGain: typeof o.coneOuterGain !== 'undefined' ? o.coneOuterGain : pa.coneOuterGain,
+          distanceModel: typeof o.distanceModel !== 'undefined' ? o.distanceModel : pa.distanceModel,
+          maxDistance: typeof o.maxDistance !== 'undefined' ? o.maxDistance : pa.maxDistance,
+          refDistance: typeof o.refDistance !== 'undefined' ? o.refDistance : pa.refDistance,
+          rolloffFactor: typeof o.rolloffFactor !== 'undefined' ? o.rolloffFactor : pa.rolloffFactor,
+          panningModel: typeof o.panningModel !== 'undefined' ? o.panningModel : pa.panningModel
+        };
+
+        // Create a new panner node if one doesn't already exist.
+        var panner = sound._panner;
+        if (!panner) {
+          // Make sure we have a position to setup the node with.
+          if (!sound._pos) {
+            sound._pos = self._pos || [0, 0, -0.5];
+          }
+
+          // Create a new panner node.
+          setupPanner(sound, 'spatial');
+          panner = sound._panner
+        }
+
+        // Update the panner values or create a new panner if none exists.
+        panner.coneInnerAngle = pa.coneInnerAngle;
+        panner.coneOuterAngle = pa.coneOuterAngle;
+        panner.coneOuterGain = pa.coneOuterGain;
+        panner.distanceModel = pa.distanceModel;
+        panner.maxDistance = pa.maxDistance;
+        panner.refDistance = pa.refDistance;
+        panner.rolloffFactor = pa.rolloffFactor;
+        panner.panningModel = pa.panningModel;
+      }
+    }
+
+    return self;
+  };
+
+  /** Single Sound Methods **/
+  /***************************************************************************/
+
+  /**
+   * Add new properties to the core Sound init.
+   * @param  {Function} _super Core Sound init method.
+   * @return {Sound}
+   */
+  Sound.prototype.init = (function(_super) {
+    return function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Setup user-defined default properties.
+      self._orientation = parent._orientation;
+      self._stereo = parent._stereo;
+      self._pos = parent._pos;
+      self._pannerAttr = parent._pannerAttr;
+
+      // Complete initilization with howler.js core Sound's init function.
+      _super.call(this);
+
+      // If a stereo or position was specified, set it up.
+      if (self._stereo) {
+        parent.stereo(self._stereo);
+      } else if (self._pos) {
+        parent.pos(self._pos[0], self._pos[1], self._pos[2], self._id);
+      }
+    };
+  })(Sound.prototype.init);
+
+  /**
+   * Override the Sound.reset method to clean up properties from the spatial plugin.
+   * @param  {Function} _super Sound reset method.
+   * @return {Sound}
+   */
+  Sound.prototype.reset = (function(_super) {
+    return function() {
+      var self = this;
+      var parent = self._parent;
+
+      // Reset all spatial plugin properties on this sound.
+      self._orientation = parent._orientation;
+      self._stereo = parent._stereo;
+      self._pos = parent._pos;
+      self._pannerAttr = parent._pannerAttr;
+
+      // If a stereo or position was specified, set it up.
+      if (self._stereo) {
+        parent.stereo(self._stereo);
+      } else if (self._pos) {
+        parent.pos(self._pos[0], self._pos[1], self._pos[2], self._id);
+      } else if (self._panner) {
+        // Disconnect the panner.
+        self._panner.disconnect(0);
+        self._panner = undefined;
+        parent._refreshBuffer(self);
+      }
+
+      // Complete resetting of the sound.
+      return _super.call(this);
+    };
+  })(Sound.prototype.reset);
+
+  /** Helper Methods **/
+  /***************************************************************************/
+
+  /**
+   * Create a new panner node and save it on the sound.
+   * @param  {Sound} sound Specific sound to setup panning on.
+   * @param {String} type Type of panner to create: 'stereo' or 'spatial'.
+   */
+  var setupPanner = function(sound, type) {
+    type = type || 'spatial';
+
+    // Create the new panner node.
+    if (type === 'spatial') {
+      sound._panner = Howler.ctx.createPanner();
+      sound._panner.coneInnerAngle = sound._pannerAttr.coneInnerAngle;
+      sound._panner.coneOuterAngle = sound._pannerAttr.coneOuterAngle;
+      sound._panner.coneOuterGain = sound._pannerAttr.coneOuterGain;
+      sound._panner.distanceModel = sound._pannerAttr.distanceModel;
+      sound._panner.maxDistance = sound._pannerAttr.maxDistance;
+      sound._panner.refDistance = sound._pannerAttr.refDistance;
+      sound._panner.rolloffFactor = sound._pannerAttr.rolloffFactor;
+      sound._panner.panningModel = sound._pannerAttr.panningModel;
+
+      if (typeof sound._panner.positionX !== 'undefined') {
+        sound._panner.positionX.setValueAtTime(sound._pos[0], Howler.ctx.currentTime);
+        sound._panner.positionY.setValueAtTime(sound._pos[1], Howler.ctx.currentTime);
+        sound._panner.positionZ.setValueAtTime(sound._pos[2], Howler.ctx.currentTime);
+      } else {
+        sound._panner.setPosition(sound._pos[0], sound._pos[1], sound._pos[2]);
+      }
+
+      if (typeof sound._panner.orientationX !== 'undefined') {
+        sound._panner.orientationX.setValueAtTime(sound._orientation[0], Howler.ctx.currentTime);
+        sound._panner.orientationY.setValueAtTime(sound._orientation[1], Howler.ctx.currentTime);
+        sound._panner.orientationZ.setValueAtTime(sound._orientation[2], Howler.ctx.currentTime);
+      } else {
+        sound._panner.setOrientation(sound._orientation[0], sound._orientation[1], sound._orientation[2]);
+      }
+    } else {
+      sound._panner = Howler.ctx.createStereoPanner();
+      sound._panner.pan.setValueAtTime(sound._stereo, Howler.ctx.currentTime);
+    }
+
+    sound._panner.connect(sound._node);
+
+    // Update the connections.
+    if (!sound._paused) {
+      sound._parent.pause(sound._id, true).play(sound._id, true);
+    }
+  };
+})();
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/README.md b/uni_modules/c-svga/node_modules/svgaplayer-weapp/README.md
new file mode 100644
index 0000000..3d9b92e
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/README.md
@@ -0,0 +1,233 @@
+# svgaplayer-weapp
+
+专为微信小程序开发的 SVGA 播放器，已在 iOS 及 Android 手机上测试通过。
+
+示例代码片段 https://developers.weixin.qq.com/s/grK1TTmt7pth
+
+请仔细阅读文档和示例，如有疑问，可添加作者微信(ponycui)，可提供技术服务。
+
+## 支持本仓库
+
+轻点 GitHub Star，让更多人看到该项目。
+
+关注作者另外一个开源项目，[MPFlutter](https://mpflutter.com)，使用 Flutter 开发微信小程序。
+
+## 安装方法
+
+### 原生小程序
+
+1. 直接复制 `./dist/svgaplayer.weapp.js` 到你的小程序工程目录下。
+
+2. 在需要添加播放器的 `wxml` 文件内，添加 `canvas` 组件，注意 canvas 的 id 必填，下一步会用到，type 必须为 2d。
+
+```xml
+<view class="container">
+  <canvas id="demoCanvas" type="2d" style="width: 300px; height: 300px; background-color: black"></canvas>
+</view>
+```
+
+3. 在需要播放的时机，这里是 `onLoad`，执行以下代码，即可播放动画。
+
+```js
+const { Parser, Player } = require("../../libs/svgaplayer.weapp"); // 此处替换为 svgaplayer.weapp.js 放置位置
+
+Page({
+  data: {
+  },
+  async onLoad() {
+    try {
+      const parser = new Parser;
+      const player = new Player;
+      await player.setCanvas('#demoCanvas')
+      const videoItem = await parser.load("https://cdn.jsdelivr.net/gh/svga/SVGA-Samples@master/angel.svga");
+      await player.setVideoItem(videoItem);
+      player.startAnimation();
+    } catch (error) {
+      console.log(error);
+    }
+  },
+})
+```
+
+### 原生小程序（支付宝）
+1. 直接复制 `./dist/svgaplayer.weapp.js` 到你的小程序工程目录下。
+
+2. 由于需要使用到[my.getFileSystemManager](https://opendocs.alipay.com/mini/api/0226oc)相关的API，请先为小程序添加[文件管理器](https://opendocs.alipay.com/mini/introduce/022rw2#%E6%B7%BB%E5%8A%A0%E8%83%BD%E5%8A%9B)能力。添加完毕后需要重新预览方可调用相关API。
+
+3. 在需要添加播放器的 `axml` 文件内，添加 `canvas` 组件，注意 canvas 的 id 必填，后面会用到，且type 必须为 2d。因为svga动画所需的各项前置能力支付宝基础库2.7.3以上才全部支持，请确保支付宝小程序已[启用基础库2.0](https://opendocs.alipay.com/mini/framework/lib-upgrade-v2)。
+
+```xml
+<!-- page.axml -->
+<view class="container">
+  <canvas id="demoCanvas" type="2d" onReady="onCanvasReady" style="width: 300px; height: 300px; background-color: black"></canvas>
+</view>
+```
+
+4. 在需要播放的时机，播放svga逻辑请在[onReady事件](https://opendocs.alipay.com/mini/component/canvas)触发之后执行，在这个时刻之前执行可能因native canvas还未初始化完毕而出现异常。
+
+5. 若需要读取本地文件，需要在`mini.project.json`内配置需要读取的内容。例如
+```json
+{
+  "include": [
+    "assets/*.svg"
+  ]
+}
+```
+
+```js
+const { Parser, Player } = require("../../libs/svgaplayer.weapp"); // 此处替换为 svgaplayer.weapp.js 放置位置
+
+Page({
+  data: {
+  },
+  async onCanvasReady() {
+    try {
+      const parser = new Parser;
+      const player = new Player;
+      await player.setCanvas('#demoCanvas')
+      // await player.setCanvas('#demoCanvas', this.selectComponent('#component_id'))
+      const videoItem = await parser.load("https://cdn.jsdelivr.net/gh/svga/SVGA-Samples@master/angel.svga");
+      await player.setVideoItem(videoItem);
+      player.startAnimation();
+    } catch (error) {
+      console.log(error);
+    }
+  },
+})
+```
+
+### Taro
+
+1. 通过 `npm install git+https://github.com/svga/svgaplayer-weapp.git --save` 安装依赖。
+
+2. 参照以下代码添加 Canvas 并配置动画。
+
+```typescript
+import { Component } from 'react'
+import { View, Text, Canvas } from '@tarojs/components'
+import { Parser, Player } from "svgaplayer-weapp";
+
+import "taro-ui/dist/style/components/button.scss" // 按需引入
+import './index.scss'
+
+export default class Index extends Component {
+
+  componentDidMount () {
+    this.loadAnimation();
+  }
+
+  async loadAnimation() {
+    const parser = new Parser;
+    const player = new Player;
+    await player.setCanvas('#demoCanvas')
+    const videoItem = await parser.load("https://cdn.jsdelivr.net/gh/svga/SVGA-Samples@master/angel.svga");
+    await player.setVideoItem(videoItem);
+    player.startAnimation();
+  }
+
+  render () {
+    return (
+      <View className='index'>
+        <Canvas type="2d" id="demoCanvas" style={{width: "300px", height: "300px", backgroundColor: "black"}} />
+      </View>
+    )
+  }
+}
+```
+
+### Types
+
+npm 包已附带 `Types`，可支持 `TypeScript` 代码提示。
+
+## API
+
+### Parser
+
+`load(url: string): Promise<VideoEntity>`
+
+从网络或本地资源包加载 `VideoEntity`。
+
+### Player
+
+`loops = 0`
+属性，设置当前动画的循环次数，0代表无限循环。
+
+`clearsAfterStop = true`
+属性，为 true 时，表示动画停止播放后默认清空画布。
+
+`fillMode = "Forward"`
+属性，为 Forward 时，表示动画播放结束后保留在最后一帧。为 Backward 时，表示保留在第一帧。
+
+`async setCanvas(selector: string, component?: Component.TrivialInstance): Promise<any>`
+设置目标 canvas，这里需要填入 selector，比如 id="demoCanvas"，则填 #demoCanvas。
+如果 Canvas 在组件内，则在第二个参数填入 Component 的实例。
+
+`async setVideoItem(videoItem?: VideoEntity): Promise<any>`
+设置需要播放的 `VideoEntity` 动画实体。
+
+`setContentMode(contentMode: string)`
+设置动画缩放模式，可选值为 Fill / AspectFill / AspectFit。
+
+`startAnimation(reverse: boolean = false)`
+开始播放动画，reverse = true 时则反向播放。
+
+`startAnimationWithRange(range: Range, reverse: boolean = false)`
+开始播放动画，在指定 `Range` 内播放。
+
+`pauseAnimation()`
+暂停播放动画。
+
+`stopAnimation(clear?: boolean)`
+停止播放动画，当 clear 为 true 时，清空画布。
+
+`clear()`
+清空画布
+
+`stepToFrame(frame: number, andPlay: boolean = false)`
+跳转动画的指定帧，andPlay 为 true 时，从该帧开始播放动画。
+
+`stepToPercentage(percentage: number, andPlay: boolean = false)`
+跳转动画的指定进度百分比，andPlay 为 true 时，从该帧开始播放动画。
+
+`async setImage(src: Uint8Array | string, forKey: string): Promise<any>`
+使用图片替换指定元素
+
+`setText(dynamicText: DynamicText, forKey: string)`
+添加文本到指定元素上
+
+`clearDynamicObjects()`
+清空所有替换元素。
+
+`onFinished(callback: () => void)`
+监听动画完成
+
+`onFrame(callback: (frame: number) => void)`
+监听动画播放过程中，当前帧的变化。
+
+`onPercentage(callback: (percentage: number) => void)`
+监听动画播放过程中，当前进度的变化。
+
+### Range
+
+```js
+interface Range {
+  location: number; // 起始帧
+  length: number; // 长度
+}
+```
+
+### DynamicText
+
+```js
+interface DynamicText {
+  text: string;
+  size: number;
+  family: string;
+  color: string;
+  offset: { x: number; y: number };
+}
+```
+
+## 感谢或联系作者
+
+![](https://cdn.jsdelivr.net/gh/PonyCui/ponycui.github.io@master/contact.png)
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/build.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/build.js
new file mode 100644
index 0000000..2caebda
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/build.js
@@ -0,0 +1,13 @@
+var browserify = require("browserify");
+var tsify = require("tsify");
+var tinyify = require("tinyify");
+
+browserify({ standalone: "SVGA" })
+  .add("./src/main.ts")
+  .plugin(tsify, { noImplicitAny: true })
+  .plugin(tinyify, { flat: false })
+  .bundle()
+  .on("error", function (error) {
+    console.error(error.toString());
+  })
+  .pipe(process.stdout);
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/dist/svgaplayer.weapp.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/dist/svgaplayer.weapp.js
new file mode 100644
index 0000000..313d6d4
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/dist/svgaplayer.weapp.js
@@ -0,0 +1 @@
+!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).SVGA=t()}}((function(){return function t(e,r,i){function n(s,a){if(!r[s]){if(!e[s]){var u="function"==typeof require&&require;if(!a&&u)return u(s,!0);if(o)return o(s,!0);var h=new Error("Cannot find module '"+s+"'");throw h.code="MODULE_NOT_FOUND",h}var l=r[s]={exports:{}};e[s][0].call(l.exports,(function(t){return n(e[s][1][t]||t)}),l,l.exports,t,e,r,i)}return r[s].exports}for(var o="function"==typeof require&&require,s=0;s<i.length;s++)n(i[s]);return n}({1:[function(t,e,r){"use strict";e.exports=function(){var e={};function r(){e.converter._configure(),e.decoder._configure(),e.Field._configure(),e.MapField._configure(),e.Message._configure(),e.Namespace._configure(),e.Method._configure(),e.ReflectionObject._configure(),e.OneOf._configure(),e.parse._configure(),e.Reader._configure(),e.Root._configure(),e.Service._configure(),e.verifier._configure(),e.Type._configure(),e.types._configure(),e.wrappers._configure(),e.Writer._configure()}if(e.build="minimal",e.Writer=t(34),e.Reader=t(22),e.util=t(31),e.rpc=t(25),e.roots=t(24),e.verifier=t(32),e.tokenize=t(27),e.parse=t(19),e.common=t(5),e.ReflectionObject=t(17),e.Namespace=t(16),e.Root=t(23),e.Enum=t(8),e.Type=t(28),e.Field=t(9),e.OneOf=t(18),e.MapField=t(13),e.Service=t(26),e.Method=t(15),e.converter=t(6),e.decoder=t(7),e.Message=t(14),e.wrappers=t(33),e.types=t(29),e.util=t(31),e.configure=r,e.load=function(t,r,i){return"function"==typeof r?(i=r,r=new e.Root):r||(r=new e.Root),r.load(t,i)},e.loadSync=function(t,r){return r||(r=new e.Root),r.loadSync(t)},e.parseFromPbString=function(t,r,i){return"function"==typeof r?(i=r,r=new e.Root):r||(r=new e.Root),r.parseFromPbString(t,i)},r(),arguments&&arguments.length)for(var i=0;i<arguments.length;i++){var n=arguments[i];if(n.hasOwnProperty("exports"))return void(n.exports=e)}return e}()},{13:13,14:14,15:15,16:16,17:17,18:18,19:19,22:22,23:23,24:24,25:25,26:26,27:27,28:28,29:29,31:31,32:32,33:33,34:34,5:5,6:6,7:7,8:8,9:9}],24:[function(t,e,r){"use strict";e.exports={}},{}],27:[function(t,e,r){"use strict";e.exports=d;var i=/[\s{}=;:[\],'"()<>]/g,n=/(?:"([^"\\]*(?:\\.[^"\\]*)*)")/g,o=/(?:'([^'\\]*(?:\\.[^'\\]*)*)')/g,s=/^ *[*/]+ */,a=/^\s*\*?\/*/,u=/\n/g,h=/\s/,l=/\\(.?)/g,f={0:"\0",r:"\r",n:"\n",t:"\t"};function c(t){return t.replace(l,(function(t,e){switch(e){case"\\":case"":return e;default:return f[e]||""}}))}function d(t,e){t=t.toString();var r=0,l=t.length,f=1,d=null,p=null,y=0,m=!1,v=[],g=null;function b(t){return Error("illegal "+t+" (line "+f+")")}function w(e){return t.charAt(e)}function _(r,i){d=t.charAt(r++),y=f,m=!1;var n,o=r-(e?2:3);do{if(--o<0||"\n"===(n=t.charAt(o))){m=!0;break}}while(" "===n||"\t"===n);for(var h=t.substring(r,i).split(u),l=0;l<h.length;++l)h[l]=h[l].replace(e?a:s,"").trim();p=h.join("\n").trim()}function x(e){var r=k(e),i=t.substring(e,r);return/^\s*\/{1,2}/.test(i)}function k(t){for(var e=t;e<l&&"\n"!==w(e);)e++;return e}function A(){if(v.length>0)return v.shift();if(g)return function(){var e="'"===g?o:n;e.lastIndex=r-1;var i=e.exec(t);if(!i)throw b("string");return r=e.lastIndex,O(g),g=null,c(i[1])}();var s,a,u,d,p;do{if(r===l)return null;for(s=!1;h.test(u=w(r));)if("\n"===u&&++f,++r===l)return null;if("/"===w(r)){if(++r===l)throw b("comment");if("/"===w(r))if(e){if(d=r,p=!1,x(r)){p=!0;do{if((r=k(r))===l)break;r++}while(x(r))}else r=Math.min(l,k(r)+1);p&&_(d,r),f++,s=!0}else{for(p="/"===w(d=r+1);"\n"!==w(++r);)if(r===l)return null;++r,p&&_(d,r-1),++f,s=!0}else{if("*"!==(u=w(r)))return"/";d=r+1,p=e||"*"===w(d);do{if("\n"===u&&++f,++r===l)throw b("comment");a=u,u=w(r)}while("*"!==a||"/"!==u);++r,p&&_(d,r-2),s=!0}}}while(s);var y=r;if(i.lastIndex=0,!i.test(w(y++)))for(;y<l&&!i.test(w(y));)++y;var m=t.substring(r,r=y);return'"'!==m&&"'"!==m||(g=m),m}function O(t){v.push(t)}function S(){if(!v.length){var t=A();if(null===t)return null;O(t)}return v[0]}return Object.defineProperty({next:A,peek:S,push:O,skip:function(t,e){var r=S();if(r===t)return A(),!0;if(!e)throw b("token '"+r+"', '"+t+"' expected");return!1},cmnt:function(t){var r=null;return void 0===t?y===f-1&&(e||"*"===d||m)&&(r=p):(y<t&&S(),y!==t||m||!e&&"/"!==d||(r=p)),r}},"line",{get:function(){return f}})}d.unescape=c},{}],5:[function(t,e,r){"use strict";e.exports=o;var i,n=/\/|\./;function o(t,e){n.test(t)||(t="google/protobuf/"+t+".proto",e={nested:{google:{nested:{protobuf:{nested:e}}}}}),o[t]=e}o("any",{Any:{fields:{type_url:{type:"string",id:1},value:{type:"bytes",id:2}}}}),o("duration",{Duration:i={fields:{seconds:{type:"int64",id:1},nanos:{type:"int32",id:2}}}}),o("timestamp",{Timestamp:i}),o("empty",{Empty:{fields:{}}}),o("struct",{Struct:{fields:{fields:{keyType:"string",type:"Value",id:1}}},Value:{oneofs:{kind:{oneof:["nullValue","numberValue","stringValue","boolValue","structValue","listValue"]}},fields:{nullValue:{type:"NullValue",id:1},numberValue:{type:"double",id:2},stringValue:{type:"string",id:3},boolValue:{type:"bool",id:4},structValue:{type:"Struct",id:5},listValue:{type:"ListValue",id:6}}},NullValue:{values:{NULL_VALUE:0}},ListValue:{fields:{values:{rule:"repeated",type:"Value",id:1}}}}),o("wrappers",{DoubleValue:{fields:{value:{type:"double",id:1}}},FloatValue:{fields:{value:{type:"float",id:1}}},Int64Value:{fields:{value:{type:"int64",id:1}}},UInt64Value:{fields:{value:{type:"uint64",id:1}}},Int32Value:{fields:{value:{type:"int32",id:1}}},UInt32Value:{fields:{value:{type:"uint32",id:1}}},BoolValue:{fields:{value:{type:"bool",id:1}}},StringValue:{fields:{value:{type:"string",id:1}}},BytesValue:{fields:{value:{type:"bytes",id:1}}}}),o("field_mask",{FieldMask:{fields:{paths:{rule:"repeated",type:"string",id:1}}}}),o.get=function(t){return o[t]||null}},{}],22:[function(t,e,r){"use strict";e.exports=a;var i,n,o=t(31);function s(t,e){return RangeError("index out of range: "+t.pos+" + "+(e||1)+" > "+t.len)}function a(t){this.buf=t,this.pos=0,this.len=t.length}var u,h="undefined"!=typeof Uint8Array?function(t){if(t instanceof Uint8Array||Array.isArray(t))return new a(t);if("undefined"!=typeof ArrayBuffer&&t instanceof ArrayBuffer)return new a(new Uint8Array(t));throw Error("illegal buffer")}:function(t){if(Array.isArray(t))return new a(t);throw Error("illegal buffer")};function l(){var t=new i(0,0),e=0;if(!(this.len-this.pos>4)){for(;e<3;++e){if(this.pos>=this.len)throw s(this);if(t.lo=(t.lo|(127&this.buf[this.pos])<<7*e)>>>0,this.buf[this.pos++]<128)return t}return t.lo=(t.lo|(127&this.buf[this.pos++])<<7*e)>>>0,t}for(;e<4;++e)if(t.lo=(t.lo|(127&this.buf[this.pos])<<7*e)>>>0,this.buf[this.pos++]<128)return t;if(t.lo=(t.lo|(127&this.buf[this.pos])<<28)>>>0,t.hi=(t.hi|(127&this.buf[this.pos])>>4)>>>0,this.buf[this.pos++]<128)return t;if(e=0,this.len-this.pos>4){for(;e<5;++e)if(t.hi=(t.hi|(127&this.buf[this.pos])<<7*e+3)>>>0,this.buf[this.pos++]<128)return t}else for(;e<5;++e){if(this.pos>=this.len)throw s(this);if(t.hi=(t.hi|(127&this.buf[this.pos])<<7*e+3)>>>0,this.buf[this.pos++]<128)return t}throw Error("invalid varint encoding")}function f(t,e){return(t[e-4]|t[e-3]<<8|t[e-2]<<16|t[e-1]<<24)>>>0}function c(){if(this.pos+8>this.len)throw s(this,8);return new i(f(this.buf,this.pos+=4),f(this.buf,this.pos+=4))}a.create=o.Buffer?function(t){return(a.create=function(t){return o.Buffer.isBuffer(t)?new(void 0)(t):h(t)})(t)}:h,a.prototype._slice=o.Array.prototype.subarray||o.Array.prototype.slice,a.prototype.uint32=(u=4294967295,function(){if(u=(127&this.buf[this.pos])>>>0,this.buf[this.pos++]<128)return u;if(u=(u|(127&this.buf[this.pos])<<7)>>>0,this.buf[this.pos++]<128)return u;if(u=(u|(127&this.buf[this.pos])<<14)>>>0,this.buf[this.pos++]<128)return u;if(u=(u|(127&this.buf[this.pos])<<21)>>>0,this.buf[this.pos++]<128)return u;if(u=(u|(15&this.buf[this.pos])<<28)>>>0,this.buf[this.pos++]<128)return u;if((this.pos+=5)>this.len)throw this.pos=this.len,s(this,10);return u}),a.prototype.int32=function(){return 0|this.uint32()},a.prototype.sint32=function(){var t=this.uint32();return t>>>1^-(1&t)|0},a.prototype.bool=function(){return 0!==this.uint32()},a.prototype.fixed32=function(){if(this.pos+4>this.len)throw s(this,4);return f(this.buf,this.pos+=4)},a.prototype.sfixed32=function(){if(this.pos+4>this.len)throw s(this,4);return 0|f(this.buf,this.pos+=4)},a.prototype.float=function(){if(this.pos+4>this.len)throw s(this,4);var t=o.float.readFloatLE(this.buf,this.pos);return this.pos+=4,t},a.prototype.double=function(){if(this.pos+8>this.len)throw s(this,4);var t=o.float.readDoubleLE(this.buf,this.pos);return this.pos+=8,t},a.prototype.bytes=function(){var t=this.uint32(),e=this.pos,r=this.pos+t;if(r>this.len)throw s(this,t);return this.pos+=t,Array.isArray(this.buf)?this.buf.slice(e,r):e===r?new this.buf.constructor(0):this._slice.call(this.buf,e,r)},a.prototype.string=function(){var t=this.bytes();return n.read(t,0,t.length)},a.prototype.skip=function(t){if("number"==typeof t){if(this.pos+t>this.len)throw s(this,t);this.pos+=t}else do{if(this.pos>=this.len)throw s(this)}while(128&this.buf[this.pos++]);return this},a.prototype.skipType=function(t){switch(t){case 0:this.skip();break;case 1:this.skip(8);break;case 2:this.skip(this.uint32());break;case 3:for(;4!=(t=7&this.uint32());)this.skipType(t);break;case 5:this.skip(4);break;default:throw Error("invalid wire type "+t+" at offset "+this.pos)}return this},a._configure=function(){i=t(12),n=t(30);var e=o.Long?"toLong":"toNumber";o.merge(a.prototype,{int64:function(){return l.call(this)[e](!1)},uint64:function(){return l.call(this)[e](!0)},sint64:function(){return l.call(this).zzDecode()[e](!1)},fixed64:function(){return c.call(this)[e](!0)},sfixed64:function(){return c.call(this)[e](!1)}})}},{12:12,30:30,31:31}],32:[function(t,e,r){"use strict";var i,n;function o(t,e){return t.name+": "+e+(t.repeated&&"array"!==e?"[]":t.map&&"object"!==e?"{k:"+t.keyType+"}":"")+" expected"}function s(t,e,r,s){var a=s.types;if(t.resolvedType)if(t.resolvedType instanceof i){if(Object.keys(t.resolvedType.values).indexOf(r)<0)return o(t,"enum value")}else{var u=a[e].verify(r);if(u)return t.name+"."+u}else switch(t.type){case"int32":case"uint32":case"sint32":case"fixed32":case"sfixed32":if(!n.isInteger(r))return o(t,"integer");break;case"int64":case"uint64":case"sint64":case"fixed64":case"sfixed64":if(!(n.isInteger(r)||r&&n.isInteger(r.low)&&n.isInteger(r.high)))return o(t,"integer|Long");break;case"float":case"double":if("number"!=typeof r)return o(t,"number");break;case"bool":if("boolean"!=typeof r)return o(t,"boolean");break;case"string":if(!n.isString(r))return o(t,"string");break;case"bytes":if(!(r&&"number"==typeof r.length||n.isString(r)))return o(t,"buffer")}}function a(t,e){switch(t.keyType){case"int32":case"uint32":case"sint32":case"fixed32":case"sfixed32":if(!n.key32Re.test(e))return o(t,"integer key");break;case"int64":case"uint64":case"sint64":case"fixed64":case"sfixed64":if(!n.key64Re.test(e))return o(t,"integer|Long key");break;case"bool":if(!n.key2Re.test(e))return o(t,"boolean key")}}function u(t){return function(e){return function(r){var i;if("object"!=typeof r||null===r)return"object expected";var u,h={};t.oneofsArray.length&&(u={});for(var l=0;l<t.fieldsArray.length;++l){var f,c=t._fieldsArray[l].resolve(),d=r[c.name];if(!c.optional||null!=d&&r.hasOwnProperty(c.name))if(c.map){if(!n.isObject(d))return o(c,"object");var p=Object.keys(d);for(f=0;f<p.length;++f){if(i=a(c,p[f]))return i;if(i=s(c,l,d[p[f]],e))return i}}else if(c.repeated){if(!Array.isArray(d))return o(c,"array");for(f=0;f<d.length;++f)if(i=s(c,l,d[f],e))return i}else{if(c.partOf){var y=c.partOf.name;if(1===h[c.partOf.name]&&1===u[y])return c.partOf.name+": multiple values";u[y]=1}if(i=s(c,l,d,e))return i}}}}}e.exports=u,u._configure=function(){i=t(8),n=t(31)}},{31:31,8:8}],19:[function(t,e,r){"use strict";var i,n,o,s,a,u,h,l,f,c,d;e.exports=A,A.filename=null,A.defaults={keepCase:!1};var p=/^[1-9][0-9]*$/,y=/^-?[1-9][0-9]*$/,m=/^0[x][0-9a-fA-F]+$/,v=/^-?0[x][0-9a-fA-F]+$/,g=/^0[0-7]+$/,b=/^-?0[0-7]+$/,w=/^(?![eE])[0-9]*(?:\.[0-9]*)?(?:[eE][+-]?[0-9]+)?$/,_=/^[a-zA-Z_][a-zA-Z_0-9]*$/,x=/^(?:\.?[a-zA-Z_][a-zA-Z_0-9]*)+$/,k=/^(?:\.[a-zA-Z][a-zA-Z_0-9]*)+$/;function A(t,e,r){e instanceof n||(r=e,e=new n),r||(r=A.defaults);var O,S,E,N,T,j=i(t,r.alternateCommentMode||!1),R=j.next,F=j.push,I=j.peek,B=j.skip,P=j.cmnt,C=!0,M=!1,D=e,L=r.keepCase?function(t){return t}:d.camelCase;function z(t,e,r){var i=A.filename;return r||(A.filename=null),Error("illegal "+(e||"token")+" '"+t+"' ("+(i?i+", ":"")+"line "+j.line+")")}function V(){var t,e=[];do{if('"'!==(t=R())&&"'"!==t)throw z(t);e.push(R()),B(t),t=I()}while('"'===t||"'"===t);return e.join("")}function Z(t){var e=R();switch(e){case"'":case'"':return F(e),V();case"true":case"TRUE":return!0;case"false":case"FALSE":return!1}try{return function(t,e){var r=1;switch("-"===t.charAt(0)&&(r=-1,t=t.substring(1)),t){case"inf":case"INF":case"Inf":return r*(1/0);case"nan":case"NAN":case"Nan":case"NaN":return NaN;case"0":return 0}if(p.test(t))return r*parseInt(t,10);if(m.test(t))return r*parseInt(t,16);if(g.test(t))return r*parseInt(t,8);if(w.test(t))return r*parseFloat(t);throw z(t,"number",!0)}(e)}catch(r){if(t&&x.test(e))return e;throw z(e,"value")}}function U(t,e){var r,i;do{!e||'"'!==(r=I())&&"'"!==r?t.push([i=q(R()),B("to",!0)?q(R()):i]):t.push(V())}while(B(",",!0));B(";")}function q(t,e){switch(t){case"max":case"MAX":case"Max":return 536870911;case"0":return 0}if(!e&&"-"===t.charAt(0))throw z(t,"id");if(y.test(t))return parseInt(t,10);if(v.test(t))return parseInt(t,16);if(b.test(t))return parseInt(t,8);throw z(t,"id")}function J(){if(void 0!==O)throw z("package");if(O=R(),!x.test(O))throw z(O,"name");D=D.define(O),B(";")}function $(){var t,e=I();switch(e){case"weak":t=E||(E=[]),R();break;case"public":R();default:t=S||(S=[])}e=V(),B(";"),t.push(e)}function K(){if(B("="),N=V(),!(M="proto3"===N)&&"proto2"!==N)throw z(N,"syntax");B(";")}function H(t,e){switch(e){case"option":return G(t,e),B(";"),!0;case"message":return function(t,e){if(!_.test(e=R()))throw z(e,"type name");var r=new o(e);W(r,(function(t){if(!H(r,t))switch(t){case"map":!function(t){B("<");var e=R();if(void 0===c.mapKey[e])throw z(e,"type");B(",");var r=R();if(!x.test(r))throw z(r,"type");B(">");var i=R();if(!_.test(i))throw z(i,"name");B("=");var n=new a(L(i),q(R()),e,r);W(n,(function(t){if("option"!==t)throw z(t);G(n,t),B(";")}),(function(){tt(n)})),t.add(n)}(r);break;case"required":case"optional":case"repeated":X(r,t);break;case"oneof":!function(t,e){if(!_.test(e=R()))throw z(e,"name");var r=new u(L(e));W(r,(function(t){"option"===t?(G(r,t),B(";")):(F(t),X(r,"optional"))})),t.add(r)}(r,t);break;case"extensions":U(r.extensions||(r.extensions=[]));break;case"reserved":U(r.reserved||(r.reserved=[]),!0);break;default:if(!M||!x.test(t))throw z(t);F(t),X(r,"optional")}})),t.add(r)}(t,e),!0;case"enum":return function(t,e){if(!_.test(e=R()))throw z(e,"name");var r=new h(e);W(r,(function(t){switch(t){case"option":G(r,t),B(";");break;case"reserved":U(r.reserved||(r.reserved=[]),!0);break;default:!function(t,e){if(!_.test(e))throw z(e,"name");B("=");var r=q(R(),!0),i={};W(i,(function(t){if("option"!==t)throw z(t);G(i,t),B(";")}),(function(){tt(i)})),t.add(e,r,i.comment)}(r,t)}})),t.add(r)}(t,e),!0;case"service":return function(t,e){if(!_.test(e=R()))throw z(e,"service name");var r=new l(e);W(r,(function(t){if(!H(r,t)){if("rpc"!==t)throw z(t);!function(t,e){var r=e;if(!_.test(e=R()))throw z(e,"name");var i,n,o,s,a=e;if(B("("),B("stream",!0)&&(n=!0),!x.test(e=R()))throw z(e);if(i=e,B(")"),B("returns"),B("("),B("stream",!0)&&(s=!0),!x.test(e=R()))throw z(e);o=e,B(")");var u=new f(a,r,i,o,n,s);W(u,(function(t){if("option"!==t)throw z(t);G(u,t),B(";")})),t.add(u)}(r,t)}})),t.add(r)}(t,e),!0;case"extend":return function(t,e){if(!x.test(e=R()))throw z(e,"reference");var r=e;W(null,(function(e){switch(e){case"required":case"repeated":case"optional":X(t,e,r);break;default:if(!M||!x.test(e))throw z(e);F(e),X(t,"optional",r)}}))}(t,e),!0}return!1}function W(t,e,r){var i=j.line;if(t&&(t.comment=P(),t.filename=A.filename),B("{",!0)){for(var n;"}"!==(n=R());)e(n);B(";",!0)}else r&&r(),B(";"),t&&"string"!=typeof t.comment&&(t.comment=P(i))}function X(t,e,r){var i=R();if("group"!==i){if(!x.test(i))throw z(i,"type");var n=R();if(!_.test(n))throw z(n,"name");n=L(n),B("=");var a=new s(n,q(R()),i,e,r);W(a,(function(t){if("option"!==t)throw z(t);G(a,t),B(";")}),(function(){tt(a)})),t.add(a),M||!a.repeated||void 0===c.packed[i]&&void 0!==c.basic[i]||a.setOption("packed",!1,!0)}else!function(t,e){var r=R();if(!_.test(r))throw z(r,"name");var i=d.lcFirst(r);r===i&&(r=d.ucFirst(r)),B("=");var n=q(R()),a=new o(r);a.group=!0;var u=new s(i,n,r,e);u.filename=A.filename,W(a,(function(t){switch(t){case"option":G(a,t),B(";");break;case"required":case"optional":case"repeated":X(a,t);break;default:throw z(t)}})),t.add(a).add(u)}(t,e)}function G(t,e){var r=B("(",!0);if(!x.test(e=R()))throw z(e,"name");var i=e;r&&(B(")"),i="("+i+")",e=I(),k.test(e)&&(i+=e,R())),B("="),Y(t,i)}function Y(t,e){if(B("{",!0))do{if(!_.test(T=R()))throw z(T,"name");"{"===I()?Y(t,e+"."+T):(B(":"),"{"===I()?Y(t,e+"."+T):Q(t,e+"."+T,Z(!0)))}while(!B("}",!0));else Q(t,e,Z(!0))}function Q(t,e,r){t.setOption&&t.setOption(e,r)}function tt(t){if(B("[",!0)){do{G(t,"option")}while(B(",",!0));B("]")}return t}for(;null!==(T=R());)switch(T){case"package":if(!C)throw z(T);J();break;case"import":if(!C)throw z(T);$();break;case"syntax":if(!C)throw z(T);K();break;case"option":if(!C)throw z(T);G(D,T),B(";");break;default:if(H(D,T)){C=!1;continue}throw z(T)}return A.filename=null,{package:O,imports:S,weakImports:E,syntax:N,root:e}}A._configure=function(){i=t(27),n=t(23),o=t(28),s=t(9),a=t(13),u=t(18),h=t(8),l=t(26),f=t(15),c=t(29),d=t(31)}},{13:13,15:15,18:18,23:23,26:26,27:27,28:28,29:29,31:31,8:8,9:9}],17:[function(t,e,r){"use strict";var i,n;function o(t,e){if(!i.isString(t))throw TypeError("name must be a string");if(e&&!i.isObject(e))throw TypeError("options must be an object");this.options=e,this.name=t,this.parent=null,this.resolved=!1,this.comment=null,this.filename=null}e.exports=o,o.className="ReflectionObject",Object.defineProperties(o.prototype,{root:{get:function(){for(var t=this;null!==t.parent;)t=t.parent;return t}},fullName:{get:function(){for(var t=[this.name],e=this.parent;e;)t.unshift(e.name),e=e.parent;return t.join(".")}}}),o.prototype.toJSON=function(){throw Error()},o.prototype.onAdd=function(t){this.parent&&this.parent!==t&&this.parent.remove(this),this.parent=t,this.resolved=!1;var e=t.root;e instanceof n&&e._handleAdd(this)},o.prototype.onRemove=function(t){var e=t.root;e instanceof n&&e._handleRemove(this),this.parent=null,this.resolved=!1},o.prototype.resolve=function(){return this.resolved||this.root instanceof n&&(this.resolved=!0),this},o.prototype.getOption=function(t){if(this.options)return this.options[t]},o.prototype.setOption=function(t,e,r){return r&&this.options&&void 0!==this.options[t]||((this.options||(this.options={}))[t]=e),this},o.prototype.setOptions=function(t,e){if(t)for(var r=Object.keys(t),i=0;i<r.length;++i)this.setOption(r[i],t[r[i]],e);return this},o.prototype.toString=function(){var t=this.constructor.className,e=this.fullName;return e.length?t+" "+e:t},o._configure=function(e){n=t(23),i=t(31)}},{23:23,31:31}],16:[function(t,e,r){"use strict";e.exports=l;var i,n,o,s,a,u=t(17);function h(t,e){if(t&&t.length){for(var r={},i=0;i<t.length;++i)r[t[i].name]=t[i].toJSON(e);return r}}function l(t,e){u.call(this,t,e),this.nested=void 0,this._nestedArray=null}function f(t){return t._nestedArray=null,t}((l.prototype=Object.create(u.prototype)).constructor=l).className="Namespace",l.fromJSON=function(t,e){return new l(t,e.options).addJSON(e.nested)},l.arrayToJSON=h,l.isReservedId=function(t,e){if(t)for(var r=0;r<t.length;++r)if("string"!=typeof t[r]&&t[r][0]<=e&&t[r][1]>=e)return!0;return!1},l.isReservedName=function(t,e){if(t)for(var r=0;r<t.length;++r)if(t[r]===e)return!0;return!1},Object.defineProperty(l.prototype,"nestedArray",{get:function(){return this._nestedArray||(this._nestedArray=o.toArray(this.nested))}}),l.prototype.toJSON=function(t){return o.toObject(["options",this.options,"nested",h(this.nestedArray,t)])},l.prototype.addJSON=function(t){if(t)for(var e,r=Object.keys(t),o=0;o<r.length;++o)e=t[r[o]],this.add((void 0!==e.fields?s.fromJSON:void 0!==e.values?i.fromJSON:void 0!==e.methods?a.fromJSON:void 0!==e.id?n.fromJSON:l.fromJSON)(r[o],e));return this},l.prototype.get=function(t){return this.nested&&this.nested[t]||null},l.prototype.getEnum=function(t){if(this.nested&&this.nested[t]instanceof i)return this.nested[t].values;throw Error("no such enum: "+t)},l.prototype.add=function(t){if(!(t instanceof n&&void 0!==t.extend||t instanceof s||t instanceof i||t instanceof a||t instanceof l))throw TypeError("object must be a valid nested object");if(this.nested){var e=this.get(t.name);if(e){if(!(e instanceof l&&t instanceof l)||e instanceof s||e instanceof a)throw Error("duplicate name '"+t.name+"' in "+this);for(var r=e.nestedArray,o=0;o<r.length;++o)t.add(r[o]);this.remove(e),this.nested||(this.nested={}),t.setOptions(e.options,!0)}}else this.nested={};return this.nested[t.name]=t,t.onAdd(this),f(this)},l.prototype.remove=function(t){if(!(t instanceof u))throw TypeError("object must be a ReflectionObject");if(t.parent!==this)throw Error(t+" is not a member of "+this);return delete this.nested[t.name],Object.keys(this.nested).length||(this.nested=void 0),t.onRemove(this),f(this)},l.prototype.define=function(t,e){if(o.isString(t))t=t.split(".");else if(!Array.isArray(t))throw TypeError("illegal path");if(t&&t.length&&""===t[0])throw Error("path must be relative");for(var r=this;t.length>0;){var i=t.shift();if(r.nested&&r.nested[i]){if(!((r=r.nested[i])instanceof l))throw Error("path conflicts with non-namespace objects")}else r.add(r=new l(i))}return e&&r.addJSON(e),r},l.prototype.resolveAll=function(){for(var t=this.nestedArray,e=0;e<t.length;)t[e]instanceof l?t[e++].resolveAll():t[e++].resolve();return this.resolve()},l.prototype.lookup=function(t,e,r){if("boolean"==typeof e?(r=e,e=void 0):e&&!Array.isArray(e)&&(e=[e]),o.isString(t)&&t.length){if("."===t)return this.root;t=t.split(".")}else if(!t.length)return this;if(""===t[0])return this.root.lookup(t.slice(1),e);var i=this.get(t[0]);if(i){if(1===t.length){if(!e||e.indexOf(i.constructor)>-1)return i}else if(i instanceof l&&(i=i.lookup(t.slice(1),e,!0)))return i}else for(var n=0;n<this.nestedArray.length;++n)if(this._nestedArray[n]instanceof l&&(i=this._nestedArray[n].lookup(t,e,!0)))return i;return null===this.parent||r?null:this.parent.lookup(t,e)},l.prototype.lookupType=function(t){var e=this.lookup(t,[s]);if(!e)throw Error("no such type: "+t);return e},l.prototype.lookupEnum=function(t){var e=this.lookup(t,[i]);if(!e)throw Error("no such Enum '"+t+"' in "+this);return e},l.prototype.lookupTypeOrEnum=function(t){var e=this.lookup(t,[s,i]);if(!e)throw Error("no such Type or Enum '"+t+"' in "+this);return e},l.prototype.lookupService=function(t){var e=this.lookup(t,[a]);if(!e)throw Error("no such Service '"+t+"' in "+this);return e},l._configure=function(){i=t(8),n=t(9),o=t(31),s=t(28),a=t(26)}},{17:17,26:26,28:28,31:31,8:8,9:9}],8:[function(t,e,r){"use strict";e.exports=o;var i=t(17);((o.prototype=Object.create(i.prototype)).constructor=o).className="Enum";var n=t(16);function o(t,e,r,n,o){if(i.call(this,t,r),e&&"object"!=typeof e)throw TypeError("values must be an object");if(this.valuesById={},this.values=Object.create(this.valuesById),this.comment=n,this.comments=o||{},this.reserved=void 0,e)for(var s=Object.keys(e),a=0;a<s.length;++a)"number"==typeof e[s[a]]&&(this.valuesById[this.values[s[a]]=e[s[a]]]=s[a])}o.fromJSON=function(t,e){var r=new o(t,e.values,e.options,e.comment,e.comments);return r.reserved=e.reserved,r},o.prototype.toJSON=function(t){var e=!!t&&Boolean(t.keepComments);return util.toObject(["options",this.options,"values",this.values,"reserved",this.reserved&&this.reserved.length?this.reserved:void 0,"comment",e?this.comment:void 0,"comments",e?this.comments:void 0])},o.prototype.add=function(t,e,r){if(!util.isString(t))throw TypeError("name must be a string");if(!util.isInteger(e))throw TypeError("id must be an integer");if(void 0!==this.values[t])throw Error("duplicate name '"+t+"' in "+this);if(this.isReservedId(e))throw Error("id "+e+" is reserved in "+this);if(this.isReservedName(t))throw Error("name '"+t+"' is reserved in "+this);if(void 0!==this.valuesById[e]){if(!this.options||!this.options.allow_alias)throw Error("duplicate id "+e+" in "+this);this.values[t]=e}else this.valuesById[this.values[t]=e]=t;return this.comments[t]=r||null,this},o.prototype.remove=function(t){if(!util.isString(t))throw TypeError("name must be a string");var e=this.values[t];if(null==e)throw Error("name '"+t+"' does not exist in "+this);return delete this.valuesById[e],delete this.values[t],delete this.comments[t],this},o.prototype.isReservedId=function(t){return n.isReservedId(this.reserved,t)},o.prototype.isReservedName=function(t){return n.isReservedName(this.reserved,t)}},{16:16,17:17}],23:[function(t,e,r){"use strict";e.exports=f;var i=t(16);((f.prototype=Object.create(i.prototype)).constructor=f).className="Root";var n,o,s,a=t(9),u=t(8),h=t(18),l=t(31);function f(t){i.call(this,"",t),this.deferred=[],this.files=[],this.names=[]}function c(){}f.fromJSON=function(t,e){return t="string"==typeof t?JSON.parse(t):t,e||(e=new f),t.options&&e.setOptions(t.options),e.addJSON(t.nested)},f.prototype.resolvePath=l.path.resolve,f.prototype.parseFromPbString=function t(e,r,i){"function"==typeof r&&(i=r,r=void 0);var n=this;if(!i)return l.asPromise(t,n,e,r);var a=null;if("string"==typeof e)a=JSON.parse(e);else{if("object"!=typeof e)return void console.log("pb\u683c\u5f0f\u8f6c\u5316\u5931\u8d25");a=e}function u(t,e){if(i){var r=i;i=null,r(t,e)}}function h(t,e){try{if(l.isString(e)&&"{"===e.charAt(0)&&(e=JSON.parse(e)),l.isString(e)){o.filename=t;var i,s=o(e,n,r),a=0;if(s.imports)for(;a<s.imports.length;++a)f(i=s.imports[a]);if(s.weakImports){for(a=0;a<s.weakImports.length;++a)i=s.weakImports[a];f(i)}}else n.setOptions(e.options).addJSON(e.nested)}catch(h){u(h)}u(null,n)}function f(t){n.names.indexOf(t)>-1||(n.names.push(t),t in s&&h(t,s[t]))}h(a.name,a.pbJsonStr)},f.prototype.load=function t(e,r,i){"function"==typeof r&&(i=r,r=void 0);var n=this;if(!i)return l.asPromise(t,n,e,r);var a=i===c;function u(t,e){if(i){var r=i;if(i=null,a)throw t;r(t,e)}}function h(t,e){try{if(l.isString(e)&&"{"===e.charAt(0)&&(e=JSON.parse(e)),l.isString(e)){o.filename=t;var i,s=o(e,n,r),h=0;if(s.imports)for(;h<s.imports.length;++h)(i=n.resolvePath(t,s.imports[h]))&&f(i);if(s.weakImports)for(h=0;h<s.weakImports.length;++h)(i=n.resolvePath(t,s.weakImports[h]))&&f(i,!0)}else n.setOptions(e.options).addJSON(e.nested)}catch(c){u(c)}a||d||u(null,n)}function f(t,e){var r=t.lastIndexOf("google/protobuf/");if(r>-1){var o=t.substring(r);o in s&&(t=o)}if(!(n.files.indexOf(t)>-1))if(n.files.push(t),t in s)a?h(t,s[t]):(++d,setTimeout((function(){--d,h(t,s[t])})));else if(a){var f;try{f=l.fs.readFileSync(t).toString("utf8")}catch(c){return void(e||u(c))}h(t,f)}else++d,l.fetch(t,(function(r,o){--d,i&&(r?e?d||u(null,n):u(r):h(t,o))}))}var d=0;l.isString(e)&&(e=[e]);for(var p,y=0;y<e.length;++y)(p=n.resolvePath("",e[y]))&&f(p);if(a)return n;d||u(null,n)},f.prototype.loadSync=function(t,e){if(!l.isNode)throw Error("not supported");return this.load(t,e,c)},f.prototype.resolveAll=function(){if(this.deferred.length)throw Error("unresolvable extensions: "+this.deferred.map((function(t){return"'extend "+t.extend+"' in "+t.parent.fullName})).join(", "));return i.prototype.resolveAll.call(this)};var d=/^[A-Z]/;function p(t,e){var r=e.parent.lookup(e.extend);if(r){var i=new a(e.fullName,e.id,e.type,e.rule,void 0,e.options);return i.declaringField=e,e.extensionField=i,r.add(i),!0}return!1}f.prototype._handleAdd=function(t){if(t instanceof a)void 0===t.extend||t.extensionField||p(0,t)||this.deferred.push(t);else if(t instanceof u)d.test(t.name)&&(t.parent[t.name]=t.values);else if(!(t instanceof h)){if(t instanceof n)for(var e=0;e<this.deferred.length;)p(0,this.deferred[e])?this.deferred.splice(e,1):++e;for(var r=0;r<t.nestedArray.length;++r)this._handleAdd(t._nestedArray[r]);d.test(t.name)&&(t.parent[t.name]=t)}},f.prototype._handleRemove=function(t){if(t instanceof a){if(void 0!==t.extend)if(t.extensionField)t.extensionField.parent.remove(t.extensionField),t.extensionField=null;else{var e=this.deferred.indexOf(t);e>-1&&this.deferred.splice(e,1)}}else if(t instanceof u)d.test(t.name)&&delete t.parent[t.name];else if(t instanceof i){for(var r=0;r<t.nestedArray.length;++r)this._handleRemove(t._nestedArray[r]);d.test(t.name)&&delete t.parent[t.name]}},f._configure=function(){n=t(28),o=t(19),s=t(5),a=t(9),u=t(8),h=t(18),l=t(31)}},{16:16,18:18,19:19,28:28,31:31,5:5,8:8,9:9}],28:[function(t,e,r){"use strict";e.exports=m;var i,n,o,s,a,u,h,l,f,c,d,p,y=t(16);function m(t,e){y.call(this,t,e),this.fields={},this.oneofs=void 0,this.extensions=void 0,this.reserved=void 0,this.group=void 0,this._fieldsById=null,this._fieldsArray=null,this._oneofsArray=null,this._ctor=null}function v(t){return t._fieldsById=t._fieldsArray=t._oneofsArray=null,delete t.encode,delete t.decode,delete t.verify,t}((m.prototype=Object.create(y.prototype)).constructor=m).className="Type",Object.defineProperties(m.prototype,{fieldsById:{get:function(){if(this._fieldsById)return this._fieldsById;this._fieldsById={};for(var t=Object.keys(this.fields),e=0;e<t.length;++e){var r=this.fields[t[e]],i=r.id;if(this._fieldsById[i])throw Error("duplicate id "+i+" in "+this);this._fieldsById[i]=r}return this._fieldsById}},fieldsArray:{get:function(){return this._fieldsArray||(this._fieldsArray=u.toArray(this.fields))}},oneofsArray:{get:function(){return this._oneofsArray||(this._oneofsArray=u.toArray(this.oneofs))}},ctor:{get:function(){return this._ctor||(this.ctor=m.generateConstructor(this))},set:function(t){var e=t.prototype;e instanceof o||((t.prototype=new o).constructor=t,u.merge(t.prototype,e)),t.$type=t.prototype.$type=this,u.merge(t,o,!0),u.merge(t.prototype,o,!0),this._ctor=t;for(var r=0;r<this.fieldsArray.length;++r)this._fieldsArray[r].resolve();var i={};for(r=0;r<this.oneofsArray.length;++r){var n=this._oneofsArray[r].resolve().name,s=function(t){for(var e={},r=0;r<t.length;++r)e[t[r]]=0;return{setter:function(r){if(!(t.indexOf(r)<0)){e[r]=1;for(var i=0;i<t.length;++i)t[i]!==r&&delete this[t[i]]}},getter:function(){for(var t=Object.keys(this),r=t.length-1;r>-1;--r)if(1===e[t[r]]&&void 0!==this[t[r]]&&null!==this[t[r]])return t[r]}}}(this._oneofsArray[r].oneof);i[n]={get:s.getter,set:s.setter}}r&&Object.defineProperties(t.prototype,i)}}}),m.generateConstructor=function(t){return function(e){for(var r,i=0;i<t.fieldsArray.length;i++)(r=t._fieldsArray[i]).map?this[r.name]={}:r.repeated&&(this[r.name]=[]);if(e)for(var n=Object.keys(e),o=0;o<n.length;++o)null!=e[n[o]]&&(this[n[o]]=e[n[o]])}},m.fromJSON=function(t,e){var r=new m(t,e.options);r.extensions=e.extensions,r.reserved=e.reserved;for(var o=Object.keys(e.fields),a=0;a<o.length;++a)r.add((void 0!==e.fields[o[a]].keyType?p.fromJSON:n.fromJSON)(o[a],e.fields[o[a]]));if(e.oneofs)for(o=Object.keys(e.oneofs),a=0;a<o.length;++a)r.add(s.fromJSON(o[a],e.oneofs[o[a]]));if(e.nested)for(o=Object.keys(e.nested),a=0;a<o.length;++a){var u=e.nested[o[a]];r.add((void 0!==u.id?n.fromJSON:void 0!==u.fields?m.fromJSON:void 0!==u.values?i.fromJSON:void 0!==u.methods?f.fromJSON:y.fromJSON)(o[a],u))}return e.extensions&&e.extensions.length&&(r.extensions=e.extensions),e.reserved&&e.reserved.length&&(r.reserved=e.reserved),e.group&&(r.group=!0),e.comment&&(r.comment=e.comment),r},m.prototype.toJSON=function(t){var e=y.prototype.toJSON.call(this,t),r=!!t&&Boolean(t.keepComments);return{options:e&&e.options||void 0,oneofs:y.arrayToJSON(this.oneofsArray,t),fields:y.arrayToJSON(this.fieldsArray.filter((function(t){return!t.declaringField})),t)||{},extensions:this.extensions&&this.extensions.length?this.extensions:void 0,reserved:this.reserved&&this.reserved.length?this.reserved:void 0,group:this.group||void 0,nested:e&&e.nested||void 0,comment:r?this.comment:void 0}},m.prototype.resolveAll=function(){for(var t=this.fieldsArray,e=0;e<t.length;)t[e++].resolve();var r=this.oneofsArray;for(e=0;e<r.length;)r[e++].resolve();return y.prototype.resolveAll.call(this)},m.prototype.get=function(t){return this.fields[t]||this.oneofs&&this.oneofs[t]||this.nested&&this.nested[t]||null},m.prototype.add=function(t){if(this.get(t.name))throw Error("duplicate name '"+t.name+"' in "+this);if(t instanceof n&&void 0===t.extend){if(this._fieldsById&&this._fieldsById[t.id])throw Error("duplicate id "+t.id+" in "+this);if(this.isReservedId(t.id))throw Error("id "+t.id+" is reserved in "+this);if(this.isReservedName(t.name))throw Error("name '"+t.name+"' is reserved in "+this);return t.parent&&t.parent.remove(t),this.fields[t.name]=t,t.message=this,t.onAdd(this),v(this)}return t instanceof s?(this.oneofs||(this.oneofs={}),this.oneofs[t.name]=t,t.onAdd(this),v(this)):y.prototype.add.call(this,t)},m.prototype.remove=function(t){if(t instanceof n&&void 0===t.extend){if(!this.fields||this.fields[t.name]!==t)throw Error(t+" is not a member of "+this);return delete this.fields[t.name],t.parent=null,t.onRemove(this),v(this)}if(t instanceof s){if(!this.oneofs||this.oneofs[t.name]!==t)throw Error(t+" is not a member of "+this);return delete this.oneofs[t.name],t.parent=null,t.onRemove(this),v(this)}return y.prototype.remove.call(this,t)},m.prototype.isReservedId=function(t){return y.isReservedId(this.reserved,t)},m.prototype.isReservedName=function(t){return y.isReservedName(this.reserved,t)},m.prototype.create=function(t){return new this.ctor(t)},m.prototype.setup=function(){for(var t=this.fullName,e=[],r=0;r<this.fieldsArray.length;++r)e.push(this._fieldsArray[r].resolve().resolvedType);this.decode=l(this)({Reader:a,types:e,util:u}),this.verify=h(this)({types:e,util:u}),this.fromObject=d.fromObject(this)({types:e,util:u}),this.toObject=d.toObject(this)({types:e,util:u});var i=c[t];if(i){var n=Object.create(this);n.fromObject=this.fromObject,this.fromObject=i.fromObject.bind(n),n.toObject=this.toObject,this.toObject=i.toObject.bind(n)}return this},m.prototype.encode=function(t,e){return this.setup().encode(t,e)},m.prototype.encodeDelimited=function(t,e){return this.encode(t,e&&e.len?e.fork():e).ldelim()},m.prototype.decode=function(t,e){return this.setup().decode(t,e)},m.prototype.decodeDelimited=function(t){return t instanceof a||(t=a.create(t)),this.decode(t,t.uint32())},m.prototype.verify=function(t){return this.setup().verify(t)},m.prototype.fromObject=function(t){return this.setup().fromObject(t)},m.prototype.toObject=function(t,e){return this.setup().toObject(t,e)},m.d=function(t){return function(e){u.decorateType(e,t)}},m._configure=function(){i=t(8),n=t(9),o=t(14),s=t(18),t(34),a=t(22),u=t(31),h=t(32),l=t(7),f=t(26),c=t(33),d=t(6),p=t(13)}},{13:13,14:14,16:16,18:18,22:22,26:26,31:31,32:32,33:33,34:34,6:6,7:7,8:8,9:9}],18:[function(t,e,r){"use strict";e.exports=s;var i,n,o=t(17);function s(t,e,r,i){if(Array.isArray(e)||(r=e,e=void 0),o.call(this,t,r),void 0!==e&&!Array.isArray(e))throw TypeError("fieldNames must be an Array");this.oneof=e||[],this.fieldsArray=[],this.comment=i}function a(t){if(t.parent)for(var e=0;e<t.fieldsArray.length;++e)t.fieldsArray[e].parent||t.parent.add(t.fieldsArray[e])}((s.prototype=Object.create(o.prototype)).constructor=s).className="OneOf",s.fromJSON=function(t,e){return new s(t,e.oneof,e.options,e.comment)},s.prototype.toJSON=function(t){var e=!!t&&Boolean(t.keepComments);return n.toObject(["options",this.options,"oneof",this.oneof,"comment",e?this.comment:void 0])},s.prototype.add=function(t){if(!(t instanceof i))throw TypeError("field must be a Field");return t.parent&&t.parent!==this.parent&&t.parent.remove(t),this.oneof.push(t.name),this.fieldsArray.push(t),t.partOf=this,a(this),this},s.prototype.remove=function(t){if(!(t instanceof i))throw TypeError("field must be a Field");var e=this.fieldsArray.indexOf(t);if(e<0)throw Error(t+" is not a member of "+this);return this.fieldsArray.splice(e,1),(e=this.oneof.indexOf(t.name))>-1&&this.oneof.splice(e,1),t.partOf=null,this},s.prototype.onAdd=function(t){o.prototype.onAdd.call(this,t);for(var e=0;e<this.oneof.length;++e){var r=t.get(this.oneof[e]);r&&!r.partOf&&(r.partOf=this,this.fieldsArray.push(r))}a(this)},s.prototype.onRemove=function(t){for(var e,r=0;r<this.fieldsArray.length;++r)(e=this.fieldsArray[r]).parent&&e.parent.remove(e);o.prototype.onRemove.call(this,t)},s.d=function(){for(var t=new Array(arguments.length),e=0;e<arguments.length;)t[e]=arguments[e++];return function(e,r){n.decorateType(e.constructor).add(new s(r,t)),Object.defineProperty(e,r,{get:n.oneOfGetter(t),set:n.oneOfSetter(t)})}},s._configure=function(){i=t(9),n=t(31)}},{17:17,31:31,9:9}],9:[function(t,e,r){"use strict";e.exports=h;var i,n,o,s,a=t(17);((h.prototype=Object.create(a.prototype)).constructor=h).className="Field";var u=/^required|optional|repeated$/;function h(t,e,r,i,s,h,l){if(o.isObject(i)?(l=s,h=i,i=s=void 0):o.isObject(s)&&(l=h,h=s,s=void 0),a.call(this,t,h),!o.isInteger(e)||e<0)throw TypeError("id must be a non-negative integer");if(!o.isString(r))throw TypeError("type must be a string");if(void 0!==i&&!u.test(i=i.toString().toLowerCase()))throw TypeError("rule must be a string rule");if(void 0!==s&&!o.isString(s))throw TypeError("extend must be a string");this.rule=i&&"optional"!==i?i:void 0,this.type=r,this.id=e,this.extend=s||void 0,this.required="required"===i,this.optional=!this.required,this.repeated="repeated"===i,this.map=!1,this.message=null,this.partOf=null,this.typeDefault=null,this.defaultValue=null,this.long=!!o.Long&&void 0!==n.long[r],this.bytes="bytes"===r,this.resolvedType=null,this.extensionField=null,this.declaringField=null,this._packed=null,this.comment=l}h.fromJSON=function(t,e){return new h(t,e.id,e.type,e.rule,e.extend,e.options,e.comment)},Object.defineProperty(h.prototype,"packed",{get:function(){return null===this._packed&&(this._packed=!1!==this.getOption("packed")),this._packed}}),h.prototype.setOption=function(t,e,r){return"packed"===t&&(this._packed=null),a.prototype.setOption.call(this,t,e,r)},h.prototype.toJSON=function(t){var e=!!t&&Boolean(t.keepComments);return o.toObject(["rule","optional"!==this.rule&&this.rule||void 0,"type",this.type,"id",this.id,"extend",this.extend,"options",this.options,"comment",e?this.comment:void 0])},h.prototype.resolve=function(){if(this.resolved)return this;if(void 0===(this.typeDefault=n.defaults[this.type])&&(this.resolvedType=(this.declaringField?this.declaringField.parent:this.parent).lookupTypeOrEnum(this.type),this.resolvedType instanceof s?this.typeDefault=null:this.typeDefault=this.resolvedType.values[Object.keys(this.resolvedType.values)[0]]),this.options&&null!=this.options.default&&(this.typeDefault=this.options.default,this.resolvedType instanceof i&&"string"==typeof this.typeDefault&&(this.typeDefault=this.resolvedType.values[this.typeDefault])),this.options&&(!0!==this.options.packed&&(void 0===this.options.packed||!this.resolvedType||this.resolvedType instanceof i)||delete this.options.packed,Object.keys(this.options).length||(this.options=void 0)),this.long)this.typeDefault=o.Long.fromNumber(this.typeDefault,"u"===this.type.charAt(0)),Object.freeze&&Object.freeze(this.typeDefault);else if(this.bytes&&"string"==typeof this.typeDefault){var t;o.utf8.write(this.typeDefault,t=o.newBuffer(o.utf8.length(this.typeDefault)),0),this.typeDefault=t}return this.map?this.defaultValue=o.emptyObject:this.repeated?this.defaultValue=o.emptyArray:this.defaultValue=this.typeDefault,this.parent instanceof s&&(this.parent.ctor.prototype[this.name]=this.defaultValue),a.prototype.resolve.call(this)},h.d=function(t,e,r,i){return"function"==typeof e?e=o.decorateType(e).name:e&&"object"==typeof e&&(e=o.decorateEnum(e).name),function(n,s){o.decorateType(n.constructor).add(new h(s,t,e,r,{default:i}))}},h._configure=function(){s=t(28),i=t(8),n=t(29),o=t(31)}},{17:17,28:28,29:29,31:31,8:8}],13:[function(t,e,r){"use strict";e.exports=s;var i,n,o=t(9);function s(t,e,r,i,s,a){if(o.call(this,t,e,i,void 0,void 0,s,a),!n.isString(r))throw TypeError("keyType must be a string");this.keyType=r,this.resolvedKeyType=null,this.map=!0}((s.prototype=Object.create(o.prototype)).constructor=s).className="MapField",s.fromJSON=function(t,e){return new s(t,e.id,e.keyType,e.type,e.options,e.comment)},s.prototype.toJSON=function(t){var e=!!t&&Boolean(t.keepComments);return n.toObject(["keyType",this.keyType,"type",this.type,"id",this.id,"extend",this.extend,"options",this.options,"comment",e?this.comment:void 0])},s.prototype.resolve=function(){if(this.resolved)return this;if(void 0===i.mapKey[this.keyType])throw Error("invalid key type: "+this.keyType);return o.prototype.resolve.call(this)},s.d=function(t,e,r){return"function"==typeof r?r=n.decorateType(r).name:r&&"object"==typeof r&&(r=n.decorateEnum(r).name),function(i,o){n.decorateType(i.constructor).add(new s(o,t,e,r))}},s._configure=function(){i=t(29),n=t(31)}},{29:29,31:31,9:9}],15:[function(t,e,r){"use strict";e.exports=o;var i,n=t(17);function o(t,e,r,o,s,a,u,h){if(i.isObject(s)?(u=s,s=a=void 0):i.isObject(a)&&(u=a,a=void 0),void 0!==e&&!i.isString(e))throw TypeError("type must be a string");if(!i.isString(r))throw TypeError("requestType must be a string");if(!i.isString(o))throw TypeError("responseType must be a string");n.call(this,t,u),this.type=e||"rpc",this.requestType=r,this.requestStream=!!s||void 0,this.responseType=o,this.responseStream=!!a||void 0,this.resolvedRequestType=null,this.resolvedResponseType=null,this.comment=h}((o.prototype=Object.create(n.prototype)).constructor=o).className="Method",o.fromJSON=function(t,e){return new o(t,e.type,e.requestType,e.responseType,e.requestStream,e.responseStream,e.options,e.comment)},o.prototype.toJSON=function(t){var e=!!t&&Boolean(t.keepComments);return i.toObject(["type","rpc"!==this.type&&this.type||void 0,"requestType",this.requestType,"requestStream",this.requestStream,"responseType",this.responseType,"responseStream",this.responseStream,"options",this.options,"comment",e?this.comment:void 0])},o.prototype.resolve=function(){return this.resolved?this:(this.resolvedRequestType=this.parent.lookupType(this.requestType),this.resolvedResponseType=this.parent.lookupType(this.responseType),n.prototype.resolve.call(this))},o._configure=function(){i=t(31)}},{17:17,31:31}],7:[function(t,e,r){"use strict";var i,n,o;function s(t){return"missing required '"+t.name+"'"}function a(t){return function(e){var r=e.Reader,a=e.types,u=e.util;return function(e,h){e instanceof r||(e=r.create(e));for(var l,f=void 0===h?e.len:e.pos+h,c=new this.ctor;e.pos<f;){var d=e.uint32();if(t.group&&4==(7&d))break;for(var p=d>>>3,y=0,m=!1;y<t.fieldsArray.length;++y){var v=t._fieldsArray[y].resolve(),g=v.name,b=v.resolvedType instanceof i?"int32":v.type;if(p==v.id){if(m=!0,v.map)e.skip().pos++,c[g]===u.emptyObject&&(c[g]={}),l=e[v.keyType](),e.pos++,n.long[v.keyType],null==n.basic[b]?c[g]["object"==typeof l?u.longToHash(l):l]=a[y].decode(e,e.uint32()):c[g]["object"==typeof l?u.longToHash(l):l]=e[b]();else if(v.repeated)if(c[g]&&c[g].length||(c[g]=[]),null!=n.packed[b]&&2==(7&d))for(var w=e.uint32()+e.pos;e.pos<w;)c[g].push(e[b]());else null==n.basic[b]?v.resolvedType.group?c[g].push(a[y].decode(e)):c[g].push(a[y].decode(e,e.uint32())):c[g].push(e[b]());else null==n.basic[b]?v.resolvedType.group?c[g]=a[y].decode(e):c[g]=a[y].decode(e,e.uint32()):c[g]=e[b]();break}}m||(console.log("t",d),e.skipType(7&d))}for(y=0;y<t._fieldsArray.length;++y){var _=t._fieldsArray[y];if(_.required&&!c.hasOwnProperty(_.name))throw o.ProtocolError(s(_),{instance:c})}return c}}}e.exports=a,a._configure=function(){i=t(8),n=t(29),o=t(31)}},{29:29,31:31,8:8}],14:[function(t,e,r){"use strict";var i;function n(t){if(t)for(var e=Object.keys(t),r=0;r<e.length;++r)this[e[r]]=t[e[r]]}e.exports=n,n.create=function(t){return this.$type.create(t)},n.encode=function(t,e){return arguments.length?1==arguments.length?this.$type.encode(arguments[0]):this.$type.encode(arguments[0],arguments[1]):this.$type.encode(this)},n.encodeDelimited=function(t,e){return this.$type.encodeDelimited(t,e)},n.decode=function(t){return this.$type.decode(t)},n.decodeDelimited=function(t){return this.$type.decodeDelimited(t)},n.verify=function(t){return this.$type.verify(t)},n.fromObject=function(t){return this.$type.fromObject(t)},n.toObject=function(t,e){return t=t||this,this.$type.toObject(t,e)},n.prototype.toJSON=function(){return this.$type.toObject(this,i.toJSONOptions)},n.set=function(t,e){n[t]=e},n.get=function(t){return n[t]},n._configure=function(){i=t(31)}},{31:31}],29:[function(t,e,r){"use strict";var i=e.exports,n=t(31),o=["double","float","int32","uint32","sint32","fixed32","sfixed32","int64","uint64","sint64","fixed64","sfixed64","bool","string","bytes"];function s(t,e){var r=0,i={};for(e|=0;r<t.length;)i[o[r+e]]=t[r++];return i}i.basic=s([1,5,0,0,0,5,5,0,0,0,1,1,0,2,2]),i.defaults=s([0,0,0,0,0,0,0,0,0,0,0,0,!1,"",n.emptyArray,null]),i.long=s([0,0,0,1,1],7),i.mapKey=s([0,0,0,5,5,0,0,0,1,1,0,2],2),i.packed=s([1,5,0,0,0,5,5,0,0,0,1,1,0]),i._configure=function(){n=t(31)}},{31:31}],33:[function(t,e,r){"use strict";var i,n=r;n[".google.protobuf.Any"]={fromObject:function(t){if(t&&t["@type"]){var e=this.lookup(t["@type"]);if(e){var r="."===t["@type"].charAt(0)?t["@type"].substr(1):t["@type"];return this.create({type_url:"/"+r,value:e.encode(e.fromObject(t)).finish()})}}return this.fromObject(t)},toObject:function(t,e){if(e&&e.json&&t.type_url&&t.value){var r=t.type_url.substring(t.type_url.lastIndexOf("/")+1),n=this.lookup(r);n&&(t=n.decode(t.value))}if(!(t instanceof this.ctor)&&t instanceof i){var o=t.$type.toObject(t,e);return o["@type"]=t.$type.fullName,o}return this.toObject(t,e)}},n._configure=function(){i=t(14)}},{14:14}],6:[function(t,e,r){"use strict";var i,n,o=e.exports;function s(t,e,r,o){var s=o.m,a=o.d,u=o.types,h=o.ksi,l=void 0!==h;if(t.resolvedType)if(t.resolvedType instanceof i){for(var f=l?a[r][h]:a[r],c=t.resolvedType.values,d=Object.keys(c),p=0;p<d.length;p++)if(!(t.repeated&&c[d[p]]===t.typeDefault||d[p]!=f&&c[d[p]]!=f)){l?s[r][h]=c[d[p]]:s[r]=c[d[p]];break}}else{if("object"!=typeof(l?a[r][h]:a[r]))throw TypeError(t.fullName+": object expected");l?s[r][h]=u[e].fromObject(a[r][h]):s[r]=u[e].fromObject(a[r])}else{var y=!1;switch(t.type){case"double":case"float":l?s[r][h]=Number(a[r][h]):s[r]=Number(a[r]);break;case"uint32":case"fixed32":l?s[r][h]=a[r][h]>>>0:s[r]=a[r]>>>0;break;case"int32":case"sint32":case"sfixed32":l?s[r][h]=0|a[r][h]:s[r]=0|a[r];break;case"uint64":y=!0;case"int64":case"sint64":case"fixed64":case"sfixed64":n.Long?l?s[r][h]=n.Long.fromValue(a[r][h]).unsigned=y:s[r]=n.Long.fromValue(a[r]).unsigned=y:"string"==typeof(l?a[r][h]:a[r])?l?s[r][h]=parseInt(a[r][h],10):s[r]=parseInt(a[r],10):"number"==typeof(l?a[r][h]:a[r])?l?s[r][h]=a[r][h]:s[r]=a[r]:"object"==typeof(l?a[r][h]:a[r])&&(l?s[r][h]=new n.LongBits(a[r][h].low>>>0,a[r][h].high>>>0).toNumber(y):s[r]=new n.LongBits(a[r].low>>>0,a[r].high>>>0).toNumber(y));break;case"bytes":"string"==typeof(l?a[r][h]:a[r])?l?n.base64.decode(a[r][h],s[r][h]=n.newBuffer(n.base64.length(a[r][h])),0):n.base64.decode(a[r],s[r]=n.newBuffer(n.base64.length(a[r])),0):(l?a[r][h]:a[r]).length&&(l?s[r][h]=a[r][h]:s[r]=a[r]);break;case"string":l?s[r][h]=String(a[r][h]):s[r]=String(a[r]);break;case"bool":l?s[r][h]=Boolean(a[r][h]):s[r]=Boolean(a[r])}}}function a(t,e,r,o){var s=o.m,a=o.d,u=o.types,h=o.ksi,l=o.o,f=void 0!==h;if(t.resolvedType)t.resolvedType instanceof i?f?a[r][h]=l.enums===String?u[e].values[s[r][h]]:s[r][h]:a[r]=l.enums===String?u[e].values[s[r]]:s[r]:f?a[r][h]=u[e].toObject(s[r][h],l):a[r]=u[e].toObject(s[r],l);else{var c=!1;switch(t.type){case"double":case"float":f?a[r][h]=l.json&&!isFinite(s[r][h])?String(s[r][h]):s[r][h]:a[r]=l.json&&!isFinite(s[r])?String(s[r]):s[r];break;case"uint64":c=!0;case"int64":case"sint64":case"fixed64":case"sfixed64":"number"==typeof s[r][h]?f?a[r][h]=l.longs===String?String(s[r][h]):s[r][h]:a[r]=l.longs===String?String(s[r]):s[r]:f?a[r][h]=l.longs===String?n.Long.prototype.toString.call(s[r][h]):l.longs===Number?new n.LongBits(s[r][h].low>>>0,s[r][h].high>>>0).toNumber(c):s[r][h]:a[r]=l.longs===String?n.Long.prototype.toString.call(s[r]):l.longs===Number?new n.LongBits(s[r].low>>>0,s[r].high>>>0).toNumber(c):s[r];break;case"bytes":f?a[r][h]=l.bytes===String?n.base64.encode(s[r][h],0,s[r][h].length):l.bytes===Array?Array.prototype.slice.call(s[r][h]):s[r][h]:a[r]=l.bytes===String?n.base64.encode(s[r],0,s[r].length):l.bytes===Array?Array.prototype.slice.call(s[r]):s[r];break;default:f?a[r][h]=s[r][h]:a[r]=s[r]}}}o._configure=function(){i=t(8),n=t(31)},o.fromObject=function(t){var e=t.fieldsArray;return function(t){return function(r){if(r instanceof this.ctor)return r;if(!e.length)return new this.ctor;for(var o=new this.ctor,a=0;a<e.length;++a){var u,h=e[a].resolve(),l=h.name;if(h.map){if(r[l]){if("object"!=typeof r[l])throw TypeError(h.fullName+": object expected");o[l]={}}var f=Object.keys(r[l]);for(u=0;u<f.length;++u)s(h,a,l,n.merge(n.copy(t),{m:o,d:r,ksi:f[u]}))}else if(h.repeated){if(r[l]){if(!Array.isArray(r[l]))throw TypeError(h.fullName+": array expected");for(o[l]=[],u=0;u<r[l].length;++u)s(h,a,l,n.merge(n.copy(t),{m:o,d:r,ksi:u}))}}else(h.resolvedType instanceof i||null!=r[l])&&s(h,a,l,n.merge(n.copy(t),{m:o,d:r}))}return o}}},o.toObject=function(t){var e=t.fieldsArray.slice().sort(n.compareFieldsById);return function(r){return e.length?function(o,s){s=s||{};for(var u,h,l={},f=[],c=[],d=[],p=0;p<e.length;++p)e[p].partOf||(e[p].resolve().repeated?f:e[p].map?c:d).push(e[p]);if(f.length&&(s.arrays||s.defaults))for(p=0;p<f.length;++p)l[f[p].name]=[];if(c.length&&(s.objects||s.defaults))for(p=0;p<c.length;++p)l[c[p].name]={};if(d.length&&s.defaults)for(p=0;p<d.length;++p)if(h=(u=d[p]).name,u.resolvedType instanceof i)l[h]=s.enums=String?u.resolvedType.valuesById[u.typeDefault]:u.typeDefault;else if(u.long)if(n.Long){var y=new n.Long(u.typeDefault.low,u.typeDefault.high,u.typeDefault.unsigned);l[h]=s.longs===String?y.toString():s.longs===Number?y.toNumber():y}else l[h]=s.longs===String?u.typeDefault.toString():u.typeDefault.toNumber();else u.bytes?l[h]=s.bytes===String?String.fromCharCode.apply(String,u.typeDefault):Array.prototype.slice.call(u.typeDefault).join("*..*").split("*..*"):l[h]=u.typeDefault;var m=!1;for(p=0;p<e.length;++p){h=(u=e[p]).name;var v,g,b=t._fieldsArray.indexOf(u);if(u.map){if(m||(m=!0),o[h]&&(v=Object.keys(o[h]).length))for(l[h]={},g=0;g<v.length;++g)a(u,b,h,n.merge(n.copy(r),{m:o,d:l,ksi:v[g],o:s}))}else if(u.repeated){if(o[h]&&o[h].length)for(l[h]=[],g=0;g<o[h].length;++g)a(u,b,h,n.merge(n.copy(r),{m:o,d:l,ksi:g,o:s}))}else null!=o[h]&&o.hasOwnProperty(h)&&a(u,b,h,n.merge(n.copy(r),{m:o,d:l,o:s})),u.partOf&&s.oneofs&&(l[u.partOf.name]=h)}return l}:function(){return{}}}}},{31:31,8:8}],26:[function(t,e,r){"use strict";e.exports=a;var i,n,o,s=t(16);function a(t,e){s.call(this,t,e),this.methods={},this._methodsArray=null}function u(t){return t._methodsArray=null,t}((a.prototype=Object.create(s.prototype)).constructor=a).className="Service",a.fromJSON=function(t,e){var r=new a(t,e.options);if(e.methods)for(var n=Object.keys(e.methods),o=0;o<n.length;++o)r.add(i.fromJSON(n[o],e.methods[n[o]]));return e.nested&&r.addJSON(e.nested),r.comment=e.comment,r},a.prototype.toJSON=function(t){var e=s.prototype.toJSON.call(this,t),r=!!t&&Boolean(t.keepComments);return n.toObject(["options",e&&e.options||void 0,"methods",s.arrayToJSON(this.methodsArray,t)||{},"nested",e&&e.nested||void 0,"comment",r?this.comment:void 0])},Object.defineProperty(a.prototype,"methodsArray",{get:function(){return this._methodsArray||(this._methodsArray=n.toArray(this.methods))}}),a.prototype.get=function(t){return this.methods[t]||s.prototype.get.call(this,t)},a.prototype.resolveAll=function(){for(var t=this.methodsArray,e=0;e<t.length;++e)t[e].resolve();return s.prototype.resolve.call(this)},a.prototype.add=function(t){if(this.get(t.name))throw Error("duplicate name '"+t.name+"' in "+this);return t instanceof i?(this.methods[t.name]=t,t.parent=this,u(this)):s.prototype.add.call(this,t)},a.prototype.remove=function(t){if(t instanceof i){if(this.methods[t.name]!==t)throw Error(t+" is not a member of "+this);return delete this.methods[t.name],t.parent=null,u(this)}return s.prototype.remove.call(this,t)},a.prototype.create=function(t,e,r){for(var i,s=new o.Service(t,e,r),a=0;a<this.methodsArray.length;++a){var u=n.lcFirst((i=this._methodsArray[a]).resolve().name).replace(/[^$\w_]/g,"");s[u]=n.codegen(["r","c"],n.isReserved(u)?u+"_":u)("return this.rpcCall(m,q,s,r,c)")({m:i,q:i.resolvedRequestType.ctor,s:i.resolvedResponseType.ctor})}return s},a._configure=function(){i=t(15),n=t(31),o=t(25)}},{15:15,16:16,25:25,31:31}],34:[function(t,e,r){"use strict";e.exports=h;var i,n=t(31),o=t(30);function s(t,e,r){this.fn=t,this.len=e,this.next=void 0,this.val=r}function a(){}function u(t){this.head=t.head,this.tail=t.tail,this.len=t.len,this.next=t.states}function h(){this.len=0,this.head=new s(a,0,0),this.tail=this.head,this.states=null}function l(t,e,r){e[r]=255&t}function f(t,e){this.len=t,this.next=void 0,this.val=e}function c(t,e,r){for(;t.hi;)e[r++]=127&t.lo|128,t.lo=(t.lo>>>7|t.hi<<25)>>>0,t.hi>>>=7;for(;t.lo>127;)e[r++]=127&t.lo|128,t.lo=t.lo>>>7;e[r++]=t.lo}function d(t,e,r){e[r]=255&t,e[r+1]=t>>>8&255,e[r+2]=t>>>16&255,e[r+3]=t>>>24}h.create=n.Buffer?function(){return(h.create=function(){return new(void 0)})()}:function(){return new h},h.alloc=function(t){return new n.Array(t)},n.Array!==Array&&(h.alloc=n.pool(h.alloc,n.Array.prototype.subarray)),h.prototype._push=function(t,e,r){return this.tail=this.tail.next=new s(t,e,r),this.len+=e,this},f.prototype=Object.create(s.prototype),f.prototype.fn=function(t,e,r){for(;t>127;)e[r++]=127&t|128,t>>>=7;e[r]=t},h.prototype.uint32=function(t){return this.len+=(this.tail=this.tail.next=new f((t>>>=0)<128?1:t<16384?2:t<2097152?3:t<268435456?4:5,t)).len,this},h.prototype.int32=function(t){return t<0?this._push(c,10,i.fromNumber(t)):this.uint32(t)},h.prototype.sint32=function(t){return this.uint32((t<<1^t>>31)>>>0)},h.prototype.uint64=function(t){var e=i.from(t);return this._push(c,e.length(),e)},h.prototype.int64=h.prototype.uint64,h.prototype.sint64=function(t){var e=i.from(t).zzEncode();return this._push(c,e.length(),e)},h.prototype.bool=function(t){return this._push(l,1,t?1:0)},h.prototype.fixed32=function(t){return this._push(d,4,t>>>0)},h.prototype.sfixed32=h.prototype.fixed32,h.prototype.fixed64=function(t){var e=i.from(t);return this._push(d,4,e.lo)._push(d,4,e.hi)},h.prototype.sfixed64=h.prototype.fixed64,h.prototype.float=function(t){return this._push(n.float.writeFloatLE,4,t)},h.prototype.double=function(t){return this._push(n.float.writeDoubleLE,8,t)};var p=n.Array.prototype.set?function(t,e,r){e.set(t,r)}:function(t,e,r){for(var i=0;i<t.length;++i)e[r+i]=t[i]};h.prototype.bytes=function(t){var e=t.length>>>0;if(!e)return this._push(l,1,0);if(n.isString(t)){var r=h.alloc(e=o.length(t));o.write(t,r,0),t=r}return this.uint32(e)._push(p,e,t)},h.prototype.string=function(t){var e=o.length(t);return e?this.uint32(e)._push(o.write,e,t):this._push(l,1,0)},h.prototype.fork=function(){return this.states=new u(this),this.head=this.tail=new s(a,0,0),this.len=0,this},h.prototype.reset=function(){return this.states?(this.head=this.states.head,this.tail=this.states.tail,this.len=this.states.len,this.states=this.states.next):(this.head=this.tail=new s(a,0,0),this.len=0),this},h.prototype.ldelim=function(){var t=this.head,e=this.tail,r=this.len;return this.reset().uint32(r),r&&(this.tail.next=t.next,this.tail=e,this.len+=r),this},h.prototype.finish=function(){for(var t=this.head.next,e=this.constructor.alloc(this.len),r=0;t;)t.fn(t.val,e,r),r+=t.len,t=t.next;return e},h._configure=function(){i=t(12),t(4),o=t(30)}},{12:12,30:30,31:31,4:4}],31:[function(t,e,r){"use strict";var i=e.exports,n=t(24);i.LongBits=t(12),i.Long=t(11),i.pool=t(21),i.float=t(10),i.asPromise=t(3),i.EventEmitter=t(2),i.path=t(20),i.base64=t(4),i.utf8=t(30),i.compareFieldsById=function(t,e){return t.id-e.id},i.toArray=function(t){if(t){for(var e=Object.keys(t),r=new Array(e.length),i=0;i<e.length;)r[i]=t[e[i++]];return r}return[]},i.toObject=function(t){for(var e={},r=0;r<t.length;){var i=t[r++],n=t[r++];void 0!==n&&(e[i]=n)}return e},i.isString=function(t){return"string"==typeof t||t instanceof String},i.isReserved=function(t){return/^(?:do|if|in|for|let|new|try|var|case|else|enum|eval|false|null|this|true|void|with|break|catch|class|const|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$/.test(t)},i.isObject=function(t){return t&&"object"==typeof t},i.Array="undefined"!=typeof Uint8Array?Uint8Array:Array,i.oneOfGetter=function(t){for(var e={},r=0;r<t.length;++r)e[t[r]]=1;return function(){for(var t=Object.keys(this),r=t.length-1;r>-1;--r)if(1===e[t[r]]&&void 0!==this[t[r]]&&null!==this[t[r]])return t[r]}},i.oneOfSetter=function(t){return function(e){for(var r=0;r<t.length;++r)t[r]!==e&&delete this[t[r]]}},i.merge=function(t,e,r){for(var i=Object.keys(e),n=0;n<i.length;++n)void 0!==t[i[n]]&&r||(t[i[n]]=e[i[n]]);return t},i.decorateType=function(e,r){if(e.$type)return r&&e.$type.name!==r&&(i.decorateRoot.remove(e.$type),e.$type.name=r,i.decorateRoot.add(e.$type)),e.$type;Type||(Type=t(28));var n=new Type(r||e.name);return i.decorateRoot.add(n),n.ctor=e,Object.defineProperty(e,"$type",{value:n,enumerable:!1}),Object.defineProperty(e.prototype,"$type",{value:n,enumerable:!1}),n},i.emptyArray=Object.freeze?Object.freeze([]):[],i.emptyObject=Object.freeze?Object.freeze({}):{},i.longToHash=function(t){return t?i.LongBits.from(t).toHash():i.LongBits.zeroHash},i.copy=function(t){if("object"!=typeof t)return t;var e={};for(var r in t)e[r]=t[r];return e},i.deepCopy=function t(e){if("object"!=typeof e)return e;var r={};for(var i in e)r[i]=t(e[i]);return r},i.ProtocolError=function(t){function e(t,r){if(!(this instanceof e))return new e(t,r);Object.defineProperty(this,"message",{get:function(){return t}}),Error.captureStackTrace?Error.captureStackTrace(this,e):Object.defineProperty(this,"stack",{value:(new Error).stack||""}),r&&merge(this,r)}return(e.prototype=Object.create(Error.prototype)).constructor=e,Object.defineProperty(e.prototype,"name",{get:function(){return t}}),e.prototype.toString=function(){return this.name+": "+this.message},e},i.toJSONOptions={longs:String,enums:String,bytes:String,json:!0},i.Buffer=null,i.newBuffer=function(t){return"number"==typeof t?new i.Array(t):"undefined"==typeof Uint8Array?t:new Uint8Array(t)},i.stringToBytes=function(t){var e,r,i=[];e=t.length;for(var n=0;n<e;n++)(r=t.charCodeAt(n))>=65536&&r<=1114111?(i.push(r>>18&7|240),i.push(r>>12&63|128),i.push(r>>6&63|128),i.push(63&r|128)):r>=2048&&r<=65535?(i.push(r>>12&15|224),i.push(r>>6&63|128),i.push(63&r|128)):r>=128&&r<=2047?(i.push(r>>6&31|192),i.push(63&r|128)):i.push(255&r);return i},i.byteToString=function(t){if("string"==typeof t)return t;for(var e="",r=t,i=0;i<r.length;i++){var n=r[i].toString(2),o=n.match(/^1+?(?=0)/);if(o&&8==n.length){for(var s=o[0].length,a=r[i].toString(2).slice(7-s),u=1;u<s;u++)a+=r[u+i].toString(2).slice(2);e+=String.fromCharCode(parseInt(a,2)),i+=s-1}else e+=String.fromCharCode(r[i])}return e},i.isInteger=Number.isInteger||function(t){return"number"==typeof t&&isFinite(t)&&Math.floor(t)===t},Object.defineProperty(i,"decorateRoot",{get:function(){return n.decorated||(n.decorated=new(t(23)))}})},{10:10,11:11,12:12,2:2,20:20,21:21,23:23,24:24,28:28,3:3,30:30,4:4}],25:[function(t,e,r){"use strict";e.exports=n;var i=t(31);function n(t,e,r){if("function"!=typeof t)throw TypeError("rpcImpl must be a function");i.EventEmitter.call(this),this.rpcImpl=t,this.requestDelimited=Boolean(e),this.responseDelimited=Boolean(r)}(n.prototype=Object.create(i.EventEmitter.prototype)).constructor=n,n.prototype.rpcCall=function t(e,r,n,o,s){if(!o)throw TypeError("request must be specified");var a=this;if(!s)return i.asPromise(t,a,e,r,n,o);if(a.rpcImpl)try{return a.rpcImpl(e,r[a.requestDelimited?"encodeDelimited":"encode"](o).finish(),(function(t,r){if(t)return a.emit("error",t,e),s(t);if(null!==r){if(!(r instanceof n))try{r=n[a.responseDelimited?"decodeDelimited":"decode"](r)}catch(t){return a.emit("error",t,e),s(t)}return a.emit("data",r,e),s(null,r)}a.end(!0)}))}catch(u){return a.emit("error",u,e),void setTimeout((function(){s(u)}),0)}else setTimeout((function(){s(Error("already ended"))}),0)},n.prototype.end=function(t){return this.rpcImpl&&(t||this.rpcImpl(null,null,null),this.rpcImpl=null,this.emit("end").off()),this}},{31:31}],2:[function(t,e,r){"use strict";function i(){this._listeners={}}e.exports=i,i.prototype.on=function(t,e,r){return(this._listeners[t]||(this._listeners[t]=[])).push({fn:e,ctx:r||this}),this},i.prototype.off=function(t,e){if(void 0===t)this._listeners={};else if(void 0===e)this._listeners[t]=[];else for(var r=this._listeners[t],i=0;i<r.length;)r[i].fn===e?r.splice(i,1):++i;return this},i.prototype.emit=function(t){var e=this._listeners[t];if(e){for(var r=[],i=1;i<arguments.length;)r.push(arguments[i++]);for(i=0;i<e.length;)e[i].fn.apply(e[i++].ctx,r)}return this}},{}],3:[function(t,e,r){"use strict";e.exports=function(t,e){for(var r=new Array(arguments.length-1),i=0,n=2,o=!0;n<arguments.length;)r[i++]=arguments[n++];return new Promise((function(n,s){r[i]=function(t){if(o)if(o=!1,t)s(t);else{for(var e=new Array(arguments.length-1),r=0;r<e.length;)e[r++]=arguments[r];n.apply(null,e)}};try{t.apply(e||null,r)}catch(a){o&&(o=!1,s(a))}}))}},{}],4:[function(t,e,r){"use strict";var i=e.exports;i.length=function(t){var e=t.length;if(!e)return 0;for(var r=0;--e%4>1&&"="===t.charAt(e);)++r;return Math.ceil(3*t.length)/4-r};for(var n=new Array(64),o=new Array(123),s=0;s<64;)o[n[s]=s<26?s+65:s<52?s+71:s<62?s-4:s-59|43]=s++;i.encode=function(t,e,r){for(var i,o=null,s=[],a=0,u=0;e<r;){var h=t[e++];switch(u){case 0:s[a++]=n[h>>2],i=(3&h)<<4,u=1;break;case 1:s[a++]=n[i|h>>4],i=(15&h)<<2,u=2;break;case 2:s[a++]=n[i|h>>6],s[a++]=n[63&h],u=0}a>8191&&((o||(o=[])).push(String.fromCharCode.apply(String,s)),a=0)}return u&&(s[a++]=n[i],s[a++]=61,1===u&&(s[a++]=61)),o?(a&&o.push(String.fromCharCode.apply(String,s.slice(0,a))),o.join("")):String.fromCharCode.apply(String,s.slice(0,a))},i.decode=function(t,e,r){for(var i,n=r,s=0,a=0;a<t.length;){var u=t.charCodeAt(a++);if(61===u&&s>1)break;if(void 0===(u=o[u]))throw Error("invalid encoding");switch(s){case 0:i=u,s=1;break;case 1:e[r++]=i<<2|(48&u)>>4,i=u,s=2;break;case 2:e[r++]=(15&i)<<4|(60&u)>>2,i=u,s=3;break;case 3:e[r++]=(3&i)<<6|u,s=0}}if(1===s)throw Error("invalid encoding");return r-n},i.test=function(t){return/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(t)}},{}],10:[function(t,e,r){"use strict";function i(t){return"undefined"!=typeof Float32Array?function(){var e=new Float32Array([-0]),r=new Uint8Array(e.buffer),i=128===r[3];function n(t,i,n){e[0]=t,i[n]=r[0],i[n+1]=r[1],i[n+2]=r[2],i[n+3]=r[3]}function o(t,i,n){e[0]=t,i[n]=r[3],i[n+1]=r[2],i[n+2]=r[1],i[n+3]=r[0]}function s(t,i){return r[0]=t[i],r[1]=t[i+1],r[2]=t[i+2],r[3]=t[i+3],e[0]}function a(t,i){return r[3]=t[i],r[2]=t[i+1],r[1]=t[i+2],r[0]=t[i+3],e[0]}t.writeFloatLE=i?n:o,t.writeFloatBE=i?o:n,t.readFloatLE=i?s:a,t.readFloatBE=i?a:s}():function(){function e(t,e,r,i){var n=e<0?1:0;if(n&&(e=-e),0===e)t(1/e>0?0:2147483648,r,i);else if(isNaN(e))t(2143289344,r,i);else if(e>34028234663852886e22)t((n<<31|2139095040)>>>0,r,i);else if(e<11754943508222875e-54)t((n<<31|Math.round(e/1401298464324817e-60))>>>0,r,i);else{var o=Math.floor(Math.log(e)/Math.LN2);t((n<<31|o+127<<23|8388607&Math.round(e*Math.pow(2,-o)*8388608))>>>0,r,i)}}function r(t,e,r){var i=t(e,r),n=2*(i>>31)+1,o=i>>>23&255,s=8388607&i;return 255===o?s?NaN:n*(1/0):0===o?1401298464324817e-60*n*s:n*Math.pow(2,o-150)*(s+8388608)}t.writeFloatLE=e.bind(null,n),t.writeFloatBE=e.bind(null,o),t.readFloatLE=r.bind(null,s),t.readFloatBE=r.bind(null,a)}(),"undefined"!=typeof Float64Array?function(){var e=new Float64Array([-0]),r=new Uint8Array(e.buffer),i=128===r[7];function n(t,i,n){e[0]=t,i[n]=r[0],i[n+1]=r[1],i[n+2]=r[2],i[n+3]=r[3],i[n+4]=r[4],i[n+5]=r[5],i[n+6]=r[6],i[n+7]=r[7]}function o(t,i,n){e[0]=t,i[n]=r[7],i[n+1]=r[6],i[n+2]=r[5],i[n+3]=r[4],i[n+4]=r[3],i[n+5]=r[2],i[n+6]=r[1],i[n+7]=r[0]}function s(t,i){return r[0]=t[i],r[1]=t[i+1],r[2]=t[i+2],r[3]=t[i+3],r[4]=t[i+4],r[5]=t[i+5],r[6]=t[i+6],r[7]=t[i+7],e[0]}function a(t,i){return r[7]=t[i],r[6]=t[i+1],r[5]=t[i+2],r[4]=t[i+3],r[3]=t[i+4],r[2]=t[i+5],r[1]=t[i+6],r[0]=t[i+7],e[0]}t.writeDoubleLE=i?n:o,t.writeDoubleBE=i?o:n,t.readDoubleLE=i?s:a,t.readDoubleBE=i?a:s}():function(){function e(t,e,r,i,n,o){var s=i<0?1:0;if(s&&(i=-i),0===i)t(0,n,o+e),t(1/i>0?0:2147483648,n,o+r);else if(isNaN(i))t(0,n,o+e),t(2146959360,n,o+r);else if(i>17976931348623157e292)t(0,n,o+e),t((s<<31|2146435072)>>>0,n,o+r);else{var a;if(i<22250738585072014e-324)t((a=i/5e-324)>>>0,n,o+e),t((s<<31|a/4294967296)>>>0,n,o+r);else{var u=Math.floor(Math.log(i)/Math.LN2);1024===u&&(u=1023),t(4503599627370496*(a=i*Math.pow(2,-u))>>>0,n,o+e),t((s<<31|u+1023<<20|1048576*a&1048575)>>>0,n,o+r)}}}function r(t,e,r,i,n){var o=t(i,n+e),s=t(i,n+r),a=2*(s>>31)+1,u=s>>>20&2047,h=4294967296*(1048575&s)+o;return 2047===u?h?NaN:a*(1/0):0===u?5e-324*a*h:a*Math.pow(2,u-1075)*(h+4503599627370496)}t.writeDoubleLE=e.bind(null,n,0,4),t.writeDoubleBE=e.bind(null,o,4,0),t.readDoubleLE=r.bind(null,s,0,4),t.readDoubleBE=r.bind(null,a,4,0)}(),t}function n(t,e,r){e[r]=255&t,e[r+1]=t>>>8&255,e[r+2]=t>>>16&255,e[r+3]=t>>>24}function o(t,e,r){e[r]=t>>>24,e[r+1]=t>>>16&255,e[r+2]=t>>>8&255,e[r+3]=255&t}function s(t,e){return(t[e]|t[e+1]<<8|t[e+2]<<16|t[e+3]<<24)>>>0}function a(t,e){return(t[e]<<24|t[e+1]<<16|t[e+2]<<8|t[e+3])>>>0}e.exports=i(i)},{}],11:[function(t,e,r){"use strict";e.exports=n;var i=null;try{i=new WebAssembly.Instance(new WebAssembly.Module(new Uint8Array([0,97,115,109,1,0,0,0,1,13,2,96,0,1,127,96,4,127,127,127,127,1,127,3,7,6,0,1,1,1,1,1,6,6,1,127,1,65,0,11,7,50,6,3,109,117,108,0,1,5,100,105,118,95,115,0,2,5,100,105,118,95,117,0,3,5,114,101,109,95,115,0,4,5,114,101,109,95,117,0,5,8,103,101,116,95,104,105,103,104,0,0,10,191,1,6,4,0,35,0,11,36,1,1,126,32,0,173,32,1,173,66,32,134,132,32,2,173,32,3,173,66,32,134,132,126,34,4,66,32,135,167,36,0,32,4,167,11,36,1,1,126,32,0,173,32,1,173,66,32,134,132,32,2,173,32,3,173,66,32,134,132,127,34,4,66,32,135,167,36,0,32,4,167,11,36,1,1,126,32,0,173,32,1,173,66,32,134,132,32,2,173,32,3,173,66,32,134,132,128,34,4,66,32,135,167,36,0,32,4,167,11,36,1,1,126,32,0,173,32,1,173,66,32,134,132,32,2,173,32,3,173,66,32,134,132,129,34,4,66,32,135,167,36,0,32,4,167,11,36,1,1,126,32,0,173,32,1,173,66,32,134,132,32,2,173,32,3,173,66,32,134,132,130,34,4,66,32,135,167,36,0,32,4,167,11])),{}).exports}catch(E){}function n(t,e,r){this.low=0|t,this.high=0|e,this.unsigned=!!r}function o(t){return!0===(t&&t.__isLong__)}n.prototype.__isLong__,Object.defineProperty(n.prototype,"__isLong__",{value:!0}),n.isLong=o;var s={},a={};function u(t,e){var r,i,n;return e?(n=0<=(t>>>=0)&&t<256)&&(i=a[t])?i:(r=l(t,(0|t)<0?-1:0,!0),n&&(a[t]=r),r):(n=-128<=(t|=0)&&t<128)&&(i=s[t])?i:(r=l(t,t<0?-1:0,!1),n&&(s[t]=r),r)}function h(t,e){if(isNaN(t))return e?b:g;if(e){if(t<0)return b;if(t>=y)return A}else{if(t<=-m)return O;if(t+1>=m)return k}return t<0?h(-t,e).neg():l(t%p|0,t/p|0,e)}function l(t,e,r){return new n(t,e,r)}n.fromInt=u,n.fromNumber=h,n.fromBits=l;var f=Math.pow;function c(t,e,r){if(0===t.length)throw Error("empty string");if("NaN"===t||"Infinity"===t||"+Infinity"===t||"-Infinity"===t)return g;if("number"==typeof e?(r=e,e=!1):e=!!e,(r=r||10)<2||36<r)throw RangeError("radix");var i;if((i=t.indexOf("-"))>0)throw Error("interior hyphen");if(0===i)return c(t.substring(1),e,r).neg();for(var n=h(f(r,8)),o=g,s=0;s<t.length;s+=8){var a=Math.min(8,t.length-s),u=parseInt(t.substring(s,s+a),r);if(a<8){var l=h(f(r,a));o=o.mul(l).add(h(u))}else o=(o=o.mul(n)).add(h(u))}return o.unsigned=e,o}function d(t,e){return"number"==typeof t?h(t,e):"string"==typeof t?c(t,e):l(t.low,t.high,"boolean"==typeof e?e:t.unsigned)}n.fromString=c,n.fromValue=d;var p=4294967296,y=p*p,m=y/2,v=u(1<<24),g=u(0);n.ZERO=g;var b=u(0,!0);n.UZERO=b;var w=u(1);n.ONE=w;var _=u(1,!0);n.UONE=_;var x=u(-1);n.NEG_ONE=x;var k=l(-1,2147483647,!1);n.MAX_VALUE=k;var A=l(-1,-1,!0);n.MAX_UNSIGNED_VALUE=A;var O=l(0,-2147483648,!1);n.MIN_VALUE=O;var S=n.prototype;S.toInt=function(){return this.unsigned?this.low>>>0:this.low},S.toNumber=function(){return this.unsigned?(this.high>>>0)*p+(this.low>>>0):this.high*p+(this.low>>>0)},S.toString=function(t){if((t=t||10)<2||36<t)throw RangeError("radix");if(this.isZero())return"0";if(this.isNegative()){if(this.eq(O)){var e=h(t),r=this.div(e),i=r.mul(e).sub(this);return r.toString(t)+i.toInt().toString(t)}return"-"+this.neg().toString(t)}for(var n=h(f(t,6),this.unsigned),o=this,s="";;){var a=o.div(n),u=(o.sub(a.mul(n)).toInt()>>>0).toString(t);if((o=a).isZero())return u+s;for(;u.length<6;)u="0"+u;s=""+u+s}},S.getHighBits=function(){return this.high},S.getHighBitsUnsigned=function(){return this.high>>>0},S.getLowBits=function(){return this.low},S.getLowBitsUnsigned=function(){return this.low>>>0},S.getNumBitsAbs=function(){if(this.isNegative())return this.eq(O)?64:this.neg().getNumBitsAbs();for(var t=0!=this.high?this.high:this.low,e=31;e>0&&0==(t&1<<e);e--);return 0!=this.high?e+33:e+1},S.isZero=function(){return 0===this.high&&0===this.low},S.eqz=S.isZero,S.isNegative=function(){return!this.unsigned&&this.high<0},S.isPositive=function(){return this.unsigned||this.high>=0},S.isOdd=function(){return 1==(1&this.low)},S.isEven=function(){return 0==(1&this.low)},S.equals=function(t){return o(t)||(t=d(t)),(this.unsigned===t.unsigned||this.high>>>31!=1||t.high>>>31!=1)&&this.high===t.high&&this.low===t.low},S.eq=S.equals,S.notEquals=function(t){return!this.eq(t)},S.neq=S.notEquals,S.ne=S.notEquals,S.lessThan=function(t){return this.comp(t)<0},S.lt=S.lessThan,S.lessThanOrEqual=function(t){return this.comp(t)<=0},S.lte=S.lessThanOrEqual,S.le=S.lessThanOrEqual,S.greaterThan=function(t){return this.comp(t)>0},S.gt=S.greaterThan,S.greaterThanOrEqual=function(t){return this.comp(t)>=0},S.gte=S.greaterThanOrEqual,S.ge=S.greaterThanOrEqual,S.compare=function(t){if(o(t)||(t=d(t)),this.eq(t))return 0;var e=this.isNegative(),r=t.isNegative();return e&&!r?-1:!e&&r?1:this.unsigned?t.high>>>0>this.high>>>0||t.high===this.high&&t.low>>>0>this.low>>>0?-1:1:this.sub(t).isNegative()?-1:1},S.comp=S.compare,S.negate=function(){return!this.unsigned&&this.eq(O)?O:this.not().add(w)},S.neg=S.negate,S.add=function(t){o(t)||(t=d(t));var e=this.high>>>16,r=65535&this.high,i=this.low>>>16,n=65535&this.low,s=t.high>>>16,a=65535&t.high,u=t.low>>>16,h=0,f=0,c=0,p=0;return c+=(p+=n+(65535&t.low))>>>16,f+=(c+=i+u)>>>16,h+=(f+=r+a)>>>16,h+=e+s,l((c&=65535)<<16|(p&=65535),(h&=65535)<<16|(f&=65535),this.unsigned)},S.subtract=function(t){return o(t)||(t=d(t)),this.add(t.neg())},S.sub=S.subtract,S.multiply=function(t){if(this.isZero())return g;if(o(t)||(t=d(t)),i)return l(i.mul(this.low,this.high,t.low,t.high),i.get_high(),this.unsigned);if(t.isZero())return g;if(this.eq(O))return t.isOdd()?O:g;if(t.eq(O))return this.isOdd()?O:g;if(this.isNegative())return t.isNegative()?this.neg().mul(t.neg()):this.neg().mul(t).neg();if(t.isNegative())return this.mul(t.neg()).neg();if(this.lt(v)&&t.lt(v))return h(this.toNumber()*t.toNumber(),this.unsigned);var e=this.high>>>16,r=65535&this.high,n=this.low>>>16,s=65535&this.low,a=t.high>>>16,u=65535&t.high,f=t.low>>>16,c=65535&t.low,p=0,y=0,m=0,b=0;return m+=(b+=s*c)>>>16,y+=(m+=n*c)>>>16,m&=65535,y+=(m+=s*f)>>>16,p+=(y+=r*c)>>>16,y&=65535,p+=(y+=n*f)>>>16,y&=65535,p+=(y+=s*u)>>>16,p+=e*c+r*f+n*u+s*a,l((m&=65535)<<16|(b&=65535),(p&=65535)<<16|(y&=65535),this.unsigned)},S.mul=S.multiply,S.divide=function(t){if(o(t)||(t=d(t)),t.isZero())throw Error("division by zero");var e,r,n;if(i)return this.unsigned||-2147483648!==this.high||-1!==t.low||-1!==t.high?l((this.unsigned?i.div_u:i.div_s)(this.low,this.high,t.low,t.high),i.get_high(),this.unsigned):this;if(this.isZero())return this.unsigned?b:g;if(this.unsigned){if(t.unsigned||(t=t.toUnsigned()),t.gt(this))return b;if(t.gt(this.shru(1)))return _;n=b}else{if(this.eq(O))return t.eq(w)||t.eq(x)?O:t.eq(O)?w:(e=this.shr(1).div(t).shl(1)).eq(g)?t.isNegative()?w:x:(r=this.sub(t.mul(e)),n=e.add(r.div(t)));if(t.eq(O))return this.unsigned?b:g;if(this.isNegative())return t.isNegative()?this.neg().div(t.neg()):this.neg().div(t).neg();if(t.isNegative())return this.div(t.neg()).neg();n=g}for(r=this;r.gte(t);){e=Math.max(1,Math.floor(r.toNumber()/t.toNumber()));for(var s=Math.ceil(Math.log(e)/Math.LN2),a=s<=48?1:f(2,s-48),u=h(e),c=u.mul(t);c.isNegative()||c.gt(r);)c=(u=h(e-=a,this.unsigned)).mul(t);u.isZero()&&(u=w),n=n.add(u),r=r.sub(c)}return n},S.div=S.divide,S.modulo=function(t){return o(t)||(t=d(t)),i?l((this.unsigned?i.rem_u:i.rem_s)(this.low,this.high,t.low,t.high),i.get_high(),this.unsigned):this.sub(this.div(t).mul(t))},S.mod=S.modulo,S.rem=S.modulo,S.not=function(){return l(~this.low,~this.high,this.unsigned)},S.and=function(t){return o(t)||(t=d(t)),l(this.low&t.low,this.high&t.high,this.unsigned)},S.or=function(t){return o(t)||(t=d(t)),l(this.low|t.low,this.high|t.high,this.unsigned)},S.xor=function(t){return o(t)||(t=d(t)),l(this.low^t.low,this.high^t.high,this.unsigned)},S.shiftLeft=function(t){return o(t)&&(t=t.toInt()),0==(t&=63)?this:t<32?l(this.low<<t,this.high<<t|this.low>>>32-t,this.unsigned):l(0,this.low<<t-32,this.unsigned)},S.shl=S.shiftLeft,S.shiftRight=function(t){return o(t)&&(t=t.toInt()),0==(t&=63)?this:t<32?l(this.low>>>t|this.high<<32-t,this.high>>t,this.unsigned):l(this.high>>t-32,this.high>=0?0:-1,this.unsigned)},S.shr=S.shiftRight,S.shiftRightUnsigned=function(t){if(o(t)&&(t=t.toInt()),0==(t&=63))return this;var e=this.high;return t<32?l(this.low>>>t|e<<32-t,e>>>t,this.unsigned):l(32===t?e:e>>>t-32,0,this.unsigned)},S.shru=S.shiftRightUnsigned,S.shr_u=S.shiftRightUnsigned,S.toSigned=function(){return this.unsigned?l(this.low,this.high,!1):this},S.toUnsigned=function(){return this.unsigned?this:l(this.low,this.high,!0)},S.toBytes=function(t){return t?this.toBytesLE():this.toBytesBE()},S.toBytesLE=function(){var t=this.high,e=this.low;return[255&e,e>>>8&255,e>>>16&255,e>>>24,255&t,t>>>8&255,t>>>16&255,t>>>24]},S.toBytesBE=function(){var t=this.high,e=this.low;return[t>>>24,t>>>16&255,t>>>8&255,255&t,e>>>24,e>>>16&255,e>>>8&255,255&e]},n.fromBytes=function(t,e,r){return r?n.fromBytesLE(t,e):n.fromBytesBE(t,e)},n.fromBytesLE=function(t,e){return new n(t[0]|t[1]<<8|t[2]<<16|t[3]<<24,t[4]|t[5]<<8|t[6]<<16|t[7]<<24,e)},n.fromBytesBE=function(t,e){return new n(t[4]<<24|t[5]<<16|t[6]<<8|t[7],t[0]<<24|t[1]<<16|t[2]<<8|t[3],e)}},{}],12:[function(t,e,r){"use strict";function i(t,e){this.lo=t>>>0,this.hi=e>>>0}e.exports=i;var n=i.zero=new i(0,0);n.toNumber=function(){return 0},n.zzEncode=n.zzDecode=function(){return this},n.length=function(){return 1};var o=i.zeroHash="\0\0\0\0\0\0\0\0";i.fromNumber=function(t){if(0===t)return n;var e=t<0;e&&(t=-t);var r=t>>>0,o=(t-r)/4294967296>>>0;return e&&(o=~o>>>0,r=~r>>>0,++r>4294967295&&(r=0,++o>4294967295&&(o=0))),new i(r,o)},i.from=function(t){return"number"==typeof t?i.fromNumber(t):"string"==typeof t||t instanceof String?i.fromNumber(parseInt(t,10)):t.low||t.high?new i(t.low>>>0,t.high>>>0):n},i.prototype.toNumber=function(t){if(!t&&this.hi>>>31){var e=1+~this.lo>>>0,r=~this.hi>>>0;return e||(r=r+1>>>0),-(e+4294967296*r)}return this.lo+4294967296*this.hi},i.prototype.toLong=function(t){return{low:0|this.lo,high:0|this.hi,unsigned:Boolean(t)}};var s=String.prototype.charCodeAt;i.fromHash=function(t){return t===o?n:new i((s.call(t,0)|s.call(t,1)<<8|s.call(t,2)<<16|s.call(t,3)<<24)>>>0,(s.call(t,4)|s.call(t,5)<<8|s.call(t,6)<<16|s.call(t,7)<<24)>>>0)},i.prototype.toHash=function(){return String.fromCharCode(255&this.lo,this.lo>>>8&255,this.lo>>>16&255,this.lo>>>24,255&this.hi,this.hi>>>8&255,this.hi>>>16&255,this.hi>>>24)},i.prototype.zzEncode=function(){var t=this.hi>>31;return this.hi=((this.hi<<1|this.lo>>>31)^t)>>>0,this.lo=(this.lo<<1^t)>>>0,this},i.prototype.zzDecode=function(){var t=-(1&this.lo);return this.lo=((this.lo>>>1|this.hi<<31)^t)>>>0,this.hi=(this.hi>>>1^t)>>>0,this},i.prototype.length=function(){var t=this.lo,e=(this.lo>>>28|this.hi<<4)>>>0,r=this.hi>>>24;return 0===r?0===e?t<16384?t<128?1:2:t<2097152?3:4:e<16384?e<128?5:6:e<2097152?7:8:r<128?9:10}},{}],20:[function(t,e,r){"use strict";var i=e.exports,n=i.isAbsolute=function(t){return/^(?:\/|\w+:)/.test(t)},o=i.normalize=function(t){var e=(t=t.replace(/\\/g,"/").replace(/\/{2,}/g,"/")).split("/"),r=n(t),i="";r&&(i=e.shift()+"/");for(var o=0;o<e.length;)".."===e[o]?o>0&&".."!==e[o-1]?e.splice(--o,2):r?e.splice(o,1):++o:"."===e[o]?e.splice(o,1):++o;return i+e.join("/")};i.resolve=function(t,e,r){return r||(e=o(e)),n(e)?e:(r||(t=o(t)),(t=t.replace(/(?:\/|^)[^/]+$/,"")).length?o(t+"/"+e):e)}},{}],21:[function(t,e,r){"use strict";e.exports=function(t,e,r){var i=r||8192,n=i>>>1,o=null,s=i;return function(r){if(r<1||r>n)return t(r);s+r>i&&(o=t(i),s=0);var a=e.call(o,s,s+=r);return 7&s&&(s=1+(7|s)),a}}},{}],30:[function(t,e,r){"use strict";var i=e.exports;i.length=function(t){for(var e=0,r=0,i=0;i<t.length;++i)(r=t.charCodeAt(i))<128?e+=1:r<2048?e+=2:55296==(64512&r)&&56320==(64512&t.charCodeAt(i+1))?(++i,e+=4):e+=3;return e},i.read=function(t,e,r){if(r-e<1)return"";for(var i,n=null,o=[],s=0;e<r;)(i=t[e++])<128?o[s++]=i:i>191&&i<224?o[s++]=(31&i)<<6|63&t[e++]:i>239&&i<365?(i=((7&i)<<18|(63&t[e++])<<12|(63&t[e++])<<6|63&t[e++])-65536,o[s++]=55296+(i>>10),o[s++]=56320+(1023&i)):o[s++]=(15&i)<<12|(63&t[e++])<<6|63&t[e++],s>8191&&((n||(n=[])).push(String.fromCharCode.apply(String,o)),s=0);return n?(s&&n.push(String.fromCharCode.apply(String,o.slice(0,s))),n.join("")):String.fromCharCode.apply(String,o.slice(0,s))},i.write=function(t,e,r){for(var i,n,o=r,s=0;s<t.length;++s)(i=t.charCodeAt(s))<128?e[r++]=i:i<2048?(e[r++]=i>>6|192,e[r++]=63&i|128):55296==(64512&i)&&56320==(64512&(n=t.charCodeAt(s+1)))?(i=65536+((1023&i)<<10)+(1023&n),++s,e[r++]=i>>18|240,e[r++]=i>>12&63|128,e[r++]=i>>6&63|128,e[r++]=63&i|128):(e[r++]=i>>12|224,e[r++]=i>>6&63|128,e[r++]=63&i|128);return r-o}},{}],35:[function(t,e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.getMiniBridge=void 0,r.getMiniBridge=function(){return"undefined"==typeof wx&&"undefined"!=typeof my?my:wx}},{}],36:[function(t,e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.BezierPath=void 0;var i=function(t,e,r){this.d=t,this.transform=e,this.styles=r,this._d=t,this._transform=e,this._styles=r};r.BezierPath=i},{}],37:[function(t,e,r){"use strict";var i,n=this&&this.__extends||(i=function(t,e){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r])})(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function r(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)});Object.defineProperty(r,"__esModule",{value:!0}),r.EllipsePath=void 0;var o=function(t){function e(e,r,i,n,o,s){var a=t.call(this,"",o,s)||this;return a._x=e,a._y=r,a._radiusX=i,a._radiusY=n,a._transform=o,a._styles=s,a}return n(e,t),e}(t(36).BezierPath);r.EllipsePath=o},{36:36}],38:[function(t,e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.FrameEntity=void 0;var i=t(36),n=function t(e){this.alpha=0,this.transform={a:1,b:0,c:0,d:1,tx:0,ty:0},this.layout={x:0,y:0,width:0,height:0},this.nx=0,this.ny=0,this.shapes=[],this.alpha=parseFloat(e.alpha)||0,e.layout&&(this.layout.x=parseFloat(e.layout.x)||0,this.layout.y=parseFloat(e.layout.y)||0,this.layout.width=parseFloat(e.layout.width)||0,this.layout.height=parseFloat(e.layout.height)||0),e.transform&&(this.transform.a=parseFloat(e.transform.a)||1,this.transform.b=parseFloat(e.transform.b)||0,this.transform.c=parseFloat(e.transform.c)||0,this.transform.d=parseFloat(e.transform.d)||1,this.transform.tx=parseFloat(e.transform.tx)||0,this.transform.ty=parseFloat(e.transform.ty)||0),e.clipPath&&e.clipPath.length>0&&(this.maskPath=new i.BezierPath(e.clipPath,void 0,{fill:"#000000"})),e.shapes&&(e.shapes instanceof Array&&e.shapes.forEach((function(t){switch(t.pathArgs=t.args,t.type){case 0:t.type="shape",t.pathArgs=t.shape;break;case 1:t.type="rect",t.pathArgs=t.rect;break;case 2:t.type="ellipse",t.pathArgs=t.ellipse;break;case 3:t.type="keep"}if(t.styles){t.styles.fill&&("number"==typeof t.styles.fill.r&&(t.styles.fill[0]=t.styles.fill.r),"number"==typeof t.styles.fill.g&&(t.styles.fill[1]=t.styles.fill.g),"number"==typeof t.styles.fill.b&&(t.styles.fill[2]=t.styles.fill.b),"number"==typeof t.styles.fill.a&&(t.styles.fill[3]=t.styles.fill.a)),t.styles.stroke&&("number"==typeof t.styles.stroke.r&&(t.styles.stroke[0]=t.styles.stroke.r),"number"==typeof t.styles.stroke.g&&(t.styles.stroke[1]=t.styles.stroke.g),"number"==typeof t.styles.stroke.b&&(t.styles.stroke[2]=t.styles.stroke.b),"number"==typeof t.styles.stroke.a&&(t.styles.stroke[3]=t.styles.stroke.a));var e=t.styles.lineDash||[];switch(t.styles.lineDashI>0&&e.push(t.styles.lineDashI),t.styles.lineDashII>0&&(e.length<1&&e.push(0),e.push(t.styles.lineDashII),e.push(0)),t.styles.lineDashIII>0&&(e.length<2&&(e.push(0),e.push(0)),e[2]=t.styles.lineDashIII),t.styles.lineDash=e,t.styles.lineJoin){case 0:t.styles.lineJoin="miter";break;case 1:t.styles.lineJoin="round";break;case 2:t.styles.lineJoin="bevel"}switch(t.styles.lineCap){case 0:t.styles.lineCap="butt";break;case 1:t.styles.lineCap="round";break;case 2:t.styles.lineCap="square"}}})),e.shapes[0]&&"keep"===e.shapes[0].type?this.shapes=t.lastShapes:(this.shapes=e.shapes,t.lastShapes=e.shapes));var r=this.transform.a*this.layout.x+this.transform.c*this.layout.y+this.transform.tx,n=this.transform.a*(this.layout.x+this.layout.width)+this.transform.c*this.layout.y+this.transform.tx,o=this.transform.a*this.layout.x+this.transform.c*(this.layout.y+this.layout.height)+this.transform.tx,s=this.transform.a*(this.layout.x+this.layout.width)+this.transform.c*(this.layout.y+this.layout.height)+this.transform.tx,a=this.transform.b*this.layout.x+this.transform.d*this.layout.y+this.transform.ty,u=this.transform.b*(this.layout.x+this.layout.width)+this.transform.d*this.layout.y+this.transform.ty,h=this.transform.b*this.layout.x+this.transform.d*(this.layout.y+this.layout.height)+this.transform.ty,l=this.transform.b*(this.layout.x+this.layout.width)+this.transform.d*(this.layout.y+this.layout.height)+this.transform.ty;this.nx=Math.min(Math.min(o,s),Math.min(r,n)),this.ny=Math.min(Math.min(h,l),Math.min(a,u))};r.FrameEntity=n},{36:36}],39:[function(t,e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.Player=r.Parser=void 0;var i=t(41),n=t(42);r.Parser=i.Parser,r.Player=n.Player},{41:41,42:42}],42:[function(t,e,r){"use strict";var i=this&&this.__awaiter||function(t,e,r,i){return new(r||(r=Promise))((function(n,o){function s(t){try{u(i.next(t))}catch(e){o(e)}}function a(t){try{u(i.throw(t))}catch(e){o(e)}}function u(t){var e;t.done?n(t.value):(e=t.value,e instanceof r?e:new r((function(t){t(e)}))).then(s,a)}u((i=i.apply(t,e||[])).next())}))},n=this&&this.__generator||function(t,e){var r,i,n,o,s={label:0,sent:function(){if(1&n[0])throw n[1];return n[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,i&&(n=2&o[0]?i.return:o[0]?i.throw||((n=i.return)&&n.call(i),0):i.next)&&!(n=n.call(i,o[1])).done)return n;switch(i=0,n&&(o=[2&o[0],n.value]),o[0]){case 0:case 1:n=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,i=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(n=(n=s.trys).length>0&&n[n.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!n||o[1]>n[0]&&o[1]<n[3])){s.label=o[1];break}if(6===o[0]&&s.label<n[1]){s.label=n[1],n=o;break}if(n&&s.label<n[2]){s.label=n[2],s.ops.push(o);break}n[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(a){o=[6,a],i=0}finally{r=n=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}};Object.defineProperty(r,"__esModule",{value:!0}),r.Player=void 0;var o=t(45),s=t(47),a=t(35).getMiniBridge(),u=function(){function t(){this.loops=0,this.clearsAfterStop=!0,this.fillMode="Forward",this._contentMode="AspectFit",this._animator=new s.ValueAnimator,this._forwardAnimating=!1,this._currentFrame=0,this._dynamicImage={},this._dynamicText={}}return t.prototype.setCanvas=function(t,e){return i(this,void 0,void 0,(function(){var r=this;return n(this,(function(i){return[2,new Promise((function(i,n){var o=a.createSelectorQuery();e&&(o=o.in(e)),o.select(t).fields({node:!0,size:!0}).exec((function(t){var e;if(r.canvas=null===(e=null==t?void 0:t[0])||void 0===e?void 0:e.node,r.canvas)if(r.ctx=r.canvas.getContext("2d"),r.ctx){var o=a.getSystemInfoSync().pixelRatio;r.canvas.width=t[0].width*o,r.canvas.height=t[0].height*o,i(void 0)}else n("canvas context not found.");else n("canvas not found.")}))}))]}))}))},t.prototype.setVideoItem=function(t){return i(this,void 0,void 0,(function(){var e,r,s=this;return n(this,(function(a){switch(a.label){case 0:return this._currentFrame=0,this._videoItem=t,t?[4,Promise.all(Object.keys(t.spec.images).map((function(e){return i(s,void 0,void 0,(function(){var r;return n(this,(function(i){switch(i.label){case 0:return i.trys.push([0,2,,3]),[4,this.loadWXImage(t.spec.images[e])];case 1:return r=i.sent(),[2,{key:e,value:r}];case 2:return i.sent(),[2,{key:e,value:void 0}];case 3:return[2]}}))}))})))]:[3,2];case 1:return e=a.sent(),r={},e.forEach((function(t){r[t.key]=t.value})),t.decodedImages=r,this._renderer=new o.Renderer(this._videoItem,this.ctx,this.canvas),[3,3];case 2:this._renderer=void 0,a.label=3;case 3:return this.clear(),this._update(),[2]}}))}))},t.prototype.loadWXImage=function(t){var e=this;if(!this.canvas)throw"no canvas";return new Promise((function(r,i){var n=e.canvas.createImage();n.onload=function(){r(n)},n.onerror=function(t){console.log(t),i("image decoded fail.")},n.src="string"==typeof t?t:"data:image/png;base64,"+a.arrayBufferToBase64(t)}))},t.prototype.setContentMode=function(t){this._contentMode=t,this._update()},t.prototype.startAnimation=function(t){void 0===t&&(t=!1),this.stopAnimation(!1),this._doStart(void 0,t,void 0)},t.prototype.startAnimationWithRange=function(t,e){void 0===e&&(e=!1),this.stopAnimation(!1),this._doStart(t,e,void 0)},t.prototype.pauseAnimation=function(){this.stopAnimation(!1)},t.prototype.stopAnimation=function(t){this._forwardAnimating=!1,void 0!==this._animator&&this._animator.stop(),void 0===t&&(t=this.clearsAfterStop),t&&this.clear()},t.prototype.clear=function(){var t;null===(t=this._renderer)||void 0===t||t.clear()},t.prototype.stepToFrame=function(t,e){void 0===e&&(e=!1);var r=this._videoItem;r&&(t>=r.frames||t<0||(this.pauseAnimation(),this._currentFrame=t,this._update(),e&&this._doStart(void 0,!1,this._currentFrame)))},t.prototype.stepToPercentage=function(t,e){void 0===e&&(e=!1);var r=this._videoItem;if(r){var i=t*r.frames;i>=r.frames&&i>0&&(i=r.frames-1),this.stepToFrame(i,e)}},t.prototype.setImage=function(t,e){return i(this,void 0,void 0,(function(){var r;return n(this,(function(i){switch(i.label){case 0:return[4,this.loadWXImage(t)];case 1:return r=i.sent(),this._dynamicImage[e]=r,[2]}}))}))},t.prototype.setText=function(t,e){this._dynamicText[e]=t},t.prototype.clearDynamicObjects=function(){this._dynamicImage={},this._dynamicText={}},t.prototype.onFinished=function(t){this._onFinished=t},t.prototype.onFrame=function(t){this._onFrame=t},t.prototype.onPercentage=function(t){this._onPercentage=t},t.prototype._doStart=function(t,e,r){var i=this;void 0===e&&(e=!1),void 0===r&&(r=0);var n=this._videoItem;n&&(this._animator=new s.ValueAnimator,this._animator.canvas=this.canvas,void 0!==t?(this._animator.startValue=Math.max(0,t.location),this._animator.endValue=Math.min(n.frames-1,t.location+t.length),this._animator.duration=(this._animator.endValue-this._animator.startValue+1)*(1/n.FPS)*1e3):(this._animator.startValue=0,this._animator.endValue=n.frames-1,this._animator.duration=n.frames*(1/n.FPS)*1e3),this._animator.loops=this.loops<=0?1/0:this.loops,this._animator.fillRule="Backward"===this.fillMode?1:0,this._animator.onUpdate=function(t){i._currentFrame!==Math.floor(t)&&(i._forwardAnimating&&(i._currentFrame,Math.floor(t)),i._currentFrame=Math.floor(t),i._update(),"function"==typeof i._onFrame&&i._onFrame(i._currentFrame),"function"==typeof i._onPercentage&&i._onPercentage((i._currentFrame+1)/n.frames))},this._animator.onEnd=function(){i._forwardAnimating=!1,!0===i.clearsAfterStop&&i.clear(),"function"==typeof i._onFinished&&i._onFinished()},!0===e?(this._animator.reverse(r),this._forwardAnimating=!1):(this._animator.start(r),this._forwardAnimating=!0),this._currentFrame=this._animator.startValue,this._update())},t.prototype._resize=function(){var t=this.ctx,e=this._videoItem;if(t&&e){var r=1,i=1,n=0,o=0,s=this.canvas.width,a=this.canvas.height,u=e.videoSize;if("Fill"===this._contentMode)r=s/u.width,i=a/u.height;else if("AspectFit"===this._contentMode||"AspectFill"===this._contentMode){var h=u.width/u.height,l=s/a;h>=l&&"AspectFit"===this._contentMode||h<=l&&"AspectFill"===this._contentMode?(r=i=s/u.width,o=(a-u.height*i)/2):(h<l&&"AspectFit"===this._contentMode||h>l&&"AspectFill"===this._contentMode)&&(r=i=a/u.height,n=(s-u.width*r)/2)}this._renderer&&(this._renderer.globalTransform={a:r,b:0,c:0,d:i,tx:n,ty:o})}},t.prototype._update=function(){this._resize(),this._renderer&&(this._renderer._dynamicImage=this._dynamicImage,this._renderer._dynamicText=this._dynamicText,this._renderer.drawFrame(this._currentFrame),this._renderer.playAudio(this._currentFrame))},t}();r.Player=u},{35:35,45:45,47:47}],41:[function(t,e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.Parser=void 0;var i=t(48),n=t(35),o=t(40).inflate,s=t(43).ProtoMovieEntity,a=n.getMiniBridge(),u=function(){function t(){}return t.prototype.load=function(t){return new Promise((function(e,r){0===t.indexOf("http://")||0===t.indexOf("https://")?a.request({url:t,dataType:"arraybuffer",responseType:"arraybuffer",success:function(t){try{var n=o(t.data),a=s.decode(n);e(new i.VideoEntity(a))}catch(u){r(u)}},fail:function(t){r(t)}}):a.getFileSystemManager().readFile({filePath:t,success:function(t){try{var n=o(t.data),a=s.decode(n);e(new i.VideoEntity(a))}catch(u){r(u)}},fail:function(t){r(t)}})}))},t}();r.Parser=u},{35:35,40:40,43:43,48:48}],40:[function(t,e,r){"use strict";var i;i=this,function(t){var e=function(t,e,r,i){for(var n=65535&t|0,o=t>>>16&65535|0,s=0;0!==r;){r-=s=r>2e3?2e3:r;do{o=o+(n=n+e[i++]|0)|0}while(--s);n%=65521,o%=65521}return n|o<<16|0},r=new Uint32Array(function(){for(var t,e=[],r=0;r<256;r++){t=r;for(var i=0;i<8;i++)t=1&t?3988292384^t>>>1:t>>>1;e[r]=t}return e}()),i=function(t,e,i,n){var o=r,s=n+i;t^=-1;for(var a=n;a<s;a++)t=t>>>8^o[255&(t^e[a])];return-1^t},n=function(t,e){var r,i,n,o,s,a,u,h,l,f,c,d,p,y,m,v,g,b,w,_,x,k,A,O,S=t.state;r=t.next_in,A=t.input,i=r+(t.avail_in-5),n=t.next_out,O=t.output,o=n-(e-t.avail_out),s=n+(t.avail_out-257),a=S.dmax,u=S.wsize,h=S.whave,l=S.wnext,f=S.window,c=S.hold,d=S.bits,p=S.lencode,y=S.distcode,m=(1<<S.lenbits)-1,v=(1<<S.distbits)-1;t:do{d<15&&(c+=A[r++]<<d,d+=8,c+=A[r++]<<d,d+=8),g=p[c&m];e:for(;;){if(c>>>=b=g>>>24,d-=b,0==(b=g>>>16&255))O[n++]=65535&g;else{if(!(16&b)){if(0==(64&b)){g=p[(65535&g)+(c&(1<<b)-1)];continue e}if(32&b){S.mode=12;break t}t.msg="invalid literal/length code",S.mode=30;break t}w=65535&g,(b&=15)&&(d<b&&(c+=A[r++]<<d,d+=8),w+=c&(1<<b)-1,c>>>=b,d-=b),d<15&&(c+=A[r++]<<d,d+=8,c+=A[r++]<<d,d+=8),g=y[c&v];r:for(;;){if(c>>>=b=g>>>24,d-=b,!(16&(b=g>>>16&255))){if(0==(64&b)){g=y[(65535&g)+(c&(1<<b)-1)];continue r}t.msg="invalid distance code",S.mode=30;break t}if(_=65535&g,d<(b&=15)&&(c+=A[r++]<<d,(d+=8)<b&&(c+=A[r++]<<d,d+=8)),(_+=c&(1<<b)-1)>a){t.msg="invalid distance too far back",S.mode=30;break t}if(c>>>=b,d-=b,_>(b=n-o)){if((b=_-b)>h&&S.sane){t.msg="invalid distance too far back",S.mode=30;break t}if(x=0,k=f,0===l){if(x+=u-b,b<w){w-=b;do{O[n++]=f[x++]}while(--b);x=n-_,k=O}}else if(l<b){if(x+=u+l-b,(b-=l)<w){w-=b;do{O[n++]=f[x++]}while(--b);if(x=0,l<w){w-=b=l;do{O[n++]=f[x++]}while(--b);x=n-_,k=O}}}else if(x+=l-b,b<w){w-=b;do{O[n++]=f[x++]}while(--b);x=n-_,k=O}for(;w>2;)O[n++]=k[x++],O[n++]=k[x++],O[n++]=k[x++],w-=3;w&&(O[n++]=k[x++],w>1&&(O[n++]=k[x++]))}else{x=n-_;do{O[n++]=O[x++],O[n++]=O[x++],O[n++]=O[x++],w-=3}while(w>2);w&&(O[n++]=O[x++],w>1&&(O[n++]=O[x++]))}break}}break}}while(r<i&&n<s);r-=w=d>>3,c&=(1<<(d-=w<<3))-1,t.next_in=r,t.next_out=n,t.avail_in=r<i?i-r+5:5-(r-i),t.avail_out=n<s?s-n+257:257-(n-s),S.hold=c,S.bits=d},o=new Uint16Array([3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0]),s=new Uint8Array([16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78]),a=new Uint16Array([1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0]),u=new Uint8Array([16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64]),h=function(t,e,r,i,n,h,l,f){var c,d,p,y,m,v,g,b,w,_=f.bits,x=0,k=0,A=0,O=0,S=0,E=0,N=0,T=0,j=0,R=0,F=null,I=0,B=new Uint16Array(16),P=new Uint16Array(16),C=null,M=0;for(x=0;x<=15;x++)B[x]=0;for(k=0;k<i;k++)B[e[r+k]]++;for(S=_,O=15;O>=1&&0===B[O];O--);if(S>O&&(S=O),0===O)return n[h++]=20971520,n[h++]=20971520,f.bits=1,0;for(A=1;A<O&&0===B[A];A++);for(S<A&&(S=A),T=1,x=1;x<=15;x++)if(T<<=1,(T-=B[x])<0)return-1;if(T>0&&(0===t||1!==O))return-1;for(P[1]=0,x=1;x<15;x++)P[x+1]=P[x]+B[x];for(k=0;k<i;k++)0!==e[r+k]&&(l[P[e[r+k]]++]=k);if(0===t?(F=C=l,v=19):1===t?(F=o,I-=257,C=s,M-=257,v=256):(F=a,C=u,v=-1),R=0,k=0,x=A,m=h,E=S,N=0,p=-1,y=(j=1<<S)-1,1===t&&j>852||2===t&&j>592)return 1;for(;;){g=x-N,l[k]<v?(b=0,w=l[k]):l[k]>v?(b=C[M+l[k]],w=F[I+l[k]]):(b=96,w=0),c=1<<x-N,A=d=1<<E;do{n[m+(R>>N)+(d-=c)]=g<<24|b<<16|w|0}while(0!==d);for(c=1<<x-1;R&c;)c>>=1;if(0!==c?(R&=c-1,R+=c):R=0,k++,0==--B[x]){if(x===O)break;x=e[r+l[k]]}if(x>S&&(R&y)!==p){for(0===N&&(N=S),m+=A,T=1<<(E=x-N);E+N<O&&!((T-=B[E+N])<=0);)E++,T<<=1;if(j+=1<<E,1===t&&j>852||2===t&&j>592)return 1;n[p=R&y]=S<<24|E<<16|m-h|0}}return 0!==R&&(n[m+R]=x-N<<24|64<<16|0),f.bits=S,0},l={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_MEM_ERROR:-4,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8},f=l.Z_FINISH,c=l.Z_BLOCK,d=l.Z_TREES,p=l.Z_OK,y=l.Z_STREAM_END,m=l.Z_NEED_DICT,v=l.Z_STREAM_ERROR,g=l.Z_DATA_ERROR,b=l.Z_MEM_ERROR,w=l.Z_BUF_ERROR,_=l.Z_DEFLATED,x=12,k=30,A=function(t){return(t>>>24&255)+(t>>>8&65280)+((65280&t)<<8)+((255&t)<<24)};function O(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new Uint16Array(320),this.work=new Uint16Array(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}var S,E,N=function(t){if(!t||!t.state)return v;var e=t.state;return t.total_in=t.total_out=e.total=0,t.msg="",e.wrap&&(t.adler=1&e.wrap),e.mode=1,e.last=0,e.havedict=0,e.dmax=32768,e.head=null,e.hold=0,e.bits=0,e.lencode=e.lendyn=new Int32Array(852),e.distcode=e.distdyn=new Int32Array(592),e.sane=1,e.back=-1,p},T=function(t){if(!t||!t.state)return v;var e=t.state;return e.wsize=0,e.whave=0,e.wnext=0,N(t)},j=function(t,e){var r;if(!t||!t.state)return v;var i=t.state;return e<0?(r=0,e=-e):(r=1+(e>>4),e<48&&(e&=15)),e&&(e<8||e>15)?v:(null!==i.window&&i.wbits!==e&&(i.window=null),i.wrap=r,i.wbits=e,T(t))},R=function(t,e){if(!t)return v;var r=new O;t.state=r,r.window=null;var i=j(t,e);return i!==p&&(t.state=null),i},F=!0,I=function(t){if(F){S=new Int32Array(512),E=new Int32Array(32);for(var e=0;e<144;)t.lens[e++]=8;for(;e<256;)t.lens[e++]=9;for(;e<280;)t.lens[e++]=7;for(;e<288;)t.lens[e++]=8;for(h(1,t.lens,0,288,S,0,t.work,{bits:9}),e=0;e<32;)t.lens[e++]=5;h(2,t.lens,0,32,E,0,t.work,{bits:5}),F=!1}t.lencode=S,t.lenbits=9,t.distcode=E,t.distbits=5},B=function(t,e,r,i){var n,o=t.state;return null===o.window&&(o.wsize=1<<o.wbits,o.wnext=0,o.whave=0,o.window=new Uint8Array(o.wsize)),i>=o.wsize?(o.window.set(e.subarray(r-o.wsize,r),0),o.wnext=0,o.whave=o.wsize):((n=o.wsize-o.wnext)>i&&(n=i),o.window.set(e.subarray(r-i,r-i+n),o.wnext),(i-=n)?(o.window.set(e.subarray(r-i,r),0),o.wnext=i,o.whave=o.wsize):(o.wnext+=n,o.wnext===o.wsize&&(o.wnext=0),o.whave<o.wsize&&(o.whave+=n))),0},P=T,C=R,M=function(t,r){var o,s,a,u,l,O,S,E,N,T,j,R,F,P,C,M,D,L,z,V,Z,U,q,J,$=0,K=new Uint8Array(4),H=new Uint8Array([16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15]);if(!t||!t.state||!t.output||!t.input&&0!==t.avail_in)return v;(o=t.state).mode===x&&(o.mode=13),l=t.next_out,a=t.output,S=t.avail_out,u=t.next_in,s=t.input,O=t.avail_in,E=o.hold,N=o.bits,T=O,j=S,U=p;t:for(;;)switch(o.mode){case 1:if(0===o.wrap){o.mode=13;break}for(;N<16;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}if(2&o.wrap&&35615===E){o.check=0,K[0]=255&E,K[1]=E>>>8&255,o.check=i(o.check,K,2,0),E=0,N=0,o.mode=2;break}if(o.flags=0,o.head&&(o.head.done=!1),!(1&o.wrap)||(((255&E)<<8)+(E>>8))%31){t.msg="incorrect header check",o.mode=k;break}if((15&E)!==_){t.msg="unknown compression method",o.mode=k;break}if(N-=4,Z=8+(15&(E>>>=4)),0===o.wbits)o.wbits=Z;else if(Z>o.wbits){t.msg="invalid window size",o.mode=k;break}o.dmax=1<<o.wbits,t.adler=o.check=1,o.mode=512&E?10:x,E=0,N=0;break;case 2:for(;N<16;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}if(o.flags=E,(255&o.flags)!==_){t.msg="unknown compression method",o.mode=k;break}if(57344&o.flags){t.msg="unknown header flags set",o.mode=k;break}o.head&&(o.head.text=E>>8&1),512&o.flags&&(K[0]=255&E,K[1]=E>>>8&255,o.check=i(o.check,K,2,0)),E=0,N=0,o.mode=3;case 3:for(;N<32;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}o.head&&(o.head.time=E),512&o.flags&&(K[0]=255&E,K[1]=E>>>8&255,K[2]=E>>>16&255,K[3]=E>>>24&255,o.check=i(o.check,K,4,0)),E=0,N=0,o.mode=4;case 4:for(;N<16;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}o.head&&(o.head.xflags=255&E,o.head.os=E>>8),512&o.flags&&(K[0]=255&E,K[1]=E>>>8&255,o.check=i(o.check,K,2,0)),E=0,N=0,o.mode=5;case 5:if(1024&o.flags){for(;N<16;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}o.length=E,o.head&&(o.head.extra_len=E),512&o.flags&&(K[0]=255&E,K[1]=E>>>8&255,o.check=i(o.check,K,2,0)),E=0,N=0}else o.head&&(o.head.extra=null);o.mode=6;case 6:if(1024&o.flags&&((R=o.length)>O&&(R=O),R&&(o.head&&(Z=o.head.extra_len-o.length,o.head.extra||(o.head.extra=new Uint8Array(o.head.extra_len)),o.head.extra.set(s.subarray(u,u+R),Z)),512&o.flags&&(o.check=i(o.check,s,R,u)),O-=R,u+=R,o.length-=R),o.length))break t;o.length=0,o.mode=7;case 7:if(2048&o.flags){if(0===O)break t;R=0;do{Z=s[u+R++],o.head&&Z&&o.length<65536&&(o.head.name+=String.fromCharCode(Z))}while(Z&&R<O);if(512&o.flags&&(o.check=i(o.check,s,R,u)),O-=R,u+=R,Z)break t}else o.head&&(o.head.name=null);o.length=0,o.mode=8;case 8:if(4096&o.flags){if(0===O)break t;R=0;do{Z=s[u+R++],o.head&&Z&&o.length<65536&&(o.head.comment+=String.fromCharCode(Z))}while(Z&&R<O);if(512&o.flags&&(o.check=i(o.check,s,R,u)),O-=R,u+=R,Z)break t}else o.head&&(o.head.comment=null);o.mode=9;case 9:if(512&o.flags){for(;N<16;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}if(E!==(65535&o.check)){t.msg="header crc mismatch",o.mode=k;break}E=0,N=0}o.head&&(o.head.hcrc=o.flags>>9&1,o.head.done=!0),t.adler=o.check=0,o.mode=x;break;case 10:for(;N<32;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}t.adler=o.check=A(E),E=0,N=0,o.mode=11;case 11:if(0===o.havedict)return t.next_out=l,t.avail_out=S,t.next_in=u,t.avail_in=O,o.hold=E,o.bits=N,m;t.adler=o.check=1,o.mode=x;case x:if(r===c||r===d)break t;case 13:if(o.last){E>>>=7&N,N-=7&N,o.mode=27;break}for(;N<3;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}switch(o.last=1&E,N-=1,3&(E>>>=1)){case 0:o.mode=14;break;case 1:if(I(o),o.mode=20,r===d){E>>>=2,N-=2;break t}break;case 2:o.mode=17;break;case 3:t.msg="invalid block type",o.mode=k}E>>>=2,N-=2;break;case 14:for(E>>>=7&N,N-=7&N;N<32;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}if((65535&E)!=(E>>>16^65535)){t.msg="invalid stored block lengths",o.mode=k;break}if(o.length=65535&E,E=0,N=0,o.mode=15,r===d)break t;case 15:o.mode=16;case 16:if(R=o.length){if(R>O&&(R=O),R>S&&(R=S),0===R)break t;a.set(s.subarray(u,u+R),l),O-=R,u+=R,S-=R,l+=R,o.length-=R;break}o.mode=x;break;case 17:for(;N<14;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}if(o.nlen=257+(31&E),E>>>=5,N-=5,o.ndist=1+(31&E),E>>>=5,N-=5,o.ncode=4+(15&E),E>>>=4,N-=4,o.nlen>286||o.ndist>30){t.msg="too many length or distance symbols",o.mode=k;break}o.have=0,o.mode=18;case 18:for(;o.have<o.ncode;){for(;N<3;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}o.lens[H[o.have++]]=7&E,E>>>=3,N-=3}for(;o.have<19;)o.lens[H[o.have++]]=0;if(o.lencode=o.lendyn,o.lenbits=7,q={bits:o.lenbits},U=h(0,o.lens,0,19,o.lencode,0,o.work,q),o.lenbits=q.bits,U){t.msg="invalid code lengths set",o.mode=k;break}o.have=0,o.mode=19;case 19:for(;o.have<o.nlen+o.ndist;){for(;M=($=o.lencode[E&(1<<o.lenbits)-1])>>>16&255,D=65535&$,!((C=$>>>24)<=N);){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}if(D<16)E>>>=C,N-=C,o.lens[o.have++]=D;else{if(16===D){for(J=C+2;N<J;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}if(E>>>=C,N-=C,0===o.have){t.msg="invalid bit length repeat",o.mode=k;break}Z=o.lens[o.have-1],R=3+(3&E),E>>>=2,N-=2}else if(17===D){for(J=C+3;N<J;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}N-=C,Z=0,R=3+(7&(E>>>=C)),E>>>=3,N-=3}else{for(J=C+7;N<J;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}N-=C,Z=0,R=11+(127&(E>>>=C)),E>>>=7,N-=7}if(o.have+R>o.nlen+o.ndist){t.msg="invalid bit length repeat",o.mode=k;break}for(;R--;)o.lens[o.have++]=Z}}if(o.mode===k)break;if(0===o.lens[256]){t.msg="invalid code -- missing end-of-block",o.mode=k;break}if(o.lenbits=9,q={bits:o.lenbits},U=h(1,o.lens,0,o.nlen,o.lencode,0,o.work,q),o.lenbits=q.bits,U){t.msg="invalid literal/lengths set",o.mode=k;break}if(o.distbits=6,o.distcode=o.distdyn,q={bits:o.distbits},U=h(2,o.lens,o.nlen,o.ndist,o.distcode,0,o.work,q),o.distbits=q.bits,U){t.msg="invalid distances set",o.mode=k;break}if(o.mode=20,r===d)break t;case 20:o.mode=21;case 21:if(O>=6&&S>=258){t.next_out=l,t.avail_out=S,t.next_in=u,t.avail_in=O,o.hold=E,o.bits=N,n(t,j),l=t.next_out,a=t.output,S=t.avail_out,u=t.next_in,s=t.input,O=t.avail_in,E=o.hold,N=o.bits,o.mode===x&&(o.back=-1);break}for(o.back=0;M=($=o.lencode[E&(1<<o.lenbits)-1])>>>16&255,D=65535&$,!((C=$>>>24)<=N);){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}if(M&&0==(240&M)){for(L=C,z=M,V=D;M=($=o.lencode[V+((E&(1<<L+z)-1)>>L)])>>>16&255,D=65535&$,!(L+(C=$>>>24)<=N);){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}E>>>=L,N-=L,o.back+=L}if(E>>>=C,N-=C,o.back+=C,o.length=D,0===M){o.mode=26;break}if(32&M){o.back=-1,o.mode=x;break}if(64&M){t.msg="invalid literal/length code",o.mode=k;break}o.extra=15&M,o.mode=22;case 22:if(o.extra){for(J=o.extra;N<J;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}o.length+=E&(1<<o.extra)-1,E>>>=o.extra,N-=o.extra,o.back+=o.extra}o.was=o.length,o.mode=23;case 23:for(;M=($=o.distcode[E&(1<<o.distbits)-1])>>>16&255,D=65535&$,!((C=$>>>24)<=N);){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}if(0==(240&M)){for(L=C,z=M,V=D;M=($=o.distcode[V+((E&(1<<L+z)-1)>>L)])>>>16&255,D=65535&$,!(L+(C=$>>>24)<=N);){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}E>>>=L,N-=L,o.back+=L}if(E>>>=C,N-=C,o.back+=C,64&M){t.msg="invalid distance code",o.mode=k;break}o.offset=D,o.extra=15&M,o.mode=24;case 24:if(o.extra){for(J=o.extra;N<J;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}o.offset+=E&(1<<o.extra)-1,E>>>=o.extra,N-=o.extra,o.back+=o.extra}if(o.offset>o.dmax){t.msg="invalid distance too far back",o.mode=k;break}o.mode=25;case 25:if(0===S)break t;if(R=j-S,o.offset>R){if((R=o.offset-R)>o.whave&&o.sane){t.msg="invalid distance too far back",o.mode=k;break}R>o.wnext?(R-=o.wnext,F=o.wsize-R):F=o.wnext-R,R>o.length&&(R=o.length),P=o.window}else P=a,F=l-o.offset,R=o.length;R>S&&(R=S),S-=R,o.length-=R;do{a[l++]=P[F++]}while(--R);0===o.length&&(o.mode=21);break;case 26:if(0===S)break t;a[l++]=o.length,S--,o.mode=21;break;case 27:if(o.wrap){for(;N<32;){if(0===O)break t;O--,E|=s[u++]<<N,N+=8}if(j-=S,t.total_out+=j,o.total+=j,j&&(t.adler=o.check=o.flags?i(o.check,a,j,l-j):e(o.check,a,j,l-j)),j=S,(o.flags?E:A(E))!==o.check){t.msg="incorrect data check",o.mode=k;break}E=0,N=0}o.mode=28;case 28:if(o.wrap&&o.flags){for(;N<32;){if(0===O)break t;O--,E+=s[u++]<<N,N+=8}if(E!==(4294967295&o.total)){t.msg="incorrect length check",o.mode=k;break}E=0,N=0}o.mode=29;case 29:U=y;break t;case k:U=g;break t;case 31:return b;case 32:default:return v}return t.next_out=l,t.avail_out=S,t.next_in=u,t.avail_in=O,o.hold=E,o.bits=N,(o.wsize||j!==t.avail_out&&o.mode<k&&(o.mode<27||r!==f))&&B(t,t.output,t.next_out,j-t.avail_out),T-=t.avail_in,j-=t.avail_out,t.total_in+=T,t.total_out+=j,o.total+=j,o.wrap&&j&&(t.adler=o.check=o.flags?i(o.check,a,j,t.next_out-j):e(o.check,a,j,t.next_out-j)),t.data_type=o.bits+(o.last?64:0)+(o.mode===x?128:0)+(20===o.mode||15===o.mode?256:0),(0===T&&0===j||r===f)&&U===p&&(U=w),U},D=function(t){if(!t||!t.state)return v;var e=t.state;return e.window&&(e.window=null),t.state=null,p},L=function(t,e){if(!t||!t.state)return v;var r=t.state;return 0==(2&r.wrap)?v:(r.head=e,e.done=!1,p)},z=function(t,r){var i,n=r.length;return t&&t.state?0!==(i=t.state).wrap&&11!==i.mode?v:11===i.mode&&e(1,r,n,0)!==i.check?g:B(t,r,n,n)?(i.mode=31,b):(i.havedict=1,p):v},V=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},Z=!0;try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(t){Z=!1}for(var U=new Uint8Array(256),q=0;q<256;q++)U[q]=q>=252?6:q>=248?5:q>=240?4:q>=224?3:q>=192?2:1;U[254]=U[254]=1;var J=function(t,e){var r,i,n=e||t.length,o=new Array(2*n);for(i=0,r=0;r<n;){var s=t[r++];if(s<128)o[i++]=s;else{var a=U[s];if(a>4)o[i++]=65533,r+=a-1;else{for(s&=2===a?31:3===a?15:7;a>1&&r<n;)s=s<<6|63&t[r++],a--;a>1?o[i++]=65533:s<65536?o[i++]=s:(s-=65536,o[i++]=55296|s>>10&1023,o[i++]=56320|1023&s)}}}return function(t,e){if(e<65534&&t.subarray&&Z)return String.fromCharCode.apply(null,t.length===e?t:t.subarray(0,e));for(var r="",i=0;i<e;i++)r+=String.fromCharCode(t[i]);return r}(o,i)},$=function(t,e){(e=e||t.length)>t.length&&(e=t.length);for(var r=e-1;r>=0&&128==(192&t[r]);)r--;return r<0||0===r?e:r+U[t[r]]>e?r:e},K={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"},H=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0},W=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1},X=Object.prototype.toString,G=l.Z_NO_FLUSH,Y=l.Z_FINISH,Q=l.Z_OK,tt=l.Z_STREAM_END,et=l.Z_NEED_DICT,rt=l.Z_STREAM_ERROR,it=l.Z_DATA_ERROR,nt=l.Z_MEM_ERROR;function ot(t){this.options=function(t){for(var e=Array.prototype.slice.call(arguments,1);e.length;){var r=e.shift();if(r){if("object"!=typeof r)throw new TypeError(r+"must be non-object");for(var i in r)V(r,i)&&(t[i]=r[i])}}return t}({chunkSize:65536,windowBits:15,to:""},t||{});var e=this.options;e.raw&&e.windowBits>=0&&e.windowBits<16&&(e.windowBits=-e.windowBits,0===e.windowBits&&(e.windowBits=-15)),!(e.windowBits>=0&&e.windowBits<16)||t&&t.windowBits||(e.windowBits+=32),e.windowBits>15&&e.windowBits<48&&0==(15&e.windowBits)&&(e.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new H,this.strm.avail_out=0;var r=C(this.strm,e.windowBits);if(r!==Q)throw new Error(K[r]);if(this.header=new W,L(this.strm,this.header),e.dictionary&&("string"==typeof e.dictionary?e.dictionary=function(t){var e,r,i,n,o,s=t.length,a=0;for(n=0;n<s;n++)55296==(64512&(r=t.charCodeAt(n)))&&n+1<s&&56320==(64512&(i=t.charCodeAt(n+1)))&&(r=65536+(r-55296<<10)+(i-56320),n++),a+=r<128?1:r<2048?2:r<65536?3:4;for(e=new Uint8Array(a),o=0,n=0;o<a;n++)55296==(64512&(r=t.charCodeAt(n)))&&n+1<s&&56320==(64512&(i=t.charCodeAt(n+1)))&&(r=65536+(r-55296<<10)+(i-56320),n++),r<128?e[o++]=r:r<2048?(e[o++]=192|r>>>6,e[o++]=128|63&r):r<65536?(e[o++]=224|r>>>12,e[o++]=128|r>>>6&63,e[o++]=128|63&r):(e[o++]=240|r>>>18,e[o++]=128|r>>>12&63,e[o++]=128|r>>>6&63,e[o++]=128|63&r);return e}(e.dictionary):"[object ArrayBuffer]"===X.call(e.dictionary)&&(e.dictionary=new Uint8Array(e.dictionary)),e.raw&&(r=z(this.strm,e.dictionary))!==Q))throw new Error(K[r])}function st(t,e){var r=new ot(e);if(r.push(t),r.err)throw r.msg||K[r.err];return r.result}ot.prototype.push=function(t,e){var r,i,n,o=this.strm,s=this.options.chunkSize,a=this.options.dictionary;if(this.ended)return!1;for(i=e===~~e?e:!0===e?Y:G,"[object ArrayBuffer]"===X.call(t)?o.input=new Uint8Array(t):o.input=t,o.next_in=0,o.avail_in=o.input.length;;){for(0===o.avail_out&&(o.output=new Uint8Array(s),o.next_out=0,o.avail_out=s),(r=M(o,i))===et&&a&&((r=z(o,a))===Q?r=M(o,i):r===it&&(r=et));o.avail_in>0&&r===tt&&o.state.wrap>0&&0!==t[o.next_in];)P(o),r=M(o,i);switch(r){case rt:case it:case et:case nt:return this.onEnd(r),this.ended=!0,!1}if(n=o.avail_out,o.next_out&&(0===o.avail_out||r===tt))if("string"===this.options.to){var u=$(o.output,o.next_out),h=o.next_out-u,l=J(o.output,u);o.next_out=h,o.avail_out=s-h,h&&o.output.set(o.output.subarray(u,u+h),0),this.onData(l)}else this.onData(o.output.length===o.next_out?o.output:o.output.subarray(0,o.next_out));if(r!==Q||0!==n){if(r===tt)return r=D(this.strm),this.onEnd(r),this.ended=!0,!0;if(0===o.avail_in)break}}return!0},ot.prototype.onData=function(t){this.chunks.push(t)},ot.prototype.onEnd=function(t){t===Q&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=function(t){for(var e=0,r=0,i=t.length;r<i;r++)e+=t[r].length;for(var n=new Uint8Array(e),o=0,s=0,a=t.length;o<a;o++){var u=t[o];n.set(u,s),s+=u.length}return n}(this.chunks)),this.chunks=[],this.err=t,this.msg=this.strm.msg};var at=ot,ut=st,ht=function(t,e){return(e=e||{}).raw=!0,st(t,e)},lt=st,ft=l,ct={Inflate:at,inflate:ut,inflateRaw:ht,ungzip:lt,constants:ft};t.Inflate=at,t.constants=ft,t.default=ct,t.inflate=ut,t.inflateRaw=ht,t.ungzip=lt,Object.defineProperty(t,"__esModule",{value:!0})}("object"==typeof r&&void 0!==e?r:(i="undefined"!=typeof globalThis?globalThis:i||self).pako={})},{}],48:[function(t,e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.VideoEntity=void 0;var i=t(46),n=function(t){var e,r;this.spec=t,this.version="2.0.0",this.decodedImages={},this.version=t.ver,this.videoSize={width:t.params.viewBoxWidth||0,height:t.params.viewBoxHeight||0},this.FPS=t.params.fps||20,this.frames=t.params.frames||0,this.sprites=null!==(r=null===(e=t.sprites)||void 0===e?void 0:e.map((function(t){return new i.SpriteEntity(t)})))&&void 0!==r?r:[],this.audios=[]};r.VideoEntity=n},{46:46}],43:[function(t,e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.ProtoMovieEntity=r.proto=void 0;var i=t(1),n=JSON.parse('{"nested":{"com":{"nested":{"opensource":{"nested":{"svga":{"options":{"objc_class_prefix":"SVGAProto","java_package":"com.opensource.svgaplayer.proto"},"nested":{"MovieParams":{"fields":{"viewBoxWidth":{"type":"float","id":1},"viewBoxHeight":{"type":"float","id":2},"fps":{"type":"int32","id":3},"frames":{"type":"int32","id":4}}},"SpriteEntity":{"fields":{"imageKey":{"type":"string","id":1},"frames":{"rule":"repeated","type":"FrameEntity","id":2},"matteKey":{"type":"string","id":3}}},"AudioEntity":{"fields":{"audioKey":{"type":"string","id":1},"startFrame":{"type":"int32","id":2},"endFrame":{"type":"int32","id":3},"startTime":{"type":"int32","id":4},"totalTime":{"type":"int32","id":5}}},"Layout":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4}}},"Transform":{"fields":{"a":{"type":"float","id":1},"b":{"type":"float","id":2},"c":{"type":"float","id":3},"d":{"type":"float","id":4},"tx":{"type":"float","id":5},"ty":{"type":"float","id":6}}},"ShapeEntity":{"oneofs":{"args":{"oneof":["shape","rect","ellipse"]}},"fields":{"type":{"type":"ShapeType","id":1},"shape":{"type":"ShapeArgs","id":2},"rect":{"type":"RectArgs","id":3},"ellipse":{"type":"EllipseArgs","id":4},"styles":{"type":"ShapeStyle","id":10},"transform":{"type":"Transform","id":11}},"nested":{"ShapeType":{"values":{"SHAPE":0,"RECT":1,"ELLIPSE":2,"KEEP":3}},"ShapeArgs":{"fields":{"d":{"type":"string","id":1}}},"RectArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4},"cornerRadius":{"type":"float","id":5}}},"EllipseArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"radiusX":{"type":"float","id":3},"radiusY":{"type":"float","id":4}}},"ShapeStyle":{"fields":{"fill":{"type":"RGBAColor","id":1},"stroke":{"type":"RGBAColor","id":2},"strokeWidth":{"type":"float","id":3},"lineCap":{"type":"LineCap","id":4},"lineJoin":{"type":"LineJoin","id":5},"miterLimit":{"type":"float","id":6},"lineDashI":{"type":"float","id":7},"lineDashII":{"type":"float","id":8},"lineDashIII":{"type":"float","id":9}},"nested":{"RGBAColor":{"fields":{"r":{"type":"float","id":1},"g":{"type":"float","id":2},"b":{"type":"float","id":3},"a":{"type":"float","id":4}}},"LineCap":{"values":{"LineCap_BUTT":0,"LineCap_ROUND":1,"LineCap_SQUARE":2}},"LineJoin":{"values":{"LineJoin_MITER":0,"LineJoin_ROUND":1,"LineJoin_BEVEL":2}}}}}},"FrameEntity":{"fields":{"alpha":{"type":"float","id":1},"layout":{"type":"Layout","id":2},"transform":{"type":"Transform","id":3},"clipPath":{"type":"string","id":4},"shapes":{"rule":"repeated","type":"ShapeEntity","id":5}}},"MovieEntity":{"fields":{"version":{"type":"string","id":1},"params":{"type":"MovieParams","id":2},"images":{"keyType":"string","type":"bytes","id":3},"sprites":{"rule":"repeated","type":"SpriteEntity","id":4},"audios":{"rule":"repeated","type":"AudioEntity","id":5}}}}}}}}}}}');r.proto=i.Root.fromJSON(n),r.ProtoMovieEntity=r.proto.lookupType("com.opensource.svga.MovieEntity")},{1:1}],47:[function(t,e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.ValueAnimator=void 0;var i=function(){function t(){this.startValue=0,this.endValue=0,this.duration=0,this.loops=1,this.fillRule=0,this.mRunning=!1,this.mStartTime=0,this.mCurrentFrication=0,this.mReverse=!1,this.onStart=function(){},this.onUpdate=function(t){},this.onEnd=function(){}}return t.prototype.start=function(t){this.doStart(!1,t)},t.prototype.reverse=function(t){this.doStart(!0,t)},t.prototype.stop=function(){this.doStop()},t.prototype.animatedValue=function(){return(this.endValue-this.startValue)*this.mCurrentFrication+this.startValue},t.prototype.doStart=function(e,r){void 0===r&&(r=void 0),this.mReverse=e,this.mRunning=!0,this.mStartTime=t.currentTimeMillsecond(),r&&(this.mStartTime-=e?(1-r/(this.endValue-this.startValue))*this.duration:r/(this.endValue-this.startValue)*this.duration),this.mCurrentFrication=0,this.onStart(),this.doFrame()},t.prototype.doStop=function(){this.mRunning=!1},t.prototype.doFrame=function(){var e,r=this,i=function(){var e;r.mRunning&&(r.doDeltaTime(t.currentTimeMillsecond()-r.mStartTime),null===(e=r.canvas)||void 0===e||e.requestAnimationFrame(i))};null===(e=this.canvas)||void 0===e||e.requestAnimationFrame(i)},t.prototype.doDeltaTime=function(t){var e=!1;t>=this.duration*this.loops?(this.mCurrentFrication=1===this.fillRule?0:1,this.mRunning=!1,e=!0):(this.mCurrentFrication=t%this.duration/this.duration,this.mReverse&&(this.mCurrentFrication=1-this.mCurrentFrication)),this.onUpdate(this.animatedValue()),!1===this.mRunning&&e&&this.onEnd()},t.currentTimeMillsecond=function(){return"undefined"==typeof performance?(new Date).getTime():performance.now()},t}();r.ValueAnimator=i},{}],45:[function(t,e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.Renderer=void 0;var i=t(36),n=t(37),o=t(44),s=function(){function t(t,e,r){this.videoItem=t,this.ctx=e,this.canvas=r,this._dynamicImage={},this._dynamicText={}}return t.prototype.clear=function(){var t=this.ctx,e={x:0,y:0,width:this.canvas.width,height:this.canvas.height};t.clearRect(e.x,e.y,e.width,e.height)},t.prototype.drawFrame=function(t){var e=this,r=this.ctx,i={x:0,y:0,width:this.canvas.width,height:this.canvas.height};r.clearRect(i.x,i.y,i.width,i.height);var n={},o=!1,s=this.videoItem.sprites;s.forEach((function(i,a){var u,h;if(-1!=(null===(u=s[0].imageKey)||void 0===u?void 0:u.indexOf(".matte")))if(-1==(null===(h=i.imageKey)||void 0===h?void 0:h.indexOf(".matte"))){var l=s[a-1];if(o&&(!i.matteKey||0==i.matteKey.length||i.matteKey!=l.matteKey)){o=!1;var f=n[i.matteKey];r.globalCompositeOperation="destination-in",e.drawSprite(f,t),r.globalCompositeOperation="source-over",r.restore()}null==i.matteKey||null!=l.matteKey&&0!=l.matteKey.length&&l.matteKey==i.matteKey||(o=!0,r.save()),e.drawSprite(i,t),o&&a==s.length-1&&(f=n.get(i.matteKey),r.globalCompositeOperation="destination-in",e.drawSprite(f,t),r.globalCompositeOperation="source-over",r.restore())}else f[i.imageKey]=i;else e.drawSprite(i,t)}))},t.prototype.drawSprite=function(t,e){var r,s,a,u=this,h=t.frames[e];if(!(h.alpha<.05)){var l=this.ctx;l.save(),this.globalTransform&&l.transform(this.globalTransform.a,this.globalTransform.b,this.globalTransform.c,this.globalTransform.d,this.globalTransform.tx,this.globalTransform.ty),l.globalAlpha=h.alpha,l.transform(h.transform.a,h.transform.b,h.transform.c,h.transform.d,h.transform.tx,h.transform.ty);var f=null===(r=t.imageKey)||void 0===r?void 0:r.replace(".matte","");if(f){var c=null!==(s=this._dynamicImage[f])&&void 0!==s?s:this.videoItem.decodedImages[f];void 0!==h.maskPath&&null!==h.maskPath&&(h.maskPath._styles=void 0,this.drawBezier(h.maskPath),l.clip()),c&&l.drawImage(c,0,0,c.width,c.height,0,0,h.layout.width,h.layout.height),h.shapes&&h.shapes.forEach((function(t){"shape"===t.type&&t.pathArgs&&t.pathArgs.d&&u.drawBezier(new i.BezierPath(t.pathArgs.d,t.transform,t.styles)),"ellipse"===t.type&&t.pathArgs&&u.drawEllipse(new n.EllipsePath(parseFloat(t.pathArgs.x)||0,parseFloat(t.pathArgs.y)||0,parseFloat(t.pathArgs.radiusX)||0,parseFloat(t.pathArgs.radiusY)||0,t.transform,t.styles)),"rect"===t.type&&t.pathArgs&&u.drawRect(new o.RectPath(parseFloat(t.pathArgs.x)||0,parseFloat(t.pathArgs.y)||0,parseFloat(t.pathArgs.width)||0,parseFloat(t.pathArgs.height)||0,parseFloat(t.pathArgs.cornerRadius)||0,t.transform,t.styles))}));var d=this._dynamicText[f];if(void 0!==d){l.font=d.size+"px "+(null!==(a=d.family)&&void 0!==a?a:"Arial");var p=l.measureText(d.text).width;l.fillStyle=d.color;var y=void 0!==d.offset&&void 0!==d.offset.x?isNaN(d.offset.x)?0:d.offset.x:0,m=void 0!==d.offset&&void 0!==d.offset.y?isNaN(d.offset.y)?0:d.offset.y:0;l.fillText(d.text,(h.layout.width-p)/2+y,h.layout.height/2+m)}l.restore()}}},t.prototype.playAudio=function(t){},t.prototype.resetShapeStyles=function(t){var e=this.ctx,r=t._styles;r&&(r&&r.stroke?e.strokeStyle="rgba("+(255*r.stroke[0]).toFixed(0)+", "+(255*r.stroke[1]).toFixed(0)+", "+(255*r.stroke[2]).toFixed(0)+", "+r.stroke[3]+")":e.strokeStyle="transparent",r&&(e.lineWidth=r.strokeWidth||void 0,e.lineCap=r.lineCap||void 0,e.lineJoin=r.lineJoin||void 0,e.miterLimit=r.miterLimit||void 0),r&&r.fill?e.fillStyle="rgba("+(255*r.fill[0]).toFixed(0)+", "+(255*r.fill[1]).toFixed(0)+", "+(255*r.fill[2]).toFixed(0)+", "+r.fill[3]+")":e.fillStyle="transparent",r&&r.lineDash&&e.setLineDash([r.lineDash[0],r.lineDash[1]],r.lineDash[2]))},t.prototype.drawBezier=function(t){var e=this,r=this.ctx;r.save(),this.resetShapeStyles(t),void 0!==t._transform&&null!==t._transform&&r.transform(t._transform.a,t._transform.b,t._transform.c,t._transform.d,t._transform.tx,t._transform.ty);var i={x:0,y:0,x1:0,y1:0,x2:0,y2:0};r.beginPath(),t._d.replace(/([a-zA-Z])/g,"|||$1 ").replace(/,/g," ").split("|||").forEach((function(t){if(0!=t.length){var r=t.substr(0,1);if("MLHVCSQRZmlhvcsqrz".indexOf(r)>=0){var n=t.substr(1).trim().split(" ");e.drawBezierElement(i,r,n)}}})),t._styles&&t._styles.fill&&r.fill(),t._styles&&t._styles.stroke&&r.stroke(),r.restore()},t.prototype.drawBezierElement=function(t,e,r){var i=this.ctx;switch(e){case"M":t.x=Number(r[0]),t.y=Number(r[1]),i.moveTo(t.x,t.y);break;case"m":t.x+=Number(r[0]),t.y+=Number(r[1]),i.moveTo(t.x,t.y);break;case"L":t.x=Number(r[0]),t.y=Number(r[1]),i.lineTo(t.x,t.y);break;case"l":t.x+=Number(r[0]),t.y+=Number(r[1]),i.lineTo(t.x,t.y);break;case"H":t.x=Number(r[0]),i.lineTo(t.x,t.y);break;case"h":t.x+=Number(r[0]),i.lineTo(t.x,t.y);break;case"V":t.y=Number(r[0]),i.lineTo(t.x,t.y);break;case"v":t.y+=Number(r[0]),i.lineTo(t.x,t.y);break;case"C":t.x1=Number(r[0]),t.y1=Number(r[1]),t.x2=Number(r[2]),t.y2=Number(r[3]),t.x=Number(r[4]),t.y=Number(r[5]),i.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y);break;case"c":t.x1=t.x+Number(r[0]),t.y1=t.y+Number(r[1]),t.x2=t.x+Number(r[2]),t.y2=t.y+Number(r[3]),t.x+=Number(r[4]),t.y+=Number(r[5]),i.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y);break;case"S":t.x1&&t.y1&&t.x2&&t.y2?(t.x1=t.x-t.x2+t.x,t.y1=t.y-t.y2+t.y,t.x2=Number(r[0]),t.y2=Number(r[1]),t.x=Number(r[2]),t.y=Number(r[3]),i.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y)):(t.x1=Number(r[0]),t.y1=Number(r[1]),t.x=Number(r[2]),t.y=Number(r[3]),i.quadraticCurveTo(t.x1,t.y1,t.x,t.y));break;case"s":t.x1&&t.y1&&t.x2&&t.y2?(t.x1=t.x-t.x2+t.x,t.y1=t.y-t.y2+t.y,t.x2=t.x+Number(r[0]),t.y2=t.y+Number(r[1]),t.x+=Number(r[2]),t.y+=Number(r[3]),i.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y)):(t.x1=t.x+Number(r[0]),t.y1=t.y+Number(r[1]),t.x+=Number(r[2]),t.y+=Number(r[3]),i.quadraticCurveTo(t.x1,t.y1,t.x,t.y));break;case"Q":t.x1=Number(r[0]),t.y1=Number(r[1]),t.x=Number(r[2]),t.y=Number(r[3]),i.quadraticCurveTo(t.x1,t.y1,t.x,t.y);break;case"q":t.x1=t.x+Number(r[0]),t.y1=t.y+Number(r[1]),t.x+=Number(r[2]),t.y+=Number(r[3]),i.quadraticCurveTo(t.x1,t.y1,t.x,t.y);break;case"A":case"a":break;case"Z":case"z":i.closePath()}},t.prototype.drawEllipse=function(t){var e=this.ctx;e.save(),this.resetShapeStyles(t),void 0!==t._transform&&null!==t._transform&&e.transform(t._transform.a,t._transform.b,t._transform.c,t._transform.d,t._transform.tx,t._transform.ty);var r=t._x-t._radiusX,i=t._y-t._radiusY,n=2*t._radiusX,o=2*t._radiusY,s=n/2*.5522848,a=o/2*.5522848,u=r+n,h=i+o,l=r+n/2,f=i+o/2;e.beginPath(),e.moveTo(r,f),e.bezierCurveTo(r,f-a,l-s,i,l,i),e.bezierCurveTo(l+s,i,u,f-a,u,f),e.bezierCurveTo(u,f+a,l+s,h,l,h),e.bezierCurveTo(l-s,h,r,f+a,r,f),t._styles&&t._styles.fill&&e.fill(),t._styles&&t._styles.stroke&&e.stroke(),e.restore()},t.prototype.drawRect=function(t){var e=this.ctx;e.save(),this.resetShapeStyles(t),void 0!==t._transform&&null!==t._transform&&e.transform(t._transform.a,t._transform.b,t._transform.c,t._transform.d,t._transform.tx,t._transform.ty);var r=t._x,i=t._y,n=t._width,o=t._height,s=t._cornerRadius;n<2*s&&(s=n/2),o<2*s&&(s=o/2),e.beginPath(),e.moveTo(r+s,i),e.arcTo(r+n,i,r+n,i+o,s),e.arcTo(r+n,i+o,r,i+o,s),e.arcTo(r,i+o,r,i,s),e.arcTo(r,i,r+n,i,s),e.closePath(),t._styles&&t._styles.fill&&e.fill(),t._styles&&t._styles.stroke&&e.stroke(),e.restore()},t}();r.Renderer=s},{36:36,37:37,44:44}],44:[function(t,e,r){"use strict";var i,n=this&&this.__extends||(i=function(t,e){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r])})(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function r(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)});Object.defineProperty(r,"__esModule",{value:!0}),r.RectPath=void 0;var o=function(t){function e(e,r,i,n,o,s,a){var u=t.call(this,"",s,a)||this;return u._x=e,u._y=r,u._width=i,u._height=n,u._cornerRadius=o,u._transform=s,u._styles=a,u}return n(e,t),e}(t(36).BezierPath);r.RectPath=o},{36:36}],46:[function(t,e,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.SpriteEntity=void 0;var i=t(38),n=function(t){var e,r;this.matteKey=t.matteKey,this.imageKey=t.imageKey,this.frames=null!==(r=null===(e=t.frames)||void 0===e?void 0:e.map((function(t){return new i.FrameEntity(t)})))&&void 0!==r?r:[]};r.SpriteEntity=n},{38:38}]},{},[39])(39)}));
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/package.json b/uni_modules/c-svga/node_modules/svgaplayer-weapp/package.json
new file mode 100644
index 0000000..b268648
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/package.json
@@ -0,0 +1,45 @@
+{
+  "_from": "svgaplayer-weapp@^1.0.0",
+  "_id": "svgaplayer-weapp@1.0.0",
+  "_inBundle": false,
+  "_integrity": "sha512-zH3y9rBHcvoRVsKwuuiRQkOP0cPeyFMxz9NJQZF+uvqwH7uO/LKLS0vEvjrRh2WhfynoXWsxxSTzWpc4Ix2cJw==",
+  "_location": "/svgaplayer-weapp",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "svgaplayer-weapp@^1.0.0",
+    "name": "svgaplayer-weapp",
+    "escapedName": "svgaplayer-weapp",
+    "rawSpec": "^1.0.0",
+    "saveSpec": null,
+    "fetchSpec": "^1.0.0"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmmirror.com/svgaplayer-weapp/-/svgaplayer-weapp-1.0.0.tgz",
+  "_shasum": "3866a67a5355b4760bc1fae20d7d4f63b2e7cc05",
+  "_spec": "svgaplayer-weapp@^1.0.0",
+  "_where": "C:\\Users\\pc\\Documents\\HBuilderProjects\\Sapp\\uni_modules\\c-svga",
+  "author": "",
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "专为微信小程序开发的 SVGA 播放器，已在 iOS 及 Android 手机上测试通过。",
+  "devDependencies": {
+    "@types/wechat-miniprogram": "^3.3.0",
+    "browserify": "^17.0.0",
+    "tinyify": "^3.0.0",
+    "tsify": "^5.0.4",
+    "typescript": "^4.3.2"
+  },
+  "license": "ISC",
+  "main": "dist/svgaplayer.weapp.js",
+  "miniprogram": "dist",
+  "name": "svgaplayer-weapp",
+  "scripts": {
+    "build": "node build.js > ./dist/svgaplayer.weapp.js"
+  },
+  "typings": "svgaplayer-weapp.d.ts",
+  "version": "1.0.0"
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/protobuf.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/protobuf.js
new file mode 100644
index 0000000..ad11579
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/protobuf.js
@@ -0,0 +1,133 @@
+/**
+ * Created by zhangmiao on 2018/3/13.
+ */
+
+
+
+(function (protobufFactory){
+    //if (typeof define === 'function')//这里会不会定义重复呢?怎么去掉呢
+    //    define('protobuf', protobufFactory);
+    //else
+        module.exports = protobufFactory();
+})(function(){
+    var protobuf = {};
+//app.globalData.protobuf = protobuf;
+
+    /**
+     * Build type, one of `"full"`, `"light"` or `"minimal"`.
+     * @name build
+     * @type {string}
+     * @const
+     */
+    protobuf.build = "minimal";
+
+// Serialization
+    protobuf.Writer       = require("./src/writer");
+    protobuf.Reader       = require("./src/reader");
+
+// Utility
+    protobuf.util         = require("./src/util");
+    protobuf.rpc          = require("./src/rpc/service");
+    protobuf.roots        = require("./src/roots");
+    protobuf.verifier     = require("./src/verifier");
+
+    protobuf.tokenize         = require("./src/tokenize");
+    protobuf.parse            = require("./src/parse");
+    protobuf.common           = require("./src/common");
+
+    protobuf.ReflectionObject = require("./src/object");
+    protobuf.Namespace        = require("./src/namespace");
+    protobuf.Root             = require("./src/root");
+    protobuf.Enum             = require("./src/enum");
+    protobuf.Type             = require("./src/type");
+    protobuf.Field            = require("./src/field");
+    protobuf.OneOf            = require("./src/oneof");
+    protobuf.MapField         = require("./src/mapField");
+    protobuf.Service          = require("./src/service");
+    protobuf.Method           = require("./src/method");
+    protobuf.converter        = require("./src/converter");
+    protobuf.decoder          = require("./src/decoder");
+
+// Runtime
+    protobuf.Message          = require("./src/message");
+    protobuf.wrappers         = require("./src/wrappers");
+
+// Utility
+    protobuf.types            = require("./src/types");
+    protobuf.util             = require("./src/util");
+
+    protobuf.configure    = configure;
+
+
+    function load(filename, root, callback) {
+        if (typeof root === "function") {
+            callback = root;
+            root = new protobuf.Root();
+        } else if (!root)
+            root = new protobuf.Root();
+        return root.load(filename, callback);
+    }
+
+    protobuf.load = load;
+
+    function loadSync(filename, root) {
+        if (!root)
+            root = new protobuf.Root();
+        return root.loadSync(filename);
+    }
+
+    protobuf.loadSync = loadSync;
+
+
+//新增weichat支持的解析pbConfig接口
+    function parseFromPbString(pbString, root, callback){
+        if (typeof root === "function") {
+            callback = root;
+            root = new protobuf.Root();
+        } else if (!root)
+            root = new protobuf.Root();
+        return root.parseFromPbString(pbString, callback);
+    }
+
+    protobuf.parseFromPbString = parseFromPbString;
+
+    /**
+     * Reconfigures the library according to the environment.
+     * @returns {undefined}
+     */
+    function configure() {
+
+        protobuf.converter._configure();
+        protobuf.decoder._configure();
+        protobuf.Field._configure();
+        protobuf.MapField._configure();
+        protobuf.Message._configure();
+        protobuf.Namespace._configure();
+        protobuf.Method._configure();
+        protobuf.ReflectionObject._configure();
+        protobuf.OneOf._configure();
+        protobuf.parse._configure();
+        protobuf.Reader._configure();
+        protobuf.Root._configure();
+        protobuf.Service._configure();
+        protobuf.verifier._configure();
+        protobuf.Type._configure();
+        protobuf.types._configure();
+        protobuf.wrappers._configure();
+        protobuf.Writer._configure();
+    }
+    configure();
+
+    if(arguments&&arguments.length){
+        for (var  i = 0 ;i < arguments.length; i++){
+            var argument = arguments[i];
+            if(argument.hasOwnProperty("exports")){
+                argument.exports = protobuf;
+                return;
+            }
+        }
+    }
+    return protobuf;
+});
+
+
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/EventEmitter.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/EventEmitter.js
new file mode 100644
index 0000000..f766fd0
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/EventEmitter.js
@@ -0,0 +1,76 @@
+"use strict";
+module.exports = EventEmitter;
+
+/**
+ * Constructs a new event emitter instance.
+ * @classdesc A minimal event emitter.
+ * @memberof util
+ * @constructor
+ */
+function EventEmitter() {
+
+    /**
+     * Registered listeners.
+     * @type {Object.<string,*>}
+     * @private
+     */
+    this._listeners = {};
+}
+
+/**
+ * Registers an event listener.
+ * @param {string} evt Event name
+ * @param {function} fn Listener
+ * @param {*} [ctx] Listener context
+ * @returns {util.EventEmitter} `this`
+ */
+EventEmitter.prototype.on = function on(evt, fn, ctx) {
+    (this._listeners[evt] || (this._listeners[evt] = [])).push({
+        fn  : fn,
+        ctx : ctx || this
+    });
+    return this;
+};
+
+/**
+ * Removes an event listener or any matching listeners if arguments are omitted.
+ * @param {string} [evt] Event name. Removes all listeners if omitted.
+ * @param {function} [fn] Listener to remove. Removes all listeners of `evt` if omitted.
+ * @returns {util.EventEmitter} `this`
+ */
+EventEmitter.prototype.off = function off(evt, fn) {
+    if (evt === undefined)
+        this._listeners = {};
+    else {
+        if (fn === undefined)
+            this._listeners[evt] = [];
+        else {
+            var listeners = this._listeners[evt];
+            for (var i = 0; i < listeners.length;)
+                if (listeners[i].fn === fn)
+                    listeners.splice(i, 1);
+                else
+                    ++i;
+        }
+    }
+    return this;
+};
+
+/**
+ * Emits an event by calling its listeners with the specified arguments.
+ * @param {string} evt Event name
+ * @param {...*} args Arguments
+ * @returns {util.EventEmitter} `this`
+ */
+EventEmitter.prototype.emit = function emit(evt) {
+    var listeners = this._listeners[evt];
+    if (listeners) {
+        var args = [],
+            i = 1;
+        for (; i < arguments.length;)
+            args.push(arguments[i++]);
+        for (i = 0; i < listeners.length;)
+            listeners[i].fn.apply(listeners[i++].ctx, args);
+    }
+    return this;
+};
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/asPromise.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/asPromise.js
new file mode 100644
index 0000000..d6f642c
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/asPromise.js
@@ -0,0 +1,52 @@
+"use strict";
+module.exports = asPromise;
+
+/**
+ * Callback as used by {@link util.asPromise}.
+ * @typedef asPromiseCallback
+ * @type {function}
+ * @param {Error|null} error Error, if any
+ * @param {...*} params Additional arguments
+ * @returns {undefined}
+ */
+
+/**
+ * Returns a promise from a node-style callback function.
+ * @memberof util
+ * @param {asPromiseCallback} fn Function to call
+ * @param {*} ctx Function context
+ * @param {...*} params Function arguments
+ * @returns {Promise<*>} Promisified function
+ */
+function asPromise(fn, ctx/*, varargs */) {
+    var params  = new Array(arguments.length - 1),
+        offset  = 0,
+        index   = 2,
+        pending = true;
+    while (index < arguments.length)
+        params[offset++] = arguments[index++];
+    return new Promise(function executor(resolve, reject) {
+        params[offset] = function callback(err/*, varargs */) {
+            if (pending) {
+                pending = false;
+                if (err)
+                    reject(err);
+                else {
+                    var params = new Array(arguments.length - 1),
+                        offset = 0;
+                    while (offset < params.length)
+                        params[offset++] = arguments[offset];
+                    resolve.apply(null, params);
+                }
+            }
+        };
+        try {
+            fn.apply(ctx || null, params);
+        } catch (err) {
+            if (pending) {
+                pending = false;
+                reject(err);
+            }
+        }
+    });
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/base64.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/base64.js
new file mode 100644
index 0000000..dd2855b
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/base64.js
@@ -0,0 +1,139 @@
+"use strict";
+
+/**
+ * A minimal base64 implementation for number arrays.
+ * @memberof util
+ * @namespace
+ */
+var base64 = module.exports;
+
+/**
+ * Calculates the byte length of a base64 encoded string.
+ * @param {string} string Base64 encoded string
+ * @returns {number} Byte length
+ */
+base64.length = function length(string) {
+    var p = string.length;
+    if (!p)
+        return 0;
+    var n = 0;
+    while (--p % 4 > 1 && string.charAt(p) === "=")
+        ++n;
+    return Math.ceil(string.length * 3) / 4 - n;
+};
+
+// Base64 encoding table
+var b64 = new Array(64);
+
+// Base64 decoding table
+var s64 = new Array(123);
+
+// 65..90, 97..122, 48..57, 43, 47
+for (var i = 0; i < 64;)
+    s64[b64[i] = i < 26 ? i + 65 : i < 52 ? i + 71 : i < 62 ? i - 4 : i - 59 | 43] = i++;
+
+/**
+ * Encodes a buffer to a base64 encoded string.
+ * @param {Uint8Array} buffer Source buffer
+ * @param {number} start Source start
+ * @param {number} end Source end
+ * @returns {string} Base64 encoded string
+ */
+base64.encode = function encode(buffer, start, end) {
+    var parts = null,
+        chunk = [];
+    var i = 0, // output index
+        j = 0, // goto index
+        t;     // temporary
+    while (start < end) {
+        var b = buffer[start++];
+        switch (j) {
+            case 0:
+                chunk[i++] = b64[b >> 2];
+                t = (b & 3) << 4;
+                j = 1;
+                break;
+            case 1:
+                chunk[i++] = b64[t | b >> 4];
+                t = (b & 15) << 2;
+                j = 2;
+                break;
+            case 2:
+                chunk[i++] = b64[t | b >> 6];
+                chunk[i++] = b64[b & 63];
+                j = 0;
+                break;
+        }
+        if (i > 8191) {
+            (parts || (parts = [])).push(String.fromCharCode.apply(String, chunk));
+            i = 0;
+        }
+    }
+    if (j) {
+        chunk[i++] = b64[t];
+        chunk[i++] = 61;
+        if (j === 1)
+            chunk[i++] = 61;
+    }
+    if (parts) {
+        if (i)
+            parts.push(String.fromCharCode.apply(String, chunk.slice(0, i)));
+        return parts.join("");
+    }
+    return String.fromCharCode.apply(String, chunk.slice(0, i));
+};
+
+var invalidEncoding = "invalid encoding";
+
+/**
+ * Decodes a base64 encoded string to a buffer.
+ * @param {string} string Source string
+ * @param {Uint8Array} buffer Destination buffer
+ * @param {number} offset Destination offset
+ * @returns {number} Number of bytes written
+ * @throws {Error} If encoding is invalid
+ */
+base64.decode = function decode(string, buffer, offset) {
+    var start = offset;
+    var j = 0, // goto index
+        t;     // temporary
+    for (var i = 0; i < string.length;) {
+        var c = string.charCodeAt(i++);
+        if (c === 61 && j > 1)
+            break;
+        if ((c = s64[c]) === undefined)
+            throw Error(invalidEncoding);
+        switch (j) {
+            case 0:
+                t = c;
+                j = 1;
+                break;
+            case 1:
+                buffer[offset++] = t << 2 | (c & 48) >> 4;
+                t = c;
+                j = 2;
+                break;
+            case 2:
+                buffer[offset++] = (t & 15) << 4 | (c & 60) >> 2;
+                t = c;
+                j = 3;
+                break;
+            case 3:
+                buffer[offset++] = (t & 3) << 6 | c;
+                j = 0;
+                break;
+        }
+    }
+    if (j === 1)
+        throw Error(invalidEncoding);
+    return offset - start;
+};
+
+/**
+ * Tests if the specified string appears to be base64 encoded.
+ * @param {string} string String to test
+ * @returns {boolean} `true` if probably base64 encoded, otherwise false
+ */
+base64.test = function test(string) {
+    return /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(string);
+};
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/common.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/common.js
new file mode 100644
index 0000000..fbf4e95
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/common.js
@@ -0,0 +1,398 @@
+module.exports = common;
+
+var commonRe = /\/|\./;
+
+/**
+ * Provides common type definitions.
+ * Can also be used to provide additional google types or your own custom types.
+ * @param {string} name Short name as in `google/protobuf/[name].proto` or full file name
+ * @param {Object.<string,*>} json JSON definition within `google.protobuf` if a short name, otherwise the file's root definition
+ * @returns {undefined}
+ * @property {INamespace} google/protobuf/any.proto Any
+ * @property {INamespace} google/protobuf/duration.proto Duration
+ * @property {INamespace} google/protobuf/empty.proto Empty
+ * @property {INamespace} google/protobuf/field_mask.proto FieldMask
+ * @property {INamespace} google/protobuf/struct.proto Struct, Value, NullValue and ListValue
+ * @property {INamespace} google/protobuf/timestamp.proto Timestamp
+ * @property {INamespace} google/protobuf/wrappers.proto Wrappers
+ * @example
+ * // manually provides descriptor.proto (assumes google/protobuf/ namespace and .proto extension)
+ * protobuf.common("descriptor", descriptorJson);
+ *
+ * // manually provides a custom definition (uses my.foo namespace)
+ * protobuf.common("my/foo/bar.proto", myFooBarJson);
+ */
+function common(name, json) {
+    if (!commonRe.test(name)) {
+        name = "google/protobuf/" + name + ".proto";
+        json = { nested: { google: { nested: { protobuf: { nested: json } } } } };
+    }
+    common[name] = json;
+}
+
+// Not provided because of limited use (feel free to discuss or to provide yourself):
+//
+// google/protobuf/descriptor.proto
+// google/protobuf/source_context.proto
+// google/protobuf/type.proto
+//
+// Stripped and pre-parsed versions of these non-bundled files are instead available as part of
+// the repository or package within the google/protobuf directory.
+
+common("any", {
+
+    /**
+     * Properties of a google.protobuf.Any message.
+     * @interface IAny
+     * @type {Object}
+     * @property {string} [typeUrl]
+     * @property {Uint8Array} [bytes]
+     * @memberof common
+     */
+    Any: {
+        fields: {
+            type_url: {
+                type: "string",
+                id: 1
+            },
+            value: {
+                type: "bytes",
+                id: 2
+            }
+        }
+    }
+});
+
+var timeType;
+
+common("duration", {
+
+    /**
+     * Properties of a google.protobuf.Duration message.
+     * @interface IDuration
+     * @type {Object}
+     * @property {number|Long} [seconds]
+     * @property {number} [nanos]
+     * @memberof common
+     */
+    Duration: timeType = {
+        fields: {
+            seconds: {
+                type: "int64",
+                id: 1
+            },
+            nanos: {
+                type: "int32",
+                id: 2
+            }
+        }
+    }
+});
+
+common("timestamp", {
+
+    /**
+     * Properties of a google.protobuf.Timestamp message.
+     * @interface ITimestamp
+     * @type {Object}
+     * @property {number|Long} [seconds]
+     * @property {number} [nanos]
+     * @memberof common
+     */
+    Timestamp: timeType
+});
+
+common("empty", {
+
+    /**
+     * Properties of a google.protobuf.Empty message.
+     * @interface IEmpty
+     * @memberof common
+     */
+    Empty: {
+        fields: {}
+    }
+});
+
+common("struct", {
+
+    /**
+     * Properties of a google.protobuf.Struct message.
+     * @interface IStruct
+     * @type {Object}
+     * @property {Object.<string,IValue>} [fields]
+     * @memberof common
+     */
+    Struct: {
+        fields: {
+            fields: {
+                keyType: "string",
+                type: "Value",
+                id: 1
+            }
+        }
+    },
+
+    /**
+     * Properties of a google.protobuf.Value message.
+     * @interface IValue
+     * @type {Object}
+     * @property {string} [kind]
+     * @property {0} [nullValue]
+     * @property {number} [numberValue]
+     * @property {string} [stringValue]
+     * @property {boolean} [boolValue]
+     * @property {IStruct} [structValue]
+     * @property {IListValue} [listValue]
+     * @memberof common
+     */
+    Value: {
+        oneofs: {
+            kind: {
+                oneof: [
+                    "nullValue",
+                    "numberValue",
+                    "stringValue",
+                    "boolValue",
+                    "structValue",
+                    "listValue"
+                ]
+            }
+        },
+        fields: {
+            nullValue: {
+                type: "NullValue",
+                id: 1
+            },
+            numberValue: {
+                type: "double",
+                id: 2
+            },
+            stringValue: {
+                type: "string",
+                id: 3
+            },
+            boolValue: {
+                type: "bool",
+                id: 4
+            },
+            structValue: {
+                type: "Struct",
+                id: 5
+            },
+            listValue: {
+                type: "ListValue",
+                id: 6
+            }
+        }
+    },
+
+    NullValue: {
+        values: {
+            NULL_VALUE: 0
+        }
+    },
+
+    /**
+     * Properties of a google.protobuf.ListValue message.
+     * @interface IListValue
+     * @type {Object}
+     * @property {Array.<IValue>} [values]
+     * @memberof common
+     */
+    ListValue: {
+        fields: {
+            values: {
+                rule: "repeated",
+                type: "Value",
+                id: 1
+            }
+        }
+    }
+});
+
+common("wrappers", {
+
+    /**
+     * Properties of a google.protobuf.DoubleValue message.
+     * @interface IDoubleValue
+     * @type {Object}
+     * @property {number} [value]
+     * @memberof common
+     */
+    DoubleValue: {
+        fields: {
+            value: {
+                type: "double",
+                id: 1
+            }
+        }
+    },
+
+    /**
+     * Properties of a google.protobuf.FloatValue message.
+     * @interface IFloatValue
+     * @type {Object}
+     * @property {number} [value]
+     * @memberof common
+     */
+    FloatValue: {
+        fields: {
+            value: {
+                type: "float",
+                id: 1
+            }
+        }
+    },
+
+    /**
+     * Properties of a google.protobuf.Int64Value message.
+     * @interface IInt64Value
+     * @type {Object}
+     * @property {number|Long} [value]
+     * @memberof common
+     */
+    Int64Value: {
+        fields: {
+            value: {
+                type: "int64",
+                id: 1
+            }
+        }
+    },
+
+    /**
+     * Properties of a google.protobuf.UInt64Value message.
+     * @interface IUInt64Value
+     * @type {Object}
+     * @property {number|Long} [value]
+     * @memberof common
+     */
+    UInt64Value: {
+        fields: {
+            value: {
+                type: "uint64",
+                id: 1
+            }
+        }
+    },
+
+    /**
+     * Properties of a google.protobuf.Int32Value message.
+     * @interface IInt32Value
+     * @type {Object}
+     * @property {number} [value]
+     * @memberof common
+     */
+    Int32Value: {
+        fields: {
+            value: {
+                type: "int32",
+                id: 1
+            }
+        }
+    },
+
+    /**
+     * Properties of a google.protobuf.UInt32Value message.
+     * @interface IUInt32Value
+     * @type {Object}
+     * @property {number} [value]
+     * @memberof common
+     */
+    UInt32Value: {
+        fields: {
+            value: {
+                type: "uint32",
+                id: 1
+            }
+        }
+    },
+
+    /**
+     * Properties of a google.protobuf.BoolValue message.
+     * @interface IBoolValue
+     * @type {Object}
+     * @property {boolean} [value]
+     * @memberof common
+     */
+    BoolValue: {
+        fields: {
+            value: {
+                type: "bool",
+                id: 1
+            }
+        }
+    },
+
+    /**
+     * Properties of a google.protobuf.StringValue message.
+     * @interface IStringValue
+     * @type {Object}
+     * @property {string} [value]
+     * @memberof common
+     */
+    StringValue: {
+        fields: {
+            value: {
+                type: "string",
+                id: 1
+            }
+        }
+    },
+
+    /**
+     * Properties of a google.protobuf.BytesValue message.
+     * @interface IBytesValue
+     * @type {Object}
+     * @property {Uint8Array} [value]
+     * @memberof common
+     */
+    BytesValue: {
+        fields: {
+            value: {
+                type: "bytes",
+                id: 1
+            }
+        }
+    }
+});
+
+common("field_mask", {
+
+    /**
+     * Properties of a google.protobuf.FieldMask message.
+     * @interface IDoubleValue
+     * @type {Object}
+     * @property {number} [value]
+     * @memberof common
+     */
+    FieldMask: {
+        fields: {
+            paths: {
+                rule: "repeated",
+                type: "string",
+                id: 1
+            }
+        }
+    }
+});
+
+/**
+ * Gets the root definition of the specified common proto file.
+ *
+ * Bundled definitions are:
+ * - google/protobuf/any.proto
+ * - google/protobuf/duration.proto
+ * - google/protobuf/empty.proto
+ * - google/protobuf/field_mask.proto
+ * - google/protobuf/struct.proto
+ * - google/protobuf/timestamp.proto
+ * - google/protobuf/wrappers.proto
+ *
+ * @param {string} file Proto file name
+ * @returns {INamespace|null} Root definition or `null` if not defined
+ */
+common.get = function get(file) {
+    return common[file] || null;
+};
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/converter.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/converter.js
new file mode 100644
index 0000000..67e1f60
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/converter.js
@@ -0,0 +1,330 @@
+/**
+ * Created by zhangmiao on 2018/3/14.
+ * 写这个,有点难;有错误请指出 ,微信中不能Function.Apply 和evl,所以去掉其中所有的gen()
+ */
+var converter = module.exports;
+
+var Enum,
+    util;
+
+
+converter._configure = function () {
+    Enum = require('./enum');
+    util = require('./util');
+};
+
+function valuePartial_fromObject(field, fieldIndex, propName, options){
+    var m       = options['m'];
+    var d       = options['d'];
+    var _types  = options['types'];
+    var ksi     = options['ksi'];
+    var ksiFlag = typeof ksi != 'undefined';
+    if(field.resolvedType){
+        if(field.resolvedType instanceof Enum){
+            var prop = ksiFlag ? d[propName][ksi] : d[propName];
+            var values = field.resolvedType.values,
+                keys = Object.keys(values);
+            for (var i = 0; i < keys.length; i++){
+                if(field.repeated && values[keys[i]] === field.typeDefault){
+                    continue;
+                }
+                if(keys[i] == prop || values[keys[i]] == prop){
+                    ksiFlag ?
+                        m[propName][ksi] = values[keys[i]] :
+                        m[propName] = values[keys[i]];
+                    break
+                }
+            }
+        }else {
+            if(typeof (ksiFlag ? d[propName][ksi] : d[propName]) !== 'object')
+                throw TypeError(field.fullName + ": object expected");
+            ksiFlag ?
+                m[propName][ksi] = _types[fieldIndex].fromObject(d[propName][ksi]):
+                m[propName] = _types[fieldIndex].fromObject(d[propName]);
+        }
+    } else {
+        var  isUnsigned = false;
+        switch (field.type){
+            case "double":
+            case "float":
+                ksiFlag ?
+                    m[propName][ksi] = Number(d[propName][ksi]) :
+                    m[propName] = Number(d[propName]);
+                break;
+            case "uint32":
+            case "fixed32":
+                ksiFlag ?
+                    m[propName][ksi] = d[propName][ksi] >>> 0:
+                    m[propName] = d[propName] >>> 0;
+                break;
+            case "int32":
+            case "sint32":
+            case "sfixed32":
+                ksiFlag ?
+                    m[propName][ksi] = d[propName][ksi] | 0 :
+                    m[propName] = d[propName] |0;
+                break;
+            case "uint64":
+                isUnsigned = true;
+            // eslint-disable-line no-fallthrough
+            case "int64":
+            case "sint64":
+            case "fixed64":
+            case "sfixed64":
+                if(util.Long)
+                    ksiFlag ?
+                        m[propName][ksi] = util.Long.fromValue(d[propName][ksi]).unsigned = isUnsigned :
+                        m[propName] = util.Long.fromValue(d[propName]).unsigned = isUnsigned;
+                else if(typeof (ksiFlag ? d[propName][ksi] : d[propName]) === 'string')
+                    ksiFlag ?
+                        m[propName][ksi] =parseInt(d[propName][ksi], 10) :
+                        m[propName] =parseInt(d[propName], 10);
+                else if(typeof (ksiFlag ? d[propName][ksi] : d[propName]) === 'number')
+                    ksiFlag ?
+                        m[propName][ksi] = d[propName][ksi] :
+                        m[propName] = d[propName];
+                else if(typeof (ksiFlag ? d[propName][ksi] : d[propName]) === 'object')
+                    ksiFlag ?
+                        m[propName][ksi] = new util.LongBits(d[propName][ksi].low >>> 0, d[propName][ksi].high >>> 0).toNumber(isUnsigned) :
+                        m[propName] = new util.LongBits(d[propName].low >>> 0, d[propName].high >>> 0).toNumber(isUnsigned);
+                break;
+            case "bytes":
+                if(typeof (ksiFlag ? d[propName][ksi] : d[propName]) ==="string")
+                    ksiFlag ?
+                        util.base64.decode(d[propName][ksi],m[propName][ksi]=util.newBuffer(util.base64.length(d[propName][ksi])),0) :
+                        util.base64.decode(d[propName],m[propName]=util.newBuffer(util.base64.length(d[propName])),0);
+                else if((ksiFlag ? d[propName][ksi] : d[propName]).length)
+                    ksiFlag?
+                        m[propName][ksi]=d[propName][ksi] :
+                        m[propName]=d[propName];
+                break;
+            case "string":
+                ksiFlag?
+                    m[propName][ksi]=String(d[propName][ksi]) :
+                    m[propName]=String(d[propName]);
+                break;
+            case "bool":
+                ksiFlag?
+                    m[propName][ksi]=Boolean(d[propName][ksi]):
+                    m[propName]=Boolean(d[propName]);
+                break;
+        }
+    }
+}
+
+/*
+* @param {Type} mtype Message type
+* @returns {Function} Function instance
+*/
+converter.fromObject = function fromObject(mtype){
+    var fields = mtype.fieldsArray;
+    return function (options){
+        return function (d){
+            if(d instanceof this.ctor)
+                return d;
+            if(!fields.length)
+                return new  this.ctor;
+
+            var  m = new this.ctor;
+            for (var i = 0; i < fields.length; ++i){
+                var field       = fields[i].resolve();
+                var propName    = field.name;
+                var _i;
+                if(field.map){
+                    if(d[propName]){
+                        if(typeof d[propName] !== 'object')
+                            throw TypeError(field.fullName + ": object expected");
+                        m[propName] = {};
+                    }
+                    var ks = Object.keys(d[propName]);
+                    for ( _i = 0; _i<ks.length ; ++_i)
+                        valuePartial_fromObject(field, i, propName, util.merge(util.copy(options), {m:m,d:d,ksi : ks[_i]}));
+                }else if(field.repeated){
+                    if(d[propName]){
+                        if(!Array.isArray(d[propName]))
+                            throw TypeError(field.fullName + ": array expected");
+                        m[propName] = [];
+                        for (_i = 0; _i < d[propName].length; ++_i) {
+                            valuePartial_fromObject(field, i, propName, util.merge(util.copy(options), {
+                                m: m,
+                                d: d,
+                                ksi: _i
+                            }));
+                        }
+                    }
+                }else {
+                    if((field.resolvedType instanceof Enum) || d[propName]!=null){
+                        valuePartial_fromObject(field,i,propName, util.merge(util.copy(options), {m:m,d:d}));
+                    }
+                }
+            }
+            return m;
+        }
+    }
+};
+
+
+function valuePartial_toObject (field, fieldIndex, propName, options){
+    var m       = options['m'];
+    var d       = options['d'];
+    var _types  = options['types'];
+    var ksi     = options['ksi'];
+    var o       = options['o'];
+    var ksiFlag = typeof ksi != 'undefined';
+    if(field.resolvedType){
+        if (field.resolvedType instanceof  Enum)
+            ksiFlag ?
+                (d[propName][ksi] = o.enums===String?_types[fieldIndex].values[m[propName][ksi]]:m[propName][ksi]) :
+                (d[propName] = o.enums===String?_types[fieldIndex].values[m[propName]]:m[propName]);
+        else
+            ksiFlag ?
+                d[propName][ksi] = _types[fieldIndex].toObject(m[propName][ksi], o) :
+                d[propName] = _types[fieldIndex].toObject(m[propName], o);
+    }else {
+        var isUnsigned = false;
+        switch (field.type) {
+            case "double":
+            case "float":
+                ksiFlag ? (d[propName][ksi] = o.json && !isFinite(m[propName][ksi])? String(m[propName][ksi]):m[propName][ksi]) :
+                    (d[propName] = o.json && !isFinite(m[propName])? String(m[propName]):m[propName]);
+                break;
+            case "uint64":
+                isUnsigned = true;
+            // eslint-disable-line no-fallthrough
+            case "int64":
+            case "sint64":
+            case "fixed64":
+            case "sfixed64":
+                if(typeof m[propName][ksi] === 'number')
+                    ksiFlag ?
+                        (d[propName][ksi] = o.longs === String ? String(m[propName][ksi]) : m[propName][ksi]) :
+                        (d[propName] = o.longs === String ? String(m[propName]) : m[propName]);
+                else
+                    ksiFlag ?
+                        (d[propName][ksi] =
+                        o.longs === String ?
+                            util.Long.prototype.toString.call(m[propName][ksi]) :
+                            o.longs === Number ? new  util.LongBits(m[propName][ksi].low >>> 0, m[propName][ksi].high >>> 0).toNumber(isUnsigned) : m[propName][ksi]):
+                        (d[propName] =
+                            o.longs === String ?
+                                util.Long.prototype.toString.call(m[propName]) :
+                                o.longs === Number ? new  util.LongBits(m[propName].low >>> 0, m[propName].high >>> 0).toNumber(isUnsigned) : m[propName]);
+                break;
+            case "bytes":
+                ksiFlag?
+                    (d[propName][ksi] =
+                    o.bytes === String ?
+                        util.base64.encode(m[propName][ksi], 0, m[propName][ksi].length) :
+                        o.bytes === Array ? Array.prototype.slice.call(m[propName][ksi]) : m[propName][ksi]):
+                    (d[propName] =
+                        o.bytes === String ?
+                            util.base64.encode(m[propName], 0, m[propName].length) :
+                            o.bytes === Array ? Array.prototype.slice.call(m[propName]) : m[propName]);
+                break;
+            default:
+                ksiFlag ? d[propName][ksi] = m[propName][ksi] : d[propName] = m[propName];
+                break;
+        }
+    }
+}
+
+
+converter.toObject   = function toObject(mtype){
+    var fields = mtype.fieldsArray.slice().sort(util.compareFieldsById);
+    return function (options){
+        if(!fields.length)
+            return function (){
+                return {};
+            };
+        return function (m, o){
+            o = o || {};
+            var d = {};
+            var repeatedFields = [],
+                mapFields = [],
+                normalFields = [],
+                field,
+                propName,
+                i = 0;
+            for (; i < fields.length; ++i)
+                if (!fields[i].partOf)
+                    ( fields[i].resolve().repeated ? repeatedFields
+                        : fields[i].map ? mapFields
+                        : normalFields).push(fields[i]);
+
+            if (repeatedFields.length) {
+                if(o.arrays || o.defaults ){
+                    for (i = 0; i < repeatedFields.length; ++i)
+                        d[repeatedFields[i].name] = [];
+                }
+            }
+
+            if (mapFields.length) {
+                if(o.objects || o.defaults){
+                    for  (i = 0; i < mapFields.length; ++i)
+                        d[mapFields[i].name] = {};
+                }
+            }
+
+            if(normalFields.length){
+                if(o.defaults){
+                    for (i = 0; i < normalFields.length; ++i){
+                        field       = normalFields[i],
+                        propName    = field.name;
+                        if(field.resolvedType instanceof Enum)
+                            d[propName] = o.enums = String ? field.resolvedType.valuesById[field.typeDefault] : field.typeDefault;
+                        else if(field.long){
+                            if(util.Long){
+                                var n = new util.Long(field.typeDefault.low, field.typeDefault.high, field.typeDefault.unsigned);
+                                d[propName] = o.longs === String ? n.toString() : o.longs === Number ? n.toNumber():n;
+                            }else {
+                                d[propName] = o.longs === String ? field.typeDefault.toString() : field.typeDefault.toNumber();
+                            }
+                        }else if(field.bytes){
+                            d[propName] = o.bytes === String ? String.fromCharCode.apply(String, field.typeDefault) : Array.prototype.slice.call(field.typeDefault).join('*..*').split("*..*");
+                        }else {
+                            d[propName] =field.typeDefault;
+                        }
+
+                    }
+                }
+            }
+            var hasKs2 = false;
+            for (i = 0; i < fields.length; ++i){
+                field       = fields[i];
+                propName    = field.name;
+                var index   = mtype._fieldsArray.indexOf(field);
+                var ks2;
+                var  j;
+                if(field.map){
+                    if (!hasKs2){
+                        hasKs2 = true;
+                    }
+                    if (m[propName]&&(ks2 = Object.keys(m[propName]).length)){
+                        d[propName] = {};
+                        for (j = 0; j < ks2.length; ++j){
+                            valuePartial_toObject(field, index, propName, util.merge(util.copy(options), {m:m,d:d,ksi :ks2[j],o:o}));
+                        }
+                    }
+                }else if(field.repeated){
+                    if(m[propName]&&m[propName].length){
+                        d[propName] = [];
+                        for (j = 0; j < m[propName].length; ++j){
+                            valuePartial_toObject(field, index, propName, util.merge(util.copy(options), {m:m,d:d,ksi:j,o:o}))
+                        }
+                    }
+                }else {
+                    if(m[propName]!=null&& (m.hasOwnProperty(propName)/*|| field.partOf*/)){
+                        valuePartial_toObject(field, index, propName, util.merge(util.copy(options), {m:m,d:d,o:o}))
+                    }
+                    if(field.partOf) {
+                        if (o.oneofs)
+                            d[field.partOf.name] = propName;
+                    }
+                }
+            }
+            return d;
+        }
+    }
+
+
+};
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/decoder.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/decoder.js
new file mode 100644
index 0000000..0e1fef8
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/decoder.js
@@ -0,0 +1,118 @@
+/**
+ * Created by zhangmiao on 2018/3/13.
+ */
+
+var Enum,
+    types,
+    util;
+
+
+function missing(field) {
+    return "missing required '" + field.name + "'";
+}
+
+function decoder(mtype){
+    return function (options){
+        var Reader = options.Reader;
+        var _types = options.types;
+        var _util   = options.util;
+        return function (r, l){
+            if(!(r instanceof Reader))
+                r = Reader.create(r);
+            var c = l === undefined ? r.len : r.pos + l,
+                m = new this.ctor;
+            var k;
+            while (r.pos < c){
+                var t = r.uint32();
+                if (mtype.group){
+                    if((t&7) === 4)
+                        break;
+                }
+                var fieldId = t>>>3;
+                var i = 0;
+                var find = false;
+                for (; i < mtype.fieldsArray.length; ++i){
+                    var field = mtype._fieldsArray[i].resolve(),
+                        name  = field.name,
+                        type  = field.resolvedType instanceof Enum ? "int32" : field.type;
+                        //ref   = m[field.name];
+                    if (fieldId != field.id) continue;
+                    find = true;
+                    if (field.map){
+                        r.skip().pos++;
+                        if(m[name] === _util.emptyObject)
+                            m[name] = {};
+                        k = r[field.keyType]();
+                        r.pos++;
+                        if(types.long[field.keyType] != undefined){
+                            if(types.basic[type] == undefined){
+                                m[name][typeof k ==='object' ? _util.longToHash(k):k] = _types[i].decode(r, r.uint32());
+                            }else {
+                                m[name][typeof k ==='object' ? _util.longToHash(k):k] = r[type]();
+                            }
+                        }else {
+                            if(types.basic[type] == undefined){
+                              m[name][typeof k === 'object' ? _util.longToHash(k) : k] = _types[i].decode(r, r.uint32());
+                            }else {
+                              m[name][typeof k === 'object' ? _util.longToHash(k) : k] = r[type]();
+                            }
+                        }
+                    }else if(field.repeated){
+                        if(!(m[name] && m[name].length)){
+                            m[name] = [];
+                        }
+
+                        if(types.packed[type] != undefined && (t&7) === 2){
+                            var c2 = r.uint32()+ r.pos;
+                            while (r.pos < c2)
+                                m[name].push(r[type]())
+                        }else {
+                            if(types.basic[type] == undefined){
+                                field.resolvedType.group ?
+                                    m[name].push(_types[i].decode(r)) :
+                                    m[name].push(_types[i].decode(r, r.uint32()))
+
+                            }else {
+                                m[name].push(r[type]());
+                            }
+                        }
+                    }else if (types.basic[type] == undefined){
+                        if(field.resolvedType.group){
+                            m[name] = _types[i].decode(r);
+                        }else {
+                            m[name] = _types[i].decode(r, r.uint32());
+                        }
+                    }else {
+                        //console.log("m",JSON.stringify(m),"type",type,"field",field);
+                        m[name] = r[type]();
+                    }
+                    break;
+                }
+
+                if(!find){
+                    console.log("t",t);
+                    r.skipType(t&7)
+                }
+
+            }
+
+            for (i = 0; i < mtype._fieldsArray.length; ++ i){
+                var rfield = mtype._fieldsArray[i];
+                if(rfield.required){
+                    if(!m.hasOwnProperty(rfield.name)){
+                        throw util.ProtocolError(missing(rfield),{instance:m})
+                    }
+                }
+            }
+            //mtype.fieldsArray.filter(function(field) { return field.map; }).length
+            return m;
+        }
+    }
+}
+
+module.exports = decoder;
+decoder._configure  = function (){
+    Enum    = require("./enum");
+    types   = require("./types");
+    util    = require("./util");
+};
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/enum.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/enum.js
new file mode 100644
index 0000000..f9c4ceb
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/enum.js
@@ -0,0 +1,171 @@
+/**
+ * Created by zhangmiao on 2018/3/12.
+ */
+
+module.exports = Enum;
+
+var ReflectionObject = require("./object");
+
+((Enum.prototype = Object.create(ReflectionObject.prototype)).constructor = Enum).className = "Enum";
+var Namespace = require("./namespace");
+
+function Enum(name, values, options, comment, comments) {
+    ReflectionObject.call(this, name, options);
+
+    if (values && typeof values !== "object")
+        throw TypeError("values must be an object");
+
+    /**
+     * Enum values by id.
+     * @type {Object.<number,string>}
+     */
+    this.valuesById = {};
+
+    /**
+     * Enum values by name.
+     * @type {Object.<string,number>}
+     */
+    this.values = Object.create(this.valuesById); // toJSON, marker
+
+    /**
+     * Enum comment text.
+     * @type {string|null}
+     */
+    this.comment = comment;
+
+    /**
+     * Value comment texts, if any.
+     * @type {Object.<string,string>}
+     */
+    this.comments = comments || {};
+
+    /**
+     * Reserved ranges, if any.
+     * @type {Array.<number[]|string>}
+     */
+    this.reserved = undefined; // toJSON
+
+    // Note that values inherit valuesById on their prototype which makes them a TypeScript-
+    // compatible enum. This is used by pbts to write actual enum definitions that work for
+    // static and reflection code alike instead of emitting generic object definitions.
+
+    if (values)
+        for (var keys = Object.keys(values), i = 0; i < keys.length; ++i)
+            if (typeof values[keys[i]] === "number") // use forward entries only
+                this.valuesById[ this.values[keys[i]] = values[keys[i]] ] = keys[i];
+}
+
+/**
+ * Enum descriptor.
+ * @interface IEnum
+ * @property {Object.<string,number>} values Enum values
+ * @property {Object.<string,*>} [options] Enum options
+ */
+
+/**
+ * Constructs an enum from an enum descriptor.
+ * @param {string} name Enum name
+ * @param {IEnum} json Enum descriptor
+ * @returns {Enum} Created enum
+ * @throws {TypeError} If arguments are invalid
+ */
+Enum.fromJSON = function fromJSON(name, json) {
+    var enm = new Enum(name, json.values, json.options, json.comment, json.comments);
+    enm.reserved = json.reserved;
+    return enm;
+};
+
+/**
+ * Converts this enum to an enum descriptor.
+ * @param {IToJSONOptions} [toJSONOptions] JSON conversion options
+ * @returns {IEnum} Enum descriptor
+ */
+Enum.prototype.toJSON = function toJSON(toJSONOptions) {
+    var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    return util.toObject([
+        "options"  , this.options,
+        "values"   , this.values,
+        "reserved" , this.reserved && this.reserved.length ? this.reserved : undefined,
+        "comment"  , keepComments ? this.comment : undefined,
+        "comments" , keepComments ? this.comments : undefined
+    ]);
+};
+
+/**
+ * Adds a value to this enum.
+ * @param {string} name Value name
+ * @param {number} id Value id
+ * @param {string} [comment] Comment, if any
+ * @returns {Enum} `this`
+ * @throws {TypeError} If arguments are invalid
+ * @throws {Error} If there is already a value with this name or id
+ */
+Enum.prototype.add = function add(name, id, comment) {
+    // utilized by the parser but not by .fromJSON
+
+    if (!util.isString(name))
+        throw TypeError("name must be a string");
+
+    if (!util.isInteger(id))
+        throw TypeError("id must be an integer");
+
+    if (this.values[name] !== undefined)
+        throw Error("duplicate name '" + name + "' in " + this);
+
+    if (this.isReservedId(id))
+        throw Error("id " + id + " is reserved in " + this);
+
+    if (this.isReservedName(name))
+        throw Error("name '" + name + "' is reserved in " + this);
+
+    if (this.valuesById[id] !== undefined) {
+        if (!(this.options && this.options.allow_alias))
+            throw Error("duplicate id " + id + " in " + this);
+        this.values[name] = id;
+    } else
+        this.valuesById[this.values[name] = id] = name;
+
+    this.comments[name] = comment || null;
+    return this;
+};
+
+/**
+ * Removes a value from this enum
+ * @param {string} name Value name
+ * @returns {Enum} `this`
+ * @throws {TypeError} If arguments are invalid
+ * @throws {Error} If `name` is not a name of this enum
+ */
+Enum.prototype.remove = function remove(name) {
+
+    if (!util.isString(name))
+        throw TypeError("name must be a string");
+
+    var val = this.values[name];
+    if (val == null)
+        throw Error("name '" + name + "' does not exist in " + this);
+
+    delete this.valuesById[val];
+    delete this.values[name];
+    delete this.comments[name];
+
+    return this;
+};
+
+/**
+ * Tests if the specified id is reserved.
+ * @param {number} id Id to test
+ * @returns {boolean} `true` if reserved, otherwise `false`
+ */
+Enum.prototype.isReservedId = function isReservedId(id) {
+    return Namespace.isReservedId(this.reserved, id);
+};
+
+/**
+ * Tests if the specified name is reserved.
+ * @param {string} name Name to test
+ * @returns {boolean} `true` if reserved, otherwise `false`
+ */
+Enum.prototype.isReservedName = function isReservedName(name) {
+    return Namespace.isReservedName(this.reserved, name);
+};
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/field.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/field.js
new file mode 100644
index 0000000..8de03d6
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/field.js
@@ -0,0 +1,377 @@
+/**
+ * Created by zhangmiao on 2018/3/12.
+ */
+
+module.exports = Field;
+
+// extends ReflectionObject
+var ReflectionObject = require("./object");
+((Field.prototype = Object.create(ReflectionObject.prototype)).constructor = Field).className = "Field";
+
+var Enum,
+    types,
+    util;
+
+var Type; // cyclic
+
+var ruleRe = /^required|optional|repeated$/;
+
+/**
+ * Constructs a new message field instance. Note that {@link MapField|map fields} have their own class.
+ * @name Field
+ * @classdesc Reflected message field.
+ * @extends FieldBase
+ * @constructor
+ * @param {string} name Unique name within its namespace
+ * @param {number} id Unique id within its namespace
+ * @param {string} type Value type
+ * @param {string|Object.<string,*>} [rule="optional"] Field rule
+ * @param {string|Object.<string,*>} [extend] Extended type if different from parent
+ * @param {Object.<string,*>} [options] Declared options
+ */
+
+/**
+ * Constructs a field from a field descriptor.
+ * @param {string} name Field name
+ * @param {IField} json Field descriptor
+ * @returns {Field} Created field
+ * @throws {TypeError} If arguments are invalid
+ */
+Field.fromJSON = function fromJSON(name, json) {
+    return new Field(name, json.id, json.type, json.rule, json.extend, json.options, json.comment);
+};
+
+/**
+ * Not an actual constructor. Use {@link Field} instead.
+ * @classdesc Base class of all reflected message fields. This is not an actual class but here for the sake of having consistent type definitions.
+ * @exports FieldBase
+ * @extends ReflectionObject
+ * @constructor
+ * @param {string} name Unique name within its namespace
+ * @param {number} id Unique id within its namespace
+ * @param {string} type Value type
+ * @param {string|Object.<string,*>} [rule="optional"] Field rule
+ * @param {string|Object.<string,*>} [extend] Extended type if different from parent
+ * @param {Object.<string,*>} [options] Declared options
+ * @param {string} [comment] Comment associated with this field
+ */
+function Field(name, id, type, rule, extend, options, comment) {
+
+    if (util.isObject(rule)) {
+        comment = extend;
+        options = rule;
+        rule = extend = undefined;
+    } else if (util.isObject(extend)) {
+        comment = options;
+        options = extend;
+        extend = undefined;
+    }
+
+    ReflectionObject.call(this, name, options);
+
+    if (!util.isInteger(id) || id < 0)
+        throw TypeError("id must be a non-negative integer");
+
+    if (!util.isString(type))
+        throw TypeError("type must be a string");
+
+    if (rule !== undefined && !ruleRe.test(rule = rule.toString().toLowerCase()))
+        throw TypeError("rule must be a string rule");
+
+    if (extend !== undefined && !util.isString(extend))
+        throw TypeError("extend must be a string");
+
+    /**
+     * Field rule, if any.
+     * @type {string|undefined}
+     */
+    this.rule = rule && rule !== "optional" ? rule : undefined; // toJSON
+
+    /**
+     * Field type.
+     * @type {string}
+     */
+    this.type = type; // toJSON
+
+    /**
+     * Unique field id.
+     * @type {number}
+     */
+    this.id = id; // toJSON, marker
+
+    /**
+     * Extended type if different from parent.
+     * @type {string|undefined}
+     */
+    this.extend = extend || undefined; // toJSON
+
+    /**
+     * Whether this field is required.
+     * @type {boolean}
+     */
+    this.required = rule === "required";
+
+    /**
+     * Whether this field is optional.
+     * @type {boolean}
+     */
+    this.optional = !this.required;
+
+    /**
+     * Whether this field is repeated.
+     * @type {boolean}
+     */
+    this.repeated = rule === "repeated";
+
+    /**
+     * Whether this field is a map or not.
+     * @type {boolean}
+     */
+    this.map = false;
+
+    /**
+     * Message this field belongs to.
+     * @type {Type|null}
+     */
+    this.message = null;
+
+    /**
+     * OneOf this field belongs to, if any,
+     * @type {OneOf|null}
+     */
+    this.partOf = null;
+
+    /**
+     * The field type's default value.
+     * @type {*}
+     */
+    this.typeDefault = null;
+
+    /**
+     * The field's default value on prototypes.
+     * @type {*}
+     */
+    this.defaultValue = null;
+
+    /**
+     * Whether this field's value should be treated as a long.
+     * @type {boolean}
+     */
+    this.long = util.Long ? types.long[type] !== undefined : /* istanbul ignore next */ false;
+
+    /**
+     * Whether this field's value is a buffer.
+     * @type {boolean}
+     */
+    this.bytes = type === "bytes";
+
+    /**
+     * Resolved type if not a basic type.
+     * @type {Type|Enum|null}
+     */
+    this.resolvedType = null;
+
+    /**
+     * Sister-field within the extended type if a declaring extension field.
+     * @type {Field|null}
+     */
+    this.extensionField = null;
+
+    /**
+     * Sister-field within the declaring namespace if an extended field.
+     * @type {Field|null}
+     */
+    this.declaringField = null;
+
+    /**
+     * Internally remembers whether this field is packed.
+     * @type {boolean|null}
+     * @private
+     */
+    this._packed = null;
+
+    /**
+     * Comment for this field.
+     * @type {string|null}
+     */
+    this.comment = comment;
+}
+
+/**
+ * Determines whether this field is packed. Only relevant when repeated and working with proto2.
+ * @name Field#packed
+ * @type {boolean}
+ * @readonly
+ */
+Object.defineProperty(Field.prototype, "packed", {
+    get: function() {
+        // defaults to packed=true if not explicity set to false
+        if (this._packed === null)
+            this._packed = this.getOption("packed") !== false;
+        return this._packed;
+    }
+});
+
+/**
+ * @override
+ */
+Field.prototype.setOption = function setOption(name, value, ifNotSet) {
+    if (name === "packed") // clear cached before setting
+        this._packed = null;
+    return ReflectionObject.prototype.setOption.call(this, name, value, ifNotSet);
+};
+
+/**
+ * Field descriptor.
+ * @interface IField
+ * @property {string} [rule="optional"] Field rule
+ * @property {string} type Field type
+ * @property {number} id Field id
+ * @property {Object.<string,*>} [options] Field options
+ */
+
+/**
+ * Extension field descriptor.
+ * @interface IExtensionField
+ * @extends IField
+ * @property {string} extend Extended type
+ */
+
+/**
+ * Converts this field to a field descriptor.
+ * @param {IToJSONOptions} [toJSONOptions] JSON conversion options
+ * @returns {IField} Field descriptor
+ */
+Field.prototype.toJSON = function toJSON(toJSONOptions) {
+    var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    return util.toObject([
+        "rule"    , this.rule !== "optional" && this.rule || undefined,
+        "type"    , this.type,
+        "id"      , this.id,
+        "extend"  , this.extend,
+        "options" , this.options,
+        "comment" , keepComments ? this.comment : undefined
+    ]);
+};
+
+/**
+ * Resolves this field's type references.
+ * @returns {Field} `this`
+ * @throws {Error} If any reference cannot be resolved
+ */
+Field.prototype.resolve = function resolve() {
+
+    if (this.resolved)
+        return this;
+
+    if ((this.typeDefault = types.defaults[this.type]) === undefined) { // if not a basic type, resolve it
+        this.resolvedType = (this.declaringField ? this.declaringField.parent : this.parent).lookupTypeOrEnum(this.type);
+        if (this.resolvedType instanceof Type)
+            this.typeDefault = null;
+        else // instanceof Enum
+            this.typeDefault = this.resolvedType.values[Object.keys(this.resolvedType.values)[0]]; // first defined
+    }
+
+    // use explicitly set default value if present
+    if (this.options && this.options["default"] != null) {
+        this.typeDefault = this.options["default"];
+        if (this.resolvedType instanceof Enum && typeof this.typeDefault === "string")
+            this.typeDefault = this.resolvedType.values[this.typeDefault];
+    }
+
+    // remove unnecessary options
+    if (this.options) {
+        if (this.options.packed === true || this.options.packed !== undefined && this.resolvedType && !(this.resolvedType instanceof Enum))
+            delete this.options.packed;
+        if (!Object.keys(this.options).length)
+            this.options = undefined;
+    }
+
+    // convert to internal data type if necesssary
+    if (this.long) {
+        this.typeDefault = util.Long.fromNumber(this.typeDefault, this.type.charAt(0) === "u");
+
+        /* istanbul ignore else */
+        if (Object.freeze)
+            Object.freeze(this.typeDefault); // long instances are meant to be immutable anyway (i.e. use small int cache that even requires it)
+
+    } else if (this.bytes && typeof this.typeDefault === "string") {
+        var buf;
+        //if (util.base64.test(this.typeDefault))
+        //    util.base64.decode(this.typeDefault, buf = util.newBuffer(util.base64.length(this.typeDefault)), 0);
+        //else
+            util.utf8.write(this.typeDefault, buf = util.newBuffer(util.utf8.length(this.typeDefault)), 0);
+        this.typeDefault = buf;
+    }
+
+    // take special care of maps and repeated fields
+    if (this.map)
+        this.defaultValue = util.emptyObject;
+    else if (this.repeated)
+        this.defaultValue = util.emptyArray;
+    else
+        this.defaultValue = this.typeDefault;
+
+    // ensure proper value on prototype
+    if (this.parent instanceof Type) {
+        this.parent.ctor.prototype[this.name] = this.defaultValue;
+    }
+    return ReflectionObject.prototype.resolve.call(this);
+};
+
+/**
+ * Decorator function as returned by {@link Field.d} and {@link MapField.d} (TypeScript).
+ * @typedef FieldDecorator
+ * @type {function}
+ * @param {Object} prototype Target prototype
+ * @param {string} fieldName Field name
+ * @returns {undefined}
+ */
+
+/**
+ * Field decorator (TypeScript).
+ * @name Field.d
+ * @function
+ * @param {number} fieldId Field id
+ * @param {"double"|"float"|"int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"string"|"bool"|"bytes"|Object} fieldType Field type
+ * @param {"optional"|"required"|"repeated"} [fieldRule="optional"] Field rule
+ * @param {T} [defaultValue] Default value
+ * @returns {FieldDecorator} Decorator function
+ * @template T extends number | number[] | Long | Long[] | string | string[] | boolean | boolean[] | Uint8Array | Uint8Array[] | Buffer | Buffer[]
+ */
+Field.d = function decorateField(fieldId, fieldType, fieldRule, defaultValue) {
+
+    // submessage: decorate the submessage and use its name as the type
+    if (typeof fieldType === "function")
+        fieldType = util.decorateType(fieldType).name;
+
+    // enum reference: create a reflected copy of the enum and keep reuseing it
+    else if (fieldType && typeof fieldType === "object")
+        fieldType = util.decorateEnum(fieldType).name;
+
+    return function fieldDecorator(prototype, fieldName) {
+        util.decorateType(prototype.constructor)
+            .add(new Field(fieldName, fieldId, fieldType, fieldRule, { "default": defaultValue }));
+    };
+};
+
+/**
+ * Field decorator (TypeScript).
+ * @name Field.d
+ * @function
+ * @param {number} fieldId Field id
+ * @param {Constructor<T>|string} fieldType Field type
+ * @param {"optional"|"required"|"repeated"} [fieldRule="optional"] Field rule
+ * @returns {FieldDecorator} Decorator function
+ * @template T extends Message<T>
+ * @variation 2
+ */
+// like Field.d but without a default value
+
+Field._configure = function configure() {
+    Type = require('./type');
+
+    Enum  = require("./enum");
+    types = require("./types");
+    util  = require("./util");
+};
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/float.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/float.js
new file mode 100644
index 0000000..3eabfe0
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/float.js
@@ -0,0 +1,333 @@
+module.exports = factory(factory);
+
+/**
+ * Reads / writes floats / doubles from / to buffers.
+ * @name util.float
+ * @namespace
+ */
+
+/**
+ * Writes a 32 bit float to a buffer using little endian byte order.
+ * @name util.float.writeFloatLE
+ * @function
+ * @param {number} val Value to write
+ * @param {Uint8Array} buf Target buffer
+ * @param {number} pos Target buffer offset
+ * @returns {undefined}
+ */
+
+/**
+ * Writes a 32 bit float to a buffer using big endian byte order.
+ * @name util.float.writeFloatBE
+ * @function
+ * @param {number} val Value to write
+ * @param {Uint8Array} buf Target buffer
+ * @param {number} pos Target buffer offset
+ * @returns {undefined}
+ */
+
+/**
+ * Reads a 32 bit float from a buffer using little endian byte order.
+ * @name util.float.readFloatLE
+ * @function
+ * @param {Uint8Array} buf Source buffer
+ * @param {number} pos Source buffer offset
+ * @returns {number} Value read
+ */
+
+/**
+ * Reads a 32 bit float from a buffer using big endian byte order.
+ * @name util.float.readFloatBE
+ * @function
+ * @param {Uint8Array} buf Source buffer
+ * @param {number} pos Source buffer offset
+ * @returns {number} Value read
+ */
+
+/**
+ * Writes a 64 bit double to a buffer using little endian byte order.
+ * @name util.float.writeDoubleLE
+ * @function
+ * @param {number} val Value to write
+ * @param {Uint8Array} buf Target buffer
+ * @param {number} pos Target buffer offset
+ * @returns {undefined}
+ */
+
+/**
+ * Writes a 64 bit double to a buffer using big endian byte order.
+ * @name util.float.writeDoubleBE
+ * @function
+ * @param {number} val Value to write
+ * @param {Uint8Array} buf Target buffer
+ * @param {number} pos Target buffer offset
+ * @returns {undefined}
+ */
+
+/**
+ * Reads a 64 bit double from a buffer using little endian byte order.
+ * @name util.float.readDoubleLE
+ * @function
+ * @param {Uint8Array} buf Source buffer
+ * @param {number} pos Source buffer offset
+ * @returns {number} Value read
+ */
+
+/**
+ * Reads a 64 bit double from a buffer using big endian byte order.
+ * @name util.float.readDoubleBE
+ * @function
+ * @param {Uint8Array} buf Source buffer
+ * @param {number} pos Source buffer offset
+ * @returns {number} Value read
+ */
+
+// Factory function for the purpose of node-based testing in modified global environments
+function factory(exports) {
+
+    // float: typed array
+    if (typeof Float32Array !== "undefined") (function() {
+
+        var f32 = new Float32Array([ -0 ]),
+            f8b = new Uint8Array(f32.buffer),
+            le  = f8b[3] === 128;
+
+        function writeFloat_f32_cpy(val, buf, pos) {
+            f32[0] = val;
+            buf[pos    ] = f8b[0];
+            buf[pos + 1] = f8b[1];
+            buf[pos + 2] = f8b[2];
+            buf[pos + 3] = f8b[3];
+        }
+
+        function writeFloat_f32_rev(val, buf, pos) {
+            f32[0] = val;
+            buf[pos    ] = f8b[3];
+            buf[pos + 1] = f8b[2];
+            buf[pos + 2] = f8b[1];
+            buf[pos + 3] = f8b[0];
+        }
+
+        /* istanbul ignore next */
+        exports.writeFloatLE = le ? writeFloat_f32_cpy : writeFloat_f32_rev;
+        /* istanbul ignore next */
+        exports.writeFloatBE = le ? writeFloat_f32_rev : writeFloat_f32_cpy;
+
+        function readFloat_f32_cpy(buf, pos) {
+            f8b[0] = buf[pos    ];
+            f8b[1] = buf[pos + 1];
+            f8b[2] = buf[pos + 2];
+            f8b[3] = buf[pos + 3];
+            return f32[0];
+        }
+
+        function readFloat_f32_rev(buf, pos) {
+            f8b[3] = buf[pos    ];
+            f8b[2] = buf[pos + 1];
+            f8b[1] = buf[pos + 2];
+            f8b[0] = buf[pos + 3];
+            return f32[0];
+        }
+
+        /* istanbul ignore next */
+        exports.readFloatLE = le ? readFloat_f32_cpy : readFloat_f32_rev;
+        /* istanbul ignore next */
+        exports.readFloatBE = le ? readFloat_f32_rev : readFloat_f32_cpy;
+
+        // float: ieee754
+    })(); else (function() {
+
+        function writeFloat_ieee754(writeUint, val, buf, pos) {
+            var sign = val < 0 ? 1 : 0;
+            if (sign)
+                val = -val;
+            if (val === 0)
+                writeUint(1 / val > 0 ? /* positive */ 0 : /* negative 0 */ 2147483648, buf, pos);
+            else if (isNaN(val))
+                writeUint(2143289344, buf, pos);
+            else if (val > 3.4028234663852886e+38) // +-Infinity
+                writeUint((sign << 31 | 2139095040) >>> 0, buf, pos);
+            else if (val < 1.1754943508222875e-38) // denormal
+                writeUint((sign << 31 | Math.round(val / 1.401298464324817e-45)) >>> 0, buf, pos);
+            else {
+                var exponent = Math.floor(Math.log(val) / Math.LN2),
+                    mantissa = Math.round(val * Math.pow(2, -exponent) * 8388608) & 8388607;
+                writeUint((sign << 31 | exponent + 127 << 23 | mantissa) >>> 0, buf, pos);
+            }
+        }
+
+        exports.writeFloatLE = writeFloat_ieee754.bind(null, writeUintLE);
+        exports.writeFloatBE = writeFloat_ieee754.bind(null, writeUintBE);
+
+        function readFloat_ieee754(readUint, buf, pos) {
+            var uint = readUint(buf, pos),
+                sign = (uint >> 31) * 2 + 1,
+                exponent = uint >>> 23 & 255,
+                mantissa = uint & 8388607;
+            return exponent === 255
+                ? mantissa
+                ? NaN
+                : sign * Infinity
+                : exponent === 0 // denormal
+                ? sign * 1.401298464324817e-45 * mantissa
+                : sign * Math.pow(2, exponent - 150) * (mantissa + 8388608);
+        }
+
+        exports.readFloatLE = readFloat_ieee754.bind(null, readUintLE);
+        exports.readFloatBE = readFloat_ieee754.bind(null, readUintBE);
+
+    })();
+
+    // double: typed array
+    if (typeof Float64Array !== "undefined") (function() {
+
+        var f64 = new Float64Array([-0]),
+            f8b = new Uint8Array(f64.buffer),
+            le  = f8b[7] === 128;
+
+        function writeDouble_f64_cpy(val, buf, pos) {
+            f64[0] = val;
+            buf[pos    ] = f8b[0];
+            buf[pos + 1] = f8b[1];
+            buf[pos + 2] = f8b[2];
+            buf[pos + 3] = f8b[3];
+            buf[pos + 4] = f8b[4];
+            buf[pos + 5] = f8b[5];
+            buf[pos + 6] = f8b[6];
+            buf[pos + 7] = f8b[7];
+        }
+
+        function writeDouble_f64_rev(val, buf, pos) {
+            f64[0] = val;
+            buf[pos    ] = f8b[7];
+            buf[pos + 1] = f8b[6];
+            buf[pos + 2] = f8b[5];
+            buf[pos + 3] = f8b[4];
+            buf[pos + 4] = f8b[3];
+            buf[pos + 5] = f8b[2];
+            buf[pos + 6] = f8b[1];
+            buf[pos + 7] = f8b[0];
+        }
+
+        /* istanbul ignore next */
+        exports.writeDoubleLE = le ? writeDouble_f64_cpy : writeDouble_f64_rev;
+        /* istanbul ignore next */
+        exports.writeDoubleBE = le ? writeDouble_f64_rev : writeDouble_f64_cpy;
+
+        function readDouble_f64_cpy(buf, pos) {
+            f8b[0] = buf[pos    ];
+            f8b[1] = buf[pos + 1];
+            f8b[2] = buf[pos + 2];
+            f8b[3] = buf[pos + 3];
+            f8b[4] = buf[pos + 4];
+            f8b[5] = buf[pos + 5];
+            f8b[6] = buf[pos + 6];
+            f8b[7] = buf[pos + 7];
+            return f64[0];
+        }
+
+        function readDouble_f64_rev(buf, pos) {
+            f8b[7] = buf[pos    ];
+            f8b[6] = buf[pos + 1];
+            f8b[5] = buf[pos + 2];
+            f8b[4] = buf[pos + 3];
+            f8b[3] = buf[pos + 4];
+            f8b[2] = buf[pos + 5];
+            f8b[1] = buf[pos + 6];
+            f8b[0] = buf[pos + 7];
+            return f64[0];
+        }
+
+        /* istanbul ignore next */
+        exports.readDoubleLE = le ? readDouble_f64_cpy : readDouble_f64_rev;
+        /* istanbul ignore next */
+        exports.readDoubleBE = le ? readDouble_f64_rev : readDouble_f64_cpy;
+
+        // double: ieee754
+    })(); else (function() {
+
+        function writeDouble_ieee754(writeUint, off0, off1, val, buf, pos) {
+            var sign = val < 0 ? 1 : 0;
+            if (sign)
+                val = -val;
+            if (val === 0) {
+                writeUint(0, buf, pos + off0);
+                writeUint(1 / val > 0 ? /* positive */ 0 : /* negative 0 */ 2147483648, buf, pos + off1);
+            } else if (isNaN(val)) {
+                writeUint(0, buf, pos + off0);
+                writeUint(2146959360, buf, pos + off1);
+            } else if (val > 1.7976931348623157e+308) { // +-Infinity
+                writeUint(0, buf, pos + off0);
+                writeUint((sign << 31 | 2146435072) >>> 0, buf, pos + off1);
+            } else {
+                var mantissa;
+                if (val < 2.2250738585072014e-308) { // denormal
+                    mantissa = val / 5e-324;
+                    writeUint(mantissa >>> 0, buf, pos + off0);
+                    writeUint((sign << 31 | mantissa / 4294967296) >>> 0, buf, pos + off1);
+                } else {
+                    var exponent = Math.floor(Math.log(val) / Math.LN2);
+                    if (exponent === 1024)
+                        exponent = 1023;
+                    mantissa = val * Math.pow(2, -exponent);
+                    writeUint(mantissa * 4503599627370496 >>> 0, buf, pos + off0);
+                    writeUint((sign << 31 | exponent + 1023 << 20 | mantissa * 1048576 & 1048575) >>> 0, buf, pos + off1);
+                }
+            }
+        }
+
+        exports.writeDoubleLE = writeDouble_ieee754.bind(null, writeUintLE, 0, 4);
+        exports.writeDoubleBE = writeDouble_ieee754.bind(null, writeUintBE, 4, 0);
+
+        function readDouble_ieee754(readUint, off0, off1, buf, pos) {
+            var lo = readUint(buf, pos + off0),
+                hi = readUint(buf, pos + off1);
+            var sign = (hi >> 31) * 2 + 1,
+                exponent = hi >>> 20 & 2047,
+                mantissa = 4294967296 * (hi & 1048575) + lo;
+            return exponent === 2047
+                ? mantissa
+                ? NaN
+                : sign * Infinity
+                : exponent === 0 // denormal
+                ? sign * 5e-324 * mantissa
+                : sign * Math.pow(2, exponent - 1075) * (mantissa + 4503599627370496);
+        }
+
+        exports.readDoubleLE = readDouble_ieee754.bind(null, readUintLE, 0, 4);
+        exports.readDoubleBE = readDouble_ieee754.bind(null, readUintBE, 4, 0);
+
+    })();
+
+    return exports;
+}
+
+// uint helpers
+
+function writeUintLE(val, buf, pos) {
+    buf[pos    ] =  val        & 255;
+    buf[pos + 1] =  val >>> 8  & 255;
+    buf[pos + 2] =  val >>> 16 & 255;
+    buf[pos + 3] =  val >>> 24;
+}
+
+function writeUintBE(val, buf, pos) {
+    buf[pos    ] =  val >>> 24;
+    buf[pos + 1] =  val >>> 16 & 255;
+    buf[pos + 2] =  val >>> 8  & 255;
+    buf[pos + 3] =  val        & 255;
+}
+
+function readUintLE(buf, pos) {
+    return (buf[pos    ]
+        | buf[pos + 1] << 8
+        | buf[pos + 2] << 16
+        | buf[pos + 3] << 24) >>> 0;
+}
+
+function readUintBE(buf, pos) {
+    return (buf[pos    ] << 24
+        | buf[pos + 1] << 16
+        | buf[pos + 2] << 8
+        | buf[pos + 3]) >>> 0;
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/index-light.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/index-light.js
new file mode 100644
index 0000000..1ef2b84
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/index-light.js
@@ -0,0 +1,103 @@
+"use strict";
+var protobuf = module.exports = require("./index-minimal");
+
+protobuf.build = "light";
+
+/**
+ * A node-style callback as used by {@link load} and {@link Root#load}.
+ * @typedef LoadCallback
+ * @type {function}
+ * @param {Error|null} error Error, if any, otherwise `null`
+ * @param {Root} [root] Root, if there hasn't been an error
+ * @returns {undefined}
+ */
+
+/**
+ * Loads one or multiple .proto or preprocessed .json files into a common root namespace and calls the callback.
+ * @param {string|string[]} filename One or multiple files to load
+ * @param {Root} root Root namespace, defaults to create a new one if omitted.
+ * @param {LoadCallback} callback Callback function
+ * @returns {undefined}
+ * @see {@link Root#load}
+ */
+function load(filename, root, callback) {
+    if (typeof root === "function") {
+        callback = root;
+        root = new protobuf.Root();
+    } else if (!root)
+        root = new protobuf.Root();
+    return root.load(filename, callback);
+}
+
+/**
+ * Loads one or multiple .proto or preprocessed .json files into a common root namespace and calls the callback.
+ * @name load
+ * @function
+ * @param {string|string[]} filename One or multiple files to load
+ * @param {LoadCallback} callback Callback function
+ * @returns {undefined}
+ * @see {@link Root#load}
+ * @variation 2
+ */
+// function load(filename:string, callback:LoadCallback):undefined
+
+/**
+ * Loads one or multiple .proto or preprocessed .json files into a common root namespace and returns a promise.
+ * @name load
+ * @function
+ * @param {string|string[]} filename One or multiple files to load
+ * @param {Root} [root] Root namespace, defaults to create a new one if omitted.
+ * @returns {Promise<Root>} Promise
+ * @see {@link Root#load}
+ * @variation 3
+ */
+// function load(filename:string, [root:Root]):Promise<Root>
+
+protobuf.load = load;
+
+/**
+ * Synchronously loads one or multiple .proto or preprocessed .json files into a common root namespace (node only).
+ * @param {string|string[]} filename One or multiple files to load
+ * @param {Root} [root] Root namespace, defaults to create a new one if omitted.
+ * @returns {Root} Root namespace
+ * @throws {Error} If synchronous fetching is not supported (i.e. in browsers) or if a file's syntax is invalid
+ * @see {@link Root#loadSync}
+ */
+function loadSync(filename, root) {
+    if (!root)
+        root = new protobuf.Root();
+    return root.loadSync(filename);
+}
+
+protobuf.loadSync = loadSync;
+
+// Serialization
+protobuf.decoder          = require("./decoder");
+protobuf.verifier         = require("./verifier");
+protobuf.converter        = require("./converter");
+
+// Reflection
+protobuf.ReflectionObject = require("./object");
+protobuf.Namespace        = require("./namespace");
+protobuf.Root             = require("./root");
+protobuf.Enum             = require("./enum");
+protobuf.Type             = require("./type");
+protobuf.Field            = require("./field");
+protobuf.OneOf            = require("./oneof");
+protobuf.MapField         = require("./mapField");
+protobuf.Service          = require("./service");
+protobuf.Method           = require("./method");
+
+// Runtime
+protobuf.Message          = require("./message");
+protobuf.wrappers         = require("./wrappers");
+
+// Utility
+protobuf.types            = require("./types");
+protobuf.util             = require("./util");
+
+// Set up possibly cyclic reflection dependencies
+protobuf.ReflectionObject._configure(protobuf.Root);
+protobuf.Namespace._configure(protobuf.Type, protobuf.Service, protobuf.Enum);
+protobuf.Root._configure(protobuf.Type);
+protobuf.Field._configure(protobuf.Type);
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/index-minimal.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/index-minimal.js
new file mode 100644
index 0000000..9bc051b
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/index-minimal.js
@@ -0,0 +1,36 @@
+"use strict";
+var protobuf = exports;
+
+/**
+ * Build type, one of `"full"`, `"light"` or `"minimal"`.
+ * @name build
+ * @type {string}
+ * @const
+ */
+protobuf.build = "minimal";
+
+// Serialization
+protobuf.Writer       = require("./writer");
+protobuf.BufferWriter = require("./writer_buffer");
+protobuf.Reader       = require("./reader");
+protobuf.BufferReader = require("./reader_buffer");
+
+// Utility
+protobuf.util         = require("./util/minimal");
+protobuf.rpc          = require("./rpc");
+protobuf.roots        = require("./roots");
+protobuf.configure    = configure;
+
+/* istanbul ignore next */
+/**
+ * Reconfigures the library according to the environment.
+ * @returns {undefined}
+ */
+function configure() {
+    protobuf.Reader._configure(protobuf.BufferReader);
+    protobuf.util._configure();
+}
+
+// Set up buffer utility according to the environment
+protobuf.Writer._configure(protobuf.BufferWriter);
+configure();
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/index.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/index.js
new file mode 100644
index 0000000..56bd3d5
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/index.js
@@ -0,0 +1,12 @@
+"use strict";
+var protobuf = module.exports = require("./index-light");
+
+protobuf.build = "full";
+
+// Parser
+protobuf.tokenize         = require("./tokenize");
+protobuf.parse            = require("./parse");
+protobuf.common           = require("./common");
+
+// Configure parser
+protobuf.Root._configure(protobuf.Type, protobuf.parse, protobuf.common);
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/inquire.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/inquire.js
new file mode 100644
index 0000000..22425ec
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/inquire.js
@@ -0,0 +1,34 @@
+/**
+ * Created by zhangmiao on 2018/3/14.
+ */
+module.exports = inquire;
+
+/**
+ * Requires a module only if available.
+ * @memberof util
+ * @param {string} moduleName Module to require
+ * @returns {?Object} Required module if available and not empty, otherwise `null`
+ */
+const app = getApp();
+app.globalData.pbModuleMap = app.globalData.pbModuleMap || {};
+function inquire(moduleName) {
+    var moduleMap = app.globalData.pbModuleMap;
+    var arr = moduleName.split('/');
+    var name = arr[arr.length -1];
+    if(typeof moduleMap[name] != 'undefined')
+    {
+        return moduleMap[name];
+    }
+
+    try {
+        var mod = require(moduleName);
+        if (mod) {
+            moduleMap[name] = mod;
+            return mod;
+        }
+        else {
+            console.log('没有加载到该模块')
+        }
+    } catch (e) {} // eslint-disable-line no-empty
+    return null;
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/long.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/long.js
new file mode 100644
index 0000000..7a769e2
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/long.js
@@ -0,0 +1,1323 @@
+module.exports = Long;
+
+/**
+ * wasm optimizations, to do native i64 multiplication and divide
+ */
+var wasm = null;
+
+try {
+    wasm = new WebAssembly.Instance(new WebAssembly.Module(new Uint8Array([
+        0, 97, 115, 109, 1, 0, 0, 0, 1, 13, 2, 96, 0, 1, 127, 96, 4, 127, 127, 127, 127, 1, 127, 3, 7, 6, 0, 1, 1, 1, 1, 1, 6, 6, 1, 127, 1, 65, 0, 11, 7, 50, 6, 3, 109, 117, 108, 0, 1, 5, 100, 105, 118, 95, 115, 0, 2, 5, 100, 105, 118, 95, 117, 0, 3, 5, 114, 101, 109, 95, 115, 0, 4, 5, 114, 101, 109, 95, 117, 0, 5, 8, 103, 101, 116, 95, 104, 105, 103, 104, 0, 0, 10, 191, 1, 6, 4, 0, 35, 0, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 126, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 127, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 128, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 129, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 130, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11
+    ])), {}).exports;
+} catch (e) {
+    // no wasm support :(
+}
+
+/**
+ * Constructs a 64 bit two's-complement integer, given its low and high 32 bit values as *signed* integers.
+ *  See the from* functions below for more convenient ways of constructing Longs.
+ * @exports Long
+ * @class A Long class for representing a 64 bit two's-complement integer value.
+ * @param {number} low The low (signed) 32 bits of the long
+ * @param {number} high The high (signed) 32 bits of the long
+ * @param {boolean=} unsigned Whether unsigned or not, defaults to signed
+ * @constructor
+ */
+function Long(low, high, unsigned) {
+
+    /**
+     * The low 32 bits as a signed value.
+     * @type {number}
+     */
+    this.low = low | 0;
+
+    /**
+     * The high 32 bits as a signed value.
+     * @type {number}
+     */
+    this.high = high | 0;
+
+    /**
+     * Whether unsigned or not.
+     * @type {boolean}
+     */
+    this.unsigned = !!unsigned;
+}
+
+// The internal representation of a long is the two given signed, 32-bit values.
+// We use 32-bit pieces because these are the size of integers on which
+// Javascript performs bit-operations.  For operations like addition and
+// multiplication, we split each number into 16 bit pieces, which can easily be
+// multiplied within Javascript's floating-point representation without overflow
+// or change in sign.
+//
+// In the algorithms below, we frequently reduce the negative case to the
+// positive case by negating the input(s) and then post-processing the result.
+// Note that we must ALWAYS check specially whether those values are MIN_VALUE
+// (-2^63) because -MIN_VALUE == MIN_VALUE (since 2^63 cannot be represented as
+// a positive number, it overflows back into a negative).  Not handling this
+// case would often result in infinite recursion.
+//
+// Common constant values ZERO, ONE, NEG_ONE, etc. are defined below the from*
+// methods on which they depend.
+
+/**
+ * An indicator used to reliably determine if an object is a Long or not.
+ * @type {boolean}
+ * @const
+ * @private
+ */
+Long.prototype.__isLong__;
+
+Object.defineProperty(Long.prototype, "__isLong__", { value: true });
+
+/**
+ * @function
+ * @param {*} obj Object
+ * @returns {boolean}
+ * @inner
+ */
+function isLong(obj) {
+    return (obj && obj["__isLong__"]) === true;
+}
+
+/**
+ * Tests if the specified object is a Long.
+ * @function
+ * @param {*} obj Object
+ * @returns {boolean}
+ */
+Long.isLong = isLong;
+
+/**
+ * A cache of the Long representations of small integer values.
+ * @type {!Object}
+ * @inner
+ */
+var INT_CACHE = {};
+
+/**
+ * A cache of the Long representations of small unsigned integer values.
+ * @type {!Object}
+ * @inner
+ */
+var UINT_CACHE = {};
+
+/**
+ * @param {number} value
+ * @param {boolean=} unsigned
+ * @returns {!Long}
+ * @inner
+ */
+function fromInt(value, unsigned) {
+    var obj, cachedObj, cache;
+    if (unsigned) {
+        value >>>= 0;
+        if (cache = (0 <= value && value < 256)) {
+            cachedObj = UINT_CACHE[value];
+            if (cachedObj)
+                return cachedObj;
+        }
+        obj = fromBits(value, (value | 0) < 0 ? -1 : 0, true);
+        if (cache)
+            UINT_CACHE[value] = obj;
+        return obj;
+    } else {
+        value |= 0;
+        if (cache = (-128 <= value && value < 128)) {
+            cachedObj = INT_CACHE[value];
+            if (cachedObj)
+                return cachedObj;
+        }
+        obj = fromBits(value, value < 0 ? -1 : 0, false);
+        if (cache)
+            INT_CACHE[value] = obj;
+        return obj;
+    }
+}
+
+/**
+ * Returns a Long representing the given 32 bit integer value.
+ * @function
+ * @param {number} value The 32 bit integer in question
+ * @param {boolean=} unsigned Whether unsigned or not, defaults to signed
+ * @returns {!Long} The corresponding Long value
+ */
+Long.fromInt = fromInt;
+
+/**
+ * @param {number} value
+ * @param {boolean=} unsigned
+ * @returns {!Long}
+ * @inner
+ */
+function fromNumber(value, unsigned) {
+    if (isNaN(value))
+        return unsigned ? UZERO : ZERO;
+    if (unsigned) {
+        if (value < 0)
+            return UZERO;
+        if (value >= TWO_PWR_64_DBL)
+            return MAX_UNSIGNED_VALUE;
+    } else {
+        if (value <= -TWO_PWR_63_DBL)
+            return MIN_VALUE;
+        if (value + 1 >= TWO_PWR_63_DBL)
+            return MAX_VALUE;
+    }
+    if (value < 0)
+        return fromNumber(-value, unsigned).neg();
+    return fromBits((value % TWO_PWR_32_DBL) | 0, (value / TWO_PWR_32_DBL) | 0, unsigned);
+}
+
+/**
+ * Returns a Long representing the given value, provided that it is a finite number. Otherwise, zero is returned.
+ * @function
+ * @param {number} value The number in question
+ * @param {boolean=} unsigned Whether unsigned or not, defaults to signed
+ * @returns {!Long} The corresponding Long value
+ */
+Long.fromNumber = fromNumber;
+
+/**
+ * @param {number} lowBits
+ * @param {number} highBits
+ * @param {boolean=} unsigned
+ * @returns {!Long}
+ * @inner
+ */
+function fromBits(lowBits, highBits, unsigned) {
+    return new Long(lowBits, highBits, unsigned);
+}
+
+/**
+ * Returns a Long representing the 64 bit integer that comes by concatenating the given low and high bits. Each is
+ *  assumed to use 32 bits.
+ * @function
+ * @param {number} lowBits The low 32 bits
+ * @param {number} highBits The high 32 bits
+ * @param {boolean=} unsigned Whether unsigned or not, defaults to signed
+ * @returns {!Long} The corresponding Long value
+ */
+Long.fromBits = fromBits;
+
+/**
+ * @function
+ * @param {number} base
+ * @param {number} exponent
+ * @returns {number}
+ * @inner
+ */
+var pow_dbl = Math.pow; // Used 4 times (4*8 to 15+4)
+
+/**
+ * @param {string} str
+ * @param {(boolean|number)=} unsigned
+ * @param {number=} radix
+ * @returns {!Long}
+ * @inner
+ */
+function fromString(str, unsigned, radix) {
+    if (str.length === 0)
+        throw Error('empty string');
+    if (str === "NaN" || str === "Infinity" || str === "+Infinity" || str === "-Infinity")
+        return ZERO;
+    if (typeof unsigned === 'number') {
+        // For goog.math.long compatibility
+        radix = unsigned,
+            unsigned = false;
+    } else {
+        unsigned = !! unsigned;
+    }
+    radix = radix || 10;
+    if (radix < 2 || 36 < radix)
+        throw RangeError('radix');
+
+    var p;
+    if ((p = str.indexOf('-')) > 0)
+        throw Error('interior hyphen');
+    else if (p === 0) {
+        return fromString(str.substring(1), unsigned, radix).neg();
+    }
+
+    // Do several (8) digits each time through the loop, so as to
+    // minimize the calls to the very expensive emulated div.
+    var radixToPower = fromNumber(pow_dbl(radix, 8));
+
+    var result = ZERO;
+    for (var i = 0; i < str.length; i += 8) {
+        var size = Math.min(8, str.length - i),
+            value = parseInt(str.substring(i, i + size), radix);
+        if (size < 8) {
+            var power = fromNumber(pow_dbl(radix, size));
+            result = result.mul(power).add(fromNumber(value));
+        } else {
+            result = result.mul(radixToPower);
+            result = result.add(fromNumber(value));
+        }
+    }
+    result.unsigned = unsigned;
+    return result;
+}
+
+/**
+ * Returns a Long representation of the given string, written using the specified radix.
+ * @function
+ * @param {string} str The textual representation of the Long
+ * @param {(boolean|number)=} unsigned Whether unsigned or not, defaults to signed
+ * @param {number=} radix The radix in which the text is written (2-36), defaults to 10
+ * @returns {!Long} The corresponding Long value
+ */
+Long.fromString = fromString;
+
+/**
+ * @function
+ * @param {!Long|number|string|!{low: number, high: number, unsigned: boolean}} val
+ * @param {boolean=} unsigned
+ * @returns {!Long}
+ * @inner
+ */
+function fromValue(val, unsigned) {
+    if (typeof val === 'number')
+        return fromNumber(val, unsigned);
+    if (typeof val === 'string')
+        return fromString(val, unsigned);
+    // Throws for non-objects, converts non-instanceof Long:
+    return fromBits(val.low, val.high, typeof unsigned === 'boolean' ? unsigned : val.unsigned);
+}
+
+/**
+ * Converts the specified value to a Long using the appropriate from* function for its type.
+ * @function
+ * @param {!Long|number|string|!{low: number, high: number, unsigned: boolean}} val Value
+ * @param {boolean=} unsigned Whether unsigned or not, defaults to signed
+ * @returns {!Long}
+ */
+Long.fromValue = fromValue;
+
+// NOTE: the compiler should inline these constant values below and then remove these variables, so there should be
+// no runtime penalty for these.
+
+/**
+ * @type {number}
+ * @const
+ * @inner
+ */
+var TWO_PWR_16_DBL = 1 << 16;
+
+/**
+ * @type {number}
+ * @const
+ * @inner
+ */
+var TWO_PWR_24_DBL = 1 << 24;
+
+/**
+ * @type {number}
+ * @const
+ * @inner
+ */
+var TWO_PWR_32_DBL = TWO_PWR_16_DBL * TWO_PWR_16_DBL;
+
+/**
+ * @type {number}
+ * @const
+ * @inner
+ */
+var TWO_PWR_64_DBL = TWO_PWR_32_DBL * TWO_PWR_32_DBL;
+
+/**
+ * @type {number}
+ * @const
+ * @inner
+ */
+var TWO_PWR_63_DBL = TWO_PWR_64_DBL / 2;
+
+/**
+ * @type {!Long}
+ * @const
+ * @inner
+ */
+var TWO_PWR_24 = fromInt(TWO_PWR_24_DBL);
+
+/**
+ * @type {!Long}
+ * @inner
+ */
+var ZERO = fromInt(0);
+
+/**
+ * Signed zero.
+ * @type {!Long}
+ */
+Long.ZERO = ZERO;
+
+/**
+ * @type {!Long}
+ * @inner
+ */
+var UZERO = fromInt(0, true);
+
+/**
+ * Unsigned zero.
+ * @type {!Long}
+ */
+Long.UZERO = UZERO;
+
+/**
+ * @type {!Long}
+ * @inner
+ */
+var ONE = fromInt(1);
+
+/**
+ * Signed one.
+ * @type {!Long}
+ */
+Long.ONE = ONE;
+
+/**
+ * @type {!Long}
+ * @inner
+ */
+var UONE = fromInt(1, true);
+
+/**
+ * Unsigned one.
+ * @type {!Long}
+ */
+Long.UONE = UONE;
+
+/**
+ * @type {!Long}
+ * @inner
+ */
+var NEG_ONE = fromInt(-1);
+
+/**
+ * Signed negative one.
+ * @type {!Long}
+ */
+Long.NEG_ONE = NEG_ONE;
+
+/**
+ * @type {!Long}
+ * @inner
+ */
+var MAX_VALUE = fromBits(0xFFFFFFFF|0, 0x7FFFFFFF|0, false);
+
+/**
+ * Maximum signed value.
+ * @type {!Long}
+ */
+Long.MAX_VALUE = MAX_VALUE;
+
+/**
+ * @type {!Long}
+ * @inner
+ */
+var MAX_UNSIGNED_VALUE = fromBits(0xFFFFFFFF|0, 0xFFFFFFFF|0, true);
+
+/**
+ * Maximum unsigned value.
+ * @type {!Long}
+ */
+Long.MAX_UNSIGNED_VALUE = MAX_UNSIGNED_VALUE;
+
+/**
+ * @type {!Long}
+ * @inner
+ */
+var MIN_VALUE = fromBits(0, 0x80000000|0, false);
+
+/**
+ * Minimum signed value.
+ * @type {!Long}
+ */
+Long.MIN_VALUE = MIN_VALUE;
+
+/**
+ * @alias Long.prototype
+ * @inner
+ */
+var LongPrototype = Long.prototype;
+
+/**
+ * Converts the Long to a 32 bit integer, assuming it is a 32 bit integer.
+ * @returns {number}
+ */
+LongPrototype.toInt = function toInt() {
+    return this.unsigned ? this.low >>> 0 : this.low;
+};
+
+/**
+ * Converts the Long to a the nearest floating-point representation of this value (double, 53 bit mantissa).
+ * @returns {number}
+ */
+LongPrototype.toNumber = function toNumber() {
+    if (this.unsigned)
+        return ((this.high >>> 0) * TWO_PWR_32_DBL) + (this.low >>> 0);
+    return this.high * TWO_PWR_32_DBL + (this.low >>> 0);
+};
+
+/**
+ * Converts the Long to a string written in the specified radix.
+ * @param {number=} radix Radix (2-36), defaults to 10
+ * @returns {string}
+ * @override
+ * @throws {RangeError} If `radix` is out of range
+ */
+LongPrototype.toString = function toString(radix) {
+    radix = radix || 10;
+    if (radix < 2 || 36 < radix)
+        throw RangeError('radix');
+    if (this.isZero())
+        return '0';
+    if (this.isNegative()) { // Unsigned Longs are never negative
+        if (this.eq(MIN_VALUE)) {
+            // We need to change the Long value before it can be negated, so we remove
+            // the bottom-most digit in this base and then recurse to do the rest.
+            var radixLong = fromNumber(radix),
+                div = this.div(radixLong),
+                rem1 = div.mul(radixLong).sub(this);
+            return div.toString(radix) + rem1.toInt().toString(radix);
+        } else
+            return '-' + this.neg().toString(radix);
+    }
+
+    // Do several (6) digits each time through the loop, so as to
+    // minimize the calls to the very expensive emulated div.
+    var radixToPower = fromNumber(pow_dbl(radix, 6), this.unsigned),
+        rem = this;
+    var result = '';
+    while (true) {
+        var remDiv = rem.div(radixToPower),
+            intval = rem.sub(remDiv.mul(radixToPower)).toInt() >>> 0,
+            digits = intval.toString(radix);
+        rem = remDiv;
+        if (rem.isZero())
+            return digits + result;
+        else {
+            while (digits.length < 6)
+                digits = '0' + digits;
+            result = '' + digits + result;
+        }
+    }
+};
+
+/**
+ * Gets the high 32 bits as a signed integer.
+ * @returns {number} Signed high bits
+ */
+LongPrototype.getHighBits = function getHighBits() {
+    return this.high;
+};
+
+/**
+ * Gets the high 32 bits as an unsigned integer.
+ * @returns {number} Unsigned high bits
+ */
+LongPrototype.getHighBitsUnsigned = function getHighBitsUnsigned() {
+    return this.high >>> 0;
+};
+
+/**
+ * Gets the low 32 bits as a signed integer.
+ * @returns {number} Signed low bits
+ */
+LongPrototype.getLowBits = function getLowBits() {
+    return this.low;
+};
+
+/**
+ * Gets the low 32 bits as an unsigned integer.
+ * @returns {number} Unsigned low bits
+ */
+LongPrototype.getLowBitsUnsigned = function getLowBitsUnsigned() {
+    return this.low >>> 0;
+};
+
+/**
+ * Gets the number of bits needed to represent the absolute value of this Long.
+ * @returns {number}
+ */
+LongPrototype.getNumBitsAbs = function getNumBitsAbs() {
+    if (this.isNegative()) // Unsigned Longs are never negative
+        return this.eq(MIN_VALUE) ? 64 : this.neg().getNumBitsAbs();
+    var val = this.high != 0 ? this.high : this.low;
+    for (var bit = 31; bit > 0; bit--)
+        if ((val & (1 << bit)) != 0)
+            break;
+    return this.high != 0 ? bit + 33 : bit + 1;
+};
+
+/**
+ * Tests if this Long's value equals zero.
+ * @returns {boolean}
+ */
+LongPrototype.isZero = function isZero() {
+    return this.high === 0 && this.low === 0;
+};
+
+/**
+ * Tests if this Long's value equals zero. This is an alias of {@link Long#isZero}.
+ * @returns {boolean}
+ */
+LongPrototype.eqz = LongPrototype.isZero;
+
+/**
+ * Tests if this Long's value is negative.
+ * @returns {boolean}
+ */
+LongPrototype.isNegative = function isNegative() {
+    return !this.unsigned && this.high < 0;
+};
+
+/**
+ * Tests if this Long's value is positive.
+ * @returns {boolean}
+ */
+LongPrototype.isPositive = function isPositive() {
+    return this.unsigned || this.high >= 0;
+};
+
+/**
+ * Tests if this Long's value is odd.
+ * @returns {boolean}
+ */
+LongPrototype.isOdd = function isOdd() {
+    return (this.low & 1) === 1;
+};
+
+/**
+ * Tests if this Long's value is even.
+ * @returns {boolean}
+ */
+LongPrototype.isEven = function isEven() {
+    return (this.low & 1) === 0;
+};
+
+/**
+ * Tests if this Long's value equals the specified's.
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.equals = function equals(other) {
+    if (!isLong(other))
+        other = fromValue(other);
+    if (this.unsigned !== other.unsigned && (this.high >>> 31) === 1 && (other.high >>> 31) === 1)
+        return false;
+    return this.high === other.high && this.low === other.low;
+};
+
+/**
+ * Tests if this Long's value equals the specified's. This is an alias of {@link Long#equals}.
+ * @function
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.eq = LongPrototype.equals;
+
+/**
+ * Tests if this Long's value differs from the specified's.
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.notEquals = function notEquals(other) {
+    return !this.eq(/* validates */ other);
+};
+
+/**
+ * Tests if this Long's value differs from the specified's. This is an alias of {@link Long#notEquals}.
+ * @function
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.neq = LongPrototype.notEquals;
+
+/**
+ * Tests if this Long's value differs from the specified's. This is an alias of {@link Long#notEquals}.
+ * @function
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.ne = LongPrototype.notEquals;
+
+/**
+ * Tests if this Long's value is less than the specified's.
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.lessThan = function lessThan(other) {
+    return this.comp(/* validates */ other) < 0;
+};
+
+/**
+ * Tests if this Long's value is less than the specified's. This is an alias of {@link Long#lessThan}.
+ * @function
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.lt = LongPrototype.lessThan;
+
+/**
+ * Tests if this Long's value is less than or equal the specified's.
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.lessThanOrEqual = function lessThanOrEqual(other) {
+    return this.comp(/* validates */ other) <= 0;
+};
+
+/**
+ * Tests if this Long's value is less than or equal the specified's. This is an alias of {@link Long#lessThanOrEqual}.
+ * @function
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.lte = LongPrototype.lessThanOrEqual;
+
+/**
+ * Tests if this Long's value is less than or equal the specified's. This is an alias of {@link Long#lessThanOrEqual}.
+ * @function
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.le = LongPrototype.lessThanOrEqual;
+
+/**
+ * Tests if this Long's value is greater than the specified's.
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.greaterThan = function greaterThan(other) {
+    return this.comp(/* validates */ other) > 0;
+};
+
+/**
+ * Tests if this Long's value is greater than the specified's. This is an alias of {@link Long#greaterThan}.
+ * @function
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.gt = LongPrototype.greaterThan;
+
+/**
+ * Tests if this Long's value is greater than or equal the specified's.
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) {
+    return this.comp(/* validates */ other) >= 0;
+};
+
+/**
+ * Tests if this Long's value is greater than or equal the specified's. This is an alias of {@link Long#greaterThanOrEqual}.
+ * @function
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.gte = LongPrototype.greaterThanOrEqual;
+
+/**
+ * Tests if this Long's value is greater than or equal the specified's. This is an alias of {@link Long#greaterThanOrEqual}.
+ * @function
+ * @param {!Long|number|string} other Other value
+ * @returns {boolean}
+ */
+LongPrototype.ge = LongPrototype.greaterThanOrEqual;
+
+/**
+ * Compares this Long's value with the specified's.
+ * @param {!Long|number|string} other Other value
+ * @returns {number} 0 if they are the same, 1 if the this is greater and -1
+ *  if the given one is greater
+ */
+LongPrototype.compare = function compare(other) {
+    if (!isLong(other))
+        other = fromValue(other);
+    if (this.eq(other))
+        return 0;
+    var thisNeg = this.isNegative(),
+        otherNeg = other.isNegative();
+    if (thisNeg && !otherNeg)
+        return -1;
+    if (!thisNeg && otherNeg)
+        return 1;
+    // At this point the sign bits are the same
+    if (!this.unsigned)
+        return this.sub(other).isNegative() ? -1 : 1;
+    // Both are positive if at least one is unsigned
+    return (other.high >>> 0) > (this.high >>> 0) || (other.high === this.high && (other.low >>> 0) > (this.low >>> 0)) ? -1 : 1;
+};
+
+/**
+ * Compares this Long's value with the specified's. This is an alias of {@link Long#compare}.
+ * @function
+ * @param {!Long|number|string} other Other value
+ * @returns {number} 0 if they are the same, 1 if the this is greater and -1
+ *  if the given one is greater
+ */
+LongPrototype.comp = LongPrototype.compare;
+
+/**
+ * Negates this Long's value.
+ * @returns {!Long} Negated Long
+ */
+LongPrototype.negate = function negate() {
+    if (!this.unsigned && this.eq(MIN_VALUE))
+        return MIN_VALUE;
+    return this.not().add(ONE);
+};
+
+/**
+ * Negates this Long's value. This is an alias of {@link Long#negate}.
+ * @function
+ * @returns {!Long} Negated Long
+ */
+LongPrototype.neg = LongPrototype.negate;
+
+/**
+ * Returns the sum of this and the specified Long.
+ * @param {!Long|number|string} addend Addend
+ * @returns {!Long} Sum
+ */
+LongPrototype.add = function add(addend) {
+    if (!isLong(addend))
+        addend = fromValue(addend);
+
+    // Divide each number into 4 chunks of 16 bits, and then sum the chunks.
+
+    var a48 = this.high >>> 16;
+    var a32 = this.high & 0xFFFF;
+    var a16 = this.low >>> 16;
+    var a00 = this.low & 0xFFFF;
+
+    var b48 = addend.high >>> 16;
+    var b32 = addend.high & 0xFFFF;
+    var b16 = addend.low >>> 16;
+    var b00 = addend.low & 0xFFFF;
+
+    var c48 = 0, c32 = 0, c16 = 0, c00 = 0;
+    c00 += a00 + b00;
+    c16 += c00 >>> 16;
+    c00 &= 0xFFFF;
+    c16 += a16 + b16;
+    c32 += c16 >>> 16;
+    c16 &= 0xFFFF;
+    c32 += a32 + b32;
+    c48 += c32 >>> 16;
+    c32 &= 0xFFFF;
+    c48 += a48 + b48;
+    c48 &= 0xFFFF;
+    return fromBits((c16 << 16) | c00, (c48 << 16) | c32, this.unsigned);
+};
+
+/**
+ * Returns the difference of this and the specified Long.
+ * @param {!Long|number|string} subtrahend Subtrahend
+ * @returns {!Long} Difference
+ */
+LongPrototype.subtract = function subtract(subtrahend) {
+    if (!isLong(subtrahend))
+        subtrahend = fromValue(subtrahend);
+    return this.add(subtrahend.neg());
+};
+
+/**
+ * Returns the difference of this and the specified Long. This is an alias of {@link Long#subtract}.
+ * @function
+ * @param {!Long|number|string} subtrahend Subtrahend
+ * @returns {!Long} Difference
+ */
+LongPrototype.sub = LongPrototype.subtract;
+
+/**
+ * Returns the product of this and the specified Long.
+ * @param {!Long|number|string} multiplier Multiplier
+ * @returns {!Long} Product
+ */
+LongPrototype.multiply = function multiply(multiplier) {
+    if (this.isZero())
+        return ZERO;
+    if (!isLong(multiplier))
+        multiplier = fromValue(multiplier);
+
+    // use wasm support if present
+    if (wasm) {
+        var low = wasm.mul(this.low,
+            this.high,
+            multiplier.low,
+            multiplier.high);
+        return fromBits(low, wasm.get_high(), this.unsigned);
+    }
+
+    if (multiplier.isZero())
+        return ZERO;
+    if (this.eq(MIN_VALUE))
+        return multiplier.isOdd() ? MIN_VALUE : ZERO;
+    if (multiplier.eq(MIN_VALUE))
+        return this.isOdd() ? MIN_VALUE : ZERO;
+
+    if (this.isNegative()) {
+        if (multiplier.isNegative())
+            return this.neg().mul(multiplier.neg());
+        else
+            return this.neg().mul(multiplier).neg();
+    } else if (multiplier.isNegative())
+        return this.mul(multiplier.neg()).neg();
+
+    // If both longs are small, use float multiplication
+    if (this.lt(TWO_PWR_24) && multiplier.lt(TWO_PWR_24))
+        return fromNumber(this.toNumber() * multiplier.toNumber(), this.unsigned);
+
+    // Divide each long into 4 chunks of 16 bits, and then add up 4x4 products.
+    // We can skip products that would overflow.
+
+    var a48 = this.high >>> 16;
+    var a32 = this.high & 0xFFFF;
+    var a16 = this.low >>> 16;
+    var a00 = this.low & 0xFFFF;
+
+    var b48 = multiplier.high >>> 16;
+    var b32 = multiplier.high & 0xFFFF;
+    var b16 = multiplier.low >>> 16;
+    var b00 = multiplier.low & 0xFFFF;
+
+    var c48 = 0, c32 = 0, c16 = 0, c00 = 0;
+    c00 += a00 * b00;
+    c16 += c00 >>> 16;
+    c00 &= 0xFFFF;
+    c16 += a16 * b00;
+    c32 += c16 >>> 16;
+    c16 &= 0xFFFF;
+    c16 += a00 * b16;
+    c32 += c16 >>> 16;
+    c16 &= 0xFFFF;
+    c32 += a32 * b00;
+    c48 += c32 >>> 16;
+    c32 &= 0xFFFF;
+    c32 += a16 * b16;
+    c48 += c32 >>> 16;
+    c32 &= 0xFFFF;
+    c32 += a00 * b32;
+    c48 += c32 >>> 16;
+    c32 &= 0xFFFF;
+    c48 += a48 * b00 + a32 * b16 + a16 * b32 + a00 * b48;
+    c48 &= 0xFFFF;
+    return fromBits((c16 << 16) | c00, (c48 << 16) | c32, this.unsigned);
+};
+
+/**
+ * Returns the product of this and the specified Long. This is an alias of {@link Long#multiply}.
+ * @function
+ * @param {!Long|number|string} multiplier Multiplier
+ * @returns {!Long} Product
+ */
+LongPrototype.mul = LongPrototype.multiply;
+
+/**
+ * Returns this Long divided by the specified. The result is signed if this Long is signed or
+ *  unsigned if this Long is unsigned.
+ * @param {!Long|number|string} divisor Divisor
+ * @returns {!Long} Quotient
+ */
+LongPrototype.divide = function divide(divisor) {
+    if (!isLong(divisor))
+        divisor = fromValue(divisor);
+    if (divisor.isZero())
+        throw Error('division by zero');
+
+    // use wasm support if present
+    if (wasm) {
+        // guard against signed division overflow: the largest
+        // negative number / -1 would be 1 larger than the largest
+        // positive number, due to two's complement.
+        if (!this.unsigned &&
+            this.high === -0x80000000 &&
+            divisor.low === -1 && divisor.high === -1) {
+            // be consistent with non-wasm code path
+            return this;
+        }
+        var low = (this.unsigned ? wasm.div_u : wasm.div_s)(
+            this.low,
+            this.high,
+            divisor.low,
+            divisor.high
+        );
+        return fromBits(low, wasm.get_high(), this.unsigned);
+    }
+
+    if (this.isZero())
+        return this.unsigned ? UZERO : ZERO;
+    var approx, rem, res;
+    if (!this.unsigned) {
+        // This section is only relevant for signed longs and is derived from the
+        // closure library as a whole.
+        if (this.eq(MIN_VALUE)) {
+            if (divisor.eq(ONE) || divisor.eq(NEG_ONE))
+                return MIN_VALUE;  // recall that -MIN_VALUE == MIN_VALUE
+            else if (divisor.eq(MIN_VALUE))
+                return ONE;
+            else {
+                // At this point, we have |other| >= 2, so |this/other| < |MIN_VALUE|.
+                var halfThis = this.shr(1);
+                approx = halfThis.div(divisor).shl(1);
+                if (approx.eq(ZERO)) {
+                    return divisor.isNegative() ? ONE : NEG_ONE;
+                } else {
+                    rem = this.sub(divisor.mul(approx));
+                    res = approx.add(rem.div(divisor));
+                    return res;
+                }
+            }
+        } else if (divisor.eq(MIN_VALUE))
+            return this.unsigned ? UZERO : ZERO;
+        if (this.isNegative()) {
+            if (divisor.isNegative())
+                return this.neg().div(divisor.neg());
+            return this.neg().div(divisor).neg();
+        } else if (divisor.isNegative())
+            return this.div(divisor.neg()).neg();
+        res = ZERO;
+    } else {
+        // The algorithm below has not been made for unsigned longs. It's therefore
+        // required to take special care of the MSB prior to running it.
+        if (!divisor.unsigned)
+            divisor = divisor.toUnsigned();
+        if (divisor.gt(this))
+            return UZERO;
+        if (divisor.gt(this.shru(1))) // 15 >>> 1 = 7 ; with divisor = 8 ; true
+            return UONE;
+        res = UZERO;
+    }
+
+    // Repeat the following until the remainder is less than other:  find a
+    // floating-point that approximates remainder / other *from below*, add this
+    // into the result, and subtract it from the remainder.  It is critical that
+    // the approximate value is less than or equal to the real value so that the
+    // remainder never becomes negative.
+    rem = this;
+    while (rem.gte(divisor)) {
+        // Approximate the result of division. This may be a little greater or
+        // smaller than the actual value.
+        approx = Math.max(1, Math.floor(rem.toNumber() / divisor.toNumber()));
+
+        // We will tweak the approximate result by changing it in the 48-th digit or
+        // the smallest non-fractional digit, whichever is larger.
+        var log2 = Math.ceil(Math.log(approx) / Math.LN2),
+            delta = (log2 <= 48) ? 1 : pow_dbl(2, log2 - 48),
+
+        // Decrease the approximation until it is smaller than the remainder.  Note
+        // that if it is too large, the product overflows and is negative.
+            approxRes = fromNumber(approx),
+            approxRem = approxRes.mul(divisor);
+        while (approxRem.isNegative() || approxRem.gt(rem)) {
+            approx -= delta;
+            approxRes = fromNumber(approx, this.unsigned);
+            approxRem = approxRes.mul(divisor);
+        }
+
+        // We know the answer can't be zero... and actually, zero would cause
+        // infinite recursion since we would make no progress.
+        if (approxRes.isZero())
+            approxRes = ONE;
+
+        res = res.add(approxRes);
+        rem = rem.sub(approxRem);
+    }
+    return res;
+};
+
+/**
+ * Returns this Long divided by the specified. This is an alias of {@link Long#divide}.
+ * @function
+ * @param {!Long|number|string} divisor Divisor
+ * @returns {!Long} Quotient
+ */
+LongPrototype.div = LongPrototype.divide;
+
+/**
+ * Returns this Long modulo the specified.
+ * @param {!Long|number|string} divisor Divisor
+ * @returns {!Long} Remainder
+ */
+LongPrototype.modulo = function modulo(divisor) {
+    if (!isLong(divisor))
+        divisor = fromValue(divisor);
+
+    // use wasm support if present
+    if (wasm) {
+        var low = (this.unsigned ? wasm.rem_u : wasm.rem_s)(
+            this.low,
+            this.high,
+            divisor.low,
+            divisor.high
+        );
+        return fromBits(low, wasm.get_high(), this.unsigned);
+    }
+
+    return this.sub(this.div(divisor).mul(divisor));
+};
+
+/**
+ * Returns this Long modulo the specified. This is an alias of {@link Long#modulo}.
+ * @function
+ * @param {!Long|number|string} divisor Divisor
+ * @returns {!Long} Remainder
+ */
+LongPrototype.mod = LongPrototype.modulo;
+
+/**
+ * Returns this Long modulo the specified. This is an alias of {@link Long#modulo}.
+ * @function
+ * @param {!Long|number|string} divisor Divisor
+ * @returns {!Long} Remainder
+ */
+LongPrototype.rem = LongPrototype.modulo;
+
+/**
+ * Returns the bitwise NOT of this Long.
+ * @returns {!Long}
+ */
+LongPrototype.not = function not() {
+    return fromBits(~this.low, ~this.high, this.unsigned);
+};
+
+/**
+ * Returns the bitwise AND of this Long and the specified.
+ * @param {!Long|number|string} other Other Long
+ * @returns {!Long}
+ */
+LongPrototype.and = function and(other) {
+    if (!isLong(other))
+        other = fromValue(other);
+    return fromBits(this.low & other.low, this.high & other.high, this.unsigned);
+};
+
+/**
+ * Returns the bitwise OR of this Long and the specified.
+ * @param {!Long|number|string} other Other Long
+ * @returns {!Long}
+ */
+LongPrototype.or = function or(other) {
+    if (!isLong(other))
+        other = fromValue(other);
+    return fromBits(this.low | other.low, this.high | other.high, this.unsigned);
+};
+
+/**
+ * Returns the bitwise XOR of this Long and the given one.
+ * @param {!Long|number|string} other Other Long
+ * @returns {!Long}
+ */
+LongPrototype.xor = function xor(other) {
+    if (!isLong(other))
+        other = fromValue(other);
+    return fromBits(this.low ^ other.low, this.high ^ other.high, this.unsigned);
+};
+
+/**
+ * Returns this Long with bits shifted to the left by the given amount.
+ * @param {number|!Long} numBits Number of bits
+ * @returns {!Long} Shifted Long
+ */
+LongPrototype.shiftLeft = function shiftLeft(numBits) {
+    if (isLong(numBits))
+        numBits = numBits.toInt();
+    if ((numBits &= 63) === 0)
+        return this;
+    else if (numBits < 32)
+        return fromBits(this.low << numBits, (this.high << numBits) | (this.low >>> (32 - numBits)), this.unsigned);
+    else
+        return fromBits(0, this.low << (numBits - 32), this.unsigned);
+};
+
+/**
+ * Returns this Long with bits shifted to the left by the given amount. This is an alias of {@link Long#shiftLeft}.
+ * @function
+ * @param {number|!Long} numBits Number of bits
+ * @returns {!Long} Shifted Long
+ */
+LongPrototype.shl = LongPrototype.shiftLeft;
+
+/**
+ * Returns this Long with bits arithmetically shifted to the right by the given amount.
+ * @param {number|!Long} numBits Number of bits
+ * @returns {!Long} Shifted Long
+ */
+LongPrototype.shiftRight = function shiftRight(numBits) {
+    if (isLong(numBits))
+        numBits = numBits.toInt();
+    if ((numBits &= 63) === 0)
+        return this;
+    else if (numBits < 32)
+        return fromBits((this.low >>> numBits) | (this.high << (32 - numBits)), this.high >> numBits, this.unsigned);
+    else
+        return fromBits(this.high >> (numBits - 32), this.high >= 0 ? 0 : -1, this.unsigned);
+};
+
+/**
+ * Returns this Long with bits arithmetically shifted to the right by the given amount. This is an alias of {@link Long#shiftRight}.
+ * @function
+ * @param {number|!Long} numBits Number of bits
+ * @returns {!Long} Shifted Long
+ */
+LongPrototype.shr = LongPrototype.shiftRight;
+
+/**
+ * Returns this Long with bits logically shifted to the right by the given amount.
+ * @param {number|!Long} numBits Number of bits
+ * @returns {!Long} Shifted Long
+ */
+LongPrototype.shiftRightUnsigned = function shiftRightUnsigned(numBits) {
+    if (isLong(numBits))
+        numBits = numBits.toInt();
+    numBits &= 63;
+    if (numBits === 0)
+        return this;
+    else {
+        var high = this.high;
+        if (numBits < 32) {
+            var low = this.low;
+            return fromBits((low >>> numBits) | (high << (32 - numBits)), high >>> numBits, this.unsigned);
+        } else if (numBits === 32)
+            return fromBits(high, 0, this.unsigned);
+        else
+            return fromBits(high >>> (numBits - 32), 0, this.unsigned);
+    }
+};
+
+/**
+ * Returns this Long with bits logically shifted to the right by the given amount. This is an alias of {@link Long#shiftRightUnsigned}.
+ * @function
+ * @param {number|!Long} numBits Number of bits
+ * @returns {!Long} Shifted Long
+ */
+LongPrototype.shru = LongPrototype.shiftRightUnsigned;
+
+/**
+ * Returns this Long with bits logically shifted to the right by the given amount. This is an alias of {@link Long#shiftRightUnsigned}.
+ * @function
+ * @param {number|!Long} numBits Number of bits
+ * @returns {!Long} Shifted Long
+ */
+LongPrototype.shr_u = LongPrototype.shiftRightUnsigned;
+
+/**
+ * Converts this Long to signed.
+ * @returns {!Long} Signed long
+ */
+LongPrototype.toSigned = function toSigned() {
+    if (!this.unsigned)
+        return this;
+    return fromBits(this.low, this.high, false);
+};
+
+/**
+ * Converts this Long to unsigned.
+ * @returns {!Long} Unsigned long
+ */
+LongPrototype.toUnsigned = function toUnsigned() {
+    if (this.unsigned)
+        return this;
+    return fromBits(this.low, this.high, true);
+};
+
+/**
+ * Converts this Long to its byte representation.
+ * @param {boolean=} le Whether little or big endian, defaults to big endian
+ * @returns {!Array.<number>} Byte representation
+ */
+LongPrototype.toBytes = function toBytes(le) {
+    return le ? this.toBytesLE() : this.toBytesBE();
+};
+
+/**
+ * Converts this Long to its little endian byte representation.
+ * @returns {!Array.<number>} Little endian byte representation
+ */
+LongPrototype.toBytesLE = function toBytesLE() {
+    var hi = this.high,
+        lo = this.low;
+    return [
+        lo        & 0xff,
+        lo >>>  8 & 0xff,
+        lo >>> 16 & 0xff,
+        lo >>> 24       ,
+        hi        & 0xff,
+        hi >>>  8 & 0xff,
+        hi >>> 16 & 0xff,
+        hi >>> 24
+    ];
+};
+
+/**
+ * Converts this Long to its big endian byte representation.
+ * @returns {!Array.<number>} Big endian byte representation
+ */
+LongPrototype.toBytesBE = function toBytesBE() {
+    var hi = this.high,
+        lo = this.low;
+    return [
+        hi >>> 24       ,
+        hi >>> 16 & 0xff,
+        hi >>>  8 & 0xff,
+        hi        & 0xff,
+        lo >>> 24       ,
+        lo >>> 16 & 0xff,
+        lo >>>  8 & 0xff,
+        lo        & 0xff
+    ];
+};
+
+/**
+ * Creates a Long from its byte representation.
+ * @param {!Array.<number>} bytes Byte representation
+ * @param {boolean=} unsigned Whether unsigned or not, defaults to signed
+ * @param {boolean=} le Whether little or big endian, defaults to big endian
+ * @returns {Long} The corresponding Long value
+ */
+Long.fromBytes = function fromBytes(bytes, unsigned, le) {
+    return le ? Long.fromBytesLE(bytes, unsigned) : Long.fromBytesBE(bytes, unsigned);
+};
+
+/**
+ * Creates a Long from its little endian byte representation.
+ * @param {!Array.<number>} bytes Little endian byte representation
+ * @param {boolean=} unsigned Whether unsigned or not, defaults to signed
+ * @returns {Long} The corresponding Long value
+ */
+Long.fromBytesLE = function fromBytesLE(bytes, unsigned) {
+    return new Long(
+        bytes[0]       |
+        bytes[1] <<  8 |
+        bytes[2] << 16 |
+        bytes[3] << 24,
+        bytes[4]       |
+        bytes[5] <<  8 |
+        bytes[6] << 16 |
+        bytes[7] << 24,
+        unsigned
+    );
+};
+
+/**
+ * Creates a Long from its big endian byte representation.
+ * @param {!Array.<number>} bytes Big endian byte representation
+ * @param {boolean=} unsigned Whether unsigned or not, defaults to signed
+ * @returns {Long} The corresponding Long value
+ */
+Long.fromBytesBE = function fromBytesBE(bytes, unsigned) {
+    return new Long(
+        bytes[4] << 24 |
+        bytes[5] << 16 |
+        bytes[6] <<  8 |
+        bytes[7],
+        bytes[0] << 24 |
+        bytes[1] << 16 |
+        bytes[2] <<  8 |
+        bytes[3],
+        unsigned
+    );
+};
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/longBits.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/longBits.js
new file mode 100644
index 0000000..ae87a23
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/longBits.js
@@ -0,0 +1,122 @@
+module.exports = LongBits;
+
+function LongBits(lo, hi) {
+    this.lo = lo >>> 0;
+    this.hi = hi >>> 0;
+}
+
+var zero = LongBits.zero = new LongBits(0, 0);
+
+zero.toNumber = function() { return 0; };
+zero.zzEncode = zero.zzDecode = function() { return this; };
+zero.length = function() { return 1; };
+
+
+var zeroHash = LongBits.zeroHash = "\0\0\0\0\0\0\0\0";
+
+LongBits.fromNumber = function fromNumber(value) {
+    if (value === 0)
+        return zero;
+    var sign = value < 0;//如果sign为 1 ,表示为负数
+    if (sign)
+        value = -value;
+    var lo = value >>> 0,//取出底32位
+        hi = (value - lo) / 4294967296 >>> 0; //取出高32位
+    if (sign) { //负数
+        hi = ~hi >>> 0; //求取高32位的反码
+        lo = ~lo >>> 0; //求取低32位的反码
+        if (++lo > 4294967295) { //低32位大于Math.pow(2,31)-1
+            lo = 0;
+            if (++hi > 4294967295) //高32位大于Math.pow(2,31)-1
+                hi = 0;
+        }
+    }
+    return new LongBits(lo, hi);
+};
+
+
+LongBits.from = function from(value) {
+    if (typeof value === "number")
+        return LongBits.fromNumber(value);
+    if (typeof value === "string" || value instanceof String) {
+        return LongBits.fromNumber(parseInt(value, 10));
+    }
+    return value.low || value.high ? new LongBits(value.low >>> 0, value.high >>> 0) : zero;
+};
+
+LongBits.prototype.toNumber = function toNumber(unsigned) {
+    if (!unsigned && this.hi >>> 31) {
+        var lo = ~this.lo + 1 >>> 0,
+            hi = ~this.hi     >>> 0;
+        if (!lo)
+            hi = hi + 1 >>> 0;
+        return -(lo + hi * 4294967296);
+    }
+    return this.lo + this.hi * 4294967296;
+};
+LongBits.prototype.toLong = function toLong(unsigned) {
+    //return util.Long
+    //    ? new util.Long(this.lo | 0, this.hi | 0, Boolean(unsigned))
+    //    /* istanbul ignore next */
+    //    : { low: this.lo | 0, high: this.hi | 0, unsigned: Boolean(unsigned) };
+    return { low: this.lo | 0, high: this.hi | 0, unsigned: Boolean(unsigned) };
+};
+
+var charCodeAt = String.prototype.charCodeAt;
+
+LongBits.fromHash = function fromHash(hash) {
+    if (hash === zeroHash)
+        return zero;
+    return new LongBits(
+        ( charCodeAt.call(hash, 0)
+        | charCodeAt.call(hash, 1) << 8
+        | charCodeAt.call(hash, 2) << 16
+        | charCodeAt.call(hash, 3) << 24) >>> 0
+        ,
+        ( charCodeAt.call(hash, 4)
+        | charCodeAt.call(hash, 5) << 8
+        | charCodeAt.call(hash, 6) << 16
+        | charCodeAt.call(hash, 7) << 24) >>> 0
+    );
+};
+
+LongBits.prototype.toHash = function toHash() {
+    return String.fromCharCode(
+        this.lo        & 255,
+        this.lo >>> 8  & 255,
+        this.lo >>> 16 & 255,
+        this.lo >>> 24      ,
+        this.hi        & 255,
+        this.hi >>> 8  & 255,
+        this.hi >>> 16 & 255,
+        this.hi >>> 24
+    );
+};
+
+LongBits.prototype.zzEncode = function zzEncode() {
+    var mask =   this.hi >> 31;
+    this.hi  = ((this.hi << 1 | this.lo >>> 31) ^ mask) >>> 0;
+    this.lo  = ( this.lo << 1                   ^ mask) >>> 0;
+    return this;
+};
+
+LongBits.prototype.zzDecode = function zzDecode() {
+    var mask = -(this.lo & 1);
+    this.lo  = ((this.lo >>> 1 | this.hi << 31) ^ mask) >>> 0;
+    this.hi  = ( this.hi >>> 1                  ^ mask) >>> 0;
+    return this;
+};
+LongBits.prototype.length = function length() {
+    var part0 =  this.lo,
+        part1 = (this.lo >>> 28 | this.hi << 4) >>> 0,
+        part2 =  this.hi >>> 24;
+    return part2 === 0
+        ? part1 === 0
+        ? part0 < 16384
+        ? part0 < 128 ? 1 : 2
+        : part0 < 2097152 ? 3 : 4
+        : part1 < 16384
+        ? part1 < 128 ? 5 : 6
+        : part1 < 2097152 ? 7 : 8
+        : part2 < 128 ? 9 : 10;
+};
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/mapField.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/mapField.js
new file mode 100644
index 0000000..4ca5cbe
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/mapField.js
@@ -0,0 +1,130 @@
+module.exports = MapField;
+
+// extends Field
+var Field = require("./field");
+((MapField.prototype = Object.create(Field.prototype)).constructor = MapField).className = "MapField";
+
+var types,
+    util;
+
+/**
+ * Constructs a new map field instance.
+ * @classdesc Reflected map field.
+ * @extends FieldBase
+ * @constructor
+ * @param {string} name Unique name within its namespace
+ * @param {number} id Unique id within its namespace
+ * @param {string} keyType Key type
+ * @param {string} type Value type
+ * @param {Object.<string,*>} [options] Declared options
+ * @param {string} [comment] Comment associated with this field
+ */
+function MapField(name, id, keyType, type, options, comment) {
+    Field.call(this, name, id, type, undefined, undefined, options, comment);
+
+    /* istanbul ignore if */
+    if (!util.isString(keyType))
+        throw TypeError("keyType must be a string");
+
+    /**
+     * Key type.
+     * @type {string}
+     */
+    this.keyType = keyType; // toJSON, marker
+
+    /**
+     * Resolved key type if not a basic type.
+     * @type {ReflectionObject|null}
+     */
+    this.resolvedKeyType = null;
+
+    // Overrides Field#map
+    this.map = true;
+}
+
+/**
+ * Map field descriptor.
+ * @interface IMapField
+ * @extends {IField}
+ * @property {string} keyType Key type
+ */
+
+/**
+ * Extension map field descriptor.
+ * @interface IExtensionMapField
+ * @extends IMapField
+ * @property {string} extend Extended type
+ */
+
+/**
+ * Constructs a map field from a map field descriptor.
+ * @param {string} name Field name
+ * @param {IMapField} json Map field descriptor
+ * @returns {MapField} Created map field
+ * @throws {TypeError} If arguments are invalid
+ */
+MapField.fromJSON = function fromJSON(name, json) {
+    return new MapField(name, json.id, json.keyType, json.type, json.options, json.comment);
+};
+
+/**
+ * Converts this map field to a map field descriptor.
+ * @param {IToJSONOptions} [toJSONOptions] JSON conversion options
+ * @returns {IMapField} Map field descriptor
+ */
+MapField.prototype.toJSON = function toJSON(toJSONOptions) {
+    var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    return util.toObject([
+        "keyType" , this.keyType,
+        "type"    , this.type,
+        "id"      , this.id,
+        "extend"  , this.extend,
+        "options" , this.options,
+        "comment" , keepComments ? this.comment : undefined
+    ]);
+};
+
+/**
+ * @override
+ */
+MapField.prototype.resolve = function resolve() {
+    if (this.resolved)
+        return this;
+
+    // Besides a value type, map fields have a key type that may be "any scalar type except for floating point types and bytes"
+    if (types.mapKey[this.keyType] === undefined)
+        throw Error("invalid key type: " + this.keyType);
+
+    return Field.prototype.resolve.call(this);
+};
+
+/**
+ * Map field decorator (TypeScript).
+ * @name MapField.d
+ * @function
+ * @param {number} fieldId Field id
+ * @param {"int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"bool"|"string"} fieldKeyType Field key type
+ * @param {"double"|"float"|"int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"bool"|"string"|"bytes"|Object|Constructor<{}>} fieldValueType Field value type
+ * @returns {FieldDecorator} Decorator function
+ * @template T extends { [key: string]: number | Long | string | boolean | Uint8Array | Buffer | number[] | Message<{}> }
+ */
+MapField.d = function decorateMapField(fieldId, fieldKeyType, fieldValueType) {
+
+    // submessage value: decorate the submessage and use its name as the type
+    if (typeof fieldValueType === "function")
+        fieldValueType = util.decorateType(fieldValueType).name;
+
+    // enum reference value: create a reflected copy of the enum and keep reuseing it
+    else if (fieldValueType && typeof fieldValueType === "object")
+        fieldValueType = util.decorateEnum(fieldValueType).name;
+
+    return function mapFieldDecorator(prototype, fieldName) {
+        util.decorateType(prototype.constructor)
+            .add(new MapField(fieldName, fieldId, fieldKeyType, fieldValueType));
+    };
+};
+
+MapField._configure = function(){
+    types   = require("./types");
+    util    = require("./util");
+};
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/message.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/message.js
new file mode 100644
index 0000000..7bc9fce
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/message.js
@@ -0,0 +1,160 @@
+"use strict";
+module.exports = Message;
+
+var util;
+
+/**
+ * Constructs a new message instance.
+ * @classdesc Abstract runtime message.
+ * @constructor
+ * @param {Properties<T>} [properties] Properties to set
+ * @template T extends object
+ */
+function Message(properties) {
+    // not used internally
+    if (properties)
+        for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            this[keys[i]] = properties[keys[i]];
+}
+
+/**
+ * Reference to the reflected type.
+ * @name Message.$type
+ * @type {Type}
+ * @readonly
+ */
+
+/**
+ * Reference to the reflected type.
+ * @name Message#$type
+ * @type {Type}
+ * @readonly
+ */
+
+/*eslint-disable valid-jsdoc*/
+
+/**
+ * Creates a new message of this type using the specified properties.
+ * @param {Object.<string,*>} [properties] Properties to set
+ * @returns {Message<T>} Message instance
+ * @template T extends Message<T>
+ * @this Constructor<T>
+ */
+Message.create = function create(properties) {
+    return this.$type.create(properties);
+};
+
+/**
+ * Encodes a message of this type.
+ * @param {T|Object.<string,*>} message Message to encode
+ * @param {Writer} [writer] Writer to use
+ * @returns {Writer} Writer
+ * @template T extends Message<T>
+ * @this Constructor<T>
+ */
+Message.encode = function encode(message, writer) {
+    if(!arguments.length){
+        return this.$type.encode(this);
+    }else if (arguments.length == 1){
+        return this.$type.encode(arguments[0]);
+    }else{
+        return this.$type.encode(arguments[0], arguments[1]);
+    }
+    //return this.$type.encode(message, writer);
+};
+
+/**
+ * Encodes a message of this type preceeded by its length as a varint.
+ * @param {T|Object.<string,*>} message Message to encode
+ * @param {Writer} [writer] Writer to use
+ * @returns {Writer} Writer
+ * @template T extends Message<T>
+ * @this Constructor<T>
+ */
+Message.encodeDelimited = function encodeDelimited(message, writer) {
+    return this.$type.encodeDelimited(message, writer);
+};
+
+/**
+ * Decodes a message of this type.
+ * @name Message.decode
+ * @function
+ * @param {Reader|Uint8Array} reader Reader or buffer to decode
+ * @returns {T} Decoded message
+ * @template T extends Message<T>
+ * @this Constructor<T>
+ */
+Message.decode = function decode(reader) {
+    return this.$type.decode(reader);
+};
+
+/**
+ * Decodes a message of this type preceeded by its length as a varint.
+ * @name Message.decodeDelimited
+ * @function
+ * @param {Reader|Uint8Array} reader Reader or buffer to decode
+ * @returns {T} Decoded message
+ * @template T extends Message<T>
+ * @this Constructor<T>
+ */
+Message.decodeDelimited = function decodeDelimited(reader) {
+    return this.$type.decodeDelimited(reader);
+};
+
+/**
+ * Verifies a message of this type.
+ * @name Message.verify
+ * @function
+ * @param {Object.<string,*>} message Plain object to verify
+ * @returns {string|null} `null` if valid, otherwise the reason why it is not
+ */
+Message.verify = function verify(message) {
+    return this.$type.verify(message);
+};
+
+/**
+ * Creates a new message of this type from a plain object. Also converts values to their respective internal types.
+ * @param {Object.<string,*>} object Plain object
+ * @returns {T} Message instance
+ * @template T extends Message<T>
+ * @this Constructor<T>
+ */
+Message.fromObject = function fromObject(object) {
+    return this.$type.fromObject(object);
+};
+
+/**
+ * Creates a plain object from a message of this type. Also converts values to other types if specified.
+ * @param {T} message Message instance
+ * @param {IConversionOptions} [options] Conversion options
+ * @returns {Object.<string,*>} Plain object
+ * @template T extends Message<T>
+ * @this Constructor<T>
+ */
+Message.toObject = function toObject(message, options) {
+    message = message || this;
+    return this.$type.toObject(message, options);
+};
+
+/**
+ * Converts this message to JSON.
+ * @returns {Object.<string,*>} JSON object
+ */
+Message.prototype.toJSON = function toJSON() {
+    return this.$type.toObject(this, util.toJSONOptions);
+};
+
+
+
+Message.set  = function(key,value){
+    Message[key] = value;
+};
+
+Message.get = function (key){
+    return Message[key];
+};
+/*eslint-enable valid-jsdoc*/
+
+Message._configure = function(){
+    util = require("./util");
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/method.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/method.js
new file mode 100644
index 0000000..3e82f5f
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/method.js
@@ -0,0 +1,155 @@
+"use strict";
+module.exports = Method;
+
+// extends ReflectionObject
+var ReflectionObject = require("./object");
+((Method.prototype = Object.create(ReflectionObject.prototype)).constructor = Method).className = "Method";
+
+var util;
+
+/**
+ * Constructs a new service method instance.
+ * @classdesc Reflected service method.
+ * @extends ReflectionObject
+ * @constructor
+ * @param {string} name Method name
+ * @param {string|undefined} type Method type, usually `"rpc"`
+ * @param {string} requestType Request message type
+ * @param {string} responseType Response message type
+ * @param {boolean|Object.<string,*>} [requestStream] Whether the request is streamed
+ * @param {boolean|Object.<string,*>} [responseStream] Whether the response is streamed
+ * @param {Object.<string,*>} [options] Declared options
+ * @param {string} [comment] The comment for this method
+ */
+function Method(name, type, requestType, responseType, requestStream, responseStream, options, comment) {
+
+    /* istanbul ignore next */
+    if (util.isObject(requestStream)) {
+        options = requestStream;
+        requestStream = responseStream = undefined;
+    } else if (util.isObject(responseStream)) {
+        options = responseStream;
+        responseStream = undefined;
+    }
+
+    /* istanbul ignore if */
+    if (!(type === undefined || util.isString(type)))
+        throw TypeError("type must be a string");
+
+    /* istanbul ignore if */
+    if (!util.isString(requestType))
+        throw TypeError("requestType must be a string");
+
+    /* istanbul ignore if */
+    if (!util.isString(responseType))
+        throw TypeError("responseType must be a string");
+
+    ReflectionObject.call(this, name, options);
+
+    /**
+     * Method type.
+     * @type {string}
+     */
+    this.type = type || "rpc"; // toJSON
+
+    /**
+     * Request type.
+     * @type {string}
+     */
+    this.requestType = requestType; // toJSON, marker
+
+    /**
+     * Whether requests are streamed or not.
+     * @type {boolean|undefined}
+     */
+    this.requestStream = requestStream ? true : undefined; // toJSON
+
+    /**
+     * Response type.
+     * @type {string}
+     */
+    this.responseType = responseType; // toJSON
+
+    /**
+     * Whether responses are streamed or not.
+     * @type {boolean|undefined}
+     */
+    this.responseStream = responseStream ? true : undefined; // toJSON
+
+    /**
+     * Resolved request type.
+     * @type {Type|null}
+     */
+    this.resolvedRequestType = null;
+
+    /**
+     * Resolved response type.
+     * @type {Type|null}
+     */
+    this.resolvedResponseType = null;
+
+    /**
+     * Comment for this method
+     * @type {string|null}
+     */
+    this.comment = comment;
+}
+
+/**
+ * Method descriptor.
+ * @interface IMethod
+ * @property {string} [type="rpc"] Method type
+ * @property {string} requestType Request type
+ * @property {string} responseType Response type
+ * @property {boolean} [requestStream=false] Whether requests are streamed
+ * @property {boolean} [responseStream=false] Whether responses are streamed
+ * @property {Object.<string,*>} [options] Method options
+ */
+
+/**
+ * Constructs a method from a method descriptor.
+ * @param {string} name Method name
+ * @param {IMethod} json Method descriptor
+ * @returns {Method} Created method
+ * @throws {TypeError} If arguments are invalid
+ */
+Method.fromJSON = function fromJSON(name, json) {
+    return new Method(name, json.type, json.requestType, json.responseType, json.requestStream, json.responseStream, json.options, json.comment);
+};
+
+/**
+ * Converts this method to a method descriptor.
+ * @param {IToJSONOptions} [toJSONOptions] JSON conversion options
+ * @returns {IMethod} Method descriptor
+ */
+Method.prototype.toJSON = function toJSON(toJSONOptions) {
+    var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    return util.toObject([
+        "type"           , this.type !== "rpc" && /* istanbul ignore next */ this.type || undefined,
+        "requestType"    , this.requestType,
+        "requestStream"  , this.requestStream,
+        "responseType"   , this.responseType,
+        "responseStream" , this.responseStream,
+        "options"        , this.options,
+        "comment"        , keepComments ? this.comment : undefined
+    ]);
+};
+
+/**
+ * @override
+ */
+Method.prototype.resolve = function resolve() {
+
+    /* istanbul ignore if */
+    if (this.resolved)
+        return this;
+
+    this.resolvedRequestType = this.parent.lookupType(this.requestType);
+    this.resolvedResponseType = this.parent.lookupType(this.responseType);
+
+    return ReflectionObject.prototype.resolve.call(this);
+};
+
+Method._configure = function (){
+    util = require("./util");
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/namespace.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/namespace.js
new file mode 100644
index 0000000..dddcf0e
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/namespace.js
@@ -0,0 +1,435 @@
+
+module.exports = Namespace;
+
+// extends ReflectionObject
+var ReflectionObject = require("./object");
+((Namespace.prototype = Object.create(ReflectionObject.prototype)).constructor = Namespace).className = "Namespace";
+
+var Enum,
+    Field,
+    util;
+
+var Type;    // cyclic
+var Service;
+
+/**
+ * Constructs a new namespace instance.
+ * @name Namespace
+ * @classdesc Reflected namespace.
+ * @extends NamespaceBase
+ * @constructor
+ * @param {string} name Namespace name
+ * @param {Object.<string,*>} [options] Declared options
+ */
+
+/**
+ * Constructs a namespace from JSON.
+ * @memberof Namespace
+ * @function
+ * @param {string} name Namespace name
+ * @param {Object.<string,*>} json JSON object
+ * @returns {Namespace} Created namespace
+ * @throws {TypeError} If arguments are invalid
+ */
+Namespace.fromJSON = function fromJSON(name, json) {
+    return new Namespace(name, json.options).addJSON(json.nested);
+};
+
+/**
+ * Converts an array of reflection objects to JSON.
+ * @memberof Namespace
+ * @param {ReflectionObject[]} array Object array
+ * @param {IToJSONOptions} [toJSONOptions] JSON conversion options
+ * @returns {Object.<string,*>|undefined} JSON object or `undefined` when array is empty
+ */
+function arrayToJSON(array, toJSONOptions) {
+    if (!(array && array.length))
+        return undefined;
+    var obj = {};
+    for (var i = 0; i < array.length; ++i)
+        obj[array[i].name] = array[i].toJSON(toJSONOptions);
+    return obj;
+}
+
+Namespace.arrayToJSON = arrayToJSON;
+
+/**
+ * Tests if the specified id is reserved.
+ * @param {Array.<number[]|string>|undefined} reserved Array of reserved ranges and names
+ * @param {number} id Id to test
+ * @returns {boolean} `true` if reserved, otherwise `false`
+ */
+Namespace.isReservedId = function isReservedId(reserved, id) {
+    if (reserved)
+        for (var i = 0; i < reserved.length; ++i)
+            if (typeof reserved[i] !== "string" && reserved[i][0] <= id && reserved[i][1] >= id)
+                return true;
+    return false;
+};
+
+/**
+ * Tests if the specified name is reserved.
+ * @param {Array.<number[]|string>|undefined} reserved Array of reserved ranges and names
+ * @param {string} name Name to test
+ * @returns {boolean} `true` if reserved, otherwise `false`
+ */
+Namespace.isReservedName = function isReservedName(reserved, name) {
+    if (reserved)
+        for (var i = 0; i < reserved.length; ++i)
+            if (reserved[i] === name)
+                return true;
+    return false;
+};
+
+/**
+ * Not an actual constructor. Use {@link Namespace} instead.
+ * @classdesc Base class of all reflection objects containing nested objects. This is not an actual class but here for the sake of having consistent type definitions.
+ * @exports NamespaceBase
+ * @extends ReflectionObject
+ * @abstract
+ * @constructor
+ * @param {string} name Namespace name
+ * @param {Object.<string,*>} [options] Declared options
+ * @see {@link Namespace}
+ */
+function Namespace(name, options) {
+    ReflectionObject.call(this, name, options);
+
+    /**
+     * Nested objects by name.
+     * @type {Object.<string,ReflectionObject>|undefined}
+     */
+    this.nested = undefined; // toJSON
+
+    /**
+     * Cached nested objects as an array.
+     * @type {ReflectionObject[]|null}
+     * @private
+     */
+    this._nestedArray = null;
+}
+
+function clearCache(namespace) {
+    namespace._nestedArray = null;
+    return namespace;
+}
+
+/**
+ * Nested objects of this namespace as an array for iteration.
+ * @name NamespaceBase#nestedArray
+ * @type {ReflectionObject[]}
+ * @readonly
+ */
+Object.defineProperty(Namespace.prototype, "nestedArray", {
+    get: function() {
+        return this._nestedArray || (this._nestedArray = util.toArray(this.nested));
+    }
+});
+
+/**
+ * Namespace descriptor.
+ * @interface INamespace
+ * @property {Object.<string,*>} [options] Namespace options
+ * @property {Object.<string,AnyNestedObject>} [nested] Nested object descriptors
+ */
+
+/**
+ * Any extension field descriptor.
+ * @typedef AnyExtensionField
+ * @type {IExtensionField|IExtensionMapField}
+ */
+
+/**
+ * Any nested object descriptor.
+ * @typedef AnyNestedObject
+ * @type {IEnum|IType|IService|AnyExtensionField|INamespace}
+ */
+// ^ BEWARE: VSCode hangs forever when using more than 5 types (that's why AnyExtensionField exists in the first place)
+
+/**
+ * Converts this namespace to a namespace descriptor.
+ * @param {IToJSONOptions} [toJSONOptions] JSON conversion options
+ * @returns {INamespace} Namespace descriptor
+ */
+Namespace.prototype.toJSON = function toJSON(toJSONOptions) {
+    return util.toObject([
+        "options" , this.options,
+        "nested"  , arrayToJSON(this.nestedArray, toJSONOptions)
+    ]);
+};
+
+/**
+ * Adds nested objects to this namespace from nested object descriptors.
+ * @param {Object.<string,AnyNestedObject>} nestedJson Any nested object descriptors
+ * @returns {Namespace} `this`
+ */
+Namespace.prototype.addJSON = function addJSON(nestedJson) {
+    var ns = this;
+    /* istanbul ignore else */
+    if (nestedJson) {
+        for (var names = Object.keys(nestedJson), i = 0, nested; i < names.length; ++i) {
+            nested = nestedJson[names[i]];
+            ns.add( // most to least likely
+                ( nested.fields !== undefined
+                    ? Type.fromJSON
+                    : nested.values !== undefined
+                    ? Enum.fromJSON
+                    : nested.methods !== undefined
+                    ? Service.fromJSON
+                    : nested.id !== undefined
+                    ? Field.fromJSON
+                    : Namespace.fromJSON )(names[i], nested)
+            );
+        }
+    }
+    return this;
+};
+
+/**
+ * Gets the nested object of the specified name.
+ * @param {string} name Nested object name
+ * @returns {ReflectionObject|null} The reflection object or `null` if it doesn't exist
+ */
+Namespace.prototype.get = function get(name) {
+    return this.nested && this.nested[name]
+        || null;
+};
+
+/**
+ * Gets the values of the nested {@link Enum|enum} of the specified name.
+ * This methods differs from {@link Namespace#get|get} in that it returns an enum's values directly and throws instead of returning `null`.
+ * @param {string} name Nested enum name
+ * @returns {Object.<string,number>} Enum values
+ * @throws {Error} If there is no such enum
+ */
+Namespace.prototype.getEnum = function getEnum(name) {
+    if (this.nested && this.nested[name] instanceof Enum)
+        return this.nested[name].values;
+    throw Error("no such enum: " + name);
+};
+
+/**
+ * Adds a nested object to this namespace.
+ * @param {ReflectionObject} object Nested object to add
+ * @returns {Namespace} `this`
+ * @throws {TypeError} If arguments are invalid
+ * @throws {Error} If there is already a nested object with this name
+ */
+Namespace.prototype.add = function add(object) {
+
+    if (!(object instanceof Field && object.extend !== undefined || object instanceof Type || object instanceof Enum || object instanceof Service || object instanceof Namespace))
+        throw TypeError("object must be a valid nested object");
+
+    if (!this.nested)
+        this.nested = {};
+    else {
+        var prev = this.get(object.name);
+        if (prev) {
+            if (prev instanceof Namespace && object instanceof Namespace && !(prev instanceof Type || prev instanceof Service)) {
+                // replace plain namespace but keep existing nested elements and options
+                var nested = prev.nestedArray;
+                for (var i = 0; i < nested.length; ++i)
+                    object.add(nested[i]);
+                this.remove(prev);
+                if (!this.nested)
+                    this.nested = {};
+                object.setOptions(prev.options, true);
+
+            } else
+                throw Error("duplicate name '" + object.name + "' in " + this);
+        }
+    }
+    this.nested[object.name] = object;
+    object.onAdd(this);
+    return clearCache(this);
+};
+
+/**
+ * Removes a nested object from this namespace.
+ * @param {ReflectionObject} object Nested object to remove
+ * @returns {Namespace} `this`
+ * @throws {TypeError} If arguments are invalid
+ * @throws {Error} If `object` is not a member of this namespace
+ */
+Namespace.prototype.remove = function remove(object) {
+
+    if (!(object instanceof ReflectionObject))
+        throw TypeError("object must be a ReflectionObject");
+    if (object.parent !== this)
+        throw Error(object + " is not a member of " + this);
+
+    delete this.nested[object.name];
+    if (!Object.keys(this.nested).length)
+        this.nested = undefined;
+
+    object.onRemove(this);
+    return clearCache(this);
+};
+
+/**
+ * Defines additial namespaces within this one if not yet existing.
+ * @param {string|string[]} path Path to create
+ * @param {*} [json] Nested types to create from JSON
+ * @returns {Namespace} Pointer to the last namespace created or `this` if path is empty
+ */
+Namespace.prototype.define = function define(path, json) {
+
+    if (util.isString(path))
+        path = path.split(".");
+    else if (!Array.isArray(path))
+        throw TypeError("illegal path");
+    if (path && path.length && path[0] === "")
+        throw Error("path must be relative");
+
+    var ptr = this;
+    while (path.length > 0) {
+        var part = path.shift();
+        if (ptr.nested && ptr.nested[part]) {
+            ptr = ptr.nested[part];
+            if (!(ptr instanceof Namespace))
+                throw Error("path conflicts with non-namespace objects");
+        } else
+            ptr.add(ptr = new Namespace(part));
+    }
+    if (json)
+        ptr.addJSON(json);
+    return ptr;
+};
+
+/**
+ * Resolves this namespace's and all its nested objects' type references. Useful to validate a reflection tree, but comes at a cost.
+ * @returns {Namespace} `this`
+ */
+Namespace.prototype.resolveAll = function resolveAll() {
+    var nested = this.nestedArray, i = 0;
+    while (i < nested.length)
+        if (nested[i] instanceof Namespace)
+            nested[i++].resolveAll();
+        else
+            nested[i++].resolve();
+    return this.resolve();
+};
+
+/**
+ * Recursively looks up the reflection object matching the specified path in the scope of this namespace.
+ * @param {string|string[]} path Path to look up
+ * @param {*|Array.<*>} filterTypes Filter types, any combination of the constructors of `protobuf.Type`, `protobuf.Enum`, `protobuf.Service` etc.
+ * @param {boolean} [parentAlreadyChecked=false] If known, whether the parent has already been checked
+ * @returns {ReflectionObject|null} Looked up object or `null` if none could be found
+ */
+Namespace.prototype.lookup = function lookup(path, filterTypes, parentAlreadyChecked) {
+
+    /* istanbul ignore next */
+    if (typeof filterTypes === "boolean") {
+        parentAlreadyChecked = filterTypes;
+        filterTypes = undefined;
+    } else if (filterTypes && !Array.isArray(filterTypes))
+        filterTypes = [ filterTypes ];
+
+    if (util.isString(path) && path.length) {
+        if (path === ".")
+            return this.root;
+        path = path.split(".");
+    } else if (!path.length)
+        return this;
+
+    // Start at root if path is absolute
+    if (path[0] === "")
+        return this.root.lookup(path.slice(1), filterTypes);
+
+    // Test if the first part matches any nested object, and if so, traverse if path contains more
+    var found = this.get(path[0]);
+    if (found) {
+        if (path.length === 1) {
+            if (!filterTypes || filterTypes.indexOf(found.constructor) > -1)
+                return found;
+        } else if (found instanceof Namespace && (found = found.lookup(path.slice(1), filterTypes, true)))
+            return found;
+
+        // Otherwise try each nested namespace
+    } else
+        for (var i = 0; i < this.nestedArray.length; ++i)
+            if (this._nestedArray[i] instanceof Namespace && (found = this._nestedArray[i].lookup(path, filterTypes, true)))
+                return found;
+
+    // If there hasn't been a match, try again at the parent
+    if (this.parent === null || parentAlreadyChecked)
+        return null;
+    return this.parent.lookup(path, filterTypes);
+};
+
+/**
+ * Looks up the reflection object at the specified path, relative to this namespace.
+ * @name NamespaceBase#lookup
+ * @function
+ * @param {string|string[]} path Path to look up
+ * @param {boolean} [parentAlreadyChecked=false] Whether the parent has already been checked
+ * @returns {ReflectionObject|null} Looked up object or `null` if none could be found
+ * @variation 2
+ */
+// lookup(path: string, [parentAlreadyChecked: boolean])
+
+/**
+ * Looks up the {@link Type|type} at the specified path, relative to this namespace.
+ * Besides its signature, this methods differs from {@link Namespace#lookup|lookup} in that it throws instead of returning `null`.
+ * @param {string|string[]} path Path to look up
+ * @returns {Type} Looked up type
+ * @throws {Error} If `path` does not point to a type
+ */
+Namespace.prototype.lookupType = function lookupType(path) {
+    var found = this.lookup(path, [ Type ]);
+    if (!found)
+        throw Error("no such type: " + path);
+    return found;
+};
+
+/**
+ * Looks up the values of the {@link Enum|enum} at the specified path, relative to this namespace.
+ * Besides its signature, this methods differs from {@link Namespace#lookup|lookup} in that it throws instead of returning `null`.
+ * @param {string|string[]} path Path to look up
+ * @returns {Enum} Looked up enum
+ * @throws {Error} If `path` does not point to an enum
+ */
+Namespace.prototype.lookupEnum = function lookupEnum(path) {
+    var found = this.lookup(path, [ Enum ]);
+    if (!found)
+        throw Error("no such Enum '" + path + "' in " + this);
+    return found;
+};
+
+/**
+ * Looks up the {@link Type|type} or {@link Enum|enum} at the specified path, relative to this namespace.
+ * Besides its signature, this methods differs from {@link Namespace#lookup|lookup} in that it throws instead of returning `null`.
+ * @param {string|string[]} path Path to look up
+ * @returns {Type} Looked up type or enum
+ * @throws {Error} If `path` does not point to a type or enum
+ */
+Namespace.prototype.lookupTypeOrEnum = function lookupTypeOrEnum(path) {
+    var found = this.lookup(path, [ Type, Enum ]);
+    if (!found)
+        throw Error("no such Type or Enum '" + path + "' in " + this);
+    return found;
+};
+
+/**
+ * Looks up the {@link Service|service} at the specified path, relative to this namespace.
+ * Besides its signature, this methods differs from {@link Namespace#lookup|lookup} in that it throws instead of returning `null`.
+ * @param {string|string[]} path Path to look up
+ * @returns {Service} Looked up service
+ * @throws {Error} If `path` does not point to a service
+ */
+Namespace.prototype.lookupService = function lookupService(path) {
+    var found = this.lookup(path, [ Service ]);
+    if (!found)
+        throw Error("no such Service '" + path + "' in " + this);
+    return found;
+};
+
+Namespace._configure = function() {
+    Enum     = require("./enum");
+    Field    = require("./field");
+    util     = require("./util");
+
+    Type     = require("./type");    // cyclic
+    Service  = require("./service");
+};
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/object.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/object.js
new file mode 100644
index 0000000..0b7dfc4
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/object.js
@@ -0,0 +1,199 @@
+"use strict";
+module.exports = ReflectionObject;
+
+ReflectionObject.className = "ReflectionObject";
+var util;
+
+var Root; // cyclic
+
+/**
+ * Constructs a new reflection object instance.
+ * @classdesc Base class of all reflection objects.
+ * @constructor
+ * @param {string} name Object name
+ * @param {Object.<string,*>} [options] Declared options
+ * @abstract
+ */
+function ReflectionObject(name, options) {
+
+    if (!util.isString(name))
+        throw TypeError("name must be a string");
+
+    if (options && !util.isObject(options))
+        throw TypeError("options must be an object");
+
+    /**
+     * Options.
+     * @type {Object.<string,*>|undefined}
+     */
+    this.options = options; // toJSON
+
+    /**
+     * Unique name within its namespace.
+     * @type {string}
+     */
+    this.name = name;
+
+    /**
+     * Parent namespace.
+     * @type {Namespace|null}
+     */
+    this.parent = null;
+
+    /**
+     * Whether already resolved or not.
+     * @type {boolean}
+     */
+    this.resolved = false;
+
+    /**
+     * Comment text, if any.
+     * @type {string|null}
+     */
+    this.comment = null;
+
+    /**
+     * Defining file name.
+     * @type {string|null}
+     */
+    this.filename = null;
+}
+
+Object.defineProperties(ReflectionObject.prototype, {
+
+    /**
+     * Reference to the root namespace.
+     * @name ReflectionObject#root
+     * @type {Root}
+     * @readonly
+     */
+    root: {
+        get: function() {
+            var ptr = this;
+            while (ptr.parent !== null)
+                ptr = ptr.parent;
+            return ptr;
+        }
+    },
+
+    /**
+     * Full name including leading dot.
+     * @name ReflectionObject#fullName
+     * @type {string}
+     * @readonly
+     */
+    fullName: {
+        get: function() {
+            var path = [ this.name ],
+                ptr = this.parent;
+            while (ptr) {
+                path.unshift(ptr.name);
+                ptr = ptr.parent;
+            }
+            return path.join(".");
+        }
+    }
+});
+
+/**
+ * Converts this reflection object to its descriptor representation.
+ * @returns {Object.<string,*>} Descriptor
+ * @abstract
+ */
+ReflectionObject.prototype.toJSON = /* istanbul ignore next */ function toJSON() {
+    throw Error(); // not implemented, shouldn't happen
+};
+
+/**
+ * Called when this object is added to a parent.
+ * @param {ReflectionObject} parent Parent added to
+ * @returns {undefined}
+ */
+ReflectionObject.prototype.onAdd = function onAdd(parent) {
+    if (this.parent && this.parent !== parent)
+        this.parent.remove(this);
+    this.parent = parent;
+    this.resolved = false;
+    var root = parent.root;
+    if (root instanceof Root)
+        root._handleAdd(this);
+};
+
+/**
+ * Called when this object is removed from a parent.
+ * @param {ReflectionObject} parent Parent removed from
+ * @returns {undefined}
+ */
+ReflectionObject.prototype.onRemove = function onRemove(parent) {
+    var root = parent.root;
+    if (root instanceof Root)
+        root._handleRemove(this);
+    this.parent = null;
+    this.resolved = false;
+};
+
+/**
+ * Resolves this objects type references.
+ * @returns {ReflectionObject} `this`
+ */
+ReflectionObject.prototype.resolve = function resolve() {
+    if (this.resolved)
+        return this;
+    if (this.root instanceof Root)
+        this.resolved = true; // only if part of a root
+    return this;
+};
+
+/**
+ * Gets an option value.
+ * @param {string} name Option name
+ * @returns {*} Option value or `undefined` if not set
+ */
+ReflectionObject.prototype.getOption = function getOption(name) {
+    if (this.options)
+        return this.options[name];
+    return undefined;
+};
+
+/**
+ * Sets an option.
+ * @param {string} name Option name
+ * @param {*} value Option value
+ * @param {boolean} [ifNotSet] Sets the option only if it isn't currently set
+ * @returns {ReflectionObject} `this`
+ */
+ReflectionObject.prototype.setOption = function setOption(name, value, ifNotSet) {
+    if (!ifNotSet || !this.options || this.options[name] === undefined)
+        (this.options || (this.options = {}))[name] = value;
+    return this;
+};
+
+/**
+ * Sets multiple options.
+ * @param {Object.<string,*>} options Options to set
+ * @param {boolean} [ifNotSet] Sets an option only if it isn't currently set
+ * @returns {ReflectionObject} `this`
+ */
+ReflectionObject.prototype.setOptions = function setOptions(options, ifNotSet) {
+    if (options)
+        for (var keys = Object.keys(options), i = 0; i < keys.length; ++i)
+            this.setOption(keys[i], options[keys[i]], ifNotSet);
+    return this;
+};
+
+/**
+ * Converts this instance to its string representation.
+ * @returns {string} Class name[, space, full name]
+ */
+ReflectionObject.prototype.toString = function toString() {
+    var className = this.constructor.className,
+        fullName  = this.fullName;
+    if (fullName.length)
+        return className + " " + fullName;
+    return className;
+};
+
+ReflectionObject._configure = function(Root_) {
+    Root = require('./root');
+    util = require('./util');
+};
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/oneof.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/oneof.js
new file mode 100644
index 0000000..c5605c3
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/oneof.js
@@ -0,0 +1,207 @@
+module.exports = OneOf;
+
+// extends ReflectionObject
+var ReflectionObject = require("./object");
+((OneOf.prototype = Object.create(ReflectionObject.prototype)).constructor = OneOf).className = "OneOf";
+
+var Field;
+var util;
+
+/**
+ * Constructs a new oneof instance.
+ * @classdesc Reflected oneof.
+ * @extends ReflectionObject
+ * @constructor
+ * @param {string} name Oneof name
+ * @param {string[]|Object.<string,*>} [fieldNames] Field names
+ * @param {Object.<string,*>} [options] Declared options
+ * @param {string} [comment] Comment associated with this field
+ */
+function OneOf(name, fieldNames, options, comment) {
+    if (!Array.isArray(fieldNames)) {
+        options = fieldNames;
+        fieldNames = undefined;
+    }
+    ReflectionObject.call(this, name, options);
+
+    /* istanbul ignore if */
+    if (!(fieldNames === undefined || Array.isArray(fieldNames)))
+        throw TypeError("fieldNames must be an Array");
+
+    /**
+     * Field names that belong to this oneof.
+     * @type {string[]}
+     */
+    this.oneof = fieldNames || []; // toJSON, marker
+
+    /**
+     * Fields that belong to this oneof as an array for iteration.
+     * @type {Field[]}
+     * @readonly
+     */
+    this.fieldsArray = []; // declared readonly for conformance, possibly not yet added to parent
+
+    /**
+     * Comment for this field.
+     * @type {string|null}
+     */
+    this.comment = comment;
+}
+
+/**
+ * Oneof descriptor.
+ * @interface IOneOf
+ * @property {Array.<string>} oneof Oneof field names
+ * @property {Object.<string,*>} [options] Oneof options
+ */
+
+/**
+ * Constructs a oneof from a oneof descriptor.
+ * @param {string} name Oneof name
+ * @param {IOneOf} json Oneof descriptor
+ * @returns {OneOf} Created oneof
+ * @throws {TypeError} If arguments are invalid
+ */
+OneOf.fromJSON = function fromJSON(name, json) {
+    return new OneOf(name, json.oneof, json.options, json.comment);
+};
+
+/**
+ * Converts this oneof to a oneof descriptor.
+ * @param {IToJSONOptions} [toJSONOptions] JSON conversion options
+ * @returns {IOneOf} Oneof descriptor
+ */
+OneOf.prototype.toJSON = function toJSON(toJSONOptions) {
+    var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    return util.toObject([
+        "options" , this.options,
+        "oneof"   , this.oneof,
+        "comment" , keepComments ? this.comment : undefined
+    ]);
+};
+
+/**
+ * Adds the fields of the specified oneof to the parent if not already done so.
+ * @param {OneOf} oneof The oneof
+ * @returns {undefined}
+ * @inner
+ * @ignore
+ */
+function addFieldsToParent(oneof) {
+    if (oneof.parent)
+        for (var i = 0; i < oneof.fieldsArray.length; ++i)
+            if (!oneof.fieldsArray[i].parent)
+                oneof.parent.add(oneof.fieldsArray[i]);
+}
+
+/**
+ * Adds a field to this oneof and removes it from its current parent, if any.
+ * @param {Field} field Field to add
+ * @returns {OneOf} `this`
+ */
+OneOf.prototype.add = function add(field) {
+
+    /* istanbul ignore if */
+    if (!(field instanceof Field))
+        throw TypeError("field must be a Field");
+
+    if (field.parent && field.parent !== this.parent)
+        field.parent.remove(field);
+    this.oneof.push(field.name);
+    this.fieldsArray.push(field);
+    field.partOf = this; // field.parent remains null
+    addFieldsToParent(this);
+    return this;
+};
+
+/**
+ * Removes a field from this oneof and puts it back to the oneof's parent.
+ * @param {Field} field Field to remove
+ * @returns {OneOf} `this`
+ */
+OneOf.prototype.remove = function remove(field) {
+
+    /* istanbul ignore if */
+    if (!(field instanceof Field))
+        throw TypeError("field must be a Field");
+
+    var index = this.fieldsArray.indexOf(field);
+
+    /* istanbul ignore if */
+    if (index < 0)
+        throw Error(field + " is not a member of " + this);
+
+    this.fieldsArray.splice(index, 1);
+    index = this.oneof.indexOf(field.name);
+
+    /* istanbul ignore else */
+    if (index > -1) // theoretical
+        this.oneof.splice(index, 1);
+
+    field.partOf = null;
+    return this;
+};
+
+/**
+ * @override
+ */
+OneOf.prototype.onAdd = function onAdd(parent) {
+    ReflectionObject.prototype.onAdd.call(this, parent);
+    var self = this;
+    // Collect present fields
+    for (var i = 0; i < this.oneof.length; ++i) {
+        var field = parent.get(this.oneof[i]);
+        if (field && !field.partOf) {
+            field.partOf = self;
+            self.fieldsArray.push(field);
+        }
+    }
+    // Add not yet present fields
+    addFieldsToParent(this);
+};
+
+/**
+ * @override
+ */
+OneOf.prototype.onRemove = function onRemove(parent) {
+    for (var i = 0, field; i < this.fieldsArray.length; ++i)
+        if ((field = this.fieldsArray[i]).parent)
+            field.parent.remove(field);
+    ReflectionObject.prototype.onRemove.call(this, parent);
+};
+
+/**
+ * Decorator function as returned by {@link OneOf.d} (TypeScript).
+ * @typedef OneOfDecorator
+ * @type {function}
+ * @param {Object} prototype Target prototype
+ * @param {string} oneofName OneOf name
+ * @returns {undefined}
+ */
+
+/**
+ * OneOf decorator (TypeScript).
+ * @function
+ * @param {...string} fieldNames Field names
+ * @returns {OneOfDecorator} Decorator function
+ * @template T extends string
+ */
+OneOf.d = function decorateOneOf() {
+    var fieldNames = new Array(arguments.length),
+        index = 0;
+    while (index < arguments.length)
+        fieldNames[index] = arguments[index++];
+    return function oneOfDecorator(prototype, oneofName) {
+        util.decorateType(prototype.constructor)
+            .add(new OneOf(oneofName, fieldNames));
+        Object.defineProperty(prototype, oneofName, {
+            get: util.oneOfGetter(fieldNames),
+            set: util.oneOfSetter(fieldNames)
+        });
+    };
+};
+
+OneOf._configure = function (){
+    Field = require('./field');
+    util = require('./util');
+};
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/parse.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/parse.js
new file mode 100644
index 0000000..d7f4389
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/parse.js
@@ -0,0 +1,770 @@
+"use strict";
+module.exports = parse;
+
+parse.filename = null;
+parse.defaults = { keepCase: false };
+
+var tokenize,
+    Root,
+    Type,
+    Field,
+    MapField,
+    OneOf,
+    Enum,
+    Service,
+    Method,
+    types,
+    util;
+
+var base10Re    = /^[1-9][0-9]*$/,
+    base10NegRe = /^-?[1-9][0-9]*$/,
+    base16Re    = /^0[x][0-9a-fA-F]+$/,
+    base16NegRe = /^-?0[x][0-9a-fA-F]+$/,
+    base8Re     = /^0[0-7]+$/,
+    base8NegRe  = /^-?0[0-7]+$/,
+    numberRe    = /^(?![eE])[0-9]*(?:\.[0-9]*)?(?:[eE][+-]?[0-9]+)?$/,
+    nameRe      = /^[a-zA-Z_][a-zA-Z_0-9]*$/,
+    typeRefRe   = /^(?:\.?[a-zA-Z_][a-zA-Z_0-9]*)+$/,
+    fqTypeRefRe = /^(?:\.[a-zA-Z][a-zA-Z_0-9]*)+$/;
+
+/**
+ * Result object returned from {@link parse}.
+ * @interface IParserResult
+ * @property {string|undefined} package Package name, if declared
+ * @property {string[]|undefined} imports Imports, if any
+ * @property {string[]|undefined} weakImports Weak imports, if any
+ * @property {string|undefined} syntax Syntax, if specified (either `"proto2"` or `"proto3"`)
+ * @property {Root} root Populated root instance
+ */
+
+/**
+ * Options modifying the behavior of {@link parse}.
+ * @interface IParseOptions
+ * @property {boolean} [keepCase=false] Keeps field casing instead of converting to camel case
+ * @property {boolean} [alternateCommentMode=false] Recognize double-slash comments in addition to doc-block comments.
+ */
+
+/**
+ * Options modifying the behavior of JSON serialization.
+ * @interface IToJSONOptions
+ * @property {boolean} [keepComments=false] Serializes comments.
+ */
+
+/**
+ * Parses the given .proto source and returns an object with the parsed contents.
+ * @param {string} source Source contents
+ * @param {Root} root Root to populate
+ * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+ * @returns {IParserResult} Parser result
+ * @property {string} filename=null Currently processing file name for error reporting, if known
+ * @property {IParseOptions} defaults Default {@link IParseOptions}
+ */
+function parse(source, root, options) {
+    /* eslint-disable callback-return */
+    if (!(root instanceof Root)) {
+        options = root;
+        root = new Root();
+    }
+    if (!options)
+        options = parse.defaults;
+
+    var tn = tokenize(source, options.alternateCommentMode || false),
+        next = tn.next,
+        push = tn.push,
+        peek = tn.peek,
+        skip = tn.skip,
+        cmnt = tn.cmnt;
+
+    var head = true,
+        pkg,
+        imports,
+        weakImports,
+        syntax,
+        isProto3 = false;
+
+    var ptr = root;
+
+    var applyCase = options.keepCase ? function(name) { return name; } : util.camelCase;
+
+    /* istanbul ignore next */
+    function illegal(token, name, insideTryCatch) {
+        var filename = parse.filename;
+        if (!insideTryCatch)
+            parse.filename = null;
+        return Error("illegal " + (name || "token") + " '" + token + "' (" + (filename ? filename + ", " : "") + "line " + tn.line + ")");
+    }
+
+    function readString() {
+        var values = [],
+            token;
+        do {
+            /* istanbul ignore if */
+            if ((token = next()) !== "\"" && token !== "'")
+                throw illegal(token);
+
+            values.push(next());
+            skip(token);
+            token = peek();
+        } while (token === "\"" || token === "'");
+        return values.join("");
+    }
+
+    function readValue(acceptTypeRef) {
+        var token = next();
+        switch (token) {
+            case "'":
+            case "\"":
+                push(token);
+                return readString();
+            case "true": case "TRUE":
+            return true;
+            case "false": case "FALSE":
+            return false;
+        }
+        try {
+            return parseNumber(token, /* insideTryCatch */ true);
+        } catch (e) {
+
+            /* istanbul ignore else */
+            if (acceptTypeRef && typeRefRe.test(token))
+                return token;
+
+            /* istanbul ignore next */
+            throw illegal(token, "value");
+        }
+    }
+
+    function readRanges(target, acceptStrings) {
+        var token, start;
+        do {
+            if (acceptStrings && ((token = peek()) === "\"" || token === "'"))
+                target.push(readString());
+            else
+                target.push([ start = parseId(next()), skip("to", true) ? parseId(next()) : start ]);
+        } while (skip(",", true));
+        skip(";");
+    }
+
+    function parseNumber(token, insideTryCatch) {
+        var sign = 1;
+        if (token.charAt(0) === "-") {
+            sign = -1;
+            token = token.substring(1);
+        }
+        switch (token) {
+            case "inf": case "INF": case "Inf":
+            return sign * Infinity;
+            case "nan": case "NAN": case "Nan": case "NaN":
+            return NaN;
+            case "0":
+                return 0;
+        }
+        if (base10Re.test(token))
+            return sign * parseInt(token, 10);
+        if (base16Re.test(token))
+            return sign * parseInt(token, 16);
+        if (base8Re.test(token))
+            return sign * parseInt(token, 8);
+
+        /* istanbul ignore else */
+        if (numberRe.test(token))
+            return sign * parseFloat(token);
+
+        /* istanbul ignore next */
+        throw illegal(token, "number", insideTryCatch);
+    }
+
+    function parseId(token, acceptNegative) {
+        switch (token) {
+            case "max": case "MAX": case "Max":
+            return 536870911;
+            case "0":
+                return 0;
+        }
+
+        /* istanbul ignore if */
+        if (!acceptNegative && token.charAt(0) === "-")
+            throw illegal(token, "id");
+
+        if (base10NegRe.test(token))
+            return parseInt(token, 10);
+        if (base16NegRe.test(token))
+            return parseInt(token, 16);
+
+        /* istanbul ignore else */
+        if (base8NegRe.test(token))
+            return parseInt(token, 8);
+
+        /* istanbul ignore next */
+        throw illegal(token, "id");
+    }
+
+    function parsePackage() {
+
+        /* istanbul ignore if */
+        if (pkg !== undefined)
+            throw illegal("package");
+
+        pkg = next();
+
+        /* istanbul ignore if */
+        if (!typeRefRe.test(pkg))
+            throw illegal(pkg, "name");
+
+        ptr = ptr.define(pkg);
+        skip(";");
+    }
+
+    function parseImport() {
+        var token = peek();
+        var whichImports;
+        switch (token) {
+            case "weak":
+                whichImports = weakImports || (weakImports = []);
+                next();
+                break;
+            case "public":
+                next();
+            // eslint-disable-line no-fallthrough
+            default:
+                whichImports = imports || (imports = []);
+                break;
+        }
+        token = readString();
+        skip(";");
+        whichImports.push(token);
+    }
+
+    function parseSyntax() {
+        skip("=");
+        syntax = readString();
+        isProto3 = syntax === "proto3";
+
+        /* istanbul ignore if */
+        if (!isProto3 && syntax !== "proto2")
+            throw illegal(syntax, "syntax");
+
+        skip(";");
+    }
+
+    function parseCommon(parent, token) {
+        switch (token) {
+
+            case "option":
+                parseOption(parent, token);
+                skip(";");
+                return true;
+
+            case "message":
+                parseType(parent, token);
+                return true;
+
+            case "enum":
+                parseEnum(parent, token);
+                return true;
+
+            case "service":
+                parseService(parent, token);
+                return true;
+
+            case "extend":
+                parseExtension(parent, token);
+                return true;
+        }
+        return false;
+    }
+
+    function ifBlock(obj, fnIf, fnElse) {
+        var trailingLine = tn.line;
+        if (obj) {
+            obj.comment = cmnt(); // try block-type comment
+            obj.filename = parse.filename;
+        }
+        if (skip("{", true)) {
+            var token;
+            while ((token = next()) !== "}")
+                fnIf(token);
+            skip(";", true);
+        } else {
+            if (fnElse)
+                fnElse();
+            skip(";");
+            if (obj && typeof obj.comment !== "string")
+                obj.comment = cmnt(trailingLine); // try line-type comment if no block
+        }
+    }
+
+    function parseType(parent, token) {
+
+        /* istanbul ignore if */
+        if (!nameRe.test(token = next()))
+            throw illegal(token, "type name");
+
+        var type = new Type(token);
+        ifBlock(type, function parseType_block(token) {
+            if (parseCommon(type, token))
+                return;
+
+            switch (token) {
+
+                case "map":
+                    parseMapField(type, token);
+                    break;
+
+                case "required":
+                case "optional":
+                case "repeated":
+                    parseField(type, token);
+                    break;
+
+                case "oneof":
+                    parseOneOf(type, token);
+                    break;
+
+                case "extensions":
+                    readRanges(type.extensions || (type.extensions = []));
+                    break;
+
+                case "reserved":
+                    readRanges(type.reserved || (type.reserved = []), true);
+                    break;
+
+                default:
+                    /* istanbul ignore if */
+                    if (!isProto3 || !typeRefRe.test(token))
+                        throw illegal(token);
+
+                    push(token);
+                    parseField(type, "optional");
+                    break;
+            }
+        });
+        parent.add(type);
+    }
+
+    function parseField(parent, rule, extend) {
+        var type = next();
+        if (type === "group") {
+            parseGroup(parent, rule);
+            return;
+        }
+
+        /* istanbul ignore if */
+        if (!typeRefRe.test(type))
+            throw illegal(type, "type");
+
+        var name = next();
+
+        /* istanbul ignore if */
+        if (!nameRe.test(name))
+            throw illegal(name, "name");
+
+        name = applyCase(name);
+        skip("=");
+
+        var field = new Field(name, parseId(next()), type, rule, extend);
+        ifBlock(field, function parseField_block(token) {
+
+            /* istanbul ignore else */
+            if (token === "option") {
+                parseOption(field, token);
+                skip(";");
+            } else
+                throw illegal(token);
+
+        }, function parseField_line() {
+            parseInlineOptions(field);
+        });
+        parent.add(field);
+
+        // JSON defaults to packed=true if not set so we have to set packed=false explicity when
+        // parsing proto2 descriptors without the option, where applicable. This must be done for
+        // all known packable types and anything that could be an enum (= is not a basic type).
+        if (!isProto3 && field.repeated && (types.packed[type] !== undefined || types.basic[type] === undefined))
+            field.setOption("packed", false, /* ifNotSet */ true);
+    }
+
+    function parseGroup(parent, rule) {
+        var name = next();
+
+        /* istanbul ignore if */
+        if (!nameRe.test(name))
+            throw illegal(name, "name");
+
+        var fieldName = util.lcFirst(name);
+        if (name === fieldName)
+            name = util.ucFirst(name);
+        skip("=");
+        var id = parseId(next());
+        var type = new Type(name);
+        type.group = true;
+        var field = new Field(fieldName, id, name, rule);
+        field.filename = parse.filename;
+        ifBlock(type, function parseGroup_block(token) {
+            switch (token) {
+
+                case "option":
+                    parseOption(type, token);
+                    skip(";");
+                    break;
+
+                case "required":
+                case "optional":
+                case "repeated":
+                    parseField(type, token);
+                    break;
+
+                /* istanbul ignore next */
+                default:
+                    throw illegal(token); // there are no groups with proto3 semantics
+            }
+        });
+        parent.add(type)
+            .add(field);
+    }
+
+    function parseMapField(parent) {
+        skip("<");
+        var keyType = next();
+
+        /* istanbul ignore if */
+        if (types.mapKey[keyType] === undefined)
+            throw illegal(keyType, "type");
+
+        skip(",");
+        var valueType = next();
+
+        /* istanbul ignore if */
+        if (!typeRefRe.test(valueType))
+            throw illegal(valueType, "type");
+
+        skip(">");
+        var name = next();
+
+        /* istanbul ignore if */
+        if (!nameRe.test(name))
+            throw illegal(name, "name");
+
+        skip("=");
+        var field = new MapField(applyCase(name), parseId(next()), keyType, valueType);
+        ifBlock(field, function parseMapField_block(token) {
+
+            /* istanbul ignore else */
+            if (token === "option") {
+                parseOption(field, token);
+                skip(";");
+            } else
+                throw illegal(token);
+
+        }, function parseMapField_line() {
+            parseInlineOptions(field);
+        });
+        parent.add(field);
+    }
+
+    function parseOneOf(parent, token) {
+
+        /* istanbul ignore if */
+        if (!nameRe.test(token = next()))
+            throw illegal(token, "name");
+
+        var oneof = new OneOf(applyCase(token));
+        ifBlock(oneof, function parseOneOf_block(token) {
+            if (token === "option") {
+                parseOption(oneof, token);
+                skip(";");
+            } else {
+                push(token);
+                parseField(oneof, "optional");
+            }
+        });
+        parent.add(oneof);
+    }
+
+    function parseEnum(parent, token) {
+
+        /* istanbul ignore if */
+        if (!nameRe.test(token = next()))
+            throw illegal(token, "name");
+
+        var enm = new Enum(token);
+        ifBlock(enm, function parseEnum_block(token) {
+            switch(token) {
+                case "option":
+                    parseOption(enm, token);
+                    skip(";");
+                    break;
+
+                case "reserved":
+                    readRanges(enm.reserved || (enm.reserved = []), true);
+                    break;
+
+                default:
+                    parseEnumValue(enm, token);
+            }
+        });
+        parent.add(enm);
+    }
+
+    function parseEnumValue(parent, token) {
+
+        /* istanbul ignore if */
+        if (!nameRe.test(token))
+            throw illegal(token, "name");
+
+        skip("=");
+        var value = parseId(next(), true),
+            dummy = {};
+        ifBlock(dummy, function parseEnumValue_block(token) {
+
+            /* istanbul ignore else */
+            if (token === "option") {
+                parseOption(dummy, token); // skip
+                skip(";");
+            } else
+                throw illegal(token);
+
+        }, function parseEnumValue_line() {
+            parseInlineOptions(dummy); // skip
+        });
+        parent.add(token, value, dummy.comment);
+    }
+
+    function parseOption(parent, token) {
+        var isCustom = skip("(", true);
+
+        /* istanbul ignore if */
+        if (!typeRefRe.test(token = next()))
+            throw illegal(token, "name");
+
+        var name = token;
+        if (isCustom) {
+            skip(")");
+            name = "(" + name + ")";
+            token = peek();
+            if (fqTypeRefRe.test(token)) {
+                name += token;
+                next();
+            }
+        }
+        skip("=");
+        parseOptionValue(parent, name);
+    }
+
+    function parseOptionValue(parent, name) {
+        if (skip("{", true)) { // { a: "foo" b { c: "bar" } }
+            do {
+                /* istanbul ignore if */
+                if (!nameRe.test(token = next()))
+                    throw illegal(token, "name");
+
+                if (peek() === "{")
+                    parseOptionValue(parent, name + "." + token);
+                else {
+                    skip(":");
+                    if (peek() === "{")
+                        parseOptionValue(parent, name + "." + token);
+                    else
+                        setOption(parent, name + "." + token, readValue(true));
+                }
+            } while (!skip("}", true));
+        } else
+            setOption(parent, name, readValue(true));
+        // Does not enforce a delimiter to be universal
+    }
+
+    function setOption(parent, name, value) {
+        if (parent.setOption)
+            parent.setOption(name, value);
+    }
+
+    function parseInlineOptions(parent) {
+        if (skip("[", true)) {
+            do {
+                parseOption(parent, "option");
+            } while (skip(",", true));
+            skip("]");
+        }
+        return parent;
+    }
+
+    function parseService(parent, token) {
+
+        /* istanbul ignore if */
+        if (!nameRe.test(token = next()))
+            throw illegal(token, "service name");
+
+        var service = new Service(token);
+        ifBlock(service, function parseService_block(token) {
+            if (parseCommon(service, token))
+                return;
+
+            /* istanbul ignore else */
+            if (token === "rpc")
+                parseMethod(service, token);
+            else
+                throw illegal(token);
+        });
+        parent.add(service);
+    }
+
+    function parseMethod(parent, token) {
+        var type = token;
+
+        /* istanbul ignore if */
+        if (!nameRe.test(token = next()))
+            throw illegal(token, "name");
+
+        var name = token,
+            requestType, requestStream,
+            responseType, responseStream;
+
+        skip("(");
+        if (skip("stream", true))
+            requestStream = true;
+
+        /* istanbul ignore if */
+        if (!typeRefRe.test(token = next()))
+            throw illegal(token);
+
+        requestType = token;
+        skip(")"); skip("returns"); skip("(");
+        if (skip("stream", true))
+            responseStream = true;
+
+        /* istanbul ignore if */
+        if (!typeRefRe.test(token = next()))
+            throw illegal(token);
+
+        responseType = token;
+        skip(")");
+
+        var method = new Method(name, type, requestType, responseType, requestStream, responseStream);
+        ifBlock(method, function parseMethod_block(token) {
+
+            /* istanbul ignore else */
+            if (token === "option") {
+                parseOption(method, token);
+                skip(";");
+            } else
+                throw illegal(token);
+
+        });
+        parent.add(method);
+    }
+
+    function parseExtension(parent, token) {
+
+        /* istanbul ignore if */
+        if (!typeRefRe.test(token = next()))
+            throw illegal(token, "reference");
+
+        var reference = token;
+        ifBlock(null, function parseExtension_block(token) {
+            switch (token) {
+
+                case "required":
+                case "repeated":
+                case "optional":
+                    parseField(parent, token, reference);
+                    break;
+
+                default:
+                    /* istanbul ignore if */
+                    if (!isProto3 || !typeRefRe.test(token))
+                        throw illegal(token);
+                    push(token);
+                    parseField(parent, "optional", reference);
+                    break;
+            }
+        });
+    }
+
+    var token;
+    while ((token = next()) !== null) {
+        switch (token) {
+
+            case "package":
+
+                /* istanbul ignore if */
+                if (!head)
+                    throw illegal(token);
+
+                parsePackage();
+                break;
+
+            case "import":
+
+                /* istanbul ignore if */
+                if (!head)
+                    throw illegal(token);
+
+                parseImport();
+                break;
+
+            case "syntax":
+
+                /* istanbul ignore if */
+                if (!head)
+                    throw illegal(token);
+
+                parseSyntax();
+                break;
+
+            case "option":
+
+                /* istanbul ignore if */
+                if (!head)
+                    throw illegal(token);
+
+                parseOption(ptr, token);
+                skip(";");
+                break;
+
+            default:
+
+                /* istanbul ignore else */
+                if (parseCommon(ptr, token)) {
+                    head = false;
+                    continue;
+                }
+
+                /* istanbul ignore next */
+                throw illegal(token);
+        }
+    }
+
+    parse.filename = null;
+    return {
+        "package"     : pkg,
+        "imports"     : imports,
+        weakImports  : weakImports,
+        syntax       : syntax,
+        root         : root
+    };
+}
+
+/**
+ * Parses the given .proto source and returns an object with the parsed contents.
+ * @name parse
+ * @function
+ * @param {string} source Source contents
+ * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+ * @returns {IParserResult} Parser result
+ * @property {string} filename=null Currently processing file name for error reporting, if known
+ * @property {IParseOptions} defaults Default {@link IParseOptions}
+ * @variation 2
+ */
+parse._configure = function (){
+    tokenize  = require("./tokenize"),
+        Root      = require("./root"),
+        Type      = require("./type"),
+        Field     = require("./field"),
+        MapField  = require("./mapField"),
+        OneOf     = require("./oneof"),
+        Enum      = require("./enum"),
+        Service   = require("./service"),
+        Method    = require("./method"),
+        types     = require("./types"),
+        util      = require("./util");
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/path.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/path.js
new file mode 100644
index 0000000..9864a0e
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/path.js
@@ -0,0 +1,58 @@
+var path = module.exports;
+
+var isAbsolute =
+/**
+ * Tests if the specified path is absolute.
+ * @param {string} path Path to test
+ * @returns {boolean} `true` if path is absolute
+ */
+    path.isAbsolute = function isAbsolute(path) {
+        return /^(?:\/|\w+:)/.test(path);
+    };
+
+var normalize =
+/**
+ * Normalizes the specified path.
+ * @param {string} path Path to normalize
+ * @returns {string} Normalized path
+ */
+    path.normalize = function normalize(path) {
+        path = path.replace(/\\/g, "/")
+            .replace(/\/{2,}/g, "/");
+        var parts    = path.split("/"),
+            absolute = isAbsolute(path),
+            prefix   = "";
+        if (absolute)
+            prefix = parts.shift() + "/";
+        for (var i = 0; i < parts.length;) {
+            if (parts[i] === "..") {
+                if (i > 0 && parts[i - 1] !== "..")
+                    parts.splice(--i, 2);
+                else if (absolute)
+                    parts.splice(i, 1);
+                else
+                    ++i;
+            } else if (parts[i] === ".")
+                parts.splice(i, 1);
+            else
+                ++i;
+        }
+        return prefix + parts.join("/");
+    };
+
+/**
+ * Resolves the specified include path against the specified origin path.
+ * @param {string} originPath Path to the origin file
+ * @param {string} includePath Include path relative to origin path
+ * @param {boolean} [alreadyNormalized=false] `true` if both paths are already known to be normalized
+ * @returns {string} Path to the include file
+ */
+path.resolve = function resolve(originPath, includePath, alreadyNormalized) {
+    if (!alreadyNormalized)
+        includePath = normalize(includePath);
+    if (isAbsolute(includePath))
+        return includePath;
+    if (!alreadyNormalized)
+        originPath = normalize(originPath);
+    return (originPath = originPath.replace(/(?:\/|^)[^/]+$/, "")).length ? normalize(originPath + "/" + includePath) : includePath;
+};
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/pool.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/pool.js
new file mode 100644
index 0000000..f916827
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/pool.js
@@ -0,0 +1,47 @@
+module.exports = pool;
+
+/**
+ * An allocator as used by {@link util.pool}.
+ * @typedef PoolAllocator
+ * @type {function}
+ * @param {number} size Buffer size
+ * @returns {Uint8Array} Buffer
+ */
+
+/**
+ * A slicer as used by {@link util.pool}.
+ * @typedef PoolSlicer
+ * @type {function}
+ * @param {number} start Start offset
+ * @param {number} end End offset
+ * @returns {Uint8Array} Buffer slice
+ * @this {Uint8Array}
+ */
+
+/**
+ * A general purpose buffer pool.
+ * @memberof util
+ * @function
+ * @param {PoolAllocator} alloc Allocator
+ * @param {PoolSlicer} slice Slicer
+ * @param {number} [size=8192] Slab size
+ * @returns {PoolAllocator} Pooled allocator
+ */
+function pool(alloc, slice, size) {
+    var SIZE   = size || 8192;
+    var MAX    = SIZE >>> 1;
+    var slab   = null;
+    var offset = SIZE;
+    return function pool_alloc(size) {
+        if (size < 1 || size > MAX)
+            return alloc(size);
+        if (offset + size > SIZE) {
+            slab = alloc(SIZE);
+            offset = 0;
+        }
+        var buf = slice.call(slab, offset, offset += size);
+        if (offset & 7) // align to 32 bit
+            offset = (offset | 7) + 1;
+        return buf;
+    };
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/reader.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/reader.js
new file mode 100644
index 0000000..6dd93b8
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/reader.js
@@ -0,0 +1,314 @@
+/**
+ * Created by zhangmiao on 2018/3/13.
+ */
+
+module.exports = Reader;
+
+var  util = require('./util');
+
+var LongBits;
+var utf8;
+
+var  BufferReader;
+
+function indexOutOfRange(reader, writeLength) {
+    return RangeError("index out of range: " + reader.pos + " + " + (writeLength || 1) + " > " + reader.len);
+}
+
+
+function Reader(buffer) {
+
+    /**
+     * Read buffer.
+     * @type {Uint8Array}
+     */
+    this.buf = buffer;
+
+    /**
+     * Read buffer position.
+     * @type {number}
+     */
+    this.pos = 0;
+
+    /**
+     * Read buffer length.
+     * @type {number}
+     */
+    this.len = buffer.length;
+}
+
+var create_array = typeof Uint8Array !== "undefined"
+    ? function create_typed_array(buffer) {
+    if (buffer instanceof Uint8Array || Array.isArray(buffer))
+        return new Reader(buffer);
+    if (typeof ArrayBuffer !== "undefined" && buffer instanceof ArrayBuffer) //增加ArrayBuffer构建
+        return new Reader(new Uint8Array(buffer));
+    throw Error("illegal buffer");
+}
+    /* istanbul ignore next */
+    : function create_array(buffer) {
+    if (Array.isArray(buffer))
+        return new Reader(buffer);
+    throw Error("illegal buffer");
+};
+
+Reader.create = util.Buffer
+    ? function create_buffer_setup(buffer) {
+    return (Reader.create = function create_buffer(buffer) {
+        return util.Buffer.isBuffer(buffer)
+            ? new BufferReader(buffer)
+            /* istanbul ignore next */
+            : create_array(buffer);
+    })(buffer);
+}
+    /* istanbul ignore next */
+    : create_array;
+
+Reader.prototype._slice = util.Array.prototype.subarray || /* istanbul ignore next */ util.Array.prototype.slice;
+
+
+Reader.prototype.uint32 = (function read_uint32_setup() {
+    var value = 4294967295; // optimizer type-hint, tends to deopt otherwise (?!)
+    return function read_uint32() {
+        value = (         this.buf[this.pos] & 127       ) >>> 0; if (this.buf[this.pos++] < 128) return value;
+        value = (value | (this.buf[this.pos] & 127) <<  7) >>> 0; if (this.buf[this.pos++] < 128) return value;
+        value = (value | (this.buf[this.pos] & 127) << 14) >>> 0; if (this.buf[this.pos++] < 128) return value;
+        value = (value | (this.buf[this.pos] & 127) << 21) >>> 0; if (this.buf[this.pos++] < 128) return value;
+        value = (value | (this.buf[this.pos] &  15) << 28) >>> 0; if (this.buf[this.pos++] < 128) return value;
+
+        /* istanbul ignore if */
+        if ((this.pos += 5) > this.len) {
+            this.pos = this.len;
+            throw indexOutOfRange(this, 10);
+        }
+        return value;
+    };
+})();
+
+Reader.prototype.int32 = function read_int32() {
+    return this.uint32() | 0;
+};
+
+Reader.prototype.sint32 = function read_sint32() {
+    var value = this.uint32();
+    return value >>> 1 ^ -(value & 1) | 0;
+};
+
+function readLongVarint() {
+    // tends to deopt with local vars for octet etc.
+    var bits = new LongBits(0, 0);
+    var i = 0;
+    if (this.len - this.pos > 4) { // fast route (lo)
+        for (; i < 4; ++i) {
+            // 1st..4th
+            bits.lo = (bits.lo | (this.buf[this.pos] & 127) << i * 7) >>> 0;
+            if (this.buf[this.pos++] < 128)
+                return bits;
+        }
+        // 5th
+        bits.lo = (bits.lo | (this.buf[this.pos] & 127) << 28) >>> 0;
+        bits.hi = (bits.hi | (this.buf[this.pos] & 127) >>  4) >>> 0;
+        if (this.buf[this.pos++] < 128)
+            return bits;
+        i = 0;
+    } else {
+        for (; i < 3; ++i) {
+            /* istanbul ignore if */
+            if (this.pos >= this.len)
+                throw indexOutOfRange(this);
+            // 1st..3th
+            bits.lo = (bits.lo | (this.buf[this.pos] & 127) << i * 7) >>> 0;
+            if (this.buf[this.pos++] < 128)
+                return bits;
+        }
+        // 4th
+        bits.lo = (bits.lo | (this.buf[this.pos++] & 127) << i * 7) >>> 0;
+        return bits;
+    }
+    if (this.len - this.pos > 4) { // fast route (hi)
+        for (; i < 5; ++i) {
+            // 6th..10th
+            bits.hi = (bits.hi | (this.buf[this.pos] & 127) << i * 7 + 3) >>> 0;
+            if (this.buf[this.pos++] < 128)
+                return bits;
+        }
+    } else {
+        for (; i < 5; ++i) {
+            /* istanbul ignore if */
+            if (this.pos >= this.len)
+                throw indexOutOfRange(this);
+            // 6th..10th
+            bits.hi = (bits.hi | (this.buf[this.pos] & 127) << i * 7 + 3) >>> 0;
+            if (this.buf[this.pos++] < 128)
+                return bits;
+        }
+    }
+    /* istanbul ignore next */
+    throw Error("invalid varint encoding");
+}
+
+Reader.prototype.bool = function read_bool() {
+    return this.uint32() !== 0;
+};
+
+
+function readFixed32_end(buf, end) { // note that this uses `end`, not `pos`
+    return (buf[end - 4]
+        | buf[end - 3] << 8
+        | buf[end - 2] << 16
+        | buf[end - 1] << 24) >>> 0;
+}
+
+Reader.prototype.fixed32 = function read_fixed32() {
+
+    /* istanbul ignore if */
+    if (this.pos + 4 > this.len)
+        throw indexOutOfRange(this, 4);
+
+    return readFixed32_end(this.buf, this.pos += 4);
+};
+
+Reader.prototype.sfixed32 = function read_sfixed32() {
+
+    /* istanbul ignore if */
+    if (this.pos + 4 > this.len)
+        throw indexOutOfRange(this, 4);
+
+    return readFixed32_end(this.buf, this.pos += 4) | 0;
+};
+
+/* eslint-disable no-invalid-this */
+
+function readFixed64(/* this: Reader */) {
+
+    /* istanbul ignore if */
+    if (this.pos + 8 > this.len)
+        throw indexOutOfRange(this, 8);
+
+    return new LongBits(readFixed32_end(this.buf, this.pos += 4), readFixed32_end(this.buf, this.pos += 4));
+}
+
+
+Reader.prototype.float = function read_float() {
+
+    /* istanbul ignore if */
+    if (this.pos + 4 > this.len)
+        throw indexOutOfRange(this, 4);
+
+    var value = util.float.readFloatLE(this.buf, this.pos);
+    this.pos += 4;
+    return value;
+};
+
+Reader.prototype.double = function read_double() {
+
+    /* istanbul ignore if */
+    if (this.pos + 8 > this.len)
+        throw indexOutOfRange(this, 4);
+
+    var value = util.float.readDoubleLE(this.buf, this.pos);
+    this.pos += 8;
+    return value;
+};
+
+Reader.prototype.bytes = function read_bytes() {
+    var length = this.uint32(),
+        start  = this.pos,
+        end    = this.pos + length;
+
+    /* istanbul ignore if */
+    if (end > this.len)
+        throw indexOutOfRange(this, length);
+    this.pos += length;
+    if (Array.isArray(this.buf)) // plain array
+        return this.buf.slice(start, end);
+    return start === end // fix for IE 10/Win8 and others' subarray returning array of size 1
+        ? new this.buf.constructor(0)
+        : this._slice.call(this.buf, start, end);
+};
+
+Reader.prototype.string = function read_string() {
+    var bytes = this.bytes();
+    return utf8.read(bytes, 0, bytes.length);
+};
+
+Reader.prototype.skip = function skip(length) {
+    if (typeof length === "number") {
+        /* istanbul ignore if */
+        if (this.pos + length > this.len)
+            throw indexOutOfRange(this, length);
+        this.pos += length;
+    } else {
+        do {
+            /* istanbul ignore if */
+            if (this.pos >= this.len)
+                throw indexOutOfRange(this);
+        } while (this.buf[this.pos++] & 128);
+    }
+    return this;
+};
+
+Reader.prototype.skipType = function(wireType) {
+    switch (wireType) {
+        case 0:
+            this.skip();
+            break;
+        case 1:
+            this.skip(8);
+            break;
+        case 2:
+            this.skip(this.uint32());
+            break;
+        case 3:
+            do { // eslint-disable-line no-constant-condition
+                if ((wireType = this.uint32() & 7) === 4)
+                    break;
+                this.skipType(wireType);
+            } while (true);
+            break;
+        case 5:
+            this.skip(4);
+            break;
+
+        /* istanbul ignore next */
+        default:
+            throw Error("invalid wire type " + wireType + " at offset " + this.pos);
+    }
+    return this;
+};
+
+
+
+//这部分可能用不到
+Reader._configure = function() {
+
+    //util       = require('./util');
+    LongBits = require("./longBits");
+    utf8     = require("./utf8");
+
+    var fn = util.Long ? "toLong" : /* istanbul ignore next */ "toNumber";
+    util.merge(Reader.prototype, {
+
+        int64: function read_int64() {
+            return readLongVarint.call(this)[fn](false);
+        },
+
+        uint64: function read_uint64() {
+            return readLongVarint.call(this)[fn](true);
+        },
+
+        sint64: function read_sint64() {
+            return readLongVarint.call(this).zzDecode()[fn](false);
+        },
+
+        fixed64: function read_fixed64() {
+            return readFixed64.call(this)[fn](true);
+        },
+
+        sfixed64: function read_sfixed64() {
+            return readFixed64.call(this)[fn](false);
+        }
+
+    });
+};
+
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/reader_buffer.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/reader_buffer.js
new file mode 100644
index 0000000..9518901
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/reader_buffer.js
@@ -0,0 +1,44 @@
+"use strict";
+module.exports = BufferReader;
+
+// extends Reader
+var Reader = require("./reader");
+(BufferReader.prototype = Object.create(Reader.prototype)).constructor = BufferReader;
+
+var util = require("./util/minimal");
+
+/**
+ * Constructs a new buffer reader instance.
+ * @classdesc Wire format reader using node buffers.
+ * @extends Reader
+ * @constructor
+ * @param {Buffer} buffer Buffer to read from
+ */
+function BufferReader(buffer) {
+    Reader.call(this, buffer);
+
+    /**
+     * Read buffer.
+     * @name BufferReader#buf
+     * @type {Buffer}
+     */
+}
+
+/* istanbul ignore else */
+if (util.Buffer)
+    BufferReader.prototype._slice = util.Buffer.prototype.slice;
+
+/**
+ * @override
+ */
+BufferReader.prototype.string = function read_string_buffer() {
+    var len = this.uint32(); // modifies pos
+    return this.buf.utf8Slice(this.pos, this.pos = Math.min(this.pos + len, this.len));
+};
+
+/**
+ * Reads a sequence of bytes preceeded by its length as a varint.
+ * @name BufferReader#bytes
+ * @function
+ * @returns {Buffer} Value read
+ */
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/root.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/root.js
new file mode 100644
index 0000000..ecf69d4
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/root.js
@@ -0,0 +1,439 @@
+module.exports = Root;
+
+// extends Namespace
+var Namespace = require("./namespace");
+((Root.prototype = Object.create(Namespace.prototype)).constructor = Root).className = "Root";
+
+var Field   = require("./field"),
+    Enum    = require("./enum"),
+    OneOf   = require("./oneof"),
+    util    = require("./util");
+
+var Type,   // cyclic
+    parse,  // might be excluded
+    common; // "
+
+/**
+ * Constructs a new root namespace instance.
+ * @classdesc Root namespace wrapping all types, enums, services, sub-namespaces etc. that belong together.
+ * @extends NamespaceBase
+ * @constructor
+ * @param {Object.<string,*>} [options] Top level options
+ */
+function Root(options) {
+    Namespace.call(this, "", options);
+
+    /**
+     * Deferred extension fields.
+     * @type {Field[]}
+     */
+    this.deferred = [];
+
+    /**
+     * Resolved file names of loaded files.
+     * @type {string[]}
+     */
+    this.files = [];
+
+    /**
+     * Resolved name of parsered pbString.
+     * @type {string[]}
+     */
+    this.names = [];
+}
+
+/**
+ * Loads a namespace descriptor into a root namespace.
+ * @param {INamespace} json Nameespace descriptor
+ * @param {Root} [root] Root namespace, defaults to create a new one if omitted
+ * @returns {Root} Root namespace
+ */
+Root.fromJSON = function fromJSON(json, root) {
+    json = typeof json === 'string' ? JSON.parse(json) : json;
+    if (!root)
+        root = new Root();
+    if (json.options)
+        root.setOptions(json.options);
+    return root.addJSON(json.nested);
+};
+
+/**
+ * Resolves the path of an imported file, relative to the importing origin.
+ * This method exists so you can override it with your own logic in case your imports are scattered over multiple directories.
+ * @function
+ * @param {string} origin The file name of the importing file
+ * @param {string} target The file name being imported
+ * @returns {string|null} Resolved path to `target` or `null` to skip the file
+ */
+Root.prototype.resolvePath = util.path.resolve;
+
+// A symbol-like function to safely signal synchronous loading
+/* istanbul ignore next */
+function SYNC() {} // eslint-disable-line no-empty-function
+
+function parseFromPbString(pbString, options, callback){
+
+    if (typeof options === "function") {
+        callback = options;
+        options = undefined;
+    }
+    var self = this;
+    if (!callback){
+        return util.asPromise(parseFromPbString, self, pbString, options);
+    }
+
+    var pbObj = null;
+    if(typeof pbString === 'string'){
+        pbObj = JSON.parse(pbString);
+    }else if(typeof pbString === 'object'){
+        pbObj = pbString;
+    }else {
+        //throw Error("pb格式转化失败");
+        console.log("pb格式转化失败");
+        return undefined;
+    }
+
+    var name      = pbObj['name'];
+    var pbJsonStr = pbObj['pbJsonStr'];
+
+    function finish(err, root){
+        if(!callback)
+            return;
+        var cb = callback;
+        callback = null;
+        cb(err, root);
+    }
+
+    function process(name, source){
+        try {
+            if (util.isString(source) && source.charAt(0) === "{")
+                source = JSON.parse(source);
+            if (!util.isString(source))
+                self.setOptions(source.options).addJSON(source.nested);
+            else {
+                parse.filename = name;
+                var parsed = parse(source, self, options),
+                    resolved;
+                var i = 0;
+                if(parsed.imports){
+                    for (; i < parsed.imports.length; ++i){
+                        resolved = parsed.imports[i];
+                        fetch(resolved);
+                    }
+                }
+                if (parsed.weakImports){
+                    for (i = 0; i < parsed.weakImports.length; ++i)
+                         resolved = parsed.weakImports[i];
+                            fetch(resolved, true);
+                }
+            }
+        } catch (err) {
+            finish(err);
+        }
+
+        finish(null, self); // only once anyway
+    }
+
+    function  fetch(name){
+        if(self.names.indexOf(name)>-1)
+            return;
+        self.names.push(name);
+        if (name in common){
+            process(name, common[name]);
+        }
+    }
+
+    process(name, pbJsonStr);
+    return undefined;
+}
+
+Root.prototype.parseFromPbString = parseFromPbString;
+
+/**
+ * Loads one or multiple .proto or preprocessed .json files into this root namespace and calls the callback.
+ * @param {string|string[]} filename Names of one or multiple files to load
+ * @param {IParseOptions} options Parse options
+ * @param {LoadCallback} callback Callback function
+ * @returns {undefined}
+ */
+Root.prototype.load = function load(filename, options, callback) {
+    if (typeof options === "function") {
+        callback = options;
+        options = undefined;
+    }
+    var self = this;
+    if (!callback)
+        return util.asPromise(load, self, filename, options);
+
+    var sync = callback === SYNC; // undocumented
+
+    // Finishes loading by calling the callback (exactly once)
+    function finish(err, root) {
+        /* istanbul ignore if */
+        if (!callback)
+            return;
+        var cb = callback;
+        callback = null;
+        if (sync)
+            throw err;
+        cb(err, root);
+    }
+
+    // Processes a single file
+    function process(filename, source) {
+        try {
+            if (util.isString(source) && source.charAt(0) === "{")
+                source = JSON.parse(source);
+            if (!util.isString(source))
+                self.setOptions(source.options).addJSON(source.nested);
+            else {
+                parse.filename = filename;
+                var parsed = parse(source, self, options),
+                    resolved,
+                    i = 0;
+                if (parsed.imports)
+                    for (; i < parsed.imports.length; ++i)
+                        if (resolved = self.resolvePath(filename, parsed.imports[i]))
+                            fetch(resolved);
+                if (parsed.weakImports)
+                    for (i = 0; i < parsed.weakImports.length; ++i)
+                        if (resolved = self.resolvePath(filename, parsed.weakImports[i]))
+                            fetch(resolved, true);
+            }
+        } catch (err) {
+            finish(err);
+        }
+        if (!sync && !queued)
+            finish(null, self); // only once anyway
+    }
+
+    // Fetches a single file
+    function fetch(filename, weak) {
+
+        // Strip path if this file references a bundled definition
+        var idx = filename.lastIndexOf("google/protobuf/");
+        if (idx > -1) {
+            var altname = filename.substring(idx);
+            if (altname in common)
+                filename = altname;
+        }
+
+        // Skip if already loaded / attempted
+        if (self.files.indexOf(filename) > -1)
+            return;
+        self.files.push(filename);
+
+        // Shortcut bundled definitions
+        if (filename in common) {
+            if (sync)
+                process(filename, common[filename]);
+            else {
+                ++queued;
+                setTimeout(function() {
+                    --queued;
+                    process(filename, common[filename]);
+                });
+            }
+            return;
+        }
+
+        // Otherwise fetch from disk or network
+        if (sync) {
+            var source;
+            try {
+                source = util.fs.readFileSync(filename).toString("utf8");
+            } catch (err) {
+                if (!weak)
+                    finish(err);
+                return;
+            }
+            process(filename, source);
+        } else {
+            ++queued;
+            util.fetch(filename, function(err, source) {
+                --queued;
+                /* istanbul ignore if */
+                if (!callback)
+                    return; // terminated meanwhile
+                if (err) {
+                    /* istanbul ignore else */
+                    if (!weak)
+                        finish(err);
+                    else if (!queued) // can't be covered reliably
+                        finish(null, self);
+                    return;
+                }
+                process(filename, source);
+            });
+        }
+    }
+    var queued = 0;
+
+    // Assembling the root namespace doesn't require working type
+    // references anymore, so we can load everything in parallel
+    if (util.isString(filename))
+        filename = [ filename ];
+    for (var i = 0, resolved; i < filename.length; ++i)
+        if (resolved = self.resolvePath("", filename[i]))
+            fetch(resolved);
+
+    if (sync)
+        return self;
+    if (!queued)
+        finish(null, self);
+    return undefined;
+};
+// function load(filename:string, options:IParseOptions, callback:LoadCallback):undefined
+
+/**
+ * Loads one or multiple .proto or preprocessed .json files into this root namespace and calls the callback.
+ * @function Root#load
+ * @param {string|string[]} filename Names of one or multiple files to load
+ * @param {LoadCallback} callback Callback function
+ * @returns {undefined}
+ * @variation 2
+ */
+// function load(filename:string, callback:LoadCallback):undefined
+
+/**
+ * Loads one or multiple .proto or preprocessed .json files into this root namespace and returns a promise.
+ * @function Root#load
+ * @param {string|string[]} filename Names of one or multiple files to load
+ * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+ * @returns {Promise<Root>} Promise
+ * @variation 3
+ */
+// function load(filename:string, [options:IParseOptions]):Promise<Root>
+
+/**
+ * Synchronously loads one or multiple .proto or preprocessed .json files into this root namespace (node only).
+ * @function Root#loadSync
+ * @param {string|string[]} filename Names of one or multiple files to load
+ * @param {IParseOptions} [options] Parse options. Defaults to {@link parse.defaults} when omitted.
+ * @returns {Root} Root namespace
+ * @throws {Error} If synchronous fetching is not supported (i.e. in browsers) or if a file's syntax is invalid
+ */
+Root.prototype.loadSync = function loadSync(filename, options) {
+    if (!util.isNode)
+        throw Error("not supported");
+    return this.load(filename, options, SYNC);
+};
+
+/**
+ * @override
+ */
+Root.prototype.resolveAll = function resolveAll() {
+    if (this.deferred.length)
+        throw Error("unresolvable extensions: " + this.deferred.map(function(field) {
+                return "'extend " + field.extend + "' in " + field.parent.fullName;
+            }).join(", "));
+    return Namespace.prototype.resolveAll.call(this);
+};
+
+// only uppercased (and thus conflict-free) children are exposed, see below
+var exposeRe = /^[A-Z]/;
+
+/**
+ * Handles a deferred declaring extension field by creating a sister field to represent it within its extended type.
+ * @param {Root} root Root instance
+ * @param {Field} field Declaring extension field witin the declaring type
+ * @returns {boolean} `true` if successfully added to the extended type, `false` otherwise
+ * @inner
+ * @ignore
+ */
+function tryHandleExtension(root, field) {
+    var extendedType = field.parent.lookup(field.extend);
+    if (extendedType) {
+        var sisterField = new Field(field.fullName, field.id, field.type, field.rule, undefined, field.options);
+        sisterField.declaringField = field;
+        field.extensionField = sisterField;
+        extendedType.add(sisterField);
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Called when any object is added to this root or its sub-namespaces.
+ * @param {ReflectionObject} object Object added
+ * @returns {undefined}
+ * @private
+ */
+Root.prototype._handleAdd = function _handleAdd(object) {
+    if (object instanceof Field) {
+
+        if (/* an extension field (implies not part of a oneof) */ object.extend !== undefined && /* not already handled */ !object.extensionField)
+            if (!tryHandleExtension(this, object))
+                this.deferred.push(object);
+
+    } else if (object instanceof Enum) {
+
+        if (exposeRe.test(object.name))
+            object.parent[object.name] = object.values; // expose enum values as property of its parent
+
+    } else if (!(object instanceof OneOf)) /* everything else is a namespace */ {
+
+        if (object instanceof Type) // Try to handle any deferred extensions
+            for (var i = 0; i < this.deferred.length;)
+                if (tryHandleExtension(this, this.deferred[i]))
+                    this.deferred.splice(i, 1);
+                else
+                    ++i;
+        for (var j = 0; j < /* initializes */ object.nestedArray.length; ++j) // recurse into the namespace
+            this._handleAdd(object._nestedArray[j]);
+        if (exposeRe.test(object.name))
+            object.parent[object.name] = object; // expose namespace as property of its parent
+    }
+
+    // The above also adds uppercased (and thus conflict-free) nested types, services and enums as
+    // properties of namespaces just like static code does. This allows using a .d.ts generated for
+    // a static module with reflection-based solutions where the condition is met.
+};
+
+/**
+ * Called when any object is removed from this root or its sub-namespaces.
+ * @param {ReflectionObject} object Object removed
+ * @returns {undefined}
+ * @private
+ */
+Root.prototype._handleRemove = function _handleRemove(object) {
+    if (object instanceof Field) {
+
+        if (/* an extension field */ object.extend !== undefined) {
+            if (/* already handled */ object.extensionField) { // remove its sister field
+                object.extensionField.parent.remove(object.extensionField);
+                object.extensionField = null;
+            } else { // cancel the extension
+                var index = this.deferred.indexOf(object);
+                /* istanbul ignore else */
+                if (index > -1)
+                    this.deferred.splice(index, 1);
+            }
+        }
+
+    } else if (object instanceof Enum) {
+
+        if (exposeRe.test(object.name))
+            delete object.parent[object.name]; // unexpose enum values
+
+    } else if (object instanceof Namespace) {
+
+        for (var i = 0; i < /* initializes */ object.nestedArray.length; ++i) // recurse into the namespace
+            this._handleRemove(object._nestedArray[i]);
+
+        if (exposeRe.test(object.name))
+            delete object.parent[object.name]; // unexpose namespaces
+
+    }
+};
+
+Root._configure = function() {
+    Type = require('./type');
+    parse = require('./parse');
+    common = require('./common');
+
+    Field   = require("./field");
+    Enum    = require("./enum");
+    OneOf   = require("./oneof");
+    util    = require("./util");
+};
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/roots.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/roots.js
new file mode 100644
index 0000000..70ad660
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/roots.js
@@ -0,0 +1,6 @@
+/**
+ * Created by zhangmiao on 2018/3/13.
+ */
+
+
+module.exports = {};
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/rpc.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/rpc.js
new file mode 100644
index 0000000..894e5c7
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/rpc.js
@@ -0,0 +1,36 @@
+"use strict";
+
+/**
+ * Streaming RPC helpers.
+ * @namespace
+ */
+var rpc = exports;
+
+/**
+ * RPC implementation passed to {@link Service#create} performing a service request on network level, i.e. by utilizing http requests or websockets.
+ * @typedef RPCImpl
+ * @type {function}
+ * @param {Method|rpc.ServiceMethod<Message<{}>,Message<{}>>} method Reflected or static method being called
+ * @param {Uint8Array} requestData Request data
+ * @param {RPCImplCallback} callback Callback function
+ * @returns {undefined}
+ * @example
+ * function rpcImpl(method, requestData, callback) {
+ *     if (protobuf.util.lcFirst(method.name) !== "myMethod") // compatible with static code
+ *         throw Error("no such method");
+ *     asynchronouslyObtainAResponse(requestData, function(err, responseData) {
+ *         callback(err, responseData);
+ *     });
+ * }
+ */
+
+/**
+ * Node-style callback as used by {@link RPCImpl}.
+ * @typedef RPCImplCallback
+ * @type {function}
+ * @param {Error|null} error Error, if any, otherwise `null`
+ * @param {Uint8Array|null} [response] Response data or `null` to signal end of stream, if there hasn't been an error
+ * @returns {undefined}
+ */
+
+rpc.Service = require("./rpc/service");
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/rpc/service.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/rpc/service.js
new file mode 100644
index 0000000..b0c8243
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/rpc/service.js
@@ -0,0 +1,141 @@
+"use strict";
+module.exports = Service;
+var util = require("../util");
+
+// Extends EventEmitter
+(Service.prototype = Object.create(util.EventEmitter.prototype)).constructor = Service;
+
+/**
+ * A service method callback as used by {@link rpc.ServiceMethod|ServiceMethod}.
+ *
+ * Differs from {@link RPCImplCallback} in that it is an actual callback of a service method which may not return `response = null`.
+ * @typedef rpc.ServiceMethodCallback
+ * @template TRes extends Message<TRes>
+ * @type {function}
+ * @param {Error|null} error Error, if any
+ * @param {TRes} [response] Response message
+ * @returns {undefined}
+ */
+
+/**
+ * A service method part of a {@link rpc.Service} as created by {@link Service.create}.
+ * @typedef rpc.ServiceMethod
+ * @template TReq extends Message<TReq>
+ * @template TRes extends Message<TRes>
+ * @type {function}
+ * @param {TReq|Properties<TReq>} request Request message or plain object
+ * @param {rpc.ServiceMethodCallback<TRes>} [callback] Node-style callback called with the error, if any, and the response message
+ * @returns {Promise<Message<TRes>>} Promise if `callback` has been omitted, otherwise `undefined`
+ */
+
+/**
+ * Constructs a new RPC service instance.
+ * @classdesc An RPC service as returned by {@link Service#create}.
+ * @exports rpc.Service
+ * @extends util.EventEmitter
+ * @constructor
+ * @param {RPCImpl} rpcImpl RPC implementation
+ * @param {boolean} [requestDelimited=false] Whether requests are length-delimited
+ * @param {boolean} [responseDelimited=false] Whether responses are length-delimited
+ */
+function Service(rpcImpl, requestDelimited, responseDelimited) {
+
+    if (typeof rpcImpl !== "function")
+        throw TypeError("rpcImpl must be a function");
+
+    util.EventEmitter.call(this);
+
+    /**
+     * RPC implementation. Becomes `null` once the service is ended.
+     * @type {RPCImpl|null}
+     */
+    this.rpcImpl = rpcImpl;
+
+    /**
+     * Whether requests are length-delimited.
+     * @type {boolean}
+     */
+    this.requestDelimited = Boolean(requestDelimited);
+
+    /**
+     * Whether responses are length-delimited.
+     * @type {boolean}
+     */
+    this.responseDelimited = Boolean(responseDelimited);
+}
+
+/**
+ * Calls a service method through {@link rpc.Service#rpcImpl|rpcImpl}.
+ * @param {Method|rpc.ServiceMethod<TReq,TRes>} method Reflected or static method
+ * @param {Constructor<TReq>} requestCtor Request constructor
+ * @param {Constructor<TRes>} responseCtor Response constructor
+ * @param {TReq|Properties<TReq>} request Request message or plain object
+ * @param {rpc.ServiceMethodCallback<TRes>} callback Service callback
+ * @returns {undefined}
+ * @template TReq extends Message<TReq>
+ * @template TRes extends Message<TRes>
+ */
+Service.prototype.rpcCall = function rpcCall(method, requestCtor, responseCtor, request, callback) {
+
+    if (!request)
+        throw TypeError("request must be specified");
+
+    var self = this;
+    if (!callback)
+        return util.asPromise(rpcCall, self, method, requestCtor, responseCtor, request);
+
+    if (!self.rpcImpl) {
+        setTimeout(function() { callback(Error("already ended")); }, 0);
+        return undefined;
+    }
+
+    try {
+        return self.rpcImpl(
+            method,
+            requestCtor[self.requestDelimited ? "encodeDelimited" : "encode"](request).finish(),
+            function rpcCallback(err, response) {
+
+                if (err) {
+                    self.emit("error", err, method);
+                    return callback(err);
+                }
+
+                if (response === null) {
+                    self.end(/* endedByRPC */ true);
+                    return undefined;
+                }
+
+                if (!(response instanceof responseCtor)) {
+                    try {
+                        response = responseCtor[self.responseDelimited ? "decodeDelimited" : "decode"](response);
+                    } catch (err) {
+                        self.emit("error", err, method);
+                        return callback(err);
+                    }
+                }
+
+                self.emit("data", response, method);
+                return callback(null, response);
+            }
+        );
+    } catch (err) {
+        self.emit("error", err, method);
+        setTimeout(function() { callback(err); }, 0);
+        return undefined;
+    }
+};
+
+/**
+ * Ends this service and emits the `end` event.
+ * @param {boolean} [endedByRPC=false] Whether the service has been ended by the RPC implementation.
+ * @returns {rpc.Service} `this`
+ */
+Service.prototype.end = function end(endedByRPC) {
+    if (this.rpcImpl) {
+        if (!endedByRPC) // signal end to rpcImpl
+            this.rpcImpl(null, null, null);
+        this.rpcImpl = null;
+        this.emit("end").off();
+    }
+    return this;
+};
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/service.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/service.js
new file mode 100644
index 0000000..e7c30e5
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/service.js
@@ -0,0 +1,173 @@
+"use strict";
+module.exports = Service;
+
+// extends Namespace
+var Namespace = require("./namespace");
+((Service.prototype = Object.create(Namespace.prototype)).constructor = Service).className = "Service";
+
+var Method,
+    util,
+    rpc;
+
+/**
+ * Constructs a new service instance.
+ * @classdesc Reflected service.
+ * @extends NamespaceBase
+ * @constructor
+ * @param {string} name Service name
+ * @param {Object.<string,*>} [options] Service options
+ * @throws {TypeError} If arguments are invalid
+ */
+function Service(name, options) {
+    Namespace.call(this, name, options);
+
+    /**
+     * Service methods.
+     * @type {Object.<string,Method>}
+     */
+    this.methods = {}; // toJSON, marker
+
+    /**
+     * Cached methods as an array.
+     * @type {Method[]|null}
+     * @private
+     */
+    this._methodsArray = null;
+}
+
+/**
+ * Service descriptor.
+ * @interface IService
+ * @extends INamespace
+ * @property {Object.<string,IMethod>} methods Method descriptors
+ */
+
+/**
+ * Constructs a service from a service descriptor.
+ * @param {string} name Service name
+ * @param {IService} json Service descriptor
+ * @returns {Service} Created service
+ * @throws {TypeError} If arguments are invalid
+ */
+Service.fromJSON = function fromJSON(name, json) {
+    var service = new Service(name, json.options);
+    /* istanbul ignore else */
+    if (json.methods)
+        for (var names = Object.keys(json.methods), i = 0; i < names.length; ++i)
+            service.add(Method.fromJSON(names[i], json.methods[names[i]]));
+    if (json.nested)
+        service.addJSON(json.nested);
+    service.comment = json.comment;
+    return service;
+};
+
+/**
+ * Converts this service to a service descriptor.
+ * @param {IToJSONOptions} [toJSONOptions] JSON conversion options
+ * @returns {IService} Service descriptor
+ */
+Service.prototype.toJSON = function toJSON(toJSONOptions) {
+    var inherited = Namespace.prototype.toJSON.call(this, toJSONOptions);
+    var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    return util.toObject([
+        "options" , inherited && inherited.options || undefined,
+        "methods" , Namespace.arrayToJSON(this.methodsArray, toJSONOptions) || /* istanbul ignore next */ {},
+        "nested"  , inherited && inherited.nested || undefined,
+        "comment" , keepComments ? this.comment : undefined
+    ]);
+};
+
+/**
+ * Methods of this service as an array for iteration.
+ * @name Service#methodsArray
+ * @type {Method[]}
+ * @readonly
+ */
+Object.defineProperty(Service.prototype, "methodsArray", {
+    get: function() {
+        return this._methodsArray || (this._methodsArray = util.toArray(this.methods));
+    }
+});
+
+function clearCache(service) {
+    service._methodsArray = null;
+    return service;
+}
+
+/**
+ * @override
+ */
+Service.prototype.get = function get(name) {
+    return this.methods[name]
+        || Namespace.prototype.get.call(this, name);
+};
+
+/**
+ * @override
+ */
+Service.prototype.resolveAll = function resolveAll() {
+    var methods = this.methodsArray;
+    for (var i = 0; i < methods.length; ++i)
+        methods[i].resolve();
+    return Namespace.prototype.resolve.call(this);
+};
+
+/**
+ * @override
+ */
+Service.prototype.add = function add(object) {
+
+    /* istanbul ignore if */
+    if (this.get(object.name))
+        throw Error("duplicate name '" + object.name + "' in " + this);
+
+    if (object instanceof Method) {
+        this.methods[object.name] = object;
+        object.parent = this;
+        return clearCache(this);
+    }
+    return Namespace.prototype.add.call(this, object);
+};
+
+/**
+ * @override
+ */
+Service.prototype.remove = function remove(object) {
+    if (object instanceof Method) {
+
+        /* istanbul ignore if */
+        if (this.methods[object.name] !== object)
+            throw Error(object + " is not a member of " + this);
+
+        delete this.methods[object.name];
+        object.parent = null;
+        return clearCache(this);
+    }
+    return Namespace.prototype.remove.call(this, object);
+};
+
+/**
+ * Creates a runtime service using the specified rpc implementation.
+ * @param {RPCImpl} rpcImpl RPC implementation
+ * @param {boolean} [requestDelimited=false] Whether requests are length-delimited
+ * @param {boolean} [responseDelimited=false] Whether responses are length-delimited
+ * @returns {rpc.Service} RPC service. Useful where requests and/or responses are streamed.
+ */
+Service.prototype.create = function create(rpcImpl, requestDelimited, responseDelimited) {
+    var rpcService = new rpc.Service(rpcImpl, requestDelimited, responseDelimited);
+    for (var i = 0, method; i < /* initializes */ this.methodsArray.length; ++i) {
+        var methodName = util.lcFirst((method = this._methodsArray[i]).resolve().name).replace(/[^$\w_]/g, "");
+        rpcService[methodName] = util.codegen(["r","c"], util.isReserved(methodName) ? methodName + "_" : methodName)("return this.rpcCall(m,q,s,r,c)")({
+            m: method,
+            q: method.resolvedRequestType.ctor,
+            s: method.resolvedResponseType.ctor
+        });
+    }
+    return rpcService;
+};
+
+Service._configure = function (){
+    Method = require("./method");
+    util   = require("./util");
+    rpc    = require("./rpc/service");
+};
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/tokenize.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/tokenize.js
new file mode 100644
index 0000000..ce2ca69
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/tokenize.js
@@ -0,0 +1,396 @@
+module.exports = tokenize;
+
+var delimRe        = /[\s{}=;:[\],'"()<>]/g,
+    stringDoubleRe = /(?:"([^"\\]*(?:\\.[^"\\]*)*)")/g,
+    stringSingleRe = /(?:'([^'\\]*(?:\\.[^'\\]*)*)')/g;
+
+var setCommentRe = /^ *[*/]+ */,
+    setCommentAltRe = /^\s*\*?\/*/,
+    setCommentSplitRe = /\n/g,
+    whitespaceRe = /\s/,
+    unescapeRe = /\\(.?)/g;
+
+var unescapeMap = {
+    "0": "\0",
+    "r": "\r",
+    "n": "\n",
+    "t": "\t"
+};
+
+/**
+ * Unescapes a string.
+ * @param {string} str String to unescape
+ * @returns {string} Unescaped string
+ * @property {Object.<string,string>} map Special characters map
+ * @memberof tokenize
+ */
+function unescape(str) {
+    return str.replace(unescapeRe, function($0, $1) {
+        switch ($1) {
+            case "\\":
+            case "":
+                return $1;
+            default:
+                return unescapeMap[$1] || "";
+        }
+    });
+}
+
+tokenize.unescape = unescape;
+
+/**
+ * Gets the next token and advances.
+ * @typedef TokenizerHandleNext
+ * @type {function}
+ * @returns {string|null} Next token or `null` on eof
+ */
+
+/**
+ * Peeks for the next token.
+ * @typedef TokenizerHandlePeek
+ * @type {function}
+ * @returns {string|null} Next token or `null` on eof
+ */
+
+/**
+ * Pushes a token back to the stack.
+ * @typedef TokenizerHandlePush
+ * @type {function}
+ * @param {string} token Token
+ * @returns {undefined}
+ */
+
+/**
+ * Skips the next token.
+ * @typedef TokenizerHandleSkip
+ * @type {function}
+ * @param {string} expected Expected token
+ * @param {boolean} [optional=false] If optional
+ * @returns {boolean} Whether the token matched
+ * @throws {Error} If the token didn't match and is not optional
+ */
+
+/**
+ * Gets the comment on the previous line or, alternatively, the line comment on the specified line.
+ * @typedef TokenizerHandleCmnt
+ * @type {function}
+ * @param {number} [line] Line number
+ * @returns {string|null} Comment text or `null` if none
+ */
+
+/**
+ * Handle object returned from {@link tokenize}.
+ * @interface ITokenizerHandle
+ * @property {TokenizerHandleNext} next Gets the next token and advances (`null` on eof)
+ * @property {TokenizerHandlePeek} peek Peeks for the next token (`null` on eof)
+ * @property {TokenizerHandlePush} push Pushes a token back to the stack
+ * @property {TokenizerHandleSkip} skip Skips a token, returns its presence and advances or, if non-optional and not present, throws
+ * @property {TokenizerHandleCmnt} cmnt Gets the comment on the previous line or the line comment on the specified line, if any
+ * @property {number} line Current line number
+ */
+
+/**
+ * Tokenizes the given .proto source and returns an object with useful utility functions.
+ * @param {string} source Source contents
+ * @param {boolean} alternateCommentMode Whether we should activate alternate comment parsing mode.
+ * @returns {ITokenizerHandle} Tokenizer handle
+ */
+function tokenize(source, alternateCommentMode) {
+    /* eslint-disable callback-return */
+    source = source.toString();
+
+    var offset = 0,
+        length = source.length,
+        line = 1,
+        commentType = null,
+        commentText = null,
+        commentLine = 0,
+        commentLineEmpty = false;
+
+    var stack = [];
+
+    var stringDelim = null;
+
+    /* istanbul ignore next */
+    /**
+     * Creates an error for illegal syntax.
+     * @param {string} subject Subject
+     * @returns {Error} Error created
+     * @inner
+     */
+    function illegal(subject) {
+        return Error("illegal " + subject + " (line " + line + ")");
+    }
+
+    /**
+     * Reads a string till its end.
+     * @returns {string} String read
+     * @inner
+     */
+    function readString() {
+        var re = stringDelim === "'" ? stringSingleRe : stringDoubleRe;
+        re.lastIndex = offset - 1;
+        var match = re.exec(source);
+        if (!match)
+            throw illegal("string");
+        offset = re.lastIndex;
+        push(stringDelim);
+        stringDelim = null;
+        return unescape(match[1]);
+    }
+
+    /**
+     * Gets the character at `pos` within the source.
+     * @param {number} pos Position
+     * @returns {string} Character
+     * @inner
+     */
+    function charAt(pos) {
+        return source.charAt(pos);
+    }
+
+    /**
+     * Sets the current comment text.
+     * @param {number} start Start offset
+     * @param {number} end End offset
+     * @returns {undefined}
+     * @inner
+     */
+    function setComment(start, end) {
+        commentType = source.charAt(start++);
+        commentLine = line;
+        commentLineEmpty = false;
+        var lookback;
+        if (alternateCommentMode) {
+            lookback = 2;  // alternate comment parsing: "//" or "/*"
+        } else {
+            lookback = 3;  // "///" or "/**"
+        }
+        var commentOffset = start - lookback,
+            c;
+        do {
+            if (--commentOffset < 0 ||
+                (c = source.charAt(commentOffset)) === "\n") {
+                commentLineEmpty = true;
+                break;
+            }
+        } while (c === " " || c === "\t");
+        var lines = source
+            .substring(start, end)
+            .split(setCommentSplitRe);
+        for (var i = 0; i < lines.length; ++i)
+            lines[i] = lines[i]
+                .replace(alternateCommentMode ? setCommentAltRe : setCommentRe, "")
+                .trim();
+        commentText = lines
+            .join("\n")
+            .trim();
+    }
+
+    function isDoubleSlashCommentLine(startOffset) {
+        var endOffset = findEndOfLine(startOffset);
+
+        // see if remaining line matches comment pattern
+        var lineText = source.substring(startOffset, endOffset);
+        // look for 1 or 2 slashes since startOffset would already point past
+        // the first slash that started the comment.
+        var isComment = /^\s*\/{1,2}/.test(lineText);
+        return isComment;
+    }
+
+    function findEndOfLine(cursor) {
+        // find end of cursor's line
+        var endOffset = cursor;
+        while (endOffset < length && charAt(endOffset) !== "\n") {
+            endOffset++;
+        }
+        return endOffset;
+    }
+
+    /**
+     * Obtains the next token.
+     * @returns {string|null} Next token or `null` on eof
+     * @inner
+     */
+    function next() {
+        if (stack.length > 0)
+            return stack.shift();
+        if (stringDelim)
+            return readString();
+        var repeat,
+            prev,
+            curr,
+            start,
+            isDoc;
+        do {
+            if (offset === length)
+                return null;
+            repeat = false;
+            while (whitespaceRe.test(curr = charAt(offset))) {
+                if (curr === "\n")
+                    ++line;
+                if (++offset === length)
+                    return null;
+            }
+
+            if (charAt(offset) === "/") {
+                if (++offset === length) {
+                    throw illegal("comment");
+                }
+                if (charAt(offset) === "/") { // Line
+                    if (!alternateCommentMode) {
+                        // check for triple-slash comment
+                        isDoc = charAt(start = offset + 1) === "/";
+
+                        while (charAt(++offset) !== "\n") {
+                            if (offset === length) {
+                                return null;
+                            }
+                        }
+                        ++offset;
+                        if (isDoc) {
+                            setComment(start, offset - 1);
+                        }
+                        ++line;
+                        repeat = true;
+                    } else {
+                        // check for double-slash comments, consolidating consecutive lines
+                        start = offset;
+                        isDoc = false;
+                        if (isDoubleSlashCommentLine(offset)) {
+                            isDoc = true;
+                            do {
+                                offset = findEndOfLine(offset);
+                                if (offset === length) {
+                                    break;
+                                }
+                                offset++;
+                            } while (isDoubleSlashCommentLine(offset));
+                        } else {
+                            offset = Math.min(length, findEndOfLine(offset) + 1);
+                        }
+                        if (isDoc) {
+                            setComment(start, offset);
+                        }
+                        line++;
+                        repeat = true;
+                    }
+                } else if ((curr = charAt(offset)) === "*") { /* Block */
+                    // check for /** (regular comment mode) or /* (alternate comment mode)
+                    start = offset + 1;
+                    isDoc = alternateCommentMode || charAt(start) === "*";
+                    do {
+                        if (curr === "\n") {
+                            ++line;
+                        }
+                        if (++offset === length) {
+                            throw illegal("comment");
+                        }
+                        prev = curr;
+                        curr = charAt(offset);
+                    } while (prev !== "*" || curr !== "/");
+                    ++offset;
+                    if (isDoc) {
+                        setComment(start, offset - 2);
+                    }
+                    repeat = true;
+                } else {
+                    return "/";
+                }
+            }
+        } while (repeat);
+
+        // offset !== length if we got here
+
+        var end = offset;
+        delimRe.lastIndex = 0;
+        var delim = delimRe.test(charAt(end++));
+        if (!delim)
+            while (end < length && !delimRe.test(charAt(end)))
+                ++end;
+        var token = source.substring(offset, offset = end);
+        if (token === "\"" || token === "'")
+            stringDelim = token;
+        return token;
+    }
+
+    /**
+     * Pushes a token back to the stack.
+     * @param {string} token Token
+     * @returns {undefined}
+     * @inner
+     */
+    function push(token) {
+        stack.push(token);
+    }
+
+    /**
+     * Peeks for the next token.
+     * @returns {string|null} Token or `null` on eof
+     * @inner
+     */
+    function peek() {
+        if (!stack.length) {
+            var token = next();
+            if (token === null)
+                return null;
+            push(token);
+        }
+        return stack[0];
+    }
+
+    /**
+     * Skips a token.
+     * @param {string} expected Expected token
+     * @param {boolean} [optional=false] Whether the token is optional
+     * @returns {boolean} `true` when skipped, `false` if not
+     * @throws {Error} When a required token is not present
+     * @inner
+     */
+    function skip(expected, optional) {
+        var actual = peek(),
+            equals = actual === expected;
+        if (equals) {
+            next();
+            return true;
+        }
+        if (!optional)
+            throw illegal("token '" + actual + "', '" + expected + "' expected");
+        return false;
+    }
+
+    /**
+     * Gets a comment.
+     * @param {number} [trailingLine] Line number if looking for a trailing comment
+     * @returns {string|null} Comment text
+     * @inner
+     */
+    function cmnt(trailingLine) {
+        var ret = null;
+        if (trailingLine === undefined) {
+            if (commentLine === line - 1 && (alternateCommentMode || commentType === "*" || commentLineEmpty)) {
+                ret = commentText;
+            }
+        } else {
+            /* istanbul ignore else */
+            if (commentLine < trailingLine) {
+                peek();
+            }
+            if (commentLine === trailingLine && !commentLineEmpty && (alternateCommentMode || commentType === "/")) {
+                ret = commentText;
+            }
+        }
+        return ret;
+    }
+
+    return Object.defineProperty({
+        next: next,
+        peek: peek,
+        push: push,
+        skip: skip,
+        cmnt: cmnt
+    }, "line", {
+        get: function() { return line; }
+    });
+    /* eslint-enable callback-return */
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/type.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/type.js
new file mode 100644
index 0000000..464d99a
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/type.js
@@ -0,0 +1,576 @@
+/**
+ * Created by zhangmiao on 2018/3/13.
+ */
+
+
+module.exports = Type;
+
+var Namespace = require("./namespace");
+((Type.prototype = Object.create(Namespace.prototype)).constructor = Type).className = "Type";
+
+
+var Enum,
+    Field,
+    Message,
+    OneOf,
+    Writer,
+    Reader,
+    util,
+    verifier,
+    encoder,
+    decoder,
+    Service,
+    wrappers,
+    converter,
+    MapField;
+
+
+
+function Type(name, options) {
+    Namespace.call(this, name, options);
+
+    /**
+     * Message fields.
+     * @type {Object.<string,Field>}
+     */
+    this.fields = {};  // toJSON, marker
+
+    /**
+     * Oneofs declared within this namespace, if any.
+     * @type {Object.<string,OneOf>}
+     */
+    this.oneofs = undefined; // toJSON
+
+    /**
+     * Extension ranges, if any.
+     * @type {number[][]}
+     */
+    this.extensions = undefined; // toJSON
+
+    /**
+     * Reserved ranges, if any.
+     * @type {Array.<number[]|string>}
+     */
+    this.reserved = undefined; // toJSON
+
+    /*?
+     * Whether this type is a legacy group.
+     * @type {boolean|undefined}
+     */
+    this.group = undefined; // toJSON 这个可能不需要,因为不支持
+
+    /**
+     * Cached fields by id.
+     * @type {Object.<number,Field>|null}
+     * @private
+     */
+    this._fieldsById = null;
+
+    /**
+     * Cached fields as an array.
+     * @type {Field[]|null}
+     * @private
+     */
+    this._fieldsArray = null;
+
+    /**
+     * Cached oneofs as an array.
+     * @type {OneOf[]|null}
+     * @private
+     */
+    this._oneofsArray = null;
+
+    /**
+     * Cached constructor.
+     * @type {Constructor<{}>}
+     * @private
+     */
+    this._ctor = null;
+}
+
+
+Object.defineProperties(Type.prototype, {
+
+    /**
+     * Message fields by id.
+     * @name Type#fieldsById
+     * @type {Object.<number,Field>}
+     * @readonly
+     */
+    fieldsById: {
+        get: function() {
+
+            /* istanbul ignore if */
+            if (this._fieldsById)
+                return this._fieldsById;
+
+            this._fieldsById = {};
+            for (var names = Object.keys(this.fields), i = 0; i < names.length; ++i) {
+                var field = this.fields[names[i]],
+                    id = field.id;
+
+                /* istanbul ignore if */
+                if (this._fieldsById[id])
+                    throw Error("duplicate id " + id + " in " + this);
+
+                this._fieldsById[id] = field;
+            }
+            return this._fieldsById;
+        }
+    },
+
+    /**
+     * Fields of this message as an array for iteration.
+     * @name Type#fieldsArray
+     * @type {Field[]}
+     * @readonly
+     */
+    fieldsArray: {
+        get: function() {
+            return this._fieldsArray || (this._fieldsArray = util.toArray(this.fields));
+        }
+    },
+
+    /**
+     * Oneofs of this message as an array for iteration.
+     * @name Type#oneofsArray
+     * @type {OneOf[]}
+     * @readonly
+     */
+    oneofsArray: {
+        get: function() {
+            return this._oneofsArray || (this._oneofsArray = util.toArray(this.oneofs));
+        }
+    },
+
+    /**
+     * The registered constructor, if any registered, otherwise a generic constructor.
+     * Assigning a function replaces the internal constructor. If the function does not extend {@link Message} yet, its prototype will be setup accordingly and static methods will be populated. If it already extends {@link Message}, it will just replace the internal constructor.
+     * @name Type#ctor
+     * @type {Constructor<{}>}
+     */
+    ctor: {
+        get: function() {
+            return this._ctor || (this.ctor = Type.generateConstructor(this));
+        },
+        set: function(ctor) {
+
+            // Ensure proper prototype
+            var prototype = ctor.prototype;
+            if (!(prototype instanceof Message)) {
+                (ctor.prototype = new Message()).constructor = ctor;
+                util.merge(ctor.prototype, prototype);
+            }
+
+            // Classes and messages reference their reflected type
+            ctor.$type = ctor.prototype.$type = this;
+
+            // Mix in static methods
+            util.merge(ctor, Message, true);
+            util.merge(ctor.prototype, Message, true);
+
+
+            this._ctor = ctor;
+
+            // Messages have non-enumerable default values on their prototype
+            var i = 0;
+            for (; i < /* initializes */ this.fieldsArray.length; ++i)
+                this._fieldsArray[i].resolve(); // ensures a proper value
+
+            // Messages have non-enumerable getters and setters for each virtual oneof field
+            var ctorProperties = {};
+            for (i = 0; i < /* initializes */ this.oneofsArray.length; ++i) {
+                var oneofName = this._oneofsArray[i].resolve().name;
+
+                var oneOfGetAndSet = (function(fieldNames){
+                    var fieldMap = {};
+                    for (var i = 0; i < fieldNames.length; ++i)
+                        fieldMap[fieldNames[i]] = 0;
+
+                    return {
+                        setter : function (name){
+                            if(fieldNames.indexOf(name) < 0) return;
+                            fieldMap[name] = 1;
+                            for (var i = 0; i < fieldNames.length; ++i)
+                                if (fieldNames[i] !== name)
+                                    delete this[/*"_"+*/fieldNames[i]];
+                        },
+
+                        getter : function (){
+                            for (var keys = Object.keys(this), i = keys.length - 1; i > -1; --i)
+                                if (fieldMap[keys[i]] === 1 && this[keys[i]] !== undefined && this[keys[i]] !== null)
+                                    return keys[i];
+                        }
+
+                    }
+                })(this._oneofsArray[i].oneof);
+
+                ctorProperties[oneofName] = {
+                    get: oneOfGetAndSet.getter,
+                    set: oneOfGetAndSet.setter
+                };
+                //var fieldNames = this._oneofsArray[i].oneof;
+                //for (var  j = 0 ; j < fieldNames.length; j++){
+                //    var fieldName = fieldNames[j];
+                //    ctorProperties[fieldName] = {
+                //        set : (function(oneofName, fieldName){
+                //            return function (value){
+                //                this[oneofName] = fieldName;
+                //                this["_"+fieldName] = value;
+                //            }
+                //        })(oneofName , fieldName),
+                //        get : (function(fieldName){
+                //            return function (){
+                //                return this["_"+fieldName];
+                //            }
+                //        })(fieldName)
+                //    }
+                //}
+            }
+
+            if (i) {
+                //util.merge(ctor.prototype, ctorProperties, true);
+                Object.defineProperties(ctor.prototype, ctorProperties);
+            }
+        }
+    }
+});
+
+
+//生成一个构造函数
+Type.generateConstructor = function generateConstructor(mtype) {
+    return function (p){
+        for (var i = 0, field; i < mtype.fieldsArray.length; i++){
+            if((field = mtype._fieldsArray[i]).map){
+                this[field.name] = {};
+            }else if(field.repeated){
+                this[field.name] = [];
+            }
+        }
+
+        if(p){
+            for (var  ks = Object.keys(p), j = 0; j < ks.length; ++j) {
+                if (p[ks[j]] != null) {
+                    this[ks[j]] = p[ks[j]]
+                }
+            }
+        }
+    };
+};
+
+
+function clearCache(type) {
+    type._fieldsById = type._fieldsArray = type._oneofsArray = null;
+    delete type.encode;
+    delete type.decode;
+    delete type.verify;
+    return type;
+}
+
+
+
+Type.fromJSON = function fromJSON(name, json) {
+    var type = new Type(name, json.options);
+    type.extensions = json.extensions;
+    type.reserved = json.reserved;
+    var names = Object.keys(json.fields),
+        i = 0;
+    for (; i < names.length; ++i)
+        type.add(
+            ( typeof json.fields[names[i]].keyType !== "undefined"
+                ? MapField.fromJSON
+                : Field.fromJSON )(names[i], json.fields[names[i]])
+        );
+    if (json.oneofs)
+        for (names = Object.keys(json.oneofs), i = 0; i < names.length; ++i)
+            type.add(OneOf.fromJSON(names[i], json.oneofs[names[i]]));
+    if (json.nested)
+        for (names = Object.keys(json.nested), i = 0; i < names.length; ++i) {
+            var nested = json.nested[names[i]];
+            type.add( // most to least likely
+                ( nested.id !== undefined
+                    ? Field.fromJSON
+                    : nested.fields !== undefined
+                    ? Type.fromJSON
+                    : nested.values !== undefined
+                    ? Enum.fromJSON
+                    : nested.methods !== undefined
+                    ? Service.fromJSON
+                    : Namespace.fromJSON )(names[i], nested)
+            );
+        }
+    if (json.extensions && json.extensions.length)
+        type.extensions = json.extensions;
+    if (json.reserved && json.reserved.length)
+        type.reserved = json.reserved;
+    if (json.group)
+        type.group = true;
+    if (json.comment)
+        type.comment = json.comment;
+    return type;
+};
+
+Type.prototype.toJSON = function toJSON(toJSONOptions) {
+    var inherited = Namespace.prototype.toJSON.call(this, toJSONOptions);
+    var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+
+    return {
+        "options"       : inherited && inherited.options || undefined,
+        "oneofs"        : Namespace.arrayToJSON(this.oneofsArray, toJSONOptions),
+        "fields"        : Namespace.arrayToJSON(this.fieldsArray.filter(function(obj) { return !obj.declaringField; }), toJSONOptions) || {},
+        "extensions"    : this.extensions && this.extensions.length ? this.extensions : undefined,
+        "reserved"      : this.reserved && this.reserved.length ? this.reserved : undefined,
+        "group"         : this.group || undefined,
+        "nested"        : inherited && inherited.nested || undefined,
+        "comment"       : keepComments ? this.comment : undefined
+    };
+};
+
+Type.prototype.resolveAll = function resolveAll() {
+    var fields = this.fieldsArray, i = 0;
+    while (i < fields.length)
+        fields[i++].resolve();
+    var oneofs = this.oneofsArray; i = 0;
+    while (i < oneofs.length)
+        oneofs[i++].resolve();
+    return Namespace.prototype.resolveAll.call(this);
+};
+
+Type.prototype.get = function get(name) {
+    return this.fields[name]
+        || this.oneofs && this.oneofs[name]
+        || this.nested && this.nested[name]
+        || null;
+};
+
+Type.prototype.add = function add(object) {
+
+    if (this.get(object.name))
+        throw Error("duplicate name '" + object.name + "' in " + this);
+
+    if (object instanceof Field && object.extend === undefined) {
+        if (this._fieldsById && this._fieldsById[object.id])
+            throw Error("duplicate id " + object.id + " in " + this);
+        if (this.isReservedId(object.id))
+            throw Error("id " + object.id + " is reserved in " + this);
+        if (this.isReservedName(object.name))
+            throw Error("name '" + object.name + "' is reserved in " + this);
+
+        if (object.parent)
+            object.parent.remove(object);
+        this.fields[object.name] = object;
+        object.message = this;
+        object.onAdd(this);
+        return clearCache(this);
+    }
+    if (object instanceof OneOf) {
+        if (!this.oneofs)
+            this.oneofs = {};
+        this.oneofs[object.name] = object;
+        object.onAdd(this);
+        return clearCache(this);
+    }
+    return Namespace.prototype.add.call(this, object);
+};
+
+Type.prototype.remove = function remove(object) {
+    if (object instanceof Field && object.extend === undefined) {
+        // See Type#add for the reason why extension fields are excluded here.
+
+        /* istanbul ignore if */
+        if (!this.fields || this.fields[object.name] !== object)
+            throw Error(object + " is not a member of " + this);
+
+        delete this.fields[object.name];
+        object.parent = null;
+        object.onRemove(this);
+        return clearCache(this);
+    }
+    if (object instanceof OneOf) {
+
+        /* istanbul ignore if */
+        if (!this.oneofs || this.oneofs[object.name] !== object)
+            throw Error(object + " is not a member of " + this);
+
+        delete this.oneofs[object.name];
+        object.parent = null;
+        object.onRemove(this);
+        return clearCache(this);
+    }
+    return Namespace.prototype.remove.call(this, object);
+};
+
+Type.prototype.isReservedId = function isReservedId(id) {
+    return Namespace.isReservedId(this.reserved, id);
+};
+
+Type.prototype.isReservedName = function isReservedName(name) {
+    return Namespace.isReservedName(this.reserved, name);
+};
+
+Type.prototype.create = function create(properties) {
+    return new this.ctor(properties);
+};
+
+
+Type.prototype.setup = function setup() {
+    // Sets up everything at once so that the prototype chain does not have to be re-evaluated
+    // multiple times (V8, soft-deopt prototype-check).
+
+    var fullName = this.fullName,
+        types    = [];
+    for (var i = 0; i < /* initializes */ this.fieldsArray.length; ++i)
+        types.push(this._fieldsArray[i].resolve().resolvedType);
+
+
+    this.decode = decoder(this)({
+        Reader : Reader,
+        types  : types,
+        util   : util
+    });
+    this.verify = verifier(this)({
+        types : types,
+        util  : util
+    });
+
+    this.fromObject = converter.fromObject(this)({
+        types : types,
+        util  : util
+    });
+    this.toObject = converter.toObject(this)({
+        types : types,
+        util  : util
+    });
+
+    // Inject custom wrappers for common types
+    var wrapper = wrappers[fullName];
+    if (wrapper) {
+        var originalThis = Object.create(this);
+        // if (wrapper.fromObject) {
+        originalThis.fromObject = this.fromObject;
+        this.fromObject = wrapper.fromObject.bind(originalThis);
+        // }
+        // if (wrapper.toObject) {
+        originalThis.toObject = this.toObject;
+        this.toObject = wrapper.toObject.bind(originalThis);
+        // }
+    }
+
+    return this;
+};
+
+/**
+ * Encodes a message of this type. Does not implicitly {@link Type#verify|verify} messages.
+ * @param {Message<{}>|Object.<string,*>} message Message instance or plain object
+ * @param {Writer} [writer] Writer to encode to
+ * @returns {Writer} writer
+ */
+
+Type.prototype.encode = function encode_setup(message, writer) {
+    return this.setup().encode(message, writer); // overrides this method
+};
+
+/**
+ * Encodes a message of this type preceeded by its byte length as a varint. Does not implicitly {@link Type#verify|verify} messages.
+ * @param {Message<{}>|Object.<string,*>} message Message instance or plain object
+ * @param {Writer} [writer] Writer to encode to
+ * @returns {Writer} writer
+ */
+Type.prototype.encodeDelimited = function encodeDelimited(message, writer) {
+    return this.encode(message, writer && writer.len ? writer.fork() : writer).ldelim();
+};
+
+/**
+ * Decodes a message of this type.
+ * @param {Reader|Uint8Array|ArrayBuffer} reader Reader or buffer to decode from
+ * @param {number} [length] Length of the message, if known beforehand
+ * @returns {Message<{}>} Decoded message
+ * @throws {Error} If the payload is not a reader or valid buffer
+ */
+
+Type.prototype.decode = function decode_setup(reader, length) {
+    return this.setup().decode(reader, length); // overrides this method
+};
+/**
+ * Decodes a message of this type preceeded by its byte length as a varint.
+ * @param {Reader|Uint8Array} reader Reader or buffer to decode from
+ * @returns {Message<{}>} Decoded message
+ * @throws {Error} If the payload is not a reader or valid buffer
+ * @throws {util.ProtocolError} If required fields are missing
+ */
+Type.prototype.decodeDelimited = function decodeDelimited(reader) {
+    if (!(reader instanceof Reader))
+        reader = Reader.create(reader);
+    return this.decode(reader, reader.uint32());
+};
+
+/**
+ * Verifies that field values are valid and that required fields are present.
+ * @param {Object.<string,*>} message Plain object to verify
+ * @returns {null|string} `null` if valid, otherwise the reason why it is not
+ */
+
+Type.prototype.verify = function verify_setup(message) {
+    return this.setup().verify(message); // overrides this method
+};
+
+/**
+ * Creates a new message of this type from a plain object. Also converts values to their respective internal types.
+ * @param {Object.<string,*>} object Plain object to convert
+ * @returns {Message<{}>} Message instance
+ */
+Type.prototype.fromObject = function fromObject(object) {
+    return this.setup().fromObject(object);
+};
+
+/**
+ * Conversion options as used by {@link Type#toObject} and {@link Message.toObject}.
+ * @interface IConversionOptions
+ * @property {Function} [longs] Long conversion type.
+ * Valid values are `String` and `Number` (the global types).
+ * Defaults to copy the present value, which is a possibly unsafe number without and a {@link Long} with a long library.
+ * @property {Function} [enums] Enum value conversion type.
+ * Only valid value is `String` (the global type).
+ * Defaults to copy the present value, which is the numeric id.
+ * @property {Function} [bytes] Bytes value conversion type.
+ * Valid values are `Array` and (a base64 encoded) `String` (the global types).
+ * Defaults to copy the present value, which usually is a Buffer under node and an Uint8Array in the browser.
+ * @property {boolean} [defaults=false] Also sets default values on the resulting object
+ * @property {boolean} [arrays=false] Sets empty arrays for missing repeated fields even if `defaults=false`
+ * @property {boolean} [objects=false] Sets empty objects for missing map fields even if `defaults=false`
+ * @property {boolean} [oneofs=false] Includes virtual oneof properties set to the present field's name, if any
+ * @property {boolean} [json=false] Performs additional JSON compatibility conversions, i.e. NaN and Infinity to strings
+ */
+
+/**
+ * Creates a plain object from a message of this type. Also converts values to other types if specified.
+ * @param {Message<{}>} message Message instance
+ * @param {IConversionOptions} [options] Conversion options
+ * @returns {Object.<string,*>} Plain object
+ */
+Type.prototype.toObject = function toObject(message, options) {
+    return this.setup().toObject(message, options);
+};
+
+Type.d = function decorateType(typeName) {
+    return function typeDecorator(target) {
+        util.decorateType(target, typeName);
+    };
+};
+
+Type._configure = function (){
+    Enum      = require("./enum");
+    Field     = require("./field");
+    Message   = require("./message");
+    OneOf     = require("./oneof");
+    Writer    = require("./writer");
+    Reader    = require("./reader");
+    util      = require("./util");
+    verifier  = require("./verifier");
+    decoder   = require("./decoder");
+    Service   = require("./service");
+    wrappers  = require("./wrappers");
+    converter = require("./converter");
+    MapField  = require("./mapField");
+
+};
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/types.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/types.js
new file mode 100644
index 0000000..6c0c93f
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/types.js
@@ -0,0 +1,199 @@
+"use strict";
+
+/**
+ * Common type constants.
+ * @namespace
+ */
+var types = module.exports;
+var util = require("./util");
+
+var s = [
+    "double",   // 0
+    "float",    // 1
+    "int32",    // 2
+    "uint32",   // 3
+    "sint32",   // 4
+    "fixed32",  // 5
+    "sfixed32", // 6
+    "int64",    // 7
+    "uint64",   // 8
+    "sint64",   // 9
+    "fixed64",  // 10
+    "sfixed64", // 11
+    "bool",     // 12
+    "string",   // 13
+    "bytes"     // 14
+];
+
+function bake(values, offset) {
+    var i = 0, o = {};
+    offset |= 0;
+    while (i < values.length) o[s[i + offset]] = values[i++];
+    return o;
+}
+
+/**
+ * Basic type wire types.
+ * @type {Object.<string,number>}
+ * @const
+ * @property {number} double=1 Fixed64 wire type
+ * @property {number} float=5 Fixed32 wire type
+ * @property {number} int32=0 Varint wire type
+ * @property {number} uint32=0 Varint wire type
+ * @property {number} sint32=0 Varint wire type
+ * @property {number} fixed32=5 Fixed32 wire type
+ * @property {number} sfixed32=5 Fixed32 wire type
+ * @property {number} int64=0 Varint wire type
+ * @property {number} uint64=0 Varint wire type
+ * @property {number} sint64=0 Varint wire type
+ * @property {number} fixed64=1 Fixed64 wire type
+ * @property {number} sfixed64=1 Fixed64 wire type
+ * @property {number} bool=0 Varint wire type
+ * @property {number} string=2 Ldelim wire type
+ * @property {number} bytes=2 Ldelim wire type
+ */
+types.basic = bake([
+    /* double   */ 1,
+    /* float    */ 5,
+    /* int32    */ 0,
+    /* uint32   */ 0,
+    /* sint32   */ 0,
+    /* fixed32  */ 5,
+    /* sfixed32 */ 5,
+    /* int64    */ 0,
+    /* uint64   */ 0,
+    /* sint64   */ 0,
+    /* fixed64  */ 1,
+    /* sfixed64 */ 1,
+    /* bool     */ 0,
+    /* string   */ 2,
+    /* bytes    */ 2
+]);
+
+/**
+ * Basic type defaults.
+ * @type {Object.<string,*>}
+ * @const
+ * @property {number} double=0 Double default
+ * @property {number} float=0 Float default
+ * @property {number} int32=0 Int32 default
+ * @property {number} uint32=0 Uint32 default
+ * @property {number} sint32=0 Sint32 default
+ * @property {number} fixed32=0 Fixed32 default
+ * @property {number} sfixed32=0 Sfixed32 default
+ * @property {number} int64=0 Int64 default
+ * @property {number} uint64=0 Uint64 default
+ * @property {number} sint64=0 Sint32 default
+ * @property {number} fixed64=0 Fixed64 default
+ * @property {number} sfixed64=0 Sfixed64 default
+ * @property {boolean} bool=false Bool default
+ * @property {string} string="" String default
+ * @property {Array.<number>} bytes=Array(0) Bytes default
+ * @property {null} message=null Message default
+ */
+types.defaults = bake([
+    /* double   */ 0,
+    /* float    */ 0,
+    /* int32    */ 0,
+    /* uint32   */ 0,
+    /* sint32   */ 0,
+    /* fixed32  */ 0,
+    /* sfixed32 */ 0,
+    /* int64    */ 0,
+    /* uint64   */ 0,
+    /* sint64   */ 0,
+    /* fixed64  */ 0,
+    /* sfixed64 */ 0,
+    /* bool     */ false,
+    /* string   */ "",
+    /* bytes    */ util.emptyArray,
+    /* message  */ null
+]);
+
+/**
+ * Basic long type wire types.
+ * @type {Object.<string,number>}
+ * @const
+ * @property {number} int64=0 Varint wire type
+ * @property {number} uint64=0 Varint wire type
+ * @property {number} sint64=0 Varint wire type
+ * @property {number} fixed64=1 Fixed64 wire type
+ * @property {number} sfixed64=1 Fixed64 wire type
+ */
+types.long = bake([
+    /* int64    */ 0,
+    /* uint64   */ 0,
+    /* sint64   */ 0,
+    /* fixed64  */ 1,
+    /* sfixed64 */ 1
+], 7);
+
+/**
+ * Allowed types for map keys with their associated wire type.
+ * @type {Object.<string,number>}
+ * @const
+ * @property {number} int32=0 Varint wire type
+ * @property {number} uint32=0 Varint wire type
+ * @property {number} sint32=0 Varint wire type
+ * @property {number} fixed32=5 Fixed32 wire type
+ * @property {number} sfixed32=5 Fixed32 wire type
+ * @property {number} int64=0 Varint wire type
+ * @property {number} uint64=0 Varint wire type
+ * @property {number} sint64=0 Varint wire type
+ * @property {number} fixed64=1 Fixed64 wire type
+ * @property {number} sfixed64=1 Fixed64 wire type
+ * @property {number} bool=0 Varint wire type
+ * @property {number} string=2 Ldelim wire type
+ */
+types.mapKey = bake([
+    /* int32    */ 0,
+    /* uint32   */ 0,
+    /* sint32   */ 0,
+    /* fixed32  */ 5,
+    /* sfixed32 */ 5,
+    /* int64    */ 0,
+    /* uint64   */ 0,
+    /* sint64   */ 0,
+    /* fixed64  */ 1,
+    /* sfixed64 */ 1,
+    /* bool     */ 0,
+    /* string   */ 2
+], 2);
+
+/**
+ * Allowed types for packed repeated fields with their associated wire type.
+ * @type {Object.<string,number>}
+ * @const
+ * @property {number} double=1 Fixed64 wire type
+ * @property {number} float=5 Fixed32 wire type
+ * @property {number} int32=0 Varint wire type
+ * @property {number} uint32=0 Varint wire type
+ * @property {number} sint32=0 Varint wire type
+ * @property {number} fixed32=5 Fixed32 wire type
+ * @property {number} sfixed32=5 Fixed32 wire type
+ * @property {number} int64=0 Varint wire type
+ * @property {number} uint64=0 Varint wire type
+ * @property {number} sint64=0 Varint wire type
+ * @property {number} fixed64=1 Fixed64 wire type
+ * @property {number} sfixed64=1 Fixed64 wire type
+ * @property {number} bool=0 Varint wire type
+ */
+types.packed = bake([
+    /* double   */ 1,
+    /* float    */ 5,
+    /* int32    */ 0,
+    /* uint32   */ 0,
+    /* sint32   */ 0,
+    /* fixed32  */ 5,
+    /* sfixed32 */ 5,
+    /* int64    */ 0,
+    /* uint64   */ 0,
+    /* sint64   */ 0,
+    /* fixed64  */ 1,
+    /* sfixed64 */ 1,
+    /* bool     */ 0
+]);
+
+types._configure = function (){
+    util = require('./util');
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/typescript.jsdoc b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/typescript.jsdoc
new file mode 100644
index 0000000..9a67101
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/typescript.jsdoc
@@ -0,0 +1,15 @@
+/**
+ * Constructor type.
+ * @interface Constructor
+ * @extends Function
+ * @template T
+ * @tstype new(...params: any[]): T; prototype: T;
+ */
+
+/**
+ * Properties type.
+ * @typedef Properties
+ * @template T
+ * @type {Object.<string,*>}
+ * @tstype { [P in keyof T]?: T[P] }
+ */
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/utf8.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/utf8.js
new file mode 100644
index 0000000..d0a1c1a
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/utf8.js
@@ -0,0 +1,105 @@
+"use strict";
+
+/**
+ * A minimal UTF8 implementation for number arrays.
+ * @memberof util
+ * @namespace
+ */
+var utf8 = module.exports;
+
+/**
+ * Calculates the UTF8 byte length of a string.
+ * @param {string} string String
+ * @returns {number} Byte length
+ */
+utf8.length = function utf8_length(string) {
+    var len = 0,
+        c = 0;
+    for (var i = 0; i < string.length; ++i) {
+        c = string.charCodeAt(i);
+        if (c < 128)
+            len += 1;
+        else if (c < 2048)
+            len += 2;
+        else if ((c & 0xFC00) === 0xD800 && (string.charCodeAt(i + 1) & 0xFC00) === 0xDC00) {
+            ++i;
+            len += 4;
+        } else
+            len += 3;
+    }
+    return len;
+};
+
+/**
+ * Reads UTF8 bytes as a string.
+ * @param {Uint8Array} buffer Source buffer
+ * @param {number} start Source start
+ * @param {number} end Source end
+ * @returns {string} String read
+ */
+utf8.read = function utf8_read(buffer, start, end) {
+    var len = end - start;
+    if (len < 1)
+        return "";
+    var parts = null,
+        chunk = [],
+        i = 0, // char offset
+        t;     // temporary
+    while (start < end) {
+        t = buffer[start++];
+        if (t < 128)
+            chunk[i++] = t;
+        else if (t > 191 && t < 224)
+            chunk[i++] = (t & 31) << 6 | buffer[start++] & 63;
+        else if (t > 239 && t < 365) {
+            t = ((t & 7) << 18 | (buffer[start++] & 63) << 12 | (buffer[start++] & 63) << 6 | buffer[start++] & 63) - 0x10000;
+            chunk[i++] = 0xD800 + (t >> 10);
+            chunk[i++] = 0xDC00 + (t & 1023);
+        } else
+            chunk[i++] = (t & 15) << 12 | (buffer[start++] & 63) << 6 | buffer[start++] & 63;
+        if (i > 8191) {
+            (parts || (parts = [])).push(String.fromCharCode.apply(String, chunk));
+            i = 0;
+        }
+    }
+    if (parts) {
+        if (i)
+            parts.push(String.fromCharCode.apply(String, chunk.slice(0, i)));
+        return parts.join("");
+    }
+    return String.fromCharCode.apply(String, chunk.slice(0, i));
+};
+
+/**
+ * Writes a string as UTF8 bytes.
+ * @param {string} string Source string
+ * @param {Uint8Array} buffer Destination buffer
+ * @param {number} offset Destination offset
+ * @returns {number} Bytes written
+ */
+utf8.write = function utf8_write(string, buffer, offset) {
+    var start = offset,
+        c1, // character 1
+        c2; // character 2
+    for (var i = 0; i < string.length; ++i) {
+        c1 = string.charCodeAt(i);
+        if (c1 < 128) {
+            buffer[offset++] = c1;
+        } else if (c1 < 2048) {
+            buffer[offset++] = c1 >> 6       | 192;
+            buffer[offset++] = c1       & 63 | 128;
+        } else if ((c1 & 0xFC00) === 0xD800 && ((c2 = string.charCodeAt(i + 1)) & 0xFC00) === 0xDC00) {
+            c1 = 0x10000 + ((c1 & 0x03FF) << 10) + (c2 & 0x03FF);
+            ++i;
+            buffer[offset++] = c1 >> 18      | 240;
+            buffer[offset++] = c1 >> 12 & 63 | 128;
+            buffer[offset++] = c1 >> 6  & 63 | 128;
+            buffer[offset++] = c1       & 63 | 128;
+        } else {
+            buffer[offset++] = c1 >> 12      | 224;
+            buffer[offset++] = c1 >> 6  & 63 | 128;
+            buffer[offset++] = c1       & 63 | 128;
+        }
+    }
+    return offset - start;
+};
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/util.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/util.js
new file mode 100644
index 0000000..6240e91
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/util.js
@@ -0,0 +1,278 @@
+/**
+ * Created by zhangmiao on 2018/3/12.
+ */
+var util = module.exports;
+
+var roots = require("./roots");
+util.LongBits = require("./longBits");
+util.Long  = require("./long");
+util.pool = require('./pool');
+util.float = require('./float');
+util.asPromise = require('./asPromise');
+util.EventEmitter = require('./EventEmitter');
+util.path = require('./path');
+util.base64 =require('./base64');
+util.utf8 = require('./utf8');
+
+util.compareFieldsById = function compareFieldsById(a, b){
+    return a.id - b.id;
+};
+
+util.toArray = function toArray(object) {
+    if (object) {
+        var keys  = Object.keys(object),
+            array = new Array(keys.length),
+            index = 0;
+        while (index < keys.length)
+            array[index] = object[keys[index++]];
+        return array;
+    }
+    return [];
+};
+
+util.toObject = function toObject(array) {
+    var object = {},
+        index  = 0;
+    while (index < array.length) {
+        var key = array[index++],
+            val = array[index++];
+        if (val !== undefined)
+            object[key] = val;
+    }
+    return object;
+};
+
+util.isString = function isString(value) {
+    return typeof value === "string" || value instanceof String;
+};
+
+var safePropBackslashRe = /\\/g,
+    safePropQuoteRe     = /"/g;
+
+/**
+ * Tests whether the specified name is a reserved word in JS.
+ * @param {string} name Name to test
+ * @returns {boolean} `true` if reserved, otherwise `false`
+ */
+util.isReserved = function isReserved(name) {
+    return /^(?:do|if|in|for|let|new|try|var|case|else|enum|eval|false|null|this|true|void|with|break|catch|class|const|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$/.test(name);
+};
+
+util.isObject = function isObject(value) {
+    return value && typeof value === "object";
+};
+
+util.Array = typeof Uint8Array !== "undefined" ? Uint8Array /* istanbul ignore next */ : Array;
+
+util.oneOfGetter = function getOneOf(fieldNames) {
+    var fieldMap = {};
+    for (var i = 0; i < fieldNames.length; ++i)
+        fieldMap[fieldNames[i]] = 1;
+
+    /**
+     * @returns {string|undefined} Set field name, if any
+     * @this Object
+     * @ignore
+     */
+    return function() { // eslint-disable-line consistent-return
+        for (var keys = Object.keys(this), i = keys.length - 1; i > -1; --i)
+            if (fieldMap[keys[i]] === 1 && this[keys[i]] !== undefined && this[keys[i]] !== null)
+                return keys[i];
+    };
+};
+
+util.oneOfSetter = function setOneOf(fieldNames) {
+
+    /**
+     * @param {string} name Field name
+     * @returns {undefined}
+     * @this Object
+     * @ignore
+     */
+    return function(name) {
+        for (var i = 0; i < fieldNames.length; ++i)
+            if (fieldNames[i] !== name)
+                delete this[/*"_"+*/fieldNames[i]];//设置为私有属性
+    };
+};
+
+
+util.merge = function merge(dst, src, ifNotSet) { // used by converters
+    for (var keys = Object.keys(src), i = 0; i < keys.length; ++i)
+        if (dst[keys[i]] === undefined || !ifNotSet)
+            dst[keys[i]] = src[keys[i]];
+    return dst;
+};
+
+util.decorateType = function decorateType(ctor, typeName) {
+
+    /* istanbul ignore if */
+    if (ctor.$type) {
+        if (typeName && ctor.$type.name !== typeName) {
+            util.decorateRoot.remove(ctor.$type);
+            ctor.$type.name = typeName;
+            util.decorateRoot.add(ctor.$type);
+        }
+        return ctor.$type;
+    }
+
+    /* istanbul ignore next */
+    if (!Type)
+        Type = require("./type");
+
+    var type = new Type(typeName || ctor.name);
+    util.decorateRoot.add(type);
+    type.ctor = ctor; // sets up .encode, .decode etc.
+    Object.defineProperty(ctor, "$type", { value: type, enumerable: false });
+    Object.defineProperty(ctor.prototype, "$type", { value: type, enumerable: false });
+    return type;
+};
+
+util.emptyArray = Object.freeze ? Object.freeze([]) : /* istanbul ignore next */ []; // used on prototypes
+
+util.emptyObject = Object.freeze ? Object.freeze({}) : /* istanbul ignore next */ {}; // used on prototypes
+
+util.longToHash = function longToHash(value) {
+    return value
+        ? util.LongBits.from(value).toHash()
+        : util.LongBits.zeroHash;
+};
+
+util.copy = function(obj){
+    if(typeof obj != 'object'){
+        return obj;
+    }
+    var  newObj = {};
+    for (var  attr in obj) {
+        newObj[attr] = obj[attr];
+    }
+    return newObj;
+};
+
+function deepCopy(obj){
+    if(typeof obj != 'object'){
+        return obj;
+    }
+    var newobj = {};
+    for ( var attr in obj) {
+        newobj[attr] = deepCopy(obj[attr]);
+    }
+    return newobj;
+}
+
+util.deepCopy = deepCopy;
+
+util.ProtocolError =function newError(name) {
+
+    function CustomError(message, properties) {
+
+        if (!(this instanceof CustomError))
+            return new CustomError(message, properties);
+
+        // Error.call(this, message);
+        // ^ just returns a new error instance because the ctor can be called as a function
+
+        Object.defineProperty(this, "message", { get: function() { return message; } });
+
+        /* istanbul ignore next */
+        if (Error.captureStackTrace) // node
+            Error.captureStackTrace(this, CustomError);
+        else
+            Object.defineProperty(this, "stack", { value: (new Error()).stack || "" });
+
+        if (properties)
+            merge(this, properties);
+    }
+
+    (CustomError.prototype = Object.create(Error.prototype)).constructor = CustomError;
+
+    Object.defineProperty(CustomError.prototype, "name", { get: function() { return name; } });
+
+    CustomError.prototype.toString = function toString() {
+        return this.name + ": " + this.message;
+    };
+
+    return CustomError;
+}
+
+util.toJSONOptions = {
+    longs: String,
+    enums: String,
+    bytes: String,
+    json: true
+};
+
+util.Buffer = (function() {
+    return null;
+})();
+
+
+util.newBuffer = function newBuffer(sizeOrArray) {
+    /* istanbul ignore next */
+    return typeof sizeOrArray === "number"
+        ? new util.Array(sizeOrArray)
+        : typeof Uint8Array === "undefined"
+        ? sizeOrArray
+        : new Uint8Array(sizeOrArray);
+};
+
+util.stringToBytes =function stringToBytes( str ) {
+    var bytes = [];
+    var len, c;
+    len = str.length;
+    for(var i = 0; i < len; i++) {
+        c = str.charCodeAt(i);
+        if(c >= 0x010000 && c <= 0x10FFFF) {
+            bytes.push(((c >> 18) & 0x07) | 0xF0);
+            bytes.push(((c >> 12) & 0x3F) | 0x80);
+            bytes.push(((c >> 6) & 0x3F) | 0x80);
+            bytes.push((c & 0x3F) | 0x80);
+        } else if(c >= 0x000800 && c <= 0x00FFFF) {
+            bytes.push(((c >> 12) & 0x0F) | 0xE0);
+            bytes.push(((c >> 6) & 0x3F) | 0x80);
+            bytes.push((c & 0x3F) | 0x80);
+        } else if(c >= 0x000080 && c <= 0x0007FF) {
+            bytes.push(((c >> 6) & 0x1F) | 0xC0);
+            bytes.push((c & 0x3F) | 0x80);
+        } else {
+            bytes.push(c & 0xFF);
+        }
+    }
+    return bytes;
+
+};
+
+util.byteToString = function byteToString(arr) {
+    if(typeof arr === 'string') {
+        return arr;
+    }
+    var str = '',
+        _arr = arr;
+    for(var i = 0; i < _arr.length; i++) {
+        var one = _arr[i].toString(2),
+            v = one.match(/^1+?(?=0)/);
+        if(v && one.length == 8) {
+            var bytesLength = v[0].length;
+            var store = _arr[i].toString(2).slice(7 - bytesLength);
+            for(var st = 1; st < bytesLength; st++) {
+                store += _arr[st + i].toString(2).slice(2);
+            }
+            str += String.fromCharCode(parseInt(store, 2));
+            i += bytesLength - 1;
+        } else {
+            str += String.fromCharCode(_arr[i]);
+        }
+    }
+    return str;
+}
+
+
+util.isInteger = Number.isInteger || /* istanbul ignore next */ function isInteger(value) {
+        return typeof value === "number" && isFinite(value) && Math.floor(value) === value;
+    };
+
+Object.defineProperty(util, "decorateRoot", {
+    get: function() {
+        return roots["decorated"] || (roots["decorated"] = new (require("./root"))());
+    }
+});
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/verifier.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/verifier.js
new file mode 100644
index 0000000..933d754
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/verifier.js
@@ -0,0 +1,157 @@
+/**
+ * Created by zhangmiao on 2018/3/14.
+ */
+module.exports = verifier;
+
+var Enum;
+var util;
+
+function invalid(field, expected) {
+    return field.name + ": " + expected + (field.repeated && expected !== "array" ? "[]" : field.map && expected !== "object" ? "{k:"+field.keyType+"}" : "") + " expected";
+}
+
+function verifyValue(field, fieldIndex, ref, options){
+    var _types = options.types;
+    if(field.resolvedType){
+        if(field.resolvedType instanceof Enum){
+            var keys = Object.keys(field.resolvedType.values);
+            if (keys.indexOf(ref)<0){
+                //没有找到时候
+                return invalid(field, "enum value");
+            }
+        }else {
+            var e = _types[fieldIndex].verify(ref);
+            if(e)
+                return field.name + "."+ e;
+        }
+    } else {
+        switch (field.type) {
+            case "int32":
+            case "uint32":
+            case "sint32":
+            case "fixed32":
+            case "sfixed32":
+                if (!util.isInteger(ref))
+                    return invalid(field, "integer");
+                break;
+            case "int64":
+            case "uint64":
+            case "sint64":
+            case "fixed64":
+            case "sfixed64":
+                if(!util.isInteger(ref)&&!(ref&&util.isInteger(ref.low)&&util.isInteger(ref.high)))
+                    return invalid(field, "integer|Long");
+                break;
+            case "float":
+            case "double":
+                if(typeof ref!=="number")
+                    return invalid(field, "number");
+                break;
+            case "bool":
+                if(typeof ref!=="boolean")
+                    return invalid(field, "boolean");
+                break;
+            case "string":
+                if(!util.isString(ref))
+                    return invalid(field, "string");
+                break;
+            case "bytes":
+                if(!(ref&&typeof ref.length==="number"||util.isString(ref)))
+                    return invalid(field, "buffer");
+                break;
+        }
+    }
+}
+
+function verifyKey(field, ref){
+    switch(field.keyType){
+        case "int32":
+        case "uint32":
+        case "sint32":
+        case "fixed32":
+        case "sfixed32":
+            if(!util.key32Re.test(ref))
+                return invalid(field, "integer key");
+            break;
+        case "int64":
+        case "uint64":
+        case "sint64":
+        case "fixed64":
+        case "sfixed64":
+            if(!util.key64Re.test(ref))
+                return invalid(field, "integer|Long key");
+            break;
+        case "bool":
+            if(!util.key2Re.test(ref))
+                return invalid(field, "boolean key");
+            break;
+    }
+}
+
+function verifier(mtype){
+    return function (options){
+        return function (m){
+            var invalidDes;
+            if(typeof m !== 'object' || m === null)
+                return "object expected";
+
+            var oneofs = mtype.oneofsArray,
+                seenFirstField = {};
+            var p;
+            if(oneofs.length)
+                p = {};
+            for (var i = 0; i < mtype.fieldsArray.length; ++i){
+                var field = mtype._fieldsArray[i].resolve(),
+                    ref   = m[field.name];
+                if(!field.optional || (ref!=null&& m.hasOwnProperty(field.name))){
+                    var  _i;
+                    if (field.map){
+                        if(!util.isObject(ref))
+                            return invalid(field, "object");
+                        var k=Object.keys(ref);
+                        for (_i = 0; _i < k.length; ++_i){
+                            //检查key值的合法性
+                            invalidDes = verifyKey(field, k[_i]);
+                            if(invalidDes){
+                                return invalidDes;
+                            }
+                            //检查value值的合法性
+                            invalidDes = verifyValue(field, i, ref[k[_i]], options);
+                            if(invalidDes){
+                                return invalidDes;
+                            }
+                        }
+                    } else if(field.repeated){
+                        if(!Array.isArray(ref)){
+                            return invalid(field, "array");
+                        }
+
+                        for (_i = 0; _i < ref.length; ++_i) {
+                            invalidDes = verifyValue(field, i, ref[_i], options);
+                            if(invalidDes){
+                                return invalidDes;
+                            }
+                        }
+                    } else {
+                        if(field.partOf) {
+                            var  oneofPropName = field.partOf.name;
+                            if (seenFirstField[field.partOf.name] === 1)
+                                if(p[oneofPropName] === 1)
+                                    return field.partOf.name + ": multiple values";
+                            p[oneofPropName] = 1
+                        }
+                        invalidDes = verifyValue(field, i, ref, options);
+                        if(invalidDes){
+                            return invalidDes;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+verifier._configure = function(){
+    Enum      = require("./enum");
+    util      = require("./util");
+};
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/wrappers.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/wrappers.js
new file mode 100644
index 0000000..0df56cc
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/wrappers.js
@@ -0,0 +1,81 @@
+var wrappers = exports;
+
+
+var Message;
+
+/**
+ * From object converter part of an {@link IWrapper}.
+ * @typedef WrapperFromObjectConverter
+ * @type {function}
+ * @param {Object.<string,*>} object Plain object
+ * @returns {Message<{}>} Message instance
+ * @this Type
+ */
+
+/**
+ * To object converter part of an {@link IWrapper}.
+ * @typedef WrapperToObjectConverter
+ * @type {function}
+ * @param {Message<{}>} message Message instance
+ * @param {IConversionOptions} [options] Conversion options
+ * @returns {Object.<string,*>} Plain object
+ * @this Type
+ */
+
+/**
+ * Common type wrapper part of {@link wrappers}.
+ * @interface IWrapper
+ * @property {WrapperFromObjectConverter} [fromObject] From object converter
+ * @property {WrapperToObjectConverter} [toObject] To object converter
+ */
+
+// Custom wrapper for Any
+wrappers[".google.protobuf.Any"] = {
+
+    fromObject: function(object) {
+
+        // unwrap value type if mapped
+        if (object && object["@type"]) {
+            var type = this.lookup(object["@type"]);
+            /* istanbul ignore else */
+            if (type) {
+                // type_url does not accept leading "."
+                var type_url = object["@type"].charAt(0) === "." ?
+                    object["@type"].substr(1) : object["@type"];
+                // type_url prefix is optional, but path seperator is required
+                return this.create({
+                    type_url: "/" + type_url,
+                    value: type.encode(type.fromObject(object)).finish()
+                });
+            }
+        }
+
+        return this.fromObject(object);
+    },
+
+    toObject: function(message, options) {
+
+        // decode value if requested and unmapped
+        if (options && options.json && message.type_url && message.value) {
+            // Only use fully qualified type name after the last '/'
+            var name = message.type_url.substring(message.type_url.lastIndexOf("/") + 1);
+            var type = this.lookup(name);
+            /* istanbul ignore else */
+            if (type)
+                message = type.decode(message.value);
+        }
+
+        // wrap value if unmapped
+        if (!(message instanceof this.ctor) && message instanceof Message) {
+            var object = message.$type.toObject(message, options);
+            object["@type"] = message.$type.fullName;
+            return object;
+        }
+
+        return this.toObject(message, options);
+    }
+};
+
+wrappers._configure = function () {
+    Message = require("./message");
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/writer.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/writer.js
new file mode 100644
index 0000000..2866ee0
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/writer.js
@@ -0,0 +1,468 @@
+module.exports = Writer;
+
+
+var util = require('./util');
+var LongBits;
+
+var BufferWriter; // cyclic
+
+var base64;
+var utf8 = require('./utf8');
+
+/**
+ * Constructs a new writer operation instance.
+ * @classdesc Scheduled writer operation.
+ * @constructor
+ * @param {function(*, Uint8Array, number)} fn Function to call
+ * @param {number} len Value byte length
+ * @param {*} val Value to write
+ * @ignore
+ */
+function Op(fn, len, val) {
+
+    /**
+     * Function to call.
+     * @type {function(Uint8Array, number, *)}
+     */
+    this.fn = fn;
+
+    /**
+     * Value byte length.
+     * @type {number}
+     */
+    this.len = len;
+
+    /**
+     * Next operation.
+     * @type {Writer.Op|undefined}
+     */
+    this.next = undefined;
+
+    /**
+     * Value to write.
+     * @type {*}
+     */
+    this.val = val; // type varies
+}
+
+/* istanbul ignore next */
+function noop() {} // eslint-disable-line no-empty-function
+
+/**
+ * Constructs a new writer state instance.
+ * @classdesc Copied writer state.
+ * @memberof Writer
+ * @constructor
+ * @param {Writer} writer Writer to copy state from
+ * @ignore
+ */
+function State(writer) {
+
+    /**
+     * Current head.
+     * @type {Writer.Op}
+     */
+    this.head = writer.head;
+
+    /**
+     * Current tail.
+     * @type {Writer.Op}
+     */
+    this.tail = writer.tail;
+
+    /**
+     * Current buffer length.
+     * @type {number}
+     */
+    this.len = writer.len;
+
+    /**
+     * Next state.
+     * @type {State|null}
+     */
+    this.next = writer.states;
+}
+
+/**
+ * Constructs a new writer instance.
+ * @classdesc Wire format writer using `Uint8Array` if available, otherwise `Array`.
+ * @constructor
+ */
+function Writer() {
+
+    /**
+     * Current length.
+     * @type {number}
+     */
+    this.len = 0;
+
+    /**
+     * Operations head.
+     * @type {Object}
+     */
+    this.head = new Op(noop, 0, 0);
+
+    /**
+     * Operations tail
+     * @type {Object}
+     */
+    this.tail = this.head;
+
+    /**
+     * Linked forked states.
+     * @type {Object|null}
+     */
+    this.states = null;
+
+    // When a value is written, the writer calculates its byte length and puts it into a linked
+    // list of operations to perform when finish() is called. This both allows us to allocate
+    // buffers of the exact required size and reduces the amount of work we have to do compared
+    // to first calculating over objects and then encoding over objects. In our case, the encoding
+    // part is just a linked list walk calling operations with already prepared values.
+}
+
+/**
+ * Creates a new writer.
+ * @function
+ * @returns {BufferWriter|Writer} A {@link BufferWriter} when Buffers are supported, otherwise a {@link Writer}
+ */
+Writer.create = util.Buffer
+    ? function create_buffer_setup() {
+    return (Writer.create = function create_buffer() {
+        return new BufferWriter();
+    })();
+}
+    /* istanbul ignore next */
+    : function create_array() {
+    return new Writer();
+};
+
+/**
+ * Allocates a buffer of the specified size.
+ * @param {number} size Buffer size
+ * @returns {Uint8Array} Buffer
+ */
+Writer.alloc = function alloc(size) {
+    return new util.Array(size);
+};
+
+// Use Uint8Array buffer pool in the browser, just like node does with buffers
+/* istanbul ignore else */
+if (util.Array !== Array)
+    Writer.alloc = util.pool(Writer.alloc, util.Array.prototype.subarray);
+
+/**
+ * Pushes a new operation to the queue.
+ * @param {function(Uint8Array, number, *)} fn Function to call
+ * @param {number} len Value byte length
+ * @param {number} val Value to write
+ * @returns {Writer} `this`
+ * @private
+ */
+Writer.prototype._push = function push(fn, len, val) {
+    this.tail = this.tail.next = new Op(fn, len, val);
+    this.len += len;
+    return this;
+};
+
+function writeByte(val, buf, pos) {
+    buf[pos] = val & 255;
+}
+
+function writeVarint32(val, buf, pos) {
+    while (val > 127) {
+        buf[pos++] = val & 127 | 128;
+        val >>>= 7;
+    }
+    buf[pos] = val;
+}
+
+/**
+ * Constructs a new varint writer operation instance.
+ * @classdesc Scheduled varint writer operation.
+ * @extends Op
+ * @constructor
+ * @param {number} len Value byte length
+ * @param {number} val Value to write
+ * @ignore
+ */
+function VarintOp(len, val) {
+    this.len = len;
+    this.next = undefined;
+    this.val = val;
+}
+
+VarintOp.prototype = Object.create(Op.prototype);
+VarintOp.prototype.fn = writeVarint32;
+
+/**
+ * Writes an unsigned 32 bit value as a varint.
+ * @param {number} value Value to write
+ * @returns {Writer} `this`
+ */
+Writer.prototype.uint32 = function write_uint32(value) {
+    // here, the call to this.push has been inlined and a varint specific Op subclass is used.
+    // uint32 is by far the most frequently used operation and benefits significantly from this.
+    this.len += (this.tail = this.tail.next = new VarintOp(
+        (value = value >>> 0) //将有符号的数变为无符号的数
+        < 128       ? 1 //2的7次方
+            : value < 16384     ? 2 //2的14次方
+            : value < 2097152   ? 3 //2的21次方
+            : value < 268435456 ? 4 //2的28次方
+            :                     5, //2的35次方 最多32次方,所以最多是5
+        value)).len;
+    return this;
+};
+
+/**
+ * Writes a signed 32 bit value as a varint.
+ * @function
+ * @param {number} value Value to write
+ * @returns {Writer} `this`
+ */
+Writer.prototype.int32 = function write_int32(value) {
+    return value < 0
+        ? this._push(writeVarint64, 10, LongBits.fromNumber(value)) // 10 bytes per spec
+        : this.uint32(value);
+};
+
+/**
+ * Writes a 32 bit value as a varint, zig-zag encoded.
+ * @param {number} value Value to write
+ * @returns {Writer} `this`
+ */
+Writer.prototype.sint32 = function write_sint32(value) {
+    return this.uint32((value << 1 ^ value >> 31) >>> 0);
+};
+
+function writeVarint64(val, buf, pos) {
+    while (val.hi) {
+        buf[pos++] = val.lo & 127 | 128;
+        val.lo = (val.lo >>> 7 | val.hi << 25) >>> 0;
+        val.hi >>>= 7;
+    }
+    while (val.lo > 127) {
+        buf[pos++] = val.lo & 127 | 128;
+        val.lo = val.lo >>> 7;
+    }
+    buf[pos++] = val.lo;
+}
+
+/**
+ * Writes an unsigned 64 bit value as a varint.
+ * @param {Long|number|string} value Value to write
+ * @returns {Writer} `this`
+ * @throws {TypeError} If `value` is a string and no long library is present.
+ */
+Writer.prototype.uint64 = function write_uint64(value) {
+    var bits = LongBits.from(value);
+    return this._push(writeVarint64, bits.length(), bits);
+};
+
+/**
+ * Writes a signed 64 bit value as a varint.
+ * @function
+ * @param {Long|number|string} value Value to write
+ * @returns {Writer} `this`
+ * @throws {TypeError} If `value` is a string and no long library is present.
+ */
+Writer.prototype.int64 = Writer.prototype.uint64;
+
+/**
+ * Writes a signed 64 bit value as a varint, zig-zag encoded.
+ * @param {Long|number|string} value Value to write
+ * @returns {Writer} `this`
+ * @throws {TypeError} If `value` is a string and no long library is present.
+ */
+Writer.prototype.sint64 = function write_sint64(value) {
+    var bits = LongBits.from(value).zzEncode();
+    return this._push(writeVarint64, bits.length(), bits);
+};
+
+/**
+ * Writes a boolish value as a varint.
+ * @param {boolean} value Value to write
+ * @returns {Writer} `this`
+ */
+Writer.prototype.bool = function write_bool(value) {
+    return this._push(writeByte, 1, value ? 1 : 0);
+};
+
+function writeFixed32(val, buf, pos) {
+    buf[pos    ] =  val         & 255;
+    buf[pos + 1] =  val >>> 8   & 255;
+    buf[pos + 2] =  val >>> 16  & 255;
+    buf[pos + 3] =  val >>> 24;
+}
+
+/**
+ * Writes an unsigned 32 bit value as fixed 32 bits.
+ * @param {number} value Value to write
+ * @returns {Writer} `this`
+ */
+Writer.prototype.fixed32 = function write_fixed32(value) {
+    return this._push(writeFixed32, 4, value >>> 0);
+};
+
+/**
+ * Writes a signed 32 bit value as fixed 32 bits.
+ * @function
+ * @param {number} value Value to write
+ * @returns {Writer} `this`
+ */
+Writer.prototype.sfixed32 = Writer.prototype.fixed32;
+
+/**
+ * Writes an unsigned 64 bit value as fixed 64 bits.
+ * @param {Long|number|string} value Value to write
+ * @returns {Writer} `this`
+ * @throws {TypeError} If `value` is a string and no long library is present.
+ */
+Writer.prototype.fixed64 = function write_fixed64(value) {
+    var bits = LongBits.from(value);
+    return this._push(writeFixed32, 4, bits.lo)._push(writeFixed32, 4, bits.hi);
+};
+
+/**
+ * Writes a signed 64 bit value as fixed 64 bits.
+ * @function
+ * @param {Long|number|string} value Value to write
+ * @returns {Writer} `this`
+ * @throws {TypeError} If `value` is a string and no long library is present.
+ */
+Writer.prototype.sfixed64 = Writer.prototype.fixed64;
+
+/**
+ * Writes a float (32 bit).
+ * @function
+ * @param {number} value Value to write
+ * @returns {Writer} `this`
+ */
+Writer.prototype.float = function write_float(value) {
+    return this._push(util.float.writeFloatLE, 4, value);
+};
+
+/**
+ * Writes a double (64 bit float).
+ * @function
+ * @param {number} value Value to write
+ * @returns {Writer} `this`
+ */
+Writer.prototype.double = function write_double(value) {
+    return this._push(util.float.writeDoubleLE, 8, value);
+};
+
+var writeBytes = util.Array.prototype.set
+    ? function writeBytes_set(val, buf, pos) {
+    buf.set(val, pos); // also works for plain array values
+}
+    /* istanbul ignore next */
+    : function writeBytes_for(val, buf, pos) {
+    for (var i = 0; i < val.length; ++i)
+        buf[pos + i] = val[i];
+};
+
+/**
+ * Writes a sequence of bytes.
+ * @param {Uint8Array|string} value Buffer or string to write
+ * @returns {Writer} `this`
+ */
+Writer.prototype.bytes = function write_bytes(value) {
+    var len = value.length >>> 0;
+    if (!len)
+        return this._push(writeByte, 1, 0);
+
+    if (util.isString(value)) {
+        //len = (value = util.stringToBytes(value)).length;
+        //var buf = Writer.alloc(len = base64.length(value));
+        //base64.decode(value, buf, 0);
+        //value = buf;
+        var buf = Writer.alloc(len = utf8.length(value));
+        utf8.write(value, buf, 0);
+        value = buf;
+    }
+    return this.uint32(len)._push(writeBytes, len, value);
+};
+
+/**
+ * Writes a string.
+ * @param {string} value Value to write
+ * @returns {Writer} `this`
+ */
+Writer.prototype.string = function write_string(value) {
+    var len = utf8.length(value);
+    return len
+        ? this.uint32(len)._push(utf8.write, len, value)
+        : this._push(writeByte, 1, 0);
+};
+
+/**
+ * Forks this writer's state by pushing it to a stack.
+ * Calling {@link Writer#reset|reset} or {@link Writer#ldelim|ldelim} resets the writer to the previous state.
+ * @returns {Writer} `this`
+ */
+Writer.prototype.fork = function fork() {
+    this.states = new State(this);
+    this.head = this.tail = new Op(noop, 0, 0);
+    this.len = 0;
+    return this;
+};
+
+/**
+ * Resets this instance to the last state.
+ * @returns {Writer} `this`
+ */
+Writer.prototype.reset = function reset() {
+    if (this.states) {
+        this.head   = this.states.head;
+        this.tail   = this.states.tail;
+        this.len    = this.states.len;
+        this.states = this.states.next;
+    } else {
+        this.head = this.tail = new Op(noop, 0, 0);
+        this.len  = 0;
+    }
+    return this;
+};
+
+/**
+ * Resets to the last state and appends the fork state's current write length as a varint followed by its operations.
+ * @returns {Writer} `this`
+ */
+Writer.prototype.ldelim = function ldelim() {
+    var head = this.head,
+        tail = this.tail,
+        len  = this.len;
+    this.reset().uint32(len);
+    if (len) {
+        this.tail.next = head.next; // skip noop
+        this.tail = tail;
+        this.len += len;
+    }
+    return this;
+};
+
+/**
+ * Finishes the write operation.
+ * @returns {Uint8Array} Finished buffer
+ */
+Writer.prototype.finish = function finish() {
+    var head = this.head.next, // skip noop
+        buf  = this.constructor.alloc(this.len),
+        pos  = 0;
+    while (head) {
+        head.fn(head.val, buf, pos);
+        pos += head.len;
+        head = head.next;
+    }
+    // this.head = this.tail = null;
+    return buf;
+};
+
+Writer._configure = function() {
+
+    //util      = require("./util");
+    LongBits  = require("./longBits");
+    base64    = require('./base64');
+    utf8      = require('./utf8');
+};
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/writer_buffer.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/writer_buffer.js
new file mode 100644
index 0000000..55c479c
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/protobuf_mp/src/writer_buffer.js
@@ -0,0 +1,81 @@
+"use strict";
+module.exports = BufferWriter;
+
+// extends Writer
+var Writer = require("./writer");
+(BufferWriter.prototype = Object.create(Writer.prototype)).constructor = BufferWriter;
+
+var util = require("./util/minimal");
+
+var Buffer = util.Buffer;
+
+/**
+ * Constructs a new buffer writer instance.
+ * @classdesc Wire format writer using node buffers.
+ * @extends Writer
+ * @constructor
+ */
+function BufferWriter() {
+    Writer.call(this);
+}
+
+/**
+ * Allocates a buffer of the specified size.
+ * @param {number} size Buffer size
+ * @returns {Buffer} Buffer
+ */
+BufferWriter.alloc = function alloc_buffer(size) {
+    return (BufferWriter.alloc = util._Buffer_allocUnsafe)(size);
+};
+
+var writeBytesBuffer = Buffer && Buffer.prototype instanceof Uint8Array && Buffer.prototype.set.name === "set"
+    ? function writeBytesBuffer_set(val, buf, pos) {
+        buf.set(val, pos); // faster than copy (requires node >= 4 where Buffers extend Uint8Array and set is properly inherited)
+                           // also works for plain array values
+    }
+    /* istanbul ignore next */
+    : function writeBytesBuffer_copy(val, buf, pos) {
+        if (val.copy) // Buffer values
+            val.copy(buf, pos, 0, val.length);
+        else for (var i = 0; i < val.length;) // plain array values
+            buf[pos++] = val[i++];
+    };
+
+/**
+ * @override
+ */
+BufferWriter.prototype.bytes = function write_bytes_buffer(value) {
+    if (util.isString(value))
+        value = util._Buffer_from(value, "base64");
+    var len = value.length >>> 0;
+    this.uint32(len);
+    if (len)
+        this._push(writeBytesBuffer, len, value);
+    return this;
+};
+
+function writeStringBuffer(val, buf, pos) {
+    if (val.length < 40) // plain js is faster for short strings (probably due to redundant assertions)
+        util.utf8.write(val, buf, pos);
+    else
+        buf.utf8Write(val, pos);
+}
+
+/**
+ * @override
+ */
+BufferWriter.prototype.string = function write_string_buffer(value) {
+    var len = Buffer.byteLength(value);
+    this.uint32(len);
+    if (len)
+        this._push(writeStringBuffer, len, value);
+    return this;
+};
+
+
+/**
+ * Finishes the write operation.
+ * @name BufferWriter#finish
+ * @function
+ * @returns {Buffer} Finished buffer
+ */
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/adaptor.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/adaptor.ts
new file mode 100644
index 0000000..906ac54
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/adaptor.ts
@@ -0,0 +1,7 @@
+declare const my: WechatMiniprogram.Wx;
+export function getMiniBridge (): WechatMiniprogram.Wx {
+  if (typeof wx === 'undefined' && typeof my !== 'undefined') {
+    return my;
+  }
+  return wx;
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/bezier_path.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/bezier_path.ts
new file mode 100644
index 0000000..de36df8
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/bezier_path.ts
@@ -0,0 +1,16 @@
+export class BezierPath {
+  _d?: string;
+  _transform?: any;
+  _styles?: any;
+  _shape?: any;
+
+  constructor(
+    readonly d: string,
+    readonly transform: any,
+    readonly styles: any
+  ) {
+    this._d = d;
+    this._transform = transform;
+    this._styles = styles;
+  }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/ellipse_path.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/ellipse_path.ts
new file mode 100644
index 0000000..78b1f30
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/ellipse_path.ts
@@ -0,0 +1,20 @@
+import { BezierPath } from "./bezier_path";
+
+export class EllipsePath extends BezierPath {
+  _x;
+  _y;
+  _radiusX;
+  _radiusY;
+  _transform;
+  _styles;
+
+  constructor(x: number, y: number, radiusX: number, radiusY: number, transform: any, styles: any) {
+    super('', transform, styles);
+    this._x = x;
+    this._y = y;
+    this._radiusX = radiusX;
+    this._radiusY = radiusY;
+    this._transform = transform;
+    this._styles = styles;
+  }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/frame_entity.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/frame_entity.ts
new file mode 100644
index 0000000..f580857
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/frame_entity.ts
@@ -0,0 +1,183 @@
+import { BezierPath } from "./bezier_path";
+
+export class FrameEntity {
+  alpha = 0.0;
+
+  transform = {
+    a: 1.0,
+    b: 0.0,
+    c: 0.0,
+    d: 1.0,
+    tx: 0.0,
+    ty: 0.0,
+  };
+
+  layout = {
+    x: 0.0,
+    y: 0.0,
+    width: 0.0,
+    height: 0.0,
+  };
+
+  nx = 0.0;
+
+  ny = 0.0;
+
+  maskPath?: BezierPath;
+
+  shapes: any[] = [];
+
+  static lastShapes: any;
+
+  constructor(spec: any) {
+    this.alpha = parseFloat(spec.alpha) || 0.0;
+    if (spec.layout) {
+      this.layout.x = parseFloat(spec.layout.x) || 0.0;
+      this.layout.y = parseFloat(spec.layout.y) || 0.0;
+      this.layout.width = parseFloat(spec.layout.width) || 0.0;
+      this.layout.height = parseFloat(spec.layout.height) || 0.0;
+    }
+    if (spec.transform) {
+      this.transform.a = parseFloat(spec.transform.a) || 1.0;
+      this.transform.b = parseFloat(spec.transform.b) || 0.0;
+      this.transform.c = parseFloat(spec.transform.c) || 0.0;
+      this.transform.d = parseFloat(spec.transform.d) || 1.0;
+      this.transform.tx = parseFloat(spec.transform.tx) || 0.0;
+      this.transform.ty = parseFloat(spec.transform.ty) || 0.0;
+    }
+    if (spec.clipPath && spec.clipPath.length > 0) {
+      this.maskPath = new BezierPath(spec.clipPath, undefined, {
+        fill: "#000000",
+      });
+    }
+    if (spec.shapes) {
+      if (spec.shapes instanceof Array) {
+        spec.shapes.forEach((shape: any) => {
+          shape.pathArgs = shape.args;
+          switch (shape.type) {
+            case 0:
+              shape.type = "shape";
+              shape.pathArgs = shape.shape;
+              break;
+            case 1:
+              shape.type = "rect";
+              shape.pathArgs = shape.rect;
+              break;
+            case 2:
+              shape.type = "ellipse";
+              shape.pathArgs = shape.ellipse;
+              break;
+            case 3:
+              shape.type = "keep";
+              break;
+          }
+          if (shape.styles) {
+            if (shape.styles.fill) {
+              if (typeof shape.styles.fill["r"] === "number")
+                shape.styles.fill[0] = shape.styles.fill["r"];
+              if (typeof shape.styles.fill["g"] === "number")
+                shape.styles.fill[1] = shape.styles.fill["g"];
+              if (typeof shape.styles.fill["b"] === "number")
+                shape.styles.fill[2] = shape.styles.fill["b"];
+              if (typeof shape.styles.fill["a"] === "number")
+                shape.styles.fill[3] = shape.styles.fill["a"];
+            }
+            if (shape.styles.stroke) {
+              if (typeof shape.styles.stroke["r"] === "number")
+                shape.styles.stroke[0] = shape.styles.stroke["r"];
+              if (typeof shape.styles.stroke["g"] === "number")
+                shape.styles.stroke[1] = shape.styles.stroke["g"];
+              if (typeof shape.styles.stroke["b"] === "number")
+                shape.styles.stroke[2] = shape.styles.stroke["b"];
+              if (typeof shape.styles.stroke["a"] === "number")
+                shape.styles.stroke[3] = shape.styles.stroke["a"];
+            }
+            let lineDash = shape.styles.lineDash || [];
+            if (shape.styles.lineDashI > 0) {
+              lineDash.push(shape.styles.lineDashI);
+            }
+            if (shape.styles.lineDashII > 0) {
+              if (lineDash.length < 1) {
+                lineDash.push(0);
+              }
+              lineDash.push(shape.styles.lineDashII);
+              lineDash.push(0);
+            }
+            if (shape.styles.lineDashIII > 0) {
+              if (lineDash.length < 2) {
+                lineDash.push(0);
+                lineDash.push(0);
+              }
+              lineDash[2] = shape.styles.lineDashIII;
+            }
+            shape.styles.lineDash = lineDash;
+
+            switch (shape.styles.lineJoin) {
+              case 0:
+                shape.styles.lineJoin = "miter";
+                break;
+              case 1:
+                shape.styles.lineJoin = "round";
+                break;
+              case 2:
+                shape.styles.lineJoin = "bevel";
+                break;
+            }
+
+            switch (shape.styles.lineCap) {
+              case 0:
+                shape.styles.lineCap = "butt";
+                break;
+              case 1:
+                shape.styles.lineCap = "round";
+                break;
+              case 2:
+                shape.styles.lineCap = "square";
+                break;
+            }
+          }
+        });
+      }
+      if (spec.shapes[0] && spec.shapes[0].type === "keep") {
+        this.shapes = FrameEntity.lastShapes;
+      } else {
+        this.shapes = spec.shapes;
+        FrameEntity.lastShapes = spec.shapes;
+      }
+    }
+    let llx =
+      this.transform.a * this.layout.x +
+      this.transform.c * this.layout.y +
+      this.transform.tx;
+    let lrx =
+      this.transform.a * (this.layout.x + this.layout.width) +
+      this.transform.c * this.layout.y +
+      this.transform.tx;
+    let lbx =
+      this.transform.a * this.layout.x +
+      this.transform.c * (this.layout.y + this.layout.height) +
+      this.transform.tx;
+    let rbx =
+      this.transform.a * (this.layout.x + this.layout.width) +
+      this.transform.c * (this.layout.y + this.layout.height) +
+      this.transform.tx;
+    let lly =
+      this.transform.b * this.layout.x +
+      this.transform.d * this.layout.y +
+      this.transform.ty;
+    let lry =
+      this.transform.b * (this.layout.x + this.layout.width) +
+      this.transform.d * this.layout.y +
+      this.transform.ty;
+    let lby =
+      this.transform.b * this.layout.x +
+      this.transform.d * (this.layout.y + this.layout.height) +
+      this.transform.ty;
+    let rby =
+      this.transform.b * (this.layout.x + this.layout.width) +
+      this.transform.d * (this.layout.y + this.layout.height) +
+      this.transform.ty;
+    this.nx = Math.min(Math.min(lbx, rbx), Math.min(llx, lrx));
+    this.ny = Math.min(Math.min(lby, rby), Math.min(lly, lry));
+  }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/main.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/main.ts
new file mode 100644
index 0000000..b89bf26
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/main.ts
@@ -0,0 +1,5 @@
+import { Parser as MParser } from "./parser";
+import { Player as MPlayer } from "./player";
+
+export const Parser = MParser;
+export const Player = MPlayer;
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/pako.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/pako.js
new file mode 100644
index 0000000..a547b5a
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/pako.js
@@ -0,0 +1,2 @@
+/*! pako 2.0.3 https://github.com/nodeca/pako @license (MIT AND Zlib) */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).pako={})}(this,(function(e){"use strict";var t=(e,t,i,n)=>{let a=65535&e|0,r=e>>>16&65535|0,s=0;for(;0!==i;){s=i>2e3?2e3:i,i-=s;do{a=a+t[n++]|0,r=r+a|0}while(--s);a%=65521,r%=65521}return a|r<<16|0};const i=new Uint32Array((()=>{let e,t=[];for(var i=0;i<256;i++){e=i;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[i]=e}return t})());var n=(e,t,n,a)=>{const r=i,s=a+n;e^=-1;for(let i=a;i<s;i++)e=e>>>8^r[255&(e^t[i])];return-1^e};var a=function(e,t){let i,n,a,r,s,o,l,d,f,h,c,u,w,b,k,m,_,g,v,p,y,x,E,R;const A=e.state;i=e.next_in,E=e.input,n=i+(e.avail_in-5),a=e.next_out,R=e.output,r=a-(t-e.avail_out),s=a+(e.avail_out-257),o=A.dmax,l=A.wsize,d=A.whave,f=A.wnext,h=A.window,c=A.hold,u=A.bits,w=A.lencode,b=A.distcode,k=(1<<A.lenbits)-1,m=(1<<A.distbits)-1;e:do{u<15&&(c+=E[i++]<<u,u+=8,c+=E[i++]<<u,u+=8),_=w[c&k];t:for(;;){if(g=_>>>24,c>>>=g,u-=g,g=_>>>16&255,0===g)R[a++]=65535&_;else{if(!(16&g)){if(0==(64&g)){_=w[(65535&_)+(c&(1<<g)-1)];continue t}if(32&g){A.mode=12;break e}e.msg="invalid literal/length code",A.mode=30;break e}v=65535&_,g&=15,g&&(u<g&&(c+=E[i++]<<u,u+=8),v+=c&(1<<g)-1,c>>>=g,u-=g),u<15&&(c+=E[i++]<<u,u+=8,c+=E[i++]<<u,u+=8),_=b[c&m];i:for(;;){if(g=_>>>24,c>>>=g,u-=g,g=_>>>16&255,!(16&g)){if(0==(64&g)){_=b[(65535&_)+(c&(1<<g)-1)];continue i}e.msg="invalid distance code",A.mode=30;break e}if(p=65535&_,g&=15,u<g&&(c+=E[i++]<<u,u+=8,u<g&&(c+=E[i++]<<u,u+=8)),p+=c&(1<<g)-1,p>o){e.msg="invalid distance too far back",A.mode=30;break e}if(c>>>=g,u-=g,g=a-r,p>g){if(g=p-g,g>d&&A.sane){e.msg="invalid distance too far back",A.mode=30;break e}if(y=0,x=h,0===f){if(y+=l-g,g<v){v-=g;do{R[a++]=h[y++]}while(--g);y=a-p,x=R}}else if(f<g){if(y+=l+f-g,g-=f,g<v){v-=g;do{R[a++]=h[y++]}while(--g);if(y=0,f<v){g=f,v-=g;do{R[a++]=h[y++]}while(--g);y=a-p,x=R}}}else if(y+=f-g,g<v){v-=g;do{R[a++]=h[y++]}while(--g);y=a-p,x=R}for(;v>2;)R[a++]=x[y++],R[a++]=x[y++],R[a++]=x[y++],v-=3;v&&(R[a++]=x[y++],v>1&&(R[a++]=x[y++]))}else{y=a-p;do{R[a++]=R[y++],R[a++]=R[y++],R[a++]=R[y++],v-=3}while(v>2);v&&(R[a++]=R[y++],v>1&&(R[a++]=R[y++]))}break}}break}}while(i<n&&a<s);v=u>>3,i-=v,u-=v<<3,c&=(1<<u)-1,e.next_in=i,e.next_out=a,e.avail_in=i<n?n-i+5:5-(i-n),e.avail_out=a<s?s-a+257:257-(a-s),A.hold=c,A.bits=u};const r=15,s=new Uint16Array([3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0]),o=new Uint8Array([16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78]),l=new Uint16Array([1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0]),d=new Uint8Array([16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64]);var f=(e,t,i,n,a,f,h,c)=>{const u=c.bits;let w,b,k,m,_,g,v=0,p=0,y=0,x=0,E=0,R=0,A=0,Z=0,S=0,O=0,U=null,T=0;const D=new Uint16Array(16),I=new Uint16Array(16);let B,N,C,z=null,F=0;for(v=0;v<=r;v++)D[v]=0;for(p=0;p<n;p++)D[t[i+p]]++;for(E=u,x=r;x>=1&&0===D[x];x--);if(E>x&&(E=x),0===x)return a[f++]=20971520,a[f++]=20971520,c.bits=1,0;for(y=1;y<x&&0===D[y];y++);for(E<y&&(E=y),Z=1,v=1;v<=r;v++)if(Z<<=1,Z-=D[v],Z<0)return-1;if(Z>0&&(0===e||1!==x))return-1;for(I[1]=0,v=1;v<r;v++)I[v+1]=I[v]+D[v];for(p=0;p<n;p++)0!==t[i+p]&&(h[I[t[i+p]]++]=p);if(0===e?(U=z=h,g=19):1===e?(U=s,T-=257,z=o,F-=257,g=256):(U=l,z=d,g=-1),O=0,p=0,v=y,_=f,R=E,A=0,k=-1,S=1<<E,m=S-1,1===e&&S>852||2===e&&S>592)return 1;for(;;){B=v-A,h[p]<g?(N=0,C=h[p]):h[p]>g?(N=z[F+h[p]],C=U[T+h[p]]):(N=96,C=0),w=1<<v-A,b=1<<R,y=b;do{b-=w,a[_+(O>>A)+b]=B<<24|N<<16|C|0}while(0!==b);for(w=1<<v-1;O&w;)w>>=1;if(0!==w?(O&=w-1,O+=w):O=0,p++,0==--D[v]){if(v===x)break;v=t[i+h[p]]}if(v>E&&(O&m)!==k){for(0===A&&(A=E),_+=y,R=v-A,Z=1<<R;R+A<x&&(Z-=D[R+A],!(Z<=0));)R++,Z<<=1;if(S+=1<<R,1===e&&S>852||2===e&&S>592)return 1;k=O&m,a[k]=E<<24|R<<16|_-f|0}}return 0!==O&&(a[_+O]=v-A<<24|64<<16|0),c.bits=E,0},h={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_MEM_ERROR:-4,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8};const{Z_FINISH:c,Z_BLOCK:u,Z_TREES:w,Z_OK:b,Z_STREAM_END:k,Z_NEED_DICT:m,Z_STREAM_ERROR:_,Z_DATA_ERROR:g,Z_MEM_ERROR:v,Z_BUF_ERROR:p,Z_DEFLATED:y}=h,x=12,E=30,R=e=>(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24);function A(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new Uint16Array(320),this.work=new Uint16Array(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}const Z=e=>{if(!e||!e.state)return _;const t=e.state;return e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=1,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new Int32Array(852),t.distcode=t.distdyn=new Int32Array(592),t.sane=1,t.back=-1,b},S=e=>{if(!e||!e.state)return _;const t=e.state;return t.wsize=0,t.whave=0,t.wnext=0,Z(e)},O=(e,t)=>{let i;if(!e||!e.state)return _;const n=e.state;return t<0?(i=0,t=-t):(i=1+(t>>4),t<48&&(t&=15)),t&&(t<8||t>15)?_:(null!==n.window&&n.wbits!==t&&(n.window=null),n.wrap=i,n.wbits=t,S(e))},U=(e,t)=>{if(!e)return _;const i=new A;e.state=i,i.window=null;const n=O(e,t);return n!==b&&(e.state=null),n};let T,D,I=!0;const B=e=>{if(I){T=new Int32Array(512),D=new Int32Array(32);let t=0;for(;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(f(1,e.lens,0,288,T,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;f(2,e.lens,0,32,D,0,e.work,{bits:5}),I=!1}e.lencode=T,e.lenbits=9,e.distcode=D,e.distbits=5},N=(e,t,i,n)=>{let a;const r=e.state;return null===r.window&&(r.wsize=1<<r.wbits,r.wnext=0,r.whave=0,r.window=new Uint8Array(r.wsize)),n>=r.wsize?(r.window.set(t.subarray(i-r.wsize,i),0),r.wnext=0,r.whave=r.wsize):(a=r.wsize-r.wnext,a>n&&(a=n),r.window.set(t.subarray(i-n,i-n+a),r.wnext),(n-=a)?(r.window.set(t.subarray(i-n,i),0),r.wnext=n,r.whave=r.wsize):(r.wnext+=a,r.wnext===r.wsize&&(r.wnext=0),r.whave<r.wsize&&(r.whave+=a))),0};var C={inflateReset:S,inflateReset2:O,inflateResetKeep:Z,inflateInit:e=>U(e,15),inflateInit2:U,inflate:(e,i)=>{let r,s,o,l,d,h,A,Z,S,O,U,T,D,I,C,z,F,L,M,H,j,K,P=0;const Y=new Uint8Array(4);let G,X;const W=new Uint8Array([16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15]);if(!e||!e.state||!e.output||!e.input&&0!==e.avail_in)return _;r=e.state,r.mode===x&&(r.mode=13),d=e.next_out,o=e.output,A=e.avail_out,l=e.next_in,s=e.input,h=e.avail_in,Z=r.hold,S=r.bits,O=h,U=A,K=b;e:for(;;)switch(r.mode){case 1:if(0===r.wrap){r.mode=13;break}for(;S<16;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}if(2&r.wrap&&35615===Z){r.check=0,Y[0]=255&Z,Y[1]=Z>>>8&255,r.check=n(r.check,Y,2,0),Z=0,S=0,r.mode=2;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&Z)<<8)+(Z>>8))%31){e.msg="incorrect header check",r.mode=E;break}if((15&Z)!==y){e.msg="unknown compression method",r.mode=E;break}if(Z>>>=4,S-=4,j=8+(15&Z),0===r.wbits)r.wbits=j;else if(j>r.wbits){e.msg="invalid window size",r.mode=E;break}r.dmax=1<<r.wbits,e.adler=r.check=1,r.mode=512&Z?10:x,Z=0,S=0;break;case 2:for(;S<16;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}if(r.flags=Z,(255&r.flags)!==y){e.msg="unknown compression method",r.mode=E;break}if(57344&r.flags){e.msg="unknown header flags set",r.mode=E;break}r.head&&(r.head.text=Z>>8&1),512&r.flags&&(Y[0]=255&Z,Y[1]=Z>>>8&255,r.check=n(r.check,Y,2,0)),Z=0,S=0,r.mode=3;case 3:for(;S<32;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}r.head&&(r.head.time=Z),512&r.flags&&(Y[0]=255&Z,Y[1]=Z>>>8&255,Y[2]=Z>>>16&255,Y[3]=Z>>>24&255,r.check=n(r.check,Y,4,0)),Z=0,S=0,r.mode=4;case 4:for(;S<16;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}r.head&&(r.head.xflags=255&Z,r.head.os=Z>>8),512&r.flags&&(Y[0]=255&Z,Y[1]=Z>>>8&255,r.check=n(r.check,Y,2,0)),Z=0,S=0,r.mode=5;case 5:if(1024&r.flags){for(;S<16;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}r.length=Z,r.head&&(r.head.extra_len=Z),512&r.flags&&(Y[0]=255&Z,Y[1]=Z>>>8&255,r.check=n(r.check,Y,2,0)),Z=0,S=0}else r.head&&(r.head.extra=null);r.mode=6;case 6:if(1024&r.flags&&(T=r.length,T>h&&(T=h),T&&(r.head&&(j=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Uint8Array(r.head.extra_len)),r.head.extra.set(s.subarray(l,l+T),j)),512&r.flags&&(r.check=n(r.check,s,T,l)),h-=T,l+=T,r.length-=T),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===h)break e;T=0;do{j=s[l+T++],r.head&&j&&r.length<65536&&(r.head.name+=String.fromCharCode(j))}while(j&&T<h);if(512&r.flags&&(r.check=n(r.check,s,T,l)),h-=T,l+=T,j)break e}else r.head&&(r.head.name=null);r.length=0,r.mode=8;case 8:if(4096&r.flags){if(0===h)break e;T=0;do{j=s[l+T++],r.head&&j&&r.length<65536&&(r.head.comment+=String.fromCharCode(j))}while(j&&T<h);if(512&r.flags&&(r.check=n(r.check,s,T,l)),h-=T,l+=T,j)break e}else r.head&&(r.head.comment=null);r.mode=9;case 9:if(512&r.flags){for(;S<16;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}if(Z!==(65535&r.check)){e.msg="header crc mismatch",r.mode=E;break}Z=0,S=0}r.head&&(r.head.hcrc=r.flags>>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=x;break;case 10:for(;S<32;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}e.adler=r.check=R(Z),Z=0,S=0,r.mode=11;case 11:if(0===r.havedict)return e.next_out=d,e.avail_out=A,e.next_in=l,e.avail_in=h,r.hold=Z,r.bits=S,m;e.adler=r.check=1,r.mode=x;case x:if(i===u||i===w)break e;case 13:if(r.last){Z>>>=7&S,S-=7&S,r.mode=27;break}for(;S<3;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}switch(r.last=1&Z,Z>>>=1,S-=1,3&Z){case 0:r.mode=14;break;case 1:if(B(r),r.mode=20,i===w){Z>>>=2,S-=2;break e}break;case 2:r.mode=17;break;case 3:e.msg="invalid block type",r.mode=E}Z>>>=2,S-=2;break;case 14:for(Z>>>=7&S,S-=7&S;S<32;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}if((65535&Z)!=(Z>>>16^65535)){e.msg="invalid stored block lengths",r.mode=E;break}if(r.length=65535&Z,Z=0,S=0,r.mode=15,i===w)break e;case 15:r.mode=16;case 16:if(T=r.length,T){if(T>h&&(T=h),T>A&&(T=A),0===T)break e;o.set(s.subarray(l,l+T),d),h-=T,l+=T,A-=T,d+=T,r.length-=T;break}r.mode=x;break;case 17:for(;S<14;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}if(r.nlen=257+(31&Z),Z>>>=5,S-=5,r.ndist=1+(31&Z),Z>>>=5,S-=5,r.ncode=4+(15&Z),Z>>>=4,S-=4,r.nlen>286||r.ndist>30){e.msg="too many length or distance symbols",r.mode=E;break}r.have=0,r.mode=18;case 18:for(;r.have<r.ncode;){for(;S<3;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}r.lens[W[r.have++]]=7&Z,Z>>>=3,S-=3}for(;r.have<19;)r.lens[W[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,G={bits:r.lenbits},K=f(0,r.lens,0,19,r.lencode,0,r.work,G),r.lenbits=G.bits,K){e.msg="invalid code lengths set",r.mode=E;break}r.have=0,r.mode=19;case 19:for(;r.have<r.nlen+r.ndist;){for(;P=r.lencode[Z&(1<<r.lenbits)-1],C=P>>>24,z=P>>>16&255,F=65535&P,!(C<=S);){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}if(F<16)Z>>>=C,S-=C,r.lens[r.have++]=F;else{if(16===F){for(X=C+2;S<X;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}if(Z>>>=C,S-=C,0===r.have){e.msg="invalid bit length repeat",r.mode=E;break}j=r.lens[r.have-1],T=3+(3&Z),Z>>>=2,S-=2}else if(17===F){for(X=C+3;S<X;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}Z>>>=C,S-=C,j=0,T=3+(7&Z),Z>>>=3,S-=3}else{for(X=C+7;S<X;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}Z>>>=C,S-=C,j=0,T=11+(127&Z),Z>>>=7,S-=7}if(r.have+T>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=E;break}for(;T--;)r.lens[r.have++]=j}}if(r.mode===E)break;if(0===r.lens[256]){e.msg="invalid code -- missing end-of-block",r.mode=E;break}if(r.lenbits=9,G={bits:r.lenbits},K=f(1,r.lens,0,r.nlen,r.lencode,0,r.work,G),r.lenbits=G.bits,K){e.msg="invalid literal/lengths set",r.mode=E;break}if(r.distbits=6,r.distcode=r.distdyn,G={bits:r.distbits},K=f(2,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,G),r.distbits=G.bits,K){e.msg="invalid distances set",r.mode=E;break}if(r.mode=20,i===w)break e;case 20:r.mode=21;case 21:if(h>=6&&A>=258){e.next_out=d,e.avail_out=A,e.next_in=l,e.avail_in=h,r.hold=Z,r.bits=S,a(e,U),d=e.next_out,o=e.output,A=e.avail_out,l=e.next_in,s=e.input,h=e.avail_in,Z=r.hold,S=r.bits,r.mode===x&&(r.back=-1);break}for(r.back=0;P=r.lencode[Z&(1<<r.lenbits)-1],C=P>>>24,z=P>>>16&255,F=65535&P,!(C<=S);){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}if(z&&0==(240&z)){for(L=C,M=z,H=F;P=r.lencode[H+((Z&(1<<L+M)-1)>>L)],C=P>>>24,z=P>>>16&255,F=65535&P,!(L+C<=S);){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}Z>>>=L,S-=L,r.back+=L}if(Z>>>=C,S-=C,r.back+=C,r.length=F,0===z){r.mode=26;break}if(32&z){r.back=-1,r.mode=x;break}if(64&z){e.msg="invalid literal/length code",r.mode=E;break}r.extra=15&z,r.mode=22;case 22:if(r.extra){for(X=r.extra;S<X;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}r.length+=Z&(1<<r.extra)-1,Z>>>=r.extra,S-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=23;case 23:for(;P=r.distcode[Z&(1<<r.distbits)-1],C=P>>>24,z=P>>>16&255,F=65535&P,!(C<=S);){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}if(0==(240&z)){for(L=C,M=z,H=F;P=r.distcode[H+((Z&(1<<L+M)-1)>>L)],C=P>>>24,z=P>>>16&255,F=65535&P,!(L+C<=S);){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}Z>>>=L,S-=L,r.back+=L}if(Z>>>=C,S-=C,r.back+=C,64&z){e.msg="invalid distance code",r.mode=E;break}r.offset=F,r.extra=15&z,r.mode=24;case 24:if(r.extra){for(X=r.extra;S<X;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}r.offset+=Z&(1<<r.extra)-1,Z>>>=r.extra,S-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){e.msg="invalid distance too far back",r.mode=E;break}r.mode=25;case 25:if(0===A)break e;if(T=U-A,r.offset>T){if(T=r.offset-T,T>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=E;break}T>r.wnext?(T-=r.wnext,D=r.wsize-T):D=r.wnext-T,T>r.length&&(T=r.length),I=r.window}else I=o,D=d-r.offset,T=r.length;T>A&&(T=A),A-=T,r.length-=T;do{o[d++]=I[D++]}while(--T);0===r.length&&(r.mode=21);break;case 26:if(0===A)break e;o[d++]=r.length,A--,r.mode=21;break;case 27:if(r.wrap){for(;S<32;){if(0===h)break e;h--,Z|=s[l++]<<S,S+=8}if(U-=A,e.total_out+=U,r.total+=U,U&&(e.adler=r.check=r.flags?n(r.check,o,U,d-U):t(r.check,o,U,d-U)),U=A,(r.flags?Z:R(Z))!==r.check){e.msg="incorrect data check",r.mode=E;break}Z=0,S=0}r.mode=28;case 28:if(r.wrap&&r.flags){for(;S<32;){if(0===h)break e;h--,Z+=s[l++]<<S,S+=8}if(Z!==(4294967295&r.total)){e.msg="incorrect length check",r.mode=E;break}Z=0,S=0}r.mode=29;case 29:K=k;break e;case E:K=g;break e;case 31:return v;case 32:default:return _}return e.next_out=d,e.avail_out=A,e.next_in=l,e.avail_in=h,r.hold=Z,r.bits=S,(r.wsize||U!==e.avail_out&&r.mode<E&&(r.mode<27||i!==c))&&N(e,e.output,e.next_out,U-e.avail_out),O-=e.avail_in,U-=e.avail_out,e.total_in+=O,e.total_out+=U,r.total+=U,r.wrap&&U&&(e.adler=r.check=r.flags?n(r.check,o,U,e.next_out-U):t(r.check,o,U,e.next_out-U)),e.data_type=r.bits+(r.last?64:0)+(r.mode===x?128:0)+(20===r.mode||15===r.mode?256:0),(0===O&&0===U||i===c)&&K===b&&(K=p),K},inflateEnd:e=>{if(!e||!e.state)return _;let t=e.state;return t.window&&(t.window=null),e.state=null,b},inflateGetHeader:(e,t)=>{if(!e||!e.state)return _;const i=e.state;return 0==(2&i.wrap)?_:(i.head=t,t.done=!1,b)},inflateSetDictionary:(e,i)=>{const n=i.length;let a,r,s;return e&&e.state?(a=e.state,0!==a.wrap&&11!==a.mode?_:11===a.mode&&(r=1,r=t(r,i,n,0),r!==a.check)?g:(s=N(e,i,n,n),s?(a.mode=31,v):(a.havedict=1,b))):_},inflateInfo:"pako inflate (from Nodeca project)"};const z=(e,t)=>Object.prototype.hasOwnProperty.call(e,t);var F=function(e){const t=Array.prototype.slice.call(arguments,1);for(;t.length;){const i=t.shift();if(i){if("object"!=typeof i)throw new TypeError(i+"must be non-object");for(const t in i)z(i,t)&&(e[t]=i[t])}}return e},L=e=>{let t=0;for(let i=0,n=e.length;i<n;i++)t+=e[i].length;const i=new Uint8Array(t);for(let t=0,n=0,a=e.length;t<a;t++){let a=e[t];i.set(a,n),n+=a.length}return i};let M=!0;try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){M=!1}const H=new Uint8Array(256);for(let e=0;e<256;e++)H[e]=e>=252?6:e>=248?5:e>=240?4:e>=224?3:e>=192?2:1;H[254]=H[254]=1;var j=e=>{let t,i,n,a,r,s=e.length,o=0;for(a=0;a<s;a++)i=e.charCodeAt(a),55296==(64512&i)&&a+1<s&&(n=e.charCodeAt(a+1),56320==(64512&n)&&(i=65536+(i-55296<<10)+(n-56320),a++)),o+=i<128?1:i<2048?2:i<65536?3:4;for(t=new Uint8Array(o),r=0,a=0;r<o;a++)i=e.charCodeAt(a),55296==(64512&i)&&a+1<s&&(n=e.charCodeAt(a+1),56320==(64512&n)&&(i=65536+(i-55296<<10)+(n-56320),a++)),i<128?t[r++]=i:i<2048?(t[r++]=192|i>>>6,t[r++]=128|63&i):i<65536?(t[r++]=224|i>>>12,t[r++]=128|i>>>6&63,t[r++]=128|63&i):(t[r++]=240|i>>>18,t[r++]=128|i>>>12&63,t[r++]=128|i>>>6&63,t[r++]=128|63&i);return t},K=(e,t)=>{let i,n;const a=t||e.length,r=new Array(2*a);for(n=0,i=0;i<a;){let t=e[i++];if(t<128){r[n++]=t;continue}let s=H[t];if(s>4)r[n++]=65533,i+=s-1;else{for(t&=2===s?31:3===s?15:7;s>1&&i<a;)t=t<<6|63&e[i++],s--;s>1?r[n++]=65533:t<65536?r[n++]=t:(t-=65536,r[n++]=55296|t>>10&1023,r[n++]=56320|1023&t)}}return((e,t)=>{if(t<65534&&e.subarray&&M)return String.fromCharCode.apply(null,e.length===t?e:e.subarray(0,t));let i="";for(let n=0;n<t;n++)i+=String.fromCharCode(e[n]);return i})(r,n)},P=(e,t)=>{(t=t||e.length)>e.length&&(t=e.length);let i=t-1;for(;i>=0&&128==(192&e[i]);)i--;return i<0||0===i?t:i+H[e[i]]>t?i:t},Y={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"};var G=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0};var X=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1};const W=Object.prototype.toString,{Z_NO_FLUSH:q,Z_FINISH:J,Z_OK:Q,Z_STREAM_END:V,Z_NEED_DICT:$,Z_STREAM_ERROR:ee,Z_DATA_ERROR:te,Z_MEM_ERROR:ie}=h;function ne(e){this.options=F({chunkSize:65536,windowBits:15,to:""},e||{});const t=this.options;t.raw&&t.windowBits>=0&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(t.windowBits>=0&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),t.windowBits>15&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new G,this.strm.avail_out=0;let i=C.inflateInit2(this.strm,t.windowBits);if(i!==Q)throw new Error(Y[i]);if(this.header=new X,C.inflateGetHeader(this.strm,this.header),t.dictionary&&("string"==typeof t.dictionary?t.dictionary=j(t.dictionary):"[object ArrayBuffer]"===W.call(t.dictionary)&&(t.dictionary=new Uint8Array(t.dictionary)),t.raw&&(i=C.inflateSetDictionary(this.strm,t.dictionary),i!==Q)))throw new Error(Y[i])}function ae(e,t){const i=new ne(t);if(i.push(e),i.err)throw i.msg||Y[i.err];return i.result}ne.prototype.push=function(e,t){const i=this.strm,n=this.options.chunkSize,a=this.options.dictionary;let r,s,o;if(this.ended)return!1;for(s=t===~~t?t:!0===t?J:q,"[object ArrayBuffer]"===W.call(e)?i.input=new Uint8Array(e):i.input=e,i.next_in=0,i.avail_in=i.input.length;;){for(0===i.avail_out&&(i.output=new Uint8Array(n),i.next_out=0,i.avail_out=n),r=C.inflate(i,s),r===$&&a&&(r=C.inflateSetDictionary(i,a),r===Q?r=C.inflate(i,s):r===te&&(r=$));i.avail_in>0&&r===V&&i.state.wrap>0&&0!==e[i.next_in];)C.inflateReset(i),r=C.inflate(i,s);switch(r){case ee:case te:case $:case ie:return this.onEnd(r),this.ended=!0,!1}if(o=i.avail_out,i.next_out&&(0===i.avail_out||r===V))if("string"===this.options.to){let e=P(i.output,i.next_out),t=i.next_out-e,a=K(i.output,e);i.next_out=t,i.avail_out=n-t,t&&i.output.set(i.output.subarray(e,e+t),0),this.onData(a)}else this.onData(i.output.length===i.next_out?i.output:i.output.subarray(0,i.next_out));if(r!==Q||0!==o){if(r===V)return r=C.inflateEnd(this.strm),this.onEnd(r),this.ended=!0,!0;if(0===i.avail_in)break}}return!0},ne.prototype.onData=function(e){this.chunks.push(e)},ne.prototype.onEnd=function(e){e===Q&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=L(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg};var re=ne,se=ae,oe=function(e,t){return(t=t||{}).raw=!0,ae(e,t)},le=ae,de=h,fe={Inflate:re,inflate:se,inflateRaw:oe,ungzip:le,constants:de};e.Inflate=re,e.constants=de,e.default=fe,e.inflate=se,e.inflateRaw=oe,e.ungzip=le,Object.defineProperty(e,"__esModule",{value:!0})}));
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/parser.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/parser.ts
new file mode 100644
index 0000000..acb9c9c
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/parser.ts
@@ -0,0 +1,48 @@
+import { VideoEntity } from "./video_entity";
+import { getMiniBridge } from "./adaptor";
+const { inflate } = require("./pako");
+const { ProtoMovieEntity } = require("./proto");
+const wx = getMiniBridge();
+
+export class Parser {
+  load(url: string): Promise<VideoEntity> {
+    return new Promise((resolver, rejector) => {
+      if (url.indexOf("http://") === 0 || url.indexOf("https://") === 0) {
+        wx.request({
+          url: url,
+          // @ts-ignore
+          dataType: "arraybuffer",
+          responseType: "arraybuffer",
+          success: (res) => {
+            try {
+              const inflatedData = inflate(res.data as any);
+              const movieData = ProtoMovieEntity.decode(inflatedData);
+              resolver(new VideoEntity(movieData));
+            } catch (error) {
+              rejector(error);
+            }
+          },
+          fail: (error) => {
+            rejector(error);
+          },
+        });
+      } else {
+        wx.getFileSystemManager().readFile({
+          filePath: url,
+          success: (res) => {
+            try {
+              const inflatedData = inflate(res.data as any);
+              const movieData = ProtoMovieEntity.decode(inflatedData);
+              resolver(new VideoEntity(movieData));
+            } catch (error) {
+              rejector(error);
+            }
+          },
+          fail: (error) => {
+            rejector(error);
+          },
+        });
+      }
+    });
+  }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/player.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/player.ts
new file mode 100644
index 0000000..b723d77
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/player.ts
@@ -0,0 +1,331 @@
+"use strict";
+
+import { Renderer } from "./renderer";
+import { ValueAnimator } from "./value_animator";
+import { VideoEntity } from "./video_entity";
+import { getMiniBridge } from "./adaptor";
+
+const wx = getMiniBridge();
+interface Range {
+  location: number;
+  length: number;
+}
+
+interface DynamicText {
+  text: string;
+  size: number;
+  family: string;
+  color: string;
+  offset: { x: number; y: number };
+}
+
+export class Player {
+  canvas?: WechatMiniprogram.Canvas;
+  ctx?: WechatMiniprogram.CanvasContext;
+
+  async setCanvas(
+    selector: string,
+    component?: WechatMiniprogram.Component.TrivialInstance
+  ): Promise<any> {
+    return new Promise((resolver, rej) => {
+      let query = wx.createSelectorQuery();
+      if (component) {
+        query = query.in(component);
+      }
+      query
+        .select(selector)
+        .fields({ node: true, size: true })
+        .exec((res) => {
+          this.canvas = res?.[0]?.node;
+          if (!this.canvas) {
+            rej("canvas not found.");
+            return;
+          }
+          this.ctx = this.canvas!.getContext("2d");
+          if (!this.ctx) {
+            rej("canvas context not found.");
+            return;
+          }
+          const dpr = wx.getSystemInfoSync().pixelRatio;
+          this.canvas!.width = res[0].width * dpr;
+          this.canvas!.height = res[0].height * dpr;
+          resolver(undefined);
+        });
+    });
+  }
+
+  loops = 0;
+
+  clearsAfterStop = true;
+
+  fillMode = "Forward";
+
+  _videoItem?: VideoEntity;
+
+  async setVideoItem(videoItem?: VideoEntity): Promise<any> {
+    this._currentFrame = 0;
+    this._videoItem = videoItem;
+    if (videoItem) {
+      const keyedImages = await Promise.all(
+        Object.keys(videoItem.spec.images).map(async (it) => {
+          try {
+            const data = await this.loadWXImage(videoItem.spec.images[it]);
+            return { key: it, value: data };
+          } catch (error) {
+            return { key: it, value: undefined };
+          }
+        })
+      );
+      let decodedImages: { [key: string]: any } = {};
+      keyedImages.forEach((it) => {
+        decodedImages[it.key] = it.value;
+      });
+      videoItem.decodedImages = decodedImages;
+      this._renderer = new Renderer(this._videoItem!, this.ctx!, this.canvas!);
+    } else {
+      this._renderer = undefined;
+    }
+    this.clear();
+    this._update();
+  }
+
+  loadWXImage(data: Uint8Array | string): Promise<any> {
+    if (!this.canvas) throw "no canvas";
+    return new Promise((res, rej) => {
+      const img: WechatMiniprogram.Image = this.canvas!.createImage();
+      img.onload = () => {
+        res(img);
+      };
+      img.onerror = (error) => {
+        console.log(error);
+        rej("image decoded fail.");
+      };
+      if (typeof data === "string") {
+        img.src = data;
+      } else {
+        img.src = "data:image/png;base64," + wx.arrayBufferToBase64(data);
+      }
+    });
+  }
+
+  _contentMode = "AspectFit";
+
+  setContentMode(contentMode: string) {
+    this._contentMode = contentMode;
+    this._update();
+  }
+
+  startAnimation(reverse: boolean = false) {
+    this.stopAnimation(false);
+    this._doStart(undefined, reverse, undefined);
+  }
+
+  startAnimationWithRange(range: Range, reverse: boolean = false) {
+    this.stopAnimation(false);
+    this._doStart(range, reverse, undefined);
+  }
+
+  pauseAnimation() {
+    this.stopAnimation(false);
+  }
+
+  stopAnimation(clear?: boolean) {
+    this._forwardAnimating = false;
+    if (this._animator !== undefined) {
+      this._animator.stop();
+    }
+    if (clear === undefined) {
+      clear = this.clearsAfterStop;
+    }
+    if (clear) {
+      this.clear();
+    }
+  }
+
+  clear() {
+    this._renderer?.clear();
+    // this._renderer?.clearAudios();
+  }
+
+  stepToFrame(frame: number, andPlay: boolean = false) {
+    const videoItem = this._videoItem;
+    if (!videoItem) return;
+    if (frame >= videoItem.frames || frame < 0) {
+      return;
+    }
+    this.pauseAnimation();
+    this._currentFrame = frame;
+    this._update();
+    if (andPlay) {
+      this._doStart(undefined, false, this._currentFrame);
+    }
+  }
+
+  stepToPercentage(percentage: number, andPlay: boolean = false) {
+    const videoItem = this._videoItem;
+    if (!videoItem) return;
+    let frame = percentage * videoItem.frames;
+    if (frame >= videoItem.frames && frame > 0) {
+      frame = videoItem.frames - 1;
+    }
+    this.stepToFrame(frame, andPlay);
+  }
+
+  async setImage(src: Uint8Array | string, forKey: string): Promise<any> {
+    const img = await this.loadWXImage(src);
+    this._dynamicImage[forKey] = img;
+  }
+
+  setText(dynamicText: DynamicText, forKey: string) {
+    this._dynamicText[forKey] = dynamicText;
+  }
+
+  clearDynamicObjects() {
+    this._dynamicImage = {};
+    this._dynamicText = {};
+  }
+
+  onFinished(callback: () => void) {
+    this._onFinished = callback;
+  }
+
+  onFrame(callback: (frame: number) => void) {
+    this._onFrame = callback;
+  }
+
+  onPercentage(callback: (percentage: number) => void) {
+    this._onPercentage = callback;
+  }
+
+  /**
+   * Private methods & properties
+   */
+
+  _renderer?: Renderer;
+  _animator: ValueAnimator = new ValueAnimator();
+  _forwardAnimating = false;
+  _currentFrame = 0;
+  _dynamicImage: { [key: string]: any } = {};
+  _dynamicText: { [key: string]: DynamicText } = {};
+
+  _onFinished?: () => void;
+  _onFrame?: (frame: number) => void;
+  _onPercentage?: (percentage: number) => void;
+
+  _doStart(range?: Range, reverse: boolean = false, fromFrame: number = 0) {
+    const videoItem = this._videoItem;
+    if (!videoItem) return;
+    this._animator = new ValueAnimator();
+    this._animator.canvas = this.canvas;
+    if (range !== undefined) {
+      this._animator.startValue = Math.max(0, range.location);
+      this._animator.endValue = Math.min(
+        videoItem.frames - 1,
+        range.location + range.length
+      );
+      this._animator.duration =
+        (this._animator.endValue - this._animator.startValue + 1) *
+        (1.0 / videoItem.FPS) *
+        1000;
+    } else {
+      this._animator.startValue = 0;
+      this._animator.endValue = videoItem.frames - 1;
+      this._animator.duration = videoItem.frames * (1.0 / videoItem.FPS) * 1000;
+    }
+    this._animator.loops = this.loops <= 0 ? Infinity : this.loops;
+    this._animator.fillRule = this.fillMode === "Backward" ? 1 : 0;
+    this._animator.onUpdate = (value) => {
+      if (this._currentFrame === Math.floor(value)) {
+        return;
+      }
+      if (this._forwardAnimating && this._currentFrame > Math.floor(value)) {
+        // this._renderer.clearAudios();
+      }
+      this._currentFrame = Math.floor(value);
+      this._update();
+      if (typeof this._onFrame === "function") {
+        this._onFrame(this._currentFrame);
+      }
+      if (typeof this._onPercentage === "function") {
+        this._onPercentage((this._currentFrame + 1) / videoItem.frames);
+      }
+    };
+    this._animator.onEnd = () => {
+      this._forwardAnimating = false;
+      if (this.clearsAfterStop === true) {
+        this.clear();
+      }
+      if (typeof this._onFinished === "function") {
+        this._onFinished();
+      }
+    };
+    if (reverse === true) {
+      this._animator.reverse(fromFrame);
+      this._forwardAnimating = false;
+    } else {
+      this._animator.start(fromFrame);
+      this._forwardAnimating = true;
+    }
+    this._currentFrame = this._animator.startValue;
+    this._update();
+  }
+
+  _resize() {
+    const ctx = this.ctx;
+    const videoItem = this._videoItem;
+    if (!ctx) return;
+    if (!videoItem) return;
+    let scaleX = 1.0;
+    let scaleY = 1.0;
+    let translateX = 0.0;
+    let translateY = 0.0;
+    let targetSize = {
+      width: this.canvas!.width,
+      height: this.canvas!.height,
+    };
+    let imageSize = videoItem.videoSize;
+    if (this._contentMode === "Fill") {
+      scaleX = targetSize.width / imageSize.width;
+      scaleY = targetSize.height / imageSize.height;
+    } else if (
+      this._contentMode === "AspectFit" ||
+      this._contentMode === "AspectFill"
+    ) {
+      const imageRatio = imageSize.width / imageSize.height;
+      const viewRatio = targetSize.width / targetSize.height;
+      if (
+        (imageRatio >= viewRatio && this._contentMode === "AspectFit") ||
+        (imageRatio <= viewRatio && this._contentMode === "AspectFill")
+      ) {
+        scaleX = scaleY = targetSize.width / imageSize.width;
+        translateY = (targetSize.height - imageSize.height * scaleY) / 2.0;
+      } else if (
+        (imageRatio < viewRatio && this._contentMode === "AspectFit") ||
+        (imageRatio > viewRatio && this._contentMode === "AspectFill")
+      ) {
+        scaleX = scaleY = targetSize.height / imageSize.height;
+        translateX = (targetSize.width - imageSize.width * scaleX) / 2.0;
+      }
+    }
+    if (this._renderer) {
+      this._renderer.globalTransform = {
+        a: scaleX,
+        b: 0.0,
+        c: 0.0,
+        d: scaleY,
+        tx: translateX,
+        ty: translateY,
+      };
+    }
+  }
+
+  _update() {
+    this._resize();
+    if (this._renderer) {
+      this._renderer._dynamicImage = this._dynamicImage;
+      this._renderer._dynamicText = this._dynamicText;
+      this._renderer.drawFrame(this._currentFrame);
+      this._renderer.playAudio(this._currentFrame);
+    }
+  }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/proto.js b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/proto.js
new file mode 100644
index 0000000..fdcf3e0
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/proto.js
@@ -0,0 +1,5 @@
+const protobuf = require("../protobuf_mp/protobuf")
+const svgaDescriptor = JSON.parse(`{"nested":{"com":{"nested":{"opensource":{"nested":{"svga":{"options":{"objc_class_prefix":"SVGAProto","java_package":"com.opensource.svgaplayer.proto"},"nested":{"MovieParams":{"fields":{"viewBoxWidth":{"type":"float","id":1},"viewBoxHeight":{"type":"float","id":2},"fps":{"type":"int32","id":3},"frames":{"type":"int32","id":4}}},"SpriteEntity":{"fields":{"imageKey":{"type":"string","id":1},"frames":{"rule":"repeated","type":"FrameEntity","id":2},"matteKey":{"type":"string","id":3}}},"AudioEntity":{"fields":{"audioKey":{"type":"string","id":1},"startFrame":{"type":"int32","id":2},"endFrame":{"type":"int32","id":3},"startTime":{"type":"int32","id":4},"totalTime":{"type":"int32","id":5}}},"Layout":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4}}},"Transform":{"fields":{"a":{"type":"float","id":1},"b":{"type":"float","id":2},"c":{"type":"float","id":3},"d":{"type":"float","id":4},"tx":{"type":"float","id":5},"ty":{"type":"float","id":6}}},"ShapeEntity":{"oneofs":{"args":{"oneof":["shape","rect","ellipse"]}},"fields":{"type":{"type":"ShapeType","id":1},"shape":{"type":"ShapeArgs","id":2},"rect":{"type":"RectArgs","id":3},"ellipse":{"type":"EllipseArgs","id":4},"styles":{"type":"ShapeStyle","id":10},"transform":{"type":"Transform","id":11}},"nested":{"ShapeType":{"values":{"SHAPE":0,"RECT":1,"ELLIPSE":2,"KEEP":3}},"ShapeArgs":{"fields":{"d":{"type":"string","id":1}}},"RectArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4},"cornerRadius":{"type":"float","id":5}}},"EllipseArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"radiusX":{"type":"float","id":3},"radiusY":{"type":"float","id":4}}},"ShapeStyle":{"fields":{"fill":{"type":"RGBAColor","id":1},"stroke":{"type":"RGBAColor","id":2},"strokeWidth":{"type":"float","id":3},"lineCap":{"type":"LineCap","id":4},"lineJoin":{"type":"LineJoin","id":5},"miterLimit":{"type":"float","id":6},"lineDashI":{"type":"float","id":7},"lineDashII":{"type":"float","id":8},"lineDashIII":{"type":"float","id":9}},"nested":{"RGBAColor":{"fields":{"r":{"type":"float","id":1},"g":{"type":"float","id":2},"b":{"type":"float","id":3},"a":{"type":"float","id":4}}},"LineCap":{"values":{"LineCap_BUTT":0,"LineCap_ROUND":1,"LineCap_SQUARE":2}},"LineJoin":{"values":{"LineJoin_MITER":0,"LineJoin_ROUND":1,"LineJoin_BEVEL":2}}}}}},"FrameEntity":{"fields":{"alpha":{"type":"float","id":1},"layout":{"type":"Layout","id":2},"transform":{"type":"Transform","id":3},"clipPath":{"type":"string","id":4},"shapes":{"rule":"repeated","type":"ShapeEntity","id":5}}},"MovieEntity":{"fields":{"version":{"type":"string","id":1},"params":{"type":"MovieParams","id":2},"images":{"keyType":"string","type":"bytes","id":3},"sprites":{"rule":"repeated","type":"SpriteEntity","id":4},"audios":{"rule":"repeated","type":"AudioEntity","id":5}}}}}}}}}}}`)
+
+export const proto = protobuf.Root.fromJSON(svgaDescriptor);
+export const ProtoMovieEntity = proto.lookupType("com.opensource.svga.MovieEntity");
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/rect_path.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/rect_path.ts
new file mode 100644
index 0000000..21a5724
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/rect_path.ts
@@ -0,0 +1,30 @@
+import { BezierPath } from "./bezier_path";
+
+export class RectPath extends BezierPath {
+  _x;
+  _y;
+  _width;
+  _height;
+  _cornerRadius;
+  _transform;
+  _styles;
+
+  constructor(
+    x: number,
+    y: number,
+    width: number,
+    height: number,
+    cornerRadius: number,
+    transform: any,
+    styles: any
+  ) {
+    super("", transform, styles);
+    this._x = x;
+    this._y = y;
+    this._width = width;
+    this._height = height;
+    this._cornerRadius = cornerRadius;
+    this._transform = transform;
+    this._styles = styles;
+  }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/renderer.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/renderer.ts
new file mode 100644
index 0000000..98f9cfb
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/renderer.ts
@@ -0,0 +1,558 @@
+import { BezierPath } from "./bezier_path";
+import { EllipsePath } from "./ellipse_path";
+import { RectPath } from "./rect_path";
+import { SpriteEntity } from "./sprite_entity";
+import { VideoEntity } from "./video_entity";
+
+interface Point {
+  x: number;
+  y: number;
+  x1: number;
+  y1: number;
+  x2: number;
+  y2: number;
+}
+
+interface DynamicText {
+  text: string;
+  size: number;
+  family: string;
+  color: string;
+  offset: { x: number; y: number };
+}
+
+const validMethods = "MLHVCSQRZmlhvcsqrz";
+
+export class Renderer {
+  constructor(
+    readonly videoItem: VideoEntity,
+    readonly ctx: WechatMiniprogram.CanvasContext,
+    readonly canvas: WechatMiniprogram.Canvas
+  ) {}
+
+  globalTransform?: {
+    a: number;
+    b: number;
+    c: number;
+    d: number;
+    tx: number;
+    ty: number;
+  };
+
+  _dynamicImage: { [key: string]: any } = {};
+  _dynamicText: { [key: string]: DynamicText } = {};
+
+  clear() {
+    const ctx = this.ctx;
+    const areaFrame = {
+      x: 0.0,
+      y: 0.0,
+      width: this.canvas.width,
+      height: this.canvas.height,
+    };
+    ctx.clearRect(areaFrame.x, areaFrame.y, areaFrame.width, areaFrame.height);
+  }
+
+  drawFrame(frame: number) {
+    const ctx = this.ctx;
+    const areaFrame = {
+      x: 0.0,
+      y: 0.0,
+      width: this.canvas.width,
+      height: this.canvas.height,
+    };
+    ctx.clearRect(areaFrame.x, areaFrame.y, areaFrame.width, areaFrame.height);
+
+    var matteSprites: any = {};
+    var isMatteing = false;
+
+    var sprites = this.videoItem.sprites;
+    sprites.forEach((sprite, index) => {
+      if (sprites[0].imageKey?.indexOf(".matte") == -1) {
+        this.drawSprite(sprite, frame);
+        return;
+      }
+      if (sprite.imageKey?.indexOf(".matte") != -1) {
+        matteSprite[sprite.imageKey!] = sprite;
+        return;
+      }
+      var lastSprite = sprites[index - 1];
+      if (
+        isMatteing &&
+        (!sprite.matteKey ||
+          sprite.matteKey.length == 0 ||
+          sprite.matteKey != lastSprite.matteKey)
+      ) {
+        isMatteing = false;
+
+        var matteSprite = matteSprites[sprite.matteKey!];
+        ctx.globalCompositeOperation = "destination-in";
+        this.drawSprite(matteSprite, frame);
+        ctx.globalCompositeOperation = "source-over";
+        ctx.restore();
+      }
+      if (
+        sprite.matteKey != null &&
+        (lastSprite.matteKey == null ||
+          lastSprite.matteKey.length == 0 ||
+          lastSprite.matteKey != sprite.matteKey)
+      ) {
+        isMatteing = true;
+        ctx.save();
+      }
+      this.drawSprite(sprite, frame);
+
+      if (isMatteing && index == sprites.length - 1) {
+        var matteSprite = matteSprites.get(sprite.matteKey);
+        ctx.globalCompositeOperation = "destination-in";
+        this.drawSprite(matteSprite, frame);
+        ctx.globalCompositeOperation = "source-over";
+        ctx.restore();
+      }
+    });
+  }
+
+  drawSprite(sprite: SpriteEntity, frameIndex: number) {
+    let frameItem = sprite.frames[frameIndex];
+    if (frameItem.alpha < 0.05) {
+      return;
+    }
+    const ctx = this.ctx;
+    ctx.save();
+    if (this.globalTransform) {
+      ctx.transform(
+        this.globalTransform.a,
+        this.globalTransform.b,
+        this.globalTransform.c,
+        this.globalTransform.d,
+        this.globalTransform.tx,
+        this.globalTransform.ty
+      );
+    }
+    ctx.globalAlpha = frameItem.alpha;
+    ctx.transform(
+      frameItem.transform.a,
+      frameItem.transform.b,
+      frameItem.transform.c,
+      frameItem.transform.d,
+      frameItem.transform.tx,
+      frameItem.transform.ty
+    );
+    let bitmapKey = sprite.imageKey?.replace(".matte", "");
+    if (!bitmapKey) return;
+    let img =
+      this._dynamicImage[bitmapKey] ?? this.videoItem.decodedImages[bitmapKey];
+    if (frameItem.maskPath !== undefined && frameItem.maskPath !== null) {
+      frameItem.maskPath._styles = undefined;
+      this.drawBezier(frameItem.maskPath);
+      ctx.clip();
+    }
+    if (img) {
+      ctx.drawImage(
+        img,
+        0,
+        0,
+        img.width,
+        img.height,
+        0,
+        0,
+        frameItem.layout.width,
+        frameItem.layout.height
+      );
+    }
+
+    frameItem.shapes &&
+      frameItem.shapes.forEach((shape: any) => {
+        if (shape.type === "shape" && shape.pathArgs && shape.pathArgs.d) {
+          this.drawBezier(
+            new BezierPath(shape.pathArgs.d, shape.transform, shape.styles)
+          );
+        }
+        if (shape.type === "ellipse" && shape.pathArgs) {
+          this.drawEllipse(
+            new EllipsePath(
+              parseFloat(shape.pathArgs.x) || 0.0,
+              parseFloat(shape.pathArgs.y) || 0.0,
+              parseFloat(shape.pathArgs.radiusX) || 0.0,
+              parseFloat(shape.pathArgs.radiusY) || 0.0,
+              shape.transform,
+              shape.styles
+            )
+          );
+        }
+        if (shape.type === "rect" && shape.pathArgs) {
+          this.drawRect(
+            new RectPath(
+              parseFloat(shape.pathArgs.x) || 0.0,
+              parseFloat(shape.pathArgs.y) || 0.0,
+              parseFloat(shape.pathArgs.width) || 0.0,
+              parseFloat(shape.pathArgs.height) || 0.0,
+              parseFloat(shape.pathArgs.cornerRadius) || 0.0,
+              shape.transform,
+              shape.styles
+            )
+          );
+        }
+      });
+    let dynamicText = this._dynamicText[bitmapKey];
+    if (dynamicText !== undefined) {
+      ctx.font = `${dynamicText.size}px ${dynamicText.family ?? "Arial"}`;
+      let textWidth = ctx.measureText(dynamicText.text).width;
+      ctx.fillStyle = dynamicText.color;
+      let offsetX =
+        dynamicText.offset !== undefined && dynamicText.offset.x !== undefined
+          ? isNaN(dynamicText.offset.x)
+            ? 0
+            : dynamicText.offset.x
+          : 0;
+      let offsetY =
+        dynamicText.offset !== undefined && dynamicText.offset.y !== undefined
+          ? isNaN(dynamicText.offset.y)
+            ? 0
+            : dynamicText.offset.y
+          : 0;
+      ctx.fillText(
+        dynamicText.text,
+        (frameItem.layout.width - textWidth) / 2 + offsetX,
+        frameItem.layout.height / 2 + offsetY
+      );
+    }
+    ctx.restore();
+  }
+
+  playAudio(frame: number) {}
+
+  resetShapeStyles(obj: any) {
+    const ctx = this.ctx;
+    const styles = obj._styles;
+    if (!styles) {
+      return;
+    }
+    if (styles && styles.stroke) {
+      ctx.strokeStyle = `rgba(${(styles.stroke[0] * 255).toFixed(0)}, ${(
+        styles.stroke[1] * 255
+      ).toFixed(0)}, ${(styles.stroke[2] * 255).toFixed(0)}, ${
+        styles.stroke[3]
+      })`;
+    } else {
+      ctx.strokeStyle = "transparent";
+    }
+    if (styles) {
+      ctx.lineWidth = styles.strokeWidth || undefined;
+      ctx.lineCap = styles.lineCap || undefined;
+      ctx.lineJoin = styles.lineJoin || undefined;
+      ctx.miterLimit = styles.miterLimit || undefined;
+    }
+    if (styles && styles.fill) {
+      ctx.fillStyle = `rgba(${(styles.fill[0] * 255).toFixed(0)}, ${(
+        styles.fill[1] * 255
+      ).toFixed(0)}, ${(styles.fill[2] * 255).toFixed(0)}, ${styles.fill[3]})`;
+    } else {
+      ctx.fillStyle = "transparent";
+    }
+    if (styles && styles.lineDash) {
+      ctx.setLineDash(
+        [styles.lineDash[0], styles.lineDash[1]],
+        styles.lineDash[2]
+      );
+    }
+  }
+
+  drawBezier(obj: any) {
+    const ctx = this.ctx;
+    ctx.save();
+    this.resetShapeStyles(obj);
+    if (obj._transform !== undefined && obj._transform !== null) {
+      ctx.transform(
+        obj._transform.a,
+        obj._transform.b,
+        obj._transform.c,
+        obj._transform.d,
+        obj._transform.tx,
+        obj._transform.ty
+      );
+    }
+    let currentPoint: Point = { x: 0, y: 0, x1: 0, y1: 0, x2: 0, y2: 0 };
+    ctx.beginPath();
+    const d = obj._d.replace(/([a-zA-Z])/g, "|||$1 ").replace(/,/g, " ");
+    d.split("|||").forEach((segment: string) => {
+      if (segment.length == 0) {
+        return;
+      }
+      const firstLetter = segment.substr(0, 1);
+      if (validMethods.indexOf(firstLetter) >= 0) {
+        const args = segment.substr(1).trim().split(" ");
+        this.drawBezierElement(currentPoint, firstLetter, args);
+      }
+    });
+    if (obj._styles && obj._styles.fill) {
+      ctx.fill();
+    }
+    if (obj._styles && obj._styles.stroke) {
+      ctx.stroke();
+    }
+    ctx.restore();
+  }
+
+  drawBezierElement(currentPoint: Point, method: string, args: any) {
+    const ctx = this.ctx;
+    switch (method) {
+      case "M":
+        currentPoint.x = Number(args[0]);
+        currentPoint.y = Number(args[1]);
+        ctx.moveTo(currentPoint.x, currentPoint.y);
+        break;
+      case "m":
+        currentPoint.x += Number(args[0]);
+        currentPoint.y += Number(args[1]);
+        ctx.moveTo(currentPoint.x, currentPoint.y);
+        break;
+      case "L":
+        currentPoint.x = Number(args[0]);
+        currentPoint.y = Number(args[1]);
+        ctx.lineTo(currentPoint.x, currentPoint.y);
+        break;
+      case "l":
+        currentPoint.x += Number(args[0]);
+        currentPoint.y += Number(args[1]);
+        ctx.lineTo(currentPoint.x, currentPoint.y);
+        break;
+      case "H":
+        currentPoint.x = Number(args[0]);
+        ctx.lineTo(currentPoint.x, currentPoint.y);
+        break;
+      case "h":
+        currentPoint.x += Number(args[0]);
+        ctx.lineTo(currentPoint.x, currentPoint.y);
+        break;
+      case "V":
+        currentPoint.y = Number(args[0]);
+        ctx.lineTo(currentPoint.x, currentPoint.y);
+        break;
+      case "v":
+        currentPoint.y += Number(args[0]);
+        ctx.lineTo(currentPoint.x, currentPoint.y);
+        break;
+      case "C":
+        currentPoint.x1 = Number(args[0]);
+        currentPoint.y1 = Number(args[1]);
+        currentPoint.x2 = Number(args[2]);
+        currentPoint.y2 = Number(args[3]);
+        currentPoint.x = Number(args[4]);
+        currentPoint.y = Number(args[5]);
+        ctx.bezierCurveTo(
+          currentPoint.x1,
+          currentPoint.y1,
+          currentPoint.x2,
+          currentPoint.y2,
+          currentPoint.x,
+          currentPoint.y
+        );
+        break;
+      case "c":
+        currentPoint.x1 = currentPoint.x + Number(args[0]);
+        currentPoint.y1 = currentPoint.y + Number(args[1]);
+        currentPoint.x2 = currentPoint.x + Number(args[2]);
+        currentPoint.y2 = currentPoint.y + Number(args[3]);
+        currentPoint.x += Number(args[4]);
+        currentPoint.y += Number(args[5]);
+        ctx.bezierCurveTo(
+          currentPoint.x1,
+          currentPoint.y1,
+          currentPoint.x2,
+          currentPoint.y2,
+          currentPoint.x,
+          currentPoint.y
+        );
+        break;
+      case "S":
+        if (
+          currentPoint.x1 &&
+          currentPoint.y1 &&
+          currentPoint.x2 &&
+          currentPoint.y2
+        ) {
+          currentPoint.x1 = currentPoint.x - currentPoint.x2 + currentPoint.x;
+          currentPoint.y1 = currentPoint.y - currentPoint.y2 + currentPoint.y;
+          currentPoint.x2 = Number(args[0]);
+          currentPoint.y2 = Number(args[1]);
+          currentPoint.x = Number(args[2]);
+          currentPoint.y = Number(args[3]);
+          ctx.bezierCurveTo(
+            currentPoint.x1,
+            currentPoint.y1,
+            currentPoint.x2,
+            currentPoint.y2,
+            currentPoint.x,
+            currentPoint.y
+          );
+        } else {
+          currentPoint.x1 = Number(args[0]);
+          currentPoint.y1 = Number(args[1]);
+          currentPoint.x = Number(args[2]);
+          currentPoint.y = Number(args[3]);
+          ctx.quadraticCurveTo(
+            currentPoint.x1,
+            currentPoint.y1,
+            currentPoint.x,
+            currentPoint.y
+          );
+        }
+        break;
+      case "s":
+        if (
+          currentPoint.x1 &&
+          currentPoint.y1 &&
+          currentPoint.x2 &&
+          currentPoint.y2
+        ) {
+          currentPoint.x1 = currentPoint.x - currentPoint.x2 + currentPoint.x;
+          currentPoint.y1 = currentPoint.y - currentPoint.y2 + currentPoint.y;
+          currentPoint.x2 = currentPoint.x + Number(args[0]);
+          currentPoint.y2 = currentPoint.y + Number(args[1]);
+          currentPoint.x += Number(args[2]);
+          currentPoint.y += Number(args[3]);
+          ctx.bezierCurveTo(
+            currentPoint.x1,
+            currentPoint.y1,
+            currentPoint.x2,
+            currentPoint.y2,
+            currentPoint.x,
+            currentPoint.y
+          );
+        } else {
+          currentPoint.x1 = currentPoint.x + Number(args[0]);
+          currentPoint.y1 = currentPoint.y + Number(args[1]);
+          currentPoint.x += Number(args[2]);
+          currentPoint.y += Number(args[3]);
+          ctx.quadraticCurveTo(
+            currentPoint.x1,
+            currentPoint.y1,
+            currentPoint.x,
+            currentPoint.y
+          );
+        }
+        break;
+      case "Q":
+        currentPoint.x1 = Number(args[0]);
+        currentPoint.y1 = Number(args[1]);
+        currentPoint.x = Number(args[2]);
+        currentPoint.y = Number(args[3]);
+        ctx.quadraticCurveTo(
+          currentPoint.x1,
+          currentPoint.y1,
+          currentPoint.x,
+          currentPoint.y
+        );
+        break;
+      case "q":
+        currentPoint.x1 = currentPoint.x + Number(args[0]);
+        currentPoint.y1 = currentPoint.y + Number(args[1]);
+        currentPoint.x += Number(args[2]);
+        currentPoint.y += Number(args[3]);
+        ctx.quadraticCurveTo(
+          currentPoint.x1,
+          currentPoint.y1,
+          currentPoint.x,
+          currentPoint.y
+        );
+        break;
+      case "A":
+        break;
+      case "a":
+        break;
+      case "Z":
+      case "z":
+        ctx.closePath();
+        break;
+      default:
+        break;
+    }
+  }
+
+  drawEllipse(obj: any) {
+    const ctx = this.ctx;
+    ctx.save();
+    this.resetShapeStyles(obj);
+    if (obj._transform !== undefined && obj._transform !== null) {
+      ctx.transform(
+        obj._transform.a,
+        obj._transform.b,
+        obj._transform.c,
+        obj._transform.d,
+        obj._transform.tx,
+        obj._transform.ty
+      );
+    }
+    let x = obj._x - obj._radiusX;
+    let y = obj._y - obj._radiusY;
+    let w = obj._radiusX * 2;
+    let h = obj._radiusY * 2;
+    var kappa = 0.5522848,
+      ox = (w / 2) * kappa,
+      oy = (h / 2) * kappa,
+      xe = x + w,
+      ye = y + h,
+      xm = x + w / 2,
+      ym = y + h / 2;
+
+    ctx.beginPath();
+    ctx.moveTo(x, ym);
+    ctx.bezierCurveTo(x, ym - oy, xm - ox, y, xm, y);
+    ctx.bezierCurveTo(xm + ox, y, xe, ym - oy, xe, ym);
+    ctx.bezierCurveTo(xe, ym + oy, xm + ox, ye, xm, ye);
+    ctx.bezierCurveTo(xm - ox, ye, x, ym + oy, x, ym);
+    if (obj._styles && obj._styles.fill) {
+      ctx.fill();
+    }
+    if (obj._styles && obj._styles.stroke) {
+      ctx.stroke();
+    }
+    ctx.restore();
+  }
+
+  drawRect(obj: any) {
+    const ctx = this.ctx;
+    ctx.save();
+    this.resetShapeStyles(obj);
+    if (obj._transform !== undefined && obj._transform !== null) {
+      ctx.transform(
+        obj._transform.a,
+        obj._transform.b,
+        obj._transform.c,
+        obj._transform.d,
+        obj._transform.tx,
+        obj._transform.ty
+      );
+    }
+
+    let x = obj._x;
+    let y = obj._y;
+    let width = obj._width;
+    let height = obj._height;
+    let radius = obj._cornerRadius;
+
+    if (width < 2 * radius) {
+      radius = width / 2;
+    }
+    if (height < 2 * radius) {
+      radius = height / 2;
+    }
+
+    ctx.beginPath();
+    ctx.moveTo(x + radius, y);
+    ctx.arcTo(x + width, y, x + width, y + height, radius);
+    ctx.arcTo(x + width, y + height, x, y + height, radius);
+    ctx.arcTo(x, y + height, x, y, radius);
+    ctx.arcTo(x, y, x + width, y, radius);
+    ctx.closePath();
+
+    if (obj._styles && obj._styles.fill) {
+      ctx.fill();
+    }
+    if (obj._styles && obj._styles.stroke) {
+      ctx.stroke();
+    }
+    ctx.restore();
+  }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/sprite_entity.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/sprite_entity.ts
new file mode 100644
index 0000000..1346929
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/sprite_entity.ts
@@ -0,0 +1,18 @@
+import { FrameEntity } from "./frame_entity";
+
+export class SpriteEntity {
+  matteKey?: string;
+
+  imageKey?: string;
+
+  frames: any[];
+
+  constructor(spec: any) {
+    this.matteKey = spec.matteKey;
+    this.imageKey = spec.imageKey;
+    this.frames =
+      spec.frames?.map((obj: any) => {
+        return new FrameEntity(obj);
+      }) ?? [];
+  }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/value_animator.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/value_animator.ts
new file mode 100644
index 0000000..757d411
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/value_animator.ts
@@ -0,0 +1,99 @@
+export class ValueAnimator {
+  static currentTimeMillsecond = () => {
+    if (typeof performance === "undefined") {
+      return new Date().getTime();
+    }
+    return performance.now();
+  };
+
+  canvas?: WechatMiniprogram.Canvas;
+  startValue = 0;
+  endValue = 0;
+  duration = 0;
+  loops = 1;
+  fillRule = 0;
+  mRunning = false;
+  mStartTime = 0;
+  mCurrentFrication = 0.0;
+  mReverse = false;
+
+  onStart = () => {};
+  onUpdate = (value: number) => {};
+  onEnd = () => {};
+
+  start(currentValue?: number) {
+    this.doStart(false, currentValue);
+  }
+
+  reverse(currentValue?: number) {
+    this.doStart(true, currentValue);
+  }
+
+  stop() {
+    this.doStop();
+  }
+
+  animatedValue() {
+    return (
+      (this.endValue - this.startValue) * this.mCurrentFrication +
+      this.startValue
+    );
+  }
+
+  doStart(reverse: boolean, currentValue: number | undefined = undefined) {
+    this.mReverse = reverse;
+    this.mRunning = true;
+    this.mStartTime = ValueAnimator.currentTimeMillsecond();
+    if (currentValue) {
+      if (reverse) {
+        this.mStartTime -=
+          (1.0 - currentValue / (this.endValue - this.startValue)) *
+          this.duration;
+      } else {
+        this.mStartTime -=
+          (currentValue / (this.endValue - this.startValue)) * this.duration;
+      }
+    }
+    this.mCurrentFrication = 0.0;
+    this.onStart();
+    this.doFrame();
+  }
+
+  doStop() {
+    this.mRunning = false;
+  }
+
+  doFrame() {
+    const renderLoop = () => {
+      if (!this.mRunning) return;
+      this.doDeltaTime(ValueAnimator.currentTimeMillsecond() - this.mStartTime);
+      this.canvas?.requestAnimationFrame(renderLoop);
+    };
+    this.canvas?.requestAnimationFrame(renderLoop);
+
+    // if (this.mRunning) {
+    //     this.doDeltaTime(ValueAnimator.currentTimeMillsecond() - this.mStartTime)
+    //     if (this.mRunning && this.canvas !== undefined) {
+    //         this.canvas.requestAnimationFrame(this.doFrame.bind(this))
+    //     }
+    // }
+  }
+
+  doDeltaTime(deltaTime: number) {
+    let ended = false;
+    if (deltaTime >= this.duration * this.loops) {
+      this.mCurrentFrication = this.fillRule === 1 ? 0.0 : 1.0;
+      this.mRunning = false;
+      ended = true;
+    } else {
+      this.mCurrentFrication = (deltaTime % this.duration) / this.duration;
+      if (this.mReverse) {
+        this.mCurrentFrication = 1.0 - this.mCurrentFrication;
+      }
+    }
+    this.onUpdate(this.animatedValue());
+    if (this.mRunning === false && ended) {
+      this.onEnd();
+    }
+  }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/video_entity.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/video_entity.ts
new file mode 100644
index 0000000..ed6cec6
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/src/video_entity.ts
@@ -0,0 +1,37 @@
+import { SpriteEntity } from "./sprite_entity";
+
+export class VideoEntity {
+  version = "2.0.0";
+
+  videoSize: {
+    width: number;
+    height: number;
+  };
+
+  FPS: number;
+
+  frames: number;
+
+  sprites: SpriteEntity[];
+
+  audios: any[];
+
+  decodedImages: { [key: string]: any } = {};
+
+  constructor(
+    readonly spec: any
+  ) {
+    this.version = spec.ver;
+    this.videoSize = {
+      width: spec.params.viewBoxWidth || 0.0,
+      height: spec.params.viewBoxHeight || 0.0,
+    };
+    this.FPS = spec.params.fps || 20;
+    this.frames = spec.params.frames || 0;
+    this.sprites =
+      spec.sprites?.map((obj: any) => {
+        return new SpriteEntity(obj);
+      }) ?? [];
+    this.audios = [];
+  }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/svgaplayer-weapp.d.ts b/uni_modules/c-svga/node_modules/svgaplayer-weapp/svgaplayer-weapp.d.ts
new file mode 100644
index 0000000..6a48e7f
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/svgaplayer-weapp.d.ts
@@ -0,0 +1,40 @@
+export class Parser {
+  load(url: string): Promise<VideoEntity>;
+}
+
+export class Player {
+  loops: number;
+  clearsAfterStop: boolean;
+  fillMode: "Forward" | "Backward";
+  async setCanvas(selector: string, component?: any): Promise<any>;
+  async setVideoItem(videoItem?: VideoEntity): Promise<any>;
+  setContentMode(contentMode: "AspectFit" | "AspectFill" | "Fill");
+  startAnimation(reverse?: boolean);
+  startAnimationWithRange(range: Range, reverse?: boolean);
+  pauseAnimation();
+  stopAnimation(clear?: boolean);
+  clear();
+  stepToFrame(frame: number, andPlay?: boolean);
+  stepToPercentage(percentage: number, andPlay?: boolean);
+  async setImage(src: Uint8Array | string, forKey: string): Promise<any>;
+  setText(dynamicText: DynamicText, forKey: string);
+  clearDynamicObjects();
+  onFinished(callback: () => void);
+  onFrame(callback: (frame: number) => void);
+  onPercentage(callback: (percentage: number) => void);
+}
+
+interface Range {
+  location: number;
+  length: number;
+}
+
+interface DynamicText {
+  text: string;
+  size: number;
+  family: string;
+  color: string;
+  offset: { x: number; y: number };
+}
+
+export default svgaplayer - weapp;
diff --git a/uni_modules/c-svga/node_modules/svgaplayer-weapp/tsconfig.json b/uni_modules/c-svga/node_modules/svgaplayer-weapp/tsconfig.json
new file mode 100644
index 0000000..cec90f7
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayer-weapp/tsconfig.json
@@ -0,0 +1,73 @@
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+    /* Basic Options */
+    // "incremental": true,                   /* Enable incremental compilation */
+    "target": "es5" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+    "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
+    "lib": [
+      "dom",
+      "es5",
+      "es2015.promise"
+    ] /* Specify library files to be included in the compilation. */,
+    "allowJs": true /* Allow javascript files to be compiled. */,
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    // "outDir": "./",                        /* Redirect output structure to the directory. */
+    "rootDir": "./src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
+    // "composite": true,                     /* Enable project compilation */
+    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true /* Enable all strict type-checking options. */,
+    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                /* Report errors on unused locals. */
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+
+    /* Advanced Options */
+    "skipLibCheck": true /* Skip type checking of declaration files. */,
+    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+  }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/CreateJS.README.md b/uni_modules/c-svga/node_modules/svgaplayerweb/CreateJS.README.md
new file mode 100644
index 0000000..ed0a447
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/CreateJS.README.md
@@ -0,0 +1,111 @@
+# SVGAPlayer-Web
+
+## Install
+
+### Add CreateJS library
+
+```html
+<script src="https://code.createjs.com/easeljs-0.8.2.min.js"></script>
+```
+
+### Prebuild JS
+1. Goto [https://github.com/yyued/SVGAPlayer-Web/tree/master/build](https://github.com/yyued/SVGAPlayer-Web/tree/master/build) Download svga.createjs.min.js
+2. Add ```<script src="svga.createjs.min.js"></script>``` to xxx.html
+
+### NPM
+1. ```npm install svgaplayerweb --save```
+2. Add ``` require('svgaplayerweb/build/svga.createjs.min') ``` to ```xxx.js```
+
+### SVGA-Format 1.x support
+
+Both Prebuild & NPM, if you need to support SVGA-Format 1.x, add JSZip script to html.
+
+```html
+<script src="http://assets.dwstatic.com/common/lib/??jszip/3.1.3/jszip.min.js,jszip/3.1.3/jszip-utils.min.js" charset="utf-8"></script>
+```
+
+## Usage
+
+```js
+var displayObject = new SVGA.CreatejsPlayer('./samples/rose_2.0.0.svga');
+displayObject.onError(function(err) {
+    console.error(err)
+})
+displayObject.setFrame(0, 0, 500, 500)
+var stage = new createjs.Stage('CanvasID');
+stage.addChild(displayObject);
+```
+
+### Replace Animation Images Dynamically
+
+You can replace specific image by yourself, ask your designer tell you the ImageKey.
+
+* The Replacing Image MUST have same WIDTH and HEIGHT as Original.
+* setImage operation MUST set BEFORE startAnimation.
+
+```
+displayObject.setImage('http://yourserver.com/xxx.png', 'ImageKey');
+```
+
+### Add Text on Animation Image Dynamically
+
+You can add text on specific image, ask your designer tell you the ImageKey.
+
+* setText operation MUST set BEFORE startAnimation.
+
+```
+displayObject.setText('Hello, World!', 'ImageKey');
+```
+
+```
+displayObject.setText({ 
+    text: 'Hello, World!, 
+    size: "24px", 
+    color: "#ffe0a4",
+    offset: {x: 0.0, y: 0.0}
+}, 'ImageKey'); // customize text styles.
+```
+
+## Classes
+
+### CreatejsPlayer
+
+You use SVGA.CreatejsPlayer controls animation play and stop.
+
+#### Properties
+
+* int loops; - Animation loop count, defaults to 0 means infinity loop.
+* BOOL clearsAfterStop; - defaults to true, means player will clear all contents after stop.
+* string fillMode; - defaults to Forward，optional Forward / Backward，fillMode = Forward，Animation will pause on last frame while finished，fillMode = Backward , Animation will pause on first frame.
+
+#### Methods
+
+* constructor (url: string, autoPlay: boolean);
+* startAnimation(, reverse: boolean = false); - start animation from zero frame.
+* startAnimationWithRange(range: {location: number, length: number}, reverse: boolean = false); - start animation in [location, location+length] frame range.
+* pauseAnimation(); - pause animation on current frame.
+* stopAnimation(); - stop animation, clear contents while clearsAfterStop === true
+* setContentMode(mode: "ScaleToFill" | "AspectFill" | "AspectFit"); - Specific Scale Mode
+* setClipsToBounds(clipsToBounds: boolean); - Clips if image render out of box.
+* clear(); - force clear contents.
+* stepToFrame(frame: int, andPlay: Boolean); - stop to specific frame, play animation while andPlay === true
+* stepToPercentage(percentage: float, andPlay: Boolean); - stop to specific percentage, play animation while andPlay === true
+* setImage(image: string, forKey: string, transform: [a, b, c, d, tx, ty]); - Replace Animation Images Dynamically, transform is optional, transform could adjust replacing image.
+* setText(text: string | {text: string, font: string, size: string, color: string, offset: {x: float, y: float}}, forKey: string); - Add Text on Animation Image Dynamically
+* clearDynamicObjects(); - clear all dynamic objects.
+
+#### Callback Method
+* onError(callback: (error: Error) => void): void; - call after load failure.
+* onFinished(callback: () => void): void; - call after animation stop.
+* onFrame(callback: (frame: number): void): void; - call after animation specific frame rendered.
+* onPercentage(callback: (percentage: number): void): void; - call after animation specific percentage rendered.
+
+## Issues
+
+### Android 4.x Breaks
+
+As known, some Android OS lack Blob support, add Blob Polyfill by yourself.
+
+```
+<script src="//cdn.bootcss.com/blob-polyfill/1.0.20150320/Blob.min.js"></script>
+```
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/ISSUE_TEMPLATE.md b/uni_modules/c-svga/node_modules/svgaplayerweb/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..56c0568
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/ISSUE_TEMPLATE.md
@@ -0,0 +1,25 @@
+## Attention
+
+* Do not ask any usage question, issue board is a issue board, accept library bugs only.
+* If you are facing any usage problem, read the README again.
+
+## Issue Template
+
+Issue Description(What's your problem)
+
+How To Reappear(How to reappear the issue)
+
+Any Attachment(Provide a sample about your issue)
+
+------ 中文分割线 ------
+
+## 注意 
+
+* 不要在 Issue 板块提问使用问题，Issue 板块只接受 Bug 反馈。
+* 如果遇到使用上的问题，仔细阅读 README。
+
+## Issue 模板
+
+请尽量使用英文提交 Issue
+
+请确切回答：问题的描述、重现方式、附件（提供一个 Demo 以重现问题）
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/LICENSE b/uni_modules/c-svga/node_modules/svgaplayerweb/LICENSE
new file mode 100644
index 0000000..9e3f30a
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2016 YY Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/LayaBox.README.md b/uni_modules/c-svga/node_modules/svgaplayerweb/LayaBox.README.md
new file mode 100644
index 0000000..2736b0b
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/LayaBox.README.md
@@ -0,0 +1,93 @@
+# SVGAPlayer-Web
+
+## Install
+
+### Patch laya.webgl.js library
+
+1. Goto [https://github.com/yyued/SVGAPlayer-Web/tree/master/patch/layabox](https://github.com/yyued/SVGAPlayer-Web/tree/master/patch/layabox) Download laya.webgl.js
+2. Replace to {LayaProjectDir}/bin/libs/laya.webgl.js
+
+### Prebuild JS
+1. Goto [https://github.com/yyued/SVGAPlayer-Web/tree/master/build](https://github.com/yyued/SVGAPlayer-Web/tree/master/build) Download svga.layabox.min.js
+2. Add ```<script src="svga.layabox.min.js"></script>``` to index.html
+3. Optional add ```index.d.ts``` to your project.
+
+### SVGA-Format 1.x support
+
+If you need to support SVGA-Format 1.x, add JSZip script to html.
+
+```html
+<script src="http://assets.dwstatic.com/common/lib/??jszip/3.1.3/jszip.min.js,jszip/3.1.3/jszip-utils.min.js" charset="utf-8"></script>
+```
+
+## Usage
+
+```js
+const displayObject = new SVGA.LayaboxPlayer('res/svga/rose_2.0.0.svga')
+displayObject.setFrame(0, 0, 750, 750);
+Laya.stage.addChild(displayObject as any)
+```
+
+### Replace Animation Images Dynamically
+
+You can replace specific image by yourself, ask your designer tell you the ImageKey.
+
+* The Replacing Image MUST have same WIDTH and HEIGHT as Original.
+* setImage operation MUST set BEFORE startAnimation.
+
+```
+displayObject.setImage('http://yourserver.com/xxx.png', 'ImageKey');
+```
+
+### Add Text on Animation Image Dynamically
+
+You can add text on specific image, ask your designer tell you the ImageKey.
+
+* setText operation MUST set BEFORE startAnimation.
+
+```
+displayObject.setText('Hello, World!', 'ImageKey');
+```
+
+```
+displayObject.setText({ 
+    text: 'Hello, World!, 
+    size: "24px", 
+    color: "#ffe0a4",
+    offset: {x: 0.0, y: 0.0}
+}, 'ImageKey'); // customize text styles.
+```
+
+## Classes
+
+### Player
+
+You use SVGA.Player controls animation play and stop.
+
+#### Properties
+
+* int loops; - Animation loop count, defaults to 0 means infinity loop.
+* BOOL clearsAfterStop; - defaults to true, means player will clear all contents after stop.
+* string fillMode; - defaults to Forward，optional Forward / Backward，fillMode = Forward，Animation will pause on last frame while finished，fillMode = Backward , Animation will pause on first frame.
+
+#### Methods
+
+* constructor (url: string, autoPlay: boolean); - first params could be '#id' or CanvasHTMLElement
+* startAnimation(reverse: boolean); - start animation from zero frame.
+* startAnimationWithRange(range: {location: number, length: number}, reverse: boolean = false); - start animation in [location, location+length] frame range.
+* pauseAnimation(); - pause animation on current frame.
+* stopAnimation(); - stop animation, clear contents while clearsAfterStop === true
+* setContentMode(mode: "ScaleToFill" | "AspectFill" | "AspectFit"); - Specific Scale Mode
+* setClipsToBounds(clipsToBounds: boolean); - Clips if image render out of box.
+* clear(); - force clear contents.
+* stepToFrame(frame: int, andPlay: Boolean); - stop to specific frame, play animation while andPlay === true
+* stepToPercentage(percentage: float, andPlay: Boolean); - stop to specific percentage, play animation while andPlay === true
+* setImage(image: string, forKey: string, transform: [a, b, c, d, tx, ty]); - Replace Animation Images Dynamically, transform is optional, transform could adjust replacing image.
+* setText(text: string | {text: string, font: string, size: string, color: string, offset: {x: float, y: float}}, forKey: string); - Add Text on Animation Image Dynamically
+* clearDynamicObjects(); - clear all dynamic objects.
+
+#### Callback Method
+* onError(callback: (error: Error) => void): void; - call after load failure.
+* onFinished(callback: () => void): void; - call after animation stop.
+* onFrame(callback: (frame: number): void): void; - call after animation specific frame rendered.
+* onPercentage(callback: (percentage: number): void): void; - call after animation specific percentage rendered.
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/README.md b/uni_modules/c-svga/node_modules/svgaplayerweb/README.md
new file mode 100644
index 0000000..009a108
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/README.md
@@ -0,0 +1,184 @@
+# SVGAPlayer-Web
+
+Language: [中文](README.zh.md)
+
+SVGAPlayer 现已支持在微信小程序播放动画，详情请[参阅](https://github.com/yyued/SVGAPlayer-Web/tree/mp)。
+
+## News
+
+* **[Lite Version](https://github.com/svga/SVGAPlayer-Web-Lite)**
+* 2.3.0 - Add audio support.
+
+## Can I Use
+
+SVGAPlayer 2.0.0 only supports below browsers.
+
+* Edge / IE 6+
+* Safari / Chrome
+* iOS 6.0+ / Android 4.0+
+
+SVGAPlayer 2.0.0 also supports below Game Engines.
+
+* CreateJS [Usage](CreateJS.README.md)
+* LayaBox [Usage](LayaBox.README.md)
+
+## Install
+
+### Prebuild JS
+
+1. Add ```<script src="https://cdn.jsdelivr.net/npm/svgaplayerweb@2.3.1/build/svga.min.js"></script>``` to your.html
+
+### NPM
+
+1. ```npm install svgaplayerweb --save```
+2. Add ``` require('svgaplayerweb') ``` to ```xxx.js```
+
+### IE6 ~ IE9
+
+* IE6+ only supports 2.x format.
+* You couldn't use npm to install SVGA library.
+
+1. Add [SVGAPlayerWeb.swf](https://github.com/yyued/SVGAPlayer-Web/blob/master/tests/SVGAPlayerWeb.swf) to your.html locate directory.
+2. Add following code to your.html
+
+```
+<!--[if lt IE 10]> 
+    <script src="../build/svga.ie.min.js"></script>
+<![endif]-->
+<!--[if gte IE 10]><!-->
+    <script src="../build/svga.min.js"></script>
+<!--<![endif]-->
+```
+
+### Audio support
+
+If your need to play audios, add ```howler.min.js``` to your html.
+
+```html
+<script src="https://cdn.jsdelivr.net/npm/howler@2.0.15/dist/howler.core.min.js"></script>
+```
+
+Notice: audio plays needs browser support, some browser requires user interaction before playing.
+
+### SVGA-Format 1.x support
+
+Both Prebuild & NPM, if you need to support SVGA-Format 1.x, add JSZip script to html.
+
+```html
+<script src="//s1.yy.com/ued_web_static/lib/jszip/3.1.4/??jszip.min.js,jszip-utils.min.js" charset="utf-8"></script>
+```
+
+## Usage
+
+### Load Animation Mannally
+
+You may create Player and Parser by yourself.
+
+1. Add Div Tag.
+
+```html
+<div id="demoCanvas" style="styles..."></div>
+```
+
+2. Load Animation
+
+```js
+var player = new SVGA.Player('#demoCanvas');
+var parser = new SVGA.Parser('#demoCanvas'); // Must Provide same selector eg:#demoCanvas IF support IE6+
+parser.load('rose_2.0.0.svga', function(videoItem) {
+    player.setVideoItem(videoItem);
+    player.startAnimation();
+})
+```
+
+### Load Animation Automatically
+
+Assign canvas element properties as below.
+
+```html
+<div src="rose_2.0.0.svga" loops="0" clearsAfterStop="true" style="styles..."></div>
+```
+
+Animation will play after Web-Page onload.
+
+### Replace Animation Images Dynamically
+
+You can replace specific image by yourself, ask your designer tell you the ImageKey.
+
+```
+player.setImage('http://yourserver.com/xxx.png', 'ImageKey');
+```
+
+### Add Text on Animation Image Dynamically
+
+You can add text on specific image, ask your designer tell you the ImageKey.
+
+```
+player.setText('Hello, World!', 'ImageKey');
+```
+
+```
+player.setText({ 
+    text: 'Hello, World!', 
+    family: 'Arial',
+    size: "24px", 
+    color: "#ffe0a4",
+    offset: {x: 0.0, y: 0.0}
+}, 'ImageKey'); // customize text styles.
+```
+
+## Classes
+
+### SVGA.Player
+
+You use SVGA.Player controls animation play and stop.
+
+#### Properties
+
+* int loops; - Animation loop count, defaults to 0 means infinity loop.
+* BOOL clearsAfterStop; - defaults to true, means player will clear all contents after stop.
+* string fillMode; - defaults to Forward，optional Forward / Backward，fillMode = Forward，Animation will pause on last frame while finished，fillMode = Backward , Animation will pause on first frame.
+
+#### Methods
+
+* constructor (canvas); - first params could be '#id' or CanvasHTMLElement
+* startAnimation(reverse: boolean = false); - start animation from zero frame.
+* startAnimationWithRange(range: {location: number, length: number}, reverse: boolean = false); - start animation in [location, location+length] frame range.
+* pauseAnimation(); - pause animation on current frame.
+* stopAnimation(); - stop animation, clear contents while clearsAfterStop === true
+* setContentMode(mode: "Fill" | "AspectFill" | "AspectFit"); - Specific Scale Mode
+* setClipsToBounds(clipsToBounds: boolean); - Clips if image render out of box.
+* clear(); - force clear contents.
+* stepToFrame(frame: int, andPlay: Boolean); - stop to specific frame, play animation while andPlay === true
+* stepToPercentage(percentage: float, andPlay: Boolean); - stop to specific percentage, play animation while andPlay === true
+* setImage(image: string, forKey: string, transform: [a, b, c, d, tx, ty]); - Replace Animation Images Dynamically, transform is optional, transform could adjust replacing image.
+* setText(text: string | {text: string, family: string, size: string, color: string, offset: {x: float, y: float}}, forKey: string); - Add Text on Animation Image Dynamically
+* clearDynamicObjects(); - clear all dynamic objects.
+
+#### Callback Method
+* onFinished(callback: () => void): void; - call after animation stop.
+* onFrame(callback: (frame: number): void): void; - call after animation specific frame rendered.
+* onPercentage(callback: (percentage: number): void): void; - call after animation specific percentage rendered.
+
+### SVGA.Parser
+
+You use SVGA.Parser load VideoItem from remote or Base64 string.
+
+Only Cross-Domain allow files could be loaded.
+
+If you eager to load resources from Base64 or File, deliver as ```load(File)``` or ```load('data:svga/2.0;base64,xxxxxx')```.
+
+#### Methods
+
+* constructor();
+* load(url: string, success: (videoItem: VideoEntity) => void, failure: (error: Error) => void): void;
+
+## Issues
+
+### Android 4.x Breaks
+
+As known, some Android OS lack Blob support, add Blob Polyfill by yourself.
+
+```
+<script src="//cdn.bootcss.com/blob-polyfill/1.0.20150320/Blob.min.js"></script>
+```
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/README.zh.md b/uni_modules/c-svga/node_modules/svgaplayerweb/README.zh.md
new file mode 100644
index 0000000..af76c4b
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/README.zh.md
@@ -0,0 +1,189 @@
+# SVGAPlayer-Web
+
+Language: [English](README.md)
+
+## 版本更新
+
+* **[Lite 版本](https://github.com/svga/SVGAPlayer-Web-Lite)**
+* 2.3.0 - 新增音频播放支持
+
+## Can I Use
+
+SVGAPlayer 2.0.0 只支持以下浏览器使用
+
+* Edge / IE 6+
+* Safari / Chrome
+* iOS 6.0+ / Android 4.0+
+
+SVGAPlayer 2.0.0 同时支持以下游戏引擎使用
+
+* CreateJS [使用指南](CreateJS.README.md)
+* LayaBox [使用指南](LayaBox.README.md)
+
+## 安装
+
+### 预编译 JS
+1. 添加 ```<script src="https://cdn.jsdelivr.net/npm/svgaplayerweb@2.3.1/build/svga.min.js"></script>``` 到 your.html 页面
+
+### NPM
+1. ```npm install svgaplayerweb --save```
+2. 添加 ```const SVGA = require('svgaplayerweb'); ``` 或 ```import SVGA from 'svgaplayerweb';``` 至 ```xxx.js```
+
+### IE6 ~ IE9
+
+* IE6+ 只支持 2.x 格式文件.
+* 你不能使用 NPM 方式安装 SVGAPlayer.
+
+1. 添加 [SVGAPlayerWeb.swf](https://github.com/yyued/SVGAPlayer-Web/blob/master/tests/SVGAPlayerWeb.swf) 到 your.html 同级目录
+2. 添加以下代码至 your.html
+
+```
+<!--[if lt IE 10]> 
+    <script src="../build/svga.ie.min.js"></script>
+<![endif]-->
+<!--[if gte IE 10]><!-->
+    <script src="../build/svga.min.js"></script>
+<!--<![endif]-->
+```
+
+### 支持音频播放
+
+如果你需要播放 svga 文件内的音频，请将 ```howler.min.js``` 添加到 HTML 页面中。
+
+```html
+<script src="https://cdn.jsdelivr.net/npm/howler@2.0.15/dist/howler.core.min.js"></script>
+```
+
+注意：部分浏览器要求在触摸事件发生后才能播放音频。
+
+### 支持 SVGA-Format 1.x 格式
+
+无论是使用预编译 JS 或是 NPM， 如果你需要播放 1.x 格式的 SVGA 文件，需要添加 JSZip 到你的 HTML 页面中。
+
+```html
+<script src="//s1.yy.com/ued_web_static/lib/jszip/3.1.4/??jszip.min.js,jszip-utils.min.js" charset="utf-8"></script>
+```
+
+## 使用指南
+
+### 手动加载
+
+你可以自行创建 Player 和 Parser 并加载动画
+
+1. 添加 Div 容器
+
+```html
+<div id="demoCanvas" style="styles..."></div>
+```
+
+2. 加载动画
+
+```js
+var player = new SVGA.Player('#demoCanvas');
+var parser = new SVGA.Parser('#demoCanvas'); // 如果你需要支持 IE6+，那么必须把同样的选择器传给 Parser。
+parser.load('rose_2.0.0.svga', function(videoItem) {
+    player.setVideoItem(videoItem);
+    player.startAnimation();
+})
+```
+
+### 自动加载
+
+为 canvas 元素添加`src`属性
+
+```html
+<div src="rose_2.0.0.svga" id="demoCanvas" style="styles..."></div>
+```
+
+```js
+new SVGA.autoload(document.querySelector('#demoCanvas'))
+```
+
+动画会在页面加载完成后播放
+
+### 动态图像
+
+你可以动态替换动画中的指定元素，询问你的动画设计师以获取 ImageKey。
+
+* 用于替换的图片，宽、高必须与原图一致。
+* setImage 操作必须在 startAnimation 之前执行。
+
+```
+player.setImage('http://yourserver.com/xxx.png', 'ImageKey');
+```
+
+### 动态文本
+
+你可以在指定元素上添加文本，询问你的动画设计师以获取 ImageKey。
+
+* setText 操作必须在 startAnimation 之前执行。
+
+```
+player.setText('Hello, World!', 'ImageKey');
+```
+
+```
+player.setText({ 
+    text: 'Hello, World!, 
+    family: 'Arial',
+    size: "24px", 
+    color: "#ffe0a4",
+    offset: {x: 0.0, y: 0.0}
+}, 'ImageKey'); // 可自定义文本样式
+```
+
+## Classes
+
+### SVGA.Player
+
+SVGA.Player 用于控制动画的播放和停止
+
+#### Properties
+
+* int loops; - 动画循环次数，默认值为 0，表示无限循环。
+* BOOL clearsAfterStop; - 默认值为 true，表示当动画结束时，清空画布。
+* string fillMode; - 默认值为 Forward，可选值 Forward / Backward，当 clearsAfterStop 为 false 时，Forward 表示动画会在结束后停留在最后一帧，Backward 则会在动画结束后停留在第一帧。
+
+#### Methods
+
+* constructor (canvas); - 传入 #id 或者 CanvasHTMLElement 至第一个参数
+* startAnimation(reverse: boolean = false); - 从第 0 帧开始播放动画
+* startAnimationWithRange(range: {location: number, length: number}, reverse: boolean = false); - 播放 [location, location+length] 指定区间帧动画
+* pauseAnimation(); - 暂停在当前帧
+* stopAnimation(); - 停止播放动画，如果 clearsAfterStop === true，将会清空画布
+* setContentMode(mode: "Fill" | "AspectFill" | "AspectFit"); - 设置动画的拉伸模式
+* setClipsToBounds(clipsToBounds: boolean); - 如果超出盒子边界，将会进行裁剪
+* clear(); - 强制清空画布
+* stepToFrame(frame: int, andPlay: Boolean); - 跳到指定帧，如果 andPlay === true，则在指定帧开始播放动画
+* stepToPercentage(percentage: float, andPlay: Boolean); - 跳到指定百分比，如果 andPlay === true，则在指定百分比开始播放动画
+* setImage(image: string, forKey: string, transform: [a, b, c, d, tx, ty]); - 设定动态图像, transform 是可选的, transform 用于变换替换图片
+* setText(text: string | {text: string, family: string, size: string, color: string, offset: {x: float, y: float}}, forKey: string); - 设定动态文本
+* clearDynamicObjects(); - 清空所有动态图像和文本
+
+#### Callback Method
+* onFinished(callback: () => void): void; - 动画停止播放时回调
+* onFrame(callback: (frame: number): void): void; - 动画播放至某帧后回调
+* onPercentage(callback: (percentage: number): void): void; - 动画播放至某进度后回调
+
+### SVGA.Parser
+
+SVGA.Parser 用于加载远端或 Base64 动画，并转换成 VideoItem。
+
+跨域的 SVGA 资源需要使用 CORS 协议才能加载成功。
+
+如果你需要加载 Base64 资源，或者 File 资源，这样传递就可以了 ```load(File)``` 或 ```load('data:svga/2.0;base64,xxxxxx')```。
+
+#### Methods
+
+* constructor();
+* load(url: string, success: (videoItem: VideoEntity) => void, failure: (error: Error) => void): void;
+
+## Issues
+
+### Android 4.x 加载失败
+
+某些 Android 4.x OS 上缺少 Blob 支持，请自行添加 Polyfill。
+
+```
+<script src="//cdn.bootcss.com/blob-polyfill/1.0.20150320/Blob.min.js"></script>
+```
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.createjs.min.js b/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.createjs.min.js
new file mode 100644
index 0000000..fc5c1a0
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.createjs.min.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.SVGA=t():e.SVGA=t()}(window,(function(){return function(e){function t(i){if(r[i])return r[i].exports;var n=r[i]={i:i,l:!1,exports:{}};return e[i].call(n.exports,n,n.exports,t),n.l=!0,n.exports}var r={};return t.m=e,t.c=r,t.d=function(e,r,i){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:i})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var i=Object.create(null);if(t.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)t.d(i,n,function(t){return e[t]}.bind(null,n));return i},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=67)}([function(e,t,r){"use strict";var i,n,o=e.exports=r(1),s=r(20);o.codegen=r(47),o.fetch=r(48),o.path=r(49),o.fs=o.inquire("fs"),o.toArray=function(e){if(e){for(var t=Object.keys(e),r=new Array(t.length),i=0;i<t.length;)r[i]=e[t[i++]];return r}return[]},o.toObject=function(e){for(var t={},r=0;r<e.length;){var i=e[r++],n=e[r++];void 0!==n&&(t[i]=n)}return t};var a=/\\/g,u=/"/g;o.isReserved=function(e){return/^(?:do|if|in|for|let|new|try|var|case|else|enum|eval|false|null|this|true|void|with|break|catch|class|const|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$/.test(e)},o.safeProp=function(e){return!/^[$\w_]+$/.test(e)||o.isReserved(e)?'["'+e.replace(a,"\\\\").replace(u,'\\"')+'"]':"."+e},o.ucFirst=function(e){return e.charAt(0).toUpperCase()+e.substring(1)};var f=/_([a-z])/g;o.camelCase=function(e){return e.substring(0,1)+e.substring(1).replace(f,(function(e,t){return t.toUpperCase()}))},o.compareFieldsById=function(e,t){return e.id-t.id},o.decorateType=function(e,t){if(e.$type)return t&&e.$type.name!==t&&(o.decorateRoot.remove(e.$type),e.$type.name=t,o.decorateRoot.add(e.$type)),e.$type;i||(i=r(22));var n=new i(t||e.name);return o.decorateRoot.add(n),n.ctor=e,Object.defineProperty(e,"$type",{value:n,enumerable:!1}),Object.defineProperty(e.prototype,"$type",{value:n,enumerable:!1}),n};var l=0;o.decorateEnum=function(e){if(e.$type)return e.$type;n||(n=r(2));var t=new n("Enum"+l++,e);return o.decorateRoot.add(t),Object.defineProperty(e,"$type",{value:t,enumerable:!1}),t},o.setProperty=function(e,t,r){if("object"!=typeof e)throw TypeError("dst must be an object");if(!t)throw TypeError("path must be specified");return function e(t,r,i){var n=r.shift();if(r.length>0)t[n]=e(t[n]||{},r,i);else{var o=t[n];o&&(i=[].concat(o).concat(i)),t[n]=i}return t}(e,t=t.split("."),r)},Object.defineProperty(o,"decorateRoot",{get:function(){return s.decorated||(s.decorated=new(r(30)))}})},function(e,t,r){"use strict";(function(e){function i(e,t,r){for(var i=Object.keys(t),n=0;n<i.length;++n)void 0!==e[i[n]]&&r||(e[i[n]]=t[i[n]]);return e}function n(e){function t(e,r){if(!(this instanceof t))return new t(e,r);Object.defineProperty(this,"message",{get:function(){return e}}),Error.captureStackTrace?Error.captureStackTrace(this,t):Object.defineProperty(this,"stack",{value:(new Error).stack||""}),r&&i(this,r)}return(t.prototype=Object.create(Error.prototype)).constructor=t,Object.defineProperty(t.prototype,"name",{get:function(){return e}}),t.prototype.toString=function(){return this.name+": "+this.message},t}var o=t;o.asPromise=r(17),o.base64=r(38),o.EventEmitter=r(39),o.float=r(40),o.inquire=r(18),o.utf8=r(41),o.pool=r(42),o.LongBits=r(43),o.isNode=Boolean(void 0!==e&&e&&e.process&&e.process.versions&&e.process.versions.node),o.global=o.isNode&&e||"undefined"!=typeof window&&window||"undefined"!=typeof self&&self||this,o.emptyArray=Object.freeze?Object.freeze([]):[],o.emptyObject=Object.freeze?Object.freeze({}):{},o.isInteger=Number.isInteger||function(e){return"number"==typeof e&&isFinite(e)&&Math.floor(e)===e},o.isString=function(e){return"string"==typeof e||e instanceof String},o.isObject=function(e){return e&&"object"==typeof e},o.isset=o.isSet=function(e,t){var r=e[t];return!(null==r||!e.hasOwnProperty(t))&&("object"!=typeof r||(Array.isArray(r)?r.length:Object.keys(r).length)>0)},o.Buffer=function(){try{var e=o.inquire("buffer").Buffer;return e.prototype.utf8Write?e:null}catch(e){return null}}(),o._Buffer_from=null,o._Buffer_allocUnsafe=null,o.newBuffer=function(e){return"number"==typeof e?o.Buffer?o._Buffer_allocUnsafe(e):new o.Array(e):o.Buffer?o._Buffer_from(e):"undefined"==typeof Uint8Array?e:new Uint8Array(e)},o.Array="undefined"!=typeof Uint8Array?Uint8Array:Array,o.Long=o.global.dcodeIO&&o.global.dcodeIO.Long||o.global.Long||o.inquire("long"),o.key2Re=/^true|false|0|1$/,o.key32Re=/^-?(?:0|[1-9][0-9]*)$/,o.key64Re=/^(?:[\\x00-\\xff]{8}|-?(?:0|[1-9][0-9]*))$/,o.longToHash=function(e){return e?o.LongBits.from(e).toHash():o.LongBits.zeroHash},o.longFromHash=function(e,t){var r=o.LongBits.fromHash(e);return o.Long?o.Long.fromBits(r.lo,r.hi,t):r.toNumber(Boolean(t))},o.merge=i,o.lcFirst=function(e){return e.charAt(0).toLowerCase()+e.substring(1)},o.newError=n,o.ProtocolError=n("ProtocolError"),o.oneOfGetter=function(e){for(var t={},r=0;r<e.length;++r)t[e[r]]=1;return function(){for(var e=Object.keys(this),r=e.length-1;r>-1;--r)if(1===t[e[r]]&&void 0!==this[e[r]]&&null!==this[e[r]])return e[r]}},o.oneOfSetter=function(e){return function(t){for(var r=0;r<e.length;++r)e[r]!==t&&delete this[e[r]]}},o.toJSONOptions={longs:String,enums:String,bytes:String,json:!0},o._configure=function(){var e=o.Buffer;e?(o._Buffer_from=e.from!==Uint8Array.from&&e.from||function(t,r){return new e(t,r)},o._Buffer_allocUnsafe=e.allocUnsafe||function(t){return new e(t)}):o._Buffer_from=o._Buffer_allocUnsafe=null}}).call(this,r(37))},function(e,t,r){"use strict";function i(e,t,r,i,o){if(n.call(this,e,r),t&&"object"!=typeof t)throw TypeError("values must be an object");if(this.valuesById={},this.values=Object.create(this.valuesById),this.comment=i,this.comments=o||{},this.reserved=void 0,t)for(var s=Object.keys(t),a=0;a<s.length;++a)"number"==typeof t[s[a]]&&(this.valuesById[this.values[s[a]]=t[s[a]]]=s[a])}e.exports=i;var n=r(3);((i.prototype=Object.create(n.prototype)).constructor=i).className="Enum";var o=r(6),s=r(0);i.fromJSON=function(e,t){var r=new i(e,t.values,t.options,t.comment,t.comments);return r.reserved=t.reserved,r},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return s.toObject(["options",this.options,"values",this.values,"reserved",this.reserved&&this.reserved.length?this.reserved:void 0,"comment",t?this.comment:void 0,"comments",t?this.comments:void 0])},i.prototype.add=function(e,t,r){if(!s.isString(e))throw TypeError("name must be a string");if(!s.isInteger(t))throw TypeError("id must be an integer");if(void 0!==this.values[e])throw Error("duplicate name '"+e+"' in "+this);if(this.isReservedId(t))throw Error("id "+t+" is reserved in "+this);if(this.isReservedName(e))throw Error("name '"+e+"' is reserved in "+this);if(void 0!==this.valuesById[t]){if(!this.options||!this.options.allow_alias)throw Error("duplicate id "+t+" in "+this);this.values[e]=t}else this.valuesById[this.values[e]=t]=e;return this.comments[e]=r||null,this},i.prototype.remove=function(e){if(!s.isString(e))throw TypeError("name must be a string");var t=this.values[e];if(null==t)throw Error("name '"+e+"' does not exist in "+this);return delete this.valuesById[t],delete this.values[e],delete this.comments[e],this},i.prototype.isReservedId=function(e){return o.isReservedId(this.reserved,e)},i.prototype.isReservedName=function(e){return o.isReservedName(this.reserved,e)}},function(e,t,r){"use strict";function i(e,t){if(!o.isString(e))throw TypeError("name must be a string");if(t&&!o.isObject(t))throw TypeError("options must be an object");this.options=t,this.parsedOptions=null,this.name=e,this.parent=null,this.resolved=!1,this.comment=null,this.filename=null}e.exports=i,i.className="ReflectionObject";var n,o=r(0);Object.defineProperties(i.prototype,{root:{get:function(){for(var e=this;null!==e.parent;)e=e.parent;return e}},fullName:{get:function(){for(var e=[this.name],t=this.parent;t;)e.unshift(t.name),t=t.parent;return e.join(".")}}}),i.prototype.toJSON=function(){throw Error()},i.prototype.onAdd=function(e){this.parent&&this.parent!==e&&this.parent.remove(this),this.parent=e,this.resolved=!1;var t=e.root;t instanceof n&&t._handleAdd(this)},i.prototype.onRemove=function(e){var t=e.root;t instanceof n&&t._handleRemove(this),this.parent=null,this.resolved=!1},i.prototype.resolve=function(){return this.resolved?this:(this.root instanceof n&&(this.resolved=!0),this)},i.prototype.getOption=function(e){if(this.options)return this.options[e]},i.prototype.setOption=function(e,t,r){return r&&this.options&&void 0!==this.options[e]||((this.options||(this.options={}))[e]=t),this},i.prototype.setParsedOption=function(e,t,r){this.parsedOptions||(this.parsedOptions=[]);var i=this.parsedOptions;if(r){var n=i.find((function(t){return Object.prototype.hasOwnProperty.call(t,e)}));if(n){var s=n[e];o.setProperty(s,r,t)}else(n={})[e]=o.setProperty({},r,t),i.push(n)}else{var a={};a[e]=t,i.push(a)}return this},i.prototype.setOptions=function(e,t){if(e)for(var r=Object.keys(e),i=0;i<r.length;++i)this.setOption(r[i],e[r[i]],t);return this},i.prototype.toString=function(){var e=this.constructor.className,t=this.fullName;return t.length?e+" "+t:e},i._configure=function(e){n=e}},function(e,t,r){"use strict";function i(e,t,r,i,o,s,l){if(u.isObject(i)?(l=o,s=i,i=o=void 0):u.isObject(o)&&(l=s,s=o,o=void 0),n.call(this,e,s),!u.isInteger(t)||t<0)throw TypeError("id must be a non-negative integer");if(!u.isString(r))throw TypeError("type must be a string");if(void 0!==i&&!f.test(i=i.toString().toLowerCase()))throw TypeError("rule must be a string rule");if(void 0!==o&&!u.isString(o))throw TypeError("extend must be a string");this.rule=i&&"optional"!==i?i:void 0,this.type=r,this.id=t,this.extend=o||void 0,this.required="required"===i,this.optional=!this.required,this.repeated="repeated"===i,this.map=!1,this.message=null,this.partOf=null,this.typeDefault=null,this.defaultValue=null,this.long=!!u.Long&&void 0!==a.long[r],this.bytes="bytes"===r,this.resolvedType=null,this.extensionField=null,this.declaringField=null,this._packed=null,this.comment=l}e.exports=i;var n=r(3);((i.prototype=Object.create(n.prototype)).constructor=i).className="Field";var o,s=r(2),a=r(7),u=r(0),f=/^required|optional|repeated$/;i.fromJSON=function(e,t){return new i(e,t.id,t.type,t.rule,t.extend,t.options,t.comment)},Object.defineProperty(i.prototype,"packed",{get:function(){return null===this._packed&&(this._packed=!1!==this.getOption("packed")),this._packed}}),i.prototype.setOption=function(e,t,r){return"packed"===e&&(this._packed=null),n.prototype.setOption.call(this,e,t,r)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return u.toObject(["rule","optional"!==this.rule&&this.rule||void 0,"type",this.type,"id",this.id,"extend",this.extend,"options",this.options,"comment",t?this.comment:void 0])},i.prototype.resolve=function(){if(this.resolved)return this;if(void 0===(this.typeDefault=a.defaults[this.type])&&(this.resolvedType=(this.declaringField?this.declaringField.parent:this.parent).lookupTypeOrEnum(this.type),this.resolvedType instanceof o?this.typeDefault=null:this.typeDefault=this.resolvedType.values[Object.keys(this.resolvedType.values)[0]]),this.options&&null!=this.options.default&&(this.typeDefault=this.options.default,this.resolvedType instanceof s&&"string"==typeof this.typeDefault&&(this.typeDefault=this.resolvedType.values[this.typeDefault])),this.options&&(!0!==this.options.packed&&(void 0===this.options.packed||!this.resolvedType||this.resolvedType instanceof s)||delete this.options.packed,Object.keys(this.options).length||(this.options=void 0)),this.long)this.typeDefault=u.Long.fromNumber(this.typeDefault,"u"===this.type.charAt(0)),Object.freeze&&Object.freeze(this.typeDefault);else if(this.bytes&&"string"==typeof this.typeDefault){var e;u.base64.test(this.typeDefault)?u.base64.decode(this.typeDefault,e=u.newBuffer(u.base64.length(this.typeDefault)),0):u.utf8.write(this.typeDefault,e=u.newBuffer(u.utf8.length(this.typeDefault)),0),this.typeDefault=e}return this.map?this.defaultValue=u.emptyObject:this.repeated?this.defaultValue=u.emptyArray:this.defaultValue=this.typeDefault,this.parent instanceof o&&(this.parent.ctor.prototype[this.name]=this.defaultValue),n.prototype.resolve.call(this)},i.d=function(e,t,r,n){return"function"==typeof t?t=u.decorateType(t).name:t&&"object"==typeof t&&(t=u.decorateEnum(t).name),function(o,s){u.decorateType(o.constructor).add(new i(s,e,t,r,{default:n}))}},i._configure=function(e){o=e}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.BezierPath=function e(t,r,i){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this._d=t,this._transform=r,this._styles=i}},function(e,t,r){"use strict";function i(e,t){if(e&&e.length){for(var r={},i=0;i<e.length;++i)r[e[i].name]=e[i].toJSON(t);return r}}function n(e,t){s.call(this,e,t),this.nested=void 0,this._nestedArray=null}function o(e){return e._nestedArray=null,e}e.exports=n;var s=r(3);((n.prototype=Object.create(s.prototype)).constructor=n).className="Namespace";var a,u,f,l=r(4),h=r(0);n.fromJSON=function(e,t){return new n(e,t.options).addJSON(t.nested)},n.arrayToJSON=i,n.isReservedId=function(e,t){if(e)for(var r=0;r<e.length;++r)if("string"!=typeof e[r]&&e[r][0]<=t&&e[r][1]>t)return!0;return!1},n.isReservedName=function(e,t){if(e)for(var r=0;r<e.length;++r)if(e[r]===t)return!0;return!1},Object.defineProperty(n.prototype,"nestedArray",{get:function(){return this._nestedArray||(this._nestedArray=h.toArray(this.nested))}}),n.prototype.toJSON=function(e){return h.toObject(["options",this.options,"nested",i(this.nestedArray,e)])},n.prototype.addJSON=function(e){if(e)for(var t,r=Object.keys(e),i=0;i<r.length;++i)t=e[r[i]],this.add((void 0!==t.fields?a.fromJSON:void 0!==t.values?f.fromJSON:void 0!==t.methods?u.fromJSON:void 0!==t.id?l.fromJSON:n.fromJSON)(r[i],t));return this},n.prototype.get=function(e){return this.nested&&this.nested[e]||null},n.prototype.getEnum=function(e){if(this.nested&&this.nested[e]instanceof f)return this.nested[e].values;throw Error("no such enum: "+e)},n.prototype.add=function(e){if(!(e instanceof l&&void 0!==e.extend||e instanceof a||e instanceof f||e instanceof u||e instanceof n))throw TypeError("object must be a valid nested object");if(this.nested){var t=this.get(e.name);if(t){if(!(t instanceof n&&e instanceof n)||t instanceof a||t instanceof u)throw Error("duplicate name '"+e.name+"' in "+this);for(var r=t.nestedArray,i=0;i<r.length;++i)e.add(r[i]);this.remove(t),this.nested||(this.nested={}),e.setOptions(t.options,!0)}}else this.nested={};return this.nested[e.name]=e,e.onAdd(this),o(this)},n.prototype.remove=function(e){if(!(e instanceof s))throw TypeError("object must be a ReflectionObject");if(e.parent!==this)throw Error(e+" is not a member of "+this);return delete this.nested[e.name],Object.keys(this.nested).length||(this.nested=void 0),e.onRemove(this),o(this)},n.prototype.define=function(e,t){if(h.isString(e))e=e.split(".");else if(!Array.isArray(e))throw TypeError("illegal path");if(e&&e.length&&""===e[0])throw Error("path must be relative");for(var r=this;e.length>0;){var i=e.shift();if(r.nested&&r.nested[i]){if(!((r=r.nested[i])instanceof n))throw Error("path conflicts with non-namespace objects")}else r.add(r=new n(i))}return t&&r.addJSON(t),r},n.prototype.resolveAll=function(){for(var e=this.nestedArray,t=0;t<e.length;)e[t]instanceof n?e[t++].resolveAll():e[t++].resolve();return this.resolve()},n.prototype.lookup=function(e,t,r){if("boolean"==typeof t?(r=t,t=void 0):t&&!Array.isArray(t)&&(t=[t]),h.isString(e)&&e.length){if("."===e)return this.root;e=e.split(".")}else if(!e.length)return this;if(""===e[0])return this.root.lookup(e.slice(1),t);var i=this.get(e[0]);if(i){if(1===e.length){if(!t||t.indexOf(i.constructor)>-1)return i}else if(i instanceof n&&(i=i.lookup(e.slice(1),t,!0)))return i}else for(var o=0;o<this.nestedArray.length;++o)if(this._nestedArray[o]instanceof n&&(i=this._nestedArray[o].lookup(e,t,!0)))return i;return null===this.parent||r?null:this.parent.lookup(e,t)},n.prototype.lookupType=function(e){var t=this.lookup(e,[a]);if(!t)throw Error("no such type: "+e);return t},n.prototype.lookupEnum=function(e){var t=this.lookup(e,[f]);if(!t)throw Error("no such Enum '"+e+"' in "+this);return t},n.prototype.lookupTypeOrEnum=function(e){var t=this.lookup(e,[a,f]);if(!t)throw Error("no such Type or Enum '"+e+"' in "+this);return t},n.prototype.lookupService=function(e){var t=this.lookup(e,[u]);if(!t)throw Error("no such Service '"+e+"' in "+this);return t},n._configure=function(e,t,r){a=e,u=t,f=r}},function(e,t,r){"use strict";function i(e,t){var r=0,i={};for(t|=0;r<e.length;)i[s[r+t]]=e[r++];return i}var n=t,o=r(0),s=["double","float","int32","uint32","sint32","fixed32","sfixed32","int64","uint64","sint64","fixed64","sfixed64","bool","string","bytes"];n.basic=i([1,5,0,0,0,5,5,0,0,0,1,1,0,2,2]),n.defaults=i([0,0,0,0,0,0,0,0,0,0,0,0,!1,"",o.emptyArray,null]),n.long=i([0,0,0,1,1],7),n.mapKey=i([0,0,0,5,5,0,0,0,1,1,0,2],2),n.packed=i([1,5,0,0,0,5,5,0,0,0,1,1,0])},function(e,t,r){"use strict";function i(e,t){return Object.prototype.hasOwnProperty.call(e,t)}var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;t.assign=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var r=t.shift();if(r){if("object"!=typeof r)throw new TypeError(r+"must be non-object");for(var n in r)i(r,n)&&(e[n]=r[n])}}return e},t.shrinkBuf=function(e,t){return e.length===t?e:e.subarray?e.subarray(0,t):(e.length=t,e)};var o={arraySet:function(e,t,r,i,n){if(t.subarray&&e.subarray)e.set(t.subarray(r,r+i),n);else for(var o=0;o<i;o++)e[n+o]=t[r+o]},flattenChunks:function(e){var t,r,i,n,o,s;for(i=0,t=0,r=e.length;t<r;t++)i+=e[t].length;for(s=new Uint8Array(i),n=0,t=0,r=e.length;t<r;t++)o=e[t],s.set(o,n),n+=o.length;return s}},s={arraySet:function(e,t,r,i,n){for(var o=0;o<i;o++)e[n+o]=t[r+o]},flattenChunks:function(e){return[].concat.apply([],e)}};t.setTyped=function(e){e?(t.Buf8=Uint8Array,t.Buf16=Uint16Array,t.Buf32=Int32Array,t.assign(t,o)):(t.Buf8=Array,t.Buf16=Array,t.Buf32=Array,t.assign(t,s))},t.setTyped(n)},function(e,t,r){"use strict";function i(e,t,r){this.fn=e,this.len=t,this.next=void 0,this.val=r}function n(){}function o(e){this.head=e.head,this.tail=e.tail,this.len=e.len,this.next=e.states}function s(){this.len=0,this.head=new i(n,0,0),this.tail=this.head,this.states=null}function a(e,t,r){t[r]=255&e}function u(e,t){this.len=e,this.next=void 0,this.val=t}function f(e,t,r){for(;e.hi;)t[r++]=127&e.lo|128,e.lo=(e.lo>>>7|e.hi<<25)>>>0,e.hi>>>=7;for(;e.lo>127;)t[r++]=127&e.lo|128,e.lo=e.lo>>>7;t[r++]=e.lo}function l(e,t,r){t[r]=255&e,t[r+1]=e>>>8&255,t[r+2]=e>>>16&255,t[r+3]=e>>>24}e.exports=s;var h,c=r(1),p=c.LongBits,d=c.base64,y=c.utf8,m=function(){return c.Buffer?function(){return(s.create=function(){return new h})()}:function(){return new s}};s.create=m(),s.alloc=function(e){return new c.Array(e)},c.Array!==Array&&(s.alloc=c.pool(s.alloc,c.Array.prototype.subarray)),s.prototype._push=function(e,t,r){return this.tail=this.tail.next=new i(e,t,r),this.len+=t,this},u.prototype=Object.create(i.prototype),u.prototype.fn=function(e,t,r){for(;e>127;)t[r++]=127&e|128,e>>>=7;t[r]=e},s.prototype.uint32=function(e){return this.len+=(this.tail=this.tail.next=new u((e>>>=0)<128?1:e<16384?2:e<2097152?3:e<268435456?4:5,e)).len,this},s.prototype.int32=function(e){return e<0?this._push(f,10,p.fromNumber(e)):this.uint32(e)},s.prototype.sint32=function(e){return this.uint32((e<<1^e>>31)>>>0)},s.prototype.uint64=function(e){var t=p.from(e);return this._push(f,t.length(),t)},s.prototype.int64=s.prototype.uint64,s.prototype.sint64=function(e){var t=p.from(e).zzEncode();return this._push(f,t.length(),t)},s.prototype.bool=function(e){return this._push(a,1,e?1:0)},s.prototype.fixed32=function(e){return this._push(l,4,e>>>0)},s.prototype.sfixed32=s.prototype.fixed32,s.prototype.fixed64=function(e){var t=p.from(e);return this._push(l,4,t.lo)._push(l,4,t.hi)},s.prototype.sfixed64=s.prototype.fixed64,s.prototype.float=function(e){return this._push(c.float.writeFloatLE,4,e)},s.prototype.double=function(e){return this._push(c.float.writeDoubleLE,8,e)};var v=c.Array.prototype.set?function(e,t,r){t.set(e,r)}:function(e,t,r){for(var i=0;i<e.length;++i)t[r+i]=e[i]};s.prototype.bytes=function(e){var t=e.length>>>0;if(!t)return this._push(a,1,0);if(c.isString(e)){var r=s.alloc(t=d.length(e));d.decode(e,r,0),e=r}return this.uint32(t)._push(v,t,e)},s.prototype.string=function(e){var t=y.length(e);return t?this.uint32(t)._push(y.write,t,e):this._push(a,1,0)},s.prototype.fork=function(){return this.states=new o(this),this.head=this.tail=new i(n,0,0),this.len=0,this},s.prototype.reset=function(){return this.states?(this.head=this.states.head,this.tail=this.states.tail,this.len=this.states.len,this.states=this.states.next):(this.head=this.tail=new i(n,0,0),this.len=0),this},s.prototype.ldelim=function(){var e=this.head,t=this.tail,r=this.len;return this.reset().uint32(r),r&&(this.tail.next=e.next,this.tail=t,this.len+=r),this},s.prototype.finish=function(){for(var e=this.head.next,t=this.constructor.alloc(this.len),r=0;e;)e.fn(e.val,t,r),r+=e.len,e=e.next;return t},s._configure=function(e){h=e,s.create=m(),h._configure()}},function(e,t,r){"use strict";function i(e,t){return RangeError("index out of range: "+e.pos+" + "+(t||1)+" > "+e.len)}function n(e){this.buf=e,this.pos=0,this.len=e.length}function o(){var e=new l(0,0),t=0;if(!(this.len-this.pos>4)){for(;t<3;++t){if(this.pos>=this.len)throw i(this);if(e.lo=(e.lo|(127&this.buf[this.pos])<<7*t)>>>0,this.buf[this.pos++]<128)return e}return e.lo=(e.lo|(127&this.buf[this.pos++])<<7*t)>>>0,e}for(;t<4;++t)if(e.lo=(e.lo|(127&this.buf[this.pos])<<7*t)>>>0,this.buf[this.pos++]<128)return e;if(e.lo=(e.lo|(127&this.buf[this.pos])<<28)>>>0,e.hi=(e.hi|(127&this.buf[this.pos])>>4)>>>0,this.buf[this.pos++]<128)return e;if(t=0,this.len-this.pos>4){for(;t<5;++t)if(e.hi=(e.hi|(127&this.buf[this.pos])<<7*t+3)>>>0,this.buf[this.pos++]<128)return e}else for(;t<5;++t){if(this.pos>=this.len)throw i(this);if(e.hi=(e.hi|(127&this.buf[this.pos])<<7*t+3)>>>0,this.buf[this.pos++]<128)return e}throw Error("invalid varint encoding")}function s(e,t){return(e[t-4]|e[t-3]<<8|e[t-2]<<16|e[t-1]<<24)>>>0}function a(){if(this.pos+8>this.len)throw i(this,8);return new l(s(this.buf,this.pos+=4),s(this.buf,this.pos+=4))}e.exports=n;var u,f=r(1),l=f.LongBits,h=f.utf8,c="undefined"!=typeof Uint8Array?function(e){if(e instanceof Uint8Array||Array.isArray(e))return new n(e);throw Error("illegal buffer")}:function(e){if(Array.isArray(e))return new n(e);throw Error("illegal buffer")},p=function(){return f.Buffer?function(e){return(n.create=function(e){return f.Buffer.isBuffer(e)?new u(e):c(e)})(e)}:c};n.create=p(),n.prototype._slice=f.Array.prototype.subarray||f.Array.prototype.slice,n.prototype.uint32=function(){var e=4294967295;return function(){if(e=(127&this.buf[this.pos])>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(127&this.buf[this.pos])<<7)>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(127&this.buf[this.pos])<<14)>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(127&this.buf[this.pos])<<21)>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(15&this.buf[this.pos])<<28)>>>0,this.buf[this.pos++]<128)return e;if((this.pos+=5)>this.len)throw this.pos=this.len,i(this,10);return e}}(),n.prototype.int32=function(){return 0|this.uint32()},n.prototype.sint32=function(){var e=this.uint32();return e>>>1^-(1&e)|0},n.prototype.bool=function(){return 0!==this.uint32()},n.prototype.fixed32=function(){if(this.pos+4>this.len)throw i(this,4);return s(this.buf,this.pos+=4)},n.prototype.sfixed32=function(){if(this.pos+4>this.len)throw i(this,4);return 0|s(this.buf,this.pos+=4)},n.prototype.float=function(){if(this.pos+4>this.len)throw i(this,4);var e=f.float.readFloatLE(this.buf,this.pos);return this.pos+=4,e},n.prototype.double=function(){if(this.pos+8>this.len)throw i(this,4);var e=f.float.readDoubleLE(this.buf,this.pos);return this.pos+=8,e},n.prototype.bytes=function(){var e=this.uint32(),t=this.pos,r=this.pos+e;if(r>this.len)throw i(this,e);return this.pos+=e,Array.isArray(this.buf)?this.buf.slice(t,r):t===r?new this.buf.constructor(0):this._slice.call(this.buf,t,r)},n.prototype.string=function(){var e=this.bytes();return h.read(e,0,e.length)},n.prototype.skip=function(e){if("number"==typeof e){if(this.pos+e>this.len)throw i(this,e);this.pos+=e}else do{if(this.pos>=this.len)throw i(this)}while(128&this.buf[this.pos++]);return this},n.prototype.skipType=function(e){switch(e){case 0:this.skip();break;case 1:this.skip(8);break;case 2:this.skip(this.uint32());break;case 3:for(;4!=(e=7&this.uint32());)this.skipType(e);break;case 5:this.skip(4);break;default:throw Error("invalid wire type "+e+" at offset "+this.pos)}return this},n._configure=function(e){u=e,n.create=p(),u._configure();var t=f.Long?"toLong":"toNumber";f.merge(n.prototype,{int64:function(){return o.call(this)[t](!1)},uint64:function(){return o.call(this)[t](!0)},sint64:function(){return o.call(this).zzDecode()[t](!1)},fixed64:function(){return a.call(this)[t](!0)},sfixed64:function(){return a.call(this)[t](!1)}})}},function(e,t,r){"use strict";function i(e,t,r,i){if(Array.isArray(t)||(r=t,t=void 0),o.call(this,e,r),void 0!==t&&!Array.isArray(t))throw TypeError("fieldNames must be an Array");this.oneof=t||[],this.fieldsArray=[],this.comment=i}function n(e){if(e.parent)for(var t=0;t<e.fieldsArray.length;++t)e.fieldsArray[t].parent||e.parent.add(e.fieldsArray[t])}e.exports=i;var o=r(3);((i.prototype=Object.create(o.prototype)).constructor=i).className="OneOf";var s=r(4),a=r(0);i.fromJSON=function(e,t){return new i(e,t.oneof,t.options,t.comment)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return a.toObject(["options",this.options,"oneof",this.oneof,"comment",t?this.comment:void 0])},i.prototype.add=function(e){if(!(e instanceof s))throw TypeError("field must be a Field");return e.parent&&e.parent!==this.parent&&e.parent.remove(e),this.oneof.push(e.name),this.fieldsArray.push(e),e.partOf=this,n(this),this},i.prototype.remove=function(e){if(!(e instanceof s))throw TypeError("field must be a Field");var t=this.fieldsArray.indexOf(e);if(t<0)throw Error(e+" is not a member of "+this);return this.fieldsArray.splice(t,1),(t=this.oneof.indexOf(e.name))>-1&&this.oneof.splice(t,1),e.partOf=null,this},i.prototype.onAdd=function(e){o.prototype.onAdd.call(this,e);for(var t=0;t<this.oneof.length;++t){var r=e.get(this.oneof[t]);r&&!r.partOf&&(r.partOf=this,this.fieldsArray.push(r))}n(this)},i.prototype.onRemove=function(e){for(var t,r=0;r<this.fieldsArray.length;++r)(t=this.fieldsArray[r]).parent&&t.parent.remove(t);o.prototype.onRemove.call(this,e)},i.d=function(){for(var e=new Array(arguments.length),t=0;t<arguments.length;)e[t]=arguments[t++];return function(t,r){a.decorateType(t.constructor).add(new i(r,e)),Object.defineProperty(t,r,{get:a.oneOfGetter(e),set:a.oneOfSetter(e)})}}},function(e,t,r){"use strict";function i(e){if(e)for(var t=Object.keys(e),r=0;r<t.length;++r)this[t[r]]=e[t[r]]}e.exports=i;var n=r(1);i.create=function(e){return this.$type.create(e)},i.encode=function(e,t){return this.$type.encode(e,t)},i.encodeDelimited=function(e,t){return this.$type.encodeDelimited(e,t)},i.decode=function(e){return this.$type.decode(e)},i.decodeDelimited=function(e){return this.$type.decodeDelimited(e)},i.verify=function(e){return this.$type.verify(e)},i.fromObject=function(e){return this.$type.fromObject(e)},i.toObject=function(e,t){return this.$type.toObject(e,t)},i.prototype.toJSON=function(){return this.$type.toObject(this,n.toJSONOptions)}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Parser=void 0;var i=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),n=r(31),o=function(e){return e&&e.__esModule?e:{default:e}}(r(50));t.Parser=function(){function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e)}return i(e,[{key:"load",value:function(e,t,r){this.loadViaWorker(e,t,r)}},{key:"loadViaWorker",value:function(e,t,r){(0,o.default)(e,(function(e){var r=e.movie;r.version=e.ver;var i=e.images,o=new n.VideoEntity(r,i);t(o)}),r)}}]),e}()},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.RectPath=void 0;var i=r(5);t.RectPath=function(e){function t(e,r,i,n,o,s,a){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);var u=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return u._x=e,u._y=r,u._width=i,u._height=n,u._cornerRadius=o,u._transform=s,u._styles=a,u}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),t}(i.BezierPath)},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.EllipsePath=void 0;var i=r(5);t.EllipsePath=function(e){function t(e,r,i,n,o,s){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);var a=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return a._x=e,a._y=r,a._radiusX=i,a._radiusY=n,a._transform=o,a._styles=s,a}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),t}(i.BezierPath)},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=r(34),n=JSON.parse('{"nested":{"com":{"nested":{"opensource":{"nested":{"svga":{"options":{"objc_class_prefix":"SVGAProto","java_package":"com.opensource.svgaplayer.proto"},"nested":{"MovieParams":{"fields":{"viewBoxWidth":{"type":"float","id":1},"viewBoxHeight":{"type":"float","id":2},"fps":{"type":"int32","id":3},"frames":{"type":"int32","id":4}}},"SpriteEntity":{"fields":{"imageKey":{"type":"string","id":1},"frames":{"rule":"repeated","type":"FrameEntity","id":2},"matteKey":{"type":"string","id":3}}},"AudioEntity":{"fields":{"audioKey":{"type":"string","id":1},"startFrame":{"type":"int32","id":2},"endFrame":{"type":"int32","id":3},"startTime":{"type":"int32","id":4},"totalTime":{"type":"int32","id":5}}},"Layout":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4}}},"Transform":{"fields":{"a":{"type":"float","id":1},"b":{"type":"float","id":2},"c":{"type":"float","id":3},"d":{"type":"float","id":4},"tx":{"type":"float","id":5},"ty":{"type":"float","id":6}}},"ShapeEntity":{"oneofs":{"args":{"oneof":["shape","rect","ellipse"]}},"fields":{"type":{"type":"ShapeType","id":1},"shape":{"type":"ShapeArgs","id":2},"rect":{"type":"RectArgs","id":3},"ellipse":{"type":"EllipseArgs","id":4},"styles":{"type":"ShapeStyle","id":10},"transform":{"type":"Transform","id":11}},"nested":{"ShapeType":{"values":{"SHAPE":0,"RECT":1,"ELLIPSE":2,"KEEP":3}},"ShapeArgs":{"fields":{"d":{"type":"string","id":1}}},"RectArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4},"cornerRadius":{"type":"float","id":5}}},"EllipseArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"radiusX":{"type":"float","id":3},"radiusY":{"type":"float","id":4}}},"ShapeStyle":{"fields":{"fill":{"type":"RGBAColor","id":1},"stroke":{"type":"RGBAColor","id":2},"strokeWidth":{"type":"float","id":3},"lineCap":{"type":"LineCap","id":4},"lineJoin":{"type":"LineJoin","id":5},"miterLimit":{"type":"float","id":6},"lineDashI":{"type":"float","id":7},"lineDashII":{"type":"float","id":8},"lineDashIII":{"type":"float","id":9}},"nested":{"RGBAColor":{"fields":{"r":{"type":"float","id":1},"g":{"type":"float","id":2},"b":{"type":"float","id":3},"a":{"type":"float","id":4}}},"LineCap":{"values":{"LineCap_BUTT":0,"LineCap_ROUND":1,"LineCap_SQUARE":2}},"LineJoin":{"values":{"LineJoin_MITER":0,"LineJoin_ROUND":1,"LineJoin_BEVEL":2}}}}}},"FrameEntity":{"fields":{"alpha":{"type":"float","id":1},"layout":{"type":"Layout","id":2},"transform":{"type":"Transform","id":3},"clipPath":{"type":"string","id":4},"shapes":{"rule":"repeated","type":"ShapeEntity","id":5}}},"MovieEntity":{"fields":{"version":{"type":"string","id":1},"params":{"type":"MovieParams","id":2},"images":{"keyType":"string","type":"bytes","id":3},"sprites":{"rule":"repeated","type":"SpriteEntity","id":4},"audios":{"rule":"repeated","type":"AudioEntity","id":5}}}}}}}}}}}'),o=t.proto=i.Root.fromJSON(n);t.ProtoMovieEntity=o.lookupType("com.opensource.svga.MovieEntity")},function(e,t,r){"use strict";e.exports=function(e,t){for(var r=new Array(arguments.length-1),i=0,n=2,o=!0;n<arguments.length;)r[i++]=arguments[n++];return new Promise((function(n,s){r[i]=function(e){if(o)if(o=!1,e)s(e);else{for(var t=new Array(arguments.length-1),r=0;r<t.length;)t[r++]=arguments[r];n.apply(null,t)}};try{e.apply(t||null,r)}catch(e){o&&(o=!1,s(e))}}))}},function(module,exports,__webpack_require__){"use strict";function inquire(moduleName){try{var mod=eval("quire".replace(/^/,"re"))(moduleName);if(mod&&(mod.length||Object.keys(mod).length))return mod}catch(e){}return null}module.exports=inquire},function(e,t,r){"use strict";t.Service=r(46)},function(e,t,r){"use strict";e.exports={}},function(e,t,r){"use strict";function i(e,t,r,i){return t.resolvedType.group?e("types[%i].encode(%s,w.uint32(%i)).uint32(%i)",r,i,(t.id<<3|3)>>>0,(t.id<<3|4)>>>0):e("types[%i].encode(%s,w.uint32(%i).fork()).ldelim()",r,i,(t.id<<3|2)>>>0)}e.exports=function(e){for(var t,r=s.codegen(["m","w"],e.name+"$encode")("if(!w)")("w=Writer.create()"),a=e.fieldsArray.slice().sort(s.compareFieldsById),u=0;u<a.length;++u){var f=a[u].resolve(),l=e._fieldsArray.indexOf(f),h=f.resolvedType instanceof n?"int32":f.type,c=o.basic[h];t="m"+s.safeProp(f.name),f.map?(r("if(%s!=null&&Object.hasOwnProperty.call(m,%j)){",t,f.name)("for(var ks=Object.keys(%s),i=0;i<ks.length;++i){",t)("w.uint32(%i).fork().uint32(%i).%s(ks[i])",(f.id<<3|2)>>>0,8|o.mapKey[f.keyType],f.keyType),void 0===c?r("types[%i].encode(%s[ks[i]],w.uint32(18).fork()).ldelim().ldelim()",l,t):r(".uint32(%i).%s(%s[ks[i]]).ldelim()",16|c,h,t),r("}")("}")):f.repeated?(r("if(%s!=null&&%s.length){",t,t),f.packed&&void 0!==o.packed[h]?r("w.uint32(%i).fork()",(f.id<<3|2)>>>0)("for(var i=0;i<%s.length;++i)",t)("w.%s(%s[i])",h,t)("w.ldelim()"):(r("for(var i=0;i<%s.length;++i)",t),void 0===c?i(r,f,l,t+"[i]"):r("w.uint32(%i).%s(%s[i])",(f.id<<3|c)>>>0,h,t)),r("}")):(f.optional&&r("if(%s!=null&&Object.hasOwnProperty.call(m,%j))",t,f.name),void 0===c?i(r,f,l,t):r("w.uint32(%i).%s(%s)",(f.id<<3|c)>>>0,h,t))}return r("return w")};var n=r(2),o=r(7),s=r(0)},function(e,t,r){"use strict";function i(e,t){o.call(this,e,t),this.fields={},this.oneofs=void 0,this.extensions=void 0,this.reserved=void 0,this.group=void 0,this._fieldsById=null,this._fieldsArray=null,this._oneofsArray=null,this._ctor=null}function n(e){return e._fieldsById=e._fieldsArray=e._oneofsArray=null,delete e.encode,delete e.decode,delete e.verify,e}e.exports=i;var o=r(6);((i.prototype=Object.create(o.prototype)).constructor=i).className="Type";var s=r(2),a=r(11),u=r(4),f=r(23),l=r(24),h=r(12),c=r(10),p=r(9),d=r(0),y=r(21),m=r(26),v=r(27),b=r(28),g=r(29);Object.defineProperties(i.prototype,{fieldsById:{get:function(){if(this._fieldsById)return this._fieldsById;this._fieldsById={};for(var e=Object.keys(this.fields),t=0;t<e.length;++t){var r=this.fields[e[t]],i=r.id;if(this._fieldsById[i])throw Error("duplicate id "+i+" in "+this);this._fieldsById[i]=r}return this._fieldsById}},fieldsArray:{get:function(){return this._fieldsArray||(this._fieldsArray=d.toArray(this.fields))}},oneofsArray:{get:function(){return this._oneofsArray||(this._oneofsArray=d.toArray(this.oneofs))}},ctor:{get:function(){return this._ctor||(this.ctor=i.generateConstructor(this)())},set:function(e){var t=e.prototype;t instanceof h||((e.prototype=new h).constructor=e,d.merge(e.prototype,t)),e.$type=e.prototype.$type=this,d.merge(e,h,!0),this._ctor=e;for(var r=0;r<this.fieldsArray.length;++r)this._fieldsArray[r].resolve();var i={};for(r=0;r<this.oneofsArray.length;++r)i[this._oneofsArray[r].resolve().name]={get:d.oneOfGetter(this._oneofsArray[r].oneof),set:d.oneOfSetter(this._oneofsArray[r].oneof)};r&&Object.defineProperties(e.prototype,i)}}}),i.generateConstructor=function(e){for(var t,r=d.codegen(["p"],e.name),i=0;i<e.fieldsArray.length;++i)(t=e._fieldsArray[i]).map?r("this%s={}",d.safeProp(t.name)):t.repeated&&r("this%s=[]",d.safeProp(t.name));return r("if(p)for(var ks=Object.keys(p),i=0;i<ks.length;++i)if(p[ks[i]]!=null)")("this[ks[i]]=p[ks[i]]")},i.fromJSON=function(e,t){var r=new i(e,t.options);r.extensions=t.extensions,r.reserved=t.reserved;for(var n=Object.keys(t.fields),h=0;h<n.length;++h)r.add((void 0!==t.fields[n[h]].keyType?f.fromJSON:u.fromJSON)(n[h],t.fields[n[h]]));if(t.oneofs)for(n=Object.keys(t.oneofs),h=0;h<n.length;++h)r.add(a.fromJSON(n[h],t.oneofs[n[h]]));if(t.nested)for(n=Object.keys(t.nested),h=0;h<n.length;++h){var c=t.nested[n[h]];r.add((void 0!==c.id?u.fromJSON:void 0!==c.fields?i.fromJSON:void 0!==c.values?s.fromJSON:void 0!==c.methods?l.fromJSON:o.fromJSON)(n[h],c))}return t.extensions&&t.extensions.length&&(r.extensions=t.extensions),t.reserved&&t.reserved.length&&(r.reserved=t.reserved),t.group&&(r.group=!0),t.comment&&(r.comment=t.comment),r},i.prototype.toJSON=function(e){var t=o.prototype.toJSON.call(this,e),r=!!e&&Boolean(e.keepComments);return d.toObject(["options",t&&t.options||void 0,"oneofs",o.arrayToJSON(this.oneofsArray,e),"fields",o.arrayToJSON(this.fieldsArray.filter((function(e){return!e.declaringField})),e)||{},"extensions",this.extensions&&this.extensions.length?this.extensions:void 0,"reserved",this.reserved&&this.reserved.length?this.reserved:void 0,"group",this.group||void 0,"nested",t&&t.nested||void 0,"comment",r?this.comment:void 0])},i.prototype.resolveAll=function(){for(var e=this.fieldsArray,t=0;t<e.length;)e[t++].resolve();var r=this.oneofsArray;for(t=0;t<r.length;)r[t++].resolve();return o.prototype.resolveAll.call(this)},i.prototype.get=function(e){return this.fields[e]||this.oneofs&&this.oneofs[e]||this.nested&&this.nested[e]||null},i.prototype.add=function(e){if(this.get(e.name))throw Error("duplicate name '"+e.name+"' in "+this);if(e instanceof u&&void 0===e.extend){if(this._fieldsById?this._fieldsById[e.id]:this.fieldsById[e.id])throw Error("duplicate id "+e.id+" in "+this);if(this.isReservedId(e.id))throw Error("id "+e.id+" is reserved in "+this);if(this.isReservedName(e.name))throw Error("name '"+e.name+"' is reserved in "+this);return e.parent&&e.parent.remove(e),this.fields[e.name]=e,e.message=this,e.onAdd(this),n(this)}return e instanceof a?(this.oneofs||(this.oneofs={}),this.oneofs[e.name]=e,e.onAdd(this),n(this)):o.prototype.add.call(this,e)},i.prototype.remove=function(e){if(e instanceof u&&void 0===e.extend){if(!this.fields||this.fields[e.name]!==e)throw Error(e+" is not a member of "+this);return delete this.fields[e.name],e.parent=null,e.onRemove(this),n(this)}if(e instanceof a){if(!this.oneofs||this.oneofs[e.name]!==e)throw Error(e+" is not a member of "+this);return delete this.oneofs[e.name],e.parent=null,e.onRemove(this),n(this)}return o.prototype.remove.call(this,e)},i.prototype.isReservedId=function(e){return o.isReservedId(this.reserved,e)},i.prototype.isReservedName=function(e){return o.isReservedName(this.reserved,e)},i.prototype.create=function(e){return new this.ctor(e)},i.prototype.setup=function(){for(var e=this.fullName,t=[],r=0;r<this.fieldsArray.length;++r)t.push(this._fieldsArray[r].resolve().resolvedType);this.encode=y(this)({Writer:p,types:t,util:d}),this.decode=m(this)({Reader:c,types:t,util:d}),this.verify=v(this)({types:t,util:d}),this.fromObject=b.fromObject(this)({types:t,util:d}),this.toObject=b.toObject(this)({types:t,util:d});var i=g[e];if(i){var n=Object.create(this);n.fromObject=this.fromObject,this.fromObject=i.fromObject.bind(n),n.toObject=this.toObject,this.toObject=i.toObject.bind(n)}return this},i.prototype.encode=function(e,t){return this.setup().encode(e,t)},i.prototype.encodeDelimited=function(e,t){return this.encode(e,t&&t.len?t.fork():t).ldelim()},i.prototype.decode=function(e,t){return this.setup().decode(e,t)},i.prototype.decodeDelimited=function(e){return e instanceof c||(e=c.create(e)),this.decode(e,e.uint32())},i.prototype.verify=function(e){return this.setup().verify(e)},i.prototype.fromObject=function(e){return this.setup().fromObject(e)},i.prototype.toObject=function(e,t){return this.setup().toObject(e,t)},i.d=function(e){return function(t){d.decorateType(t,e)}}},function(e,t,r){"use strict";function i(e,t,r,i,o,a){if(n.call(this,e,t,i,void 0,void 0,o,a),!s.isString(r))throw TypeError("keyType must be a string");this.keyType=r,this.resolvedKeyType=null,this.map=!0}e.exports=i;var n=r(4);((i.prototype=Object.create(n.prototype)).constructor=i).className="MapField";var o=r(7),s=r(0);i.fromJSON=function(e,t){return new i(e,t.id,t.keyType,t.type,t.options,t.comment)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return s.toObject(["keyType",this.keyType,"type",this.type,"id",this.id,"extend",this.extend,"options",this.options,"comment",t?this.comment:void 0])},i.prototype.resolve=function(){if(this.resolved)return this;if(void 0===o.mapKey[this.keyType])throw Error("invalid key type: "+this.keyType);return n.prototype.resolve.call(this)},i.d=function(e,t,r){return"function"==typeof r?r=s.decorateType(r).name:r&&"object"==typeof r&&(r=s.decorateEnum(r).name),function(n,o){s.decorateType(n.constructor).add(new i(o,e,t,r))}}},function(e,t,r){"use strict";function i(e,t){o.call(this,e,t),this.methods={},this._methodsArray=null}function n(e){return e._methodsArray=null,e}e.exports=i;var o=r(6);((i.prototype=Object.create(o.prototype)).constructor=i).className="Service";var s=r(25),a=r(0),u=r(19);i.fromJSON=function(e,t){var r=new i(e,t.options);if(t.methods)for(var n=Object.keys(t.methods),o=0;o<n.length;++o)r.add(s.fromJSON(n[o],t.methods[n[o]]));return t.nested&&r.addJSON(t.nested),r.comment=t.comment,r},i.prototype.toJSON=function(e){var t=o.prototype.toJSON.call(this,e),r=!!e&&Boolean(e.keepComments);return a.toObject(["options",t&&t.options||void 0,"methods",o.arrayToJSON(this.methodsArray,e)||{},"nested",t&&t.nested||void 0,"comment",r?this.comment:void 0])},Object.defineProperty(i.prototype,"methodsArray",{get:function(){return this._methodsArray||(this._methodsArray=a.toArray(this.methods))}}),i.prototype.get=function(e){return this.methods[e]||o.prototype.get.call(this,e)},i.prototype.resolveAll=function(){for(var e=this.methodsArray,t=0;t<e.length;++t)e[t].resolve();return o.prototype.resolve.call(this)},i.prototype.add=function(e){if(this.get(e.name))throw Error("duplicate name '"+e.name+"' in "+this);return e instanceof s?(this.methods[e.name]=e,e.parent=this,n(this)):o.prototype.add.call(this,e)},i.prototype.remove=function(e){if(e instanceof s){if(this.methods[e.name]!==e)throw Error(e+" is not a member of "+this);return delete this.methods[e.name],e.parent=null,n(this)}return o.prototype.remove.call(this,e)},i.prototype.create=function(e,t,r){for(var i,n=new u.Service(e,t,r),o=0;o<this.methodsArray.length;++o){var s=a.lcFirst((i=this._methodsArray[o]).resolve().name).replace(/[^$\w_]/g,"");n[s]=a.codegen(["r","c"],a.isReserved(s)?s+"_":s)("return this.rpcCall(m,q,s,r,c)")({m:i,q:i.resolvedRequestType.ctor,s:i.resolvedResponseType.ctor})}return n}},function(e,t,r){"use strict";function i(e,t,r,i,s,a,u,f,l){if(o.isObject(s)?(u=s,s=a=void 0):o.isObject(a)&&(u=a,a=void 0),void 0!==t&&!o.isString(t))throw TypeError("type must be a string");if(!o.isString(r))throw TypeError("requestType must be a string");if(!o.isString(i))throw TypeError("responseType must be a string");n.call(this,e,u),this.type=t||"rpc",this.requestType=r,this.requestStream=!!s||void 0,this.responseType=i,this.responseStream=!!a||void 0,this.resolvedRequestType=null,this.resolvedResponseType=null,this.comment=f,this.parsedOptions=l}e.exports=i;var n=r(3);((i.prototype=Object.create(n.prototype)).constructor=i).className="Method";var o=r(0);i.fromJSON=function(e,t){return new i(e,t.type,t.requestType,t.responseType,t.requestStream,t.responseStream,t.options,t.comment,t.parsedOptions)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return o.toObject(["type","rpc"!==this.type&&this.type||void 0,"requestType",this.requestType,"requestStream",this.requestStream,"responseType",this.responseType,"responseStream",this.responseStream,"options",this.options,"comment",t?this.comment:void 0,"parsedOptions",this.parsedOptions])},i.prototype.resolve=function(){return this.resolved?this:(this.resolvedRequestType=this.parent.lookupType(this.requestType),this.resolvedResponseType=this.parent.lookupType(this.responseType),n.prototype.resolve.call(this))}},function(e,t,r){"use strict";function i(e){return"missing required '"+e.name+"'"}e.exports=function(e){var t=s.codegen(["r","l"],e.name+"$decode")("if(!(r instanceof Reader))")("r=Reader.create(r)")("var c=l===undefined?r.len:r.pos+l,m=new this.ctor"+(e.fieldsArray.filter((function(e){return e.map})).length?",k,value":""))("while(r.pos<c){")("var t=r.uint32()");e.group&&t("if((t&7)===4)")("break"),t("switch(t>>>3){");for(var r=0;r<e.fieldsArray.length;++r){var a=e._fieldsArray[r].resolve(),u=a.resolvedType instanceof n?"int32":a.type,f="m"+s.safeProp(a.name);t("case %i:",a.id),a.map?(t("if(%s===util.emptyObject)",f)("%s={}",f)("var c2 = r.uint32()+r.pos"),void 0!==o.defaults[a.keyType]?t("k=%j",o.defaults[a.keyType]):t("k=null"),void 0!==o.defaults[u]?t("value=%j",o.defaults[u]):t("value=null"),t("while(r.pos<c2){")("var tag2=r.uint32()")("switch(tag2>>>3){")("case 1: k=r.%s(); break",a.keyType)("case 2:"),void 0===o.basic[u]?t("value=types[%i].decode(r,r.uint32())",r):t("value=r.%s()",u),t("break")("default:")("r.skipType(tag2&7)")("break")("}")("}"),void 0!==o.long[a.keyType]?t('%s[typeof k==="object"?util.longToHash(k):k]=value',f):t("%s[k]=value",f)):a.repeated?(t("if(!(%s&&%s.length))",f,f)("%s=[]",f),void 0!==o.packed[u]&&t("if((t&7)===2){")("var c2=r.uint32()+r.pos")("while(r.pos<c2)")("%s.push(r.%s())",f,u)("}else"),void 0===o.basic[u]?t(a.resolvedType.group?"%s.push(types[%i].decode(r))":"%s.push(types[%i].decode(r,r.uint32()))",f,r):t("%s.push(r.%s())",f,u)):void 0===o.basic[u]?t(a.resolvedType.group?"%s=types[%i].decode(r)":"%s=types[%i].decode(r,r.uint32())",f,r):t("%s=r.%s()",f,u),t("break")}for(t("default:")("r.skipType(t&7)")("break")("}")("}"),r=0;r<e._fieldsArray.length;++r){var l=e._fieldsArray[r];l.required&&t("if(!m.hasOwnProperty(%j))",l.name)("throw util.ProtocolError(%j,{instance:m})",i(l))}return t("return m")};var n=r(2),o=r(7),s=r(0)},function(e,t,r){"use strict";function i(e,t){return e.name+": "+t+(e.repeated&&"array"!==t?"[]":e.map&&"object"!==t?"{k:"+e.keyType+"}":"")+" expected"}function n(e,t,r,n){if(t.resolvedType)if(t.resolvedType instanceof s){e("switch(%s){",n)("default:")("return%j",i(t,"enum value"));for(var o=Object.keys(t.resolvedType.values),a=0;a<o.length;++a)e("case %i:",t.resolvedType.values[o[a]]);e("break")("}")}else e("{")("var e=types[%i].verify(%s);",r,n)("if(e)")("return%j+e",t.name+".")("}");else switch(t.type){case"int32":case"uint32":case"sint32":case"fixed32":case"sfixed32":e("if(!util.isInteger(%s))",n)("return%j",i(t,"integer"));break;case"int64":case"uint64":case"sint64":case"fixed64":case"sfixed64":e("if(!util.isInteger(%s)&&!(%s&&util.isInteger(%s.low)&&util.isInteger(%s.high)))",n,n,n,n)("return%j",i(t,"integer|Long"));break;case"float":case"double":e('if(typeof %s!=="number")',n)("return%j",i(t,"number"));break;case"bool":e('if(typeof %s!=="boolean")',n)("return%j",i(t,"boolean"));break;case"string":e("if(!util.isString(%s))",n)("return%j",i(t,"string"));break;case"bytes":e('if(!(%s&&typeof %s.length==="number"||util.isString(%s)))',n,n,n)("return%j",i(t,"buffer"))}return e}function o(e,t,r){switch(t.keyType){case"int32":case"uint32":case"sint32":case"fixed32":case"sfixed32":e("if(!util.key32Re.test(%s))",r)("return%j",i(t,"integer key"));break;case"int64":case"uint64":case"sint64":case"fixed64":case"sfixed64":e("if(!util.key64Re.test(%s))",r)("return%j",i(t,"integer|Long key"));break;case"bool":e("if(!util.key2Re.test(%s))",r)("return%j",i(t,"boolean key"))}return e}e.exports=function(e){var t=a.codegen(["m"],e.name+"$verify")('if(typeof m!=="object"||m===null)')("return%j","object expected"),r={};e.oneofsArray.length&&t("var p={}");for(var s=0;s<e.fieldsArray.length;++s){var u=e._fieldsArray[s].resolve(),f="m"+a.safeProp(u.name);if(u.optional&&t("if(%s!=null&&m.hasOwnProperty(%j)){",f,u.name),u.map)t("if(!util.isObject(%s))",f)("return%j",i(u,"object"))("var k=Object.keys(%s)",f)("for(var i=0;i<k.length;++i){"),o(t,u,"k[i]"),n(t,u,s,f+"[k[i]]")("}");else if(u.repeated)t("if(!Array.isArray(%s))",f)("return%j",i(u,"array"))("for(var i=0;i<%s.length;++i){",f),n(t,u,s,f+"[i]")("}");else{if(u.partOf){var l=a.safeProp(u.partOf.name);1===r[u.partOf.name]&&t("if(p%s===1)",l)("return%j",u.partOf.name+": multiple values"),r[u.partOf.name]=1,t("p%s=1",l)}n(t,u,s,f)}u.optional&&t("}")}return t("return null")};var s=r(2),a=r(0)},function(e,t,r){"use strict";function i(e,t,r,i){if(t.resolvedType)if(t.resolvedType instanceof s){e("switch(d%s){",i);for(var n=t.resolvedType.values,o=Object.keys(n),a=0;a<o.length;++a)t.repeated&&n[o[a]]===t.typeDefault&&e("default:"),e("case%j:",o[a])("case %i:",n[o[a]])("m%s=%j",i,n[o[a]])("break");e("}")}else e('if(typeof d%s!=="object")',i)("throw TypeError(%j)",t.fullName+": object expected")("m%s=types[%i].fromObject(d%s)",i,r,i);else{var u=!1;switch(t.type){case"double":case"float":e("m%s=Number(d%s)",i,i);break;case"uint32":case"fixed32":e("m%s=d%s>>>0",i,i);break;case"int32":case"sint32":case"sfixed32":e("m%s=d%s|0",i,i);break;case"uint64":u=!0;case"int64":case"sint64":case"fixed64":case"sfixed64":e("if(util.Long)")("(m%s=util.Long.fromValue(d%s)).unsigned=%j",i,i,u)('else if(typeof d%s==="string")',i)("m%s=parseInt(d%s,10)",i,i)('else if(typeof d%s==="number")',i)("m%s=d%s",i,i)('else if(typeof d%s==="object")',i)("m%s=new util.LongBits(d%s.low>>>0,d%s.high>>>0).toNumber(%s)",i,i,i,u?"true":"");break;case"bytes":e('if(typeof d%s==="string")',i)("util.base64.decode(d%s,m%s=util.newBuffer(util.base64.length(d%s)),0)",i,i,i)("else if(d%s.length)",i)("m%s=d%s",i,i);break;case"string":e("m%s=String(d%s)",i,i);break;case"bool":e("m%s=Boolean(d%s)",i,i)}}return e}function n(e,t,r,i){if(t.resolvedType)t.resolvedType instanceof s?e("d%s=o.enums===String?types[%i].values[m%s]:m%s",i,r,i,i):e("d%s=types[%i].toObject(m%s,o)",i,r,i);else{var n=!1;switch(t.type){case"double":case"float":e("d%s=o.json&&!isFinite(m%s)?String(m%s):m%s",i,i,i,i);break;case"uint64":n=!0;case"int64":case"sint64":case"fixed64":case"sfixed64":e('if(typeof m%s==="number")',i)("d%s=o.longs===String?String(m%s):m%s",i,i,i)("else")("d%s=o.longs===String?util.Long.prototype.toString.call(m%s):o.longs===Number?new util.LongBits(m%s.low>>>0,m%s.high>>>0).toNumber(%s):m%s",i,i,i,i,n?"true":"",i);break;case"bytes":e("d%s=o.bytes===String?util.base64.encode(m%s,0,m%s.length):o.bytes===Array?Array.prototype.slice.call(m%s):m%s",i,i,i,i,i);break;default:e("d%s=m%s",i,i)}}return e}var o=t,s=r(2),a=r(0);o.fromObject=function(e){var t=e.fieldsArray,r=a.codegen(["d"],e.name+"$fromObject")("if(d instanceof this.ctor)")("return d");if(!t.length)return r("return new this.ctor");r("var m=new this.ctor");for(var n=0;n<t.length;++n){var o=t[n].resolve(),u=a.safeProp(o.name);o.map?(r("if(d%s){",u)('if(typeof d%s!=="object")',u)("throw TypeError(%j)",o.fullName+": object expected")("m%s={}",u)("for(var ks=Object.keys(d%s),i=0;i<ks.length;++i){",u),i(r,o,n,u+"[ks[i]]")("}")("}")):o.repeated?(r("if(d%s){",u)("if(!Array.isArray(d%s))",u)("throw TypeError(%j)",o.fullName+": array expected")("m%s=[]",u)("for(var i=0;i<d%s.length;++i){",u),i(r,o,n,u+"[i]")("}")("}")):(o.resolvedType instanceof s||r("if(d%s!=null){",u),i(r,o,n,u),o.resolvedType instanceof s||r("}"))}return r("return m")},o.toObject=function(e){var t=e.fieldsArray.slice().sort(a.compareFieldsById);if(!t.length)return a.codegen()("return {}");for(var r=a.codegen(["m","o"],e.name+"$toObject")("if(!o)")("o={}")("var d={}"),i=[],o=[],u=[],f=0;f<t.length;++f)t[f].partOf||(t[f].resolve().repeated?i:t[f].map?o:u).push(t[f]);if(i.length){for(r("if(o.arrays||o.defaults){"),f=0;f<i.length;++f)r("d%s=[]",a.safeProp(i[f].name));r("}")}if(o.length){for(r("if(o.objects||o.defaults){"),f=0;f<o.length;++f)r("d%s={}",a.safeProp(o[f].name));r("}")}if(u.length){for(r("if(o.defaults){"),f=0;f<u.length;++f){var l=u[f],h=a.safeProp(l.name);if(l.resolvedType instanceof s)r("d%s=o.enums===String?%j:%j",h,l.resolvedType.valuesById[l.typeDefault],l.typeDefault);else if(l.long)r("if(util.Long){")("var n=new util.Long(%i,%i,%j)",l.typeDefault.low,l.typeDefault.high,l.typeDefault.unsigned)("d%s=o.longs===String?n.toString():o.longs===Number?n.toNumber():n",h)("}else")("d%s=o.longs===String?%j:%i",h,l.typeDefault.toString(),l.typeDefault.toNumber());else if(l.bytes){var c="["+Array.prototype.slice.call(l.typeDefault).join(",")+"]";r("if(o.bytes===String)d%s=%j",h,String.fromCharCode.apply(String,l.typeDefault))("else{")("d%s=%s",h,c)("if(o.bytes!==Array)d%s=util.newBuffer(d%s)",h,h)("}")}else r("d%s=%j",h,l.typeDefault)}r("}")}var p=!1;for(f=0;f<t.length;++f){l=t[f];var d=e._fieldsArray.indexOf(l);h=a.safeProp(l.name);l.map?(p||(p=!0,r("var ks2")),r("if(m%s&&(ks2=Object.keys(m%s)).length){",h,h)("d%s={}",h)("for(var j=0;j<ks2.length;++j){"),n(r,l,d,h+"[ks2[j]]")("}")):l.repeated?(r("if(m%s&&m%s.length){",h,h)("d%s=[]",h)("for(var j=0;j<m%s.length;++j){",h),n(r,l,d,h+"[j]")("}")):(r("if(m%s!=null&&m.hasOwnProperty(%j)){",h,l.name),n(r,l,d,h),l.partOf&&r("if(o.oneofs)")("d%s=%j",a.safeProp(l.partOf.name),l.name)),r("}")}return r("return d")}},function(e,t,r){"use strict";var i=t,n=r(12);i[".google.protobuf.Any"]={fromObject:function(e){if(e&&e["@type"]){var t=e["@type"].substring(e["@type"].lastIndexOf("/")+1),r=this.lookup(t);if(r){var i="."===e["@type"].charAt(0)?e["@type"].substr(1):e["@type"];return-1===i.indexOf("/")&&(i="/"+i),this.create({type_url:i,value:r.encode(r.fromObject(e)).finish()})}}return this.fromObject(e)},toObject:function(e,t){var r="",i="";if(t&&t.json&&e.type_url&&e.value){i=e.type_url.substring(e.type_url.lastIndexOf("/")+1),r=e.type_url.substring(0,e.type_url.lastIndexOf("/")+1);var o=this.lookup(i);o&&(e=o.decode(e.value))}if(!(e instanceof this.ctor)&&e instanceof n){var s=e.$type.toObject(e,t);return""===r&&(r="type.googleapis.com/"),i=r+("."===e.$type.fullName[0]?e.$type.fullName.substr(1):e.$type.fullName),s["@type"]=i,s}return this.toObject(e,t)}}},function(e,t,r){"use strict";function i(e){s.call(this,"",e),this.deferred=[],this.files=[]}function n(){}function o(e,t){var r=t.parent.lookup(t.extend);if(r){var i=new l(t.fullName,t.id,t.type,t.rule,void 0,t.options);return i.declaringField=t,t.extensionField=i,r.add(i),!0}return!1}e.exports=i;var s=r(6);((i.prototype=Object.create(s.prototype)).constructor=i).className="Root";var a,u,f,l=r(4),h=r(2),c=r(11),p=r(0);i.fromJSON=function(e,t){return t||(t=new i),e.options&&t.setOptions(e.options),t.addJSON(e.nested)},i.prototype.resolvePath=p.path.resolve,i.prototype.fetch=p.fetch,i.prototype.load=function e(t,r,i){function o(e,t){if(i){var r=i;if(i=null,c)throw e;r(e,t)}}function s(e){var t=e.lastIndexOf("google/protobuf/");if(t>-1){var r=e.substring(t);if(r in f)return r}return null}function a(e,t){try{if(p.isString(t)&&"{"===t.charAt(0)&&(t=JSON.parse(t)),p.isString(t)){u.filename=e;var i,n=u(t,h,r),a=0;if(n.imports)for(;a<n.imports.length;++a)(i=s(n.imports[a])||h.resolvePath(e,n.imports[a]))&&l(i);if(n.weakImports)for(a=0;a<n.weakImports.length;++a)(i=s(n.weakImports[a])||h.resolvePath(e,n.weakImports[a]))&&l(i,!0)}else h.setOptions(t.options).addJSON(t.nested)}catch(e){o(e)}c||d||o(null,h)}function l(e,t){if(!(h.files.indexOf(e)>-1)){if(h.files.push(e),e in f)return void(c?a(e,f[e]):(++d,setTimeout((function(){--d,a(e,f[e])}))));if(c){var r;try{r=p.fs.readFileSync(e).toString("utf8")}catch(e){return void(t||o(e))}a(e,r)}else++d,h.fetch(e,(function(r,n){if(--d,i)return r?void(t?d||o(null,h):o(r)):void a(e,n)}))}}"function"==typeof r&&(i=r,r=void 0);var h=this;if(!i)return p.asPromise(e,h,t,r);var c=i===n,d=0;p.isString(t)&&(t=[t]);for(var y,m=0;m<t.length;++m)(y=h.resolvePath("",t[m]))&&l(y);if(c)return h;d||o(null,h)},i.prototype.loadSync=function(e,t){if(!p.isNode)throw Error("not supported");return this.load(e,t,n)},i.prototype.resolveAll=function(){if(this.deferred.length)throw Error("unresolvable extensions: "+this.deferred.map((function(e){return"'extend "+e.extend+"' in "+e.parent.fullName})).join(", "));return s.prototype.resolveAll.call(this)};var d=/^[A-Z]/;i.prototype._handleAdd=function(e){if(e instanceof l)void 0===e.extend||e.extensionField||o(0,e)||this.deferred.push(e);else if(e instanceof h)d.test(e.name)&&(e.parent[e.name]=e.values);else if(!(e instanceof c)){if(e instanceof a)for(var t=0;t<this.deferred.length;)o(0,this.deferred[t])?this.deferred.splice(t,1):++t;for(var r=0;r<e.nestedArray.length;++r)this._handleAdd(e._nestedArray[r]);d.test(e.name)&&(e.parent[e.name]=e)}},i.prototype._handleRemove=function(e){if(e instanceof l){if(void 0!==e.extend)if(e.extensionField)e.extensionField.parent.remove(e.extensionField),e.extensionField=null;else{var t=this.deferred.indexOf(e);t>-1&&this.deferred.splice(t,1)}}else if(e instanceof h)d.test(e.name)&&delete e.parent[e.name];else if(e instanceof s){for(var r=0;r<e.nestedArray.length;++r)this._handleRemove(e._nestedArray[r]);d.test(e.name)&&delete e.parent[e.name]}},i._configure=function(e,t,r){a=e,u=t,f=r}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.VideoEntity=void 0;var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),o=r(32),s=r(16).ProtoMovieEntity;t.VideoEntity=function(){function e(t,r){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this.version="",this.videoSize={width:0,height:0},this.FPS=20,this.frames=0,this.images={},this.sprites=[],this.audios=[],"object"===(void 0===t?"undefined":i(t))&&t.$type==s?("object"===i(t.params)&&(this.version=t.ver,this.videoSize.width=t.params.viewBoxWidth||0,this.videoSize.height=t.params.viewBoxHeight||0,this.FPS=t.params.fps||20,this.frames=t.params.frames||0),this.resetSprites(t),this.audios=t.audios):t&&(t.movie&&(t.movie.viewBox&&(this.videoSize.width=parseFloat(t.movie.viewBox.width)||0,this.videoSize.height=parseFloat(t.movie.viewBox.height)||0),this.version=t.ver,this.FPS=parseInt(t.movie.fps)||20,this.frames=parseInt(t.movie.frames)||0),this.resetSprites(t)),r&&(this.images=r)}return n(e,[{key:"resetSprites",value:function(e){e.sprites instanceof Array&&(this.sprites=e.sprites.map((function(e){return new o.SpriteEntity(e)})))}}]),e}()},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.SpriteEntity=void 0;var i=r(33);r(5),r(14),r(15),t.SpriteEntity=function e(t){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this.matteKey=null,this.imageKey=null,this.frames=[],this.matteKey=t.matteKey,this.imageKey=t.imageKey,t.frames&&(this.frames=t.frames.map((function(e){return new i.FrameEntity(e)})))}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.FrameEntity=void 0;var i=r(5);t.FrameEntity=function e(t){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this.alpha=0,this.transform={a:1,b:0,c:0,d:1,tx:0,ty:0},this.layout={x:0,y:0,width:0,height:0},this.nx=0,this.ny=0,this.maskPath=null,this.shapes=[],this.alpha=parseFloat(t.alpha)||0,t.layout&&(this.layout.x=parseFloat(t.layout.x)||0,this.layout.y=parseFloat(t.layout.y)||0,this.layout.width=parseFloat(t.layout.width)||0,this.layout.height=parseFloat(t.layout.height)||0),t.transform&&(this.transform.a=parseFloat(t.transform.a)||1,this.transform.b=parseFloat(t.transform.b)||0,this.transform.c=parseFloat(t.transform.c)||0,this.transform.d=parseFloat(t.transform.d)||1,this.transform.tx=parseFloat(t.transform.tx)||0,this.transform.ty=parseFloat(t.transform.ty)||0),t.clipPath&&t.clipPath.length>0&&(this.maskPath=new i.BezierPath(t.clipPath,void 0,{fill:"#000000"})),t.shapes&&(t.shapes instanceof Array&&t.shapes.forEach((function(e){switch(e.pathArgs=e.args,e.type){case 0:e.type="shape",e.pathArgs=e.shape;break;case 1:e.type="rect",e.pathArgs=e.rect;break;case 2:e.type="ellipse",e.pathArgs=e.ellipse;break;case 3:e.type="keep"}if(e.styles){e.styles.fill&&("number"==typeof e.styles.fill.r&&(e.styles.fill[0]=e.styles.fill.r),"number"==typeof e.styles.fill.g&&(e.styles.fill[1]=e.styles.fill.g),"number"==typeof e.styles.fill.b&&(e.styles.fill[2]=e.styles.fill.b),"number"==typeof e.styles.fill.a&&(e.styles.fill[3]=e.styles.fill.a)),e.styles.stroke&&("number"==typeof e.styles.stroke.r&&(e.styles.stroke[0]=e.styles.stroke.r),"number"==typeof e.styles.stroke.g&&(e.styles.stroke[1]=e.styles.stroke.g),"number"==typeof e.styles.stroke.b&&(e.styles.stroke[2]=e.styles.stroke.b),"number"==typeof e.styles.stroke.a&&(e.styles.stroke[3]=e.styles.stroke.a));var t=e.styles.lineDash||[];switch(e.styles.lineDashI>0&&t.push(e.styles.lineDashI),e.styles.lineDashII>0&&(t.length<1&&t.push(0),t.push(e.styles.lineDashII),t.push(0)),e.styles.lineDashIII>0&&(t.length<2&&(t.push(0),t.push(0)),t[2]=e.styles.lineDashIII),e.styles.lineDash=t,e.styles.lineJoin){case 0:e.styles.lineJoin="miter";break;case 1:e.styles.lineJoin="round";break;case 2:e.styles.lineJoin="bevel"}switch(e.styles.lineCap){case 0:e.styles.lineCap="butt";break;case 1:e.styles.lineCap="round";break;case 2:e.styles.lineCap="square"}}})),t.shapes[0]&&"keep"===t.shapes[0].type?this.shapes=e.lastShapes:(this.shapes=t.shapes,e.lastShapes=t.shapes));var r=this.transform.a*this.layout.x+this.transform.c*this.layout.y+this.transform.tx,n=this.transform.a*(this.layout.x+this.layout.width)+this.transform.c*this.layout.y+this.transform.tx,o=this.transform.a*this.layout.x+this.transform.c*(this.layout.y+this.layout.height)+this.transform.tx,s=this.transform.a*(this.layout.x+this.layout.width)+this.transform.c*(this.layout.y+this.layout.height)+this.transform.tx,a=this.transform.b*this.layout.x+this.transform.d*this.layout.y+this.transform.ty,u=this.transform.b*(this.layout.x+this.layout.width)+this.transform.d*this.layout.y+this.transform.ty,f=this.transform.b*this.layout.x+this.transform.d*(this.layout.y+this.layout.height)+this.transform.ty,l=this.transform.b*(this.layout.x+this.layout.width)+this.transform.d*(this.layout.y+this.layout.height)+this.transform.ty;this.nx=Math.min(Math.min(o,s),Math.min(r,n)),this.ny=Math.min(Math.min(f,l),Math.min(a,u))}},function(e,t,r){"use strict";e.exports=r(35)},function(e,t,r){"use strict";var i=e.exports=r(36);i.build="light",i.load=function(e,t,r){return"function"==typeof t?(r=t,t=new i.Root):t||(t=new i.Root),t.load(e,r)},i.loadSync=function(e,t){return t||(t=new i.Root),t.loadSync(e)},i.encoder=r(21),i.decoder=r(26),i.verifier=r(27),i.converter=r(28),i.ReflectionObject=r(3),i.Namespace=r(6),i.Root=r(30),i.Enum=r(2),i.Type=r(22),i.Field=r(4),i.OneOf=r(11),i.MapField=r(23),i.Service=r(24),i.Method=r(25),i.Message=r(12),i.wrappers=r(29),i.types=r(7),i.util=r(0),i.ReflectionObject._configure(i.Root),i.Namespace._configure(i.Type,i.Service,i.Enum),i.Root._configure(i.Type),i.Field._configure(i.Type)},function(e,t,r){"use strict";function i(){n.util._configure(),n.Writer._configure(n.BufferWriter),n.Reader._configure(n.BufferReader)}var n=t;n.build="minimal",n.Writer=r(9),n.BufferWriter=r(44),n.Reader=r(10),n.BufferReader=r(45),n.util=r(1),n.rpc=r(19),n.roots=r(20),n.configure=i,i()},function(e,t){var r;r=function(){return this}();try{r=r||new Function("return this")()}catch(e){"object"==typeof window&&(r=window)}e.exports=r},function(e,t,r){"use strict";var i=t;i.length=function(e){var t=e.length;if(!t)return 0;for(var r=0;--t%4>1&&"="===e.charAt(t);)++r;return Math.ceil(3*e.length)/4-r};for(var n=new Array(64),o=new Array(123),s=0;s<64;)o[n[s]=s<26?s+65:s<52?s+71:s<62?s-4:s-59|43]=s++;i.encode=function(e,t,r){for(var i,o=null,s=[],a=0,u=0;t<r;){var f=e[t++];switch(u){case 0:s[a++]=n[f>>2],i=(3&f)<<4,u=1;break;case 1:s[a++]=n[i|f>>4],i=(15&f)<<2,u=2;break;case 2:s[a++]=n[i|f>>6],s[a++]=n[63&f],u=0}a>8191&&((o||(o=[])).push(String.fromCharCode.apply(String,s)),a=0)}return u&&(s[a++]=n[i],s[a++]=61,1===u&&(s[a++]=61)),o?(a&&o.push(String.fromCharCode.apply(String,s.slice(0,a))),o.join("")):String.fromCharCode.apply(String,s.slice(0,a))},i.decode=function(e,t,r){for(var i,n=r,s=0,a=0;a<e.length;){var u=e.charCodeAt(a++);if(61===u&&s>1)break;if(void 0===(u=o[u]))throw Error("invalid encoding");switch(s){case 0:i=u,s=1;break;case 1:t[r++]=i<<2|(48&u)>>4,i=u,s=2;break;case 2:t[r++]=(15&i)<<4|(60&u)>>2,i=u,s=3;break;case 3:t[r++]=(3&i)<<6|u,s=0}}if(1===s)throw Error("invalid encoding");return r-n},i.test=function(e){return/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(e)}},function(e,t,r){"use strict";function i(){this._listeners={}}e.exports=i,i.prototype.on=function(e,t,r){return(this._listeners[e]||(this._listeners[e]=[])).push({fn:t,ctx:r||this}),this},i.prototype.off=function(e,t){if(void 0===e)this._listeners={};else if(void 0===t)this._listeners[e]=[];else for(var r=this._listeners[e],i=0;i<r.length;)r[i].fn===t?r.splice(i,1):++i;return this},i.prototype.emit=function(e){var t=this._listeners[e];if(t){for(var r=[],i=1;i<arguments.length;)r.push(arguments[i++]);for(i=0;i<t.length;)t[i].fn.apply(t[i++].ctx,r)}return this}},function(e,t,r){"use strict";function i(e){return"undefined"!=typeof Float32Array?function(){function t(e,t,r){o[0]=e,t[r]=s[0],t[r+1]=s[1],t[r+2]=s[2],t[r+3]=s[3]}function r(e,t,r){o[0]=e,t[r]=s[3],t[r+1]=s[2],t[r+2]=s[1],t[r+3]=s[0]}function i(e,t){return s[0]=e[t],s[1]=e[t+1],s[2]=e[t+2],s[3]=e[t+3],o[0]}function n(e,t){return s[3]=e[t],s[2]=e[t+1],s[1]=e[t+2],s[0]=e[t+3],o[0]}var o=new Float32Array([-0]),s=new Uint8Array(o.buffer),a=128===s[3];e.writeFloatLE=a?t:r,e.writeFloatBE=a?r:t,e.readFloatLE=a?i:n,e.readFloatBE=a?n:i}():function(){function t(e,t,r,i){var n=t<0?1:0;if(n&&(t=-t),0===t)e(1/t>0?0:2147483648,r,i);else if(isNaN(t))e(2143289344,r,i);else if(t>34028234663852886e22)e((n<<31|2139095040)>>>0,r,i);else if(t<11754943508222875e-54)e((n<<31|Math.round(t/1401298464324817e-60))>>>0,r,i);else{var o=Math.floor(Math.log(t)/Math.LN2);e((n<<31|o+127<<23|8388607&Math.round(t*Math.pow(2,-o)*8388608))>>>0,r,i)}}function r(e,t,r){var i=e(t,r),n=2*(i>>31)+1,o=i>>>23&255,s=8388607&i;return 255===o?s?NaN:n*(1/0):0===o?1401298464324817e-60*n*s:n*Math.pow(2,o-150)*(s+8388608)}e.writeFloatLE=t.bind(null,n),e.writeFloatBE=t.bind(null,o),e.readFloatLE=r.bind(null,s),e.readFloatBE=r.bind(null,a)}(),"undefined"!=typeof Float64Array?function(){function t(e,t,r){o[0]=e,t[r]=s[0],t[r+1]=s[1],t[r+2]=s[2],t[r+3]=s[3],t[r+4]=s[4],t[r+5]=s[5],t[r+6]=s[6],t[r+7]=s[7]}function r(e,t,r){o[0]=e,t[r]=s[7],t[r+1]=s[6],t[r+2]=s[5],t[r+3]=s[4],t[r+4]=s[3],t[r+5]=s[2],t[r+6]=s[1],t[r+7]=s[0]}function i(e,t){return s[0]=e[t],s[1]=e[t+1],s[2]=e[t+2],s[3]=e[t+3],s[4]=e[t+4],s[5]=e[t+5],s[6]=e[t+6],s[7]=e[t+7],o[0]}function n(e,t){return s[7]=e[t],s[6]=e[t+1],s[5]=e[t+2],s[4]=e[t+3],s[3]=e[t+4],s[2]=e[t+5],s[1]=e[t+6],s[0]=e[t+7],o[0]}var o=new Float64Array([-0]),s=new Uint8Array(o.buffer),a=128===s[7];e.writeDoubleLE=a?t:r,e.writeDoubleBE=a?r:t,e.readDoubleLE=a?i:n,e.readDoubleBE=a?n:i}():function(){function t(e,t,r,i,n,o){var s=i<0?1:0;if(s&&(i=-i),0===i)e(0,n,o+t),e(1/i>0?0:2147483648,n,o+r);else if(isNaN(i))e(0,n,o+t),e(2146959360,n,o+r);else if(i>17976931348623157e292)e(0,n,o+t),e((s<<31|2146435072)>>>0,n,o+r);else{var a;if(i<22250738585072014e-324)e((a=i/5e-324)>>>0,n,o+t),e((s<<31|a/4294967296)>>>0,n,o+r);else{var u=Math.floor(Math.log(i)/Math.LN2);1024===u&&(u=1023),e(4503599627370496*(a=i*Math.pow(2,-u))>>>0,n,o+t),e((s<<31|u+1023<<20|1048576*a&1048575)>>>0,n,o+r)}}}function r(e,t,r,i,n){var o=e(i,n+t),s=e(i,n+r),a=2*(s>>31)+1,u=s>>>20&2047,f=4294967296*(1048575&s)+o;return 2047===u?f?NaN:a*(1/0):0===u?5e-324*a*f:a*Math.pow(2,u-1075)*(f+4503599627370496)}e.writeDoubleLE=t.bind(null,n,0,4),e.writeDoubleBE=t.bind(null,o,4,0),e.readDoubleLE=r.bind(null,s,0,4),e.readDoubleBE=r.bind(null,a,4,0)}(),e}function n(e,t,r){t[r]=255&e,t[r+1]=e>>>8&255,t[r+2]=e>>>16&255,t[r+3]=e>>>24}function o(e,t,r){t[r]=e>>>24,t[r+1]=e>>>16&255,t[r+2]=e>>>8&255,t[r+3]=255&e}function s(e,t){return(e[t]|e[t+1]<<8|e[t+2]<<16|e[t+3]<<24)>>>0}function a(e,t){return(e[t]<<24|e[t+1]<<16|e[t+2]<<8|e[t+3])>>>0}e.exports=i(i)},function(e,t,r){"use strict";var i=t;i.length=function(e){for(var t=0,r=0,i=0;i<e.length;++i)(r=e.charCodeAt(i))<128?t+=1:r<2048?t+=2:55296==(64512&r)&&56320==(64512&e.charCodeAt(i+1))?(++i,t+=4):t+=3;return t},i.read=function(e,t,r){if(r-t<1)return"";for(var i,n=null,o=[],s=0;t<r;)(i=e[t++])<128?o[s++]=i:i>191&&i<224?o[s++]=(31&i)<<6|63&e[t++]:i>239&&i<365?(i=((7&i)<<18|(63&e[t++])<<12|(63&e[t++])<<6|63&e[t++])-65536,o[s++]=55296+(i>>10),o[s++]=56320+(1023&i)):o[s++]=(15&i)<<12|(63&e[t++])<<6|63&e[t++],s>8191&&((n||(n=[])).push(String.fromCharCode.apply(String,o)),s=0);return n?(s&&n.push(String.fromCharCode.apply(String,o.slice(0,s))),n.join("")):String.fromCharCode.apply(String,o.slice(0,s))},i.write=function(e,t,r){for(var i,n,o=r,s=0;s<e.length;++s)(i=e.charCodeAt(s))<128?t[r++]=i:i<2048?(t[r++]=i>>6|192,t[r++]=63&i|128):55296==(64512&i)&&56320==(64512&(n=e.charCodeAt(s+1)))?(i=65536+((1023&i)<<10)+(1023&n),++s,t[r++]=i>>18|240,t[r++]=i>>12&63|128,t[r++]=i>>6&63|128,t[r++]=63&i|128):(t[r++]=i>>12|224,t[r++]=i>>6&63|128,t[r++]=63&i|128);return r-o}},function(e,t,r){"use strict";e.exports=function(e,t,r){var i=r||8192,n=i>>>1,o=null,s=i;return function(r){if(r<1||r>n)return e(r);s+r>i&&(o=e(i),s=0);var a=t.call(o,s,s+=r);return 7&s&&(s=1+(7|s)),a}}},function(e,t,r){"use strict";function i(e,t){this.lo=e>>>0,this.hi=t>>>0}e.exports=i;var n=r(1),o=i.zero=new i(0,0);o.toNumber=function(){return 0},o.zzEncode=o.zzDecode=function(){return this},o.length=function(){return 1};var s=i.zeroHash="\0\0\0\0\0\0\0\0";i.fromNumber=function(e){if(0===e)return o;var t=e<0;t&&(e=-e);var r=e>>>0,n=(e-r)/4294967296>>>0;return t&&(n=~n>>>0,r=~r>>>0,++r>4294967295&&(r=0,++n>4294967295&&(n=0))),new i(r,n)},i.from=function(e){if("number"==typeof e)return i.fromNumber(e);if(n.isString(e)){if(!n.Long)return i.fromNumber(parseInt(e,10));e=n.Long.fromString(e)}return e.low||e.high?new i(e.low>>>0,e.high>>>0):o},i.prototype.toNumber=function(e){if(!e&&this.hi>>>31){var t=1+~this.lo>>>0,r=~this.hi>>>0;return t||(r=r+1>>>0),-(t+4294967296*r)}return this.lo+4294967296*this.hi},i.prototype.toLong=function(e){return n.Long?new n.Long(0|this.lo,0|this.hi,Boolean(e)):{low:0|this.lo,high:0|this.hi,unsigned:Boolean(e)}};var a=String.prototype.charCodeAt;i.fromHash=function(e){return e===s?o:new i((a.call(e,0)|a.call(e,1)<<8|a.call(e,2)<<16|a.call(e,3)<<24)>>>0,(a.call(e,4)|a.call(e,5)<<8|a.call(e,6)<<16|a.call(e,7)<<24)>>>0)},i.prototype.toHash=function(){return String.fromCharCode(255&this.lo,this.lo>>>8&255,this.lo>>>16&255,this.lo>>>24,255&this.hi,this.hi>>>8&255,this.hi>>>16&255,this.hi>>>24)},i.prototype.zzEncode=function(){var e=this.hi>>31;return this.hi=((this.hi<<1|this.lo>>>31)^e)>>>0,this.lo=(this.lo<<1^e)>>>0,this},i.prototype.zzDecode=function(){var e=-(1&this.lo);return this.lo=((this.lo>>>1|this.hi<<31)^e)>>>0,this.hi=(this.hi>>>1^e)>>>0,this},i.prototype.length=function(){var e=this.lo,t=(this.lo>>>28|this.hi<<4)>>>0,r=this.hi>>>24;return 0===r?0===t?e<16384?e<128?1:2:e<2097152?3:4:t<16384?t<128?5:6:t<2097152?7:8:r<128?9:10}},function(e,t,r){"use strict";function i(){o.call(this)}function n(e,t,r){e.length<40?s.utf8.write(e,t,r):t.utf8Write?t.utf8Write(e,r):t.write(e,r)}e.exports=i;var o=r(9);(i.prototype=Object.create(o.prototype)).constructor=i;var s=r(1);i._configure=function(){i.alloc=s._Buffer_allocUnsafe,i.writeBytesBuffer=s.Buffer&&s.Buffer.prototype instanceof Uint8Array&&"set"===s.Buffer.prototype.set.name?function(e,t,r){t.set(e,r)}:function(e,t,r){if(e.copy)e.copy(t,r,0,e.length);else for(var i=0;i<e.length;)t[r++]=e[i++]}},i.prototype.bytes=function(e){s.isString(e)&&(e=s._Buffer_from(e,"base64"));var t=e.length>>>0;return this.uint32(t),t&&this._push(i.writeBytesBuffer,t,e),this},i.prototype.string=function(e){var t=s.Buffer.byteLength(e);return this.uint32(t),t&&this._push(n,t,e),this},i._configure()},function(e,t,r){"use strict";function i(e){n.call(this,e)}e.exports=i;var n=r(10);(i.prototype=Object.create(n.prototype)).constructor=i;var o=r(1);i._configure=function(){o.Buffer&&(i.prototype._slice=o.Buffer.prototype.slice)},i.prototype.string=function(){var e=this.uint32();return this.buf.utf8Slice?this.buf.utf8Slice(this.pos,this.pos=Math.min(this.pos+e,this.len)):this.buf.toString("utf-8",this.pos,this.pos=Math.min(this.pos+e,this.len))},i._configure()},function(e,t,r){"use strict";function i(e,t,r){if("function"!=typeof e)throw TypeError("rpcImpl must be a function");n.EventEmitter.call(this),this.rpcImpl=e,this.requestDelimited=Boolean(t),this.responseDelimited=Boolean(r)}e.exports=i;var n=r(1);(i.prototype=Object.create(n.EventEmitter.prototype)).constructor=i,i.prototype.rpcCall=function e(t,r,i,o,s){if(!o)throw TypeError("request must be specified");var a=this;if(!s)return n.asPromise(e,a,t,r,i,o);if(a.rpcImpl)try{return a.rpcImpl(t,r[a.requestDelimited?"encodeDelimited":"encode"](o).finish(),(function(e,r){if(e)return a.emit("error",e,t),s(e);if(null!==r){if(!(r instanceof i))try{r=i[a.responseDelimited?"decodeDelimited":"decode"](r)}catch(e){return a.emit("error",e,t),s(e)}return a.emit("data",r,t),s(null,r)}a.end(!0)}))}catch(e){return a.emit("error",e,t),void setTimeout((function(){s(e)}),0)}else setTimeout((function(){s(Error("already ended"))}),0)},i.prototype.end=function(e){return this.rpcImpl&&(e||this.rpcImpl(null,null,null),this.rpcImpl=null,this.emit("end").off()),this}},function(e,t,r){"use strict";function i(e,t){function r(e){if("string"!=typeof e){var t=n();if(i.verbose&&console.log("codegen: "+t),t="return "+t,e){for(var s=Object.keys(e),a=new Array(s.length+1),u=new Array(s.length),f=0;f<s.length;)a[f]=s[f],u[f]=e[s[f++]];return a[f]=t,Function.apply(null,a).apply(null,u)}return Function(t)()}for(var l=new Array(arguments.length-1),h=0;h<l.length;)l[h]=arguments[++h];if(h=0,e=e.replace(/%([%dfijs])/g,(function(e,t){var r=l[h++];switch(t){case"d":case"f":return String(Number(r));case"i":return String(Math.floor(r));case"j":return JSON.stringify(r);case"s":return String(r)}return"%"})),h!==l.length)throw Error("parameter count mismatch");return o.push(e),r}function n(r){return"function "+(r||t||"")+"("+(e&&e.join(",")||"")+"){\n  "+o.join("\n  ")+"\n}"}"string"==typeof e&&(t=e,e=void 0);var o=[];return r.toString=n,r}e.exports=i,i.verbose=!1},function(e,t,r){"use strict";function i(e,t,r){return"function"==typeof t?(r=t,t={}):t||(t={}),r?!t.xhr&&o&&o.readFile?o.readFile(e,(function(n,o){return n&&"undefined"!=typeof XMLHttpRequest?i.xhr(e,t,r):n?r(n):r(null,t.binary?o:o.toString("utf8"))})):i.xhr(e,t,r):n(i,this,e,t)}e.exports=i;var n=r(17),o=r(18)("fs");i.xhr=function(e,t,r){var i=new XMLHttpRequest;i.onreadystatechange=function(){if(4===i.readyState){if(0!==i.status&&200!==i.status)return r(Error("status "+i.status));if(t.binary){var e=i.response;if(!e){e=[];for(var n=0;n<i.responseText.length;++n)e.push(255&i.responseText.charCodeAt(n))}return r(null,"undefined"!=typeof Uint8Array?new Uint8Array(e):e)}return r(null,i.responseText)}},t.binary&&("overrideMimeType"in i&&i.overrideMimeType("text/plain; charset=x-user-defined"),i.responseType="arraybuffer"),i.open("GET",e),i.send()}},function(e,t,r){"use strict";var i=t,n=i.isAbsolute=function(e){return/^(?:\/|\w+:)/.test(e)},o=i.normalize=function(e){var t=(e=e.replace(/\\/g,"/").replace(/\/{2,}/g,"/")).split("/"),r=n(e),i="";r&&(i=t.shift()+"/");for(var o=0;o<t.length;)".."===t[o]?o>0&&".."!==t[o-1]?t.splice(--o,2):r?t.splice(o,1):++o:"."===t[o]?t.splice(o,1):++o;return i+t.join("/")};i.resolve=function(e,t,r){return r||(t=o(t)),n(t)?t:(r||(e=o(e)),(e=e.replace(/(?:\/|^)[^/]+$/,"")).length?o(e+"/"+t):t)}},function(e,t,r){"use strict";var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=r(16).ProtoMovieEntity,o=r(8).assign,s=r(51),a={};o(a,s);var u=function(e){for(var t=[],r=0;r<e.length;r+=32768)t.push(String.fromCharCode.apply(null,e.subarray(r,r+32768)));return t.join("")},f={loadAssets:function(e,t,r){if("object"===("undefined"==typeof JSZipUtils?"undefined":i(JSZipUtils))&&"function"==typeof JSZip)if("[object File]"==e.toString())f._readBlobAsArrayBuffer(e,(function(e){var i=new Uint8Array(e,0,4);80==i[0]&&75==i[1]&&3==i[2]&&4==i[3]?JSZip.loadAsync(e).then((function(e){f._decodeAssets(e,t)})):f.load_viaProto(e,t,r)}));else if(e.indexOf("data:svga/1.0;base64,")>=0){var n=f._base64ToArrayBuffer(e.substring(21));JSZip.loadAsync(n).then((function(e){f._decodeAssets(e,t)}))}else if(e.indexOf("data:svga/2.0;base64,")>=0){n=f._base64ToArrayBuffer(e.substring(21));f.load_viaProto(n,t,r)}else JSZipUtils.getBinaryContent(e,(function(e,i){if(e)throw r&&r(e),console.error(e),e;var n=new Uint8Array(i,0,4);80==n[0]&&75==n[1]&&3==n[2]&&4==n[3]?JSZip.loadAsync(i).then((function(e){f._decodeAssets(e,t)})):f.load_viaProto(i,t,r)}));else{var o=new XMLHttpRequest;o.open("GET",e,!0),o.responseType="arraybuffer",o.onload=function(){f.load_viaProto(o.response,t,r)},o.onerror=function(e){if(!r)throw console.error(e),e;r(e)},o.send()}},load_viaProto:function(e,t,r){try{var i=a.inflate(e),o=n.decode(i),s={};f._loadImages(s,void 0,o,(function(){o.ver="2.0",t({movie:o,images:s})}))}catch(e){if(r)return void r(e);throw console.error(e),e}},_decodeAssets:function(e,t){var r="1.0";e.file("movie.binary")&&(r="1.5"),e.file("movie.spec").async("string").then((function(i){var n=JSON.parse(i),o={};n.ver=r,f._loadImages(o,e,n,(function(){t({movie:n,images:o})}))}))},_loadImages:function(e,t,r,o){var s=this;if("object"===(void 0===r?"undefined":i(r))&&r.$type==n){var a=!0;if(t)e:for(var l in r.images){switch(function(i){if(r.images.hasOwnProperty(i)){var n=r.images[i],l=u(n);return e.hasOwnProperty(i)?"continue":(a=!1,t.file(l+".png").async("base64").then(function(n){e[i]=n,f._loadImages(e,t,r,o)}.bind(s)),"break")}}(l)){case"continue":continue;case"break":break e}}else for(var h in r.images)if(r.images.hasOwnProperty(h)){var c=r.images[h],p=void 0;try{p=u(c)}catch(e){p=u(c)}e[h]=btoa(p)}a&&o.call(this)}else{a=!0;for(var d in r.images)if(r.images.hasOwnProperty(d)){var y=r.images[d];if(e.hasOwnProperty(d))continue;a=!1,t.file(y+".png").async("base64").then(function(i){e[d]=i,f._loadImages(e,t,r,o)}.bind(this));break}a&&o.call(this)}},_base64ToArrayBuffer:function(e){for(var t=window.atob(e),r=t.length,i=new Uint8Array(r),n=0;n<r;n++)i[n]=t.charCodeAt(n);return i.buffer},_readBlobAsArrayBuffer:function(e,t){var r=new FileReader;r.onload=function(e){t(e.target.result)},r.readAsArrayBuffer(e)}};e.exports=function(e,t,r){f.loadAssets(e,t,r)}},function(e,t,r){"use strict";function i(e){if(!(this instanceof i))return new i(e);this.options=s.assign({chunkSize:16384,windowBits:0,to:""},e||{});var t=this.options;t.raw&&t.windowBits>=0&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(t.windowBits>=0&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),t.windowBits>15&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new l,this.strm.avail_out=0;var r=o.inflateInit2(this.strm,t.windowBits);if(r!==u.Z_OK)throw new Error(f[r]);if(this.header=new h,o.inflateGetHeader(this.strm,this.header),t.dictionary&&("string"==typeof t.dictionary?t.dictionary=a.string2buf(t.dictionary):"[object ArrayBuffer]"===c.call(t.dictionary)&&(t.dictionary=new Uint8Array(t.dictionary)),t.raw&&(r=o.inflateSetDictionary(this.strm,t.dictionary))!==u.Z_OK))throw new Error(f[r])}function n(e,t){var r=new i(t);if(r.push(e,!0),r.err)throw r.msg||f[r.err];return r.result}var o=r(52),s=r(8),a=r(57),u=r(58),f=r(59),l=r(60),h=r(61),c=Object.prototype.toString;i.prototype.push=function(e,t){var r,i,n,f,l,h=this.strm,p=this.options.chunkSize,d=this.options.dictionary,y=!1;if(this.ended)return!1;i=t===~~t?t:!0===t?u.Z_FINISH:u.Z_NO_FLUSH,"string"==typeof e?h.input=a.binstring2buf(e):"[object ArrayBuffer]"===c.call(e)?h.input=new Uint8Array(e):h.input=e,h.next_in=0,h.avail_in=h.input.length;do{if(0===h.avail_out&&(h.output=new s.Buf8(p),h.next_out=0,h.avail_out=p),(r=o.inflate(h,u.Z_NO_FLUSH))===u.Z_NEED_DICT&&d&&(r=o.inflateSetDictionary(this.strm,d)),r===u.Z_BUF_ERROR&&!0===y&&(r=u.Z_OK,y=!1),r!==u.Z_STREAM_END&&r!==u.Z_OK)return this.onEnd(r),this.ended=!0,!1;h.next_out&&(0!==h.avail_out&&r!==u.Z_STREAM_END&&(0!==h.avail_in||i!==u.Z_FINISH&&i!==u.Z_SYNC_FLUSH)||("string"===this.options.to?(n=a.utf8border(h.output,h.next_out),f=h.next_out-n,l=a.buf2string(h.output,n),h.next_out=f,h.avail_out=p-f,f&&s.arraySet(h.output,h.output,n,f,0),this.onData(l)):this.onData(s.shrinkBuf(h.output,h.next_out)))),0===h.avail_in&&0===h.avail_out&&(y=!0)}while((h.avail_in>0||0===h.avail_out)&&r!==u.Z_STREAM_END);return r===u.Z_STREAM_END&&(i=u.Z_FINISH),i===u.Z_FINISH?(r=o.inflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===u.Z_OK):i!==u.Z_SYNC_FLUSH||(this.onEnd(u.Z_OK),h.avail_out=0,!0)},i.prototype.onData=function(e){this.chunks.push(e)},i.prototype.onEnd=function(e){e===u.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=s.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},t.Inflate=i,t.inflate=n,t.inflateRaw=function(e,t){return(t=t||{}).raw=!0,n(e,t)},t.ungzip=n},function(e,t,r){"use strict";function i(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function n(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new p.Buf16(320),this.work=new p.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function o(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=B,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new p.Buf32(le),t.distcode=t.distdyn=new p.Buf32(he),t.sane=1,t.back=-1,O):j}function s(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,o(e)):j}function a(e,t){var r,i;return e&&e.state?(i=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||t>15)?j:(null!==i.window&&i.wbits!==t&&(i.window=null),i.wrap=r,i.wbits=t,s(e))):j}function u(e,t){var r,i;return e?(i=new n,e.state=i,i.window=null,(r=a(e,t))!==O&&(e.state=null),r):j}function f(e){if(pe){var t;for(h=new p.Buf32(512),c=new p.Buf32(32),t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(v(g,e.lens,0,288,h,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;v(_,e.lens,0,32,c,0,e.work,{bits:5}),pe=!1}e.lencode=h,e.lenbits=9,e.distcode=c,e.distbits=5}function l(e,t,r,i){var n,o=e.state;return null===o.window&&(o.wsize=1<<o.wbits,o.wnext=0,o.whave=0,o.window=new p.Buf8(o.wsize)),i>=o.wsize?(p.arraySet(o.window,t,r-o.wsize,o.wsize,0),o.wnext=0,o.whave=o.wsize):((n=o.wsize-o.wnext)>i&&(n=i),p.arraySet(o.window,t,r-i,n,o.wnext),(i-=n)?(p.arraySet(o.window,t,r-i,i,0),o.wnext=i,o.whave=o.wsize):(o.wnext+=n,o.wnext===o.wsize&&(o.wnext=0),o.whave<o.wsize&&(o.whave+=n))),0}var h,c,p=r(8),d=r(53),y=r(54),m=r(55),v=r(56),b=0,g=1,_=2,w=4,k=5,x=6,O=0,S=1,A=2,j=-2,E=-3,T=-4,N=-5,F=8,B=1,P=2,I=3,R=4,C=5,L=6,D=7,M=8,z=9,J=10,Z=11,q=12,U=13,$=14,V=15,K=16,H=17,W=18,G=19,Y=20,X=21,Q=22,ee=23,te=24,re=25,ie=26,ne=27,oe=28,se=29,ae=30,ue=31,fe=32,le=852,he=592,ce=15,pe=!0;t.inflateReset=s,t.inflateReset2=a,t.inflateResetKeep=o,t.inflateInit=function(e){return u(e,ce)},t.inflateInit2=u,t.inflate=function(e,t){var r,n,o,s,a,u,h,c,le,he,ce,pe,de,ye,me,ve,be,ge,_e,we,ke,xe,Oe,Se,Ae=0,je=new p.Buf8(4),Ee=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!e||!e.state||!e.output||!e.input&&0!==e.avail_in)return j;(r=e.state).mode===q&&(r.mode=U),a=e.next_out,o=e.output,h=e.avail_out,s=e.next_in,n=e.input,u=e.avail_in,c=r.hold,le=r.bits,he=u,ce=h,xe=O;e:for(;;)switch(r.mode){case B:if(0===r.wrap){r.mode=U;break}for(;le<16;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(2&r.wrap&&35615===c){r.check=0,je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0),c=0,le=0,r.mode=P;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&c)<<8)+(c>>8))%31){e.msg="incorrect header check",r.mode=ae;break}if((15&c)!==F){e.msg="unknown compression method",r.mode=ae;break}if(le-=4,ke=8+(15&(c>>>=4)),0===r.wbits)r.wbits=ke;else if(ke>r.wbits){e.msg="invalid window size",r.mode=ae;break}r.dmax=1<<ke,e.adler=r.check=1,r.mode=512&c?J:q,c=0,le=0;break;case P:for(;le<16;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(r.flags=c,(255&r.flags)!==F){e.msg="unknown compression method",r.mode=ae;break}if(57344&r.flags){e.msg="unknown header flags set",r.mode=ae;break}r.head&&(r.head.text=c>>8&1),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0)),c=0,le=0,r.mode=I;case I:for(;le<32;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.head&&(r.head.time=c),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,je[2]=c>>>16&255,je[3]=c>>>24&255,r.check=y(r.check,je,4,0)),c=0,le=0,r.mode=R;case R:for(;le<16;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.head&&(r.head.xflags=255&c,r.head.os=c>>8),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0)),c=0,le=0,r.mode=C;case C:if(1024&r.flags){for(;le<16;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.length=c,r.head&&(r.head.extra_len=c),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0)),c=0,le=0}else r.head&&(r.head.extra=null);r.mode=L;case L:if(1024&r.flags&&((pe=r.length)>u&&(pe=u),pe&&(r.head&&(ke=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),p.arraySet(r.head.extra,n,s,pe,ke)),512&r.flags&&(r.check=y(r.check,n,pe,s)),u-=pe,s+=pe,r.length-=pe),r.length))break e;r.length=0,r.mode=D;case D:if(2048&r.flags){if(0===u)break e;pe=0;do{ke=n[s+pe++],r.head&&ke&&r.length<65536&&(r.head.name+=String.fromCharCode(ke))}while(ke&&pe<u);if(512&r.flags&&(r.check=y(r.check,n,pe,s)),u-=pe,s+=pe,ke)break e}else r.head&&(r.head.name=null);r.length=0,r.mode=M;case M:if(4096&r.flags){if(0===u)break e;pe=0;do{ke=n[s+pe++],r.head&&ke&&r.length<65536&&(r.head.comment+=String.fromCharCode(ke))}while(ke&&pe<u);if(512&r.flags&&(r.check=y(r.check,n,pe,s)),u-=pe,s+=pe,ke)break e}else r.head&&(r.head.comment=null);r.mode=z;case z:if(512&r.flags){for(;le<16;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(c!==(65535&r.check)){e.msg="header crc mismatch",r.mode=ae;break}c=0,le=0}r.head&&(r.head.hcrc=r.flags>>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=q;break;case J:for(;le<32;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}e.adler=r.check=i(c),c=0,le=0,r.mode=Z;case Z:if(0===r.havedict)return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=u,r.hold=c,r.bits=le,A;e.adler=r.check=1,r.mode=q;case q:if(t===k||t===x)break e;case U:if(r.last){c>>>=7&le,le-=7&le,r.mode=ne;break}for(;le<3;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}switch(r.last=1&c,le-=1,3&(c>>>=1)){case 0:r.mode=$;break;case 1:if(f(r),r.mode=Y,t===x){c>>>=2,le-=2;break e}break;case 2:r.mode=H;break;case 3:e.msg="invalid block type",r.mode=ae}c>>>=2,le-=2;break;case $:for(c>>>=7&le,le-=7&le;le<32;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if((65535&c)!=(c>>>16^65535)){e.msg="invalid stored block lengths",r.mode=ae;break}if(r.length=65535&c,c=0,le=0,r.mode=V,t===x)break e;case V:r.mode=K;case K:if(pe=r.length){if(pe>u&&(pe=u),pe>h&&(pe=h),0===pe)break e;p.arraySet(o,n,s,pe,a),u-=pe,s+=pe,h-=pe,a+=pe,r.length-=pe;break}r.mode=q;break;case H:for(;le<14;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(r.nlen=257+(31&c),c>>>=5,le-=5,r.ndist=1+(31&c),c>>>=5,le-=5,r.ncode=4+(15&c),c>>>=4,le-=4,r.nlen>286||r.ndist>30){e.msg="too many length or distance symbols",r.mode=ae;break}r.have=0,r.mode=W;case W:for(;r.have<r.ncode;){for(;le<3;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.lens[Ee[r.have++]]=7&c,c>>>=3,le-=3}for(;r.have<19;)r.lens[Ee[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,Oe={bits:r.lenbits},xe=v(b,r.lens,0,19,r.lencode,0,r.work,Oe),r.lenbits=Oe.bits,xe){e.msg="invalid code lengths set",r.mode=ae;break}r.have=0,r.mode=G;case G:for(;r.have<r.nlen+r.ndist;){for(;ve=(Ae=r.lencode[c&(1<<r.lenbits)-1])>>>16&255,be=65535&Ae,!((me=Ae>>>24)<=le);){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(be<16)c>>>=me,le-=me,r.lens[r.have++]=be;else{if(16===be){for(Se=me+2;le<Se;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(c>>>=me,le-=me,0===r.have){e.msg="invalid bit length repeat",r.mode=ae;break}ke=r.lens[r.have-1],pe=3+(3&c),c>>>=2,le-=2}else if(17===be){for(Se=me+3;le<Se;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}le-=me,ke=0,pe=3+(7&(c>>>=me)),c>>>=3,le-=3}else{for(Se=me+7;le<Se;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}le-=me,ke=0,pe=11+(127&(c>>>=me)),c>>>=7,le-=7}if(r.have+pe>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=ae;break}for(;pe--;)r.lens[r.have++]=ke}}if(r.mode===ae)break;if(0===r.lens[256]){e.msg="invalid code -- missing end-of-block",r.mode=ae;break}if(r.lenbits=9,Oe={bits:r.lenbits},xe=v(g,r.lens,0,r.nlen,r.lencode,0,r.work,Oe),r.lenbits=Oe.bits,xe){e.msg="invalid literal/lengths set",r.mode=ae;break}if(r.distbits=6,r.distcode=r.distdyn,Oe={bits:r.distbits},xe=v(_,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,Oe),r.distbits=Oe.bits,xe){e.msg="invalid distances set",r.mode=ae;break}if(r.mode=Y,t===x)break e;case Y:r.mode=X;case X:if(u>=6&&h>=258){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=u,r.hold=c,r.bits=le,m(e,ce),a=e.next_out,o=e.output,h=e.avail_out,s=e.next_in,n=e.input,u=e.avail_in,c=r.hold,le=r.bits,r.mode===q&&(r.back=-1);break}for(r.back=0;ve=(Ae=r.lencode[c&(1<<r.lenbits)-1])>>>16&255,be=65535&Ae,!((me=Ae>>>24)<=le);){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(ve&&0==(240&ve)){for(ge=me,_e=ve,we=be;ve=(Ae=r.lencode[we+((c&(1<<ge+_e)-1)>>ge)])>>>16&255,be=65535&Ae,!(ge+(me=Ae>>>24)<=le);){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}c>>>=ge,le-=ge,r.back+=ge}if(c>>>=me,le-=me,r.back+=me,r.length=be,0===ve){r.mode=ie;break}if(32&ve){r.back=-1,r.mode=q;break}if(64&ve){e.msg="invalid literal/length code",r.mode=ae;break}r.extra=15&ve,r.mode=Q;case Q:if(r.extra){for(Se=r.extra;le<Se;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.length+=c&(1<<r.extra)-1,c>>>=r.extra,le-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=ee;case ee:for(;ve=(Ae=r.distcode[c&(1<<r.distbits)-1])>>>16&255,be=65535&Ae,!((me=Ae>>>24)<=le);){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(0==(240&ve)){for(ge=me,_e=ve,we=be;ve=(Ae=r.distcode[we+((c&(1<<ge+_e)-1)>>ge)])>>>16&255,be=65535&Ae,!(ge+(me=Ae>>>24)<=le);){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}c>>>=ge,le-=ge,r.back+=ge}if(c>>>=me,le-=me,r.back+=me,64&ve){e.msg="invalid distance code",r.mode=ae;break}r.offset=be,r.extra=15&ve,r.mode=te;case te:if(r.extra){for(Se=r.extra;le<Se;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.offset+=c&(1<<r.extra)-1,c>>>=r.extra,le-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){e.msg="invalid distance too far back",r.mode=ae;break}r.mode=re;case re:if(0===h)break e;if(pe=ce-h,r.offset>pe){if((pe=r.offset-pe)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=ae;break}pe>r.wnext?(pe-=r.wnext,de=r.wsize-pe):de=r.wnext-pe,pe>r.length&&(pe=r.length),ye=r.window}else ye=o,de=a-r.offset,pe=r.length;pe>h&&(pe=h),h-=pe,r.length-=pe;do{o[a++]=ye[de++]}while(--pe);0===r.length&&(r.mode=X);break;case ie:if(0===h)break e;o[a++]=r.length,h--,r.mode=X;break;case ne:if(r.wrap){for(;le<32;){if(0===u)break e;u--,c|=n[s++]<<le,le+=8}if(ce-=h,e.total_out+=ce,r.total+=ce,ce&&(e.adler=r.check=r.flags?y(r.check,o,ce,a-ce):d(r.check,o,ce,a-ce)),ce=h,(r.flags?c:i(c))!==r.check){e.msg="incorrect data check",r.mode=ae;break}c=0,le=0}r.mode=oe;case oe:if(r.wrap&&r.flags){for(;le<32;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(c!==(4294967295&r.total)){e.msg="incorrect length check",r.mode=ae;break}c=0,le=0}r.mode=se;case se:xe=S;break e;case ae:xe=E;break e;case ue:return T;case fe:default:return j}return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=u,r.hold=c,r.bits=le,(r.wsize||ce!==e.avail_out&&r.mode<ae&&(r.mode<ne||t!==w))&&l(e,e.output,e.next_out,ce-e.avail_out)?(r.mode=ue,T):(he-=e.avail_in,ce-=e.avail_out,e.total_in+=he,e.total_out+=ce,r.total+=ce,r.wrap&&ce&&(e.adler=r.check=r.flags?y(r.check,o,ce,e.next_out-ce):d(r.check,o,ce,e.next_out-ce)),e.data_type=r.bits+(r.last?64:0)+(r.mode===q?128:0)+(r.mode===Y||r.mode===V?256:0),(0===he&&0===ce||t===w)&&xe===O&&(xe=N),xe)},t.inflateEnd=function(e){if(!e||!e.state)return j;var t=e.state;return t.window&&(t.window=null),e.state=null,O},t.inflateGetHeader=function(e,t){var r;return e&&e.state?0==(2&(r=e.state).wrap)?j:(r.head=t,t.done=!1,O):j},t.inflateSetDictionary=function(e,t){var r,i=t.length;return e&&e.state?0!==(r=e.state).wrap&&r.mode!==Z?j:r.mode===Z&&d(1,t,i,0)!==r.check?E:l(e,t,i,i)?(r.mode=ue,T):(r.havedict=1,O):j},t.inflateInfo="pako inflate (from Nodeca project)"},function(e,t,r){"use strict";e.exports=function(e,t,r,i){for(var n=65535&e|0,o=e>>>16&65535|0,s=0;0!==r;){r-=s=r>2e3?2e3:r;do{o=o+(n=n+t[i++]|0)|0}while(--s);n%=65521,o%=65521}return n|o<<16|0}},function(e,t,r){"use strict";var i=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var i=0;i<8;i++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();e.exports=function(e,t,r,n){var o=i,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^o[255&(e^t[a])];return-1^e}},function(e,t,r){"use strict";e.exports=function(e,t){var r,i,n,o,s,a,u,f,l,h,c,p,d,y,m,v,b,g,_,w,k,x,O,S,A;r=e.state,i=e.next_in,S=e.input,n=i+(e.avail_in-5),o=e.next_out,A=e.output,s=o-(t-e.avail_out),a=o+(e.avail_out-257),u=r.dmax,f=r.wsize,l=r.whave,h=r.wnext,c=r.window,p=r.hold,d=r.bits,y=r.lencode,m=r.distcode,v=(1<<r.lenbits)-1,b=(1<<r.distbits)-1;e:do{d<15&&(p+=S[i++]<<d,d+=8,p+=S[i++]<<d,d+=8),g=y[p&v];t:for(;;){if(p>>>=_=g>>>24,d-=_,0==(_=g>>>16&255))A[o++]=65535&g;else{if(!(16&_)){if(0==(64&_)){g=y[(65535&g)+(p&(1<<_)-1)];continue t}if(32&_){r.mode=12;break e}e.msg="invalid literal/length code",r.mode=30;break e}w=65535&g,(_&=15)&&(d<_&&(p+=S[i++]<<d,d+=8),w+=p&(1<<_)-1,p>>>=_,d-=_),d<15&&(p+=S[i++]<<d,d+=8,p+=S[i++]<<d,d+=8),g=m[p&b];r:for(;;){if(p>>>=_=g>>>24,d-=_,!(16&(_=g>>>16&255))){if(0==(64&_)){g=m[(65535&g)+(p&(1<<_)-1)];continue r}e.msg="invalid distance code",r.mode=30;break e}if(k=65535&g,d<(_&=15)&&(p+=S[i++]<<d,(d+=8)<_&&(p+=S[i++]<<d,d+=8)),(k+=p&(1<<_)-1)>u){e.msg="invalid distance too far back",r.mode=30;break e}if(p>>>=_,d-=_,k>(_=o-s)){if((_=k-_)>l&&r.sane){e.msg="invalid distance too far back",r.mode=30;break e}if(x=0,O=c,0===h){if(x+=f-_,_<w){w-=_;do{A[o++]=c[x++]}while(--_);x=o-k,O=A}}else if(h<_){if(x+=f+h-_,(_-=h)<w){w-=_;do{A[o++]=c[x++]}while(--_);if(x=0,h<w){w-=_=h;do{A[o++]=c[x++]}while(--_);x=o-k,O=A}}}else if(x+=h-_,_<w){w-=_;do{A[o++]=c[x++]}while(--_);x=o-k,O=A}for(;w>2;)A[o++]=O[x++],A[o++]=O[x++],A[o++]=O[x++],w-=3;w&&(A[o++]=O[x++],w>1&&(A[o++]=O[x++]))}else{x=o-k;do{A[o++]=A[x++],A[o++]=A[x++],A[o++]=A[x++],w-=3}while(w>2);w&&(A[o++]=A[x++],w>1&&(A[o++]=A[x++]))}break}}break}}while(i<n&&o<a);i-=w=d>>3,p&=(1<<(d-=w<<3))-1,e.next_in=i,e.next_out=o,e.avail_in=i<n?n-i+5:5-(i-n),e.avail_out=o<a?a-o+257:257-(o-a),r.hold=p,r.bits=d}},function(e,t,r){"use strict";var i=r(8),n=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],o=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],s=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],a=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];e.exports=function(e,t,r,u,f,l,h,c){var p,d,y,m,v,b,g,_,w,k=c.bits,x=0,O=0,S=0,A=0,j=0,E=0,T=0,N=0,F=0,B=0,P=null,I=0,R=new i.Buf16(16),C=new i.Buf16(16),L=null,D=0;for(x=0;x<=15;x++)R[x]=0;for(O=0;O<u;O++)R[t[r+O]]++;for(j=k,A=15;A>=1&&0===R[A];A--);if(j>A&&(j=A),0===A)return f[l++]=20971520,f[l++]=20971520,c.bits=1,0;for(S=1;S<A&&0===R[S];S++);for(j<S&&(j=S),N=1,x=1;x<=15;x++)if(N<<=1,(N-=R[x])<0)return-1;if(N>0&&(0===e||1!==A))return-1;for(C[1]=0,x=1;x<15;x++)C[x+1]=C[x]+R[x];for(O=0;O<u;O++)0!==t[r+O]&&(h[C[t[r+O]]++]=O);if(0===e?(P=L=h,b=19):1===e?(P=n,I-=257,L=o,D-=257,b=256):(P=s,L=a,b=-1),B=0,O=0,x=S,v=l,E=j,T=0,y=-1,m=(F=1<<j)-1,1===e&&F>852||2===e&&F>592)return 1;for(;;){g=x-T,h[O]<b?(_=0,w=h[O]):h[O]>b?(_=L[D+h[O]],w=P[I+h[O]]):(_=96,w=0),p=1<<x-T,S=d=1<<E;do{f[v+(B>>T)+(d-=p)]=g<<24|_<<16|w|0}while(0!==d);for(p=1<<x-1;B&p;)p>>=1;if(0!==p?(B&=p-1,B+=p):B=0,O++,0==--R[x]){if(x===A)break;x=t[r+h[O]]}if(x>j&&(B&m)!==y){for(0===T&&(T=j),v+=S,N=1<<(E=x-T);E+T<A&&!((N-=R[E+T])<=0);)E++,N<<=1;if(F+=1<<E,1===e&&F>852||2===e&&F>592)return 1;f[y=B&m]=j<<24|E<<16|v-l|0}}return 0!==B&&(f[v+B]=x-T<<24|64<<16|0),c.bits=j,0}},function(e,t,r){"use strict";function i(e,t){if(t<65534&&(e.subarray&&s||!e.subarray&&o))return String.fromCharCode.apply(null,n.shrinkBuf(e,t));for(var r="",i=0;i<t;i++)r+=String.fromCharCode(e[i]);return r}var n=r(8),o=!0,s=!0;try{String.fromCharCode.apply(null,[0])}catch(e){o=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){s=!1}for(var a=new n.Buf8(256),u=0;u<256;u++)a[u]=u>=252?6:u>=248?5:u>=240?4:u>=224?3:u>=192?2:1;a[254]=a[254]=1,t.string2buf=function(e){var t,r,i,o,s,a=e.length,u=0;for(o=0;o<a;o++)55296==(64512&(r=e.charCodeAt(o)))&&o+1<a&&56320==(64512&(i=e.charCodeAt(o+1)))&&(r=65536+(r-55296<<10)+(i-56320),o++),u+=r<128?1:r<2048?2:r<65536?3:4;for(t=new n.Buf8(u),s=0,o=0;s<u;o++)55296==(64512&(r=e.charCodeAt(o)))&&o+1<a&&56320==(64512&(i=e.charCodeAt(o+1)))&&(r=65536+(r-55296<<10)+(i-56320),o++),r<128?t[s++]=r:r<2048?(t[s++]=192|r>>>6,t[s++]=128|63&r):r<65536?(t[s++]=224|r>>>12,t[s++]=128|r>>>6&63,t[s++]=128|63&r):(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63,t[s++]=128|r>>>6&63,t[s++]=128|63&r);return t},t.buf2binstring=function(e){return i(e,e.length)},t.binstring2buf=function(e){for(var t=new n.Buf8(e.length),r=0,i=t.length;r<i;r++)t[r]=e.charCodeAt(r);return t},t.buf2string=function(e,t){var r,n,o,s,u=t||e.length,f=new Array(2*u);for(n=0,r=0;r<u;)if((o=e[r++])<128)f[n++]=o;else if((s=a[o])>4)f[n++]=65533,r+=s-1;else{for(o&=2===s?31:3===s?15:7;s>1&&r<u;)o=o<<6|63&e[r++],s--;s>1?f[n++]=65533:o<65536?f[n++]=o:(o-=65536,f[n++]=55296|o>>10&1023,f[n++]=56320|1023&o)}return i(f,n)},t.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;r>=0&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+a[e[r]]>t?r:t}},function(e,t,r){"use strict";e.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},function(e,t,r){"use strict";e.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},function(e,t,r){"use strict";e.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},function(e,t,r){"use strict";e.exports=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}},function(e,t,r){"undefined"!=typeof self&&self,e.exports=function(e){function t(i){if(r[i])return r[i].exports;var n=r[i]={i:i,l:!1,exports:{}};return e[i].call(n.exports,n,n.exports,t),n.l=!0,n.exports}var r={};return t.m=e,t.c=r,t.d=function(e,r,i){t.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:i})},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=r(1);e.exports=i.ValueAnimator},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=function(){function e(){this.startValue=0,this.endValue=0,this.duration=0,this.loops=1,this.fillRule=0,this.onStart=function(){},this.onUpdate=function(){},this.onEnd=function(){},this.mRunning=!1,this.mStartTime=0,this.mCurrentFrication=0,this.mReverse=!1}return e.prototype.start=function(e){void 0===e&&(e=void 0),this.doStart(!1,e)},e.prototype.reverse=function(e){void 0===e&&(e=void 0),this.doStart(!0,e)},e.prototype.stop=function(){this.doStop()},Object.defineProperty(e.prototype,"animatedValue",{get:function(){return(this.endValue-this.startValue)*this.mCurrentFrication+this.startValue},enumerable:!0,configurable:!0}),e.prototype.doStart=function(t,r){void 0===t&&(t=!1),void 0===r&&(r=void 0),this.mReverse=t,this.mRunning=!0,this.mStartTime=e.currentTimeMillsecond(),r&&(this.mStartTime-=t?(1-r/(this.endValue-this.startValue))*this.duration:r/(this.endValue-this.startValue)*this.duration),this.mCurrentFrication=0,this.onStart(),this.doFrame()},e.prototype.doStop=function(){this.mRunning=!1},e.prototype.doFrame=function(){this.mRunning&&(this.doDeltaTime(e.currentTimeMillsecond()-this.mStartTime),this.mRunning&&e.requestAnimationFrame(this.doFrame.bind(this)))},e.prototype.doDeltaTime=function(e){e>=this.duration*this.loops?(this.mCurrentFrication=1===this.fillRule?0:1,this.mRunning=!1):(this.mCurrentFrication=e%this.duration/this.duration,this.mReverse&&(this.mCurrentFrication=1-this.mCurrentFrication)),this.onUpdate(this.animatedValue),!1===this.mRunning&&this.onEnd()},e.currentTimeMillsecond=function(){return"undefined"==typeof performance?(new Date).getTime():performance.now()},e.requestAnimationFrame=function(e){return"undefined"==typeof requestAnimationFrame?setTimeout(e,16):window.requestAnimationFrame(e)},e}();t.ValueAnimator=i}])},,,,,function(e,t,r){"use strict";var i=r(13),n=r(68);e.exports={Parser:i.Parser,Player:n.Player,CreatejsPlayer:n.Player}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Player=void 0;var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),o=r(69),s=r(13),a=r(62);t.Player=function(e){function t(e,r){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);var i=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return i.loops=0,i.clearsAfterStop=!0,i.fillMode="Forward",i._renderer=void 0,i._animator=void 0,i._contentMode="AspectFit",i._videoItem=void 0,i._currentFrame=0,i._dynamicImage={},i._dynamicImageTransform={},i._dynamicText={},i._onFinished=void 0,i._onFrame=void 0,i._onPercentage=void 0,i._clipsToBounds=!1,i._frame={x:0,y:0,width:0,height:0},(new s.Parser).load(e,(function(e){i.setVideoItem(e),!1!==r&&i.startAnimation()}),(function(e){i._onError&&i._onError(e)})),i._renderer=new o.Renderer(i),i}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,createjs.Container),n(t,[{key:"setVideoItem",value:function(e){this._currentFrame=0,this._videoItem=e,this.removeAllChildren(),this._addLayers()}},{key:"setContentMode",value:function(e){this._contentMode=e,this._update()}},{key:"setClipsToBounds",value:function(e){this._clipsToBounds=e,this._update()}},{key:"setFrame",value:function(e,t,r,i){this._frame={x:e,y:t,width:r,height:i},this._update()}},{key:"startAnimation",value:function(e){this.visible=!0,this.stopAnimation(!1),this._doStart(void 0,e,void 0)}},{key:"startAnimationWithRange",value:function(e,t){this.visible=!0,this.stopAnimation(!1),this._doStart(e,t,void 0)}},{key:"pauseAnimation",value:function(){this.stopAnimation(!1)}},{key:"stopAnimation",value:function(e){void 0!==this._animator&&this._animator.stop(),void 0===e&&(e=this.clearsAfterStop),e&&this.clear()}},{key:"clear",value:function(){this.visible=!1,null!=this.stage&&this.stage.update()}},{key:"stepToFrame",value:function(e,t){e>=this._videoItem.frames||e<0||(this.visible=!0,this.pauseAnimation(),this._currentFrame=e,this._update(),t&&this._doStart(void 0,!1,this._currentFrame))}},{key:"stepToPercentage",value:function(e,t){var r=parseInt(e*this._videoItem.frames);r>=this._videoItem.frames&&r>0&&(r=this._videoItem.frames-1),this.stepToFrame(r,t)}},{key:"setImage",value:function(e,t,r){if(this._dynamicImage[t]=e,void 0!==r&&r instanceof Array&&6==r.length&&(this._dynamicImageTransform[t]=r),void 0!==this._videoItem){var i=this._currentFrame;this.removeAllChildren(),this._addLayers(),this._currentFrame=i,this._update()}}},{key:"setText",value:function(e,t){var r="string"==typeof e?e:e.text,n=("object"===(void 0===e?"undefined":i(e))?e.size:"14px")||"14px",o=("object"===(void 0===e?"undefined":i(e))&&e.family,("object"===(void 0===e?"undefined":i(e))?e.color:"#000000")||"#000000"),s=("object"===(void 0===e?"undefined":i(e))?e.offset:{x:0,y:0})||{x:0,y:0},a=new createjs.Text(r,n+" family",o);if(a.offset=s,this._dynamicText[t]=a,void 0!==this._videoItem){var u=this._currentFrame;this.removeAllChildren(),this._addLayers(),this._currentFrame=u,this._update()}}},{key:"clearDynamicObjects",value:function(){this._dynamicImage={},this._dynamicImageTransform={},this._dynamicText={}}},{key:"onError",value:function(e){this._onError=e}},{key:"onFinished",value:function(e){this._onFinished=e}},{key:"onFrame",value:function(e){this._onFrame=e}},{key:"onPercentage",value:function(e){this._onPercentage=e}},{key:"_doStart",value:function(e,t,r){var i=this;this._animator=new a,void 0!==e?(this._animator.startValue=Math.max(0,e.location),this._animator.endValue=Math.min(this._videoItem.frames-1,e.location+e.length),this._animator.duration=(this._animator.endValue-this._animator.startValue+1)*(1/this._videoItem.FPS)*1e3):(this._animator.startValue=0,this._animator.endValue=this._videoItem.frames-1,this._animator.duration=this._videoItem.frames*(1/this._videoItem.FPS)*1e3),this._animator.loops=this.loops<=0?1/0:this.loops,this._animator.fillRule="Backward"===this.fillMode?1:0,this._animator.onUpdate=function(e){i._currentFrame!==Math.floor(e)&&(i._currentFrame=Math.floor(e),i._update(),"function"==typeof i._onFrame&&i._onFrame(i._currentFrame),"function"==typeof i._onPercentage&&i._onPercentage(parseFloat(i._currentFrame+1)/parseFloat(i._videoItem.frames)))},this._animator.onEnd=function(){!0===i.clearsAfterStop&&i.clear(),"function"==typeof i._onFinished&&i._onFinished()},!0===t?this._animator.reverse(r):this._animator.start(r)}},{key:"_addLayers",value:function(){var e=this;this._videoItem.sprites.forEach((function(t){e.addChild(e._renderer.requestContentLayer(t))})),this._currentFrame=0,this._update()}},{key:"_resize",value:function(){var e=1,t=1,r=0,i=0,n=this._frame.width,o=this._frame.height,s=this._videoItem.videoSize;if("Fill"===this._contentMode)e=n/s.width,t=o/s.height;else if("AspectFit"===this._contentMode||"AspectFill"===this._contentMode){var a=s.width/s.height,u=n/o;a>=u&&"AspectFit"===this._contentMode||a<=u&&"AspectFill"===this._contentMode?(e=t=n/s.width,i=(o-s.height*t)/2):(a<u&&"AspectFit"===this._contentMode||a>u&&"AspectFill"===this._contentMode)&&(e=t=o/s.height,r=(n-s.width*e)/2)}this.transformMatrix={a:e,b:0,c:0,d:t,tx:this._frame.x+r,ty:this._frame.y+i}}},{key:"_updateMask",value:function(){this._clipsToBounds?(this.mask=new createjs.Shape,this.mask.__width===this._frame.__width&&this.mask.height===this._frame.height||(this.mask.graphics.clear(),this.mask.graphics.drawRect(0,0,this._frame.width,this._frame.height),this.mask.__width=this._frame.width,this.mask.__height=this._frame.height)):this.mask=void 0}},{key:"_update",value:function(){void 0!==this._videoItem&&(this._resize(),this._updateMask(),this._renderer.drawFrame(this._currentFrame),null!=this.stage&&this.stage.update())}}]),t}()},function(e,t,r){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0}),t.Renderer=void 0;var n=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),o=r(5),s=r(15),a=r(14),u=function(e){function t(e){i(this,t);var r=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return r._drawedFrame=0,r._keepFrameCache={},r._sprite=e,r._resetKeepFrameCache(),r}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,createjs.Container),n(t,[{key:"stepToFrame",value:function(e){e<this._sprite.frames.length&&this._drawFrame(e)}},{key:"_resetKeepFrameCache",value:function(){var e=this;this._keepFrameCache={};var t=0;this._sprite.frames.forEach((function(r,i){e._isKeepFrame(r)?e._keepFrameCache[i]=t:t=i}))}},{key:"_requestKeepFrame",value:function(e){return this._keepFrameCache[e]}},{key:"_isKeepFrame",value:function(e){return e.shapes&&e.shapes.length>0&&"keep"===e.shapes[0].type}},{key:"_drawFrame",value:function(e){var t=this;if(e<this._sprite.frames.length){var r=this._sprite.frames[e];if(this._isKeepFrame(r)&&this._drawedFrame===this._requestKeepFrame(e))return;this.removeAllChildren(),r.shapes.forEach((function(e){"shape"===e.type&&e.pathArgs&&e.pathArgs.d?t.addChild(f.requestBezierShape(new o.BezierPath(e.pathArgs.d,e.transform,e.styles))):"ellipse"===e.type&&e.pathArgs?t.addChild(f.requestEllipseShape(new s.EllipsePath(parseFloat(e.pathArgs.x)||0,parseFloat(e.pathArgs.y)||0,parseFloat(e.pathArgs.radiusX)||0,parseFloat(e.pathArgs.radiusY)||0,e.transform,e.styles))):"rect"===e.type&&e.pathArgs&&t.addChild(f.requestRectShape(new a.RectPath(parseFloat(e.pathArgs.x)||0,parseFloat(e.pathArgs.y)||0,parseFloat(e.pathArgs.width)||0,parseFloat(e.pathArgs.height)||0,parseFloat(e.pathArgs.cornerRadius)||0,e.transform,e.styles)))})),this._drawedFrame=e}}}]),t}(),f=t.Renderer=function(){function e(t){i(this,e),this._owner=t}return n(e,[{key:"requestContentLayer",value:function(t){var r=void 0,i=new createjs.Container;return t.imageKey&&((r=this._owner._dynamicImage[t.imageKey]||this._owner._videoItem.images[t.imageKey])&&i.addChild(this.requestBitmapLayer(r,this._owner._dynamicImageTransform[t.imageKey],t.frames)),this._owner._dynamicText[t.imageKey]&&(i.textLayer=this._owner._dynamicText[t.imageKey],i.addChild(this._owner._dynamicText[t.imageKey]))),i.addChild(this.requestVectorLayer(t)),i.stepToFrame=function(r){if(r<t.frames.length){var n=t.frames[r];if(n.alpha>0){if(i.alpha=n.alpha,i.visible=!0,i.transformMatrix=new window.createjs.Matrix2D(n.transform.a,n.transform.b,n.transform.c,n.transform.d,n.transform.tx,n.transform.ty),i.setBounds({x:n.layout.x,y:n.layout.y,width:n.layout.width,height:n.layout.height}),n.maskPath?(i.mask=e.requestBezierShape(n.maskPath),i.mask.transformMatrix=i.transformMatrix):i.mask=void 0,i.textLayer){var o=void 0!==i.textLayer.offset&&void 0!==i.textLayer.offset.x?i.textLayer.offset.x:0,s=void 0!==i.textLayer.offset&&void 0!==i.textLayer.offset.y?i.textLayer.offset.y:0;i.textLayer.textBaseline="middle",i.textLayer.x=(n.layout.width-i.textLayer.getBounds().width)/2+o,i.textLayer.y=n.layout.height/2+s}}else i.visible=!1}i.children.forEach((function(e){e.stepToFrame&&e.stepToFrame(r)}))},i}},{key:"requestBitmapLayer",value:function(e,t,r){var i=document.createElement("img"),n=void 0;0===e.indexOf("iVBO")||0===e.indexOf("/9j/2w")?i.src="data:image/png;base64,"+e:(i.src=e,r[0]&&r[0].layout&&((n=document.createElement("canvas")).width=r[0].layout.width,n.height=r[0].layout.height,i.onload=function(){n.getContext("2d").drawImage(i,0,0,r[0].layout.width,r[0].layout.height)}));var o=new createjs.Bitmap(n||i);return void 0!==t&&(o.transformMatrix=new createjs.Matrix2D(t[0],t[1],t[2],t[3],t[4],t[5])),o.frames=r,o.stepToFrame=function(e){},o}},{key:"requestVectorLayer",value:function(e){return new u(e)}},{key:"drawFrame",value:function(e){this._owner.children.forEach((function(t){t.stepToFrame(e)}))}}],[{key:"resetStyle",value:function(e,t){var r=e._styles;if(r){if(r&&r.stroke&&t.graphics.beginStroke("rgba("+parseInt(255*r.stroke[0])+", "+parseInt(255*r.stroke[1])+", "+parseInt(255*r.stroke[2])+", "+r.stroke[3]+")"),r){var i=r.strokeWidth||0,n=r.lineCap||"",o=r.lineJoin||"",s=r.miterLimit||"";t.graphics.setStrokeStyle(i,n,o,s,!0)}r&&r.fill&&t.graphics.beginFill("rgba("+parseInt(255*r.fill[0])+", "+parseInt(255*r.fill[1])+", "+parseInt(255*r.fill[2])+", "+r.fill[3]+")"),r&&r.lineDash&&t.graphics.setStrokeDash([r.lineDash[0],r.lineDash[1]],r.lineDash[2])}}},{key:"requestBezierShape",value:function(e){var t=this,r=new createjs.Shape,i=r.graphics;this.resetStyle(e,r);var n={x:0,y:0,x1:0,y1:0,x2:0,y2:0};return e._d.replace(/([a-zA-Z])/g,"|||$1 ").replace(/,/g," ").split("|||").forEach((function(e){if(0!=e.length){var r=e.substr(0,1);if("MLHVCSQRZmlhvcsqrz".indexOf(r)>=0){var o=e.substr(1).trim().split(" ");t.drawBezierElement(i,n,r,o)}}})),void 0!==e._transform&&null!==e._transform&&(r.transformMatrix=new createjs.Matrix2D(e._transform.a,e._transform.b,e._transform.c,e._transform.d,e._transform.tx,e._transform.ty)),r}},{key:"drawBezierElement",value:function(e,t,r,i){switch(r){case"M":t.x=Number(i[0]),t.y=Number(i[1]),e.moveTo(t.x,t.y);break;case"m":t.x+=Number(i[0]),t.y+=Number(i[1]),e.moveTo(t.x,t.y);break;case"L":t.x=Number(i[0]),t.y=Number(i[1]),e.lineTo(t.x,t.y);break;case"l":t.x+=Number(i[0]),t.y+=Number(i[1]),e.lineTo(t.x,t.y);break;case"H":t.x=Number(i[0]),e.lineTo(t.x,t.y);break;case"h":t.x+=Number(i[0]),e.lineTo(t.x,t.y);break;case"V":t.y=Number(i[0]),e.lineTo(t.x,t.y);break;case"v":t.y+=Number(i[0]),e.lineTo(t.x,t.y);break;case"C":t.x1=Number(i[0]),t.y1=Number(i[1]),t.x2=Number(i[2]),t.y2=Number(i[3]),t.x=Number(i[4]),t.y=Number(i[5]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y);break;case"c":t.x1=t.x+Number(i[0]),t.y1=t.y+Number(i[1]),t.x2=t.x+Number(i[2]),t.y2=t.y+Number(i[3]),t.x+=Number(i[4]),t.y+=Number(i[5]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y);break;case"S":t.x1&&t.y1&&t.x2&&t.y2?(t.x1=t.x-t.x2+t.x,t.y1=t.y-t.y2+t.y,t.x2=Number(i[0]),t.y2=Number(i[1]),t.x=Number(i[2]),t.y=Number(i[3]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y)):(t.x1=Number(i[0]),t.y1=Number(i[1]),t.x=Number(i[2]),t.y=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y));break;case"s":t.x1&&t.y1&&t.x2&&t.y2?(t.x1=t.x-t.x2+t.x,t.y1=t.y-t.y2+t.y,t.x2=t.x+Number(i[0]),t.y2=t.y+Number(i[1]),t.x+=Number(i[2]),t.y+=Number(i[3]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y)):(t.x1=t.x+Number(i[0]),t.y1=t.y+Number(i[1]),t.x+=Number(i[2]),t.y+=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y));break;case"Q":t.x1=Number(i[0]),t.y1=Number(i[1]),t.x=Number(i[2]),t.y=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y);break;case"q":t.x1=t.x+Number(i[0]),t.y1=t.y+Number(i[1]),t.x+=Number(i[2]),t.y+=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y);break;case"A":case"a":break;case"Z":case"z":e.closePath()}}},{key:"requestEllipseShape",value:function(e){var t=new createjs.Shape,r=t.graphics;return this.resetStyle(e,t),r.drawEllipse(e._x-e._radiusX,e._y-e._radiusY,2*e._radiusX,2*e._radiusY),void 0!==e._transform&&null!==e._transform&&(t.transformMatrix=new createjs.Matrix2D(e._transform.a,e._transform.b,e._transform.c,e._transform.d,e._transform.tx,e._transform.ty)),t}},{key:"requestRectShape",value:function(e){var t=new createjs.Shape,r=t.graphics;return this.resetStyle(e,t),r.drawRoundRect(e._x,e._y,e._width,e._height,e._cornerRadius),void 0!==e._transform&&null!==e._transform&&(t.transformMatrix=new createjs.Matrix2D(e._transform.a,e._transform.b,e._transform.c,e._transform.d,e._transform.tx,e._transform.ty)),t}}]),e}()}])}));
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.ie.min.js b/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.ie.min.js
new file mode 100644
index 0000000..1418cc2
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.ie.min.js
@@ -0,0 +1 @@
+(function(global){if(typeof global.SVGA==="undefined"){global.SVGA={SWFLocation:"SVGAPlayerWeb.swf",createUUID:function(){var s=[];var hexDigits="0123456789abcdef";for(var i=0;i<36;i++){s[i]=hexDigits.substr(Math.floor(Math.random()*0x10),1)}s[14]="4";s[19]=hexDigits.substr((s[19]&0x3)|0x8,1);s[8]=s[13]=s[18]=s[23]="_";var uuid=s.join("");return uuid},createHandler:function(callback){var uuid=global.SVGA.createUUID();global["SVGACB_"+uuid+"_handler"]=function(a,b,c,d,e,f,g){callback(a,b,c,d,e,f,g)};return"SVGACB_"+uuid+"_handler"},createSWFObject:function(container,callback){var uuid=global.SVGA.createUUID();var containerElement=typeof container==="object"?container:document.getElementById(container.replace('#',''));if(containerElement===null||containerElement===undefined){throw Error("You must provide a valid div ID >>> new Parser(xxx).")}if(containerElement.getElementsByTagName("object").length===0){try{var element=document.createElement("<object id='"+uuid+"' classid='clsid:D27CDB6E-AE6D-11cf-96B8-444553540000' />")}catch(error){var element=document.createElement("object");element.setAttribute("id",uuid);element.setAttribute("classid","clsid:d27cdb6e-ae6d-11cf-96b8-444553540000")}global["SVGACB_"+uuid+"_onReady"]=function(){callback(document.getElementById(uuid))};element.setAttribute("width",containerElement.offsetWidth);element.setAttribute("height",containerElement.offsetHeight);(function(element){var attr=document.createElement("param");attr.setAttribute("name","movie");attr.setAttribute("value",global.SVGA.SWFLocation);element.appendChild(attr)})(element);(function(element){var attr=document.createElement("param");attr.setAttribute("name","play");attr.setAttribute("value","true");element.appendChild(attr)})(element);(function(element){var attr=document.createElement("param");attr.setAttribute("name","allowScriptAccess");attr.setAttribute("value","always");element.appendChild(attr)})(element);(function(element){var attr=document.createElement("param");attr.setAttribute("name","wmode");attr.setAttribute("value","transparent");element.appendChild(attr)})(element);(function(element){var attr=document.createElement("param");attr.setAttribute("name","FlashVars");attr.setAttribute("value","uuid="+uuid);element.appendChild(attr)})(element);containerElement.appendChild(element)}else{callback(containerElement.getElementsByTagName("object")[0])}},Parser:function(container){return{load:function(url,success,failure){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAParser_Instance_load(url,SVGA.createHandler(function(videoItem){success(videoItem)}),SVGA.createHandler(function(message){failure(new Error(message))}))})}}},Player:function(container){return{setLoops:function(value){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_setLoops(value)})},setClearsAfterStop:function(value){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_setClearsAfterStop(value)})},setContentMode:function(value){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_setContentMode(value)})},setClipsToBounds:function(value){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_setClipsToBounds(value)})},pauseAnimation:function(){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_pauseAnimation()})},stopAnimation:function(value){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_stopAnimation(value||true)})},clear:function(){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_clear()})},stepToFrame:function(frame,andPlay){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_stepToFrame(frame,andPlay===true)})},stepToPercentage:function(percentage,andPlay){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_stepToPercentage(percentage,andPlay===true)})},setImage:function(url,forKey){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_setImage(url,forKey)})},setText:function(textORMap,forKey){SVGA.createSWFObject(container,function(swfObject){if(typeof textORMap==="object"){swfObject.SVGAPlayer_Instance_setText(textORMap.text,textORMap.size,textORMap.color,forKey)}else{swfObject.SVGAPlayer_Instance_setText(textORMap,"","",forKey)}})},clearDynamicObjects:function(){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_clearDynamicObjects()})},onFinished:function(callback){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_onFinished(SVGA.createHandler(callback))})},onFrame:function(callback){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_onFrame(SVGA.createHandler(callback))})},onPercentage:function(callback){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_onPercentage(SVGA.createHandler(callback))})},setFrame:function(x,y,width,height){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_setFrame(x,y,width,height)})},setVideoItem:function(videoItem){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_setVideoItem(videoItem)})},startAnimation:function(){SVGA.createSWFObject(container,function(swfObject){swfObject.SVGAPlayer_Instance_setFrame(0,0,swfObject.offsetWidth,swfObject.offsetHeight);swfObject.SVGAPlayer_Instance_startAnimation()})}}}}}})(window);
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.layabox.min.js b/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.layabox.min.js
new file mode 100644
index 0000000..13e36d2
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.layabox.min.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.SVGA=t():e.SVGA=t()}(window,(function(){return function(e){function t(i){if(r[i])return r[i].exports;var n=r[i]={i:i,l:!1,exports:{}};return e[i].call(n.exports,n,n.exports,t),n.l=!0,n.exports}var r={};return t.m=e,t.c=r,t.d=function(e,r,i){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:i})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var i=Object.create(null);if(t.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)t.d(i,n,function(t){return e[t]}.bind(null,n));return i},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=70)}([function(e,t,r){"use strict";var i,n,o=e.exports=r(1),s=r(20);o.codegen=r(47),o.fetch=r(48),o.path=r(49),o.fs=o.inquire("fs"),o.toArray=function(e){if(e){for(var t=Object.keys(e),r=new Array(t.length),i=0;i<t.length;)r[i]=e[t[i++]];return r}return[]},o.toObject=function(e){for(var t={},r=0;r<e.length;){var i=e[r++],n=e[r++];void 0!==n&&(t[i]=n)}return t};var a=/\\/g,u=/"/g;o.isReserved=function(e){return/^(?:do|if|in|for|let|new|try|var|case|else|enum|eval|false|null|this|true|void|with|break|catch|class|const|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$/.test(e)},o.safeProp=function(e){return!/^[$\w_]+$/.test(e)||o.isReserved(e)?'["'+e.replace(a,"\\\\").replace(u,'\\"')+'"]':"."+e},o.ucFirst=function(e){return e.charAt(0).toUpperCase()+e.substring(1)};var f=/_([a-z])/g;o.camelCase=function(e){return e.substring(0,1)+e.substring(1).replace(f,(function(e,t){return t.toUpperCase()}))},o.compareFieldsById=function(e,t){return e.id-t.id},o.decorateType=function(e,t){if(e.$type)return t&&e.$type.name!==t&&(o.decorateRoot.remove(e.$type),e.$type.name=t,o.decorateRoot.add(e.$type)),e.$type;i||(i=r(22));var n=new i(t||e.name);return o.decorateRoot.add(n),n.ctor=e,Object.defineProperty(e,"$type",{value:n,enumerable:!1}),Object.defineProperty(e.prototype,"$type",{value:n,enumerable:!1}),n};var l=0;o.decorateEnum=function(e){if(e.$type)return e.$type;n||(n=r(2));var t=new n("Enum"+l++,e);return o.decorateRoot.add(t),Object.defineProperty(e,"$type",{value:t,enumerable:!1}),t},o.setProperty=function(e,t,r){if("object"!=typeof e)throw TypeError("dst must be an object");if(!t)throw TypeError("path must be specified");return function e(t,r,i){var n=r.shift();if(r.length>0)t[n]=e(t[n]||{},r,i);else{var o=t[n];o&&(i=[].concat(o).concat(i)),t[n]=i}return t}(e,t=t.split("."),r)},Object.defineProperty(o,"decorateRoot",{get:function(){return s.decorated||(s.decorated=new(r(30)))}})},function(e,t,r){"use strict";(function(e){function i(e,t,r){for(var i=Object.keys(t),n=0;n<i.length;++n)void 0!==e[i[n]]&&r||(e[i[n]]=t[i[n]]);return e}function n(e){function t(e,r){if(!(this instanceof t))return new t(e,r);Object.defineProperty(this,"message",{get:function(){return e}}),Error.captureStackTrace?Error.captureStackTrace(this,t):Object.defineProperty(this,"stack",{value:(new Error).stack||""}),r&&i(this,r)}return(t.prototype=Object.create(Error.prototype)).constructor=t,Object.defineProperty(t.prototype,"name",{get:function(){return e}}),t.prototype.toString=function(){return this.name+": "+this.message},t}var o=t;o.asPromise=r(17),o.base64=r(38),o.EventEmitter=r(39),o.float=r(40),o.inquire=r(18),o.utf8=r(41),o.pool=r(42),o.LongBits=r(43),o.isNode=Boolean(void 0!==e&&e&&e.process&&e.process.versions&&e.process.versions.node),o.global=o.isNode&&e||"undefined"!=typeof window&&window||"undefined"!=typeof self&&self||this,o.emptyArray=Object.freeze?Object.freeze([]):[],o.emptyObject=Object.freeze?Object.freeze({}):{},o.isInteger=Number.isInteger||function(e){return"number"==typeof e&&isFinite(e)&&Math.floor(e)===e},o.isString=function(e){return"string"==typeof e||e instanceof String},o.isObject=function(e){return e&&"object"==typeof e},o.isset=o.isSet=function(e,t){var r=e[t];return!(null==r||!e.hasOwnProperty(t))&&("object"!=typeof r||(Array.isArray(r)?r.length:Object.keys(r).length)>0)},o.Buffer=function(){try{var e=o.inquire("buffer").Buffer;return e.prototype.utf8Write?e:null}catch(e){return null}}(),o._Buffer_from=null,o._Buffer_allocUnsafe=null,o.newBuffer=function(e){return"number"==typeof e?o.Buffer?o._Buffer_allocUnsafe(e):new o.Array(e):o.Buffer?o._Buffer_from(e):"undefined"==typeof Uint8Array?e:new Uint8Array(e)},o.Array="undefined"!=typeof Uint8Array?Uint8Array:Array,o.Long=o.global.dcodeIO&&o.global.dcodeIO.Long||o.global.Long||o.inquire("long"),o.key2Re=/^true|false|0|1$/,o.key32Re=/^-?(?:0|[1-9][0-9]*)$/,o.key64Re=/^(?:[\\x00-\\xff]{8}|-?(?:0|[1-9][0-9]*))$/,o.longToHash=function(e){return e?o.LongBits.from(e).toHash():o.LongBits.zeroHash},o.longFromHash=function(e,t){var r=o.LongBits.fromHash(e);return o.Long?o.Long.fromBits(r.lo,r.hi,t):r.toNumber(Boolean(t))},o.merge=i,o.lcFirst=function(e){return e.charAt(0).toLowerCase()+e.substring(1)},o.newError=n,o.ProtocolError=n("ProtocolError"),o.oneOfGetter=function(e){for(var t={},r=0;r<e.length;++r)t[e[r]]=1;return function(){for(var e=Object.keys(this),r=e.length-1;r>-1;--r)if(1===t[e[r]]&&void 0!==this[e[r]]&&null!==this[e[r]])return e[r]}},o.oneOfSetter=function(e){return function(t){for(var r=0;r<e.length;++r)e[r]!==t&&delete this[e[r]]}},o.toJSONOptions={longs:String,enums:String,bytes:String,json:!0},o._configure=function(){var e=o.Buffer;e?(o._Buffer_from=e.from!==Uint8Array.from&&e.from||function(t,r){return new e(t,r)},o._Buffer_allocUnsafe=e.allocUnsafe||function(t){return new e(t)}):o._Buffer_from=o._Buffer_allocUnsafe=null}}).call(this,r(37))},function(e,t,r){"use strict";function i(e,t,r,i,o){if(n.call(this,e,r),t&&"object"!=typeof t)throw TypeError("values must be an object");if(this.valuesById={},this.values=Object.create(this.valuesById),this.comment=i,this.comments=o||{},this.reserved=void 0,t)for(var s=Object.keys(t),a=0;a<s.length;++a)"number"==typeof t[s[a]]&&(this.valuesById[this.values[s[a]]=t[s[a]]]=s[a])}e.exports=i;var n=r(3);((i.prototype=Object.create(n.prototype)).constructor=i).className="Enum";var o=r(6),s=r(0);i.fromJSON=function(e,t){var r=new i(e,t.values,t.options,t.comment,t.comments);return r.reserved=t.reserved,r},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return s.toObject(["options",this.options,"values",this.values,"reserved",this.reserved&&this.reserved.length?this.reserved:void 0,"comment",t?this.comment:void 0,"comments",t?this.comments:void 0])},i.prototype.add=function(e,t,r){if(!s.isString(e))throw TypeError("name must be a string");if(!s.isInteger(t))throw TypeError("id must be an integer");if(void 0!==this.values[e])throw Error("duplicate name '"+e+"' in "+this);if(this.isReservedId(t))throw Error("id "+t+" is reserved in "+this);if(this.isReservedName(e))throw Error("name '"+e+"' is reserved in "+this);if(void 0!==this.valuesById[t]){if(!this.options||!this.options.allow_alias)throw Error("duplicate id "+t+" in "+this);this.values[e]=t}else this.valuesById[this.values[e]=t]=e;return this.comments[e]=r||null,this},i.prototype.remove=function(e){if(!s.isString(e))throw TypeError("name must be a string");var t=this.values[e];if(null==t)throw Error("name '"+e+"' does not exist in "+this);return delete this.valuesById[t],delete this.values[e],delete this.comments[e],this},i.prototype.isReservedId=function(e){return o.isReservedId(this.reserved,e)},i.prototype.isReservedName=function(e){return o.isReservedName(this.reserved,e)}},function(e,t,r){"use strict";function i(e,t){if(!o.isString(e))throw TypeError("name must be a string");if(t&&!o.isObject(t))throw TypeError("options must be an object");this.options=t,this.parsedOptions=null,this.name=e,this.parent=null,this.resolved=!1,this.comment=null,this.filename=null}e.exports=i,i.className="ReflectionObject";var n,o=r(0);Object.defineProperties(i.prototype,{root:{get:function(){for(var e=this;null!==e.parent;)e=e.parent;return e}},fullName:{get:function(){for(var e=[this.name],t=this.parent;t;)e.unshift(t.name),t=t.parent;return e.join(".")}}}),i.prototype.toJSON=function(){throw Error()},i.prototype.onAdd=function(e){this.parent&&this.parent!==e&&this.parent.remove(this),this.parent=e,this.resolved=!1;var t=e.root;t instanceof n&&t._handleAdd(this)},i.prototype.onRemove=function(e){var t=e.root;t instanceof n&&t._handleRemove(this),this.parent=null,this.resolved=!1},i.prototype.resolve=function(){return this.resolved?this:(this.root instanceof n&&(this.resolved=!0),this)},i.prototype.getOption=function(e){if(this.options)return this.options[e]},i.prototype.setOption=function(e,t,r){return r&&this.options&&void 0!==this.options[e]||((this.options||(this.options={}))[e]=t),this},i.prototype.setParsedOption=function(e,t,r){this.parsedOptions||(this.parsedOptions=[]);var i=this.parsedOptions;if(r){var n=i.find((function(t){return Object.prototype.hasOwnProperty.call(t,e)}));if(n){var s=n[e];o.setProperty(s,r,t)}else(n={})[e]=o.setProperty({},r,t),i.push(n)}else{var a={};a[e]=t,i.push(a)}return this},i.prototype.setOptions=function(e,t){if(e)for(var r=Object.keys(e),i=0;i<r.length;++i)this.setOption(r[i],e[r[i]],t);return this},i.prototype.toString=function(){var e=this.constructor.className,t=this.fullName;return t.length?e+" "+t:e},i._configure=function(e){n=e}},function(e,t,r){"use strict";function i(e,t,r,i,o,s,l){if(u.isObject(i)?(l=o,s=i,i=o=void 0):u.isObject(o)&&(l=s,s=o,o=void 0),n.call(this,e,s),!u.isInteger(t)||t<0)throw TypeError("id must be a non-negative integer");if(!u.isString(r))throw TypeError("type must be a string");if(void 0!==i&&!f.test(i=i.toString().toLowerCase()))throw TypeError("rule must be a string rule");if(void 0!==o&&!u.isString(o))throw TypeError("extend must be a string");this.rule=i&&"optional"!==i?i:void 0,this.type=r,this.id=t,this.extend=o||void 0,this.required="required"===i,this.optional=!this.required,this.repeated="repeated"===i,this.map=!1,this.message=null,this.partOf=null,this.typeDefault=null,this.defaultValue=null,this.long=!!u.Long&&void 0!==a.long[r],this.bytes="bytes"===r,this.resolvedType=null,this.extensionField=null,this.declaringField=null,this._packed=null,this.comment=l}e.exports=i;var n=r(3);((i.prototype=Object.create(n.prototype)).constructor=i).className="Field";var o,s=r(2),a=r(7),u=r(0),f=/^required|optional|repeated$/;i.fromJSON=function(e,t){return new i(e,t.id,t.type,t.rule,t.extend,t.options,t.comment)},Object.defineProperty(i.prototype,"packed",{get:function(){return null===this._packed&&(this._packed=!1!==this.getOption("packed")),this._packed}}),i.prototype.setOption=function(e,t,r){return"packed"===e&&(this._packed=null),n.prototype.setOption.call(this,e,t,r)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return u.toObject(["rule","optional"!==this.rule&&this.rule||void 0,"type",this.type,"id",this.id,"extend",this.extend,"options",this.options,"comment",t?this.comment:void 0])},i.prototype.resolve=function(){if(this.resolved)return this;if(void 0===(this.typeDefault=a.defaults[this.type])&&(this.resolvedType=(this.declaringField?this.declaringField.parent:this.parent).lookupTypeOrEnum(this.type),this.resolvedType instanceof o?this.typeDefault=null:this.typeDefault=this.resolvedType.values[Object.keys(this.resolvedType.values)[0]]),this.options&&null!=this.options.default&&(this.typeDefault=this.options.default,this.resolvedType instanceof s&&"string"==typeof this.typeDefault&&(this.typeDefault=this.resolvedType.values[this.typeDefault])),this.options&&(!0!==this.options.packed&&(void 0===this.options.packed||!this.resolvedType||this.resolvedType instanceof s)||delete this.options.packed,Object.keys(this.options).length||(this.options=void 0)),this.long)this.typeDefault=u.Long.fromNumber(this.typeDefault,"u"===this.type.charAt(0)),Object.freeze&&Object.freeze(this.typeDefault);else if(this.bytes&&"string"==typeof this.typeDefault){var e;u.base64.test(this.typeDefault)?u.base64.decode(this.typeDefault,e=u.newBuffer(u.base64.length(this.typeDefault)),0):u.utf8.write(this.typeDefault,e=u.newBuffer(u.utf8.length(this.typeDefault)),0),this.typeDefault=e}return this.map?this.defaultValue=u.emptyObject:this.repeated?this.defaultValue=u.emptyArray:this.defaultValue=this.typeDefault,this.parent instanceof o&&(this.parent.ctor.prototype[this.name]=this.defaultValue),n.prototype.resolve.call(this)},i.d=function(e,t,r,n){return"function"==typeof t?t=u.decorateType(t).name:t&&"object"==typeof t&&(t=u.decorateEnum(t).name),function(o,s){u.decorateType(o.constructor).add(new i(s,e,t,r,{default:n}))}},i._configure=function(e){o=e}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.BezierPath=function e(t,r,i){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this._d=t,this._transform=r,this._styles=i}},function(e,t,r){"use strict";function i(e,t){if(e&&e.length){for(var r={},i=0;i<e.length;++i)r[e[i].name]=e[i].toJSON(t);return r}}function n(e,t){s.call(this,e,t),this.nested=void 0,this._nestedArray=null}function o(e){return e._nestedArray=null,e}e.exports=n;var s=r(3);((n.prototype=Object.create(s.prototype)).constructor=n).className="Namespace";var a,u,f,l=r(4),h=r(0);n.fromJSON=function(e,t){return new n(e,t.options).addJSON(t.nested)},n.arrayToJSON=i,n.isReservedId=function(e,t){if(e)for(var r=0;r<e.length;++r)if("string"!=typeof e[r]&&e[r][0]<=t&&e[r][1]>t)return!0;return!1},n.isReservedName=function(e,t){if(e)for(var r=0;r<e.length;++r)if(e[r]===t)return!0;return!1},Object.defineProperty(n.prototype,"nestedArray",{get:function(){return this._nestedArray||(this._nestedArray=h.toArray(this.nested))}}),n.prototype.toJSON=function(e){return h.toObject(["options",this.options,"nested",i(this.nestedArray,e)])},n.prototype.addJSON=function(e){if(e)for(var t,r=Object.keys(e),i=0;i<r.length;++i)t=e[r[i]],this.add((void 0!==t.fields?a.fromJSON:void 0!==t.values?f.fromJSON:void 0!==t.methods?u.fromJSON:void 0!==t.id?l.fromJSON:n.fromJSON)(r[i],t));return this},n.prototype.get=function(e){return this.nested&&this.nested[e]||null},n.prototype.getEnum=function(e){if(this.nested&&this.nested[e]instanceof f)return this.nested[e].values;throw Error("no such enum: "+e)},n.prototype.add=function(e){if(!(e instanceof l&&void 0!==e.extend||e instanceof a||e instanceof f||e instanceof u||e instanceof n))throw TypeError("object must be a valid nested object");if(this.nested){var t=this.get(e.name);if(t){if(!(t instanceof n&&e instanceof n)||t instanceof a||t instanceof u)throw Error("duplicate name '"+e.name+"' in "+this);for(var r=t.nestedArray,i=0;i<r.length;++i)e.add(r[i]);this.remove(t),this.nested||(this.nested={}),e.setOptions(t.options,!0)}}else this.nested={};return this.nested[e.name]=e,e.onAdd(this),o(this)},n.prototype.remove=function(e){if(!(e instanceof s))throw TypeError("object must be a ReflectionObject");if(e.parent!==this)throw Error(e+" is not a member of "+this);return delete this.nested[e.name],Object.keys(this.nested).length||(this.nested=void 0),e.onRemove(this),o(this)},n.prototype.define=function(e,t){if(h.isString(e))e=e.split(".");else if(!Array.isArray(e))throw TypeError("illegal path");if(e&&e.length&&""===e[0])throw Error("path must be relative");for(var r=this;e.length>0;){var i=e.shift();if(r.nested&&r.nested[i]){if(!((r=r.nested[i])instanceof n))throw Error("path conflicts with non-namespace objects")}else r.add(r=new n(i))}return t&&r.addJSON(t),r},n.prototype.resolveAll=function(){for(var e=this.nestedArray,t=0;t<e.length;)e[t]instanceof n?e[t++].resolveAll():e[t++].resolve();return this.resolve()},n.prototype.lookup=function(e,t,r){if("boolean"==typeof t?(r=t,t=void 0):t&&!Array.isArray(t)&&(t=[t]),h.isString(e)&&e.length){if("."===e)return this.root;e=e.split(".")}else if(!e.length)return this;if(""===e[0])return this.root.lookup(e.slice(1),t);var i=this.get(e[0]);if(i){if(1===e.length){if(!t||t.indexOf(i.constructor)>-1)return i}else if(i instanceof n&&(i=i.lookup(e.slice(1),t,!0)))return i}else for(var o=0;o<this.nestedArray.length;++o)if(this._nestedArray[o]instanceof n&&(i=this._nestedArray[o].lookup(e,t,!0)))return i;return null===this.parent||r?null:this.parent.lookup(e,t)},n.prototype.lookupType=function(e){var t=this.lookup(e,[a]);if(!t)throw Error("no such type: "+e);return t},n.prototype.lookupEnum=function(e){var t=this.lookup(e,[f]);if(!t)throw Error("no such Enum '"+e+"' in "+this);return t},n.prototype.lookupTypeOrEnum=function(e){var t=this.lookup(e,[a,f]);if(!t)throw Error("no such Type or Enum '"+e+"' in "+this);return t},n.prototype.lookupService=function(e){var t=this.lookup(e,[u]);if(!t)throw Error("no such Service '"+e+"' in "+this);return t},n._configure=function(e,t,r){a=e,u=t,f=r}},function(e,t,r){"use strict";function i(e,t){var r=0,i={};for(t|=0;r<e.length;)i[s[r+t]]=e[r++];return i}var n=t,o=r(0),s=["double","float","int32","uint32","sint32","fixed32","sfixed32","int64","uint64","sint64","fixed64","sfixed64","bool","string","bytes"];n.basic=i([1,5,0,0,0,5,5,0,0,0,1,1,0,2,2]),n.defaults=i([0,0,0,0,0,0,0,0,0,0,0,0,!1,"",o.emptyArray,null]),n.long=i([0,0,0,1,1],7),n.mapKey=i([0,0,0,5,5,0,0,0,1,1,0,2],2),n.packed=i([1,5,0,0,0,5,5,0,0,0,1,1,0])},function(e,t,r){"use strict";function i(e,t){return Object.prototype.hasOwnProperty.call(e,t)}var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;t.assign=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var r=t.shift();if(r){if("object"!=typeof r)throw new TypeError(r+"must be non-object");for(var n in r)i(r,n)&&(e[n]=r[n])}}return e},t.shrinkBuf=function(e,t){return e.length===t?e:e.subarray?e.subarray(0,t):(e.length=t,e)};var o={arraySet:function(e,t,r,i,n){if(t.subarray&&e.subarray)e.set(t.subarray(r,r+i),n);else for(var o=0;o<i;o++)e[n+o]=t[r+o]},flattenChunks:function(e){var t,r,i,n,o,s;for(i=0,t=0,r=e.length;t<r;t++)i+=e[t].length;for(s=new Uint8Array(i),n=0,t=0,r=e.length;t<r;t++)o=e[t],s.set(o,n),n+=o.length;return s}},s={arraySet:function(e,t,r,i,n){for(var o=0;o<i;o++)e[n+o]=t[r+o]},flattenChunks:function(e){return[].concat.apply([],e)}};t.setTyped=function(e){e?(t.Buf8=Uint8Array,t.Buf16=Uint16Array,t.Buf32=Int32Array,t.assign(t,o)):(t.Buf8=Array,t.Buf16=Array,t.Buf32=Array,t.assign(t,s))},t.setTyped(n)},function(e,t,r){"use strict";function i(e,t,r){this.fn=e,this.len=t,this.next=void 0,this.val=r}function n(){}function o(e){this.head=e.head,this.tail=e.tail,this.len=e.len,this.next=e.states}function s(){this.len=0,this.head=new i(n,0,0),this.tail=this.head,this.states=null}function a(e,t,r){t[r]=255&e}function u(e,t){this.len=e,this.next=void 0,this.val=t}function f(e,t,r){for(;e.hi;)t[r++]=127&e.lo|128,e.lo=(e.lo>>>7|e.hi<<25)>>>0,e.hi>>>=7;for(;e.lo>127;)t[r++]=127&e.lo|128,e.lo=e.lo>>>7;t[r++]=e.lo}function l(e,t,r){t[r]=255&e,t[r+1]=e>>>8&255,t[r+2]=e>>>16&255,t[r+3]=e>>>24}e.exports=s;var h,c=r(1),p=c.LongBits,d=c.base64,y=c.utf8,m=function(){return c.Buffer?function(){return(s.create=function(){return new h})()}:function(){return new s}};s.create=m(),s.alloc=function(e){return new c.Array(e)},c.Array!==Array&&(s.alloc=c.pool(s.alloc,c.Array.prototype.subarray)),s.prototype._push=function(e,t,r){return this.tail=this.tail.next=new i(e,t,r),this.len+=t,this},u.prototype=Object.create(i.prototype),u.prototype.fn=function(e,t,r){for(;e>127;)t[r++]=127&e|128,e>>>=7;t[r]=e},s.prototype.uint32=function(e){return this.len+=(this.tail=this.tail.next=new u((e>>>=0)<128?1:e<16384?2:e<2097152?3:e<268435456?4:5,e)).len,this},s.prototype.int32=function(e){return e<0?this._push(f,10,p.fromNumber(e)):this.uint32(e)},s.prototype.sint32=function(e){return this.uint32((e<<1^e>>31)>>>0)},s.prototype.uint64=function(e){var t=p.from(e);return this._push(f,t.length(),t)},s.prototype.int64=s.prototype.uint64,s.prototype.sint64=function(e){var t=p.from(e).zzEncode();return this._push(f,t.length(),t)},s.prototype.bool=function(e){return this._push(a,1,e?1:0)},s.prototype.fixed32=function(e){return this._push(l,4,e>>>0)},s.prototype.sfixed32=s.prototype.fixed32,s.prototype.fixed64=function(e){var t=p.from(e);return this._push(l,4,t.lo)._push(l,4,t.hi)},s.prototype.sfixed64=s.prototype.fixed64,s.prototype.float=function(e){return this._push(c.float.writeFloatLE,4,e)},s.prototype.double=function(e){return this._push(c.float.writeDoubleLE,8,e)};var v=c.Array.prototype.set?function(e,t,r){t.set(e,r)}:function(e,t,r){for(var i=0;i<e.length;++i)t[r+i]=e[i]};s.prototype.bytes=function(e){var t=e.length>>>0;if(!t)return this._push(a,1,0);if(c.isString(e)){var r=s.alloc(t=d.length(e));d.decode(e,r,0),e=r}return this.uint32(t)._push(v,t,e)},s.prototype.string=function(e){var t=y.length(e);return t?this.uint32(t)._push(y.write,t,e):this._push(a,1,0)},s.prototype.fork=function(){return this.states=new o(this),this.head=this.tail=new i(n,0,0),this.len=0,this},s.prototype.reset=function(){return this.states?(this.head=this.states.head,this.tail=this.states.tail,this.len=this.states.len,this.states=this.states.next):(this.head=this.tail=new i(n,0,0),this.len=0),this},s.prototype.ldelim=function(){var e=this.head,t=this.tail,r=this.len;return this.reset().uint32(r),r&&(this.tail.next=e.next,this.tail=t,this.len+=r),this},s.prototype.finish=function(){for(var e=this.head.next,t=this.constructor.alloc(this.len),r=0;e;)e.fn(e.val,t,r),r+=e.len,e=e.next;return t},s._configure=function(e){h=e,s.create=m(),h._configure()}},function(e,t,r){"use strict";function i(e,t){return RangeError("index out of range: "+e.pos+" + "+(t||1)+" > "+e.len)}function n(e){this.buf=e,this.pos=0,this.len=e.length}function o(){var e=new l(0,0),t=0;if(!(this.len-this.pos>4)){for(;t<3;++t){if(this.pos>=this.len)throw i(this);if(e.lo=(e.lo|(127&this.buf[this.pos])<<7*t)>>>0,this.buf[this.pos++]<128)return e}return e.lo=(e.lo|(127&this.buf[this.pos++])<<7*t)>>>0,e}for(;t<4;++t)if(e.lo=(e.lo|(127&this.buf[this.pos])<<7*t)>>>0,this.buf[this.pos++]<128)return e;if(e.lo=(e.lo|(127&this.buf[this.pos])<<28)>>>0,e.hi=(e.hi|(127&this.buf[this.pos])>>4)>>>0,this.buf[this.pos++]<128)return e;if(t=0,this.len-this.pos>4){for(;t<5;++t)if(e.hi=(e.hi|(127&this.buf[this.pos])<<7*t+3)>>>0,this.buf[this.pos++]<128)return e}else for(;t<5;++t){if(this.pos>=this.len)throw i(this);if(e.hi=(e.hi|(127&this.buf[this.pos])<<7*t+3)>>>0,this.buf[this.pos++]<128)return e}throw Error("invalid varint encoding")}function s(e,t){return(e[t-4]|e[t-3]<<8|e[t-2]<<16|e[t-1]<<24)>>>0}function a(){if(this.pos+8>this.len)throw i(this,8);return new l(s(this.buf,this.pos+=4),s(this.buf,this.pos+=4))}e.exports=n;var u,f=r(1),l=f.LongBits,h=f.utf8,c="undefined"!=typeof Uint8Array?function(e){if(e instanceof Uint8Array||Array.isArray(e))return new n(e);throw Error("illegal buffer")}:function(e){if(Array.isArray(e))return new n(e);throw Error("illegal buffer")},p=function(){return f.Buffer?function(e){return(n.create=function(e){return f.Buffer.isBuffer(e)?new u(e):c(e)})(e)}:c};n.create=p(),n.prototype._slice=f.Array.prototype.subarray||f.Array.prototype.slice,n.prototype.uint32=function(){var e=4294967295;return function(){if(e=(127&this.buf[this.pos])>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(127&this.buf[this.pos])<<7)>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(127&this.buf[this.pos])<<14)>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(127&this.buf[this.pos])<<21)>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(15&this.buf[this.pos])<<28)>>>0,this.buf[this.pos++]<128)return e;if((this.pos+=5)>this.len)throw this.pos=this.len,i(this,10);return e}}(),n.prototype.int32=function(){return 0|this.uint32()},n.prototype.sint32=function(){var e=this.uint32();return e>>>1^-(1&e)|0},n.prototype.bool=function(){return 0!==this.uint32()},n.prototype.fixed32=function(){if(this.pos+4>this.len)throw i(this,4);return s(this.buf,this.pos+=4)},n.prototype.sfixed32=function(){if(this.pos+4>this.len)throw i(this,4);return 0|s(this.buf,this.pos+=4)},n.prototype.float=function(){if(this.pos+4>this.len)throw i(this,4);var e=f.float.readFloatLE(this.buf,this.pos);return this.pos+=4,e},n.prototype.double=function(){if(this.pos+8>this.len)throw i(this,4);var e=f.float.readDoubleLE(this.buf,this.pos);return this.pos+=8,e},n.prototype.bytes=function(){var e=this.uint32(),t=this.pos,r=this.pos+e;if(r>this.len)throw i(this,e);return this.pos+=e,Array.isArray(this.buf)?this.buf.slice(t,r):t===r?new this.buf.constructor(0):this._slice.call(this.buf,t,r)},n.prototype.string=function(){var e=this.bytes();return h.read(e,0,e.length)},n.prototype.skip=function(e){if("number"==typeof e){if(this.pos+e>this.len)throw i(this,e);this.pos+=e}else do{if(this.pos>=this.len)throw i(this)}while(128&this.buf[this.pos++]);return this},n.prototype.skipType=function(e){switch(e){case 0:this.skip();break;case 1:this.skip(8);break;case 2:this.skip(this.uint32());break;case 3:for(;4!=(e=7&this.uint32());)this.skipType(e);break;case 5:this.skip(4);break;default:throw Error("invalid wire type "+e+" at offset "+this.pos)}return this},n._configure=function(e){u=e,n.create=p(),u._configure();var t=f.Long?"toLong":"toNumber";f.merge(n.prototype,{int64:function(){return o.call(this)[t](!1)},uint64:function(){return o.call(this)[t](!0)},sint64:function(){return o.call(this).zzDecode()[t](!1)},fixed64:function(){return a.call(this)[t](!0)},sfixed64:function(){return a.call(this)[t](!1)}})}},function(e,t,r){"use strict";function i(e,t,r,i){if(Array.isArray(t)||(r=t,t=void 0),o.call(this,e,r),void 0!==t&&!Array.isArray(t))throw TypeError("fieldNames must be an Array");this.oneof=t||[],this.fieldsArray=[],this.comment=i}function n(e){if(e.parent)for(var t=0;t<e.fieldsArray.length;++t)e.fieldsArray[t].parent||e.parent.add(e.fieldsArray[t])}e.exports=i;var o=r(3);((i.prototype=Object.create(o.prototype)).constructor=i).className="OneOf";var s=r(4),a=r(0);i.fromJSON=function(e,t){return new i(e,t.oneof,t.options,t.comment)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return a.toObject(["options",this.options,"oneof",this.oneof,"comment",t?this.comment:void 0])},i.prototype.add=function(e){if(!(e instanceof s))throw TypeError("field must be a Field");return e.parent&&e.parent!==this.parent&&e.parent.remove(e),this.oneof.push(e.name),this.fieldsArray.push(e),e.partOf=this,n(this),this},i.prototype.remove=function(e){if(!(e instanceof s))throw TypeError("field must be a Field");var t=this.fieldsArray.indexOf(e);if(t<0)throw Error(e+" is not a member of "+this);return this.fieldsArray.splice(t,1),(t=this.oneof.indexOf(e.name))>-1&&this.oneof.splice(t,1),e.partOf=null,this},i.prototype.onAdd=function(e){o.prototype.onAdd.call(this,e);for(var t=0;t<this.oneof.length;++t){var r=e.get(this.oneof[t]);r&&!r.partOf&&(r.partOf=this,this.fieldsArray.push(r))}n(this)},i.prototype.onRemove=function(e){for(var t,r=0;r<this.fieldsArray.length;++r)(t=this.fieldsArray[r]).parent&&t.parent.remove(t);o.prototype.onRemove.call(this,e)},i.d=function(){for(var e=new Array(arguments.length),t=0;t<arguments.length;)e[t]=arguments[t++];return function(t,r){a.decorateType(t.constructor).add(new i(r,e)),Object.defineProperty(t,r,{get:a.oneOfGetter(e),set:a.oneOfSetter(e)})}}},function(e,t,r){"use strict";function i(e){if(e)for(var t=Object.keys(e),r=0;r<t.length;++r)this[t[r]]=e[t[r]]}e.exports=i;var n=r(1);i.create=function(e){return this.$type.create(e)},i.encode=function(e,t){return this.$type.encode(e,t)},i.encodeDelimited=function(e,t){return this.$type.encodeDelimited(e,t)},i.decode=function(e){return this.$type.decode(e)},i.decodeDelimited=function(e){return this.$type.decodeDelimited(e)},i.verify=function(e){return this.$type.verify(e)},i.fromObject=function(e){return this.$type.fromObject(e)},i.toObject=function(e,t){return this.$type.toObject(e,t)},i.prototype.toJSON=function(){return this.$type.toObject(this,n.toJSONOptions)}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Parser=void 0;var i=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),n=r(31),o=function(e){return e&&e.__esModule?e:{default:e}}(r(50));t.Parser=function(){function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e)}return i(e,[{key:"load",value:function(e,t,r){this.loadViaWorker(e,t,r)}},{key:"loadViaWorker",value:function(e,t,r){(0,o.default)(e,(function(e){var r=e.movie;r.version=e.ver;var i=e.images,o=new n.VideoEntity(r,i);t(o)}),r)}}]),e}()},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.RectPath=void 0;var i=r(5);t.RectPath=function(e){function t(e,r,i,n,o,s,a){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);var u=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return u._x=e,u._y=r,u._width=i,u._height=n,u._cornerRadius=o,u._transform=s,u._styles=a,u}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),t}(i.BezierPath)},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.EllipsePath=void 0;var i=r(5);t.EllipsePath=function(e){function t(e,r,i,n,o,s){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);var a=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return a._x=e,a._y=r,a._radiusX=i,a._radiusY=n,a._transform=o,a._styles=s,a}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),t}(i.BezierPath)},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=r(34),n=JSON.parse('{"nested":{"com":{"nested":{"opensource":{"nested":{"svga":{"options":{"objc_class_prefix":"SVGAProto","java_package":"com.opensource.svgaplayer.proto"},"nested":{"MovieParams":{"fields":{"viewBoxWidth":{"type":"float","id":1},"viewBoxHeight":{"type":"float","id":2},"fps":{"type":"int32","id":3},"frames":{"type":"int32","id":4}}},"SpriteEntity":{"fields":{"imageKey":{"type":"string","id":1},"frames":{"rule":"repeated","type":"FrameEntity","id":2},"matteKey":{"type":"string","id":3}}},"AudioEntity":{"fields":{"audioKey":{"type":"string","id":1},"startFrame":{"type":"int32","id":2},"endFrame":{"type":"int32","id":3},"startTime":{"type":"int32","id":4},"totalTime":{"type":"int32","id":5}}},"Layout":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4}}},"Transform":{"fields":{"a":{"type":"float","id":1},"b":{"type":"float","id":2},"c":{"type":"float","id":3},"d":{"type":"float","id":4},"tx":{"type":"float","id":5},"ty":{"type":"float","id":6}}},"ShapeEntity":{"oneofs":{"args":{"oneof":["shape","rect","ellipse"]}},"fields":{"type":{"type":"ShapeType","id":1},"shape":{"type":"ShapeArgs","id":2},"rect":{"type":"RectArgs","id":3},"ellipse":{"type":"EllipseArgs","id":4},"styles":{"type":"ShapeStyle","id":10},"transform":{"type":"Transform","id":11}},"nested":{"ShapeType":{"values":{"SHAPE":0,"RECT":1,"ELLIPSE":2,"KEEP":3}},"ShapeArgs":{"fields":{"d":{"type":"string","id":1}}},"RectArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4},"cornerRadius":{"type":"float","id":5}}},"EllipseArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"radiusX":{"type":"float","id":3},"radiusY":{"type":"float","id":4}}},"ShapeStyle":{"fields":{"fill":{"type":"RGBAColor","id":1},"stroke":{"type":"RGBAColor","id":2},"strokeWidth":{"type":"float","id":3},"lineCap":{"type":"LineCap","id":4},"lineJoin":{"type":"LineJoin","id":5},"miterLimit":{"type":"float","id":6},"lineDashI":{"type":"float","id":7},"lineDashII":{"type":"float","id":8},"lineDashIII":{"type":"float","id":9}},"nested":{"RGBAColor":{"fields":{"r":{"type":"float","id":1},"g":{"type":"float","id":2},"b":{"type":"float","id":3},"a":{"type":"float","id":4}}},"LineCap":{"values":{"LineCap_BUTT":0,"LineCap_ROUND":1,"LineCap_SQUARE":2}},"LineJoin":{"values":{"LineJoin_MITER":0,"LineJoin_ROUND":1,"LineJoin_BEVEL":2}}}}}},"FrameEntity":{"fields":{"alpha":{"type":"float","id":1},"layout":{"type":"Layout","id":2},"transform":{"type":"Transform","id":3},"clipPath":{"type":"string","id":4},"shapes":{"rule":"repeated","type":"ShapeEntity","id":5}}},"MovieEntity":{"fields":{"version":{"type":"string","id":1},"params":{"type":"MovieParams","id":2},"images":{"keyType":"string","type":"bytes","id":3},"sprites":{"rule":"repeated","type":"SpriteEntity","id":4},"audios":{"rule":"repeated","type":"AudioEntity","id":5}}}}}}}}}}}'),o=t.proto=i.Root.fromJSON(n);t.ProtoMovieEntity=o.lookupType("com.opensource.svga.MovieEntity")},function(e,t,r){"use strict";e.exports=function(e,t){for(var r=new Array(arguments.length-1),i=0,n=2,o=!0;n<arguments.length;)r[i++]=arguments[n++];return new Promise((function(n,s){r[i]=function(e){if(o)if(o=!1,e)s(e);else{for(var t=new Array(arguments.length-1),r=0;r<t.length;)t[r++]=arguments[r];n.apply(null,t)}};try{e.apply(t||null,r)}catch(e){o&&(o=!1,s(e))}}))}},function(module,exports,__webpack_require__){"use strict";function inquire(moduleName){try{var mod=eval("quire".replace(/^/,"re"))(moduleName);if(mod&&(mod.length||Object.keys(mod).length))return mod}catch(e){}return null}module.exports=inquire},function(e,t,r){"use strict";t.Service=r(46)},function(e,t,r){"use strict";e.exports={}},function(e,t,r){"use strict";function i(e,t,r,i){return t.resolvedType.group?e("types[%i].encode(%s,w.uint32(%i)).uint32(%i)",r,i,(t.id<<3|3)>>>0,(t.id<<3|4)>>>0):e("types[%i].encode(%s,w.uint32(%i).fork()).ldelim()",r,i,(t.id<<3|2)>>>0)}e.exports=function(e){for(var t,r=s.codegen(["m","w"],e.name+"$encode")("if(!w)")("w=Writer.create()"),a=e.fieldsArray.slice().sort(s.compareFieldsById),u=0;u<a.length;++u){var f=a[u].resolve(),l=e._fieldsArray.indexOf(f),h=f.resolvedType instanceof n?"int32":f.type,c=o.basic[h];t="m"+s.safeProp(f.name),f.map?(r("if(%s!=null&&Object.hasOwnProperty.call(m,%j)){",t,f.name)("for(var ks=Object.keys(%s),i=0;i<ks.length;++i){",t)("w.uint32(%i).fork().uint32(%i).%s(ks[i])",(f.id<<3|2)>>>0,8|o.mapKey[f.keyType],f.keyType),void 0===c?r("types[%i].encode(%s[ks[i]],w.uint32(18).fork()).ldelim().ldelim()",l,t):r(".uint32(%i).%s(%s[ks[i]]).ldelim()",16|c,h,t),r("}")("}")):f.repeated?(r("if(%s!=null&&%s.length){",t,t),f.packed&&void 0!==o.packed[h]?r("w.uint32(%i).fork()",(f.id<<3|2)>>>0)("for(var i=0;i<%s.length;++i)",t)("w.%s(%s[i])",h,t)("w.ldelim()"):(r("for(var i=0;i<%s.length;++i)",t),void 0===c?i(r,f,l,t+"[i]"):r("w.uint32(%i).%s(%s[i])",(f.id<<3|c)>>>0,h,t)),r("}")):(f.optional&&r("if(%s!=null&&Object.hasOwnProperty.call(m,%j))",t,f.name),void 0===c?i(r,f,l,t):r("w.uint32(%i).%s(%s)",(f.id<<3|c)>>>0,h,t))}return r("return w")};var n=r(2),o=r(7),s=r(0)},function(e,t,r){"use strict";function i(e,t){o.call(this,e,t),this.fields={},this.oneofs=void 0,this.extensions=void 0,this.reserved=void 0,this.group=void 0,this._fieldsById=null,this._fieldsArray=null,this._oneofsArray=null,this._ctor=null}function n(e){return e._fieldsById=e._fieldsArray=e._oneofsArray=null,delete e.encode,delete e.decode,delete e.verify,e}e.exports=i;var o=r(6);((i.prototype=Object.create(o.prototype)).constructor=i).className="Type";var s=r(2),a=r(11),u=r(4),f=r(23),l=r(24),h=r(12),c=r(10),p=r(9),d=r(0),y=r(21),m=r(26),v=r(27),b=r(28),g=r(29);Object.defineProperties(i.prototype,{fieldsById:{get:function(){if(this._fieldsById)return this._fieldsById;this._fieldsById={};for(var e=Object.keys(this.fields),t=0;t<e.length;++t){var r=this.fields[e[t]],i=r.id;if(this._fieldsById[i])throw Error("duplicate id "+i+" in "+this);this._fieldsById[i]=r}return this._fieldsById}},fieldsArray:{get:function(){return this._fieldsArray||(this._fieldsArray=d.toArray(this.fields))}},oneofsArray:{get:function(){return this._oneofsArray||(this._oneofsArray=d.toArray(this.oneofs))}},ctor:{get:function(){return this._ctor||(this.ctor=i.generateConstructor(this)())},set:function(e){var t=e.prototype;t instanceof h||((e.prototype=new h).constructor=e,d.merge(e.prototype,t)),e.$type=e.prototype.$type=this,d.merge(e,h,!0),this._ctor=e;for(var r=0;r<this.fieldsArray.length;++r)this._fieldsArray[r].resolve();var i={};for(r=0;r<this.oneofsArray.length;++r)i[this._oneofsArray[r].resolve().name]={get:d.oneOfGetter(this._oneofsArray[r].oneof),set:d.oneOfSetter(this._oneofsArray[r].oneof)};r&&Object.defineProperties(e.prototype,i)}}}),i.generateConstructor=function(e){for(var t,r=d.codegen(["p"],e.name),i=0;i<e.fieldsArray.length;++i)(t=e._fieldsArray[i]).map?r("this%s={}",d.safeProp(t.name)):t.repeated&&r("this%s=[]",d.safeProp(t.name));return r("if(p)for(var ks=Object.keys(p),i=0;i<ks.length;++i)if(p[ks[i]]!=null)")("this[ks[i]]=p[ks[i]]")},i.fromJSON=function(e,t){var r=new i(e,t.options);r.extensions=t.extensions,r.reserved=t.reserved;for(var n=Object.keys(t.fields),h=0;h<n.length;++h)r.add((void 0!==t.fields[n[h]].keyType?f.fromJSON:u.fromJSON)(n[h],t.fields[n[h]]));if(t.oneofs)for(n=Object.keys(t.oneofs),h=0;h<n.length;++h)r.add(a.fromJSON(n[h],t.oneofs[n[h]]));if(t.nested)for(n=Object.keys(t.nested),h=0;h<n.length;++h){var c=t.nested[n[h]];r.add((void 0!==c.id?u.fromJSON:void 0!==c.fields?i.fromJSON:void 0!==c.values?s.fromJSON:void 0!==c.methods?l.fromJSON:o.fromJSON)(n[h],c))}return t.extensions&&t.extensions.length&&(r.extensions=t.extensions),t.reserved&&t.reserved.length&&(r.reserved=t.reserved),t.group&&(r.group=!0),t.comment&&(r.comment=t.comment),r},i.prototype.toJSON=function(e){var t=o.prototype.toJSON.call(this,e),r=!!e&&Boolean(e.keepComments);return d.toObject(["options",t&&t.options||void 0,"oneofs",o.arrayToJSON(this.oneofsArray,e),"fields",o.arrayToJSON(this.fieldsArray.filter((function(e){return!e.declaringField})),e)||{},"extensions",this.extensions&&this.extensions.length?this.extensions:void 0,"reserved",this.reserved&&this.reserved.length?this.reserved:void 0,"group",this.group||void 0,"nested",t&&t.nested||void 0,"comment",r?this.comment:void 0])},i.prototype.resolveAll=function(){for(var e=this.fieldsArray,t=0;t<e.length;)e[t++].resolve();var r=this.oneofsArray;for(t=0;t<r.length;)r[t++].resolve();return o.prototype.resolveAll.call(this)},i.prototype.get=function(e){return this.fields[e]||this.oneofs&&this.oneofs[e]||this.nested&&this.nested[e]||null},i.prototype.add=function(e){if(this.get(e.name))throw Error("duplicate name '"+e.name+"' in "+this);if(e instanceof u&&void 0===e.extend){if(this._fieldsById?this._fieldsById[e.id]:this.fieldsById[e.id])throw Error("duplicate id "+e.id+" in "+this);if(this.isReservedId(e.id))throw Error("id "+e.id+" is reserved in "+this);if(this.isReservedName(e.name))throw Error("name '"+e.name+"' is reserved in "+this);return e.parent&&e.parent.remove(e),this.fields[e.name]=e,e.message=this,e.onAdd(this),n(this)}return e instanceof a?(this.oneofs||(this.oneofs={}),this.oneofs[e.name]=e,e.onAdd(this),n(this)):o.prototype.add.call(this,e)},i.prototype.remove=function(e){if(e instanceof u&&void 0===e.extend){if(!this.fields||this.fields[e.name]!==e)throw Error(e+" is not a member of "+this);return delete this.fields[e.name],e.parent=null,e.onRemove(this),n(this)}if(e instanceof a){if(!this.oneofs||this.oneofs[e.name]!==e)throw Error(e+" is not a member of "+this);return delete this.oneofs[e.name],e.parent=null,e.onRemove(this),n(this)}return o.prototype.remove.call(this,e)},i.prototype.isReservedId=function(e){return o.isReservedId(this.reserved,e)},i.prototype.isReservedName=function(e){return o.isReservedName(this.reserved,e)},i.prototype.create=function(e){return new this.ctor(e)},i.prototype.setup=function(){for(var e=this.fullName,t=[],r=0;r<this.fieldsArray.length;++r)t.push(this._fieldsArray[r].resolve().resolvedType);this.encode=y(this)({Writer:p,types:t,util:d}),this.decode=m(this)({Reader:c,types:t,util:d}),this.verify=v(this)({types:t,util:d}),this.fromObject=b.fromObject(this)({types:t,util:d}),this.toObject=b.toObject(this)({types:t,util:d});var i=g[e];if(i){var n=Object.create(this);n.fromObject=this.fromObject,this.fromObject=i.fromObject.bind(n),n.toObject=this.toObject,this.toObject=i.toObject.bind(n)}return this},i.prototype.encode=function(e,t){return this.setup().encode(e,t)},i.prototype.encodeDelimited=function(e,t){return this.encode(e,t&&t.len?t.fork():t).ldelim()},i.prototype.decode=function(e,t){return this.setup().decode(e,t)},i.prototype.decodeDelimited=function(e){return e instanceof c||(e=c.create(e)),this.decode(e,e.uint32())},i.prototype.verify=function(e){return this.setup().verify(e)},i.prototype.fromObject=function(e){return this.setup().fromObject(e)},i.prototype.toObject=function(e,t){return this.setup().toObject(e,t)},i.d=function(e){return function(t){d.decorateType(t,e)}}},function(e,t,r){"use strict";function i(e,t,r,i,o,a){if(n.call(this,e,t,i,void 0,void 0,o,a),!s.isString(r))throw TypeError("keyType must be a string");this.keyType=r,this.resolvedKeyType=null,this.map=!0}e.exports=i;var n=r(4);((i.prototype=Object.create(n.prototype)).constructor=i).className="MapField";var o=r(7),s=r(0);i.fromJSON=function(e,t){return new i(e,t.id,t.keyType,t.type,t.options,t.comment)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return s.toObject(["keyType",this.keyType,"type",this.type,"id",this.id,"extend",this.extend,"options",this.options,"comment",t?this.comment:void 0])},i.prototype.resolve=function(){if(this.resolved)return this;if(void 0===o.mapKey[this.keyType])throw Error("invalid key type: "+this.keyType);return n.prototype.resolve.call(this)},i.d=function(e,t,r){return"function"==typeof r?r=s.decorateType(r).name:r&&"object"==typeof r&&(r=s.decorateEnum(r).name),function(n,o){s.decorateType(n.constructor).add(new i(o,e,t,r))}}},function(e,t,r){"use strict";function i(e,t){o.call(this,e,t),this.methods={},this._methodsArray=null}function n(e){return e._methodsArray=null,e}e.exports=i;var o=r(6);((i.prototype=Object.create(o.prototype)).constructor=i).className="Service";var s=r(25),a=r(0),u=r(19);i.fromJSON=function(e,t){var r=new i(e,t.options);if(t.methods)for(var n=Object.keys(t.methods),o=0;o<n.length;++o)r.add(s.fromJSON(n[o],t.methods[n[o]]));return t.nested&&r.addJSON(t.nested),r.comment=t.comment,r},i.prototype.toJSON=function(e){var t=o.prototype.toJSON.call(this,e),r=!!e&&Boolean(e.keepComments);return a.toObject(["options",t&&t.options||void 0,"methods",o.arrayToJSON(this.methodsArray,e)||{},"nested",t&&t.nested||void 0,"comment",r?this.comment:void 0])},Object.defineProperty(i.prototype,"methodsArray",{get:function(){return this._methodsArray||(this._methodsArray=a.toArray(this.methods))}}),i.prototype.get=function(e){return this.methods[e]||o.prototype.get.call(this,e)},i.prototype.resolveAll=function(){for(var e=this.methodsArray,t=0;t<e.length;++t)e[t].resolve();return o.prototype.resolve.call(this)},i.prototype.add=function(e){if(this.get(e.name))throw Error("duplicate name '"+e.name+"' in "+this);return e instanceof s?(this.methods[e.name]=e,e.parent=this,n(this)):o.prototype.add.call(this,e)},i.prototype.remove=function(e){if(e instanceof s){if(this.methods[e.name]!==e)throw Error(e+" is not a member of "+this);return delete this.methods[e.name],e.parent=null,n(this)}return o.prototype.remove.call(this,e)},i.prototype.create=function(e,t,r){for(var i,n=new u.Service(e,t,r),o=0;o<this.methodsArray.length;++o){var s=a.lcFirst((i=this._methodsArray[o]).resolve().name).replace(/[^$\w_]/g,"");n[s]=a.codegen(["r","c"],a.isReserved(s)?s+"_":s)("return this.rpcCall(m,q,s,r,c)")({m:i,q:i.resolvedRequestType.ctor,s:i.resolvedResponseType.ctor})}return n}},function(e,t,r){"use strict";function i(e,t,r,i,s,a,u,f,l){if(o.isObject(s)?(u=s,s=a=void 0):o.isObject(a)&&(u=a,a=void 0),void 0!==t&&!o.isString(t))throw TypeError("type must be a string");if(!o.isString(r))throw TypeError("requestType must be a string");if(!o.isString(i))throw TypeError("responseType must be a string");n.call(this,e,u),this.type=t||"rpc",this.requestType=r,this.requestStream=!!s||void 0,this.responseType=i,this.responseStream=!!a||void 0,this.resolvedRequestType=null,this.resolvedResponseType=null,this.comment=f,this.parsedOptions=l}e.exports=i;var n=r(3);((i.prototype=Object.create(n.prototype)).constructor=i).className="Method";var o=r(0);i.fromJSON=function(e,t){return new i(e,t.type,t.requestType,t.responseType,t.requestStream,t.responseStream,t.options,t.comment,t.parsedOptions)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return o.toObject(["type","rpc"!==this.type&&this.type||void 0,"requestType",this.requestType,"requestStream",this.requestStream,"responseType",this.responseType,"responseStream",this.responseStream,"options",this.options,"comment",t?this.comment:void 0,"parsedOptions",this.parsedOptions])},i.prototype.resolve=function(){return this.resolved?this:(this.resolvedRequestType=this.parent.lookupType(this.requestType),this.resolvedResponseType=this.parent.lookupType(this.responseType),n.prototype.resolve.call(this))}},function(e,t,r){"use strict";function i(e){return"missing required '"+e.name+"'"}e.exports=function(e){var t=s.codegen(["r","l"],e.name+"$decode")("if(!(r instanceof Reader))")("r=Reader.create(r)")("var c=l===undefined?r.len:r.pos+l,m=new this.ctor"+(e.fieldsArray.filter((function(e){return e.map})).length?",k,value":""))("while(r.pos<c){")("var t=r.uint32()");e.group&&t("if((t&7)===4)")("break"),t("switch(t>>>3){");for(var r=0;r<e.fieldsArray.length;++r){var a=e._fieldsArray[r].resolve(),u=a.resolvedType instanceof n?"int32":a.type,f="m"+s.safeProp(a.name);t("case %i:",a.id),a.map?(t("if(%s===util.emptyObject)",f)("%s={}",f)("var c2 = r.uint32()+r.pos"),void 0!==o.defaults[a.keyType]?t("k=%j",o.defaults[a.keyType]):t("k=null"),void 0!==o.defaults[u]?t("value=%j",o.defaults[u]):t("value=null"),t("while(r.pos<c2){")("var tag2=r.uint32()")("switch(tag2>>>3){")("case 1: k=r.%s(); break",a.keyType)("case 2:"),void 0===o.basic[u]?t("value=types[%i].decode(r,r.uint32())",r):t("value=r.%s()",u),t("break")("default:")("r.skipType(tag2&7)")("break")("}")("}"),void 0!==o.long[a.keyType]?t('%s[typeof k==="object"?util.longToHash(k):k]=value',f):t("%s[k]=value",f)):a.repeated?(t("if(!(%s&&%s.length))",f,f)("%s=[]",f),void 0!==o.packed[u]&&t("if((t&7)===2){")("var c2=r.uint32()+r.pos")("while(r.pos<c2)")("%s.push(r.%s())",f,u)("}else"),void 0===o.basic[u]?t(a.resolvedType.group?"%s.push(types[%i].decode(r))":"%s.push(types[%i].decode(r,r.uint32()))",f,r):t("%s.push(r.%s())",f,u)):void 0===o.basic[u]?t(a.resolvedType.group?"%s=types[%i].decode(r)":"%s=types[%i].decode(r,r.uint32())",f,r):t("%s=r.%s()",f,u),t("break")}for(t("default:")("r.skipType(t&7)")("break")("}")("}"),r=0;r<e._fieldsArray.length;++r){var l=e._fieldsArray[r];l.required&&t("if(!m.hasOwnProperty(%j))",l.name)("throw util.ProtocolError(%j,{instance:m})",i(l))}return t("return m")};var n=r(2),o=r(7),s=r(0)},function(e,t,r){"use strict";function i(e,t){return e.name+": "+t+(e.repeated&&"array"!==t?"[]":e.map&&"object"!==t?"{k:"+e.keyType+"}":"")+" expected"}function n(e,t,r,n){if(t.resolvedType)if(t.resolvedType instanceof s){e("switch(%s){",n)("default:")("return%j",i(t,"enum value"));for(var o=Object.keys(t.resolvedType.values),a=0;a<o.length;++a)e("case %i:",t.resolvedType.values[o[a]]);e("break")("}")}else e("{")("var e=types[%i].verify(%s);",r,n)("if(e)")("return%j+e",t.name+".")("}");else switch(t.type){case"int32":case"uint32":case"sint32":case"fixed32":case"sfixed32":e("if(!util.isInteger(%s))",n)("return%j",i(t,"integer"));break;case"int64":case"uint64":case"sint64":case"fixed64":case"sfixed64":e("if(!util.isInteger(%s)&&!(%s&&util.isInteger(%s.low)&&util.isInteger(%s.high)))",n,n,n,n)("return%j",i(t,"integer|Long"));break;case"float":case"double":e('if(typeof %s!=="number")',n)("return%j",i(t,"number"));break;case"bool":e('if(typeof %s!=="boolean")',n)("return%j",i(t,"boolean"));break;case"string":e("if(!util.isString(%s))",n)("return%j",i(t,"string"));break;case"bytes":e('if(!(%s&&typeof %s.length==="number"||util.isString(%s)))',n,n,n)("return%j",i(t,"buffer"))}return e}function o(e,t,r){switch(t.keyType){case"int32":case"uint32":case"sint32":case"fixed32":case"sfixed32":e("if(!util.key32Re.test(%s))",r)("return%j",i(t,"integer key"));break;case"int64":case"uint64":case"sint64":case"fixed64":case"sfixed64":e("if(!util.key64Re.test(%s))",r)("return%j",i(t,"integer|Long key"));break;case"bool":e("if(!util.key2Re.test(%s))",r)("return%j",i(t,"boolean key"))}return e}e.exports=function(e){var t=a.codegen(["m"],e.name+"$verify")('if(typeof m!=="object"||m===null)')("return%j","object expected"),r={};e.oneofsArray.length&&t("var p={}");for(var s=0;s<e.fieldsArray.length;++s){var u=e._fieldsArray[s].resolve(),f="m"+a.safeProp(u.name);if(u.optional&&t("if(%s!=null&&m.hasOwnProperty(%j)){",f,u.name),u.map)t("if(!util.isObject(%s))",f)("return%j",i(u,"object"))("var k=Object.keys(%s)",f)("for(var i=0;i<k.length;++i){"),o(t,u,"k[i]"),n(t,u,s,f+"[k[i]]")("}");else if(u.repeated)t("if(!Array.isArray(%s))",f)("return%j",i(u,"array"))("for(var i=0;i<%s.length;++i){",f),n(t,u,s,f+"[i]")("}");else{if(u.partOf){var l=a.safeProp(u.partOf.name);1===r[u.partOf.name]&&t("if(p%s===1)",l)("return%j",u.partOf.name+": multiple values"),r[u.partOf.name]=1,t("p%s=1",l)}n(t,u,s,f)}u.optional&&t("}")}return t("return null")};var s=r(2),a=r(0)},function(e,t,r){"use strict";function i(e,t,r,i){if(t.resolvedType)if(t.resolvedType instanceof s){e("switch(d%s){",i);for(var n=t.resolvedType.values,o=Object.keys(n),a=0;a<o.length;++a)t.repeated&&n[o[a]]===t.typeDefault&&e("default:"),e("case%j:",o[a])("case %i:",n[o[a]])("m%s=%j",i,n[o[a]])("break");e("}")}else e('if(typeof d%s!=="object")',i)("throw TypeError(%j)",t.fullName+": object expected")("m%s=types[%i].fromObject(d%s)",i,r,i);else{var u=!1;switch(t.type){case"double":case"float":e("m%s=Number(d%s)",i,i);break;case"uint32":case"fixed32":e("m%s=d%s>>>0",i,i);break;case"int32":case"sint32":case"sfixed32":e("m%s=d%s|0",i,i);break;case"uint64":u=!0;case"int64":case"sint64":case"fixed64":case"sfixed64":e("if(util.Long)")("(m%s=util.Long.fromValue(d%s)).unsigned=%j",i,i,u)('else if(typeof d%s==="string")',i)("m%s=parseInt(d%s,10)",i,i)('else if(typeof d%s==="number")',i)("m%s=d%s",i,i)('else if(typeof d%s==="object")',i)("m%s=new util.LongBits(d%s.low>>>0,d%s.high>>>0).toNumber(%s)",i,i,i,u?"true":"");break;case"bytes":e('if(typeof d%s==="string")',i)("util.base64.decode(d%s,m%s=util.newBuffer(util.base64.length(d%s)),0)",i,i,i)("else if(d%s.length)",i)("m%s=d%s",i,i);break;case"string":e("m%s=String(d%s)",i,i);break;case"bool":e("m%s=Boolean(d%s)",i,i)}}return e}function n(e,t,r,i){if(t.resolvedType)t.resolvedType instanceof s?e("d%s=o.enums===String?types[%i].values[m%s]:m%s",i,r,i,i):e("d%s=types[%i].toObject(m%s,o)",i,r,i);else{var n=!1;switch(t.type){case"double":case"float":e("d%s=o.json&&!isFinite(m%s)?String(m%s):m%s",i,i,i,i);break;case"uint64":n=!0;case"int64":case"sint64":case"fixed64":case"sfixed64":e('if(typeof m%s==="number")',i)("d%s=o.longs===String?String(m%s):m%s",i,i,i)("else")("d%s=o.longs===String?util.Long.prototype.toString.call(m%s):o.longs===Number?new util.LongBits(m%s.low>>>0,m%s.high>>>0).toNumber(%s):m%s",i,i,i,i,n?"true":"",i);break;case"bytes":e("d%s=o.bytes===String?util.base64.encode(m%s,0,m%s.length):o.bytes===Array?Array.prototype.slice.call(m%s):m%s",i,i,i,i,i);break;default:e("d%s=m%s",i,i)}}return e}var o=t,s=r(2),a=r(0);o.fromObject=function(e){var t=e.fieldsArray,r=a.codegen(["d"],e.name+"$fromObject")("if(d instanceof this.ctor)")("return d");if(!t.length)return r("return new this.ctor");r("var m=new this.ctor");for(var n=0;n<t.length;++n){var o=t[n].resolve(),u=a.safeProp(o.name);o.map?(r("if(d%s){",u)('if(typeof d%s!=="object")',u)("throw TypeError(%j)",o.fullName+": object expected")("m%s={}",u)("for(var ks=Object.keys(d%s),i=0;i<ks.length;++i){",u),i(r,o,n,u+"[ks[i]]")("}")("}")):o.repeated?(r("if(d%s){",u)("if(!Array.isArray(d%s))",u)("throw TypeError(%j)",o.fullName+": array expected")("m%s=[]",u)("for(var i=0;i<d%s.length;++i){",u),i(r,o,n,u+"[i]")("}")("}")):(o.resolvedType instanceof s||r("if(d%s!=null){",u),i(r,o,n,u),o.resolvedType instanceof s||r("}"))}return r("return m")},o.toObject=function(e){var t=e.fieldsArray.slice().sort(a.compareFieldsById);if(!t.length)return a.codegen()("return {}");for(var r=a.codegen(["m","o"],e.name+"$toObject")("if(!o)")("o={}")("var d={}"),i=[],o=[],u=[],f=0;f<t.length;++f)t[f].partOf||(t[f].resolve().repeated?i:t[f].map?o:u).push(t[f]);if(i.length){for(r("if(o.arrays||o.defaults){"),f=0;f<i.length;++f)r("d%s=[]",a.safeProp(i[f].name));r("}")}if(o.length){for(r("if(o.objects||o.defaults){"),f=0;f<o.length;++f)r("d%s={}",a.safeProp(o[f].name));r("}")}if(u.length){for(r("if(o.defaults){"),f=0;f<u.length;++f){var l=u[f],h=a.safeProp(l.name);if(l.resolvedType instanceof s)r("d%s=o.enums===String?%j:%j",h,l.resolvedType.valuesById[l.typeDefault],l.typeDefault);else if(l.long)r("if(util.Long){")("var n=new util.Long(%i,%i,%j)",l.typeDefault.low,l.typeDefault.high,l.typeDefault.unsigned)("d%s=o.longs===String?n.toString():o.longs===Number?n.toNumber():n",h)("}else")("d%s=o.longs===String?%j:%i",h,l.typeDefault.toString(),l.typeDefault.toNumber());else if(l.bytes){var c="["+Array.prototype.slice.call(l.typeDefault).join(",")+"]";r("if(o.bytes===String)d%s=%j",h,String.fromCharCode.apply(String,l.typeDefault))("else{")("d%s=%s",h,c)("if(o.bytes!==Array)d%s=util.newBuffer(d%s)",h,h)("}")}else r("d%s=%j",h,l.typeDefault)}r("}")}var p=!1;for(f=0;f<t.length;++f){l=t[f];var d=e._fieldsArray.indexOf(l);h=a.safeProp(l.name);l.map?(p||(p=!0,r("var ks2")),r("if(m%s&&(ks2=Object.keys(m%s)).length){",h,h)("d%s={}",h)("for(var j=0;j<ks2.length;++j){"),n(r,l,d,h+"[ks2[j]]")("}")):l.repeated?(r("if(m%s&&m%s.length){",h,h)("d%s=[]",h)("for(var j=0;j<m%s.length;++j){",h),n(r,l,d,h+"[j]")("}")):(r("if(m%s!=null&&m.hasOwnProperty(%j)){",h,l.name),n(r,l,d,h),l.partOf&&r("if(o.oneofs)")("d%s=%j",a.safeProp(l.partOf.name),l.name)),r("}")}return r("return d")}},function(e,t,r){"use strict";var i=t,n=r(12);i[".google.protobuf.Any"]={fromObject:function(e){if(e&&e["@type"]){var t=e["@type"].substring(e["@type"].lastIndexOf("/")+1),r=this.lookup(t);if(r){var i="."===e["@type"].charAt(0)?e["@type"].substr(1):e["@type"];return-1===i.indexOf("/")&&(i="/"+i),this.create({type_url:i,value:r.encode(r.fromObject(e)).finish()})}}return this.fromObject(e)},toObject:function(e,t){var r="",i="";if(t&&t.json&&e.type_url&&e.value){i=e.type_url.substring(e.type_url.lastIndexOf("/")+1),r=e.type_url.substring(0,e.type_url.lastIndexOf("/")+1);var o=this.lookup(i);o&&(e=o.decode(e.value))}if(!(e instanceof this.ctor)&&e instanceof n){var s=e.$type.toObject(e,t);return""===r&&(r="type.googleapis.com/"),i=r+("."===e.$type.fullName[0]?e.$type.fullName.substr(1):e.$type.fullName),s["@type"]=i,s}return this.toObject(e,t)}}},function(e,t,r){"use strict";function i(e){s.call(this,"",e),this.deferred=[],this.files=[]}function n(){}function o(e,t){var r=t.parent.lookup(t.extend);if(r){var i=new l(t.fullName,t.id,t.type,t.rule,void 0,t.options);return i.declaringField=t,t.extensionField=i,r.add(i),!0}return!1}e.exports=i;var s=r(6);((i.prototype=Object.create(s.prototype)).constructor=i).className="Root";var a,u,f,l=r(4),h=r(2),c=r(11),p=r(0);i.fromJSON=function(e,t){return t||(t=new i),e.options&&t.setOptions(e.options),t.addJSON(e.nested)},i.prototype.resolvePath=p.path.resolve,i.prototype.fetch=p.fetch,i.prototype.load=function e(t,r,i){function o(e,t){if(i){var r=i;if(i=null,c)throw e;r(e,t)}}function s(e){var t=e.lastIndexOf("google/protobuf/");if(t>-1){var r=e.substring(t);if(r in f)return r}return null}function a(e,t){try{if(p.isString(t)&&"{"===t.charAt(0)&&(t=JSON.parse(t)),p.isString(t)){u.filename=e;var i,n=u(t,h,r),a=0;if(n.imports)for(;a<n.imports.length;++a)(i=s(n.imports[a])||h.resolvePath(e,n.imports[a]))&&l(i);if(n.weakImports)for(a=0;a<n.weakImports.length;++a)(i=s(n.weakImports[a])||h.resolvePath(e,n.weakImports[a]))&&l(i,!0)}else h.setOptions(t.options).addJSON(t.nested)}catch(e){o(e)}c||d||o(null,h)}function l(e,t){if(!(h.files.indexOf(e)>-1)){if(h.files.push(e),e in f)return void(c?a(e,f[e]):(++d,setTimeout((function(){--d,a(e,f[e])}))));if(c){var r;try{r=p.fs.readFileSync(e).toString("utf8")}catch(e){return void(t||o(e))}a(e,r)}else++d,h.fetch(e,(function(r,n){if(--d,i)return r?void(t?d||o(null,h):o(r)):void a(e,n)}))}}"function"==typeof r&&(i=r,r=void 0);var h=this;if(!i)return p.asPromise(e,h,t,r);var c=i===n,d=0;p.isString(t)&&(t=[t]);for(var y,m=0;m<t.length;++m)(y=h.resolvePath("",t[m]))&&l(y);if(c)return h;d||o(null,h)},i.prototype.loadSync=function(e,t){if(!p.isNode)throw Error("not supported");return this.load(e,t,n)},i.prototype.resolveAll=function(){if(this.deferred.length)throw Error("unresolvable extensions: "+this.deferred.map((function(e){return"'extend "+e.extend+"' in "+e.parent.fullName})).join(", "));return s.prototype.resolveAll.call(this)};var d=/^[A-Z]/;i.prototype._handleAdd=function(e){if(e instanceof l)void 0===e.extend||e.extensionField||o(0,e)||this.deferred.push(e);else if(e instanceof h)d.test(e.name)&&(e.parent[e.name]=e.values);else if(!(e instanceof c)){if(e instanceof a)for(var t=0;t<this.deferred.length;)o(0,this.deferred[t])?this.deferred.splice(t,1):++t;for(var r=0;r<e.nestedArray.length;++r)this._handleAdd(e._nestedArray[r]);d.test(e.name)&&(e.parent[e.name]=e)}},i.prototype._handleRemove=function(e){if(e instanceof l){if(void 0!==e.extend)if(e.extensionField)e.extensionField.parent.remove(e.extensionField),e.extensionField=null;else{var t=this.deferred.indexOf(e);t>-1&&this.deferred.splice(t,1)}}else if(e instanceof h)d.test(e.name)&&delete e.parent[e.name];else if(e instanceof s){for(var r=0;r<e.nestedArray.length;++r)this._handleRemove(e._nestedArray[r]);d.test(e.name)&&delete e.parent[e.name]}},i._configure=function(e,t,r){a=e,u=t,f=r}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.VideoEntity=void 0;var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),o=r(32),s=r(16).ProtoMovieEntity;t.VideoEntity=function(){function e(t,r){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this.version="",this.videoSize={width:0,height:0},this.FPS=20,this.frames=0,this.images={},this.sprites=[],this.audios=[],"object"===(void 0===t?"undefined":i(t))&&t.$type==s?("object"===i(t.params)&&(this.version=t.ver,this.videoSize.width=t.params.viewBoxWidth||0,this.videoSize.height=t.params.viewBoxHeight||0,this.FPS=t.params.fps||20,this.frames=t.params.frames||0),this.resetSprites(t),this.audios=t.audios):t&&(t.movie&&(t.movie.viewBox&&(this.videoSize.width=parseFloat(t.movie.viewBox.width)||0,this.videoSize.height=parseFloat(t.movie.viewBox.height)||0),this.version=t.ver,this.FPS=parseInt(t.movie.fps)||20,this.frames=parseInt(t.movie.frames)||0),this.resetSprites(t)),r&&(this.images=r)}return n(e,[{key:"resetSprites",value:function(e){e.sprites instanceof Array&&(this.sprites=e.sprites.map((function(e){return new o.SpriteEntity(e)})))}}]),e}()},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.SpriteEntity=void 0;var i=r(33);r(5),r(14),r(15),t.SpriteEntity=function e(t){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this.matteKey=null,this.imageKey=null,this.frames=[],this.matteKey=t.matteKey,this.imageKey=t.imageKey,t.frames&&(this.frames=t.frames.map((function(e){return new i.FrameEntity(e)})))}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.FrameEntity=void 0;var i=r(5);t.FrameEntity=function e(t){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this.alpha=0,this.transform={a:1,b:0,c:0,d:1,tx:0,ty:0},this.layout={x:0,y:0,width:0,height:0},this.nx=0,this.ny=0,this.maskPath=null,this.shapes=[],this.alpha=parseFloat(t.alpha)||0,t.layout&&(this.layout.x=parseFloat(t.layout.x)||0,this.layout.y=parseFloat(t.layout.y)||0,this.layout.width=parseFloat(t.layout.width)||0,this.layout.height=parseFloat(t.layout.height)||0),t.transform&&(this.transform.a=parseFloat(t.transform.a)||1,this.transform.b=parseFloat(t.transform.b)||0,this.transform.c=parseFloat(t.transform.c)||0,this.transform.d=parseFloat(t.transform.d)||1,this.transform.tx=parseFloat(t.transform.tx)||0,this.transform.ty=parseFloat(t.transform.ty)||0),t.clipPath&&t.clipPath.length>0&&(this.maskPath=new i.BezierPath(t.clipPath,void 0,{fill:"#000000"})),t.shapes&&(t.shapes instanceof Array&&t.shapes.forEach((function(e){switch(e.pathArgs=e.args,e.type){case 0:e.type="shape",e.pathArgs=e.shape;break;case 1:e.type="rect",e.pathArgs=e.rect;break;case 2:e.type="ellipse",e.pathArgs=e.ellipse;break;case 3:e.type="keep"}if(e.styles){e.styles.fill&&("number"==typeof e.styles.fill.r&&(e.styles.fill[0]=e.styles.fill.r),"number"==typeof e.styles.fill.g&&(e.styles.fill[1]=e.styles.fill.g),"number"==typeof e.styles.fill.b&&(e.styles.fill[2]=e.styles.fill.b),"number"==typeof e.styles.fill.a&&(e.styles.fill[3]=e.styles.fill.a)),e.styles.stroke&&("number"==typeof e.styles.stroke.r&&(e.styles.stroke[0]=e.styles.stroke.r),"number"==typeof e.styles.stroke.g&&(e.styles.stroke[1]=e.styles.stroke.g),"number"==typeof e.styles.stroke.b&&(e.styles.stroke[2]=e.styles.stroke.b),"number"==typeof e.styles.stroke.a&&(e.styles.stroke[3]=e.styles.stroke.a));var t=e.styles.lineDash||[];switch(e.styles.lineDashI>0&&t.push(e.styles.lineDashI),e.styles.lineDashII>0&&(t.length<1&&t.push(0),t.push(e.styles.lineDashII),t.push(0)),e.styles.lineDashIII>0&&(t.length<2&&(t.push(0),t.push(0)),t[2]=e.styles.lineDashIII),e.styles.lineDash=t,e.styles.lineJoin){case 0:e.styles.lineJoin="miter";break;case 1:e.styles.lineJoin="round";break;case 2:e.styles.lineJoin="bevel"}switch(e.styles.lineCap){case 0:e.styles.lineCap="butt";break;case 1:e.styles.lineCap="round";break;case 2:e.styles.lineCap="square"}}})),t.shapes[0]&&"keep"===t.shapes[0].type?this.shapes=e.lastShapes:(this.shapes=t.shapes,e.lastShapes=t.shapes));var r=this.transform.a*this.layout.x+this.transform.c*this.layout.y+this.transform.tx,n=this.transform.a*(this.layout.x+this.layout.width)+this.transform.c*this.layout.y+this.transform.tx,o=this.transform.a*this.layout.x+this.transform.c*(this.layout.y+this.layout.height)+this.transform.tx,s=this.transform.a*(this.layout.x+this.layout.width)+this.transform.c*(this.layout.y+this.layout.height)+this.transform.tx,a=this.transform.b*this.layout.x+this.transform.d*this.layout.y+this.transform.ty,u=this.transform.b*(this.layout.x+this.layout.width)+this.transform.d*this.layout.y+this.transform.ty,f=this.transform.b*this.layout.x+this.transform.d*(this.layout.y+this.layout.height)+this.transform.ty,l=this.transform.b*(this.layout.x+this.layout.width)+this.transform.d*(this.layout.y+this.layout.height)+this.transform.ty;this.nx=Math.min(Math.min(o,s),Math.min(r,n)),this.ny=Math.min(Math.min(f,l),Math.min(a,u))}},function(e,t,r){"use strict";e.exports=r(35)},function(e,t,r){"use strict";var i=e.exports=r(36);i.build="light",i.load=function(e,t,r){return"function"==typeof t?(r=t,t=new i.Root):t||(t=new i.Root),t.load(e,r)},i.loadSync=function(e,t){return t||(t=new i.Root),t.loadSync(e)},i.encoder=r(21),i.decoder=r(26),i.verifier=r(27),i.converter=r(28),i.ReflectionObject=r(3),i.Namespace=r(6),i.Root=r(30),i.Enum=r(2),i.Type=r(22),i.Field=r(4),i.OneOf=r(11),i.MapField=r(23),i.Service=r(24),i.Method=r(25),i.Message=r(12),i.wrappers=r(29),i.types=r(7),i.util=r(0),i.ReflectionObject._configure(i.Root),i.Namespace._configure(i.Type,i.Service,i.Enum),i.Root._configure(i.Type),i.Field._configure(i.Type)},function(e,t,r){"use strict";function i(){n.util._configure(),n.Writer._configure(n.BufferWriter),n.Reader._configure(n.BufferReader)}var n=t;n.build="minimal",n.Writer=r(9),n.BufferWriter=r(44),n.Reader=r(10),n.BufferReader=r(45),n.util=r(1),n.rpc=r(19),n.roots=r(20),n.configure=i,i()},function(e,t){var r;r=function(){return this}();try{r=r||new Function("return this")()}catch(e){"object"==typeof window&&(r=window)}e.exports=r},function(e,t,r){"use strict";var i=t;i.length=function(e){var t=e.length;if(!t)return 0;for(var r=0;--t%4>1&&"="===e.charAt(t);)++r;return Math.ceil(3*e.length)/4-r};for(var n=new Array(64),o=new Array(123),s=0;s<64;)o[n[s]=s<26?s+65:s<52?s+71:s<62?s-4:s-59|43]=s++;i.encode=function(e,t,r){for(var i,o=null,s=[],a=0,u=0;t<r;){var f=e[t++];switch(u){case 0:s[a++]=n[f>>2],i=(3&f)<<4,u=1;break;case 1:s[a++]=n[i|f>>4],i=(15&f)<<2,u=2;break;case 2:s[a++]=n[i|f>>6],s[a++]=n[63&f],u=0}a>8191&&((o||(o=[])).push(String.fromCharCode.apply(String,s)),a=0)}return u&&(s[a++]=n[i],s[a++]=61,1===u&&(s[a++]=61)),o?(a&&o.push(String.fromCharCode.apply(String,s.slice(0,a))),o.join("")):String.fromCharCode.apply(String,s.slice(0,a))},i.decode=function(e,t,r){for(var i,n=r,s=0,a=0;a<e.length;){var u=e.charCodeAt(a++);if(61===u&&s>1)break;if(void 0===(u=o[u]))throw Error("invalid encoding");switch(s){case 0:i=u,s=1;break;case 1:t[r++]=i<<2|(48&u)>>4,i=u,s=2;break;case 2:t[r++]=(15&i)<<4|(60&u)>>2,i=u,s=3;break;case 3:t[r++]=(3&i)<<6|u,s=0}}if(1===s)throw Error("invalid encoding");return r-n},i.test=function(e){return/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(e)}},function(e,t,r){"use strict";function i(){this._listeners={}}e.exports=i,i.prototype.on=function(e,t,r){return(this._listeners[e]||(this._listeners[e]=[])).push({fn:t,ctx:r||this}),this},i.prototype.off=function(e,t){if(void 0===e)this._listeners={};else if(void 0===t)this._listeners[e]=[];else for(var r=this._listeners[e],i=0;i<r.length;)r[i].fn===t?r.splice(i,1):++i;return this},i.prototype.emit=function(e){var t=this._listeners[e];if(t){for(var r=[],i=1;i<arguments.length;)r.push(arguments[i++]);for(i=0;i<t.length;)t[i].fn.apply(t[i++].ctx,r)}return this}},function(e,t,r){"use strict";function i(e){return"undefined"!=typeof Float32Array?function(){function t(e,t,r){o[0]=e,t[r]=s[0],t[r+1]=s[1],t[r+2]=s[2],t[r+3]=s[3]}function r(e,t,r){o[0]=e,t[r]=s[3],t[r+1]=s[2],t[r+2]=s[1],t[r+3]=s[0]}function i(e,t){return s[0]=e[t],s[1]=e[t+1],s[2]=e[t+2],s[3]=e[t+3],o[0]}function n(e,t){return s[3]=e[t],s[2]=e[t+1],s[1]=e[t+2],s[0]=e[t+3],o[0]}var o=new Float32Array([-0]),s=new Uint8Array(o.buffer),a=128===s[3];e.writeFloatLE=a?t:r,e.writeFloatBE=a?r:t,e.readFloatLE=a?i:n,e.readFloatBE=a?n:i}():function(){function t(e,t,r,i){var n=t<0?1:0;if(n&&(t=-t),0===t)e(1/t>0?0:2147483648,r,i);else if(isNaN(t))e(2143289344,r,i);else if(t>34028234663852886e22)e((n<<31|2139095040)>>>0,r,i);else if(t<11754943508222875e-54)e((n<<31|Math.round(t/1401298464324817e-60))>>>0,r,i);else{var o=Math.floor(Math.log(t)/Math.LN2);e((n<<31|o+127<<23|8388607&Math.round(t*Math.pow(2,-o)*8388608))>>>0,r,i)}}function r(e,t,r){var i=e(t,r),n=2*(i>>31)+1,o=i>>>23&255,s=8388607&i;return 255===o?s?NaN:n*(1/0):0===o?1401298464324817e-60*n*s:n*Math.pow(2,o-150)*(s+8388608)}e.writeFloatLE=t.bind(null,n),e.writeFloatBE=t.bind(null,o),e.readFloatLE=r.bind(null,s),e.readFloatBE=r.bind(null,a)}(),"undefined"!=typeof Float64Array?function(){function t(e,t,r){o[0]=e,t[r]=s[0],t[r+1]=s[1],t[r+2]=s[2],t[r+3]=s[3],t[r+4]=s[4],t[r+5]=s[5],t[r+6]=s[6],t[r+7]=s[7]}function r(e,t,r){o[0]=e,t[r]=s[7],t[r+1]=s[6],t[r+2]=s[5],t[r+3]=s[4],t[r+4]=s[3],t[r+5]=s[2],t[r+6]=s[1],t[r+7]=s[0]}function i(e,t){return s[0]=e[t],s[1]=e[t+1],s[2]=e[t+2],s[3]=e[t+3],s[4]=e[t+4],s[5]=e[t+5],s[6]=e[t+6],s[7]=e[t+7],o[0]}function n(e,t){return s[7]=e[t],s[6]=e[t+1],s[5]=e[t+2],s[4]=e[t+3],s[3]=e[t+4],s[2]=e[t+5],s[1]=e[t+6],s[0]=e[t+7],o[0]}var o=new Float64Array([-0]),s=new Uint8Array(o.buffer),a=128===s[7];e.writeDoubleLE=a?t:r,e.writeDoubleBE=a?r:t,e.readDoubleLE=a?i:n,e.readDoubleBE=a?n:i}():function(){function t(e,t,r,i,n,o){var s=i<0?1:0;if(s&&(i=-i),0===i)e(0,n,o+t),e(1/i>0?0:2147483648,n,o+r);else if(isNaN(i))e(0,n,o+t),e(2146959360,n,o+r);else if(i>17976931348623157e292)e(0,n,o+t),e((s<<31|2146435072)>>>0,n,o+r);else{var a;if(i<22250738585072014e-324)e((a=i/5e-324)>>>0,n,o+t),e((s<<31|a/4294967296)>>>0,n,o+r);else{var u=Math.floor(Math.log(i)/Math.LN2);1024===u&&(u=1023),e(4503599627370496*(a=i*Math.pow(2,-u))>>>0,n,o+t),e((s<<31|u+1023<<20|1048576*a&1048575)>>>0,n,o+r)}}}function r(e,t,r,i,n){var o=e(i,n+t),s=e(i,n+r),a=2*(s>>31)+1,u=s>>>20&2047,f=4294967296*(1048575&s)+o;return 2047===u?f?NaN:a*(1/0):0===u?5e-324*a*f:a*Math.pow(2,u-1075)*(f+4503599627370496)}e.writeDoubleLE=t.bind(null,n,0,4),e.writeDoubleBE=t.bind(null,o,4,0),e.readDoubleLE=r.bind(null,s,0,4),e.readDoubleBE=r.bind(null,a,4,0)}(),e}function n(e,t,r){t[r]=255&e,t[r+1]=e>>>8&255,t[r+2]=e>>>16&255,t[r+3]=e>>>24}function o(e,t,r){t[r]=e>>>24,t[r+1]=e>>>16&255,t[r+2]=e>>>8&255,t[r+3]=255&e}function s(e,t){return(e[t]|e[t+1]<<8|e[t+2]<<16|e[t+3]<<24)>>>0}function a(e,t){return(e[t]<<24|e[t+1]<<16|e[t+2]<<8|e[t+3])>>>0}e.exports=i(i)},function(e,t,r){"use strict";var i=t;i.length=function(e){for(var t=0,r=0,i=0;i<e.length;++i)(r=e.charCodeAt(i))<128?t+=1:r<2048?t+=2:55296==(64512&r)&&56320==(64512&e.charCodeAt(i+1))?(++i,t+=4):t+=3;return t},i.read=function(e,t,r){if(r-t<1)return"";for(var i,n=null,o=[],s=0;t<r;)(i=e[t++])<128?o[s++]=i:i>191&&i<224?o[s++]=(31&i)<<6|63&e[t++]:i>239&&i<365?(i=((7&i)<<18|(63&e[t++])<<12|(63&e[t++])<<6|63&e[t++])-65536,o[s++]=55296+(i>>10),o[s++]=56320+(1023&i)):o[s++]=(15&i)<<12|(63&e[t++])<<6|63&e[t++],s>8191&&((n||(n=[])).push(String.fromCharCode.apply(String,o)),s=0);return n?(s&&n.push(String.fromCharCode.apply(String,o.slice(0,s))),n.join("")):String.fromCharCode.apply(String,o.slice(0,s))},i.write=function(e,t,r){for(var i,n,o=r,s=0;s<e.length;++s)(i=e.charCodeAt(s))<128?t[r++]=i:i<2048?(t[r++]=i>>6|192,t[r++]=63&i|128):55296==(64512&i)&&56320==(64512&(n=e.charCodeAt(s+1)))?(i=65536+((1023&i)<<10)+(1023&n),++s,t[r++]=i>>18|240,t[r++]=i>>12&63|128,t[r++]=i>>6&63|128,t[r++]=63&i|128):(t[r++]=i>>12|224,t[r++]=i>>6&63|128,t[r++]=63&i|128);return r-o}},function(e,t,r){"use strict";e.exports=function(e,t,r){var i=r||8192,n=i>>>1,o=null,s=i;return function(r){if(r<1||r>n)return e(r);s+r>i&&(o=e(i),s=0);var a=t.call(o,s,s+=r);return 7&s&&(s=1+(7|s)),a}}},function(e,t,r){"use strict";function i(e,t){this.lo=e>>>0,this.hi=t>>>0}e.exports=i;var n=r(1),o=i.zero=new i(0,0);o.toNumber=function(){return 0},o.zzEncode=o.zzDecode=function(){return this},o.length=function(){return 1};var s=i.zeroHash="\0\0\0\0\0\0\0\0";i.fromNumber=function(e){if(0===e)return o;var t=e<0;t&&(e=-e);var r=e>>>0,n=(e-r)/4294967296>>>0;return t&&(n=~n>>>0,r=~r>>>0,++r>4294967295&&(r=0,++n>4294967295&&(n=0))),new i(r,n)},i.from=function(e){if("number"==typeof e)return i.fromNumber(e);if(n.isString(e)){if(!n.Long)return i.fromNumber(parseInt(e,10));e=n.Long.fromString(e)}return e.low||e.high?new i(e.low>>>0,e.high>>>0):o},i.prototype.toNumber=function(e){if(!e&&this.hi>>>31){var t=1+~this.lo>>>0,r=~this.hi>>>0;return t||(r=r+1>>>0),-(t+4294967296*r)}return this.lo+4294967296*this.hi},i.prototype.toLong=function(e){return n.Long?new n.Long(0|this.lo,0|this.hi,Boolean(e)):{low:0|this.lo,high:0|this.hi,unsigned:Boolean(e)}};var a=String.prototype.charCodeAt;i.fromHash=function(e){return e===s?o:new i((a.call(e,0)|a.call(e,1)<<8|a.call(e,2)<<16|a.call(e,3)<<24)>>>0,(a.call(e,4)|a.call(e,5)<<8|a.call(e,6)<<16|a.call(e,7)<<24)>>>0)},i.prototype.toHash=function(){return String.fromCharCode(255&this.lo,this.lo>>>8&255,this.lo>>>16&255,this.lo>>>24,255&this.hi,this.hi>>>8&255,this.hi>>>16&255,this.hi>>>24)},i.prototype.zzEncode=function(){var e=this.hi>>31;return this.hi=((this.hi<<1|this.lo>>>31)^e)>>>0,this.lo=(this.lo<<1^e)>>>0,this},i.prototype.zzDecode=function(){var e=-(1&this.lo);return this.lo=((this.lo>>>1|this.hi<<31)^e)>>>0,this.hi=(this.hi>>>1^e)>>>0,this},i.prototype.length=function(){var e=this.lo,t=(this.lo>>>28|this.hi<<4)>>>0,r=this.hi>>>24;return 0===r?0===t?e<16384?e<128?1:2:e<2097152?3:4:t<16384?t<128?5:6:t<2097152?7:8:r<128?9:10}},function(e,t,r){"use strict";function i(){o.call(this)}function n(e,t,r){e.length<40?s.utf8.write(e,t,r):t.utf8Write?t.utf8Write(e,r):t.write(e,r)}e.exports=i;var o=r(9);(i.prototype=Object.create(o.prototype)).constructor=i;var s=r(1);i._configure=function(){i.alloc=s._Buffer_allocUnsafe,i.writeBytesBuffer=s.Buffer&&s.Buffer.prototype instanceof Uint8Array&&"set"===s.Buffer.prototype.set.name?function(e,t,r){t.set(e,r)}:function(e,t,r){if(e.copy)e.copy(t,r,0,e.length);else for(var i=0;i<e.length;)t[r++]=e[i++]}},i.prototype.bytes=function(e){s.isString(e)&&(e=s._Buffer_from(e,"base64"));var t=e.length>>>0;return this.uint32(t),t&&this._push(i.writeBytesBuffer,t,e),this},i.prototype.string=function(e){var t=s.Buffer.byteLength(e);return this.uint32(t),t&&this._push(n,t,e),this},i._configure()},function(e,t,r){"use strict";function i(e){n.call(this,e)}e.exports=i;var n=r(10);(i.prototype=Object.create(n.prototype)).constructor=i;var o=r(1);i._configure=function(){o.Buffer&&(i.prototype._slice=o.Buffer.prototype.slice)},i.prototype.string=function(){var e=this.uint32();return this.buf.utf8Slice?this.buf.utf8Slice(this.pos,this.pos=Math.min(this.pos+e,this.len)):this.buf.toString("utf-8",this.pos,this.pos=Math.min(this.pos+e,this.len))},i._configure()},function(e,t,r){"use strict";function i(e,t,r){if("function"!=typeof e)throw TypeError("rpcImpl must be a function");n.EventEmitter.call(this),this.rpcImpl=e,this.requestDelimited=Boolean(t),this.responseDelimited=Boolean(r)}e.exports=i;var n=r(1);(i.prototype=Object.create(n.EventEmitter.prototype)).constructor=i,i.prototype.rpcCall=function e(t,r,i,o,s){if(!o)throw TypeError("request must be specified");var a=this;if(!s)return n.asPromise(e,a,t,r,i,o);if(a.rpcImpl)try{return a.rpcImpl(t,r[a.requestDelimited?"encodeDelimited":"encode"](o).finish(),(function(e,r){if(e)return a.emit("error",e,t),s(e);if(null!==r){if(!(r instanceof i))try{r=i[a.responseDelimited?"decodeDelimited":"decode"](r)}catch(e){return a.emit("error",e,t),s(e)}return a.emit("data",r,t),s(null,r)}a.end(!0)}))}catch(e){return a.emit("error",e,t),void setTimeout((function(){s(e)}),0)}else setTimeout((function(){s(Error("already ended"))}),0)},i.prototype.end=function(e){return this.rpcImpl&&(e||this.rpcImpl(null,null,null),this.rpcImpl=null,this.emit("end").off()),this}},function(e,t,r){"use strict";function i(e,t){function r(e){if("string"!=typeof e){var t=n();if(i.verbose&&console.log("codegen: "+t),t="return "+t,e){for(var s=Object.keys(e),a=new Array(s.length+1),u=new Array(s.length),f=0;f<s.length;)a[f]=s[f],u[f]=e[s[f++]];return a[f]=t,Function.apply(null,a).apply(null,u)}return Function(t)()}for(var l=new Array(arguments.length-1),h=0;h<l.length;)l[h]=arguments[++h];if(h=0,e=e.replace(/%([%dfijs])/g,(function(e,t){var r=l[h++];switch(t){case"d":case"f":return String(Number(r));case"i":return String(Math.floor(r));case"j":return JSON.stringify(r);case"s":return String(r)}return"%"})),h!==l.length)throw Error("parameter count mismatch");return o.push(e),r}function n(r){return"function "+(r||t||"")+"("+(e&&e.join(",")||"")+"){\n  "+o.join("\n  ")+"\n}"}"string"==typeof e&&(t=e,e=void 0);var o=[];return r.toString=n,r}e.exports=i,i.verbose=!1},function(e,t,r){"use strict";function i(e,t,r){return"function"==typeof t?(r=t,t={}):t||(t={}),r?!t.xhr&&o&&o.readFile?o.readFile(e,(function(n,o){return n&&"undefined"!=typeof XMLHttpRequest?i.xhr(e,t,r):n?r(n):r(null,t.binary?o:o.toString("utf8"))})):i.xhr(e,t,r):n(i,this,e,t)}e.exports=i;var n=r(17),o=r(18)("fs");i.xhr=function(e,t,r){var i=new XMLHttpRequest;i.onreadystatechange=function(){if(4===i.readyState){if(0!==i.status&&200!==i.status)return r(Error("status "+i.status));if(t.binary){var e=i.response;if(!e){e=[];for(var n=0;n<i.responseText.length;++n)e.push(255&i.responseText.charCodeAt(n))}return r(null,"undefined"!=typeof Uint8Array?new Uint8Array(e):e)}return r(null,i.responseText)}},t.binary&&("overrideMimeType"in i&&i.overrideMimeType("text/plain; charset=x-user-defined"),i.responseType="arraybuffer"),i.open("GET",e),i.send()}},function(e,t,r){"use strict";var i=t,n=i.isAbsolute=function(e){return/^(?:\/|\w+:)/.test(e)},o=i.normalize=function(e){var t=(e=e.replace(/\\/g,"/").replace(/\/{2,}/g,"/")).split("/"),r=n(e),i="";r&&(i=t.shift()+"/");for(var o=0;o<t.length;)".."===t[o]?o>0&&".."!==t[o-1]?t.splice(--o,2):r?t.splice(o,1):++o:"."===t[o]?t.splice(o,1):++o;return i+t.join("/")};i.resolve=function(e,t,r){return r||(t=o(t)),n(t)?t:(r||(e=o(e)),(e=e.replace(/(?:\/|^)[^/]+$/,"")).length?o(e+"/"+t):t)}},function(e,t,r){"use strict";var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=r(16).ProtoMovieEntity,o=r(8).assign,s=r(51),a={};o(a,s);var u=function(e){for(var t=[],r=0;r<e.length;r+=32768)t.push(String.fromCharCode.apply(null,e.subarray(r,r+32768)));return t.join("")},f={loadAssets:function(e,t,r){if("object"===("undefined"==typeof JSZipUtils?"undefined":i(JSZipUtils))&&"function"==typeof JSZip)if("[object File]"==e.toString())f._readBlobAsArrayBuffer(e,(function(e){var i=new Uint8Array(e,0,4);80==i[0]&&75==i[1]&&3==i[2]&&4==i[3]?JSZip.loadAsync(e).then((function(e){f._decodeAssets(e,t)})):f.load_viaProto(e,t,r)}));else if(e.indexOf("data:svga/1.0;base64,")>=0){var n=f._base64ToArrayBuffer(e.substring(21));JSZip.loadAsync(n).then((function(e){f._decodeAssets(e,t)}))}else if(e.indexOf("data:svga/2.0;base64,")>=0){n=f._base64ToArrayBuffer(e.substring(21));f.load_viaProto(n,t,r)}else JSZipUtils.getBinaryContent(e,(function(e,i){if(e)throw r&&r(e),console.error(e),e;var n=new Uint8Array(i,0,4);80==n[0]&&75==n[1]&&3==n[2]&&4==n[3]?JSZip.loadAsync(i).then((function(e){f._decodeAssets(e,t)})):f.load_viaProto(i,t,r)}));else{var o=new XMLHttpRequest;o.open("GET",e,!0),o.responseType="arraybuffer",o.onload=function(){f.load_viaProto(o.response,t,r)},o.onerror=function(e){if(!r)throw console.error(e),e;r(e)},o.send()}},load_viaProto:function(e,t,r){try{var i=a.inflate(e),o=n.decode(i),s={};f._loadImages(s,void 0,o,(function(){o.ver="2.0",t({movie:o,images:s})}))}catch(e){if(r)return void r(e);throw console.error(e),e}},_decodeAssets:function(e,t){var r="1.0";e.file("movie.binary")&&(r="1.5"),e.file("movie.spec").async("string").then((function(i){var n=JSON.parse(i),o={};n.ver=r,f._loadImages(o,e,n,(function(){t({movie:n,images:o})}))}))},_loadImages:function(e,t,r,o){var s=this;if("object"===(void 0===r?"undefined":i(r))&&r.$type==n){var a=!0;if(t)e:for(var l in r.images){switch(function(i){if(r.images.hasOwnProperty(i)){var n=r.images[i],l=u(n);return e.hasOwnProperty(i)?"continue":(a=!1,t.file(l+".png").async("base64").then(function(n){e[i]=n,f._loadImages(e,t,r,o)}.bind(s)),"break")}}(l)){case"continue":continue;case"break":break e}}else for(var h in r.images)if(r.images.hasOwnProperty(h)){var c=r.images[h],p=void 0;try{p=u(c)}catch(e){p=u(c)}e[h]=btoa(p)}a&&o.call(this)}else{a=!0;for(var d in r.images)if(r.images.hasOwnProperty(d)){var y=r.images[d];if(e.hasOwnProperty(d))continue;a=!1,t.file(y+".png").async("base64").then(function(i){e[d]=i,f._loadImages(e,t,r,o)}.bind(this));break}a&&o.call(this)}},_base64ToArrayBuffer:function(e){for(var t=window.atob(e),r=t.length,i=new Uint8Array(r),n=0;n<r;n++)i[n]=t.charCodeAt(n);return i.buffer},_readBlobAsArrayBuffer:function(e,t){var r=new FileReader;r.onload=function(e){t(e.target.result)},r.readAsArrayBuffer(e)}};e.exports=function(e,t,r){f.loadAssets(e,t,r)}},function(e,t,r){"use strict";function i(e){if(!(this instanceof i))return new i(e);this.options=s.assign({chunkSize:16384,windowBits:0,to:""},e||{});var t=this.options;t.raw&&t.windowBits>=0&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(t.windowBits>=0&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),t.windowBits>15&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new l,this.strm.avail_out=0;var r=o.inflateInit2(this.strm,t.windowBits);if(r!==u.Z_OK)throw new Error(f[r]);if(this.header=new h,o.inflateGetHeader(this.strm,this.header),t.dictionary&&("string"==typeof t.dictionary?t.dictionary=a.string2buf(t.dictionary):"[object ArrayBuffer]"===c.call(t.dictionary)&&(t.dictionary=new Uint8Array(t.dictionary)),t.raw&&(r=o.inflateSetDictionary(this.strm,t.dictionary))!==u.Z_OK))throw new Error(f[r])}function n(e,t){var r=new i(t);if(r.push(e,!0),r.err)throw r.msg||f[r.err];return r.result}var o=r(52),s=r(8),a=r(57),u=r(58),f=r(59),l=r(60),h=r(61),c=Object.prototype.toString;i.prototype.push=function(e,t){var r,i,n,f,l,h=this.strm,p=this.options.chunkSize,d=this.options.dictionary,y=!1;if(this.ended)return!1;i=t===~~t?t:!0===t?u.Z_FINISH:u.Z_NO_FLUSH,"string"==typeof e?h.input=a.binstring2buf(e):"[object ArrayBuffer]"===c.call(e)?h.input=new Uint8Array(e):h.input=e,h.next_in=0,h.avail_in=h.input.length;do{if(0===h.avail_out&&(h.output=new s.Buf8(p),h.next_out=0,h.avail_out=p),(r=o.inflate(h,u.Z_NO_FLUSH))===u.Z_NEED_DICT&&d&&(r=o.inflateSetDictionary(this.strm,d)),r===u.Z_BUF_ERROR&&!0===y&&(r=u.Z_OK,y=!1),r!==u.Z_STREAM_END&&r!==u.Z_OK)return this.onEnd(r),this.ended=!0,!1;h.next_out&&(0!==h.avail_out&&r!==u.Z_STREAM_END&&(0!==h.avail_in||i!==u.Z_FINISH&&i!==u.Z_SYNC_FLUSH)||("string"===this.options.to?(n=a.utf8border(h.output,h.next_out),f=h.next_out-n,l=a.buf2string(h.output,n),h.next_out=f,h.avail_out=p-f,f&&s.arraySet(h.output,h.output,n,f,0),this.onData(l)):this.onData(s.shrinkBuf(h.output,h.next_out)))),0===h.avail_in&&0===h.avail_out&&(y=!0)}while((h.avail_in>0||0===h.avail_out)&&r!==u.Z_STREAM_END);return r===u.Z_STREAM_END&&(i=u.Z_FINISH),i===u.Z_FINISH?(r=o.inflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===u.Z_OK):i!==u.Z_SYNC_FLUSH||(this.onEnd(u.Z_OK),h.avail_out=0,!0)},i.prototype.onData=function(e){this.chunks.push(e)},i.prototype.onEnd=function(e){e===u.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=s.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},t.Inflate=i,t.inflate=n,t.inflateRaw=function(e,t){return(t=t||{}).raw=!0,n(e,t)},t.ungzip=n},function(e,t,r){"use strict";function i(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function n(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new p.Buf16(320),this.work=new p.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function o(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=B,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new p.Buf32(le),t.distcode=t.distdyn=new p.Buf32(he),t.sane=1,t.back=-1,O):j}function s(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,o(e)):j}function a(e,t){var r,i;return e&&e.state?(i=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||t>15)?j:(null!==i.window&&i.wbits!==t&&(i.window=null),i.wrap=r,i.wbits=t,s(e))):j}function u(e,t){var r,i;return e?(i=new n,e.state=i,i.window=null,(r=a(e,t))!==O&&(e.state=null),r):j}function f(e){if(pe){var t;for(h=new p.Buf32(512),c=new p.Buf32(32),t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(v(g,e.lens,0,288,h,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;v(_,e.lens,0,32,c,0,e.work,{bits:5}),pe=!1}e.lencode=h,e.lenbits=9,e.distcode=c,e.distbits=5}function l(e,t,r,i){var n,o=e.state;return null===o.window&&(o.wsize=1<<o.wbits,o.wnext=0,o.whave=0,o.window=new p.Buf8(o.wsize)),i>=o.wsize?(p.arraySet(o.window,t,r-o.wsize,o.wsize,0),o.wnext=0,o.whave=o.wsize):((n=o.wsize-o.wnext)>i&&(n=i),p.arraySet(o.window,t,r-i,n,o.wnext),(i-=n)?(p.arraySet(o.window,t,r-i,i,0),o.wnext=i,o.whave=o.wsize):(o.wnext+=n,o.wnext===o.wsize&&(o.wnext=0),o.whave<o.wsize&&(o.whave+=n))),0}var h,c,p=r(8),d=r(53),y=r(54),m=r(55),v=r(56),b=0,g=1,_=2,w=4,k=5,x=6,O=0,S=1,A=2,j=-2,T=-3,E=-4,N=-5,F=8,B=1,P=2,C=3,I=4,R=5,L=6,D=7,M=8,z=9,J=10,q=11,Z=12,U=13,G=14,$=15,V=16,K=17,H=18,W=19,Y=20,X=21,Q=22,ee=23,te=24,re=25,ie=26,ne=27,oe=28,se=29,ae=30,ue=31,fe=32,le=852,he=592,ce=15,pe=!0;t.inflateReset=s,t.inflateReset2=a,t.inflateResetKeep=o,t.inflateInit=function(e){return u(e,ce)},t.inflateInit2=u,t.inflate=function(e,t){var r,n,o,s,a,u,h,c,le,he,ce,pe,de,ye,me,ve,be,ge,_e,we,ke,xe,Oe,Se,Ae=0,je=new p.Buf8(4),Te=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!e||!e.state||!e.output||!e.input&&0!==e.avail_in)return j;(r=e.state).mode===Z&&(r.mode=U),a=e.next_out,o=e.output,h=e.avail_out,s=e.next_in,n=e.input,u=e.avail_in,c=r.hold,le=r.bits,he=u,ce=h,xe=O;e:for(;;)switch(r.mode){case B:if(0===r.wrap){r.mode=U;break}for(;le<16;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(2&r.wrap&&35615===c){r.check=0,je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0),c=0,le=0,r.mode=P;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&c)<<8)+(c>>8))%31){e.msg="incorrect header check",r.mode=ae;break}if((15&c)!==F){e.msg="unknown compression method",r.mode=ae;break}if(le-=4,ke=8+(15&(c>>>=4)),0===r.wbits)r.wbits=ke;else if(ke>r.wbits){e.msg="invalid window size",r.mode=ae;break}r.dmax=1<<ke,e.adler=r.check=1,r.mode=512&c?J:Z,c=0,le=0;break;case P:for(;le<16;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(r.flags=c,(255&r.flags)!==F){e.msg="unknown compression method",r.mode=ae;break}if(57344&r.flags){e.msg="unknown header flags set",r.mode=ae;break}r.head&&(r.head.text=c>>8&1),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0)),c=0,le=0,r.mode=C;case C:for(;le<32;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.head&&(r.head.time=c),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,je[2]=c>>>16&255,je[3]=c>>>24&255,r.check=y(r.check,je,4,0)),c=0,le=0,r.mode=I;case I:for(;le<16;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.head&&(r.head.xflags=255&c,r.head.os=c>>8),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0)),c=0,le=0,r.mode=R;case R:if(1024&r.flags){for(;le<16;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.length=c,r.head&&(r.head.extra_len=c),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0)),c=0,le=0}else r.head&&(r.head.extra=null);r.mode=L;case L:if(1024&r.flags&&((pe=r.length)>u&&(pe=u),pe&&(r.head&&(ke=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),p.arraySet(r.head.extra,n,s,pe,ke)),512&r.flags&&(r.check=y(r.check,n,pe,s)),u-=pe,s+=pe,r.length-=pe),r.length))break e;r.length=0,r.mode=D;case D:if(2048&r.flags){if(0===u)break e;pe=0;do{ke=n[s+pe++],r.head&&ke&&r.length<65536&&(r.head.name+=String.fromCharCode(ke))}while(ke&&pe<u);if(512&r.flags&&(r.check=y(r.check,n,pe,s)),u-=pe,s+=pe,ke)break e}else r.head&&(r.head.name=null);r.length=0,r.mode=M;case M:if(4096&r.flags){if(0===u)break e;pe=0;do{ke=n[s+pe++],r.head&&ke&&r.length<65536&&(r.head.comment+=String.fromCharCode(ke))}while(ke&&pe<u);if(512&r.flags&&(r.check=y(r.check,n,pe,s)),u-=pe,s+=pe,ke)break e}else r.head&&(r.head.comment=null);r.mode=z;case z:if(512&r.flags){for(;le<16;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(c!==(65535&r.check)){e.msg="header crc mismatch",r.mode=ae;break}c=0,le=0}r.head&&(r.head.hcrc=r.flags>>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=Z;break;case J:for(;le<32;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}e.adler=r.check=i(c),c=0,le=0,r.mode=q;case q:if(0===r.havedict)return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=u,r.hold=c,r.bits=le,A;e.adler=r.check=1,r.mode=Z;case Z:if(t===k||t===x)break e;case U:if(r.last){c>>>=7&le,le-=7&le,r.mode=ne;break}for(;le<3;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}switch(r.last=1&c,le-=1,3&(c>>>=1)){case 0:r.mode=G;break;case 1:if(f(r),r.mode=Y,t===x){c>>>=2,le-=2;break e}break;case 2:r.mode=K;break;case 3:e.msg="invalid block type",r.mode=ae}c>>>=2,le-=2;break;case G:for(c>>>=7&le,le-=7&le;le<32;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if((65535&c)!=(c>>>16^65535)){e.msg="invalid stored block lengths",r.mode=ae;break}if(r.length=65535&c,c=0,le=0,r.mode=$,t===x)break e;case $:r.mode=V;case V:if(pe=r.length){if(pe>u&&(pe=u),pe>h&&(pe=h),0===pe)break e;p.arraySet(o,n,s,pe,a),u-=pe,s+=pe,h-=pe,a+=pe,r.length-=pe;break}r.mode=Z;break;case K:for(;le<14;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(r.nlen=257+(31&c),c>>>=5,le-=5,r.ndist=1+(31&c),c>>>=5,le-=5,r.ncode=4+(15&c),c>>>=4,le-=4,r.nlen>286||r.ndist>30){e.msg="too many length or distance symbols",r.mode=ae;break}r.have=0,r.mode=H;case H:for(;r.have<r.ncode;){for(;le<3;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.lens[Te[r.have++]]=7&c,c>>>=3,le-=3}for(;r.have<19;)r.lens[Te[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,Oe={bits:r.lenbits},xe=v(b,r.lens,0,19,r.lencode,0,r.work,Oe),r.lenbits=Oe.bits,xe){e.msg="invalid code lengths set",r.mode=ae;break}r.have=0,r.mode=W;case W:for(;r.have<r.nlen+r.ndist;){for(;ve=(Ae=r.lencode[c&(1<<r.lenbits)-1])>>>16&255,be=65535&Ae,!((me=Ae>>>24)<=le);){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(be<16)c>>>=me,le-=me,r.lens[r.have++]=be;else{if(16===be){for(Se=me+2;le<Se;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(c>>>=me,le-=me,0===r.have){e.msg="invalid bit length repeat",r.mode=ae;break}ke=r.lens[r.have-1],pe=3+(3&c),c>>>=2,le-=2}else if(17===be){for(Se=me+3;le<Se;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}le-=me,ke=0,pe=3+(7&(c>>>=me)),c>>>=3,le-=3}else{for(Se=me+7;le<Se;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}le-=me,ke=0,pe=11+(127&(c>>>=me)),c>>>=7,le-=7}if(r.have+pe>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=ae;break}for(;pe--;)r.lens[r.have++]=ke}}if(r.mode===ae)break;if(0===r.lens[256]){e.msg="invalid code -- missing end-of-block",r.mode=ae;break}if(r.lenbits=9,Oe={bits:r.lenbits},xe=v(g,r.lens,0,r.nlen,r.lencode,0,r.work,Oe),r.lenbits=Oe.bits,xe){e.msg="invalid literal/lengths set",r.mode=ae;break}if(r.distbits=6,r.distcode=r.distdyn,Oe={bits:r.distbits},xe=v(_,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,Oe),r.distbits=Oe.bits,xe){e.msg="invalid distances set",r.mode=ae;break}if(r.mode=Y,t===x)break e;case Y:r.mode=X;case X:if(u>=6&&h>=258){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=u,r.hold=c,r.bits=le,m(e,ce),a=e.next_out,o=e.output,h=e.avail_out,s=e.next_in,n=e.input,u=e.avail_in,c=r.hold,le=r.bits,r.mode===Z&&(r.back=-1);break}for(r.back=0;ve=(Ae=r.lencode[c&(1<<r.lenbits)-1])>>>16&255,be=65535&Ae,!((me=Ae>>>24)<=le);){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(ve&&0==(240&ve)){for(ge=me,_e=ve,we=be;ve=(Ae=r.lencode[we+((c&(1<<ge+_e)-1)>>ge)])>>>16&255,be=65535&Ae,!(ge+(me=Ae>>>24)<=le);){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}c>>>=ge,le-=ge,r.back+=ge}if(c>>>=me,le-=me,r.back+=me,r.length=be,0===ve){r.mode=ie;break}if(32&ve){r.back=-1,r.mode=Z;break}if(64&ve){e.msg="invalid literal/length code",r.mode=ae;break}r.extra=15&ve,r.mode=Q;case Q:if(r.extra){for(Se=r.extra;le<Se;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.length+=c&(1<<r.extra)-1,c>>>=r.extra,le-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=ee;case ee:for(;ve=(Ae=r.distcode[c&(1<<r.distbits)-1])>>>16&255,be=65535&Ae,!((me=Ae>>>24)<=le);){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(0==(240&ve)){for(ge=me,_e=ve,we=be;ve=(Ae=r.distcode[we+((c&(1<<ge+_e)-1)>>ge)])>>>16&255,be=65535&Ae,!(ge+(me=Ae>>>24)<=le);){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}c>>>=ge,le-=ge,r.back+=ge}if(c>>>=me,le-=me,r.back+=me,64&ve){e.msg="invalid distance code",r.mode=ae;break}r.offset=be,r.extra=15&ve,r.mode=te;case te:if(r.extra){for(Se=r.extra;le<Se;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}r.offset+=c&(1<<r.extra)-1,c>>>=r.extra,le-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){e.msg="invalid distance too far back",r.mode=ae;break}r.mode=re;case re:if(0===h)break e;if(pe=ce-h,r.offset>pe){if((pe=r.offset-pe)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=ae;break}pe>r.wnext?(pe-=r.wnext,de=r.wsize-pe):de=r.wnext-pe,pe>r.length&&(pe=r.length),ye=r.window}else ye=o,de=a-r.offset,pe=r.length;pe>h&&(pe=h),h-=pe,r.length-=pe;do{o[a++]=ye[de++]}while(--pe);0===r.length&&(r.mode=X);break;case ie:if(0===h)break e;o[a++]=r.length,h--,r.mode=X;break;case ne:if(r.wrap){for(;le<32;){if(0===u)break e;u--,c|=n[s++]<<le,le+=8}if(ce-=h,e.total_out+=ce,r.total+=ce,ce&&(e.adler=r.check=r.flags?y(r.check,o,ce,a-ce):d(r.check,o,ce,a-ce)),ce=h,(r.flags?c:i(c))!==r.check){e.msg="incorrect data check",r.mode=ae;break}c=0,le=0}r.mode=oe;case oe:if(r.wrap&&r.flags){for(;le<32;){if(0===u)break e;u--,c+=n[s++]<<le,le+=8}if(c!==(4294967295&r.total)){e.msg="incorrect length check",r.mode=ae;break}c=0,le=0}r.mode=se;case se:xe=S;break e;case ae:xe=T;break e;case ue:return E;case fe:default:return j}return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=u,r.hold=c,r.bits=le,(r.wsize||ce!==e.avail_out&&r.mode<ae&&(r.mode<ne||t!==w))&&l(e,e.output,e.next_out,ce-e.avail_out)?(r.mode=ue,E):(he-=e.avail_in,ce-=e.avail_out,e.total_in+=he,e.total_out+=ce,r.total+=ce,r.wrap&&ce&&(e.adler=r.check=r.flags?y(r.check,o,ce,e.next_out-ce):d(r.check,o,ce,e.next_out-ce)),e.data_type=r.bits+(r.last?64:0)+(r.mode===Z?128:0)+(r.mode===Y||r.mode===$?256:0),(0===he&&0===ce||t===w)&&xe===O&&(xe=N),xe)},t.inflateEnd=function(e){if(!e||!e.state)return j;var t=e.state;return t.window&&(t.window=null),e.state=null,O},t.inflateGetHeader=function(e,t){var r;return e&&e.state?0==(2&(r=e.state).wrap)?j:(r.head=t,t.done=!1,O):j},t.inflateSetDictionary=function(e,t){var r,i=t.length;return e&&e.state?0!==(r=e.state).wrap&&r.mode!==q?j:r.mode===q&&d(1,t,i,0)!==r.check?T:l(e,t,i,i)?(r.mode=ue,E):(r.havedict=1,O):j},t.inflateInfo="pako inflate (from Nodeca project)"},function(e,t,r){"use strict";e.exports=function(e,t,r,i){for(var n=65535&e|0,o=e>>>16&65535|0,s=0;0!==r;){r-=s=r>2e3?2e3:r;do{o=o+(n=n+t[i++]|0)|0}while(--s);n%=65521,o%=65521}return n|o<<16|0}},function(e,t,r){"use strict";var i=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var i=0;i<8;i++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();e.exports=function(e,t,r,n){var o=i,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^o[255&(e^t[a])];return-1^e}},function(e,t,r){"use strict";e.exports=function(e,t){var r,i,n,o,s,a,u,f,l,h,c,p,d,y,m,v,b,g,_,w,k,x,O,S,A;r=e.state,i=e.next_in,S=e.input,n=i+(e.avail_in-5),o=e.next_out,A=e.output,s=o-(t-e.avail_out),a=o+(e.avail_out-257),u=r.dmax,f=r.wsize,l=r.whave,h=r.wnext,c=r.window,p=r.hold,d=r.bits,y=r.lencode,m=r.distcode,v=(1<<r.lenbits)-1,b=(1<<r.distbits)-1;e:do{d<15&&(p+=S[i++]<<d,d+=8,p+=S[i++]<<d,d+=8),g=y[p&v];t:for(;;){if(p>>>=_=g>>>24,d-=_,0==(_=g>>>16&255))A[o++]=65535&g;else{if(!(16&_)){if(0==(64&_)){g=y[(65535&g)+(p&(1<<_)-1)];continue t}if(32&_){r.mode=12;break e}e.msg="invalid literal/length code",r.mode=30;break e}w=65535&g,(_&=15)&&(d<_&&(p+=S[i++]<<d,d+=8),w+=p&(1<<_)-1,p>>>=_,d-=_),d<15&&(p+=S[i++]<<d,d+=8,p+=S[i++]<<d,d+=8),g=m[p&b];r:for(;;){if(p>>>=_=g>>>24,d-=_,!(16&(_=g>>>16&255))){if(0==(64&_)){g=m[(65535&g)+(p&(1<<_)-1)];continue r}e.msg="invalid distance code",r.mode=30;break e}if(k=65535&g,d<(_&=15)&&(p+=S[i++]<<d,(d+=8)<_&&(p+=S[i++]<<d,d+=8)),(k+=p&(1<<_)-1)>u){e.msg="invalid distance too far back",r.mode=30;break e}if(p>>>=_,d-=_,k>(_=o-s)){if((_=k-_)>l&&r.sane){e.msg="invalid distance too far back",r.mode=30;break e}if(x=0,O=c,0===h){if(x+=f-_,_<w){w-=_;do{A[o++]=c[x++]}while(--_);x=o-k,O=A}}else if(h<_){if(x+=f+h-_,(_-=h)<w){w-=_;do{A[o++]=c[x++]}while(--_);if(x=0,h<w){w-=_=h;do{A[o++]=c[x++]}while(--_);x=o-k,O=A}}}else if(x+=h-_,_<w){w-=_;do{A[o++]=c[x++]}while(--_);x=o-k,O=A}for(;w>2;)A[o++]=O[x++],A[o++]=O[x++],A[o++]=O[x++],w-=3;w&&(A[o++]=O[x++],w>1&&(A[o++]=O[x++]))}else{x=o-k;do{A[o++]=A[x++],A[o++]=A[x++],A[o++]=A[x++],w-=3}while(w>2);w&&(A[o++]=A[x++],w>1&&(A[o++]=A[x++]))}break}}break}}while(i<n&&o<a);i-=w=d>>3,p&=(1<<(d-=w<<3))-1,e.next_in=i,e.next_out=o,e.avail_in=i<n?n-i+5:5-(i-n),e.avail_out=o<a?a-o+257:257-(o-a),r.hold=p,r.bits=d}},function(e,t,r){"use strict";var i=r(8),n=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],o=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],s=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],a=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];e.exports=function(e,t,r,u,f,l,h,c){var p,d,y,m,v,b,g,_,w,k=c.bits,x=0,O=0,S=0,A=0,j=0,T=0,E=0,N=0,F=0,B=0,P=null,C=0,I=new i.Buf16(16),R=new i.Buf16(16),L=null,D=0;for(x=0;x<=15;x++)I[x]=0;for(O=0;O<u;O++)I[t[r+O]]++;for(j=k,A=15;A>=1&&0===I[A];A--);if(j>A&&(j=A),0===A)return f[l++]=20971520,f[l++]=20971520,c.bits=1,0;for(S=1;S<A&&0===I[S];S++);for(j<S&&(j=S),N=1,x=1;x<=15;x++)if(N<<=1,(N-=I[x])<0)return-1;if(N>0&&(0===e||1!==A))return-1;for(R[1]=0,x=1;x<15;x++)R[x+1]=R[x]+I[x];for(O=0;O<u;O++)0!==t[r+O]&&(h[R[t[r+O]]++]=O);if(0===e?(P=L=h,b=19):1===e?(P=n,C-=257,L=o,D-=257,b=256):(P=s,L=a,b=-1),B=0,O=0,x=S,v=l,T=j,E=0,y=-1,m=(F=1<<j)-1,1===e&&F>852||2===e&&F>592)return 1;for(;;){g=x-E,h[O]<b?(_=0,w=h[O]):h[O]>b?(_=L[D+h[O]],w=P[C+h[O]]):(_=96,w=0),p=1<<x-E,S=d=1<<T;do{f[v+(B>>E)+(d-=p)]=g<<24|_<<16|w|0}while(0!==d);for(p=1<<x-1;B&p;)p>>=1;if(0!==p?(B&=p-1,B+=p):B=0,O++,0==--I[x]){if(x===A)break;x=t[r+h[O]]}if(x>j&&(B&m)!==y){for(0===E&&(E=j),v+=S,N=1<<(T=x-E);T+E<A&&!((N-=I[T+E])<=0);)T++,N<<=1;if(F+=1<<T,1===e&&F>852||2===e&&F>592)return 1;f[y=B&m]=j<<24|T<<16|v-l|0}}return 0!==B&&(f[v+B]=x-E<<24|64<<16|0),c.bits=j,0}},function(e,t,r){"use strict";function i(e,t){if(t<65534&&(e.subarray&&s||!e.subarray&&o))return String.fromCharCode.apply(null,n.shrinkBuf(e,t));for(var r="",i=0;i<t;i++)r+=String.fromCharCode(e[i]);return r}var n=r(8),o=!0,s=!0;try{String.fromCharCode.apply(null,[0])}catch(e){o=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){s=!1}for(var a=new n.Buf8(256),u=0;u<256;u++)a[u]=u>=252?6:u>=248?5:u>=240?4:u>=224?3:u>=192?2:1;a[254]=a[254]=1,t.string2buf=function(e){var t,r,i,o,s,a=e.length,u=0;for(o=0;o<a;o++)55296==(64512&(r=e.charCodeAt(o)))&&o+1<a&&56320==(64512&(i=e.charCodeAt(o+1)))&&(r=65536+(r-55296<<10)+(i-56320),o++),u+=r<128?1:r<2048?2:r<65536?3:4;for(t=new n.Buf8(u),s=0,o=0;s<u;o++)55296==(64512&(r=e.charCodeAt(o)))&&o+1<a&&56320==(64512&(i=e.charCodeAt(o+1)))&&(r=65536+(r-55296<<10)+(i-56320),o++),r<128?t[s++]=r:r<2048?(t[s++]=192|r>>>6,t[s++]=128|63&r):r<65536?(t[s++]=224|r>>>12,t[s++]=128|r>>>6&63,t[s++]=128|63&r):(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63,t[s++]=128|r>>>6&63,t[s++]=128|63&r);return t},t.buf2binstring=function(e){return i(e,e.length)},t.binstring2buf=function(e){for(var t=new n.Buf8(e.length),r=0,i=t.length;r<i;r++)t[r]=e.charCodeAt(r);return t},t.buf2string=function(e,t){var r,n,o,s,u=t||e.length,f=new Array(2*u);for(n=0,r=0;r<u;)if((o=e[r++])<128)f[n++]=o;else if((s=a[o])>4)f[n++]=65533,r+=s-1;else{for(o&=2===s?31:3===s?15:7;s>1&&r<u;)o=o<<6|63&e[r++],s--;s>1?f[n++]=65533:o<65536?f[n++]=o:(o-=65536,f[n++]=55296|o>>10&1023,f[n++]=56320|1023&o)}return i(f,n)},t.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;r>=0&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+a[e[r]]>t?r:t}},function(e,t,r){"use strict";e.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},function(e,t,r){"use strict";e.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},function(e,t,r){"use strict";e.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},function(e,t,r){"use strict";e.exports=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}},function(e,t,r){"undefined"!=typeof self&&self,e.exports=function(e){function t(i){if(r[i])return r[i].exports;var n=r[i]={i:i,l:!1,exports:{}};return e[i].call(n.exports,n,n.exports,t),n.l=!0,n.exports}var r={};return t.m=e,t.c=r,t.d=function(e,r,i){t.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:i})},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=r(1);e.exports=i.ValueAnimator},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=function(){function e(){this.startValue=0,this.endValue=0,this.duration=0,this.loops=1,this.fillRule=0,this.onStart=function(){},this.onUpdate=function(){},this.onEnd=function(){},this.mRunning=!1,this.mStartTime=0,this.mCurrentFrication=0,this.mReverse=!1}return e.prototype.start=function(e){void 0===e&&(e=void 0),this.doStart(!1,e)},e.prototype.reverse=function(e){void 0===e&&(e=void 0),this.doStart(!0,e)},e.prototype.stop=function(){this.doStop()},Object.defineProperty(e.prototype,"animatedValue",{get:function(){return(this.endValue-this.startValue)*this.mCurrentFrication+this.startValue},enumerable:!0,configurable:!0}),e.prototype.doStart=function(t,r){void 0===t&&(t=!1),void 0===r&&(r=void 0),this.mReverse=t,this.mRunning=!0,this.mStartTime=e.currentTimeMillsecond(),r&&(this.mStartTime-=t?(1-r/(this.endValue-this.startValue))*this.duration:r/(this.endValue-this.startValue)*this.duration),this.mCurrentFrication=0,this.onStart(),this.doFrame()},e.prototype.doStop=function(){this.mRunning=!1},e.prototype.doFrame=function(){this.mRunning&&(this.doDeltaTime(e.currentTimeMillsecond()-this.mStartTime),this.mRunning&&e.requestAnimationFrame(this.doFrame.bind(this)))},e.prototype.doDeltaTime=function(e){e>=this.duration*this.loops?(this.mCurrentFrication=1===this.fillRule?0:1,this.mRunning=!1):(this.mCurrentFrication=e%this.duration/this.duration,this.mReverse&&(this.mCurrentFrication=1-this.mCurrentFrication)),this.onUpdate(this.animatedValue),!1===this.mRunning&&this.onEnd()},e.currentTimeMillsecond=function(){return"undefined"==typeof performance?(new Date).getTime():performance.now()},e.requestAnimationFrame=function(e){return"undefined"==typeof requestAnimationFrame?setTimeout(e,16):window.requestAnimationFrame(e)},e}();t.ValueAnimator=i}])},,,,,,,,function(e,t,r){"use strict";var i=r(13),n=r(71);e.exports={Parser:i.Parser,Player:n.Player,LayaboxPlayer:n.Player}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Player=void 0;var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),o=r(72),s=r(13),a=r(62);t.Player=function(e){function t(e,r){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);var i=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return i.loops=0,i.clearsAfterStop=!0,i.fillMode="Forward",i._renderer=void 0,i._animator=void 0,i._contentMode="AspectFit",i._videoItem=void 0,i._currentFrame=0,i._dynamicImage={},i._dynamicImageTransform={},i._dynamicText={},i._onFinished=void 0,i._onFrame=void 0,i._onPercentage=void 0,i._clipsToBounds=!1,i._frame={x:0,y:0,width:0,height:0},e&&(new s.Parser).load(e,(function(e){i.setVideoItem(e),!1!==r&&i.startAnimation()}),(function(e){i._onError&&i._onError(e)})),i._renderer=new o.Renderer(i),i}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,Laya.Sprite),n(t,[{key:"setVideoUrl",value:function(e,t,r,i){var n=this;(new s.Parser).load(e,(function(e){r&&r(e),n.setVideoItem(e),!1!==t&&n.startAnimation()}),(function(e){i&&i(e),n._onError&&n._onError(e)}))}},{key:"setVideoItem",value:function(e){this._currentFrame=0,this._videoItem=e,this.removeChildren(0,this.numChildren),this._addLayers()}},{key:"setContentMode",value:function(e){this._contentMode=e,this._update()}},{key:"setClipsToBounds",value:function(e){this._clipsToBounds=e,this._update()}},{key:"setFrame",value:function(e,t,r,i){this._frame={x:e,y:t,width:r,height:i},this._update()}},{key:"startAnimation",value:function(e){this.visible=!0,this.stopAnimation(!1),this._doStart(void 0,e,void 0)}},{key:"startAnimationWithRange",value:function(e,t){this.visible=!0,this.stopAnimation(!1),this._doStart(e,t,void 0)}},{key:"pauseAnimation",value:function(){this.stopAnimation(!1)}},{key:"stopAnimation",value:function(e){void 0!==this._animator&&this._animator.stop(),void 0===e&&(e=this.clearsAfterStop),e&&this.clear()}},{key:"clear",value:function(){this.visible=!1}},{key:"stepToFrame",value:function(e,t){e>=this._videoItem.frames||e<0||(this.visible=!0,this.pauseAnimation(),this._currentFrame=e,this._update(),t&&this._doStart(void 0,!1,this._currentFrame))}},{key:"stepToPercentage",value:function(e,t){var r=parseInt(e*this._videoItem.frames);r>=this._videoItem.frames&&r>0&&(r=this._videoItem.frames-1),this.stepToFrame(r,t)}},{key:"setImage",value:function(e,t,r){if(this._dynamicImage[t]=e,void 0!==r&&r instanceof Array&&6==r.length&&(this._dynamicImageTransform[t]=r),void 0!==this._videoItem){var i=this._currentFrame;this.removeChildren(0,this.numChildren),this._addLayers(),this._currentFrame=i,this._update()}}},{key:"setText",value:function(e,t){var r="string"==typeof e?e:e.text,n=("object"===(void 0===e?"undefined":i(e))?e.size:"14px")||"14px",o=("object"===(void 0===e?"undefined":i(e))&&e.family,("object"===(void 0===e?"undefined":i(e))?e.color:"#000000")||"#000000"),s=("object"===(void 0===e?"undefined":i(e))?e.offset:{x:0,y:0})||{x:0,y:0},a=new Laya.Text;if(a.text=r,a.fontSize=isNaN(parseInt(n.split(" ")[0]))?14:parseInt(n.split(" ")[0]),a.color=o,a.align="center",a.valign="middle",void 0!==a.y&&(a.y=a.y-a.textHeight/2),a.offset=s,this._dynamicText[t]=a,void 0!==this._videoItem){var u=this._currentFrame;this.removeChildren(0,this.numChildren),this._addLayers(),this._currentFrame=u,this._update()}}},{key:"clearDynamicObjects",value:function(){this._dynamicImage={},this._dynamicImageTransform={},this._dynamicText={}}},{key:"onError",value:function(e){this._onError=e}},{key:"onFinished",value:function(e){this._onFinished=e}},{key:"onFrame",value:function(e){this._onFrame=e}},{key:"onPercentage",value:function(e){this._onPercentage=e}},{key:"_doStart",value:function(e,t,r){var i=this;this._animator=new a,void 0!==e?(this._animator.startValue=Math.max(0,e.location),this._animator.endValue=Math.min(this._videoItem.frames-1,e.location+e.length),this._animator.duration=(this._animator.endValue-this._animator.startValue+1)*(1/this._videoItem.FPS)*1e3):(this._animator.startValue=0,this._animator.endValue=this._videoItem.frames-1,this._animator.duration=this._videoItem.frames*(1/this._videoItem.FPS)*1e3),this._animator.loops=this.loops<=0?1/0:this.loops,this._animator.fillRule="Backward"===this.fillMode?1:0,this._animator.onUpdate=function(e){i._currentFrame!==Math.floor(e)&&(i._currentFrame=Math.floor(e),i._update(),"function"==typeof i._onFrame&&i._onFrame(i._currentFrame),"function"==typeof i._onPercentage&&i._onPercentage(parseFloat(i._currentFrame+1)/parseFloat(i._videoItem.frames)))},this._animator.onEnd=function(){!0===i.clearsAfterStop&&i.clear(),"function"==typeof i._onFinished&&i._onFinished()},!0===t?this._animator.reverse(r):this._animator.start(r)}},{key:"_addLayers",value:function(){var e=this;this._videoItem.sprites.forEach((function(t){e.addChild(e._renderer.requestContentLayer(t))})),this._currentFrame=0,this._update()}},{key:"_resize",value:function(){var e=1,t=1,r=0,i=0,n=this._frame.width,o=this._frame.height,s=this._videoItem.videoSize;if("Fill"===this._contentMode)e=n/s.width,t=o/s.height;else if("AspectFit"===this._contentMode||"AspectFill"===this._contentMode){var a=s.width/s.height,u=n/o;a>=u&&"AspectFit"===this._contentMode||a<=u&&"AspectFill"===this._contentMode?(e=t=n/s.width,i=(o-s.height*t)/2):(a<u&&"AspectFit"===this._contentMode||a>u&&"AspectFill"===this._contentMode)&&(e=t=o/s.height,r=(n-s.width*e)/2)}this.transform=new Laya.Matrix(e,0,0,t,this._frame.x+r,this._frame.y+i)}},{key:"_updateMask",value:function(){}},{key:"_update",value:function(){void 0!==this._videoItem&&(this._resize(),this._updateMask(),this._renderer.drawFrame(this._currentFrame))}}]),t}()},function(e,t,r){"use strict";function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function n(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0}),t.Renderer=void 0;var s=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),a=r(5),u=r(15),f=r(14),l=function(e){function t(){i(this,t);var e=n(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return e.customGraphics={currentPath:[]},e.customRenderEnable=!0,e}return o(t,Laya.Sprite),s(t,[{key:"getBounds",value:function(){return{x:0,y:0,width:3e3,height:3e3}}},{key:"beginFill",value:function(e){this.customGraphics.fillStyle=e}},{key:"beginStroke",value:function(e){this.customGraphics.strokeStyle=e}},{key:"setStrokeStyle",value:function(e,t,r,i){this.customGraphics.lineCap=t,this.customGraphics.lineJoin=r,this.customGraphics.lineWidth=e,this.customGraphics.miterLimit=i}},{key:"setStrokeDash",value:function(e,t){this.customGraphics.strokeDash={arr:e,arg:t}}},{key:"moveTo",value:function(e,t){this.customGraphics.currentPath.push(["moveTo",e,t])}},{key:"lineTo",value:function(e,t){this.customGraphics.currentPath.push(["lineTo",e,t])}},{key:"bezierCurveTo",value:function(e,t,r,i,n,o){this.customGraphics.currentPath.push(["bezierCurveTo",e,t,r,i,n,o])}},{key:"quadraticCurveTo",value:function(e,t,r,i){this.customGraphics.currentPath.push(["quadraticCurveTo",e,t,r,i])}},{key:"closePath",value:function(){this.customGraphics.currentPath.push(["closePath"])}},{key:"drawEllipse",value:function(e,t,r,i){void 0===this.customGraphics.currentPath&&(this.customGraphics.currentPath=[]),this.customGraphics.currentPath.push(["ellipse",e,t,r,i])}},{key:"drawRoundRect",value:function(e,t,r,i,n){void 0===this.customGraphics.currentPath&&(this.customGraphics.currentPath=[]),this.customGraphics.currentPath.push(["rect",e,t,r,i,n])}},{key:"customRender",value:function(e,t,r){if(e.ctx instanceof Laya.WebGLContext2D&&(e.ctx._curMat,e.ctx._curMat.tx,e.ctx._curMat.a,e.ctx._curMat.ty,e.ctx._curMat.d),"string"==typeof this.customGraphics.fillStyle)if(e.ctx instanceof Laya.WebGLContext2D)if(this.customGraphics.fillStyle.startsWith("rgba")){var i=this.customGraphics.fillStyle.replace("rgba(","").replace(")").split(",");e.ctx.fillStyle=Laya.Color.create("#"+parseInt(i[0]).toString(16)+parseInt(i[1]).toString(16)+parseInt(i[2]).toString(16))}else e.ctx.fillStyle=this.customGraphics.fillStyle;else e.ctx.fillStyle=this.customGraphics.fillStyle;if("string"==typeof this.customGraphics.strokeStyle)if(e.ctx instanceof Laya.WebGLContext2D)if(this.customGraphics.strokeStyle.startsWith("rgba")){var n=this.customGraphics.strokeStyle.replace("rgba(","").replace(")").split(",");e.ctx.strokeStyle=Laya.Color.create("#"+parseInt(n[0]).toString(16)+parseInt(n[1]).toString(16)+parseInt(n[2]).toString(16))}else e.ctx.strokeStyle=this.customGraphics.strokeStyle;else e.ctx.strokeStyle=this.customGraphics.strokeStyle;if(e.ctx.lineCap=this.customGraphics.lineCap,e.ctx.lineJoin=this.customGraphics.lineJoin,e.ctx.lineWidth=this.customGraphics.lineWidth,e.ctx.miterLimit=this.customGraphics.miterLimit,void 0!==this.customGraphics.strokeDash){var o=this.customGraphics.strokeDash,s=o.arr,a=o.arg,u=[];s.forEach((function(e){return u.push(e)})),u.push(a),e.ctx.setLineDash&&e.ctx.setLineDash(u)}this.customGraphics.currentPath instanceof Array&&(e.ctx.beginPath(),this.customGraphics.currentPath.forEach((function(t){if("moveTo"===t[0]){var r={x:t[1],y:t[2]};e.ctx.moveTo(r.x,r.y)}else if("lineTo"===t[0]){var i={x:t[1],y:t[2]};e.ctx.lineTo(i.x,i.y)}else if("bezierCurveTo"===t[0]){var n={x:t[1],y:t[2]},o={x:t[3],y:t[4]},s={x:t[5],y:t[6]};e.ctx.bezierCurveTo(n.x,n.y,o.x,o.y,s.x,s.y)}else if("quadraticCurveTo"===t[0]){var a={x:t[1],y:t[2]},u={x:t[3],y:t[4]};e.ctx.quadraticCurveTo(a.x,a.y,u.x,u.y)}else if("closePath"===t[0])e.ctx.closePath();else if("ellipse"===t[0]){var f=t[1],l=t[2],h=t[3],c=t[4],p=h/2*.5522848,d=c/2*.5522848,y=f+h,m=l+c,v=f+h/2,b=l+c/2;e.ctx.beginPath(),e.ctx.moveTo(f,b),e.ctx.bezierCurveTo(f,b-d,v-p,l,v,l),e.ctx.bezierCurveTo(v+p,l,y,b-d,y,b),e.ctx.bezierCurveTo(y,b+d,v+p,m,v,m),e.ctx.bezierCurveTo(v-p,m,f,b+d,f,b)}else if("rect"===t[0]){var g={x:t[1],y:t[2]},_=g.x,w=g.y,k=t[3],x=t[4],O=t[5];e.ctx.moveTo(_+O,w),e.ctx.lineTo(_+k-O,w),e.ctx.quadraticCurveTo(_+k,w,_+k,w+O),e.ctx.lineTo(_+k,w+x-O),e.ctx.quadraticCurveTo(_+k,w+x,_+k-O,w+x),e.ctx.lineTo(_+O,w+x),e.ctx.quadraticCurveTo(_,w+x,_,w+x-O),e.ctx.lineTo(_,w+O),e.ctx.quadraticCurveTo(_,w,_+O,w),e.ctx.lineTo(_,w),e.ctx.closePath()}}))),this.customGraphics.fillStyle&&e.ctx.fill(),this.customGraphics.strokeStyle&&e.ctx.stroke()}}]),t}(),h=function(e){function t(e){i(this,t);var r=n(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return r._drawedFrame=0,r._keepFrameCache={},r._sprite=e,r._resetKeepFrameCache(),r}return o(t,Laya.Sprite),s(t,[{key:"stepToFrame",value:function(e){e<this._sprite.frames.length&&this._drawFrame(e)}},{key:"_resetKeepFrameCache",value:function(){var e=this;this._keepFrameCache={};var t=0;this._sprite.frames.forEach((function(r,i){e._isKeepFrame(r)?e._keepFrameCache[i]=t:t=i}))}},{key:"_requestKeepFrame",value:function(e){return this._keepFrameCache[e]}},{key:"_isKeepFrame",value:function(e){return e.shapes&&e.shapes.length>0&&"keep"===e.shapes[0].type}},{key:"_drawFrame",value:function(e){var t=this;if(e<this._sprite.frames.length){var r=this._sprite.frames[e];if(this._isKeepFrame(r)&&this._drawedFrame===this._requestKeepFrame(e))return;this.removeChildren(0,this.numChildren),r.shapes.forEach((function(e){"shape"===e.type&&e.pathArgs&&e.pathArgs.d?t.addChild(c.requestBezierShape(new a.BezierPath(e.pathArgs.d,e.transform,e.styles))):"ellipse"===e.type&&e.pathArgs?t.addChild(c.requestEllipseShape(new u.EllipsePath(parseFloat(e.pathArgs.x)||0,parseFloat(e.pathArgs.y)||0,parseFloat(e.pathArgs.radiusX)||0,parseFloat(e.pathArgs.radiusY)||0,e.transform,e.styles))):"rect"===e.type&&e.pathArgs&&t.addChild(c.requestRectShape(new f.RectPath(parseFloat(e.pathArgs.x)||0,parseFloat(e.pathArgs.y)||0,parseFloat(e.pathArgs.width)||0,parseFloat(e.pathArgs.height)||0,parseFloat(e.pathArgs.cornerRadius)||0,e.transform,e.styles)))})),this._drawedFrame=e}}}]),t}(),c=t.Renderer=function(){function e(t){i(this,e),this._owner=t}return s(e,[{key:"requestContentLayer",value:function(t){var r=void 0,i=new Laya.Sprite;return t.imageKey&&((r=this._owner._dynamicImage[t.imageKey]||this._owner._videoItem.images[t.imageKey])&&i.addChild(this.requestBitmapLayer(r,this._owner._dynamicImageTransform[t.imageKey],t.frames)),this._owner._dynamicText[t.imageKey]&&(i.textLayer=this._owner._dynamicText[t.imageKey],i.addChild(this._owner._dynamicText[t.imageKey]))),i.addChild(this.requestVectorLayer(t)),i.stepToFrame=function(r){if(r<t.frames.length){var n=t.frames[r];if(n.alpha>0){if(i.alpha=n.alpha,i.visible=!0,i.transform=new Laya.Matrix(n.transform.a,n.transform.b,n.transform.c,n.transform.d,n.transform.tx,n.transform.ty),i.setBounds(new Laya.Rectangle(n.layout.x,n.layout.y,n.layout.width,n.layout.height)),i.mask=void 0,n.maskPath&&(i.mask=e.requestBezierShape(n.maskPath)),i.textLayer){var o=void 0!==i.textLayer.offset&&void 0!==i.textLayer.offset.x?i.textLayer.offset.x:0,s=void 0!==i.textLayer.offset&&void 0!==i.textLayer.offset.y?i.textLayer.offset.y:0;i.textLayer.x=(n.layout.width-i.textLayer.getBounds().width)/2+o,i.textLayer.y=(n.layout.height-i.textLayer.getBounds().height)/2+s}}else i.visible=!1}for(var a=0;a<i.numChildren;a++){var u=i.getChildAt(a);u.stepToFrame&&u.stepToFrame(r)}},i}},{key:"requestBitmapLayer",value:function(e,t,r){var i=new Laya.Sprite;return 0===e.indexOf("iVBO")||0===e.indexOf("/9j/2w")?i.loadImage("data:image/png;base64,"+e):i.loadImage(e),void 0!==t&&(i.transform=new Laya.Matrix(t[0],t[1],t[2],t[3],t[4],t[5])),i.frames=r,i.stepToFrame=function(e){},i}},{key:"requestVectorLayer",value:function(e){return new h(e)}},{key:"drawFrame",value:function(e){for(var t=0;t<this._owner.numChildren;t++){var r=this._owner.getChildAt(t);r.stepToFrame&&r.stepToFrame(e)}}}],[{key:"resetStyle",value:function(e,t){var r=e._styles;if(r){if(r&&r.stroke&&t.beginStroke("rgba("+parseInt(255*r.stroke[0])+", "+parseInt(255*r.stroke[1])+", "+parseInt(255*r.stroke[2])+", "+r.stroke[3]+")"),r){var i=r.strokeWidth||0,n=r.lineCap||"",o=r.lineJoin||"",s=r.miterLimit||"";t.setStrokeStyle(i,n,o,s,!0)}r&&r.fill&&t.beginFill("rgba("+parseInt(255*r.fill[0])+", "+parseInt(255*r.fill[1])+", "+parseInt(255*r.fill[2])+", "+r.fill[3]+")"),r&&r.lineDash&&t.setStrokeDash([r.lineDash[0],r.lineDash[1]],r.lineDash[2])}}},{key:"requestBezierShape",value:function(e){var t=this,r=new l,i=r;this.resetStyle(e,r);var n={x:0,y:0,x1:0,y1:0,x2:0,y2:0};return e._d.replace(/([a-zA-Z])/g,"|||$1 ").replace(/,/g," ").split("|||").forEach((function(e){if(0!=e.length){var r=e.substr(0,1);if("MLHVCSQRZmlhvcsqrz".indexOf(r)>=0){var o=e.substr(1).trim().split(" ");t.drawBezierElement(i,n,r,o)}}})),void 0!==e._transform&&null!==e._transform&&(r.transform=new Laya.Matrix(e._transform.a,e._transform.b,e._transform.c,e._transform.d,e._transform.tx,e._transform.ty)),r}},{key:"drawBezierElement",value:function(e,t,r,i){switch(r){case"M":t.x=Number(i[0]),t.y=Number(i[1]),e.moveTo(t.x,t.y);break;case"m":t.x+=Number(i[0]),t.y+=Number(i[1]),e.moveTo(t.x,t.y);break;case"L":t.x=Number(i[0]),t.y=Number(i[1]),e.lineTo(t.x,t.y);break;case"l":t.x+=Number(i[0]),t.y+=Number(i[1]),e.lineTo(t.x,t.y);break;case"H":t.x=Number(i[0]),e.lineTo(t.x,t.y);break;case"h":t.x+=Number(i[0]),e.lineTo(t.x,t.y);break;case"V":t.y=Number(i[0]),e.lineTo(t.x,t.y);break;case"v":t.y+=Number(i[0]),e.lineTo(t.x,t.y);break;case"C":t.x1=Number(i[0]),t.y1=Number(i[1]),t.x2=Number(i[2]),t.y2=Number(i[3]),t.x=Number(i[4]),t.y=Number(i[5]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y);break;case"c":t.x1=t.x+Number(i[0]),t.y1=t.y+Number(i[1]),t.x2=t.x+Number(i[2]),t.y2=t.y+Number(i[3]),t.x+=Number(i[4]),t.y+=Number(i[5]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y);break;case"S":t.x1&&t.y1&&t.x2&&t.y2?(t.x1=t.x-t.x2+t.x,t.y1=t.y-t.y2+t.y,t.x2=Number(i[0]),t.y2=Number(i[1]),t.x=Number(i[2]),t.y=Number(i[3]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y)):(t.x1=Number(i[0]),t.y1=Number(i[1]),t.x=Number(i[2]),t.y=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y));break;case"s":t.x1&&t.y1&&t.x2&&t.y2?(t.x1=t.x-t.x2+t.x,t.y1=t.y-t.y2+t.y,t.x2=t.x+Number(i[0]),t.y2=t.y+Number(i[1]),t.x+=Number(i[2]),t.y+=Number(i[3]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y)):(t.x1=t.x+Number(i[0]),t.y1=t.y+Number(i[1]),t.x+=Number(i[2]),t.y+=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y));break;case"Q":t.x1=Number(i[0]),t.y1=Number(i[1]),t.x=Number(i[2]),t.y=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y);break;case"q":t.x1=t.x+Number(i[0]),t.y1=t.y+Number(i[1]),t.x+=Number(i[2]),t.y+=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y);break;case"A":case"a":break;case"Z":case"z":e.closePath()}}},{key:"requestEllipseShape",value:function(e){var t=new l,r=t;return this.resetStyle(e,t),r.drawEllipse(e._x-e._radiusX,e._y-e._radiusY,2*e._radiusX,2*e._radiusY),void 0!==e._transform&&null!==e._transform&&(t.transform=new Laya.Matrix(e._transform.a,e._transform.b,e._transform.c,e._transform.d,e._transform.tx,e._transform.ty)),t}},{key:"requestRectShape",value:function(e){var t=new l,r=t;return this.resetStyle(e,t),r.drawRoundRect(e._x,e._y,e._width,e._height,e._cornerRadius),void 0!==e._transform&&null!==e._transform&&(t.transform=new Laya.Matrix(e._transform.a,e._transform.b,e._transform.c,e._transform.d,e._transform.tx,e._transform.ty)),t}}]),e}()}])}));
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.min.js b/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.min.js
new file mode 100644
index 0000000..fb60df4
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/build/svga.min.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.SVGA=t():e.SVGA=t()}(window,(function(){return function(e){function t(i){if(r[i])return r[i].exports;var n=r[i]={i:i,l:!1,exports:{}};return e[i].call(n.exports,n,n.exports,t),n.l=!0,n.exports}var r={};return t.m=e,t.c=r,t.d=function(e,r,i){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:i})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var i=Object.create(null);if(t.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)t.d(i,n,function(t){return e[t]}.bind(null,n));return i},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=64)}([function(e,t,r){"use strict";var i,n,o=e.exports=r(1),s=r(20);o.codegen=r(47),o.fetch=r(48),o.path=r(49),o.fs=o.inquire("fs"),o.toArray=function(e){if(e){for(var t=Object.keys(e),r=new Array(t.length),i=0;i<t.length;)r[i]=e[t[i++]];return r}return[]},o.toObject=function(e){for(var t={},r=0;r<e.length;){var i=e[r++],n=e[r++];void 0!==n&&(t[i]=n)}return t};var a=/\\/g,f=/"/g;o.isReserved=function(e){return/^(?:do|if|in|for|let|new|try|var|case|else|enum|eval|false|null|this|true|void|with|break|catch|class|const|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$/.test(e)},o.safeProp=function(e){return!/^[$\w_]+$/.test(e)||o.isReserved(e)?'["'+e.replace(a,"\\\\").replace(f,'\\"')+'"]':"."+e},o.ucFirst=function(e){return e.charAt(0).toUpperCase()+e.substring(1)};var l=/_([a-z])/g;o.camelCase=function(e){return e.substring(0,1)+e.substring(1).replace(l,(function(e,t){return t.toUpperCase()}))},o.compareFieldsById=function(e,t){return e.id-t.id},o.decorateType=function(e,t){if(e.$type)return t&&e.$type.name!==t&&(o.decorateRoot.remove(e.$type),e.$type.name=t,o.decorateRoot.add(e.$type)),e.$type;i||(i=r(22));var n=new i(t||e.name);return o.decorateRoot.add(n),n.ctor=e,Object.defineProperty(e,"$type",{value:n,enumerable:!1}),Object.defineProperty(e.prototype,"$type",{value:n,enumerable:!1}),n};var u=0;o.decorateEnum=function(e){if(e.$type)return e.$type;n||(n=r(2));var t=new n("Enum"+u++,e);return o.decorateRoot.add(t),Object.defineProperty(e,"$type",{value:t,enumerable:!1}),t},o.setProperty=function(e,t,r){if("object"!=typeof e)throw TypeError("dst must be an object");if(!t)throw TypeError("path must be specified");return function e(t,r,i){var n=r.shift();if(r.length>0)t[n]=e(t[n]||{},r,i);else{var o=t[n];o&&(i=[].concat(o).concat(i)),t[n]=i}return t}(e,t=t.split("."),r)},Object.defineProperty(o,"decorateRoot",{get:function(){return s.decorated||(s.decorated=new(r(30)))}})},function(e,t,r){"use strict";(function(e){function i(e,t,r){for(var i=Object.keys(t),n=0;n<i.length;++n)void 0!==e[i[n]]&&r||(e[i[n]]=t[i[n]]);return e}function n(e){function t(e,r){if(!(this instanceof t))return new t(e,r);Object.defineProperty(this,"message",{get:function(){return e}}),Error.captureStackTrace?Error.captureStackTrace(this,t):Object.defineProperty(this,"stack",{value:(new Error).stack||""}),r&&i(this,r)}return(t.prototype=Object.create(Error.prototype)).constructor=t,Object.defineProperty(t.prototype,"name",{get:function(){return e}}),t.prototype.toString=function(){return this.name+": "+this.message},t}var o=t;o.asPromise=r(17),o.base64=r(38),o.EventEmitter=r(39),o.float=r(40),o.inquire=r(18),o.utf8=r(41),o.pool=r(42),o.LongBits=r(43),o.isNode=Boolean(void 0!==e&&e&&e.process&&e.process.versions&&e.process.versions.node),o.global=o.isNode&&e||"undefined"!=typeof window&&window||"undefined"!=typeof self&&self||this,o.emptyArray=Object.freeze?Object.freeze([]):[],o.emptyObject=Object.freeze?Object.freeze({}):{},o.isInteger=Number.isInteger||function(e){return"number"==typeof e&&isFinite(e)&&Math.floor(e)===e},o.isString=function(e){return"string"==typeof e||e instanceof String},o.isObject=function(e){return e&&"object"==typeof e},o.isset=o.isSet=function(e,t){var r=e[t];return!(null==r||!e.hasOwnProperty(t))&&("object"!=typeof r||(Array.isArray(r)?r.length:Object.keys(r).length)>0)},o.Buffer=function(){try{var e=o.inquire("buffer").Buffer;return e.prototype.utf8Write?e:null}catch(e){return null}}(),o._Buffer_from=null,o._Buffer_allocUnsafe=null,o.newBuffer=function(e){return"number"==typeof e?o.Buffer?o._Buffer_allocUnsafe(e):new o.Array(e):o.Buffer?o._Buffer_from(e):"undefined"==typeof Uint8Array?e:new Uint8Array(e)},o.Array="undefined"!=typeof Uint8Array?Uint8Array:Array,o.Long=o.global.dcodeIO&&o.global.dcodeIO.Long||o.global.Long||o.inquire("long"),o.key2Re=/^true|false|0|1$/,o.key32Re=/^-?(?:0|[1-9][0-9]*)$/,o.key64Re=/^(?:[\\x00-\\xff]{8}|-?(?:0|[1-9][0-9]*))$/,o.longToHash=function(e){return e?o.LongBits.from(e).toHash():o.LongBits.zeroHash},o.longFromHash=function(e,t){var r=o.LongBits.fromHash(e);return o.Long?o.Long.fromBits(r.lo,r.hi,t):r.toNumber(Boolean(t))},o.merge=i,o.lcFirst=function(e){return e.charAt(0).toLowerCase()+e.substring(1)},o.newError=n,o.ProtocolError=n("ProtocolError"),o.oneOfGetter=function(e){for(var t={},r=0;r<e.length;++r)t[e[r]]=1;return function(){for(var e=Object.keys(this),r=e.length-1;r>-1;--r)if(1===t[e[r]]&&void 0!==this[e[r]]&&null!==this[e[r]])return e[r]}},o.oneOfSetter=function(e){return function(t){for(var r=0;r<e.length;++r)e[r]!==t&&delete this[e[r]]}},o.toJSONOptions={longs:String,enums:String,bytes:String,json:!0},o._configure=function(){var e=o.Buffer;e?(o._Buffer_from=e.from!==Uint8Array.from&&e.from||function(t,r){return new e(t,r)},o._Buffer_allocUnsafe=e.allocUnsafe||function(t){return new e(t)}):o._Buffer_from=o._Buffer_allocUnsafe=null}}).call(this,r(37))},function(e,t,r){"use strict";function i(e,t,r,i,o){if(n.call(this,e,r),t&&"object"!=typeof t)throw TypeError("values must be an object");if(this.valuesById={},this.values=Object.create(this.valuesById),this.comment=i,this.comments=o||{},this.reserved=void 0,t)for(var s=Object.keys(t),a=0;a<s.length;++a)"number"==typeof t[s[a]]&&(this.valuesById[this.values[s[a]]=t[s[a]]]=s[a])}e.exports=i;var n=r(3);((i.prototype=Object.create(n.prototype)).constructor=i).className="Enum";var o=r(6),s=r(0);i.fromJSON=function(e,t){var r=new i(e,t.values,t.options,t.comment,t.comments);return r.reserved=t.reserved,r},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return s.toObject(["options",this.options,"values",this.values,"reserved",this.reserved&&this.reserved.length?this.reserved:void 0,"comment",t?this.comment:void 0,"comments",t?this.comments:void 0])},i.prototype.add=function(e,t,r){if(!s.isString(e))throw TypeError("name must be a string");if(!s.isInteger(t))throw TypeError("id must be an integer");if(void 0!==this.values[e])throw Error("duplicate name '"+e+"' in "+this);if(this.isReservedId(t))throw Error("id "+t+" is reserved in "+this);if(this.isReservedName(e))throw Error("name '"+e+"' is reserved in "+this);if(void 0!==this.valuesById[t]){if(!this.options||!this.options.allow_alias)throw Error("duplicate id "+t+" in "+this);this.values[e]=t}else this.valuesById[this.values[e]=t]=e;return this.comments[e]=r||null,this},i.prototype.remove=function(e){if(!s.isString(e))throw TypeError("name must be a string");var t=this.values[e];if(null==t)throw Error("name '"+e+"' does not exist in "+this);return delete this.valuesById[t],delete this.values[e],delete this.comments[e],this},i.prototype.isReservedId=function(e){return o.isReservedId(this.reserved,e)},i.prototype.isReservedName=function(e){return o.isReservedName(this.reserved,e)}},function(e,t,r){"use strict";function i(e,t){if(!o.isString(e))throw TypeError("name must be a string");if(t&&!o.isObject(t))throw TypeError("options must be an object");this.options=t,this.parsedOptions=null,this.name=e,this.parent=null,this.resolved=!1,this.comment=null,this.filename=null}e.exports=i,i.className="ReflectionObject";var n,o=r(0);Object.defineProperties(i.prototype,{root:{get:function(){for(var e=this;null!==e.parent;)e=e.parent;return e}},fullName:{get:function(){for(var e=[this.name],t=this.parent;t;)e.unshift(t.name),t=t.parent;return e.join(".")}}}),i.prototype.toJSON=function(){throw Error()},i.prototype.onAdd=function(e){this.parent&&this.parent!==e&&this.parent.remove(this),this.parent=e,this.resolved=!1;var t=e.root;t instanceof n&&t._handleAdd(this)},i.prototype.onRemove=function(e){var t=e.root;t instanceof n&&t._handleRemove(this),this.parent=null,this.resolved=!1},i.prototype.resolve=function(){return this.resolved?this:(this.root instanceof n&&(this.resolved=!0),this)},i.prototype.getOption=function(e){if(this.options)return this.options[e]},i.prototype.setOption=function(e,t,r){return r&&this.options&&void 0!==this.options[e]||((this.options||(this.options={}))[e]=t),this},i.prototype.setParsedOption=function(e,t,r){this.parsedOptions||(this.parsedOptions=[]);var i=this.parsedOptions;if(r){var n=i.find((function(t){return Object.prototype.hasOwnProperty.call(t,e)}));if(n){var s=n[e];o.setProperty(s,r,t)}else(n={})[e]=o.setProperty({},r,t),i.push(n)}else{var a={};a[e]=t,i.push(a)}return this},i.prototype.setOptions=function(e,t){if(e)for(var r=Object.keys(e),i=0;i<r.length;++i)this.setOption(r[i],e[r[i]],t);return this},i.prototype.toString=function(){var e=this.constructor.className,t=this.fullName;return t.length?e+" "+t:e},i._configure=function(e){n=e}},function(e,t,r){"use strict";function i(e,t,r,i,o,s,u){if(f.isObject(i)?(u=o,s=i,i=o=void 0):f.isObject(o)&&(u=s,s=o,o=void 0),n.call(this,e,s),!f.isInteger(t)||t<0)throw TypeError("id must be a non-negative integer");if(!f.isString(r))throw TypeError("type must be a string");if(void 0!==i&&!l.test(i=i.toString().toLowerCase()))throw TypeError("rule must be a string rule");if(void 0!==o&&!f.isString(o))throw TypeError("extend must be a string");this.rule=i&&"optional"!==i?i:void 0,this.type=r,this.id=t,this.extend=o||void 0,this.required="required"===i,this.optional=!this.required,this.repeated="repeated"===i,this.map=!1,this.message=null,this.partOf=null,this.typeDefault=null,this.defaultValue=null,this.long=!!f.Long&&void 0!==a.long[r],this.bytes="bytes"===r,this.resolvedType=null,this.extensionField=null,this.declaringField=null,this._packed=null,this.comment=u}e.exports=i;var n=r(3);((i.prototype=Object.create(n.prototype)).constructor=i).className="Field";var o,s=r(2),a=r(7),f=r(0),l=/^required|optional|repeated$/;i.fromJSON=function(e,t){return new i(e,t.id,t.type,t.rule,t.extend,t.options,t.comment)},Object.defineProperty(i.prototype,"packed",{get:function(){return null===this._packed&&(this._packed=!1!==this.getOption("packed")),this._packed}}),i.prototype.setOption=function(e,t,r){return"packed"===e&&(this._packed=null),n.prototype.setOption.call(this,e,t,r)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return f.toObject(["rule","optional"!==this.rule&&this.rule||void 0,"type",this.type,"id",this.id,"extend",this.extend,"options",this.options,"comment",t?this.comment:void 0])},i.prototype.resolve=function(){if(this.resolved)return this;if(void 0===(this.typeDefault=a.defaults[this.type])&&(this.resolvedType=(this.declaringField?this.declaringField.parent:this.parent).lookupTypeOrEnum(this.type),this.resolvedType instanceof o?this.typeDefault=null:this.typeDefault=this.resolvedType.values[Object.keys(this.resolvedType.values)[0]]),this.options&&null!=this.options.default&&(this.typeDefault=this.options.default,this.resolvedType instanceof s&&"string"==typeof this.typeDefault&&(this.typeDefault=this.resolvedType.values[this.typeDefault])),this.options&&(!0!==this.options.packed&&(void 0===this.options.packed||!this.resolvedType||this.resolvedType instanceof s)||delete this.options.packed,Object.keys(this.options).length||(this.options=void 0)),this.long)this.typeDefault=f.Long.fromNumber(this.typeDefault,"u"===this.type.charAt(0)),Object.freeze&&Object.freeze(this.typeDefault);else if(this.bytes&&"string"==typeof this.typeDefault){var e;f.base64.test(this.typeDefault)?f.base64.decode(this.typeDefault,e=f.newBuffer(f.base64.length(this.typeDefault)),0):f.utf8.write(this.typeDefault,e=f.newBuffer(f.utf8.length(this.typeDefault)),0),this.typeDefault=e}return this.map?this.defaultValue=f.emptyObject:this.repeated?this.defaultValue=f.emptyArray:this.defaultValue=this.typeDefault,this.parent instanceof o&&(this.parent.ctor.prototype[this.name]=this.defaultValue),n.prototype.resolve.call(this)},i.d=function(e,t,r,n){return"function"==typeof t?t=f.decorateType(t).name:t&&"object"==typeof t&&(t=f.decorateEnum(t).name),function(o,s){f.decorateType(o.constructor).add(new i(s,e,t,r,{default:n}))}},i._configure=function(e){o=e}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.BezierPath=function e(t,r,i){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this._d=t,this._transform=r,this._styles=i}},function(e,t,r){"use strict";function i(e,t){if(e&&e.length){for(var r={},i=0;i<e.length;++i)r[e[i].name]=e[i].toJSON(t);return r}}function n(e,t){s.call(this,e,t),this.nested=void 0,this._nestedArray=null}function o(e){return e._nestedArray=null,e}e.exports=n;var s=r(3);((n.prototype=Object.create(s.prototype)).constructor=n).className="Namespace";var a,f,l,u=r(4),h=r(0);n.fromJSON=function(e,t){return new n(e,t.options).addJSON(t.nested)},n.arrayToJSON=i,n.isReservedId=function(e,t){if(e)for(var r=0;r<e.length;++r)if("string"!=typeof e[r]&&e[r][0]<=t&&e[r][1]>t)return!0;return!1},n.isReservedName=function(e,t){if(e)for(var r=0;r<e.length;++r)if(e[r]===t)return!0;return!1},Object.defineProperty(n.prototype,"nestedArray",{get:function(){return this._nestedArray||(this._nestedArray=h.toArray(this.nested))}}),n.prototype.toJSON=function(e){return h.toObject(["options",this.options,"nested",i(this.nestedArray,e)])},n.prototype.addJSON=function(e){if(e)for(var t,r=Object.keys(e),i=0;i<r.length;++i)t=e[r[i]],this.add((void 0!==t.fields?a.fromJSON:void 0!==t.values?l.fromJSON:void 0!==t.methods?f.fromJSON:void 0!==t.id?u.fromJSON:n.fromJSON)(r[i],t));return this},n.prototype.get=function(e){return this.nested&&this.nested[e]||null},n.prototype.getEnum=function(e){if(this.nested&&this.nested[e]instanceof l)return this.nested[e].values;throw Error("no such enum: "+e)},n.prototype.add=function(e){if(!(e instanceof u&&void 0!==e.extend||e instanceof a||e instanceof l||e instanceof f||e instanceof n))throw TypeError("object must be a valid nested object");if(this.nested){var t=this.get(e.name);if(t){if(!(t instanceof n&&e instanceof n)||t instanceof a||t instanceof f)throw Error("duplicate name '"+e.name+"' in "+this);for(var r=t.nestedArray,i=0;i<r.length;++i)e.add(r[i]);this.remove(t),this.nested||(this.nested={}),e.setOptions(t.options,!0)}}else this.nested={};return this.nested[e.name]=e,e.onAdd(this),o(this)},n.prototype.remove=function(e){if(!(e instanceof s))throw TypeError("object must be a ReflectionObject");if(e.parent!==this)throw Error(e+" is not a member of "+this);return delete this.nested[e.name],Object.keys(this.nested).length||(this.nested=void 0),e.onRemove(this),o(this)},n.prototype.define=function(e,t){if(h.isString(e))e=e.split(".");else if(!Array.isArray(e))throw TypeError("illegal path");if(e&&e.length&&""===e[0])throw Error("path must be relative");for(var r=this;e.length>0;){var i=e.shift();if(r.nested&&r.nested[i]){if(!((r=r.nested[i])instanceof n))throw Error("path conflicts with non-namespace objects")}else r.add(r=new n(i))}return t&&r.addJSON(t),r},n.prototype.resolveAll=function(){for(var e=this.nestedArray,t=0;t<e.length;)e[t]instanceof n?e[t++].resolveAll():e[t++].resolve();return this.resolve()},n.prototype.lookup=function(e,t,r){if("boolean"==typeof t?(r=t,t=void 0):t&&!Array.isArray(t)&&(t=[t]),h.isString(e)&&e.length){if("."===e)return this.root;e=e.split(".")}else if(!e.length)return this;if(""===e[0])return this.root.lookup(e.slice(1),t);var i=this.get(e[0]);if(i){if(1===e.length){if(!t||t.indexOf(i.constructor)>-1)return i}else if(i instanceof n&&(i=i.lookup(e.slice(1),t,!0)))return i}else for(var o=0;o<this.nestedArray.length;++o)if(this._nestedArray[o]instanceof n&&(i=this._nestedArray[o].lookup(e,t,!0)))return i;return null===this.parent||r?null:this.parent.lookup(e,t)},n.prototype.lookupType=function(e){var t=this.lookup(e,[a]);if(!t)throw Error("no such type: "+e);return t},n.prototype.lookupEnum=function(e){var t=this.lookup(e,[l]);if(!t)throw Error("no such Enum '"+e+"' in "+this);return t},n.prototype.lookupTypeOrEnum=function(e){var t=this.lookup(e,[a,l]);if(!t)throw Error("no such Type or Enum '"+e+"' in "+this);return t},n.prototype.lookupService=function(e){var t=this.lookup(e,[f]);if(!t)throw Error("no such Service '"+e+"' in "+this);return t},n._configure=function(e,t,r){a=e,f=t,l=r}},function(e,t,r){"use strict";function i(e,t){var r=0,i={};for(t|=0;r<e.length;)i[s[r+t]]=e[r++];return i}var n=t,o=r(0),s=["double","float","int32","uint32","sint32","fixed32","sfixed32","int64","uint64","sint64","fixed64","sfixed64","bool","string","bytes"];n.basic=i([1,5,0,0,0,5,5,0,0,0,1,1,0,2,2]),n.defaults=i([0,0,0,0,0,0,0,0,0,0,0,0,!1,"",o.emptyArray,null]),n.long=i([0,0,0,1,1],7),n.mapKey=i([0,0,0,5,5,0,0,0,1,1,0,2],2),n.packed=i([1,5,0,0,0,5,5,0,0,0,1,1,0])},function(e,t,r){"use strict";function i(e,t){return Object.prototype.hasOwnProperty.call(e,t)}var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;t.assign=function(e){for(var t=Array.prototype.slice.call(arguments,1);t.length;){var r=t.shift();if(r){if("object"!=typeof r)throw new TypeError(r+"must be non-object");for(var n in r)i(r,n)&&(e[n]=r[n])}}return e},t.shrinkBuf=function(e,t){return e.length===t?e:e.subarray?e.subarray(0,t):(e.length=t,e)};var o={arraySet:function(e,t,r,i,n){if(t.subarray&&e.subarray)e.set(t.subarray(r,r+i),n);else for(var o=0;o<i;o++)e[n+o]=t[r+o]},flattenChunks:function(e){var t,r,i,n,o,s;for(i=0,t=0,r=e.length;t<r;t++)i+=e[t].length;for(s=new Uint8Array(i),n=0,t=0,r=e.length;t<r;t++)o=e[t],s.set(o,n),n+=o.length;return s}},s={arraySet:function(e,t,r,i,n){for(var o=0;o<i;o++)e[n+o]=t[r+o]},flattenChunks:function(e){return[].concat.apply([],e)}};t.setTyped=function(e){e?(t.Buf8=Uint8Array,t.Buf16=Uint16Array,t.Buf32=Int32Array,t.assign(t,o)):(t.Buf8=Array,t.Buf16=Array,t.Buf32=Array,t.assign(t,s))},t.setTyped(n)},function(e,t,r){"use strict";function i(e,t,r){this.fn=e,this.len=t,this.next=void 0,this.val=r}function n(){}function o(e){this.head=e.head,this.tail=e.tail,this.len=e.len,this.next=e.states}function s(){this.len=0,this.head=new i(n,0,0),this.tail=this.head,this.states=null}function a(e,t,r){t[r]=255&e}function f(e,t){this.len=e,this.next=void 0,this.val=t}function l(e,t,r){for(;e.hi;)t[r++]=127&e.lo|128,e.lo=(e.lo>>>7|e.hi<<25)>>>0,e.hi>>>=7;for(;e.lo>127;)t[r++]=127&e.lo|128,e.lo=e.lo>>>7;t[r++]=e.lo}function u(e,t,r){t[r]=255&e,t[r+1]=e>>>8&255,t[r+2]=e>>>16&255,t[r+3]=e>>>24}e.exports=s;var h,c=r(1),d=c.LongBits,p=c.base64,y=c.utf8,m=function(){return c.Buffer?function(){return(s.create=function(){return new h})()}:function(){return new s}};s.create=m(),s.alloc=function(e){return new c.Array(e)},c.Array!==Array&&(s.alloc=c.pool(s.alloc,c.Array.prototype.subarray)),s.prototype._push=function(e,t,r){return this.tail=this.tail.next=new i(e,t,r),this.len+=t,this},f.prototype=Object.create(i.prototype),f.prototype.fn=function(e,t,r){for(;e>127;)t[r++]=127&e|128,e>>>=7;t[r]=e},s.prototype.uint32=function(e){return this.len+=(this.tail=this.tail.next=new f((e>>>=0)<128?1:e<16384?2:e<2097152?3:e<268435456?4:5,e)).len,this},s.prototype.int32=function(e){return e<0?this._push(l,10,d.fromNumber(e)):this.uint32(e)},s.prototype.sint32=function(e){return this.uint32((e<<1^e>>31)>>>0)},s.prototype.uint64=function(e){var t=d.from(e);return this._push(l,t.length(),t)},s.prototype.int64=s.prototype.uint64,s.prototype.sint64=function(e){var t=d.from(e).zzEncode();return this._push(l,t.length(),t)},s.prototype.bool=function(e){return this._push(a,1,e?1:0)},s.prototype.fixed32=function(e){return this._push(u,4,e>>>0)},s.prototype.sfixed32=s.prototype.fixed32,s.prototype.fixed64=function(e){var t=d.from(e);return this._push(u,4,t.lo)._push(u,4,t.hi)},s.prototype.sfixed64=s.prototype.fixed64,s.prototype.float=function(e){return this._push(c.float.writeFloatLE,4,e)},s.prototype.double=function(e){return this._push(c.float.writeDoubleLE,8,e)};var v=c.Array.prototype.set?function(e,t,r){t.set(e,r)}:function(e,t,r){for(var i=0;i<e.length;++i)t[r+i]=e[i]};s.prototype.bytes=function(e){var t=e.length>>>0;if(!t)return this._push(a,1,0);if(c.isString(e)){var r=s.alloc(t=p.length(e));p.decode(e,r,0),e=r}return this.uint32(t)._push(v,t,e)},s.prototype.string=function(e){var t=y.length(e);return t?this.uint32(t)._push(y.write,t,e):this._push(a,1,0)},s.prototype.fork=function(){return this.states=new o(this),this.head=this.tail=new i(n,0,0),this.len=0,this},s.prototype.reset=function(){return this.states?(this.head=this.states.head,this.tail=this.states.tail,this.len=this.states.len,this.states=this.states.next):(this.head=this.tail=new i(n,0,0),this.len=0),this},s.prototype.ldelim=function(){var e=this.head,t=this.tail,r=this.len;return this.reset().uint32(r),r&&(this.tail.next=e.next,this.tail=t,this.len+=r),this},s.prototype.finish=function(){for(var e=this.head.next,t=this.constructor.alloc(this.len),r=0;e;)e.fn(e.val,t,r),r+=e.len,e=e.next;return t},s._configure=function(e){h=e,s.create=m(),h._configure()}},function(e,t,r){"use strict";function i(e,t){return RangeError("index out of range: "+e.pos+" + "+(t||1)+" > "+e.len)}function n(e){this.buf=e,this.pos=0,this.len=e.length}function o(){var e=new u(0,0),t=0;if(!(this.len-this.pos>4)){for(;t<3;++t){if(this.pos>=this.len)throw i(this);if(e.lo=(e.lo|(127&this.buf[this.pos])<<7*t)>>>0,this.buf[this.pos++]<128)return e}return e.lo=(e.lo|(127&this.buf[this.pos++])<<7*t)>>>0,e}for(;t<4;++t)if(e.lo=(e.lo|(127&this.buf[this.pos])<<7*t)>>>0,this.buf[this.pos++]<128)return e;if(e.lo=(e.lo|(127&this.buf[this.pos])<<28)>>>0,e.hi=(e.hi|(127&this.buf[this.pos])>>4)>>>0,this.buf[this.pos++]<128)return e;if(t=0,this.len-this.pos>4){for(;t<5;++t)if(e.hi=(e.hi|(127&this.buf[this.pos])<<7*t+3)>>>0,this.buf[this.pos++]<128)return e}else for(;t<5;++t){if(this.pos>=this.len)throw i(this);if(e.hi=(e.hi|(127&this.buf[this.pos])<<7*t+3)>>>0,this.buf[this.pos++]<128)return e}throw Error("invalid varint encoding")}function s(e,t){return(e[t-4]|e[t-3]<<8|e[t-2]<<16|e[t-1]<<24)>>>0}function a(){if(this.pos+8>this.len)throw i(this,8);return new u(s(this.buf,this.pos+=4),s(this.buf,this.pos+=4))}e.exports=n;var f,l=r(1),u=l.LongBits,h=l.utf8,c="undefined"!=typeof Uint8Array?function(e){if(e instanceof Uint8Array||Array.isArray(e))return new n(e);throw Error("illegal buffer")}:function(e){if(Array.isArray(e))return new n(e);throw Error("illegal buffer")},d=function(){return l.Buffer?function(e){return(n.create=function(e){return l.Buffer.isBuffer(e)?new f(e):c(e)})(e)}:c};n.create=d(),n.prototype._slice=l.Array.prototype.subarray||l.Array.prototype.slice,n.prototype.uint32=function(){var e=4294967295;return function(){if(e=(127&this.buf[this.pos])>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(127&this.buf[this.pos])<<7)>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(127&this.buf[this.pos])<<14)>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(127&this.buf[this.pos])<<21)>>>0,this.buf[this.pos++]<128)return e;if(e=(e|(15&this.buf[this.pos])<<28)>>>0,this.buf[this.pos++]<128)return e;if((this.pos+=5)>this.len)throw this.pos=this.len,i(this,10);return e}}(),n.prototype.int32=function(){return 0|this.uint32()},n.prototype.sint32=function(){var e=this.uint32();return e>>>1^-(1&e)|0},n.prototype.bool=function(){return 0!==this.uint32()},n.prototype.fixed32=function(){if(this.pos+4>this.len)throw i(this,4);return s(this.buf,this.pos+=4)},n.prototype.sfixed32=function(){if(this.pos+4>this.len)throw i(this,4);return 0|s(this.buf,this.pos+=4)},n.prototype.float=function(){if(this.pos+4>this.len)throw i(this,4);var e=l.float.readFloatLE(this.buf,this.pos);return this.pos+=4,e},n.prototype.double=function(){if(this.pos+8>this.len)throw i(this,4);var e=l.float.readDoubleLE(this.buf,this.pos);return this.pos+=8,e},n.prototype.bytes=function(){var e=this.uint32(),t=this.pos,r=this.pos+e;if(r>this.len)throw i(this,e);return this.pos+=e,Array.isArray(this.buf)?this.buf.slice(t,r):t===r?new this.buf.constructor(0):this._slice.call(this.buf,t,r)},n.prototype.string=function(){var e=this.bytes();return h.read(e,0,e.length)},n.prototype.skip=function(e){if("number"==typeof e){if(this.pos+e>this.len)throw i(this,e);this.pos+=e}else do{if(this.pos>=this.len)throw i(this)}while(128&this.buf[this.pos++]);return this},n.prototype.skipType=function(e){switch(e){case 0:this.skip();break;case 1:this.skip(8);break;case 2:this.skip(this.uint32());break;case 3:for(;4!=(e=7&this.uint32());)this.skipType(e);break;case 5:this.skip(4);break;default:throw Error("invalid wire type "+e+" at offset "+this.pos)}return this},n._configure=function(e){f=e,n.create=d(),f._configure();var t=l.Long?"toLong":"toNumber";l.merge(n.prototype,{int64:function(){return o.call(this)[t](!1)},uint64:function(){return o.call(this)[t](!0)},sint64:function(){return o.call(this).zzDecode()[t](!1)},fixed64:function(){return a.call(this)[t](!0)},sfixed64:function(){return a.call(this)[t](!1)}})}},function(e,t,r){"use strict";function i(e,t,r,i){if(Array.isArray(t)||(r=t,t=void 0),o.call(this,e,r),void 0!==t&&!Array.isArray(t))throw TypeError("fieldNames must be an Array");this.oneof=t||[],this.fieldsArray=[],this.comment=i}function n(e){if(e.parent)for(var t=0;t<e.fieldsArray.length;++t)e.fieldsArray[t].parent||e.parent.add(e.fieldsArray[t])}e.exports=i;var o=r(3);((i.prototype=Object.create(o.prototype)).constructor=i).className="OneOf";var s=r(4),a=r(0);i.fromJSON=function(e,t){return new i(e,t.oneof,t.options,t.comment)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return a.toObject(["options",this.options,"oneof",this.oneof,"comment",t?this.comment:void 0])},i.prototype.add=function(e){if(!(e instanceof s))throw TypeError("field must be a Field");return e.parent&&e.parent!==this.parent&&e.parent.remove(e),this.oneof.push(e.name),this.fieldsArray.push(e),e.partOf=this,n(this),this},i.prototype.remove=function(e){if(!(e instanceof s))throw TypeError("field must be a Field");var t=this.fieldsArray.indexOf(e);if(t<0)throw Error(e+" is not a member of "+this);return this.fieldsArray.splice(t,1),(t=this.oneof.indexOf(e.name))>-1&&this.oneof.splice(t,1),e.partOf=null,this},i.prototype.onAdd=function(e){o.prototype.onAdd.call(this,e);for(var t=0;t<this.oneof.length;++t){var r=e.get(this.oneof[t]);r&&!r.partOf&&(r.partOf=this,this.fieldsArray.push(r))}n(this)},i.prototype.onRemove=function(e){for(var t,r=0;r<this.fieldsArray.length;++r)(t=this.fieldsArray[r]).parent&&t.parent.remove(t);o.prototype.onRemove.call(this,e)},i.d=function(){for(var e=new Array(arguments.length),t=0;t<arguments.length;)e[t]=arguments[t++];return function(t,r){a.decorateType(t.constructor).add(new i(r,e)),Object.defineProperty(t,r,{get:a.oneOfGetter(e),set:a.oneOfSetter(e)})}}},function(e,t,r){"use strict";function i(e){if(e)for(var t=Object.keys(e),r=0;r<t.length;++r)this[t[r]]=e[t[r]]}e.exports=i;var n=r(1);i.create=function(e){return this.$type.create(e)},i.encode=function(e,t){return this.$type.encode(e,t)},i.encodeDelimited=function(e,t){return this.$type.encodeDelimited(e,t)},i.decode=function(e){return this.$type.decode(e)},i.decodeDelimited=function(e){return this.$type.decodeDelimited(e)},i.verify=function(e){return this.$type.verify(e)},i.fromObject=function(e){return this.$type.fromObject(e)},i.toObject=function(e,t){return this.$type.toObject(e,t)},i.prototype.toJSON=function(){return this.$type.toObject(this,n.toJSONOptions)}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Parser=void 0;var i=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),n=r(31),o=function(e){return e&&e.__esModule?e:{default:e}}(r(50));t.Parser=function(){function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e)}return i(e,[{key:"load",value:function(e,t,r){this.loadViaWorker(e,t,r)}},{key:"loadViaWorker",value:function(e,t,r){(0,o.default)(e,(function(e){var r=e.movie;r.version=e.ver;var i=e.images,o=new n.VideoEntity(r,i);t(o)}),r)}}]),e}()},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.RectPath=void 0;var i=r(5);t.RectPath=function(e){function t(e,r,i,n,o,s,a){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);var f=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return f._x=e,f._y=r,f._width=i,f._height=n,f._cornerRadius=o,f._transform=s,f._styles=a,f}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),t}(i.BezierPath)},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.EllipsePath=void 0;var i=r(5);t.EllipsePath=function(e){function t(e,r,i,n,o,s){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t);var a=function(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}(this,(t.__proto__||Object.getPrototypeOf(t)).call(this));return a._x=e,a._y=r,a._radiusX=i,a._radiusY=n,a._transform=o,a._styles=s,a}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}(t,e),t}(i.BezierPath)},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=r(34),n=JSON.parse('{"nested":{"com":{"nested":{"opensource":{"nested":{"svga":{"options":{"objc_class_prefix":"SVGAProto","java_package":"com.opensource.svgaplayer.proto"},"nested":{"MovieParams":{"fields":{"viewBoxWidth":{"type":"float","id":1},"viewBoxHeight":{"type":"float","id":2},"fps":{"type":"int32","id":3},"frames":{"type":"int32","id":4}}},"SpriteEntity":{"fields":{"imageKey":{"type":"string","id":1},"frames":{"rule":"repeated","type":"FrameEntity","id":2},"matteKey":{"type":"string","id":3}}},"AudioEntity":{"fields":{"audioKey":{"type":"string","id":1},"startFrame":{"type":"int32","id":2},"endFrame":{"type":"int32","id":3},"startTime":{"type":"int32","id":4},"totalTime":{"type":"int32","id":5}}},"Layout":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4}}},"Transform":{"fields":{"a":{"type":"float","id":1},"b":{"type":"float","id":2},"c":{"type":"float","id":3},"d":{"type":"float","id":4},"tx":{"type":"float","id":5},"ty":{"type":"float","id":6}}},"ShapeEntity":{"oneofs":{"args":{"oneof":["shape","rect","ellipse"]}},"fields":{"type":{"type":"ShapeType","id":1},"shape":{"type":"ShapeArgs","id":2},"rect":{"type":"RectArgs","id":3},"ellipse":{"type":"EllipseArgs","id":4},"styles":{"type":"ShapeStyle","id":10},"transform":{"type":"Transform","id":11}},"nested":{"ShapeType":{"values":{"SHAPE":0,"RECT":1,"ELLIPSE":2,"KEEP":3}},"ShapeArgs":{"fields":{"d":{"type":"string","id":1}}},"RectArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4},"cornerRadius":{"type":"float","id":5}}},"EllipseArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"radiusX":{"type":"float","id":3},"radiusY":{"type":"float","id":4}}},"ShapeStyle":{"fields":{"fill":{"type":"RGBAColor","id":1},"stroke":{"type":"RGBAColor","id":2},"strokeWidth":{"type":"float","id":3},"lineCap":{"type":"LineCap","id":4},"lineJoin":{"type":"LineJoin","id":5},"miterLimit":{"type":"float","id":6},"lineDashI":{"type":"float","id":7},"lineDashII":{"type":"float","id":8},"lineDashIII":{"type":"float","id":9}},"nested":{"RGBAColor":{"fields":{"r":{"type":"float","id":1},"g":{"type":"float","id":2},"b":{"type":"float","id":3},"a":{"type":"float","id":4}}},"LineCap":{"values":{"LineCap_BUTT":0,"LineCap_ROUND":1,"LineCap_SQUARE":2}},"LineJoin":{"values":{"LineJoin_MITER":0,"LineJoin_ROUND":1,"LineJoin_BEVEL":2}}}}}},"FrameEntity":{"fields":{"alpha":{"type":"float","id":1},"layout":{"type":"Layout","id":2},"transform":{"type":"Transform","id":3},"clipPath":{"type":"string","id":4},"shapes":{"rule":"repeated","type":"ShapeEntity","id":5}}},"MovieEntity":{"fields":{"version":{"type":"string","id":1},"params":{"type":"MovieParams","id":2},"images":{"keyType":"string","type":"bytes","id":3},"sprites":{"rule":"repeated","type":"SpriteEntity","id":4},"audios":{"rule":"repeated","type":"AudioEntity","id":5}}}}}}}}}}}'),o=t.proto=i.Root.fromJSON(n);t.ProtoMovieEntity=o.lookupType("com.opensource.svga.MovieEntity")},function(e,t,r){"use strict";e.exports=function(e,t){for(var r=new Array(arguments.length-1),i=0,n=2,o=!0;n<arguments.length;)r[i++]=arguments[n++];return new Promise((function(n,s){r[i]=function(e){if(o)if(o=!1,e)s(e);else{for(var t=new Array(arguments.length-1),r=0;r<t.length;)t[r++]=arguments[r];n.apply(null,t)}};try{e.apply(t||null,r)}catch(e){o&&(o=!1,s(e))}}))}},function(module,exports,__webpack_require__){"use strict";function inquire(moduleName){try{var mod=eval("quire".replace(/^/,"re"))(moduleName);if(mod&&(mod.length||Object.keys(mod).length))return mod}catch(e){}return null}module.exports=inquire},function(e,t,r){"use strict";t.Service=r(46)},function(e,t,r){"use strict";e.exports={}},function(e,t,r){"use strict";function i(e,t,r,i){return t.resolvedType.group?e("types[%i].encode(%s,w.uint32(%i)).uint32(%i)",r,i,(t.id<<3|3)>>>0,(t.id<<3|4)>>>0):e("types[%i].encode(%s,w.uint32(%i).fork()).ldelim()",r,i,(t.id<<3|2)>>>0)}e.exports=function(e){for(var t,r=s.codegen(["m","w"],e.name+"$encode")("if(!w)")("w=Writer.create()"),a=e.fieldsArray.slice().sort(s.compareFieldsById),f=0;f<a.length;++f){var l=a[f].resolve(),u=e._fieldsArray.indexOf(l),h=l.resolvedType instanceof n?"int32":l.type,c=o.basic[h];t="m"+s.safeProp(l.name),l.map?(r("if(%s!=null&&Object.hasOwnProperty.call(m,%j)){",t,l.name)("for(var ks=Object.keys(%s),i=0;i<ks.length;++i){",t)("w.uint32(%i).fork().uint32(%i).%s(ks[i])",(l.id<<3|2)>>>0,8|o.mapKey[l.keyType],l.keyType),void 0===c?r("types[%i].encode(%s[ks[i]],w.uint32(18).fork()).ldelim().ldelim()",u,t):r(".uint32(%i).%s(%s[ks[i]]).ldelim()",16|c,h,t),r("}")("}")):l.repeated?(r("if(%s!=null&&%s.length){",t,t),l.packed&&void 0!==o.packed[h]?r("w.uint32(%i).fork()",(l.id<<3|2)>>>0)("for(var i=0;i<%s.length;++i)",t)("w.%s(%s[i])",h,t)("w.ldelim()"):(r("for(var i=0;i<%s.length;++i)",t),void 0===c?i(r,l,u,t+"[i]"):r("w.uint32(%i).%s(%s[i])",(l.id<<3|c)>>>0,h,t)),r("}")):(l.optional&&r("if(%s!=null&&Object.hasOwnProperty.call(m,%j))",t,l.name),void 0===c?i(r,l,u,t):r("w.uint32(%i).%s(%s)",(l.id<<3|c)>>>0,h,t))}return r("return w")};var n=r(2),o=r(7),s=r(0)},function(e,t,r){"use strict";function i(e,t){o.call(this,e,t),this.fields={},this.oneofs=void 0,this.extensions=void 0,this.reserved=void 0,this.group=void 0,this._fieldsById=null,this._fieldsArray=null,this._oneofsArray=null,this._ctor=null}function n(e){return e._fieldsById=e._fieldsArray=e._oneofsArray=null,delete e.encode,delete e.decode,delete e.verify,e}e.exports=i;var o=r(6);((i.prototype=Object.create(o.prototype)).constructor=i).className="Type";var s=r(2),a=r(11),f=r(4),l=r(23),u=r(24),h=r(12),c=r(10),d=r(9),p=r(0),y=r(21),m=r(26),v=r(27),g=r(28),b=r(29);Object.defineProperties(i.prototype,{fieldsById:{get:function(){if(this._fieldsById)return this._fieldsById;this._fieldsById={};for(var e=Object.keys(this.fields),t=0;t<e.length;++t){var r=this.fields[e[t]],i=r.id;if(this._fieldsById[i])throw Error("duplicate id "+i+" in "+this);this._fieldsById[i]=r}return this._fieldsById}},fieldsArray:{get:function(){return this._fieldsArray||(this._fieldsArray=p.toArray(this.fields))}},oneofsArray:{get:function(){return this._oneofsArray||(this._oneofsArray=p.toArray(this.oneofs))}},ctor:{get:function(){return this._ctor||(this.ctor=i.generateConstructor(this)())},set:function(e){var t=e.prototype;t instanceof h||((e.prototype=new h).constructor=e,p.merge(e.prototype,t)),e.$type=e.prototype.$type=this,p.merge(e,h,!0),this._ctor=e;for(var r=0;r<this.fieldsArray.length;++r)this._fieldsArray[r].resolve();var i={};for(r=0;r<this.oneofsArray.length;++r)i[this._oneofsArray[r].resolve().name]={get:p.oneOfGetter(this._oneofsArray[r].oneof),set:p.oneOfSetter(this._oneofsArray[r].oneof)};r&&Object.defineProperties(e.prototype,i)}}}),i.generateConstructor=function(e){for(var t,r=p.codegen(["p"],e.name),i=0;i<e.fieldsArray.length;++i)(t=e._fieldsArray[i]).map?r("this%s={}",p.safeProp(t.name)):t.repeated&&r("this%s=[]",p.safeProp(t.name));return r("if(p)for(var ks=Object.keys(p),i=0;i<ks.length;++i)if(p[ks[i]]!=null)")("this[ks[i]]=p[ks[i]]")},i.fromJSON=function(e,t){var r=new i(e,t.options);r.extensions=t.extensions,r.reserved=t.reserved;for(var n=Object.keys(t.fields),h=0;h<n.length;++h)r.add((void 0!==t.fields[n[h]].keyType?l.fromJSON:f.fromJSON)(n[h],t.fields[n[h]]));if(t.oneofs)for(n=Object.keys(t.oneofs),h=0;h<n.length;++h)r.add(a.fromJSON(n[h],t.oneofs[n[h]]));if(t.nested)for(n=Object.keys(t.nested),h=0;h<n.length;++h){var c=t.nested[n[h]];r.add((void 0!==c.id?f.fromJSON:void 0!==c.fields?i.fromJSON:void 0!==c.values?s.fromJSON:void 0!==c.methods?u.fromJSON:o.fromJSON)(n[h],c))}return t.extensions&&t.extensions.length&&(r.extensions=t.extensions),t.reserved&&t.reserved.length&&(r.reserved=t.reserved),t.group&&(r.group=!0),t.comment&&(r.comment=t.comment),r},i.prototype.toJSON=function(e){var t=o.prototype.toJSON.call(this,e),r=!!e&&Boolean(e.keepComments);return p.toObject(["options",t&&t.options||void 0,"oneofs",o.arrayToJSON(this.oneofsArray,e),"fields",o.arrayToJSON(this.fieldsArray.filter((function(e){return!e.declaringField})),e)||{},"extensions",this.extensions&&this.extensions.length?this.extensions:void 0,"reserved",this.reserved&&this.reserved.length?this.reserved:void 0,"group",this.group||void 0,"nested",t&&t.nested||void 0,"comment",r?this.comment:void 0])},i.prototype.resolveAll=function(){for(var e=this.fieldsArray,t=0;t<e.length;)e[t++].resolve();var r=this.oneofsArray;for(t=0;t<r.length;)r[t++].resolve();return o.prototype.resolveAll.call(this)},i.prototype.get=function(e){return this.fields[e]||this.oneofs&&this.oneofs[e]||this.nested&&this.nested[e]||null},i.prototype.add=function(e){if(this.get(e.name))throw Error("duplicate name '"+e.name+"' in "+this);if(e instanceof f&&void 0===e.extend){if(this._fieldsById?this._fieldsById[e.id]:this.fieldsById[e.id])throw Error("duplicate id "+e.id+" in "+this);if(this.isReservedId(e.id))throw Error("id "+e.id+" is reserved in "+this);if(this.isReservedName(e.name))throw Error("name '"+e.name+"' is reserved in "+this);return e.parent&&e.parent.remove(e),this.fields[e.name]=e,e.message=this,e.onAdd(this),n(this)}return e instanceof a?(this.oneofs||(this.oneofs={}),this.oneofs[e.name]=e,e.onAdd(this),n(this)):o.prototype.add.call(this,e)},i.prototype.remove=function(e){if(e instanceof f&&void 0===e.extend){if(!this.fields||this.fields[e.name]!==e)throw Error(e+" is not a member of "+this);return delete this.fields[e.name],e.parent=null,e.onRemove(this),n(this)}if(e instanceof a){if(!this.oneofs||this.oneofs[e.name]!==e)throw Error(e+" is not a member of "+this);return delete this.oneofs[e.name],e.parent=null,e.onRemove(this),n(this)}return o.prototype.remove.call(this,e)},i.prototype.isReservedId=function(e){return o.isReservedId(this.reserved,e)},i.prototype.isReservedName=function(e){return o.isReservedName(this.reserved,e)},i.prototype.create=function(e){return new this.ctor(e)},i.prototype.setup=function(){for(var e=this.fullName,t=[],r=0;r<this.fieldsArray.length;++r)t.push(this._fieldsArray[r].resolve().resolvedType);this.encode=y(this)({Writer:d,types:t,util:p}),this.decode=m(this)({Reader:c,types:t,util:p}),this.verify=v(this)({types:t,util:p}),this.fromObject=g.fromObject(this)({types:t,util:p}),this.toObject=g.toObject(this)({types:t,util:p});var i=b[e];if(i){var n=Object.create(this);n.fromObject=this.fromObject,this.fromObject=i.fromObject.bind(n),n.toObject=this.toObject,this.toObject=i.toObject.bind(n)}return this},i.prototype.encode=function(e,t){return this.setup().encode(e,t)},i.prototype.encodeDelimited=function(e,t){return this.encode(e,t&&t.len?t.fork():t).ldelim()},i.prototype.decode=function(e,t){return this.setup().decode(e,t)},i.prototype.decodeDelimited=function(e){return e instanceof c||(e=c.create(e)),this.decode(e,e.uint32())},i.prototype.verify=function(e){return this.setup().verify(e)},i.prototype.fromObject=function(e){return this.setup().fromObject(e)},i.prototype.toObject=function(e,t){return this.setup().toObject(e,t)},i.d=function(e){return function(t){p.decorateType(t,e)}}},function(e,t,r){"use strict";function i(e,t,r,i,o,a){if(n.call(this,e,t,i,void 0,void 0,o,a),!s.isString(r))throw TypeError("keyType must be a string");this.keyType=r,this.resolvedKeyType=null,this.map=!0}e.exports=i;var n=r(4);((i.prototype=Object.create(n.prototype)).constructor=i).className="MapField";var o=r(7),s=r(0);i.fromJSON=function(e,t){return new i(e,t.id,t.keyType,t.type,t.options,t.comment)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return s.toObject(["keyType",this.keyType,"type",this.type,"id",this.id,"extend",this.extend,"options",this.options,"comment",t?this.comment:void 0])},i.prototype.resolve=function(){if(this.resolved)return this;if(void 0===o.mapKey[this.keyType])throw Error("invalid key type: "+this.keyType);return n.prototype.resolve.call(this)},i.d=function(e,t,r){return"function"==typeof r?r=s.decorateType(r).name:r&&"object"==typeof r&&(r=s.decorateEnum(r).name),function(n,o){s.decorateType(n.constructor).add(new i(o,e,t,r))}}},function(e,t,r){"use strict";function i(e,t){o.call(this,e,t),this.methods={},this._methodsArray=null}function n(e){return e._methodsArray=null,e}e.exports=i;var o=r(6);((i.prototype=Object.create(o.prototype)).constructor=i).className="Service";var s=r(25),a=r(0),f=r(19);i.fromJSON=function(e,t){var r=new i(e,t.options);if(t.methods)for(var n=Object.keys(t.methods),o=0;o<n.length;++o)r.add(s.fromJSON(n[o],t.methods[n[o]]));return t.nested&&r.addJSON(t.nested),r.comment=t.comment,r},i.prototype.toJSON=function(e){var t=o.prototype.toJSON.call(this,e),r=!!e&&Boolean(e.keepComments);return a.toObject(["options",t&&t.options||void 0,"methods",o.arrayToJSON(this.methodsArray,e)||{},"nested",t&&t.nested||void 0,"comment",r?this.comment:void 0])},Object.defineProperty(i.prototype,"methodsArray",{get:function(){return this._methodsArray||(this._methodsArray=a.toArray(this.methods))}}),i.prototype.get=function(e){return this.methods[e]||o.prototype.get.call(this,e)},i.prototype.resolveAll=function(){for(var e=this.methodsArray,t=0;t<e.length;++t)e[t].resolve();return o.prototype.resolve.call(this)},i.prototype.add=function(e){if(this.get(e.name))throw Error("duplicate name '"+e.name+"' in "+this);return e instanceof s?(this.methods[e.name]=e,e.parent=this,n(this)):o.prototype.add.call(this,e)},i.prototype.remove=function(e){if(e instanceof s){if(this.methods[e.name]!==e)throw Error(e+" is not a member of "+this);return delete this.methods[e.name],e.parent=null,n(this)}return o.prototype.remove.call(this,e)},i.prototype.create=function(e,t,r){for(var i,n=new f.Service(e,t,r),o=0;o<this.methodsArray.length;++o){var s=a.lcFirst((i=this._methodsArray[o]).resolve().name).replace(/[^$\w_]/g,"");n[s]=a.codegen(["r","c"],a.isReserved(s)?s+"_":s)("return this.rpcCall(m,q,s,r,c)")({m:i,q:i.resolvedRequestType.ctor,s:i.resolvedResponseType.ctor})}return n}},function(e,t,r){"use strict";function i(e,t,r,i,s,a,f,l,u){if(o.isObject(s)?(f=s,s=a=void 0):o.isObject(a)&&(f=a,a=void 0),void 0!==t&&!o.isString(t))throw TypeError("type must be a string");if(!o.isString(r))throw TypeError("requestType must be a string");if(!o.isString(i))throw TypeError("responseType must be a string");n.call(this,e,f),this.type=t||"rpc",this.requestType=r,this.requestStream=!!s||void 0,this.responseType=i,this.responseStream=!!a||void 0,this.resolvedRequestType=null,this.resolvedResponseType=null,this.comment=l,this.parsedOptions=u}e.exports=i;var n=r(3);((i.prototype=Object.create(n.prototype)).constructor=i).className="Method";var o=r(0);i.fromJSON=function(e,t){return new i(e,t.type,t.requestType,t.responseType,t.requestStream,t.responseStream,t.options,t.comment,t.parsedOptions)},i.prototype.toJSON=function(e){var t=!!e&&Boolean(e.keepComments);return o.toObject(["type","rpc"!==this.type&&this.type||void 0,"requestType",this.requestType,"requestStream",this.requestStream,"responseType",this.responseType,"responseStream",this.responseStream,"options",this.options,"comment",t?this.comment:void 0,"parsedOptions",this.parsedOptions])},i.prototype.resolve=function(){return this.resolved?this:(this.resolvedRequestType=this.parent.lookupType(this.requestType),this.resolvedResponseType=this.parent.lookupType(this.responseType),n.prototype.resolve.call(this))}},function(e,t,r){"use strict";function i(e){return"missing required '"+e.name+"'"}e.exports=function(e){var t=s.codegen(["r","l"],e.name+"$decode")("if(!(r instanceof Reader))")("r=Reader.create(r)")("var c=l===undefined?r.len:r.pos+l,m=new this.ctor"+(e.fieldsArray.filter((function(e){return e.map})).length?",k,value":""))("while(r.pos<c){")("var t=r.uint32()");e.group&&t("if((t&7)===4)")("break"),t("switch(t>>>3){");for(var r=0;r<e.fieldsArray.length;++r){var a=e._fieldsArray[r].resolve(),f=a.resolvedType instanceof n?"int32":a.type,l="m"+s.safeProp(a.name);t("case %i:",a.id),a.map?(t("if(%s===util.emptyObject)",l)("%s={}",l)("var c2 = r.uint32()+r.pos"),void 0!==o.defaults[a.keyType]?t("k=%j",o.defaults[a.keyType]):t("k=null"),void 0!==o.defaults[f]?t("value=%j",o.defaults[f]):t("value=null"),t("while(r.pos<c2){")("var tag2=r.uint32()")("switch(tag2>>>3){")("case 1: k=r.%s(); break",a.keyType)("case 2:"),void 0===o.basic[f]?t("value=types[%i].decode(r,r.uint32())",r):t("value=r.%s()",f),t("break")("default:")("r.skipType(tag2&7)")("break")("}")("}"),void 0!==o.long[a.keyType]?t('%s[typeof k==="object"?util.longToHash(k):k]=value',l):t("%s[k]=value",l)):a.repeated?(t("if(!(%s&&%s.length))",l,l)("%s=[]",l),void 0!==o.packed[f]&&t("if((t&7)===2){")("var c2=r.uint32()+r.pos")("while(r.pos<c2)")("%s.push(r.%s())",l,f)("}else"),void 0===o.basic[f]?t(a.resolvedType.group?"%s.push(types[%i].decode(r))":"%s.push(types[%i].decode(r,r.uint32()))",l,r):t("%s.push(r.%s())",l,f)):void 0===o.basic[f]?t(a.resolvedType.group?"%s=types[%i].decode(r)":"%s=types[%i].decode(r,r.uint32())",l,r):t("%s=r.%s()",l,f),t("break")}for(t("default:")("r.skipType(t&7)")("break")("}")("}"),r=0;r<e._fieldsArray.length;++r){var u=e._fieldsArray[r];u.required&&t("if(!m.hasOwnProperty(%j))",u.name)("throw util.ProtocolError(%j,{instance:m})",i(u))}return t("return m")};var n=r(2),o=r(7),s=r(0)},function(e,t,r){"use strict";function i(e,t){return e.name+": "+t+(e.repeated&&"array"!==t?"[]":e.map&&"object"!==t?"{k:"+e.keyType+"}":"")+" expected"}function n(e,t,r,n){if(t.resolvedType)if(t.resolvedType instanceof s){e("switch(%s){",n)("default:")("return%j",i(t,"enum value"));for(var o=Object.keys(t.resolvedType.values),a=0;a<o.length;++a)e("case %i:",t.resolvedType.values[o[a]]);e("break")("}")}else e("{")("var e=types[%i].verify(%s);",r,n)("if(e)")("return%j+e",t.name+".")("}");else switch(t.type){case"int32":case"uint32":case"sint32":case"fixed32":case"sfixed32":e("if(!util.isInteger(%s))",n)("return%j",i(t,"integer"));break;case"int64":case"uint64":case"sint64":case"fixed64":case"sfixed64":e("if(!util.isInteger(%s)&&!(%s&&util.isInteger(%s.low)&&util.isInteger(%s.high)))",n,n,n,n)("return%j",i(t,"integer|Long"));break;case"float":case"double":e('if(typeof %s!=="number")',n)("return%j",i(t,"number"));break;case"bool":e('if(typeof %s!=="boolean")',n)("return%j",i(t,"boolean"));break;case"string":e("if(!util.isString(%s))",n)("return%j",i(t,"string"));break;case"bytes":e('if(!(%s&&typeof %s.length==="number"||util.isString(%s)))',n,n,n)("return%j",i(t,"buffer"))}return e}function o(e,t,r){switch(t.keyType){case"int32":case"uint32":case"sint32":case"fixed32":case"sfixed32":e("if(!util.key32Re.test(%s))",r)("return%j",i(t,"integer key"));break;case"int64":case"uint64":case"sint64":case"fixed64":case"sfixed64":e("if(!util.key64Re.test(%s))",r)("return%j",i(t,"integer|Long key"));break;case"bool":e("if(!util.key2Re.test(%s))",r)("return%j",i(t,"boolean key"))}return e}e.exports=function(e){var t=a.codegen(["m"],e.name+"$verify")('if(typeof m!=="object"||m===null)')("return%j","object expected"),r={};e.oneofsArray.length&&t("var p={}");for(var s=0;s<e.fieldsArray.length;++s){var f=e._fieldsArray[s].resolve(),l="m"+a.safeProp(f.name);if(f.optional&&t("if(%s!=null&&m.hasOwnProperty(%j)){",l,f.name),f.map)t("if(!util.isObject(%s))",l)("return%j",i(f,"object"))("var k=Object.keys(%s)",l)("for(var i=0;i<k.length;++i){"),o(t,f,"k[i]"),n(t,f,s,l+"[k[i]]")("}");else if(f.repeated)t("if(!Array.isArray(%s))",l)("return%j",i(f,"array"))("for(var i=0;i<%s.length;++i){",l),n(t,f,s,l+"[i]")("}");else{if(f.partOf){var u=a.safeProp(f.partOf.name);1===r[f.partOf.name]&&t("if(p%s===1)",u)("return%j",f.partOf.name+": multiple values"),r[f.partOf.name]=1,t("p%s=1",u)}n(t,f,s,l)}f.optional&&t("}")}return t("return null")};var s=r(2),a=r(0)},function(e,t,r){"use strict";function i(e,t,r,i){if(t.resolvedType)if(t.resolvedType instanceof s){e("switch(d%s){",i);for(var n=t.resolvedType.values,o=Object.keys(n),a=0;a<o.length;++a)t.repeated&&n[o[a]]===t.typeDefault&&e("default:"),e("case%j:",o[a])("case %i:",n[o[a]])("m%s=%j",i,n[o[a]])("break");e("}")}else e('if(typeof d%s!=="object")',i)("throw TypeError(%j)",t.fullName+": object expected")("m%s=types[%i].fromObject(d%s)",i,r,i);else{var f=!1;switch(t.type){case"double":case"float":e("m%s=Number(d%s)",i,i);break;case"uint32":case"fixed32":e("m%s=d%s>>>0",i,i);break;case"int32":case"sint32":case"sfixed32":e("m%s=d%s|0",i,i);break;case"uint64":f=!0;case"int64":case"sint64":case"fixed64":case"sfixed64":e("if(util.Long)")("(m%s=util.Long.fromValue(d%s)).unsigned=%j",i,i,f)('else if(typeof d%s==="string")',i)("m%s=parseInt(d%s,10)",i,i)('else if(typeof d%s==="number")',i)("m%s=d%s",i,i)('else if(typeof d%s==="object")',i)("m%s=new util.LongBits(d%s.low>>>0,d%s.high>>>0).toNumber(%s)",i,i,i,f?"true":"");break;case"bytes":e('if(typeof d%s==="string")',i)("util.base64.decode(d%s,m%s=util.newBuffer(util.base64.length(d%s)),0)",i,i,i)("else if(d%s.length)",i)("m%s=d%s",i,i);break;case"string":e("m%s=String(d%s)",i,i);break;case"bool":e("m%s=Boolean(d%s)",i,i)}}return e}function n(e,t,r,i){if(t.resolvedType)t.resolvedType instanceof s?e("d%s=o.enums===String?types[%i].values[m%s]:m%s",i,r,i,i):e("d%s=types[%i].toObject(m%s,o)",i,r,i);else{var n=!1;switch(t.type){case"double":case"float":e("d%s=o.json&&!isFinite(m%s)?String(m%s):m%s",i,i,i,i);break;case"uint64":n=!0;case"int64":case"sint64":case"fixed64":case"sfixed64":e('if(typeof m%s==="number")',i)("d%s=o.longs===String?String(m%s):m%s",i,i,i)("else")("d%s=o.longs===String?util.Long.prototype.toString.call(m%s):o.longs===Number?new util.LongBits(m%s.low>>>0,m%s.high>>>0).toNumber(%s):m%s",i,i,i,i,n?"true":"",i);break;case"bytes":e("d%s=o.bytes===String?util.base64.encode(m%s,0,m%s.length):o.bytes===Array?Array.prototype.slice.call(m%s):m%s",i,i,i,i,i);break;default:e("d%s=m%s",i,i)}}return e}var o=t,s=r(2),a=r(0);o.fromObject=function(e){var t=e.fieldsArray,r=a.codegen(["d"],e.name+"$fromObject")("if(d instanceof this.ctor)")("return d");if(!t.length)return r("return new this.ctor");r("var m=new this.ctor");for(var n=0;n<t.length;++n){var o=t[n].resolve(),f=a.safeProp(o.name);o.map?(r("if(d%s){",f)('if(typeof d%s!=="object")',f)("throw TypeError(%j)",o.fullName+": object expected")("m%s={}",f)("for(var ks=Object.keys(d%s),i=0;i<ks.length;++i){",f),i(r,o,n,f+"[ks[i]]")("}")("}")):o.repeated?(r("if(d%s){",f)("if(!Array.isArray(d%s))",f)("throw TypeError(%j)",o.fullName+": array expected")("m%s=[]",f)("for(var i=0;i<d%s.length;++i){",f),i(r,o,n,f+"[i]")("}")("}")):(o.resolvedType instanceof s||r("if(d%s!=null){",f),i(r,o,n,f),o.resolvedType instanceof s||r("}"))}return r("return m")},o.toObject=function(e){var t=e.fieldsArray.slice().sort(a.compareFieldsById);if(!t.length)return a.codegen()("return {}");for(var r=a.codegen(["m","o"],e.name+"$toObject")("if(!o)")("o={}")("var d={}"),i=[],o=[],f=[],l=0;l<t.length;++l)t[l].partOf||(t[l].resolve().repeated?i:t[l].map?o:f).push(t[l]);if(i.length){for(r("if(o.arrays||o.defaults){"),l=0;l<i.length;++l)r("d%s=[]",a.safeProp(i[l].name));r("}")}if(o.length){for(r("if(o.objects||o.defaults){"),l=0;l<o.length;++l)r("d%s={}",a.safeProp(o[l].name));r("}")}if(f.length){for(r("if(o.defaults){"),l=0;l<f.length;++l){var u=f[l],h=a.safeProp(u.name);if(u.resolvedType instanceof s)r("d%s=o.enums===String?%j:%j",h,u.resolvedType.valuesById[u.typeDefault],u.typeDefault);else if(u.long)r("if(util.Long){")("var n=new util.Long(%i,%i,%j)",u.typeDefault.low,u.typeDefault.high,u.typeDefault.unsigned)("d%s=o.longs===String?n.toString():o.longs===Number?n.toNumber():n",h)("}else")("d%s=o.longs===String?%j:%i",h,u.typeDefault.toString(),u.typeDefault.toNumber());else if(u.bytes){var c="["+Array.prototype.slice.call(u.typeDefault).join(",")+"]";r("if(o.bytes===String)d%s=%j",h,String.fromCharCode.apply(String,u.typeDefault))("else{")("d%s=%s",h,c)("if(o.bytes!==Array)d%s=util.newBuffer(d%s)",h,h)("}")}else r("d%s=%j",h,u.typeDefault)}r("}")}var d=!1;for(l=0;l<t.length;++l){u=t[l];var p=e._fieldsArray.indexOf(u);h=a.safeProp(u.name);u.map?(d||(d=!0,r("var ks2")),r("if(m%s&&(ks2=Object.keys(m%s)).length){",h,h)("d%s={}",h)("for(var j=0;j<ks2.length;++j){"),n(r,u,p,h+"[ks2[j]]")("}")):u.repeated?(r("if(m%s&&m%s.length){",h,h)("d%s=[]",h)("for(var j=0;j<m%s.length;++j){",h),n(r,u,p,h+"[j]")("}")):(r("if(m%s!=null&&m.hasOwnProperty(%j)){",h,u.name),n(r,u,p,h),u.partOf&&r("if(o.oneofs)")("d%s=%j",a.safeProp(u.partOf.name),u.name)),r("}")}return r("return d")}},function(e,t,r){"use strict";var i=t,n=r(12);i[".google.protobuf.Any"]={fromObject:function(e){if(e&&e["@type"]){var t=e["@type"].substring(e["@type"].lastIndexOf("/")+1),r=this.lookup(t);if(r){var i="."===e["@type"].charAt(0)?e["@type"].substr(1):e["@type"];return-1===i.indexOf("/")&&(i="/"+i),this.create({type_url:i,value:r.encode(r.fromObject(e)).finish()})}}return this.fromObject(e)},toObject:function(e,t){var r="",i="";if(t&&t.json&&e.type_url&&e.value){i=e.type_url.substring(e.type_url.lastIndexOf("/")+1),r=e.type_url.substring(0,e.type_url.lastIndexOf("/")+1);var o=this.lookup(i);o&&(e=o.decode(e.value))}if(!(e instanceof this.ctor)&&e instanceof n){var s=e.$type.toObject(e,t);return""===r&&(r="type.googleapis.com/"),i=r+("."===e.$type.fullName[0]?e.$type.fullName.substr(1):e.$type.fullName),s["@type"]=i,s}return this.toObject(e,t)}}},function(e,t,r){"use strict";function i(e){s.call(this,"",e),this.deferred=[],this.files=[]}function n(){}function o(e,t){var r=t.parent.lookup(t.extend);if(r){var i=new u(t.fullName,t.id,t.type,t.rule,void 0,t.options);return i.declaringField=t,t.extensionField=i,r.add(i),!0}return!1}e.exports=i;var s=r(6);((i.prototype=Object.create(s.prototype)).constructor=i).className="Root";var a,f,l,u=r(4),h=r(2),c=r(11),d=r(0);i.fromJSON=function(e,t){return t||(t=new i),e.options&&t.setOptions(e.options),t.addJSON(e.nested)},i.prototype.resolvePath=d.path.resolve,i.prototype.fetch=d.fetch,i.prototype.load=function e(t,r,i){function o(e,t){if(i){var r=i;if(i=null,c)throw e;r(e,t)}}function s(e){var t=e.lastIndexOf("google/protobuf/");if(t>-1){var r=e.substring(t);if(r in l)return r}return null}function a(e,t){try{if(d.isString(t)&&"{"===t.charAt(0)&&(t=JSON.parse(t)),d.isString(t)){f.filename=e;var i,n=f(t,h,r),a=0;if(n.imports)for(;a<n.imports.length;++a)(i=s(n.imports[a])||h.resolvePath(e,n.imports[a]))&&u(i);if(n.weakImports)for(a=0;a<n.weakImports.length;++a)(i=s(n.weakImports[a])||h.resolvePath(e,n.weakImports[a]))&&u(i,!0)}else h.setOptions(t.options).addJSON(t.nested)}catch(e){o(e)}c||p||o(null,h)}function u(e,t){if(!(h.files.indexOf(e)>-1)){if(h.files.push(e),e in l)return void(c?a(e,l[e]):(++p,setTimeout((function(){--p,a(e,l[e])}))));if(c){var r;try{r=d.fs.readFileSync(e).toString("utf8")}catch(e){return void(t||o(e))}a(e,r)}else++p,h.fetch(e,(function(r,n){if(--p,i)return r?void(t?p||o(null,h):o(r)):void a(e,n)}))}}"function"==typeof r&&(i=r,r=void 0);var h=this;if(!i)return d.asPromise(e,h,t,r);var c=i===n,p=0;d.isString(t)&&(t=[t]);for(var y,m=0;m<t.length;++m)(y=h.resolvePath("",t[m]))&&u(y);if(c)return h;p||o(null,h)},i.prototype.loadSync=function(e,t){if(!d.isNode)throw Error("not supported");return this.load(e,t,n)},i.prototype.resolveAll=function(){if(this.deferred.length)throw Error("unresolvable extensions: "+this.deferred.map((function(e){return"'extend "+e.extend+"' in "+e.parent.fullName})).join(", "));return s.prototype.resolveAll.call(this)};var p=/^[A-Z]/;i.prototype._handleAdd=function(e){if(e instanceof u)void 0===e.extend||e.extensionField||o(0,e)||this.deferred.push(e);else if(e instanceof h)p.test(e.name)&&(e.parent[e.name]=e.values);else if(!(e instanceof c)){if(e instanceof a)for(var t=0;t<this.deferred.length;)o(0,this.deferred[t])?this.deferred.splice(t,1):++t;for(var r=0;r<e.nestedArray.length;++r)this._handleAdd(e._nestedArray[r]);p.test(e.name)&&(e.parent[e.name]=e)}},i.prototype._handleRemove=function(e){if(e instanceof u){if(void 0!==e.extend)if(e.extensionField)e.extensionField.parent.remove(e.extensionField),e.extensionField=null;else{var t=this.deferred.indexOf(e);t>-1&&this.deferred.splice(t,1)}}else if(e instanceof h)p.test(e.name)&&delete e.parent[e.name];else if(e instanceof s){for(var r=0;r<e.nestedArray.length;++r)this._handleRemove(e._nestedArray[r]);p.test(e.name)&&delete e.parent[e.name]}},i._configure=function(e,t,r){a=e,f=t,l=r}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.VideoEntity=void 0;var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),o=r(32),s=r(16).ProtoMovieEntity;t.VideoEntity=function(){function e(t,r){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this.version="",this.videoSize={width:0,height:0},this.FPS=20,this.frames=0,this.images={},this.sprites=[],this.audios=[],"object"===(void 0===t?"undefined":i(t))&&t.$type==s?("object"===i(t.params)&&(this.version=t.ver,this.videoSize.width=t.params.viewBoxWidth||0,this.videoSize.height=t.params.viewBoxHeight||0,this.FPS=t.params.fps||20,this.frames=t.params.frames||0),this.resetSprites(t),this.audios=t.audios):t&&(t.movie&&(t.movie.viewBox&&(this.videoSize.width=parseFloat(t.movie.viewBox.width)||0,this.videoSize.height=parseFloat(t.movie.viewBox.height)||0),this.version=t.ver,this.FPS=parseInt(t.movie.fps)||20,this.frames=parseInt(t.movie.frames)||0),this.resetSprites(t)),r&&(this.images=r)}return n(e,[{key:"resetSprites",value:function(e){e.sprites instanceof Array&&(this.sprites=e.sprites.map((function(e){return new o.SpriteEntity(e)})))}}]),e}()},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.SpriteEntity=void 0;var i=r(33);r(5),r(14),r(15),t.SpriteEntity=function e(t){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this.matteKey=null,this.imageKey=null,this.frames=[],this.matteKey=t.matteKey,this.imageKey=t.imageKey,t.frames&&(this.frames=t.frames.map((function(e){return new i.FrameEntity(e)})))}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.FrameEntity=void 0;var i=r(5);t.FrameEntity=function e(t){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this.alpha=0,this.transform={a:1,b:0,c:0,d:1,tx:0,ty:0},this.layout={x:0,y:0,width:0,height:0},this.nx=0,this.ny=0,this.maskPath=null,this.shapes=[],this.alpha=parseFloat(t.alpha)||0,t.layout&&(this.layout.x=parseFloat(t.layout.x)||0,this.layout.y=parseFloat(t.layout.y)||0,this.layout.width=parseFloat(t.layout.width)||0,this.layout.height=parseFloat(t.layout.height)||0),t.transform&&(this.transform.a=parseFloat(t.transform.a)||1,this.transform.b=parseFloat(t.transform.b)||0,this.transform.c=parseFloat(t.transform.c)||0,this.transform.d=parseFloat(t.transform.d)||1,this.transform.tx=parseFloat(t.transform.tx)||0,this.transform.ty=parseFloat(t.transform.ty)||0),t.clipPath&&t.clipPath.length>0&&(this.maskPath=new i.BezierPath(t.clipPath,void 0,{fill:"#000000"})),t.shapes&&(t.shapes instanceof Array&&t.shapes.forEach((function(e){switch(e.pathArgs=e.args,e.type){case 0:e.type="shape",e.pathArgs=e.shape;break;case 1:e.type="rect",e.pathArgs=e.rect;break;case 2:e.type="ellipse",e.pathArgs=e.ellipse;break;case 3:e.type="keep"}if(e.styles){e.styles.fill&&("number"==typeof e.styles.fill.r&&(e.styles.fill[0]=e.styles.fill.r),"number"==typeof e.styles.fill.g&&(e.styles.fill[1]=e.styles.fill.g),"number"==typeof e.styles.fill.b&&(e.styles.fill[2]=e.styles.fill.b),"number"==typeof e.styles.fill.a&&(e.styles.fill[3]=e.styles.fill.a)),e.styles.stroke&&("number"==typeof e.styles.stroke.r&&(e.styles.stroke[0]=e.styles.stroke.r),"number"==typeof e.styles.stroke.g&&(e.styles.stroke[1]=e.styles.stroke.g),"number"==typeof e.styles.stroke.b&&(e.styles.stroke[2]=e.styles.stroke.b),"number"==typeof e.styles.stroke.a&&(e.styles.stroke[3]=e.styles.stroke.a));var t=e.styles.lineDash||[];switch(e.styles.lineDashI>0&&t.push(e.styles.lineDashI),e.styles.lineDashII>0&&(t.length<1&&t.push(0),t.push(e.styles.lineDashII),t.push(0)),e.styles.lineDashIII>0&&(t.length<2&&(t.push(0),t.push(0)),t[2]=e.styles.lineDashIII),e.styles.lineDash=t,e.styles.lineJoin){case 0:e.styles.lineJoin="miter";break;case 1:e.styles.lineJoin="round";break;case 2:e.styles.lineJoin="bevel"}switch(e.styles.lineCap){case 0:e.styles.lineCap="butt";break;case 1:e.styles.lineCap="round";break;case 2:e.styles.lineCap="square"}}})),t.shapes[0]&&"keep"===t.shapes[0].type?this.shapes=e.lastShapes:(this.shapes=t.shapes,e.lastShapes=t.shapes));var r=this.transform.a*this.layout.x+this.transform.c*this.layout.y+this.transform.tx,n=this.transform.a*(this.layout.x+this.layout.width)+this.transform.c*this.layout.y+this.transform.tx,o=this.transform.a*this.layout.x+this.transform.c*(this.layout.y+this.layout.height)+this.transform.tx,s=this.transform.a*(this.layout.x+this.layout.width)+this.transform.c*(this.layout.y+this.layout.height)+this.transform.tx,a=this.transform.b*this.layout.x+this.transform.d*this.layout.y+this.transform.ty,f=this.transform.b*(this.layout.x+this.layout.width)+this.transform.d*this.layout.y+this.transform.ty,l=this.transform.b*this.layout.x+this.transform.d*(this.layout.y+this.layout.height)+this.transform.ty,u=this.transform.b*(this.layout.x+this.layout.width)+this.transform.d*(this.layout.y+this.layout.height)+this.transform.ty;this.nx=Math.min(Math.min(o,s),Math.min(r,n)),this.ny=Math.min(Math.min(l,u),Math.min(a,f))}},function(e,t,r){"use strict";e.exports=r(35)},function(e,t,r){"use strict";var i=e.exports=r(36);i.build="light",i.load=function(e,t,r){return"function"==typeof t?(r=t,t=new i.Root):t||(t=new i.Root),t.load(e,r)},i.loadSync=function(e,t){return t||(t=new i.Root),t.loadSync(e)},i.encoder=r(21),i.decoder=r(26),i.verifier=r(27),i.converter=r(28),i.ReflectionObject=r(3),i.Namespace=r(6),i.Root=r(30),i.Enum=r(2),i.Type=r(22),i.Field=r(4),i.OneOf=r(11),i.MapField=r(23),i.Service=r(24),i.Method=r(25),i.Message=r(12),i.wrappers=r(29),i.types=r(7),i.util=r(0),i.ReflectionObject._configure(i.Root),i.Namespace._configure(i.Type,i.Service,i.Enum),i.Root._configure(i.Type),i.Field._configure(i.Type)},function(e,t,r){"use strict";function i(){n.util._configure(),n.Writer._configure(n.BufferWriter),n.Reader._configure(n.BufferReader)}var n=t;n.build="minimal",n.Writer=r(9),n.BufferWriter=r(44),n.Reader=r(10),n.BufferReader=r(45),n.util=r(1),n.rpc=r(19),n.roots=r(20),n.configure=i,i()},function(e,t){var r;r=function(){return this}();try{r=r||new Function("return this")()}catch(e){"object"==typeof window&&(r=window)}e.exports=r},function(e,t,r){"use strict";var i=t;i.length=function(e){var t=e.length;if(!t)return 0;for(var r=0;--t%4>1&&"="===e.charAt(t);)++r;return Math.ceil(3*e.length)/4-r};for(var n=new Array(64),o=new Array(123),s=0;s<64;)o[n[s]=s<26?s+65:s<52?s+71:s<62?s-4:s-59|43]=s++;i.encode=function(e,t,r){for(var i,o=null,s=[],a=0,f=0;t<r;){var l=e[t++];switch(f){case 0:s[a++]=n[l>>2],i=(3&l)<<4,f=1;break;case 1:s[a++]=n[i|l>>4],i=(15&l)<<2,f=2;break;case 2:s[a++]=n[i|l>>6],s[a++]=n[63&l],f=0}a>8191&&((o||(o=[])).push(String.fromCharCode.apply(String,s)),a=0)}return f&&(s[a++]=n[i],s[a++]=61,1===f&&(s[a++]=61)),o?(a&&o.push(String.fromCharCode.apply(String,s.slice(0,a))),o.join("")):String.fromCharCode.apply(String,s.slice(0,a))},i.decode=function(e,t,r){for(var i,n=r,s=0,a=0;a<e.length;){var f=e.charCodeAt(a++);if(61===f&&s>1)break;if(void 0===(f=o[f]))throw Error("invalid encoding");switch(s){case 0:i=f,s=1;break;case 1:t[r++]=i<<2|(48&f)>>4,i=f,s=2;break;case 2:t[r++]=(15&i)<<4|(60&f)>>2,i=f,s=3;break;case 3:t[r++]=(3&i)<<6|f,s=0}}if(1===s)throw Error("invalid encoding");return r-n},i.test=function(e){return/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(e)}},function(e,t,r){"use strict";function i(){this._listeners={}}e.exports=i,i.prototype.on=function(e,t,r){return(this._listeners[e]||(this._listeners[e]=[])).push({fn:t,ctx:r||this}),this},i.prototype.off=function(e,t){if(void 0===e)this._listeners={};else if(void 0===t)this._listeners[e]=[];else for(var r=this._listeners[e],i=0;i<r.length;)r[i].fn===t?r.splice(i,1):++i;return this},i.prototype.emit=function(e){var t=this._listeners[e];if(t){for(var r=[],i=1;i<arguments.length;)r.push(arguments[i++]);for(i=0;i<t.length;)t[i].fn.apply(t[i++].ctx,r)}return this}},function(e,t,r){"use strict";function i(e){return"undefined"!=typeof Float32Array?function(){function t(e,t,r){o[0]=e,t[r]=s[0],t[r+1]=s[1],t[r+2]=s[2],t[r+3]=s[3]}function r(e,t,r){o[0]=e,t[r]=s[3],t[r+1]=s[2],t[r+2]=s[1],t[r+3]=s[0]}function i(e,t){return s[0]=e[t],s[1]=e[t+1],s[2]=e[t+2],s[3]=e[t+3],o[0]}function n(e,t){return s[3]=e[t],s[2]=e[t+1],s[1]=e[t+2],s[0]=e[t+3],o[0]}var o=new Float32Array([-0]),s=new Uint8Array(o.buffer),a=128===s[3];e.writeFloatLE=a?t:r,e.writeFloatBE=a?r:t,e.readFloatLE=a?i:n,e.readFloatBE=a?n:i}():function(){function t(e,t,r,i){var n=t<0?1:0;if(n&&(t=-t),0===t)e(1/t>0?0:2147483648,r,i);else if(isNaN(t))e(2143289344,r,i);else if(t>34028234663852886e22)e((n<<31|2139095040)>>>0,r,i);else if(t<11754943508222875e-54)e((n<<31|Math.round(t/1401298464324817e-60))>>>0,r,i);else{var o=Math.floor(Math.log(t)/Math.LN2);e((n<<31|o+127<<23|8388607&Math.round(t*Math.pow(2,-o)*8388608))>>>0,r,i)}}function r(e,t,r){var i=e(t,r),n=2*(i>>31)+1,o=i>>>23&255,s=8388607&i;return 255===o?s?NaN:n*(1/0):0===o?1401298464324817e-60*n*s:n*Math.pow(2,o-150)*(s+8388608)}e.writeFloatLE=t.bind(null,n),e.writeFloatBE=t.bind(null,o),e.readFloatLE=r.bind(null,s),e.readFloatBE=r.bind(null,a)}(),"undefined"!=typeof Float64Array?function(){function t(e,t,r){o[0]=e,t[r]=s[0],t[r+1]=s[1],t[r+2]=s[2],t[r+3]=s[3],t[r+4]=s[4],t[r+5]=s[5],t[r+6]=s[6],t[r+7]=s[7]}function r(e,t,r){o[0]=e,t[r]=s[7],t[r+1]=s[6],t[r+2]=s[5],t[r+3]=s[4],t[r+4]=s[3],t[r+5]=s[2],t[r+6]=s[1],t[r+7]=s[0]}function i(e,t){return s[0]=e[t],s[1]=e[t+1],s[2]=e[t+2],s[3]=e[t+3],s[4]=e[t+4],s[5]=e[t+5],s[6]=e[t+6],s[7]=e[t+7],o[0]}function n(e,t){return s[7]=e[t],s[6]=e[t+1],s[5]=e[t+2],s[4]=e[t+3],s[3]=e[t+4],s[2]=e[t+5],s[1]=e[t+6],s[0]=e[t+7],o[0]}var o=new Float64Array([-0]),s=new Uint8Array(o.buffer),a=128===s[7];e.writeDoubleLE=a?t:r,e.writeDoubleBE=a?r:t,e.readDoubleLE=a?i:n,e.readDoubleBE=a?n:i}():function(){function t(e,t,r,i,n,o){var s=i<0?1:0;if(s&&(i=-i),0===i)e(0,n,o+t),e(1/i>0?0:2147483648,n,o+r);else if(isNaN(i))e(0,n,o+t),e(2146959360,n,o+r);else if(i>17976931348623157e292)e(0,n,o+t),e((s<<31|2146435072)>>>0,n,o+r);else{var a;if(i<22250738585072014e-324)e((a=i/5e-324)>>>0,n,o+t),e((s<<31|a/4294967296)>>>0,n,o+r);else{var f=Math.floor(Math.log(i)/Math.LN2);1024===f&&(f=1023),e(4503599627370496*(a=i*Math.pow(2,-f))>>>0,n,o+t),e((s<<31|f+1023<<20|1048576*a&1048575)>>>0,n,o+r)}}}function r(e,t,r,i,n){var o=e(i,n+t),s=e(i,n+r),a=2*(s>>31)+1,f=s>>>20&2047,l=4294967296*(1048575&s)+o;return 2047===f?l?NaN:a*(1/0):0===f?5e-324*a*l:a*Math.pow(2,f-1075)*(l+4503599627370496)}e.writeDoubleLE=t.bind(null,n,0,4),e.writeDoubleBE=t.bind(null,o,4,0),e.readDoubleLE=r.bind(null,s,0,4),e.readDoubleBE=r.bind(null,a,4,0)}(),e}function n(e,t,r){t[r]=255&e,t[r+1]=e>>>8&255,t[r+2]=e>>>16&255,t[r+3]=e>>>24}function o(e,t,r){t[r]=e>>>24,t[r+1]=e>>>16&255,t[r+2]=e>>>8&255,t[r+3]=255&e}function s(e,t){return(e[t]|e[t+1]<<8|e[t+2]<<16|e[t+3]<<24)>>>0}function a(e,t){return(e[t]<<24|e[t+1]<<16|e[t+2]<<8|e[t+3])>>>0}e.exports=i(i)},function(e,t,r){"use strict";var i=t;i.length=function(e){for(var t=0,r=0,i=0;i<e.length;++i)(r=e.charCodeAt(i))<128?t+=1:r<2048?t+=2:55296==(64512&r)&&56320==(64512&e.charCodeAt(i+1))?(++i,t+=4):t+=3;return t},i.read=function(e,t,r){if(r-t<1)return"";for(var i,n=null,o=[],s=0;t<r;)(i=e[t++])<128?o[s++]=i:i>191&&i<224?o[s++]=(31&i)<<6|63&e[t++]:i>239&&i<365?(i=((7&i)<<18|(63&e[t++])<<12|(63&e[t++])<<6|63&e[t++])-65536,o[s++]=55296+(i>>10),o[s++]=56320+(1023&i)):o[s++]=(15&i)<<12|(63&e[t++])<<6|63&e[t++],s>8191&&((n||(n=[])).push(String.fromCharCode.apply(String,o)),s=0);return n?(s&&n.push(String.fromCharCode.apply(String,o.slice(0,s))),n.join("")):String.fromCharCode.apply(String,o.slice(0,s))},i.write=function(e,t,r){for(var i,n,o=r,s=0;s<e.length;++s)(i=e.charCodeAt(s))<128?t[r++]=i:i<2048?(t[r++]=i>>6|192,t[r++]=63&i|128):55296==(64512&i)&&56320==(64512&(n=e.charCodeAt(s+1)))?(i=65536+((1023&i)<<10)+(1023&n),++s,t[r++]=i>>18|240,t[r++]=i>>12&63|128,t[r++]=i>>6&63|128,t[r++]=63&i|128):(t[r++]=i>>12|224,t[r++]=i>>6&63|128,t[r++]=63&i|128);return r-o}},function(e,t,r){"use strict";e.exports=function(e,t,r){var i=r||8192,n=i>>>1,o=null,s=i;return function(r){if(r<1||r>n)return e(r);s+r>i&&(o=e(i),s=0);var a=t.call(o,s,s+=r);return 7&s&&(s=1+(7|s)),a}}},function(e,t,r){"use strict";function i(e,t){this.lo=e>>>0,this.hi=t>>>0}e.exports=i;var n=r(1),o=i.zero=new i(0,0);o.toNumber=function(){return 0},o.zzEncode=o.zzDecode=function(){return this},o.length=function(){return 1};var s=i.zeroHash="\0\0\0\0\0\0\0\0";i.fromNumber=function(e){if(0===e)return o;var t=e<0;t&&(e=-e);var r=e>>>0,n=(e-r)/4294967296>>>0;return t&&(n=~n>>>0,r=~r>>>0,++r>4294967295&&(r=0,++n>4294967295&&(n=0))),new i(r,n)},i.from=function(e){if("number"==typeof e)return i.fromNumber(e);if(n.isString(e)){if(!n.Long)return i.fromNumber(parseInt(e,10));e=n.Long.fromString(e)}return e.low||e.high?new i(e.low>>>0,e.high>>>0):o},i.prototype.toNumber=function(e){if(!e&&this.hi>>>31){var t=1+~this.lo>>>0,r=~this.hi>>>0;return t||(r=r+1>>>0),-(t+4294967296*r)}return this.lo+4294967296*this.hi},i.prototype.toLong=function(e){return n.Long?new n.Long(0|this.lo,0|this.hi,Boolean(e)):{low:0|this.lo,high:0|this.hi,unsigned:Boolean(e)}};var a=String.prototype.charCodeAt;i.fromHash=function(e){return e===s?o:new i((a.call(e,0)|a.call(e,1)<<8|a.call(e,2)<<16|a.call(e,3)<<24)>>>0,(a.call(e,4)|a.call(e,5)<<8|a.call(e,6)<<16|a.call(e,7)<<24)>>>0)},i.prototype.toHash=function(){return String.fromCharCode(255&this.lo,this.lo>>>8&255,this.lo>>>16&255,this.lo>>>24,255&this.hi,this.hi>>>8&255,this.hi>>>16&255,this.hi>>>24)},i.prototype.zzEncode=function(){var e=this.hi>>31;return this.hi=((this.hi<<1|this.lo>>>31)^e)>>>0,this.lo=(this.lo<<1^e)>>>0,this},i.prototype.zzDecode=function(){var e=-(1&this.lo);return this.lo=((this.lo>>>1|this.hi<<31)^e)>>>0,this.hi=(this.hi>>>1^e)>>>0,this},i.prototype.length=function(){var e=this.lo,t=(this.lo>>>28|this.hi<<4)>>>0,r=this.hi>>>24;return 0===r?0===t?e<16384?e<128?1:2:e<2097152?3:4:t<16384?t<128?5:6:t<2097152?7:8:r<128?9:10}},function(e,t,r){"use strict";function i(){o.call(this)}function n(e,t,r){e.length<40?s.utf8.write(e,t,r):t.utf8Write?t.utf8Write(e,r):t.write(e,r)}e.exports=i;var o=r(9);(i.prototype=Object.create(o.prototype)).constructor=i;var s=r(1);i._configure=function(){i.alloc=s._Buffer_allocUnsafe,i.writeBytesBuffer=s.Buffer&&s.Buffer.prototype instanceof Uint8Array&&"set"===s.Buffer.prototype.set.name?function(e,t,r){t.set(e,r)}:function(e,t,r){if(e.copy)e.copy(t,r,0,e.length);else for(var i=0;i<e.length;)t[r++]=e[i++]}},i.prototype.bytes=function(e){s.isString(e)&&(e=s._Buffer_from(e,"base64"));var t=e.length>>>0;return this.uint32(t),t&&this._push(i.writeBytesBuffer,t,e),this},i.prototype.string=function(e){var t=s.Buffer.byteLength(e);return this.uint32(t),t&&this._push(n,t,e),this},i._configure()},function(e,t,r){"use strict";function i(e){n.call(this,e)}e.exports=i;var n=r(10);(i.prototype=Object.create(n.prototype)).constructor=i;var o=r(1);i._configure=function(){o.Buffer&&(i.prototype._slice=o.Buffer.prototype.slice)},i.prototype.string=function(){var e=this.uint32();return this.buf.utf8Slice?this.buf.utf8Slice(this.pos,this.pos=Math.min(this.pos+e,this.len)):this.buf.toString("utf-8",this.pos,this.pos=Math.min(this.pos+e,this.len))},i._configure()},function(e,t,r){"use strict";function i(e,t,r){if("function"!=typeof e)throw TypeError("rpcImpl must be a function");n.EventEmitter.call(this),this.rpcImpl=e,this.requestDelimited=Boolean(t),this.responseDelimited=Boolean(r)}e.exports=i;var n=r(1);(i.prototype=Object.create(n.EventEmitter.prototype)).constructor=i,i.prototype.rpcCall=function e(t,r,i,o,s){if(!o)throw TypeError("request must be specified");var a=this;if(!s)return n.asPromise(e,a,t,r,i,o);if(a.rpcImpl)try{return a.rpcImpl(t,r[a.requestDelimited?"encodeDelimited":"encode"](o).finish(),(function(e,r){if(e)return a.emit("error",e,t),s(e);if(null!==r){if(!(r instanceof i))try{r=i[a.responseDelimited?"decodeDelimited":"decode"](r)}catch(e){return a.emit("error",e,t),s(e)}return a.emit("data",r,t),s(null,r)}a.end(!0)}))}catch(e){return a.emit("error",e,t),void setTimeout((function(){s(e)}),0)}else setTimeout((function(){s(Error("already ended"))}),0)},i.prototype.end=function(e){return this.rpcImpl&&(e||this.rpcImpl(null,null,null),this.rpcImpl=null,this.emit("end").off()),this}},function(e,t,r){"use strict";function i(e,t){function r(e){if("string"!=typeof e){var t=n();if(i.verbose&&console.log("codegen: "+t),t="return "+t,e){for(var s=Object.keys(e),a=new Array(s.length+1),f=new Array(s.length),l=0;l<s.length;)a[l]=s[l],f[l]=e[s[l++]];return a[l]=t,Function.apply(null,a).apply(null,f)}return Function(t)()}for(var u=new Array(arguments.length-1),h=0;h<u.length;)u[h]=arguments[++h];if(h=0,e=e.replace(/%([%dfijs])/g,(function(e,t){var r=u[h++];switch(t){case"d":case"f":return String(Number(r));case"i":return String(Math.floor(r));case"j":return JSON.stringify(r);case"s":return String(r)}return"%"})),h!==u.length)throw Error("parameter count mismatch");return o.push(e),r}function n(r){return"function "+(r||t||"")+"("+(e&&e.join(",")||"")+"){\n  "+o.join("\n  ")+"\n}"}"string"==typeof e&&(t=e,e=void 0);var o=[];return r.toString=n,r}e.exports=i,i.verbose=!1},function(e,t,r){"use strict";function i(e,t,r){return"function"==typeof t?(r=t,t={}):t||(t={}),r?!t.xhr&&o&&o.readFile?o.readFile(e,(function(n,o){return n&&"undefined"!=typeof XMLHttpRequest?i.xhr(e,t,r):n?r(n):r(null,t.binary?o:o.toString("utf8"))})):i.xhr(e,t,r):n(i,this,e,t)}e.exports=i;var n=r(17),o=r(18)("fs");i.xhr=function(e,t,r){var i=new XMLHttpRequest;i.onreadystatechange=function(){if(4===i.readyState){if(0!==i.status&&200!==i.status)return r(Error("status "+i.status));if(t.binary){var e=i.response;if(!e){e=[];for(var n=0;n<i.responseText.length;++n)e.push(255&i.responseText.charCodeAt(n))}return r(null,"undefined"!=typeof Uint8Array?new Uint8Array(e):e)}return r(null,i.responseText)}},t.binary&&("overrideMimeType"in i&&i.overrideMimeType("text/plain; charset=x-user-defined"),i.responseType="arraybuffer"),i.open("GET",e),i.send()}},function(e,t,r){"use strict";var i=t,n=i.isAbsolute=function(e){return/^(?:\/|\w+:)/.test(e)},o=i.normalize=function(e){var t=(e=e.replace(/\\/g,"/").replace(/\/{2,}/g,"/")).split("/"),r=n(e),i="";r&&(i=t.shift()+"/");for(var o=0;o<t.length;)".."===t[o]?o>0&&".."!==t[o-1]?t.splice(--o,2):r?t.splice(o,1):++o:"."===t[o]?t.splice(o,1):++o;return i+t.join("/")};i.resolve=function(e,t,r){return r||(t=o(t)),n(t)?t:(r||(e=o(e)),(e=e.replace(/(?:\/|^)[^/]+$/,"")).length?o(e+"/"+t):t)}},function(e,t,r){"use strict";var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=r(16).ProtoMovieEntity,o=r(8).assign,s=r(51),a={};o(a,s);var f=function(e){for(var t=[],r=0;r<e.length;r+=32768)t.push(String.fromCharCode.apply(null,e.subarray(r,r+32768)));return t.join("")},l={loadAssets:function(e,t,r){if("object"===("undefined"==typeof JSZipUtils?"undefined":i(JSZipUtils))&&"function"==typeof JSZip)if("[object File]"==e.toString())l._readBlobAsArrayBuffer(e,(function(e){var i=new Uint8Array(e,0,4);80==i[0]&&75==i[1]&&3==i[2]&&4==i[3]?JSZip.loadAsync(e).then((function(e){l._decodeAssets(e,t)})):l.load_viaProto(e,t,r)}));else if(e.indexOf("data:svga/1.0;base64,")>=0){var n=l._base64ToArrayBuffer(e.substring(21));JSZip.loadAsync(n).then((function(e){l._decodeAssets(e,t)}))}else if(e.indexOf("data:svga/2.0;base64,")>=0){n=l._base64ToArrayBuffer(e.substring(21));l.load_viaProto(n,t,r)}else JSZipUtils.getBinaryContent(e,(function(e,i){if(e)throw r&&r(e),console.error(e),e;var n=new Uint8Array(i,0,4);80==n[0]&&75==n[1]&&3==n[2]&&4==n[3]?JSZip.loadAsync(i).then((function(e){l._decodeAssets(e,t)})):l.load_viaProto(i,t,r)}));else{var o=new XMLHttpRequest;o.open("GET",e,!0),o.responseType="arraybuffer",o.onload=function(){l.load_viaProto(o.response,t,r)},o.onerror=function(e){if(!r)throw console.error(e),e;r(e)},o.send()}},load_viaProto:function(e,t,r){try{var i=a.inflate(e),o=n.decode(i),s={};l._loadImages(s,void 0,o,(function(){o.ver="2.0",t({movie:o,images:s})}))}catch(e){if(r)return void r(e);throw console.error(e),e}},_decodeAssets:function(e,t){var r="1.0";e.file("movie.binary")&&(r="1.5"),e.file("movie.spec").async("string").then((function(i){var n=JSON.parse(i),o={};n.ver=r,l._loadImages(o,e,n,(function(){t({movie:n,images:o})}))}))},_loadImages:function(e,t,r,o){var s=this;if("object"===(void 0===r?"undefined":i(r))&&r.$type==n){var a=!0;if(t)e:for(var u in r.images){switch(function(i){if(r.images.hasOwnProperty(i)){var n=r.images[i],u=f(n);return e.hasOwnProperty(i)?"continue":(a=!1,t.file(u+".png").async("base64").then(function(n){e[i]=n,l._loadImages(e,t,r,o)}.bind(s)),"break")}}(u)){case"continue":continue;case"break":break e}}else for(var h in r.images)if(r.images.hasOwnProperty(h)){var c=r.images[h],d=void 0;try{d=f(c)}catch(e){d=f(c)}e[h]=btoa(d)}a&&o.call(this)}else{a=!0;for(var p in r.images)if(r.images.hasOwnProperty(p)){var y=r.images[p];if(e.hasOwnProperty(p))continue;a=!1,t.file(y+".png").async("base64").then(function(i){e[p]=i,l._loadImages(e,t,r,o)}.bind(this));break}a&&o.call(this)}},_base64ToArrayBuffer:function(e){for(var t=window.atob(e),r=t.length,i=new Uint8Array(r),n=0;n<r;n++)i[n]=t.charCodeAt(n);return i.buffer},_readBlobAsArrayBuffer:function(e,t){var r=new FileReader;r.onload=function(e){t(e.target.result)},r.readAsArrayBuffer(e)}};e.exports=function(e,t,r){l.loadAssets(e,t,r)}},function(e,t,r){"use strict";function i(e){if(!(this instanceof i))return new i(e);this.options=s.assign({chunkSize:16384,windowBits:0,to:""},e||{});var t=this.options;t.raw&&t.windowBits>=0&&t.windowBits<16&&(t.windowBits=-t.windowBits,0===t.windowBits&&(t.windowBits=-15)),!(t.windowBits>=0&&t.windowBits<16)||e&&e.windowBits||(t.windowBits+=32),t.windowBits>15&&t.windowBits<48&&0==(15&t.windowBits)&&(t.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new u,this.strm.avail_out=0;var r=o.inflateInit2(this.strm,t.windowBits);if(r!==f.Z_OK)throw new Error(l[r]);if(this.header=new h,o.inflateGetHeader(this.strm,this.header),t.dictionary&&("string"==typeof t.dictionary?t.dictionary=a.string2buf(t.dictionary):"[object ArrayBuffer]"===c.call(t.dictionary)&&(t.dictionary=new Uint8Array(t.dictionary)),t.raw&&(r=o.inflateSetDictionary(this.strm,t.dictionary))!==f.Z_OK))throw new Error(l[r])}function n(e,t){var r=new i(t);if(r.push(e,!0),r.err)throw r.msg||l[r.err];return r.result}var o=r(52),s=r(8),a=r(57),f=r(58),l=r(59),u=r(60),h=r(61),c=Object.prototype.toString;i.prototype.push=function(e,t){var r,i,n,l,u,h=this.strm,d=this.options.chunkSize,p=this.options.dictionary,y=!1;if(this.ended)return!1;i=t===~~t?t:!0===t?f.Z_FINISH:f.Z_NO_FLUSH,"string"==typeof e?h.input=a.binstring2buf(e):"[object ArrayBuffer]"===c.call(e)?h.input=new Uint8Array(e):h.input=e,h.next_in=0,h.avail_in=h.input.length;do{if(0===h.avail_out&&(h.output=new s.Buf8(d),h.next_out=0,h.avail_out=d),(r=o.inflate(h,f.Z_NO_FLUSH))===f.Z_NEED_DICT&&p&&(r=o.inflateSetDictionary(this.strm,p)),r===f.Z_BUF_ERROR&&!0===y&&(r=f.Z_OK,y=!1),r!==f.Z_STREAM_END&&r!==f.Z_OK)return this.onEnd(r),this.ended=!0,!1;h.next_out&&(0!==h.avail_out&&r!==f.Z_STREAM_END&&(0!==h.avail_in||i!==f.Z_FINISH&&i!==f.Z_SYNC_FLUSH)||("string"===this.options.to?(n=a.utf8border(h.output,h.next_out),l=h.next_out-n,u=a.buf2string(h.output,n),h.next_out=l,h.avail_out=d-l,l&&s.arraySet(h.output,h.output,n,l,0),this.onData(u)):this.onData(s.shrinkBuf(h.output,h.next_out)))),0===h.avail_in&&0===h.avail_out&&(y=!0)}while((h.avail_in>0||0===h.avail_out)&&r!==f.Z_STREAM_END);return r===f.Z_STREAM_END&&(i=f.Z_FINISH),i===f.Z_FINISH?(r=o.inflateEnd(this.strm),this.onEnd(r),this.ended=!0,r===f.Z_OK):i!==f.Z_SYNC_FLUSH||(this.onEnd(f.Z_OK),h.avail_out=0,!0)},i.prototype.onData=function(e){this.chunks.push(e)},i.prototype.onEnd=function(e){e===f.Z_OK&&("string"===this.options.to?this.result=this.chunks.join(""):this.result=s.flattenChunks(this.chunks)),this.chunks=[],this.err=e,this.msg=this.strm.msg},t.Inflate=i,t.inflate=n,t.inflateRaw=function(e,t){return(t=t||{}).raw=!0,n(e,t)},t.ungzip=n},function(e,t,r){"use strict";function i(e){return(e>>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function n(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new d.Buf16(320),this.work=new d.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function o(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=C,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new d.Buf32(ue),t.distcode=t.distdyn=new d.Buf32(he),t.sane=1,t.back=-1,O):j}function s(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,o(e)):j}function a(e,t){var r,i;return e&&e.state?(i=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||t>15)?j:(null!==i.window&&i.wbits!==t&&(i.window=null),i.wrap=r,i.wbits=t,s(e))):j}function f(e,t){var r,i;return e?(i=new n,e.state=i,i.window=null,(r=a(e,t))!==O&&(e.state=null),r):j}function l(e){if(de){var t;for(h=new d.Buf32(512),c=new d.Buf32(32),t=0;t<144;)e.lens[t++]=8;for(;t<256;)e.lens[t++]=9;for(;t<280;)e.lens[t++]=7;for(;t<288;)e.lens[t++]=8;for(v(b,e.lens,0,288,h,0,e.work,{bits:9}),t=0;t<32;)e.lens[t++]=5;v(_,e.lens,0,32,c,0,e.work,{bits:5}),de=!1}e.lencode=h,e.lenbits=9,e.distcode=c,e.distbits=5}function u(e,t,r,i){var n,o=e.state;return null===o.window&&(o.wsize=1<<o.wbits,o.wnext=0,o.whave=0,o.window=new d.Buf8(o.wsize)),i>=o.wsize?(d.arraySet(o.window,t,r-o.wsize,o.wsize,0),o.wnext=0,o.whave=o.wsize):((n=o.wsize-o.wnext)>i&&(n=i),d.arraySet(o.window,t,r-i,n,o.wnext),(i-=n)?(d.arraySet(o.window,t,r-i,i,0),o.wnext=i,o.whave=o.wsize):(o.wnext+=n,o.wnext===o.wsize&&(o.wnext=0),o.whave<o.wsize&&(o.whave+=n))),0}var h,c,d=r(8),p=r(53),y=r(54),m=r(55),v=r(56),g=0,b=1,_=2,w=4,k=5,x=6,O=0,A=1,S=2,j=-2,T=-3,E=-4,N=-5,F=8,C=1,B=2,I=3,P=4,R=5,D=6,M=7,L=8,z=9,J=10,U=11,Z=12,K=13,q=14,$=15,V=16,H=17,W=18,G=19,Y=20,Q=21,X=22,ee=23,te=24,re=25,ie=26,ne=27,oe=28,se=29,ae=30,fe=31,le=32,ue=852,he=592,ce=15,de=!0;t.inflateReset=s,t.inflateReset2=a,t.inflateResetKeep=o,t.inflateInit=function(e){return f(e,ce)},t.inflateInit2=f,t.inflate=function(e,t){var r,n,o,s,a,f,h,c,ue,he,ce,de,pe,ye,me,ve,ge,be,_e,we,ke,xe,Oe,Ae,Se=0,je=new d.Buf8(4),Te=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!e||!e.state||!e.output||!e.input&&0!==e.avail_in)return j;(r=e.state).mode===Z&&(r.mode=K),a=e.next_out,o=e.output,h=e.avail_out,s=e.next_in,n=e.input,f=e.avail_in,c=r.hold,ue=r.bits,he=f,ce=h,xe=O;e:for(;;)switch(r.mode){case C:if(0===r.wrap){r.mode=K;break}for(;ue<16;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}if(2&r.wrap&&35615===c){r.check=0,je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0),c=0,ue=0,r.mode=B;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&c)<<8)+(c>>8))%31){e.msg="incorrect header check",r.mode=ae;break}if((15&c)!==F){e.msg="unknown compression method",r.mode=ae;break}if(ue-=4,ke=8+(15&(c>>>=4)),0===r.wbits)r.wbits=ke;else if(ke>r.wbits){e.msg="invalid window size",r.mode=ae;break}r.dmax=1<<ke,e.adler=r.check=1,r.mode=512&c?J:Z,c=0,ue=0;break;case B:for(;ue<16;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}if(r.flags=c,(255&r.flags)!==F){e.msg="unknown compression method",r.mode=ae;break}if(57344&r.flags){e.msg="unknown header flags set",r.mode=ae;break}r.head&&(r.head.text=c>>8&1),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0)),c=0,ue=0,r.mode=I;case I:for(;ue<32;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}r.head&&(r.head.time=c),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,je[2]=c>>>16&255,je[3]=c>>>24&255,r.check=y(r.check,je,4,0)),c=0,ue=0,r.mode=P;case P:for(;ue<16;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}r.head&&(r.head.xflags=255&c,r.head.os=c>>8),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0)),c=0,ue=0,r.mode=R;case R:if(1024&r.flags){for(;ue<16;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}r.length=c,r.head&&(r.head.extra_len=c),512&r.flags&&(je[0]=255&c,je[1]=c>>>8&255,r.check=y(r.check,je,2,0)),c=0,ue=0}else r.head&&(r.head.extra=null);r.mode=D;case D:if(1024&r.flags&&((de=r.length)>f&&(de=f),de&&(r.head&&(ke=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),d.arraySet(r.head.extra,n,s,de,ke)),512&r.flags&&(r.check=y(r.check,n,de,s)),f-=de,s+=de,r.length-=de),r.length))break e;r.length=0,r.mode=M;case M:if(2048&r.flags){if(0===f)break e;de=0;do{ke=n[s+de++],r.head&&ke&&r.length<65536&&(r.head.name+=String.fromCharCode(ke))}while(ke&&de<f);if(512&r.flags&&(r.check=y(r.check,n,de,s)),f-=de,s+=de,ke)break e}else r.head&&(r.head.name=null);r.length=0,r.mode=L;case L:if(4096&r.flags){if(0===f)break e;de=0;do{ke=n[s+de++],r.head&&ke&&r.length<65536&&(r.head.comment+=String.fromCharCode(ke))}while(ke&&de<f);if(512&r.flags&&(r.check=y(r.check,n,de,s)),f-=de,s+=de,ke)break e}else r.head&&(r.head.comment=null);r.mode=z;case z:if(512&r.flags){for(;ue<16;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}if(c!==(65535&r.check)){e.msg="header crc mismatch",r.mode=ae;break}c=0,ue=0}r.head&&(r.head.hcrc=r.flags>>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=Z;break;case J:for(;ue<32;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}e.adler=r.check=i(c),c=0,ue=0,r.mode=U;case U:if(0===r.havedict)return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=f,r.hold=c,r.bits=ue,S;e.adler=r.check=1,r.mode=Z;case Z:if(t===k||t===x)break e;case K:if(r.last){c>>>=7&ue,ue-=7&ue,r.mode=ne;break}for(;ue<3;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}switch(r.last=1&c,ue-=1,3&(c>>>=1)){case 0:r.mode=q;break;case 1:if(l(r),r.mode=Y,t===x){c>>>=2,ue-=2;break e}break;case 2:r.mode=H;break;case 3:e.msg="invalid block type",r.mode=ae}c>>>=2,ue-=2;break;case q:for(c>>>=7&ue,ue-=7&ue;ue<32;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}if((65535&c)!=(c>>>16^65535)){e.msg="invalid stored block lengths",r.mode=ae;break}if(r.length=65535&c,c=0,ue=0,r.mode=$,t===x)break e;case $:r.mode=V;case V:if(de=r.length){if(de>f&&(de=f),de>h&&(de=h),0===de)break e;d.arraySet(o,n,s,de,a),f-=de,s+=de,h-=de,a+=de,r.length-=de;break}r.mode=Z;break;case H:for(;ue<14;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}if(r.nlen=257+(31&c),c>>>=5,ue-=5,r.ndist=1+(31&c),c>>>=5,ue-=5,r.ncode=4+(15&c),c>>>=4,ue-=4,r.nlen>286||r.ndist>30){e.msg="too many length or distance symbols",r.mode=ae;break}r.have=0,r.mode=W;case W:for(;r.have<r.ncode;){for(;ue<3;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}r.lens[Te[r.have++]]=7&c,c>>>=3,ue-=3}for(;r.have<19;)r.lens[Te[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,Oe={bits:r.lenbits},xe=v(g,r.lens,0,19,r.lencode,0,r.work,Oe),r.lenbits=Oe.bits,xe){e.msg="invalid code lengths set",r.mode=ae;break}r.have=0,r.mode=G;case G:for(;r.have<r.nlen+r.ndist;){for(;ve=(Se=r.lencode[c&(1<<r.lenbits)-1])>>>16&255,ge=65535&Se,!((me=Se>>>24)<=ue);){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}if(ge<16)c>>>=me,ue-=me,r.lens[r.have++]=ge;else{if(16===ge){for(Ae=me+2;ue<Ae;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}if(c>>>=me,ue-=me,0===r.have){e.msg="invalid bit length repeat",r.mode=ae;break}ke=r.lens[r.have-1],de=3+(3&c),c>>>=2,ue-=2}else if(17===ge){for(Ae=me+3;ue<Ae;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}ue-=me,ke=0,de=3+(7&(c>>>=me)),c>>>=3,ue-=3}else{for(Ae=me+7;ue<Ae;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}ue-=me,ke=0,de=11+(127&(c>>>=me)),c>>>=7,ue-=7}if(r.have+de>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=ae;break}for(;de--;)r.lens[r.have++]=ke}}if(r.mode===ae)break;if(0===r.lens[256]){e.msg="invalid code -- missing end-of-block",r.mode=ae;break}if(r.lenbits=9,Oe={bits:r.lenbits},xe=v(b,r.lens,0,r.nlen,r.lencode,0,r.work,Oe),r.lenbits=Oe.bits,xe){e.msg="invalid literal/lengths set",r.mode=ae;break}if(r.distbits=6,r.distcode=r.distdyn,Oe={bits:r.distbits},xe=v(_,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,Oe),r.distbits=Oe.bits,xe){e.msg="invalid distances set",r.mode=ae;break}if(r.mode=Y,t===x)break e;case Y:r.mode=Q;case Q:if(f>=6&&h>=258){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=f,r.hold=c,r.bits=ue,m(e,ce),a=e.next_out,o=e.output,h=e.avail_out,s=e.next_in,n=e.input,f=e.avail_in,c=r.hold,ue=r.bits,r.mode===Z&&(r.back=-1);break}for(r.back=0;ve=(Se=r.lencode[c&(1<<r.lenbits)-1])>>>16&255,ge=65535&Se,!((me=Se>>>24)<=ue);){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}if(ve&&0==(240&ve)){for(be=me,_e=ve,we=ge;ve=(Se=r.lencode[we+((c&(1<<be+_e)-1)>>be)])>>>16&255,ge=65535&Se,!(be+(me=Se>>>24)<=ue);){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}c>>>=be,ue-=be,r.back+=be}if(c>>>=me,ue-=me,r.back+=me,r.length=ge,0===ve){r.mode=ie;break}if(32&ve){r.back=-1,r.mode=Z;break}if(64&ve){e.msg="invalid literal/length code",r.mode=ae;break}r.extra=15&ve,r.mode=X;case X:if(r.extra){for(Ae=r.extra;ue<Ae;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}r.length+=c&(1<<r.extra)-1,c>>>=r.extra,ue-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=ee;case ee:for(;ve=(Se=r.distcode[c&(1<<r.distbits)-1])>>>16&255,ge=65535&Se,!((me=Se>>>24)<=ue);){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}if(0==(240&ve)){for(be=me,_e=ve,we=ge;ve=(Se=r.distcode[we+((c&(1<<be+_e)-1)>>be)])>>>16&255,ge=65535&Se,!(be+(me=Se>>>24)<=ue);){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}c>>>=be,ue-=be,r.back+=be}if(c>>>=me,ue-=me,r.back+=me,64&ve){e.msg="invalid distance code",r.mode=ae;break}r.offset=ge,r.extra=15&ve,r.mode=te;case te:if(r.extra){for(Ae=r.extra;ue<Ae;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}r.offset+=c&(1<<r.extra)-1,c>>>=r.extra,ue-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){e.msg="invalid distance too far back",r.mode=ae;break}r.mode=re;case re:if(0===h)break e;if(de=ce-h,r.offset>de){if((de=r.offset-de)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=ae;break}de>r.wnext?(de-=r.wnext,pe=r.wsize-de):pe=r.wnext-de,de>r.length&&(de=r.length),ye=r.window}else ye=o,pe=a-r.offset,de=r.length;de>h&&(de=h),h-=de,r.length-=de;do{o[a++]=ye[pe++]}while(--de);0===r.length&&(r.mode=Q);break;case ie:if(0===h)break e;o[a++]=r.length,h--,r.mode=Q;break;case ne:if(r.wrap){for(;ue<32;){if(0===f)break e;f--,c|=n[s++]<<ue,ue+=8}if(ce-=h,e.total_out+=ce,r.total+=ce,ce&&(e.adler=r.check=r.flags?y(r.check,o,ce,a-ce):p(r.check,o,ce,a-ce)),ce=h,(r.flags?c:i(c))!==r.check){e.msg="incorrect data check",r.mode=ae;break}c=0,ue=0}r.mode=oe;case oe:if(r.wrap&&r.flags){for(;ue<32;){if(0===f)break e;f--,c+=n[s++]<<ue,ue+=8}if(c!==(4294967295&r.total)){e.msg="incorrect length check",r.mode=ae;break}c=0,ue=0}r.mode=se;case se:xe=A;break e;case ae:xe=T;break e;case fe:return E;case le:default:return j}return e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=f,r.hold=c,r.bits=ue,(r.wsize||ce!==e.avail_out&&r.mode<ae&&(r.mode<ne||t!==w))&&u(e,e.output,e.next_out,ce-e.avail_out)?(r.mode=fe,E):(he-=e.avail_in,ce-=e.avail_out,e.total_in+=he,e.total_out+=ce,r.total+=ce,r.wrap&&ce&&(e.adler=r.check=r.flags?y(r.check,o,ce,e.next_out-ce):p(r.check,o,ce,e.next_out-ce)),e.data_type=r.bits+(r.last?64:0)+(r.mode===Z?128:0)+(r.mode===Y||r.mode===$?256:0),(0===he&&0===ce||t===w)&&xe===O&&(xe=N),xe)},t.inflateEnd=function(e){if(!e||!e.state)return j;var t=e.state;return t.window&&(t.window=null),e.state=null,O},t.inflateGetHeader=function(e,t){var r;return e&&e.state?0==(2&(r=e.state).wrap)?j:(r.head=t,t.done=!1,O):j},t.inflateSetDictionary=function(e,t){var r,i=t.length;return e&&e.state?0!==(r=e.state).wrap&&r.mode!==U?j:r.mode===U&&p(1,t,i,0)!==r.check?T:u(e,t,i,i)?(r.mode=fe,E):(r.havedict=1,O):j},t.inflateInfo="pako inflate (from Nodeca project)"},function(e,t,r){"use strict";e.exports=function(e,t,r,i){for(var n=65535&e|0,o=e>>>16&65535|0,s=0;0!==r;){r-=s=r>2e3?2e3:r;do{o=o+(n=n+t[i++]|0)|0}while(--s);n%=65521,o%=65521}return n|o<<16|0}},function(e,t,r){"use strict";var i=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var i=0;i<8;i++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();e.exports=function(e,t,r,n){var o=i,s=n+r;e^=-1;for(var a=n;a<s;a++)e=e>>>8^o[255&(e^t[a])];return-1^e}},function(e,t,r){"use strict";e.exports=function(e,t){var r,i,n,o,s,a,f,l,u,h,c,d,p,y,m,v,g,b,_,w,k,x,O,A,S;r=e.state,i=e.next_in,A=e.input,n=i+(e.avail_in-5),o=e.next_out,S=e.output,s=o-(t-e.avail_out),a=o+(e.avail_out-257),f=r.dmax,l=r.wsize,u=r.whave,h=r.wnext,c=r.window,d=r.hold,p=r.bits,y=r.lencode,m=r.distcode,v=(1<<r.lenbits)-1,g=(1<<r.distbits)-1;e:do{p<15&&(d+=A[i++]<<p,p+=8,d+=A[i++]<<p,p+=8),b=y[d&v];t:for(;;){if(d>>>=_=b>>>24,p-=_,0==(_=b>>>16&255))S[o++]=65535&b;else{if(!(16&_)){if(0==(64&_)){b=y[(65535&b)+(d&(1<<_)-1)];continue t}if(32&_){r.mode=12;break e}e.msg="invalid literal/length code",r.mode=30;break e}w=65535&b,(_&=15)&&(p<_&&(d+=A[i++]<<p,p+=8),w+=d&(1<<_)-1,d>>>=_,p-=_),p<15&&(d+=A[i++]<<p,p+=8,d+=A[i++]<<p,p+=8),b=m[d&g];r:for(;;){if(d>>>=_=b>>>24,p-=_,!(16&(_=b>>>16&255))){if(0==(64&_)){b=m[(65535&b)+(d&(1<<_)-1)];continue r}e.msg="invalid distance code",r.mode=30;break e}if(k=65535&b,p<(_&=15)&&(d+=A[i++]<<p,(p+=8)<_&&(d+=A[i++]<<p,p+=8)),(k+=d&(1<<_)-1)>f){e.msg="invalid distance too far back",r.mode=30;break e}if(d>>>=_,p-=_,k>(_=o-s)){if((_=k-_)>u&&r.sane){e.msg="invalid distance too far back",r.mode=30;break e}if(x=0,O=c,0===h){if(x+=l-_,_<w){w-=_;do{S[o++]=c[x++]}while(--_);x=o-k,O=S}}else if(h<_){if(x+=l+h-_,(_-=h)<w){w-=_;do{S[o++]=c[x++]}while(--_);if(x=0,h<w){w-=_=h;do{S[o++]=c[x++]}while(--_);x=o-k,O=S}}}else if(x+=h-_,_<w){w-=_;do{S[o++]=c[x++]}while(--_);x=o-k,O=S}for(;w>2;)S[o++]=O[x++],S[o++]=O[x++],S[o++]=O[x++],w-=3;w&&(S[o++]=O[x++],w>1&&(S[o++]=O[x++]))}else{x=o-k;do{S[o++]=S[x++],S[o++]=S[x++],S[o++]=S[x++],w-=3}while(w>2);w&&(S[o++]=S[x++],w>1&&(S[o++]=S[x++]))}break}}break}}while(i<n&&o<a);i-=w=p>>3,d&=(1<<(p-=w<<3))-1,e.next_in=i,e.next_out=o,e.avail_in=i<n?n-i+5:5-(i-n),e.avail_out=o<a?a-o+257:257-(o-a),r.hold=d,r.bits=p}},function(e,t,r){"use strict";var i=r(8),n=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],o=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],s=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],a=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];e.exports=function(e,t,r,f,l,u,h,c){var d,p,y,m,v,g,b,_,w,k=c.bits,x=0,O=0,A=0,S=0,j=0,T=0,E=0,N=0,F=0,C=0,B=null,I=0,P=new i.Buf16(16),R=new i.Buf16(16),D=null,M=0;for(x=0;x<=15;x++)P[x]=0;for(O=0;O<f;O++)P[t[r+O]]++;for(j=k,S=15;S>=1&&0===P[S];S--);if(j>S&&(j=S),0===S)return l[u++]=20971520,l[u++]=20971520,c.bits=1,0;for(A=1;A<S&&0===P[A];A++);for(j<A&&(j=A),N=1,x=1;x<=15;x++)if(N<<=1,(N-=P[x])<0)return-1;if(N>0&&(0===e||1!==S))return-1;for(R[1]=0,x=1;x<15;x++)R[x+1]=R[x]+P[x];for(O=0;O<f;O++)0!==t[r+O]&&(h[R[t[r+O]]++]=O);if(0===e?(B=D=h,g=19):1===e?(B=n,I-=257,D=o,M-=257,g=256):(B=s,D=a,g=-1),C=0,O=0,x=A,v=u,T=j,E=0,y=-1,m=(F=1<<j)-1,1===e&&F>852||2===e&&F>592)return 1;for(;;){b=x-E,h[O]<g?(_=0,w=h[O]):h[O]>g?(_=D[M+h[O]],w=B[I+h[O]]):(_=96,w=0),d=1<<x-E,A=p=1<<T;do{l[v+(C>>E)+(p-=d)]=b<<24|_<<16|w|0}while(0!==p);for(d=1<<x-1;C&d;)d>>=1;if(0!==d?(C&=d-1,C+=d):C=0,O++,0==--P[x]){if(x===S)break;x=t[r+h[O]]}if(x>j&&(C&m)!==y){for(0===E&&(E=j),v+=A,N=1<<(T=x-E);T+E<S&&!((N-=P[T+E])<=0);)T++,N<<=1;if(F+=1<<T,1===e&&F>852||2===e&&F>592)return 1;l[y=C&m]=j<<24|T<<16|v-u|0}}return 0!==C&&(l[v+C]=x-E<<24|64<<16|0),c.bits=j,0}},function(e,t,r){"use strict";function i(e,t){if(t<65534&&(e.subarray&&s||!e.subarray&&o))return String.fromCharCode.apply(null,n.shrinkBuf(e,t));for(var r="",i=0;i<t;i++)r+=String.fromCharCode(e[i]);return r}var n=r(8),o=!0,s=!0;try{String.fromCharCode.apply(null,[0])}catch(e){o=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(e){s=!1}for(var a=new n.Buf8(256),f=0;f<256;f++)a[f]=f>=252?6:f>=248?5:f>=240?4:f>=224?3:f>=192?2:1;a[254]=a[254]=1,t.string2buf=function(e){var t,r,i,o,s,a=e.length,f=0;for(o=0;o<a;o++)55296==(64512&(r=e.charCodeAt(o)))&&o+1<a&&56320==(64512&(i=e.charCodeAt(o+1)))&&(r=65536+(r-55296<<10)+(i-56320),o++),f+=r<128?1:r<2048?2:r<65536?3:4;for(t=new n.Buf8(f),s=0,o=0;s<f;o++)55296==(64512&(r=e.charCodeAt(o)))&&o+1<a&&56320==(64512&(i=e.charCodeAt(o+1)))&&(r=65536+(r-55296<<10)+(i-56320),o++),r<128?t[s++]=r:r<2048?(t[s++]=192|r>>>6,t[s++]=128|63&r):r<65536?(t[s++]=224|r>>>12,t[s++]=128|r>>>6&63,t[s++]=128|63&r):(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63,t[s++]=128|r>>>6&63,t[s++]=128|63&r);return t},t.buf2binstring=function(e){return i(e,e.length)},t.binstring2buf=function(e){for(var t=new n.Buf8(e.length),r=0,i=t.length;r<i;r++)t[r]=e.charCodeAt(r);return t},t.buf2string=function(e,t){var r,n,o,s,f=t||e.length,l=new Array(2*f);for(n=0,r=0;r<f;)if((o=e[r++])<128)l[n++]=o;else if((s=a[o])>4)l[n++]=65533,r+=s-1;else{for(o&=2===s?31:3===s?15:7;s>1&&r<f;)o=o<<6|63&e[r++],s--;s>1?l[n++]=65533:o<65536?l[n++]=o:(o-=65536,l[n++]=55296|o>>10&1023,l[n++]=56320|1023&o)}return i(l,n)},t.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;r>=0&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+a[e[r]]>t?r:t}},function(e,t,r){"use strict";e.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},function(e,t,r){"use strict";e.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},function(e,t,r){"use strict";e.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},function(e,t,r){"use strict";e.exports=function(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}},function(e,t,r){"undefined"!=typeof self&&self,e.exports=function(e){function t(i){if(r[i])return r[i].exports;var n=r[i]={i:i,l:!1,exports:{}};return e[i].call(n.exports,n,n.exports,t),n.l=!0,n.exports}var r={};return t.m=e,t.c=r,t.d=function(e,r,i){t.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:i})},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=r(1);e.exports=i.ValueAnimator},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=function(){function e(){this.startValue=0,this.endValue=0,this.duration=0,this.loops=1,this.fillRule=0,this.onStart=function(){},this.onUpdate=function(){},this.onEnd=function(){},this.mRunning=!1,this.mStartTime=0,this.mCurrentFrication=0,this.mReverse=!1}return e.prototype.start=function(e){void 0===e&&(e=void 0),this.doStart(!1,e)},e.prototype.reverse=function(e){void 0===e&&(e=void 0),this.doStart(!0,e)},e.prototype.stop=function(){this.doStop()},Object.defineProperty(e.prototype,"animatedValue",{get:function(){return(this.endValue-this.startValue)*this.mCurrentFrication+this.startValue},enumerable:!0,configurable:!0}),e.prototype.doStart=function(t,r){void 0===t&&(t=!1),void 0===r&&(r=void 0),this.mReverse=t,this.mRunning=!0,this.mStartTime=e.currentTimeMillsecond(),r&&(this.mStartTime-=t?(1-r/(this.endValue-this.startValue))*this.duration:r/(this.endValue-this.startValue)*this.duration),this.mCurrentFrication=0,this.onStart(),this.doFrame()},e.prototype.doStop=function(){this.mRunning=!1},e.prototype.doFrame=function(){this.mRunning&&(this.doDeltaTime(e.currentTimeMillsecond()-this.mStartTime),this.mRunning&&e.requestAnimationFrame(this.doFrame.bind(this)))},e.prototype.doDeltaTime=function(e){e>=this.duration*this.loops?(this.mCurrentFrication=1===this.fillRule?0:1,this.mRunning=!1):(this.mCurrentFrication=e%this.duration/this.duration,this.mReverse&&(this.mCurrentFrication=1-this.mCurrentFrication)),this.onUpdate(this.animatedValue),!1===this.mRunning&&this.onEnd()},e.currentTimeMillsecond=function(){return"undefined"==typeof performance?(new Date).getTime():performance.now()},e.requestAnimationFrame=function(e){return"undefined"==typeof requestAnimationFrame?setTimeout(e,16):window.requestAnimationFrame(e)},e}();t.ValueAnimator=i}])},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Player=void 0;var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),o=r(65),s=r(62);t.Player=function(){function e(t){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this.loops=0,this.clearsAfterStop=!0,this.fillMode="Forward",this._asChild=!1,this._container=void 0,this._renderer=void 0,this._animator=void 0,this._drawingCanvas=void 0,this._contentMode="AspectFit",this._videoItem=void 0,this._forwardAnimating=!1,this._currentFrame=0,this._dynamicImage={},this._dynamicImageTransform={},this._dynamicText={},this._onFinished=void 0,this._onFrame=void 0,this._onPercentage=void 0,this._container="string"==typeof t?document.querySelector(t):t,this._asChild=void 0===t,this._init()}return n(e,[{key:"setVideoItem",value:function(e){this._currentFrame=0,this._videoItem=e,this._renderer.prepare(),this.clear(),this._update()}},{key:"setContentMode",value:function(e){this._contentMode=e,this._update()}},{key:"setClipsToBounds",value:function(e){this._container instanceof HTMLDivElement&&(this._container.style.overflowX=this._container.style.overflowY=e?"hidden":void 0)}},{key:"startAnimation",value:function(e){this.stopAnimation(!1),this._doStart(void 0,e,void 0)}},{key:"startAnimationWithRange",value:function(e,t){this.stopAnimation(!1),this._doStart(e,t,void 0)}},{key:"pauseAnimation",value:function(){this.stopAnimation(!1)}},{key:"stopAnimation",value:function(e){this._forwardAnimating=!1,void 0!==this._animator&&this._animator.stop(),void 0===e&&(e=this.clearsAfterStop),e&&this.clear()}},{key:"clear",value:function(){this._renderer.clear(),this._renderer.clearAudios()}},{key:"stepToFrame",value:function(e,t){e>=this._videoItem.frames||e<0||(this.pauseAnimation(),this._currentFrame=e,this._update(),t&&this._doStart(void 0,!1,this._currentFrame))}},{key:"stepToPercentage",value:function(e,t){var r=parseInt(e*this._videoItem.frames);r>=this._videoItem.frames&&r>0&&(r=this._videoItem.frames-1),this.stepToFrame(r,t)}},{key:"setImage",value:function(e,t,r){this._dynamicImage[t]=e,void 0!==r&&r instanceof Array&&6==r.length&&(this._dynamicImageTransform[t]=r)}},{key:"setText",value:function(e,t){var r="string"==typeof e?e:e.text,n=("object"===(void 0===e?"undefined":i(e))?e.size:"14px")||"14px",o=("object"===(void 0===e?"undefined":i(e))?e.family:"Arial")||"Arial",s=("object"===(void 0===e?"undefined":i(e))?e.color:"#000000")||"#000000",a=("object"===(void 0===e?"undefined":i(e))?e.offset:{x:0,y:0})||{x:0,y:0};this._dynamicText[t]={text:r,style:n+" "+o,color:s,offset:a}}},{key:"clearDynamicObjects",value:function(){this._dynamicImage={},this._dynamicImageTransform={},this._dynamicText={}}},{key:"onFinished",value:function(e){this._onFinished=e}},{key:"onFrame",value:function(e){this._onFrame=e}},{key:"onPercentage",value:function(e){this._onPercentage=e}},{key:"drawOnContext",value:function(e,t,r,i,n){this._drawingCanvas&&this._videoItem&&e.drawImage(this._drawingCanvas,t,r,i||this._videoItem.videoSize.width,n||this._videoItem.videoSize.height)}},{key:"_init",value:function(){if(this._container instanceof HTMLDivElement||this._asChild){if(this._container)for(var e=this._container.querySelectorAll("canvas"),t=0;t<e.length;t++){var r=e[t];void 0!==r&&r.__isPlayer&&this._container.removeChild(r)}this._drawingCanvas=document.createElement("canvas"),this._drawingCanvas.__isPlayer=!0,this._drawingCanvas.style.backgroundColor="transparent",this._container&&(this._container.appendChild(this._drawingCanvas),this._container.style.textAlign="left")}this._renderer=new o.Renderer(this)}},{key:"_doStart",value:function(e,t,r){var i=this;this._animator=new s,void 0!==e?(this._animator.startValue=Math.max(0,e.location),this._animator.endValue=Math.min(this._videoItem.frames-1,e.location+e.length),this._animator.duration=(this._animator.endValue-this._animator.startValue+1)*(1/this._videoItem.FPS)*1e3):(this._animator.startValue=0,this._animator.endValue=this._videoItem.frames-1,this._animator.duration=this._videoItem.frames*(1/this._videoItem.FPS)*1e3),this._animator.loops=this.loops<=0?1/0:this.loops,this._animator.fillRule="Backward"===this.fillMode?1:0,this._animator.onUpdate=function(e){i._currentFrame!==Math.floor(e)&&(i._forwardAnimating&&i._currentFrame>Math.floor(e)&&i._renderer.clearAudios(),i._currentFrame=Math.floor(e),i._update(),"function"==typeof i._onFrame&&i._onFrame(i._currentFrame),"function"==typeof i._onPercentage&&i._onPercentage(parseFloat(i._currentFrame+1)/parseFloat(i._videoItem.frames)))},this._animator.onEnd=function(){i._forwardAnimating=!1,!0===i.clearsAfterStop&&i.clear(),"function"==typeof i._onFinished&&i._onFinished()},!0===t?(this._animator.reverse(r),this._forwardAnimating=!1):(this._animator.start(r),this._forwardAnimating=!0),this._currentFrame=this._animator.startValue,this._update()}},{key:"_resize",value:function(){var e=!1;if(this._drawingCanvas){var t;t=this._drawingCanvas.parentNode?{width:this._drawingCanvas.parentNode.clientWidth,height:this._drawingCanvas.parentNode.clientHeight}:this._videoItem.videoSize;var r=this._videoItem.videoSize;if(t.width>=r.width&&t.height>=r.height)this._drawingCanvas.width=t.width,this._drawingCanvas.height=t.height,this._drawingCanvas.style.webkitTransform=this._drawingCanvas.style.transform="",e=!0;else{if(this._drawingCanvas.width=r.width,this._drawingCanvas.height=r.height,"Fill"===this._contentMode){var i=t.width/r.width,n=t.height/r.height,o=(r.width*i-r.width)/2,s=(r.height*n-r.height)/2;this._drawingCanvas.style.webkitTransform=this._drawingCanvas.style.transform="matrix("+i+", 0.0, 0.0, "+n+", "+o+", "+s+")"}else if("AspectFit"===this._contentMode||"AspectFill"===this._contentMode){var a=r.width/r.height,f=t.width/t.height;if(a>=f&&"AspectFit"===this._contentMode||a<=f&&"AspectFill"===this._contentMode){var l=t.width/r.width,u=(r.width*l-r.width)/2,h=(r.height*l-r.height)/2+(t.height-r.height*l)/2;this._drawingCanvas.style.webkitTransform=this._drawingCanvas.style.transform="matrix("+l+", 0.0, 0.0, "+l+", "+u+", "+h+")"}else if(a<f&&"AspectFit"===this._contentMode||a>f&&"AspectFill"===this._contentMode){var c=t.height/r.height,d=(r.width*c-r.width)/2+(t.width-r.width*c)/2,p=(r.height*c-r.height)/2;this._drawingCanvas.style.webkitTransform=this._drawingCanvas.style.transform="matrix("+c+", 0.0, 0.0, "+c+", "+d+", "+p+")"}}this._globalTransform=void 0}}if(void 0===this._drawingCanvas||!0===e){var y=1,m=1,v=0,g=0,b={width:void 0!==this._container?this._container.clientWidth:0,height:void 0!==this._container?this._container.clientHeight:0},_=this._videoItem.videoSize;if("Fill"===this._contentMode)y=b.width/_.width,m=b.height/_.height;else if("AspectFit"===this._contentMode||"AspectFill"===this._contentMode){var w=_.width/_.height,k=b.width/b.height;w>=k&&"AspectFit"===this._contentMode||w<=k&&"AspectFill"===this._contentMode?(y=m=b.width/_.width,g=(b.height-_.height*m)/2):(w<k&&"AspectFit"===this._contentMode||w>k&&"AspectFill"===this._contentMode)&&(y=m=b.height/_.height,v=(b.width-_.width*y)/2)}this._globalTransform={a:y,b:0,c:0,d:m,tx:v,ty:g}}}},{key:"_update",value:function(){void 0!==this._videoItem&&(this._resize(),this._renderer.drawFrame(this._currentFrame),this._renderer.playAudio(this._currentFrame))}}]),e}()},function(e,t,r){"use strict";var i=r(13),n=r(63),o=r(66);e.exports={Parser:i.Parser,Player:n.Player,autoload:o.AutoLoader.autoload},o.AutoLoader.autoload()},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.Renderer=void 0;var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n=function(){function e(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,r,i){return r&&e(t.prototype,r),i&&e(t,i),t}}(),o=r(5),s=r(15),a=r(14);t.Renderer=function(){function e(t){(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")})(this,e),this._owner=void 0,this._prepared=!1,this._undrawFrame=void 0,this._bitmapCache=void 0,this._soundsQueue=[],this._owner=t}return n(e,[{key:"dataURLtoBlob",value:function(e){for(var t=e.split(","),r=t[0].match(/:(.*?);/)[1],i=atob(t[1]),n=i.length,o=new Uint8Array(n);n--;)o[n]=i.charCodeAt(n);return new Blob([o],{type:r})}},{key:"prepare",value:function(){var e,t,r=this;if(this._prepared=!1,this._bitmapCache=void 0,void 0===this._owner._videoItem.images||0==Object.keys(this._owner._videoItem.images).length)return this._bitmapCache={},void(this._prepared=!0);void 0===this._bitmapCache&&function(){r._bitmapCache={};var i=0,n=0;for(e in r._owner._videoItem.images){var o=r._owner._videoItem.images[e];if(0===o.indexOf("iVBO")||0===o.indexOf("/9j/2w")){i++;var s=document.createElement("img");s.onload=function(){++n==i&&(this._prepared=!0,"number"==typeof this._undrawFrame&&(this.drawFrame(this._undrawFrame),this._undrawFrame=void 0))}.bind(r),s.src="data:image/png;base64,"+o;var a=e.replace(".matte","");r._bitmapCache[a]=s}else 0===o.indexOf("SUQz")&&void 0!==window.Howl&&(i++,(t=new Howl({src:["Google Inc."===navigator.vendor?URL.createObjectURL(r.dataURLtoBlob("data:audio/x-mpeg;base64,"+o)):"data:audio/x-mpeg;base64,"+o],html5:"Google Inc."===navigator.vendor||void 0,preload:"Google Inc."===navigator.vendor||void 0,format:"Google Inc."===navigator.vendor?["mp3"]:void 0})).once("load",function(){++n==i&&(this._prepared=!0,"number"==typeof this._undrawFrame&&(this.drawFrame(this._undrawFrame),this._undrawFrame=void 0))}.bind(r)),t.on("loaderror",(function(e){console.error(e)})),r._bitmapCache[e]=t)}}()}},{key:"clear",value:function(){var e=(this._owner._drawingCanvas||this._owner._container).getContext("2d"),t={x:0,y:0,width:(this._owner._drawingCanvas||this._owner._container).width,height:(this._owner._drawingCanvas||this._owner._container).height};e.clearRect(t.x,t.y,t.width,t.height)}},{key:"clearAudios",value:function(){this._soundsQueue.forEach((function(e){e.player.stop(e.playID)})),this._soundsQueue=[]}},{key:"drawFrame",value:function(e){var t=this;if(this._prepared){var r=(this._owner._drawingCanvas||this._owner._container).getContext("2d"),i={x:0,y:0,width:(this._owner._drawingCanvas||this._owner._container).width,height:(this._owner._drawingCanvas||this._owner._container).height};r.clearRect(i.x,i.y,i.width,i.height);var n=new Map,o=!1,s=this._owner._videoItem.sprites;s.forEach((function(i,a){if(-1!=s[0].imageKey.indexOf(".matte"))if(-1==i.imageKey.indexOf(".matte")){var f=s[a-1];if(o&&(null==i.matteKey||0==i.matteKey.length||i.matteKey!=f.matteKey)){o=!1;var l=n.get(i.matteKey);r.globalCompositeOperation="destination-in",t.drawSprite(l,r,e),r.globalCompositeOperation="source-over",r.restore()}if(null==i.matteKey||null!=f.matteKey&&0!=f.matteKey.length&&f.matteKey==i.matteKey||(o=!0,r.save()),t.drawSprite(i,r,e),o&&a==s.length-1){l=n.get(i.matteKey);r.globalCompositeOperation="destination-in",t.drawSprite(l,r,e),r.globalCompositeOperation="source-over",r.restore()}}else n.set(i.imageKey,i);else t.drawSprite(i,r,e)}))}else this._undrawFrame=e}},{key:"drawSprite",value:function(e,t,r){var n=this,f=e.frames[this._owner._currentFrame];if(!(f.alpha<.05)){t.save(),this._owner._globalTransform&&t.transform(this._owner._globalTransform.a,this._owner._globalTransform.b,this._owner._globalTransform.c,this._owner._globalTransform.d,this._owner._globalTransform.tx,this._owner._globalTransform.ty),t.globalAlpha=f.alpha,t.transform(f.transform.a,f.transform.b,f.transform.c,f.transform.d,f.transform.tx,f.transform.ty);var l=e.imageKey.replace(".matte",""),u=this._owner._dynamicImage[l]||this._bitmapCache[l]||this._owner._videoItem.images[l];if("string"==typeof u){var h=this._bitmapCache[e.imageKey]||document.createElement("img"),c=void 0,d=void 0;if(0===u.indexOf("iVBO")||0===u.indexOf("/9j/2w")?h.src="data:image/png;base64,"+u:(h._svgaSrc!==u&&(h._svgaSrc=u,h.src=u),c=f.layout.width,d=f.layout.height),this._bitmapCache[e.imageKey]=h,void 0!==f.maskPath&&null!==f.maskPath&&(this.drawBezier(t,f.maskPath),t.clip()),void 0!==this._owner._dynamicImageTransform[e.imageKey]){t.save();var p=this._owner._dynamicImageTransform[e.imageKey];t.transform(p[0],p[1],p[2],p[3],p[4],p[5])}c&&d?t.drawImage(h,0,0,c,d):t.drawImage(h,0,0),void 0!==this._owner._dynamicImageTransform[e.imageKey]&&t.restore()}else if("object"===(void 0===u?"undefined":i(u))){if(void 0!==f.maskPath&&null!==f.maskPath&&(f.maskPath._styles=void 0,this.drawBezier(t,f.maskPath),t.clip()),void 0!==this._owner._dynamicImageTransform[e.imageKey]){t.save();var y=this._owner._dynamicImageTransform[e.imageKey];t.transform(y[0],y[1],y[2],y[3],y[4],y[5])}t.drawImage(u,0,0),void 0!==this._owner._dynamicImageTransform[e.imageKey]&&t.restore()}f.shapes&&f.shapes.forEach((function(e){"shape"===e.type&&e.pathArgs&&e.pathArgs.d&&n.drawBezier(t,new o.BezierPath(e.pathArgs.d,e.transform,e.styles)),"ellipse"===e.type&&e.pathArgs&&n.drawEllipse(t,new s.EllipsePath(parseFloat(e.pathArgs.x)||0,parseFloat(e.pathArgs.y)||0,parseFloat(e.pathArgs.radiusX)||0,parseFloat(e.pathArgs.radiusY)||0,e.transform,e.styles)),"rect"===e.type&&e.pathArgs&&n.drawRect(t,new a.RectPath(parseFloat(e.pathArgs.x)||0,parseFloat(e.pathArgs.y)||0,parseFloat(e.pathArgs.width)||0,parseFloat(e.pathArgs.height)||0,parseFloat(e.pathArgs.cornerRadius)||0,e.transform,e.styles))}));var m=this._owner._dynamicText[e.imageKey];if(void 0!==m){t.textBaseline="middle",t.font=m.style;var v=t.measureText(m.text).width;t.fillStyle=m.color;var g=void 0!==m.offset&&void 0!==m.offset.x?isNaN(parseFloat(m.offset.x))?0:parseFloat(m.offset.x):0,b=void 0!==m.offset&&void 0!==m.offset.y?isNaN(parseFloat(m.offset.y))?0:parseFloat(m.offset.y):0;t.fillText(m.text,(f.layout.width-v)/2+g,f.layout.height/2+b)}t.restore()}}},{key:"playAudio",value:function(e){var t=this;if(this._owner._forwardAnimating&&this._owner._videoItem.audios instanceof Array){this._owner._videoItem.audios.forEach((function(r){if(r.startFrame===e&&void 0!==t._bitmapCache[r.audioKey]&&"function"==typeof t._bitmapCache[r.audioKey].play){var i={playID:t._bitmapCache[r.audioKey].play(),player:t._bitmapCache[r.audioKey],endFrame:r.endFrame};i.player.seek(r.startTime/1e3,i.playID),t._soundsQueue.push(i)}}));var r=!1;this._soundsQueue.forEach((function(t){e>=t.endFrame&&(r=!0,t.player.stop(t.playID))})),r&&(this._soundsQueue=this._soundsQueue.filter((function(t){return e<t.endFrame})))}}},{key:"resetShapeStyles",value:function(e,t){var r=t._styles;void 0!==r&&(r&&r.stroke?e.strokeStyle="rgba("+parseInt(255*r.stroke[0])+", "+parseInt(255*r.stroke[1])+", "+parseInt(255*r.stroke[2])+", "+r.stroke[3]+")":e.strokeStyle="transparent",r&&(e.lineWidth=r.strokeWidth||void 0,e.lineCap=r.lineCap||void 0,e.lineJoin=r.lineJoin||void 0,e.miterLimit=r.miterLimit||void 0),r&&r.fill?e.fillStyle="rgba("+parseInt(255*r.fill[0])+", "+parseInt(255*r.fill[1])+", "+parseInt(255*r.fill[2])+", "+r.fill[3]+")":e.fillStyle="transparent",r&&r.lineDash&&e.setLineDash(r.lineDash))}},{key:"drawBezier",value:function(e,t){var r=this;e.save(),this.resetShapeStyles(e,t),void 0!==t._transform&&null!==t._transform&&e.transform(t._transform.a,t._transform.b,t._transform.c,t._transform.d,t._transform.tx,t._transform.ty);var i={x:0,y:0,x1:0,y1:0,x2:0,y2:0};e.beginPath(),t._d.replace(/([a-zA-Z])/g,"|||$1 ").replace(/,/g," ").split("|||").forEach((function(t){if(0!=t.length){var n=t.substr(0,1);if("MLHVCSQRZmlhvcsqrz".indexOf(n)>=0){var o=t.substr(1).trim().split(" ");r.drawBezierElement(e,i,n,o)}}})),t._styles&&t._styles.fill&&e.fill(),t._styles&&t._styles.stroke&&e.stroke(),e.restore()}},{key:"drawBezierElement",value:function(e,t,r,i){switch(r){case"M":t.x=Number(i[0]),t.y=Number(i[1]),e.moveTo(t.x,t.y);break;case"m":t.x+=Number(i[0]),t.y+=Number(i[1]),e.moveTo(t.x,t.y);break;case"L":t.x=Number(i[0]),t.y=Number(i[1]),e.lineTo(t.x,t.y);break;case"l":t.x+=Number(i[0]),t.y+=Number(i[1]),e.lineTo(t.x,t.y);break;case"H":t.x=Number(i[0]),e.lineTo(t.x,t.y);break;case"h":t.x+=Number(i[0]),e.lineTo(t.x,t.y);break;case"V":t.y=Number(i[0]),e.lineTo(t.x,t.y);break;case"v":t.y+=Number(i[0]),e.lineTo(t.x,t.y);break;case"C":t.x1=Number(i[0]),t.y1=Number(i[1]),t.x2=Number(i[2]),t.y2=Number(i[3]),t.x=Number(i[4]),t.y=Number(i[5]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y);break;case"c":t.x1=t.x+Number(i[0]),t.y1=t.y+Number(i[1]),t.x2=t.x+Number(i[2]),t.y2=t.y+Number(i[3]),t.x+=Number(i[4]),t.y+=Number(i[5]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y);break;case"S":t.x1&&t.y1&&t.x2&&t.y2?(t.x1=t.x-t.x2+t.x,t.y1=t.y-t.y2+t.y,t.x2=Number(i[0]),t.y2=Number(i[1]),t.x=Number(i[2]),t.y=Number(i[3]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y)):(t.x1=Number(i[0]),t.y1=Number(i[1]),t.x=Number(i[2]),t.y=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y));break;case"s":t.x1&&t.y1&&t.x2&&t.y2?(t.x1=t.x-t.x2+t.x,t.y1=t.y-t.y2+t.y,t.x2=t.x+Number(i[0]),t.y2=t.y+Number(i[1]),t.x+=Number(i[2]),t.y+=Number(i[3]),e.bezierCurveTo(t.x1,t.y1,t.x2,t.y2,t.x,t.y)):(t.x1=t.x+Number(i[0]),t.y1=t.y+Number(i[1]),t.x+=Number(i[2]),t.y+=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y));break;case"Q":t.x1=Number(i[0]),t.y1=Number(i[1]),t.x=Number(i[2]),t.y=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y);break;case"q":t.x1=t.x+Number(i[0]),t.y1=t.y+Number(i[1]),t.x+=Number(i[2]),t.y+=Number(i[3]),e.quadraticCurveTo(t.x1,t.y1,t.x,t.y);break;case"A":case"a":break;case"Z":case"z":e.closePath()}}},{key:"drawEllipse",value:function(e,t){e.save(),this.resetShapeStyles(e,t),void 0!==t._transform&&null!==t._transform&&e.transform(t._transform.a,t._transform.b,t._transform.c,t._transform.d,t._transform.tx,t._transform.ty);var r=t._x-t._radiusX,i=t._y-t._radiusY,n=2*t._radiusX,o=2*t._radiusY,s=n/2*.5522848,a=o/2*.5522848,f=r+n,l=i+o,u=r+n/2,h=i+o/2;e.beginPath(),e.moveTo(r,h),e.bezierCurveTo(r,h-a,u-s,i,u,i),e.bezierCurveTo(u+s,i,f,h-a,f,h),e.bezierCurveTo(f,h+a,u+s,l,u,l),e.bezierCurveTo(u-s,l,r,h+a,r,h),t._styles&&t._styles.fill&&e.fill(),t._styles&&t._styles.stroke&&e.stroke(),e.restore()}},{key:"drawRect",value:function(e,t){e.save(),this.resetShapeStyles(e,t),void 0!==t._transform&&null!==t._transform&&e.transform(t._transform.a,t._transform.b,t._transform.c,t._transform.d,t._transform.tx,t._transform.ty);var r=t._x,i=t._y,n=t._width,o=t._height,s=t._cornerRadius;n<2*s&&(s=n/2),o<2*s&&(s=o/2),e.beginPath(),e.moveTo(r+s,i),e.arcTo(r+n,i,r+n,i+o,s),e.arcTo(r+n,i+o,r,i+o,s),e.arcTo(r,i+o,r,i,s),e.arcTo(r,i,r+n,i,s),e.closePath(),t._styles&&t._styles.fill&&e.fill(),t._styles&&t._styles.stroke&&e.stroke(),e.restore()}}]),e}()},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.AutoLoader=void 0;var i=r(13),n=r(63),o=t.AutoLoader=function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e)};o.sharedParser=new i.Parser,o.autoload=function(e,t){if("undefined"!=typeof window&&"undefined"!=typeof document){var r=t||o.sharedParser;if(e){if(("CANVAS"===e.tagName||"DIV"===e.tagName)&&e.attributes.src&&e.attributes.src.value.indexOf(".svga")===e.attributes.src.value.length-5){var i=e.attributes.src.value,s=new n.Player(e);r.load(i,(function(t){if(e.attributes.loops){var r=parseFloat(e.attributes.loops.value)||0;s.loops=r}if(e.attributes.clearsAfterStop){var i=!("false"===e.attributes.clearsAfterStop.value);s.clearsAfterStop=i}s.setVideoItem(t),s.startAnimation()})),e.player=s}}else for(var a=document.querySelectorAll('[src$=".svga"]'),f=0;f<a.length;f++){e=a[f];o.autoload(e)}}}}])}));
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/index.d.ts b/uni_modules/c-svga/node_modules/svgaplayerweb/index.d.ts
new file mode 100644
index 0000000..5dbf96a
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/index.d.ts
@@ -0,0 +1,71 @@
+export as namespace SVGA;
+
+declare global {
+    const SVGA: {
+        VideoEntity: typeof VideoEntity,
+        Parser: typeof Parser,
+        Player: typeof Player,
+        CreatejsPlayer: typeof CreatejsPlayer,
+        LayaboxPlayer: typeof LayaboxPlayer,
+    }
+}
+
+export class VideoEntity {
+    videoSize: { width: number, height: number }
+    FPS: number
+    frames: number
+}
+
+export class Parser {
+    load(url: string, success: (videoItem: VideoEntity) => void, failure?: (err: Error) => void): void
+}
+
+export class Player {
+
+    loops: number;
+    clearsAfterStop: boolean;
+    fillMode: "Forward" | "Backward"
+
+    constructor(canvas: string | HTMLCanvasElement | HTMLDivElement)
+    setVideoItem(videoItem: VideoEntity): void
+    setContentMode(contentMode: "Fill" | "AspectFill" | "AspectFit"): void
+    setClipsToBounds(clipsToBounds: boolean): void
+    startAnimation(reverse?: boolean): void
+    startAnimationWithRange(range: {location: number, length: number}, reverse?: boolean): void
+    pauseAnimation(): void
+    stopAnimation(clear?: boolean): void
+    clear(): void
+    stepToFrame(frame: number, andPlay?: boolean): void
+    stepToPercentage(percentage: number, andPlay?: boolean): void
+    setImage(urlORbase64: string, forKey: string, transform?: number[]): void
+    setText(textORMap: string | {
+        text: string,
+        size?: string,
+        family?: string,
+        color?: string,
+        offset?: { x: number, y: number }
+    }, forKey: string): void
+    clearDynamicObjects(): void
+    onFinished(callback: () => void): void
+    onFrame(callback: (frame: number) => void): void
+    onPercentage(callback: (percentage: number) => void): void
+    drawOnContext(ctx: CanvasRenderingContext2D, x: number, y: number, width?: number, height?: number): void
+
+}
+
+export class CreatejsPlayer extends Player {
+
+    constructor(url: string, autoplay?: boolean)
+    onError(callback: (error: Error) => void): void
+    setFrame(x: number, y: number, width: number, height: number): void
+
+}
+
+export class LayaboxPlayer extends Player {
+
+    constructor(url?: string, autoplay?: boolean)
+    setVideoUrl(url?: string, autoplay?: boolean, success?: (videoItem: VideoEntity) => void, failure?: (error: Error) => void): void;
+    onError(callback: (error: Error) => void): void
+    setFrame(x: number, y: number, width: number, height: number): void
+
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/package.json b/uni_modules/c-svga/node_modules/svgaplayerweb/package.json
new file mode 100644
index 0000000..962642a
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/package.json
@@ -0,0 +1,61 @@
+{
+  "_from": "svgaplayerweb@^2.3.2",
+  "_id": "svgaplayerweb@2.3.2",
+  "_inBundle": false,
+  "_integrity": "sha512-QuTvNIgy3W6Mi4h74SczEHUtAwb8m3ax7Ai7xRLUuN6hjJh49RGtWOWq1IuF2I7ECcl0HAYn8FcTn99UDz9UiQ==",
+  "_location": "/svgaplayerweb",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "svgaplayerweb@^2.3.2",
+    "name": "svgaplayerweb",
+    "escapedName": "svgaplayerweb",
+    "rawSpec": "^2.3.2",
+    "saveSpec": null,
+    "fetchSpec": "^2.3.2"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmmirror.com/svgaplayerweb/-/svgaplayerweb-2.3.2.tgz",
+  "_shasum": "15595b8dcc20cf4de4adc3103970b7cf5ae19a84",
+  "_spec": "svgaplayerweb@^2.3.2",
+  "_where": "C:\\Users\\pc\\Documents\\HBuilderProjects\\Sapp\\uni_modules\\c-svga",
+  "author": {
+    "name": "YYUED"
+  },
+  "bugs": {
+    "url": "https://github.com/yyued/SVGAPlayer-Web/issues"
+  },
+  "bundleDependencies": false,
+  "dependencies": {},
+  "deprecated": false,
+  "description": "Language: [中文](README.zh.md)",
+  "devDependencies": {
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.1.2",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-stage-0": "^6.24.1",
+    "http-server": "^0.10.0",
+    "pako": "^1.0.6",
+    "protobufjs": "^6.8.0",
+    "uglify-js": "^3.1.2",
+    "value-animator": "git+https://github.com/yyued/value-animator.git",
+    "webpack": "^3.6.0"
+  },
+  "homepage": "https://github.com/yyued/SVGAPlayer-Web#readme",
+  "license": "Apache License 2.0",
+  "main": "./build/svga.min.js",
+  "name": "svgaplayerweb",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/yyued/SVGAPlayer-Web.git"
+  },
+  "scripts": {
+    "build": "webpack",
+    "start": "http-server ./ & webpack -w & open http://127.0.0.1:8080/tests/"
+  },
+  "types": "index.d.ts",
+  "version": "2.3.2"
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/patch/layabox/laya.webgl.js b/uni_modules/c-svga/node_modules/svgaplayerweb/patch/layabox/laya.webgl.js
new file mode 100644
index 0000000..c15d374
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/patch/layabox/laya.webgl.js
@@ -0,0 +1,9018 @@
+var Bezier = function (t) { function n(i) { if (r[i]) return r[i].exports; var e = r[i] = { exports: {}, id: i, loaded: !1 }; return t[i].call(e.exports, e, e.exports, n), e.loaded = !0, e.exports } var r = {}; return n.m = t, n.c = r, n.p = "", n(0) }([function (t, n, r) { "use strict"; t.exports = r(1) }, function (t, n, r) { "use strict"; var i = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (t) { return typeof t } : function (t) { return t && "function" == typeof Symbol && t.constructor === Symbol ? "symbol" : typeof t }; !function () { function n(t, n, r, i, e) { "undefined" == typeof e && (e = .5); var o = y.projectionratio(e, t), s = 1 - o, u = { x: o * n.x + s * i.x, y: o * n.y + s * i.y }, a = y.abcratio(e, t), f = { x: r.x + (r.x - u.x) / a, y: r.y + (r.y - u.y) / a }; return { A: f, B: r, C: u } } var e = Math.abs, o = Math.min, s = Math.max, u = Math.cos, a = Math.sin, f = Math.acos, c = Math.sqrt, h = Math.PI, x = { x: 0, y: 0, z: 0 }, y = r(2), p = r(3), l = function (t) { var n = t && t.forEach ? t : [].slice.call(arguments), r = !1; if ("object" === i(n[0])) { r = n.length; var o = []; n.forEach(function (t) { ["x", "y", "z"].forEach(function (n) { "undefined" != typeof t[n] && o.push(t[n]) }) }), n = o } var s = !1, u = n.length; if (r) { if (r > 4) { if (1 !== arguments.length) throw new Error("Only new Bezier(point[]) is accepted for 4th and higher order curves"); s = !0 } } else if (6 !== u && 8 !== u && 9 !== u && 12 !== u && 1 !== arguments.length) throw new Error("Only new Bezier(point[]) is accepted for 4th and higher order curves"); var a = !s && (9 === u || 12 === u) || t && t[0] && "undefined" != typeof t[0].z; this._3d = a; for (var f = [], c = 0, h = a ? 3 : 2; u > c; c += h) { var x = { x: n[c], y: n[c + 1] }; a && (x.z = n[c + 2]), f.push(x) } this.order = f.length - 1, this.points = f; var p = ["x", "y"]; a && p.push("z"), this.dims = p, this.dimlen = p.length, function (t) { for (var n = t.order, r = t.points, i = y.align(r, { p1: r[0], p2: r[n] }), o = 0; o < i.length; o++)if (e(i[o].y) > 1e-4) return void (t._linear = !1); t._linear = !0 }(this), this._t1 = 0, this._t2 = 1, this.update() }; l.fromSVG = function (t) { var n = t.match(/[-+]?\d*\.?\d+(?:[eE][-+]?\d+)?/g).map(parseFloat), r = /[cq]/.test(t); return r ? (n = n.map(function (t, r) { return 2 > r ? t : t + n[r % 2] }), new l(n)) : new l(n) }, l.quadraticFromPoints = function (t, r, i, e) { if ("undefined" == typeof e && (e = .5), 0 === e) return new l(r, r, i); if (1 === e) return new l(t, r, r); var o = n(2, t, r, i, e); return new l(t, o.A, i) }, l.cubicFromPoints = function (t, r, i, e, o) { "undefined" == typeof e && (e = .5); var s = n(3, t, r, i, e); "undefined" == typeof o && (o = y.dist(r, s.C)); var u = o * (1 - e) / e, a = y.dist(t, i), f = (i.x - t.x) / a, c = (i.y - t.y) / a, h = o * f, x = o * c, p = u * f, v = u * c, d = { x: r.x - h, y: r.y - x }, m = { x: r.x + p, y: r.y + v }, g = s.A, z = { x: g.x + (d.x - g.x) / (1 - e), y: g.y + (d.y - g.y) / (1 - e) }, b = { x: g.x + (m.x - g.x) / e, y: g.y + (m.y - g.y) / e }, _ = { x: t.x + (z.x - t.x) / e, y: t.y + (z.y - t.y) / e }, w = { x: i.x + (b.x - i.x) / (1 - e), y: i.y + (b.y - i.y) / (1 - e) }; return new l(t, _, w, i) }; var v = function () { return y }; l.getUtils = v, l.prototype = { getUtils: v, valueOf: function () { return this.toString() }, toString: function () { return y.pointsToString(this.points) }, toSVG: function (t) { if (this._3d) return !1; for (var n = this.points, r = n[0].x, i = n[0].y, e = ["M", r, i, 2 === this.order ? "Q" : "C"], o = 1, s = n.length; s > o; o++)e.push(n[o].x), e.push(n[o].y); return e.join(" ") }, update: function () { this.dpoints = []; for (var t = this.points, n = t.length, r = n - 1; n > 1; n-- , r--) { for (var i, e = [], o = 0; r > o; o++)i = { x: r * (t[o + 1].x - t[o].x), y: r * (t[o + 1].y - t[o].y) }, this._3d && (i.z = r * (t[o + 1].z - t[o].z)), e.push(i); this.dpoints.push(e), t = e } this.computedirection() }, computedirection: function () { var t = this.points, n = y.angle(t[0], t[this.order], t[1]); this.clockwise = n > 0 }, length: function () { return y.length(this.derivative.bind(this)) }, _lut: [], getLUT: function (t) { if (t = t || 100, this._lut.length === t) return this._lut; this._lut = []; for (var n = 0; t >= n; n++)this._lut.push(this.compute(n / t)); return this._lut }, on: function (t, n) { n = n || 5; for (var r, i = this.getLUT(), e = [], o = 0, s = 0; s < i.length; s++)r = i[s], y.dist(r, t) < n && (e.push(r), o += s / i.length); return e.length ? o /= e.length : !1 }, project: function (t) { var n = this.getLUT(), r = n.length - 1, i = y.closest(n, t), e = i.mdist, o = i.mpos; if (0 === o || o === r) { var s = o / r, u = this.compute(s); return u.t = s, u.d = e, u } var a, s, f, c, h = (o - 1) / r, x = (o + 1) / r, p = .1 / r; for (e += 1, s = h, a = s; x + p > s; s += p)f = this.compute(s), c = y.dist(t, f), e > c && (e = c, a = s); return f = this.compute(a), f.t = a, f.d = e, f }, get: function (t) { return this.compute(t) }, point: function (t) { return this.points[t] }, compute: function (t) { if (0 === t) return this.points[0]; if (1 === t) return this.points[this.order]; var n = this.points, r = 1 - t; if (1 === this.order) return f = { x: r * n[0].x + t * n[1].x, y: r * n[0].y + t * n[1].y }, this._3d && (f.z = r * n[0].z + t * n[1].z), f; if (this.order < 4) { var i, e, o, s = r * r, u = t * t, a = 0; 2 === this.order ? (n = [n[0], n[1], n[2], x], i = s, e = r * t * 2, o = u) : 3 === this.order && (i = s * r, e = s * t * 3, o = r * u * 3, a = t * u); var f = { x: i * n[0].x + e * n[1].x + o * n[2].x + a * n[3].x, y: i * n[0].y + e * n[1].y + o * n[2].y + a * n[3].y }; return this._3d && (f.z = i * n[0].z + e * n[1].z + o * n[2].z + a * n[3].z), f } for (var c = JSON.parse(JSON.stringify(this.points)); c.length > 1;) { for (var h = 0; h < c.length - 1; h++)c[h] = { x: c[h].x + (c[h + 1].x - c[h].x) * t, y: c[h].y + (c[h + 1].y - c[h].y) * t }, "undefined" != typeof c[h].z && (c[h] = c[h].z + (c[h + 1].z - c[h].z) * t); c.splice(c.length - 1, 1) } return c[0] }, raise: function () { for (var t, n, r, i = this.points, e = [i[0]], o = i.length, t = 1; o > t; t++)n = i[t], r = i[t - 1], e[t] = { x: (o - t) / o * n.x + t / o * r.x, y: (o - t) / o * n.y + t / o * r.y }; return e[o] = i[o - 1], new l(e) }, derivative: function (t) { var n, r, i = 1 - t, e = 0, o = this.dpoints[0]; 2 === this.order && (o = [o[0], o[1], x], n = i, r = t), 3 === this.order && (n = i * i, r = i * t * 2, e = t * t); var s = { x: n * o[0].x + r * o[1].x + e * o[2].x, y: n * o[0].y + r * o[1].y + e * o[2].y }; return this._3d && (s.z = n * o[0].z + r * o[1].z + e * o[2].z), s }, inflections: function () { return y.inflections(this.points) }, normal: function (t) { return this._3d ? this.__normal3(t) : this.__normal2(t) }, __normal2: function (t) { var n = this.derivative(t), r = c(n.x * n.x + n.y * n.y); return { x: -n.y / r, y: n.x / r } }, __normal3: function (t) { var n = this.derivative(t), r = this.derivative(t + .01), i = c(n.x * n.x + n.y * n.y + n.z * n.z), e = c(r.x * r.x + r.y * r.y + r.z * r.z); n.x /= i, n.y /= i, n.z /= i, r.x /= e, r.y /= e, r.z /= e; var o = { x: r.y * n.z - r.z * n.y, y: r.z * n.x - r.x * n.z, z: r.x * n.y - r.y * n.x }, s = c(o.x * o.x + o.y * o.y + o.z * o.z); o.x /= s, o.y /= s, o.z /= s; var u = [o.x * o.x, o.x * o.y - o.z, o.x * o.z + o.y, o.x * o.y + o.z, o.y * o.y, o.y * o.z - o.x, o.x * o.z - o.y, o.y * o.z + o.x, o.z * o.z], a = { x: u[0] * n.x + u[1] * n.y + u[2] * n.z, y: u[3] * n.x + u[4] * n.y + u[5] * n.z, z: u[6] * n.x + u[7] * n.y + u[8] * n.z }; return a }, hull: function (t) { var n, r = this.points, i = [], e = [], o = 0, s = 0, u = 0; for (e[o++] = r[0], e[o++] = r[1], e[o++] = r[2], 3 === this.order && (e[o++] = r[3]); r.length > 1;) { for (i = [], s = 0, u = r.length - 1; u > s; s++)n = y.lerp(t, r[s], r[s + 1]), e[o++] = n, i.push(n); r = i } return e }, split: function (t, n) { if (0 === t && n) return this.split(n).left; if (1 === n) return this.split(t).right; var r = this.hull(t), i = { left: new l(2 === this.order ? [r[0], r[3], r[5]] : [r[0], r[4], r[7], r[9]]), right: new l(2 === this.order ? [r[5], r[4], r[2]] : [r[9], r[8], r[6], r[3]]), span: r }; if (i.left._t1 = y.map(0, 0, 1, this._t1, this._t2), i.left._t2 = y.map(t, 0, 1, this._t1, this._t2), i.right._t1 = y.map(t, 0, 1, this._t1, this._t2), i.right._t2 = y.map(1, 0, 1, this._t1, this._t2), !n) return i; n = y.map(n, t, 1, 0, 1); var e = i.right.split(n); return e.left }, extrema: function () { var t, n, r = this.dims, i = {}, e = []; return r.forEach(function (r) { n = function (t) { return t[r] }, t = this.dpoints[0].map(n), i[r] = y.droots(t), 3 === this.order && (t = this.dpoints[1].map(n), i[r] = i[r].concat(y.droots(t))), i[r] = i[r].filter(function (t) { return t >= 0 && 1 >= t }), e = e.concat(i[r].sort()) }.bind(this)), e = e.sort().filter(function (t, n) { return e.indexOf(t) === n }), i.values = e, i }, bbox: function () { var t = this.extrema(), n = {}; return this.dims.forEach(function (r) { n[r] = y.getminmax(this, r, t[r]) }.bind(this)), n }, overlaps: function (t) { var n = this.bbox(), r = t.bbox(); return y.bboxoverlap(n, r) }, offset: function (t, n) { if ("undefined" != typeof n) { var r = this.get(t), i = this.normal(t), e = { c: r, n: i, x: r.x + i.x * n, y: r.y + i.y * n }; return this._3d && (e.z = r.z + i.z * n), e } if (this._linear) { var o = this.normal(0), s = this.points.map(function (n) { var r = { x: n.x + t * o.x, y: n.y + t * o.y }; return n.z && i.z && (r.z = n.z + t * o.z), r }); return [new l(s)] } var u = this.reduce(); return u.map(function (n) { return n.scale(t) }) }, simple: function () { if (3 === this.order) { var t = y.angle(this.points[0], this.points[3], this.points[1]), n = y.angle(this.points[0], this.points[3], this.points[2]); if (t > 0 && 0 > n || 0 > t && n > 0) return !1 } var r = this.normal(0), i = this.normal(1), o = r.x * i.x + r.y * i.y; this._3d && (o += r.z * i.z); var s = e(f(o)); return h / 3 > s }, reduce: function () { var t, n, r = 0, i = 0, o = .01, s = [], u = [], a = this.extrema().values; for (-1 === a.indexOf(0) && (a = [0].concat(a)), -1 === a.indexOf(1) && a.push(1), r = a[0], t = 1; t < a.length; t++)i = a[t], n = this.split(r, i), n._t1 = r, n._t2 = i, s.push(n), r = i; return s.forEach(function (t) { for (r = 0, i = 0; 1 >= i;)for (i = r + o; 1 + o >= i; i += o)if (n = t.split(r, i), !n.simple()) { if (i -= o, e(r - i) < o) return []; n = t.split(r, i), n._t1 = y.map(r, 0, 1, t._t1, t._t2), n._t2 = y.map(i, 0, 1, t._t1, t._t2), u.push(n), r = i; break } 1 > r && (n = t.split(r, 1), n._t1 = y.map(r, 0, 1, t._t1, t._t2), n._t2 = t._t2, u.push(n)) }), u }, scale: function (t) { var n = this.order, r = !1; if ("function" == typeof t && (r = t), r && 2 === n) return this.raise().scale(r); var i = this.clockwise, e = r ? r(0) : t, o = r ? r(1) : t, s = [this.offset(0, 10), this.offset(1, 10)], u = y.lli4(s[0], s[0].c, s[1], s[1].c); if (!u) throw new Error("cannot scale this curve. Try reducing it first."); var a = this.points, f = []; return [0, 1].forEach(function (t) { var r = f[t * n] = y.copy(a[t * n]); r.x += (t ? o : e) * s[t].n.x, r.y += (t ? o : e) * s[t].n.y }.bind(this)), r ? ([0, 1].forEach(function (e) { if (2 !== this.order || !e) { var o = a[e + 1], s = { x: o.x - u.x, y: o.y - u.y }, h = r ? r((e + 1) / n) : t; r && !i && (h = -h); var x = c(s.x * s.x + s.y * s.y); s.x /= x, s.y /= x, f[e + 1] = { x: o.x + h * s.x, y: o.y + h * s.y } } }.bind(this)), new l(f)) : ([0, 1].forEach(function (t) { if (2 !== this.order || !t) { var r = f[t * n], i = this.derivative(t), e = { x: r.x + i.x, y: r.y + i.y }; f[t + 1] = y.lli4(r, e, u, a[t + 1]) } }.bind(this)), new l(f)) }, outline: function (t, n, r, i) { function e(t, n, r, i, e) { return function (o) { var s = i / r, u = (i + e) / r, a = n - t; return y.map(o, 0, 1, t + s * a, t + u * a) } } n = "undefined" == typeof n ? t : n; var o, s = this.reduce(), u = s.length, a = [], f = [], c = 0, h = this.length(), x = "undefined" != typeof r && "undefined" != typeof i; s.forEach(function (o) { _ = o.length(), x ? (a.push(o.scale(e(t, r, h, c, _))), f.push(o.scale(e(-n, -i, h, c, _)))) : (a.push(o.scale(t)), f.push(o.scale(-n))), c += _ }), f = f.map(function (t) { return o = t.points, o[3] ? t.points = [o[3], o[2], o[1], o[0]] : t.points = [o[2], o[1], o[0]], t }).reverse(); var l = a[0].points[0], v = a[u - 1].points[a[u - 1].points.length - 1], d = f[u - 1].points[f[u - 1].points.length - 1], m = f[0].points[0], g = y.makeline(d, l), z = y.makeline(v, m), b = [g].concat(a).concat([z]).concat(f), _ = b.length; return new p(b) }, outlineshapes: function (t, n, r) { n = n || t; for (var i = this.outline(t, n).curves, e = [], o = 1, s = i.length; s / 2 > o; o++) { var u = y.makeshape(i[o], i[s - o], r); u.startcap.virtual = o > 1, u.endcap.virtual = s / 2 - 1 > o, e.push(u) } return e }, intersects: function (t, n) { return t ? t.p1 && t.p2 ? this.lineIntersects(t) : (t instanceof l && (t = t.reduce()), this.curveintersects(this.reduce(), t, n)) : this.selfintersects(n) }, lineIntersects: function (t) { var n = o(t.p1.x, t.p2.x), r = o(t.p1.y, t.p2.y), i = s(t.p1.x, t.p2.x), e = s(t.p1.y, t.p2.y), u = this; return y.roots(this.points, t).filter(function (t) { var o = u.get(t); return y.between(o.x, n, i) && y.between(o.y, r, e) }) }, selfintersects: function (t) { var n, r, i, e, o = this.reduce(), s = o.length - 2, u = []; for (n = 0; s > n; n++)i = o.slice(n, n + 1), e = o.slice(n + 2), r = this.curveintersects(i, e, t), u = u.concat(r); return u }, curveintersects: function (t, n, r) { var i = []; t.forEach(function (t) { n.forEach(function (n) { t.overlaps(n) && i.push({ left: t, right: n }) }) }); var e = []; return i.forEach(function (t) { var n = y.pairiteration(t.left, t.right, r); n.length > 0 && (e = e.concat(n)) }), e }, arcs: function (t) { t = t || .5; var n = []; return this._iterate(t, n) }, _error: function (t, n, r, i) { var o = (i - r) / 4, s = this.get(r + o), u = this.get(i - o), a = y.dist(t, n), f = y.dist(t, s), c = y.dist(t, u); return e(f - a) + e(c - a) }, _iterate: function (t, n) { var r, i = 0, e = 1; do { r = 0, e = 1; var o, s, f, c, h, x = this.get(i), p = !1, l = !1, v = e, d = 1, m = 0; do { l = p, c = f, v = (i + e) / 2, m++ , o = this.get(v), s = this.get(e), f = y.getccenter(x, o, s), f.interval = { start: i, end: e }; var g = this._error(f, x, i, e); if (p = t >= g, h = l && !p, h || (d = e), p) { if (e >= 1) { if (f.interval.end = d = 1, c = f, e > 1) { var z = { x: f.x + f.r * u(f.e), y: f.y + f.r * a(f.e) }; f.e += y.angle({ x: f.x, y: f.y }, z, this.get(1)) } break } e += (e - i) / 2 } else e = v } while (!h && r++ < 100); if (r >= 100) break; c = c ? c : f, n.push(c), i = d } while (1 > e); return n } }, t.exports = l }() }, function (t, n, r) { "use strict"; !function () { var n = Math.abs, i = Math.cos, e = Math.sin, o = Math.acos, s = Math.atan2, u = Math.sqrt, a = Math.pow, f = function (t) { return 0 > t ? -a(-t, 1 / 3) : a(t, 1 / 3) }, c = Math.PI, h = 2 * c, x = c / 2, y = 1e-6, p = Number.MAX_SAFE_INTEGER, l = Number.MIN_SAFE_INTEGER, v = { Tvalues: [-.06405689286260563, .06405689286260563, -.1911188674736163, .1911188674736163, -.3150426796961634, .3150426796961634, -.4337935076260451, .4337935076260451, -.5454214713888396, .5454214713888396, -.6480936519369755, .6480936519369755, -.7401241915785544, .7401241915785544, -.820001985973903, .820001985973903, -.8864155270044011, .8864155270044011, -.9382745520027328, .9382745520027328, -.9747285559713095, .9747285559713095, -.9951872199970213, .9951872199970213], Cvalues: [.12793819534675216, .12793819534675216, .1258374563468283, .1258374563468283, .12167047292780339, .12167047292780339, .1155056680537256, .1155056680537256, .10744427011596563, .10744427011596563, .09761865210411388, .09761865210411388, .08619016153195327, .08619016153195327, .0733464814110803, .0733464814110803, .05929858491543678, .05929858491543678, .04427743881741981, .04427743881741981, .028531388628933663, .028531388628933663, .0123412297999872, .0123412297999872], arcfn: function (t, n) { var r = n(t), i = r.x * r.x + r.y * r.y; return "undefined" != typeof r.z && (i += r.z * r.z), u(i) }, between: function (t, n, r) { return t >= n && r >= t || v.approximately(t, n) || v.approximately(t, r) }, approximately: function (t, r, i) { return n(t - r) <= (i || y) }, length: function (t) { var n, r, i = .5, e = 0, o = v.Tvalues.length; for (n = 0; o > n; n++)r = i * v.Tvalues[n] + i, e += v.Cvalues[n] * v.arcfn(r, t); return i * e }, map: function (t, n, r, i, e) { var o = r - n, s = e - i, u = t - n, a = u / o; return i + s * a }, lerp: function (t, n, r) { var i = { x: n.x + t * (r.x - n.x), y: n.y + t * (r.y - n.y) }; return n.z && r.z && (i.z = n.z + t * (r.z - n.z)), i }, pointToString: function (t) { var n = t.x + "/" + t.y; return "undefined" != typeof t.z && (n += "/" + t.z), n }, pointsToString: function (t) { return "[" + t.map(v.pointToString).join(", ") + "]" }, copy: function (t) { return JSON.parse(JSON.stringify(t)) }, angle: function (t, n, r) { var i = n.x - t.x, e = n.y - t.y, o = r.x - t.x, u = r.y - t.y, a = i * u - e * o, f = i * o + e * u; return s(a, f) }, round: function (t, n) { var r = "" + t, i = r.indexOf("."); return parseFloat(r.substring(0, i + 1 + n)) }, dist: function (t, n) { var r = t.x - n.x, i = t.y - n.y; return u(r * r + i * i) }, closest: function (t, n) { var r, i, e = a(2, 63); return t.forEach(function (t, o) { i = v.dist(n, t), e > i && (e = i, r = o) }), { mdist: e, mpos: r } }, abcratio: function (t, r) { if (2 !== r && 3 !== r) return !1; if ("undefined" == typeof t) t = .5; else if (0 === t || 1 === t) return t; var i = a(t, r) + a(1 - t, r), e = i - 1; return n(e / i) }, projectionratio: function (t, n) { if (2 !== n && 3 !== n) return !1; if ("undefined" == typeof t) t = .5; else if (0 === t || 1 === t) return t; var r = a(1 - t, n), i = a(t, n) + r; return r / i }, lli8: function (t, n, r, i, e, o, s, u) { var a = (t * i - n * r) * (e - s) - (t - r) * (e * u - o * s), f = (t * i - n * r) * (o - u) - (n - i) * (e * u - o * s), c = (t - r) * (o - u) - (n - i) * (e - s); return 0 == c ? !1 : { x: a / c, y: f / c } }, lli4: function (t, n, r, i) { var e = t.x, o = t.y, s = n.x, u = n.y, a = r.x, f = r.y, c = i.x, h = i.y; return v.lli8(e, o, s, u, a, f, c, h) }, lli: function (t, n) { return v.lli4(t, t.c, n, n.c) }, makeline: function (t, n) { var i = r(1), e = t.x, o = t.y, s = n.x, u = n.y, a = (s - e) / 3, f = (u - o) / 3; return new i(e, o, e + a, o + f, e + 2 * a, o + 2 * f, s, u) }, findbbox: function (t) { var n = p, r = p, i = l, e = l; return t.forEach(function (t) { var o = t.bbox(); n > o.x.min && (n = o.x.min), r > o.y.min && (r = o.y.min), i < o.x.max && (i = o.x.max), e < o.y.max && (e = o.y.max) }), { x: { min: n, mid: (n + i) / 2, max: i, size: i - n }, y: { min: r, mid: (r + e) / 2, max: e, size: e - r } } }, shapeintersections: function (t, n, r, i, e) { if (!v.bboxoverlap(n, i)) return []; var o = [], s = [t.startcap, t.forward, t.back, t.endcap], u = [r.startcap, r.forward, r.back, r.endcap]; return s.forEach(function (n) { n.virtual || u.forEach(function (i) { if (!i.virtual) { var s = n.intersects(i, e); s.length > 0 && (s.c1 = n, s.c2 = i, s.s1 = t, s.s2 = r, o.push(s)) } }) }), o }, makeshape: function (t, n, r) { var i = n.points.length, e = t.points.length, o = v.makeline(n.points[i - 1], t.points[0]), s = v.makeline(t.points[e - 1], n.points[0]), u = { startcap: o, forward: t, back: n, endcap: s, bbox: v.findbbox([o, t, n, s]) }, a = v; return u.intersections = function (t) { return a.shapeintersections(u, u.bbox, t, t.bbox, r) }, u }, getminmax: function (t, n, r) { if (!r) return { min: 0, max: 0 }; var i, e, o = p, s = l; -1 === r.indexOf(0) && (r = [0].concat(r)), -1 === r.indexOf(1) && r.push(1); for (var u = 0, a = r.length; a > u; u++)i = r[u], e = t.get(i), e[n] < o && (o = e[n]), e[n] > s && (s = e[n]); return { min: o, mid: (o + s) / 2, max: s, size: s - o } }, align: function (t, n) { var r = n.p1.x, o = n.p1.y, u = -s(n.p2.y - o, n.p2.x - r), a = function (t) { return { x: (t.x - r) * i(u) - (t.y - o) * e(u), y: (t.x - r) * e(u) + (t.y - o) * i(u) } }; return t.map(a) }, roots: function (t, n) { n = n || { p1: { x: 0, y: 0 }, p2: { x: 1, y: 0 } }; var r = t.length - 1, e = v.align(t, n), s = function (t) { return t >= 0 && 1 >= t }; if (2 === r) { var a = e[0].y, c = e[1].y, x = e[2].y, y = a - 2 * c + x; if (0 !== y) { var p = -u(c * c - a * x), l = -a + c, d = -(p + l) / y, m = -(-p + l) / y; return [d, m].filter(s) } return c !== x && 0 === y ? [(2 * c - x) / 2 * (c - x)].filter(s) : [] } var g, d, z, b, _, w = e[0].y, E = e[1].y, S = e[2].y, M = e[3].y, y = -w + 3 * E - 3 * S + M, a = (3 * w - 6 * E + 3 * S) / y, c = (-3 * w + 3 * E) / y, x = w / y, e = (3 * c - a * a) / 3, k = e / 3, O = (2 * a * a * a - 9 * a * c + 27 * x) / 27, T = O / 2, N = T * T + k * k * k; if (0 > N) { var j = -e / 3, I = j * j * j, A = u(I), C = -O / (2 * A), F = -1 > C ? -1 : C > 1 ? 1 : C, q = o(F), U = f(A), B = 2 * U; return z = B * i(q / 3) - a / 3, b = B * i((q + h) / 3) - a / 3, _ = B * i((q + 2 * h) / 3) - a / 3, [z, b, _].filter(s) } if (0 === N) return g = 0 > T ? f(-T) : -f(T), z = 2 * g - a / 3, b = -g - a / 3, [z, b].filter(s); var G = u(N); return g = f(-T + G), d = f(T + G), [g - d - a / 3].filter(s) }, droots: function (t) { if (3 === t.length) { var n = t[0], r = t[1], i = t[2], e = n - 2 * r + i; if (0 !== e) { var o = -u(r * r - n * i), s = -n + r, a = -(o + s) / e, f = -(-o + s) / e; return [a, f] } return r !== i && 0 === e ? [(2 * r - i) / (2 * (r - i))] : [] } if (2 === t.length) { var n = t[0], r = t[1]; return n !== r ? [n / (n - r)] : [] } }, inflections: function (t) { if (t.length < 4) return []; var n = v.align(t, { p1: t[0], p2: t.slice(-1)[0] }), r = n[2].x * n[1].y, i = n[3].x * n[1].y, e = n[1].x * n[2].y, o = n[3].x * n[2].y, s = 18 * (-3 * r + 2 * i + 3 * e - o), u = 18 * (3 * r - i - 3 * e), a = 18 * (e - r); if (v.approximately(s, 0)) { if (!v.approximately(u, 0)) { var f = -a / u; if (f >= 0 && 1 >= f) return [f] } return [] } var c = u * u - 4 * s * a, h = Math.sqrt(c), o = 2 * s; return v.approximately(o, 0) ? [] : [(h - u) / o, -(u + h) / o].filter(function (t) { return t >= 0 && 1 >= t }) }, bboxoverlap: function (t, r) { var i, e, o, s, u, a = ["x", "y"], f = a.length; for (i = 0; f > i; i++)if (e = a[i], o = t[e].mid, s = r[e].mid, u = (t[e].size + r[e].size) / 2, n(o - s) >= u) return !1; return !0 }, expandbox: function (t, n) { n.x.min < t.x.min && (t.x.min = n.x.min), n.y.min < t.y.min && (t.y.min = n.y.min), n.z && n.z.min < t.z.min && (t.z.min = n.z.min), n.x.max > t.x.max && (t.x.max = n.x.max), n.y.max > t.y.max && (t.y.max = n.y.max), n.z && n.z.max > t.z.max && (t.z.max = n.z.max), t.x.mid = (t.x.min + t.x.max) / 2, t.y.mid = (t.y.min + t.y.max) / 2, t.z && (t.z.mid = (t.z.min + t.z.max) / 2), t.x.size = t.x.max - t.x.min, t.y.size = t.y.max - t.y.min, t.z && (t.z.size = t.z.max - t.z.min) }, pairiteration: function (t, n, r) { var i = t.bbox(), e = n.bbox(), o = 1e5, s = r || .5; if (i.x.size + i.y.size < s && e.x.size + e.y.size < s) return [(o * (t._t1 + t._t2) / 2 | 0) / o + "/" + (o * (n._t1 + n._t2) / 2 | 0) / o]; var u = t.split(.5), a = n.split(.5), f = [{ left: u.left, right: a.left }, { left: u.left, right: a.right }, { left: u.right, right: a.right }, { left: u.right, right: a.left }]; f = f.filter(function (t) { return v.bboxoverlap(t.left.bbox(), t.right.bbox()) }); var c = []; return 0 === f.length ? c : (f.forEach(function (t) { c = c.concat(v.pairiteration(t.left, t.right, s)) }), c = c.filter(function (t, n) { return c.indexOf(t) === n })) }, getccenter: function (t, n, r) { var o, u = n.x - t.x, a = n.y - t.y, f = r.x - n.x, c = r.y - n.y, y = u * i(x) - a * e(x), p = u * e(x) + a * i(x), l = f * i(x) - c * e(x), d = f * e(x) + c * i(x), m = (t.x + n.x) / 2, g = (t.y + n.y) / 2, z = (n.x + r.x) / 2, b = (n.y + r.y) / 2, _ = m + y, w = g + p, E = z + l, S = b + d, M = v.lli8(m, g, _, w, z, b, E, S), k = v.dist(M, t), O = s(t.y - M.y, t.x - M.x), T = s(n.y - M.y, n.x - M.x), N = s(r.y - M.y, r.x - M.x); return N > O ? ((O > T || T > N) && (O += h), O > N && (o = N, N = O, O = o)) : T > N && O > T ? (o = N, N = O, O = o) : N += h, M.s = O, M.e = N, M.r = k, M } }; t.exports = v }() }, function (t, n, r) { "use strict"; !function () { var n = r(2), i = function (t) { this.curves = [], this._3d = !1, t && (this.curves = t, this._3d = this.curves[0]._3d) }; i.prototype = { valueOf: function () { return this.toString() }, toString: function () { return "[" + this.curves.map(function (t) { return n.pointsToString(t.points) }).join(", ") + "]" }, addCurve: function (t) { this.curves.push(t), this._3d = this._3d || t._3d }, length: function () { return this.curves.map(function (t) { return t.length() }).reduce(function (t, n) { return t + n }) }, curve: function (t) { return this.curves[t] }, bbox: function e() { for (var t = this.curves, e = t[0].bbox(), r = 1; r < t.length; r++)n.expandbox(e, t[r].bbox()); return e }, offset: function o(t) { var o = []; return this.curves.forEach(function (n) { o = o.concat(n.offset(t)) }), new i(o) } }, t.exports = i }() }]);
+
+(function (window, document, Laya) {
+	var __un = Laya.un, __uns = Laya.uns, __static = Laya.static, __class = Laya.class, __getset = Laya.getset, __newvec = Laya.__newvec;
+
+	var Arith = laya.maths.Arith, Bezier = laya.maths.Bezier, Bitmap = laya.resource.Bitmap, Browser = laya.utils.Browser;
+	var Byte = laya.utils.Byte, Color = laya.utils.Color, ColorFilter = laya.filters.ColorFilter, Config = Laya.Config, Context = laya.resource.Context;
+	var Event = laya.events.Event, Filter = laya.filters.Filter, Graphics = laya.display.Graphics, HTMLCanvas = laya.resource.HTMLCanvas;
+	var HTMLChar = laya.utils.HTMLChar, HTMLImage = laya.resource.HTMLImage, HTMLSubImage = laya.resource.HTMLSubImage;
+	var Handler = laya.utils.Handler, Loader = laya.net.Loader, Matrix = laya.maths.Matrix, Point = laya.maths.Point, Rectangle = laya.maths.Rectangle;
+	var Render = laya.renders.Render, RenderContext = laya.renders.RenderContext, RenderSprite = laya.renders.RenderSprite;
+	var Resource = laya.resource.Resource, ResourceManager = laya.resource.ResourceManager, RunDriver = laya.utils.RunDriver;
+	var Sprite = laya.display.Sprite, Stage = laya.display.Stage, Stat = laya.utils.Stat, StringKey = laya.utils.StringKey;
+	var Style = laya.display.css.Style, System = laya.system.System, Text = laya.display.Text, Texture = laya.resource.Texture;
+	var TransformInfo = laya.display.css.TransformInfo, URL = laya.net.URL, Utils = laya.utils.Utils, VectorGraphManager = laya.utils.VectorGraphManager;
+	var WordText = laya.utils.WordText;
+	Laya.interface('laya.webgl.shapes.IShape');
+	Laya.interface('laya.webgl.submit.ISubmit');
+	Laya.interface('laya.webgl.text.ICharSegment');
+	Laya.interface('laya.webgl.canvas.save.ISaveData');
+	Laya.interface('laya.webgl.resource.IMergeAtlasBitmap');
+	Laya.interface('laya.filters.IFilterActionGL', 'laya.filters.IFilterAction');
+	//class laya.webgl.canvas.save.SaveBase
+	var SaveBase = (function () {
+		function SaveBase() {
+			//this._valueName=null;
+			//this._value=null;
+			//this._dataObj=null;
+			//this._newSubmit=false;
+		}
+
+		__class(SaveBase, 'laya.webgl.canvas.save.SaveBase');
+		var __proto = SaveBase.prototype;
+		Laya.imps(__proto, { "laya.webgl.canvas.save.ISaveData": true })
+		__proto.isSaveMark = function () { return false; }
+		__proto.restore = function (context) {
+			this._dataObj[this._valueName] = this._value;
+			SaveBase._cache[SaveBase._cache._length++] = this;
+			this._newSubmit && (context._curSubmit = Submit.RENDERBASE, context._renderKey = 0);
+		}
+
+		SaveBase._createArray = function () {
+			var value = [];
+			value._length = 0;
+			return value;
+		}
+
+		SaveBase._init = function () {
+			var namemap = SaveBase._namemap = {};
+			namemap[0x1] = "ALPHA";
+			namemap[0x2] = "fillStyle";
+			namemap[0x8] = "font";
+			namemap[0x100] = "lineWidth";
+			namemap[0x200] = "strokeStyle";
+			namemap[0x2000] = "_mergeID";
+			namemap[0x400] = namemap[0x800] = namemap[0x1000] = [];
+			namemap[0x4000] = "textBaseline";
+			namemap[0x8000] = "textAlign";
+			namemap[0x10000] = "_nBlendType";
+			namemap[0x100000] = "shader";
+			namemap[0x200000] = "filters";
+			return namemap;
+		}
+
+		SaveBase.save = function (context, type, dataObj, newSubmit) {
+			if ((context._saveMark._saveuse & type) !== type) {
+				context._saveMark._saveuse |= type;
+				var cache = SaveBase._cache;
+				var o = cache._length > 0 ? cache[--cache._length] : (new SaveBase());
+				o._value = dataObj[o._valueName = SaveBase._namemap[type]];
+				o._dataObj = dataObj;
+				o._newSubmit = newSubmit;
+				var _save = context._save;
+				_save[_save._length++] = o;
+			}
+		}
+
+		__static(SaveBase,
+			['_cache', function () { return this._cache = laya.webgl.canvas.save.SaveBase._createArray(); }, '_namemap', function () { return this._namemap = SaveBase._init(); }
+			]);
+		return SaveBase;
+	})()
+
+
+	//class laya.filters.webgl.FilterActionGL
+	var FilterActionGL = (function () {
+		function FilterActionGL() { }
+		__class(FilterActionGL, 'laya.filters.webgl.FilterActionGL');
+		var __proto = FilterActionGL.prototype;
+		Laya.imps(__proto, { "laya.filters.IFilterActionGL": true })
+		__proto.setValue = function (shader) { }
+		__proto.setValueMix = function (shader) { }
+		__proto.apply3d = function (scope, sprite, context, x, y) { return null; }
+		__proto.apply = function (srcCanvas) { return null; }
+		__getset(0, __proto, 'typeMix', function () {
+			return 0;
+		});
+
+		return FilterActionGL;
+	})()
+
+
+	//class laya.webgl.shader.ShaderValue
+	var ShaderValue = (function () {
+		function ShaderValue() { }
+		__class(ShaderValue, 'laya.webgl.shader.ShaderValue');
+		return ShaderValue;
+	})()
+
+
+	//class laya.webgl.atlas.AtlasGrid
+	var AtlasGrid = (function () {
+		var TexRowInfo, TexMergeTexSize;
+		function AtlasGrid(width, height, atlasID) {
+			this._atlasID = 0;
+			this._width = 0;
+			this._height = 0;
+			this._texCount = 0;
+			this._rowInfo = null;
+			this._cells = null;
+			this._failSize = new TexMergeTexSize();
+			(width === void 0) && (width = 0);
+			(height === void 0) && (height = 0);
+			(atlasID === void 0) && (atlasID = 0);
+			this._cells = null;
+			this._rowInfo = null;
+			this._init(width, height);
+			this._atlasID = atlasID;
+		}
+
+		__class(AtlasGrid, 'laya.webgl.atlas.AtlasGrid');
+		var __proto = AtlasGrid.prototype;
+		//------------------------------------------------------------------------------
+		__proto.getAltasID = function () {
+			return this._atlasID;
+		}
+
+		//------------------------------------------------------------------------------
+		__proto.setAltasID = function (atlasID) {
+			if (atlasID >= 0) {
+				this._atlasID = atlasID;
+			}
+		}
+
+		//------------------------------------------------------------------
+		__proto.addTex = function (type, width, height) {
+			var result = this._get(width, height);
+			if (result.ret == false) {
+				return result;
+			}
+			this._fill(result.x, result.y, width, height, type);
+			this._texCount++;
+			return result;
+		}
+
+		//------------------------------------------------------------------------------
+		__proto._release = function () {
+			if (this._cells != null) {
+				this._cells.length = 0;
+				this._cells = null;
+			}
+			if (this._rowInfo) {
+				this._rowInfo.length = 0;
+				this._rowInfo = null;
+			}
+		}
+
+		//------------------------------------------------------------------------------
+		__proto._init = function (width, height) {
+			this._width = width;
+			this._height = height;
+			this._release();
+			if (this._width == 0) return false;
+			this._cells = new Uint8Array(this._width * this._height * 3);
+			this._rowInfo = __newvec(this._height);
+			for (var i = 0; i < this._height; i++) {
+				this._rowInfo[i] = new TexRowInfo();
+			}
+			this._clear();
+			return true;
+		}
+
+		//------------------------------------------------------------------
+		__proto._get = function (width, height) {
+			var pFillInfo = new MergeFillInfo();
+			if (width >= this._failSize.width && height >= this._failSize.height) {
+				return pFillInfo;
+			};
+			var rx = -1;
+			var ry = -1;
+			var nWidth = this._width;
+			var nHeight = this._height;
+			var pCellBox = this._cells;
+			for (var y = 0; y < nHeight; y++) {
+				if (this._rowInfo[y].spaceCount < width) continue;
+				for (var x = 0; x < nWidth;) {
+					var tm = (y * nWidth + x) * 3;
+					if (pCellBox[tm] != 0 || pCellBox[tm + 1] < width || pCellBox[tm + 2] < height) {
+						x += pCellBox[tm + 1];
+						continue;
+					}
+					rx = x;
+					ry = y;
+					for (var xx = 0; xx < width; xx++) {
+						if (pCellBox[3 * xx + tm + 2] < height) {
+							rx = -1;
+							break;
+						}
+					}
+					if (rx < 0) {
+						x += pCellBox[tm + 1];
+						continue;
+					}
+					pFillInfo.ret = true;
+					pFillInfo.x = rx;
+					pFillInfo.y = ry;
+					return pFillInfo;
+				}
+			}
+			return pFillInfo;
+		}
+
+		//------------------------------------------------------------------
+		__proto._fill = function (x, y, w, h, type) {
+			var nWidth = this._width;
+			var nHeghit = this._height;
+			this._check((x + w) <= nWidth && (y + h) <= nHeghit);
+			for (var yy = y; yy < (h + y); ++yy) {
+				this._check(this._rowInfo[yy].spaceCount >= w);
+				this._rowInfo[yy].spaceCount -= w;
+				for (var xx = 0; xx < w; xx++) {
+					var tm = (x + yy * nWidth + xx) * 3;
+					this._check(this._cells[tm] == 0);
+					this._cells[tm] = type;
+					this._cells[tm + 1] = w;
+					this._cells[tm + 2] = h;
+				}
+			}
+			if (x > 0) {
+				for (yy = 0; yy < h; ++yy) {
+					var s = 0;
+					for (xx = x - 1; xx >= 0; --xx, ++s) {
+						if (this._cells[((y + yy) * nWidth + xx) * 3] != 0) break;
+					}
+					for (xx = s; xx > 0; --xx) {
+						this._cells[((y + yy) * nWidth + x - xx) * 3 + 1] = xx;
+						this._check(xx > 0);
+					}
+				}
+			}
+			if (y > 0) {
+				for (xx = x; xx < (x + w); ++xx) {
+					s = 0;
+					for (yy = y - 1; yy >= 0; --yy, s++) {
+						if (this._cells[(xx + yy * nWidth) * 3] != 0) break;
+					}
+					for (yy = s; yy > 0; --yy) {
+						this._cells[(xx + (y - yy) * nWidth) * 3 + 2] = yy;
+						this._check(yy > 0);
+					}
+				}
+			}
+		}
+
+		__proto._check = function (ret) {
+			if (ret == false) {
+				console.log("xtexMerger 错误啦");
+			}
+		}
+
+		//------------------------------------------------------------------
+		__proto._clear = function () {
+			this._texCount = 0;
+			for (var y = 0; y < this._height; y++) {
+				this._rowInfo[y].spaceCount = this._width;
+			}
+			for (var i = 0; i < this._height; i++) {
+				for (var j = 0; j < this._width; j++) {
+					var tm = (i * this._width + j) * 3;
+					this._cells[tm] = 0;
+					this._cells[tm + 1] = this._width - j;
+					this._cells[tm + 2] = this._width - i;
+				}
+			}
+			this._failSize.width = this._width + 1;
+			this._failSize.height = this._height + 1;
+		}
+
+		AtlasGrid.__init$ = function () {
+			//------------------------------------------------------------------------------
+			//class TexRowInfo
+			TexRowInfo = (function () {
+				function TexRowInfo() {
+					this.spaceCount = 0;
+				}
+				__class(TexRowInfo, '');
+				return TexRowInfo;
+			})()
+			//------------------------------------------------------------------------------
+			//class TexMergeTexSize
+			TexMergeTexSize = (function () {
+				function TexMergeTexSize() {
+					this.width = 0;
+					this.height = 0;
+				}
+				__class(TexMergeTexSize, '');
+				return TexMergeTexSize;
+			})()
+		}
+
+		return AtlasGrid;
+	})()
+
+
+	//class laya.webgl.atlas.AtlasResourceManager
+	var AtlasResourceManager = (function () {
+		function AtlasResourceManager(width, height, gridSize, maxTexNum) {
+			this._currentAtlasCount = 0;
+			this._maxAtlaserCount = 0;
+			this._width = 0;
+			this._height = 0;
+			this._gridSize = 0;
+			this._gridNumX = 0;
+			this._gridNumY = 0;
+			this._init = false;
+			this._curAtlasIndex = 0;
+			this._setAtlasParam = false;
+			this._atlaserArray = null;
+			this._needGC = false;
+			this._setAtlasParam = true;
+			this._width = width;
+			this._height = height;
+			this._gridSize = gridSize;
+			this._maxAtlaserCount = maxTexNum;
+			this._gridNumX = width / gridSize;
+			this._gridNumY = height / gridSize;
+			this._curAtlasIndex = 0;
+			this._atlaserArray = [];
+		}
+
+		__class(AtlasResourceManager, 'laya.webgl.atlas.AtlasResourceManager');
+		var __proto = AtlasResourceManager.prototype;
+		__proto.setAtlasParam = function (width, height, gridSize, maxTexNum) {
+			if (this._setAtlasParam == true) {
+				AtlasResourceManager._sid_ = 0;
+				this._width = width;
+				this._height = height;
+				this._gridSize = gridSize;
+				this._maxAtlaserCount = maxTexNum;
+				this._gridNumX = width / gridSize;
+				this._gridNumY = height / gridSize;
+				this._curAtlasIndex = 0;
+				this.freeAll();
+				return true;
+			} else {
+				console.log("设置大图合集参数错误，只能在开始页面设置各种参数");
+				throw -1;
+				return false;
+			}
+			return false;
+		}
+
+		//添加 图片到大图集
+		__proto.pushData = function (texture) {
+			var bitmap = texture.bitmap;
+			var nWebGLImageIndex = -1;
+			var curAtlas = null;
+			var i = 0, n = 0, altasIndex = 0;
+			for (i = 0, n = this._atlaserArray.length; i < n; i++) {
+				altasIndex = (this._curAtlasIndex + i) % n;
+				curAtlas = this._atlaserArray[altasIndex];
+				nWebGLImageIndex = curAtlas.findBitmapIsExist(bitmap);
+				if (nWebGLImageIndex != -1) {
+					break;
+				}
+			}
+			if (nWebGLImageIndex != -1) {
+				var offset = curAtlas.InAtlasWebGLImagesOffsetValue[nWebGLImageIndex];
+				offsetX = offset[0];
+				offsetY = offset[1];
+				curAtlas.addToAtlas(texture, offsetX, offsetY);
+				return true;
+			} else {
+				var tex = texture;
+				this._setAtlasParam = false;
+				var bFound = false;
+				var nImageGridX = (Math.ceil((texture.bitmap.width + 2) / this._gridSize));
+				var nImageGridY = (Math.ceil((texture.bitmap.height + 2) / this._gridSize));
+				var bSuccess = false;
+				for (var k = 0; k < 2; k++) {
+					var maxAtlaserCount = this._maxAtlaserCount;
+					for (i = 0; i < maxAtlaserCount; i++) {
+						altasIndex = (this._curAtlasIndex + i) % maxAtlaserCount;
+						(this._atlaserArray.length - 1 >= altasIndex) || (this._atlaserArray.push(new Atlaser(this._gridNumX, this._gridNumY, this._width, this._height, AtlasResourceManager._sid_++)));
+						var atlas = this._atlaserArray[altasIndex];
+						var offsetX = 0, offsetY = 0;
+						var fillInfo = atlas.addTex(1, nImageGridX, nImageGridY);
+						if (fillInfo.ret) {
+							offsetX = fillInfo.x * this._gridSize + 1;
+							offsetY = fillInfo.y * this._gridSize + 1;
+							bitmap.lock = true;
+							atlas.addToAtlasTexture((bitmap), offsetX, offsetY);
+							atlas.addToAtlas(texture, offsetX, offsetY);
+							bSuccess = true;
+							this._curAtlasIndex = altasIndex;
+							break;
+						}
+					}
+					if (bSuccess)
+						break;
+					this._atlaserArray.push(new Atlaser(this._gridNumX, this._gridNumY, this._width, this._height, AtlasResourceManager._sid_++));
+					this._needGC = true;
+					this.garbageCollection();
+					this._curAtlasIndex = this._atlaserArray.length - 1;
+				}
+				if (!bSuccess) {
+					console.log(">>>AtlasManager pushData error");
+				}
+				return bSuccess;
+			}
+		}
+
+		__proto.addToAtlas = function (tex) {
+			laya.webgl.atlas.AtlasResourceManager.instance.pushData(tex);
+		}
+
+		/**
+		*回收大图合集,不建议手动调用
+		*@return
+		*/
+		__proto.garbageCollection = function () {
+			if (this._needGC === true) {
+				var n = this._atlaserArray.length - this._maxAtlaserCount;
+				for (var i = 0; i < n; i++) {
+					this._atlaserArray[i].dispose();
+					console.log("AtlasResourceManager:Dispose the inner Atlas。");
+				}
+				console.log(">>>>altas garbageCollection =" + n);
+				this._atlaserArray.splice(0, n);
+				this._needGC = false;
+			}
+			return true;
+		}
+
+		__proto.freeAll = function () {
+			for (var i = 0, n = this._atlaserArray.length; i < n; i++) {
+				this._atlaserArray[i].dispose();
+			}
+			this._atlaserArray.length = 0;
+			this._curAtlasIndex = 0;
+		}
+
+		__proto.getAtlaserCount = function () {
+			return this._atlaserArray.length;
+		}
+
+		__proto.getAtlaserByIndex = function (index) {
+			return this._atlaserArray[index];
+		}
+
+		__getset(1, AtlasResourceManager, 'instance', function () {
+			if (!AtlasResourceManager._Instance) {
+				AtlasResourceManager._Instance = new AtlasResourceManager(laya.webgl.atlas.AtlasResourceManager.atlasTextureWidth, laya.webgl.atlas.AtlasResourceManager.atlasTextureHeight,/*CLASS CONST:laya.webgl.atlas.AtlasResourceManager.gridSize*/16, laya.webgl.atlas.AtlasResourceManager.maxTextureCount);
+			}
+			return AtlasResourceManager._Instance;
+		});
+
+		__getset(1, AtlasResourceManager, 'enabled', function () {
+			return Config.atlasEnable;
+		});
+
+		__getset(1, AtlasResourceManager, 'atlasLimitWidth', function () {
+			return AtlasResourceManager._atlasLimitWidth;
+		}, function (value) {
+			AtlasResourceManager._atlasLimitWidth = value;
+		});
+
+		__getset(1, AtlasResourceManager, 'atlasLimitHeight', function () {
+			return AtlasResourceManager._atlasLimitHeight;
+		}, function (value) {
+			AtlasResourceManager._atlasLimitHeight = value;
+		});
+
+		AtlasResourceManager._enable = function () {
+			Config.atlasEnable = true;
+		}
+
+		AtlasResourceManager._disable = function () {
+			Config.atlasEnable = false;
+		}
+
+		AtlasResourceManager.__init__ = function () {
+			AtlasResourceManager.atlasTextureWidth = 2048;
+			AtlasResourceManager.atlasTextureHeight = 2048;
+			AtlasResourceManager.maxTextureCount = 6;
+			AtlasResourceManager.atlasLimitWidth = 512;
+			AtlasResourceManager.atlasLimitHeight = 512;
+		}
+
+		AtlasResourceManager._atlasLimitWidth = 0;
+		AtlasResourceManager._atlasLimitHeight = 0;
+		AtlasResourceManager.gridSize = 16;
+		AtlasResourceManager.atlasTextureWidth = 0;
+		AtlasResourceManager.atlasTextureHeight = 0;
+		AtlasResourceManager.maxTextureCount = 0;
+		AtlasResourceManager._atlasRestore = 0;
+		AtlasResourceManager.BOARDER_TYPE_NO = 0;
+		AtlasResourceManager.BOARDER_TYPE_RIGHT = 1;
+		AtlasResourceManager.BOARDER_TYPE_LEFT = 2;
+		AtlasResourceManager.BOARDER_TYPE_BOTTOM = 4;
+		AtlasResourceManager.BOARDER_TYPE_TOP = 8;
+		AtlasResourceManager.BOARDER_TYPE_ALL = 15;
+		AtlasResourceManager._sid_ = 0;
+		AtlasResourceManager._Instance = null;
+		return AtlasResourceManager;
+	})()
+
+
+	//class laya.webgl.atlas.MergeFillInfo
+	var MergeFillInfo = (function () {
+		function MergeFillInfo() {
+			this.x = 0;
+			this.y = 0;
+			this.ret = false;
+			this.ret = false;
+			this.x = 0;
+			this.y = 0;
+		}
+
+		__class(MergeFillInfo, 'laya.webgl.atlas.MergeFillInfo');
+		return MergeFillInfo;
+	})()
+
+
+		;
+	//class laya.webgl.canvas.BlendMode
+	var BlendMode = (function () {
+		function BlendMode() { }
+		__class(BlendMode, 'laya.webgl.canvas.BlendMode');
+		BlendMode._init_ = function (gl) {
+			BlendMode.fns = [BlendMode.BlendNormal, BlendMode.BlendAdd, BlendMode.BlendMultiply, BlendMode.BlendScreen, BlendMode.BlendOverlay, BlendMode.BlendLight, BlendMode.BlendMask, BlendMode.BlendDestinationOut];
+			BlendMode.targetFns = [BlendMode.BlendNormalTarget, BlendMode.BlendAddTarget, BlendMode.BlendMultiplyTarget, BlendMode.BlendScreenTarget, BlendMode.BlendOverlayTarget, BlendMode.BlendLightTarget, BlendMode.BlendMask, BlendMode.BlendDestinationOut];
+		}
+
+		BlendMode.BlendNormal = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ONE*/1,/*laya.webgl.WebGLContext.ONE_MINUS_SRC_ALPHA*/0x0303);
+		}
+
+		BlendMode.BlendAdd = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ONE*/1,/*laya.webgl.WebGLContext.DST_ALPHA*/0x0304);
+		}
+
+		BlendMode.BlendMultiply = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.DST_COLOR*/0x0306,/*laya.webgl.WebGLContext.ONE_MINUS_SRC_ALPHA*/0x0303);
+		}
+
+		BlendMode.BlendScreen = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ONE*/1,/*laya.webgl.WebGLContext.ONE*/1);
+		}
+
+		BlendMode.BlendOverlay = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ONE*/1,/*laya.webgl.WebGLContext.ONE_MINUS_SRC_COLOR*/0x0301);
+		}
+
+		BlendMode.BlendLight = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ONE*/1,/*laya.webgl.WebGLContext.ONE*/1);
+		}
+
+		BlendMode.BlendNormalTarget = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ONE*/1,/*laya.webgl.WebGLContext.ONE_MINUS_SRC_ALPHA*/0x0303);
+		}
+
+		BlendMode.BlendAddTarget = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ONE*/1,/*laya.webgl.WebGLContext.DST_ALPHA*/0x0304);
+		}
+
+		BlendMode.BlendMultiplyTarget = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.DST_COLOR*/0x0306,/*laya.webgl.WebGLContext.ONE_MINUS_SRC_ALPHA*/0x0303);
+		}
+
+		BlendMode.BlendScreenTarget = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ONE*/1,/*laya.webgl.WebGLContext.ONE*/1);
+		}
+
+		BlendMode.BlendOverlayTarget = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ONE*/1,/*laya.webgl.WebGLContext.ONE_MINUS_SRC_COLOR*/0x0301);
+		}
+
+		BlendMode.BlendLightTarget = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ONE*/1,/*laya.webgl.WebGLContext.ONE*/1);
+		}
+
+		BlendMode.BlendMask = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ZERO*/0,/*laya.webgl.WebGLContext.SRC_ALPHA*/0x0302);
+		}
+
+		BlendMode.BlendDestinationOut = function (gl) {
+			gl.blendFunc(/*laya.webgl.WebGLContext.ZERO*/0,/*laya.webgl.WebGLContext.ZERO*/0);
+		}
+
+		BlendMode.activeBlendFunction = null;
+		BlendMode.NORMAL = "normal";
+		BlendMode.ADD = "add";
+		BlendMode.MULTIPLY = "multiply";
+		BlendMode.SCREEN = "screen";
+		BlendMode.LIGHT = "light";
+		BlendMode.OVERLAY = "overlay";
+		BlendMode.DESTINATIONOUT = "destination-out";
+		BlendMode.fns = [];
+		BlendMode.targetFns = [];
+		__static(BlendMode,
+			['NAMES', function () { return this.NAMES = ["normal", "add", "multiply", "screen", "overlay", "light", "mask", "destination-out"]; }, 'TOINT', function () { return this.TOINT = { "normal": 0, "add": 1, "multiply": 2, "screen": 3, "lighter": 1, "overlay": 4, "light": 5, "mask": 6, "destination-out": 7 }; }
+			]);
+		return BlendMode;
+	})()
+
+
+	//class laya.webgl.canvas.DrawStyle
+	var DrawStyle = (function () {
+		function DrawStyle(value) {
+			this._color = Color.create("black");
+			this.setValue(value);
+		}
+
+		__class(DrawStyle, 'laya.webgl.canvas.DrawStyle');
+		var __proto = DrawStyle.prototype;
+		__proto.setValue = function (value) {
+			if (value) {
+				if ((typeof value == 'string')) {
+					this._color = Color.create(value);
+					return;
+				}
+				if ((value instanceof laya.utils.Color)) {
+					this._color = value;
+					return;
+				}
+			}
+		}
+
+		__proto.reset = function () {
+			this._color = Color.create("black");
+		}
+
+		__proto.equal = function (value) {
+			if ((typeof value == 'string')) return this._color.strColor === value;
+			if ((value instanceof laya.utils.Color)) return this._color.numColor === (value).numColor;
+			return false;
+		}
+
+		__proto.toColorStr = function () {
+			return this._color.strColor;
+		}
+
+		DrawStyle.create = function (value) {
+			if (value) {
+				var color;
+				if ((typeof value == 'string')) color = Color.create(value);
+				else if ((value instanceof laya.utils.Color)) color = value;
+				if (color) {
+					return color._drawStyle || (color._drawStyle = new DrawStyle(value));
+				}
+			}
+			return null;
+		}
+
+		__static(DrawStyle,
+			['DEFAULT', function () { return this.DEFAULT = new DrawStyle("#000000"); }
+			]);
+		return DrawStyle;
+	})()
+
+
+	//class laya.webgl.canvas.Path
+	var Path = (function () {
+		function Path() {
+			this._x = 0;
+			this._y = 0;
+			//this._rect=null;
+			//this.ib=null;
+			//this.vb=null;
+			this.dirty = false;
+			//this.geomatrys=null;
+			//this._curGeomatry=null;
+			this.offset = 0;
+			this.count = 0;
+			this.geoStart = 0;
+			this.tempArray = [];
+			this.closePath = false;
+			this.geomatrys = [];
+			var gl = WebGL.mainContext;
+			this.ib = IndexBuffer2D.create(/*laya.webgl.WebGLContext.DYNAMIC_DRAW*/0x88E8);
+			this.vb = VertexBuffer2D.create(5);
+		}
+
+		__class(Path, 'laya.webgl.canvas.Path');
+		var __proto = Path.prototype;
+		__proto.addPoint = function (pointX, pointY) {
+			this.tempArray.push(pointX, pointY);
+		}
+
+		__proto.getEndPointX = function () {
+			return this.tempArray[this.tempArray.length - 2];
+		}
+
+		__proto.getEndPointY = function () {
+			return this.tempArray[this.tempArray.length - 1];
+		}
+
+		__proto.polygon = function (x, y, points, color, borderWidth, borderColor) {
+			var geo;
+			this.geomatrys.push(this._curGeomatry = geo = new Polygon(x, y, points, color, borderWidth, borderColor));
+			if (!color) geo.fill = false;
+			if (borderColor == undefined) geo.borderWidth = 0;
+			return geo;
+		}
+
+		__proto.setGeomtry = function (shape) {
+			this.geomatrys.push(this._curGeomatry = shape);
+		}
+
+		__proto.drawLine = function (x, y, points, width, color) {
+			var geo;
+			if (this.closePath) {
+				this.geomatrys.push(this._curGeomatry = geo = new LoopLine(x, y, points, width, color));
+			} else {
+				this.geomatrys.push(this._curGeomatry = geo = new Line(x, y, points, width, color));
+			}
+			geo.fill = false;
+			return geo;
+		}
+
+		__proto.update = function () {
+			var si = this.ib._byteLength;
+			var len = this.geomatrys.length;
+			this.offset = si;
+			for (var i = this.geoStart; i < len; i++) {
+				this.geomatrys[i].getData(this.ib, this.vb, this.vb._byteLength / 20);
+			}
+			this.geoStart = len;
+			this.count = (this.ib._byteLength - si) / CONST3D2D.BYTES_PIDX;
+		}
+
+		__proto.reset = function () {
+			this.vb.clear();
+			this.ib.clear();
+			this.offset = this.count = this.geoStart = 0;
+			this.geomatrys.length = 0;
+		}
+
+		__proto.recover = function () {
+			this._curGeomatry = null;
+			this.vb.destory();
+			this.vb = null;
+			this.ib.destory();
+			this.ib = null;
+		}
+
+		return Path;
+	})()
+
+
+	//class laya.webgl.canvas.save.SaveClipRect
+	var SaveClipRect = (function () {
+		function SaveClipRect() {
+			//this._clipSaveRect=null;
+			//this._submitScissor=null;
+			this._clipRect = new Rectangle();
+		}
+
+		__class(SaveClipRect, 'laya.webgl.canvas.save.SaveClipRect');
+		var __proto = SaveClipRect.prototype;
+		Laya.imps(__proto, { "laya.webgl.canvas.save.ISaveData": true })
+		__proto.isSaveMark = function () { return false; }
+		__proto.restore = function (context) {
+			context._clipRect = this._clipSaveRect;
+			SaveClipRect._cache[SaveClipRect._cache._length++] = this;
+			this._submitScissor.submitLength = context._submits._length - this._submitScissor.submitIndex;
+			context._curSubmit = Submit.RENDERBASE;
+			context._renderKey = 0;
+		}
+
+		SaveClipRect.save = function (context, submitScissor) {
+			if ((context._saveMark._saveuse & /*laya.webgl.canvas.save.SaveBase.TYPE_CLIPRECT*/0x20000) ==/*laya.webgl.canvas.save.SaveBase.TYPE_CLIPRECT*/0x20000) return;
+			context._saveMark._saveuse |=/*laya.webgl.canvas.save.SaveBase.TYPE_CLIPRECT*/0x20000;
+			var cache = SaveClipRect._cache;
+			var o = cache._length > 0 ? cache[--cache._length] : (new SaveClipRect());
+			o._clipSaveRect = context._clipRect;
+			context._clipRect = o._clipRect.copyFrom(context._clipRect);
+			o._submitScissor = submitScissor;
+			var _save = context._save;
+			_save[_save._length++] = o;
+		}
+
+		__static(SaveClipRect,
+			['_cache', function () { return this._cache = SaveBase._createArray(); }
+			]);
+		return SaveClipRect;
+	})()
+
+
+	//class laya.webgl.canvas.save.SaveClipRectStencil
+	var SaveClipRectStencil = (function () {
+		function SaveClipRectStencil() {
+			//this._clipSaveRect=null;
+			//this._saveMatrix=null;
+			this._contextX = 0;
+			this._contextY = 0;
+			//this._submitStencil=null;
+			this._clipRect = new Rectangle();
+			this._rect = new Rectangle();
+			this._matrix = new Matrix();
+		}
+
+		__class(SaveClipRectStencil, 'laya.webgl.canvas.save.SaveClipRectStencil');
+		var __proto = SaveClipRectStencil.prototype;
+		Laya.imps(__proto, { "laya.webgl.canvas.save.ISaveData": true })
+		__proto.isSaveMark = function () { return false; }
+		__proto.restore = function (context) {
+			SubmitStencil.restore(context, this._rect, this._saveMatrix, this._contextX, this._contextY);
+			context._clipRect = this._clipSaveRect;
+			context._curMat = this._saveMatrix;
+			context._x = this._contextX;
+			context._y = this._contextY;
+			SaveClipRectStencil._cache[SaveClipRectStencil._cache._length++] = this;
+			context._curSubmit = Submit.RENDERBASE;
+		}
+
+		SaveClipRectStencil.save = function (context, submitStencil, x, y, width, height, clipX, clipY, clipWidth, clipHeight) {
+			if ((context._saveMark._saveuse & /*laya.webgl.canvas.save.SaveBase.TYPE_CLIPRECT_STENCIL*/0x40000) ==/*laya.webgl.canvas.save.SaveBase.TYPE_CLIPRECT_STENCIL*/0x40000) return;
+			context._saveMark._saveuse |=/*laya.webgl.canvas.save.SaveBase.TYPE_CLIPRECT_STENCIL*/0x40000;
+			var cache = SaveClipRectStencil._cache;
+			var o = cache._length > 0 ? cache[--cache._length] : (new SaveClipRectStencil());
+			o._clipSaveRect = context._clipRect;
+			o._clipRect.setTo(clipX, clipY, clipWidth, clipHeight);
+			context._clipRect = o._clipRect;
+			o._rect.x = x;
+			o._rect.y = y;
+			o._rect.width = width;
+			o._rect.height = height;
+			o._contextX = context._x;
+			o._contextY = context._y;
+			o._saveMatrix = context._curMat;
+			context._curMat.copyTo(o._matrix);
+			context._curMat = o._matrix;
+			o._submitStencil = submitStencil;
+			var _save = context._save;
+			_save[_save._length++] = o;
+		}
+
+		__static(SaveClipRectStencil,
+			['_cache', function () { return this._cache = SaveBase._createArray(); }
+			]);
+		return SaveClipRectStencil;
+	})()
+
+
+	//class laya.webgl.canvas.save.SaveMark
+	var SaveMark = (function () {
+		function SaveMark() {
+			this._saveuse = 0;
+			//this._preSaveMark=null;
+			;
+		}
+
+		__class(SaveMark, 'laya.webgl.canvas.save.SaveMark');
+		var __proto = SaveMark.prototype;
+		Laya.imps(__proto, { "laya.webgl.canvas.save.ISaveData": true })
+		__proto.isSaveMark = function () {
+			return true;
+		}
+
+		__proto.restore = function (context) {
+			context._saveMark = this._preSaveMark;
+			SaveMark._no[SaveMark._no._length++] = this;
+		}
+
+		SaveMark.Create = function (context) {
+			var no = SaveMark._no;
+			var o = no._length > 0 ? no[--no._length] : (new SaveMark());
+			o._saveuse = 0;
+			o._preSaveMark = context._saveMark;
+			context._saveMark = o;
+			return o;
+		}
+
+		__static(SaveMark,
+			['_no', function () { return this._no = SaveBase._createArray(); }
+			]);
+		return SaveMark;
+	})()
+
+
+	//class laya.webgl.canvas.save.SaveTransform
+	var SaveTransform = (function () {
+		function SaveTransform() {
+			//this._savematrix=null;
+			this._matrix = new Matrix();
+		}
+
+		__class(SaveTransform, 'laya.webgl.canvas.save.SaveTransform');
+		var __proto = SaveTransform.prototype;
+		Laya.imps(__proto, { "laya.webgl.canvas.save.ISaveData": true })
+		__proto.isSaveMark = function () { return false; }
+		__proto.restore = function (context) {
+			context._curMat = this._savematrix;
+			SaveTransform._no[SaveTransform._no._length++] = this;
+		}
+
+		SaveTransform.save = function (context) {
+			var _saveMark = context._saveMark;
+			if ((_saveMark._saveuse & /*laya.webgl.canvas.save.SaveBase.TYPE_TRANSFORM*/0x800) ===/*laya.webgl.canvas.save.SaveBase.TYPE_TRANSFORM*/0x800) return;
+			_saveMark._saveuse |=/*laya.webgl.canvas.save.SaveBase.TYPE_TRANSFORM*/0x800;
+			var no = SaveTransform._no;
+			var o = no._length > 0 ? no[--no._length] : (new SaveTransform());
+			o._savematrix = context._curMat;
+			context._curMat = context._curMat.copyTo(o._matrix);
+			var _save = context._save;
+			_save[_save._length++] = o;
+		}
+
+		__static(SaveTransform,
+			['_no', function () { return this._no = SaveBase._createArray(); }
+			]);
+		return SaveTransform;
+	})()
+
+
+	//class laya.webgl.canvas.save.SaveTranslate
+	var SaveTranslate = (function () {
+		function SaveTranslate() {
+			//this._x=NaN;
+			//this._y=NaN;
+		}
+
+		__class(SaveTranslate, 'laya.webgl.canvas.save.SaveTranslate');
+		var __proto = SaveTranslate.prototype;
+		Laya.imps(__proto, { "laya.webgl.canvas.save.ISaveData": true })
+		__proto.isSaveMark = function () { return false; }
+		__proto.restore = function (context) {
+			var mat = context._curMat;
+			context._x = this._x;
+			context._y = this._y;
+			SaveTranslate._no[SaveTranslate._no._length++] = this;
+		}
+
+		SaveTranslate.save = function (context) {
+			var no = SaveTranslate._no;
+			var o = no._length > 0 ? no[--no._length] : (new SaveTranslate());
+			o._x = context._x;
+			o._y = context._y;
+			var _save = context._save;
+			_save[_save._length++] = o;
+		}
+
+		__static(SaveTranslate,
+			['_no', function () { return this._no = SaveBase._createArray(); }
+			]);
+		return SaveTranslate;
+	})()
+
+
+	//class laya.webgl.resource.RenderTargetMAX
+	var RenderTargetMAX = (function () {
+		function RenderTargetMAX() {
+			//public var targets:Vector.<OneTarget>;//没用到
+			this.target = null;
+			this.repaint = false;
+			this._width = NaN;
+			this._height = NaN;
+			this._sp = null;
+			this._clipRect = new Rectangle();
+		}
+
+		__class(RenderTargetMAX, 'laya.webgl.resource.RenderTargetMAX');
+		var __proto = RenderTargetMAX.prototype;
+		__proto.setSP = function (sp) {
+			this._sp = sp;
+		}
+
+		__proto.size = function (w, h) {
+			var _$this = this;
+			if (this._width === w && this._height === h) {
+				this.target.size(w, h);
+				return;
+			}
+			this.repaint = true;
+			this._width = w;
+			this._height = h;
+			if (!this.target)
+				this.target = RenderTarget2D.create(w, h);
+			else
+				this.target.size(w, h);
+			if (!this.target.hasListener(/*laya.events.Event.RECOVERED*/"recovered")) {
+				this.target.on(/*laya.events.Event.RECOVERED*/"recovered", this, function (e) {
+					Laya.timer.callLater(_$this._sp, _$this._sp.repaint);
+				});
+			}
+		}
+
+		__proto._flushToTarget = function (context, target) {
+			if (target._destroy) return;
+			var worldScissorTest = RenderState2D.worldScissorTest;
+			var preworldClipRect = RenderState2D.worldClipRect;
+			RenderState2D.worldClipRect = this._clipRect;
+			this._clipRect.x = this._clipRect.y = 0;
+			this._clipRect.width = this._width;
+			this._clipRect.height = this._height;
+			RenderState2D.worldScissorTest = false;
+			WebGL.mainContext.disable(/*laya.webgl.WebGLContext.SCISSOR_TEST*/0x0C11);
+			var preAlpha = RenderState2D.worldAlpha;
+			var preMatrix4 = RenderState2D.worldMatrix4;
+			var preMatrix = RenderState2D.worldMatrix;
+			var preFilters = RenderState2D.worldFilters;
+			var preShaderDefines = RenderState2D.worldShaderDefines;
+			RenderState2D.worldMatrix = Matrix.EMPTY;
+			RenderState2D.restoreTempArray();
+			RenderState2D.worldMatrix4 = RenderState2D.TEMPMAT4_ARRAY;
+			RenderState2D.worldAlpha = 1;
+			RenderState2D.worldFilters = null;
+			RenderState2D.worldShaderDefines = null;
+			BaseShader.activeShader = null;
+			target.start();
+			Config.showCanvasMark ? target.clear(0, 1, 0, 0.3) : target.clear(0, 0, 0, 0);
+			context.flush();
+			target.end();
+			BaseShader.activeShader = null;
+			RenderState2D.worldAlpha = preAlpha;
+			RenderState2D.worldMatrix4 = preMatrix4;
+			RenderState2D.worldMatrix = preMatrix;
+			RenderState2D.worldFilters = preFilters;
+			RenderState2D.worldShaderDefines = preShaderDefines;
+			RenderState2D.worldScissorTest = worldScissorTest
+			if (worldScissorTest) {
+				var y = RenderState2D.height - preworldClipRect.y - preworldClipRect.height;
+				WebGL.mainContext.scissor(preworldClipRect.x, y, preworldClipRect.width, preworldClipRect.height);
+				WebGL.mainContext.enable(/*laya.webgl.WebGLContext.SCISSOR_TEST*/0x0C11);
+			}
+			RenderState2D.worldClipRect = preworldClipRect;
+		}
+
+		__proto.flush = function (context) {
+			if (this.repaint) {
+				this._flushToTarget(context, this.target);
+				this.repaint = false;
+			}
+		}
+
+		__proto.drawTo = function (context, x, y, width, height) {
+			context.drawTexture(this.target.getTexture(), x, y, width, height, 0, 0);
+		}
+
+		__proto.destroy = function () {
+			if (this.target) {
+				this.target.destroy();
+				this.target = null;
+				this._sp = null;
+			}
+		}
+
+		return RenderTargetMAX;
+	})()
+
+
+	//class laya.webgl.shader.d2.Shader2D
+	var Shader2D = (function () {
+		function Shader2D() {
+			this.ALPHA = 1;
+			//this.glTexture=null;
+			//this.shader=null;
+			//this.filters=null;
+			this.shaderType = 0;
+			//this.colorAdd=null;
+			//this.strokeStyle=null;
+			//this.fillStyle=null;
+			this.defines = new ShaderDefines2D();
+		}
+
+		__class(Shader2D, 'laya.webgl.shader.d2.Shader2D');
+		var __proto = Shader2D.prototype;
+		__proto.destroy = function () {
+			this.defines = null;
+			this.filters = null;
+			this.glTexture = null;
+			this.strokeStyle = null;
+			this.fillStyle = null;
+		}
+
+		Shader2D.__init__ = function () {
+			Shader.addInclude("parts/ColorFilter_ps_uniform.glsl", "uniform vec4 colorAlpha;\nuniform mat4 colorMat;");
+			Shader.addInclude("parts/ColorFilter_ps_logic.glsl", "mat4 alphaMat =colorMat;\n\nalphaMat[0][3] *= gl_FragColor.a;\nalphaMat[1][3] *= gl_FragColor.a;\nalphaMat[2][3] *= gl_FragColor.a;\n\ngl_FragColor = gl_FragColor * alphaMat;\ngl_FragColor += colorAlpha/255.0*gl_FragColor.a;\n");
+			Shader.addInclude("parts/GlowFilter_ps_uniform.glsl", "uniform vec4 u_color;\nuniform float u_strength;\nuniform float u_blurX;\nuniform float u_blurY;\nuniform float u_offsetX;\nuniform float u_offsetY;\nuniform float u_textW;\nuniform float u_textH;");
+			Shader.addInclude("parts/GlowFilter_ps_logic.glsl", "const float c_IterationTime = 10.0;\nfloat floatIterationTotalTime = c_IterationTime * c_IterationTime;\nvec4 vec4Color = vec4(0.0,0.0,0.0,0.0);\nvec2 vec2FilterDir = vec2(-(u_offsetX)/u_textW,-(u_offsetY)/u_textH);\nvec2 vec2FilterOff = vec2(u_blurX/u_textW/c_IterationTime * 2.0,u_blurY/u_textH/c_IterationTime * 2.0);\nfloat maxNum = u_blurX * u_blurY;\nvec2 vec2Off = vec2(0.0,0.0);\nfloat floatOff = c_IterationTime/2.0;\nfor(float i = 0.0;i<=c_IterationTime; ++i){\n	for(float j = 0.0;j<=c_IterationTime; ++j){\n		vec2Off = vec2(vec2FilterOff.x * (i - floatOff),vec2FilterOff.y * (j - floatOff));\n		vec4Color += texture2D(texture, v_texcoord + vec2FilterDir + vec2Off)/floatIterationTotalTime;\n	}\n}\ngl_FragColor = vec4(u_color.rgb,vec4Color.a * u_strength);\ngl_FragColor.rgb *= gl_FragColor.a;");
+			Shader.addInclude("parts/BlurFilter_ps_logic.glsl", "gl_FragColor =   blur();\ngl_FragColor.w*=alpha;");
+			Shader.addInclude("parts/BlurFilter_ps_uniform.glsl", "uniform vec4 strength_sig2_2sig2_gauss1;\nuniform vec2 blurInfo;\n\n#define PI 3.141593\n\n//float sigma=strength/3.0;//3σ以外影响很小。即当σ=1的时候，半径为3\n//float sig2 = sigma*sigma;\n//float _2sig2 = 2.0*sig2;\n//return 1.0/(2*PI*sig2)*exp(-(x*x+y*y)/_2sig2)\n//float gauss1 = 1.0/(2.0*PI*sig2);\n\nfloat getGaussian(float x, float y){\n    return strength_sig2_2sig2_gauss1.w*exp(-(x*x+y*y)/strength_sig2_2sig2_gauss1.z);\n}\n\nvec4 blur(){\n    const float blurw = 9.0;\n    vec4 vec4Color = vec4(0.0,0.0,0.0,0.0);\n    vec2 halfsz=vec2(blurw,blurw)/2.0/blurInfo;    \n    vec2 startpos=v_texcoord-halfsz;\n    vec2 ctexcoord = startpos;\n    vec2 step = 1.0/blurInfo;  //每个像素      \n    \n    for(float y = 0.0;y<=blurw; ++y){\n        ctexcoord.x=startpos.x;\n        for(float x = 0.0;x<=blurw; ++x){\n            //TODO 纹理坐标的固定偏移应该在vs中处理\n            vec4Color += texture2D(texture, ctexcoord)*getGaussian(x-blurw/2.0,y-blurw/2.0);\n            ctexcoord.x+=step.x;\n        }\n        ctexcoord.y+=step.y;\n    }\n    return vec4Color;\n}");
+			Shader.addInclude("parts/ColorAdd_ps_uniform.glsl", "uniform vec4 colorAdd;\n");
+			Shader.addInclude("parts/ColorAdd_ps_logic.glsl", "gl_FragColor = vec4(colorAdd.rgb,colorAdd.a*gl_FragColor.a);\ngl_FragColor.xyz *= colorAdd.a;");
+			var vs, ps;
+			vs = "attribute vec4 position;\nattribute vec2 texcoord;\nuniform vec2 size;\n\n#ifdef WORLDMAT\nuniform mat4 mmat;\n#endif\nvarying vec2 v_texcoord;\nvoid main() {\n  #ifdef WORLDMAT\n  vec4 pos=mmat*position;\n  gl_Position =vec4((pos.x/size.x-0.5)*2.0,(0.5-pos.y/size.y)*2.0,pos.z,1.0);\n  #else\n  gl_Position =vec4((position.x/size.x-0.5)*2.0,(0.5-position.y/size.y)*2.0,position.z,1.0);\n  #endif\n  \n  v_texcoord = texcoord;\n}";
+			ps = "precision mediump float;\n//precision highp float;\nvarying vec2 v_texcoord;\nuniform sampler2D texture;\nuniform float alpha;\n#include?BLUR_FILTER  \"parts/BlurFilter_ps_uniform.glsl\";\n#include?COLOR_FILTER \"parts/ColorFilter_ps_uniform.glsl\";\n#include?GLOW_FILTER \"parts/GlowFilter_ps_uniform.glsl\";\n#include?COLOR_ADD \"parts/ColorAdd_ps_uniform.glsl\";\n\nvoid main() {\n   vec4 color= texture2D(texture, v_texcoord);\n   color.a*=alpha;\n   color.rgb*=alpha;\n   gl_FragColor=color;\n   #include?COLOR_ADD \"parts/ColorAdd_ps_logic.glsl\";   \n   #include?BLUR_FILTER  \"parts/BlurFilter_ps_logic.glsl\";\n   #include?COLOR_FILTER \"parts/ColorFilter_ps_logic.glsl\";\n   #include?GLOW_FILTER \"parts/GlowFilter_ps_logic.glsl\";\n}";
+			Shader.preCompile2D(0,/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, vs, ps, null);
+			vs = "attribute vec4 position;\nuniform vec2 size;\nuniform mat4 mmat;\nvoid main() {\n  vec4 pos=mmat*position;\n  gl_Position =vec4((pos.x/size.x-0.5)*2.0,(0.5-pos.y/size.y)*2.0,pos.z,1.0);\n}";
+			ps = "precision mediump float;\nuniform vec4 color;\nuniform float alpha;\n#include?COLOR_FILTER \"parts/ColorFilter_ps_uniform.glsl\";\nvoid main() {\n	vec4 a = vec4(color.r, color.g, color.b, color.a);\n	a.w = alpha;\n	a.xyz *= alpha;\n	gl_FragColor = a;\n	#include?COLOR_FILTER \"parts/ColorFilter_ps_logic.glsl\";\n}";
+			Shader.preCompile2D(0,/*laya.webgl.shader.d2.ShaderDefines2D.COLOR2D*/0x02, vs, ps, null);
+			vs = "attribute vec4 position;\nattribute vec3 a_color;\nuniform mat4 mmat;\nuniform mat4 u_mmat2;\nuniform vec2 u_pos;\nuniform vec2 size;\nvarying vec3 color;\nvoid main(){\n  vec4 tPos = vec4(position.x + u_pos.x,position.y + u_pos.y,position.z,position.w);\n  vec4 pos=mmat*u_mmat2*tPos;\n  gl_Position =vec4((pos.x/size.x-0.5)*2.0,(0.5-pos.y/size.y)*2.0,pos.z,1.0);\n  color=a_color;\n}";
+			ps = "precision mediump float;\n//precision mediump float;\nvarying vec3 color;\nuniform float alpha;\nvoid main(){\n	//vec4 a=vec4(color.r, color.g, color.b, 1);\n	//a.a*=alpha;\n    gl_FragColor=vec4(color.r, color.g, color.b, alpha);\n	gl_FragColor.rgb*=alpha;\n}";
+			Shader.preCompile2D(0,/*laya.webgl.shader.d2.ShaderDefines2D.PRIMITIVE*/0x04, vs, ps, null);
+			vs = "attribute vec4 position;\nattribute vec2 texcoord;\nuniform vec2 size;\n\n#ifdef WORLDMAT\nuniform mat4 mmat;\n#endif\nvarying vec2 v_texcoord;\nvoid main() {\n  #ifdef WORLDMAT\n  vec4 pos=mmat*position;\n  gl_Position =vec4((pos.x/size.x-0.5)*2.0,(0.5-pos.y/size.y)*2.0,pos.z,1.0);\n  #else\n  gl_Position =vec4((position.x/size.x-0.5)*2.0,(0.5-position.y/size.y)*2.0,position.z,1.0);\n  #endif\n  \n  v_texcoord = texcoord;\n}";
+			ps = "#ifdef FSHIGHPRECISION\nprecision highp float;\n#else\nprecision mediump float;\n#endif\n//precision highp float;\nvarying vec2 v_texcoord;\nuniform sampler2D texture;\nuniform float alpha;\nuniform vec4 u_TexRange;\nuniform vec2 u_offset;\n#include?BLUR_FILTER  \"parts/BlurFilter_ps_uniform.glsl\";\n#include?COLOR_FILTER \"parts/ColorFilter_ps_uniform.glsl\";\n#include?GLOW_FILTER \"parts/GlowFilter_ps_uniform.glsl\";\n#include?COLOR_ADD \"parts/ColorAdd_ps_uniform.glsl\";\n\nvoid main() {\n   vec2 newTexCoord;\n   newTexCoord.x = mod(u_offset.x + v_texcoord.x,u_TexRange.y) + u_TexRange.x;\n   newTexCoord.y = mod(u_offset.y + v_texcoord.y,u_TexRange.w) + u_TexRange.z;\n   vec4 color= texture2D(texture, newTexCoord);\n   color.a*=alpha;\n   gl_FragColor=color;\n   #include?COLOR_ADD \"parts/ColorAdd_ps_logic.glsl\";   \n   #include?BLUR_FILTER  \"parts/BlurFilter_ps_logic.glsl\";\n   #include?COLOR_FILTER \"parts/ColorFilter_ps_logic.glsl\";\n   #include?GLOW_FILTER \"parts/GlowFilter_ps_logic.glsl\";\n}";
+			Shader.preCompile2D(0,/*laya.webgl.shader.d2.ShaderDefines2D.FILLTEXTURE*/0x100, vs, ps, null);
+			vs = "attribute vec2 position;\nattribute vec2 texcoord;\nattribute vec4 color;\nuniform vec2 size;\nuniform float offsetX;\nuniform float offsetY;\nuniform mat4 mmat;\nuniform mat4 u_mmat2;\nvarying vec2 v_texcoord;\nvarying vec4 v_color;\nvoid main() {\n  vec4 pos=mmat*u_mmat2*vec4(offsetX+position.x,offsetY+position.y,0,1 );\n  gl_Position = vec4((pos.x/size.x-0.5)*2.0,(0.5-pos.y/size.y)*2.0,pos.z,1.0);\n  v_color = color;\n  v_color.rgb *= v_color.a;\n  v_texcoord = texcoord;  \n}";
+			ps = "precision mediump float;\nvarying vec2 v_texcoord;\nvarying vec4 v_color;\nuniform sampler2D texture;\nuniform float alpha;\nvoid main() {\n	vec4 t_color = texture2D(texture, v_texcoord);\n	gl_FragColor = t_color.rgba * v_color;\n	gl_FragColor *= alpha;\n}";
+			Shader.preCompile2D(0,/*laya.webgl.shader.d2.ShaderDefines2D.SKINMESH*/0x200, vs, ps, null);
+		}
+
+		return Shader2D;
+	})()
+
+
+	//class laya.webgl.shader.ShaderDefines
+	var ShaderDefines = (function () {
+		function ShaderDefines(name2int, int2name, int2nameMap) {
+			this._value = 0;
+			//this._name2int=null;
+			//this._int2name=null;
+			//this._int2nameMap=null;
+			this._name2int = name2int;
+			this._int2name = int2name;
+			this._int2nameMap = int2nameMap;
+		}
+
+		__class(ShaderDefines, 'laya.webgl.shader.ShaderDefines');
+		var __proto = ShaderDefines.prototype;
+		__proto.add = function (value) {
+			if ((typeof value == 'string')) value = this._name2int[value];
+			this._value |= value;
+			return this._value;
+		}
+
+		__proto.addInt = function (value) {
+			this._value |= value;
+			return this._value;
+		}
+
+		__proto.remove = function (value) {
+			if ((typeof value == 'string')) value = this._name2int[value];
+			this._value &= (~value);
+			return this._value;
+		}
+
+		__proto.isDefine = function (def) {
+			return (this._value & def) === def;
+		}
+
+		__proto.getValue = function () {
+			return this._value;
+		}
+
+		__proto.setValue = function (value) {
+			this._value = value;
+		}
+
+		__proto.toNameDic = function () {
+			var r = this._int2nameMap[this._value];
+			return r ? r : ShaderDefines._toText(this._value, this._int2name, this._int2nameMap);
+		}
+
+		ShaderDefines._reg = function (name, value, _name2int, _int2name) {
+			_name2int[name] = value;
+			_int2name[value] = name;
+		}
+
+		ShaderDefines._toText = function (value, _int2name, _int2nameMap) {
+			var r = _int2nameMap[value];
+			if (r) return r;
+			var o = {};
+			var d = 1;
+			for (var i = 0; i < 32; i++) {
+				d = 1 << i;
+				if (d > value) break;
+				if (value & d) {
+					var name = _int2name[d];
+					name && (o[name] = "");
+				}
+			}
+			_int2nameMap[value] = o;
+			return o;
+		}
+
+		ShaderDefines._toInt = function (names, _name2int) {
+			var words = names.split('.');
+			var num = 0;
+			for (var i = 0, n = words.length; i < n; i++) {
+				var value = _name2int[words[i]];
+				if (!value) throw new Error("Defines to int err:" + names + "/" + words[i]);
+				num |= value;
+			}
+			return num;
+		}
+
+		return ShaderDefines;
+	})()
+
+
+	/**
+	*这里销毁的问题，后面待确认
+	*/
+	//class laya.webgl.shader.d2.skinAnishader.SkinMesh
+	var SkinMesh = (function () {
+		function SkinMesh() {
+			this.mVBBuffer = null;
+			this.mIBBuffer = null;
+			this.mVBData = null;
+			this.mIBData = null;
+			this.mEleNum = 0;
+			this.mTexture = null;
+			this.transform = null;
+			this._vs = null;
+			this._ps = null;
+			this._indexStart = -1;
+			this._verticles = null;
+			this._uvs = null;
+			this._tempMatrix = new Matrix();
+		}
+
+		__class(SkinMesh, 'laya.webgl.shader.d2.skinAnishader.SkinMesh');
+		var __proto = SkinMesh.prototype;
+		__proto.init = function (texture, vs, ps) {
+			if (vs) {
+				this._vs = vs;
+			} else {
+				this._vs = [];
+				var tWidth = texture.width;
+				var tHeight = texture.height;
+				var tRed = 1;
+				var tGreed = 1;
+				var tBlue = 1;
+				var tAlpha = 1;
+				this._vs.push(0, 0, 0, 0, tRed, tGreed, tBlue, tAlpha);
+				this._vs.push(tWidth, 0, 1, 0, tRed, tGreed, tBlue, tAlpha);
+				this._vs.push(tWidth, tHeight, 1, 1, tRed, tGreed, tBlue, tAlpha);
+				this._vs.push(0, tHeight, 0, 1, tRed, tGreed, tBlue, tAlpha);
+			}
+			if (ps) {
+				this._ps = ps;
+			} else {
+				if (!SkinMesh._defaultPS) {
+					SkinMesh._defaultPS = [];
+					SkinMesh._defaultPS.push(0, 1, 3, 3, 1, 2);
+				}
+				this._ps = SkinMesh._defaultPS;
+			}
+			this.mVBData = new Float32Array(this._vs);
+			this.mIBData = new Uint16Array(this._ps.length);
+			this.mIBData["start"] = -1;
+			this.mEleNum = this._ps.length;
+			this.mTexture = texture;
+		}
+
+		__proto.init2 = function (texture, vs, ps, verticles, uvs) {
+			if (this.transform) this.transform = null;
+			if (ps) {
+				this._ps = ps;
+			} else {
+				this._ps = [];
+				this._ps.push(0, 1, 3, 3, 1, 2);
+			}
+			this._verticles = verticles;
+			this._uvs = uvs;
+			this.mEleNum = this._ps.length;
+			this.mTexture = texture;
+			if (Render.isConchNode || Render.isConchApp) {
+				this._initMyData();
+				this.mVBData = new Float32Array(this._vs);
+			}
+		}
+
+		__proto._initMyData = function () {
+			var vsI = 0;
+			var vI = 0;
+			var vLen = this._verticles.length;
+			var tempVLen = vLen * 4;
+			this._vs = SkinMesh._tempVS;
+			var insertNew = false;
+			if (Render.isConchNode || Render.isConchApp) {
+				this._vs.length = tempVLen;
+				insertNew = true;
+			} else {
+				if (this._vs.length < tempVLen) {
+					this._vs.length = tempVLen;
+					insertNew = true;
+				}
+			}
+			SkinMesh._tVSLen = tempVLen;
+			if (insertNew) {
+				while (vsI < tempVLen) {
+					this._vs[vsI] = this._verticles[vI];
+					this._vs[vsI + 1] = this._verticles[vI + 1];
+					this._vs[vsI + 2] = this._uvs[vI];
+					this._vs[vsI + 3] = this._uvs[vI + 1];
+					this._vs[vsI + 4] = 1;
+					this._vs[vsI + 5] = 1;
+					this._vs[vsI + 6] = 1;
+					this._vs[vsI + 7] = 1;
+					vsI += 8;
+					vI += 2;
+				}
+			} else {
+				while (vsI < tempVLen) {
+					this._vs[vsI] = this._verticles[vI];
+					this._vs[vsI + 1] = this._verticles[vI + 1];
+					this._vs[vsI + 2] = this._uvs[vI];
+					this._vs[vsI + 3] = this._uvs[vI + 1];
+					vsI += 8;
+					vI += 2;
+				}
+			}
+		}
+
+		__proto.getData2 = function (vb, ib, start) {
+			this.mVBBuffer = vb;
+			this.mIBBuffer = ib;
+			this._initMyData();
+			vb.appendEx2(this._vs, Float32Array, SkinMesh._tVSLen, 4);
+			this._indexStart = ib._byteLength;
+			var tIB;
+			tIB = SkinMesh._tempIB;
+			if (tIB.length < this._ps.length) {
+				tIB.length = this._ps.length;
+			}
+			for (var i = 0, n = this._ps.length; i < n; i++) {
+				tIB[i] = this._ps[i] + start;
+			}
+			ib.appendEx2(tIB, Uint16Array, this._ps.length, 2);
+		}
+
+		__proto.getData = function (vb, ib, start) {
+			this.mVBBuffer = vb;
+			this.mIBBuffer = ib;
+			vb.append(this.mVBData);
+			this._indexStart = ib._byteLength;
+			if (this.mIBData["start"] != start) {
+				for (var i = 0, n = this._ps.length; i < n; i++) {
+					this.mIBData[i] = this._ps[i] + start;
+				}
+				this.mIBData["start"] = start;
+			}
+			ib.append(this.mIBData);
+		}
+
+		__proto.render = function (context, x, y) {
+			if (Render.isWebGL && this.mTexture) {
+				context._renderKey = 0;
+				context._shader2D.glTexture = null;
+				SkinMeshBuffer.getInstance().addSkinMesh(this);
+				var tempSubmit = Submit.createShape(context, this.mIBBuffer, this.mVBBuffer, this.mEleNum, this._indexStart, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.SKINMESH*/0x200, 0));
+				this.transform || (this.transform = Matrix.EMPTY);
+				this.transform.translate(x, y);
+				Matrix.mul(this.transform, context._curMat, this._tempMatrix);
+				this.transform.translate(-x, -y);
+				var tShaderValue = tempSubmit.shaderValue;
+				var tArray = tShaderValue.u_mmat2 || RenderState2D.getMatrArray();
+				RenderState2D.mat2MatArray(this._tempMatrix, tArray);
+				tShaderValue.textureHost = this.mTexture;
+				tShaderValue.offsetX = 0;
+				tShaderValue.offsetY = 0;
+				tShaderValue.u_mmat2 = tArray;
+				tShaderValue.ALPHA = context._shader2D.ALPHA;
+				context._submits[context._submits._length++] = tempSubmit;
+			}
+			else if (Render.isConchApp && this.mTexture) {
+				this.transform || (this.transform = Matrix.EMPTY);
+				context.setSkinMesh && context.setSkinMesh(x, y, this._ps, this.mVBData, this.mEleNum, 0, this.mTexture, this.transform);
+			}
+		}
+
+		SkinMesh._tempVS = [];
+		SkinMesh._tempIB = [];
+		SkinMesh._defaultPS = null;
+		SkinMesh._tVSLen = 0;
+		return SkinMesh;
+	})()
+
+
+	//class laya.webgl.shader.d2.skinAnishader.SkinMeshBuffer
+	var SkinMeshBuffer = (function () {
+		function SkinMeshBuffer() {
+			this.ib = null;
+			this.vb = null;
+			var gl = WebGL.mainContext;
+			this.ib = IndexBuffer2D.create(/*laya.webgl.WebGLContext.DYNAMIC_DRAW*/0x88E8);
+			this.vb = VertexBuffer2D.create(8);
+		}
+
+		__class(SkinMeshBuffer, 'laya.webgl.shader.d2.skinAnishader.SkinMeshBuffer');
+		var __proto = SkinMeshBuffer.prototype;
+		__proto.addSkinMesh = function (skinMesh) {
+			skinMesh.getData2(this.vb, this.ib, this.vb._byteLength / 32);
+		}
+
+		__proto.reset = function () {
+			this.vb.clear();
+			this.ib.clear();
+		}
+
+		SkinMeshBuffer.getInstance = function () {
+			return SkinMeshBuffer.instance = SkinMeshBuffer.instance || new SkinMeshBuffer();
+		}
+
+		SkinMeshBuffer.instance = null;
+		return SkinMeshBuffer;
+	})()
+
+
+	//此类可以减少代码
+	//class laya.webgl.shapes.BasePoly
+	var BasePoly = (function () {
+		function BasePoly(x, y, width, height, edges, color, borderWidth, borderColor, round) {
+			//this.x=NaN;
+			//this.y=NaN;
+			//this.r=NaN;
+			//this.width=NaN;
+			//this.height=NaN;
+			//this.edges=NaN;
+			this.r0 = 0
+			//this.color=0;
+			//this.borderColor=NaN;
+			//this.borderWidth=NaN;
+			//this.round=0;
+			this.fill = true;
+			//this.mUint16Array=null;
+			//this.mFloat32Array=null;
+			this.r1 = Math.PI / 2;
+			(round === void 0) && (round = 0);
+			this.x = x;
+			this.y = y;
+			this.width = width;
+			this.height = height;
+			this.edges = edges;
+			this.color = color;
+			this.borderWidth = borderWidth;
+			this.borderColor = borderColor;
+		}
+
+		__class(BasePoly, 'laya.webgl.shapes.BasePoly');
+		var __proto = BasePoly.prototype;
+		Laya.imps(__proto, { "laya.webgl.shapes.IShape": true })
+		__proto.getData = function (ib, vb, start) { }
+		__proto.rebuild = function (points) { }
+		__proto.setMatrix = function (mat) { }
+		__proto.needUpdate = function (mat) {
+			return true;
+		}
+
+		__proto.sector = function (outVert, outIndex, start) {
+			var x = this.x, y = this.y, edges = this.edges, seg = (this.r1 - this.r0) / edges;
+			var w = this.width, h = this.height, color = this.color;
+			var r = ((color >> 16) & 0x0000ff) / 255, g = ((color >> 8) & 0xff) / 255, b = (color & 0x0000ff) / 255;
+			outVert.push(x, y, r, g, b);
+			for (var i = 0; i < edges + 1; i++) {
+				outVert.push(x + Math.sin(seg * i + this.r0) * w, y + Math.cos(seg * i + this.r0) * h);
+				outVert.push(r, g, b);
+			}
+			for (i = 0; i < edges; i++) {
+				outIndex.push(start, start + i + 1, start + i + 2);
+			}
+		}
+
+		//用于画线
+		__proto.createLine2 = function (p, indices, lineWidth, len, outVertex, indexCount) {
+			var points = p.concat();
+			var result = outVertex;
+			var color = this.borderColor;
+			var r = ((color >> 16) & 0x0000ff) / 255, g = ((color >> 8) & 0xff) / 255, b = (color & 0x0000ff) / 255;
+			var length = points.length / 2;
+			var iStart = len, w = lineWidth / 2;
+			var px, py, p1x, p1y, p2x, p2y, p3x, p3y;
+			var perpx, perpy, perp2x, perp2y, perp3x, perp3y;
+			var a1, b1, c1, a2, b2, c2;
+			var denom, pdist, dist;
+			p1x = points[0];
+			p1y = points[1];
+			p2x = points[2];
+			p2y = points[3];
+			perpx = -(p1y - p2y);
+			perpy = p1x - p2x;
+			dist = Math.sqrt(perpx * perpx + perpy * perpy);
+			perpx = perpx / dist * w;
+			perpy = perpy / dist * w;
+			result.push(p1x - perpx + this.x, p1y - perpy + this.y, r, g, b, p1x + perpx + this.x, p1y + perpy + this.y, r, g, b);
+			for (var i = 1; i < length - 1; i++) {
+				p1x = points[(i - 1) * 2];
+				p1y = points[(i - 1) * 2 + 1];
+				p2x = points[(i) * 2];
+				p2y = points[(i) * 2 + 1];
+				p3x = points[(i + 1) * 2];
+				p3y = points[(i + 1) * 2 + 1];
+				perpx = -(p1y - p2y);
+				perpy = p1x - p2x;
+				dist = Math.sqrt(perpx * perpx + perpy * perpy);
+				perpx = perpx / dist * w;
+				perpy = perpy / dist * w;
+				perp2x = -(p2y - p3y);
+				perp2y = p2x - p3x;
+				dist = Math.sqrt(perp2x * perp2x + perp2y * perp2y);
+				perp2x = perp2x / dist * w;
+				perp2y = perp2y / dist * w;
+				a1 = (-perpy + p1y) - (-perpy + p2y);
+				b1 = (-perpx + p2x) - (-perpx + p1x);
+				c1 = (-perpx + p1x) * (-perpy + p2y) - (-perpx + p2x) * (-perpy + p1y);
+				a2 = (-perp2y + p3y) - (-perp2y + p2y);
+				b2 = (-perp2x + p2x) - (-perp2x + p3x);
+				c2 = (-perp2x + p3x) * (-perp2y + p2y) - (-perp2x + p2x) * (-perp2y + p3y);
+				denom = a1 * b2 - a2 * b1;
+				if (Math.abs(denom) < 0.1) {
+					denom += 10.1;
+					result.push(p2x - perpx + this.x, p2y - perpy + this.y, r, g, b, p2x + perpx + this.x, p2y + perpy + this.y, r, g, b);
+					continue;
+				}
+				px = (b1 * c2 - b2 * c1) / denom;
+				py = (a2 * c1 - a1 * c2) / denom;
+				pdist = (px - p2x) * (px - p2x) + (py - p2y) + (py - p2y);
+				result.push(px + this.x, py + this.y, r, g, b, p2x - (px - p2x) + this.x, p2y - (py - p2y) + this.y, r, g, b);
+			}
+			p1x = points[points.length - 4];
+			p1y = points[points.length - 3];
+			p2x = points[points.length - 2];
+			p2y = points[points.length - 1];
+			perpx = -(p1y - p2y);
+			perpy = p1x - p2x;
+			dist = Math.sqrt(perpx * perpx + perpy * perpy);
+			perpx = perpx / dist * w;
+			perpy = perpy / dist * w;
+			result.push(p2x - perpx + this.x, p2y - perpy + this.y, r, g, b, p2x + perpx + this.x, p2y + perpy + this.y, r, g, b);
+			var groupLen = indexCount;
+			for (i = 1; i < groupLen; i++) {
+				indices.push(iStart + (i - 1) * 2, iStart + (i - 1) * 2 + 1, iStart + i * 2 + 1, iStart + i * 2 + 1, iStart + i * 2, iStart + (i - 1) * 2);
+			}
+			return result;
+		}
+
+		// /*,outVertex:Array,outIndex:Array*/
+		__proto.createLine = function (p, indices, lineWidth, len) {
+			var points = p.concat();
+			var result = p;
+			var color = this.borderColor;
+			var r = ((color >> 16) & 0x0000ff) / 255, g = ((color >> 8) & 0xff) / 255, b = (color & 0x0000ff) / 255;
+			points.splice(0, 5);
+			var length = points.length / 5;
+			var iStart = len, w = lineWidth / 2;
+			var px, py, p1x, p1y, p2x, p2y, p3x, p3y;
+			var perpx, perpy, perp2x, perp2y, perp3x, perp3y;
+			var a1, b1, c1, a2, b2, c2;
+			var denom, pdist, dist;
+			p1x = points[0];
+			p1y = points[1];
+			p2x = points[5];
+			p2y = points[6];
+			perpx = -(p1y - p2y);
+			perpy = p1x - p2x;
+			dist = Math.sqrt(perpx * perpx + perpy * perpy);
+			perpx = perpx / dist * w;
+			perpy = perpy / dist * w;
+			result.push(p1x - perpx, p1y - perpy, r, g, b, p1x + perpx, p1y + perpy, r, g, b);
+			for (var i = 1; i < length - 1; i++) {
+				p1x = points[(i - 1) * 5];
+				p1y = points[(i - 1) * 5 + 1];
+				p2x = points[(i) * 5];
+				p2y = points[(i) * 5 + 1];
+				p3x = points[(i + 1) * 5];
+				p3y = points[(i + 1) * 5 + 1];
+				perpx = -(p1y - p2y);
+				perpy = p1x - p2x;
+				dist = Math.sqrt(perpx * perpx + perpy * perpy);
+				perpx = perpx / dist * w;
+				perpy = perpy / dist * w;
+				perp2x = -(p2y - p3y);
+				perp2y = p2x - p3x;
+				dist = Math.sqrt(perp2x * perp2x + perp2y * perp2y);
+				perp2x = perp2x / dist * w;
+				perp2y = perp2y / dist * w;
+				a1 = (-perpy + p1y) - (-perpy + p2y);
+				b1 = (-perpx + p2x) - (-perpx + p1x);
+				c1 = (-perpx + p1x) * (-perpy + p2y) - (-perpx + p2x) * (-perpy + p1y);
+				a2 = (-perp2y + p3y) - (-perp2y + p2y);
+				b2 = (-perp2x + p2x) - (-perp2x + p3x);
+				c2 = (-perp2x + p3x) * (-perp2y + p2y) - (-perp2x + p2x) * (-perp2y + p3y);
+				denom = a1 * b2 - a2 * b1;
+				if (Math.abs(denom) < 0.1) {
+					denom += 10.1;
+					result.push(p2x - perpx, p2y - perpy, r, g, b, p2x + perpx, p2y + perpy, r, g, b);
+					continue;
+				}
+				px = (b1 * c2 - b2 * c1) / denom;
+				py = (a2 * c1 - a1 * c2) / denom;
+				pdist = (px - p2x) * (px - p2x) + (py - p2y) + (py - p2y);
+				result.push(px, py, r, g, b, p2x - (px - p2x), p2y - (py - p2y), r, g, b);
+			}
+			p1x = points[points.length - 10];
+			p1y = points[points.length - 9];
+			p2x = points[points.length - 5];
+			p2y = points[points.length - 4];
+			perpx = -(p1y - p2y);
+			perpy = p1x - p2x;
+			dist = Math.sqrt(perpx * perpx + perpy * perpy);
+			perpx = perpx / dist * w;
+			perpy = perpy / dist * w;
+			result.push(p2x - perpx, p2y - perpy, r, g, b, p2x + perpx, p2y + perpy, r, g, b);
+			var groupLen = this.edges + 1;
+			for (i = 1; i < groupLen; i++) {
+				indices.push(iStart + (i - 1) * 2, iStart + (i - 1) * 2 + 1, iStart + i * 2 + 1, iStart + i * 2 + 1, iStart + i * 2, iStart + (i - 1) * 2);
+			}
+			return result;
+		}
+
+		//闭合路径
+		__proto.createLoopLine = function (p, indices, lineWidth, len, outVertex, outIndex) {
+			var points = p.concat();
+			var result = outVertex ? outVertex : p;
+			var color = this.borderColor;
+			var r = ((color >> 16) & 0x0000ff) / 255, g = ((color >> 8) & 0xff) / 255, b = (color & 0x0000ff) / 255;
+			points.splice(0, 5);
+			var firstPoint = [points[0], points[1]];
+			var lastPoint = [points[points.length - 5], points[points.length - 4]];
+			var midPointX = lastPoint[0] + (firstPoint[0] - lastPoint[0]) * 0.5;
+			var midPointY = lastPoint[1] + (firstPoint[1] - lastPoint[1]) * 0.5;
+			points.unshift(midPointX, midPointY, 0, 0, 0);
+			points.push(midPointX, midPointY, 0, 0, 0);
+			var length = points.length / 5;
+			var iStart = len, w = lineWidth / 2;
+			var px, py, p1x, p1y, p2x, p2y, p3x, p3y;
+			var perpx, perpy, perp2x, perp2y, perp3x, perp3y;
+			var a1, b1, c1, a2, b2, c2;
+			var denom, pdist, dist;
+			p1x = points[0];
+			p1y = points[1];
+			p2x = points[5];
+			p2y = points[6];
+			perpx = -(p1y - p2y);
+			perpy = p1x - p2x;
+			dist = Math.sqrt(perpx * perpx + perpy * perpy);
+			perpx = perpx / dist * w;
+			perpy = perpy / dist * w;
+			result.push(p1x - perpx, p1y - perpy, r, g, b, p1x + perpx, p1y + perpy, r, g, b);
+			for (var i = 1; i < length - 1; i++) {
+				p1x = points[(i - 1) * 5];
+				p1y = points[(i - 1) * 5 + 1];
+				p2x = points[(i) * 5];
+				p2y = points[(i) * 5 + 1];
+				p3x = points[(i + 1) * 5];
+				p3y = points[(i + 1) * 5 + 1];
+				perpx = -(p1y - p2y);
+				perpy = p1x - p2x;
+				dist = Math.sqrt(perpx * perpx + perpy * perpy);
+				perpx = perpx / dist * w;
+				perpy = perpy / dist * w;
+				perp2x = -(p2y - p3y);
+				perp2y = p2x - p3x;
+				dist = Math.sqrt(perp2x * perp2x + perp2y * perp2y);
+				perp2x = perp2x / dist * w;
+				perp2y = perp2y / dist * w;
+				a1 = (-perpy + p1y) - (-perpy + p2y);
+				b1 = (-perpx + p2x) - (-perpx + p1x);
+				c1 = (-perpx + p1x) * (-perpy + p2y) - (-perpx + p2x) * (-perpy + p1y);
+				a2 = (-perp2y + p3y) - (-perp2y + p2y);
+				b2 = (-perp2x + p2x) - (-perp2x + p3x);
+				c2 = (-perp2x + p3x) * (-perp2y + p2y) - (-perp2x + p2x) * (-perp2y + p3y);
+				denom = a1 * b2 - a2 * b1;
+				if (Math.abs(denom) < 0.1) {
+					denom += 10.1;
+					result.push(p2x - perpx, p2y - perpy, r, g, b, p2x + perpx, p2y + perpy, r, g, b);
+					continue;
+				}
+				px = (b1 * c2 - b2 * c1) / denom;
+				py = (a2 * c1 - a1 * c2) / denom;
+				pdist = (px - p2x) * (px - p2x) + (py - p2y) + (py - p2y);
+				result.push(px, py, r, g, b, p2x - (px - p2x), p2y - (py - p2y), r, g, b);
+			}
+			if (outIndex) {
+				indices = outIndex;
+			};
+			var groupLen = this.edges + 1;
+			for (i = 1; i < groupLen; i++) {
+				indices.push(iStart + (i - 1) * 2, iStart + (i - 1) * 2 + 1, iStart + i * 2 + 1, iStart + i * 2 + 1, iStart + i * 2, iStart + (i - 1) * 2);
+			}
+			indices.push(iStart + (i - 1) * 2, iStart + (i - 1) * 2 + 1, iStart + 1, iStart + 1, iStart, iStart + (i - 1) * 2);
+			return result;
+		}
+
+		return BasePoly;
+	})()
+
+
+	//class laya.webgl.shapes.GeometryData
+	var GeometryData = (function () {
+		function GeometryData(lineWidth, lineColor, lineAlpha, fillColor, fillAlpha, fill, shape) {
+			//this.lineWidth=NaN;
+			//this.lineColor=NaN;
+			//this.lineAlpha=NaN;
+			//this.fillColor=NaN;
+			//this.fillAlpha=NaN;
+			//this.shape=null;
+			//this.fill=false;
+			this.lineWidth = lineWidth;
+			this.lineColor = lineColor;
+			this.lineAlpha = lineAlpha;
+			this.fillColor = fillColor;
+			this.fillAlpha = fillAlpha;
+			this.shape = shape;
+			this.fill = fill;
+		}
+
+		__class(GeometryData, 'laya.webgl.shapes.GeometryData');
+		var __proto = GeometryData.prototype;
+		__proto.clone = function () {
+			return new GeometryData(this.lineWidth, this.lineColor, this.lineAlpha, this.fillColor, this.fillAlpha, this.fill, this.shape);
+		}
+
+		__proto.getIndexData = function () {
+			return null;
+		}
+
+		__proto.getVertexData = function () {
+			return null;
+		}
+
+		__proto.destroy = function () {
+			this.shape = null;
+		}
+
+		return GeometryData;
+	})()
+
+
+	//class laya.webgl.shapes.Vertex
+	var Vertex = (function () {
+		function Vertex(p) {
+			//this.points=null;
+			if ((p instanceof Float32Array))
+				this.points = p;
+			else if ((p instanceof Array)) {
+				var len = p.length;
+				this.points = new Float32Array(p);
+			}
+		}
+
+		__class(Vertex, 'laya.webgl.shapes.Vertex');
+		var __proto = Vertex.prototype;
+		Laya.imps(__proto, { "laya.webgl.shapes.IShape": true })
+		__proto.getData = function (ib, vb, start) { }
+		__proto.needUpdate = function (mat) {
+			return false;
+		}
+
+		__proto.rebuild = function (points) { }
+		// TODO Auto Generated method stub
+		__proto.setMatrix = function (mat) { }
+		return Vertex;
+	})()
+
+
+	//class laya.webgl.submit.Submit
+	var Submit = (function () {
+		function Submit(renderType) {
+			//this._selfVb=null;
+			//this._ib=null;
+			//this._blendFn=null;
+			//this._renderType=0;
+			//this._vb=null;
+			// 从VB中什么地方开始画，画到哪
+			//this._startIdx=0;
+			//this._numEle=0;
+			//this.shaderValue=null;
+			(renderType === void 0) && (renderType = 10000);
+			this._renderType = renderType;
+		}
+
+		__class(Submit, 'laya.webgl.submit.Submit');
+		var __proto = Submit.prototype;
+		Laya.imps(__proto, { "laya.webgl.submit.ISubmit": true })
+		__proto.releaseRender = function () {
+			var cache = Submit._cache;
+			cache[cache._length++] = this;
+			this.shaderValue.release();
+			this._vb = null;
+		}
+
+		__proto.getRenderType = function () {
+			return this._renderType;
+		}
+
+		__proto.renderSubmit = function () {
+			if (this._numEle === 0) return 1;
+			var _tex = this.shaderValue.textureHost;
+			if (_tex) {
+				var source = _tex.source;
+				if (!_tex.bitmap || !source)
+					return 1;
+				this.shaderValue.texture = source;
+			}
+			this._vb.bind_upload(this._ib);
+			var gl = WebGL.mainContext;
+			this.shaderValue.upload();
+			if (BlendMode.activeBlendFunction !== this._blendFn) {
+				gl.enable(/*laya.webgl.WebGLContext.BLEND*/0x0BE2);
+				this._blendFn(gl);
+				BlendMode.activeBlendFunction = this._blendFn;
+			}
+			Stat.drawCall++;
+			Stat.trianglesFaces += this._numEle / 3;
+			gl.drawElements(/*laya.webgl.WebGLContext.TRIANGLES*/0x0004, this._numEle,/*laya.webgl.WebGLContext.UNSIGNED_SHORT*/0x1403, this._startIdx);
+			return 1;
+		}
+
+		Submit.__init__ = function () {
+			var s = Submit.RENDERBASE = new Submit(-1);
+			s.shaderValue = new Value2D(0, 0);
+			s.shaderValue.ALPHA = -1234;
+		}
+
+		Submit.createSubmit = function (context, ib, vb, pos, sv) {
+			var o = Submit._cache._length ? Submit._cache[--Submit._cache._length] : new Submit();
+			if (vb == null) {
+				vb = o._selfVb || (o._selfVb = VertexBuffer2D.create(-1));
+				vb.clear();
+				pos = 0;
+			}
+			o._ib = ib;
+			o._vb = vb;
+			o._startIdx = pos * CONST3D2D.BYTES_PIDX;
+			o._numEle = 0;
+			var blendType = context._nBlendType;
+			o._blendFn = context._targets ? BlendMode.targetFns[blendType] : BlendMode.fns[blendType];
+			o.shaderValue = sv;
+			o.shaderValue.setValue(context._shader2D);
+			var filters = context._shader2D.filters;
+			filters && o.shaderValue.setFilters(filters);
+			return o;
+		}
+
+		Submit.createShape = function (ctx, ib, vb, numEle, offset, sv) {
+			var o = (!Submit._cache._length) ? (new Submit()) : Submit._cache[--Submit._cache._length];
+			o._ib = ib;
+			o._vb = vb;
+			o._numEle = numEle;
+			o._startIdx = offset;
+			o.shaderValue = sv;
+			o.shaderValue.setValue(ctx._shader2D);
+			var blendType = ctx._nBlendType;
+			o._blendFn = ctx._targets ? BlendMode.targetFns[blendType] : BlendMode.fns[blendType];
+			return o;
+		}
+
+		Submit.TYPE_2D = 10000;
+		Submit.TYPE_CANVAS = 10003;
+		Submit.TYPE_CMDSETRT = 10004;
+		Submit.TYPE_CUSTOM = 10005;
+		Submit.TYPE_BLURRT = 10006;
+		Submit.TYPE_CMDDESTORYPRERT = 10007;
+		Submit.TYPE_DISABLESTENCIL = 10008;
+		Submit.TYPE_OTHERIBVB = 10009;
+		Submit.TYPE_PRIMITIVE = 10010;
+		Submit.TYPE_RT = 10011;
+		Submit.TYPE_BLUR_RT = 10012;
+		Submit.TYPE_TARGET = 10013;
+		Submit.TYPE_CHANGE_VALUE = 10014;
+		Submit.TYPE_SHAPE = 10015;
+		Submit.TYPE_TEXTURE = 10016;
+		Submit.TYPE_FILLTEXTURE = 10017;
+		Submit.RENDERBASE = null;
+		__static(Submit,
+			['_cache', function () { return this._cache = (Submit._cache = [], Submit._cache._length = 0, Submit._cache); }
+			]);
+		return Submit;
+	})()
+
+
+	//class laya.webgl.submit.SubmitCMD
+	var SubmitCMD = (function () {
+		function SubmitCMD() {
+			this.fun = null;
+			this.args = null;
+		}
+
+		__class(SubmitCMD, 'laya.webgl.submit.SubmitCMD');
+		var __proto = SubmitCMD.prototype;
+		Laya.imps(__proto, { "laya.webgl.submit.ISubmit": true })
+		__proto.renderSubmit = function () {
+			this.fun.apply(null, this.args);
+			return 1;
+		}
+
+		__proto.getRenderType = function () {
+			return 0;
+		}
+
+		__proto.releaseRender = function () {
+			var cache = SubmitCMD._cache;
+			cache[cache._length++] = this;
+		}
+
+		SubmitCMD.create = function (args, fun) {
+			var o = SubmitCMD._cache._length ? SubmitCMD._cache[--SubmitCMD._cache._length] : new SubmitCMD();
+			o.fun = fun;
+			o.args = args;
+			return o;
+		}
+
+		__static(SubmitCMD,
+			['_cache', function () { return this._cache = (SubmitCMD._cache = [], SubmitCMD._cache._length = 0, SubmitCMD._cache); }
+			]);
+		return SubmitCMD;
+	})()
+
+
+	//class laya.webgl.submit.SubmitCMDScope
+	var SubmitCMDScope = (function () {
+		function SubmitCMDScope() {
+			this.variables = {};
+		}
+
+		__class(SubmitCMDScope, 'laya.webgl.submit.SubmitCMDScope');
+		var __proto = SubmitCMDScope.prototype;
+		__proto.getValue = function (name) {
+			return this.variables[name];
+		}
+
+		__proto.addValue = function (name, value) {
+			return this.variables[name] = value;
+		}
+
+		__proto.setValue = function (name, value) {
+			if (this.variables.hasOwnProperty(name)) {
+				return this.variables[name] = value;
+			}
+			return null;
+		}
+
+		__proto.clear = function () {
+			for (var key in this.variables) {
+				delete this.variables[key];
+			}
+		}
+
+		__proto.recycle = function () {
+			this.clear();
+			SubmitCMDScope.POOL.push(this);
+		}
+
+		SubmitCMDScope.create = function () {
+			var scope = SubmitCMDScope.POOL.pop();
+			scope || (scope = new SubmitCMDScope());
+			return scope;
+		}
+
+		SubmitCMDScope.POOL = [];
+		return SubmitCMDScope;
+	})()
+
+
+	//class laya.webgl.submit.SubmitOtherIBVB
+	var SubmitOtherIBVB = (function () {
+		function SubmitOtherIBVB() {
+			this.offset = 0;
+			//this._vb=null;
+			//this._ib=null;
+			//this._blendFn=null;
+			//this._mat=null;
+			//this._shader=null;
+			//this._shaderValue=null;
+			//this._numEle=0;
+			this.startIndex = 0;
+			;
+			this._mat = Matrix.create();
+		}
+
+		__class(SubmitOtherIBVB, 'laya.webgl.submit.SubmitOtherIBVB');
+		var __proto = SubmitOtherIBVB.prototype;
+		Laya.imps(__proto, { "laya.webgl.submit.ISubmit": true })
+		__proto.releaseRender = function () {
+			var cache = SubmitOtherIBVB._cache;
+			cache[cache._length++] = this;
+		}
+
+		__proto.getRenderType = function () {
+			return /*laya.webgl.submit.Submit.TYPE_OTHERIBVB*/10009;
+		}
+
+		__proto.renderSubmit = function () {
+			var _tex = this._shaderValue.textureHost;
+			if (_tex) {
+				var source = _tex.source;
+				if (!_tex.bitmap || !source)
+					return 1;
+				this._shaderValue.texture = source;
+			}
+			this._vb.bind_upload(this._ib);
+			var w = RenderState2D.worldMatrix4;
+			var wmat = Matrix.TEMP;
+			Matrix.mulPre(this._mat, w[0], w[1], w[4], w[5], w[12], w[13], wmat);
+			var tmp = RenderState2D.worldMatrix4 = SubmitOtherIBVB.tempMatrix4;
+			tmp[0] = wmat.a;
+			tmp[1] = wmat.b;
+			tmp[4] = wmat.c;
+			tmp[5] = wmat.d;
+			tmp[12] = wmat.tx;
+			tmp[13] = wmat.ty;
+			this._shader._offset = this.offset;
+			this._shaderValue.refresh();
+			this._shader.upload(this._shaderValue);
+			this._shader._offset = 0;
+			var gl = WebGL.mainContext;
+			if (BlendMode.activeBlendFunction !== this._blendFn) {
+				gl.enable(/*laya.webgl.WebGLContext.BLEND*/0x0BE2);
+				this._blendFn(gl);
+				BlendMode.activeBlendFunction = this._blendFn;
+			}
+			Stat.drawCall++;
+			Stat.trianglesFaces += this._numEle / 3;
+			gl.drawElements(/*laya.webgl.WebGLContext.TRIANGLES*/0x0004, this._numEle,/*laya.webgl.WebGLContext.UNSIGNED_SHORT*/0x1403, this.startIndex);
+			RenderState2D.worldMatrix4 = w;
+			BaseShader.activeShader = null;
+			return 1;
+		}
+
+		SubmitOtherIBVB.create = function (context, vb, ib, numElement, shader, shaderValue, startIndex, offset, type) {
+			(type === void 0) && (type = 0);
+			var o = (!SubmitOtherIBVB._cache._length) ? (new SubmitOtherIBVB()) : SubmitOtherIBVB._cache[--SubmitOtherIBVB._cache._length];
+			o._ib = ib;
+			o._vb = vb;
+			o._numEle = numElement;
+			o._shader = shader;
+			o._shaderValue = shaderValue;
+			var blendType = context._nBlendType;
+			o._blendFn = context._targets ? BlendMode.targetFns[blendType] : BlendMode.fns[blendType];
+			switch (type) {
+				case 0:
+					o.offset = 0;
+					o.startIndex = offset / (CONST3D2D.BYTES_PE * vb.vertexStride) * 1.5;
+					o.startIndex *= CONST3D2D.BYTES_PIDX;
+					break;
+				case 1:
+					o.startIndex = startIndex;
+					o.offset = offset;
+					break;
+			}
+			return o;
+		}
+
+		__static(SubmitOtherIBVB,
+			['_cache', function () { return this._cache = (SubmitOtherIBVB._cache = [], SubmitOtherIBVB._cache._length = 0, SubmitOtherIBVB._cache); }, 'tempMatrix4', function () { return this.tempMatrix4 = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1,]; }
+			]);
+		return SubmitOtherIBVB;
+	})()
+
+
+	//class laya.webgl.submit.SubmitScissor
+	var SubmitScissor = (function () {
+		function SubmitScissor() {
+			this.submitIndex = 0;
+			this.submitLength = 0;
+			this.context = null;
+			this.clipRect = new Rectangle();
+			this.screenRect = new Rectangle();
+		}
+
+		__class(SubmitScissor, 'laya.webgl.submit.SubmitScissor');
+		var __proto = SubmitScissor.prototype;
+		Laya.imps(__proto, { "laya.webgl.submit.ISubmit": true })
+		__proto._scissor = function (x, y, w, h) {
+			var m = RenderState2D.worldMatrix4;
+			var a = m[0], d = m[5], tx = m[12], ty = m[13];
+			x = x * a + tx;
+			y = y * d + ty;
+			w *= a;
+			h *= d;
+			if (w < 1 || h < 1) {
+				return false;
+			};
+			var r = x + w;
+			var b = y + h;
+			x < 0 && (x = 0, w = r - x);
+			y < 0 && (y = 0, h = b - y);
+			var screen = RenderState2D.worldClipRect;
+			x = Math.max(x, screen.x);
+			y = Math.max(y, screen.y);
+			w = Math.min(r, screen.right) - x;
+			h = Math.min(b, screen.bottom) - y;
+			if (w < 1 || h < 1) {
+				return false;
+			};
+			var worldScissorTest = RenderState2D.worldScissorTest;
+			this.screenRect.copyFrom(screen);
+			screen.x = x;
+			screen.y = y;
+			screen.width = w;
+			screen.height = h;
+			RenderState2D.worldScissorTest = true;
+			y = RenderState2D.height - y - h;
+			WebGL.mainContext.scissor(x, y, w, h);
+			WebGL.mainContext.enable(/*laya.webgl.WebGLContext.SCISSOR_TEST*/0x0C11);
+			this.context.submitElement(this.submitIndex, this.submitIndex + this.submitLength);
+			if (worldScissorTest) {
+				y = RenderState2D.height - this.screenRect.y - this.screenRect.height;
+				WebGL.mainContext.scissor(this.screenRect.x, y, this.screenRect.width, this.screenRect.height);
+				WebGL.mainContext.enable(/*laya.webgl.WebGLContext.SCISSOR_TEST*/0x0C11);
+			}
+			else {
+				WebGL.mainContext.disable(/*laya.webgl.WebGLContext.SCISSOR_TEST*/0x0C11);
+				RenderState2D.worldScissorTest = false;
+			}
+			screen.copyFrom(this.screenRect);
+			return true;
+		}
+
+		__proto._scissorWithTagart = function (x, y, w, h) {
+			if (w < 1 || h < 1) {
+				return false;
+			};
+			var r = x + w;
+			var b = y + h;
+			x < 0 && (x = 0, w = r - x);
+			y < 0 && (y = 0, h = b - y);
+			var screen = RenderState2D.worldClipRect;
+			x = Math.max(x, screen.x);
+			y = Math.max(y, screen.y);
+			w = Math.min(r, screen.right) - x;
+			h = Math.min(b, screen.bottom) - y;
+			if (w < 1 || h < 1) {
+				return false;
+			};
+			var worldScissorTest = RenderState2D.worldScissorTest;
+			this.screenRect.copyFrom(screen);
+			RenderState2D.worldScissorTest = true;
+			screen.x = x;
+			screen.y = y;
+			screen.width = w;
+			screen.height = h;
+			y = RenderState2D.height - y - h;
+			WebGL.mainContext.scissor(x, y, w, h);
+			WebGL.mainContext.enable(/*laya.webgl.WebGLContext.SCISSOR_TEST*/0x0C11);
+			this.context.submitElement(this.submitIndex, this.submitIndex + this.submitLength);
+			if (worldScissorTest) {
+				y = RenderState2D.height - this.screenRect.y - this.screenRect.height;
+				WebGL.mainContext.scissor(this.screenRect.x, y, this.screenRect.width, this.screenRect.height);
+				WebGL.mainContext.enable(/*laya.webgl.WebGLContext.SCISSOR_TEST*/0x0C11);
+			}
+			else {
+				WebGL.mainContext.disable(/*laya.webgl.WebGLContext.SCISSOR_TEST*/0x0C11);
+				RenderState2D.worldScissorTest = false;
+			}
+			screen.copyFrom(this.screenRect);
+			return true;
+		}
+
+		__proto.renderSubmit = function () {
+			this.submitLength = Math.min(this.context._submits._length - 1, this.submitLength);
+			if (this.submitLength < 1 || this.clipRect.width < 1 || this.clipRect.height < 1)
+				return this.submitLength + 1;
+			if (this.context._targets)
+				this._scissorWithTagart(this.clipRect.x, this.clipRect.y, this.clipRect.width, this.clipRect.height);
+			else this._scissor(this.clipRect.x, this.clipRect.y, this.clipRect.width, this.clipRect.height);
+			return this.submitLength + 1;
+		}
+
+		__proto.getRenderType = function () {
+			return 0;
+		}
+
+		__proto.releaseRender = function () {
+			var cache = SubmitScissor._cache;
+			cache[cache._length++] = this;
+			this.context = null;
+		}
+
+		SubmitScissor.create = function (context) {
+			var o = SubmitScissor._cache._length ? SubmitScissor._cache[--SubmitScissor._cache._length] : new SubmitScissor();
+			o.context = context;
+			return o;
+		}
+
+		__static(SubmitScissor,
+			['_cache', function () { return this._cache = (SubmitScissor._cache = [], SubmitScissor._cache._length = 0, SubmitScissor._cache); }
+			]);
+		return SubmitScissor;
+	})()
+
+
+	//class laya.webgl.submit.SubmitStencil
+	var SubmitStencil = (function () {
+		function SubmitStencil() {
+			this.step = 0;
+			this.blendMode = null;
+			this.level = 0;
+		}
+
+		__class(SubmitStencil, 'laya.webgl.submit.SubmitStencil');
+		var __proto = SubmitStencil.prototype;
+		Laya.imps(__proto, { "laya.webgl.submit.ISubmit": true })
+		__proto.renderSubmit = function () {
+			switch (this.step) {
+				case 1:
+					this.do1();
+					break;
+				case 2:
+					this.do2();
+					break;
+				case 3:
+					this.do3();
+					break;
+				case 4:
+					this.do4();
+					break;
+				case 5:
+					this.do5();
+					break;
+				case 6:
+					this.do6();
+					break;
+				case 7:
+					this.do7();
+					break;
+				case 8:
+					this.do8();
+					break;
+			}
+			return 1;
+		}
+
+		__proto.getRenderType = function () {
+			return 0;
+		}
+
+		__proto.releaseRender = function () {
+			var cache = SubmitStencil._cache;
+			cache[cache._length++] = this;
+		}
+
+		__proto.do1 = function () {
+			var gl = WebGL.mainContext;
+			gl.enable(/*laya.webgl.WebGLContext.STENCIL_TEST*/0x0B90);
+			gl.clear(/*laya.webgl.WebGLContext.STENCIL_BUFFER_BIT*/0x00000400);
+			gl.colorMask(false, false, false, false);
+			gl.stencilFunc(/*laya.webgl.WebGLContext.EQUAL*/0x0202, this.level, 0xFF);
+			gl.stencilOp(/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.INCR*/0x1E02);
+		}
+
+		//gl.stencilOp(WebGLContext.KEEP,WebGLContext.KEEP,WebGLContext.INVERT);//测试通过给模版缓冲 写入值 一开始是0 现在是 0xFF (模版缓冲中不知道是多少位的数据)
+		__proto.do2 = function () {
+			var gl = WebGL.mainContext;
+			gl.stencilFunc(/*laya.webgl.WebGLContext.EQUAL*/0x0202, this.level + 1, 0xFF);
+			gl.colorMask(true, true, true, true);
+			gl.stencilOp(/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.KEEP*/0x1E00);
+		}
+
+		__proto.do3 = function () {
+			var gl = WebGL.mainContext;
+			gl.colorMask(true, true, true, true);
+			gl.stencilOp(/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.KEEP*/0x1E00);
+			gl.clear(/*laya.webgl.WebGLContext.STENCIL_BUFFER_BIT*/0x00000400);
+			gl.disable(/*laya.webgl.WebGLContext.STENCIL_TEST*/0x0B90);
+		}
+
+		__proto.do4 = function () {
+			var gl = WebGL.mainContext;
+			if (this.level == 0) {
+				gl.enable(/*laya.webgl.WebGLContext.STENCIL_TEST*/0x0B90);
+				gl.clear(/*laya.webgl.WebGLContext.STENCIL_BUFFER_BIT*/0x00000400);
+			}
+			gl.colorMask(false, false, false, false);
+			gl.stencilFunc(/*laya.webgl.WebGLContext.ALWAYS*/0x0207, 0, 0xFF);
+			gl.stencilOp(/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.INCR*/0x1E02);
+		}
+
+		__proto.do5 = function () {
+			var gl = WebGL.mainContext;
+			gl.stencilFunc(/*laya.webgl.WebGLContext.EQUAL*/0x0202, this.level, 0xFF);
+			gl.colorMask(true, true, true, true);
+			gl.stencilOp(/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.KEEP*/0x1E00);
+		}
+
+		__proto.do6 = function () {
+			var gl = WebGL.mainContext;
+			BlendMode.targetFns[BlendMode.TOINT[this.blendMode]](gl);
+		}
+
+		__proto.do7 = function () {
+			var gl = WebGL.mainContext;
+			gl.colorMask(false, false, false, false);
+			gl.stencilOp(/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.DECR*/0x1E03);
+		}
+
+		__proto.do8 = function () {
+			var gl = WebGL.mainContext;
+			gl.colorMask(true, true, true, true);
+			gl.stencilFunc(/*laya.webgl.WebGLContext.EQUAL*/0x0202, this.level, 0xFF);
+			gl.stencilOp(/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.KEEP*/0x1E00,/*laya.webgl.WebGLContext.KEEP*/0x1E00);
+		}
+
+		SubmitStencil.restore = function (context, clip, m, _x, _y) {
+			var submitStencil;
+			context._renderKey = 0;
+			if (SubmitStencil._mask > 0) {
+				SubmitStencil._mask--;
+			}
+			if (SubmitStencil._mask == 0) {
+				submitStencil = laya.webgl.submit.SubmitStencil.create(3);
+				context.addRenderObject(submitStencil);
+				context._curSubmit = Submit.RENDERBASE;
+			}
+			else {
+				submitStencil = laya.webgl.submit.SubmitStencil.create(7);
+				context.addRenderObject(submitStencil);
+				var vb = context._vb;
+				var nPos = (vb._byteLength >> 2);
+				if (GlUtils.fillRectImgVb(vb, null, clip.x, clip.y, clip.width, clip.height, Texture.DEF_UV, m, _x, _y, 0, 0)) {
+					var shader = context._shader2D;
+					shader.glTexture = null;
+					var submit = context._curSubmit = Submit.createSubmit(context, context._ib, vb, ((vb._byteLength -/*laya.webgl.canvas.WebGLContext2D._RECTVBSIZE*/16 */*laya.webgl.utils.Buffer2D.FLOAT32*/4) / 32) * 3, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.COLOR2D*/0x02, 0));
+					submit.shaderValue.ALPHA = 1.0;
+					context._submits[context._submits._length++] = submit;
+					context._curSubmit._numEle += 6;
+					context._curSubmit = Submit.RENDERBASE;
+				} else {
+					alert("clipRect calc stencil rect error");
+				}
+				submitStencil = laya.webgl.submit.SubmitStencil.create(8);
+				context.addRenderObject(submitStencil);
+			}
+		}
+
+		SubmitStencil.restore2 = function (context, submit) {
+			var submitStencil;
+			context._renderKey = 0;
+			if (SubmitStencil._mask > 0) {
+				SubmitStencil._mask--;
+			}
+			if (SubmitStencil._mask == 0) {
+				submitStencil = laya.webgl.submit.SubmitStencil.create(3);
+				context.addRenderObject(submitStencil);
+				context._curSubmit = Submit.RENDERBASE;
+			}
+			else {
+				submitStencil = laya.webgl.submit.SubmitStencil.create(7);
+				context.addRenderObject(submitStencil);
+				context._submits[context._submits._length++] = submit;
+				submitStencil = laya.webgl.submit.SubmitStencil.create(8);
+				context.addRenderObject(submitStencil);
+			}
+		}
+
+		SubmitStencil.create = function (step) {
+			var o = SubmitStencil._cache._length ? SubmitStencil._cache[--SubmitStencil._cache._length] : new SubmitStencil();
+			o.step = step;
+			if (step == 5)
+				++SubmitStencil._mask;
+			o.level = SubmitStencil._mask;
+			return o;
+		}
+
+		SubmitStencil._mask = 0;
+		__static(SubmitStencil,
+			['_cache', function () { return this._cache = (SubmitStencil._cache = [], SubmitStencil._cache._length = 0, SubmitStencil._cache); }
+			]);
+		return SubmitStencil;
+	})()
+
+
+	//class laya.webgl.submit.SubmitTarget
+	var SubmitTarget = (function () {
+		function SubmitTarget() {
+			this._renderType = 0;
+			this._vb = null;
+			this._ib = null;
+			this._startIdx = 0;
+			this._numEle = 0;
+			this.shaderValue = null;
+			this.blendType = 0;
+			this.proName = null;
+			this.scope = null;
+		}
+
+		__class(SubmitTarget, 'laya.webgl.submit.SubmitTarget');
+		var __proto = SubmitTarget.prototype;
+		Laya.imps(__proto, { "laya.webgl.submit.ISubmit": true })
+		__proto.renderSubmit = function () {
+			this._vb.bind_upload(this._ib);
+			var target = this.scope.getValue(this.proName);
+			if (target) {
+				this.shaderValue.texture = target.source;
+				if (this.shaderValue["strength"] && !this.shaderValue["blurInfo"]) {
+					this.shaderValue["blurInfo"] = [target.width, target.height];
+				}
+				this.shaderValue.upload();
+				this.blend();
+				Stat.drawCall++;
+				Stat.trianglesFaces += this._numEle / 3;
+				WebGL.mainContext.drawElements(/*laya.webgl.WebGLContext.TRIANGLES*/0x0004, this._numEle,/*laya.webgl.WebGLContext.UNSIGNED_SHORT*/0x1403, this._startIdx);
+			}
+			return 1;
+		}
+
+		__proto.blend = function () {
+			if (BlendMode.activeBlendFunction !== BlendMode.fns[this.blendType]) {
+				var gl = WebGL.mainContext;
+				gl.enable(/*laya.webgl.WebGLContext.BLEND*/0x0BE2);
+				BlendMode.fns[this.blendType](gl);
+				BlendMode.activeBlendFunction = BlendMode.fns[this.blendType];
+			}
+		}
+
+		__proto.getRenderType = function () {
+			return 0;
+		}
+
+		__proto.releaseRender = function () {
+			var cache = SubmitTarget._cache;
+			cache[cache._length++] = this;
+		}
+
+		SubmitTarget.create = function (context, ib, vb, pos, sv, proName) {
+			var o = SubmitTarget._cache._length ? SubmitTarget._cache[--SubmitTarget._cache._length] : new SubmitTarget();
+			o._ib = ib;
+			o._vb = vb;
+			o.proName = proName;
+			o._startIdx = pos * CONST3D2D.BYTES_PIDX;
+			o._numEle = 0;
+			o.blendType = context._nBlendType;
+			o.shaderValue = sv;
+			o.shaderValue.setValue(context._shader2D);
+			return o;
+		}
+
+		__static(SubmitTarget,
+			['_cache', function () { return this._cache = (SubmitTarget._cache = [], SubmitTarget._cache._length = 0, SubmitTarget._cache); }
+			]);
+		return SubmitTarget;
+	})()
+
+
+	/**
+	*...特殊的字符，如泰文，必须重新实现这个类
+	*/
+	//class laya.webgl.text.CharSegment
+	var CharSegment = (function () {
+		function CharSegment() {
+			this._sourceStr = null;
+		}
+
+		__class(CharSegment, 'laya.webgl.text.CharSegment');
+		var __proto = CharSegment.prototype;
+		Laya.imps(__proto, { "laya.webgl.text.ICharSegment": true })
+		__proto.textToSpit = function (str) {
+			this._sourceStr = str;
+		}
+
+		__proto.getChar = function (i) {
+			return this._sourceStr.charAt(i);
+		}
+
+		__proto.getCharCode = function (i) {
+			return this._sourceStr.charCodeAt(i);
+		}
+
+		__proto.length = function () {
+			return this._sourceStr.length;
+		}
+
+		return CharSegment;
+	})()
+
+
+	//class laya.webgl.text.DrawText
+	var DrawText = (function () {
+		var CharValue;
+		function DrawText() { }
+		__class(DrawText, 'laya.webgl.text.DrawText');
+		DrawText.__init__ = function () {
+			DrawText._charsTemp = new Array;
+			DrawText._drawValue = new CharValue();
+			DrawText._charSeg = new CharSegment();
+		}
+
+		DrawText.customCharSeg = function (charseg) {
+			DrawText._charSeg = charseg;
+		}
+
+		DrawText.getChar = function (char, id, drawValue) {
+			var result = WebGLCharImage.createOneChar(char, drawValue);
+			if (id != -1)
+				DrawText._charsCache[id] = result;
+			return result;
+		}
+
+		DrawText._drawSlow = function (save, ctx, txt, words, curMat, font, textAlign, fillColor, borderColor, lineWidth, x, y, sx, sy, underLine) {
+			var drawValue = DrawText._drawValue.value(font, fillColor, borderColor, lineWidth, sx, sy, underLine);
+			var i = 0, n = 0;
+			var chars = DrawText._charsTemp;
+			var width = 0, oneChar, htmlWord, id = NaN;
+			if (words) {
+				chars.length = words.length;
+				for (i = 0, n = words.length; i < n; i++) {
+					htmlWord = words[i];
+					id = htmlWord.charNum + drawValue.txtID;
+					chars[i] = oneChar = DrawText._charsCache[id] || DrawText.getChar(htmlWord.char, id, drawValue);
+					oneChar.active();
+				}
+			} else {
+				var text = ((txt instanceof laya.utils.WordText)) ? txt.toString() : txt;
+				if (Text.CharacterCache) {
+					DrawText._charSeg.textToSpit(text);
+					var len =/*if err,please use iflash.method.xmlLength()*/DrawText._charSeg.length();
+					chars.length = len;
+					for (i = 0, n = len; i < n; i++) {
+						id = DrawText._charSeg.getCharCode(i) + drawValue.txtID;
+						chars[i] = oneChar = DrawText._charsCache[id] || DrawText.getChar(DrawText._charSeg.getChar(i), id, drawValue);
+						oneChar.active();
+						width += oneChar.cw;
+					}
+				}
+				else {
+					chars.length = 0;
+					oneChar = DrawText.getChar(text, -1, drawValue);
+					oneChar.active();
+					width += oneChar.cw;
+					chars[0] = oneChar;
+				}
+			};
+			var dx = 0;
+			if (textAlign !== null && textAlign !== "left")
+				dx = -(textAlign == "center" ? (width / 2) : width);
+			var uv, bdSz = NaN, texture, value, saveLength = 0;
+			if (words) {
+				for (i = 0, n = chars.length; i < n; i++) {
+					oneChar = chars[i];
+					if (!oneChar.isSpace) {
+						htmlWord = words[i];
+						bdSz = oneChar.borderSize;
+						texture = oneChar.texture;
+						ctx._drawText(texture, x + dx + htmlWord.x * sx - bdSz, y + htmlWord.y * sy - bdSz, texture.width, texture.height, curMat, 0, 0, 0, 0);
+					}
+				}
+			} else {
+				for (i = 0, n = chars.length; i < n; i++) {
+					oneChar = chars[i];
+					if (!oneChar.isSpace) {
+						bdSz = oneChar.borderSize;
+						texture = oneChar.texture;
+						ctx._drawText(texture, x + dx - bdSz, y - bdSz, texture.width, texture.height, curMat, 0, 0, 0, 0);
+						save && (value = save[saveLength++], value || (value = save[saveLength - 1] = []), value[0] = texture, value[1] = dx - bdSz, value[2] = -bdSz);
+					}
+					dx += oneChar.cw;
+				}
+				save && (save.length = saveLength);
+			}
+		}
+
+		DrawText._drawFast = function (save, ctx, curMat, x, y) {
+			var texture, value;
+			for (var i = 0, n = save.length; i < n; i++) {
+				value = save[i];
+				texture = value[0];
+				texture.active();
+				ctx._drawText(texture, x + value[1], y + value[2], texture.width, texture.height, curMat, 0, 0, 0, 0);
+			}
+		}
+
+		DrawText.drawText = function (ctx, txt, words, curMat, font, textAlign, fillColor, borderColor, lineWidth, x, y, underLine) {
+			(underLine === void 0) && (underLine = 0);
+			if ((txt && txt.length === 0) || (words && words.length === 0))
+				return;
+			var sx = curMat.a, sy = curMat.d;
+			(curMat.b !== 0 || curMat.c !== 0) && (sx = sy = 1);
+			var scale = sx !== 1 || sy !== 1;
+			if (scale && Laya.stage.transform) {
+				var t = Laya.stage.transform;
+				scale = t.a === sx && t.d === sy;
+			} else scale = false;
+			if (scale) {
+				curMat = curMat.copyTo(WebGLContext2D._tmpMatrix);
+				var tempTx = curMat.tx;
+				var tempTy = curMat.ty;
+				curMat.scale(1 / sx, 1 / sy);
+				curMat._checkTransform();
+				x *= sx;
+				y *= sy;
+				x += tempTx - curMat.tx;
+				y += tempTy - curMat.ty;
+			} else sx = sy = 1;
+			if (words) {
+				DrawText._drawSlow(null, ctx, txt, words, curMat, font, textAlign, fillColor, borderColor, lineWidth, x, y, sx, sy, underLine);
+			} else {
+				if (txt.toUpperCase === null) {
+					var idNum = sx + sy * 100000;
+					var myCache = txt;
+					if (!myCache.changed && myCache.id === idNum) {
+						DrawText._drawFast(myCache.save, ctx, curMat, x, y);
+					} else {
+						myCache.id = idNum;
+						myCache.changed = false;
+						DrawText._drawSlow(myCache.save, ctx, txt, words, curMat, font, textAlign, fillColor, borderColor, lineWidth, x, y, sx, sy, underLine);
+					}
+					return;
+				};
+				var id = txt + font.toString() + fillColor + borderColor + lineWidth + sx + sy + textAlign;
+				var cache = DrawText._textsCache[id];
+				if (Text.CharacterCache) {
+					if (cache) {
+						DrawText._drawFast(cache, ctx, curMat, x, y);
+					} else {
+						DrawText._textsCache.__length || (DrawText._textsCache.__length = 0);
+						if (DrawText._textsCache.__length > Config.WebGLTextCacheCount) {
+							DrawText._textsCache = {};
+							DrawText._textsCache.__length = 0;
+							DrawText._curPoolIndex = 0;
+						}
+						DrawText._textCachesPool[DrawText._curPoolIndex] ? (cache = DrawText._textsCache[id] = DrawText._textCachesPool[DrawText._curPoolIndex], cache.length = 0) : (DrawText._textCachesPool[DrawText._curPoolIndex] = cache = DrawText._textsCache[id] = []);
+						DrawText._textsCache.__length++
+						DrawText._curPoolIndex++;
+						DrawText._drawSlow(cache, ctx, txt, words, curMat, font, textAlign, fillColor, borderColor, lineWidth, x, y, sx, sy, underLine);
+					}
+				}
+				else {
+					DrawText._drawSlow(cache, ctx, txt, words, curMat, font, textAlign, fillColor, borderColor, lineWidth, x, y, sx, sy, underLine);
+				}
+			}
+		}
+
+		DrawText._charsTemp = null;
+		DrawText._textCachesPool = [];
+		DrawText._curPoolIndex = 0;
+		DrawText._charsCache = {};
+		DrawText._textsCache = {};
+		DrawText._drawValue = null;
+		DrawText.d = [];
+		DrawText._charSeg = null;
+		DrawText.__init$ = function () {
+			//class CharValue
+			CharValue = (function () {
+				function CharValue() {
+					//this.txtID=NaN;
+					//this.font=null;
+					//this.fillColor=null;
+					//this.borderColor=null;
+					//this.lineWidth=0;
+					//this.scaleX=NaN;
+					//this.scaleY=NaN;
+					//this.underLine=0;
+				}
+				__class(CharValue, '');
+				var __proto = CharValue.prototype;
+				__proto.value = function (font, fillColor, borderColor, lineWidth, scaleX, scaleY, underLine) {
+					this.font = font;
+					this.fillColor = fillColor;
+					this.borderColor = borderColor;
+					this.lineWidth = lineWidth;
+					this.scaleX = scaleX;
+					this.scaleY = scaleY;
+					this.underLine = underLine;
+					var key = font.toString() + scaleX + scaleY + lineWidth + fillColor + borderColor + underLine;
+					this.txtID = CharValue._keymap[key];
+					if (!this.txtID) {
+						this.txtID = (++CharValue._keymapCount) * 0.0000001;
+						CharValue._keymap[key] = this.txtID;
+					}
+					return this;
+				}
+				CharValue.clear = function () {
+					CharValue._keymap = {};
+					CharValue._keymapCount = 1;
+				}
+				CharValue._keymap = {};
+				CharValue._keymapCount = 1;
+				return CharValue;
+			})()
+		}
+
+		return DrawText;
+	})()
+
+
+	//class laya.webgl.text.FontInContext
+	var FontInContext = (function () {
+		function FontInContext(font) {
+			//this._text=null;
+			//this._words=null;
+			this._index = 0;
+			this._size = 14;
+			this._italic = -2;
+			FontInContext._cache2 = FontInContext._cache2 || [];
+			this.setFont(font || "14px Arial");
+		}
+
+		__class(FontInContext, 'laya.webgl.text.FontInContext');
+		var __proto = FontInContext.prototype;
+		__proto.setFont = function (value) {
+			var arr = FontInContext._cache2[value];
+			if (!arr) {
+				this._words = value.split(' ');
+				for (var i = 0, n = this._words.length; i < n; i++) {
+					if (this._words[i].indexOf('px') > 0) {
+						this._index = i;
+						break;
+					}
+				}
+				this._size = parseInt(this._words[this._index]);
+				FontInContext._cache2[value] = [this._words, this._size];
+			} else {
+				this._words = arr[0];
+				this._size = arr[1];
+			}
+			this._text = null;
+			this._italic = -2;
+		}
+
+		__proto.getItalic = function () {
+			this._italic === -2 && (this._italic = this.hasType("italic"));
+			return this._italic;
+		}
+
+		__proto.hasType = function (name) {
+			for (var i = 0, n = this._words.length; i < n; i++)
+				if (this._words[i] === name) return i;
+			return -1;
+		}
+
+		__proto.removeType = function (name) {
+			for (var i = 0, n = this._words.length; i < n; i++)
+				if (this._words[i] === name) {
+					this._words.splice(i, 1);
+					if (this._index > i) this._index--;
+					break;
+				}
+			this._text = null;
+			this._italic = -2;
+		}
+
+		__proto.copyTo = function (dec) {
+			dec._text = this._text;
+			dec._size = this._size;
+			dec._index = this._index;
+			dec._words = this._words.slice();
+			dec._italic = -2;
+			return dec;
+		}
+
+		__proto.toString = function () {
+			return this._text ? this._text : (this._text = this._words.join(' '));
+		}
+
+		__getset(0, __proto, 'size', function () {
+			return this._size;
+		}, function (value) {
+			this._size = value;
+			this._words[this._index] = value + "px";
+			this._text = null;
+		});
+
+		FontInContext.create = function (font) {
+			var r = FontInContext._cache[font];
+			if (r) return r;
+			r = FontInContext._cache[font] = new FontInContext(font);
+			return r;
+		}
+
+		FontInContext._cache = {};
+		FontInContext._cache2 = null;
+		__static(FontInContext,
+			['EMPTY', function () { return this.EMPTY = new FontInContext(); }
+			]);
+		return FontInContext;
+	})()
+
+
+	//class laya.webgl.utils.CONST3D2D
+	var CONST3D2D = (function () {
+		function CONST3D2D() { }
+		__class(CONST3D2D, 'laya.webgl.utils.CONST3D2D');
+		CONST3D2D._TMPARRAY = [];
+		CONST3D2D._OFFSETX = 0;
+		CONST3D2D._OFFSETY = 0;
+		__static(CONST3D2D,
+			['BYTES_PE', function () { return this.BYTES_PE =/*__JS__ */Float32Array.BYTES_PER_ELEMENT; }, 'BYTES_PIDX', function () { return this.BYTES_PIDX =/*__JS__ */Uint16Array.BYTES_PER_ELEMENT; }, 'defaultMatrix4', function () { return this.defaultMatrix4 = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; }, 'defaultMinusYMatrix4', function () { return this.defaultMinusYMatrix4 = [1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; }, 'uniformMatrix3', function () { return this.uniformMatrix3 = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0]; }
+			]);
+		return CONST3D2D;
+	})()
+
+
+	//class laya.webgl.utils.GlUtils
+	var GlUtils = (function () {
+		function GlUtils() { }
+		__class(GlUtils, 'laya.webgl.utils.GlUtils');
+		GlUtils.make2DProjection = function (width, height, depth) {
+			return [2.0 / width, 0, 0, 0, 0, -2.0 / height, 0, 0, 0, 0, 2.0 / depth, 0, -1, 1, 0, 1,];
+		}
+
+		GlUtils.fillIBQuadrangle = function (buffer, count) {
+			if (count > 65535 / 4) {
+				throw Error("IBQuadrangle count:" + count + " must<:" + Math.floor(65535 / 4));
+				return false;
+			}
+			count = Math.floor(count);
+			buffer._resizeBuffer((count + 1) * 6 */*laya.webgl.utils.Buffer2D.SHORT*/2, false);
+			buffer.byteLength = buffer.bufferLength;
+			var bufferData = buffer.getUint16Array();
+			var idx = 0;
+			for (var i = 0; i < count; i++) {
+				bufferData[idx++] = i * 4;
+				bufferData[idx++] = i * 4 + 2;
+				bufferData[idx++] = i * 4 + 1;
+				bufferData[idx++] = i * 4;
+				bufferData[idx++] = i * 4 + 3;
+				bufferData[idx++] = i * 4 + 2;
+			}
+			buffer.setNeedUpload();
+			return true;
+		}
+
+		GlUtils.expandIBQuadrangle = function (buffer, count) {
+			buffer.bufferLength >= (count * 6 */*laya.webgl.utils.Buffer2D.SHORT*/2) || GlUtils.fillIBQuadrangle(buffer, count);
+		}
+
+		GlUtils.mathCeilPowerOfTwo = function (value) {
+			value--;
+			value |= value >> 1;
+			value |= value >> 2;
+			value |= value >> 4;
+			value |= value >> 8;
+			value |= value >> 16;
+			value++;
+			return value;
+		}
+
+		GlUtils.fillQuadrangleImgVb = function (vb, x, y, point4, uv, m, _x, _y) {
+			'use strict';
+			var vpos = (vb._byteLength >> 2) +/*laya.webgl.canvas.WebGLContext2D._RECTVBSIZE*/16;
+			vb.byteLength = (vpos << 2);
+			var vbdata = vb.getFloat32Array();
+			vpos -=/*laya.webgl.canvas.WebGLContext2D._RECTVBSIZE*/16;
+			vbdata[vpos + 2] = uv[0];
+			vbdata[vpos + 3] = uv[1];
+			vbdata[vpos + 6] = uv[2];
+			vbdata[vpos + 7] = uv[3];
+			vbdata[vpos + 10] = uv[4];
+			vbdata[vpos + 11] = uv[5];
+			vbdata[vpos + 14] = uv[6];
+			vbdata[vpos + 15] = uv[7];
+			var a = m.a, b = m.b, c = m.c, d = m.d;
+			if (a !== 1 || b !== 0 || c !== 0 || d !== 1) {
+				m.bTransform = true;
+				var tx = m.tx + _x, ty = m.ty + _y;
+				vbdata[vpos] = (point4[0] + x) * a + (point4[1] + y) * c + tx;
+				vbdata[vpos + 1] = (point4[0] + x) * b + (point4[1] + y) * d + ty;
+				vbdata[vpos + 4] = (point4[2] + x) * a + (point4[3] + y) * c + tx;
+				vbdata[vpos + 5] = (point4[2] + x) * b + (point4[3] + y) * d + ty;
+				vbdata[vpos + 8] = (point4[4] + x) * a + (point4[5] + y) * c + tx;
+				vbdata[vpos + 9] = (point4[4] + x) * b + (point4[5] + y) * d + ty;
+				vbdata[vpos + 12] = (point4[6] + x) * a + (point4[7] + y) * c + tx;
+				vbdata[vpos + 13] = (point4[6] + x) * b + (point4[7] + y) * d + ty;
+			} else {
+				m.bTransform = false;
+				x += m.tx + _x;
+				y += m.ty + _y;
+				vbdata[vpos] = x + point4[0];
+				vbdata[vpos + 1] = y + point4[1];
+				vbdata[vpos + 4] = x + point4[2];
+				vbdata[vpos + 5] = y + point4[3];
+				vbdata[vpos + 8] = x + point4[4];
+				vbdata[vpos + 9] = y + point4[5];
+				vbdata[vpos + 12] = x + point4[6];
+				vbdata[vpos + 13] = y + point4[7];
+			}
+			vb._upload = true;
+			return true;
+		}
+
+		GlUtils.fillTranglesVB = function (vb, x, y, points, m, _x, _y) {
+			var vpos = (vb._byteLength >> 2) + points.length;
+			vb.byteLength = (vpos << 2);
+			var vbdata = vb.getFloat32Array();
+			vpos -= points.length;
+			var len = points.length;
+			var a = m.a, b = m.b, c = m.c, d = m.d;
+			for (var i = 0; i < len; i += 4) {
+				vbdata[vpos + i + 2] = points[i + 2];
+				vbdata[vpos + i + 3] = points[i + 3];
+				if (a !== 1 || b !== 0 || c !== 0 || d !== 1) {
+					m.bTransform = true;
+					var tx = m.tx + _x, ty = m.ty + _y;
+					vbdata[vpos + i] = (points[i] + x) * a + (points[i + 1] + y) * c + tx;
+					vbdata[vpos + i + 1] = (points[i] + x) * b + (points[i + 1] + y) * d + ty;
+				} else {
+					m.bTransform = false;
+					x += m.tx + _x;
+					y += m.ty + _y;
+					vbdata[vpos + i] = x + points[i];
+					vbdata[vpos + i + 1] = y + points[i + 1];
+				}
+			}
+			vb._upload = true;
+			return true;
+		}
+
+		GlUtils.copyPreImgVb = function (vb, dx, dy) {
+			var vpos = (vb._byteLength >> 2);
+			vb.byteLength = ((vpos +/*laya.webgl.canvas.WebGLContext2D._RECTVBSIZE*/16) << 2);
+			var vbdata = vb.getFloat32Array();
+			for (var i = 0, ci = vpos - 16; i < 4; i++) {
+				vbdata[vpos] = vbdata[ci] + dx;
+				++vpos;
+				++ci;
+				vbdata[vpos] = vbdata[ci] + dy;
+				++vpos;
+				++ci;
+				vbdata[vpos] = vbdata[ci];
+				++vpos;
+				++ci;
+				vbdata[vpos] = vbdata[ci];
+				++vpos;
+				++ci;
+			}
+			vb._upload = true;
+		}
+
+		GlUtils.fillRectImgVb = function (vb, clip, x, y, width, height, uv, m, _x, _y, dx, dy, round) {
+			(round === void 0) && (round = false);
+			var mType = 1;
+			var toBx, toBy, toEx, toEy;
+			var cBx, cBy, cEx, cEy;
+			var w0, h0, tx, ty;
+			var finalX, finalY, offsetX, offsetY;
+			var a = m.a, b = m.b, c = m.c, d = m.d;
+			var useClip = clip && clip.width < /*laya.webgl.canvas.WebGLContext2D._MAXSIZE*/99999999;
+			if (a !== 1 || b !== 0 || c !== 0 || d !== 1) {
+				m.bTransform = true;
+				if (b === 0 && c === 0) {
+					mType = 23;
+					w0 = width + x, h0 = height + y;
+					tx = m.tx + _x, ty = m.ty + _y;
+					toBx = a * x + tx;
+					toEx = a * w0 + tx;
+					toBy = d * y + ty;
+					toEy = d * h0 + ty;
+				}
+			} else {
+				mType = 23;
+				m.bTransform = false;
+				toBx = x + m.tx + _x;
+				toEx = toBx + width;
+				toBy = y + m.ty + _y;
+				toEy = toBy + height;
+			}
+			if (useClip) {
+				cBx = clip.x, cBy = clip.y, cEx = clip.width + cBx, cEy = clip.height + cBy;
+			}
+			if (mType !== 1) {
+				if (Math.min(toBx, toEx) >= cEx) return false;
+				if (Math.min(toBy, toEy) >= cEy) return false;
+				if (Math.max(toEx, toBx) <= cBx) return false;
+				if (Math.max(toEy, toBy) <= cBy) return false;
+			};
+			var vpos = (vb._byteLength >> 2);
+			vb.byteLength = ((vpos +/*laya.webgl.canvas.WebGLContext2D._RECTVBSIZE*/16) << 2);
+			var vbdata = vb.getFloat32Array();
+			vbdata[vpos + 2] = uv[0];
+			vbdata[vpos + 3] = uv[1];
+			vbdata[vpos + 6] = uv[2];
+			vbdata[vpos + 7] = uv[3];
+			vbdata[vpos + 10] = uv[4];
+			vbdata[vpos + 11] = uv[5];
+			vbdata[vpos + 14] = uv[6];
+			vbdata[vpos + 15] = uv[7];
+			switch (mType) {
+				case 1:
+					tx = m.tx + _x, ty = m.ty + _y;
+					w0 = width + x, h0 = height + y;
+					var w1 = x, h1 = y;
+					var aw1 = a * w1, ch1 = c * h1, dh1 = d * h1, bw1 = b * w1;
+					var aw0 = a * w0, ch0 = c * h0, dh0 = d * h0, bw0 = b * w0;
+					if (round) {
+						finalX = aw1 + ch1 + tx;
+						offsetX = Math.round(finalX) - finalX;
+						finalY = dh1 + bw1 + ty;
+						offsetY = Math.round(finalY) - finalY;
+						vbdata[vpos] = finalX + offsetX;
+						vbdata[vpos + 1] = finalY + offsetY;
+						vbdata[vpos + 4] = aw0 + ch1 + tx + offsetX;
+						vbdata[vpos + 5] = dh1 + bw0 + ty + offsetY;
+						vbdata[vpos + 8] = aw0 + ch0 + tx + offsetX;
+						vbdata[vpos + 9] = dh0 + bw0 + ty + offsetY;
+						vbdata[vpos + 12] = aw1 + ch0 + tx + offsetX;
+						vbdata[vpos + 13] = dh0 + bw1 + ty + offsetY;
+					} else {
+						vbdata[vpos] = aw1 + ch1 + tx;
+						vbdata[vpos + 1] = dh1 + bw1 + ty;
+						vbdata[vpos + 4] = aw0 + ch1 + tx;
+						vbdata[vpos + 5] = dh1 + bw0 + ty;
+						vbdata[vpos + 8] = aw0 + ch0 + tx;
+						vbdata[vpos + 9] = dh0 + bw0 + ty;
+						vbdata[vpos + 12] = aw1 + ch0 + tx;
+						vbdata[vpos + 13] = dh0 + bw1 + ty;
+					}
+					break;
+				case 23:
+					if (round) {
+						finalX = toBx + dx;
+						offsetX = Math.round(finalX) - finalX;
+						finalY = toBy;
+						offsetY = Math.round(finalY) - finalY;
+						vbdata[vpos] = finalX + offsetX;
+						vbdata[vpos + 1] = finalY + offsetY;
+						vbdata[vpos + 4] = toEx + dx + offsetX;
+						vbdata[vpos + 5] = toBy + offsetY;
+						vbdata[vpos + 8] = toEx + offsetX;
+						vbdata[vpos + 9] = toEy + offsetY;
+						vbdata[vpos + 12] = toBx + offsetX;
+						vbdata[vpos + 13] = toEy + offsetY;
+					} else {
+						vbdata[vpos] = toBx + dx;
+						vbdata[vpos + 1] = toBy;
+						vbdata[vpos + 4] = toEx + dx;
+						vbdata[vpos + 5] = toBy;
+						vbdata[vpos + 8] = toEx;
+						vbdata[vpos + 9] = toEy;
+						vbdata[vpos + 12] = toBx;
+						vbdata[vpos + 13] = toEy;
+					}
+					break;
+			}
+			vb._upload = true;
+			return true;
+		}
+
+		GlUtils.fillLineVb = function (vb, clip, fx, fy, tx, ty, width, mat) {
+			'use strict';
+			var linew = width * .5;
+			var data = GlUtils._fillLineArray;
+			var perpx = -(fy - ty), perpy = fx - tx;
+			var dist = Math.sqrt(perpx * perpx + perpy * perpy);
+			perpx /= dist, perpy /= dist, perpx *= linew, perpy *= linew;
+			data[0] = fx - perpx, data[1] = fy - perpy, data[4] = fx + perpx, data[5] = fy + perpy, data[8] = tx + perpx, data[9] = ty + perpy, data[12] = tx - perpx, data[13] = ty - perpy;
+			mat && mat.transformPointArray(data, data);
+			var vpos = (vb._byteLength >> 2) +/*laya.webgl.canvas.WebGLContext2D._RECTVBSIZE*/16;
+			vb.byteLength = (vpos << 2);
+			vb.insertData(data, vpos -/*laya.webgl.canvas.WebGLContext2D._RECTVBSIZE*/16);
+			return true;
+		}
+
+		__static(GlUtils,
+			['_fillLineArray', function () { return this._fillLineArray = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; }
+			]);
+		return GlUtils;
+	})()
+
+
+	//class laya.webgl.utils.MatirxArray
+	var MatirxArray = (function () {
+		function MatirxArray() { }
+		__class(MatirxArray, 'laya.webgl.utils.MatirxArray');
+		MatirxArray.ArrayMul = function (a, b, o) {
+			if (!a) {
+				MatirxArray.copyArray(b, o);
+				return;
+			}
+			if (!b) {
+				MatirxArray.copyArray(a, o);
+				return;
+			};
+			var ai0 = NaN, ai1 = NaN, ai2 = NaN, ai3 = NaN;
+			for (var i = 0; i < 4; i++) {
+				ai0 = a[i];
+				ai1 = a[i + 4];
+				ai2 = a[i + 8];
+				ai3 = a[i + 12];
+				o[i] = ai0 * b[0] + ai1 * b[1] + ai2 * b[2] + ai3 * b[3];
+				o[i + 4] = ai0 * b[4] + ai1 * b[5] + ai2 * b[6] + ai3 * b[7];
+				o[i + 8] = ai0 * b[8] + ai1 * b[9] + ai2 * b[10] + ai3 * b[11];
+				o[i + 12] = ai0 * b[12] + ai1 * b[13] + ai2 * b[14] + ai3 * b[15];
+			}
+		}
+
+		MatirxArray.copyArray = function (f, t) {
+			if (!f) return;
+			if (!t) return;
+			for (var i = 0; i < f.length; i++) {
+				t[i] = f[i];
+			}
+		}
+
+		return MatirxArray;
+	})()
+
+
+	//class laya.webgl.utils.RenderState2D
+	var RenderState2D = (function () {
+		function RenderState2D() { }
+		__class(RenderState2D, 'laya.webgl.utils.RenderState2D');
+		RenderState2D.getMatrArray = function () {
+			return [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
+		}
+
+		RenderState2D.mat2MatArray = function (mat, matArray) {
+			var m = mat;
+			var m4 = matArray;
+			m4[0] = m.a;
+			m4[1] = m.b;
+			m4[2] = RenderState2D.EMPTYMAT4_ARRAY[2];
+			m4[3] = RenderState2D.EMPTYMAT4_ARRAY[3];
+			m4[4] = m.c;
+			m4[5] = m.d;
+			m4[6] = RenderState2D.EMPTYMAT4_ARRAY[6];
+			m4[7] = RenderState2D.EMPTYMAT4_ARRAY[7];
+			m4[8] = RenderState2D.EMPTYMAT4_ARRAY[8];
+			m4[9] = RenderState2D.EMPTYMAT4_ARRAY[9];
+			m4[10] = RenderState2D.EMPTYMAT4_ARRAY[10];
+			m4[11] = RenderState2D.EMPTYMAT4_ARRAY[11];
+			m4[12] = m.tx;
+			m4[13] = m.ty;
+			m4[14] = RenderState2D.EMPTYMAT4_ARRAY[14];
+			m4[15] = RenderState2D.EMPTYMAT4_ARRAY[15];
+			return matArray;
+		}
+
+		RenderState2D.restoreTempArray = function () {
+			RenderState2D.TEMPMAT4_ARRAY[0] = 1;
+			RenderState2D.TEMPMAT4_ARRAY[1] = 0;
+			RenderState2D.TEMPMAT4_ARRAY[4] = 0;
+			RenderState2D.TEMPMAT4_ARRAY[5] = 1;
+			RenderState2D.TEMPMAT4_ARRAY[12] = 0;
+			RenderState2D.TEMPMAT4_ARRAY[13] = 0;
+		}
+
+		RenderState2D.clear = function () {
+			RenderState2D.worldScissorTest = false;
+			RenderState2D.worldShaderDefines = null;
+			RenderState2D.worldFilters = null;
+			RenderState2D.worldAlpha = 1;
+			RenderState2D.worldClipRect.x = RenderState2D.worldClipRect.y = 0;
+			RenderState2D.worldClipRect.width = RenderState2D.width;
+			RenderState2D.worldClipRect.height = RenderState2D.height;
+			RenderState2D.curRenderTarget = null;
+		}
+
+		RenderState2D._MAXSIZE = 99999999;
+		RenderState2D.worldAlpha = 1.0;
+		RenderState2D.worldScissorTest = false;
+		RenderState2D.worldFilters = null;
+		RenderState2D.worldShaderDefines = null;
+		RenderState2D.curRenderTarget = null;
+		RenderState2D.width = 0;
+		RenderState2D.height = 0;
+		__static(RenderState2D,
+			['EMPTYMAT4_ARRAY', function () { return this.EMPTYMAT4_ARRAY = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; }, 'TEMPMAT4_ARRAY', function () { return this.TEMPMAT4_ARRAY = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; }, 'worldMatrix4', function () { return this.worldMatrix4 = RenderState2D.TEMPMAT4_ARRAY; }, 'worldMatrix', function () { return this.worldMatrix = new Matrix(); }, 'worldClipRect', function () { return this.worldClipRect = new Rectangle(0, 0, 99999999, 99999999); }
+			]);
+		return RenderState2D;
+	})()
+
+
+	/**
+	*@private
+	*<code>ShaderCompile</code> 类用于实现Shader编译。
+	*/
+	//class laya.webgl.utils.ShaderCompile
+	var ShaderCompile = (function () {
+		var ShaderNode, InlcudeFile;
+		function ShaderCompile(name, vs, ps, nameMap) {
+			//this._nameMap=null;
+			//this._VS=null;
+			//this._PS=null;
+			var _$this = this;
+			function _compile(script) {
+				var includefiles = [];
+				var top = new ShaderNode(includefiles);
+				_$this._compileToTree(top, script.split('\n'), 0, includefiles);
+				return top;
+			};
+			var startTime = Browser.now();
+			this._VS = _compile(vs);
+			this._PS = _compile(ps);
+			this._nameMap = nameMap;
+			if ((Browser.now() - startTime) > 2)
+				console.log("ShaderCompile use time:" + (Browser.now() - startTime) + "  size:" + vs.length + "/" + ps.length);
+		}
+
+		__class(ShaderCompile, 'laya.webgl.utils.ShaderCompile');
+		var __proto = ShaderCompile.prototype;
+		__proto._compileToTree = function (parent, lines, start, includefiles) {
+			var node, preNode;
+			var text, name, fname;
+			var ofs = 0, words, noUseNode;
+			for (var i = start; i < lines.length; i++) {
+				text = lines[i];
+				if (text.length < 1) continue;
+				ofs = text.indexOf("//");
+				if (ofs === 0) continue;
+				if (ofs >= 0) text = text.substr(0, ofs);
+				node = noUseNode || new ShaderNode(includefiles);
+				noUseNode = null;
+				node.text = text;
+				node.noCompile = true;
+				if ((ofs = text.indexOf("#")) >= 0) {
+					name = "#";
+					for (var j = ofs + 1, n = text.length; j < n; j++) {
+						var c = text.charAt(j);
+						if (c === ' ' || c === '\t' || c === '?') break;
+						name += c;
+					}
+					node.name = name;
+					switch (name) {
+						case "#ifdef":
+						case "#ifndef":
+							node.src = text;
+							node.noCompile = text.match(/[!&|()=<>]/) != null;
+							if (!node.noCompile) {
+								words = text.replace(/^\s*/, '').split(/\s+/);
+								node.setCondition(words[1], name === "#ifdef" ? 1 : 2);
+								node.text = "//" + node.text;
+							} else {
+								console.log("function():Boolean{return " + text.substr(ofs + node.name.length) + "}");
+							}
+							node.setParent(parent);
+							parent = node;
+							continue;
+						case "#if":
+							node.src = text;
+							node.noCompile = true;
+							node.setParent(parent);
+							parent = node;
+							continue;
+						case "#else":
+							node.src = text;
+							parent = parent.parent;
+							preNode = parent.childs[parent.childs.length - 1];
+							node.noCompile = preNode.noCompile;
+							if (!node.noCompile) {
+								node.condition = preNode.condition;
+								node.conditionType = preNode.conditionType == 1 ? 2 : 1;
+								node.text = "//" + node.text + " " + preNode.text + " " + node.conditionType;
+							}
+							node.setParent(parent);
+							parent = node;
+							continue;
+						case "#endif":
+							parent = parent.parent;
+							preNode = parent.childs[parent.childs.length - 1];
+							node.noCompile = preNode.noCompile;
+							if (!node.noCompile) {
+								node.text = "//" + node.text;
+							}
+							node.setParent(parent);
+							continue;
+						case "#include":
+							words = ShaderCompile.splitToWords(text, null);
+							var inlcudeFile = ShaderCompile.includes[words[1]];
+							if (!inlcudeFile) {
+								throw "ShaderCompile error no this include file:" + words[1];
+								return;
+							}
+							if ((ofs = words[0].indexOf("?")) < 0) {
+								node.setParent(parent);
+								text = inlcudeFile.getWith(words[2] == 'with' ? words[3] : null);
+								this._compileToTree(node, text.split('\n'), 0, includefiles);
+								node.text = "";
+								continue;
+							}
+							node.setCondition(words[0].substr(ofs + 1), 1);
+							node.text = inlcudeFile.getWith(words[2] == 'with' ? words[3] : null);
+							break;
+						case "#import":
+							words = ShaderCompile.splitToWords(text, null);
+							fname = words[1];
+							includefiles.push({ node: node, file: ShaderCompile.includes[fname], ofs: node.text.length });
+							continue;
+					}
+				} else {
+					preNode = parent.childs[parent.childs.length - 1];
+					if (preNode && !preNode.name) {
+						includefiles.length > 0 && ShaderCompile.splitToWords(text, preNode);
+						noUseNode = node;
+						preNode.text += "\n" + text;
+						continue;
+					}
+					includefiles.length > 0 && ShaderCompile.splitToWords(text, node);
+				}
+				node.setParent(parent);
+			}
+		}
+
+		__proto.createShader = function (define, shaderName, createShader) {
+			var defMap = {};
+			var defineStr = "";
+			if (define) {
+				for (var i in define) {
+					defineStr += "#define " + i + "\n";
+					defMap[i] = true;
+				}
+			};
+			var vs = this._VS.toscript(defMap, []);
+			var ps = this._PS.toscript(defMap, []);
+			return (createShader || Shader.create)(defineStr + vs.join('\n'), defineStr + ps.join('\n'), shaderName, this._nameMap);
+		}
+
+		ShaderCompile._parseOne = function (attributes, uniforms, words, i, word, b) {
+			var one = { type: ShaderCompile.shaderParamsMap[words[i + 1]], name: words[i + 2], size: isNaN(parseInt(words[i + 3])) ? 1 : parseInt(words[i + 3]) };
+			if (b) {
+				if (word == "attribute") {
+					attributes.push(one);
+				} else {
+					uniforms.push(one);
+				}
+			}
+			if (words[i + 3] == ':') {
+				one.type = words[i + 4];
+				i += 2;
+			}
+			i += 2;
+			return i;
+		}
+
+		ShaderCompile.addInclude = function (fileName, txt) {
+			if (!txt || txt.length === 0)
+				throw new Error("add shader include file err:" + fileName);
+			if (ShaderCompile.includes[fileName])
+				throw new Error("add shader include file err, has add:" + fileName);
+			ShaderCompile.includes[fileName] = new InlcudeFile(txt);
+		}
+
+		ShaderCompile.preGetParams = function (vs, ps) {
+			var text = [vs, ps];
+			var result = {};
+			var attributes = [];
+			var uniforms = [];
+			var definesInfo = {};
+			var definesName = [];
+			result.attributes = attributes;
+			result.uniforms = uniforms;
+			result.defines = definesInfo;
+			var i = 0, n = 0, one;
+			for (var s = 0; s < 2; s++) {
+				text[s] = text[s].replace(ShaderCompile._removeAnnotation, "");
+				var words = text[s].match(ShaderCompile._reg);
+				var tempelse;
+				for (i = 0, n = words.length; i < n; i++) {
+					var word = words[i];
+					if (word != "attribute" && word != "uniform") {
+						if (word == "#define") {
+							word = words[++i];
+							definesName[word] = 1;
+							continue;
+						} else if (word == "#ifdef") {
+							tempelse = words[++i];
+							var def = definesInfo[tempelse] = definesInfo[tempelse] || [];
+							for (i++; i < n; i++) {
+								word = words[i];
+								if (word != "attribute" && word != "uniform") {
+									if (word == "#else") {
+										for (i++; i < n; i++) {
+											word = words[i];
+											if (word != "attribute" && word != "uniform") {
+												if (word == "#endif") {
+													break;
+												}
+												continue;
+											}
+											i = ShaderCompile._parseOne(attributes, uniforms, words, i, word, !definesName[tempelse]);
+										}
+									}
+									continue;
+								}
+								i = ShaderCompile._parseOne(attributes, uniforms, words, i, word, definesName[tempelse]);
+							}
+						}
+						continue;
+					}
+					i = ShaderCompile._parseOne(attributes, uniforms, words, i, word, true);
+				}
+			}
+			return result;
+		}
+
+		ShaderCompile.splitToWords = function (str, block) {
+			var out = [];
+			var c;
+			var ofs = -1;
+			var word;
+			for (var i = 0, n = str.length; i < n; i++) {
+				c = str.charAt(i);
+				if (" \t=+-*/&%!<>()'\",;".indexOf(c) >= 0) {
+					if (ofs >= 0 && (i - ofs) > 1) {
+						word = str.substr(ofs, i - ofs);
+						out.push(word);
+					}
+					if (c == '"' || c == "'") {
+						var ofs2 = str.indexOf(c, i + 1);
+						if (ofs2 < 0) {
+							throw "Sharder err:" + str;
+							return null;
+						}
+						out.push(str.substr(i + 1, ofs2 - i - 1));
+						i = ofs2;
+						ofs = -1;
+						continue;
+					}
+					if (c == '(' && block && out.length > 0) {
+						word = out[out.length - 1] + ";";
+						if ("vec4;main;".indexOf(word) < 0)
+							block.useFuns += word;
+					}
+					ofs = -1;
+					continue;
+				}
+				if (ofs < 0) ofs = i;
+			}
+			if (ofs < n && (n - ofs) > 1) {
+				word = str.substr(ofs, n - ofs);
+				out.push(word);
+			}
+			return out;
+		}
+
+		ShaderCompile.IFDEF_NO = 0;
+		ShaderCompile.IFDEF_YES = 1;
+		ShaderCompile.IFDEF_ELSE = 2;
+		ShaderCompile.IFDEF_PARENT = 3;
+		ShaderCompile.includes = {};
+		__static(ShaderCompile,
+			['_removeAnnotation', function () { return this._removeAnnotation = new RegExp("(/\\*([^*]|[\\r\\\n]|(\\*+([^*/]|[\\r\\n])))*\\*+/)|(//.*)", "g"); }, '_reg', function () { return this._reg = new RegExp("(\".*\")|('.*')|([#\\w\\*-\\.+/()=<>{}\\\\]+)|([,;:\\\\])", "g"); }, '_splitToWordExps', function () { return this._splitToWordExps = new RegExp("[(\".*\")]+|[('.*')]+|([ \\t=\\+\\-*/&%!<>!%\(\),;])", "g"); }, 'shaderParamsMap', function () { return this.shaderParamsMap = { "float":/*laya.webgl.WebGLContext.FLOAT*/0x1406, "int":/*laya.webgl.WebGLContext.INT*/0x1404, "bool":/*laya.webgl.WebGLContext.BOOL*/0x8B56, "vec2":/*laya.webgl.WebGLContext.FLOAT_VEC2*/0x8B50, "vec3":/*laya.webgl.WebGLContext.FLOAT_VEC3*/0x8B51, "vec4":/*laya.webgl.WebGLContext.FLOAT_VEC4*/0x8B52, "ivec2":/*laya.webgl.WebGLContext.INT_VEC2*/0x8B53, "ivec3":/*laya.webgl.WebGLContext.INT_VEC3*/0x8B54, "ivec4":/*laya.webgl.WebGLContext.INT_VEC4*/0x8B55, "bvec2":/*laya.webgl.WebGLContext.BOOL_VEC2*/0x8B57, "bvec3":/*laya.webgl.WebGLContext.BOOL_VEC3*/0x8B58, "bvec4":/*laya.webgl.WebGLContext.BOOL_VEC4*/0x8B59, "mat2":/*laya.webgl.WebGLContext.FLOAT_MAT2*/0x8B5A, "mat3":/*laya.webgl.WebGLContext.FLOAT_MAT3*/0x8B5B, "mat4":/*laya.webgl.WebGLContext.FLOAT_MAT4*/0x8B5C, "sampler2D":/*laya.webgl.WebGLContext.SAMPLER_2D*/0x8B5E, "samplerCube":/*laya.webgl.WebGLContext.SAMPLER_CUBE*/0x8B60 }; }
+			]);
+		ShaderCompile.__init$ = function () {
+			//class ShaderNode
+			ShaderNode = (function () {
+				function ShaderNode(includefiles) {
+					this.childs = [];
+					this.text = "";
+					this.parent = null;
+					this.name = null;
+					this.noCompile = false;
+					this.includefiles = null;
+					this.condition = null;
+					this.conditionType = 0;
+					this.useFuns = "";
+					this.z = 0;
+					this.src = null;
+					this.includefiles = includefiles;
+				}
+				__class(ShaderNode, '');
+				var __proto = ShaderNode.prototype;
+				__proto.setParent = function (parent) {
+					parent.childs.push(this);
+					this.z = parent.z + 1;
+					this.parent = parent;
+				}
+				__proto.setCondition = function (condition, type) {
+					if (condition) {
+						this.conditionType = type;
+						condition = condition.replace(/(\s*$)/g, "");
+						this.condition = function () {
+							return this[condition];
+						}
+						this.condition.__condition = condition;
+					}
+				}
+				__proto.toscript = function (def, out) {
+					return this._toscript(def, out, ++ShaderNode.__id);
+				}
+				__proto._toscript = function (def, out, id) {
+					if (this.childs.length < 1 && !this.text) return out;
+					var outIndex = out.length;
+					if (this.condition) {
+						var ifdef = !!this.condition.call(def);
+						this.conditionType ===/*laya.webgl.utils.ShaderCompile.IFDEF_ELSE*/2 && (ifdef = !ifdef);
+						if (!ifdef) return out;
+					}
+					this.text && out.push(this.text);
+					this.childs.length > 0 && this.childs.forEach(function (o, index, arr) {
+						o._toscript(def, out, id);
+					});
+					if (this.includefiles.length > 0 && this.useFuns.length > 0) {
+						var funsCode;
+						for (var i = 0, n = this.includefiles.length; i < n; i++) {
+							if (this.includefiles[i].curUseID == id) {
+								continue;
+							}
+							funsCode = this.includefiles[i].file.getFunsScript(this.useFuns);
+							if (funsCode.length > 0) {
+								this.includefiles[i].curUseID = id;
+								out[0] = funsCode + out[0];
+							}
+						}
+					}
+					return out;
+				}
+				ShaderNode.__id = 1;
+				return ShaderNode;
+			})()
+			//class InlcudeFile
+			InlcudeFile = (function () {
+				function InlcudeFile(txt) {
+					this.script = null;
+					this.codes = {};
+					this.funs = {};
+					this.curUseID = -1;
+					this.funnames = "";
+					this.script = txt;
+					var begin = 0, ofs = 0, end = 0;
+					while (true) {
+						begin = txt.indexOf("#begin", begin);
+						if (begin < 0) break;
+						end = begin + 5;
+						while (true) {
+							end = txt.indexOf("#end", end);
+							if (end < 0) break;
+							if (txt.charAt(end + 4) === 'i')
+								end += 5;
+							else break;
+						}
+						if (end < 0) {
+							throw "add include err,no #end:" + txt;
+							return;
+						}
+						ofs = txt.indexOf('\n', begin);
+						var words = ShaderCompile.splitToWords(txt.substr(begin, ofs - begin), null);
+						if (words[1] == 'code') {
+							this.codes[words[2]] = txt.substr(ofs + 1, end - ofs - 1);
+						} else if (words[1] == 'function') {
+							ofs = txt.indexOf("function", begin);
+							ofs += "function".length;
+							this.funs[words[3]] = txt.substr(ofs + 1, end - ofs - 1);
+							this.funnames += words[3] + ";";
+						}
+						begin = end + 1;
+					}
+				}
+				__class(InlcudeFile, '');
+				var __proto = InlcudeFile.prototype;
+				__proto.getWith = function (name) {
+					var r = name ? this.codes[name] : this.script;
+					if (!r) {
+						throw "get with error:" + name;
+					}
+					return r;
+				}
+				__proto.getFunsScript = function (funsdef) {
+					var r = "";
+					for (var i in this.funs) {
+						if (funsdef.indexOf(i + ";") >= 0) {
+							r += this.funs[i];
+						}
+					}
+					return r;
+				}
+				return InlcudeFile;
+			})()
+		}
+
+		return ShaderCompile;
+	})()
+
+
+	/**
+	*@private
+	*/
+	//class laya.webgl.WebGL
+	var WebGL = (function () {
+		function WebGL() { }
+		__class(WebGL, 'laya.webgl.WebGL');
+		WebGL._uint8ArraySlice = function () {
+			var _this =/*__JS__ */this;
+			var sz = _this.length;
+			var dec = new Uint8Array(_this.length);
+			for (var i = 0; i < sz; i++)dec[i] = _this[i];
+			return dec;
+		}
+
+		WebGL._float32ArraySlice = function () {
+			var _this =/*__JS__ */this;
+			var sz = _this.length;
+			var dec = new Float32Array(_this.length);
+			for (var i = 0; i < sz; i++)dec[i] = _this[i];
+			return dec;
+		}
+
+		WebGL._uint16ArraySlice = function (__arg) {
+			var arg = arguments;
+			var _this =/*__JS__ */this;
+			var sz = 0;
+			var dec;
+			var i = 0;
+			if (arg.length === 0) {
+				sz = _this.length;
+				dec = new Uint16Array(sz);
+				for (i = 0; i < sz; i++)
+					dec[i] = _this[i];
+			} else if (arg.length === 2) {
+				var start = arg[0];
+				var end = arg[1];
+				if (end > start) {
+					sz = end - start;
+					dec = new Uint16Array(sz);
+					for (i = start; i < end; i++)
+						dec[i - start] = _this[i];
+				} else {
+					dec = new Uint16Array(0);
+				}
+			}
+			return dec;
+		}
+
+		WebGL.expandContext = function () {
+			var from = Context.prototype;
+			var to =/*__JS__ */CanvasRenderingContext2D.prototype;
+			to.fillTrangles = from.fillTrangles;
+			Buffer2D.__int__(null);
+			to.setIBVB = function (x, y, ib, vb, numElement, mat, shader, shaderValues, startIndex, offset) {
+				(startIndex === void 0) && (startIndex = 0);
+				(offset === void 0) && (offset = 0);
+				if (ib === null) {
+					this._ib = this._ib || IndexBuffer2D.QuadrangleIB;
+					ib = this._ib;
+					GlUtils.expandIBQuadrangle(ib, (vb._byteLength / (4 * 16) + 8));
+				}
+				this._setIBVB(x, y, ib, vb, numElement, mat, shader, shaderValues, startIndex, offset);
+			};
+			to.fillTrangles = function (tex, x, y, points, m) {
+				this._curMat = this._curMat || Matrix.create();
+				this._vb = this._vb || VertexBuffer2D.create();
+				if (!this._ib) {
+					this._ib = IndexBuffer2D.create();
+					GlUtils.fillIBQuadrangle(this._ib, length / 4);
+				};
+				var vb = this._vb;
+				var length = points.length >> 4;
+				GlUtils.fillTranglesVB(vb, x, y, points, m || this._curMat, 0, 0);
+				GlUtils.expandIBQuadrangle(this._ib, (vb._byteLength / (4 * 16) + 8));
+				var shaderValues = new Value2D(0x01, 0);
+				shaderValues.textureHost = tex;
+				var sd = new Shader2X("attribute vec2 position; attribute vec2 texcoord; uniform vec2 size; uniform mat4 mmat; varying vec2 v_texcoord; void main() { vec4 p=vec4(position.xy,0.0,1.0);vec4 pos=mmat*p; gl_Position =vec4((pos.x/size.x-0.5)*2.0,(0.5-pos.y/size.y)*2.0,pos.z,1.0); v_texcoord = texcoord; }", "precision mediump float; varying vec2 v_texcoord; uniform sampler2D texture; void main() {vec4 color= texture2D(texture, v_texcoord); color.a*=1.0; gl_FragColor= color;}");
+			/*__JS__ */vb._vertType = 3;
+				this._setIBVB(x, y, this._ib, vb, length * 6, m, sd, shaderValues, 0, 0);
+			}
+		}
+
+		WebGL.enable = function () {
+			Browser.__init__();
+			if (Render.isConchApp) {
+				if (!Render.isConchWebGL) {
+					RunDriver.skinAniSprite = function () {
+						var tSkinSprite = new SkinMesh()
+						return tSkinSprite;
+					}
+					WebGL.expandContext();
+					return false;
+				}
+			}
+			RunDriver.getWebGLContext = function getWebGLContext(canvas) {
+				var gl;
+				var names = ["webgl", "experimental-webgl", "webkit-3d", "moz-webgl"];
+				for (var i = 0; i < names.length; i++) {
+					try {
+						gl = canvas.getContext(names[i], { stencil: Config.isStencil, alpha: Config.isAlpha, antialias: Config.isAntialias, premultipliedAlpha: Config.premultipliedAlpha, preserveDrawingBuffer: Config.preserveDrawingBuffer });
+					} catch (e) { }
+					if (gl)
+						return gl;
+				}
+				return null;
+			}
+			WebGL.mainContext = RunDriver.getWebGLContext(Render._mainCanvas);
+			if (WebGL.mainContext == null)
+				return false;
+			if (Render.isWebGL) return true;
+			HTMLImage.create = function (src, def) {
+				return new WebGLImage(src, def);
+			}
+			HTMLSubImage.create = function (canvas, offsetX, offsetY, width, height, atlasImage, src) {
+				return new WebGLSubImage(canvas, offsetX, offsetY, width, height, atlasImage, src);
+			}
+			Render.WebGL = WebGL;
+			Render.isWebGL = true;
+			DrawText.__init__();
+			RunDriver.createRenderSprite = function (type, next) {
+				return new RenderSprite3D(type, next);
+			}
+			RunDriver.createWebGLContext2D = function (c) {
+				return new WebGLContext2D(c);
+			}
+			RunDriver.changeWebGLSize = function (width, height) {
+				laya.webgl.WebGL.onStageResize(width, height);
+			}
+			RunDriver.createGraphics = function () {
+				return new GraphicsGL();
+			};
+			var action = RunDriver.createFilterAction;
+			RunDriver.createFilterAction = action ? action : function (type) {
+				return new ColorFilterActionGL()
+			}
+			RunDriver.clear = function (color) {
+				RenderState2D.worldScissorTest && laya.webgl.WebGL.mainContext.disable(/*laya.webgl.WebGLContext.SCISSOR_TEST*/0x0C11);
+				var ctx = Render.context.ctx;
+				var c = (ctx._submits._length == 0 || Config.preserveDrawingBuffer) ? Color.create(color)._color : Stage._wgColor;
+				if (c) ctx.clearBG(c[0], c[1], c[2], c[3]);
+				RenderState2D.clear();
+			}
+			RunDriver.addToAtlas = function (texture, force) {
+				(force === void 0) && (force = false);
+				var bitmap = texture.bitmap;
+				if (!Render.optimizeTextureMemory(texture.url, texture)) {
+					(bitmap).enableMerageInAtlas = false;
+					return;
+				}
+				if ((Laya.__typeof(bitmap, 'laya.webgl.resource.IMergeAtlasBitmap')) && ((bitmap).allowMerageInAtlas)) {
+					bitmap.on(/*laya.events.Event.RECOVERED*/"recovered", texture, texture.addTextureToAtlas);
+				}
+			}
+			RunDriver.isAtlas = function (bitmap) {
+				return (bitmap instanceof laya.webgl.atlas.AtlasWebGLCanvas);
+			}
+			AtlasResourceManager._enable();
+			RunDriver.beginFlush = function () {
+				var atlasResourceManager = AtlasResourceManager.instance;
+				var count = atlasResourceManager.getAtlaserCount();
+				for (var i = 0; i < count; i++) {
+					var atlerCanvas = atlasResourceManager.getAtlaserByIndex(i).texture;
+					(atlerCanvas._flashCacheImageNeedFlush) && (RunDriver.flashFlushImage(atlerCanvas));
+				}
+			}
+			RunDriver.drawToCanvas = function (sprite, _renderType, canvasWidth, canvasHeight, offsetX, offsetY) {
+				offsetX -= sprite.x;
+				offsetY -= sprite.y;
+				var renderTarget = RenderTarget2D.create(canvasWidth, canvasHeight,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, 0, false);
+				renderTarget.start();
+				Render.context.clear();
+				sprite.render(Render.context, offsetX, RenderState2D.height - canvasHeight + offsetY);
+				Render.context.flush();
+				renderTarget.end();
+				var pixels = renderTarget.getData(0, 0, renderTarget.width, renderTarget.height);
+				renderTarget.recycle();
+				var htmlCanvas = new WebGLCanvas();
+				htmlCanvas._canvas = Browser.createElement("canvas");
+				htmlCanvas.size(canvasWidth, canvasHeight);
+				var context = htmlCanvas._canvas.getContext('2d');
+				Browser.canvas.size(canvasWidth, canvasHeight);
+				var tempContext = Browser.context;
+				var imgData = tempContext.createImageData(canvasWidth, canvasHeight);
+				imgData.data.set(/*__JS__ */new Uint8ClampedArray(pixels.buffer));
+				htmlCanvas._imgData = imgData;
+				tempContext.putImageData(imgData, 0, 0);
+				context.save();
+				context.translate(0, canvasHeight);
+				context.scale(1, -1);
+				context.drawImage(Browser.canvas.source, 0, 0);
+				context.restore();
+				return htmlCanvas;
+			}
+			RunDriver.createFilterAction = function (type) {
+				var action;
+				switch (type) {
+					case /*laya.filters.Filter.COLOR*/0x20:
+						action = new ColorFilterActionGL();
+						break;
+				}
+				return action;
+			}
+			RunDriver.addTextureToAtlas = function (texture) {
+				texture._uvID++;
+				AtlasResourceManager._atlasRestore++;
+				((texture.bitmap).enableMerageInAtlas) && (AtlasResourceManager.instance.addToAtlas(texture));
+			}
+			RunDriver.getTexturePixels = function (value, x, y, width, height) {
+				(Render.context.ctx).clear();
+				var tSprite = new Sprite();
+				tSprite.graphics.drawTexture(value, -x, -y);
+				var tRenderTarget = RenderTarget2D.create(width, height);
+				tRenderTarget.start();
+				tRenderTarget.clear(0, 0, 0, 0);
+				tSprite.render(Render.context, 0, 0);
+				(Render.context.ctx).flush();
+				tRenderTarget.end();
+				var tUint8Array = tRenderTarget.getData(0, 0, width, height);
+				var tArray = [];
+				var tIndex = 0;
+				for (var i = height - 1; i >= 0; i--) {
+					for (var j = 0; j < width; j++) {
+						tIndex = (i * width + j) * 4;
+						tArray.push(tUint8Array[tIndex]);
+						tArray.push(tUint8Array[tIndex + 1]);
+						tArray.push(tUint8Array[tIndex + 2]);
+						tArray.push(tUint8Array[tIndex + 3]);
+					}
+				}
+				return tArray;
+			}
+			RunDriver.skinAniSprite = function () {
+				var tSkinSprite = new SkinMesh()
+				return tSkinSprite;
+			}
+			Filter._filterStart = function (scope, sprite, context, x, y) {
+				var b = scope.getValue("bounds");
+				var source = RenderTarget2D.create(b.width, b.height);
+				source.start();
+				source.clear(0, 0, 0, 0);
+				scope.addValue("src", source);
+				scope.addValue("ScissorTest", RenderState2D.worldScissorTest);
+				if (RenderState2D.worldScissorTest) {
+					var tClilpRect = new Rectangle();
+					tClilpRect.copyFrom((context.ctx)._clipRect)
+					scope.addValue("clipRect", tClilpRect);
+					RenderState2D.worldScissorTest = false;
+					laya.webgl.WebGL.mainContext.disable(/*laya.webgl.WebGLContext.SCISSOR_TEST*/0x0C11);
+				}
+			}
+			Filter._filterEnd = function (scope, sprite, context, x, y) {
+				var b = scope.getValue("bounds");
+				var source = scope.getValue("src");
+				source.end();
+				var out = RenderTarget2D.create(b.width, b.height);
+				out.start();
+				out.clear(0, 0, 0, 0);
+				scope.addValue("out", out);
+				sprite._set$P('_filterCache', out);
+				sprite._set$P('_isHaveGlowFilter', scope.getValue("_isHaveGlowFilter"));
+			}
+			Filter._EndTarget = function (scope, context) {
+				var source = scope.getValue("src");
+				source.recycle();
+				var out = scope.getValue("out");
+				out.end();
+				var b = scope.getValue("ScissorTest");
+				if (b) {
+					RenderState2D.worldScissorTest = true;
+					laya.webgl.WebGL.mainContext.enable(/*laya.webgl.WebGLContext.SCISSOR_TEST*/0x0C11);
+					context.ctx.save();
+					var tClipRect = scope.getValue("clipRect");
+					(context.ctx).clipRect(tClipRect.x, tClipRect.y, tClipRect.width, tClipRect.height);
+				}
+			}
+			Filter._useSrc = function (scope) {
+				var source = scope.getValue("out");
+				source.end();
+				source = scope.getValue("src");
+				source.start();
+				source.clear(0, 0, 0, 0);
+			}
+			Filter._endSrc = function (scope) {
+				var source = scope.getValue("src");
+				source.end();
+			}
+			Filter._useOut = function (scope) {
+				var source = scope.getValue("src");
+				source.end();
+				source = scope.getValue("out");
+				source.start();
+				source.clear(0, 0, 0, 0);
+			}
+			Filter._endOut = function (scope) {
+				var source = scope.getValue("out");
+				source.end();
+			}
+			Filter._recycleScope = function (scope) {
+				scope.recycle();
+			}
+			Filter._filter = function (sprite, context, x, y) {
+				var next = this._next;
+				if (next) {
+					var filters = sprite.filters, len = filters.length;
+					if (len == 1 && (filters[0].type ==/*laya.filters.Filter.COLOR*/0x20)) {
+						context.ctx.save();
+						context.ctx.setFilters([filters[0]]);
+						next._fun.call(next, sprite, context, x, y);
+						context.ctx.restore();
+						return;
+					};
+					var shaderValue;
+					var b;
+					var scope = SubmitCMDScope.create();
+					var p = Point.TEMP;
+					var tMatrix = context.ctx._getTransformMatrix();
+					var mat = Matrix.create();
+					tMatrix.copyTo(mat);
+					var tPadding = 0;
+					var tHalfPadding = 0;
+					var tIsHaveGlowFilter = false;
+					var out = sprite._$P._filterCache ? sprite._$P._filterCache : null;
+					if (!out || sprite._repaint) {
+						tIsHaveGlowFilter = sprite._isHaveGlowFilter();
+						scope.addValue("_isHaveGlowFilter", tIsHaveGlowFilter);
+						if (tIsHaveGlowFilter) {
+							tPadding = 50;
+							tHalfPadding = 25;
+						}
+						b = new Rectangle();
+						b.copyFrom((sprite).getSelfBounds());
+						b.x += (sprite).x;
+						b.y += (sprite).y;
+						b.x -= (sprite).pivotX + 4;
+						b.y -= (sprite).pivotY + 4;
+						var tSX = b.x;
+						var tSY = b.y;
+						b.width += (tPadding + 8);
+						b.height += (tPadding + 8);
+						p.x = b.x * mat.a + b.y * mat.c;
+						p.y = b.y * mat.d + b.x * mat.b;
+						b.x = p.x;
+						b.y = p.y;
+						p.x = b.width * mat.a + b.height * mat.c;
+						p.y = b.height * mat.d + b.width * mat.b;
+						b.width = p.x;
+						b.height = p.y;
+						if (b.width <= 0 || b.height <= 0) {
+							return;
+						}
+						out && out.recycle();
+						scope.addValue("bounds", b);
+						var submit = SubmitCMD.create([scope, sprite, context, 0, 0], Filter._filterStart);
+						context.addRenderObject(submit);
+						(context.ctx)._renderKey = 0;
+						(context.ctx)._shader2D.glTexture = null;
+						var tX = sprite.x - tSX + tHalfPadding;
+						var tY = sprite.y - tSY + tHalfPadding;
+						next._fun.call(next, sprite, context, tX, tY);
+						submit = SubmitCMD.create([scope, sprite, context, 0, 0], Filter._filterEnd);
+						context.addRenderObject(submit);
+						for (var i = 0; i < len; i++) {
+							if (i != 0) {
+								submit = SubmitCMD.create([scope], Filter._useSrc);
+								context.addRenderObject(submit);
+								shaderValue = Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, 0);
+								Matrix.TEMP.identity();
+								context.ctx.drawTarget(scope, 0, 0, b.width, b.height, Matrix.TEMP, "out", shaderValue, null, BlendMode.TOINT.overlay);
+								submit = SubmitCMD.create([scope], Filter._useOut);
+								context.addRenderObject(submit);
+							};
+							var fil = filters[i];
+							fil.action.apply3d(scope, sprite, context, 0, 0);
+						}
+						submit = SubmitCMD.create([scope, context], Filter._EndTarget);
+						context.addRenderObject(submit);
+					} else {
+						tIsHaveGlowFilter = sprite._$P._isHaveGlowFilter ? sprite._$P._isHaveGlowFilter : false;
+						if (tIsHaveGlowFilter) {
+							tPadding = 50;
+							tHalfPadding = 25;
+						}
+						b = sprite.getBounds();
+						if (b.width <= 0 || b.height <= 0) {
+							return;
+						}
+						b.width += tPadding;
+						b.height += tPadding;
+						p.x = b.x * mat.a + b.y * mat.c;
+						p.y = b.y * mat.d + b.x * mat.b;
+						b.x = p.x;
+						b.y = p.y;
+						p.x = b.width * mat.a + b.height * mat.c;
+						p.y = b.height * mat.d + b.width * mat.b;
+						b.width = p.x;
+						b.height = p.y;
+						scope.addValue("out", out);
+					}
+					x = x - tHalfPadding - sprite.x;
+					y = y - tHalfPadding - sprite.y;
+					p.setTo(x, y);
+					mat.transformPoint(p);
+					x = p.x + b.x;
+					y = p.y + b.y;
+					shaderValue = Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, 0);
+					Matrix.TEMP.identity();
+					(context.ctx).drawTarget(scope, x, y, b.width, b.height, Matrix.TEMP, "out", shaderValue, null, BlendMode.TOINT.overlay);
+					submit = SubmitCMD.create([scope], Filter._recycleScope);
+					context.addRenderObject(submit);
+					mat.destroy();
+				}
+			}
+			Float32Array.prototype.slice || (Float32Array.prototype.slice = WebGL._float32ArraySlice);
+			Uint16Array.prototype.slice || (Uint16Array.prototype.slice = WebGL._uint16ArraySlice);
+			Uint8Array.prototype.slice || (Uint8Array.prototype.slice = WebGL._uint8ArraySlice);
+			return true;
+		}
+
+		WebGL.onStageResize = function (width, height) {
+			if (WebGL.mainContext == null) return;
+			WebGL.mainContext.viewport(0, 0, width, height);
+			RenderState2D.width = width;
+			RenderState2D.height = height;
+		}
+
+		WebGL.onInvalidGLRes = function () {
+			AtlasResourceManager.instance.freeAll();
+			ResourceManager.releaseContentManagers(true);
+			WebGL.doNodeRepaint(Laya.stage);
+			WebGL.mainContext.viewport(0, 0, RenderState2D.width, RenderState2D.height);
+			Laya.stage.event(/*laya.events.Event.DEVICE_LOST*/"devicelost");
+		}
+
+		WebGL.doNodeRepaint = function (sprite) {
+			(sprite.numChildren == 0) && (sprite.repaint());
+			for (var i = 0; i < sprite.numChildren; i++)
+				WebGL.doNodeRepaint(sprite.getChildAt(i));
+		}
+
+		WebGL.init = function (canvas, width, height) {
+			WebGL.mainCanvas = canvas;
+			HTMLCanvas._createContext = function (canvas) {
+				return new WebGLContext2D(canvas);
+			};
+			var gl = laya.webgl.WebGL.mainContext;
+			if (gl.getShaderPrecisionFormat != null) {
+				var vertexPrecisionFormat = gl.getShaderPrecisionFormat(/*laya.webgl.WebGLContext.VERTEX_SHADER*/0x8B31,/*laya.webgl.WebGLContext.HIGH_FLOAT*/0x8DF2);
+				var framePrecisionFormat = gl.getShaderPrecisionFormat(/*laya.webgl.WebGLContext.FRAGMENT_SHADER*/0x8B30,/*laya.webgl.WebGLContext.HIGH_FLOAT*/0x8DF2);
+				WebGL.shaderHighPrecision = (vertexPrecisionFormat.precision && framePrecisionFormat.precision) ? true : false;
+			} else {
+				WebGL.shaderHighPrecision = false;
+			}
+			WebGL.compressAstc = gl.getExtension("WEBGL_compressed_texture_astc");
+			WebGL.compressAtc = gl.getExtension("WEBGL_compressed_texture_atc");
+			WebGL.compressEtc = gl.getExtension("WEBGL_compressed_texture_etc");
+			WebGL.compressEtc1 = gl.getExtension("WEBGL_compressed_texture_etc1");
+			WebGL.compressPvrtc = gl.getExtension("WEBGL_compressed_texture_pvrtc");
+			WebGL.compressS3tc = gl.getExtension("WEBGL_compressed_texture_s3tc");
+			WebGL.compressS3tc_srgb = gl.getExtension("WEBGL_compressed_texture_s3tc_srgb");
+			gl.deleteTexture1 = gl.deleteTexture;
+			gl.deleteTexture = function (t) {
+				if (t == WebGLContext.curBindTexValue) {
+					WebGLContext.curBindTexValue = null;
+				}
+				gl.deleteTexture1(t);
+			}
+			WebGL.onStageResize(width, height);
+			if (WebGL.mainContext == null)
+				throw new Error("webGL getContext err!");
+			System.__init__();
+			AtlasResourceManager.__init__();
+			ShaderDefines2D.__init__();
+			Submit.__init__();
+			WebGLContext2D.__init__();
+			Value2D.__init__();
+			Shader2D.__init__();
+			Buffer2D.__int__(gl);
+			BlendMode._init_(gl);
+			if (Render.isConchApp) {
+			/*__JS__ */conch.setOnInvalidGLRes(WebGL.onInvalidGLRes);
+			}
+		}
+
+		WebGL.compressAstc = null;
+		WebGL.compressAtc = null;
+		WebGL.compressEtc = null;
+		WebGL.compressEtc1 = null;
+		WebGL.compressPvrtc = null;
+		WebGL.compressS3tc = null;
+		WebGL.compressS3tc_srgb = null;
+		WebGL.mainCanvas = null;
+		WebGL.mainContext = null;
+		WebGL.antialias = true;
+		WebGL.shaderHighPrecision = false;
+		__static(WebGL,
+			['_bg_null', function () { return this._bg_null = [0, 0, 0, 0]; }
+			]);
+		return WebGL;
+	})()
+
+
+	//class laya.webgl.WebGLContext
+	var WebGLContext = (function () {
+		function WebGLContext() { }
+		__class(WebGLContext, 'laya.webgl.WebGLContext');
+		WebGLContext.UseProgram = function (program) {
+			if (WebGLContext._useProgram === program) return false;
+			WebGL.mainContext.useProgram(program);
+			WebGLContext._useProgram = program;
+			return true;
+		}
+
+		WebGLContext.setDepthTest = function (gl, value) {
+			value !== WebGLContext._depthTest && (WebGLContext._depthTest = value, value ? gl.enable(/*CLASS CONST:laya.webgl.WebGLContext.DEPTH_TEST*/0x0B71) : gl.disable(/*CLASS CONST:laya.webgl.WebGLContext.DEPTH_TEST*/0x0B71));
+		}
+
+		WebGLContext.setDepthMask = function (gl, value) {
+			value !== WebGLContext._depthMask && (WebGLContext._depthMask = value, gl.depthMask(value));
+		}
+
+		WebGLContext.setDepthFunc = function (gl, value) {
+			value !== WebGLContext._depthFunc && (WebGLContext._depthFunc = value, gl.depthFunc(value));
+		}
+
+		WebGLContext.setBlend = function (gl, value) {
+			value !== WebGLContext._blend && (WebGLContext._blend = value, value ? gl.enable(/*CLASS CONST:laya.webgl.WebGLContext.BLEND*/0x0BE2) : gl.disable(/*CLASS CONST:laya.webgl.WebGLContext.BLEND*/0x0BE2));
+		}
+
+		WebGLContext.setBlendFunc = function (gl, sFactor, dFactor) {
+			(sFactor !== WebGLContext._sFactor || dFactor !== WebGLContext._dFactor) && (WebGLContext._sFactor = sFactor, WebGLContext._dFactor = dFactor, gl.blendFunc(sFactor, dFactor));
+		}
+
+		WebGLContext.setCullFace = function (gl, value) {
+			value !== WebGLContext._cullFace && (WebGLContext._cullFace = value, value ? gl.enable(/*CLASS CONST:laya.webgl.WebGLContext.CULL_FACE*/0x0B44) : gl.disable(/*CLASS CONST:laya.webgl.WebGLContext.CULL_FACE*/0x0B44));
+		}
+
+		WebGLContext.setFrontFace = function (gl, value) {
+			value !== WebGLContext._frontFace && (WebGLContext._frontFace = value, gl.frontFace(value));
+		}
+
+		WebGLContext.bindTexture = function (gl, target, texture) {
+			gl.bindTexture(target, texture);
+			WebGLContext.curBindTexTarget = target;
+			WebGLContext.curBindTexValue = texture;
+		}
+
+		WebGLContext.DEPTH_BUFFER_BIT = 0x00000100;
+		WebGLContext.STENCIL_BUFFER_BIT = 0x00000400;
+		WebGLContext.COLOR_BUFFER_BIT = 0x00004000;
+		WebGLContext.POINTS = 0x0000;
+		WebGLContext.LINES = 0x0001;
+		WebGLContext.LINE_LOOP = 0x0002;
+		WebGLContext.LINE_STRIP = 0x0003;
+		WebGLContext.TRIANGLES = 0x0004;
+		WebGLContext.TRIANGLE_STRIP = 0x0005;
+		WebGLContext.TRIANGLE_FAN = 0x0006;
+		WebGLContext.ZERO = 0;
+		WebGLContext.ONE = 1;
+		WebGLContext.SRC_COLOR = 0x0300;
+		WebGLContext.ONE_MINUS_SRC_COLOR = 0x0301;
+		WebGLContext.SRC_ALPHA = 0x0302;
+		WebGLContext.ONE_MINUS_SRC_ALPHA = 0x0303;
+		WebGLContext.DST_ALPHA = 0x0304;
+		WebGLContext.ONE_MINUS_DST_ALPHA = 0x0305;
+		WebGLContext.DST_COLOR = 0x0306;
+		WebGLContext.ONE_MINUS_DST_COLOR = 0x0307;
+		WebGLContext.SRC_ALPHA_SATURATE = 0x0308;
+		WebGLContext.FUNC_ADD = 0x8006;
+		WebGLContext.BLEND_EQUATION = 0x8009;
+		WebGLContext.BLEND_EQUATION_RGB = 0x8009;
+		WebGLContext.BLEND_EQUATION_ALPHA = 0x883D;
+		WebGLContext.FUNC_SUBTRACT = 0x800A;
+		WebGLContext.FUNC_REVERSE_SUBTRACT = 0x800B;
+		WebGLContext.BLEND_DST_RGB = 0x80C8;
+		WebGLContext.BLEND_SRC_RGB = 0x80C9;
+		WebGLContext.BLEND_DST_ALPHA = 0x80CA;
+		WebGLContext.BLEND_SRC_ALPHA = 0x80CB;
+		WebGLContext.CONSTANT_COLOR = 0x8001;
+		WebGLContext.ONE_MINUS_CONSTANT_COLOR = 0x8002;
+		WebGLContext.CONSTANT_ALPHA = 0x8003;
+		WebGLContext.ONE_MINUS_CONSTANT_ALPHA = 0x8004;
+		WebGLContext.BLEND_COLOR = 0x8005;
+		WebGLContext.ARRAY_BUFFER = 0x8892;
+		WebGLContext.ELEMENT_ARRAY_BUFFER = 0x8893;
+		WebGLContext.ARRAY_BUFFER_BINDING = 0x8894;
+		WebGLContext.ELEMENT_ARRAY_BUFFER_BINDING = 0x8895;
+		WebGLContext.STREAM_DRAW = 0x88E0;
+		WebGLContext.STATIC_DRAW = 0x88E4;
+		WebGLContext.DYNAMIC_DRAW = 0x88E8;
+		WebGLContext.BUFFER_SIZE = 0x8764;
+		WebGLContext.BUFFER_USAGE = 0x8765;
+		WebGLContext.CURRENT_VERTEX_ATTRIB = 0x8626;
+		WebGLContext.FRONT = 0x0404;
+		WebGLContext.BACK = 0x0405;
+		WebGLContext.CULL_FACE = 0x0B44;
+		WebGLContext.FRONT_AND_BACK = 0x0408;
+		WebGLContext.BLEND = 0x0BE2;
+		WebGLContext.DITHER = 0x0BD0;
+		WebGLContext.STENCIL_TEST = 0x0B90;
+		WebGLContext.DEPTH_TEST = 0x0B71;
+		WebGLContext.SCISSOR_TEST = 0x0C11;
+		WebGLContext.POLYGON_OFFSET_FILL = 0x8037;
+		WebGLContext.SAMPLE_ALPHA_TO_COVERAGE = 0x809E;
+		WebGLContext.SAMPLE_COVERAGE = 0x80A0;
+		WebGLContext.NO_ERROR = 0;
+		WebGLContext.INVALID_ENUM = 0x0500;
+		WebGLContext.INVALID_VALUE = 0x0501;
+		WebGLContext.INVALID_OPERATION = 0x0502;
+		WebGLContext.OUT_OF_MEMORY = 0x0505;
+		WebGLContext.CW = 0x0900;
+		WebGLContext.CCW = 0x0901;
+		WebGLContext.LINE_WIDTH = 0x0B21;
+		WebGLContext.ALIASED_POINT_SIZE_RANGE = 0x846D;
+		WebGLContext.ALIASED_LINE_WIDTH_RANGE = 0x846E;
+		WebGLContext.CULL_FACE_MODE = 0x0B45;
+		WebGLContext.FRONT_FACE = 0x0B46;
+		WebGLContext.DEPTH_RANGE = 0x0B70;
+		WebGLContext.DEPTH_WRITEMASK = 0x0B72;
+		WebGLContext.DEPTH_CLEAR_VALUE = 0x0B73;
+		WebGLContext.DEPTH_FUNC = 0x0B74;
+		WebGLContext.STENCIL_CLEAR_VALUE = 0x0B91;
+		WebGLContext.STENCIL_FUNC = 0x0B92;
+		WebGLContext.STENCIL_FAIL = 0x0B94;
+		WebGLContext.STENCIL_PASS_DEPTH_FAIL = 0x0B95;
+		WebGLContext.STENCIL_PASS_DEPTH_PASS = 0x0B96;
+		WebGLContext.STENCIL_REF = 0x0B97;
+		WebGLContext.STENCIL_VALUE_MASK = 0x0B93;
+		WebGLContext.STENCIL_WRITEMASK = 0x0B98;
+		WebGLContext.STENCIL_BACK_FUNC = 0x8800;
+		WebGLContext.STENCIL_BACK_FAIL = 0x8801;
+		WebGLContext.STENCIL_BACK_PASS_DEPTH_FAIL = 0x8802;
+		WebGLContext.STENCIL_BACK_PASS_DEPTH_PASS = 0x8803;
+		WebGLContext.STENCIL_BACK_REF = 0x8CA3;
+		WebGLContext.STENCIL_BACK_VALUE_MASK = 0x8CA4;
+		WebGLContext.STENCIL_BACK_WRITEMASK = 0x8CA5;
+		WebGLContext.VIEWPORT = 0x0BA2;
+		WebGLContext.SCISSOR_BOX = 0x0C10;
+		WebGLContext.COLOR_CLEAR_VALUE = 0x0C22;
+		WebGLContext.COLOR_WRITEMASK = 0x0C23;
+		WebGLContext.UNPACK_ALIGNMENT = 0x0CF5;
+		WebGLContext.PACK_ALIGNMENT = 0x0D05;
+		WebGLContext.MAX_TEXTURE_SIZE = 0x0D33;
+		WebGLContext.MAX_VIEWPORT_DIMS = 0x0D3A;
+		WebGLContext.SUBPIXEL_BITS = 0x0D50;
+		WebGLContext.RED_BITS = 0x0D52;
+		WebGLContext.GREEN_BITS = 0x0D53;
+		WebGLContext.BLUE_BITS = 0x0D54;
+		WebGLContext.ALPHA_BITS = 0x0D55;
+		WebGLContext.DEPTH_BITS = 0x0D56;
+		WebGLContext.STENCIL_BITS = 0x0D57;
+		WebGLContext.POLYGON_OFFSET_UNITS = 0x2A00;
+		WebGLContext.POLYGON_OFFSET_FACTOR = 0x8038;
+		WebGLContext.TEXTURE_BINDING_2D = 0x8069;
+		WebGLContext.SAMPLE_BUFFERS = 0x80A8;
+		WebGLContext.SAMPLES = 0x80A9;
+		WebGLContext.SAMPLE_COVERAGE_VALUE = 0x80AA;
+		WebGLContext.SAMPLE_COVERAGE_INVERT = 0x80AB;
+		WebGLContext.NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2;
+		WebGLContext.COMPRESSED_TEXTURE_FORMATS = 0x86A3;
+		WebGLContext.DONT_CARE = 0x1100;
+		WebGLContext.FASTEST = 0x1101;
+		WebGLContext.NICEST = 0x1102;
+		WebGLContext.GENERATE_MIPMAP_HINT = 0x8192;
+		WebGLContext.BYTE = 0x1400;
+		WebGLContext.UNSIGNED_BYTE = 0x1401;
+		WebGLContext.SHORT = 0x1402;
+		WebGLContext.UNSIGNED_SHORT = 0x1403;
+		WebGLContext.INT = 0x1404;
+		WebGLContext.UNSIGNED_INT = 0x1405;
+		WebGLContext.FLOAT = 0x1406;
+		WebGLContext.DEPTH_COMPONENT = 0x1902;
+		WebGLContext.ALPHA = 0x1906;
+		WebGLContext.RGB = 0x1907;
+		WebGLContext.RGBA = 0x1908;
+		WebGLContext.LUMINANCE = 0x1909;
+		WebGLContext.LUMINANCE_ALPHA = 0x190A;
+		WebGLContext.UNSIGNED_SHORT_4_4_4_4 = 0x8033;
+		WebGLContext.UNSIGNED_SHORT_5_5_5_1 = 0x8034;
+		WebGLContext.UNSIGNED_SHORT_5_6_5 = 0x8363;
+		WebGLContext.FRAGMENT_SHADER = 0x8B30;
+		WebGLContext.VERTEX_SHADER = 0x8B31;
+		WebGLContext.MAX_VERTEX_ATTRIBS = 0x8869;
+		WebGLContext.MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB;
+		WebGLContext.MAX_VARYING_VECTORS = 0x8DFC;
+		WebGLContext.MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D;
+		WebGLContext.MAX_VERTEX_TEXTURE_IMAGE_UNITS = 0x8B4C;
+		WebGLContext.MAX_TEXTURE_IMAGE_UNITS = 0x8872;
+		WebGLContext.MAX_FRAGMENT_UNIFORM_VECTORS = 0x8DFD;
+		WebGLContext.SHADER_TYPE = 0x8B4F;
+		WebGLContext.DELETE_STATUS = 0x8B80;
+		WebGLContext.LINK_STATUS = 0x8B82;
+		WebGLContext.VALIDATE_STATUS = 0x8B83;
+		WebGLContext.ATTACHED_SHADERS = 0x8B85;
+		WebGLContext.ACTIVE_UNIFORMS = 0x8B86;
+		WebGLContext.ACTIVE_ATTRIBUTES = 0x8B89;
+		WebGLContext.SHADING_LANGUAGE_VERSION = 0x8B8C;
+		WebGLContext.CURRENT_PROGRAM = 0x8B8D;
+		WebGLContext.NEVER = 0x0200;
+		WebGLContext.LESS = 0x0201;
+		WebGLContext.EQUAL = 0x0202;
+		WebGLContext.LEQUAL = 0x0203;
+		WebGLContext.GREATER = 0x0204;
+		WebGLContext.NOTEQUAL = 0x0205;
+		WebGLContext.GEQUAL = 0x0206;
+		WebGLContext.ALWAYS = 0x0207;
+		WebGLContext.KEEP = 0x1E00;
+		WebGLContext.REPLACE = 0x1E01;
+		WebGLContext.INCR = 0x1E02;
+		WebGLContext.DECR = 0x1E03;
+		WebGLContext.INVERT = 0x150A;
+		WebGLContext.INCR_WRAP = 0x8507;
+		WebGLContext.DECR_WRAP = 0x8508;
+		WebGLContext.VENDOR = 0x1F00;
+		WebGLContext.RENDERER = 0x1F01;
+		WebGLContext.VERSION = 0x1F02;
+		WebGLContext.NEAREST = 0x2600;
+		WebGLContext.LINEAR = 0x2601;
+		WebGLContext.NEAREST_MIPMAP_NEAREST = 0x2700;
+		WebGLContext.LINEAR_MIPMAP_NEAREST = 0x2701;
+		WebGLContext.NEAREST_MIPMAP_LINEAR = 0x2702;
+		WebGLContext.LINEAR_MIPMAP_LINEAR = 0x2703;
+		WebGLContext.TEXTURE_MAG_FILTER = 0x2800;
+		WebGLContext.TEXTURE_MIN_FILTER = 0x2801;
+		WebGLContext.TEXTURE_WRAP_S = 0x2802;
+		WebGLContext.TEXTURE_WRAP_T = 0x2803;
+		WebGLContext.TEXTURE_2D = 0x0DE1;
+		WebGLContext.TEXTURE = 0x1702;
+		WebGLContext.TEXTURE_CUBE_MAP = 0x8513;
+		WebGLContext.TEXTURE_BINDING_CUBE_MAP = 0x8514;
+		WebGLContext.TEXTURE_CUBE_MAP_POSITIVE_X = 0x8515;
+		WebGLContext.TEXTURE_CUBE_MAP_NEGATIVE_X = 0x8516;
+		WebGLContext.TEXTURE_CUBE_MAP_POSITIVE_Y = 0x8517;
+		WebGLContext.TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x8518;
+		WebGLContext.TEXTURE_CUBE_MAP_POSITIVE_Z = 0x8519;
+		WebGLContext.TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x851A;
+		WebGLContext.MAX_CUBE_MAP_TEXTURE_SIZE = 0x851C;
+		WebGLContext.TEXTURE0 = 0x84C0;
+		WebGLContext.TEXTURE1 = 0x84C1;
+		WebGLContext.TEXTURE2 = 0x84C2;
+		WebGLContext.TEXTURE3 = 0x84C3;
+		WebGLContext.TEXTURE4 = 0x84C4;
+		WebGLContext.TEXTURE5 = 0x84C5;
+		WebGLContext.TEXTURE6 = 0x84C6;
+		WebGLContext.TEXTURE7 = 0x84C7;
+		WebGLContext.TEXTURE8 = 0x84C8;
+		WebGLContext.TEXTURE9 = 0x84C9;
+		WebGLContext.TEXTURE10 = 0x84CA;
+		WebGLContext.TEXTURE11 = 0x84CB;
+		WebGLContext.TEXTURE12 = 0x84CC;
+		WebGLContext.TEXTURE13 = 0x84CD;
+		WebGLContext.TEXTURE14 = 0x84CE;
+		WebGLContext.TEXTURE15 = 0x84CF;
+		WebGLContext.TEXTURE16 = 0x84D0;
+		WebGLContext.TEXTURE17 = 0x84D1;
+		WebGLContext.TEXTURE18 = 0x84D2;
+		WebGLContext.TEXTURE19 = 0x84D3;
+		WebGLContext.TEXTURE20 = 0x84D4;
+		WebGLContext.TEXTURE21 = 0x84D5;
+		WebGLContext.TEXTURE22 = 0x84D6;
+		WebGLContext.TEXTURE23 = 0x84D7;
+		WebGLContext.TEXTURE24 = 0x84D8;
+		WebGLContext.TEXTURE25 = 0x84D9;
+		WebGLContext.TEXTURE26 = 0x84DA;
+		WebGLContext.TEXTURE27 = 0x84DB;
+		WebGLContext.TEXTURE28 = 0x84DC;
+		WebGLContext.TEXTURE29 = 0x84DD;
+		WebGLContext.TEXTURE30 = 0x84DE;
+		WebGLContext.TEXTURE31 = 0x84DF;
+		WebGLContext.ACTIVE_TEXTURE = 0x84E0;
+		WebGLContext.REPEAT = 0x2901;
+		WebGLContext.CLAMP_TO_EDGE = 0x812F;
+		WebGLContext.MIRRORED_REPEAT = 0x8370;
+		WebGLContext.FLOAT_VEC2 = 0x8B50;
+		WebGLContext.FLOAT_VEC3 = 0x8B51;
+		WebGLContext.FLOAT_VEC4 = 0x8B52;
+		WebGLContext.INT_VEC2 = 0x8B53;
+		WebGLContext.INT_VEC3 = 0x8B54;
+		WebGLContext.INT_VEC4 = 0x8B55;
+		WebGLContext.BOOL = 0x8B56;
+		WebGLContext.BOOL_VEC2 = 0x8B57;
+		WebGLContext.BOOL_VEC3 = 0x8B58;
+		WebGLContext.BOOL_VEC4 = 0x8B59;
+		WebGLContext.FLOAT_MAT2 = 0x8B5A;
+		WebGLContext.FLOAT_MAT3 = 0x8B5B;
+		WebGLContext.FLOAT_MAT4 = 0x8B5C;
+		WebGLContext.SAMPLER_2D = 0x8B5E;
+		WebGLContext.SAMPLER_CUBE = 0x8B60;
+		WebGLContext.VERTEX_ATTRIB_ARRAY_ENABLED = 0x8622;
+		WebGLContext.VERTEX_ATTRIB_ARRAY_SIZE = 0x8623;
+		WebGLContext.VERTEX_ATTRIB_ARRAY_STRIDE = 0x8624;
+		WebGLContext.VERTEX_ATTRIB_ARRAY_TYPE = 0x8625;
+		WebGLContext.VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886A;
+		WebGLContext.VERTEX_ATTRIB_ARRAY_POINTER = 0x8645;
+		WebGLContext.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F;
+		WebGLContext.COMPILE_STATUS = 0x8B81;
+		WebGLContext.LOW_FLOAT = 0x8DF0;
+		WebGLContext.MEDIUM_FLOAT = 0x8DF1;
+		WebGLContext.HIGH_FLOAT = 0x8DF2;
+		WebGLContext.LOW_INT = 0x8DF3;
+		WebGLContext.MEDIUM_INT = 0x8DF4;
+		WebGLContext.HIGH_INT = 0x8DF5;
+		WebGLContext.FRAMEBUFFER = 0x8D40;
+		WebGLContext.RENDERBUFFER = 0x8D41;
+		WebGLContext.RGBA4 = 0x8056;
+		WebGLContext.RGB5_A1 = 0x8057;
+		WebGLContext.RGB565 = 0x8D62;
+		WebGLContext.DEPTH_COMPONENT16 = 0x81A5;
+		WebGLContext.STENCIL_INDEX = 0x1901;
+		WebGLContext.STENCIL_INDEX8 = 0x8D48;
+		WebGLContext.DEPTH_STENCIL = 0x84F9;
+		WebGLContext.RENDERBUFFER_WIDTH = 0x8D42;
+		WebGLContext.RENDERBUFFER_HEIGHT = 0x8D43;
+		WebGLContext.RENDERBUFFER_INTERNAL_FORMAT = 0x8D44;
+		WebGLContext.RENDERBUFFER_RED_SIZE = 0x8D50;
+		WebGLContext.RENDERBUFFER_GREEN_SIZE = 0x8D51;
+		WebGLContext.RENDERBUFFER_BLUE_SIZE = 0x8D52;
+		WebGLContext.RENDERBUFFER_ALPHA_SIZE = 0x8D53;
+		WebGLContext.RENDERBUFFER_DEPTH_SIZE = 0x8D54;
+		WebGLContext.RENDERBUFFER_STENCIL_SIZE = 0x8D55;
+		WebGLContext.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = 0x8CD0;
+		WebGLContext.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME = 0x8CD1;
+		WebGLContext.FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL = 0x8CD2;
+		WebGLContext.FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = 0x8CD3;
+		WebGLContext.COLOR_ATTACHMENT0 = 0x8CE0;
+		WebGLContext.DEPTH_ATTACHMENT = 0x8D00;
+		WebGLContext.STENCIL_ATTACHMENT = 0x8D20;
+		WebGLContext.DEPTH_STENCIL_ATTACHMENT = 0x821A;
+		WebGLContext.NONE = 0;
+		WebGLContext.FRAMEBUFFER_COMPLETE = 0x8CD5;
+		WebGLContext.FRAMEBUFFER_INCOMPLETE_ATTACHMENT = 0x8CD6;
+		WebGLContext.FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = 0x8CD7;
+		WebGLContext.FRAMEBUFFER_INCOMPLETE_DIMENSIONS = 0x8CD9;
+		WebGLContext.FRAMEBUFFER_UNSUPPORTED = 0x8CDD;
+		WebGLContext.FRAMEBUFFER_BINDING = 0x8CA6;
+		WebGLContext.RENDERBUFFER_BINDING = 0x8CA7;
+		WebGLContext.MAX_RENDERBUFFER_SIZE = 0x84E8;
+		WebGLContext.INVALID_FRAMEBUFFER_OPERATION = 0x0506;
+		WebGLContext.UNPACK_FLIP_Y_WEBGL = 0x9240;
+		WebGLContext.UNPACK_PREMULTIPLY_ALPHA_WEBGL = 0x9241;
+		WebGLContext.CONTEXT_LOST_WEBGL = 0x9242;
+		WebGLContext.UNPACK_COLORSPACE_CONVERSION_WEBGL = 0x9243;
+		WebGLContext.BROWSER_DEFAULT_WEBGL = 0x9244;
+		WebGLContext._useProgram = null;
+		WebGLContext._depthTest = true;
+		WebGLContext._depthMask = true;
+		WebGLContext._blend = false;
+		WebGLContext._cullFace = false;
+		WebGLContext.curBindTexTarget = null;
+		WebGLContext.curBindTexValue = null;
+		__static(WebGLContext,
+			['_depthFunc', function () { return this._depthFunc =/*CLASS CONST:laya.webgl.WebGLContext.LESS*/0x0201; }, '_sFactor', function () { return this._sFactor =/*CLASS CONST:laya.webgl.WebGLContext.ONE*/1; }, '_dFactor', function () { return this._dFactor =/*CLASS CONST:laya.webgl.WebGLContext.ZERO*/0; }, '_frontFace', function () { return this._frontFace =/*CLASS CONST:laya.webgl.WebGLContext.CCW*/0x0901; }
+			]);
+		return WebGLContext;
+	})()
+
+
+	//class laya.webgl.display.GraphicsGL extends laya.display.Graphics
+	var GraphicsGL = (function (_super) {
+		function GraphicsGL() {
+			GraphicsGL.__super.call(this);
+		}
+
+		__class(GraphicsGL, 'laya.webgl.display.GraphicsGL', _super);
+		var __proto = GraphicsGL.prototype;
+		__proto.setShader = function (shader) {
+			this._saveToCmd(Render.context._setShader, [shader]);
+		}
+
+		__proto.setIBVB = function (x, y, ib, vb, numElement, shader) {
+			this._saveToCmd(Render.context._setIBVB, [x, y, ib, vb, numElement, shader]);
+		}
+
+		__proto.drawParticle = function (x, y, ps) {
+			var pt = RunDriver.createParticleTemplate2D(ps);
+			pt.x = x;
+			pt.y = y;
+			this._saveToCmd(Render.context._drawParticle, [pt]);
+		}
+
+		return GraphicsGL;
+	})(Graphics)
+
+
+	//class laya.webgl.canvas.WebGLContext2D extends laya.resource.Context
+	var WebGLContext2D = (function (_super) {
+		var ContextParams;
+		function WebGLContext2D(c) {
+			this._x = 0;
+			this._y = 0;
+			this._id = ++WebGLContext2D._COUNT;
+			//this._other=null;
+			this._path = null;
+			//this._primitiveValue2D=null;
+			this._drawCount = 1;
+			this._maxNumEle = 0;
+			this._clear = false;
+			this._isMain = false;
+			this._atlasResourceChange = 0;
+			this._submits = null;
+			this._curSubmit = null;
+			this._ib = null;
+			this._vb = null;
+			//this._curMat=null;
+			this._nBlendType = 0;
+			//this._save=null;
+			//this._targets=null;
+			//this._renderKey=NaN;
+			this._saveMark = null;
+			this._shader2D = null;
+			/**所cacheAs精灵*/
+			//this.sprite=null;
+			/*******************************************start矢量绘制***************************************************/
+			this.mId = -1;
+			this.mHaveKey = false;
+			this.mHaveLineKey = false;
+			this.mX = 0;
+			this.mY = 0;
+			WebGLContext2D.__super.call(this);
+			this._width = 99999999;
+			this._height = 99999999;
+			this._clipRect = WebGLContext2D.MAXCLIPRECT;
+			this.mOutPoint
+			this._canvas = c;
+			WebGLContext2D._contextcount++;
+			if (Render.isFlash) {
+				this._ib = IndexBuffer2D.create(/*laya.webgl.WebGLContext.STATIC_DRAW*/0x88E4);
+				GlUtils.fillIBQuadrangle(this._ib, 16);
+			} else
+				this._ib = IndexBuffer2D.QuadrangleIB;
+			this.clear();
+		}
+
+		__class(WebGLContext2D, 'laya.webgl.canvas.WebGLContext2D', _super);
+		var __proto = WebGLContext2D.prototype;
+		__proto.setIsMainContext = function () {
+			this._isMain = true;
+		}
+
+		__proto.clearBG = function (r, g, b, a) {
+			var gl = WebGL.mainContext;
+			gl.clearColor(r, g, b, a);
+			gl.clear(/*laya.webgl.WebGLContext.COLOR_BUFFER_BIT*/0x00004000);
+		}
+
+		__proto._getSubmits = function () {
+			return this._submits;
+		}
+
+		__proto._releaseMem = function () {
+			if (!this._submits)
+				return;
+			this._curMat.destroy();
+			this._curMat = null;
+			this._shader2D.destroy();
+			this._shader2D = null;
+			for (var i = 0, n = this._submits._length; i < n; i++)
+				this._submits[i].releaseRender();
+			this._submits.length = 0;
+			this._submits._length = 0;
+			this._submits = null;
+			this._curSubmit = null;
+			this._path && this._path.recover();
+			this._path = null;
+			this._other && (this._other.font = null);
+			this._save = null;
+			if (this._vb) {
+				this._vb.releaseResource();
+				this._vb.dispose();
+				this._vb.destory();
+				this._vb = null;
+			}
+		}
+
+		__proto.destroy = function () {
+			--WebGLContext2D._contextcount;
+			this.sprite = null;
+			this._releaseMem();
+			this._targets && this._targets.destroy();
+			this._targets = null;
+			this._canvas = null;
+			this._ib && (this._ib != IndexBuffer2D.QuadrangleIB) && this._ib.releaseResource();
+		}
+
+		__proto.clear = function () {
+			if (!this._submits) {
+				this._other = ContextParams.DEFAULT;
+				this._curMat = Matrix.create();
+				this._vb = VertexBuffer2D.create(-1);
+				this._submits = [];
+				this._save = [SaveMark.Create(this)];
+				this._save.length = 10;
+				this._shader2D = new Shader2D();
+			}
+			this._vb.clear();
+			this._targets && (this._targets.repaint = true);
+			this._other = ContextParams.DEFAULT;
+			this._clear = true;
+			this._repaint = false;
+			this._drawCount = 1;
+			this._renderKey = 0;
+			this._other.lineWidth = this._shader2D.ALPHA = 1.0;
+			this._nBlendType = 0;
+			this._clipRect = WebGLContext2D.MAXCLIPRECT;
+			this._curSubmit = Submit.RENDERBASE;
+			this._shader2D.glTexture = null;
+			this._shader2D.fillStyle = this._shader2D.strokeStyle = DrawStyle.DEFAULT;
+			for (var i = 0, n = this._submits._length; i < n; i++)
+				this._submits[i].releaseRender();
+			this._submits._length = 0;
+			this._curMat.identity();
+			this._other.clear();
+			this._saveMark = this._save[0];
+			this._save._length = 1;
+		}
+
+		__proto.size = function (w, h) {
+			if (this._width != w || this._height != h) {
+				if (w == 0 || h == 0) {
+					if (this._vb._byteLength != 0) {
+						this._width = w;
+						this._height = h;
+						this._vb.clear();
+						this._vb.upload();
+					}
+					for (var i = 0, n = this._submits._length; i < n; i++)
+						this._submits[i].releaseRender();
+					this._submits.length = 0;
+					this._submits._length = 0;
+					this._curSubmit = null;
+					this._path && this._path.recover();
+					this._path = null;
+					this.sprite = null;
+					this._targets && (this._targets.destroy());
+					this._targets = null;
+				} else {
+					this._width = w;
+					this._height = h;
+					this._targets && (this._targets.size(w, h));
+					this._canvas.memorySize -= this._canvas.memorySize;
+				}
+			}
+			if (w === 0 && h === 0) this._releaseMem();
+		}
+
+		__proto._getTransformMatrix = function () {
+			return this._curMat;
+		}
+
+		__proto.translate = function (x, y) {
+			if (x !== 0 || y !== 0) {
+				SaveTranslate.save(this);
+				if (this._curMat.bTransform) {
+					SaveTransform.save(this);
+					this._curMat.transformPointN(Point.TEMP.setTo(x, y));
+					x = Point.TEMP.x;
+					y = Point.TEMP.y;
+				}
+				this._x += x;
+				this._y += y;
+			}
+		}
+
+		__proto.save = function () {
+			this._save[this._save._length++] = SaveMark.Create(this);
+		}
+
+		__proto.restore = function () {
+			var sz = this._save._length;
+			if (sz < 1)
+				return;
+			for (var i = sz - 1; i >= 0; i--) {
+				var o = this._save[i];
+				o.restore(this);
+				if (o.isSaveMark()) {
+					this._save._length = i;
+					return;
+				}
+			}
+		}
+
+		__proto._fillText = function (txt, words, x, y, fontStr, color, strokeColor, lineWidth, textAlign, underLine) {
+			(underLine === void 0) && (underLine = 0);
+			var shader = this._shader2D;
+			var curShader = this._curSubmit.shaderValue;
+			var font = fontStr ? FontInContext.create(fontStr) : this._other.font;
+			if (AtlasResourceManager.enabled) {
+				if (shader.ALPHA !== curShader.ALPHA)
+					shader.glTexture = null;
+				DrawText.drawText(this, txt, words, this._curMat, font, textAlign || this._other.textAlign, color, strokeColor, lineWidth, x, y, underLine);
+			} else {
+				var preDef = this._shader2D.defines.getValue();
+				var colorAdd = color ? Color.create(color)._color : shader.colorAdd;
+				if (shader.ALPHA !== curShader.ALPHA || colorAdd !== shader.colorAdd || curShader.colorAdd !== shader.colorAdd) {
+					shader.glTexture = null;
+					shader.colorAdd = colorAdd;
+				}
+				DrawText.drawText(this, txt, words, this._curMat, font, textAlign || this._other.textAlign, color, strokeColor, lineWidth, x, y, underLine);
+			}
+		}
+
+		//TODO:实现下划线
+		__proto.fillWords = function (words, x, y, fontStr, color, underLine) {
+			this._fillText(null, words, x, y, fontStr, color, null, -1, null, underLine);
+		}
+
+		__proto.fillBorderWords = function (words, x, y, font, color, borderColor, lineWidth) {
+			this._fillBorderText(null, words, x, y, font, color, borderColor, lineWidth, null);
+		}
+
+		__proto.fillText = function (txt, x, y, fontStr, color, textAlign) {
+			this._fillText(txt, null, x, y, fontStr, color, null, -1, textAlign);
+		}
+
+		__proto.strokeText = function (txt, x, y, fontStr, color, lineWidth, textAlign) {
+			this._fillText(txt, null, x, y, fontStr, null, color, lineWidth || 1, textAlign);
+		}
+
+		__proto.fillBorderText = function (txt, x, y, fontStr, fillColor, borderColor, lineWidth, textAlign) {
+			this._fillBorderText(txt, null, x, y, fontStr, fillColor, borderColor, lineWidth, textAlign);
+		}
+
+		__proto._fillBorderText = function (txt, words, x, y, fontStr, fillColor, borderColor, lineWidth, textAlign) {
+			if (!AtlasResourceManager.enabled) {
+				this._fillText(txt, words, x, y, fontStr, null, borderColor, lineWidth || 1, textAlign);
+				this._fillText(txt, words, x, y, fontStr, fillColor, null, -1, textAlign);
+				return;
+			};
+			var shader = this._shader2D;
+			var curShader = this._curSubmit.shaderValue;
+			if (shader.ALPHA !== curShader.ALPHA)
+				shader.glTexture = null;
+			var font = fontStr ? (WebGLContext2D._fontTemp.setFont(fontStr), WebGLContext2D._fontTemp) : this._other.font;
+			DrawText.drawText(this, txt, words, this._curMat, font, textAlign || this._other.textAlign, fillColor, borderColor, lineWidth || 1, x, y, 0);
+		}
+
+		__proto.fillRect = function (x, y, width, height, fillStyle) {
+			var vb = this._vb;
+			if (GlUtils.fillRectImgVb(vb, this._clipRect, x, y, width, height, Texture.DEF_UV, this._curMat, this._x, this._y, 0, 0)) {
+				this._renderKey = 0;
+				var pre = this._shader2D.fillStyle;
+				fillStyle && (this._shader2D.fillStyle = DrawStyle.create(fillStyle));
+				var shader = this._shader2D;
+				var curShader = this._curSubmit.shaderValue;
+				if (shader.fillStyle !== curShader.fillStyle || shader.ALPHA !== curShader.ALPHA) {
+					shader.glTexture = null;
+					var submit = this._curSubmit = Submit.createSubmit(this, this._ib, vb, ((vb._byteLength - 16 */*laya.webgl.utils.Buffer2D.FLOAT32*/4) / 32) * 3, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.COLOR2D*/0x02, 0));
+					submit.shaderValue.color = shader.fillStyle._color._color;
+					submit.shaderValue.ALPHA = shader.ALPHA;
+					this._submits[this._submits._length++] = submit;
+				}
+				this._curSubmit._numEle += 6;
+				this._shader2D.fillStyle = pre;
+			}
+		}
+
+		__proto.fillTexture = function (texture, x, y, width, height, type, offset, other) {
+			if (!(texture.loaded && texture.bitmap && texture.source)) {
+				if (this.sprite) {
+					Laya.timer.callLater(this, this._repaintSprite);
+				}
+				return;
+			};
+			var vb = this._vb;
+			var w = texture.bitmap.width, h = texture.bitmap.height, uv = texture.uv;
+			var ox = offset.x % texture.width, oy = offset.y % texture.height;
+			if (w != other.w || h != other.h) {
+				if (!other.w && !other.h) {
+					other.oy = other.ox = 0;
+					switch (type) {
+						case "repeat":
+							other.width = width;
+							other.height = height;
+							break;
+						case "repeat-x":
+							other.width = width;
+							if (oy < 0) {
+								if (texture.height + oy > height) {
+									other.height = height;
+								} else {
+									other.height = texture.height + oy;
+								}
+							} else {
+								other.oy = oy;
+								if (texture.height + oy > height) {
+									other.height = height - oy;
+								} else {
+									other.height = texture.height;
+								}
+							}
+							break;
+						case "repeat-y":
+							if (ox < 0) {
+								if (texture.width + ox > width) {
+									other.width = width;
+								} else {
+									other.width = texture.width + ox;
+								}
+							} else {
+								other.ox = ox;
+								if (texture.width + ox > width) {
+									other.width = width - ox;
+								} else {
+									other.width = texture.width;
+								}
+							}
+							other.height = height;
+							break;
+						default:
+							other.width = width;
+							other.height = height;
+							break;
+					}
+				}
+				other.w = w;
+				other.h = h;
+				other.uv = [0, 0, other.width / w, 0, other.width / w, other.height / h, 0, other.height / h];
+			}
+			x += other.ox;
+			y += other.oy;
+			ox -= other.ox;
+			oy -= other.oy;
+			if (GlUtils.fillRectImgVb(vb, this._clipRect, x, y, other.width, other.height, other.uv, this._curMat, this._x, this._y, 0, 0)) {
+				this._renderKey = 0;
+				var submit = SubmitTexture.create(this, this._ib, vb, ((vb._byteLength - 16 */*laya.webgl.utils.Buffer2D.FLOAT32*/4) / 32) * 3, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.FILLTEXTURE*/0x100, 0));
+				this._submits[this._submits._length++] = submit;
+				var shaderValue = submit.shaderValue;
+				shaderValue.textureHost = texture;
+				var tTextureX = uv[0] * w;
+				var tTextureY = uv[1] * h;
+				var tTextureW = (uv[2] - uv[0]) * w;
+				var tTextureH = (uv[5] - uv[3]) * h;
+				var tx = -ox / w;
+				var ty = -oy / h;
+				shaderValue.u_TexRange[0] = tTextureX / w;
+				shaderValue.u_TexRange[1] = tTextureW / w;
+				shaderValue.u_TexRange[2] = tTextureY / h;
+				shaderValue.u_TexRange[3] = tTextureH / h;
+				shaderValue.u_offset[0] = tx;
+				shaderValue.u_offset[1] = ty;
+				if (AtlasResourceManager.enabled && !this._isMain)
+					submit.addTexture(texture, (vb._byteLength >> 2) -/*CLASS CONST:laya.webgl.canvas.WebGLContext2D._RECTVBSIZE*/16);
+				this._curSubmit = submit;
+				submit._renderType =/*laya.webgl.submit.Submit.TYPE_FILLTEXTURE*/10017;
+				submit._numEle += 6;
+			}
+		}
+
+		__proto.setShader = function (shader) {
+			SaveBase.save(this,/*laya.webgl.canvas.save.SaveBase.TYPE_SHADER*/0x100000, this._shader2D, true);
+			this._shader2D.shader = shader;
+		}
+
+		__proto.setFilters = function (value) {
+			SaveBase.save(this,/*laya.webgl.canvas.save.SaveBase.TYPE_FILTERS*/0x200000, this._shader2D, true);
+			this._shader2D.filters = value;
+			this._curSubmit = Submit.RENDERBASE;
+			this._renderKey = 0;
+			this._drawCount++;
+		}
+
+		__proto.drawTexture = function (tex, x, y, width, height, tx, ty) {
+			this._drawTextureM(tex, x, y, width, height, tx, ty, null, 1);
+		}
+
+		__proto.addTextureVb = function (invb, x, y) {
+			var finalVB = this._curSubmit._vb || this._vb;
+			var vpos = (finalVB._byteLength >> 2);
+			finalVB.byteLength = ((vpos +/*CLASS CONST:laya.webgl.canvas.WebGLContext2D._RECTVBSIZE*/16) << 2);
+			var vbdata = finalVB.getFloat32Array();
+			for (var i = 0, ci = 0; i < 16; i += 4) {
+				vbdata[vpos++] = invb[i] + x;
+				vbdata[vpos++] = invb[i + 1] + y;
+				vbdata[vpos++] = invb[i + 2];
+				vbdata[vpos++] = invb[i + 3];
+			}
+			this._curSubmit._numEle += 6;
+			this._maxNumEle = Math.max(this._maxNumEle, this._curSubmit._numEle);
+			finalVB._upload = true;
+		}
+
+		__proto.willDrawTexture = function (tex, alpha) {
+			if (!(tex.loaded && tex.bitmap && tex.source)) {
+				if (this.sprite) {
+					Laya.timer.callLater(this, this._repaintSprite);
+				}
+				return 0;
+			};
+			var webGLImg = tex.bitmap;
+			var rid = webGLImg.id + this._shader2D.ALPHA * alpha +/*laya.webgl.submit.Submit.TYPE_TEXTURE*/10016;
+			if (rid == this._renderKey) return rid;
+			var shader = this._shader2D;
+			var preAlpha = shader.ALPHA;
+			var curShader = this._curSubmit.shaderValue;
+			shader.ALPHA *= alpha;
+			this._renderKey = rid;
+			this._drawCount++;
+			shader.glTexture = webGLImg;
+			var vb = this._vb;
+			var submit = null;
+			var vbSize = (vb._byteLength / 32) * 3;
+			submit = SubmitTexture.create(this, this._ib, vb, vbSize, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, 0));
+			this._submits[this._submits._length++] = submit;
+			submit.shaderValue.textureHost = tex;
+			submit._renderType =/*laya.webgl.submit.Submit.TYPE_TEXTURE*/10016;
+			submit._preIsSameTextureShader = this._curSubmit._renderType ===/*laya.webgl.submit.Submit.TYPE_TEXTURE*/10016 && shader.ALPHA === curShader.ALPHA;
+			this._curSubmit = submit;
+			shader.ALPHA = preAlpha;
+			return rid;
+		}
+
+		__proto.drawTextures = function (tex, pos, tx, ty) {
+			if (!(tex.loaded && tex.bitmap && tex.source)) {
+				this.sprite && Laya.timer.callLater(this, this._repaintSprite);
+				return;
+			};
+			var pre = this._clipRect;
+			this._clipRect = WebGLContext2D.MAXCLIPRECT;
+			if (!this._drawTextureM(tex, pos[0], pos[1], tex.width, tex.height, tx, ty, null, 1)) {
+				alert("drawTextures err");
+				return;
+			}
+			this._clipRect = pre;
+			Stat.drawCall++;
+			if (pos.length < 4)
+				return;
+			var finalVB = this._curSubmit._vb || this._vb;
+			var sx = this._curMat.a, sy = this._curMat.d;
+			for (var i = 2, sz = pos.length; i < sz; i += 2) {
+				GlUtils.copyPreImgVb(finalVB, (pos[i] - pos[i - 2]) * sx, (pos[i + 1] - pos[i - 1]) * sy);
+				this._curSubmit._numEle += 6;
+			}
+			this._maxNumEle = Math.max(this._maxNumEle, this._curSubmit._numEle);
+		}
+
+		__proto._drawTextureM = function (tex, x, y, width, height, tx, ty, m, alpha) {
+			if (!(tex.loaded && tex.source)) {
+				if (this.sprite) {
+					Laya.timer.callLater(this, this._repaintSprite);
+				}
+				return false;
+			};
+			var finalVB = this._curSubmit._vb || this._vb;
+			var webGLImg = tex.bitmap;
+			x += tx;
+			y += ty;
+			this._drawCount++;
+			var rid = webGLImg.id + this._shader2D.ALPHA * alpha +/*laya.webgl.submit.Submit.TYPE_TEXTURE*/10016;
+			if (rid != this._renderKey) {
+				this._renderKey = rid;
+				var curShader = this._curSubmit.shaderValue;
+				var shader = this._shader2D;
+				var alphaBack = shader.ALPHA;
+				shader.ALPHA *= alpha;
+				shader.glTexture = webGLImg;
+				var vb = this._vb;
+				var submit = null;
+				var vbSize = (vb._byteLength / 32) * 3;
+				submit = SubmitTexture.create(this, this._ib, vb, vbSize, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, 0));
+				this._submits[this._submits._length++] = submit;
+				submit.shaderValue.textureHost = tex;
+				submit._renderType =/*laya.webgl.submit.Submit.TYPE_TEXTURE*/10016;
+				submit._preIsSameTextureShader = this._curSubmit._renderType ===/*laya.webgl.submit.Submit.TYPE_TEXTURE*/10016 && shader.ALPHA === curShader.ALPHA;
+				this._curSubmit = submit;
+				finalVB = this._curSubmit._vb || this._vb;
+				shader.ALPHA = alphaBack;
+			}
+			if (GlUtils.fillRectImgVb(finalVB, this._clipRect, x, y, width || tex.width, height || tex.height, tex.uv, m || this._curMat, this._x, this._y, 0, 0)) {
+				if (AtlasResourceManager.enabled && !this._isMain)
+					(this._curSubmit).addTexture(tex, (finalVB._byteLength >> 2) -/*CLASS CONST:laya.webgl.canvas.WebGLContext2D._RECTVBSIZE*/16);
+				this._curSubmit._numEle += 6;
+				this._maxNumEle = Math.max(this._maxNumEle, this._curSubmit._numEle);
+				return true;
+			}
+			return false;
+		}
+
+		__proto._repaintSprite = function () {
+			if (this.sprite)
+				this.sprite.repaint();
+		}
+
+		//}
+		__proto._drawText = function (tex, x, y, width, height, m, tx, ty, dx, dy) {
+			var webGLImg = tex.bitmap;
+			this._drawCount++;
+			var rid = webGLImg.id + this._shader2D.ALPHA +/*laya.webgl.submit.Submit.TYPE_TEXTURE*/10016;
+			if (rid != this._renderKey) {
+				this._renderKey = rid;
+				var curShader = this._curSubmit.shaderValue;
+				var shader = this._shader2D;
+				shader.glTexture = webGLImg;
+				var vb = this._vb;
+				var submit = null;
+				var submitID = NaN;
+				var vbSize = (vb._byteLength / 32) * 3;
+				if (AtlasResourceManager.enabled) {
+					submit = SubmitTexture.create(this, this._ib, vb, vbSize, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, 0));
+				} else {
+					submit = SubmitTexture.create(this, this._ib, vb, vbSize, TextSV.create());
+				}
+				submit._preIsSameTextureShader = this._curSubmit._renderType ===/*laya.webgl.submit.Submit.TYPE_TEXTURE*/10016 && shader.ALPHA === curShader.ALPHA;
+				this._submits[this._submits._length++] = submit;
+				submit.shaderValue.textureHost = tex;
+				submit._renderType =/*laya.webgl.submit.Submit.TYPE_TEXTURE*/10016;
+				this._curSubmit = submit;
+			}
+			tex.active();
+			var finalVB = this._curSubmit._vb || this._vb;
+			if (GlUtils.fillRectImgVb(finalVB, this._clipRect, x + tx, y + ty, width || tex.width, height || tex.height, tex.uv, m || this._curMat, this._x, this._y, dx, dy, true)) {
+				if (AtlasResourceManager.enabled && !this._isMain) {
+					(this._curSubmit).addTexture(tex, (finalVB._byteLength >> 2) -/*CLASS CONST:laya.webgl.canvas.WebGLContext2D._RECTVBSIZE*/16);
+				}
+				this._curSubmit._numEle += 6;
+				this._maxNumEle = Math.max(this._maxNumEle, this._curSubmit._numEle);
+			}
+		}
+
+		__proto.drawTextureWithTransform = function (tex, x, y, width, height, transform, tx, ty, alpha) {
+			if (!transform) {
+				this._drawTextureM(tex, x, y, width, height, tx, ty, null, alpha);
+				return;
+			};
+			var curMat = this._curMat;
+			var prex = this._x;
+			var prey = this._y;
+			(tx !== 0 || ty !== 0) && (this._x = tx * curMat.a + ty * curMat.c, this._y = ty * curMat.d + tx * curMat.b);
+			if (transform && curMat.bTransform) {
+				Matrix.mul(transform, curMat, WebGLContext2D._tmpMatrix);
+				transform = WebGLContext2D._tmpMatrix;
+				transform._checkTransform();
+			} else {
+				this._x += curMat.tx;
+				this._y += curMat.ty;
+			}
+			this._drawTextureM(tex, x, y, width, height, 0, 0, transform, alpha);
+			this._x = prex;
+			this._y = prey;
+		}
+
+		__proto.fillQuadrangle = function (tex, x, y, point4, m) {
+			var submit = this._curSubmit;
+			var vb = this._vb;
+			var shader = this._shader2D;
+			var curShader = submit.shaderValue;
+			this._renderKey = 0;
+			if (tex.bitmap) {
+				var t_tex = tex.bitmap;
+				if (shader.glTexture != t_tex || shader.ALPHA !== curShader.ALPHA) {
+					shader.glTexture = t_tex;
+					submit = this._curSubmit = Submit.createSubmit(this, this._ib, vb, ((vb._byteLength) / 32) * 3, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, 0));
+					submit.shaderValue.glTexture = t_tex;
+					this._submits[this._submits._length++] = submit;
+				}
+				GlUtils.fillQuadrangleImgVb(vb, x, y, point4, tex.uv, m || this._curMat, this._x, this._y);
+			} else {
+				if (!submit.shaderValue.fillStyle || !submit.shaderValue.fillStyle.equal(tex) || shader.ALPHA !== curShader.ALPHA) {
+					shader.glTexture = null;
+					submit = this._curSubmit = Submit.createSubmit(this, this._ib, vb, ((vb._byteLength) / 32) * 3, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.COLOR2D*/0x02, 0));
+					submit.shaderValue.defines.add(/*laya.webgl.shader.d2.ShaderDefines2D.COLOR2D*/0x02);
+					submit.shaderValue.fillStyle = DrawStyle.create(tex);
+					this._submits[this._submits._length++] = submit;
+				}
+				GlUtils.fillQuadrangleImgVb(vb, x, y, point4, Texture.DEF_UV, m || this._curMat, this._x, this._y);
+			}
+			submit._numEle += 6;
+		}
+
+		__proto.drawTexture2 = function (x, y, pivotX, pivotY, transform, alpha, blendMode, args) {
+			if (alpha == 0) return;
+			var curMat = this._curMat;
+			this._x = x * curMat.a + y * curMat.c;
+			this._y = y * curMat.d + x * curMat.b;
+			if (transform) {
+				if (curMat.bTransform || transform.bTransform) {
+					Matrix.mul(transform, curMat, WebGLContext2D._tmpMatrix);
+					transform = WebGLContext2D._tmpMatrix;
+				} else {
+					this._x += transform.tx + curMat.tx;
+					this._y += transform.ty + curMat.ty;
+					transform = Matrix.EMPTY;
+				}
+			}
+			if (alpha === 1 && !blendMode)
+				this._drawTextureM(args[0], args[1] - pivotX, args[2] - pivotY, args[3], args[4], 0, 0, transform, 1);
+			else {
+				var preAlpha = this._shader2D.ALPHA;
+				var preblendType = this._nBlendType;
+				this._shader2D.ALPHA = alpha;
+				blendMode && (this._nBlendType = BlendMode.TOINT(blendMode));
+				this._drawTextureM(args[0], args[1] - pivotX, args[2] - pivotY, args[3], args[4], 0, 0, transform, 1);
+				this._shader2D.ALPHA = preAlpha;
+				this._nBlendType = preblendType;
+			}
+			this._x = this._y = 0;
+		}
+
+		__proto.drawCanvas = function (canvas, x, y, width, height) {
+			var src = canvas.context;
+			this._renderKey = 0;
+			if (src._targets) {
+				this._submits[this._submits._length++] = SubmitCanvas.create(src, 0, null);
+				this._curSubmit = Submit.RENDERBASE;
+				src._targets.drawTo(this, x, y, width, height);
+			} else {
+				var submit = this._submits[this._submits._length++] = SubmitCanvas.create(src, this._shader2D.ALPHA, this._shader2D.filters);
+				var sx = width / canvas.width;
+				var sy = height / canvas.height;
+				var mat = submit._matrix;
+				this._curMat.copyTo(mat);
+				sx != 1 && sy != 1 && mat.scale(sx, sy);
+				var tx = mat.tx, ty = mat.ty;
+				mat.tx = mat.ty = 0;
+				mat.transformPoint(Point.TEMP.setTo(x, y));
+				mat.translate(Point.TEMP.x + tx, Point.TEMP.y + ty);
+				this._curSubmit = Submit.RENDERBASE;
+			}
+			if (Config.showCanvasMark) {
+				this.save();
+				this.lineWidth = 4;
+				this.strokeStyle = src._targets ? "yellow" : "green";
+				this.strokeRect(x - 1, y - 1, width + 2, height + 2, 1);
+				this.strokeRect(x, y, width, height, 1);
+				this.restore();
+			}
+		}
+
+		__proto.drawTarget = function (scope, x, y, width, height, m, proName, shaderValue, uv, blend) {
+			(blend === void 0) && (blend = -1);
+			var vb = this._vb;
+			if (GlUtils.fillRectImgVb(vb, this._clipRect, x, y, width, height, uv || Texture.DEF_UV, m || this._curMat, this._x, this._y, 0, 0)) {
+				this._renderKey = 0;
+				var shader = this._shader2D;
+				shader.glTexture = null;
+				var curShader = this._curSubmit.shaderValue;
+				var submit = this._curSubmit = SubmitTarget.create(this, this._ib, vb, ((vb._byteLength - 16 */*laya.webgl.utils.Buffer2D.FLOAT32*/4) / 32) * 3, shaderValue, proName);
+				if (blend == -1) {
+					submit.blendType = this._nBlendType;
+				} else {
+					submit.blendType = blend;
+				}
+				submit.scope = scope;
+				this._submits[this._submits._length++] = submit;
+				this._curSubmit._numEle += 6;
+			}
+		}
+
+		__proto.transform = function (a, b, c, d, tx, ty) {
+			SaveTransform.save(this);
+			Matrix.mul(Matrix.TEMP.setTo(a, b, c, d, tx, ty), this._curMat, this._curMat);
+			this._curMat._checkTransform();
+		}
+
+		__proto.setTransformByMatrix = function (value) {
+			value.copyTo(this._curMat);
+		}
+
+		__proto.transformByMatrix = function (value) {
+			SaveTransform.save(this);
+			Matrix.mul(value, this._curMat, this._curMat);
+			this._curMat._checkTransform();
+		}
+
+		__proto.rotate = function (angle) {
+			SaveTransform.save(this);
+			this._curMat.rotateEx(angle);
+		}
+
+		__proto.scale = function (scaleX, scaleY) {
+			SaveTransform.save(this);
+			this._curMat.scaleEx(scaleX, scaleY);
+		}
+
+		__proto.clipRect = function (x, y, width, height) {
+			if (this._curMat.b != 0 || this._curMat.c != 0) {
+				this._renderKey = 0;
+				var submitStencil0 = SubmitStencil.create(4);
+				this.addRenderObject(submitStencil0);
+				var vb = this._vb;
+				var nPos = (vb._byteLength >> 2);
+				if (GlUtils.fillRectImgVb(vb, null, x, y, width, height, Texture.DEF_UV, this._curMat, this._x, this._y, 0, 0)) {
+					var shader = this._shader2D;
+					shader.glTexture = null;
+					var submit = this._curSubmit = Submit.createSubmit(this, this._ib, vb, ((vb._byteLength - 16 */*laya.webgl.utils.Buffer2D.FLOAT32*/4) / 32) * 3, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.COLOR2D*/0x02, 0));
+					submit.shaderValue.ALPHA = 1.0;
+					this._submits[this._submits._length++] = submit;
+					this._curSubmit._numEle += 6;
+				} else {
+					alert("clipRect calc stencil rect error");
+				};
+				var submitStencil1 = SubmitStencil.create(5);
+				this.addRenderObject(submitStencil1);
+				var vbdata = vb.getFloat32Array();
+				var minx = Math.min(Math.min(Math.min(vbdata[nPos + 0], vbdata[nPos + 4]), vbdata[nPos + 8]), vbdata[nPos + 12]);
+				var maxx = Math.max(Math.max(Math.max(vbdata[nPos + 0], vbdata[nPos + 4]), vbdata[nPos + 8]), vbdata[nPos + 12]);
+				var miny = Math.min(Math.min(Math.min(vbdata[nPos + 1], vbdata[nPos + 5]), vbdata[nPos + 9]), vbdata[nPos + 13]);
+				var maxy = Math.max(Math.max(Math.max(vbdata[nPos + 1], vbdata[nPos + 5]), vbdata[nPos + 9]), vbdata[nPos + 13]);
+				SaveClipRectStencil.save(this, submitStencil1, x, y, width, height, minx, miny, maxx - minx, maxy - miny);
+				this._curSubmit = Submit.RENDERBASE;
+			} else {
+				width *= this._curMat.a;
+				height *= this._curMat.d;
+				var p = Point.TEMP;
+				this._curMat.transformPoint(p.setTo(x, y));
+				if (width < 0) {
+					p.x = p.x + width;
+					width = -width;
+				}
+				if (height < 0) {
+					p.y = p.y + height;
+					height = -height;
+				}
+				this._renderKey = 0;
+				var submitSc = this._curSubmit = SubmitScissor.create(this);
+				this._submits[this._submits._length++] = submitSc;
+				submitSc.submitIndex = this._submits._length;
+				submitSc.submitLength = 9999999;
+				SaveClipRect.save(this, submitSc);
+				var clip = this._clipRect;
+				var x1 = clip.x, y1 = clip.y;
+				var r = p.x + width, b = p.y + height;
+				x1 < p.x && (clip.x = p.x);
+				y1 < p.y && (clip.y = p.y);
+				clip.width = Math.min(r, x1 + clip.width) - clip.x;
+				clip.height = Math.min(b, y1 + clip.height) - clip.y;
+				this._shader2D.glTexture = null;
+				submitSc.clipRect.copyFrom(clip);
+				this._curSubmit = Submit.RENDERBASE;
+			}
+		}
+
+		__proto.setIBVB = function (x, y, ib, vb, numElement, mat, shader, shaderValues, startIndex, offset, type) {
+			(startIndex === void 0) && (startIndex = 0);
+			(offset === void 0) && (offset = 0);
+			(type === void 0) && (type = 0);
+			if (ib === null) {
+				if (!Render.isFlash) {
+					ib = this._ib;
+				} else {
+					var falshVB = vb;
+					(falshVB._selfIB) || (falshVB._selfIB = IndexBuffer2D.create(/*laya.webgl.WebGLContext.STATIC_DRAW*/0x88E4));
+					falshVB._selfIB.clear();
+					ib = falshVB._selfIB;
+				}
+				GlUtils.expandIBQuadrangle(ib, (vb._byteLength / (/*laya.webgl.utils.Buffer2D.FLOAT32*/4 * vb.vertexStride * 4)));
+			}
+			if (!shaderValues || !shader)
+				throw Error("setIBVB must input:shader shaderValues");
+			var submit = SubmitOtherIBVB.create(this, vb, ib, numElement, shader, shaderValues, startIndex, offset, type);
+			mat || (mat = Matrix.EMPTY);
+			mat.translate(x, y);
+			Matrix.mul(mat, this._curMat, submit._mat);
+			mat.translate(-x, -y);
+			this._submits[this._submits._length++] = submit;
+			this._curSubmit = Submit.RENDERBASE;
+			this._renderKey = 0;
+		}
+
+		__proto.addRenderObject = function (o) {
+			this._submits[this._submits._length++] = o;
+		}
+
+		__proto.fillTrangles = function (tex, x, y, points, m) {
+			var submit = this._curSubmit;
+			var vb = this._vb;
+			var shader = this._shader2D;
+			var curShader = submit.shaderValue;
+			var length = points.length >> 4;
+			var t_tex = tex.bitmap;
+			this._renderKey = 0;
+			if (shader.glTexture != t_tex || shader.ALPHA !== curShader.ALPHA) {
+				submit = this._curSubmit = Submit.createSubmit(this, this._ib, vb, ((vb._byteLength) / 32) * 3, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, 0));
+				submit.shaderValue.textureHost = tex;
+				this._submits[this._submits._length++] = submit;
+			}
+			GlUtils.fillTranglesVB(vb, x, y, points, m || this._curMat, this._x, this._y);
+			submit._numEle += length * 6;
+		}
+
+		__proto.submitElement = function (start, end) {
+			var renderList = this._submits;
+			end < 0 && (end = renderList._length);
+			while (start < end) {
+				start += renderList[start].renderSubmit();
+			}
+		}
+
+		__proto.finish = function () {
+			WebGL.mainContext.finish();
+		}
+
+		__proto.flush = function () {
+			var maxNum = Math.max(this._vb._byteLength / (/*laya.webgl.utils.Buffer2D.FLOAT32*/4 * 16), this._maxNumEle / 6) + 8;
+			if (maxNum > (this._ib.bufferLength / (6 */*laya.webgl.utils.Buffer2D.SHORT*/2))) {
+				GlUtils.expandIBQuadrangle(this._ib, maxNum);
+			}
+			if (!this._isMain && AtlasResourceManager.enabled && AtlasResourceManager._atlasRestore > this._atlasResourceChange) {
+				this._atlasResourceChange = AtlasResourceManager._atlasRestore;
+				var renderList = this._submits;
+				for (var i = 0, s = renderList._length; i < s; i++) {
+					var submit = renderList[i];
+					if (submit.getRenderType() ===/*laya.webgl.submit.Submit.TYPE_TEXTURE*/10016)
+						(submit).checkTexture();
+				}
+			}
+			this.submitElement(0, this._submits._length);
+			this._path && this._path.reset();
+			SkinMeshBuffer.instance && SkinMeshBuffer.getInstance().reset();
+			this._curSubmit = Submit.RENDERBASE;
+			this._renderKey = 0;
+			return this._submits._length;
+		}
+
+		__proto.setPathId = function (id) {
+			this.mId = id;
+			if (this.mId != -1) {
+				this.mHaveKey = false;
+				var tVGM = VectorGraphManager.getInstance();
+				if (tVGM.shapeDic[this.mId]) {
+					this.mHaveKey = true;
+				}
+				this.mHaveLineKey = false;
+				if (tVGM.shapeLineDic[this.mId]) {
+					this.mHaveLineKey = true;
+				}
+			}
+		}
+
+		__proto.movePath = function (x, y) {
+			var _x1 = x, _y1 = y;
+			x = this._curMat.a * _x1 + this._curMat.c * _y1 + this._curMat.tx;
+			y = this._curMat.b * _x1 + this._curMat.d * _y1 + this._curMat.ty;
+			this.mX += x;
+			this.mY += y;
+		}
+
+		__proto.beginPath = function () {
+			var tPath = this._getPath();
+			tPath.tempArray.length = 0;
+			tPath.closePath = false;
+			this.mX = 0;
+			this.mY = 0;
+		}
+
+		__proto.closePath = function () {
+			this._path.closePath = true;
+		}
+
+		__proto.fill = function (isConvexPolygon) {
+			(isConvexPolygon === void 0) && (isConvexPolygon = false);
+			var tPath = this._getPath();
+			this.drawPoly(0, 0, tPath.tempArray, this.fillStyle._color.numColor, 0, 0, isConvexPolygon);
+		}
+
+		__proto.stroke = function () {
+			var tPath = this._getPath();
+			if (this.lineWidth > 0) {
+				if (this.mId == -1) {
+					tPath.drawLine(0, 0, tPath.tempArray, this.lineWidth, this.strokeStyle._color.numColor);
+				} else {
+					if (this.mHaveLineKey) {
+						var tShapeLine = VectorGraphManager.getInstance().shapeLineDic[this.mId];
+						tShapeLine.rebuild(tPath.tempArray);
+						tPath.setGeomtry(tShapeLine);
+					} else {
+						VectorGraphManager.getInstance().addLine(this.mId, tPath.drawLine(0, 0, tPath.tempArray, this.lineWidth, this.strokeStyle._color.numColor));
+					}
+				}
+				tPath.update();
+				var tPosArray = [this.mX, this.mY];
+				var tempSubmit = Submit.createShape(this, tPath.ib, tPath.vb, tPath.count, tPath.offset, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.PRIMITIVE*/0x04, 0));
+				tempSubmit.shaderValue.ALPHA = this._shader2D.ALPHA;
+				(tempSubmit.shaderValue).u_pos = tPosArray;
+				tempSubmit.shaderValue.u_mmat2 = RenderState2D.TEMPMAT4_ARRAY;
+				this._submits[this._submits._length++] = tempSubmit;
+			}
+		}
+
+		__proto.line = function (fromX, fromY, toX, toY, lineWidth, mat) {
+			var submit = this._curSubmit;
+			var vb = this._vb;
+			if (GlUtils.fillLineVb(vb, this._clipRect, fromX, fromY, toX, toY, lineWidth, mat)) {
+				this._renderKey = 0;
+				var shader = this._shader2D;
+				var curShader = submit.shaderValue;
+				if (shader.strokeStyle !== curShader.strokeStyle || shader.ALPHA !== curShader.ALPHA) {
+					shader.glTexture = null;
+					submit = this._curSubmit = Submit.createSubmit(this, this._ib, vb, ((vb._byteLength - 16 */*laya.webgl.utils.Buffer2D.FLOAT32*/4) / 32) * 3, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.COLOR2D*/0x02, 0));
+					submit.shaderValue.strokeStyle = shader.strokeStyle;
+					submit.shaderValue.mainID =/*laya.webgl.shader.d2.ShaderDefines2D.COLOR2D*/0x02;
+					submit.shaderValue.ALPHA = shader.ALPHA;
+					this._submits[this._submits._length++] = submit;
+				}
+				submit._numEle += 6;
+			}
+		}
+
+		__proto.moveTo = function (x, y, b) {
+			(b === void 0) && (b = true);
+			var tPath = this._getPath();
+			if (b) {
+				var _x1 = x, _y1 = y;
+				x = this._curMat.a * _x1 + this._curMat.c * _y1 + this._curMat.tx;
+				y = this._curMat.b * _x1 + this._curMat.d * _y1 + this._curMat.ty;
+			}
+			tPath.addPoint(x, y);
+		}
+
+		__proto.lineTo = function (x, y, b) {
+			(b === void 0) && (b = true);
+			var tPath = this._getPath();
+			if (b) {
+				var _x1 = x, _y1 = y;
+				x = this._curMat.a * _x1 + this._curMat.c * _y1 + this._curMat.tx;
+				y = this._curMat.b * _x1 + this._curMat.d * _y1 + this._curMat.ty;
+			}
+			tPath.addPoint(x, y);
+		}
+
+		__proto.drawCurves = function (x, y, args) {
+			this.setPathId(-1);
+			this.beginPath();
+			this.strokeStyle = args[3];
+			this.lineWidth = args[4];
+			var points = args[2];
+			x += args[0], y += args[1];
+			this.movePath(x, y);
+			this.moveTo(points[0], points[1]);
+			var i = 2, n = points.length;
+			while (i < n) {
+				this.quadraticCurveTo(points[i++], points[i++], points[i++], points[i++]);
+			}
+			this.stroke();
+		}
+
+		__proto.arcTo = function (x1, y1, x2, y2, r) {
+			if (this.mId != -1) {
+				if (this.mHaveKey) {
+					return;
+				}
+			};
+			var i = 0;
+			var x = 0, y = 0;
+			var tPath = this._getPath();
+			this._curMat.copyTo(WebGLContext2D._tmpMatrix);
+			WebGLContext2D._tmpMatrix.tx = WebGLContext2D._tmpMatrix.ty = 0;
+			WebGLContext2D._tempPoint.setTo(tPath.getEndPointX(), tPath.getEndPointY());
+			WebGLContext2D._tmpMatrix.invertTransformPoint(WebGLContext2D._tempPoint);
+			var dx = WebGLContext2D._tempPoint.x - x1;
+			var dy = WebGLContext2D._tempPoint.y - y1;
+			var len1 = Math.sqrt(dx * dx + dy * dy);
+			if (len1 <= 0.000001) {
+				return;
+			};
+			var ndx = dx / len1;
+			var ndy = dy / len1;
+			var dx2 = x2 - x1;
+			var dy2 = y2 - y1;
+			var len22 = dx2 * dx2 + dy2 * dy2;
+			var len2 = Math.sqrt(len22);
+			if (len2 <= 0.000001) {
+				return;
+			};
+			var ndx2 = dx2 / len2;
+			var ndy2 = dy2 / len2;
+			var odx = ndx + ndx2;
+			var ody = ndy + ndy2;
+			var olen = Math.sqrt(odx * odx + ody * ody);
+			if (olen <= 0.000001) {
+				return;
+			};
+			var nOdx = odx / olen;
+			var nOdy = ody / olen;
+			var alpha = Math.acos(nOdx * ndx + nOdy * ndy);
+			var halfAng = Math.PI / 2 - alpha;
+			len1 = r / Math.tan(halfAng);
+			var ptx1 = len1 * ndx + x1;
+			var pty1 = len1 * ndy + y1;
+			var orilen = Math.sqrt(len1 * len1 + r * r);
+			var orix = x1 + nOdx * orilen;
+			var oriy = y1 + nOdy * orilen;
+			var ptx2 = len1 * ndx2 + x1;
+			var pty2 = len1 * ndy2 + y1;
+			var dir = ndx * ndy2 - ndy * ndx2;
+			var fChgAng = 0;
+			var sinx = 0.0;
+			var cosx = 0.0;
+			if (dir >= 0) {
+				fChgAng = halfAng * 2;
+				var fda = fChgAng / WebGLContext2D.SEGNUM;
+				sinx = Math.sin(fda);
+				cosx = Math.cos(fda);
+			}
+			else {
+				fChgAng = -halfAng * 2;
+				fda = fChgAng / WebGLContext2D.SEGNUM;
+				sinx = Math.sin(fda);
+				cosx = Math.cos(fda);
+			}
+			x = this._curMat.a * ptx1 + this._curMat.c * pty1 + this._curMat.tx;
+			y = this._curMat.b * ptx1 + this._curMat.d * pty1 + this._curMat.ty;
+			if (x != this._path.getEndPointX() || y != this._path.getEndPointY()) {
+				tPath.addPoint(x, y);
+			};
+			var cvx = ptx1 - orix;
+			var cvy = pty1 - oriy;
+			var tx = 0.0;
+			var ty = 0.0;
+			for (i = 0; i < WebGLContext2D.SEGNUM; i++) {
+				var cx = cvx * cosx + cvy * sinx;
+				var cy = -cvx * sinx + cvy * cosx;
+				x = cx + orix;
+				y = cy + oriy;
+				x1 = this._curMat.a * x + this._curMat.c * y + this._curMat.tx;
+				y1 = this._curMat.b * x + this._curMat.d * y + this._curMat.ty;
+				x = x1;
+				y = y1;
+				if (x != this._path.getEndPointX() || y != this._path.getEndPointY()) {
+					tPath.addPoint(x, y);
+				}
+				cvx = cx;
+				cvy = cy;
+			}
+		}
+
+		__proto.arc = function (cx, cy, r, startAngle, endAngle, counterclockwise, b) {
+			(counterclockwise === void 0) && (counterclockwise = false);
+			(b === void 0) && (b = true);
+			if (this.mId != -1) {
+				var tShape = VectorGraphManager.getInstance().shapeDic[this.mId];
+				if (tShape) {
+					if (this.mHaveKey && !tShape.needUpdate(this._curMat))
+						return;
+				}
+				cx = 0;
+				cy = 0;
+			};
+			var a = 0, da = 0, hda = 0, kappa = 0;
+			var dx = 0, dy = 0, x = 0, y = 0, tanx = 0, tany = 0;
+			var px = 0, py = 0, ptanx = 0, ptany = 0;
+			var i = 0, ndivs = 0, nvals = 0;
+			da = endAngle - startAngle;
+			if (!counterclockwise) {
+				if (Math.abs(da) >= Math.PI * 2) {
+					da = Math.PI * 2;
+				} else {
+					while (da < 0.0) {
+						da += Math.PI * 2;
+					}
+				}
+			} else {
+				if (Math.abs(da) >= Math.PI * 2) {
+					da = -Math.PI * 2;
+				} else {
+					while (da > 0.0) {
+						da -= Math.PI * 2;
+					}
+				}
+			}
+			if (r < 101) {
+				ndivs = Math.max(10, da * r / 5);
+			} else if (r < 201) {
+				ndivs = Math.max(10, da * r / 20);
+			} else {
+				ndivs = Math.max(10, da * r / 40);
+			}
+			hda = (da / ndivs) / 2.0;
+			kappa = Math.abs(4 / 3 * (1 - Math.cos(hda)) / Math.sin(hda));
+			if (counterclockwise)
+				kappa = -kappa;
+			nvals = 0;
+			var tPath = this._getPath();
+			var _x1 = NaN, _y1 = NaN;
+			for (i = 0; i <= ndivs; i++) {
+				a = startAngle + da * (i / ndivs);
+				dx = Math.cos(a);
+				dy = Math.sin(a);
+				x = cx + dx * r;
+				y = cy + dy * r;
+				if (b) {
+					_x1 = x, _y1 = y;
+					x = this._curMat.a * _x1 + this._curMat.c * _y1 + this._curMat.tx;
+					y = this._curMat.b * _x1 + this._curMat.d * _y1 + this._curMat.ty;
+				}
+				if (x != this._path.getEndPointX() || y != this._path.getEndPointY()) {
+					tPath.addPoint(x, y);
+				}
+			}
+			dx = Math.cos(endAngle);
+			dy = Math.sin(endAngle);
+			x = cx + dx * r;
+			y = cy + dy * r;
+			if (b) {
+				_x1 = x, _y1 = y;
+				x = this._curMat.a * _x1 + this._curMat.c * _y1 + this._curMat.tx;
+				y = this._curMat.b * _x1 + this._curMat.d * _y1 + this._curMat.ty;
+			}
+			if (x != this._path.getEndPointX() || y != this._path.getEndPointY()) {
+				tPath.addPoint(x, y);
+			}
+		}
+
+		__proto.quadraticCurveTo = function (cpx, cpy, x, y) {
+			var tBezier = Bezier.I;
+			var tResultArray = [];
+			var _x1 = x, _y1 = y;
+			x = this._curMat.a * _x1 + this._curMat.c * _y1 + this._curMat.tx;
+			y = this._curMat.b * _x1 + this._curMat.d * _y1 + this._curMat.ty;
+			_x1 = cpx, _y1 = cpy;
+			cpx = this._curMat.a * _x1 + this._curMat.c * _y1 + this._curMat.tx;
+			cpy = this._curMat.b * _x1 + this._curMat.d * _y1 + this._curMat.ty;
+			var tArray = tBezier.getBezierPoints([this._path.getEndPointX(), this._path.getEndPointY(), cpx, cpy, x, y], 30, 2);
+			for (var i = 0, n = tArray.length / 2; i < n; i++) {
+				this.lineTo(tArray[i * 2], tArray[i * 2 + 1], false);
+			}
+			this.lineTo(x, y, false);
+		}
+
+		__proto.bezierCurveTo = function (cp1x, cp1y, cp2x, cp2y, x, y) {
+			var tBezier = Bezier.I;
+			var tResultArray = [];
+			var _x1 = x, _y1 = y;
+			x = this._curMat.a * _x1 + this._curMat.c * _y1 + this._curMat.tx;
+			y = this._curMat.b * _x1 + this._curMat.d * _y1 + this._curMat.ty;
+			_x1 = cp1x, _y1 = cp1y;
+			cp1x = this._curMat.a * _x1 + this._curMat.c * _y1 + this._curMat.tx;
+			cp1y = this._curMat.b * _x1 + this._curMat.d * _y1 + this._curMat.ty;
+			_x1 = cp2x, _y1 = cp2y;
+			cp2x = this._curMat.a * _x1 + this._curMat.c * _y1 + this._curMat.tx;
+			cp2y = this._curMat.b * _x1 + this._curMat.d * _y1 + this._curMat.ty;
+			var sx = this._path.getEndPointX();
+			var sy = this._path.getEndPointY();
+			if (sx == undefined || isNaN(sx)) {
+				sx = 0;
+			}
+			if (sy == undefined || isNaN(sy)) {
+				sy = 0;
+			}
+			var bezier = new window.Bezier(sx, sy, cp1x, cp1y, cp2x, cp2y, x, y);
+			var arr = bezier.getLUT(Math.ceil(bezier.length()));
+			for (var index = 0; index < arr.length; index++) {
+				var pt = arr[index];
+				this.lineTo(pt.x, pt.y, false);
+			}
+			this.lineTo(x, y, false);
+		}
+
+		__proto.rect = function (x, y, width, height) {
+			this._other = this._other.make();
+			this._other.path || (this._other.path = new Path());
+			this._other.path.rect(x, y, width, height);
+		}
+
+		__proto.strokeRect = function (x, y, width, height, parameterLineWidth) {
+			var tW = parameterLineWidth * 0.5;
+			this.line(x - tW, y, x + width + tW, y, parameterLineWidth, this._curMat);
+			this.line(x + width, y, x + width, y + height, parameterLineWidth, this._curMat);
+			this.line(x, y, x, y + height, parameterLineWidth, this._curMat);
+			this.line(x - tW, y + height, x + width + tW, y + height, parameterLineWidth, this._curMat);
+		}
+
+		__proto.clip = function () { }
+		/**
+		*画多边形(用)
+		*@param x
+		*@param y
+		*@param points
+		*/
+		__proto.drawPoly = function (x, y, points, color, lineWidth, boderColor, isConvexPolygon) {
+			(isConvexPolygon === void 0) && (isConvexPolygon = false);
+			this._renderKey = 0;
+			this._shader2D.glTexture = null;
+			var tPath = this._getPath();
+			if (this.mId == -1) {
+				tPath.polygon(x, y, points, color, lineWidth ? lineWidth : 1, boderColor)
+			} else {
+				if (this.mHaveKey) {
+					var tShape = VectorGraphManager.getInstance().shapeDic[this.mId];
+					tShape.setMatrix(this._curMat);
+					tShape.rebuild(tPath.tempArray);
+					tPath.setGeomtry(tShape);
+				} else {
+					var t = tPath.polygon(x, y, points, color, lineWidth ? lineWidth : 1, boderColor);
+					VectorGraphManager.getInstance().addShape(this.mId, t);
+					t.setMatrix(this._curMat);
+				}
+			}
+			tPath.update();
+			var tPosArray = [this.mX, this.mY];
+			var tempSubmit;
+			if (!isConvexPolygon) {
+				var submit = SubmitStencil.create(4);
+				this.addRenderObject(submit);
+				tempSubmit = Submit.createShape(this, tPath.ib, tPath.vb, tPath.count, tPath.offset, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.PRIMITIVE*/0x04, 0));
+				tempSubmit.shaderValue.ALPHA = this._shader2D.ALPHA;
+				(tempSubmit.shaderValue).u_pos = tPosArray;
+				tempSubmit.shaderValue.u_mmat2 = RenderState2D.EMPTYMAT4_ARRAY;
+				this._submits[this._submits._length++] = tempSubmit;
+				submit = SubmitStencil.create(5);
+				this.addRenderObject(submit);
+			}
+			tempSubmit = Submit.createShape(this, tPath.ib, tPath.vb, tPath.count, tPath.offset, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.PRIMITIVE*/0x04, 0));
+			tempSubmit.shaderValue.ALPHA = this._shader2D.ALPHA;
+			(tempSubmit.shaderValue).u_pos = tPosArray;
+			tempSubmit.shaderValue.u_mmat2 = RenderState2D.EMPTYMAT4_ARRAY;
+			this._submits[this._submits._length++] = tempSubmit;
+			if (!isConvexPolygon) {
+				tempSubmit = Submit.createShape(this, tPath.ib, tPath.vb, tPath.count, tPath.offset, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.PRIMITIVE*/0x04, 0));
+				tempSubmit.shaderValue.ALPHA = this._shader2D.ALPHA;
+				(tempSubmit.shaderValue).u_pos = tPosArray;
+				tempSubmit.shaderValue.u_mmat2 = RenderState2D.EMPTYMAT4_ARRAY;
+				SubmitStencil.restore2(this, tempSubmit);
+			}
+			if (lineWidth > 0) {
+				if (this.mHaveLineKey) {
+					var tShapeLine = VectorGraphManager.getInstance().shapeLineDic[this.mId];
+					tShapeLine.rebuild(tPath.tempArray);
+					tPath.setGeomtry(tShapeLine);
+				} else {
+					VectorGraphManager.getInstance().addShape(this.mId, tPath.drawLine(x, y, points, lineWidth, boderColor));
+				}
+				tPath.update();
+				tempSubmit = Submit.createShape(this, tPath.ib, tPath.vb, tPath.count, tPath.offset, Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.PRIMITIVE*/0x04, 0));
+				tempSubmit.shaderValue.ALPHA = this._shader2D.ALPHA;
+				tempSubmit.shaderValue.u_mmat2 = RenderState2D.EMPTYMAT4_ARRAY;
+				this._submits[this._submits._length++] = tempSubmit;
+			}
+		}
+
+		/*******************************************end矢量绘制***************************************************/
+		__proto.drawParticle = function (x, y, pt) {
+			pt.x = x;
+			pt.y = y;
+			this._submits[this._submits._length++] = pt;
+		}
+
+		__proto._getPath = function () {
+			return this._path || (this._path = new Path());
+		}
+
+		/*,_shader2D.ALPHA=1*/
+		__getset(0, __proto, 'globalCompositeOperation', function () {
+			return BlendMode.NAMES[this._nBlendType];
+		}, function (value) {
+			var n = BlendMode.TOINT[value];
+			n == null || (this._nBlendType === n) || (SaveBase.save(this,/*laya.webgl.canvas.save.SaveBase.TYPE_GLOBALCOMPOSITEOPERATION*/0x10000, this, true), this._curSubmit = Submit.RENDERBASE, this._renderKey = 0, this._nBlendType = n);
+		});
+
+		__getset(0, __proto, 'strokeStyle', function () {
+			return this._shader2D.strokeStyle;
+		}, function (value) {
+			this._shader2D.strokeStyle.equal(value) || (SaveBase.save(this,/*laya.webgl.canvas.save.SaveBase.TYPE_STROKESTYLE*/0x200, this._shader2D, false), this._shader2D.strokeStyle = DrawStyle.create(value));
+		});
+
+		__getset(0, __proto, 'globalAlpha', function () {
+			return this._shader2D.ALPHA;
+		}, function (value) {
+			value = Math.floor(value * 1000) / 1000;
+			if (value != this._shader2D.ALPHA) {
+				SaveBase.save(this,/*laya.webgl.canvas.save.SaveBase.TYPE_ALPHA*/0x1, this._shader2D, true);
+				this._shader2D.ALPHA = value;
+			}
+		});
+
+		__getset(0, __proto, 'asBitmap', null, function (value) {
+			if (value) {
+				this._targets || (this._targets = new RenderTargetMAX());
+				this._targets.repaint = true;
+				if (!this._width || !this._height)
+					throw Error("asBitmap no size!");
+				this._targets.setSP(this.sprite);
+				this._targets.size(this._width, this._height);
+			} else
+				this._targets = null;
+		});
+
+		__getset(0, __proto, 'fillStyle', function () {
+			return this._shader2D.fillStyle;
+		}, function (value) {
+			this._shader2D.fillStyle.equal(value) || (SaveBase.save(this,/*laya.webgl.canvas.save.SaveBase.TYPE_FILESTYLE*/0x2, this._shader2D, false), this._shader2D.fillStyle = DrawStyle.create(value));
+		});
+
+		__getset(0, __proto, 'textAlign', function () {
+			return this._other.textAlign;
+		}, function (value) {
+			(this._other.textAlign === value) || (this._other = this._other.make(), SaveBase.save(this,/*laya.webgl.canvas.save.SaveBase.TYPE_TEXTALIGN*/0x8000, this._other, false), this._other.textAlign = value);
+		});
+
+		__getset(0, __proto, 'lineWidth', function () {
+			return this._other.lineWidth;
+		}, function (value) {
+			(this._other.lineWidth === value) || (this._other = this._other.make(), SaveBase.save(this,/*laya.webgl.canvas.save.SaveBase.TYPE_LINEWIDTH*/0x100, this._other, false), this._other.lineWidth = value);
+		});
+
+		__getset(0, __proto, 'textBaseline', function () {
+			return this._other.textBaseline;
+		}, function (value) {
+			(this._other.textBaseline === value) || (this._other = this._other.make(), SaveBase.save(this,/*laya.webgl.canvas.save.SaveBase.TYPE_TEXTBASELINE*/0x4000, this._other, false), this._other.textBaseline = value);
+		});
+
+		__getset(0, __proto, 'font', null, function (str) {
+			if (str == this._other.font.toString())
+				return;
+			this._other = this._other.make();
+			SaveBase.save(this,/*laya.webgl.canvas.save.SaveBase.TYPE_FONT*/0x8, this._other, false);
+			this._other.font === FontInContext.EMPTY ? (this._other.font = new FontInContext(str)) : (this._other.font.setFont(str));
+		});
+
+		WebGLContext2D.__init__ = function () {
+			ContextParams.DEFAULT = new ContextParams();
+		}
+
+		WebGLContext2D._SUBMITVBSIZE = 32000;
+		WebGLContext2D._MAXSIZE = 99999999;
+		WebGLContext2D._RECTVBSIZE = 16;
+		WebGLContext2D._COUNT = 0;
+		WebGLContext2D.SEGNUM = 32;
+		WebGLContext2D._contextcount = 0;
+		__static(WebGLContext2D,
+			['_tempPoint', function () { return this._tempPoint = new Point(); }, 'MAXCLIPRECT', function () { return this.MAXCLIPRECT = new Rectangle(0, 0, 99999999, 99999999); }, '_tmpMatrix', function () { return this._tmpMatrix = new Matrix(); }, '_fontTemp', function () { return this._fontTemp = new FontInContext(); }, '_drawStyleTemp', function () { return this._drawStyleTemp = new DrawStyle(null); }
+			]);
+		WebGLContext2D.__init$ = function () {
+			//class ContextParams
+			ContextParams = (function () {
+				function ContextParams() {
+					this.lineWidth = 1;
+					this.path = null;
+					this.textAlign = null;
+					this.textBaseline = null;
+					this.font = FontInContext.EMPTY;
+				}
+				__class(ContextParams, '');
+				var __proto = ContextParams.prototype;
+				__proto.clear = function () {
+					this.lineWidth = 1;
+					this.path && this.path.clear();
+					this.textAlign = this.textBaseline = null;
+					this.font = FontInContext.EMPTY;
+				}
+				__proto.make = function () {
+					return this === ContextParams.DEFAULT ? new ContextParams() : this;
+				}
+				ContextParams.DEFAULT = null;
+				return ContextParams;
+			})()
+		}
+
+		return WebGLContext2D;
+	})(Context)
+
+
+	//class laya.webgl.shader.d2.value.Value2D extends laya.webgl.shader.ShaderValue
+	var Value2D = (function (_super) {
+		function Value2D(mainID, subID) {
+			this.size = [0, 0];
+			this.alpha = 1.0;
+			//this.mmat=null;
+			this.ALPHA = 1.0;
+			//this.shader=null;
+			//this.mainID=0;
+			this.subID = 0;
+			//this.filters=null;
+			//this.textureHost=null;
+			//this.texture=null;
+			//this.fillStyle=null;
+			//this.color=null;
+			//this.strokeStyle=null;
+			//this.colorAdd=null;
+			//this.glTexture=null;
+			//this.u_mmat2=null;
+			//this._inClassCache=null;
+			this._cacheID = 0;
+			Value2D.__super.call(this);
+			this.defines = new ShaderDefines2D();
+			this.position = Value2D._POSITION;
+			this.mainID = mainID;
+			this.subID = subID;
+			this.textureHost = null;
+			this.texture = null;
+			this.fillStyle = null;
+			this.color = null;
+			this.strokeStyle = null;
+			this.colorAdd = null;
+			this.glTexture = null;
+			this.u_mmat2 = null;
+			this._cacheID = mainID | subID;
+			this._inClassCache = Value2D._cache[this._cacheID];
+			if (mainID > 0 && !this._inClassCache) {
+				this._inClassCache = Value2D._cache[this._cacheID] = [];
+				this._inClassCache._length = 0;
+			}
+			this.clear();
+		}
+
+		__class(Value2D, 'laya.webgl.shader.d2.value.Value2D', _super);
+		var __proto = Value2D.prototype;
+		__proto.setValue = function (value) { }
+		//throw new Error("todo in subclass");
+		__proto.refresh = function () {
+			var size = this.size;
+			size[0] = RenderState2D.width;
+			size[1] = RenderState2D.height;
+			this.alpha = this.ALPHA * RenderState2D.worldAlpha;
+			this.mmat = RenderState2D.worldMatrix4;
+			return this;
+		}
+
+		__proto._ShaderWithCompile = function () {
+			return Shader.withCompile2D(0, this.mainID, this.defines.toNameDic(), this.mainID | this.defines._value, Shader2X.create);
+		}
+
+		__proto._withWorldShaderDefines = function () {
+			var defs = RenderState2D.worldShaderDefines;
+			var sd = Shader.sharders[this.mainID | this.defines._value | defs.getValue()];
+			if (!sd) {
+				var def = {};
+				var dic;
+				var name;
+				dic = this.defines.toNameDic(); for (name in dic) def[name] = "";
+				dic = defs.toNameDic(); for (name in dic) def[name] = "";
+				sd = Shader.withCompile2D(0, this.mainID, def, this.mainID | this.defines._value | defs.getValue(), Shader2X.create);
+			};
+			var worldFilters = RenderState2D.worldFilters;
+			if (!worldFilters) return sd;
+			var n = worldFilters.length, f;
+			for (var i = 0; i < n; i++) {
+				((f = worldFilters[i])) && f.action.setValue(this);
+			}
+			return sd;
+		}
+
+		__proto.upload = function () {
+			var renderstate2d = RenderState2D;
+			this.alpha = this.ALPHA * renderstate2d.worldAlpha;
+			if (RenderState2D.worldMatrix4 !== RenderState2D.TEMPMAT4_ARRAY) this.defines.add(/*laya.webgl.shader.d2.ShaderDefines2D.WORLDMAT*/0x80);
+			(WebGL.shaderHighPrecision) && (this.defines.add(/*laya.webgl.shader.d2.ShaderDefines2D.SHADERDEFINE_FSHIGHPRECISION*/0x400));
+			var sd = renderstate2d.worldShaderDefines ? this._withWorldShaderDefines() : (Shader.sharders[this.mainID | this.defines._value] || this._ShaderWithCompile());
+			var params;
+			this.size[0] = renderstate2d.width, this.size[1] = renderstate2d.height;
+			this.mmat = renderstate2d.worldMatrix4;
+			if (BaseShader.activeShader !== sd) {
+				if (sd._shaderValueWidth !== renderstate2d.width || sd._shaderValueHeight !== renderstate2d.height) {
+					sd._shaderValueWidth = renderstate2d.width;
+					sd._shaderValueHeight = renderstate2d.height;
+				}
+				else {
+					params = sd._params2dQuick2 || sd._make2dQuick2();
+				}
+				sd.upload(this, params);
+			}
+			else {
+				if (sd._shaderValueWidth !== renderstate2d.width || sd._shaderValueHeight !== renderstate2d.height) {
+					sd._shaderValueWidth = renderstate2d.width;
+					sd._shaderValueHeight = renderstate2d.height;
+				}
+				else {
+					params = (sd._params2dQuick1) || sd._make2dQuick1();
+				}
+				sd.upload(this, params);
+			}
+		}
+
+		__proto.setFilters = function (value) {
+			this.filters = value;
+			if (!value)
+				return;
+			var n = value.length, f;
+			for (var i = 0; i < n; i++) {
+				f = value[i];
+				if (f) {
+					this.defines.add(f.type);
+					f.action.setValue(this);
+				}
+			}
+		}
+
+		__proto.clear = function () {
+			this.defines.setValue(this.subID);
+		}
+
+		__proto.release = function () {
+			this._inClassCache[this._inClassCache._length++] = this;
+			this.fillStyle = null;
+			this.strokeStyle = null;
+			this.clear();
+		}
+
+		Value2D._initone = function (type, classT) {
+			Value2D._typeClass[type] = classT;
+			Value2D._cache[type] = [];
+			Value2D._cache[type]._length = 0;
+		}
+
+		Value2D.__init__ = function () {
+			Value2D._POSITION = [2,/*laya.webgl.WebGLContext.FLOAT*/0x1406, false, 4 * CONST3D2D.BYTES_PE, 0];
+			Value2D._TEXCOORD = [2,/*laya.webgl.WebGLContext.FLOAT*/0x1406, false, 4 * CONST3D2D.BYTES_PE, 2 * CONST3D2D.BYTES_PE];
+			Value2D._initone(/*laya.webgl.shader.d2.ShaderDefines2D.COLOR2D*/0x02, Color2dSV);
+			Value2D._initone(/*laya.webgl.shader.d2.ShaderDefines2D.PRIMITIVE*/0x04, PrimitiveSV);
+			Value2D._initone(/*laya.webgl.shader.d2.ShaderDefines2D.FILLTEXTURE*/0x100, FillTextureSV);
+			Value2D._initone(/*laya.webgl.shader.d2.ShaderDefines2D.SKINMESH*/0x200, SkinSV);
+			Value2D._initone(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, TextureSV);
+			Value2D._initone(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01 | /*laya.webgl.shader.d2.ShaderDefines2D.COLORADD*/0x40, TextSV);
+			Value2D._initone(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01 | /*laya.webgl.shader.d2.ShaderDefines2D.FILTERGLOW*/0x08, TextureSV);
+		}
+
+		Value2D.create = function (mainType, subType) {
+			var types = Value2D._cache[mainType | subType];
+			if (types._length)
+				return types[--types._length];
+			else
+				return new Value2D._typeClass[mainType | subType](subType);
+		}
+
+		Value2D._POSITION = null;
+		Value2D._TEXCOORD = null;
+		Value2D._cache = [];
+		Value2D._typeClass = [];
+		__static(Value2D,
+			['TEMPMAT4_ARRAY', function () { return this.TEMPMAT4_ARRAY = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; }
+			]);
+		return Value2D;
+	})(ShaderValue)
+
+
+	//class laya.webgl.utils.RenderSprite3D extends laya.renders.RenderSprite
+	var RenderSprite3D = (function (_super) {
+		function RenderSprite3D(type, next) {
+			RenderSprite3D.__super.call(this, type, next);
+		}
+
+		__class(RenderSprite3D, 'laya.webgl.utils.RenderSprite3D', _super);
+		var __proto = RenderSprite3D.prototype;
+		__proto.onCreate = function (type) {
+			switch (type) {
+				case 0x08:
+					this._fun = this._blend;
+					return;
+				case 0x04:
+					this._fun = this._transform;
+					return;
+			}
+		}
+
+		__proto._mask = function (sprite, context, x, y) {
+			var next = this._next;
+			var mask = sprite.mask;
+			var submitCMD;
+			var submitStencil;
+			if (mask) {
+				context.ctx.save();
+				var preBlendMode = (context.ctx).globalCompositeOperation;
+				var tRect = new Rectangle();
+				tRect.copyFrom(mask.getBounds());
+				tRect.width = Math.round(tRect.width);
+				tRect.height = Math.round(tRect.height);
+				tRect.x = Math.round(tRect.x);
+				tRect.y = Math.round(tRect.y);
+				if (tRect.width > 0 && tRect.height > 0) {
+					var tf = sprite._style._tf;
+					var scope = SubmitCMDScope.create();
+					scope.addValue("bounds", tRect);
+					submitCMD = SubmitCMD.create([scope, context], laya.webgl.utils.RenderSprite3D.tmpTarget);
+					context.addRenderObject(submitCMD);
+					mask.render(context, -tRect.x, -tRect.y);
+					submitCMD = SubmitCMD.create([scope], laya.webgl.utils.RenderSprite3D.endTmpTarget);
+					context.addRenderObject(submitCMD);
+					context.ctx.save();
+					context.clipRect(x - tf.translateX + tRect.x, y - tf.translateY + tRect.y, tRect.width, tRect.height);
+					next._fun.call(next, sprite, context, x, y);
+					context.ctx.restore();
+					submitStencil = SubmitStencil.create(6);
+					preBlendMode = (context.ctx).globalCompositeOperation;
+					submitStencil.blendMode = "mask";
+					context.addRenderObject(submitStencil);
+					Matrix.TEMP.identity();
+					var shaderValue = Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, 0);
+					var uv = Texture.INV_UV;
+					var w = tRect.width;
+					var h = tRect.height;
+					var tempLimit = 32;
+					if (tRect.width < tempLimit || tRect.height < tempLimit) {
+						uv = RenderSprite3D.tempUV;
+						uv[0] = 0;
+						uv[1] = 0;
+						uv[2] = (tRect.width >= 32) ? 1 : tRect.width / tempLimit;
+						uv[3] = 0
+						uv[4] = (tRect.width >= 32) ? 1 : tRect.width / tempLimit;
+						uv[5] = (tRect.height >= 32) ? 1 : tRect.height / tempLimit;
+						uv[6] = 0;
+						uv[7] = (tRect.height >= 32) ? 1 : tRect.height / tempLimit;
+						tRect.width = (tRect.width >= 32) ? tRect.width : tempLimit;
+						tRect.height = (tRect.height >= 32) ? tRect.height : tempLimit;
+						uv[1] *= -1; uv[3] *= -1; uv[5] *= -1; uv[7] *= -1;
+						uv[1] += 1; uv[3] += 1; uv[5] += 1; uv[7] += 1;
+					}
+					(context.ctx).drawTarget(scope, x + tRect.x - tf.translateX, y + tRect.y - tf.translateY, w, h, Matrix.TEMP, "tmpTarget", shaderValue, uv, 6);
+					submitCMD = SubmitCMD.create([scope], laya.webgl.utils.RenderSprite3D.recycleTarget);
+					context.addRenderObject(submitCMD);
+					submitStencil = SubmitStencil.create(6);
+					submitStencil.blendMode = preBlendMode;
+					context.addRenderObject(submitStencil);
+				}
+				context.ctx.restore();
+			}
+			else {
+				next._fun.call(next, sprite, context, x, y);
+			}
+		}
+
+		__proto._blend = function (sprite, context, x, y) {
+			var style = sprite._style;
+			var next = this._next;
+			if (style.blendMode) {
+				context.ctx.save();
+				context.ctx.globalCompositeOperation = style.blendMode;
+				next._fun.call(next, sprite, context, x, y);
+				context.ctx.restore();
+			}
+			else {
+				next._fun.call(next, sprite, context, x, y);
+			}
+		}
+
+		__proto._transform = function (sprite, context, x, y) {
+			'use strict';
+			var transform = sprite.transform, _next = this._next;
+			if (transform && _next != RenderSprite.NORENDER) {
+				var ctx = context.ctx;
+				var style = sprite._style;
+				transform.tx = x;
+				transform.ty = y;
+				var m2 = ctx._getTransformMatrix();
+				var m1 = m2.clone();
+				Matrix.mul(transform, m2, m2);
+				m2._checkTransform();
+				transform.tx = transform.ty = 0;
+				_next._fun.call(_next, sprite, context, 0, 0);
+				m1.copyTo(m2);
+				m1.destroy();
+			} else {
+				_next._fun.call(_next, sprite, context, x, y);
+			}
+		}
+
+		RenderSprite3D.tmpTarget = function (scope, context) {
+			var b = scope.getValue("bounds");
+			var tmpTarget = RenderTarget2D.create(b.width, b.height);
+			tmpTarget.start();
+			tmpTarget.clear(0, 0, 0, 0);
+			scope.addValue("tmpTarget", tmpTarget);
+		}
+
+		RenderSprite3D.endTmpTarget = function (scope) {
+			var tmpTarget = scope.getValue("tmpTarget");
+			tmpTarget.end();
+		}
+
+		RenderSprite3D.recycleTarget = function (scope) {
+			var tmpTarget = scope.getValue("tmpTarget");
+			tmpTarget.recycle();
+			scope.recycle();
+		}
+
+		__static(RenderSprite3D,
+			['tempUV', function () { return this.tempUV = new Array(8); }
+			]);
+		return RenderSprite3D;
+	})(RenderSprite)
+
+
+	//class laya.filters.webgl.ColorFilterActionGL extends laya.filters.webgl.FilterActionGL
+	var ColorFilterActionGL = (function (_super) {
+		function ColorFilterActionGL() {
+			this.data = null;
+			ColorFilterActionGL.__super.call(this);
+		}
+
+		__class(ColorFilterActionGL, 'laya.filters.webgl.ColorFilterActionGL', _super);
+		var __proto = ColorFilterActionGL.prototype;
+		Laya.imps(__proto, { "laya.filters.IFilterActionGL": true })
+		__proto.setValue = function (shader) {
+			shader.colorMat = this.data._mat;
+			shader.colorAlpha = this.data._alpha;
+		}
+
+		__proto.apply3d = function (scope, sprite, context, x, y) {
+			var b = scope.getValue("bounds");
+			var shaderValue = Value2D.create(/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, 0);
+			shaderValue.setFilters([this.data]);
+			var tMatrix = Matrix.TEMP;
+			tMatrix.identity();
+			context.ctx.drawTarget(scope, 0, 0, b.width, b.height, tMatrix, "src", shaderValue);
+		}
+
+		return ColorFilterActionGL;
+	})(FilterActionGL)
+
+
+	//class laya.webgl.atlas.Atlaser extends laya.webgl.atlas.AtlasGrid
+	var Atlaser = (function (_super) {
+		function Atlaser(gridNumX, gridNumY, width, height, atlasID) {
+			this._atlasCanvas = null;
+			this._inAtlasTextureKey = null;
+			this._inAtlasTextureBitmapValue = null;
+			this._inAtlasTextureOriUVValue = null;
+			this._InAtlasWebGLImagesKey = null;
+			this._InAtlasWebGLImagesOffsetValue = null;
+			Atlaser.__super.call(this, gridNumX, gridNumY, atlasID);
+			this._inAtlasTextureKey = [];
+			this._inAtlasTextureBitmapValue = [];
+			this._inAtlasTextureOriUVValue = [];
+			this._InAtlasWebGLImagesKey = {};
+			this._InAtlasWebGLImagesOffsetValue = [];
+			this._atlasCanvas = new AtlasWebGLCanvas();
+			this._atlasCanvas._atlaser = this;
+			this._atlasCanvas.width = width;
+			this._atlasCanvas.height = height;
+			this._atlasCanvas.activeResource();
+			this._atlasCanvas.lock = true;
+		}
+
+		__class(Atlaser, 'laya.webgl.atlas.Atlaser', _super);
+		var __proto = Atlaser.prototype;
+		__proto.computeUVinAtlasTexture = function (texture, oriUV, offsetX, offsetY) {
+			var tex = texture;
+			var _width = AtlasResourceManager.atlasTextureWidth;
+			var _height = AtlasResourceManager.atlasTextureHeight;
+			var u1 = offsetX / _width, v1 = offsetY / _height, u2 = (offsetX + texture.bitmap.width) / _width, v2 = (offsetY + texture.bitmap.height) / _height;
+			var inAltasUVWidth = texture.bitmap.width / _width, inAltasUVHeight = texture.bitmap.height / _height;
+			texture.uv = [u1 + oriUV[0] * inAltasUVWidth, v1 + oriUV[1] * inAltasUVHeight, u2 - (1 - oriUV[2]) * inAltasUVWidth, v1 + oriUV[3] * inAltasUVHeight, u2 - (1 - oriUV[4]) * inAltasUVWidth, v2 - (1 - oriUV[5]) * inAltasUVHeight, u1 + oriUV[6] * inAltasUVWidth, v2 - (1 - oriUV[7]) * inAltasUVHeight];
+		}
+
+		__proto.findBitmapIsExist = function (bitmap) {
+			if ((bitmap instanceof laya.webgl.resource.WebGLImage)) {
+				var webImage = bitmap;
+				var sUrl = webImage.url;
+				var object = this._InAtlasWebGLImagesKey[sUrl ? sUrl : webImage.id]
+				if (object) {
+					return object.offsetInfoID;
+				}
+			}
+			return -1;
+		}
+
+		/**
+		*
+		*@param inAtlasRes
+		*@return 是否已经存在队列中
+		*/
+		__proto.addToAtlasTexture = function (mergeAtlasBitmap, offsetX, offsetY) {
+			if ((mergeAtlasBitmap instanceof laya.webgl.resource.WebGLImage)) {
+				var webImage = mergeAtlasBitmap;
+				var sUrl = webImage.url;
+				this._InAtlasWebGLImagesKey[sUrl ? sUrl : webImage.id] = { bitmap: mergeAtlasBitmap, offsetInfoID: this._InAtlasWebGLImagesOffsetValue.length };
+				this._InAtlasWebGLImagesOffsetValue.push([offsetX, offsetY]);
+			}
+			this._atlasCanvas.texSubImage2D(offsetX, offsetY, mergeAtlasBitmap.atlasSource);
+			mergeAtlasBitmap.clearAtlasSource();
+		}
+
+		__proto.addToAtlas = function (texture, offsetX, offsetY) {
+			texture._atlasID = this._inAtlasTextureKey.length;
+			var oriUV = texture.uv.slice();
+			var oriBitmap = texture.bitmap;
+			this._inAtlasTextureKey.push(texture);
+			this._inAtlasTextureOriUVValue.push(oriUV);
+			this._inAtlasTextureBitmapValue.push(oriBitmap);
+			this.computeUVinAtlasTexture(texture, oriUV, offsetX, offsetY);
+			texture.bitmap = this._atlasCanvas;
+		}
+
+		__proto.clear = function () {
+			for (var i = 0, n = this._inAtlasTextureKey.length; i < n; i++) {
+				this._inAtlasTextureKey[i].bitmap = this._inAtlasTextureBitmapValue[i];
+				this._inAtlasTextureKey[i].uv = this._inAtlasTextureOriUVValue[i];
+				this._inAtlasTextureKey[i]._atlasID = -1;
+				this._inAtlasTextureKey[i].bitmap.lock = false;
+				this._inAtlasTextureKey[i].bitmap.releaseResource();
+			}
+			this._inAtlasTextureKey.length = 0;
+			this._inAtlasTextureBitmapValue.length = 0;
+			this._inAtlasTextureOriUVValue.length = 0;
+			this._InAtlasWebGLImagesKey = null;
+			this._InAtlasWebGLImagesOffsetValue.length = 0;
+		}
+
+		__proto.dispose = function () {
+			this.clear();
+			this._atlasCanvas.dispose();
+		}
+
+		__getset(0, __proto, 'InAtlasWebGLImagesOffsetValue', function () {
+			return this._InAtlasWebGLImagesOffsetValue;
+		});
+
+		__getset(0, __proto, 'texture', function () {
+			return this._atlasCanvas;
+		});
+
+		__getset(0, __proto, 'inAtlasWebGLImagesKey', function () {
+			return this._InAtlasWebGLImagesKey;
+		});
+
+		return Atlaser;
+	})(AtlasGrid)
+
+
+	//class laya.webgl.shader.d2.ShaderDefines2D extends laya.webgl.shader.ShaderDefines
+	var ShaderDefines2D = (function (_super) {
+		function ShaderDefines2D() {
+			ShaderDefines2D.__super.call(this, ShaderDefines2D.__name2int, ShaderDefines2D.__int2name, ShaderDefines2D.__int2nameMap);
+		}
+
+		__class(ShaderDefines2D, 'laya.webgl.shader.d2.ShaderDefines2D', _super);
+		ShaderDefines2D.__init__ = function () {
+			ShaderDefines2D.reg("TEXTURE2D", 0x01);
+			ShaderDefines2D.reg("COLOR2D", 0x02);
+			ShaderDefines2D.reg("PRIMITIVE", 0x04);
+			ShaderDefines2D.reg("GLOW_FILTER", 0x08);
+			ShaderDefines2D.reg("BLUR_FILTER", 0x10);
+			ShaderDefines2D.reg("COLOR_FILTER", 0x20);
+			ShaderDefines2D.reg("COLOR_ADD", 0x40);
+			ShaderDefines2D.reg("WORLDMAT", 0x80);
+			ShaderDefines2D.reg("FILLTEXTURE", 0x100);
+			ShaderDefines2D.reg("FSHIGHPRECISION", 0x400);
+		}
+
+		ShaderDefines2D.reg = function (name, value) {
+			ShaderDefines._reg(name, value, ShaderDefines2D.__name2int, ShaderDefines2D.__int2name);
+		}
+
+		ShaderDefines2D.toText = function (value, int2name, int2nameMap) {
+			return ShaderDefines._toText(value, int2name, int2nameMap);
+		}
+
+		ShaderDefines2D.toInt = function (names) {
+			return ShaderDefines._toInt(names, ShaderDefines2D.__name2int);
+		}
+
+		ShaderDefines2D.TEXTURE2D = 0x01;
+		ShaderDefines2D.COLOR2D = 0x02;
+		ShaderDefines2D.PRIMITIVE = 0x04;
+		ShaderDefines2D.FILTERGLOW = 0x08;
+		ShaderDefines2D.FILTERBLUR = 0x10;
+		ShaderDefines2D.FILTERCOLOR = 0x20;
+		ShaderDefines2D.COLORADD = 0x40;
+		ShaderDefines2D.WORLDMAT = 0x80;
+		ShaderDefines2D.FILLTEXTURE = 0x100;
+		ShaderDefines2D.SKINMESH = 0x200;
+		ShaderDefines2D.SHADERDEFINE_FSHIGHPRECISION = 0x400;
+		ShaderDefines2D.__name2int = {};
+		ShaderDefines2D.__int2name = [];
+		ShaderDefines2D.__int2nameMap = [];
+		return ShaderDefines2D;
+	})(ShaderDefines)
+
+
+	//class laya.webgl.shapes.Ellipse extends laya.webgl.shapes.BasePoly
+	var Ellipse = (function (_super) {
+		function Ellipse(x, y, width, height, color, borderWidth, borderColor) {
+			Ellipse.__super.call(this, x, y, width, height, 40, color, borderWidth, borderColor);
+		}
+
+		__class(Ellipse, 'laya.webgl.shapes.Ellipse', _super);
+		return Ellipse;
+	})(BasePoly)
+
+
+	//class laya.webgl.shapes.Line extends laya.webgl.shapes.BasePoly
+	var Line = (function (_super) {
+		function Line(x, y, points, borderWidth, color) {
+			this._points = [];
+			this.rebuild(points);
+			Line.__super.call(this, x, y, 0, 0, 0, color, borderWidth, color, 0);
+		}
+
+		__class(Line, 'laya.webgl.shapes.Line', _super);
+		var __proto = Line.prototype;
+		__proto.rebuild = function (points) {
+			var len = points.length;
+			var preLen = this._points.length;
+			if (len != preLen) {
+				this.mUint16Array = new Uint16Array((len / 2 - 1) * 6);
+				this.mFloat32Array = new Float32Array(len * 5);
+			}
+			this._points.length = 0;
+			var tCurrX = NaN;
+			var tCurrY = NaN;
+			var tLastX = -1;
+			var tLastY = -1;
+			var tLen = points.length / 2;
+			for (var i = 0; i < tLen; i++) {
+				tCurrX = points[i * 2];
+				tCurrY = points[i * 2 + 1];
+				if (Math.abs(tLastX - tCurrX) > 0.01 || Math.abs(tLastY - tCurrY) > 0.01) {
+					this._points.push(tCurrX, tCurrY);
+				}
+				tLastX = tCurrX;
+				tLastY = tCurrY;
+			}
+		}
+
+		__proto.getData = function (ib, vb, start) {
+			var indices = [];
+			var verts = [];
+			(this.borderWidth > 0) && this.createLine2(this._points, indices, this.borderWidth, start, verts, this._points.length / 2);
+			this.mUint16Array.set(indices, 0);
+			this.mFloat32Array.set(verts, 0);
+			ib.append(this.mUint16Array);
+			vb.append(this.mFloat32Array);
+		}
+
+		return Line;
+	})(BasePoly)
+
+
+	//class laya.webgl.shapes.LoopLine extends laya.webgl.shapes.BasePoly
+	var LoopLine = (function (_super) {
+		function LoopLine(x, y, points, width, color) {
+			this._points = [];
+			var tCurrX = NaN;
+			var tCurrY = NaN;
+			var tLastX = -1;
+			var tLastY = -1;
+			var tLen = points.length / 2 - 1;
+			for (var i = 0; i < tLen; i++) {
+				tCurrX = points[i * 2];
+				tCurrY = points[i * 2 + 1];
+				if (Math.abs(tLastX - tCurrX) > 0.01 || Math.abs(tLastY - tCurrY) > 0.01) {
+					this._points.push(tCurrX, tCurrY);
+				}
+				tLastX = tCurrX;
+				tLastY = tCurrY;
+			}
+			tCurrX = points[tLen * 2];
+			tCurrY = points[tLen * 2 + 1];
+			tLastX = this._points[0];
+			tLastY = this._points[1];
+			if (Math.abs(tLastX - tCurrX) > 0.01 || Math.abs(tLastY - tCurrY) > 0.01) {
+				this._points.push(tCurrX, tCurrY);
+			}
+			LoopLine.__super.call(this, x, y, 0, 0, this._points.length / 2, 0, width, color);
+		}
+
+		__class(LoopLine, 'laya.webgl.shapes.LoopLine', _super);
+		var __proto = LoopLine.prototype;
+		__proto.getData = function (ib, vb, start) {
+			if (this.borderWidth > 0) {
+				var color = this.color;
+				var r = ((color >> 16) & 0x0000ff) / 255, g = ((color >> 8) & 0xff) / 255, b = (color & 0x0000ff) / 255;
+				var verts = [];
+				var tLastX = -1, tLastY = -1;
+				var tCurrX = 0, tCurrY = 0;
+				var indices = [];
+				var tLen = Math.floor(this._points.length / 2);
+				for (var i = 0; i < tLen; i++) {
+					tCurrX = this._points[i * 2];
+					tCurrY = this._points[i * 2 + 1];
+					verts.push(this.x + tCurrX, this.y + tCurrY, r, g, b);
+				}
+				this.createLoopLine(verts, indices, this.borderWidth, start + verts.length / 5);
+				ib.append(new Uint16Array(indices));
+				vb.append(new Float32Array(verts));
+			}
+		}
+
+		__proto.createLoopLine = function (p, indices, lineWidth, len, outVertex, outIndex) {
+			var tLen = p.length / 5;
+			var points = p.concat();
+			var result = outVertex ? outVertex : p;
+			var color = this.borderColor;
+			var r = ((color >> 16) & 0x0000ff) / 255, g = ((color >> 8) & 0xff) / 255, b = (color & 0x0000ff) / 255;
+			var firstPoint = [points[0], points[1]];
+			var lastPoint = [points[points.length - 5], points[points.length - 4]];
+			var midPointX = lastPoint[0] + (firstPoint[0] - lastPoint[0]) * 0.5;
+			var midPointY = lastPoint[1] + (firstPoint[1] - lastPoint[1]) * 0.5;
+			points.unshift(midPointX, midPointY, 0, 0, 0);
+			points.push(midPointX, midPointY, 0, 0, 0);
+			var length = points.length / 5;
+			var iStart = len, w = lineWidth / 2;
+			var px, py, p1x, p1y, p2x, p2y, p3x, p3y;
+			var perpx, perpy, perp2x, perp2y, perp3x, perp3y;
+			var a1, b1, c1, a2, b2, c2;
+			var denom, pdist, dist;
+			p1x = points[0];
+			p1y = points[1];
+			p2x = points[5];
+			p2y = points[6];
+			perpx = -(p1y - p2y);
+			perpy = p1x - p2x;
+			dist = Math.sqrt(perpx * perpx + perpy * perpy);
+			perpx = perpx / dist * w;
+			perpy = perpy / dist * w;
+			result.push(p1x - perpx, p1y - perpy, r, g, b, p1x + perpx, p1y + perpy, r, g, b);
+			for (var i = 1; i < length - 1; i++) {
+				p1x = points[(i - 1) * 5];
+				p1y = points[(i - 1) * 5 + 1];
+				p2x = points[(i) * 5];
+				p2y = points[(i) * 5 + 1];
+				p3x = points[(i + 1) * 5];
+				p3y = points[(i + 1) * 5 + 1];
+				perpx = -(p1y - p2y);
+				perpy = p1x - p2x;
+				dist = Math.sqrt(perpx * perpx + perpy * perpy);
+				perpx = perpx / dist * w;
+				perpy = perpy / dist * w;
+				perp2x = -(p2y - p3y);
+				perp2y = p2x - p3x;
+				dist = Math.sqrt(perp2x * perp2x + perp2y * perp2y);
+				perp2x = perp2x / dist * w;
+				perp2y = perp2y / dist * w;
+				a1 = (-perpy + p1y) - (-perpy + p2y);
+				b1 = (-perpx + p2x) - (-perpx + p1x);
+				c1 = (-perpx + p1x) * (-perpy + p2y) - (-perpx + p2x) * (-perpy + p1y);
+				a2 = (-perp2y + p3y) - (-perp2y + p2y);
+				b2 = (-perp2x + p2x) - (-perp2x + p3x);
+				c2 = (-perp2x + p3x) * (-perp2y + p2y) - (-perp2x + p2x) * (-perp2y + p3y);
+				denom = a1 * b2 - a2 * b1;
+				if (Math.abs(denom) < 0.1) {
+					denom += 10.1;
+					result.push(p2x - perpx, p2y - perpy, r, g, b, p2x + perpx, p2y + perpy, r, g, b);
+					continue;
+				}
+				px = (b1 * c2 - b2 * c1) / denom;
+				py = (a2 * c1 - a1 * c2) / denom;
+				pdist = (px - p2x) * (px - p2x) + (py - p2y) + (py - p2y);
+				result.push(px, py, r, g, b, p2x - (px - p2x), p2y - (py - p2y), r, g, b);
+			}
+			if (outIndex) {
+				indices = outIndex;
+			};
+			var groupLen = this.edges + 1;
+			for (i = 1; i < groupLen; i++) {
+				indices.push(iStart + (i - 1) * 2, iStart + (i - 1) * 2 + 1, iStart + i * 2 + 1, iStart + i * 2 + 1, iStart + i * 2, iStart + (i - 1) * 2);
+			}
+			indices.push(iStart + (i - 1) * 2, iStart + (i - 1) * 2 + 1, iStart + 1, iStart + 1, iStart, iStart + (i - 1) * 2);
+			return result;
+		}
+
+		return LoopLine;
+	})(BasePoly)
+
+
+	//class laya.webgl.shapes.Polygon extends laya.webgl.shapes.BasePoly
+	var Polygon = (function (_super) {
+		function Polygon(x, y, points, color, borderWidth, borderColor) {
+			this._points = null;
+			this._start = -1;
+			this._repaint = false;
+			this._mat = Matrix.create();
+			this._points = points.slice(0, points.length);
+			Polygon.__super.call(this, x, y, 0, 0, this._points.length / 2, color, borderWidth, borderColor);
+		}
+
+		__class(Polygon, 'laya.webgl.shapes.Polygon', _super);
+		var __proto = Polygon.prototype;
+		__proto.rebuild = function (point) {
+			if (!this._repaint) {
+				this._points.length = 0;
+				this._points = this._points.concat(point);
+			}
+		}
+
+		__proto.setMatrix = function (mat) {
+			mat.copyTo(this._mat);
+		}
+
+		__proto.needUpdate = function (mat) {
+			this._repaint = (this._mat.a == mat.a && this._mat.b == mat.b && this._mat.c == mat.c && this._mat.d == mat.d && this._mat.tx == mat.tx && this._mat.ty == mat.ty);
+			return !this._repaint;
+		}
+
+		__proto.getData = function (ib, vb, start) {
+			var indices, i = 0;
+			var tArray = this._points;
+			var tLen = 0;
+			if (this.mUint16Array && this.mFloat32Array && this._repaint) {
+				if (this._start != start) {
+					this._start = start;
+					indices = [];
+					tLen = Math.floor(tArray.length / 2);
+					for (i = 2; i < tLen; i++) {
+						indices.push(start, start + i - 1, start + i);
+					}
+					this.mUint16Array = new Uint16Array(indices);
+				}
+			}
+			else {
+				this._start = start;
+				indices = [];
+				var verts = [];
+				var color = this.color;
+				var r = ((color >> 16) & 0x0000ff) / 255, g = ((color >> 8) & 0xff) / 255, b = (color & 0x0000ff) / 255;
+				tLen = Math.floor(tArray.length / 2);
+				for (i = 0; i < tLen; i++) {
+					verts.push(this.x + tArray[i * 2], this.y + tArray[i * 2 + 1], r, g, b);
+				}
+				for (i = 2; i < tLen; i++) {
+					indices.push(start, start + i - 1, start + i);
+				}
+				this.mUint16Array = new Uint16Array(indices);
+				this.mFloat32Array = new Float32Array(verts);
+			}
+			ib.append(this.mUint16Array);
+			vb.append(this.mFloat32Array);
+		}
+
+		return Polygon;
+	})(BasePoly)
+
+
+	//class laya.webgl.submit.SubmitCanvas extends laya.webgl.submit.Submit
+	var SubmitCanvas = (function (_super) {
+		function SubmitCanvas() {
+			//this._ctx_src=null;
+			this._matrix = new Matrix();
+			this._matrix4 = CONST3D2D.defaultMatrix4.concat();
+			SubmitCanvas.__super.call(this,/*laya.webgl.submit.Submit.TYPE_2D*/10000);
+			this.shaderValue = new Value2D(0, 0);
+		}
+
+		__class(SubmitCanvas, 'laya.webgl.submit.SubmitCanvas', _super);
+		var __proto = SubmitCanvas.prototype;
+		__proto.renderSubmit = function () {
+			if (this._ctx_src._targets) {
+				this._ctx_src._targets.flush(this._ctx_src);
+				return 1;
+			};
+			var preAlpha = RenderState2D.worldAlpha;
+			var preMatrix4 = RenderState2D.worldMatrix4;
+			var preMatrix = RenderState2D.worldMatrix;
+			var preFilters = RenderState2D.worldFilters;
+			var preWorldShaderDefines = RenderState2D.worldShaderDefines;
+			var v = this.shaderValue;
+			var m = this._matrix;
+			var m4 = this._matrix4;
+			var mout = Matrix.TEMP;
+			Matrix.mul(m, preMatrix, mout);
+			m4[0] = mout.a;
+			m4[1] = mout.b;
+			m4[4] = mout.c;
+			m4[5] = mout.d;
+			m4[12] = mout.tx;
+			m4[13] = mout.ty;
+			RenderState2D.worldMatrix = mout.clone();
+			RenderState2D.worldMatrix4 = m4;
+			RenderState2D.worldAlpha = RenderState2D.worldAlpha * v.alpha;
+			if (v.filters && v.filters.length) {
+				RenderState2D.worldFilters = v.filters;
+				RenderState2D.worldShaderDefines = v.defines;
+			}
+			this._ctx_src.flush();
+			RenderState2D.worldAlpha = preAlpha;
+			RenderState2D.worldMatrix4 = preMatrix4;
+			RenderState2D.worldMatrix.destroy();
+			RenderState2D.worldMatrix = preMatrix;
+			RenderState2D.worldFilters = preFilters;
+			RenderState2D.worldShaderDefines = preWorldShaderDefines;
+			return 1;
+		}
+
+		__proto.releaseRender = function () {
+			var cache = SubmitCanvas._cache;
+			this._ctx_src = null;
+			cache[cache._length++] = this;
+		}
+
+		__proto.getRenderType = function () {
+			return /*laya.webgl.submit.Submit.TYPE_CANVAS*/10003;
+		}
+
+		SubmitCanvas.create = function (ctx_src, alpha, filters) {
+			var o = (!SubmitCanvas._cache._length) ? (new SubmitCanvas()) : SubmitCanvas._cache[--SubmitCanvas._cache._length];
+			o._ctx_src = ctx_src;
+			var v = o.shaderValue;
+			v.alpha = alpha;
+			v.defines.setValue(0);
+			filters && filters.length && v.setFilters(filters);
+			return o;
+		}
+
+		__static(SubmitCanvas,
+			['_cache', function () { return this._cache = (SubmitCanvas._cache = [], SubmitCanvas._cache._length = 0, SubmitCanvas._cache); }
+			]);
+		return SubmitCanvas;
+	})(Submit)
+
+
+	//class laya.webgl.submit.SubmitTexture extends laya.webgl.submit.Submit
+	var SubmitTexture = (function (_super) {
+		function SubmitTexture(renderType) {
+			this._preIsSameTextureShader = false;
+			this._isSameTexture = true;
+			this._texs = new Array;
+			this._texsID = new Array;
+			this._vbPos = new Array;
+			(renderType === void 0) && (renderType = 10000);
+			SubmitTexture.__super.call(this, renderType);
+		}
+
+		__class(SubmitTexture, 'laya.webgl.submit.SubmitTexture', _super);
+		var __proto = SubmitTexture.prototype;
+		__proto.releaseRender = function () {
+			var cache = SubmitTexture._cache;
+			cache[cache._length++] = this;
+			this.shaderValue.release();
+			this._preIsSameTextureShader = false;
+			this._vb = null;
+			this._texs.length = 0;
+			this._vbPos.length = 0;
+			this._isSameTexture = true;
+		}
+
+		__proto.addTexture = function (tex, vbpos) {
+			this._texsID[this._texs.length] = tex._uvID;
+			this._texs.push(tex);
+			this._vbPos.push(vbpos);
+		}
+
+		//检查材质是否修改，修改UV，设置是否是同一材质
+		__proto.checkTexture = function () {
+			if (this._texs.length < 1) {
+				this._isSameTexture = true;
+				return;
+			};
+			var _tex = this.shaderValue.textureHost;
+			var webGLImg = _tex.bitmap;
+			if (webGLImg === null) return;
+			var vbdata = this._vb.getFloat32Array();
+			for (var i = 0, s = this._texs.length; i < s; i++) {
+				var tex = this._texs[i];
+				tex.active();
+				var newUV = tex.uv;
+				if (this._texsID[i] !== tex._uvID) {
+					this._texsID[i] = tex._uvID;
+					var vbPos = this._vbPos[i];
+					vbdata[vbPos + 2] = newUV[0];
+					vbdata[vbPos + 3] = newUV[1];
+					vbdata[vbPos + 6] = newUV[2];
+					vbdata[vbPos + 7] = newUV[3];
+					vbdata[vbPos + 10] = newUV[4];
+					vbdata[vbPos + 11] = newUV[5];
+					vbdata[vbPos + 14] = newUV[6];
+					vbdata[vbPos + 15] = newUV[7];
+					this._vb.setNeedUpload();
+				}
+				if (tex.bitmap !== webGLImg) {
+					this._isSameTexture = false;
+				}
+			}
+		}
+
+		__proto.renderSubmit = function () {
+			if (this._numEle === 0) {
+				SubmitTexture._shaderSet = false;
+				return 1;
+			};
+			var _tex = this.shaderValue.textureHost;
+			if (_tex) {
+				var source = _tex.source;
+				if (!_tex.bitmap || !source) {
+					SubmitTexture._shaderSet = false;
+					return 1;
+				}
+				this.shaderValue.texture = source;
+			}
+			this._vb.bind_upload(this._ib);
+			var gl = WebGL.mainContext;
+			if (BlendMode.activeBlendFunction !== this._blendFn) {
+				gl.enable(/*laya.webgl.WebGLContext.BLEND*/0x0BE2);
+				this._blendFn(gl);
+				BlendMode.activeBlendFunction = this._blendFn;
+			}
+			Stat.drawCall++;
+			Stat.trianglesFaces += this._numEle / 3;
+			if (this._preIsSameTextureShader && BaseShader.activeShader && SubmitTexture._shaderSet)
+				(BaseShader.activeShader).uploadTexture2D(this.shaderValue.texture);
+			else this.shaderValue.upload();
+			SubmitTexture._shaderSet = true;
+			if (this._texs.length > 1 && !this._isSameTexture) {
+				var webGLImg = _tex.bitmap;
+				var index = 0;
+				var shader = BaseShader.activeShader;
+				for (var i = 0, s = this._texs.length; i < s; i++) {
+					var tex2 = this._texs[i];
+					if (tex2.bitmap !== webGLImg || (i + 1) === s) {
+						shader.uploadTexture2D(tex2.source);
+						gl.drawElements(/*laya.webgl.WebGLContext.TRIANGLES*/0x0004, (i - index + 1) * 6,/*laya.webgl.WebGLContext.UNSIGNED_SHORT*/0x1403, this._startIdx + index * 6 * CONST3D2D.BYTES_PIDX);
+						webGLImg = tex2.bitmap;
+						index = i;
+					}
+				}
+			} else {
+				gl.drawElements(/*laya.webgl.WebGLContext.TRIANGLES*/0x0004, this._numEle,/*laya.webgl.WebGLContext.UNSIGNED_SHORT*/0x1403, this._startIdx);
+			}
+			return 1;
+		}
+
+		SubmitTexture.create = function (context, ib, vb, pos, sv) {
+			var o = SubmitTexture._cache._length ? SubmitTexture._cache[--SubmitTexture._cache._length] : new SubmitTexture();
+			if (vb == null) {
+				vb = o._selfVb || (o._selfVb = VertexBuffer2D.create(-1));
+				vb.clear();
+				pos = 0;
+			}
+			o._ib = ib;
+			o._vb = vb;
+			o._startIdx = pos * CONST3D2D.BYTES_PIDX;
+			o._numEle = 0;
+			var blendType = context._nBlendType;
+			o._blendFn = context._targets ? BlendMode.targetFns[blendType] : BlendMode.fns[blendType];
+			o.shaderValue = sv;
+			o.shaderValue.setValue(context._shader2D);
+			var filters = context._shader2D.filters;
+			filters && o.shaderValue.setFilters(filters);
+			return o;
+		}
+
+		SubmitTexture._shaderSet = true;
+		__static(SubmitTexture,
+			['_cache', function () { return this._cache = (SubmitTexture._cache = [], SubmitTexture._cache._length = 0, SubmitTexture._cache); }
+			]);
+		return SubmitTexture;
+	})(Submit)
+
+
+	/**
+	*...
+	*@author ...
+	*/
+	//class laya.webgl.shader.BaseShader extends laya.resource.Resource
+	var BaseShader = (function (_super) {
+		function BaseShader() {
+			BaseShader.__super.call(this);
+		}
+
+		__class(BaseShader, 'laya.webgl.shader.BaseShader', _super);
+		BaseShader.activeShader = null;
+		BaseShader.bindShader = null;
+		return BaseShader;
+	})(Resource)
+
+
+	//class laya.webgl.resource.RenderTarget2D extends laya.resource.Texture
+	var RenderTarget2D = (function (_super) {
+		function RenderTarget2D(width, height, surfaceFormat, surfaceType, depthStencilFormat, mipMap, repeat, minFifter, magFifter) {
+			this._type = 0;
+			this._svWidth = NaN;
+			this._svHeight = NaN;
+			this._preRenderTarget = null;
+			//TODO:.........................................................
+			this._alreadyResolved = false;
+			this._looked = false;
+			this._surfaceFormat = 0;
+			this._surfaceType = 0;
+			this._depthStencilFormat = 0;
+			this._mipMap = false;
+			this._repeat = false;
+			this._minFifter = 0;
+			this._magFifter = 0;
+			this._destroy = false;
+			(surfaceFormat === void 0) && (surfaceFormat =/*laya.webgl.WebGLContext.RGBA*/0x1908);
+			(surfaceType === void 0) && (surfaceType =/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401);
+			(depthStencilFormat === void 0) && (depthStencilFormat =/*laya.webgl.WebGLContext.DEPTH_STENCIL*/0x84F9);
+			(mipMap === void 0) && (mipMap = false);
+			(repeat === void 0) && (repeat = false);
+			(minFifter === void 0) && (minFifter = -1);
+			(magFifter === void 0) && (magFifter = -1);
+			this._type = 1;
+			this._w = width;
+			this._h = height;
+			this._surfaceFormat = surfaceFormat;
+			this._surfaceType = surfaceType;
+			this._depthStencilFormat = depthStencilFormat;
+			this._mipMap = mipMap;
+			this._repeat = repeat;
+			this._minFifter = minFifter;
+			this._magFifter = magFifter;
+			this._createWebGLRenderTarget();
+			this.bitmap.lock = true;
+			RenderTarget2D.__super.call(this, this.bitmap, Texture.INV_UV);
+		}
+
+		__class(RenderTarget2D, 'laya.webgl.resource.RenderTarget2D', _super);
+		var __proto = RenderTarget2D.prototype;
+		Laya.imps(__proto, { "laya.resource.IDispose": true })
+		//TODO:临时......................................................
+		__proto.getType = function () {
+			return this._type;
+		}
+
+		//*/
+		__proto.getTexture = function () {
+			return this;
+		}
+
+		__proto.size = function (w, h) {
+			if (this._w == w && this._h == h) return;
+			this._w = w;
+			this._h = h;
+			this.release();
+			if (this._w != 0 && this._h != 0) this._createWebGLRenderTarget();
+		}
+
+		__proto.release = function () {
+			this.destroy();
+		}
+
+		__proto.recycle = function () {
+			RenderTarget2D.POOL.push(this);
+		}
+
+		__proto.start = function () {
+			var gl = WebGL.mainContext;
+			this._preRenderTarget = RenderState2D.curRenderTarget;
+			RenderState2D.curRenderTarget = this;
+			gl.bindFramebuffer(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40, this.bitmap.frameBuffer);
+			this._alreadyResolved = false;
+			if (this._type == 1) {
+				gl.viewport(0, 0, this._w, this._h);
+				this._svWidth = RenderState2D.width;
+				this._svHeight = RenderState2D.height;
+				RenderState2D.width = this._w;
+				RenderState2D.height = this._h;
+				BaseShader.activeShader = null;
+			}
+			return this;
+		}
+
+		__proto.clear = function (r, g, b, a) {
+			(r === void 0) && (r = 0.0);
+			(g === void 0) && (g = 0.0);
+			(b === void 0) && (b = 0.0);
+			(a === void 0) && (a = 1.0);
+			var gl = WebGL.mainContext;
+			gl.clearColor(r, g, b, a);
+			var clearFlag =/*laya.webgl.WebGLContext.COLOR_BUFFER_BIT*/0x00004000;
+			switch (this._depthStencilFormat) {
+				case /*laya.webgl.WebGLContext.DEPTH_COMPONENT16*/0x81A5:
+					clearFlag |=/*laya.webgl.WebGLContext.DEPTH_BUFFER_BIT*/0x00000100;
+					break;
+				case /*laya.webgl.WebGLContext.STENCIL_INDEX8*/0x8D48:
+					clearFlag |=/*laya.webgl.WebGLContext.STENCIL_BUFFER_BIT*/0x00000400;
+					break;
+				case /*laya.webgl.WebGLContext.DEPTH_STENCIL*/0x84F9:
+					clearFlag |=/*laya.webgl.WebGLContext.DEPTH_BUFFER_BIT*/0x00000100;
+					clearFlag |=/*laya.webgl.WebGLContext.STENCIL_BUFFER_BIT*/0x00000400
+					break;
+			}
+			gl.clear(clearFlag);
+		}
+
+		__proto.end = function () {
+			var gl = WebGL.mainContext;
+			gl.bindFramebuffer(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40, this._preRenderTarget ? this._preRenderTarget.bitmap.frameBuffer : null);
+			this._alreadyResolved = true;
+			RenderState2D.curRenderTarget = this._preRenderTarget;
+			if (this._type == 1) {
+				gl.viewport(0, 0, this._svWidth, this._svHeight);
+				RenderState2D.width = this._svWidth;
+				RenderState2D.height = this._svHeight;
+				BaseShader.activeShader = null;
+			} else gl.viewport(0, 0, Laya.stage.width, Laya.stage.height);
+		}
+
+		__proto.getData = function (x, y, width, height) {
+			var gl = WebGL.mainContext;
+			gl.bindFramebuffer(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40, (this.bitmap).frameBuffer);
+			var canRead = (gl.checkFramebufferStatus(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40) ===/*laya.webgl.WebGLContext.FRAMEBUFFER_COMPLETE*/0x8CD5);
+			if (!canRead) {
+				gl.bindFramebuffer(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40, null);
+				return null;
+			};
+			var pixels = new Uint8Array(this._w * this._h * 4);
+			gl.readPixels(x, y, width, height, this._surfaceFormat, this._surfaceType, pixels);
+			gl.bindFramebuffer(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40, null);
+			return pixels;
+		}
+
+		/**彻底清理资源,注意会强制解锁清理*/
+		__proto.destroy = function (foreDiposeTexture) {
+			(foreDiposeTexture === void 0) && (foreDiposeTexture = false);
+			if (!this._destroy) {
+				this._loaded = false;
+				this.bitmap.offAll();
+				this.bitmap.detoryResource();
+				this.bitmap.dispose();
+				this.offAll();
+				this.bitmap = null;
+				this._alreadyResolved = false;
+				this._destroy = true;
+				_super.prototype.destroy.call(this);
+			}
+		}
+
+		//待测试
+		__proto.dispose = function () { }
+		__proto._createWebGLRenderTarget = function () {
+			this.bitmap = new WebGLRenderTarget(this.width, this.height, this._surfaceFormat, this._surfaceType, this._depthStencilFormat, this._mipMap, this._repeat, this._minFifter, this._magFifter);
+			this.bitmap.activeResource();
+			this._alreadyResolved = true;
+			this._destroy = false;
+			this._loaded = true;
+			this.bitmap.on(/*laya.events.Event.RECOVERED*/"recovered", this, function (e) {
+				this.event(/*laya.events.Event.RECOVERED*/"recovered");
+			})
+		}
+
+		__getset(0, __proto, 'surfaceFormat', function () {
+			return this._surfaceFormat;
+		});
+
+		__getset(0, __proto, 'magFifter', function () {
+			return this._magFifter;
+		});
+
+		__getset(0, __proto, 'surfaceType', function () {
+			return this._surfaceType;
+		});
+
+		__getset(0, __proto, 'mipMap', function () {
+			return this._mipMap;
+		});
+
+		__getset(0, __proto, 'depthStencilFormat', function () {
+			return this._depthStencilFormat;
+		});
+
+		//}
+		__getset(0, __proto, 'minFifter', function () {
+			return this._minFifter;
+		});
+
+		/**返回RenderTarget的Texture*/
+		__getset(0, __proto, 'source', function () {
+			if (this._alreadyResolved)
+				return Laya.superGet(Texture, this, 'source');
+			return null;
+		});
+
+		RenderTarget2D.create = function (w, h, surfaceFormat, surfaceType, depthStencilFormat, mipMap, repeat, minFifter, magFifter) {
+			(surfaceFormat === void 0) && (surfaceFormat =/*laya.webgl.WebGLContext.RGBA*/0x1908);
+			(surfaceType === void 0) && (surfaceType =/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401);
+			(depthStencilFormat === void 0) && (depthStencilFormat =/*laya.webgl.WebGLContext.DEPTH_STENCIL*/0x84F9);
+			(mipMap === void 0) && (mipMap = false);
+			(repeat === void 0) && (repeat = false);
+			(minFifter === void 0) && (minFifter = -1);
+			(magFifter === void 0) && (magFifter = -1);
+			var t = RenderTarget2D.POOL.pop();
+			t || (t = new RenderTarget2D(w, h));
+			if (!t.bitmap || t._w != w || t._h != h || t._surfaceFormat != surfaceFormat || t._surfaceType != surfaceType || t._depthStencilFormat != depthStencilFormat || t._mipMap != mipMap || t._repeat != repeat || t._minFifter != minFifter || t._magFifter != magFifter) {
+				t._w = w;
+				t._h = h;
+				t._surfaceFormat = surfaceFormat;
+				t._surfaceType = surfaceType;
+				t._depthStencilFormat = depthStencilFormat;
+				t._mipMap = mipMap;
+				t._repeat = repeat;
+				t._minFifter = minFifter;
+				t._magFifter = magFifter;
+				t.release();
+				t._createWebGLRenderTarget();
+			}
+			return t;
+		}
+
+		RenderTarget2D.TYPE2D = 1;
+		RenderTarget2D.TYPE3D = 2;
+		RenderTarget2D.POOL = [];
+		return RenderTarget2D;
+	})(Texture)
+
+
+	//class laya.webgl.utils.Buffer extends laya.resource.Resource
+	var Buffer = (function (_super) {
+		function Buffer() {
+			this._glBuffer = null;
+			this._buffer = null;
+			//可能为Float32Array、Uint16Array、Uint8Array、ArrayBuffer等。
+			this._bufferType = 0;
+			this._bufferUsage = 0;
+			this._byteLength = 0;
+			Buffer.__super.call(this);
+			Buffer._gl = WebGL.mainContext;
+		}
+
+		__class(Buffer, 'laya.webgl.utils.Buffer', _super);
+		var __proto = Buffer.prototype;
+		__proto._bind = function () {
+			this.activeResource();
+			if (Buffer._bindActive[this._bufferType] !== this._glBuffer) {
+				(this._bufferType ===/*laya.webgl.WebGLContext.ARRAY_BUFFER*/0x8892) && (Buffer._bindVertexBuffer = this._glBuffer);
+				Buffer._gl.bindBuffer(this._bufferType, Buffer._bindActive[this._bufferType] = this._glBuffer);
+				BaseShader.activeShader = null;
+			}
+		}
+
+		__proto.recreateResource = function () {
+			this._glBuffer || (this._glBuffer = Buffer._gl.createBuffer());
+			this.completeCreate();
+		}
+
+		__proto.detoryResource = function () {
+			if (this._glBuffer) {
+				WebGL.mainContext.deleteBuffer(this._glBuffer);
+				this._glBuffer = null;
+			}
+			this.memorySize = 0;
+		}
+
+		__getset(0, __proto, 'bufferUsage', function () {
+			return this._bufferUsage;
+		});
+
+		Buffer._gl = null;
+		Buffer._bindActive = {};
+		Buffer._bindVertexBuffer = null;
+		Buffer._enableAtributes = [];
+		return Buffer;
+	})(Resource)
+
+
+	//class laya.webgl.shader.d2.skinAnishader.SkinSV extends laya.webgl.shader.d2.value.Value2D
+	var SkinSV = (function (_super) {
+		function SkinSV(type) {
+			this.texcoord = null;
+			this.offsetX = 300;
+			this.offsetY = 0;
+			SkinSV.__super.call(this,/*laya.webgl.shader.d2.ShaderDefines2D.SKINMESH*/0x200, 0);
+			var _vlen = 8 * CONST3D2D.BYTES_PE;
+			this.position = [2,/*laya.webgl.WebGLContext.FLOAT*/0x1406, false, _vlen, 0];
+			this.texcoord = [2,/*laya.webgl.WebGLContext.FLOAT*/0x1406, false, _vlen, 2 * CONST3D2D.BYTES_PE];
+			this.color = [4,/*laya.webgl.WebGLContext.FLOAT*/0x1406, false, _vlen, 4 * CONST3D2D.BYTES_PE];
+		}
+
+		__class(SkinSV, 'laya.webgl.shader.d2.skinAnishader.SkinSV', _super);
+		return SkinSV;
+	})(Value2D)
+
+
+	//class laya.webgl.shader.d2.value.Color2dSV extends laya.webgl.shader.d2.value.Value2D
+	var Color2dSV = (function (_super) {
+		function Color2dSV(args) {
+			Color2dSV.__super.call(this,/*laya.webgl.shader.d2.ShaderDefines2D.COLOR2D*/0x02, 0);
+			this.color = [];
+		}
+
+		__class(Color2dSV, 'laya.webgl.shader.d2.value.Color2dSV', _super);
+		var __proto = Color2dSV.prototype;
+		__proto.setValue = function (value) {
+			value.fillStyle && (this.color = value.fillStyle._color._color);
+			value.strokeStyle && (this.color = value.strokeStyle._color._color);
+		}
+
+		return Color2dSV;
+	})(Value2D)
+
+
+	//class laya.webgl.shader.d2.value.FillTextureSV extends laya.webgl.shader.d2.value.Value2D
+	var FillTextureSV = (function (_super) {
+		function FillTextureSV(type) {
+			this.u_colorMatrix = null;
+			this.strength = 0;
+			this.colorMat = null;
+			this.colorAlpha = null;
+			this.u_TexRange = [0, 1, 0, 1];
+			this.u_offset = [0, 0];
+			this.texcoord = Value2D._TEXCOORD;
+			FillTextureSV.__super.call(this,/*laya.webgl.shader.d2.ShaderDefines2D.FILLTEXTURE*/0x100, 0);
+		}
+
+		__class(FillTextureSV, 'laya.webgl.shader.d2.value.FillTextureSV', _super);
+		var __proto = FillTextureSV.prototype;
+		//this.color=[4,WebGLContext.FLOAT,false,_vlen,4 *CONST3D2D.BYTES_PE];
+		__proto.setValue = function (vo) {
+			this.ALPHA = vo.ALPHA;
+			vo.filters && this.setFilters(vo.filters);
+		}
+
+		__proto.clear = function () {
+			this.texture = null;
+			this.shader = null;
+			this.defines.setValue(0);
+		}
+
+		return FillTextureSV;
+	})(Value2D)
+
+
+	//class laya.webgl.shader.d2.value.TextureSV extends laya.webgl.shader.d2.value.Value2D
+	var TextureSV = (function (_super) {
+		function TextureSV(subID) {
+			this.u_colorMatrix = null;
+			this.strength = 0;
+			this.blurInfo = null;
+			this.colorMat = null;
+			this.colorAlpha = null;
+			this.texcoord = Value2D._TEXCOORD;
+			(subID === void 0) && (subID = 0);
+			TextureSV.__super.call(this,/*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01, subID);
+		}
+
+		__class(TextureSV, 'laya.webgl.shader.d2.value.TextureSV', _super);
+		var __proto = TextureSV.prototype;
+		__proto.setValue = function (vo) {
+			this.ALPHA = vo.ALPHA;
+			vo.filters && this.setFilters(vo.filters);
+		}
+
+		__proto.clear = function () {
+			this.texture = null;
+			this.shader = null;
+			this.defines.setValue(0);
+		}
+
+		return TextureSV;
+	})(Value2D)
+
+
+	//class laya.webgl.shader.d2.value.PrimitiveSV extends laya.webgl.shader.d2.value.Value2D
+	var PrimitiveSV = (function (_super) {
+		function PrimitiveSV(args) {
+			this.a_color = null;
+			this.u_pos = [0, 0];
+			PrimitiveSV.__super.call(this,/*laya.webgl.shader.d2.ShaderDefines2D.PRIMITIVE*/0x04, 0);
+			this.position = [2,/*laya.webgl.WebGLContext.FLOAT*/0x1406, false, 5 * CONST3D2D.BYTES_PE, 0];
+			this.a_color = [3,/*laya.webgl.WebGLContext.FLOAT*/0x1406, false, 5 * CONST3D2D.BYTES_PE, 2 * CONST3D2D.BYTES_PE];
+		}
+
+		__class(PrimitiveSV, 'laya.webgl.shader.d2.value.PrimitiveSV', _super);
+		return PrimitiveSV;
+	})(Value2D)
+
+
+	//class laya.webgl.atlas.AtlasWebGLCanvas extends laya.resource.Bitmap
+	var AtlasWebGLCanvas = (function (_super) {
+		function AtlasWebGLCanvas() {
+			this._atlaser = null;
+			/**兼容Stage3D使用*/
+			this._flashCacheImage = null;
+			this._flashCacheImageNeedFlush = false;
+			AtlasWebGLCanvas.__super.call(this);
+		}
+
+		__class(AtlasWebGLCanvas, 'laya.webgl.atlas.AtlasWebGLCanvas', _super);
+		var __proto = AtlasWebGLCanvas.prototype;
+		/***重新创建资源*/
+		__proto.recreateResource = function () {
+			var gl = WebGL.mainContext;
+			var glTex = this._source = gl.createTexture();
+			var preTarget = WebGLContext.curBindTexTarget;
+			var preTexture = WebGLContext.curBindTexValue;
+			WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, glTex);
+			gl.texImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0,/*laya.webgl.WebGLContext.RGBA*/0x1908, this._w, this._h, 0,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, null);
+			gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MIN_FILTER*/0x2801,/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+			gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MAG_FILTER*/0x2800,/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+			gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_S*/0x2802,/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F);
+			gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_T*/0x2803,/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F);
+			(preTarget && preTexture) && (WebGLContext.bindTexture(gl, preTarget, preTexture));
+			this.memorySize = this._w * this._h * 4;
+			this.completeCreate();
+		}
+
+		/***销毁资源*/
+		__proto.detoryResource = function () {
+			if (this._source) {
+				WebGL.mainContext.deleteTexture(this._source);
+				this._source = null;
+				this.memorySize = 0;
+			}
+		}
+
+		/**采样image到WebGLTexture的一部分*/
+		__proto.texSubImage2D = function (xoffset, yoffset, bitmap) {
+			if (!Render.isFlash) {
+				var gl = WebGL.mainContext;
+				var preTarget = WebGLContext.curBindTexTarget;
+				var preTexture = WebGLContext.curBindTexValue;
+				WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, this._source);
+				gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_PREMULTIPLY_ALPHA_WEBGL*/0x9241, true);
+				(xoffset - 1 >= 0) && (gl.texSubImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0, xoffset - 1, yoffset,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, bitmap));
+				(xoffset + 1 <= this._w) && (gl.texSubImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0, xoffset + 1, yoffset,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, bitmap));
+				(yoffset - 1 >= 0) && (gl.texSubImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0, xoffset, yoffset - 1,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, bitmap));
+				(yoffset + 1 <= this._h) && (gl.texSubImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0, xoffset, yoffset + 1,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, bitmap));
+				gl.texSubImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0, xoffset, yoffset,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, bitmap);
+				gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_PREMULTIPLY_ALPHA_WEBGL*/0x9241, false);
+				(preTarget && preTexture) && (WebGLContext.bindTexture(gl, preTarget, preTexture));
+			} else {
+				if (!this._flashCacheImage) {
+					this._flashCacheImage = HTMLImage.create("");
+					this._flashCacheImage._image.createCanvas(this._w, this._h);
+				};
+				var bmData = bitmap.bitmapdata;
+				this._flashCacheImage._image.copyPixels(bmData, 0, 0, bmData.width, bmData.height, xoffset, yoffset);
+				(this._flashCacheImageNeedFlush) || (this._flashCacheImageNeedFlush = true);
+			}
+		}
+
+		/**采样image到WebGLTexture的一部分*/
+		__proto.texSubImage2DPixel = function (xoffset, yoffset, width, height, pixel) {
+			var gl = WebGL.mainContext;
+			var preTarget = WebGLContext.curBindTexTarget;
+			var preTexture = WebGLContext.curBindTexValue;
+			WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, this._source);
+			var pixels = new Uint8Array(pixel.data);
+			gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_PREMULTIPLY_ALPHA_WEBGL*/0x9241, true);
+			gl.texSubImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0, xoffset, yoffset, width, height,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, pixels);
+			gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_PREMULTIPLY_ALPHA_WEBGL*/0x9241, false);
+			(preTarget && preTexture) && (WebGLContext.bindTexture(gl, preTarget, preTexture));
+		}
+
+		/***
+		*设置图片宽度
+		*@param value 图片宽度
+		*/
+		__getset(0, __proto, 'width', _super.prototype._$get_width, function (value) {
+			this._w = value;
+		});
+
+		/***
+		*设置图片高度
+		*@param value 图片高度
+		*/
+		__getset(0, __proto, 'height', _super.prototype._$get_height, function (value) {
+			this._h = value;
+		});
+
+		return AtlasWebGLCanvas;
+	})(Bitmap)
+
+
+	//class laya.webgl.resource.WebGLCanvas extends laya.resource.Bitmap
+	var WebGLCanvas = (function (_super) {
+		function WebGLCanvas() {
+			//this._ctx=null;
+			/**HTML Canvas*/
+			//this._canvas=null;
+			//this._imgData=null;
+			//}
+			//this.iscpuSource=false;
+			WebGLCanvas.__super.call(this);
+		}
+
+		__class(WebGLCanvas, 'laya.webgl.resource.WebGLCanvas', _super);
+		var __proto = WebGLCanvas.prototype;
+		//}
+		__proto.getCanvas = function () {
+			return this._canvas;
+		}
+
+		__proto.clear = function () {
+			this._ctx && this._ctx.clear();
+		}
+
+		__proto.destroy = function () {
+			this._ctx && this._ctx.destroy();
+			this._ctx = null;
+		}
+
+		__proto._setContext = function (context) {
+			this._ctx = context;
+		}
+
+		__proto.getContext = function (contextID, other) {
+			return this._ctx ? this._ctx : (this._ctx = WebGLCanvas._createContext(this));
+		}
+
+		/*override public function copyTo(dec:Bitmap):void {
+		super.copyTo(dec);
+		(dec as WebGLCanvas)._ctx=_ctx;
+	}*/
+
+
+		__proto.size = function (w, h) {
+			if (this._w != w || this._h != h) {
+				this._w = w;
+				this._h = h;
+				this._ctx && this._ctx.size(w, h);
+				this._canvas && (this._canvas.height = h, this._canvas.width = w);
+			}
+
+		}
+
+
+		__proto.recreateResource = function () {
+			this.createWebGlTexture();
+			this.completeCreate();
+		}
+
+
+		__proto.detoryResource = function () {
+			if (this._source && !this.iscpuSource) {
+				WebGL.mainContext.deleteTexture(this._source);
+				this._source = null;
+				this.memorySize = 0;
+			}
+
+		}
+
+
+		__proto.createWebGlTexture = function () {
+			var gl = WebGL.mainContext;
+			if (!this._canvas) {
+				throw "create GLTextur err:no data:" + this._canvas;
+			};
+
+			var glTex = this._source = gl.createTexture();
+			this.iscpuSource = false;
+			var preTarget = WebGLContext.curBindTexTarget;
+			var preTexture = WebGLContext.curBindTexValue;
+			WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, glTex);
+			gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_FLIP_Y_WEBGL*/0x9240, 1);
+			gl.texImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, this._imgData);
+			gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MAG_FILTER*/0x2800,/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+			gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MIN_FILTER*/0x2801,/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+			gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_S*/0x2802,/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F);
+			gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_T*/0x2803,/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F);
+			gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_FLIP_Y_WEBGL*/0x9240, 0);
+			this.memorySize = this._w * this._h * 4;
+			(preTarget && preTexture) && (WebGLContext.bindTexture(gl, preTarget, preTexture));
+		}
+
+
+		//_canvas=null;
+		__proto.texSubImage2D = function (webglCanvas, xoffset, yoffset) {
+			var gl = WebGL.mainContext;
+			var preTarget = WebGLContext.curBindTexTarget;
+			var preTexture = WebGLContext.curBindTexValue;
+			WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, this._source);
+			gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_PREMULTIPLY_ALPHA_WEBGL*/0x9241, true);
+			gl.texSubImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0, xoffset, yoffset,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, webglCanvas._source);
+			gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_PREMULTIPLY_ALPHA_WEBGL*/0x9241, false);
+			(preTarget && preTexture) && (WebGLContext.bindTexture(gl, preTarget, preTexture));
+		}
+
+
+		__getset(0, __proto, 'context', function () {
+			return this._ctx;
+		});
+
+
+		__getset(0, __proto, 'asBitmap', null, function (value) {
+			this._ctx && (this._ctx.asBitmap = value);
+		});
+
+
+		WebGLCanvas._createContext = null;
+		return WebGLCanvas;
+	})(Bitmap)
+
+
+	//class laya.webgl.resource.WebGLCharImage extends laya.resource.Bitmap
+	var WebGLCharImage = (function (_super) {
+		function WebGLCharImage(content, drawValue) {
+			this.CborderSize = 12;
+			//this._ctx=null;
+			/***是否创建私有Source*/
+			//this._allowMerageInAtlas=false;
+			/**是否允许加入大图合集*/
+			//this._enableMerageInAtlas=false;
+			/**HTML Canvas，绘制字符载体,非私有数据载体*/
+			//this.canvas=null;
+			/**********************************************************************************/
+			//this.cw=NaN;
+			//this.ch=NaN;
+			//this.xs=NaN;
+			//this.ys=NaN;
+			//this.char=null;
+			//this.fillColor=null;
+			//this.borderColor=null;
+			//this.borderSize=0;
+			//this.font=null;
+			//this.fontSize=0;
+			//this.texture=null;
+			//this.lineWidth=0;
+			//this.UV=null;
+			//this.isSpace=false;
+			//this.underLine=0;
+			WebGLCharImage.__super.call(this);
+			this.char = content;
+			this.isSpace = content === ' ';
+			this.xs = drawValue.scaleX;
+			this.ys = drawValue.scaleY;
+			this.font = drawValue.font.toString();
+			this.fontSize = drawValue.font.size;
+			this.fillColor = drawValue.fillColor;
+			this.borderColor = drawValue.borderColor;
+			this.lineWidth = drawValue.lineWidth;
+			this.underLine = drawValue.underLine;
+			var bIsConchApp = Render.isConchApp;
+			var pCanvas;
+			if (bIsConchApp) {
+			/*__JS__ */pCanvas = ConchTextCanvas;
+			/*__JS__ */pCanvas._source = ConchTextCanvas;
+			/*__JS__ */pCanvas._source.canvas = ConchTextCanvas;
+			} else {
+				pCanvas = Browser.canvas.source;
+			}
+			this.canvas = pCanvas;
+			this._enableMerageInAtlas = true;
+			if (bIsConchApp) {
+			/*__JS__ */this._ctx = pCanvas;
+			} else {
+				this._ctx = this.canvas.getContext('2d', undefined);
+			};
+			var t = Utils.measureText(this.char, this.font);
+			this.cw = t.width * this.xs;
+			this.ch = (t.height || this.fontSize) * this.ys;
+			this.onresize(this.cw + this.CborderSize * 2, this.ch + this.CborderSize * 2);
+			this.texture = new Texture(this);
+		}
+
+		__class(WebGLCharImage, 'laya.webgl.resource.WebGLCharImage', _super);
+		var __proto = WebGLCharImage.prototype;
+		Laya.imps(__proto, { "laya.webgl.resource.IMergeAtlasBitmap": true })
+		__proto.active = function () {
+			this.texture.active();
+		}
+
+		__proto.recreateResource = function () {
+			var bIsConchApp = Render.isConchApp;
+			this.onresize(this.cw + this.CborderSize * 2, this.ch + this.CborderSize * 2);
+			this.canvas && (this.canvas.height = this._h, this.canvas.width = this._w);
+			if (bIsConchApp) {
+				var nFontSize = this.fontSize;
+				if (this.xs != 1 || this.ys != 1) {
+					nFontSize = parseInt(nFontSize * ((this.xs > this.ys) ? this.xs : this.ys) + "");
+				};
+				var sFont = "normal 100 " + nFontSize + "px Arial";
+				if (this.borderColor) {
+					sFont += " 1 " + this.borderColor;
+				}
+				this._ctx.font = sFont;
+				this._ctx.textBaseline = "top";
+				this._ctx.fillStyle = this.fillColor;
+				this._ctx.fillText(this.char, this.CborderSize, this.CborderSize, null, null, null);
+			} else {
+				this._ctx.save();
+				(this._ctx).clearRect(0, 0, this.cw + this.CborderSize * 2, this.ch + this.CborderSize * 2);
+				this._ctx.font = this.font;
+				if (Text.RightToLeft) {
+					this._ctx.textAlign = "end";
+				}
+				this._ctx.textBaseline = "top";
+				this._ctx.translate(this.CborderSize, this.CborderSize);
+				if (this.xs != 1 || this.ys != 1) {
+					this._ctx.scale(this.xs, this.ys);
+				}
+				if (this.fillColor && this.borderColor) {
+					this._ctx.strokeStyle = this.borderColor;
+					this._ctx.lineWidth = this.lineWidth;
+					this._ctx.strokeText(this.char, 0, 0, null, null, 0, null);
+					this._ctx.fillStyle = this.fillColor;
+					this._ctx.fillText(this.char, 0, 0, null, null, null);
+				} else {
+					if (this.lineWidth === -1) {
+						this._ctx.fillStyle = this.fillColor ? this.fillColor : "white";
+						this._ctx.fillText(this.char, 0, 0, null, null, null);
+					} else {
+						this._ctx.strokeStyle = this.borderColor ? this.borderColor : 'white';
+						this._ctx.lineWidth = this.lineWidth;
+						this._ctx.strokeText(this.char, 0, 0, null, null, 0, null);
+					}
+				}
+				if (this.underLine) {
+					this._ctx.lineWidth = 1;
+					this._ctx.strokeStyle = this.fillColor;
+					this._ctx.beginPath();
+					this._ctx.moveTo(0, this.fontSize + 1);
+					var nW = this._ctx.measureText(this.char).width + 1;
+					this._ctx.lineTo(nW, this.fontSize + 1);
+					this._ctx.stroke();
+				}
+				this._ctx.restore();
+			}
+			this.borderSize = this.CborderSize;
+			this.completeCreate();
+		}
+
+		__proto.onresize = function (w, h) {
+			this._w = w;
+			this._h = h;
+			this._allowMerageInAtlas = true;
+		}
+
+		__proto.clearAtlasSource = function () { }
+		/**
+		*是否创建私有Source
+		*@return 是否创建
+		*/
+		__getset(0, __proto, 'allowMerageInAtlas', function () {
+			return this._allowMerageInAtlas;
+		});
+
+		__getset(0, __proto, 'atlasSource', function () {
+			return this.canvas;
+		});
+
+		/**
+		*是否创建私有Source,通常禁止修改
+		*@param value 是否创建
+		*/
+		/**
+		*是否创建私有Source
+		*@return 是否创建
+		*/
+		__getset(0, __proto, 'enableMerageInAtlas', function () {
+			return this._enableMerageInAtlas;
+		}, function (value) {
+			this._enableMerageInAtlas = value;
+		});
+
+		WebGLCharImage.createOneChar = function (content, drawValue) {
+			var char = new WebGLCharImage(content, drawValue);
+			return char;
+		}
+
+		return WebGLCharImage;
+	})(Bitmap)
+
+
+	//class laya.webgl.resource.WebGLRenderTarget extends laya.resource.Bitmap
+	var WebGLRenderTarget = (function (_super) {
+		function WebGLRenderTarget(width, height, surfaceFormat, surfaceType, depthStencilFormat, mipMap, repeat, minFifter, magFifter) {
+			//this._frameBuffer=null;
+			//this._depthStencilBuffer=null;
+			//this._surfaceFormat=0;
+			//this._surfaceType=0;
+			//this._depthStencilFormat=0;
+			//this._mipMap=false;
+			//this._repeat=false;
+			//this._minFifter=0;
+			//this._magFifter=0;
+			(surfaceFormat === void 0) && (surfaceFormat =/*laya.webgl.WebGLContext.RGBA*/0x1908);
+			(surfaceType === void 0) && (surfaceType =/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401);
+			(depthStencilFormat === void 0) && (depthStencilFormat =/*laya.webgl.WebGLContext.DEPTH_STENCIL*/0x84F9);
+			(mipMap === void 0) && (mipMap = false);
+			(repeat === void 0) && (repeat = false);
+			(minFifter === void 0) && (minFifter = -1);
+			(magFifter === void 0) && (magFifter = 1);
+			WebGLRenderTarget.__super.call(this);
+			this._w = width;
+			this._h = height;
+			this._surfaceFormat = surfaceFormat;
+			this._surfaceType = surfaceType;
+			this._depthStencilFormat = depthStencilFormat;
+			this._mipMap = mipMap;
+			this._repeat = repeat;
+			this._minFifter = minFifter;
+			this._magFifter = magFifter;
+		}
+
+		__class(WebGLRenderTarget, 'laya.webgl.resource.WebGLRenderTarget', _super);
+		var __proto = WebGLRenderTarget.prototype;
+		__proto.recreateResource = function () {
+			var gl = WebGL.mainContext;
+			this._frameBuffer || (this._frameBuffer = gl.createFramebuffer());
+			this._source || (this._source = gl.createTexture());
+			var preTarget = WebGLContext.curBindTexTarget;
+			var preTexture = WebGLContext.curBindTexValue;
+			WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, this._source);
+			gl.texImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0,/*laya.webgl.WebGLContext.RGBA*/0x1908, this._w, this._h, 0, this._surfaceFormat, this._surfaceType, null);
+			var minFifter = this._minFifter;
+			var magFifter = this._magFifter;
+			var repeat = this._repeat ? /*laya.webgl.WebGLContext.REPEAT*/0x2901 :/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F;
+			var isPot = Arith.isPOT(this._w, this._h);
+			if (isPot) {
+				if (this._mipMap)
+					(minFifter !== -1) || (minFifter =/*laya.webgl.WebGLContext.LINEAR_MIPMAP_LINEAR*/0x2703);
+				else
+			(minFifter !== -1) || (minFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				(magFifter !== -1) || (magFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MIN_FILTER*/0x2801, minFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MAG_FILTER*/0x2800, magFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_S*/0x2802, repeat);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_T*/0x2803, repeat);
+				this._mipMap && gl.generateMipmap(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1);
+			} else {
+				(minFifter !== -1) || (minFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				(magFifter !== -1) || (magFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MIN_FILTER*/0x2801, minFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MAG_FILTER*/0x2800, magFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_S*/0x2802,/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_T*/0x2803,/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F);
+			}
+			gl.bindFramebuffer(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40, this._frameBuffer);
+			gl.framebufferTexture2D(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40,/*laya.webgl.WebGLContext.COLOR_ATTACHMENT0*/0x8CE0,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, this._source, 0);
+			if (this._depthStencilFormat) {
+				this._depthStencilBuffer || (this._depthStencilBuffer = gl.createRenderbuffer());
+				gl.bindRenderbuffer(/*laya.webgl.WebGLContext.RENDERBUFFER*/0x8D41, this._depthStencilBuffer);
+				gl.renderbufferStorage(/*laya.webgl.WebGLContext.RENDERBUFFER*/0x8D41, this._depthStencilFormat, this._w, this._h);
+				switch (this._depthStencilFormat) {
+					case /*laya.webgl.WebGLContext.DEPTH_COMPONENT16*/0x81A5:
+						gl.framebufferRenderbuffer(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40,/*laya.webgl.WebGLContext.DEPTH_ATTACHMENT*/0x8D00,/*laya.webgl.WebGLContext.RENDERBUFFER*/0x8D41, this._depthStencilBuffer);
+						break;
+					case /*laya.webgl.WebGLContext.STENCIL_INDEX8*/0x8D48:
+						gl.framebufferRenderbuffer(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40,/*laya.webgl.WebGLContext.STENCIL_ATTACHMENT*/0x8D20,/*laya.webgl.WebGLContext.RENDERBUFFER*/0x8D41, this._depthStencilBuffer);
+						break;
+					case /*laya.webgl.WebGLContext.DEPTH_STENCIL*/0x84F9:
+						gl.framebufferRenderbuffer(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40,/*laya.webgl.WebGLContext.DEPTH_STENCIL_ATTACHMENT*/0x821A,/*laya.webgl.WebGLContext.RENDERBUFFER*/0x8D41, this._depthStencilBuffer);
+						break;
+				}
+			}
+			gl.bindFramebuffer(/*laya.webgl.WebGLContext.FRAMEBUFFER*/0x8D40, null);
+			(preTarget && preTexture) && (WebGLContext.bindTexture(gl, preTarget, preTexture));
+			gl.bindRenderbuffer(/*laya.webgl.WebGLContext.RENDERBUFFER*/0x8D41, null);
+			this.memorySize = this._w * this._h * 4;
+			this.completeCreate();
+		}
+
+		__proto.detoryResource = function () {
+			if (this._frameBuffer) {
+				WebGL.mainContext.deleteTexture(this._source);
+				WebGL.mainContext.deleteFramebuffer(this._frameBuffer);
+				WebGL.mainContext.deleteRenderbuffer(this._depthStencilBuffer);
+				this._source = null;
+				this._frameBuffer = null;
+				this._depthStencilBuffer = null;
+				this.memorySize = 0;
+			}
+		}
+
+		__getset(0, __proto, 'depthStencilBuffer', function () {
+			return this._depthStencilBuffer;
+		});
+
+		__getset(0, __proto, 'frameBuffer', function () {
+			return this._frameBuffer;
+		});
+
+		return WebGLRenderTarget;
+	})(Bitmap)
+
+
+	//class laya.webgl.resource.WebGLSubImage extends laya.resource.Bitmap
+	var WebGLSubImage = (function (_super) {
+		function WebGLSubImage(canvas, offsetX, offsetY, width, height, atlasImage, src) {
+			/**HTML Context*/
+			//this._ctx=null;
+			/***是否创建私有Source,值为false时不根据src创建私有WebGLTexture,同时销毁时也只清空source=null,不调用WebGL.mainContext.deleteTexture类似函数，调用资源激活前有效*/
+			//this._allowMerageInAtlas=false;
+			/**是否允许加入大图合集*/
+			//this._enableMerageInAtlas=false;
+			/**HTML Canvas，绘制子图载体,非私有数据载体*/
+			//this.canvas=null;
+			/**是否使用重复模式纹理寻址*/
+			//this.repeat=false;
+			/**是否使用mipLevel*/
+			//this.mipmap=false;
+			/**缩小过滤器*/
+			//this.minFifter=0;
+			/**放大过滤器*/
+			//this.magFifter=0;
+			//动态默认值，判断是否可生成miplevel
+			//this.atlasImage=null;
+			this.offsetX = 0;
+			this.offsetY = 0;
+			//this.src=null;
+			WebGLSubImage.__super.call(this);
+			this.repeat = true;
+			this.mipmap = false;
+			this.minFifter = -1;
+			this.magFifter = -1;
+			this.atlasImage = atlasImage;
+			this.canvas = canvas;
+			this._ctx = canvas.getContext('2d', undefined);
+			this._w = width;
+			this._h = height;
+			this.offsetX = offsetX;
+			this.offsetY = offsetY;
+			this.src = src;
+			this._enableMerageInAtlas = true;
+			(AtlasResourceManager.enabled) && (this._w < AtlasResourceManager.atlasLimitWidth && this._h < AtlasResourceManager.atlasLimitHeight) ? this._allowMerageInAtlas = true : this._allowMerageInAtlas = false;
+		}
+
+		__class(WebGLSubImage, 'laya.webgl.resource.WebGLSubImage', _super);
+		var __proto = WebGLSubImage.prototype;
+		Laya.imps(__proto, { "laya.webgl.resource.IMergeAtlasBitmap": true })
+		/*override public function copyTo(dec:Bitmap):void {
+		var d:WebGLSubImage=dec as WebGLSubImage;
+		super.copyTo(dec);
+		d._ctx=_ctx;
+	}*/
+
+
+		__proto.size = function (w, h) {
+			this._w = w;
+			this._h = h;
+			this._ctx && this._ctx.size(w, h);
+			this.canvas && (this.canvas.height = h, this.canvas.width = w);
+		}
+
+
+		__proto.recreateResource = function () {
+			this.size(this._w, this._h);
+			this._ctx.drawImage(this.atlasImage, this.offsetX, this.offsetY, this._w, this._h, 0, 0, this._w, this._h);
+			(!(this._allowMerageInAtlas && this._enableMerageInAtlas)) ? (this.createWebGlTexture()) : (this.memorySize = 0);
+			this.completeCreate();
+		}
+
+
+		__proto.createWebGlTexture = function () {
+			var gl = WebGL.mainContext;
+			if (!this.canvas) {
+				throw "create GLTextur err:no data:" + this.canvas;
+			};
+
+			var glTex = this._source = gl.createTexture();
+			var preTarget = WebGLContext.curBindTexTarget;
+			var preTexture = WebGLContext.curBindTexValue;
+			WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, glTex);
+			gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_PREMULTIPLY_ALPHA_WEBGL*/0x9241, true);
+			gl.texImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, this.canvas);
+			gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_PREMULTIPLY_ALPHA_WEBGL*/0x9241, false);
+			var minFifter = this.minFifter;
+			var magFifter = this.magFifter;
+			var repeat = this.repeat ? /*laya.webgl.WebGLContext.REPEAT*/0x2901 :/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F;
+			var isPOT = Arith.isPOT(this.width, this.height);
+			if (isPOT) {
+				if (this.mipmap)
+					(minFifter !== -1) || (minFifter =/*laya.webgl.WebGLContext.LINEAR_MIPMAP_LINEAR*/0x2703);
+				else
+		(minFifter !== -1) || (minFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				(magFifter !== -1) || (magFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MAG_FILTER*/0x2800, magFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MIN_FILTER*/0x2801, minFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_S*/0x2802, repeat);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_T*/0x2803, repeat);
+				this.mipmap && gl.generateMipmap(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1);
+			} else {
+				(minFifter !== -1) || (minFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				(magFifter !== -1) || (magFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MIN_FILTER*/0x2801, minFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MAG_FILTER*/0x2800, magFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_S*/0x2802,/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_T*/0x2803,/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F);
+			}
+
+			(preTarget && preTexture) && (WebGLContext.bindTexture(gl, preTarget, preTexture));
+			this.canvas = null;
+			this.memorySize = this._w * this._h * 4;
+		}
+
+
+		__proto.detoryResource = function () {
+			if (!(AtlasResourceManager.enabled && this._allowMerageInAtlas) && this._source) {
+				WebGL.mainContext.deleteTexture(this._source);
+				this._source = null;
+				this.memorySize = 0;
+			}
+
+		}
+
+
+		//}
+		__proto.clearAtlasSource = function () { }
+		/**
+		*是否创建私有Source
+		*@return 是否创建
+		*/
+		__getset(0, __proto, 'allowMerageInAtlas', function () {
+			return this._allowMerageInAtlas;
+		});
+
+
+		//public var createFromPixel:Boolean=true;
+		__getset(0, __proto, 'atlasSource', function () {
+			return this.canvas;
+		});
+
+
+		/**
+		*是否创建私有Source,通常禁止修改
+		*@param value 是否创建
+		*/
+		/**
+		*是否创建私有Source
+		*@return 是否创建
+		*/
+		__getset(0, __proto, 'enableMerageInAtlas', function () {
+			return this._allowMerageInAtlas;
+		}, function (value) {
+
+			this._allowMerageInAtlas = value;
+		});
+
+
+		return WebGLSubImage;
+	})(Bitmap)
+
+
+	//class laya.webgl.shader.Shader extends laya.webgl.shader.BaseShader
+	var Shader = (function (_super) {
+		function Shader(vs, ps, saveName, nameMap) {
+			this.customCompile = false;
+			//this._nameMap=null;
+			//shader参数别名，语义
+			//this._vs=null;
+			//this._ps=null;
+			this._curActTexIndex = 0;
+			//this._reCompile=false;
+			//存储一些私有变量
+			this.tag = {};
+			//this._vshader=null;
+			//this._pshader=null;
+			this._program = null;
+			this._params = null;
+			this._paramsMap = {};
+			this._offset = 0;
+			//this._id=0;
+			Shader.__super.call(this);
+			if ((!vs) || (!ps)) throw "Shader Error";
+			if (Render.isConchApp || Render.isFlash) {
+				this.customCompile = true;
+			}
+			this._id = ++Shader._count;
+			this._vs = vs;
+			this._ps = ps;
+			this._nameMap = nameMap ? nameMap : {};
+			saveName != null && (Shader.sharders[saveName] = this);
+		}
+
+		__class(Shader, 'laya.webgl.shader.Shader', _super);
+		var __proto = Shader.prototype;
+		__proto.recreateResource = function () {
+			this._compile();
+			this.completeCreate();
+			this.memorySize = 0;
+		}
+
+		//忽略尺寸尺寸
+		__proto.detoryResource = function () {
+			WebGL.mainContext.deleteShader(this._vshader);
+			WebGL.mainContext.deleteShader(this._pshader);
+			WebGL.mainContext.deleteProgram(this._program);
+			this._vshader = this._pshader = this._program = null;
+			this._params = null;
+			this._paramsMap = {};
+			this.memorySize = 0;
+			this._curActTexIndex = 0;
+		}
+
+		__proto._compile = function () {
+			if (!this._vs || !this._ps || this._params)
+				return;
+			this._reCompile = true;
+			this._params = [];
+			var text = [this._vs, this._ps];
+			var result;
+			if (this.customCompile)
+				result = ShaderCompile.preGetParams(this._vs, this._ps);
+			var gl = WebGL.mainContext;
+			this._program = gl.createProgram();
+			this._vshader = Shader._createShader(gl, text[0],/*laya.webgl.WebGLContext.VERTEX_SHADER*/0x8B31);
+			this._pshader = Shader._createShader(gl, text[1],/*laya.webgl.WebGLContext.FRAGMENT_SHADER*/0x8B30);
+			gl.attachShader(this._program, this._vshader);
+			gl.attachShader(this._program, this._pshader);
+			gl.linkProgram(this._program);
+			if (!this.customCompile && !gl.getProgramParameter(this._program,/*laya.webgl.WebGLContext.LINK_STATUS*/0x8B82)) {
+				throw gl.getProgramInfoLog(this._program);
+			};
+			var one, i = 0, j = 0, n = 0, location;
+			var attribNum = this.customCompile ? result.attributes.length : gl.getProgramParameter(this._program,/*laya.webgl.WebGLContext.ACTIVE_ATTRIBUTES*/0x8B89);
+			for (i = 0; i < attribNum; i++) {
+				var attrib = this.customCompile ? result.attributes[i] : gl.getActiveAttrib(this._program, i);
+				location = gl.getAttribLocation(this._program, attrib.name);
+				one = { vartype: "attribute", glfun: null, ivartype: 0, attrib: attrib, location: location, name: attrib.name, type: attrib.type, isArray: false, isSame: false, preValue: null, indexOfParams: 0 };
+				this._params.push(one);
+			};
+			var nUniformNum = this.customCompile ? result.uniforms.length : gl.getProgramParameter(this._program,/*laya.webgl.WebGLContext.ACTIVE_UNIFORMS*/0x8B86);
+			for (i = 0; i < nUniformNum; i++) {
+				var uniform = this.customCompile ? result.uniforms[i] : gl.getActiveUniform(this._program, i);
+				location = gl.getUniformLocation(this._program, uniform.name);
+				one = { vartype: "uniform", glfun: null, ivartype: 1, attrib: attrib, location: location, name: uniform.name, type: uniform.type, isArray: false, isSame: false, preValue: null, indexOfParams: 0 };
+				if (one.name.indexOf('[0]') > 0) {
+					one.name = one.name.substr(0, one.name.length - 3);
+					one.isArray = true;
+					one.location = gl.getUniformLocation(this._program, one.name);
+				}
+				this._params.push(one);
+			}
+			for (i = 0, n = this._params.length; i < n; i++) {
+				one = this._params[i];
+				one.indexOfParams = i;
+				one.index = 1;
+				one.value = [one.location, null];
+				one.codename = one.name;
+				one.name = this._nameMap[one.codename] ? this._nameMap[one.codename] : one.codename;
+				this._paramsMap[one.name] = one;
+				one._this = this;
+				one.uploadedValue = [];
+				if (one.vartype === "attribute") {
+					one.fun = this._attribute;
+					continue;
+				}
+				switch (one.type) {
+					case /*laya.webgl.WebGLContext.INT*/0x1404:
+						one.fun = one.isArray ? this._uniform1iv : this._uniform1i;
+						break;
+					case /*laya.webgl.WebGLContext.FLOAT*/0x1406:
+						one.fun = one.isArray ? this._uniform1fv : this._uniform1f;
+						break;
+					case /*laya.webgl.WebGLContext.FLOAT_VEC2*/0x8B50:
+						one.fun = one.isArray ? this._uniform_vec2v : this._uniform_vec2;
+						break;
+					case /*laya.webgl.WebGLContext.FLOAT_VEC3*/0x8B51:
+						one.fun = one.isArray ? this._uniform_vec3v : this._uniform_vec3;
+						break;
+					case /*laya.webgl.WebGLContext.FLOAT_VEC4*/0x8B52:
+						one.fun = one.isArray ? this._uniform_vec4v : this._uniform_vec4;
+						break;
+					case /*laya.webgl.WebGLContext.SAMPLER_2D*/0x8B5E:
+						one.fun = this._uniform_sampler2D;
+						break;
+					case /*laya.webgl.WebGLContext.SAMPLER_CUBE*/0x8B60:
+						one.fun = this._uniform_samplerCube;
+						break;
+					case /*laya.webgl.WebGLContext.FLOAT_MAT4*/0x8B5C:
+						one.glfun = gl.uniformMatrix4fv;
+						one.fun = this._uniformMatrix4fv;
+						break;
+					case /*laya.webgl.WebGLContext.BOOL*/0x8B56:
+						one.fun = this._uniform1i;
+						break;
+					case /*laya.webgl.WebGLContext.FLOAT_MAT2*/0x8B5A:
+					case /*laya.webgl.WebGLContext.FLOAT_MAT3*/0x8B5B:
+						throw new Error("compile shader err!");
+						break;
+					default:
+						throw new Error("compile shader err!");
+						break;
+				}
+			}
+		}
+
+		/**
+		*根据变量名字获得
+		*@param name
+		*@return
+		*/
+		__proto.getUniform = function (name) {
+			return this._paramsMap[name];
+		}
+
+		__proto._attribute = function (one, value) {
+			var gl = WebGL.mainContext;
+			var enableAtributes = Buffer._enableAtributes;
+			var location = one.location;
+			(enableAtributes[location]) || (gl.enableVertexAttribArray(location));
+			gl.vertexAttribPointer(location, value[0], value[1], value[2], value[3], value[4] + this._offset);
+			enableAtributes[location] = Buffer._bindVertexBuffer;
+			return 1;
+		}
+
+		__proto._uniform1f = function (one, value) {
+			var uploadedValue = one.uploadedValue;
+			if (uploadedValue[0] !== value) {
+				WebGL.mainContext.uniform1f(one.location, uploadedValue[0] = value);
+				return 1;
+			}
+			return 0;
+		}
+
+		__proto._uniform1fv = function (one, value) {
+			if (value.length < 4) {
+				var uploadedValue = one.uploadedValue;
+				if (uploadedValue[0] !== value[0] || uploadedValue[1] !== value[1] || uploadedValue[2] !== value[2] || uploadedValue[3] !== value[3]) {
+					WebGL.mainContext.uniform1fv(one.location, value);
+					uploadedValue[0] = value[0];
+					uploadedValue[1] = value[1];
+					uploadedValue[2] = value[2];
+					uploadedValue[3] = value[3];
+					return 1;
+				}
+				return 0;
+			} else {
+				WebGL.mainContext.uniform1fv(one.location, value);
+				return 1;
+			}
+		}
+
+		__proto._uniform_vec2 = function (one, value) {
+			var uploadedValue = one.uploadedValue;
+			if (uploadedValue[0] !== value[0] || uploadedValue[1] !== value[1]) {
+				WebGL.mainContext.uniform2f(one.location, uploadedValue[0] = value[0], uploadedValue[1] = value[1]);
+				return 1;
+			}
+			return 0;
+		}
+
+		__proto._uniform_vec2v = function (one, value) {
+			if (value.length < 2) {
+				var uploadedValue = one.uploadedValue;
+				if (uploadedValue[0] !== value[0] || uploadedValue[1] !== value[1] || uploadedValue[2] !== value[2] || uploadedValue[3] !== value[3]) {
+					WebGL.mainContext.uniform2fv(one.location, value);
+					uploadedValue[0] = value[0];
+					uploadedValue[1] = value[1];
+					uploadedValue[2] = value[2];
+					uploadedValue[3] = value[3];
+					return 1;
+				}
+				return 0;
+			} else {
+				WebGL.mainContext.uniform2fv(one.location, value);
+				return 1;
+			}
+		}
+
+		__proto._uniform_vec3 = function (one, value) {
+			var uploadedValue = one.uploadedValue;
+			if (uploadedValue[0] !== value[0] || uploadedValue[1] !== value[1] || uploadedValue[2] !== value[2]) {
+				WebGL.mainContext.uniform3f(one.location, uploadedValue[0] = value[0], uploadedValue[1] = value[1], uploadedValue[2] = value[2]);
+				return 1;
+			}
+			return 0;
+		}
+
+		__proto._uniform_vec3v = function (one, value) {
+			WebGL.mainContext.uniform3fv(one.location, value);
+			return 1;
+		}
+
+		__proto._uniform_vec4 = function (one, value) {
+			var uploadedValue = one.uploadedValue;
+			if (uploadedValue[0] !== value[0] || uploadedValue[1] !== value[1] || uploadedValue[2] !== value[2] || uploadedValue[3] !== value[3]) {
+				WebGL.mainContext.uniform4f(one.location, uploadedValue[0] = value[0], uploadedValue[1] = value[1], uploadedValue[2] = value[2], uploadedValue[3] = value[3]);
+				return 1;
+			}
+			return 0;
+		}
+
+		__proto._uniform_vec4v = function (one, value) {
+			WebGL.mainContext.uniform4fv(one.location, value);
+			return 1;
+		}
+
+		__proto._uniformMatrix2fv = function (one, value) {
+			WebGL.mainContext.uniformMatrix2fv(one.location, false, value);
+			return 1;
+		}
+
+		__proto._uniformMatrix3fv = function (one, value) {
+			WebGL.mainContext.uniformMatrix3fv(one.location, false, value);
+			return 1;
+		}
+
+		__proto._uniformMatrix4fv = function (one, value) {
+			WebGL.mainContext.uniformMatrix4fv(one.location, false, value);
+			return 1;
+		}
+
+		__proto._uniform1i = function (one, value) {
+			var uploadedValue = one.uploadedValue;
+			if (uploadedValue[0] !== value) {
+				WebGL.mainContext.uniform1i(one.location, uploadedValue[0] = value);
+				return 1;
+			}
+			return 0;
+		}
+
+		__proto._uniform1iv = function (one, value) {
+			WebGL.mainContext.uniform1iv(one.location, value);
+			return 1;
+		}
+
+		__proto._uniform_ivec2 = function (one, value) {
+			var uploadedValue = one.uploadedValue;
+			if (uploadedValue[0] !== value[0] || uploadedValue[1] !== value[1]) {
+				WebGL.mainContext.uniform2i(one.location, uploadedValue[0] = value[0], uploadedValue[1] = value[1]);
+				return 1;
+			}
+			return 0;
+		}
+
+		__proto._uniform_ivec2v = function (one, value) {
+			WebGL.mainContext.uniform2iv(one.location, value);
+			return 1;
+		}
+
+		__proto._uniform_vec3i = function (one, value) {
+			var uploadedValue = one.uploadedValue;
+			if (uploadedValue[0] !== value[0] || uploadedValue[1] !== value[1] || uploadedValue[2] !== value[2]) {
+				WebGL.mainContext.uniform3i(one.location, uploadedValue[0] = value[0], uploadedValue[1] = value[1], uploadedValue[2] = value[2]);
+				return 1;
+			}
+			return 0;
+		}
+
+		__proto._uniform_vec3vi = function (one, value) {
+			WebGL.mainContext.uniform3iv(one.location, value);
+			return 1;
+		}
+
+		__proto._uniform_vec4i = function (one, value) {
+			var uploadedValue = one.uploadedValue;
+			if (uploadedValue[0] !== value[0] || uploadedValue[1] !== value[1] || uploadedValue[2] !== value[2] || uploadedValue[3] !== value[3]) {
+				WebGL.mainContext.uniform4i(one.location, uploadedValue[0] = value[0], uploadedValue[1] = value[1], uploadedValue[2] = value[2], uploadedValue[3] = value[3]);
+				return 1;
+			}
+			return 0;
+		}
+
+		__proto._uniform_vec4vi = function (one, value) {
+			WebGL.mainContext.uniform4iv(one.location, value);
+			return 1;
+		}
+
+		__proto._uniform_sampler2D = function (one, value) {
+			var gl = WebGL.mainContext;
+			var uploadedValue = one.uploadedValue;
+			if (uploadedValue[0] == null) {
+				uploadedValue[0] = this._curActTexIndex;
+				gl.uniform1i(one.location, this._curActTexIndex);
+				gl.activeTexture(Shader._TEXTURES[this._curActTexIndex]);
+				WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, value);
+				this._curActTexIndex++;
+				return 1;
+			} else {
+				gl.activeTexture(Shader._TEXTURES[uploadedValue[0]]);
+				WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, value);
+				return 0;
+			}
+		}
+
+		__proto._uniform_samplerCube = function (one, value) {
+			var gl = WebGL.mainContext;
+			var uploadedValue = one.uploadedValue;
+			if (uploadedValue[0] == null) {
+				uploadedValue[0] = this._curActTexIndex;
+				gl.uniform1i(one.location, this._curActTexIndex);
+				gl.activeTexture(Shader._TEXTURES[this._curActTexIndex]);
+				WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_CUBE_MAP*/0x8513, value);
+				this._curActTexIndex++;
+				return 1;
+			} else {
+				gl.activeTexture(Shader._TEXTURES[uploadedValue[0]]);
+				WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_CUBE_MAP*/0x8513, value);
+				return 0;
+			}
+		}
+
+		__proto._noSetValue = function (one) {
+			console.log("no....:" + one.name);
+		}
+
+		//throw new Error("upload shader err,must set value:"+one.name);
+		__proto.uploadOne = function (name, value) {
+			this.activeResource();
+			WebGLContext.UseProgram(this._program);
+			var one = this._paramsMap[name];
+			one.fun.call(this, one, value);
+		}
+
+		__proto.uploadTexture2D = function (value) {
+			Stat.shaderCall++;
+			var gl = WebGL.mainContext;
+			gl.activeTexture(/*laya.webgl.WebGLContext.TEXTURE0*/0x84C0);
+			WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, value);
+		}
+
+		/**
+		*提交shader到GPU
+		*@param shaderValue
+		*/
+		__proto.upload = function (shaderValue, params) {
+			BaseShader.activeShader = BaseShader.bindShader = this;
+			this._lastUseFrameCount === Stat.loopCount || this.activeResource();
+			WebGLContext.UseProgram(this._program);
+			if (this._reCompile) {
+				params = this._params;
+				this._reCompile = false;
+			} else {
+				params = params || this._params;
+			};
+			var gl = WebGL.mainContext;
+			var one, value, n = params.length, shaderCall = 0;
+			for (var i = 0; i < n; i++) {
+				one = params[i];
+				if ((value = shaderValue[one.name]) !== null)
+					shaderCall += one.fun.call(this, one, value);
+			}
+			Stat.shaderCall += shaderCall;
+		}
+
+		/**
+		*按数组的定义提交
+		*@param shaderValue 数组格式[name,value,...]
+		*/
+		__proto.uploadArray = function (shaderValue, length, _bufferUsage) {
+			BaseShader.activeShader = this;
+			BaseShader.bindShader = this;
+			this.activeResource();
+			WebGLContext.UseProgram(this._program);
+			var params = this._params, value;
+			var one, shaderCall = 0;
+			for (var i = length - 2; i >= 0; i -= 2) {
+				one = this._paramsMap[shaderValue[i]];
+				if (!one)
+					continue;
+				value = shaderValue[i + 1];
+				if (value != null) {
+					_bufferUsage && _bufferUsage[one.name] && _bufferUsage[one.name].bind();
+					shaderCall += one.fun.call(this, one, value);
+				}
+			}
+			Stat.shaderCall += shaderCall;
+		}
+
+		/**
+		*得到编译后的变量及相关预定义
+		*@return
+		*/
+		__proto.getParams = function () {
+			return this._params;
+		}
+
+		Shader.getShader = function (name) {
+			return Shader.sharders[name];
+		}
+
+		Shader.create = function (vs, ps, saveName, nameMap) {
+			return new Shader(vs, ps, saveName, nameMap);
+		}
+
+		Shader.withCompile = function (nameID, define, shaderName, createShader) {
+			if (shaderName && Shader.sharders[shaderName])
+				return Shader.sharders[shaderName];
+			var pre = Shader._preCompileShader[0.0002 * nameID];
+			if (!pre)
+				throw new Error("withCompile shader err!" + nameID);
+			return pre.createShader(define, shaderName, createShader);
+		}
+
+		Shader.withCompile2D = function (nameID, mainID, define, shaderName, createShader) {
+			if (shaderName && Shader.sharders[shaderName])
+				return Shader.sharders[shaderName];
+			var pre = Shader._preCompileShader[0.0002 * nameID + mainID];
+			if (!pre)
+				throw new Error("withCompile shader err!" + nameID + " " + mainID);
+			return pre.createShader(define, shaderName, createShader);
+		}
+
+		Shader.addInclude = function (fileName, txt) {
+			ShaderCompile.addInclude(fileName, txt);
+		}
+
+		Shader.preCompile = function (nameID, vs, ps, nameMap) {
+			var id = 0.0002 * nameID;
+			Shader._preCompileShader[id] = new ShaderCompile(id, vs, ps, nameMap);
+		}
+
+		Shader.preCompile2D = function (nameID, mainID, vs, ps, nameMap) {
+			var id = 0.0002 * nameID + mainID;
+			Shader._preCompileShader[id] = new ShaderCompile(id, vs, ps, nameMap);
+		}
+
+		Shader._createShader = function (gl, str, type) {
+			var shader = gl.createShader(type);
+			gl.shaderSource(shader, str);
+			gl.compileShader(shader);
+			return shader;
+		}
+
+		Shader._count = 0;
+		Shader._preCompileShader = {};
+		Shader.SHADERNAME2ID = 0.0002;
+		__static(Shader,
+			['_TEXTURES', function () { return this._TEXTURES = [ /*laya.webgl.WebGLContext.TEXTURE0*/0x84C0,/*laya.webgl.WebGLContext.TEXTURE1*/0x84C1,/*laya.webgl.WebGLContext.TEXTURE2*/0x84C2,/*laya.webgl.WebGLContext.TEXTURE3*/0x84C3,/*laya.webgl.WebGLContext.TEXTURE4*/0x84C4,/*laya.webgl.WebGLContext.TEXTURE5*/0x84C5,/*laya.webgl.WebGLContext.TEXTURE6*/0x84C6, ,/*laya.webgl.WebGLContext.TEXTURE7*/0x84C7,/*laya.webgl.WebGLContext.TEXTURE8*/0x84C8]; }, 'nameKey', function () { return this.nameKey = new StringKey(); }, 'sharders', function () { return this.sharders = (Shader.sharders = [], Shader.sharders.length = 0x20, Shader.sharders); }
+			]);
+		return Shader;
+	})(BaseShader)
+
+
+	//class laya.webgl.utils.Buffer2D extends laya.webgl.utils.Buffer
+	var Buffer2D = (function (_super) {
+		function Buffer2D() {
+			this._maxsize = 0;
+			this._upload = true;
+			this._uploadSize = 0;
+			Buffer2D.__super.call(this);
+			this.lock = true;
+		}
+
+		__class(Buffer2D, 'laya.webgl.utils.Buffer2D', _super);
+		var __proto = Buffer2D.prototype;
+		__proto._bufferData = function () {
+			this._maxsize = Math.max(this._maxsize, this._byteLength);
+			if (Stat.loopCount % 30 == 0) {
+				if (this._buffer.byteLength > (this._maxsize + 64)) {
+					this.memorySize = this._buffer.byteLength;
+					this._buffer = this._buffer.slice(0, this._maxsize + 64);
+					this._checkArrayUse();
+				}
+				this._maxsize = this._byteLength;
+			}
+			if (this._uploadSize < this._buffer.byteLength) {
+				this._uploadSize = this._buffer.byteLength;
+				Buffer._gl.bufferData(this._bufferType, this._uploadSize, this._bufferUsage);
+				this.memorySize = this._uploadSize;
+			}
+			Buffer._gl.bufferSubData(this._bufferType, 0, this._buffer);
+		}
+
+		__proto._bufferSubData = function (offset, dataStart, dataLength) {
+			(offset === void 0) && (offset = 0);
+			(dataStart === void 0) && (dataStart = 0);
+			(dataLength === void 0) && (dataLength = 0);
+			this._maxsize = Math.max(this._maxsize, this._byteLength);
+			if (Stat.loopCount % 30 == 0) {
+				if (this._buffer.byteLength > (this._maxsize + 64)) {
+					this.memorySize = this._buffer.byteLength;
+					this._buffer = this._buffer.slice(0, this._maxsize + 64);
+					this._checkArrayUse();
+				}
+				this._maxsize = this._byteLength;
+			}
+			if (this._uploadSize < this._buffer.byteLength) {
+				this._uploadSize = this._buffer.byteLength;
+				Buffer._gl.bufferData(this._bufferType, this._uploadSize, this._bufferUsage);
+				this.memorySize = this._uploadSize;
+			}
+			if (dataStart || dataLength) {
+				var subBuffer = this._buffer.slice(dataStart, dataLength);
+				Buffer._gl.bufferSubData(this._bufferType, offset, subBuffer);
+			} else {
+				Buffer._gl.bufferSubData(this._bufferType, offset, this._buffer);
+			}
+		}
+
+		__proto._checkArrayUse = function () { }
+		__proto._bind_upload = function () {
+			if (!this._upload)
+				return false;
+			this._upload = false;
+			this._bind();
+			this._bufferData();
+			return true;
+		}
+
+		__proto._bind_subUpload = function (offset, dataStart, dataLength) {
+			(offset === void 0) && (offset = 0);
+			(dataStart === void 0) && (dataStart = 0);
+			(dataLength === void 0) && (dataLength = 0);
+			if (!this._upload)
+				return false;
+			this._upload = false;
+			this._bind();
+			this._bufferSubData(offset, dataStart, dataLength);
+			return true;
+		}
+
+		__proto._resizeBuffer = function (nsz, copy) {
+			if (nsz < this._buffer.byteLength)
+				return this;
+			this.memorySize = nsz;
+			if (copy && this._buffer && this._buffer.byteLength > 0) {
+				var newbuffer = new ArrayBuffer(nsz);
+				var n = new Uint8Array(newbuffer);
+				n.set(new Uint8Array(this._buffer), 0);
+				this._buffer = newbuffer;
+			} else
+				this._buffer = new ArrayBuffer(nsz);
+			this._checkArrayUse();
+			this._upload = true;
+			return this;
+		}
+
+		__proto.append = function (data) {
+			this._upload = true;
+			var byteLen = 0, n;
+			byteLen = data.byteLength;
+			if ((data instanceof Uint8Array)) {
+				this._resizeBuffer(this._byteLength + byteLen, true);
+				n = new Uint8Array(this._buffer, this._byteLength);
+			} else if ((data instanceof Uint16Array)) {
+				this._resizeBuffer(this._byteLength + byteLen, true);
+				n = new Uint16Array(this._buffer, this._byteLength);
+			} else if ((data instanceof Float32Array)) {
+				this._resizeBuffer(this._byteLength + byteLen, true);
+				n = new Float32Array(this._buffer, this._byteLength);
+			}
+			n.set(data, 0);
+			this._byteLength += byteLen;
+			this._checkArrayUse();
+		}
+
+		__proto.appendEx = function (data, type) {
+			this._upload = true;
+			var byteLen = 0, n;
+			byteLen = data.byteLength;
+			this._resizeBuffer(this._byteLength + byteLen, true);
+			n = new type(this._buffer, this._byteLength);
+			n.set(data, 0);
+			this._byteLength += byteLen;
+			this._checkArrayUse();
+		}
+
+		__proto.appendEx2 = function (data, type, dataLen, perDataLen) {
+			(perDataLen === void 0) && (perDataLen = 1);
+			this._upload = true;
+			var byteLen = 0, n;
+			byteLen = dataLen * perDataLen;
+			this._resizeBuffer(this._byteLength + byteLen, true);
+			n = new type(this._buffer, this._byteLength);
+			var i = 0;
+			for (i = 0; i < dataLen; i++) {
+				n[i] = data[i];
+			}
+			this._byteLength += byteLen;
+			this._checkArrayUse();
+		}
+
+		__proto.getBuffer = function () {
+			return this._buffer;
+		}
+
+		__proto.setNeedUpload = function () {
+			this._upload = true;
+		}
+
+		__proto.getNeedUpload = function () {
+			return this._upload;
+		}
+
+		__proto.upload = function () {
+			var scuess = this._bind_upload();
+			Buffer._gl.bindBuffer(this._bufferType, null);
+			Buffer._bindActive[this._bufferType] = null;
+			BaseShader.activeShader = null
+			return scuess;
+		}
+
+		__proto.subUpload = function (offset, dataStart, dataLength) {
+			(offset === void 0) && (offset = 0);
+			(dataStart === void 0) && (dataStart = 0);
+			(dataLength === void 0) && (dataLength = 0);
+			var scuess = this._bind_subUpload();
+			Buffer._gl.bindBuffer(this._bufferType, null);
+			Buffer._bindActive[this._bufferType] = null;
+			BaseShader.activeShader = null
+			return scuess;
+		}
+
+		__proto.detoryResource = function () {
+			_super.prototype.detoryResource.call(this);
+			this._upload = true;
+			this._uploadSize = 0;
+		}
+
+		__proto.clear = function () {
+			this._byteLength = 0;
+			this._upload = true;
+		}
+
+		__getset(0, __proto, 'bufferLength', function () {
+			return this._buffer.byteLength;
+		});
+
+		__getset(0, __proto, 'byteLength', null, function (value) {
+			if (this._byteLength === value)
+				return;
+			value <= this._buffer.byteLength || (this._resizeBuffer(value * 2 + 256, true));
+			this._byteLength = value;
+		});
+
+		Buffer2D.__int__ = function (gl) {
+			IndexBuffer2D.QuadrangleIB = IndexBuffer2D.create(/*laya.webgl.WebGLContext.STATIC_DRAW*/0x88E4);
+			GlUtils.fillIBQuadrangle(IndexBuffer2D.QuadrangleIB, 16);
+		}
+
+		Buffer2D.FLOAT32 = 4;
+		Buffer2D.SHORT = 2;
+		return Buffer2D;
+	})(Buffer)
+
+
+	//class laya.webgl.shader.d2.value.GlowSV extends laya.webgl.shader.d2.value.TextureSV
+	var GlowSV = (function (_super) {
+		function GlowSV(args) {
+			this.u_blurX = false;
+			this.u_color = null;
+			this.u_offset = null;
+			this.u_strength = NaN;
+			this.u_texW = 0;
+			this.u_texH = 0;
+			GlowSV.__super.call(this,/*laya.webgl.shader.d2.ShaderDefines2D.FILTERGLOW*/0x08 | /*laya.webgl.shader.d2.ShaderDefines2D.TEXTURE2D*/0x01);
+		}
+
+		__class(GlowSV, 'laya.webgl.shader.d2.value.GlowSV', _super);
+		var __proto = GlowSV.prototype;
+		__proto.setValue = function (vo) {
+			_super.prototype.setValue.call(this, vo);
+		}
+
+		__proto.clear = function () {
+			_super.prototype.clear.call(this);
+		}
+
+		return GlowSV;
+	})(TextureSV)
+
+
+	//class laya.webgl.shader.d2.value.TextSV extends laya.webgl.shader.d2.value.TextureSV
+	var TextSV = (function (_super) {
+		function TextSV(args) {
+			TextSV.__super.call(this,/*laya.webgl.shader.d2.ShaderDefines2D.COLORADD*/0x40);
+			this.defines.add(/*laya.webgl.shader.d2.ShaderDefines2D.COLORADD*/0x40);
+		}
+
+		__class(TextSV, 'laya.webgl.shader.d2.value.TextSV', _super);
+		var __proto = TextSV.prototype;
+		__proto.release = function () {
+			TextSV.pool[TextSV._length++] = this;
+			this.clear();
+		}
+
+		__proto.clear = function () {
+			_super.prototype.clear.call(this);
+		}
+
+		TextSV.create = function () {
+			if (TextSV._length) return TextSV.pool[--TextSV._length];
+			else return new TextSV(null);
+		}
+
+		TextSV.pool = [];
+		TextSV._length = 0;
+		return TextSV;
+	})(TextureSV)
+
+
+	//class laya.webgl.shader.d2.Shader2X extends laya.webgl.shader.Shader
+	var Shader2X = (function (_super) {
+		function Shader2X(vs, ps, saveName, nameMap) {
+			this._params2dQuick1 = null;
+			this._params2dQuick2 = null;
+			this._shaderValueWidth = NaN;
+			this._shaderValueHeight = NaN;
+			Shader2X.__super.call(this, vs, ps, saveName, nameMap);
+		}
+
+		__class(Shader2X, 'laya.webgl.shader.d2.Shader2X', _super);
+		var __proto = Shader2X.prototype;
+		__proto.upload2dQuick1 = function (shaderValue) {
+			this.upload(shaderValue, this._params2dQuick1 || this._make2dQuick1());
+		}
+
+		__proto._make2dQuick1 = function () {
+			if (!this._params2dQuick1) {
+				this.activeResource();
+				this._params2dQuick1 = [];
+				var params = this._params, one;
+				for (var i = 0, n = params.length; i < n; i++) {
+					one = params[i];
+					if (!Render.isFlash && (one.name === "size" || one.name === "position" || one.name === "texcoord")) continue;
+					this._params2dQuick1.push(one);
+				}
+			}
+			return this._params2dQuick1;
+		}
+
+		__proto.detoryResource = function () {
+			_super.prototype.detoryResource.call(this);
+			this._params2dQuick1 = null;
+			this._params2dQuick2 = null;
+		}
+
+		__proto.upload2dQuick2 = function (shaderValue) {
+			this.upload(shaderValue, this._params2dQuick2 || this._make2dQuick2());
+		}
+
+		__proto._make2dQuick2 = function () {
+			if (!this._params2dQuick2) {
+				this.activeResource();
+				this._params2dQuick2 = [];
+				var params = this._params, one;
+				for (var i = 0, n = params.length; i < n; i++) {
+					one = params[i];
+					if (!Render.isFlash && (one.name === "size")) continue;
+					this._params2dQuick2.push(one);
+				}
+			}
+			return this._params2dQuick2;
+		}
+
+		Shader2X.create = function (vs, ps, saveName, nameMap) {
+			return new Shader2X(vs, ps, saveName, nameMap);
+		}
+
+		return Shader2X;
+	})(Shader)
+
+
+	//class laya.webgl.utils.IndexBuffer2D extends laya.webgl.utils.Buffer2D
+	var IndexBuffer2D = (function (_super) {
+		function IndexBuffer2D(bufferUsage) {
+			this._uint8Array = null;
+			this._uint16Array = null;
+			(bufferUsage === void 0) && (bufferUsage =/*laya.webgl.WebGLContext.STATIC_DRAW*/0x88E4);
+			IndexBuffer2D.__super.call(this);
+			this._bufferUsage = bufferUsage;
+			this._bufferType =/*laya.webgl.WebGLContext.ELEMENT_ARRAY_BUFFER*/0x8893;
+			Render.isFlash || (this._buffer = new ArrayBuffer(8));
+		}
+
+		__class(IndexBuffer2D, 'laya.webgl.utils.IndexBuffer2D', _super);
+		var __proto = IndexBuffer2D.prototype;
+		__proto._checkArrayUse = function () {
+			this._uint8Array && (this._uint8Array = new Uint8Array(this._buffer));
+			this._uint16Array && (this._uint16Array = new Uint16Array(this._buffer));
+		}
+
+		__proto.getUint8Array = function () {
+			return this._uint8Array || (this._uint8Array = new Uint8Array(this._buffer));
+		}
+
+		__proto.getUint16Array = function () {
+			return this._uint16Array || (this._uint16Array = new Uint16Array(this._buffer));
+		}
+
+		__proto.destory = function () {
+			this._uint16Array = null;
+			this._uint8Array = null;
+			this._buffer = null;
+		}
+
+		IndexBuffer2D.QuadrangleIB = null;
+		IndexBuffer2D.create = function (bufferUsage) {
+			(bufferUsage === void 0) && (bufferUsage =/*laya.webgl.WebGLContext.STATIC_DRAW*/0x88E4);
+			return new IndexBuffer2D(bufferUsage);
+		}
+
+		return IndexBuffer2D;
+	})(Buffer2D)
+
+
+	//class laya.webgl.utils.VertexBuffer2D extends laya.webgl.utils.Buffer2D
+	var VertexBuffer2D = (function (_super) {
+		function VertexBuffer2D(vertexStride, bufferUsage) {
+			this._floatArray32 = null;
+			this._vertexStride = 0;
+			VertexBuffer2D.__super.call(this);
+			this._vertexStride = vertexStride;
+			this._bufferUsage = bufferUsage;
+			this._bufferType =/*laya.webgl.WebGLContext.ARRAY_BUFFER*/0x8892;
+			Render.isFlash || (this._buffer = new ArrayBuffer(8));
+			this.getFloat32Array();
+		}
+
+		__class(VertexBuffer2D, 'laya.webgl.utils.VertexBuffer2D', _super);
+		var __proto = VertexBuffer2D.prototype;
+		__proto.getFloat32Array = function () {
+			return this._floatArray32 || (this._floatArray32 = new Float32Array(this._buffer));
+		}
+
+		__proto.bind = function (ibBuffer) {
+			(ibBuffer) && (ibBuffer._bind());
+			this._bind();
+		}
+
+		__proto.insertData = function (data, pos) {
+			var vbdata = this.getFloat32Array();
+			vbdata.set(data, pos);
+			this._upload = true;
+		}
+
+		__proto.bind_upload = function (ibBuffer) {
+			(ibBuffer._bind_upload()) || (ibBuffer._bind());
+			(this._bind_upload()) || (this._bind());
+		}
+
+		__proto._checkArrayUse = function () {
+			this._floatArray32 && (this._floatArray32 = new Float32Array(this._buffer));
+		}
+
+		__proto.detoryResource = function () {
+			_super.prototype.detoryResource.call(this);
+			var enableAtributes = Buffer._enableAtributes;
+			for (var i = 0; i < 10; i++) {
+				WebGL.mainContext.disableVertexAttribArray(i);
+				enableAtributes[i] = null;
+			}
+		}
+
+		//}
+		__proto.destory = function () {
+			this._byteLength = 0;
+			this._upload = true;
+			this._buffer = null;
+			this._floatArray32 = null;
+		}
+
+		__getset(0, __proto, 'vertexStride', function () {
+			return this._vertexStride;
+		});
+
+		VertexBuffer2D.create = function (vertexStride, bufferUsage) {
+			(bufferUsage === void 0) && (bufferUsage =/*laya.webgl.WebGLContext.DYNAMIC_DRAW*/0x88E8);
+			return new VertexBuffer2D(vertexStride, bufferUsage);
+		}
+
+		return VertexBuffer2D;
+	})(Buffer2D)
+
+
+	//class laya.webgl.resource.WebGLImage extends laya.resource.HTMLImage
+	var WebGLImage = (function (_super) {
+		function WebGLImage(data, def, format, mipmap) {
+			/**@private */
+			this._format = 0;
+			/**@private */
+			this._mipmap = false;
+			/***是否创建私有Source,值为false时不根据src创建私有WebGLTexture,同时销毁时也只清空source=null,不调用WebGL.mainContext.deleteTexture类似函数，调用资源激活前有效*/
+			this._allowMerageInAtlas = false;
+			/**是否允许加入大图合集*/
+			this._enableMerageInAtlas = false;
+			/**是否使用重复模式纹理寻址*/
+			this.repeat = false;
+			/**@private */
+			this._image = null;
+			/**缩小过滤器*/
+			this.minFifter = 0;
+			/**放大过滤器*/
+			this.magFifter = 0;
+			(format === void 0) && (format =/*laya.webgl.WebGLContext.RGBA*/0x1908);
+			(mipmap === void 0) && (mipmap = true);
+			WebGLImage.__super.call(this, data, def);
+			this._format = format;
+			this._mipmap = mipmap;
+			this.repeat = false;
+			this.minFifter = -1;
+			this.magFifter = -1;
+			if ((typeof data == 'string')) {
+				this.url = data;
+				this._src = data;
+				this._image = new Browser.window.Image();
+				if (def) {
+					def.onload && (this.onload = def.onload);
+					def.onerror && (this.onerror = def.onerror);
+					def.onCreate && def.onCreate(this);
+				}
+				this._image.crossOrigin = (data && (data.indexOf("data:") == 0)) ? null : "";
+				(data) && (this._image.src = data);
+			} else if ((data instanceof ArrayBuffer)) {
+				this._src = def;
+				this.url = this._src;
+				var readData = new Byte(data);
+				var magicNumber = readData.readUTFBytes(4);
+				var version = readData.readUTFBytes(2);
+				var dataType = readData.getInt16();
+				readData.endian =/*laya.utils.Byte.BIG_ENDIAN*/"bigEndian";
+				this._w = readData.getInt16();
+				this._h = readData.getInt16();
+				var originalWidth = readData.getInt16();
+				var originalHeight = readData.getInt16();
+				this._image = new Uint8Array(data, readData.pos);
+				this._format = WebGL.compressEtc1.COMPRESSED_RGB_ETC1_WEBGL;
+				(AtlasResourceManager.enabled) && (this._w < AtlasResourceManager.atlasLimitWidth && this._h < AtlasResourceManager.atlasLimitHeight) ? this._allowMerageInAtlas = true : this._allowMerageInAtlas = false;
+			} else {
+				this._src = def;
+				this.url = this._src;
+				this._image = data["source"] || data;
+				this.onresize();
+			}
+			this._$5__enableMerageInAtlas = true;
+		}
+
+		__class(WebGLImage, 'laya.webgl.resource.WebGLImage', _super);
+		var __proto = WebGLImage.prototype;
+		Laya.imps(__proto, { "laya.webgl.resource.IMergeAtlasBitmap": true })
+		__proto._init_ = function (src, def) { }
+		__proto._createWebGlTexture = function () {
+			if (!this._image) {
+				throw "create GLTextur err:no data:" + this._image;
+			};
+			var gl = WebGL.mainContext;
+			var glTex = this._source = gl.createTexture();
+			var preTarget = WebGLContext.curBindTexTarget;
+			var preTexture = WebGLContext.curBindTexValue;
+			WebGLContext.bindTexture(gl,/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, glTex);
+			gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_PREMULTIPLY_ALPHA_WEBGL*/0x9241, true);
+			switch (this._format) {
+				case /*laya.webgl.WebGLContext.RGBA*/0x1908:
+					gl.texImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0, this._format,/*laya.webgl.WebGLContext.RGBA*/0x1908,/*laya.webgl.WebGLContext.UNSIGNED_BYTE*/0x1401, this._image);
+					break;
+				case WebGL.compressEtc1.COMPRESSED_RGB_ETC1_WEBGL:
+					gl.compressedTexImage2D(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1, 0, this._format, this._w, this._h, 0, this._image);
+					break;
+			}
+			gl.pixelStorei(/*laya.webgl.WebGLContext.UNPACK_PREMULTIPLY_ALPHA_WEBGL*/0x9241, false);
+			var minFifter = this.minFifter;
+			var magFifter = this.magFifter;
+			var repeat = this.repeat ? /*laya.webgl.WebGLContext.REPEAT*/0x2901 :/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F;
+			var isPot = Arith.isPOT(this._w, this._h);
+			if (isPot) {
+				if (this.mipmap)
+					(minFifter !== -1) || (minFifter =/*laya.webgl.WebGLContext.LINEAR_MIPMAP_LINEAR*/0x2703);
+				else
+			(minFifter !== -1) || (minFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				(magFifter !== -1) || (magFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MIN_FILTER*/0x2801, minFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MAG_FILTER*/0x2800, magFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_S*/0x2802, repeat);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_T*/0x2803, repeat);
+				this.mipmap && gl.generateMipmap(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1);
+			} else {
+				(minFifter !== -1) || (minFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				(magFifter !== -1) || (magFifter =/*laya.webgl.WebGLContext.LINEAR*/0x2601);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MIN_FILTER*/0x2801, minFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_MAG_FILTER*/0x2800, magFifter);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_S*/0x2802,/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F);
+				gl.texParameteri(/*laya.webgl.WebGLContext.TEXTURE_2D*/0x0DE1,/*laya.webgl.WebGLContext.TEXTURE_WRAP_T*/0x2803,/*laya.webgl.WebGLContext.CLAMP_TO_EDGE*/0x812F);
+			}
+			(preTarget && preTexture) && (WebGLContext.bindTexture(gl, preTarget, preTexture));
+			this._image.onload = null;
+			this._image = null;
+			if (isPot)
+				this.memorySize = this._w * this._h * 4 * (1 + 1 / 3);
+			else
+				this.memorySize = this._w * this._h * 4;
+			this._recreateLock = false;
+		}
+
+		/***重新创建资源，如果异步创建中被强制释放再创建，则需等待释放完成后再重新加载创建。*/
+		__proto.recreateResource = function () {
+			var _$this = this;
+			if (this._src == null || this._src === "")
+				return;
+			this._needReleaseAgain = false;
+			if (!this._image) {
+				this._recreateLock = true;
+				var _this = this;
+				this._image = new Browser.window.Image();
+				this._image.crossOrigin = this._src.indexOf("data:") == 0 ? null : "";
+				this._image.onload = function () {
+					if (_this._needReleaseAgain) {
+						_this._needReleaseAgain = false;
+						_this._image.onload = null;
+						_this._image = null;
+						return;
+					}
+					(!(_this._allowMerageInAtlas && _this._enableMerageInAtlas)) ? (_this._createWebGlTexture()) : (_$this.memorySize = 0, _$this._recreateLock = false);
+					_this.completeCreate();
+				};
+				this._image.src = this._src;
+			} else {
+				if (this._recreateLock) {
+					return;
+				}
+				(!(this._allowMerageInAtlas && this._$5__enableMerageInAtlas)) ? (this._createWebGlTexture()) : (this.memorySize = 0, this._recreateLock = false);
+				this.completeCreate();
+			}
+		}
+
+		/***销毁资源*/
+		__proto.detoryResource = function () {
+			if (this._recreateLock) {
+				this._needReleaseAgain = true;
+			}
+			if (this._source) {
+				WebGL.mainContext.deleteTexture(this._source);
+				this._source = null;
+				this._image = null;
+				this.memorySize = 0;
+			}
+		}
+
+		/***调整尺寸*/
+		__proto.onresize = function () {
+			this._w = this._image.width;
+			this._h = this._image.height;
+			(AtlasResourceManager.enabled) && (this._w < AtlasResourceManager.atlasLimitWidth && this._h < AtlasResourceManager.atlasLimitHeight) ? this._allowMerageInAtlas = true : this._allowMerageInAtlas = false;
+		}
+
+		__proto.clearAtlasSource = function () {
+			this._image = null;
+		}
+
+		/**
+		*获取纹理格式。
+		*/
+		__getset(0, __proto, 'format', function () {
+			return this._format;
+		});
+
+		/**
+		*是否创建私有Source,通常禁止修改
+		*@param value 是否创建
+		*/
+		/**
+		*是否创建私有Source
+		*@return 是否创建
+		*/
+		__getset(0, __proto, 'enableMerageInAtlas', function () {
+			return this._$5__enableMerageInAtlas;
+		}, function (value) {
+			this._$5__enableMerageInAtlas = value;
+		});
+
+		/**
+		*获取是否具有mipmap。
+		*/
+		__getset(0, __proto, 'mipmap', function () {
+			return this._mipmap;
+		});
+
+		/**
+		*是否创建私有Source
+		*@return 是否创建
+		*/
+		__getset(0, __proto, 'allowMerageInAtlas', function () {
+			return this._allowMerageInAtlas;
+		});
+
+		__getset(0, __proto, 'atlasSource', function () {
+			return this._image;
+		});
+
+		/***
+		*设置onload函数
+		*@param value onload函数
+		*/
+		__getset(0, __proto, 'onload', null, function (value) {
+			var _$this = this;
+			this._onload = value;
+			this._image && (this._image.onload = this._onload != null ? (function () {
+				_$this.onresize();
+				_$this._onload();
+			}) : null);
+		});
+
+		/***
+		*设置onerror函数
+		*@param value onerror函数
+		*/
+		__getset(0, __proto, 'onerror', null, function (value) {
+			var _$this = this;
+			this._onerror = value;
+			this._image && (this._image.onerror = this._onerror != null ? (function () {
+				_$this._onerror()
+			}) : null);
+		});
+
+		return WebGLImage;
+	})(HTMLImage)
+
+
+	Laya.__init([DrawText, AtlasGrid, WebGLContext2D, ShaderCompile]);
+})(window, document, Laya);
+
+if (typeof define === 'function' && define.amd) {
+	define('laya.core', ['require', "exports"], function (require, exports) {
+		'use strict';
+		Object.defineProperty(exports, '__esModule', { value: true });
+		for (var i in Laya) {
+			var o = Laya[i];
+			o && o.__isclass && (exports[i] = o);
+		}
+	});
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/autoLoader.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/autoLoader.js
new file mode 100644
index 0000000..513f852
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/autoLoader.js
@@ -0,0 +1,41 @@
+import { Parser } from '../parser'
+import { Player } from './player'
+
+export class AutoLoader {
+
+    static sharedParser = new Parser();
+
+    static autoload = (element, customParser) => {
+        if (typeof window === "undefined" || typeof document === "undefined") {
+            return;
+        }
+        let parser = customParser || AutoLoader.sharedParser;
+        if (element) {
+            if ((element.tagName === "CANVAS" || element.tagName === "DIV") && element.attributes.src && element.attributes.src.value.indexOf(".svga") === element.attributes.src.value.length - 5) {
+                let src = element.attributes.src.value;
+                let player = new Player(element);
+                parser.load(src, (videoItem) => {
+                    if (element.attributes.loops) {
+                        let loops = parseFloat(element.attributes.loops.value) || 0;
+                        player.loops = loops;
+                    }
+                    if (element.attributes.clearsAfterStop) {
+                        let clearsAfterStop = !(element.attributes.clearsAfterStop.value === "false")
+                        player.clearsAfterStop = clearsAfterStop;
+                    }
+                    player.setVideoItem(videoItem);
+                    player.startAnimation();
+                });
+                element.player = player;
+            }
+        }
+        else {
+            var elements = document.querySelectorAll('[src$=".svga"]');
+            for (var index = 0; index < elements.length; index++) {
+                var element = elements[index];
+                AutoLoader.autoload(element);
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/index.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/index.js
new file mode 100644
index 0000000..38e7214
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/index.js
@@ -0,0 +1,11 @@
+import { Parser } from '../parser'
+import { Player } from './player'
+import { AutoLoader } from './autoLoader'
+
+module.exports = {
+    Parser,
+    Player,
+    autoload: AutoLoader.autoload,
+}
+
+AutoLoader.autoload();
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/player.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/player.js
new file mode 100644
index 0000000..eaa83df
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/player.js
@@ -0,0 +1,305 @@
+'use strict';
+
+import { Renderer } from './renderer'
+const ValueAnimator = require("value-animator")
+
+export class Player {
+
+    loops = 0;
+    clearsAfterStop = true;
+    fillMode = "Forward";
+
+    constructor(container) {
+        this._container = typeof container === "string" ? document.querySelector(container) : container;
+        this._asChild = container === undefined
+        this._init();
+    }
+
+    setVideoItem(videoItem) {
+        this._currentFrame = 0;
+        this._videoItem = videoItem;
+        this._renderer.prepare();
+        this.clear();
+        this._update();
+    }
+
+    setContentMode(contentMode) {
+        this._contentMode = contentMode;
+        this._update();
+    }
+
+    setClipsToBounds(clipsToBounds) {
+        if (this._container instanceof HTMLDivElement) {
+            this._container.style.overflowX = this._container.style.overflowY = clipsToBounds ? "hidden" : undefined;
+        }
+    }
+
+    startAnimation(reverse) {
+        this.stopAnimation(false);
+        this._doStart(undefined, reverse, undefined);
+    }
+
+    startAnimationWithRange(range, reverse) {
+        this.stopAnimation(false);
+        this._doStart(range, reverse, undefined)
+    }
+
+    pauseAnimation() {
+        this.stopAnimation(false);
+    }
+
+    stopAnimation(clear) {
+        this._forwardAnimating = false
+        if (this._animator !== undefined) {
+            this._animator.stop()
+        }
+        if (clear === undefined) {
+            clear = this.clearsAfterStop;
+        }
+        if (clear) {
+            this.clear();
+        }
+    }
+
+    clear() {
+        this._renderer.clear();
+        this._renderer.clearAudios();
+    }
+
+    stepToFrame(frame, andPlay) {
+        if (frame >= this._videoItem.frames || frame < 0) {
+            return;
+        }
+        this.pauseAnimation();
+        this._currentFrame = frame;
+        this._update();
+        if (andPlay) {
+            this._doStart(undefined, false, this._currentFrame)
+        }
+    }
+
+    stepToPercentage(percentage, andPlay) {
+        let frame = parseInt(percentage * this._videoItem.frames);
+        if (frame >= this._videoItem.frames && frame > 0) {
+            frame = this._videoItem.frames - 1;
+        }
+        this.stepToFrame(frame, andPlay);
+    }
+
+    setImage(urlORbase64, forKey, transform) {
+        this._dynamicImage[forKey] = urlORbase64;
+        if (transform !== undefined && transform instanceof Array && transform.length == 6) {
+            this._dynamicImageTransform[forKey] = transform;
+        }
+    }
+
+    setText(textORMap, forKey) {
+        let text = typeof textORMap === "string" ? textORMap : textORMap.text;
+        let size = (typeof textORMap === "object" ? textORMap.size : "14px") || "14px";
+        let family = (typeof textORMap === "object" ? textORMap.family : "Arial") || "Arial";
+        let color = (typeof textORMap === "object" ? textORMap.color : "#000000") || "#000000";
+        let offset = (typeof textORMap === "object" ? textORMap.offset : { x: 0.0, y: 0.0 }) || { x: 0.0, y: 0.0 };
+        this._dynamicText[forKey] = {
+            text,
+            style: `${size} ${family}`,
+            color,
+            offset,
+        };
+    }
+
+    clearDynamicObjects() {
+        this._dynamicImage = {};
+        this._dynamicImageTransform = {};
+        this._dynamicText = {};
+    }
+
+    onFinished(callback) {
+        this._onFinished = callback;
+    }
+
+    onFrame(callback) {
+        this._onFrame = callback;
+    }
+
+    onPercentage(callback) {
+        this._onPercentage = callback;
+    }
+
+    drawOnContext(ctx, x, y, width, height) {
+        if (this._drawingCanvas && this._videoItem) {
+            ctx.drawImage(this._drawingCanvas, x, y, width || this._videoItem.videoSize.width, height || this._videoItem.videoSize.height);
+        }
+    }
+
+    /**
+     * Private methods & properties
+     */
+
+    _asChild = false;
+    _container = undefined;
+    _renderer = undefined;
+    _animator = undefined;
+    _drawingCanvas = undefined;
+    _contentMode = "AspectFit"
+    _videoItem = undefined;
+    _forwardAnimating = false;
+    _currentFrame = 0;
+    _dynamicImage = {};
+    _dynamicImageTransform = {};
+    _dynamicText = {};
+    _onFinished = undefined;
+    _onFrame = undefined;
+    _onPercentage = undefined;
+
+    _init() {
+        if (this._container instanceof HTMLDivElement || this._asChild) {
+            if (this._container) {
+                const existedCanvasElements = this._container.querySelectorAll('canvas');
+                for (let index = 0; index < existedCanvasElements.length; index++) {
+                    let element = existedCanvasElements[index];
+                    if (element !== undefined && element.__isPlayer) {
+                        this._container.removeChild(element);
+                    }
+                }
+            }
+            this._drawingCanvas = document.createElement('canvas');
+            this._drawingCanvas.__isPlayer = true
+            this._drawingCanvas.style.backgroundColor = "transparent"
+            if (this._container) {
+                this._container.appendChild(this._drawingCanvas);
+                this._container.style.textAlign = "left";
+            }
+        }
+        this._renderer = new Renderer(this);
+    }
+
+    _doStart(range, reverse, fromFrame) {
+        this._animator = new ValueAnimator()
+        if (range !== undefined) {
+            this._animator.startValue = Math.max(0, range.location)
+            this._animator.endValue = Math.min(this._videoItem.frames - 1, range.location + range.length)
+            this._animator.duration = (this._animator.endValue - this._animator.startValue + 1) * (1.0 / this._videoItem.FPS) * 1000
+        }
+        else {
+            this._animator.startValue = 0
+            this._animator.endValue = this._videoItem.frames - 1
+            this._animator.duration = this._videoItem.frames * (1.0 / this._videoItem.FPS) * 1000
+        }
+        this._animator.loops = this.loops <= 0 ? Infinity : this.loops
+        this._animator.fillRule = this.fillMode === "Backward" ? 1 : 0
+        this._animator.onUpdate = (value) => {
+            if (this._currentFrame === Math.floor(value)) {
+                return;
+            }
+            if (this._forwardAnimating && this._currentFrame > Math.floor(value)) {
+                this._renderer.clearAudios()
+            }
+            this._currentFrame = Math.floor(value)
+            this._update()
+            if (typeof this._onFrame === "function") {
+                this._onFrame(this._currentFrame);
+            }
+            if (typeof this._onPercentage === "function") {
+                this._onPercentage(parseFloat(this._currentFrame + 1) / parseFloat(this._videoItem.frames));
+            }
+        }
+        this._animator.onEnd = () => {
+            this._forwardAnimating = false
+            if (this.clearsAfterStop === true) {
+                this.clear()
+            }
+            if (typeof this._onFinished === "function") {
+                this._onFinished();
+            }
+        }
+        if (reverse === true) {
+            this._animator.reverse(fromFrame)
+            this._forwardAnimating = false
+        }
+        else {
+            this._animator.start(fromFrame)
+            this._forwardAnimating = true
+        }
+        this._currentFrame = this._animator.startValue
+        this._update()
+    }
+
+    _resize() {
+        let asParent = false;
+        if (this._drawingCanvas) {
+            let scaleX = 1.0; let scaleY = 1.0; let translateX = 0.0; let translateY = 0.0;
+            let targetSize;
+            if (this._drawingCanvas.parentNode) {
+                targetSize = { width: this._drawingCanvas.parentNode.clientWidth, height: this._drawingCanvas.parentNode.clientHeight };
+            }
+            else {
+                targetSize = this._videoItem.videoSize;
+            }
+            let imageSize = this._videoItem.videoSize;
+            if (targetSize.width >= imageSize.width && targetSize.height >= imageSize.height) {
+                this._drawingCanvas.width = targetSize.width;
+                this._drawingCanvas.height = targetSize.height;
+                this._drawingCanvas.style.webkitTransform = this._drawingCanvas.style.transform = "";
+                asParent = true;
+            }
+            else {
+                this._drawingCanvas.width = imageSize.width;
+                this._drawingCanvas.height = imageSize.height;
+                if (this._contentMode === "Fill") {
+                    const scaleX = targetSize.width / imageSize.width;
+                    const scaleY = targetSize.height / imageSize.height;
+                    const translateX = (imageSize.width * scaleX - imageSize.width) / 2.0
+                    const translateY = (imageSize.height * scaleY - imageSize.height) / 2.0
+                    this._drawingCanvas.style.webkitTransform = this._drawingCanvas.style.transform = "matrix(" + scaleX + ", 0.0, 0.0, " + scaleY + ", " + translateX + ", " + translateY + ")"
+                }
+                else if (this._contentMode === "AspectFit" || this._contentMode === "AspectFill") {
+                    const imageRatio = imageSize.width / imageSize.height;
+                    const viewRatio = targetSize.width / targetSize.height;
+                    if ((imageRatio >= viewRatio && this._contentMode === "AspectFit") || (imageRatio <= viewRatio && this._contentMode === "AspectFill")) {
+                        const scale = targetSize.width / imageSize.width;
+                        const translateX = (imageSize.width * scale - imageSize.width) / 2.0
+                        const translateY = (imageSize.height * scale - imageSize.height) / 2.0 + (targetSize.height - imageSize.height * scale) / 2.0
+                        this._drawingCanvas.style.webkitTransform = this._drawingCanvas.style.transform = "matrix(" + scale + ", 0.0, 0.0, " + scale + ", " + translateX + ", " + translateY + ")"
+                    }
+                    else if ((imageRatio < viewRatio && this._contentMode === "AspectFit") || (imageRatio > viewRatio && this._contentMode === "AspectFill")) {
+                        const scale = targetSize.height / imageSize.height;
+                        const translateX = (imageSize.width * scale - imageSize.width) / 2.0 + (targetSize.width - imageSize.width * scale) / 2.0
+                        const translateY = (imageSize.height * scale - imageSize.height) / 2.0
+                        this._drawingCanvas.style.webkitTransform = this._drawingCanvas.style.transform = "matrix(" + scale + ", 0.0, 0.0, " + scale + ", " + translateX + ", " + translateY + ")"
+                    }
+                }
+                this._globalTransform = undefined;
+            }
+        }
+        if (this._drawingCanvas === undefined || asParent === true) {
+            let scaleX = 1.0; let scaleY = 1.0; let translateX = 0.0; let translateY = 0.0;
+            let targetSize = { width: this._container !== undefined ? this._container.clientWidth : 0.0, height: this._container !== undefined ? this._container.clientHeight : 0.0 };
+            let imageSize = this._videoItem.videoSize;
+            if (this._contentMode === "Fill") {
+                scaleX = targetSize.width / imageSize.width;
+                scaleY = targetSize.height / imageSize.height;
+            }
+            else if (this._contentMode === "AspectFit" || this._contentMode === "AspectFill") {
+                const imageRatio = imageSize.width / imageSize.height;
+                const viewRatio = targetSize.width / targetSize.height;
+                if ((imageRatio >= viewRatio && this._contentMode === "AspectFit") || (imageRatio <= viewRatio && this._contentMode === "AspectFill")) {
+                    scaleX = scaleY = targetSize.width / imageSize.width;
+                    translateY = (targetSize.height - imageSize.height * scaleY) / 2.0
+                }
+                else if ((imageRatio < viewRatio && this._contentMode === "AspectFit") || (imageRatio > viewRatio && this._contentMode === "AspectFill")) {
+                    scaleX = scaleY = targetSize.height / imageSize.height;
+                    translateX = (targetSize.width - imageSize.width * scaleX) / 2.0
+                }
+            }
+            this._globalTransform = { a: scaleX, b: 0.0, c: 0.0, d: scaleY, tx: translateX, ty: translateY };
+        }
+    }
+
+    _update() {
+        if (this._videoItem === undefined) { return; }
+        this._resize();
+        this._renderer.drawFrame(this._currentFrame);
+        this._renderer.playAudio(this._currentFrame);
+    }
+
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/renderer.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/renderer.js
new file mode 100644
index 0000000..c37cae5
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/Canvas/renderer.js
@@ -0,0 +1,504 @@
+import { BezierPath } from '../bezierPath'
+import { EllipsePath } from '../ellipsePath'
+import { RectPath } from '../rectPath'
+
+const validMethods = 'MLHVCSQRZmlhvcsqrz'
+
+export class Renderer {
+
+    _owner = undefined;
+    _prepared = false;
+    _undrawFrame = undefined;
+    _bitmapCache = undefined;
+    _soundsQueue = [];
+
+    constructor(owner) {
+        this._owner = owner;
+    }
+
+    dataURLtoBlob(dataurl) {
+        var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
+            bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
+        while (n--) {
+            u8arr[n] = bstr.charCodeAt(n);
+        }
+        return new Blob([u8arr], { type: mime });
+    }
+
+    prepare() {
+        this._prepared = false;
+        this._bitmapCache = undefined;
+        if (this._owner._videoItem.images === undefined || Object.keys(this._owner._videoItem.images).length == 0) {
+            this._bitmapCache = {};
+            this._prepared = true;
+            return;
+        }
+        if (this._bitmapCache === undefined) {
+            this._bitmapCache = {};
+            let totalCount = 0
+            let loadedCount = 0
+            for (var imageKey in this._owner._videoItem.images) {
+                let src = this._owner._videoItem.images[imageKey];
+                if (src.indexOf("iVBO") === 0 || src.indexOf("/9j/2w") === 0) {
+                    totalCount++;
+                    let imgTag = document.createElement('img');
+                    imgTag.onload = function () {
+                        loadedCount++;
+                        if (loadedCount == totalCount) {
+                            this._prepared = true;
+                            if (typeof this._undrawFrame === "number") {
+                                this.drawFrame(this._undrawFrame);
+                                this._undrawFrame = undefined;
+                            }
+                        }
+                    }.bind(this);
+                    imgTag.src = 'data:image/png;base64,' + src;
+                    let bitmapKey = imageKey.replace(".matte", "");
+                    this._bitmapCache[bitmapKey] = imgTag;
+                }
+                else if (src.indexOf("SUQz") === 0) {
+                    if (window.Howl !== undefined) {
+                        totalCount++;
+                        var sound = new Howl({
+                            src: [(navigator.vendor === "Google Inc." ? URL.createObjectURL(this.dataURLtoBlob('data:audio/x-mpeg;base64,' + src)) : 'data:audio/x-mpeg;base64,' + src)],
+                            html5: navigator.vendor === "Google Inc." ? true : undefined,
+                            preload: navigator.vendor === "Google Inc." ? true : undefined,
+                            format: navigator.vendor === "Google Inc." ? ["mp3"] : undefined,
+                        });
+                        sound.once("load", function () {
+                            loadedCount++;
+                            if (loadedCount == totalCount) {
+                                this._prepared = true;
+                                if (typeof this._undrawFrame === "number") {
+                                    this.drawFrame(this._undrawFrame);
+                                    this._undrawFrame = undefined;
+                                }
+                            }
+                        }.bind(this))
+                        sound.on("loaderror", function (e) {
+                            console.error(e)
+                        })
+                        this._bitmapCache[imageKey] = sound;
+                    }
+                }
+            }
+        }
+    }
+
+    clear() {
+        const ctx = (this._owner._drawingCanvas || this._owner._container).getContext('2d')
+        const areaFrame = {
+            x: 0.0,
+            y: 0.0,
+            width: (this._owner._drawingCanvas || this._owner._container).width,
+            height: (this._owner._drawingCanvas || this._owner._container).height,
+        }
+        ctx.clearRect(areaFrame.x, areaFrame.y, areaFrame.width, areaFrame.height)
+    }
+
+    clearAudios() {
+        this._soundsQueue.forEach(it => {
+            it.player.stop(it.playID)
+        })
+        this._soundsQueue = []
+    }
+
+    drawFrame(frame) {
+        if (this._prepared) {
+            const ctx = (this._owner._drawingCanvas || this._owner._container).getContext('2d')
+            const areaFrame = {
+                x: 0.0,
+                y: 0.0,
+                width: (this._owner._drawingCanvas || this._owner._container).width,
+                height: (this._owner._drawingCanvas || this._owner._container).height,
+            }
+            ctx.clearRect(areaFrame.x, areaFrame.y, areaFrame.width, areaFrame.height)
+
+            var matteSprites = new Map();
+            var isMatteing = false;
+
+            var sprites = this._owner._videoItem.sprites;
+            sprites.forEach((sprite, index) => {
+                if (sprites[0].imageKey.indexOf(".matte") == -1) {
+                    this.drawSprite(sprite, ctx, frame);
+                    return;
+                }
+                if (sprite.imageKey.indexOf(".matte") != -1) {
+                    matteSprites.set(sprite.imageKey, sprite);
+                    return;
+                }
+                var lastSprite = sprites[index - 1];
+                if (isMatteing && ((sprite.matteKey == null || sprite.matteKey.length == 0) || sprite.matteKey != lastSprite.matteKey)) {
+                    isMatteing = false;
+
+                    var matteSprite = matteSprites.get(sprite.matteKey);
+                    ctx.globalCompositeOperation = "destination-in";
+                    this.drawSprite(matteSprite, ctx, frame);
+                    ctx.globalCompositeOperation = "source-over";
+                    ctx.restore();
+                }
+                if (sprite.matteKey != null && ((lastSprite.matteKey == null || lastSprite.matteKey.length == 0) || lastSprite.matteKey != sprite.matteKey)) {
+                    isMatteing = true;
+                    ctx.save();
+                }
+                this.drawSprite(sprite, ctx, frame);
+
+                if (isMatteing && index == sprites.length - 1) {
+                    var matteSprite = matteSprites.get(sprite.matteKey);
+                    ctx.globalCompositeOperation = "destination-in";
+                    this.drawSprite(matteSprite, ctx, frame);
+                    ctx.globalCompositeOperation = "source-over";
+                    ctx.restore();
+                }
+            });
+        }
+        else {
+            this._undrawFrame = frame;
+        }
+    }
+
+    drawSprite(sprite, ctx, frameIndex) {
+        let frameItem = sprite.frames[this._owner._currentFrame];
+        if (frameItem.alpha < 0.05) {
+            return;
+        }
+        ctx.save();
+        if (this._owner._globalTransform) {
+            ctx.transform(this._owner._globalTransform.a, this._owner._globalTransform.b, this._owner._globalTransform.c, this._owner._globalTransform.d, this._owner._globalTransform.tx, this._owner._globalTransform.ty)
+        }
+        ctx.globalAlpha = frameItem.alpha;
+        ctx.transform(frameItem.transform.a, frameItem.transform.b, frameItem.transform.c, frameItem.transform.d, frameItem.transform.tx, frameItem.transform.ty)
+        let bitmapKey = sprite.imageKey.replace(".matte", "");
+        let src = this._owner._dynamicImage[bitmapKey] || this._bitmapCache[bitmapKey] || this._owner._videoItem.images[bitmapKey];
+        if (typeof src === "string") {
+            let imgTag = this._bitmapCache[sprite.imageKey] || document.createElement('img');
+            let targetWidth = undefined;
+            let targetHeight = undefined;
+            if (src.indexOf("iVBO") === 0 || src.indexOf("/9j/2w") === 0) {
+                imgTag.src = 'data:image/png;base64,' + src;
+            }
+            else {
+                if (imgTag._svgaSrc !== src) {
+                    imgTag._svgaSrc = src;
+                    imgTag.src = src;
+                }
+                targetWidth = frameItem.layout.width;
+                targetHeight = frameItem.layout.height;
+            }
+            this._bitmapCache[sprite.imageKey] = imgTag;
+            if (frameItem.maskPath !== undefined && frameItem.maskPath !== null) {
+                this.drawBezier(ctx, frameItem.maskPath);
+                ctx.clip();
+            }
+            if (this._owner._dynamicImageTransform[sprite.imageKey] !== undefined) {
+                ctx.save();
+                const concatTransform = this._owner._dynamicImageTransform[sprite.imageKey];
+                ctx.transform(concatTransform[0], concatTransform[1], concatTransform[2], concatTransform[3], concatTransform[4], concatTransform[5]);
+            }
+            if (targetWidth && targetHeight) { ctx.drawImage(imgTag, 0, 0, targetWidth, targetHeight); }
+            else { ctx.drawImage(imgTag, 0, 0); }
+            if (this._owner._dynamicImageTransform[sprite.imageKey] !== undefined) {
+                ctx.restore();
+            }
+        }
+        else if (typeof src === "object") {
+            if (frameItem.maskPath !== undefined && frameItem.maskPath !== null) {
+                frameItem.maskPath._styles = undefined;
+                this.drawBezier(ctx, frameItem.maskPath);
+                ctx.clip();
+            }
+            if (this._owner._dynamicImageTransform[sprite.imageKey] !== undefined) {
+                ctx.save();
+                const concatTransform = this._owner._dynamicImageTransform[sprite.imageKey];
+                ctx.transform(concatTransform[0], concatTransform[1], concatTransform[2], concatTransform[3], concatTransform[4], concatTransform[5]);
+            }
+            ctx.drawImage(src, 0, 0);
+            if (this._owner._dynamicImageTransform[sprite.imageKey] !== undefined) {
+                ctx.restore();
+            }
+        }
+        frameItem.shapes && frameItem.shapes.forEach(shape => {
+            if (shape.type === "shape" && shape.pathArgs && shape.pathArgs.d) {
+                this.drawBezier(ctx, new BezierPath(shape.pathArgs.d, shape.transform, shape.styles))
+            }
+            if (shape.type === "ellipse" && shape.pathArgs) {
+                this.drawEllipse(ctx, new EllipsePath(parseFloat(shape.pathArgs.x) || 0.0, parseFloat(shape.pathArgs.y) || 0.0, parseFloat(shape.pathArgs.radiusX) || 0.0, parseFloat(shape.pathArgs.radiusY) || 0.0, shape.transform, shape.styles))
+            }
+            if (shape.type === "rect" && shape.pathArgs) {
+                this.drawRect(ctx, new RectPath(parseFloat(shape.pathArgs.x) || 0.0, parseFloat(shape.pathArgs.y) || 0.0, parseFloat(shape.pathArgs.width) || 0.0, parseFloat(shape.pathArgs.height) || 0.0, parseFloat(shape.pathArgs.cornerRadius) || 0.0, shape.transform, shape.styles))
+            }
+        })
+        let dynamicText = this._owner._dynamicText[sprite.imageKey];
+        if (dynamicText !== undefined) {
+            ctx.textBaseline = "middle";
+            ctx.font = dynamicText.style;
+            let textWidth = ctx.measureText(dynamicText.text).width
+            ctx.fillStyle = dynamicText.color;
+            let offsetX = (dynamicText.offset !== undefined && dynamicText.offset.x !== undefined) ? isNaN(parseFloat(dynamicText.offset.x)) ? 0 : parseFloat(dynamicText.offset.x) : 0;
+            let offsetY = (dynamicText.offset !== undefined && dynamicText.offset.y !== undefined) ? isNaN(parseFloat(dynamicText.offset.y)) ? 0 : parseFloat(dynamicText.offset.y) : 0;
+            ctx.fillText(dynamicText.text, (frameItem.layout.width - textWidth) / 2 + offsetX, frameItem.layout.height / 2 + offsetY);
+        }
+        ctx.restore();
+    }
+
+    playAudio(frame) {
+        if (this._owner._forwardAnimating && this._owner._videoItem.audios instanceof Array) {
+            this._owner._videoItem.audios.forEach(audio => {
+                if (audio.startFrame === frame && this._bitmapCache[audio.audioKey] !== undefined && typeof this._bitmapCache[audio.audioKey].play === "function") {
+                    const item = {
+                        playID: this._bitmapCache[audio.audioKey].play(),
+                        player: this._bitmapCache[audio.audioKey],
+                        endFrame: audio.endFrame,
+                    }
+                    item.player.seek(audio.startTime / 1000, item.playID)
+                    this._soundsQueue.push(item)
+                }
+            })
+            let deleted = false
+            this._soundsQueue.forEach(it => {
+                if (frame >= it.endFrame) {
+                    deleted = true
+                    it.player.stop(it.playID)
+                }
+            })
+            if (deleted) {
+                this._soundsQueue = this._soundsQueue.filter(it => frame < it.endFrame)
+            }
+        }
+    }
+
+    resetShapeStyles(ctx, obj) {
+        const styles = obj._styles;
+        if (styles === undefined) { return; }
+        if (styles && styles.stroke) {
+            ctx.strokeStyle = `rgba(${parseInt(styles.stroke[0] * 255)}, ${parseInt(styles.stroke[1] * 255)}, ${parseInt(styles.stroke[2] * 255)}, ${styles.stroke[3]})`;
+        }
+        else {
+            ctx.strokeStyle = "transparent"
+        }
+        if (styles) {
+            ctx.lineWidth = styles.strokeWidth || undefined;
+            ctx.lineCap = styles.lineCap || undefined;
+            ctx.lineJoin = styles.lineJoin || undefined;
+            ctx.miterLimit = styles.miterLimit || undefined;
+        }
+        if (styles && styles.fill) {
+            ctx.fillStyle = `rgba(${parseInt(styles.fill[0] * 255)}, ${parseInt(styles.fill[1] * 255)}, ${parseInt(styles.fill[2] * 255)}, ${styles.fill[3]})`
+        }
+        else {
+            ctx.fillStyle = "transparent"
+        }
+        if (styles && styles.lineDash) {
+            ctx.setLineDash(styles.lineDash);
+        }
+    }
+
+    drawBezier(ctx, obj) {
+        ctx.save();
+        this.resetShapeStyles(ctx, obj);
+        if (obj._transform !== undefined && obj._transform !== null) {
+            ctx.transform(obj._transform.a, obj._transform.b, obj._transform.c, obj._transform.d, obj._transform.tx, obj._transform.ty);
+        }
+        let currentPoint = { x: 0, y: 0, x1: 0, y1: 0, x2: 0, y2: 0 }
+        ctx.beginPath();
+        const d = obj._d.replace(/([a-zA-Z])/g, '|||$1 ').replace(/,/g, ' ');
+        d.split('|||').forEach(segment => {
+            if (segment.length == 0) { return; }
+            const firstLetter = segment.substr(0, 1);
+            if (validMethods.indexOf(firstLetter) >= 0) {
+                const args = segment.substr(1).trim().split(" ");
+                this.drawBezierElement(ctx, currentPoint, firstLetter, args);
+            }
+        })
+        if (obj._styles && obj._styles.fill) {
+            ctx.fill();
+        }
+        if (obj._styles && obj._styles.stroke) {
+            ctx.stroke();
+        }
+        ctx.restore();
+    }
+
+    drawBezierElement(ctx, currentPoint, method, args) {
+        switch (method) {
+            case 'M':
+                currentPoint.x = Number(args[0]);
+                currentPoint.y = Number(args[1]);
+                ctx.moveTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'm':
+                currentPoint.x += Number(args[0]);
+                currentPoint.y += Number(args[1]);
+                ctx.moveTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'L':
+                currentPoint.x = Number(args[0]);
+                currentPoint.y = Number(args[1]);
+                ctx.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'l':
+                currentPoint.x += Number(args[0]);
+                currentPoint.y += Number(args[1]);
+                ctx.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'H':
+                currentPoint.x = Number(args[0]);
+                ctx.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'h':
+                currentPoint.x += Number(args[0]);
+                ctx.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'V':
+                currentPoint.y = Number(args[0]);
+                ctx.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'v':
+                currentPoint.y += Number(args[0]);
+                ctx.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'C':
+                currentPoint.x1 = Number(args[0]);
+                currentPoint.y1 = Number(args[1]);
+                currentPoint.x2 = Number(args[2]);
+                currentPoint.y2 = Number(args[3]);
+                currentPoint.x = Number(args[4]);
+                currentPoint.y = Number(args[5]);
+                ctx.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                break;
+            case 'c':
+                currentPoint.x1 = currentPoint.x + Number(args[0]);
+                currentPoint.y1 = currentPoint.y + Number(args[1]);
+                currentPoint.x2 = currentPoint.x + Number(args[2]);
+                currentPoint.y2 = currentPoint.y + Number(args[3]);
+                currentPoint.x += Number(args[4]);
+                currentPoint.y += Number(args[5]);
+                ctx.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                break;
+            case 'S':
+                if (currentPoint.x1 && currentPoint.y1 && currentPoint.x2 && currentPoint.y2) {
+                    currentPoint.x1 = currentPoint.x - currentPoint.x2 + currentPoint.x;
+                    currentPoint.y1 = currentPoint.y - currentPoint.y2 + currentPoint.y;
+                    currentPoint.x2 = Number(args[0]);
+                    currentPoint.y2 = Number(args[1]);
+                    currentPoint.x = Number(args[2]);
+                    currentPoint.y = Number(args[3]);
+                    ctx.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                } else {
+                    currentPoint.x1 = Number(args[0]);
+                    currentPoint.y1 = Number(args[1]);
+                    currentPoint.x = Number(args[2]);
+                    currentPoint.y = Number(args[3]);
+                    ctx.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                }
+                break;
+            case 's':
+                if (currentPoint.x1 && currentPoint.y1 && currentPoint.x2 && currentPoint.y2) {
+                    currentPoint.x1 = currentPoint.x - currentPoint.x2 + currentPoint.x;
+                    currentPoint.y1 = currentPoint.y - currentPoint.y2 + currentPoint.y;
+                    currentPoint.x2 = currentPoint.x + Number(args[0]);
+                    currentPoint.y2 = currentPoint.y + Number(args[1]);
+                    currentPoint.x += Number(args[2]);
+                    currentPoint.y += Number(args[3]);
+                    ctx.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                } else {
+                    currentPoint.x1 = currentPoint.x + Number(args[0]);
+                    currentPoint.y1 = currentPoint.y + Number(args[1]);
+                    currentPoint.x += Number(args[2]);
+                    currentPoint.y += Number(args[3]);
+                    ctx.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                }
+                break;
+            case 'Q':
+                currentPoint.x1 = Number(args[0]);
+                currentPoint.y1 = Number(args[1]);
+                currentPoint.x = Number(args[2]);
+                currentPoint.y = Number(args[3]);
+                ctx.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                break;
+            case 'q':
+                currentPoint.x1 = currentPoint.x + Number(args[0]);
+                currentPoint.y1 = currentPoint.y + Number(args[1]);
+                currentPoint.x += Number(args[2]);
+                currentPoint.y += Number(args[3]);
+                ctx.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                break;
+            case 'A':
+                break;
+            case 'a':
+                break;
+            case 'Z':
+            case 'z':
+                ctx.closePath();
+                break;
+            default:
+                break;
+        }
+    }
+
+    drawEllipse(ctx, obj) {
+        ctx.save();
+        this.resetShapeStyles(ctx, obj);
+        if (obj._transform !== undefined && obj._transform !== null) {
+            ctx.transform(obj._transform.a, obj._transform.b, obj._transform.c, obj._transform.d, obj._transform.tx, obj._transform.ty);
+        }
+        let x = obj._x - obj._radiusX;
+        let y = obj._y - obj._radiusY;
+        let w = obj._radiusX * 2;
+        let h = obj._radiusY * 2;
+        var kappa = .5522848,
+            ox = (w / 2) * kappa,
+            oy = (h / 2) * kappa,
+            xe = x + w,
+            ye = y + h,
+            xm = x + w / 2,
+            ym = y + h / 2;
+
+        ctx.beginPath();
+        ctx.moveTo(x, ym);
+        ctx.bezierCurveTo(x, ym - oy, xm - ox, y, xm, y);
+        ctx.bezierCurveTo(xm + ox, y, xe, ym - oy, xe, ym);
+        ctx.bezierCurveTo(xe, ym + oy, xm + ox, ye, xm, ye);
+        ctx.bezierCurveTo(xm - ox, ye, x, ym + oy, x, ym);
+        if (obj._styles && obj._styles.fill) {
+            ctx.fill();
+        }
+        if (obj._styles && obj._styles.stroke) {
+            ctx.stroke();
+        }
+        ctx.restore();
+    }
+
+    drawRect(ctx, obj) {
+        ctx.save();
+        this.resetShapeStyles(ctx, obj);
+        if (obj._transform !== undefined && obj._transform !== null) {
+            ctx.transform(obj._transform.a, obj._transform.b, obj._transform.c, obj._transform.d, obj._transform.tx, obj._transform.ty);
+        }
+
+        let x = obj._x;
+        let y = obj._y;
+        let width = obj._width;
+        let height = obj._height;
+        let radius = obj._cornerRadius;
+
+        if (width < 2 * radius) { radius = width / 2; }
+        if (height < 2 * radius) { radius = height / 2; }
+
+        ctx.beginPath();
+        ctx.moveTo(x + radius, y);
+        ctx.arcTo(x + width, y, x + width, y + height, radius);
+        ctx.arcTo(x + width, y + height, x, y + height, radius);
+        ctx.arcTo(x, y + height, x, y, radius);
+        ctx.arcTo(x, y, x + width, y, radius);
+        ctx.closePath();
+
+        if (obj._styles && obj._styles.fill) {
+            ctx.fill();
+        }
+        if (obj._styles && obj._styles.stroke) {
+            ctx.stroke();
+        }
+        ctx.restore();
+    }
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/CreateJS/index.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/CreateJS/index.js
new file mode 100644
index 0000000..51fc690
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/CreateJS/index.js
@@ -0,0 +1,8 @@
+import { Parser } from '../parser'
+import { Player } from './player'
+
+module.exports = {
+    Parser,
+    Player,
+    CreatejsPlayer: Player,
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/CreateJS/player.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/CreateJS/player.js
new file mode 100644
index 0000000..eee1626
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/CreateJS/player.js
@@ -0,0 +1,273 @@
+import { Renderer } from './renderer'
+import { Parser } from '../parser'
+const ValueAnimator = require("value-animator")
+
+export class Player extends createjs.Container {
+
+    loops = 0;
+    clearsAfterStop = true;
+    fillMode = "Forward";
+
+    constructor(url, autoplay) {
+        super();
+        (new Parser()).load(url, (videoItem) => {
+            this.setVideoItem(videoItem);
+            if (autoplay !== false) {
+                this.startAnimation();
+            }
+        }, (error) => {
+            this._onError && this._onError(error);
+        })
+        this._renderer = new Renderer(this);
+    }
+
+    setVideoItem(videoItem) {
+        this._currentFrame = 0;
+        this._videoItem = videoItem;
+        this.removeAllChildren();
+        this._addLayers();
+    }
+
+    setContentMode(contentMode) {
+        this._contentMode = contentMode;
+        this._update();
+    }
+
+    setClipsToBounds(clipsToBounds) {
+        this._clipsToBounds = clipsToBounds;
+        this._update();
+    }
+
+    setFrame(x, y, width, height) {
+        this._frame = { x, y, width, height }
+        this._update();
+    }
+
+    startAnimation(reverse) {
+        this.visible = true;
+        this.stopAnimation(false);
+        this._doStart(undefined, reverse, undefined);
+    }
+
+    startAnimationWithRange(range, reverse) {
+        this.visible = true;
+        this.stopAnimation(false);
+        this._doStart(range, reverse, undefined)
+    }
+
+    pauseAnimation() {
+        this.stopAnimation(false);
+    }
+
+    stopAnimation(clear) {
+        if (this._animator !== undefined) {
+            this._animator.stop()
+        }
+        if (clear === undefined) {
+            clear = this.clearsAfterStop;
+        }
+        if (clear) {
+            this.clear();
+        }
+    }
+
+    clear() {
+        this.visible = false;
+        if (this.stage != null) {
+            this.stage.update();
+        }
+    }
+
+    stepToFrame(frame, andPlay) {
+        if (frame >= this._videoItem.frames || frame < 0) {
+            return;
+        }
+        this.visible = true;
+        this.pauseAnimation();
+        this._currentFrame = frame;
+        this._update();
+        if (andPlay) {
+            this._doStart(undefined, false, this._currentFrame)
+        }
+    }
+
+    stepToPercentage(percentage, andPlay) {
+        let frame = parseInt(percentage * this._videoItem.frames);
+        if (frame >= this._videoItem.frames && frame > 0) {
+            frame = this._videoItem.frames - 1;
+        }
+        this.stepToFrame(frame, andPlay);
+    }
+
+    setImage(urlORbase64, forKey, transform) {
+        this._dynamicImage[forKey] = urlORbase64;
+        if (transform !== undefined && transform instanceof Array && transform.length == 6) {
+            this._dynamicImageTransform[forKey] = transform;
+        }
+        if (this._videoItem !== undefined) {
+            const currentFrame = this._currentFrame;
+            this.removeAllChildren();
+            this._addLayers();
+            this._currentFrame = currentFrame;
+            this._update();
+        }
+    }
+
+    setText(textORMap, forKey) {
+        let text = typeof textORMap === "string" ? textORMap : textORMap.text;
+        let size = (typeof textORMap === "object" ? textORMap.size : "14px") || "14px";
+        let family = (typeof textORMap === "object" ? textORMap.family : "Arial") || "Arial";
+        let color = (typeof textORMap === "object" ? textORMap.color : "#000000") || "#000000";
+        let offset = (typeof textORMap === "object" ? textORMap.offset : { x: 0.0, y: 0.0 }) || { x: 0.0, y: 0.0 };
+        let textLayer = new createjs.Text(text, `${size} family`, color);
+        textLayer.offset = offset;
+        this._dynamicText[forKey] = textLayer;
+        if (this._videoItem !== undefined) {
+            const currentFrame = this._currentFrame;
+            this.removeAllChildren();
+            this._addLayers();
+            this._currentFrame = currentFrame;
+            this._update();
+        }
+    }
+
+    clearDynamicObjects() {
+        this._dynamicImage = {};
+        this._dynamicImageTransform = {};
+        this._dynamicText = {};
+    }
+
+    onError(callback) {
+        this._onError = callback;
+    }
+
+    onFinished(callback) {
+        this._onFinished = callback;
+    }
+
+    onFrame(callback) {
+        this._onFrame = callback;
+    }
+
+    onPercentage(callback) {
+        this._onPercentage = callback;
+    }
+
+    /**
+     * Private methods & properties
+     */
+
+    _renderer = undefined;
+    _animator = undefined;
+    _contentMode = "AspectFit"
+    _videoItem = undefined;
+    _currentFrame = 0;
+    _dynamicImage = {};
+    _dynamicImageTransform = {};
+    _dynamicText = {};
+    _onFinished = undefined;
+    _onFrame = undefined;
+    _onPercentage = undefined;
+    _clipsToBounds = false;
+    _frame = { x: 0, y: 0, width: 0, height: 0 };
+
+    _doStart(range, reverse, fromFrame) {
+        this._animator = new ValueAnimator()
+        if (range !== undefined) {
+            this._animator.startValue = Math.max(0, range.location)
+            this._animator.endValue = Math.min(this._videoItem.frames - 1, range.location + range.length)
+            this._animator.duration = (this._animator.endValue - this._animator.startValue + 1) * (1.0 / this._videoItem.FPS) * 1000
+        }
+        else {
+            this._animator.startValue = 0
+            this._animator.endValue = this._videoItem.frames - 1
+            this._animator.duration = this._videoItem.frames * (1.0 / this._videoItem.FPS) * 1000
+        }
+        this._animator.loops = this.loops <= 0 ? Infinity : this.loops
+        this._animator.fillRule = this.fillMode === "Backward" ? 1 : 0
+        this._animator.onUpdate = (value) => {
+            if (this._currentFrame === Math.floor(value)) {
+                return;
+            }
+            this._currentFrame = Math.floor(value)
+            this._update()
+            if (typeof this._onFrame === "function") {
+                this._onFrame(this._currentFrame);
+            }
+            if (typeof this._onPercentage === "function") {
+                this._onPercentage(parseFloat(this._currentFrame + 1) / parseFloat(this._videoItem.frames));
+            }
+        }
+        this._animator.onEnd = () => {
+            if (this.clearsAfterStop === true) {
+                this.clear()
+            }
+            if (typeof this._onFinished === "function") {
+                this._onFinished();
+            }
+        }
+        if (reverse === true) {
+            this._animator.reverse(fromFrame)
+        }
+        else {
+            this._animator.start(fromFrame)
+        }
+    }
+
+    _addLayers() {
+        this._videoItem.sprites.forEach((sprite) => {
+            this.addChild(this._renderer.requestContentLayer(sprite));
+        })
+        this._currentFrame = 0;
+        this._update();
+    }
+
+    _resize() {
+        let scaleX = 1.0; let scaleY = 1.0; let translateX = 0.0; let translateY = 0.0;
+        let targetSize = { width: this._frame.width, height: this._frame.height };
+        let imageSize = this._videoItem.videoSize;
+        if (this._contentMode === "Fill") {
+            scaleX = targetSize.width / imageSize.width;
+            scaleY = targetSize.height / imageSize.height;
+        }
+        else if (this._contentMode === "AspectFit" || this._contentMode === "AspectFill") {
+            const imageRatio = imageSize.width / imageSize.height;
+            const viewRatio = targetSize.width / targetSize.height;
+            if ((imageRatio >= viewRatio && this._contentMode === "AspectFit") || (imageRatio <= viewRatio && this._contentMode === "AspectFill")) {
+                scaleX = scaleY = targetSize.width / imageSize.width;
+                translateY = (targetSize.height - imageSize.height * scaleY) / 2.0
+            }
+            else if ((imageRatio < viewRatio && this._contentMode === "AspectFit") || (imageRatio > viewRatio && this._contentMode === "AspectFill")) {
+                scaleX = scaleY = targetSize.height / imageSize.height;
+                translateX = (targetSize.width - imageSize.width * scaleX) / 2.0
+            }
+        }
+        this.transformMatrix = { a: scaleX, b: 0.0, c: 0.0, d: scaleY, tx: this._frame.x + translateX, ty: this._frame.y + translateY };
+    }
+
+    _updateMask() {
+        if (this._clipsToBounds) {
+            this.mask = new createjs.Shape();
+            if (this.mask.__width !== this._frame.__width || this.mask.height !== this._frame.height) {
+                this.mask.graphics.clear();
+                this.mask.graphics.drawRect(0.0, 0.0, this._frame.width, this._frame.height);
+                this.mask.__width = this._frame.width;
+                this.mask.__height = this._frame.height;
+            }
+        }
+        else {
+            this.mask = undefined;
+        }
+    }
+
+    _update() {
+        if (this._videoItem === undefined) { return; }
+        this._resize();
+        this._updateMask();
+        this._renderer.drawFrame(this._currentFrame);
+        if (this.stage != null) {
+            this.stage.update();
+        }
+    }
+
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/CreateJS/renderer.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/CreateJS/renderer.js
new file mode 100644
index 0000000..71d8acd
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/CreateJS/renderer.js
@@ -0,0 +1,344 @@
+import { BezierPath } from '../bezierPath'
+import { EllipsePath } from '../ellipsePath'
+import { RectPath } from '../rectPath'
+
+const validMethods = 'MLHVCSQRZmlhvcsqrz'
+
+class VectorLayer extends createjs.Container {
+
+    _sprite;
+    _drawedFrame = 0;
+    _keepFrameCache = {};
+
+    constructor(sprite) {
+        super();
+        this._sprite = sprite;
+        this._resetKeepFrameCache();
+    }
+
+    stepToFrame(frame) {
+        if (frame < this._sprite.frames.length) {
+            this._drawFrame(frame);
+        }
+    }
+
+    _resetKeepFrameCache() {
+        this._keepFrameCache = {}
+        let lastKeep = 0;
+        this._sprite.frames.forEach((frameItem, idx) => {
+            if (!this._isKeepFrame(frameItem)) {
+                lastKeep = idx;
+            }
+            else {
+                this._keepFrameCache[idx] = lastKeep;
+            }
+        });
+    }
+
+    _requestKeepFrame(frame) {
+        return this._keepFrameCache[frame]
+    }
+
+    _isKeepFrame(frameItem) {
+        return frameItem.shapes && frameItem.shapes.length > 0 && frameItem.shapes[0].type === "keep";
+    }
+
+    _drawFrame(frame) {
+        if (frame < this._sprite.frames.length) {
+            let frameItem = this._sprite.frames[frame];
+            if (this._isKeepFrame(frameItem)) {
+                if (this._drawedFrame === this._requestKeepFrame(frame)) {
+                    return;
+                }
+            }
+            this.removeAllChildren();
+            frameItem.shapes.forEach((shape) => {
+                if (shape.type === "shape" && shape.pathArgs && shape.pathArgs.d) {
+                    this.addChild(Renderer.requestBezierShape(new BezierPath(shape.pathArgs.d, shape.transform, shape.styles)));
+                }
+                else if (shape.type === "ellipse" && shape.pathArgs) {
+                    this.addChild(Renderer.requestEllipseShape(new EllipsePath(parseFloat(shape.pathArgs.x) || 0.0, parseFloat(shape.pathArgs.y) || 0.0, parseFloat(shape.pathArgs.radiusX) || 0.0, parseFloat(shape.pathArgs.radiusY) || 0.0, shape.transform, shape.styles)));
+                }
+                else if (shape.type === "rect" && shape.pathArgs) {
+                    this.addChild(Renderer.requestRectShape(new RectPath(parseFloat(shape.pathArgs.x) || 0.0, parseFloat(shape.pathArgs.y) || 0.0, parseFloat(shape.pathArgs.width) || 0.0, parseFloat(shape.pathArgs.height) || 0.0, parseFloat(shape.pathArgs.cornerRadius) || 0.0, shape.transform, shape.styles)));
+                }
+            })
+            this._drawedFrame = frame;
+        }
+    }
+
+}
+
+export class Renderer {
+
+    _owner;
+
+    constructor(owner) {
+        this._owner = owner;
+    }
+
+    requestContentLayer(sprite) {
+        let bitmap;
+        let contentLayer = new createjs.Container();
+        if (sprite.imageKey) {
+            bitmap = this._owner._dynamicImage[sprite.imageKey] || this._owner._videoItem.images[sprite.imageKey];
+            if (bitmap) {
+                contentLayer.addChild(this.requestBitmapLayer(bitmap, this._owner._dynamicImageTransform[sprite.imageKey], sprite.frames));
+            }
+            if (this._owner._dynamicText[sprite.imageKey]) {
+                contentLayer.textLayer = this._owner._dynamicText[sprite.imageKey];
+                contentLayer.addChild(this._owner._dynamicText[sprite.imageKey])
+            }
+        }
+        contentLayer.addChild(this.requestVectorLayer(sprite));
+        contentLayer.stepToFrame = (frame) => {
+            if (frame < sprite.frames.length) {
+                let frameItem = sprite.frames[frame];
+                if (frameItem.alpha > 0.0) {
+                    contentLayer.alpha = frameItem.alpha;
+                    contentLayer.visible = true;
+                    contentLayer.transformMatrix = new window.createjs.Matrix2D(frameItem.transform.a, frameItem.transform.b, frameItem.transform.c, frameItem.transform.d, frameItem.transform.tx, frameItem.transform.ty);
+                    contentLayer.setBounds({ x: frameItem.layout.x, y: frameItem.layout.y, width: frameItem.layout.width, height: frameItem.layout.height });
+                    if (frameItem.maskPath) {
+                        contentLayer.mask = Renderer.requestBezierShape(frameItem.maskPath);
+                        contentLayer.mask.transformMatrix = contentLayer.transformMatrix;
+                    }
+                    else {
+                        contentLayer.mask = undefined;
+                    }
+                    if (contentLayer.textLayer) {
+                        let offsetX = (contentLayer.textLayer.offset !== undefined && contentLayer.textLayer.offset.x !== undefined) ? contentLayer.textLayer.offset.x : 0;
+                        let offsetY = (contentLayer.textLayer.offset !== undefined && contentLayer.textLayer.offset.y !== undefined) ? contentLayer.textLayer.offset.y : 0;
+                        contentLayer.textLayer.textBaseline = "middle";
+                        contentLayer.textLayer.x = (frameItem.layout.width - contentLayer.textLayer.getBounds().width) / 2.0 + offsetX;
+                        contentLayer.textLayer.y = frameItem.layout.height / 2.0 + offsetY;
+                    }
+                }
+                else {
+                    contentLayer.visible = false;
+                }
+            }
+            contentLayer.children.forEach((element) => {
+                element.stepToFrame && element.stepToFrame(frame);
+            })
+        }
+        return contentLayer;
+    }
+
+    requestBitmapLayer(bitmap, bitmapTransform, frames) {
+        let imgTag = document.createElement('img');
+        let backCanvas;
+        if (bitmap.indexOf("iVBO") === 0 || bitmap.indexOf("/9j/2w") === 0) {
+            imgTag.src = 'data:image/png;base64,' + bitmap;
+        }
+        else {
+            imgTag.src = bitmap;
+            if (frames[0] && frames[0].layout) {
+                backCanvas = document.createElement('canvas');
+                backCanvas.width = frames[0].layout.width
+                backCanvas.height = frames[0].layout.height
+                imgTag.onload = function() {
+                    backCanvas.getContext('2d').drawImage(imgTag, 0, 0, frames[0].layout.width, frames[0].layout.height)
+                }
+            }
+        }
+        let layer = new createjs.Bitmap(backCanvas || imgTag);
+        if (bitmapTransform !== undefined) {
+            layer.transformMatrix = new createjs.Matrix2D(bitmapTransform[0], bitmapTransform[1], bitmapTransform[2], bitmapTransform[3], bitmapTransform[4], bitmapTransform[5]);
+        }
+        layer.frames = frames;
+        layer.stepToFrame = (frame) => { }
+        return layer;
+    }
+
+    requestVectorLayer(sprite) {
+        return new VectorLayer(sprite);
+    }
+
+    drawFrame(frame) {
+        this._owner.children.forEach((element) => {
+            element.stepToFrame(frame);
+        });
+    }
+
+    static resetStyle(obj, shape) {
+        const styles = obj._styles;
+        if (!styles) { return; }
+        if (styles && styles.stroke) {
+            shape.graphics.beginStroke(`rgba(${parseInt(styles.stroke[0] * 255)}, ${parseInt(styles.stroke[1] * 255)}, ${parseInt(styles.stroke[2] * 255)}, ${styles.stroke[3]})`);
+        }
+        if (styles) {
+            const width = styles.strokeWidth || 0.0;
+            const caps = styles.lineCap || '';
+            const joints = styles.lineJoin || '';
+            const miterLimit = styles.miterLimit || '';
+            shape.graphics.setStrokeStyle(width, caps, joints, miterLimit, true);
+        }
+        if (styles && styles.fill) {
+            shape.graphics.beginFill(`rgba(${parseInt(styles.fill[0] * 255)}, ${parseInt(styles.fill[1] * 255)}, ${parseInt(styles.fill[2] * 255)}, ${styles.fill[3]})`);
+        }
+        if (styles && styles.lineDash) {
+            shape.graphics.setStrokeDash([styles.lineDash[0], styles.lineDash[1]], styles.lineDash[2]);
+        }
+    }
+
+    static requestBezierShape(obj) {
+        const shape = new createjs.Shape()
+        const g = shape.graphics;
+        this.resetStyle(obj, shape);
+        let currentPoint = { x: 0, y: 0, x1: 0, y1: 0, x2: 0, y2: 0 }
+        const d = obj._d.replace(/([a-zA-Z])/g, '|||$1 ').replace(/,/g, ' ');
+        d.split('|||').forEach(segment => {
+            if (segment.length == 0) { return; }
+            const firstLetter = segment.substr(0, 1);
+            if (validMethods.indexOf(firstLetter) >= 0) {
+                const args = segment.substr(1).trim().split(" ");
+                this.drawBezierElement(g, currentPoint, firstLetter, args);
+            }
+        })
+        if (obj._transform !== undefined && obj._transform !== null) {
+            shape.transformMatrix = new createjs.Matrix2D(obj._transform.a, obj._transform.b, obj._transform.c, obj._transform.d, obj._transform.tx, obj._transform.ty);
+        }
+        return shape;
+    }
+
+    static drawBezierElement(g, currentPoint, method, args) {
+        switch (method) {
+            case 'M':
+                currentPoint.x = Number(args[0]);
+                currentPoint.y = Number(args[1]);
+                g.moveTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'm':
+                currentPoint.x += Number(args[0]);
+                currentPoint.y += Number(args[1]);
+                g.moveTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'L':
+                currentPoint.x = Number(args[0]);
+                currentPoint.y = Number(args[1]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'l':
+                currentPoint.x += Number(args[0]);
+                currentPoint.y += Number(args[1]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'H':
+                currentPoint.x = Number(args[0]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'h':
+                currentPoint.x += Number(args[0]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'V':
+                currentPoint.y = Number(args[0]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'v':
+                currentPoint.y += Number(args[0]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'C':
+                currentPoint.x1 = Number(args[0]);
+                currentPoint.y1 = Number(args[1]);
+                currentPoint.x2 = Number(args[2]);
+                currentPoint.y2 = Number(args[3]);
+                currentPoint.x = Number(args[4]);
+                currentPoint.y = Number(args[5]);
+                g.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                break;
+            case 'c':
+                currentPoint.x1 = currentPoint.x + Number(args[0]);
+                currentPoint.y1 = currentPoint.y + Number(args[1]);
+                currentPoint.x2 = currentPoint.x + Number(args[2]);
+                currentPoint.y2 = currentPoint.y + Number(args[3]);
+                currentPoint.x += Number(args[4]);
+                currentPoint.y += Number(args[5]);
+                g.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                break;
+            case 'S':
+                if (currentPoint.x1 && currentPoint.y1 && currentPoint.x2 && currentPoint.y2) {
+                    currentPoint.x1 = currentPoint.x - currentPoint.x2 + currentPoint.x;
+                    currentPoint.y1 = currentPoint.y - currentPoint.y2 + currentPoint.y;
+                    currentPoint.x2 = Number(args[0]);
+                    currentPoint.y2 = Number(args[1]);
+                    currentPoint.x = Number(args[2]);
+                    currentPoint.y = Number(args[3]);
+                    g.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                } else {
+                    currentPoint.x1 = Number(args[0]);
+                    currentPoint.y1 = Number(args[1]);
+                    currentPoint.x = Number(args[2]);
+                    currentPoint.y = Number(args[3]);
+                    g.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                }
+                break;
+            case 's':
+                if (currentPoint.x1 && currentPoint.y1 && currentPoint.x2 && currentPoint.y2) {
+                    currentPoint.x1 = currentPoint.x - currentPoint.x2 + currentPoint.x;
+                    currentPoint.y1 = currentPoint.y - currentPoint.y2 + currentPoint.y;
+                    currentPoint.x2 = currentPoint.x + Number(args[0]);
+                    currentPoint.y2 = currentPoint.y + Number(args[1]);
+                    currentPoint.x += Number(args[2]);
+                    currentPoint.y += Number(args[3]);
+                    g.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                } else {
+                    currentPoint.x1 = currentPoint.x + Number(args[0]);
+                    currentPoint.y1 = currentPoint.y + Number(args[1]);
+                    currentPoint.x += Number(args[2]);
+                    currentPoint.y += Number(args[3]);
+                    g.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                }
+                break;
+            case 'Q':
+                currentPoint.x1 = Number(args[0]);
+                currentPoint.y1 = Number(args[1]);
+                currentPoint.x = Number(args[2]);
+                currentPoint.y = Number(args[3]);
+                g.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                break;
+            case 'q':
+                currentPoint.x1 = currentPoint.x + Number(args[0]);
+                currentPoint.y1 = currentPoint.y + Number(args[1]);
+                currentPoint.x += Number(args[2]);
+                currentPoint.y += Number(args[3]);
+                g.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                break;
+            case 'A':
+                break;
+            case 'a':
+                break;
+            case 'Z':
+            case 'z':
+                g.closePath();
+                break;
+            default:
+                break;
+        }
+    }
+
+    static requestEllipseShape(obj) {
+        const shape = new createjs.Shape()
+        const g = shape.graphics;
+        this.resetStyle(obj, shape);
+        g.drawEllipse(obj._x - obj._radiusX, obj._y - obj._radiusY, obj._radiusX * 2, obj._radiusY * 2);
+        if (obj._transform !== undefined && obj._transform !== null) {
+            shape.transformMatrix = new createjs.Matrix2D(obj._transform.a, obj._transform.b, obj._transform.c, obj._transform.d, obj._transform.tx, obj._transform.ty);
+        }
+        return shape;
+    }
+
+    static requestRectShape(obj) {
+        const shape = new createjs.Shape()
+        const g = shape.graphics;
+        this.resetStyle(obj, shape);
+        g.drawRoundRect(obj._x, obj._y, obj._width, obj._height, obj._cornerRadius);
+        if (obj._transform !== undefined && obj._transform !== null) {
+            shape.transformMatrix = new createjs.Matrix2D(obj._transform.a, obj._transform.b, obj._transform.c, obj._transform.d, obj._transform.tx, obj._transform.ty);
+        }
+        return shape;
+    }
+
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/LayaBox/index.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/LayaBox/index.js
new file mode 100644
index 0000000..33988dc
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/LayaBox/index.js
@@ -0,0 +1,8 @@
+import { Parser } from '../parser'
+import { Player } from './player'
+
+module.exports = {
+    Parser,
+    Player,
+    LayaboxPlayer: Player,
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/LayaBox/player.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/LayaBox/player.js
new file mode 100644
index 0000000..a2e88b3
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/LayaBox/player.js
@@ -0,0 +1,281 @@
+import { Renderer } from './renderer'
+import { Parser } from '../parser'
+const ValueAnimator = require("value-animator")
+
+export class Player extends Laya.Sprite {
+
+    loops = 0;
+    clearsAfterStop = true;
+    fillMode = "Forward";
+
+    constructor(url, autoplay) {
+        super();
+        if (url) {
+            (new Parser()).load(url, (videoItem) => {
+                this.setVideoItem(videoItem);
+                if (autoplay !== false) {
+                    this.startAnimation();
+                }
+            }, (error) => {
+                this._onError && this._onError(error);
+            })
+        }
+        this._renderer = new Renderer(this);
+    }
+
+    setVideoUrl(url, autoplay, success, failure) {
+        (new Parser()).load(url, (videoItem) => {
+            if (success) {
+                success(videoItem);
+            }
+            this.setVideoItem(videoItem);
+            if (autoplay !== false) {
+                this.startAnimation();
+            }
+        }, (error) => {
+            if (failure) {
+                failure(error);
+            }
+            this._onError && this._onError(error);
+        })
+    }
+
+    setVideoItem(videoItem) {
+        this._currentFrame = 0;
+        this._videoItem = videoItem;
+        this.removeChildren(0, this.numChildren);
+        this._addLayers();
+    }
+
+    setContentMode(contentMode) {
+        this._contentMode = contentMode;
+        this._update();
+    }
+
+    setClipsToBounds(clipsToBounds) {
+        this._clipsToBounds = clipsToBounds;
+        this._update();
+    }
+
+    setFrame(x, y, width, height) {
+        this._frame = { x, y, width, height }
+        this._update();
+    }
+
+    startAnimation(reverse) {
+        this.visible = true;
+        this.stopAnimation(false);
+        this._doStart(undefined, reverse, undefined);
+    }
+
+    startAnimationWithRange(range, reverse) {
+        this.visible = true;
+        this.stopAnimation(false);
+        this._doStart(range, reverse, undefined)
+    }
+
+    pauseAnimation() {
+        this.stopAnimation(false);
+    }
+
+    stopAnimation(clear) {
+        if (this._animator !== undefined) {
+            this._animator.stop()
+        }
+        if (clear === undefined) {
+            clear = this.clearsAfterStop;
+        }
+        if (clear) {
+            this.clear();
+        }
+    }
+
+    clear() {
+        this.visible = false;
+    }
+
+    stepToFrame(frame, andPlay) {
+        if (frame >= this._videoItem.frames || frame < 0) {
+            return;
+        }
+        this.visible = true;
+        this.pauseAnimation();
+        this._currentFrame = frame;
+        this._update();
+        if (andPlay) {
+            this._doStart(undefined, false, this._currentFrame)
+        }
+    }
+
+    stepToPercentage(percentage, andPlay) {
+        let frame = parseInt(percentage * this._videoItem.frames);
+        if (frame >= this._videoItem.frames && frame > 0) {
+            frame = this._videoItem.frames - 1;
+        }
+        this.stepToFrame(frame, andPlay);
+    }
+
+    setImage(urlORbase64, forKey, transform) {
+        this._dynamicImage[forKey] = urlORbase64;
+        if (transform !== undefined && transform instanceof Array && transform.length == 6) {
+            this._dynamicImageTransform[forKey] = transform;
+        }
+        if (this._videoItem !== undefined) {
+            const currentFrame = this._currentFrame;
+            this.removeChildren(0, this.numChildren);
+            this._addLayers();
+            this._currentFrame = currentFrame;
+            this._update();
+        }
+    }
+
+    setText(textORMap, forKey) {
+        let text = typeof textORMap === "string" ? textORMap : textORMap.text;
+        let size = (typeof textORMap === "object" ? textORMap.size : "14px") || "14px";
+        let family = (typeof textORMap === "object" ? textORMap.family : "Arial") || "Arial";
+        let color = (typeof textORMap === "object" ? textORMap.color : "#000000") || "#000000";
+        let offset = (typeof textORMap === "object" ? textORMap.offset : { x: 0.0, y: 0.0 }) || { x: 0.0, y: 0.0 };
+        let textLayer = new Laya.Text();
+        textLayer.text = text;
+        textLayer.fontSize = isNaN(parseInt(size.split(' ')[0])) ? 14 : parseInt(size.split(' ')[0]);;
+        textLayer.color = color;
+        textLayer.align = "center";
+        textLayer.valign = "middle";
+        if (textLayer.y !== undefined) {
+            textLayer.y = textLayer.y - textLayer.textHeight / 2.0;
+        }
+        textLayer.offset = offset;
+        this._dynamicText[forKey] = textLayer;
+        if (this._videoItem !== undefined) {
+            const currentFrame = this._currentFrame;
+            this.removeChildren(0, this.numChildren);
+            this._addLayers();
+            this._currentFrame = currentFrame;
+            this._update();
+        }
+    }
+
+    clearDynamicObjects() {
+        this._dynamicImage = {};
+        this._dynamicImageTransform = {};
+        this._dynamicText = {};
+    }
+
+    onError(callback) {
+        this._onError = callback;
+    }
+
+    onFinished(callback) {
+        this._onFinished = callback;
+    }
+
+    onFrame(callback) {
+        this._onFrame = callback;
+    }
+
+    onPercentage(callback) {
+        this._onPercentage = callback;
+    }
+
+    /**
+     * Private methods & properties
+     */
+
+    _renderer = undefined;
+    _animator = undefined;
+    _contentMode = "AspectFit"
+    _videoItem = undefined;
+    _currentFrame = 0;
+    _dynamicImage = {};
+    _dynamicImageTransform = {};
+    _dynamicText = {};
+    _onFinished = undefined;
+    _onFrame = undefined;
+    _onPercentage = undefined;
+    _clipsToBounds = false;
+    _frame = { x: 0, y: 0, width: 0, height: 0 };
+
+    _doStart(range, reverse, fromFrame) {
+        this._animator = new ValueAnimator()
+        if (range !== undefined) {
+            this._animator.startValue = Math.max(0, range.location)
+            this._animator.endValue = Math.min(this._videoItem.frames - 1, range.location + range.length)
+            this._animator.duration = (this._animator.endValue - this._animator.startValue + 1) * (1.0 / this._videoItem.FPS) * 1000
+        }
+        else {
+            this._animator.startValue = 0
+            this._animator.endValue = this._videoItem.frames - 1
+            this._animator.duration = this._videoItem.frames * (1.0 / this._videoItem.FPS) * 1000
+        }
+        this._animator.loops = this.loops <= 0 ? Infinity : this.loops
+        this._animator.fillRule = this.fillMode === "Backward" ? 1 : 0
+        this._animator.onUpdate = (value) => {
+            if (this._currentFrame === Math.floor(value)) {
+                return;
+            }
+            this._currentFrame = Math.floor(value)
+            this._update()
+            if (typeof this._onFrame === "function") {
+                this._onFrame(this._currentFrame);
+            }
+            if (typeof this._onPercentage === "function") {
+                this._onPercentage(parseFloat(this._currentFrame + 1) / parseFloat(this._videoItem.frames));
+            }
+        }
+        this._animator.onEnd = () => {
+            if (this.clearsAfterStop === true) {
+                this.clear()
+            }
+            if (typeof this._onFinished === "function") {
+                this._onFinished();
+            }
+        }
+        if (reverse === true) {
+            this._animator.reverse(fromFrame)
+        }
+        else {
+            this._animator.start(fromFrame)
+        }
+    }
+
+    _addLayers() {
+        this._videoItem.sprites.forEach((sprite) => {
+            this.addChild(this._renderer.requestContentLayer(sprite));
+        })
+        this._currentFrame = 0;
+        this._update();
+    }
+
+    _resize() {
+        let scaleX = 1.0; let scaleY = 1.0; let translateX = 0.0; let translateY = 0.0;
+        let targetSize = { width: this._frame.width, height: this._frame.height };
+        let imageSize = this._videoItem.videoSize;
+        if (this._contentMode === "Fill") {
+            scaleX = targetSize.width / imageSize.width;
+            scaleY = targetSize.height / imageSize.height;
+        }
+        else if (this._contentMode === "AspectFit" || this._contentMode === "AspectFill") {
+            const imageRatio = imageSize.width / imageSize.height;
+            const viewRatio = targetSize.width / targetSize.height;
+            if ((imageRatio >= viewRatio && this._contentMode === "AspectFit") || (imageRatio <= viewRatio && this._contentMode === "AspectFill")) {
+                scaleX = scaleY = targetSize.width / imageSize.width;
+                translateY = (targetSize.height - imageSize.height * scaleY) / 2.0
+            }
+            else if ((imageRatio < viewRatio && this._contentMode === "AspectFit") || (imageRatio > viewRatio && this._contentMode === "AspectFill")) {
+                scaleX = scaleY = targetSize.height / imageSize.height;
+                translateX = (targetSize.width - imageSize.width * scaleX) / 2.0
+            }
+        }
+        this.transform = new Laya.Matrix(scaleX, 0.0, 0.0, scaleY, this._frame.x + translateX, this._frame.y + translateY);
+    }
+
+    _updateMask() { }
+
+    _update() {
+        if (this._videoItem === undefined) { return; }
+        this._resize();
+        this._updateMask();
+        this._renderer.drawFrame(this._currentFrame);
+    }
+
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/LayaBox/renderer.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/LayaBox/renderer.js
new file mode 100644
index 0000000..63b26ff
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/LayaBox/renderer.js
@@ -0,0 +1,519 @@
+import { BezierPath } from '../bezierPath'
+import { EllipsePath } from '../ellipsePath'
+import { RectPath } from '../rectPath'
+
+const validMethods = 'MLHVCSQRZmlhvcsqrz'
+
+class ShapeSprite extends Laya.Sprite {
+
+    customGraphics = {
+        currentPath: [],
+    };
+
+    constructor() {
+        super();
+        this.customRenderEnable = true;
+    }
+
+    getBounds() {
+        return { x: 0, y: 0, width: 3000, height: 3000 }
+    }
+
+    beginFill(fillStyle) {
+        this.customGraphics.fillStyle = fillStyle;
+    }
+
+    beginStroke(stroke) {
+        this.customGraphics.strokeStyle = stroke;
+    }
+
+    setStrokeStyle(width, caps, joints, miterLimit) {
+        this.customGraphics.lineCap = caps;
+        this.customGraphics.lineJoin = joints;
+        this.customGraphics.lineWidth = width;
+        this.customGraphics.miterLimit = miterLimit;
+    }
+
+    setStrokeDash(arr, arg) {
+        this.customGraphics.strokeDash = { arr, arg }
+    }
+
+    moveTo(x, y) {
+        this.customGraphics.currentPath.push(["moveTo", x, y]);
+    }
+
+    lineTo(x, y) {
+        this.customGraphics.currentPath.push(["lineTo", x, y]);
+    }
+
+    bezierCurveTo(x1, y1, x2, y2, x, y) {
+        this.customGraphics.currentPath.push(["bezierCurveTo", x1, y1, x2, y2, x, y]);
+    }
+
+    quadraticCurveTo(x1, y1, x, y) {
+        this.customGraphics.currentPath.push(["quadraticCurveTo", x1, y1, x, y]);
+    }
+
+    closePath() {
+        this.customGraphics.currentPath.push(["closePath"]);
+    }
+
+    drawEllipse(left, top, dX, dY) {
+        if (this.customGraphics.currentPath === undefined) {
+            this.customGraphics.currentPath = [];
+        }
+        this.customGraphics.currentPath.push(["ellipse", left, top, dX, dY]);
+    }
+
+    drawRoundRect(x, y, width, height, cornerRadius) {
+        if (this.customGraphics.currentPath === undefined) {
+            this.customGraphics.currentPath = [];
+        }
+        this.customGraphics.currentPath.push(["rect", x, y, width, height, cornerRadius]);
+    }
+
+    customRender(render, x, y) {
+        let tx = 0.0;
+        let ty = 0.0;
+        if (render.ctx instanceof Laya.WebGLContext2D) {
+            const mat = render.ctx._curMat;
+            tx = render.ctx._curMat.tx / render.ctx._curMat.a
+            ty = render.ctx._curMat.ty / render.ctx._curMat.d
+        }
+        if (typeof this.customGraphics.fillStyle === 'string') {
+            if (render.ctx instanceof Laya.WebGLContext2D) {
+                if (this.customGraphics.fillStyle.startsWith('rgba')) {
+                    const components = this.customGraphics.fillStyle.replace('rgba(', '').replace(')').split(',');
+                    render.ctx.fillStyle = Laya.Color.create('#' + parseInt(components[0]).toString(16) + parseInt(components[1]).toString(16) + parseInt(components[2]).toString(16))
+                }
+                else {
+                    render.ctx.fillStyle = this.customGraphics.fillStyle;
+                }
+            }
+            else {
+                render.ctx.fillStyle = this.customGraphics.fillStyle;
+            }
+        }
+        if (typeof this.customGraphics.strokeStyle === 'string') {
+            if (render.ctx instanceof Laya.WebGLContext2D) {
+                if (this.customGraphics.strokeStyle.startsWith('rgba')) {
+                    const components = this.customGraphics.strokeStyle.replace('rgba(', '').replace(')').split(',');
+                    render.ctx.strokeStyle = Laya.Color.create('#' + parseInt(components[0]).toString(16) + parseInt(components[1]).toString(16) + parseInt(components[2]).toString(16))
+                }
+                else {
+                    render.ctx.strokeStyle = this.customGraphics.strokeStyle;
+                }
+            }
+            else {
+                render.ctx.strokeStyle = this.customGraphics.strokeStyle;
+            }
+        }
+        render.ctx.lineCap = this.customGraphics.lineCap;
+        render.ctx.lineJoin = this.customGraphics.lineJoin;
+        render.ctx.lineWidth = this.customGraphics.lineWidth;
+        render.ctx.miterLimit = this.customGraphics.miterLimit;
+        if (this.customGraphics.strokeDash !== undefined) {
+            const { arr, arg } = this.customGraphics.strokeDash;
+            const newArr = [];
+            arr.forEach(item => newArr.push(item));
+            newArr.push(arg);
+            render.ctx.setLineDash && render.ctx.setLineDash(newArr);
+        }
+        if (this.customGraphics.currentPath instanceof Array) {
+            render.ctx.beginPath();
+            this.customGraphics.currentPath.forEach((item) => {
+                if (item[0] === "moveTo") {
+                    const tPoint = { x: item[1], y: item[2] };
+                    render.ctx.moveTo(tPoint.x, tPoint.y);
+                }
+                else if (item[0] === "lineTo") {
+                    const tPoint = { x: item[1], y: item[2] };
+                    render.ctx.lineTo(tPoint.x, tPoint.y);
+                }
+                else if (item[0] === "bezierCurveTo") {
+                    const tPoint1 = { x: item[1], y: item[2] };
+                    const tPoint2 = { x: item[3], y: item[4] };
+                    const tPoint3 = { x: item[5], y: item[6] };
+                    render.ctx.bezierCurveTo(tPoint1.x, tPoint1.y, tPoint2.x, tPoint2.y, tPoint3.x, tPoint3.y);
+                }
+                else if (item[0] === "quadraticCurveTo") {
+                    const tPoint1 = { x: item[1], y: item[2] };
+                    const tPoint2 = { x: item[3], y: item[4] };
+                    render.ctx.quadraticCurveTo(tPoint1.x, tPoint1.y, tPoint2.x, tPoint2.y);
+                }
+                else if (item[0] === "closePath") {
+                    render.ctx.closePath();
+                }
+                else if (item[0] === "ellipse") {
+                    let x = item[1];
+                    let y = item[2];
+                    let w = item[3];
+                    let h = item[4];
+                    var kappa = .5522848,
+                        ox = (w / 2) * kappa,
+                        oy = (h / 2) * kappa,
+                        xe = x + w,
+                        ye = y + h,
+                        xm = x + w / 2,
+                        ym = y + h / 2;
+
+                    render.ctx.beginPath();
+                    render.ctx.moveTo(x, ym);
+                    render.ctx.bezierCurveTo(x, ym - oy, xm - ox, y, xm, y);
+                    render.ctx.bezierCurveTo(xm + ox, y, xe, ym - oy, xe, ym);
+                    render.ctx.bezierCurveTo(xe, ym + oy, xm + ox, ye, xm, ye);
+                    render.ctx.bezierCurveTo(xm - ox, ye, x, ym + oy, x, ym);
+                }
+                else if (item[0] === "rect") {
+                    const tPoint = { x: item[1], y: item[2] };
+                    let x = tPoint.x;
+                    let y = tPoint.y;
+                    let width = item[3];
+                    let height = item[4];
+                    let radius = item[5];
+                    render.ctx.moveTo(x + radius, y);
+                    render.ctx.lineTo(x + width - radius, y);
+                    render.ctx.quadraticCurveTo(x + width, y, x + width, y + radius);
+                    render.ctx.lineTo(x + width, y + height - radius);
+                    render.ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
+                    render.ctx.lineTo(x + radius, y + height);
+                    render.ctx.quadraticCurveTo(x, y + height, x, y + height - radius);
+                    render.ctx.lineTo(x, y + radius);
+                    render.ctx.quadraticCurveTo(x, y, x + radius, y);
+                    render.ctx.lineTo(x, y);
+                    render.ctx.closePath();
+                }
+            })
+        }
+        this.customGraphics.fillStyle && render.ctx.fill();
+        this.customGraphics.strokeStyle && render.ctx.stroke();
+    }
+
+}
+
+class VectorLayer extends Laya.Sprite {
+
+    _sprite;
+    _drawedFrame = 0;
+    _keepFrameCache = {};
+
+    constructor(sprite) {
+        super();
+        this._sprite = sprite;
+        this._resetKeepFrameCache();
+    }
+
+    stepToFrame(frame) {
+        if (frame < this._sprite.frames.length) {
+            this._drawFrame(frame);
+        }
+    }
+
+    _resetKeepFrameCache() {
+        this._keepFrameCache = {}
+        let lastKeep = 0;
+        this._sprite.frames.forEach((frameItem, idx) => {
+            if (!this._isKeepFrame(frameItem)) {
+                lastKeep = idx;
+            }
+            else {
+                this._keepFrameCache[idx] = lastKeep;
+            }
+        });
+    }
+
+    _requestKeepFrame(frame) {
+        return this._keepFrameCache[frame]
+    }
+
+    _isKeepFrame(frameItem) {
+        return frameItem.shapes && frameItem.shapes.length > 0 && frameItem.shapes[0].type === "keep";
+    }
+
+    _drawFrame(frame) {
+        if (frame < this._sprite.frames.length) {
+            let frameItem = this._sprite.frames[frame];
+            if (this._isKeepFrame(frameItem)) {
+                if (this._drawedFrame === this._requestKeepFrame(frame)) {
+                    return;
+                }
+            }
+            this.removeChildren(0, this.numChildren);
+            frameItem.shapes.forEach((shape) => {
+                if (shape.type === "shape" && shape.pathArgs && shape.pathArgs.d) {
+                    this.addChild(Renderer.requestBezierShape(new BezierPath(shape.pathArgs.d, shape.transform, shape.styles)));
+                }
+                else if (shape.type === "ellipse" && shape.pathArgs) {
+                    this.addChild(Renderer.requestEllipseShape(new EllipsePath(parseFloat(shape.pathArgs.x) || 0.0, parseFloat(shape.pathArgs.y) || 0.0, parseFloat(shape.pathArgs.radiusX) || 0.0, parseFloat(shape.pathArgs.radiusY) || 0.0, shape.transform, shape.styles)));
+                }
+                else if (shape.type === "rect" && shape.pathArgs) {
+                    this.addChild(Renderer.requestRectShape(new RectPath(parseFloat(shape.pathArgs.x) || 0.0, parseFloat(shape.pathArgs.y) || 0.0, parseFloat(shape.pathArgs.width) || 0.0, parseFloat(shape.pathArgs.height) || 0.0, parseFloat(shape.pathArgs.cornerRadius) || 0.0, shape.transform, shape.styles)));
+                }
+            })
+            this._drawedFrame = frame;
+        }
+    }
+
+}
+
+export class Renderer {
+
+    _owner;
+
+    constructor(owner) {
+        this._owner = owner;
+    }
+
+    requestContentLayer(sprite) {
+        let bitmap;
+        let contentLayer = new Laya.Sprite();
+        if (sprite.imageKey) {
+            bitmap = this._owner._dynamicImage[sprite.imageKey] || this._owner._videoItem.images[sprite.imageKey];
+            if (bitmap) {
+                contentLayer.addChild(this.requestBitmapLayer(bitmap, this._owner._dynamicImageTransform[sprite.imageKey], sprite.frames));
+            }
+            if (this._owner._dynamicText[sprite.imageKey]) {
+                contentLayer.textLayer = this._owner._dynamicText[sprite.imageKey];
+                contentLayer.addChild(this._owner._dynamicText[sprite.imageKey])
+            }
+        }
+        contentLayer.addChild(this.requestVectorLayer(sprite));
+        contentLayer.stepToFrame = (frame) => {
+            if (frame < sprite.frames.length) {
+                let frameItem = sprite.frames[frame];
+                if (frameItem.alpha > 0.0) {
+                    contentLayer.alpha = frameItem.alpha;
+                    contentLayer.visible = true;
+                    contentLayer.transform = new Laya.Matrix(frameItem.transform.a, frameItem.transform.b, frameItem.transform.c, frameItem.transform.d, frameItem.transform.tx, frameItem.transform.ty);
+                    contentLayer.setBounds(new Laya.Rectangle(frameItem.layout.x, frameItem.layout.y, frameItem.layout.width, frameItem.layout.height));
+                    contentLayer.mask = undefined;
+                    if (frameItem.maskPath) {
+                        contentLayer.mask = Renderer.requestBezierShape(frameItem.maskPath);
+                    }
+                    if (contentLayer.textLayer) {
+                        let offsetX = (contentLayer.textLayer.offset !== undefined && contentLayer.textLayer.offset.x !== undefined) ? contentLayer.textLayer.offset.x : 0;
+                        let offsetY = (contentLayer.textLayer.offset !== undefined && contentLayer.textLayer.offset.y !== undefined) ? contentLayer.textLayer.offset.y : 0;
+                        contentLayer.textLayer.x = (frameItem.layout.width - contentLayer.textLayer.getBounds().width) / 2.0 + offsetX;
+                        contentLayer.textLayer.y = (frameItem.layout.height - contentLayer.textLayer.getBounds().height) / 2.0 + offsetY;
+                    }
+                }
+                else {
+                    contentLayer.visible = false;
+                }
+            }
+            for (let index = 0; index < contentLayer.numChildren; index++) {
+                const child = contentLayer.getChildAt(index);
+                child.stepToFrame && child.stepToFrame(frame);
+            }
+        }
+        return contentLayer;
+    }
+
+    requestBitmapLayer(bitmap, bitmapTransform, frames) {
+        let layer = new Laya.Sprite();
+        if (bitmap.indexOf("iVBO") === 0 || bitmap.indexOf("/9j/2w") === 0) {
+            layer.loadImage('data:image/png;base64,' + bitmap);
+        }
+        else {
+            layer.loadImage(bitmap);
+        }
+        if (bitmapTransform !== undefined) {
+            layer.transform = new Laya.Matrix(bitmapTransform[0], bitmapTransform[1], bitmapTransform[2], bitmapTransform[3], bitmapTransform[4], bitmapTransform[5]);
+        }
+        layer.frames = frames;
+        layer.stepToFrame = (frame) => { }
+        return layer;
+    }
+
+    requestVectorLayer(sprite) {
+        return new VectorLayer(sprite);
+    }
+
+    drawFrame(frame) {
+        for (let index = 0; index < this._owner.numChildren; index++) {
+            const child = this._owner.getChildAt(index);
+            child.stepToFrame && child.stepToFrame(frame);
+        }
+    }
+
+    static resetStyle(obj, shape) {
+        const styles = obj._styles;
+        if (!styles) { return; }
+        if (styles && styles.stroke) {
+            shape.beginStroke(`rgba(${parseInt(styles.stroke[0] * 255)}, ${parseInt(styles.stroke[1] * 255)}, ${parseInt(styles.stroke[2] * 255)}, ${styles.stroke[3]})`);
+        }
+        if (styles) {
+            const width = styles.strokeWidth || 0.0;
+            const caps = styles.lineCap || '';
+            const joints = styles.lineJoin || '';
+            const miterLimit = styles.miterLimit || '';
+            shape.setStrokeStyle(width, caps, joints, miterLimit, true);
+        }
+        if (styles && styles.fill) {
+            shape.beginFill(`rgba(${parseInt(styles.fill[0] * 255)}, ${parseInt(styles.fill[1] * 255)}, ${parseInt(styles.fill[2] * 255)}, ${styles.fill[3]})`);
+        }
+        if (styles && styles.lineDash) {
+            shape.setStrokeDash([styles.lineDash[0], styles.lineDash[1]], styles.lineDash[2]);
+        }
+    }
+
+    static requestBezierShape(obj) {
+        const shape = new ShapeSprite()
+        const g = shape;
+        this.resetStyle(obj, shape);
+        let currentPoint = { x: 0, y: 0, x1: 0, y1: 0, x2: 0, y2: 0 }
+        const d = obj._d.replace(/([a-zA-Z])/g, '|||$1 ').replace(/,/g, ' ');
+        d.split('|||').forEach(segment => {
+            if (segment.length == 0) { return; }
+            const firstLetter = segment.substr(0, 1);
+            if (validMethods.indexOf(firstLetter) >= 0) {
+                const args = segment.substr(1).trim().split(" ");
+                this.drawBezierElement(g, currentPoint, firstLetter, args);
+            }
+        })
+        if (obj._transform !== undefined && obj._transform !== null) {
+            shape.transform = new Laya.Matrix(obj._transform.a, obj._transform.b, obj._transform.c, obj._transform.d, obj._transform.tx, obj._transform.ty);
+        }
+        return shape;
+    }
+
+    static drawBezierElement(g, currentPoint, method, args) {
+        switch (method) {
+            case 'M':
+                currentPoint.x = Number(args[0]);
+                currentPoint.y = Number(args[1]);
+                g.moveTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'm':
+                currentPoint.x += Number(args[0]);
+                currentPoint.y += Number(args[1]);
+                g.moveTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'L':
+                currentPoint.x = Number(args[0]);
+                currentPoint.y = Number(args[1]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'l':
+                currentPoint.x += Number(args[0]);
+                currentPoint.y += Number(args[1]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'H':
+                currentPoint.x = Number(args[0]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'h':
+                currentPoint.x += Number(args[0]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'V':
+                currentPoint.y = Number(args[0]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'v':
+                currentPoint.y += Number(args[0]);
+                g.lineTo(currentPoint.x, currentPoint.y);
+                break;
+            case 'C':
+                currentPoint.x1 = Number(args[0]);
+                currentPoint.y1 = Number(args[1]);
+                currentPoint.x2 = Number(args[2]);
+                currentPoint.y2 = Number(args[3]);
+                currentPoint.x = Number(args[4]);
+                currentPoint.y = Number(args[5]);
+                g.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                break;
+            case 'c':
+                currentPoint.x1 = currentPoint.x + Number(args[0]);
+                currentPoint.y1 = currentPoint.y + Number(args[1]);
+                currentPoint.x2 = currentPoint.x + Number(args[2]);
+                currentPoint.y2 = currentPoint.y + Number(args[3]);
+                currentPoint.x += Number(args[4]);
+                currentPoint.y += Number(args[5]);
+                g.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                break;
+            case 'S':
+                if (currentPoint.x1 && currentPoint.y1 && currentPoint.x2 && currentPoint.y2) {
+                    currentPoint.x1 = currentPoint.x - currentPoint.x2 + currentPoint.x;
+                    currentPoint.y1 = currentPoint.y - currentPoint.y2 + currentPoint.y;
+                    currentPoint.x2 = Number(args[0]);
+                    currentPoint.y2 = Number(args[1]);
+                    currentPoint.x = Number(args[2]);
+                    currentPoint.y = Number(args[3]);
+                    g.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                } else {
+                    currentPoint.x1 = Number(args[0]);
+                    currentPoint.y1 = Number(args[1]);
+                    currentPoint.x = Number(args[2]);
+                    currentPoint.y = Number(args[3]);
+                    g.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                }
+                break;
+            case 's':
+                if (currentPoint.x1 && currentPoint.y1 && currentPoint.x2 && currentPoint.y2) {
+                    currentPoint.x1 = currentPoint.x - currentPoint.x2 + currentPoint.x;
+                    currentPoint.y1 = currentPoint.y - currentPoint.y2 + currentPoint.y;
+                    currentPoint.x2 = currentPoint.x + Number(args[0]);
+                    currentPoint.y2 = currentPoint.y + Number(args[1]);
+                    currentPoint.x += Number(args[2]);
+                    currentPoint.y += Number(args[3]);
+                    g.bezierCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x2, currentPoint.y2, currentPoint.x, currentPoint.y);
+                } else {
+                    currentPoint.x1 = currentPoint.x + Number(args[0]);
+                    currentPoint.y1 = currentPoint.y + Number(args[1]);
+                    currentPoint.x += Number(args[2]);
+                    currentPoint.y += Number(args[3]);
+                    g.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                }
+                break;
+            case 'Q':
+                currentPoint.x1 = Number(args[0]);
+                currentPoint.y1 = Number(args[1]);
+                currentPoint.x = Number(args[2]);
+                currentPoint.y = Number(args[3]);
+                g.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                break;
+            case 'q':
+                currentPoint.x1 = currentPoint.x + Number(args[0]);
+                currentPoint.y1 = currentPoint.y + Number(args[1]);
+                currentPoint.x += Number(args[2]);
+                currentPoint.y += Number(args[3]);
+                g.quadraticCurveTo(currentPoint.x1, currentPoint.y1, currentPoint.x, currentPoint.y);
+                break;
+            case 'A':
+                break;
+            case 'a':
+                break;
+            case 'Z':
+            case 'z':
+                g.closePath();
+                break;
+            default:
+                break;
+        }
+    }
+
+    static requestEllipseShape(obj) {
+        const shape = new ShapeSprite()
+        const g = shape;
+        this.resetStyle(obj, shape);
+        g.drawEllipse(obj._x - obj._radiusX, obj._y - obj._radiusY, obj._radiusX * 2, obj._radiusY * 2);
+        if (obj._transform !== undefined && obj._transform !== null) {
+            shape.transform = new Laya.Matrix(obj._transform.a, obj._transform.b, obj._transform.c, obj._transform.d, obj._transform.tx, obj._transform.ty);
+        }
+        return shape;
+    }
+
+    static requestRectShape(obj) {
+        const shape = new ShapeSprite()
+        const g = shape;
+        this.resetStyle(obj, shape);
+        g.drawRoundRect(obj._x, obj._y, obj._width, obj._height, obj._cornerRadius);
+        if (obj._transform !== undefined && obj._transform !== null) {
+            shape.transform = new Laya.Matrix(obj._transform.a, obj._transform.b, obj._transform.c, obj._transform.d, obj._transform.tx, obj._transform.ty);
+        }
+        return shape;
+    }
+
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/bezierPath.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/bezierPath.js
new file mode 100644
index 0000000..9faabcb
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/bezierPath.js
@@ -0,0 +1,14 @@
+export class BezierPath {
+
+    _d;
+    _transform;
+    _styles;
+    _shape;
+
+    constructor(d, transform, styles) {
+        this._d = d;
+        this._transform = transform;
+        this._styles = styles;
+    }
+
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/ellipsePath.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/ellipsePath.js
new file mode 100644
index 0000000..1b5e0ce
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/ellipsePath.js
@@ -0,0 +1,23 @@
+
+import { BezierPath } from './bezierPath'
+
+export class EllipsePath extends BezierPath {
+
+    _x;
+    _y;
+    _radiusX;
+    _radiusY;
+    _transform;
+    _styles;
+
+    constructor(x, y, radiusX, radiusY, transform, styles) {
+        super();
+        this._x = x;
+        this._y = y;
+        this._radiusX = radiusX;
+        this._radiusY = radiusY;
+        this._transform = transform;
+        this._styles = styles;
+    }
+
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/frameEntity.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/frameEntity.js
new file mode 100644
index 0000000..821adc3
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/frameEntity.js
@@ -0,0 +1,151 @@
+import { BezierPath } from './bezierPath'
+
+export class FrameEntity {
+
+    alpha = 0.0;
+
+    transform = {
+        a: 1.0,
+        b: 0.0,
+        c: 0.0,
+        d: 1.0,
+        tx: 0.0,
+        ty: 0.0,
+    };
+
+    layout = {
+        x: 0.0,
+        y: 0.0,
+        width: 0.0,
+        height: 0.0,
+    }
+
+    nx = 0.0;
+
+    ny = 0.0;
+
+    /**
+     * BezierPath
+     */
+    maskPath = null;
+
+    /**
+     * Object[]
+     */
+    shapes = [];
+
+    constructor(spec) {
+        this.alpha = parseFloat(spec.alpha) || 0.0;
+        if (spec.layout) {
+            this.layout.x = parseFloat(spec.layout.x) || 0.0;
+            this.layout.y = parseFloat(spec.layout.y) || 0.0;
+            this.layout.width = parseFloat(spec.layout.width) || 0.0;
+            this.layout.height = parseFloat(spec.layout.height) || 0.0;
+        }
+        if (spec.transform) {
+            this.transform.a = parseFloat(spec.transform.a) || 1.0;
+            this.transform.b = parseFloat(spec.transform.b) || 0.0;
+            this.transform.c = parseFloat(spec.transform.c) || 0.0;
+            this.transform.d = parseFloat(spec.transform.d) || 1.0;
+            this.transform.tx = parseFloat(spec.transform.tx) || 0.0;
+            this.transform.ty = parseFloat(spec.transform.ty) || 0.0;
+        }
+        if (spec.clipPath && spec.clipPath.length > 0) {
+            this.maskPath = new BezierPath(spec.clipPath, undefined, { fill: "#000000" });
+        }
+        if (spec.shapes) {
+            if (spec.shapes instanceof Array) {
+                spec.shapes.forEach(shape => {
+                    shape.pathArgs = shape.args;
+                    switch (shape.type) {
+                        case 0:
+                            shape.type = "shape";
+                            shape.pathArgs = shape.shape;
+                            break;
+                        case 1:
+                            shape.type = "rect";
+                            shape.pathArgs = shape.rect;
+                            break;
+                        case 2:
+                            shape.type = "ellipse";
+                            shape.pathArgs = shape.ellipse;
+                            break;
+                        case 3:
+                            shape.type = "keep";
+                            break;
+                    }
+                    if (shape.styles) {
+                        if (shape.styles.fill) {
+                            if (typeof shape.styles.fill["r"] === "number") shape.styles.fill[0] = shape.styles.fill["r"];
+                            if (typeof shape.styles.fill["g"] === "number") shape.styles.fill[1] = shape.styles.fill["g"];
+                            if (typeof shape.styles.fill["b"] === "number") shape.styles.fill[2] = shape.styles.fill["b"];
+                            if (typeof shape.styles.fill["a"] === "number") shape.styles.fill[3] = shape.styles.fill["a"];
+                        }
+                        if (shape.styles.stroke) {
+                            if (typeof shape.styles.stroke["r"] === "number") shape.styles.stroke[0] = shape.styles.stroke["r"];
+                            if (typeof shape.styles.stroke["g"] === "number") shape.styles.stroke[1] = shape.styles.stroke["g"];
+                            if (typeof shape.styles.stroke["b"] === "number") shape.styles.stroke[2] = shape.styles.stroke["b"];
+                            if (typeof shape.styles.stroke["a"] === "number") shape.styles.stroke[3] = shape.styles.stroke["a"];
+                        }
+                        let lineDash = shape.styles.lineDash || []
+                        if (shape.styles.lineDashI > 0) {
+                            lineDash.push(shape.styles.lineDashI)
+                        }
+                        if (shape.styles.lineDashII > 0) {
+                            if (lineDash.length < 1) { lineDash.push(0) }
+                            lineDash.push(shape.styles.lineDashII)
+                            lineDash.push(0)
+                        }
+                        if (shape.styles.lineDashIII > 0) {
+                            if (lineDash.length < 2) { lineDash.push(0); lineDash.push(0); }
+                            lineDash[2] = shape.styles.lineDashIII
+                        }
+                        shape.styles.lineDash = lineDash
+
+                        switch (shape.styles.lineJoin) {
+                            case 0:
+                                shape.styles.lineJoin = "miter";
+                                break;
+                            case 1:
+                                shape.styles.lineJoin = "round";
+                                break;
+                            case 2:
+                                shape.styles.lineJoin = "bevel";
+                                break;
+                        }
+
+                        switch (shape.styles.lineCap) {
+                            case 0:
+                                shape.styles.lineCap = "butt";
+                                break;
+                            case 1:
+                                shape.styles.lineCap = "round";
+                                break;
+                            case 2:
+                                shape.styles.lineCap = "square";
+                                break;
+                        }
+                    }
+                })
+            }
+            if (spec.shapes[0] && spec.shapes[0].type === "keep") {
+                this.shapes = FrameEntity.lastShapes;
+            }
+            else {
+                this.shapes = spec.shapes
+                FrameEntity.lastShapes = spec.shapes;
+            }
+        }
+        let llx = this.transform.a * this.layout.x + this.transform.c * this.layout.y + this.transform.tx;
+        let lrx = this.transform.a * (this.layout.x + this.layout.width) + this.transform.c * this.layout.y + this.transform.tx;
+        let lbx = this.transform.a * this.layout.x + this.transform.c * (this.layout.y + this.layout.height) + this.transform.tx;
+        let rbx = this.transform.a * (this.layout.x + this.layout.width) + this.transform.c * (this.layout.y + this.layout.height) + this.transform.tx;
+        let lly = this.transform.b * this.layout.x + this.transform.d * this.layout.y + this.transform.ty;
+        let lry = this.transform.b * (this.layout.x + this.layout.width) + this.transform.d * this.layout.y + this.transform.ty;
+        let lby = this.transform.b * this.layout.x + this.transform.d * (this.layout.y + this.layout.height) + this.transform.ty;
+        let rby = this.transform.b * (this.layout.x + this.layout.width) + this.transform.d * (this.layout.y + this.layout.height) + this.transform.ty;
+        this.nx = Math.min(Math.min(lbx, rbx), Math.min(llx, lrx));
+        this.ny = Math.min(Math.min(lby, rby), Math.min(lly, lry));
+    }
+
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/mockWorker.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/mockWorker.js
new file mode 100644
index 0000000..8418790
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/mockWorker.js
@@ -0,0 +1,207 @@
+const { ProtoMovieEntity } = require("./proto")
+const assignUtils = require('pako/lib/utils/common').assign;
+const inflate = require("pako/lib/inflate")
+const pako = {}
+assignUtils(pako, inflate);
+
+const Uint8ToString = function (u8a) {
+    var CHUNK_SZ = 0x8000;
+    var c = [];
+    for (var i = 0; i < u8a.length; i += CHUNK_SZ) {
+        c.push(String.fromCharCode.apply(null, u8a.subarray(i, i + CHUNK_SZ)));
+    }
+    return c.join("");
+}
+
+const actions = {
+
+    loadAssets: (url, cb, failure) => {
+
+        if (typeof JSZipUtils === "object" && typeof JSZip === "function") {
+            if (url.toString() == "[object File]"){
+                actions._readBlobAsArrayBuffer(url, function (arrayBufferSVGA) {
+                    const dataHeader = new Uint8Array(arrayBufferSVGA, 0, 4)
+                    if (dataHeader[0] == 80 && dataHeader[1] == 75 && dataHeader[2] == 3 && dataHeader[3] == 4) {
+                        JSZip.loadAsync(arrayBufferSVGA).then(function (zip) {
+                            actions._decodeAssets(zip, cb);
+                        });
+                    }
+                    else {
+                        actions.load_viaProto(arrayBufferSVGA, cb, failure);
+                    }
+                });
+
+            } else if(url.indexOf("data:svga/1.0;base64,") >= 0) {
+                var arrayBufferSVGA = actions._base64ToArrayBuffer(url.substring(21));
+                JSZip.loadAsync(arrayBufferSVGA).then(function (zip) {
+                    actions._decodeAssets(zip, cb);
+                });
+            }else if(url.indexOf("data:svga/2.0;base64,") >= 0){
+                var arrayBufferSVGA = actions._base64ToArrayBuffer(url.substring(21));
+                actions.load_viaProto(arrayBufferSVGA, cb, failure);
+            }else{
+                JSZipUtils.getBinaryContent(url, function (err, data) {
+                    if (err) {
+                        failure && failure(err);
+                        console.error(err);
+                        throw err;
+                    }
+                    else {
+                        const dataHeader = new Uint8Array(data, 0, 4)
+                        if (dataHeader[0] == 80 && dataHeader[1] == 75 && dataHeader[2] == 3 && dataHeader[3] == 4) {
+                            JSZip.loadAsync(data).then(function (zip) {
+                                actions._decodeAssets(zip, cb);
+                            });
+                        }
+                        else {
+                            actions.load_viaProto(data, cb, failure);
+                        }
+                    }
+                });
+            }
+        }
+        else {
+            const req = new XMLHttpRequest()
+            req.open("GET", url, true);
+            req.responseType = "arraybuffer"
+            // load success
+            req.onload = () => {
+                actions.load_viaProto(req.response, cb, failure);
+            };
+            // load error
+            req.onerror = (err) => {
+                // Do not log to console or throw, if failure() exists
+                if (failure) {
+                    failure(err);
+                    return;
+                }
+                console.error(err);
+                throw err;
+            };
+            req.send()
+        }
+    },
+
+    load_viaProto: (arraybuffer, cb, failure) => {
+        try {
+            const inflatedData = pako.inflate(arraybuffer);
+            const movieData = ProtoMovieEntity.decode(inflatedData);
+            let images = {};
+            actions._loadImages(images, undefined, movieData, function () {
+                movieData.ver = "2.0";
+                cb({
+                    movie: movieData,
+                    images,
+                })
+            })
+        } catch (err) {
+            // Do not log to console or throw, if failure() exists
+            if (failure) {
+                failure(err);
+                return;
+            }
+            console.error(err);
+            throw err;
+        }
+    },
+
+    _decodeAssets: (zip, cb) => {
+
+        var version = "1.0";
+        if(zip.file("movie.binary")){
+            version = "1.5";
+        }
+
+        zip.file("movie.spec").async("string").then(function (spec) {
+            let movieData = JSON.parse(spec);
+            let images = {};
+
+            movieData.ver = version;
+
+            actions._loadImages(images, zip, movieData, function () {
+                cb({
+                    movie: movieData,
+                    images,
+                })
+            })
+        })
+    },
+
+    _loadImages: function (images, zip, movieData, imagesLoadedBlock) {
+        if (typeof movieData === "object" && movieData.$type == ProtoMovieEntity) {
+            var finished = true;
+            if (!zip) {
+                for (const key in movieData.images) {
+                    if (movieData.images.hasOwnProperty(key)) {
+                        const element = movieData.images[key];
+                        let value;
+                        try {
+                          value = Uint8ToString(element);
+                        } catch(e) {
+                          // fix windows xp chrome 下首次执行 String.fromCharCode.apply报错问题
+                          value = Uint8ToString(element);
+                        }
+                        images[key] = btoa(value);
+                    }
+                }
+            }
+            else {
+                for (const key in movieData.images) {
+                    if (movieData.images.hasOwnProperty(key)) {
+                        const element = movieData.images[key];
+                        const value = Uint8ToString(element);
+                        if (images.hasOwnProperty(key)) {
+                            continue;
+                        }
+                        finished = false;
+                        zip.file(value + ".png").async("base64").then(function (data) {
+                            images[key] = data;
+                            actions._loadImages(images, zip, movieData, imagesLoadedBlock);
+                        }.bind(this))
+                        break;
+                    }
+                }
+            }
+            finished && imagesLoadedBlock.call(this)
+        }
+        else {
+            var finished = true;
+            for (var key in movieData.images) {
+                if (movieData.images.hasOwnProperty(key)) {
+                    var element = movieData.images[key];
+                    if (images.hasOwnProperty(key)) {
+                        continue;
+                    }
+                    finished = false;
+                    zip.file(element + ".png").async("base64").then(function (data) {
+                        images[key] = data;
+                        actions._loadImages(images, zip, movieData, imagesLoadedBlock);
+                    }.bind(this))
+                    break;
+                }
+            }
+            finished && imagesLoadedBlock.call(this)
+        }
+    },
+
+    _base64ToArrayBuffer: (base64) => {
+        var binary_string =  window.atob(base64);
+        var len = binary_string.length;
+        var bytes = new Uint8Array( len );
+        for (var i = 0; i < len; i++)        {
+            bytes[i] = binary_string.charCodeAt(i);
+        }
+        return bytes.buffer;
+    },
+
+    _readBlobAsArrayBuffer: (blob, callback) => {
+        var reader = new FileReader();
+        reader.onload = function(e) {callback(e.target.result);};
+        reader.readAsArrayBuffer(blob);
+    }
+
+}
+
+module.exports = (data, cb, failure) => {
+    actions['loadAssets'](data, cb, failure);
+}
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/parser.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/parser.js
new file mode 100644
index 0000000..d20536c
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/parser.js
@@ -0,0 +1,24 @@
+import { VideoEntity } from './videoEntity'
+import MockWorker from './mockWorker'
+
+export class Parser {
+
+    /**
+     * url: 资源路径
+     * success(VideoEntity videoItem)
+     */
+    load(url, success, failure) {
+        this.loadViaWorker(url, success, failure);
+    }
+
+    loadViaWorker(url, success, failure) {
+        MockWorker(url, (data) => {
+            let movie = data.movie;
+            movie["version"] = data.ver;
+            let images = data.images;
+            let videoItem = new VideoEntity(movie, images);
+            success(videoItem);
+        }, failure)
+    }
+
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/proto.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/proto.js
new file mode 100644
index 0000000..89b75c5
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/proto.js
@@ -0,0 +1,5 @@
+const protobuf = require("protobufjs/light")
+const svgaDescriptor = JSON.parse(`{"nested":{"com":{"nested":{"opensource":{"nested":{"svga":{"options":{"objc_class_prefix":"SVGAProto","java_package":"com.opensource.svgaplayer.proto"},"nested":{"MovieParams":{"fields":{"viewBoxWidth":{"type":"float","id":1},"viewBoxHeight":{"type":"float","id":2},"fps":{"type":"int32","id":3},"frames":{"type":"int32","id":4}}},"SpriteEntity":{"fields":{"imageKey":{"type":"string","id":1},"frames":{"rule":"repeated","type":"FrameEntity","id":2},"matteKey":{"type":"string","id":3}}},"AudioEntity":{"fields":{"audioKey":{"type":"string","id":1},"startFrame":{"type":"int32","id":2},"endFrame":{"type":"int32","id":3},"startTime":{"type":"int32","id":4},"totalTime":{"type":"int32","id":5}}},"Layout":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4}}},"Transform":{"fields":{"a":{"type":"float","id":1},"b":{"type":"float","id":2},"c":{"type":"float","id":3},"d":{"type":"float","id":4},"tx":{"type":"float","id":5},"ty":{"type":"float","id":6}}},"ShapeEntity":{"oneofs":{"args":{"oneof":["shape","rect","ellipse"]}},"fields":{"type":{"type":"ShapeType","id":1},"shape":{"type":"ShapeArgs","id":2},"rect":{"type":"RectArgs","id":3},"ellipse":{"type":"EllipseArgs","id":4},"styles":{"type":"ShapeStyle","id":10},"transform":{"type":"Transform","id":11}},"nested":{"ShapeType":{"values":{"SHAPE":0,"RECT":1,"ELLIPSE":2,"KEEP":3}},"ShapeArgs":{"fields":{"d":{"type":"string","id":1}}},"RectArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"width":{"type":"float","id":3},"height":{"type":"float","id":4},"cornerRadius":{"type":"float","id":5}}},"EllipseArgs":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"radiusX":{"type":"float","id":3},"radiusY":{"type":"float","id":4}}},"ShapeStyle":{"fields":{"fill":{"type":"RGBAColor","id":1},"stroke":{"type":"RGBAColor","id":2},"strokeWidth":{"type":"float","id":3},"lineCap":{"type":"LineCap","id":4},"lineJoin":{"type":"LineJoin","id":5},"miterLimit":{"type":"float","id":6},"lineDashI":{"type":"float","id":7},"lineDashII":{"type":"float","id":8},"lineDashIII":{"type":"float","id":9}},"nested":{"RGBAColor":{"fields":{"r":{"type":"float","id":1},"g":{"type":"float","id":2},"b":{"type":"float","id":3},"a":{"type":"float","id":4}}},"LineCap":{"values":{"LineCap_BUTT":0,"LineCap_ROUND":1,"LineCap_SQUARE":2}},"LineJoin":{"values":{"LineJoin_MITER":0,"LineJoin_ROUND":1,"LineJoin_BEVEL":2}}}}}},"FrameEntity":{"fields":{"alpha":{"type":"float","id":1},"layout":{"type":"Layout","id":2},"transform":{"type":"Transform","id":3},"clipPath":{"type":"string","id":4},"shapes":{"rule":"repeated","type":"ShapeEntity","id":5}}},"MovieEntity":{"fields":{"version":{"type":"string","id":1},"params":{"type":"MovieParams","id":2},"images":{"keyType":"string","type":"bytes","id":3},"sprites":{"rule":"repeated","type":"SpriteEntity","id":4},"audios":{"rule":"repeated","type":"AudioEntity","id":5}}}}}}}}}}}`)
+
+export const proto = protobuf.Root.fromJSON(svgaDescriptor);
+export const ProtoMovieEntity = proto.lookupType("com.opensource.svga.MovieEntity");
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/rectPath.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/rectPath.js
new file mode 100644
index 0000000..fa424a4
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/rectPath.js
@@ -0,0 +1,24 @@
+import { BezierPath } from './bezierPath'
+
+export class RectPath extends BezierPath {
+
+    _x;
+    _y;
+    _width;
+    _height;
+    _cornerRadius;
+    _transform;
+    _styles;
+
+    constructor(x, y, width, height, cornerRadius, transform, styles) {
+        super();
+        this._x = x
+        this._y = y
+        this._width = width
+        this._height = height
+        this._cornerRadius = cornerRadius
+        this._transform = transform
+        this._styles = styles
+    }
+
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/spriteEntity.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/spriteEntity.js
new file mode 100644
index 0000000..7af5979
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/spriteEntity.js
@@ -0,0 +1,33 @@
+import { FrameEntity } from './frameEntity'
+import { BezierPath } from './bezierPath'
+import { RectPath } from './rectPath'
+import { EllipsePath } from './ellipsePath'
+
+export class SpriteEntity {
+
+    /**
+     * string
+     */
+    matteKey = null
+
+    /**
+     * string
+     */
+    imageKey = null
+
+    /**
+     * FrameEntity[]
+     */
+    frames = []
+
+    constructor(spec) {
+        this.matteKey = spec.matteKey;
+        this.imageKey = spec.imageKey;
+        if (spec.frames) {
+            this.frames = spec.frames.map((obj) => {
+                return new FrameEntity(obj)
+            })
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/src/videoEntity.js b/uni_modules/c-svga/node_modules/svgaplayerweb/src/videoEntity.js
new file mode 100644
index 0000000..372daf4
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/src/videoEntity.js
@@ -0,0 +1,82 @@
+import { SpriteEntity } from './spriteEntity'
+const { ProtoMovieEntity } = require("./proto")
+
+export class VideoEntity {
+
+    /**
+     * SVGA 文件版本
+     */
+    version = "";
+
+    /**
+     * 影片尺寸
+     */
+    videoSize = {
+        width: 0.0,
+        height: 0.0,
+    };
+
+    /**
+     * 帧率
+     */
+    FPS = 20;
+
+    /**
+     * 帧数
+     */
+    frames = 0;
+
+    /**
+     * Bitmaps
+     */
+    images = {};
+
+    /**
+     * SpriteEntity[]
+     */
+    sprites = []
+
+    /**
+     * AudioEntity[]
+     */
+    audios = []
+
+    constructor(spec, images) {
+
+        if (typeof spec === "object" && spec.$type == ProtoMovieEntity) {
+            if (typeof spec.params === "object") {
+                this.version = spec.ver;
+                this.videoSize.width = spec.params.viewBoxWidth || 0.0;
+                this.videoSize.height = spec.params.viewBoxHeight || 0.0;
+                this.FPS = spec.params.fps || 20;
+                this.frames = spec.params.frames || 0;
+            }
+            this.resetSprites(spec)
+            this.audios = spec.audios
+        }
+        else if (spec) {
+            if (spec.movie) {
+                if (spec.movie.viewBox) {
+                    this.videoSize.width = parseFloat(spec.movie.viewBox.width) || 0.0;
+                    this.videoSize.height = parseFloat(spec.movie.viewBox.height) || 0.0;
+                }
+                this.version = spec.ver;
+                this.FPS = parseInt(spec.movie.fps) || 20;
+                this.frames = parseInt(spec.movie.frames) || 0;
+            }
+            this.resetSprites(spec)
+        }
+        if (images) {
+            this.images = images
+        }
+    }
+
+    resetSprites(spec) {
+        if (spec.sprites instanceof Array) {
+            this.sprites = spec.sprites.map((obj) => {
+                return new SpriteEntity(obj)
+            })
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/node_modules/svgaplayerweb/webpack.config.js b/uni_modules/c-svga/node_modules/svgaplayerweb/webpack.config.js
new file mode 100644
index 0000000..e007030
--- /dev/null
+++ b/uni_modules/c-svga/node_modules/svgaplayerweb/webpack.config.js
@@ -0,0 +1,34 @@
+var path = require('path');
+var webpack = require('webpack')
+
+module.exports = {
+    entry: {
+        "svga.min": "./src/Canvas/index.js",
+        "svga.createjs.min": "./src/CreateJS/index.js",
+        "svga.layabox.min": "./src/LayaBox/index.js",
+    },
+    output: {
+        path: __dirname,
+        filename: "build/[name].js",
+        libraryTarget: 'umd',
+        library: 'SVGA',
+    },
+    module: {
+        rules: [
+            {
+                test: path.join(__dirname, 'src'),
+                loader: 'babel-loader',
+                query: {
+                    presets: ['es2015', "stage-0"]
+                }
+            }
+        ],
+    },
+    plugins: [
+        new webpack.optimize.UglifyJsPlugin({
+            include: /\.min\.js$/,
+            minimize: true,
+            output: { comments: false },
+        })
+    ],
+}
\ No newline at end of file
diff --git a/uni_modules/c-svga/package.json b/uni_modules/c-svga/package.json
new file mode 100644
index 0000000..fad4cc2
--- /dev/null
+++ b/uni_modules/c-svga/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "c-svga",
+  "displayName": "c-svga",
+  "version": "1.0.16",
+  "description": "svga动画",
+  "keywords": [
+    "svga",
+    "动画",
+    "微信svga",
+    ""
+  ],
+  "repository": "https://gitee.com/wangziwl/c-designc.git",
+  "engines": {
+    "HBuilderX": "^3.7.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": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "u",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  },
+  "dependencies": {
+    "howler": "^2.2.3",
+    "svgaplayer-weapp": "^1.0.0",
+    "svgaplayerweb": "^2.3.2"
+  }
+}
diff --git a/uni_modules/c-svga/readme.md b/uni_modules/c-svga/readme.md
new file mode 100644
index 0000000..86dc9b3
--- /dev/null
+++ b/uni_modules/c-svga/readme.md
@@ -0,0 +1,242 @@
+# c-svga
+
+### 
+- c-svga svga动画
+
+### c-design交流群号：330647926
+
+### 示例预览
+
+[https://cloud.vuedata.wang/cdesign/#/pages/svga/svga](https://cloud.vuedata.wang/cdesign/#/pages/svga/svga)
+####
+![微信小程序预览](https://mp-eeab6da6-80cd-4e80-844a-66b2a7203834.cdn.bspapp.com/cloudstorage/7dca3f02-baef-470d-88d2-eebd7c31ab73.jpg?x-oss-process=image/resize,m_fixed,w_240)
+
+### 一、使用示例
+#### vue2/vue3
+```html
+<template>
+	<view class="page">
+		<c-svga ref="cSvgaRef" :canvasId='canvasId'
+		 :src="src" 
+		 :loops='0' :auto-play="true" @frame='onFrame' @finished='onFinished' @percentage='onPercentage' @loaded='onLoaded'></c-svga>
+		<view class="content">
+			<view>切换图像</view>
+			<view class="btnBox">
+				<button @click="src='https://mp-eeab6da6-80cd-4e80-844a-66b2a7203834.cdn.bspapp.com/cloudstorage/b3875bda-8de0-476d-8f55-d10b24f16d98.svg'" size="mini">小汽车</button>
+				<button @click="src='https://mp-eeab6da6-80cd-4e80-844a-66b2a7203834.cdn.bspapp.com/cloudstorage/eebed809-b03e-4b90-88f8-5d6811b65f86.svg'" size="mini">玫瑰花</button>
+			</view>
+			<view>播放暂停</view>
+			<view class="btnBox">
+				<button @click="$refs.cSvgaRef.call('startAnimation')" size="mini">播放</button>
+				<button @click="$refs.cSvgaRef.call('startAnimation',true)" size="mini">反向播放</button>
+				<button @click="$refs.cSvgaRef.call('pauseAnimation')" size="mini">暂停播放</button>
+				<button @click="$refs.cSvgaRef.call('stopAnimation')" size="mini">停止播放</button>
+			</view>
+			<view>设置动画的拉伸模式</view>
+			<view class="btnBox">
+				<button @click="$refs.cSvgaRef.call('setContentMode','Fill')" size="mini">Fill</button>
+				<button @click="$refs.cSvgaRef.call('setContentMode','AspectFill')" size="mini">AspectFill</button>
+				<button @click="$refs.cSvgaRef.call('setContentMode','AspectFit')" size="mini">AspectFit</button>
+			</view>
+			<view>强制清空画布</view>
+			<view class="btnBox">
+				<button @click="$refs.cSvgaRef.call('clear')" size="mini">清空画布</button>
+			</view>
+			<view>跳到指定帧/百分比</view>
+			<view class="btnBox">
+				<button @click="$refs.cSvgaRef.call('stepToFrame',[40,true])" size="mini">跳到40帧</button>
+				<button @click="$refs.cSvgaRef.call('stepToPercentage',[60,true])" size="mini">跳到60%</button>
+			</view>
+			<view>设定动态图像/动态文本</view>
+			<view class="btnBox">
+				<button @click="$refs.cSvgaRef.call('setImage',['/static/index/logo.png','06'])" size="mini">动态图像</button>
+				<button @click="$refs.cSvgaRef.call('setText',[{text:'Hello, World!'},'08'])" size="mini">动态文本</button>
+				<button @click="$refs.cSvgaRef.call('clearDynamicObjects')" size="mini">清空动态图像和文本</button>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				canvasId:'myCanvas',
+				src:'https://mp-eeab6da6-80cd-4e80-844a-66b2a7203834.cdn.bspapp.com/cloudstorage/b3875bda-8de0-476d-8f55-d10b24f16d98.svg'
+			}
+		},
+		methods: {
+			onFinished() {
+				console.log('动画停止播放时回调');
+			},
+			onFrame(frame){//动画播放至某帧后回调
+				// console.log(frame);
+			},
+			onPercentage(percentage){ //动画播放至某进度后回调
+				// console.log(percentage);
+			},
+			onLoaded(){
+				console.log('加载完成');
+			}
+		},
+	}
+	
+
+
+	
+</script>
+
+<style lang="scss">
+	.page{
+		width: 100vw;
+		overflow-x: hidden;
+	}
+	.content{
+		padding: 20rpx;
+		font-size: 28rpx;
+	}
+	.btnBox{
+		width: 100%;
+		display: flex;align-items: center;
+		margin-top: 20rpx;
+		margin-bottom: 30rpx;
+	}
+</style>
+```
+#### vue3
+```html
+<template>
+	<view class="page">
+		<c-svga ref="cSvgaRef" :canvasId='canvasId'
+		 :src="src" 
+		 :loops='0' :auto-play="true" @frame='onFrame' @finished='onFinished' @percentage='onPercentage' @loaded='onLoaded'></c-svga>
+		<view class="content">
+			<view>切换图像</view>
+			<view class="btnBox">
+				<button @click="src='https://mp-eeab6da6-80cd-4e80-844a-66b2a7203834.cdn.bspapp.com/cloudstorage/b3875bda-8de0-476d-8f55-d10b24f16d98.svg'" size="mini">小汽车</button>
+				<button @click="src='https://mp-eeab6da6-80cd-4e80-844a-66b2a7203834.cdn.bspapp.com/cloudstorage/eebed809-b03e-4b90-88f8-5d6811b65f86.svg'" size="mini">玫瑰花</button>
+			</view>
+			<view>播放暂停</view>
+			<view class="btnBox">
+				<button @click="cSvgaRef.call('startAnimation')" size="mini">播放</button>
+				<button @click="cSvgaRef.call('startAnimation',true)" size="mini">反向播放</button>
+				<button @click="cSvgaRef.call('pauseAnimation')" size="mini">暂停播放</button>
+				<button @click="cSvgaRef.call('stopAnimation')" size="mini">停止播放</button>
+			</view>
+			<view>设置动画的拉伸模式</view>
+			<view class="btnBox">
+				<button @click="cSvgaRef.call('setContentMode','Fill')" size="mini">Fill</button>
+				<button @click="cSvgaRef.call('setContentMode','AspectFill')" size="mini">AspectFill</button>
+				<button @click="cSvgaRef.call('setContentMode','AspectFit')" size="mini">AspectFit</button>
+			</view>
+			<view>强制清空画布</view>
+			<view class="btnBox">
+				<button @click="cSvgaRef.call('clear')" size="mini">清空画布</button>
+			</view>
+			<view>跳到指定帧/百分比</view>
+			<view class="btnBox">
+				<button @click="cSvgaRef.call('stepToFrame',[40,true])" size="mini">跳到40帧</button>
+				<button @click="cSvgaRef.call('stepToPercentage',[60,true])" size="mini">跳到60%</button>
+			</view>
+			<view>设定动态图像/动态文本</view>
+			<view class="btnBox">
+				<button @click="cSvgaRef.call('setImage',['/static/index/logo.png','06'])" size="mini">动态图像</button>
+				<button @click="cSvgaRef.call('setText',[{text:'Hello, World!'},'08'])" size="mini">动态文本</button>
+				<button @click="cSvgaRef.call('clearDynamicObjects')" size="mini">清空动态图像和文本</button>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script setup>
+	import { ref } from "vue";
+	const cSvgaRef = ref(),canvasId='myCanvas'
+	let src = ref('https://mp-eeab6da6-80cd-4e80-844a-66b2a7203834.cdn.bspapp.com/cloudstorage/b3875bda-8de0-476d-8f55-d10b24f16d98.svg')
+	
+	const onFinished=()=>{
+		console.log('动画停止播放时回调');
+	}
+	const onFrame=(frame)=>{//动画播放至某帧后回调
+		// console.log(frame);
+	}
+	const onPercentage=(percentage)=>{ //动画播放至某进度后回调
+		// console.log(percentage);
+	}
+	const onLoaded=()=>{
+		console.log('加载完成');
+	}
+	
+</script>
+
+<style lang="scss">
+	.page{
+		width: 100vw;
+		overflow-x: hidden;
+	}
+	.content{
+		padding: 20rpx;
+		font-size: 28rpx;
+	}
+	.btnBox{
+		width: 100%;
+		display: flex;align-items: center;
+		margin-top: 20rpx;
+		margin-bottom: 30rpx;
+	}
+</style>
+```
+
+### 二、Props
+
+| 字段				| 类型		| 必填	| 默认值				| 描述																																							|
+| -----------		| --------	| ----	| ----------------------| -------------------------------	
+| canvasId			| String	| 否|  'c'+uuid(18)	| canvasId 画布id 可不填此项																																	|
+| width				| String	| 否|  750rpx		| 图像宽度 单位rpx/px																																			|
+| height			| String	| 否|  750rpx		| 图像高度 单位rpx/px																																			|
+| src				| String	| 是|				| svga文件地址																																					|
+| autoPlay			| Boolean	| 否|  true			| 是否自动播放																																					|
+| loops				| Number	| 否|  0			| 动画循环次数																																					|
+| clearsAfterStop	| Boolean	| 否|  true			| 当动画结束时，是否清空画布																																	|
+| fillMode			| String	| 否|Forward		| 默认值为 Forward，可选值 Forward / Backward，当 clearsAfterStop 为 false 时，Forward 表示动画会在结束后停留在最后一帧，Backward 则会在动画结束后停留在第一帧。|
+| isOnChange		| Boolean	| 否|false			|false时不触发Frame Percentage监听																														|
+
+### 三、Event
+| 字段			| 描述										|
+| ---------		| ------------------------					|
+| loaded	| 监听svga文件加载完成				|
+| finished	| 监听动画停止播放 loop!=0时生效				|
+| frame		| 监听动画播放至某帧 isOnChange=true时生效	|
+| percentage	| 监听动画播放至某进度 isOnChange=true时生效	|
+
+### 四、Methods
+
+#### 组件内方法统一使用 call(funName, args) 调用
+
+```js
+	this.$refs.cSvgaRef.call('startAnimation')
+	//or
+	const cSvgaRef = ref()
+	cSvgaRef.value.call('startAnimation')
+```
+
+#### funName args入参为array类型 单个参数可传入string类型 
+
+* constructor (canvas); - 传入 #id 或者 CanvasHTMLElement 至第一个参数
+* startAnimation(reverse: boolean = false); - 从第 0 帧开始播放动画
+* startAnimationWithRange(range: {location: number, length: number}, reverse: boolean = false); - 播放 [location, location+length] 指定区间帧动画
+* pauseAnimation(); - 暂停在当前帧
+* stopAnimation(); - 停止播放动画，如果 clearsAfterStop === true，将会清空画布
+* setContentMode(mode: "Fill" | "AspectFill" | "AspectFit"); - 设置动画的拉伸模式
+* setClipsToBounds(clipsToBounds: boolean); - 如果超出盒子边界，将会进行裁剪
+* clear(); - 强制清空画布
+* stepToFrame(frame: int, andPlay: Boolean); - 跳到指定帧，如果 andPlay === true，则在指定帧开始播放动画
+* stepToPercentage(percentage: float, andPlay: Boolean); - 跳到指定百分比，如果 andPlay === true，则在指定百分比开始播放动画
+* setImage(image: string, forKey: string, transform: [a, b, c, d, tx, ty]); - 设定动态图像, transform 是可选的, transform 用于变换替换图片
+* setText(text: string | {text: string, family: string, size: string, color: string, offset: {x: float, y: float}}, forKey: string); - 设定动态文本
+* clearDynamicObjects(); - 清空所有动态图像和文本
+
+### 微信小程序端加载本地svga文件需要将文件后缀名调整为svg
+### 暂不支持nvue nvue请使用性能更好的原生插件
+### 注意：由于Hbuilderx上传插件无法上传node_odules依赖 导入插件后进入插件目录/uni_modules/c-svga   使用npm i 进行依赖安装 
\ No newline at end of file
diff --git a/uni_modules/lime-painter/changelog.md b/uni_modules/lime-painter/changelog.md
new file mode 100644
index 0000000..b988d35
--- /dev/null
+++ b/uni_modules/lime-painter/changelog.md
@@ -0,0 +1,223 @@
+## 1.9.6.5（2024-04-14）
+- fix: 修复`nvue`无法生图的问题
+## 1.9.6.4（2024-03-10）
+- fix: 修复代理ctx导致H5不能使用ctx.save
+## 1.9.6.3（2024-03-08）
+- fix: 修复支付宝真机无法使用的问题
+## 1.9.6.2（2024-02-22）
+- fix: 修复使用render函数报错的问题
+## 1.9.6.1（2023-12-22）
+- fix: 修复字节小程序非2d字体偏移
+- fix: 修复`canvasToTempFilePathSync`会触发两次的问题
+- fix: 修复`parser`图片没有宽度的问题
+## 1.9.6（2023-12-06）
+- fix: 修复背景图受padding影响
+- fix: 修复因字节报错改了代理实现导致微信报错
+- 1.9.5.8（2023-11-16）
+- fix: 修复margin问题
+- fix: 修复borderWidth问题
+- fix: 修复textBox问题
+- fix: 修复字节开发工具报`could not be cloned.`问题
+## 1.9.5.7（2023-07-27）
+- fix: 去掉多余的方法
+- chore: 更新文档，增加自定义字体说明
+## 1.9.5.6（2023-07-21）
+- feat: 有限的支持富文本
+- feat: H5和APP 增加 `hidpi` prop，主要用于大尺寸无法生成图片时用
+- fix: 修复 钉钉小程序 缺少 `measureText` 方法
+- chore: 由于微信小程序 pc 端的 canvas 2d 时不时抽风，故不使用canvas 2d
+## 1.9.5.5（2023-06-27）
+- fix: 修复把`emoji`表情字符拆分成多个字符的情况
+## 1.9.5.4（2023-06-05）
+- fix: 修复因`canvasToTempFilePathSync`监听导致重复调用
+## 1.9.5.3（2023-05-23）
+- fix: 因isPc错写成了isPC导致小程序PC不能生成图片
+## 1.9.5.2（2023-05-22）
+- feat: 删除多余文件
+## 1.9.5.1（2023-05-22）
+- fix: 修复 文字行数与`line-clamp`相同但不满一行时也加了省略号的问题
+## 1.9.5（2023-05-14）
+- feat: 增加 `text-indent` 和 `calc` 方法
+- feat: 优化 布局时间
+## 1.9.4.4（2023-04-15）
+- fix: 修复无法匹配负值
+- fix: 修复 Nvue IOS getImageInfo `useCORS` 为 undefined
+## 1.9.4.3（2023-04-01）
+- feat: 增加支持文字描边 `text-stroke: '5rpx #fff'`
+## 1.9.4.2（2023-03-30）
+- fix: 修复 支付宝小程序 isPC 在手机也为true的问题
+- feat: 由 微信开发工具 3060 版 无法获取图片尺寸，现 微信开发工具 3220 版 修复该问题，故还原上一版的获取图片方式。
+## 1.9.4.1（2023-03-28）
+- fix: 修复固定高度不正确问题
+## 1.9.4（2023-03-17）
+- fix: nvue ios getImageInfo缺少this报错
+- fix: pathType 非2d无效问题
+- fix: 修复 小米9se 可能会存在多次init 导致画面多次放大
+- fix: 修复 border 分开写 width style无效问题
+- fix: 修复 支付宝小程序IOS 再次进入不渲染的问题
+- fix: 修复 支付宝小程序安卓Zindex排序错乱问题
+- fix: 修复 微信开发工具 3060 版 无法获取图片的问题
+- feat: 把 for in 改为 forEach
+- feat: 增加 hidden
+- feat: 根节点 box-sizing 默认 `border-box`
+- feat: 增加支持 `vw` `wh`
+- chore: pathType 取消 默认值，因为字节开发工具不能显示
+- chore: 支付宝小程序开发工具不支持 生成图片 请以真机调试为准
+- bug: 企业微信 2.20.3无法使用
+## 1.9.3.5（2022-06-29）
+- feat: justifyContent 增加 `space-around`、`space-between`
+- feat: canvas 2d 也使用`getImageInfo`
+- fix: 修复 `text`的 `text-decoration`错位
+## 1.9.3.4（2022-06-20）
+- fix: 修复 因创建节点速度问题导致顺序出错。 
+- fix: 修复 微信小程序 PC 无法显示本地图片 
+- fix: 修复 flex-box 对齐问题 
+- feat: 增加 `text-shadow`
+- feat: 重写 `text` 对齐方式
+- chore: 更新文档
+## 1.9.3.3（2022-06-17）
+- fix: 修复 支付宝小程序 canvas 2d 存在ctx.draw问题导致报错
+- fix: 修复 支付宝小程序 toDataURL 存在权限问题改用 `toTempFilePath`
+- fix: 修复 支付宝小程序 image size 问题导致 `objectFit` 无效
+## 1.9.3.2（2022-06-14）
+- fix: 修复 image 设置背景色不生效问题
+- fix: 修复 nvue 环境判断缺少参数问题
+## 1.9.3.1（2022-06-14）
+- fix: 修复 bottom 定位不对问题
+- fix: 修复 因小数导致计算出错换行问题
+- feat: 增加 `useCORS` h5端图片跨域 在设置请求头无效果后试一下设置这个值
+- chore: 更新文档
+## 1.9.3（2022-06-13）
+- feat: 增加 `zIndex`
+- feat: 增加 `flex-box` 该功能处于原始阶段，非常简陋。
+- tips: QQ小程序 vue3 不支持, 为 uni 官方BUG
+## 1.9.2.9（2022-06-10）
+- fix: 修复`text-align`及`margin`居中问题
+## 1.9.2.8（2022-06-10）
+- fix: 修复 Nvue `canvasToTempFilePathSync` 不生效问题
+## 1.9.2.7（2022-06-10）
+- fix: 修复 margin及padding的bug
+- fix: 修复 Nvue `isCanvasToTempFilePath` 不生效问题
+## 1.9.2.6（2022-06-09）
+- fix: 修复 Nvue 不显示
+- feat: 增加支持字体渐变
+```html
+<l-painter-text 
+	text="水调歌头\n明月几时有？把酒问青天。不知天上宫阙，今夕是何年。我欲乘风归去，又恐琼楼玉宇，高处不胜寒。起舞弄清影，何似在人间。"
+	css="background: linear-gradient(,#ff971b 0%, #1989fa 100%); background-clip: text" />
+```
+## 1.9.2.5（2022-06-09）
+- chore: 更变获取父级宽度的设定
+- chore: `pathType` 在canvas 2d 默认为 `url`
+## 1.9.2.4（2022-06-08）
+- fix: 修复 `pathType` 不生效问题
+## 1.9.2.3（2022-06-08）
+- fix: 修复 `canvasToTempFilePath` 漏写 `success` 参数
+## 1.9.2.2（2022-06-07）
+- chore: 更新文档
+## 1.9.2.1（2022-06-07）
+- fix: 修复 vue3 赋值给this再传入导致image无法绘制
+- fix: 修复 `canvasToTempFilePathSync` 时机问题
+- feat: canvas 2d 更改图片生成方式 `toDataURL` 
+## 1.9.2（2022-05-30）
+- fix: 修复 `canvasToTempFilePathSync` 在 vue3 下只生成一次
+## 1.9.1.7（2022-05-28）
+- fix: 修复 `qrcode`显示不全问题
+## 1.9.1.6（2022-05-28）
+- fix: 修复 `canvasToTempFilePathSync` 会重复多次问题
+- fix: 修复 `view` css `backgroundImage` 图片下载失败导致 子节点不渲染
+## 1.9.1.5（2022-05-27）
+- fix: 修正支付宝小程序 canvas 2d版本号 2.7.15
+## 1.9.1.4（2022-05-22）
+- fix: 修复字节小程序无法使用xml方式
+- fix: 修复字节小程序无法使用base64(非2D情况下工具上无法显示)
+- fix: 修复支付宝小程序 `canvasToTempFilePath` 报错
+## 1.9.1.3（2022-04-29）
+- fix: 修复vue3打包后uni对象为空后的报错
+## 1.9.1.2（2022-04-25）
+- fix: 删除多余文件
+## 1.9.1.1（2022-04-25）
+- fix: 修复图片不显示问题
+## 1.9.1（2022-04-12）
+- fix: 因四舍五入导致有些机型错位
+- fix: 修复无views报错 
+- chore: nvue下因ios无法读取插件内static文件，改由下载方式
+## 1.9.0（2022-03-20）
+- fix: 因无法固定尺寸导致生成图片不全
+- fix: 特定情况下text判断无效
+- chore: 本地化APP Nvue webview
+## 1.8.9（2022-02-20）
+- fix: 修复 小程序下载最多10次并发的问题
+- fix: 修复 APP端无法获取本地图片
+- fix: 修复 APP Nvue端不执行问题
+- chore: 增加图片缓存机制
+## 1.8.8.8（2022-01-27）
+- fix: 修复 主动调用尺寸问题
+## 1.8.8.6（2022-01-26）
+- fix: 修复 nvue 下无宽度时获取父级宽度 
+- fix: 修复 ios app 无法渲染问题
+## 1.8.8（2022-01-23）
+- fix: 修复 主动调用时无节点问题
+- fix: 修复 `box-shadow` 颜色问题
+- fix: 修复 `transform:rotate` 角度位置问题
+- feat: 增加 `overflow:hidden`
+## 1.8.7（2022-01-07）
+- fix: 修复 image 方向为 `right` 时原始宽高问题
+- feat: 支持 view 设置背景图 `background-image: url(xxx)`
+- chore: 去掉可选链
+## 1.8.6（2021-11-28）
+- feat: 支持`view`对`inline-block`的子集使用`text-align`
+## 1.8.5.5（2021-08-17）
+- chore: 更新文档，删除 replace
+- fix: 修复 text 值为 number时报错
+## 1.8.5.4（2021-08-16）
+- fix: 字节小程序兼容
+## 1.8.5.3（2021-08-15）
+- fix: 修复线性渐变与css现实效果不一致的问题
+- chore: 更新文档
+## 1.8.5.2（2021-08-13）
+- chore: 增加`background-image`、`background-repeat` 能力，主要用于背景纹理的绘制，并不是代替`image`。例如：大面积的重复平铺的水印
+- 注意：这个功能H5暂时无法使用，因为[官方的API有BUG](https://ask.dcloud.net.cn/question/128793)，待官方修复！！！
+## 1.8.5.1（2021-08-10）
+- fix: 修复因`margin`报错问题
+## 1.8.5（2021-08-09）
+- chore: 增加margin支持`auto`,以达到居中效果
+## 1.8.4（2021-08-06）
+- chore: 增加判断缓存文件条件
+- fix: 修复css 多余空格报错问题
+## 1.8.3（2021-08-04）
+- tips: 1.6.x 以下的版本升级到1.8.x后要为每个元素都加上定位：position: 'absolute'
+- fix: 修复只有一个view子元素时不计算高度的问题
+## 1.8.2（2021-08-03）
+- fix: 修复 path-type 为 `url` 无效问题
+- fix: 修复 qrcode `text` 为空时报错问题
+- fix: 修复 image `src` 动态设置时不生效问题
+- feat: 增加 css 属性 `min-width` `max-width`
+## 1.8.1（2021-08-02）
+- fix: 修复无法加载本地图片
+## 1.8.0（2021-08-02）
+- chore 文档更新
+- 使用旧版的同学不要升级！
+## 1.8.0-beta（2021-07-30）
+- ## 全新布局方式 不兼容旧版！
+- chore: 布局方式变更
+- tips: 微信canvas 2d 不支持真机调试
+## 1.6.6（2021-07-09）
+- chore: 统一命名规范，无须主动引入组件
+## 1.6.5（2021-06-08）
+- chore: 去掉console
+## 1.6.4（2021-06-07）
+- fix: 修复 数字 为纯字符串时不转换的BUG
+## 1.6.3（2021-06-06）
+- fix: 修复 PC 端放大的BUG
+## 1.6.2（2021-05-31）
+- fix: 修复 报`adaptor is not a function`错误
+- fix: 修复 text 多行高度
+- fix: 优化 默认文字的基准线
+- feat: `@progress`事件，监听绘制进度
+## 1.6.1（2021-02-28）
+- 删除多余节点
+## 1.6.0（2021-02-26）
+- 调整为uni_modules目录规范
+- 修复：transform的rotate不能为负数问题
+- 新增：`pathType` 指定生成图片返回的路径类型,可选值有 `base64`、`url`
diff --git a/uni_modules/lime-painter/components/common/relation.js b/uni_modules/lime-painter/components/common/relation.js
new file mode 100644
index 0000000..6ed37e8
--- /dev/null
+++ b/uni_modules/lime-painter/components/common/relation.js
@@ -0,0 +1,150 @@
+const styles = (v ='') =>  v.split(';').filter(v => v && !/^[\n\s]+$/.test(v)).map(v => {
+						const key = v.slice(0, v.indexOf(':'))
+						const value = v.slice(v.indexOf(':')+1)
+						return {
+							[key
+								.replace(/-([a-z])/g, function() { return arguments[1].toUpperCase()})
+								.replace(/\s+/g, '')
+							]: value.replace(/^\s+/, '').replace(/\s+$/, '') || ''
+						}
+					})
+export function parent(parent) {
+	return {
+		provide() {
+			return {
+				[parent]: this
+			}
+		},
+		data() {
+			return {
+				el: {
+					id: null,
+					css: {},
+					views: []
+				},
+			}
+		},
+		watch: {
+			css: { 
+				handler(v) {
+					if(this.canvasId) {
+						this.el.css = (typeof v == 'object' ? v : v && Object.assign(...styles(v))) || {}
+						this.canvasWidth = this.el.css && this.el.css.width || this.canvasWidth
+						this.canvasHeight = this.el.css && this.el.css.height || this.canvasHeight
+					}
+				},
+				immediate: true
+			}
+		}
+	}
+}
+export function children(parent, options = {}) {
+	const indexKey = options.indexKey || 'index'
+	return {
+		inject: {
+			[parent]: {
+				default: null
+			}
+		},
+		watch: {
+			el: {
+				handler(v, o) {
+					if(JSON.stringify(v) != JSON.stringify(o))
+						this.bindRelation()
+				},
+				deep: true,
+				immediate: true
+			},
+			src: {
+				handler(v, o) {
+					if(v != o)
+						this.bindRelation()
+				},
+				immediate: true
+			},
+			text: {
+				handler(v, o) {
+					if(v != o) this.bindRelation()
+				},
+				immediate: true
+			},
+			css: {
+				handler(v, o) {
+					if(v != o)
+						this.el.css = (typeof v == 'object' ? v : v && Object.assign(...styles(v))) || {}
+				},
+				immediate: true
+			},
+			replace: {
+				handler(v, o) {
+					if(JSON.stringify(v) != JSON.stringify(o))
+						this.bindRelation()
+				},
+				deep: true,
+				immediate: true
+			}
+		},
+		created() {
+			if(!this._uid) {
+				this._uid = this._.uid
+			}
+			Object.defineProperty(this, 'parent', {
+				get: () => this[parent] || [],
+			})
+			Object.defineProperty(this, 'index', {
+				get: () =>  {
+					this.bindRelation();
+					const {parent: {el: {views=[]}={}}={}} = this
+					return views.indexOf(this.el)
+				},
+			});
+			this.el.type = this.type
+			if(this.uid) {
+				this.el.uid = this.uid
+			}
+			this.bindRelation()
+		},
+		// #ifdef VUE3
+		beforeUnmount() {
+			this.removeEl()
+		},
+		// #endif
+		// #ifdef VUE2
+		beforeDestroy() {
+			this.removeEl()
+		},
+		// #endif
+		methods: {
+			removeEl() {
+				if (this.parent) {
+					this.parent.el.views = this.parent.el.views.filter(
+						(item) => item._uid !== this._uid
+					);
+				}
+			},
+			bindRelation() {
+				if(!this.el._uid) {
+					this.el._uid = this._uid 
+				}
+				if(['text','qrcode'].includes(this.type)) {
+					this.el.text = this.$slots && this.$slots.default && this.$slots.default[0].text || `${this.text || ''}`.replace(/\\n/g, '\n')
+				}
+				if(this.type == 'image') {
+					this.el.src = this.src
+				}
+				if (!this.parent) {
+					return;
+				}
+				let views = this.parent.el.views || [];
+				if(views.indexOf(this.el) !== -1) {
+					this.parent.el.views = views.map(v => v._uid == this._uid ? this.el : v)
+				} else {
+					this.parent.el.views = [...views, this.el];
+				}
+			}
+		},
+		mounted() {
+			// this.bindRelation()
+		},
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue b/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue
new file mode 100644
index 0000000..e24e3aa
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue
@@ -0,0 +1,28 @@
+<template>
+	
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-image',
+		mixins:[children('painter')],
+		props: {
+			id: String,
+			css: [String, Object],
+			src: String
+		},
+		data() {
+			return {
+				type: 'image',
+				el: {
+					css: {},
+					src: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue b/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue
new file mode 100644
index 0000000..a73e5ed
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue
@@ -0,0 +1,27 @@
+<template>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-qrcode',
+		mixins:[children('painter')],
+		props: {
+			id: String,
+			css: [String, Object],
+			text: String
+		},
+		data() {
+			return {
+				type: 'qrcode',
+				el: {
+					css: {},
+					text: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue b/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue
new file mode 100644
index 0000000..b332b02
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue
@@ -0,0 +1,33 @@
+<template>
+	<text style="opacity: 0;height: 0;"><slot/></text>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-text',
+		mixins:[children('painter')],
+		props: {
+			type: {
+				type: String,
+				default: 'text'
+			},
+			uid: String,
+			css: [String, Object],
+			text: [String, Number],
+			replace: Object,
+		},
+		data() {
+			return {
+				// type: 'text',
+				el: {
+					css: {},
+					text: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue b/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue
new file mode 100644
index 0000000..94596e5
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue
@@ -0,0 +1,34 @@
+<template>
+	<view><slot/></view>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-view',
+		mixins:[children('painter'), parent('painter')],
+		props: {
+			id: String,
+			type: {
+				type: String,
+				default: 'view'
+			},
+			css: [String, Object],
+		},
+		data() {
+			return {
+				// type: 'view',
+				el: {
+					css: {},
+					views:[]
+				},
+			}
+		},
+		mounted() {
+			
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter/l-painter.vue b/uni_modules/lime-painter/components/l-painter/l-painter.vue
new file mode 100644
index 0000000..83926fd
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/l-painter.vue
@@ -0,0 +1,461 @@
+<template>
+	<view class="lime-painter" ref="limepainter">
+		<view v-if="canvasId && size" :style="styles">
+			<!-- #ifndef APP-NVUE -->
+			<canvas class="lime-painter__canvas" v-if="use2dCanvas" :id="canvasId" type="2d" :style="size"></canvas>
+			<canvas class="lime-painter__canvas" v-else :id="canvasId" :canvas-id="canvasId" :style="size"
+				:width="boardWidth * dpr" :height="boardHeight * dpr" :hidpi="hidpi"></canvas>
+
+			<!-- #endif -->
+			<!-- #ifdef APP-NVUE -->
+			<web-view :style="size" ref="webview"
+				src="/uni_modules/lime-painter/hybrid/html/index.html"
+				class="lime-painter__canvas" @pagefinish="onPageFinish" @error="onError" @onPostMessage="onMessage">
+			</web-view>
+			<!-- #endif -->
+		</view>
+		<slot />
+	</view>
+</template>
+
+<script>
+	import { parent } from '../common/relation'
+	import props from './props'
+	import {toPx, base64ToPath, pathToBase64, isBase64, sleep, getImageInfo }from './utils';
+	//  #ifndef APP-NVUE
+	import { canIUseCanvas2d, isPC} from './utils';
+	import Painter from './painter';
+	// import Painter from '@painter'
+	const nvue = {}
+	//  #endif
+	//  #ifdef APP-NVUE
+	import nvue from './nvue'
+	//  #endif
+	export default {
+		name: 'lime-painter',
+		mixins: [props, parent('painter'), nvue],
+		data() {
+			return {
+				use2dCanvas: false,
+				canvasHeight: 150,
+				canvasWidth: null,
+				parentWidth: 0,
+				inited: false,
+				progress: 0,
+				firstRender: 0,
+				done: false,
+				tasks: []
+			};
+		},
+		computed: {
+			styles() {
+				return `${this.size}${this.customStyle||''};` + (this.hidden && 'position: fixed; left: 1500rpx;')
+			},
+			canvasId() {
+				return `l-painter${this._ && this._.uid || this._uid}`
+			},
+			size() {
+				if (this.boardWidth && this.boardHeight) {
+					return `width:${this.boardWidth}px; height: ${this.boardHeight}px;`;
+				}
+			},
+			dpr() {
+				return this.pixelRatio || uni.getSystemInfoSync().pixelRatio;
+			},
+			boardWidth() {
+				const {width = 0} = (this.elements && this.elements.css) || this.elements || this
+				const w = toPx(width||this.width)
+				return w || Math.max(w, toPx(this.canvasWidth));
+			},
+			boardHeight() {
+				const {height = 0} = (this.elements && this.elements.css) || this.elements || this
+				const h = toPx(height||this.height)
+				return h || Math.max(h, toPx(this.canvasHeight));
+			},
+			hasBoard() {
+				return this.board && Object.keys(this.board).length
+			},
+			elements() {
+				return this.hasBoard ? this.board : JSON.parse(JSON.stringify(this.el))
+			}
+		},
+		created() {
+			this.use2dCanvas = this.type === '2d' && canIUseCanvas2d() && !isPC
+		},
+		async mounted() {
+			await sleep(30)
+			await this.getParentWeith()
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.$watch('elements', this.watchRender, {
+						deep: true,
+						immediate: true
+					});
+				}, 30)
+			})
+		},
+		// #ifdef VUE3
+		unmounted() {
+			this.done = false
+			this.inited = false
+			this.firstRender = 0
+			this.progress = 0
+			this.painter = null
+			clearTimeout(this.rendertimer)
+		},
+		// #endif
+		// #ifdef VUE2
+		destroyed() {
+			this.done = false
+			this.inited = false
+			this.firstRender = 0
+			this.progress = 0
+			this.painter = null
+			clearTimeout(this.rendertimer)
+		},
+		// #endif
+		methods: {
+			async watchRender(val, old) {
+				if (!val || !val.views || (!this.firstRender ? !val.views.length : !this.firstRender) || !Object.keys(val).length || JSON.stringify(val) == JSON.stringify(old)) return;
+				this.firstRender = 1
+				this.progress = 0
+				this.done = false
+				clearTimeout(this.rendertimer)
+				this.rendertimer = setTimeout(() => {
+					this.render(val);
+				}, this.beforeDelay)
+			},
+			async setFilePath(path, param) {
+				let filePath = path
+				const {pathType = this.pathType} =  param || this
+				if (pathType == 'base64' && !isBase64(path)) {
+					filePath = await pathToBase64(path)
+				} else if (pathType == 'url' && isBase64(path)) {
+					filePath = await base64ToPath(path)
+				}
+				if (param && param.isEmit) {
+					this.$emit('success', filePath);
+				}
+				return filePath
+			},
+			async getSize(args) {
+				const {width} = args.css || args
+				const {height} = args.css || args
+				if (!this.size) {
+					if (width || height) {
+						this.canvasWidth = width || this.canvasWidth
+						this.canvasHeight = height || this.canvasHeight
+						await sleep(30);
+					} else {
+						await this.getParentWeith()
+					}
+				}
+			},
+			canvasToTempFilePathSync(args) {
+				// this.stopWatch && this.stopWatch()
+				// this.stopWatch = this.$watch('done', (v) => {
+				// 	if (v) {
+				// 		this.canvasToTempFilePath(args)
+				// 		this.stopWatch && this.stopWatch()
+				// 	}
+				// }, {
+				// 	immediate: true
+				// })
+				this.tasks.push(args)
+				if(this.done){
+					this.runTask()
+				}
+			},
+			runTask(){
+				while(this.tasks.length){
+					const task = this.tasks.shift()	
+					 this.canvasToTempFilePath(task)
+				}
+			},
+			// #ifndef APP-NVUE
+			getParentWeith() {
+				return new Promise(resolve => {
+					uni.createSelectorQuery()
+						.in(this)
+						.select(`.lime-painter`)
+						.boundingClientRect()
+						.exec(res => {
+							const {width, height} = res[0]||{}
+							this.parentWidth = Math.ceil(width||0)
+							this.canvasWidth = this.parentWidth || 300
+							this.canvasHeight = height || this.canvasHeight||150
+							resolve(res[0])
+						})
+				})
+			},
+			async render(args = {}) {
+				if(!Object.keys(args).length) {
+					return console.error('空对象')
+				}
+				this.progress = 0
+				this.done = false
+				// #ifdef APP-NVUE
+				this.tempFilePath.length = 0
+				// #endif
+				await this.getSize(args)
+				const ctx = await this.getContext();
+				
+				let {
+					use2dCanvas,
+					boardWidth,
+					boardHeight,
+					canvas,
+					afterDelay
+				} = this;
+				if (use2dCanvas && !canvas) {
+					return Promise.reject(new Error('canvas 没创建'));
+				}
+				this.boundary = {
+					top: 0,
+					left: 0,
+					width: boardWidth,
+					height: boardHeight
+				};
+				this.painter = null
+				if (!this.painter) {
+					const {width} = args.css || args
+					const {height} = args.css || args
+					if(!width && this.parentWidth) {
+						Object.assign(args, {width: this.parentWidth})
+					}
+					const param = {
+						context: ctx,
+						canvas,
+						width: boardWidth,
+						height: boardHeight,
+						pixelRatio: this.dpr,
+						useCORS: this.useCORS,
+						createImage: getImageInfo.bind(this),
+						performance: this.performance,
+						listen: {
+							onProgress: (v) => {
+								this.progress = v
+								this.$emit('progress', v)
+							},
+							onEffectFail: (err) => {
+								this.$emit('faill', err)
+							}
+						}
+					}
+					this.painter = new Painter(param)
+				} 
+				try{
+					// vue3 赋值给data会引起图片无法绘制
+					const { width, height } = await this.painter.source(JSON.parse(JSON.stringify(args)))
+					this.boundary.height = this.canvasHeight = height
+					this.boundary.width = this.canvasWidth = width
+					await sleep(this.sleep);
+					await this.painter.render()
+					await new Promise(resolve => this.$nextTick(resolve));
+					if (!use2dCanvas) {
+						await this.canvasDraw();
+					}
+					if (afterDelay && use2dCanvas) {
+						await sleep(afterDelay);
+					}
+					this.$emit('done');
+					this.done = true
+					if (this.isCanvasToTempFilePath) {
+						this.canvasToTempFilePath()
+							.then(res => {
+								this.$emit('success', res.tempFilePath)
+							})
+							.catch(err => {
+								this.$emit('fail', new Error(JSON.stringify(err)));
+							});
+					}
+					this.runTask()
+					return Promise.resolve({
+						ctx,
+						draw: this.painter,
+						node: this.node
+					});
+				}catch(e){
+					//TODO handle the exception
+				}
+				
+			},
+			canvasDraw(flag = false) {
+				return new Promise((resolve, reject) => this.ctx.draw(flag, () => setTimeout(() => resolve(), this
+					.afterDelay)));
+			},
+			async getContext() {
+				if (!this.canvasWidth) {
+					this.$emit('fail', 'painter no size')
+					console.error('[lime-painter]: 给画板或父级设置尺寸')
+					return Promise.reject();
+				}
+				if (this.ctx && this.inited) {
+					return Promise.resolve(this.ctx);
+				}
+				const { type, use2dCanvas, dpr, boardWidth, boardHeight } = this;
+				const _getContext = () => {
+					return new Promise(resolve => {
+						uni.createSelectorQuery()
+							.in(this)
+							.select(`#${this.canvasId}`)
+							.boundingClientRect()
+							.exec(res => {
+								if (res) {
+									const ctx = uni.createCanvasContext(this.canvasId, this);
+									if (!this.inited) {
+										this.inited = true;
+										this.use2dCanvas = false;
+										this.canvas = res;
+									}
+									
+									// 钉钉小程序框架不支持 measureText 方法，用此方法 mock
+									if (!ctx.measureText) {
+										function strLen(str) {
+											let len = 0;
+											for (let i = 0; i < str.length; i++) {
+												if (str.charCodeAt(i) > 0 && str.charCodeAt(i) < 128) {
+													len++;
+												} else {
+													len += 2;
+												}
+											}
+											return len;
+										}
+										ctx.measureText = text => {
+											let fontSize = ctx.state && ctx.state.fontSize || 12;
+											const font = ctx.__font
+											if (font && fontSize == 12) {
+												fontSize = parseInt(font.split(' ')[3], 10);
+											}
+											fontSize /= 2;
+											return {
+												width: strLen(text) * fontSize
+											};
+										}
+									}
+									
+									// #ifdef MP-ALIPAY
+									ctx.scale(dpr, dpr);
+									// #endif
+									this.ctx = ctx
+									resolve(this.ctx);
+								} else {
+									console.error('[lime-painter] no node')
+								}
+							});
+					});
+				};
+				if (!use2dCanvas) {
+					return _getContext();
+				}
+				return new Promise(resolve => {
+					uni.createSelectorQuery()
+						.in(this)
+						.select(`#${this.canvasId}`)
+						.node()
+						.exec(res => {
+							let {node: canvas} = res && res[0]||{};
+							if(canvas) {
+								const ctx = canvas.getContext(type);
+								if (!this.inited) {
+									this.inited = true;
+									this.use2dCanvas = true;
+									this.canvas = canvas;
+								}
+								this.ctx = ctx
+								resolve(this.ctx);
+							} else {
+								console.error('[lime-painter]: no size')
+							}
+						});
+				});
+			},
+			canvasToTempFilePath(args = {}) {
+				return new Promise(async (resolve, reject) => {
+					const { use2dCanvas, canvasId, dpr, fileType, quality } = this;
+					const success = async (res) => {
+						try {
+							const tempFilePath = await this.setFilePath(res.tempFilePath || res, args)
+							const result = Object.assign(res, {tempFilePath})
+							args.success && args.success(result)
+							resolve(result)
+						} catch (e) {
+							this.$emit('fail', e)
+						}
+					}
+					
+					let { top: y = 0, left: x = 0, width, height } = this.boundary || this;
+					// let destWidth = width * dpr;
+					// let destHeight = height * dpr;
+					// #ifdef MP-ALIPAY
+					// width = destWidth;
+					// height = destHeight;
+					// #endif
+					
+					const copyArgs = Object.assign({
+						// x,
+						// y,
+						// width,
+						// height,
+						// destWidth,
+						// destHeight,
+						canvasId,
+						id: canvasId,
+						fileType,
+						quality,
+					}, args, {success});
+					// if(this.isPC || use2dCanvas) {
+					// 	copyArgs.canvas = this.canvas
+					// }
+					if (use2dCanvas) {
+						copyArgs.canvas = this.canvas
+						try{
+							// #ifndef MP-ALIPAY
+							const oFilePath = this.canvas.toDataURL(`image/${args.fileType||fileType}`.replace(/pg/, 'peg'), args.quality||quality)
+							if(/data:,/.test(oFilePath)) {
+								uni.canvasToTempFilePath(copyArgs, this);
+							} else {
+								const tempFilePath = await this.setFilePath(oFilePath, args)
+								args.success && args.success({tempFilePath})
+								resolve({tempFilePath})
+							}
+							// #endif
+							// #ifdef MP-ALIPAY
+							this.canvas.toTempFilePath(copyArgs)
+							// #endif
+						}catch(e){
+							args.fail && args.fail(e)
+							reject(e)
+						}
+					} else {
+						// #ifdef MP-ALIPAY
+						if(this.ctx.toTempFilePath) {
+							// 钉钉
+							const ctx = uni.createCanvasContext(canvasId);
+							ctx.toTempFilePath(copyArgs);
+						} else {
+							my.canvasToTempFilePath(copyArgs);
+						}
+						// #endif
+						// #ifndef MP-ALIPAY
+						uni.canvasToTempFilePath(copyArgs, this);
+						// #endif
+					}
+				})
+			}
+			// #endif
+		}
+	};
+</script>
+<style>
+	.lime-painter,
+	.lime-painter__canvas {
+		// #ifndef APP-NVUE
+		width: 100%;
+		// #endif
+		// #ifdef APP-NVUE
+		flex: 1;
+		// #endif
+	}
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter/nvue.js b/uni_modules/lime-painter/components/l-painter/nvue.js
new file mode 100644
index 0000000..25645fb
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/nvue.js
@@ -0,0 +1,214 @@
+// #ifdef APP-NVUE
+import {
+	sleep,
+	getImageInfo,
+	isBase64,
+	networkReg
+} from './utils';
+const dom = weex.requireModule('dom')
+import {
+	version
+} from '../../package.json'
+
+export default {
+	data() {
+		return {
+			tempFilePath: [],
+			isInitFile: false,
+			osName: uni.getSystemInfoSync().osName
+		}
+	},
+	methods: {
+		getParentWeith() {
+			return new Promise(resolve => {
+				dom.getComponentRect(this.$refs.limepainter, (res) => {
+					this.parentWidth = Math.ceil(res.size.width)
+					this.canvasWidth = this.canvasWidth || this.parentWidth || 300
+					this.canvasHeight = res.size.height || this.canvasHeight || 150
+					resolve(res.size)
+				})
+			})
+		},
+		onPageFinish() {
+			this.webview = this.$refs.webview
+			this.webview.evalJS(`init(${this.dpr})`)
+		},
+		onMessage(e) {
+			const res = e.detail.data[0] || null;
+			if (res.event) {
+				if (res.event == 'inited') {
+					this.inited = true
+				}
+				if (res.event == 'fail') {
+					this.$emit('fail', res)
+				}
+				if (res.event == 'layoutChange') {
+					const data = typeof res.data == 'string' ? JSON.parse(res.data) : res.data
+					this.canvasWidth = Math.ceil(data.width);
+					this.canvasHeight = Math.ceil(data.height);
+				}
+				if (res.event == 'progressChange') {
+					this.progress = res.data * 1
+				}
+				if (res.event == 'file') {
+					this.tempFilePath.push(res.data)
+					if (this.tempFilePath.length > 7) {
+						this.tempFilePath.shift()
+					}
+					return
+				}
+				if (res.event == 'success') {
+					if (res.data) {
+						this.tempFilePath.push(res.data)
+						if (this.tempFilePath.length > 8) {
+							this.tempFilePath.shift()
+						}
+						if (this.isCanvasToTempFilePath) {
+							this.setFilePath(this.tempFilePath.join(''), {
+								isEmit: true
+							})
+						}
+					} else {
+						this.$emit('fail', 'canvas no data')
+					}
+					return
+				}
+				this.$emit(res.event, JSON.parse(res.data));
+			} else if (res.file) {
+				this.file = res.data;
+			} else {
+				console.info(res[0])
+			}
+		},
+		getWebViewInited() {
+			if (this.inited) return Promise.resolve(this.inited);
+			return new Promise((resolve) => {
+				this.$watch(
+					'inited',
+					async val => {
+						if (val) {
+							resolve(val)
+						}
+					}, {
+						immediate: true
+					}
+				);
+			})
+		},
+		getTempFilePath() {
+			if (this.tempFilePath.length == 8) return Promise.resolve(this.tempFilePath)
+			return new Promise((resolve) => {
+				this.$watch(
+					'tempFilePath',
+					async val => {
+						if (val.length == 8) {
+							resolve(val.join(''))
+						}
+					}, {
+						deep: true
+					}
+				);
+			})
+		},
+		getWebViewDone() {
+			if (this.progress == 1) return Promise.resolve(this.progress);
+			return new Promise((resolve) => {
+				this.$watch(
+					'progress',
+					async val => {
+						if (val == 1) {
+							this.$emit('done')
+							this.done = true
+							this.runTask()
+							resolve(val)
+						}
+					}, {
+						immediate: true
+					}
+				);
+			})
+		},
+		async render(args) {
+			try {
+				await this.getSize(args)
+				const {
+					width
+				} = args.css || args
+				if (!width && this.parentWidth) {
+					Object.assign(args, {
+						width: this.parentWidth
+					})
+				}
+				const newNode = await this.calcImage(args);
+				await this.getWebViewInited()
+				this.webview.evalJS(`source(${JSON.stringify(newNode)})`)
+				await this.getWebViewDone()
+				await sleep(this.afterDelay)
+				if (this.isCanvasToTempFilePath) {
+					const params = {
+						fileType: this.fileType,
+						quality: this.quality
+					}
+					this.webview.evalJS(`save(${JSON.stringify(params)})`)
+				}
+				return Promise.resolve()
+			} catch (e) {
+				this.$emit('fail', e)
+			}
+		},
+		async calcImage(args) {
+			let node = JSON.parse(JSON.stringify(args))
+			const urlReg = /url\((.+)\)/
+			const {
+				backgroundImage
+			} = node.css || {}
+			const isBG = backgroundImage && urlReg.exec(backgroundImage)[1]
+			const url = node.url || node.src || isBG
+			if (['text', 'qrcode'].includes(node.type)) {
+				return node
+			}
+			if ((node.type === "image" || isBG) && url && !isBase64(url) && (this.osName == 'ios' || !networkReg
+					.test(url))) {
+				let {
+					path
+				} = await getImageInfo(url, true)
+				if (isBG) {
+					node.css.backgroundImage = `url(${path})`
+				} else {
+					node.src = path
+				}
+			} else if (node.views && node.views.length) {
+				for (let i = 0; i < node.views.length; i++) {
+					node.views[i] = await this.calcImage(node.views[i])
+				}
+			}
+			return node
+		},
+		async canvasToTempFilePath(args = {}) {
+			if (!this.inited) {
+				return this.$emit('fail', 'no init')
+			}
+			this.tempFilePath = []
+			if (args.fileType == 'jpg') {
+				args.fileType = 'jpeg'
+			}
+
+			this.webview.evalJS(`save(${JSON.stringify(args)})`)
+			try {
+				let tempFilePath = await this.getTempFilePath()
+
+				tempFilePath = await this.setFilePath(tempFilePath, args)
+				args.success({
+					errMsg: "canvasToTempFilePath:ok",
+					tempFilePath
+				})
+			} catch (e) {
+				console.log('e', e)
+				args.fail({
+					error: e
+				})
+			}
+		}
+	}
+}
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-painter/components/l-painter/painter.js b/uni_modules/lime-painter/components/l-painter/painter.js
new file mode 100644
index 0000000..bd42fc9
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/painter.js
@@ -0,0 +1 @@
+var t=function(){return t=Object.assign||function(t){for(var e,i=1,n=arguments.length;i<n;i++)for(var r in e=arguments[i])Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t},t.apply(this,arguments)};function e(t,e,i,n){return new(i||(i=Promise))((function(r,o){function s(t){try{h(n.next(t))}catch(t){o(t)}}function a(t){try{h(n.throw(t))}catch(t){o(t)}}function h(t){var e;t.done?r(t.value):(e=t.value,e instanceof i?e:new i((function(t){t(e)}))).then(s,a)}h((n=n.apply(t,e||[])).next())}))}function i(t,e){var i,n,r,o,s={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(i)throw new TypeError("Generator is already executing.");for(;s;)try{if(i=1,n&&(r=2&o[0]?n.return:o[0]?n.throw||((r=n.return)&&r.call(n),0):n.next)&&!(r=r.call(n,o[1])).done)return r;switch(n=0,r&&(o=[2&o[0],r.value]),o[0]){case 0:case 1:r=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(r=s.trys,(r=r.length>0&&r[r.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!r||o[1]>r[0]&&o[1]<r[3])){s.label=o[1];break}if(6===o[0]&&s.label<r[1]){s.label=r[1],r=o;break}if(r&&s.label<r[2]){s.label=r[2],s.ops.push(o);break}r[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{i=r=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}var n={MP_WEIXIN:"mp-weixin",MP_QQ:"mp-qq",MP_ALIPAY:"mp-alipay",MP_BAIDU:"mp-baidu",MP_TOUTIAO:"mp-toutiao",MP_DINGDING:"mp-dingding",H5:"h5",WEB:"web",PLUS:"plus"},r=["Top","Right","Bottom","Left"],o="right",s="bottom",a=["contentSize","clientSize","borderSize","offsetSize"],h="row",c="column",f={TOP:"top",MIDDLE:"middle",BOTTOM:s},l={LEFT:"left",CENTER:"center",RIGHT:o},d="view",u="text",p="image",g="qrcode",v="block",y="inline-block",x="none",b="flex",w="absolute",m="fixed",S={display:v,color:"#000000",lineHeight:"1.4em",fontSize:14,fontWeight:400,fontFamily:"sans-serif",lineCap:"butt",flexDirection:h,flexWrap:"nowrap",textAlign:"left",alignItems:"flex-start",justifyContent:"flex-start",position:"static",transformOrigin:"".concat("center"," ").concat("center")},z={upx2px:function(t){return window.innerWidth/750*t},getSystemInfoSync:function(){return{screenWidth:window.innerWidth,screenHeight:window.innerHeight}},getImageInfo:function(t){var e=t.src,i=t.success,n=t.fail,r=new Image;r.onload=function(){i({width:r.naturalWidth,height:r.naturalHeight,path:r.src,src:e})},r.onerror=n,r.src=e}},I="object"==typeof window?"undefined"==typeof uni||"undefined"!=typeof uni&&!uni.addInterceptor?n.WEB:n.H5:"object"==typeof swan?n.MP_BAIDU:"object"==typeof tt?n.MP_TOUTIAO:"object"==typeof plus?n.PLUS:"object"==typeof wx?n.MP_WEIXIN:void 0,M=I==n.MP_WEIXIN?wx:"undefined"!=typeof uni?uni.getImageInfo?{upx2px:function(t){return uni.upx2px(t)},getSystemInfoSync:function(){return uni.getSystemInfoSync()},getImageInfo:function(t){return uni.getImageInfo(t)},downloadFile:function(t){return uni.downloadFile(t)}}:Object.assign(uni,z):"undefined"!=typeof window?z:uni;if(!M.upx2px){var k=((M.getSystemInfoSync&&M.getSystemInfoSync()).screenWidth||375)/750;M.upx2px=function(t){return k*t}}function B(t){return/^-?\d+(\.\d+)?$/.test(t)}function W(t,e,i){if(B(t))return 1*t;if("string"==typeof t){var n=/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|vw|vh|px|%)$/g.exec(t);if(!t||!n)return 0;var r=n[3];t=parseFloat(t);var o=0;if("rpx"===r)o=M.upx2px(t);else if("px"===r)o=1*t;else if("%"===r&&e)o=t*W(e)/100;else if("em"===r&&e)o=t*W(e||14);else if(["vw","vh"].includes(r)){var s=M.getSystemInfoSync(),a=s.screenWidth,h=s.screenHeight;o=t*("vw"==r?a:h)/100}return 1*o.toFixed(2)}return 0}function P(t){return/%$/.test(t)}var O=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},T=function(t,e,i,n,r,o){t.startsWith("linear")?function(t,e,i,n,r,o){for(var s=function(t,e,i,n,r){void 0===n&&(n=0);void 0===r&&(r=0);var o=t.match(/([-]?\d{1,3})deg/),s=o&&o[1]?parseFloat(o[1]):0;s>=360&&(s-=360);s<0&&(s+=360);if(0===(s=Math.round(s)))return{x0:Math.round(e/2)+n,y0:i+r,x1:Math.round(e/2)+n,y1:r};if(180===s)return{x0:Math.round(e/2)+n,y0:r,x1:Math.round(e/2)+n,y1:i+r};if(90===s)return{x0:n,y0:Math.round(i/2)+r,x1:e+n,y1:Math.round(i/2)+r};if(270===s)return{x0:e+n,y0:Math.round(i/2)+r,x1:n,y1:Math.round(i/2)+r};var a=Math.round(180*Math.asin(e/Math.sqrt(Math.pow(e,2)+Math.pow(i,2)))/Math.PI);if(s===a)return{x0:n,y0:i+r,x1:e+n,y1:r};if(s===180-a)return{x0:n,y0:r,x1:e+n,y1:i+r};if(s===180+a)return{x0:e+n,y0:r,x1:n,y1:i+r};if(s===360-a)return{x0:e+n,y0:i+r,x1:n,y1:r};var h=0,c=0,f=0,l=0;if(s<a||s>180-a&&s<180||s>180&&s<180+a||s>360-a){var d=s*Math.PI/180,u=s<a||s>360-a?i/2:-i/2,p=Math.tan(d)*u,g=s<a||s>180-a&&s<180?e/2-p:-e/2-p;h=-(f=p+(v=Math.pow(Math.sin(d),2)*g)),c=-(l=u+v/Math.tan(d))}if(s>a&&s<90||s>90&&s<90+a||s>180+a&&s<270||s>270&&s<360-a){var v;d=(90-s)*Math.PI/180,p=s>a&&s<90||s>90&&s<90+a?e/2:-e/2,u=Math.tan(d)*p,g=s>a&&s<90||s>270&&s<360-a?i/2-u:-i/2-u;h=-(f=p+(v=Math.pow(Math.sin(d),2)*g)/Math.tan(d)),c=-(l=u+v)}return h=Math.round(h+e/2)+n,c=Math.round(i/2-c)+r,f=Math.round(f+e/2)+n,l=Math.round(i/2-l)+r,{x0:h,y0:c,x1:f,y1:l}}(r,t,e,i,n),a=s.x0,h=s.y0,c=s.x1,f=s.y1,l=o.createLinearGradient(a,h,c,f),d=r.match(/linear-gradient\((.+)\)/)[1],u=L(d.substring(d.indexOf(",")+1)),p=0;p<u.colors.length;p++)l.addColorStop(u.percents[p],u.colors[p]);o.setFillStyle(l)}(e,i,n,r,t,o):t.startsWith("radial")&&function(t,e,i,n,r,o){for(var s=L(r.match(/radial-gradient\((.+)\)/)[1]),a=Math.round(t/2)+i,h=Math.round(e/2)+n,c=o.createRadialGradient(a,h,0,a,h,Math.max(t,e)/2),f=0;f<s.colors.length;f++)c.addColorStop(s.percents[f],s.colors[f]);o.setFillStyle(c)}(e,i,n,r,t,o)};function L(t){for(var e=[],i=[],n=0,r=t.substring(0,t.length-1).split("%,");n<r.length;n++){var o=r[n];e.push(o.substring(0,o.lastIndexOf(" ")).trim()),i.push(o.substring(o.lastIndexOf(" "),o.length)/100)}return{colors:e,percents:i}}function R(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function F(){return F=Object.assign?Object.assign.bind():function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var n in i)Object.prototype.hasOwnProperty.call(i,n)&&(t[n]=i[n])}return t},F.apply(this,arguments)}function A(t,e){return A=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},A(t,e)}function j(t,e){(null==e||e>t.length)&&(e=t.length);for(var i=0,n=new Array(e);i<e;i++)n[i]=t[i];return n}function E(t,e){var i="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(i)return(i=i.call(t)).next.bind(i);if(Array.isArray(t)||(i=function(t,e){if(t){if("string"==typeof t)return j(t,e);var i=Object.prototype.toString.call(t).slice(8,-1);return"Object"===i&&t.constructor&&(i=t.constructor.name),"Map"===i||"Set"===i?Array.from(t):"Arguments"===i||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(i)?j(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){i&&(t=i);var n=0;return function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function C(t){return"number"==typeof t}function H(t){return"auto"===t||null===t}function D(t){return/%$/.test(t)}var Y=p,$=u,U=d,N=g,X=y,_=w,q=m;function G(t){return t.replace(/-([a-z])/g,(function(t,e){return e.toUpperCase()}))}function V(t,e){var i,n,o=function(t){var e=t.match(/([a-z]+)/)[1];return[e,G(t.split(e)[1])]}(t),s=o[0],a=o[1],h=e.split(" ");if(a)return(i={})[s+a]=e,i;if(h.length&&!a){var c=h[0],f=h[1],l=h[2],d=h[3];return(n={})[s+r[0]]=c,n[s+r[1]]=f||c,n[s+r[2]]=l||c,n[s+r[3]]=d||f||c,n}}function J(t){t=t.trim();for(var e=new Array,i="+",n="",r=t.length,o=0;o<r;++o){if("."===t[o]||!isNaN(Number(t[o]))&&" "!==t[o])n+=t[o];else if("("===t[o]){for(var s=1,a=o;s>0;)"("===t[a+=1]&&(s+=1),")"===t[a]&&(s-=1);n="".concat(J(t.slice(o+1,a))),o=a}if(isNaN(Number(t[o]))&&"."!==t[o]||o===r-1){var h=parseFloat(n);switch(i){case"+":e.push(h);break;case"-":e.push(-h);break;case"*":e.push(e.pop()*h);break;case"/":e.push(e.pop()/h)}i=t[o],n=""}}for(var c=0;e.length;)c+=e.pop();return c}var Q,Z=0,K=function(){function t(){R(this,"elements",[]),R(this,"afterElements",[]),R(this,"beforeElements",[]),R(this,"ids",[]),R(this,"width",0),R(this,"height",0),R(this,"top",0),R(this,"left",0),R(this,"pre",null),R(this,"offsetX",0),R(this,"offsetY",0),Z++,this.id=Z}var e=t.prototype;return e.fixedBind=function(t,e){void 0===e&&(e=0),this.container=e?t.parent:t.root,this.container.fixedLine=this,this.fixedAdd(t)},e.fixedAdd=function(t){if(!this.ids.includes(t.id)){this.ids.push(t.id),this.elements.push(t);var e=t.computedStyle.zIndex;(void 0===e?0:e)>=0?this.afterElements.push(t):this.beforeElements.push(t),this.refreshLayout()}},e.bind=function(t){this.container=t.parent,this.container.line=null,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),this.isInline=t.isInline(),this.container.line=this,this.outerWidth=t.parent&&t.parent.contentSize.width?t.parent.contentSize.width:1/0,this.add(t)},e.getPreLine=function(){return this.container.lines[this.container.lines.length-2]},e.canIEnter=function(t){return!((100*t.offsetSize.width+100*this.width)/100>this.outerWidth)||(this.closeLine(),!1)},e.closeLine=function(){delete this.container.line},e.add=function(t){this.ids.includes(t.id)||(this.ids.push(t.id),this.elements.push(t),this.refreshWidthHeight(t))},e.refreshWidthHeight=function(t){t.offsetSize.height>this.height&&(this.height=t.offsetSize.height),this.width+=t.offsetSize.width||0,(this.container.lineMaxWidth||0)<this.width&&(this.container.lineMaxWidth=this.width)},e.refreshXAlign=function(){if(this.isInline){var t=this.container.contentSize.width-this.width,e=this.container.style.textAlign;"center"===e?t/=2:"left"===e&&(t=0),this.offsetX=t}},e.getOffsetY=function(t){if(!t||!t.style)return 0;var e=(t.style||{}).verticalAlign;return e===s?this.height-t.contentSize.height:"middle"===e?(this.height-t.contentSize.height)/2:0},e.setIndent=function(t){var e=t.style.textIndent;if(e&&/^calc/.test(e)){var i=/^calc\((.+)\)$/.exec(e);if(i&&i[1]){var n=i[1].replace(/([^\s\(\+\-\*\/]+)\.(left|right|bottom|top|width|height)/g,(function(e){var i=e.split("."),n=i[0],r=i[1],o=t.parent.querySelector(n);if(o&&o.offsetSize){var s={right:o.offsetSize.left+o.offsetSize.width,bottom:o.offsetSize.top+o.offsetSize.height};return o.offsetSize[r]||s[r]||0}})),r=J(n.replace(new RegExp(/-?[0-9]+(\.[0-9]+)?(rpx|px|%)/,"g"),W));t.style.textIndent=r}}},e.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style.top=i.top+r,t.style.left=n?n.offsetSize.left+n.offsetSize.width:i.left,t.getBoxPosition()}))},e.refreshLayout=function(){this.afterElements=this.afterElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex})),this.beforeElements=this.beforeElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex}))},t}(),et=((Q={})[h]={width:"width",contentWidth:"width",lineMaxWidth:"lineMaxWidth",left:"left",top:"top",height:"height",lineMaxHeight:"lineMaxHeight",marginLeft:"marginLeft"},Q[c]={width:"height",contentWidth:"height",lineMaxWidth:"lineMaxWidth",left:"top",top:"left",height:"width",lineMaxHeight:"lineMaxHeight",marginLeft:"marginTop"},Q),it=function(t){var e,i;function n(){var e;return R(function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(e=t.call(this)||this),"outerWidth",0),e.exactValue=0,e.flexTotal=0,e.width=0,e.key=null,e.flexDirection="row",e}i=t,(e=n).prototype=Object.create(i.prototype),e.prototype.constructor=e,A(e,i);var r=n.prototype;return r.bind=function(t){this.container=t.parent,this.container.line=this,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),t.parent&&(this.flexDirection=t.parent.style.flexDirection,this.key=et[this.flexDirection]),this.initHeight(t),this.outerWidth=t.parent&&t.parent.contentSize[this.key.contentWidth]?t.parent.contentSize[this.key.contentWidth]:1/0,this.add(t)},r.add=function(t){this.ids.push(t.id);var e=t.style.flex;C(e)?this.flexTotal+=e:C(this.getWidth(t.style))&&(this.exactValue+=this.getWidth(t.offsetSize)),this.elements.push(t),this.refreshWidthHeight(t),t.next||this.closeLine()},r.closeLine=function(){this.calcFlex()},r.initHeight=function(t){this[this.key.height]=0},r.getWidth=function(t){return t[this.key.width]||0},r.getHeight=function(t){return t[this.key.height]||0},r.setWidth=function(t,e){t[this.key.width]=e},r.setHeight=function(t,e){t[this.key.height]=e},r.calcFlex=function(){var t=this,e=this.container.contentSize[this.key.contentWidth],i=0;this.elements.forEach((function(n){var r=n.style,o=n.contentSize,s=t.getWidth(r)||t.getWidth(o);C(r.flex)&&(s=r.flex/t.flexTotal*(e-t.exactValue)),t.setWidth(n.computedStyle,s),n.isFlexCalc=!0,delete n.line,delete n.lines,delete n.lineMaxWidth,n.getBoxWidthHeight(),i=Math.max(i,t.getHeight(n.offsetSize))})),this.setHeight(this,i)},r.refreshWidthHeight=function(t){var e=this.container.style.alignItems;e&&!t.style.alignSelf&&(t.style.alignSelf=e);var i=this.getHeight(t.offsetSize);i>this[this.key.height]&&(this.container[this.key.lineMaxHeight]=this[this.key.height]=i),this[this.key.width]+=this.getWidth(t.offsetSize);var n=Math.min(this.getWidth(this),!this.getWidth(this.container.contentSize)&&1/0);(this.container[this.key.lineMaxWidth]||0)<n&&(this.container[this.key.lineMaxWidth]=n)},r.refreshXAlign=function(){var t=this,e=this.elements.reduce((function(e,i){return e+t.getWidth(i.offsetSize)}),0),i=(this.outerWidth==1/0?0:this.outerWidth-e)||0,n=this.container.style.justifyContent;"center"===n?i/=2:"flex-start"===n?i=0:["space-between","space-around"].includes(n)&&(!function(e,i){void 0===i&&(i=0),i/=t.elements.length+(e?-1:1),t.elements.forEach((function(n,r){var o;e&&!r||(n.style.margin?n.style.margin[t.key.marginLeft]+=i:n.style.margin=((o={})[t.key.marginLeft]=i,o),n.getBoxPosition())})),i=0}("space-between"==n,i),i=0),this.offsetX=i||0,this.refreshYAlign()},r.refreshYAlign=function(){var t=this;if(1==this.container.lines.length)return 0;var e=this.container.lines.reduce((function(e,i){return e+t.getHeight(i)}),0),i=this.container.style.alignItems,n=this.getHeight(this.container.contentSize);if("center"===i){var r=(n-e)/(this.container.lines.length+1);this.container.lines.forEach((function(t){t.offsetY=r}))}if("flex-end"===i){var o=n-e;this.container.lines[0].offsetY=o}},r.getOffsetY=function(t){if(this.container.lines.length>1)return 0;var e=t.style.alignSelf,i=this.getHeight(this.container.contentSize),n=i-this.getHeight(t.offsetSize);return"flex-end"===e?n:"center"===e?n/2:"stretch"===e?(n&&t.name==d&&(t.style[this.key.width]=this.getWidth(t.offsetSize),t.style[this.key.height]=i,delete t.line,delete t.lines,t.getBoxWidthHeight()),0):0},r.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style[i.key.top]=i[i.key.top]+r,t.style[i.key.left]=n?n.offsetSize[i.key.left]+i.getWidth(n.offsetSize):i[i.key.left],t.getBoxPosition()}))},n}(K),nt=p,rt=u,ot=d,st=v,at=y,ht=b,ct=w,ft=m,lt=0,dt={left:null,top:null,width:null,height:null},ut=new Map,pt=function(){function t(t,e,i,n){var o=this;R(this,"id",lt++),R(this,"style",{left:null,top:null,width:null,height:null}),R(this,"computedStyle",{}),R(this,"originStyle",{}),R(this,"children",{}),R(this,"layoutBox",F({},dt)),R(this,"contentSize",F({},dt)),R(this,"clientSize",F({},dt)),R(this,"borderSize",F({},dt)),R(this,"offsetSize",F({},dt)),this.ctx=n,this.root=i,e&&(this.parent=e),this.name=t.type||t.name,this.attributes=this.getAttributes(t);var s=function(t,e){var i,n=["color","fontSize","lineHeight","verticalAlign","fontWeight","textAlign"],o=t.type,s=void 0===o?U:o,a=t.styles,h=void 0===a?{}:a,c=(e||{}).computedStyle,f=Object.assign({},S);if([$,Y,N].includes(s)&&!h.display&&(f.display=X),c)for(var l=0;l<n.length;l++){var d=n[l];(h[d]||c[d])&&(h[d]=h[(i=d,i.replace(/([A-Z])/g,"-$1").toLowerCase())]||h[d]||c[d])}for(var u=function(t){var e,i,n,o,a=h[t];if(/-/.test(t)&&(t=G(t),f[t]=a),/^(box|text)?shadow$/i.test(t)){var c=[];return a.replace(/((-?\d+(rpx|px|vw|vh)?\s+?){3})(.+)/,(function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];c=t[1].match(/-?\d+(rpx|px|vw|vh)?/g).map((function(t){return W(t)})).concat(t[4])})),/^text/.test(t)?f.textShadow=c:f.boxShadow=c,"continue"}if(/^border/i.test(t)&&!/radius$/i.test(t)){var l=t.match(/^border([BTRLa-z]+)?/)[0],d=t.match(/[W|S|C][a-z]+/),u=a.replace(/([\(,])\s+|\s+([\),])/g,"$1$2").split(" ").map((function(t){return/^\d/.test(t)?W(t,""):t}));return f[l]||(f[l]={}),1==u.length&&d?f[l][l+d[0]]=u[0]:f[l]=((e={})[l+"Width"]=B(u[0])?u[0]:0,e[l+"Style"]=u[1]||"solid",e[l+"Color"]=u[2]||"black",e),"continue"}if(/^background(color)?$/i.test(t))return f.backgroundColor=a,"continue";if(/^objectPosition$/i.test(t))return f[t]=a.split(" "),"continue";if(/padding|margin|radius/i.test(t)){var p=/radius$/i.test(t),g="borderRadius",v=p?g:t.match(/[a-z]+/)[0],y=function(t,e){return"border".concat(t).concat(e,"Radius")},x=[0,0,0,0].map((function(t,e){return p?[y(r[0],r[3]),y(r[0],r[1]),y(r[2],r[1]),y(r[2],r[3])][e]:v+r[e]}));if("padding"===t||"margin"===t||/^(border)?radius$/i.test(t)){u="".concat(a).split(" ").map((function(e){return/^-?\d+(rpx|px|vh|vw)?$/.test(e)?W(e):"margin"!=t&&/auto/.test(e)?0:e}),[])||[0];var b=p?g:t,w=u[0],m=u[1],S=u[2],z=u[3];f[b]=((i={})[x[0]]=H(w)?0:w,i[x[1]]=B(m)||H(m)?m:w,i[x[2]]=H(B(S)?S:w)?0:B(S)?S:w,i[x[3]]=B(z)?z:null!=m?m:w,i)}else"object"==typeof f[v]||(f[v]=((n={})[x[0]]=f[v]||0,n[x[1]]=f[v]||0,n[x[2]]=f[v]||0,n[x[3]]=f[v]||0,n)),f[v][t]="margin"==v&&H(a)||D(a)?a:W(a);return"continue"}if(/^transform$/i.test(t))return f[t]={},a.replace(/([a-zA-Z]+)\(([0-9,-\.%rpxdeg\s]+)\)/g,(function(e,i,n){var r=n.split(",").map((function(t){return t.replace(/(^\s*)|(\s*$)/g,"")})),o=function(t,e){return t.includes("deg")?1*t:e&&!D(e)?W(t,e):t};i.includes("matrix")?f[t][i]=r.map((function(t){return 1*t})):i.includes("rotate")?f[t][i]=1*n.match(/^-?\d+(\.\d+)?/)[0]:/[X, Y]/.test(i)?f[t][i]=/[X]/.test(i)?o(r[0],h.width):o(r[0],h.height):(f[t][i+"X"]=o(r[0],h.width),f[t][i+"Y"]=o(r[1]||r[0],h.height))})),"continue";if(/^font$/i.test(t)&&console.warn("font 不支持简写"),/^textindent/i.test(t)&&(f[t]=/^calc/.test(a)?a:W(a)),/^textstroke/i.test(t)){var I=t.match(/color|width|type$/i),M=(l="textStroke",a.split(" ").map((function(t){return/^\d+(rpx|px|vh|vw)?$/.test(t)?W(t):t})));return I?f[l]?f[l][I[0]]=M[0]:f[l]=((o={})[I[0]]=M[0],o):f[l]={width:M[0],color:M[1],type:M[2]},"continue"}/^left|top$/i.test(t)&&![_,q].includes(h.position)?f[t]=0:f[t]=/^-?[\d\.]+(px|rpx|vw|vh)?$/.test(a)?W(a):/em$/.test(a)&&s==$?W(a,h.fontSize):a},p=0,g=Object.keys(h);p<g.length;p++)u(g[p]);return f}(t,e);this.isAbsolute=s.position==ct,this.isFixed=s.position==ft,this.originStyle=s,this.styles=t.styles,Object.keys(s).forEach((function(t){Object.defineProperty(o.style,t,{configurable:!0,enumerable:!0,get:function(){return s[t]},set:function(e){s[t]=e}})}));var a={contentSize:F({},this.contentSize),clientSize:F({},this.clientSize),borderSize:F({},this.borderSize),offsetSize:F({},this.offsetSize)};Object.keys(a).forEach((function(t){Object.keys(o[t]).forEach((function(e){Object.defineProperty(o[t],e,{configurable:!0,enumerable:!0,get:function(){return a[t][e]},set:function(i){a[t][e]=i}})}))})),this.computedStyle=this.style}var e=t.prototype;return e.add=function(t){t.parent=this,this.children[t.id]=t},e.getChildren=function(){var t=this;return Object.keys(this.children).map((function(e){return t.children[e]}))},e.prev=function(t){void 0===t&&(t=this);var e=t.parent.getChildren();return e[e.findIndex((function(e){return e.id==t.id}))-1]},e.querySelector=function(t){var e=this.getChildren();if("string"!=typeof t)return null;var i=e.find((function(e){var i=e.id,n=e.attributes;return i==t||n&&n.uid==t}));return i||(this.parent&&this.parent.querySelector&&this.parent.querySelector(t)||null)},e.getLineRect=function(t,e){var i={width:0,height:0},n=e?e.lines:this.parent&&this.parent.lines;return n&&n.find((function(e){return e.ids.includes(t)}))||i},e.setPosition=function(t,e){var i={left:"width",top:"height",right:"width",bottom:"height"};Object.keys(i).forEach((function(n){var r=n==o?"left":"top";[o,s].includes(n)&&void 0!==t.style[n]&&!B(t.originStyle[r])?t.style[r]=e[i[n]]-t.offsetSize[i[n]]-W(t.style[n],e[i[n]]):t.style[n]=W(t.style[n],e[i[n]])}))},e.getAttributes=function(t){var e=t.attributes,i=void 0===e?{}:e,n=t.uid,r=t.url,o=t.src,s=t.replace,a=t.text;return n&&(i.uid=n),(r||o)&&(i.src=i.src||r||o),s&&(i.replace=s),a&&(i.text=a),i},e.getOffsetSize=function(t,e,i){void 0===i&&(i=a[3]);var n=e||{},r=n.margin,o=(r=void 0===r?{}:r).marginLeft,s=void 0===o?0:o,h=r.marginTop,c=void 0===h?0:h,f=r.marginRight,l=void 0===f?0:f,d=r.marginBottom,u=void 0===d?0:d,p=n.padding,g=(p=void 0===p?{}:p).paddingLeft,v=void 0===g?0:g,y=p.paddingTop,x=void 0===y?0:y,b=p.paddingRight,w=void 0===b?0:b,m=p.paddingBottom,S=void 0===m?0:m,z=n.border,I=(z=void 0===z?{}:z).borderWidth,M=void 0===I?0:I,k=n.borderTop,B=(k=void 0===k?{}:k).borderTopWidth,W=void 0===B?M:B,P=n.borderBottom,O=(P=void 0===P?{}:P).borderBottomWidth,T=void 0===O?M:O,L=n.borderRight,R=(L=void 0===L?{}:L).borderRightWidth,F=void 0===R?M:R,A=n.borderLeft,j=(A=void 0===A?{}:A).borderLeftWidth,E=void 0===j?M:j,C=s<0&&l<0?Math.abs(s+l):0,H=c<0&&u<0?Math.abs(c+u):0,D=s>=0&&l<0,Y=c>=0&&u<0;return i==a[0]&&(this[i].left=t.left+s+v+E+(D?2*-l:0),this[i].top=t.top+c+x+W+(Y?2*-u:0),this[i].width=t.width+(this[i].widthAdd?0:C),this[i].height=t.height+(this[i].heightAdd?0:H),this[i].widthAdd=C,this[i].heightAdd=H),i==a[1]&&(this[i].left=t.left+s+E+(D<0?-l:0),this[i].top=t.top+c+W+(Y?-u:0),this[i].width=t.width+v+w,this[i].height=t.height+x+S),i==a[2]&&(this[i].left=t.left+s+E/2+(D<0?-l:0),this[i].top=t.top+c+W/2+(Y?-u:0),this[i].width=t.width+v+w+E/2+F/2,this[i].height=t.height+x+S+T/2+W/2),i==a[3]&&(this[i].left=t.left+(D<0?-l:0),this[i].top=t.top+(Y?-u:0),this[i].width=t.width+v+w+E+F+s+l,this[i].height=t.height+x+S+T+W+u+c),this[i]},e.layoutBoxUpdate=function(t,e,i,n){var r=this;if(void 0===i&&(i=-1),"border-box"==e.boxSizing){var o=e||{},s=o.border,h=(s=void 0===s?{}:s).borderWidth,c=void 0===h?0:h,f=o.borderTop,l=(f=void 0===f?{}:f).borderTopWidth,d=void 0===l?c:l,u=o.borderBottom,p=(u=void 0===u?{}:u).borderBottomWidth,g=void 0===p?c:p,v=o.borderRight,y=(v=void 0===v?{}:v).borderRightWidth,x=void 0===y?c:y,b=o.borderLeft,w=(b=void 0===b?{}:b).borderLeftWidth,m=void 0===w?c:w,S=o.padding,z=(S=void 0===S?{}:S).paddingTop,I=void 0===z?0:z,M=S.paddingRight,k=void 0===M?0:M,B=S.paddingBottom,W=void 0===B?0:B,P=S.paddingLeft,O=void 0===P?0:P;i||(t.width-=O+k+x+m),1!==i||n||(t.height-=I+W+d+g)}this.layoutBox&&(a.forEach((function(i){return r.layoutBox[i]=r.getOffsetSize(t,e,i)})),this.layoutBox=Object.assign({},this.layoutBox,this.layoutBox.borderSize))},e.getBoxPosition=function(){var t=this.computedStyle,e=this.fixedLine,i=this.lines,n=t.left,r=void 0===n?0:n,o=t.top,s=void 0===o?0:o,a=F({},this.contentSize,{left:r,top:s}),h=this.contentSize.top-this.offsetSize.top,c=this.contentSize.left-this.offsetSize.left;if(this.root.fixedLine&&!this.root.isDone){this.root.isDone=!0;for(var f,l=E(this.root.fixedLine.elements);!(f=l()).done;){var d=f.value;d.setPosition(d,this.root.offsetSize),d.getBoxPosition()}}if(e)for(var u,p=E(e.elements);!(u=p()).done;){var g=u.value,v=F({},this.borderSize,{left:r,top:s});g.setPosition(g,v);var y=this.borderSize.top-this.offsetSize.top,x=this.borderSize.left-this.offsetSize.left;g.style.left+=r+x,g.style.top+=s+y,g.getBoxPosition()}if(i)for(var b,w=E(i);!(b=w()).done;){b.value.layout(a.top+h,a.left+c)}return this.layoutBoxUpdate(a,t),this.layoutBox},e.getBoxState=function(t,e){return this.isBlock(t)||this.isBlock(e)},e.isBlock=function(t){return void 0===t&&(t=this),t&&t.style.display==st},e.isFlex=function(t){return void 0===t&&(t=this),t&&t.style.display==ht},e.isInFlow=function(){return!(this.isAbsolute||this.isFixed)},e.inFlexBox=function(t){return void 0===t&&(t=this),!!t.isInFlow()&&(!!t.parent&&(!(!t.parent||t.parent.style.display!==ht)||void 0))},e.isInline=function(t){return void 0===t&&(t=this),t&&t.style.display==at},e.contrastSize=function(t,e,i){var n=t;return i&&(n=Math.min(n,i)),e&&(n=Math.max(n,e)),n},e.measureText=function(t,e){var i=this.ctx.measureText(t),n=i.width,r=i.actualBoundingBoxAscent,o=i.actualBoundingBoxDescent;return{ascent:r,descent:o,width:n,fontHeight:r+o||.7*e+1}},e.getParentSize=function(t,e){if(void 0===t&&(t=this),void 0===e&&(e=!1),t&&t.parent){if(t.parent.contentSize.width)return t.parent.contentSize;if(e)return this.getParentSize(t.parent,e)}return null},e.getBoxWidthHeight=function(){var t=this,e=this.name,i=this.computedStyle,n=this.attributes,r=this.parent,o=void 0===r?{}:r,s=this.ctx,a=this.getChildren(),h=i.left,c=void 0===h?0:h,f=i.top,l=void 0===f?0:f,d=i.bottom,u=i.right,p=i.width,g=void 0===p?0:p,v=i.minWidth,y=i.maxWidth,x=i.minHeight,b=i.maxHeight,w=i.height,m=void 0===w?0:w,S=i.fontSize,z=i.fontWeight,I=i.fontFamily,M=i.fontStyle,k=i.position;i.textIndent;var B=i.lineClamp,P=i.lineHeight,O=i.padding,T=void 0===O?{}:O,L=i.margin,R=void 0===L?{}:L,F=i.border,A=(F=void 0===F?{}:F).borderWidth,j=void 0===A?0:A,E=i.borderRight,C=(E=void 0===E?{}:E).borderRightWidth,Y=void 0===C?j:C,$=i.borderLeft,U=($=void 0===$?{}:$).borderLeftWidth,N=void 0===U?j:U,X=o.contentSize&&o.contentSize.width,_=o.contentSize&&o.contentSize.height;if(D(g)&&X&&(g=W(g,X)),D(g)&&!X&&(g=null),D(m)&&_&&(m=W(m,_)),D(m)&&!_&&(m=null),D(v)&&X&&(v=W(v,X)),D(y)&&X&&(y=W(y,X)),D(x)&&_&&(x=W(x,_)),D(b)&&_&&(b=W(b,_)),i.padding&&X)for(var q in i.padding)Object.hasOwnProperty.call(T,q)&&(T[q]=W(T[q],X));var G=T.paddingRight,V=void 0===G?0:G,J=T.paddingLeft,Q=void 0===J?0:J;if(i.margin&&[R.marginLeft,R.marginRight].includes("auto"))if(g){var Z=X&&X-g-V-Q-N-Y||0;R.marginLeft==R.marginRight?R.marginLeft=R.marginRight=Z/2:H(R.marginLeft)?R.marginLeft=Z:R.marginRight=Z}else R.marginLeft=R.marginRight=0;var tt=R.marginRight,et=void 0===tt?0:tt,st=R.marginLeft,at={width:g,height:m,left:0,top:0},ht=Q+V+N+Y+(void 0===st?0:st)+et;if(this.offsetWidth=ht,e==rt&&!this.attributes.widths){var ft=n.text||"";s.save(),s.setFonts({fontFamily:I,fontSize:S,fontWeight:z,fontStyle:M}),ft.length,"\n"==ft&&(ft="",this.isBr=!0),(""+ft).split("\n").map((function(e){var i=Array.from(e).map((function(e){var i=""+(/^[\u4e00-\u9fa5]+$/.test(e)?"cn":e)+I+S+z+M,n=ut.get(i);if(n)return{width:n,text:e};var r=t.measureText(e,S).width;return ut.set(i,r),{width:r,text:e}})),n=t.measureText(e,S),r=n.fontHeight,o=n.ascent,s=n.descent;t.attributes.fontHeight=r,t.attributes.ascent=o,t.attributes.descent=s,t.attributes.widths||(t.attributes.widths=[]),t.attributes.widths.push({widths:i,total:i.reduce((function(t,e){return t+e.width}),0)})})),s.restore()}if(e==nt&&null==g){var lt=n.width,dt=n.height;at.width=this.contrastSize(Math.round(lt*m/dt)||0,v,y),this.layoutBoxUpdate(at,i,0)}if(e==rt&&null==g){var pt=this.attributes.widths,gt=Math.max.apply(Math,pt.map((function(t){return t.total})));if(o&&X>0&&(gt>X||this.isBlock(this))&&!this.isAbsolute&&!this.isFixed)gt=X;at.width=this.contrastSize(gt,v,y),this.layoutBoxUpdate(at,i,0)}if(e==rt&&(o.style.flex||!this.attributes.lines)){var vt=this.attributes.widths.length;this.attributes.widths.forEach((function(t){return t.widths.reduce((function(t,e,i){return t+e.width>at.width?(vt++,e.width):t+e.width}),0)})),vt=B&&vt>B?B:vt,this.attributes.lines=vt}if(e==nt&&null==m){var yt=n.width,xt=n.height;n.text,at.height=this.contrastSize(W(at.width*xt/yt)||0,x,b),this.layoutBoxUpdate(at,i,1)}e==rt&&null==m&&(P=W(P,S),at.height=this.contrastSize(W(this.attributes.lines*P),x,b),this.layoutBoxUpdate(at,i,1,!0)),!g&&o&&o.children&&X&&(!this.isFlex(o)||o.isFlexCalc)&&([ot,rt].includes(e)&&this.isFlex()||e==ot&&this.isBlock(this)&&this.isInFlow())&&(at.width=this.contrastSize(X-(o.isFlexCalc?0:ht),v,y),this.layoutBoxUpdate(at,i)),g&&!D(g)&&(at.width=this.contrastSize(g,v,y),this.layoutBoxUpdate(at,i,0)),m&&!D(m)&&(at.height=this.contrastSize(at.height,x,b),this.layoutBoxUpdate(at,i,1));var bt=0;if(a.length){var wt=null,mt=!1;a.forEach((function(e,n){e.getBoxWidthHeight();var r=a[n+1];if(r&&r.isInFlow()&&(e.next=r),!t.line||!t.line.ids.includes(e.id))if(e.isInFlow()&&!e.inFlexBox()){var o=t.getBoxState(wt,e);if(e.isBr)return mt=!0;t.line&&t.line.canIEnter(e)&&!o&&!mt?t.line.add(e):(mt=!1,(new K).bind(e)),wt=e}else e.inFlexBox()?t.line&&(t.line.canIEnter(e)||"nowrap"==i.flexWrap)?t.line.add(e):(new it).bind(e):e.isFixed?t.root.fixedLine?t.root.fixedLine.fixedAdd(e):(new K).fixedBind(e):t.fixedLine?t.fixedLine.fixedAdd(e):(new K).fixedBind(e,1)})),this.lines&&(bt=this.lines.reduce((function(t,e){return t+e.height}),0))}var St=0,zt=0;if(!g&&(this.isAbsolute||this.isFixed)&&X){var It=k==ct?X:this.root.width,Mt=It-(D(c)?W(c,It):c)-(D(u)?W(u,It):u);St=i.left?Mt:this.lineMaxWidth}if(!m&&(null!=l?l:this.isAbsolute||this.isFixed&&_)){var kt=k==ct?_:this.root.height,Bt=kt-(D(l)?W(l,kt):l)-(D(d)?W(d,kt):d);zt=i.top?Bt:0}if(g&&!D(g)||at.width||(at.width=St||this.contrastSize((this.isBlock(this)&&!this.isInFlow()?X||o.lineMaxWidth:this.lineMaxWidth)||this.lineMaxWidth,v,y),this.layoutBoxUpdate(at,i,0)),m||!bt&&!zt||(at.height=zt||this.contrastSize(bt,x,b),this.layoutBoxUpdate(at,i)),i.borderRadius&&this.borderSize&&this.borderSize.width)for(var q in i.borderRadius)Object.hasOwnProperty.call(i.borderRadius,q)&&(i.borderRadius[q]=W(i.borderRadius[q],this.borderSize.width));return this.layoutBox},e.layout=function(){return this.getBoxWidthHeight(),this.root.offsetSize=this.offsetSize,this.root.contentSize=this.contentSize,this.getBoxPosition(),this.offsetSize},t}(),gt=function(){var t,e,i,n,r,o,s=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],a=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],h=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],c=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],f=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],l=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],d=[],u=[],p=[],g=[],v=[],y=2;function x(t,e){var i;t>e&&(i=t,t=e,e=i),i=e,i*=e,i+=e,i>>=1,g[i+=t]=1}function b(t,i){var n;for(p[t+e*i]=1,n=-2;n<2;n++)p[t+n+e*(i-2)]=1,p[t-2+e*(i+n+1)]=1,p[t+2+e*(i+n)]=1,p[t+n+1+e*(i+2)]=1;for(n=0;n<2;n++)x(t-1,i+n),x(t+1,i-n),x(t-n,i-1),x(t+n,i+1)}function w(t){for(;t>=255;)t=((t-=255)>>8)+(255&t);return t}var m=[];function S(t,e,i,n){var r,o,s;for(r=0;r<n;r++)d[i+r]=0;for(r=0;r<e;r++){if(255!=(s=f[d[t+r]^d[i]]))for(o=1;o<n;o++)d[i+o-1]=d[i+o]^l[w(s+m[n-o])];else for(o=i;o<i+n;o++)d[o]=d[o+1];d[i+n-1]=255==s?0:l[w(s+m[0])]}}function z(t,e){var i;return t>e&&(i=t,t=e,e=i),i=e,i+=e*e,i>>=1,g[i+=t]}function I(t){var i,n,r,o;switch(t){case 0:for(n=0;n<e;n++)for(i=0;i<e;i++)i+n&1||z(i,n)||(p[i+n*e]^=1);break;case 1:for(n=0;n<e;n++)for(i=0;i<e;i++)1&n||z(i,n)||(p[i+n*e]^=1);break;case 2:for(n=0;n<e;n++)for(r=0,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,n)||(p[i+n*e]^=1);break;case 3:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=o,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,n)||(p[i+n*e]^=1);break;case 4:for(n=0;n<e;n++)for(r=0,o=n>>1&1,i=0;i<e;i++,r++)3==r&&(r=0,o=!o),o||z(i,n)||(p[i+n*e]^=1);break;case 5:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&n&1)+!(!r|!o)||z(i,n)||(p[i+n*e]^=1);break;case 6:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&n&1)+(r&&r==o)&1||z(i,n)||(p[i+n*e]^=1);break;case 7:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(r&&r==o)+(i+n&1)&1||z(i,n)||(p[i+n*e]^=1)}}function M(t){var e,i=0;for(e=0;e<=t;e++)v[e]>=5&&(i+=3+v[e]-5);for(e=3;e<t-1;e+=2)v[e-2]==v[e+2]&&v[e+2]==v[e-1]&&v[e-1]==v[e+1]&&3*v[e-1]==v[e]&&(0==v[e-3]||e+3>t||3*v[e-3]>=4*v[e]||3*v[e+3]>=4*v[e])&&(i+=40);return i}function k(){var t,i,n,r,o,s=0,a=0;for(i=0;i<e-1;i++)for(t=0;t<e-1;t++)(p[t+e*i]&&p[t+1+e*i]&&p[t+e*(i+1)]&&p[t+1+e*(i+1)]||!(p[t+e*i]||p[t+1+e*i]||p[t+e*(i+1)]||p[t+1+e*(i+1)]))&&(s+=3);for(i=0;i<e;i++){for(v[0]=0,n=r=t=0;t<e;t++)(o=p[t+e*i])==r?v[n]++:v[++n]=1,a+=(r=o)?1:-1;s+=M(n)}a<0&&(a=-a);var h=a,c=0;for(h+=h<<2,h<<=1;h>e*e;)h-=e*e,c++;for(s+=10*c,t=0;t<e;t++){for(v[0]=0,n=r=i=0;i<e;i++)(o=p[t+e*i])==r?v[n]++:v[++n]=1,r=o;s+=M(n)}return s}var B=null;return{api:{get ecclevel(){return y},set ecclevel(t){y=t},get size(){return _size},set size(t){_size=t},get canvas(){return B},set canvas(t){B=t},getFrame:function(v){return function(v){var M,B,W,P,O,T,L,R;P=v.length,t=0;do{if(t++,W=4*(y-1)+16*(t-1),i=c[W++],n=c[W++],r=c[W++],o=c[W],P<=(W=r*(i+n)+n-3+(t<=9)))break}while(t<40);for(e=17+4*t,O=r+(r+o)*(i+n)+n,P=0;P<O;P++)u[P]=0;for(d=v.slice(0),P=0;P<e*e;P++)p[P]=0;for(P=0;P<(e*(e+1)+1)/2;P++)g[P]=0;for(P=0;P<3;P++){for(W=0,B=0,1==P&&(W=e-7),2==P&&(B=e-7),p[B+3+e*(W+3)]=1,M=0;M<6;M++)p[B+M+e*W]=1,p[B+e*(W+M+1)]=1,p[B+6+e*(W+M)]=1,p[B+M+1+e*(W+6)]=1;for(M=1;M<5;M++)x(B+M,W+1),x(B+1,W+M+1),x(B+5,W+M),x(B+M+1,W+5);for(M=2;M<4;M++)p[B+M+e*(W+2)]=1,p[B+2+e*(W+M+1)]=1,p[B+4+e*(W+M)]=1,p[B+M+1+e*(W+4)]=1}if(t>1)for(P=s[t],B=e-7;;){for(M=e-7;M>P-3&&(b(M,B),!(M<P));)M-=P;if(B<=P+9)break;b(6,B-=P),b(B,6)}for(p[8+e*(e-8)]=1,B=0;B<7;B++)x(7,B),x(e-8,B),x(7,B+e-7);for(M=0;M<8;M++)x(M,7),x(M+e-8,7),x(M,e-8);for(M=0;M<9;M++)x(M,8);for(M=0;M<8;M++)x(M+e-8,8),x(8,M);for(B=0;B<7;B++)x(8,B+e-7);for(M=0;M<e-14;M++)1&M?(x(8+M,6),x(6,8+M)):(p[8+M+6*e]=1,p[6+e*(8+M)]=1);if(t>6)for(P=a[t-7],W=17,M=0;M<6;M++)for(B=0;B<3;B++,W--)1&(W>11?t>>W-12:P>>W)?(p[5-M+e*(2-B+e-11)]=1,p[2-B+e-11+e*(5-M)]=1):(x(5-M,2-B+e-11),x(2-B+e-11,5-M));for(B=0;B<e;B++)for(M=0;M<=B;M++)p[M+e*B]&&x(M,B);for(O=d.length,T=0;T<O;T++)u[T]=d.charCodeAt(T);if(d=u.slice(0),O>=(M=r*(i+n)+n)-2&&(O=M-2,t>9&&O--),T=O,t>9){for(d[T+2]=0,d[T+3]=0;T--;)P=d[T],d[T+3]|=255&P<<4,d[T+2]=P>>4;d[2]|=255&O<<4,d[1]=O>>4,d[0]=64|O>>12}else{for(d[T+1]=0,d[T+2]=0;T--;)P=d[T],d[T+2]|=255&P<<4,d[T+1]=P>>4;d[1]|=255&O<<4,d[0]=64|O>>4}for(T=O+3-(t<10);T<M;)d[T++]=236,d[T++]=17;for(m[0]=1,T=0;T<o;T++){for(m[T+1]=1,L=T;L>0;L--)m[L]=m[L]?m[L-1]^l[w(f[m[L]]+T)]:m[L-1];m[0]=l[w(f[m[0]]+T)]}for(T=0;T<=o;T++)m[T]=f[m[T]];for(W=M,B=0,T=0;T<i;T++)S(B,r,W,o),B+=r,W+=o;for(T=0;T<n;T++)S(B,r+1,W,o),B+=r+1,W+=o;for(B=0,T=0;T<r;T++){for(L=0;L<i;L++)u[B++]=d[T+L*r];for(L=0;L<n;L++)u[B++]=d[i*r+T+L*(r+1)]}for(L=0;L<n;L++)u[B++]=d[i*r+T+L*(r+1)];for(T=0;T<o;T++)for(L=0;L<i+n;L++)u[B++]=d[M+T+L*o];for(d=u,M=B=e-1,W=O=1,R=(r+o)*(i+n)+n,T=0;T<R;T++)for(P=d[T],L=0;L<8;L++,P<<=1){128&P&&(p[M+e*B]=1);do{O?M--:(M++,W?0!=B?B--:(W=!W,6==(M-=2)&&(M--,B=9)):B!=e-1?B++:(W=!W,6==(M-=2)&&(M--,B-=8))),O=!O}while(z(M,B))}for(d=p.slice(0),P=0,B=3e4,W=0;W<8&&(I(W),(M=k())<B&&(B=M,P=W),7!=P);W++)p=d.slice(0);for(P!=W&&I(P),B=h[P+(y-1<<3)],W=0;W<8;W++,B>>=1)1&B&&(p[e-1-W+8*e]=1,W<6?p[8+e*W]=1:p[8+e*(W+1)]=1);for(W=0;W<7;W++,B>>=1)1&B&&(p[8+e*(e-7+W)]=1,W?p[6-W+8*e]=1:p[7+8*e]=1);return p}(v)},utf16to8:function(t){var e,i,n,r;for(e="",n=t.length,i=0;i<n;i++)(r=t.charCodeAt(i))>=1&&r<=127?e+=t.charAt(i):r>2047?(e+=String.fromCharCode(224|r>>12&15),e+=String.fromCharCode(128|r>>6&63),e+=String.fromCharCode(128|r>>0&63)):(e+=String.fromCharCode(192|r>>6&31),e+=String.fromCharCode(128|r>>0&63));return e},draw:function(t,i,n,r,o){i.drawView(n,r);var s=i.ctx,a=n.contentSize,h=a.width,c=a.height,f=a.left,l=a.top;r.borderRadius,r.backgroundColor;var d=r.color,u=void 0===d?"#000000":d;r.border,n.contentSize.left,n.borderSize.left,n.contentSize.top,n.borderSize.top;if(y=o||y,s){s.save(),i.setOpacity(r),i.setTransform(n,r);var p=Math.min(h,c);t=this.utf16to8(t);var g=this.getFrame(t),v=p/e;s.setFillStyle(u);for(var x=0;x<e;x++)for(var b=0;b<e;b++)g[b*e+x]&&s.fillRect(f+v*x,l+v*b,v,v);s.restore(),i.setBorder(n,r)}else console.warn("No canvas provided to draw QR code in!")}}}}(),vt=p,yt=u,xt=g,bt=d,wt=f.TOP,mt=f.MIDDLE,St=f.BOTTOM,zt=l.LEFT,It=l.CENTER,Mt=l.RIGHT,kt=function(){function r(t){var e,i,r=this;this.v="1.9.5.1",this.id=null,this.pixelRatio=1,this.width=0,this.height=0,this.sleep=1e3/30,this.count=0,this.isRate=!1,this.isDraw=!0,this.isCache=!0,this.fixed="",this.useCORS=!1,this.performance=!1,this.imageBus=[],this.createImage=function(t,e){return new Promise((function(i,n){var o=null;window||r.canvas.createImage?(o=r.canvas&&r.canvas.createImage?r.canvas.createImage():new Image,e&&o.setAttribute("crossOrigin","Anonymous"),o.src=t,o.onload=function(){i({width:o.naturalWidth||o.width,height:o.naturalHeight||o.height,path:o,src:this.src})},o.onerror=function(t){n(t)}):n({fail:"getImageInfo fail",src:t})}))},this.options=t,Object.assign(this,t),this.ctx=(e=t.context,i={get:function(t,i){if("setFonts"===i)return function(t){var i=t.fontFamily,r=void 0===i?"sans-serif":i,o=t.fontSize,s=void 0===o?14:o,a=t.fontWeight,h=void 0===a?"normal":a,c=t.fontStyle,f=void 0===c?"normal":c;I==n.MP_TOUTIAO&&(h="bold"==h?"bold":"",f="italic"==f?"italic":""),e.font="".concat(f," ").concat(h," ").concat(Math.round(s),"px ").concat(r)};if(!e.draw||!e.setFillStyle){if("setFillStyle"===i)return function(t){e.fillStyle=t};if("setStrokeStyle"===i)return function(t){e.strokeStyle=t};if("setLineWidth"===i)return function(t){e.lineWidth=t};if("setLineCap"===i)return function(t){e.lineCap=t};if("setFontSize"===i)return function(t){e.font="".concat(String(t),"px sans-serif")};if("setGlobalAlpha"===i)return function(t){e.globalAlpha=t};if("setLineJoin"===i)return function(t){e.lineJoin=t};if("setTextAlign"===i)return function(t){e.textAlign=t};if("setMiterLimit"===i)return function(t){e.miterLimit=t};if("setShadow"===i)return function(t,i,n,r){e.shadowOffsetX=t,e.shadowOffsetY=i,e.shadowBlur=n,e.shadowColor=r};if("setTextBaseline"===i)return function(t){e.textBaseline=t};if("createCircularGradient"===i)return function(){};if("draw"===i)return function(){};if("function"==typeof e[i])return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return e[i].apply(e,t)}}return t[i]},set:function(t,i,n){return e[i]=n,!0}},new Proxy(e,i)),this.progress=0,this.root={width:t.width,height:t.height,fontSizeRate:1,fixedLine:null},this.size=this.root;var o=0;Object.defineProperty(this,"progress",{configurable:!0,set:function(t){o=t,r.lifecycle("onProgress",t/r.count)},get:function(){return o||0}})}return r.prototype.lifecycle=function(t,e){this.options.listen&&this.options.listen[t]&&this.options.listen[t](e)},r.prototype.setContext=function(t){t&&(this.ctx=t)},r.prototype.init=function(){if(this.canvas.height||n.WEB==I){this.ctx.setTransform(1,0,0,1,0,0);var t=this.size.height*this.pixelRatio,e=this.size.width*this.pixelRatio;this.canvas.height=t,this.canvas.width=e,this.ctx.scale(this.pixelRatio,this.pixelRatio)}},r.prototype.clear=function(){this.ctx.clearRect(0,0,this.size.width,this.size.height)},r.prototype.clipPath=function(t,e,i,n,r,o,s){void 0===o&&(o=!1),void 0===s&&(s=!1);var a=this.ctx;if(/polygon/.test(r)){var h=r.match(/-?\d+(rpx|px|%)?\s+-?\d+(rpx|px|%)?/g)||[];a.beginPath(),h.map((function(r){var o=r.split(" "),s=o[0],a=o[1];return[W(s,i)+t,W(a,n)+e]})).forEach((function(t,e){0==e?a.moveTo(t[0],t[1]):a.lineTo(t[0],t[1])})),a.closePath(),s&&a.stroke(),o&&a.fill()}},r.prototype.roundRect=function(t,e,i,n,r,o,s){if(void 0===o&&(o=!1),void 0===s&&(s=!1),!(r<0)){var a=this.ctx;if(a.beginPath(),r){var h=r||{},c=h.borderTopLeftRadius,f=void 0===c?r||0:c,l=h.borderTopRightRadius,d=void 0===l?r||0:l,u=h.borderBottomRightRadius,p=void 0===u?r||0:u,g=h.borderBottomLeftRadius,v=void 0===g?r||0:g;a.arc(t+i-p,e+n-p,p,0,.5*Math.PI),a.lineTo(t+v,e+n),a.arc(t+v,e+n-v,v,.5*Math.PI,Math.PI),a.lineTo(t,e+f),a.arc(t+f,e+f,f,Math.PI,1.5*Math.PI),a.lineTo(t+i-d,e),a.arc(t+i-d,e+d,d,1.5*Math.PI,2*Math.PI),a.lineTo(t+i,e+n-p)}else a.rect(t,e,i,n);a.closePath(),s&&a.stroke(),o&&a.fill()}},r.prototype.setTransform=function(t,e){var i=e.transform,n=e.transformOrigin,r=this.ctx,o=i||{},s=o.scaleX,a=void 0===s?1:s,h=o.scaleY,c=void 0===h?1:h,f=o.translateX,l=void 0===f?0:f,d=o.translateY,u=void 0===d?0:d,p=o.rotate,g=void 0===p?0:p,v=o.skewX,y=void 0===v?0:v,x=o.skewY,b=void 0===x?0:x,w=t.left,m=t.top,S=t.width,z=t.height;l=W(l,S)||0,u=W(u,z)||0;var I=W("0%",1),M=W("50%",1),k=W("100%",1),P={top:I,center:M,bottom:k},O={left:I,center:M,right:k};if(n=n.split(" ").filter((function(t,e){return e<2})).reduce((function(t,e){if(/\d+/.test(e)){var i=W(e,1)/(/px|rpx$/.test(e)?B(t.x)?z:S:1);return B(t.x)?Object.assign(t,{y:i}):Object.assign(t,{x:i})}return B(O[e])&&!B(t.x)?Object.assign(t,{x:O[e]}):Object.assign(t,{y:P[e]||.5})}),{}),(l||u)&&r.translate(l,u),(a||c)&&r.scale(a,c),g){var T=w+S*n.x,L=m+z*n.y;r.translate(T,L),r.rotate(g*Math.PI/180),r.translate(-T,-L)}(y||b)&&r.transform(1,Math.tan(b*Math.PI/180),Math.tan(y*Math.PI/180),1,0,0)},r.prototype.setBackground=function(t,e,i,r,o){var s=this.ctx;t&&"transparent"!=t?O(t)?T(t,e,i,r,o,s):s.setFillStyle(t):[n.MP_TOUTIAO,n.MP_BAIDU].includes(I)?s.setFillStyle("rgba(0,0,0,0)"):s.setFillStyle("transparent")},r.prototype.setShadow=function(t){var e=t.boxShadow,i=void 0===e?[]:e,n=this.ctx;if(i.length){var r=i[0],o=i[1],s=i[2],a=i[3];n.setShadow(r,o,s,a)}},r.prototype.setBorder=function(t,e){var i=this.ctx,n=t.width,r=t.height,o=t.left,s=t.top,a=e.border,h=e.borderBottom,c=e.borderTop,f=e.borderRight,l=e.borderLeft,d=e.borderRadius,u=e.lineCap,p=a||{},g=p.borderWidth,v=void 0===g?0:g,y=p.borderStyle,x=p.borderColor,b=h||{},w=b.borderBottomWidth,m=void 0===w?v:w,S=b.borderBottomStyle,z=void 0===S?y:S,M=b.borderBottomColor,k=void 0===M?x:M,B=c||{},W=B.borderTopWidth,P=void 0===W?v:W,O=B.borderTopStyle,T=void 0===O?y:O,L=B.borderTopColor,R=void 0===L?x:L,F=f||{},A=F.borderRightWidth,j=void 0===A?v:A,E=F.borderRightStyle,C=void 0===E?y:E,H=F.borderRightColor,D=void 0===H?x:H,Y=l||{},$=Y.borderLeftWidth,U=void 0===$?v:$,N=Y.borderLeftStyle,X=void 0===N?y:N,_=Y.borderLeftColor,q=void 0===_?x:_,G=d||{},V=G.borderTopLeftRadius,J=void 0===V?d||0:V,Q=G.borderTopRightRadius,Z=void 0===Q?d||0:Q,K=G.borderBottomRightRadius,tt=void 0===K?d||0:K,et=G.borderBottomLeftRadius,it=void 0===et?d||0:et;if(h||l||c||f||a){var nt=function(t,e,n){"dashed"==e?/mp/.test(I)?i.setLineDash([Math.ceil(4*t/3),Math.ceil(4*t/3)]):i.setLineDash([Math.ceil(6*t),Math.ceil(6*t)]):"dotted"==e&&i.setLineDash([t,t]),i.setStrokeStyle(n)},rt=function(t,e,n,r,o,s,a,h,c,f,l,d,p,g,v){i.save(),i.setLineCap(v?"square":u),i.setLineWidth(d),nt(d,p,g),i.beginPath(),i.arc(t,e,a,Math.PI*c,Math.PI*f),i.lineTo(n,r),i.arc(o,s,h,Math.PI*f,Math.PI*l),i.stroke(),i.restore()};if(i.save(),a&&!h&&!l&&!c&&!f)return i.setLineWidth(v),nt(v,y,x),this.roundRect(o,s,n,r,d,!1,!!x),void i.restore();m&&rt(o+n-tt,s+r-tt,o+it,s+r,o+it,s+r-it,tt,it,.25,.5,.75,m,z,k,U&&j),U&&rt(o+it,s+r-it,o,s+J,o+J,s+J,it,J,.75,1,1.25,U,X,q,P&&m),P&&rt(o+J,s+J,o+n-Z,s,o+n-Z,s+Z,J,Z,1.25,1.5,1.75,P,T,R,U&&j),j&&rt(o+n-Z,s+Z,o+n,s+r-tt,o+n-tt,s+r-tt,Z,tt,1.75,2,.25,j,C,D,P&&m)}},r.prototype.setOpacity=function(t){var e=t.opacity,i=void 0===e?1:e;this.ctx.setGlobalAlpha(i)},r.prototype.drawPattern=function(t,n,r){return e(this,void 0,void 0,(function(){var e=this;return i(this,(function(i){return[2,new Promise((function(i,o){e.drawView(n,r,!0,!1,!0);var s=e,a=s.ctx;s.canvas;var h=n.width,c=n.height,f=n.left,l=n.top,d=r||{},u=d.borderRadius,p=void 0===u?0:u,g=d.backgroundImage,v=d.backgroundRepeat,y=void 0===v?"repeat":v;g&&function(t){var o=a.createPattern(t.src,y);a.setFillStyle(o),e.roundRect(f,l,h,c,p,!0,!1),e.setBorder(n,r),i()}(t)}))]}))}))},r.prototype.drawView=function(t,e,i,n,r){void 0===i&&(i=!0),void 0===n&&(n=!0),void 0===r&&(r=!0);var o=this.ctx,s=t.width,a=t.height,h=t.left,c=t.top,f=e||{},l=f.borderRadius,d=void 0===l?0:l,u=f.backgroundColor,p=void 0===u?"transparent":u,g=f.overflow;e.opacity&&this.setOpacity(e),this.setTransform(t,e),r&&(o.save(),this.setShadow(e)),i&&this.setBackground(p,s,a,h,c),e.clipPath?this.clipPath(h,c,s,a,e.clipPath,i,!1):this.roundRect(h,c,s,a,d,i,!1),r&&o.restore(),n&&this.setBorder(t,e),"hidden"==g&&o.clip()},r.prototype.drawImage=function(t,r,o,s){return void 0===r&&(r={}),void 0===o&&(o={}),void 0===s&&(s=!0),e(this,void 0,void 0,(function(){var a=this;return i(this,(function(h){switch(h.label){case 0:return[4,new Promise((function(h,c){return e(a,void 0,void 0,(function(){var e,a,c,f,l,d,u,p,g,v,y,x,b,w,m,S,z,M,k,O,T,L=this;return i(this,(function(i){return e=this.ctx,a=o.borderRadius,c=void 0===a?0:a,f=o.backgroundColor,l=void 0===f?"transparent":f,d=o.objectFit,u=void 0===d?"fill":d,p=o.backgroundSize,g=void 0===p?"fill":p,v=o.objectPosition,y=o.backgroundPosition,x=o.boxShadow,o.backgroundImage&&(u=g,v=y),x&&this.drawView(r,Object.assign(o,{backgroundColor:l||x&&(l||"#ffffff")}),!0,!1,!0),b=r.width,w=r.height,m=r.left,S=r.top,e.save(),z=r.contentSize.left-r.borderSize.left,M=r.contentSize.top-r.borderSize.top,s||(this.setOpacity(o),this.setTransform(r,o),this.setBackground(l,b,w,m,S),this.roundRect(m,S,b,w,c,!!(c||!x&&l),!1)),m+=z,S+=M,e.clip(),k=function(t){if("fill"!==u){var i=function(t,e,i){var n=t.objectFit,r=t.objectPosition,o=e.width/e.height,s=i.width/i.height,a=1,h="contain",c="cover";n==h&&o>=s||n==c&&o<s?a=e.height/i.height:(n==h&&o<s||n==c&&o>=s)&&(a=e.width/i.width);var f=i.width*a,l=i.height*a,d=r||[],u=d[0],p=d[1],g=B(u)?W(u,e.width):(e.width-f)*(P(u)?W(u,1):{left:0,center:.5,right:1}[u||"center"]),v=B(p)?W(p,e.height):(e.height-l)*(P(p)?W(p,1):{top:0,center:.5,bottom:1}[p||"center"]),y=function(t,e){return[(t-g)/a,(e-v)/a]},x=y(0,0),b=x[0],w=x[1],m=y(e.width,e.height),S=m[0],z=m[1],I=Math.max,M=Math.min;return{sx:I(b,0),sy:I(w,0),sw:M(S-b,i.width),sh:M(z-w,i.height),dx:I(g,0),dy:I(v,0),dw:M(f,e.width),dh:M(l,e.height)}}({objectFit:u,objectPosition:v},r.contentSize,t),o=i.sx,s=i.sy,a=i.sh,h=i.sw,c=i.dx,f=i.dy,l=i.dh,d=i.dw;I==n.MP_BAIDU?e.drawImage(t.src,c+m,f+S,d,l,o,s,h,a):e.drawImage(t.src,o,s,h,a,c+m,f+S,d,l)}else e.drawImage(t.src,m,S,b,w)},O=function(){e.restore(),L.drawView(r,o,!1,!0,!1),h(1)},T=function(t){k(t),O()},T(t),[2]}))}))}))];case 1:return h.sent(),[2]}}))}))},r.prototype.drawText=function(t,e,i,n){var r=this,o=this.ctx,s=e.borderSize,a=e.contentSize,h=e.left,c=e.top,f=a.width,l=a.height,d=a.left-s.left||0,u=a.top-s.top||0,p=i.color,g=i.lineHeight,v=i.fontSize,y=i.fontWeight,x=i.fontFamily,b=i.fontStyle,w=i.textIndent,m=void 0===w?0:w,S=i.textAlign,z=i.textStroke,I=i.verticalAlign,M=void 0===I?mt:I,k=i.backgroundColor,P=i.lineClamp,O=i.backgroundClip,T=i.textShadow,L=i.textDecoration;if(m=B(m)?m:0,this.drawView(e,i,O!=yt),g=W(g,v),t){o.save(),h+=d,c+=u;var R=n.fontHeight,F=n.descent,A=void 0===F?0:F,j=n.ascent,E=A+(void 0===j?0:j);switch(o.setFonts({fontFamily:x,fontSize:v,fontWeight:y,fontStyle:b}),o.setTextBaseline(mt),o.setTextAlign(S),O?this.setBackground(k,f,l,h,c):o.setFillStyle(p),S){case zt:break;case It:h+=.5*f;break;case Mt:h+=f}var C=n.lines*g,H=Math.ceil((l-C)/2);switch(H<0&&(H=0),M){case wt:break;case mt:c+=H;break;case St:c+=2*H}var D=(g-R)/2,Y=g/2,$=function(t){var e=o.measureText(t),i=e.actualBoundingBoxDescent,n=void 0===i?0:i,r=e.actualBoundingBoxAscent;return M==wt?{fix:E?void 0===r?0:r:Y-D/2,lineY:E?0:D-D/2}:M==mt?{fix:E?Y+n/4:Y,lineY:E?0:D}:M==St?{fix:E?g-n:Y+D/2,lineY:E?2*D:D+D/2}:{fix:0,height:0,lineY:0}},U=function(t,e,i){var r=t;switch(S){case zt:r+=i;break;case It:r=(t-=i/2)+i;break;case Mt:r=t,t-=i}if(L){o.setLineWidth(v/13),o.beginPath();var s=.1*n.fontHeight;/\bunderline\b/.test(L)&&(o.moveTo(t,e+n.fontHeight+s),o.lineTo(r,e+n.fontHeight+s)),/\boverline\b/.test(L)&&(o.moveTo(t,e-s),o.lineTo(r,e-s)),/\bline-through\b/.test(L)&&(o.moveTo(t,e+.5*n.fontHeight),o.lineTo(r,e+.5*n.fontHeight)),o.closePath(),o.setStrokeStyle(p),o.stroke()}},N=function(t,e,i){var n=function(){o.setLineWidth(z.width),o.setStrokeStyle(z.color),o.strokeText(t,e,i)},s="outset";z&&z.type!==s?(o.save(),r.setShadow({boxShadow:T}),o.fillText(t,e,i),o.restore(),n()):z&&z.type==s?(o.save(),r.setShadow({boxShadow:T}),n(),o.restore(),o.save(),o.fillText(t,e,i),o.restore()):(r.setShadow({boxShadow:T}),o.fillText(t,e,i))};if(!n.widths||1==n.widths.length&&n.widths[0].total+m<=a.width){var X=$(t),_=X.fix,q=void 0===_?0:_,G=X.lineY;return N(t,h+m,c+q),U(h+m,c+G,n&&n.widths&&n.widths[0].total||n.text),c+=g,o.restore(),void this.setBorder(e,i)}for(var V=c,J=h,Q="",Z=0,K=o.measureText("...").width,tt=n.widths,et=0;et<tt.length;et++){var it=tt[et].widths,nt=0;Q="",c+=1==(Z+=1)?0:g,1==Z&&m&&(nt=m,J=h+m);for(var rt=0;rt<it.length;rt++){1!==Z&&m&&(J=h);var ot=it[rt],st=ot.width,at=ot.text,ht=(it[rt+1]||{}).width;if(Q+=at,(nt+=st)+(void 0===ht?0:ht)+(0==Z?m:0)+(Z==P?K:0)>a.width){Z>=P&&(Q+="…"),Z++,nt=0;var ct=$(Q);q=ct.fix,G=ct.lineY;N(Q,J,c+q),U(J,c+G,nt),c+=g,Q=""}else if(rt==it.length-1){et!=tt.length-1&&Z==P&&K+nt<a.width&&(Q+="…");var ft=$(Q);q=ft.fix,G=ft.lineY;N(Q,J,c+q),U(J,c+G,nt)}if(c>V+l||Z>P)break}}o.restore()}},r.prototype.source=function(t){return e(this,void 0,void 0,(function(){var e,n,r,o,s=this;return i(this,(function(i){switch(i.label){case 0:if(this.node=null,e=+new Date,"{}"==JSON.stringify(t))return[2];if(t.styles=t.styles||t.css||{},!t.type)for(n in t.type=bt,t)["views","children","type","css","styles"].includes(n)||(t.styles[n]=t[n],delete t[n]);return t.styles.boxSizing||(t.styles.boxSizing="border-box"),[4,this.create(t)];case 1:return(r=i.sent())?(o=r.layout()||{},this.size=o,this.node=r,this.onEffectFinished().then((function(t){return s.lifecycle("onEffectSuccess",t)})).catch((function(t){return s.lifecycle("onEffectFail",t)})),this.performance&&console.log("布局用时："+(+new Date-e)+"ms"),[2,this.size]):[2,console.warn("no node")]}}))}))},r.prototype.getImageInfo=function(t){return this.imageBus[t]||(this.imageBus[t]=this.createImage(t,this.useCORS)),this.imageBus[t]},r.prototype.create=function(n,r){return e(this,void 0,void 0,(function(){function e(i,n,r){void 0===n&&(n={}),void 0===r&&(r=!0);var o=[];return i.forEach((function(i){var s=i.styles,a=void 0===s?{}:s,h=i.css,c=void 0===h?{}:h,f=i.children,l=void 0===f?[]:f,d=i.views,u=void 0===d?[]:d,p=i.text,g=void 0===p?"":p,v=i.type,y=void 0===v?"":v;!l&&u&&(i.children=l=u);var x={};x=t(t(r?t({},n):{},a),c);var b={},w={},m={};Object.keys(x).map((function(t){if(t.includes("padding")||t.includes("margin")){var e=V(t,x[t]);Object.keys(e).map((function(t){t.includes("Left")?w[t]=e[t]:t.includes("Right")?m[t]=e[t]:b[t]=e[t]}))}}));if(x.textIndent&&(w.textIndent=x.textIndent,delete n.textIndent),""!==g){var S=Array.from(g);S.forEach((function(t,e){var i=Object.assign({},x,b);0===e?Object.assign(i,w):e==S.length-1&&Object.assign(i,m),delete i.padding,delete i.margin,o.push({type:"text",text:t,styles:i})}))}if(y==vt||y==xt)o.push(i);else if("block"===a.display&&l.length>0){var z=e(l,x,!1);i.children=z,i.flattened=!0,o.push(i)}else if(l.length>0){z=e(l,x,r);o=o.concat(z)}})),o}var o,s,a,h,c,f,l,d,u,p,g,v,y,b,w,m,S,z,I,M,k,B,W,P;return i(this,(function(i){switch(i.label){case 0:if(!n)return[2];if(n.styles||(n.styles=n.css||{}),o=n.type,s=n.show,a=void 0===s||s,h=o==vt,c=[yt,xt].includes(o),f="textBox"==o,l=n.styles||{},d=l.backgroundImage,u=l.display,h&&!n.src&&!n.url)return[2];if(u==x||!a)return[2];if(c||f){if(p=n.children,g=n.views,!p&&g&&(n.children=p=g),!n.text&&(!p||p&&!p.length))return[2];p&&p.length&&!n.flattened&&(v=e(n.children||n.views),n.type="view",n.children=v)}if(!(h||n.type==bt&&d))return[3,4];y=h?n.src:"",b=/url\(['"]?(.*?)['"]?\)/.exec(d),d&&b&&b[1]&&(y=b[1]||""),i.label=1;case 1:return i.trys.push([1,3,,4]),[4,this.getImageInfo(y)];case 2:return w=i.sent(),m=w.width,S=w.height,!(z=w.path)&&h?[2]:(z&&(n.attributes=Object.assign(n.attributes||{},{width:m,height:S,path:z,src:z,naturalSrc:y})),[3,4]);case 3:return I=i.sent(),n.type!=bt?[2]:(this.lifecycle("onEffectFail",t(t({},I),{src:y})),[3,4]);case 4:if(this.count+=1,M=new pt(n,r,this.root,this.ctx),!(k=n.children||n.views))return[3,8];B=0,i.label=5;case 5:return B<k.length?(W=k[B],[4,this.create(W,M)]):[3,8];case 6:(P=i.sent())&&M.add(P),i.label=7;case 7:return B++,[3,5];case 8:return[2,M]}}))}))},r.prototype.drawNode=function(t,n){return void 0===n&&(n=!1),e(this,void 0,void 0,(function(){var e,r,o,s,a,h,c,f,l,d,u,p,g,v,y,x,b,w,m,S,z,I,M;return i(this,(function(i){switch(i.label){case 0:return e=t.layoutBox,r=t.computedStyle,o=t.attributes,s=t.name,a=t.children,h=t.fixedLine,c=t.attributes,f=c.src,l=c.text,d=r.position,u=r.backgroundImage,p=r.backgroundRepeat,["fixed"].includes(d)&&!n?[2]:(this.ctx.save(),s!==bt?[3,7]:f&&u?p?[4,this.drawPattern(o,e,r)]:[3,2]:[3,5]);case 1:return i.sent(),[3,4];case 2:return[4,this.drawImage(o,e,r,!1)];case 3:i.sent(),i.label=4;case 4:return[3,6];case 5:this.drawView(e,r),i.label=6;case 6:return[3,10];case 7:return s===vt&&f?[4,this.drawImage(o,e,r,!1)]:[3,9];case 8:return i.sent(),[3,10];case 9:s===yt?this.drawText(l,e,r,o):s===xt&&gt.api&&gt.api.draw(l,this,e,r),i.label=10;case 10:if(this.progress+=1,v=(g=h||{}).beforeElements,y=g.afterElements,!v)return[3,14];x=0,b=v,i.label=11;case 11:return x<b.length?(M=b[x],[4,this.drawNode(M)]):[3,14];case 12:i.sent(),i.label=13;case 13:return x++,[3,11];case 14:if(!a)return[3,18];w=Object.values?Object.values(a):Object.keys(a).map((function(t){return a[t]})),m=0,S=w,i.label=15;case 15:return m<S.length?"absolute"===(M=S[m]).computedStyle.position?[3,17]:[4,this.drawNode(M)]:[3,18];case 16:i.sent(),i.label=17;case 17:return m++,[3,15];case 18:if(!y)return[3,22];z=0,I=y,i.label=19;case 19:return z<I.length?(M=I[z],[4,this.drawNode(M)]):[3,22];case 20:i.sent(),i.label=21;case 21:return z++,[3,19];case 22:return this.ctx.restore(),[2]}}))}))},r.prototype.render=function(t){var n=this;return void 0===t&&(t=30),new Promise((function(r,o){return e(n,void 0,void 0,(function(){var e,n,s,a,h,c,f,l,d,u;return i(this,(function(i){switch(i.label){case 0:return e=+new Date,this.init(),[4,(p=t,void 0===p&&(p=0),new Promise((function(t){return setTimeout(t,p)})))];case 1:i.sent(),i.label=2;case 2:if(i.trys.push([2,14,,15]),!this.node)return[3,12];if(n=this.root.fixedLine||{},s=n.beforeElements,a=n.afterElements,!s)return[3,6];h=0,c=s,i.label=3;case 3:return h<c.length?(d=c[h],[4,this.drawNode(d,!0)]):[3,6];case 4:i.sent(),i.label=5;case 5:return h++,[3,3];case 6:return[4,this.drawNode(this.node)];case 7:if(i.sent(),!a)return[3,11];f=0,l=a,i.label=8;case 8:return f<l.length?(d=l[f],[4,this.drawNode(d,!0)]):[3,11];case 9:i.sent(),i.label=10;case 10:return f++,[3,8];case 11:return r(this.node),[3,13];case 12:this.lifecycle("onEffectFail","node is empty"),i.label=13;case 13:return[3,15];case 14:return u=i.sent(),this.lifecycle("onEffectFail",u),o(u),[3,15];case 15:return this.performance&&console.log("渲染用时："+(+new Date-e-30)+"ms"),[2]}var p}))}))}))},r.prototype.onEffectFinished=function(){var t=this,e=Object.keys(this.imageBus).map((function(e){return t.imageBus[e]}));return Promise.all(e)},r.prototype.destroy=function(){this.node=[]},r.prototype.save=function(t){try{var e=t||{},i=e.fileType,n=void 0===i?"png":i,r=e.quality,o=void 0===r?1:r;return this.canvas.toDataURL("image/".concat(n),o)}catch(t){return this.lifecycle("onEffectFail","image cross domain"),t}},r}();n.WEB==I&&(window.Painter=kt);export{kt as Painter,kt as default};
diff --git a/uni_modules/lime-painter/components/l-painter/props.js b/uni_modules/lime-painter/components/l-painter/props.js
new file mode 100644
index 0000000..fee87cf
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/props.js
@@ -0,0 +1,56 @@
+export default {
+	props: {
+		board: Object,
+		pathType: String, // 'base64'、'url'
+		fileType: {
+			type: String,
+			default: 'png'
+		},
+		hidden: Boolean,
+		quality: {
+			type: Number,
+			default: 1
+		},
+		css: [String, Object],
+		// styles: [String, Object],
+		width: [Number, String],
+		height: [Number, String],
+		pixelRatio: Number,
+		customStyle: String,
+		isCanvasToTempFilePath: Boolean,
+		// useCanvasToTempFilePath: Boolean,
+		sleep: {
+			type: Number,
+			default: 1000 / 30
+		},
+		beforeDelay: {
+			type: Number,
+			default: 100
+		},
+		afterDelay: {
+			type: Number,
+			default: 100
+		},
+		performance: Boolean,
+		// #ifdef MP-WEIXIN || MP-TOUTIAO || MP-ALIPAY
+		type: {
+			type: String,
+			default: '2d'
+		},
+		// #endif
+		// #ifdef APP-NVUE
+		hybrid: Boolean,
+		timeout: {
+			type: Number,
+			default: 2000
+		},
+		// #endif
+		// #ifdef H5 || APP-PLUS
+		useCORS: Boolean,
+		hidpi: {
+			type: Boolean,
+			default: true
+		}
+		// #endif
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-painter/components/l-painter/single.js b/uni_modules/lime-painter/components/l-painter/single.js
new file mode 100644
index 0000000..ec415d8
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/single.js
@@ -0,0 +1 @@
+var t=function(){return t=Object.assign||function(t){for(var e,i=1,n=arguments.length;i<n;i++)for(var r in e=arguments[i])Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t},t.apply(this,arguments)};function e(t,e,i,n){return new(i||(i=Promise))((function(r,o){function s(t){try{a(n.next(t))}catch(t){o(t)}}function h(t){try{a(n.throw(t))}catch(t){o(t)}}function a(t){var e;t.done?r(t.value):(e=t.value,e instanceof i?e:new i((function(t){t(e)}))).then(s,h)}a((n=n.apply(t,e||[])).next())}))}function i(t,e){var i,n,r,o,s={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return o={next:h(0),throw:h(1),return:h(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function h(o){return function(h){return function(o){if(i)throw new TypeError("Generator is already executing.");for(;s;)try{if(i=1,n&&(r=2&o[0]?n.return:o[0]?n.throw||((r=n.return)&&r.call(n),0):n.next)&&!(r=r.call(n,o[1])).done)return r;switch(n=0,r&&(o=[2&o[0],r.value]),o[0]){case 0:case 1:r=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(r=s.trys,(r=r.length>0&&r[r.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!r||o[1]>r[0]&&o[1]<r[3])){s.label=o[1];break}if(6===o[0]&&s.label<r[1]){s.label=r[1],r=o;break}if(r&&s.label<r[2]){s.label=r[2],s.ops.push(o);break}r[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{i=r=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,h])}}}var n={MP_WEIXIN:"mp-weixin",MP_QQ:"mp-qq",MP_ALIPAY:"mp-alipay",MP_BAIDU:"mp-baidu",MP_TOUTIAO:"mp-toutiao",MP_DINGDING:"mp-dingding",H5:"h5",WEB:"web",PLUS:"plus"},r=["Top","Right","Bottom","Left"],o="right",s="bottom",h=["contentSize","clientSize","borderSize","offsetSize"],a="row",l="column",d={TOP:"top",MIDDLE:"middle",BOTTOM:s},c={LEFT:"left",CENTER:"center",RIGHT:o},f="view",u="text",p="image",g="qrcode",v="block",y="inline-block",x="none",b="flex",w="absolute",m="fixed",S={display:v,color:"#000000",lineHeight:"1.4em",fontSize:14,fontWeight:400,fontFamily:"sans-serif",lineCap:"butt",flexDirection:a,flexWrap:"nowrap",textAlign:"left",alignItems:"flex-start",justifyContent:"flex-start",position:"static",transformOrigin:"".concat("center"," ").concat("center")},z={upx2px:function(t){return window.innerWidth/750*t},getSystemInfoSync:function(){return{screenWidth:window.innerWidth,screenHeight:window.innerHeight}},getImageInfo:function(t){var e=t.src,i=t.success,n=t.fail,r=new Image;r.onload=function(){i({width:r.naturalWidth,height:r.naturalHeight,path:r.src,src:e})},r.onerror=n,r.src=e}},I="object"==typeof window?"undefined"==typeof uni||"undefined"!=typeof uni&&!uni.addInterceptor?n.WEB:n.H5:"object"==typeof swan?n.MP_BAIDU:"object"==typeof tt?n.MP_TOUTIAO:"object"==typeof plus?n.PLUS:"object"==typeof wx?n.MP_WEIXIN:void 0,M=I==n.MP_WEIXIN?wx:"undefined"!=typeof uni?uni.getImageInfo?{upx2px:function(t){return uni.upx2px(t)},getSystemInfoSync:function(){return uni.getSystemInfoSync()},getImageInfo:function(t){return uni.getImageInfo(t)},downloadFile:function(t){return uni.downloadFile(t)}}:Object.assign(uni,z):"undefined"!=typeof window?z:uni;if(!M.upx2px){var B=((M.getSystemInfoSync&&M.getSystemInfoSync()).screenWidth||375)/750;M.upx2px=function(t){return B*t}}function W(t){return/^-?\d+(\.\d+)?$/.test(t)}function k(t,e,i){if(W(t))return 1*t;if("string"==typeof t){var n=/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|vw|vh|px|%)$/g.exec(t);if(!t||!n)return 0;var r=n[3];t=parseFloat(t);var o=0;if("rpx"===r)o=M.upx2px(t);else if("px"===r)o=1*t;else if("%"===r&&e)o=t*k(e)/100;else if("em"===r&&e)o=t*k(e||14);else if(["vw","vh"].includes(r)){var s=M.getSystemInfoSync(),h=s.screenWidth,a=s.screenHeight;o=t*("vw"==r?h:a)/100}return 1*o.toFixed(2)}return 0}function P(t){return/%$/.test(t)}var O=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},T=function(t,e,i,n,r,o){t.startsWith("linear")?function(t,e,i,n,r,o){for(var s=function(t,e,i,n,r){void 0===n&&(n=0);void 0===r&&(r=0);var o=t.match(/([-]?\d{1,3})deg/),s=o&&o[1]?parseFloat(o[1]):0;s>=360&&(s-=360);s<0&&(s+=360);if(0===(s=Math.round(s)))return{x0:Math.round(e/2)+n,y0:i+r,x1:Math.round(e/2)+n,y1:r};if(180===s)return{x0:Math.round(e/2)+n,y0:r,x1:Math.round(e/2)+n,y1:i+r};if(90===s)return{x0:n,y0:Math.round(i/2)+r,x1:e+n,y1:Math.round(i/2)+r};if(270===s)return{x0:e+n,y0:Math.round(i/2)+r,x1:n,y1:Math.round(i/2)+r};var h=Math.round(180*Math.asin(e/Math.sqrt(Math.pow(e,2)+Math.pow(i,2)))/Math.PI);if(s===h)return{x0:n,y0:i+r,x1:e+n,y1:r};if(s===180-h)return{x0:n,y0:r,x1:e+n,y1:i+r};if(s===180+h)return{x0:e+n,y0:r,x1:n,y1:i+r};if(s===360-h)return{x0:e+n,y0:i+r,x1:n,y1:r};var a=0,l=0,d=0,c=0;if(s<h||s>180-h&&s<180||s>180&&s<180+h||s>360-h){var f=s*Math.PI/180,u=s<h||s>360-h?i/2:-i/2,p=Math.tan(f)*u,g=s<h||s>180-h&&s<180?e/2-p:-e/2-p;a=-(d=p+(v=Math.pow(Math.sin(f),2)*g)),l=-(c=u+v/Math.tan(f))}if(s>h&&s<90||s>90&&s<90+h||s>180+h&&s<270||s>270&&s<360-h){var v;f=(90-s)*Math.PI/180,p=s>h&&s<90||s>90&&s<90+h?e/2:-e/2,u=Math.tan(f)*p,g=s>h&&s<90||s>270&&s<360-h?i/2-u:-i/2-u;a=-(d=p+(v=Math.pow(Math.sin(f),2)*g)/Math.tan(f)),l=-(c=u+v)}return a=Math.round(a+e/2)+n,l=Math.round(i/2-l)+r,d=Math.round(d+e/2)+n,c=Math.round(i/2-c)+r,{x0:a,y0:l,x1:d,y1:c}}(r,t,e,i,n),h=s.x0,a=s.y0,l=s.x1,d=s.y1,c=o.createLinearGradient(h,a,l,d),f=r.match(/linear-gradient\((.+)\)/)[1],u=L(f.substring(f.indexOf(",")+1)),p=0;p<u.colors.length;p++)c.addColorStop(u.percents[p],u.colors[p]);o.setFillStyle(c)}(e,i,n,r,t,o):t.startsWith("radial")&&function(t,e,i,n,r,o){for(var s=L(r.match(/radial-gradient\((.+)\)/)[1]),h=Math.round(t/2)+i,a=Math.round(e/2)+n,l=o.createRadialGradient(h,a,0,h,a,Math.max(t,e)/2),d=0;d<s.colors.length;d++)l.addColorStop(s.percents[d],s.colors[d]);o.setFillStyle(l)}(e,i,n,r,t,o)};function L(t){for(var e=[],i=[],n=0,r=t.substring(0,t.length-1).split("%,");n<r.length;n++){var o=r[n];e.push(o.substring(0,o.lastIndexOf(" ")).trim()),i.push(o.substring(o.lastIndexOf(" "),o.length)/100)}return{colors:e,percents:i}}function R(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function F(){return F=Object.assign?Object.assign.bind():function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var n in i)Object.prototype.hasOwnProperty.call(i,n)&&(t[n]=i[n])}return t},F.apply(this,arguments)}function A(t,e){return A=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},A(t,e)}function j(t,e){(null==e||e>t.length)&&(e=t.length);for(var i=0,n=new Array(e);i<e;i++)n[i]=t[i];return n}function E(t,e){var i="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(i)return(i=i.call(t)).next.bind(i);if(Array.isArray(t)||(i=function(t,e){if(t){if("string"==typeof t)return j(t,e);var i=Object.prototype.toString.call(t).slice(8,-1);return"Object"===i&&t.constructor&&(i=t.constructor.name),"Map"===i||"Set"===i?Array.from(t):"Arguments"===i||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(i)?j(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){i&&(t=i);var n=0;return function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function H(t){return"number"==typeof t}function C(t){return"auto"===t||null===t}function D(t){return/%$/.test(t)}var Y=p,$=u,U=f,N=g,X=y,_=w,q=m;function G(t){return t.replace(/-([a-z])/g,(function(t,e){return e.toUpperCase()}))}function V(t,e){var i,n,o=function(t){var e=t.match(/([a-z]+)/)[1];return[e,G(t.split(e)[1])]}(t),s=o[0],h=o[1],a=e.split(" ");if(h)return(i={})[s+h]=e,i;if(a.length&&!h){var l=a[0],d=a[1],c=a[2],f=a[3];return(n={})[s+r[0]]=l,n[s+r[1]]=d||l,n[s+r[2]]=c||l,n[s+r[3]]=f||d||l,n}}function J(t){t=t.trim();for(var e=new Array,i="+",n="",r=t.length,o=0;o<r;++o){if("."===t[o]||!isNaN(Number(t[o]))&&" "!==t[o])n+=t[o];else if("("===t[o]){for(var s=1,h=o;s>0;)"("===t[h+=1]&&(s+=1),")"===t[h]&&(s-=1);n="".concat(J(t.slice(o+1,h))),o=h}if(isNaN(Number(t[o]))&&"."!==t[o]||o===r-1){var a=parseFloat(n);switch(i){case"+":e.push(a);break;case"-":e.push(-a);break;case"*":e.push(e.pop()*a);break;case"/":e.push(e.pop()/a)}i=t[o],n=""}}for(var l=0;e.length;)l+=e.pop();return l}var Q,Z=0,K=function(){function t(){R(this,"elements",[]),R(this,"afterElements",[]),R(this,"beforeElements",[]),R(this,"ids",[]),R(this,"width",0),R(this,"height",0),R(this,"top",0),R(this,"left",0),R(this,"pre",null),R(this,"offsetX",0),R(this,"offsetY",0),Z++,this.id=Z}var e=t.prototype;return e.fixedBind=function(t,e){void 0===e&&(e=0),this.container=e?t.parent:t.root,this.container.fixedLine=this,this.fixedAdd(t)},e.fixedAdd=function(t){if(!this.ids.includes(t.id)){this.ids.push(t.id),this.elements.push(t);var e=t.computedStyle.zIndex;(void 0===e?0:e)>=0?this.afterElements.push(t):this.beforeElements.push(t),this.refreshLayout()}},e.bind=function(t){this.container=t.parent,this.container.line=null,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),this.isInline=t.isInline(),this.container.line=this,this.outerWidth=t.parent&&t.parent.contentSize.width?t.parent.contentSize.width:1/0,this.add(t)},e.getPreLine=function(){return this.container.lines[this.container.lines.length-2]},e.canIEnter=function(t){return!((100*t.offsetSize.width+100*this.width)/100>this.outerWidth)||(this.closeLine(),!1)},e.closeLine=function(){delete this.container.line},e.add=function(t){this.ids.includes(t.id)||(this.ids.push(t.id),this.elements.push(t),this.refreshWidthHeight(t))},e.refreshWidthHeight=function(t){t.offsetSize.height>this.height&&(this.height=t.offsetSize.height),this.width+=t.offsetSize.width||0,(this.container.lineMaxWidth||0)<this.width&&(this.container.lineMaxWidth=this.width)},e.refreshXAlign=function(){if(this.isInline){var t=this.container.contentSize.width-this.width,e=this.container.style.textAlign;"center"===e?t/=2:"left"===e&&(t=0),this.offsetX=t}},e.getOffsetY=function(t){if(!t||!t.style)return 0;var e=(t.style||{}).verticalAlign;return e===s?this.height-t.contentSize.height:"middle"===e?(this.height-t.contentSize.height)/2:0},e.setIndent=function(t){var e=t.style.textIndent;if(e&&/^calc/.test(e)){var i=/^calc\((.+)\)$/.exec(e);if(i&&i[1]){var n=i[1].replace(/([^\s\(\+\-\*\/]+)\.(left|right|bottom|top|width|height)/g,(function(e){var i=e.split("."),n=i[0],r=i[1],o=t.parent.querySelector(n);if(o&&o.offsetSize){var s={right:o.offsetSize.left+o.offsetSize.width,bottom:o.offsetSize.top+o.offsetSize.height};return o.offsetSize[r]||s[r]||0}})),r=J(n.replace(new RegExp(/-?[0-9]+(\.[0-9]+)?(rpx|px|%)/,"g"),k));t.style.textIndent=r}}},e.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style.top=i.top+r,t.style.left=n?n.offsetSize.left+n.offsetSize.width:i.left,t.getBoxPosition()}))},e.refreshLayout=function(){this.afterElements=this.afterElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex})),this.beforeElements=this.beforeElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex}))},t}(),et=((Q={})[a]={width:"width",contentWidth:"width",lineMaxWidth:"lineMaxWidth",left:"left",top:"top",height:"height",lineMaxHeight:"lineMaxHeight",marginLeft:"marginLeft"},Q[l]={width:"height",contentWidth:"height",lineMaxWidth:"lineMaxWidth",left:"top",top:"left",height:"width",lineMaxHeight:"lineMaxHeight",marginLeft:"marginTop"},Q),it=function(t){var e,i;function n(){var e;return R(function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(e=t.call(this)||this),"outerWidth",0),e.exactValue=0,e.flexTotal=0,e.width=0,e.key=null,e.flexDirection="row",e}i=t,(e=n).prototype=Object.create(i.prototype),e.prototype.constructor=e,A(e,i);var r=n.prototype;return r.bind=function(t){this.container=t.parent,this.container.line=this,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),t.parent&&(this.flexDirection=t.parent.style.flexDirection,this.key=et[this.flexDirection]),this.initHeight(t),this.outerWidth=t.parent&&t.parent.contentSize[this.key.contentWidth]?t.parent.contentSize[this.key.contentWidth]:1/0,this.add(t)},r.add=function(t){this.ids.push(t.id);var e=t.style.flex;H(e)?this.flexTotal+=e:H(this.getWidth(t.style))&&(this.exactValue+=this.getWidth(t.offsetSize)),this.elements.push(t),this.refreshWidthHeight(t),t.next||this.closeLine()},r.closeLine=function(){this.calcFlex()},r.initHeight=function(t){this[this.key.height]=0},r.getWidth=function(t){return t[this.key.width]||0},r.getHeight=function(t){return t[this.key.height]||0},r.setWidth=function(t,e){t[this.key.width]=e},r.setHeight=function(t,e){t[this.key.height]=e},r.calcFlex=function(){var t=this,e=this.container.contentSize[this.key.contentWidth],i=0;this.elements.forEach((function(n){var r=n.style,o=n.contentSize,s=t.getWidth(r)||t.getWidth(o);H(r.flex)&&(s=r.flex/t.flexTotal*(e-t.exactValue)),t.setWidth(n.computedStyle,s),n.isFlexCalc=!0,delete n.line,delete n.lines,delete n.lineMaxWidth,n.getBoxWidthHeight(),i=Math.max(i,t.getHeight(n.offsetSize))})),this.setHeight(this,i)},r.refreshWidthHeight=function(t){var e=this.container.style.alignItems;e&&!t.style.alignSelf&&(t.style.alignSelf=e);var i=this.getHeight(t.offsetSize);i>this[this.key.height]&&(this.container[this.key.lineMaxHeight]=this[this.key.height]=i),this[this.key.width]+=this.getWidth(t.offsetSize);var n=Math.min(this.getWidth(this),!this.getWidth(this.container.contentSize)&&1/0);(this.container[this.key.lineMaxWidth]||0)<n&&(this.container[this.key.lineMaxWidth]=n)},r.refreshXAlign=function(){var t=this,e=this.elements.reduce((function(e,i){return e+t.getWidth(i.offsetSize)}),0),i=(this.outerWidth==1/0?0:this.outerWidth-e)||0,n=this.container.style.justifyContent;"center"===n?i/=2:"flex-start"===n?i=0:["space-between","space-around"].includes(n)&&(!function(e,i){void 0===i&&(i=0),i/=t.elements.length+(e?-1:1),t.elements.forEach((function(n,r){var o;e&&!r||(n.style.margin?n.style.margin[t.key.marginLeft]+=i:n.style.margin=((o={})[t.key.marginLeft]=i,o),n.getBoxPosition())})),i=0}("space-between"==n,i),i=0),this.offsetX=i||0,this.refreshYAlign()},r.refreshYAlign=function(){var t=this;if(1==this.container.lines.length)return 0;var e=this.container.lines.reduce((function(e,i){return e+t.getHeight(i)}),0),i=this.container.style.alignItems,n=this.getHeight(this.container.contentSize);if("center"===i){var r=(n-e)/(this.container.lines.length+1);this.container.lines.forEach((function(t){t.offsetY=r}))}if("flex-end"===i){var o=n-e;this.container.lines[0].offsetY=o}},r.getOffsetY=function(t){if(this.container.lines.length>1)return 0;var e=t.style.alignSelf,i=this.getHeight(this.container.contentSize),n=i-this.getHeight(t.offsetSize);return"flex-end"===e?n:"center"===e?n/2:"stretch"===e?(n&&t.name==f&&(t.style[this.key.width]=this.getWidth(t.offsetSize),t.style[this.key.height]=i,delete t.line,delete t.lines,t.getBoxWidthHeight()),0):0},r.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style[i.key.top]=i[i.key.top]+r,t.style[i.key.left]=n?n.offsetSize[i.key.left]+i.getWidth(n.offsetSize):i[i.key.left],t.getBoxPosition()}))},n}(K),nt=p,rt=u,ot=f,st=v,ht=y,at=b,lt=w,dt=m,ct=0,ft={left:null,top:null,width:null,height:null},ut=new Map,pt=function(){function t(t,e,i,n){var o=this;R(this,"id",ct++),R(this,"style",{left:null,top:null,width:null,height:null}),R(this,"computedStyle",{}),R(this,"originStyle",{}),R(this,"children",{}),R(this,"layoutBox",F({},ft)),R(this,"contentSize",F({},ft)),R(this,"clientSize",F({},ft)),R(this,"borderSize",F({},ft)),R(this,"offsetSize",F({},ft)),this.ctx=n,this.root=i,e&&(this.parent=e),this.name=t.type||t.name,this.attributes=this.getAttributes(t);var s=function(t,e){var i,n=["color","fontSize","lineHeight","verticalAlign","fontWeight","textAlign"],o=t.type,s=void 0===o?U:o,h=t.styles,a=void 0===h?{}:h,l=(e||{}).computedStyle,d=Object.assign({},S);if([$,Y,N].includes(s)&&!a.display&&(d.display=X),l)for(var c=0;c<n.length;c++){var f=n[c];(a[f]||l[f])&&(a[f]=a[(i=f,i.replace(/([A-Z])/g,"-$1").toLowerCase())]||a[f]||l[f])}for(var u=function(t){var e,i,n,o,h=a[t];if(/-/.test(t)&&(t=G(t),d[t]=h),/^(box|text)?shadow$/i.test(t)){var l=[];return h.replace(/((-?\d+(rpx|px|vw|vh)?\s+?){3})(.+)/,(function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];l=t[1].match(/-?\d+(rpx|px|vw|vh)?/g).map((function(t){return k(t)})).concat(t[4])})),/^text/.test(t)?d.textShadow=l:d.boxShadow=l,"continue"}if(/^border/i.test(t)&&!/radius$/i.test(t)){var c=t.match(/^border([BTRLa-z]+)?/)[0],f=t.match(/[W|S|C][a-z]+/),u=h.replace(/([\(,])\s+|\s+([\),])/g,"$1$2").split(" ").map((function(t){return/^\d/.test(t)?k(t,""):t}));return d[c]||(d[c]={}),1==u.length&&f?d[c][c+f[0]]=u[0]:d[c]=((e={})[c+"Width"]=W(u[0])?u[0]:0,e[c+"Style"]=u[1]||"solid",e[c+"Color"]=u[2]||"black",e),"continue"}if(/^background(color)?$/i.test(t))return d.backgroundColor=h,"continue";if(/^objectPosition$/i.test(t))return d[t]=h.split(" "),"continue";if(/padding|margin|radius/i.test(t)){var p=/radius$/i.test(t),g="borderRadius",v=p?g:t.match(/[a-z]+/)[0],y=function(t,e){return"border".concat(t).concat(e,"Radius")},x=[0,0,0,0].map((function(t,e){return p?[y(r[0],r[3]),y(r[0],r[1]),y(r[2],r[1]),y(r[2],r[3])][e]:v+r[e]}));if("padding"===t||"margin"===t||/^(border)?radius$/i.test(t)){u="".concat(h).split(" ").map((function(e){return/^-?\d+(rpx|px|vh|vw)?$/.test(e)?k(e):"margin"!=t&&/auto/.test(e)?0:e}),[])||[0];var b=p?g:t,w=u[0],m=u[1],S=u[2],z=u[3];d[b]=((i={})[x[0]]=C(w)?0:w,i[x[1]]=W(m)||C(m)?m:w,i[x[2]]=C(W(S)?S:w)?0:W(S)?S:w,i[x[3]]=W(z)?z:null!=m?m:w,i)}else"object"==typeof d[v]||(d[v]=((n={})[x[0]]=d[v]||0,n[x[1]]=d[v]||0,n[x[2]]=d[v]||0,n[x[3]]=d[v]||0,n)),d[v][t]="margin"==v&&C(h)||D(h)?h:k(h);return"continue"}if(/^transform$/i.test(t))return d[t]={},h.replace(/([a-zA-Z]+)\(([0-9,-\.%rpxdeg\s]+)\)/g,(function(e,i,n){var r=n.split(",").map((function(t){return t.replace(/(^\s*)|(\s*$)/g,"")})),o=function(t,e){return t.includes("deg")?1*t:e&&!D(e)?k(t,e):t};i.includes("matrix")?d[t][i]=r.map((function(t){return 1*t})):i.includes("rotate")?d[t][i]=1*n.match(/^-?\d+(\.\d+)?/)[0]:/[X, Y]/.test(i)?d[t][i]=/[X]/.test(i)?o(r[0],a.width):o(r[0],a.height):(d[t][i+"X"]=o(r[0],a.width),d[t][i+"Y"]=o(r[1]||r[0],a.height))})),"continue";if(/^font$/i.test(t)&&console.warn("font 不支持简写"),/^textindent/i.test(t)&&(d[t]=/^calc/.test(h)?h:k(h)),/^textstroke/i.test(t)){var I=t.match(/color|width|type$/i),M=(c="textStroke",h.split(" ").map((function(t){return/^\d+(rpx|px|vh|vw)?$/.test(t)?k(t):t})));return I?d[c]?d[c][I[0]]=M[0]:d[c]=((o={})[I[0]]=M[0],o):d[c]={width:M[0],color:M[1],type:M[2]},"continue"}/^left|top$/i.test(t)&&![_,q].includes(a.position)?d[t]=0:d[t]=/^-?[\d\.]+(px|rpx|vw|vh)?$/.test(h)?k(h):/em$/.test(h)&&s==$?k(h,a.fontSize):h},p=0,g=Object.keys(a);p<g.length;p++)u(g[p]);return d}(t,e);this.isAbsolute=s.position==lt,this.isFixed=s.position==dt,this.originStyle=s,this.styles=t.styles,Object.keys(s).forEach((function(t){Object.defineProperty(o.style,t,{configurable:!0,enumerable:!0,get:function(){return s[t]},set:function(e){s[t]=e}})}));var h={contentSize:F({},this.contentSize),clientSize:F({},this.clientSize),borderSize:F({},this.borderSize),offsetSize:F({},this.offsetSize)};Object.keys(h).forEach((function(t){Object.keys(o[t]).forEach((function(e){Object.defineProperty(o[t],e,{configurable:!0,enumerable:!0,get:function(){return h[t][e]},set:function(i){h[t][e]=i}})}))})),this.computedStyle=this.style}var e=t.prototype;return e.add=function(t){t.parent=this,this.children[t.id]=t},e.getChildren=function(){var t=this;return Object.keys(this.children).map((function(e){return t.children[e]}))},e.prev=function(t){void 0===t&&(t=this);var e=t.parent.getChildren();return e[e.findIndex((function(e){return e.id==t.id}))-1]},e.querySelector=function(t){var e=this.getChildren();if("string"!=typeof t)return null;var i=e.find((function(e){var i=e.id,n=e.attributes;return i==t||n&&n.uid==t}));return i||(this.parent&&this.parent.querySelector&&this.parent.querySelector(t)||null)},e.getLineRect=function(t,e){var i={width:0,height:0},n=e?e.lines:this.parent&&this.parent.lines;return n&&n.find((function(e){return e.ids.includes(t)}))||i},e.setPosition=function(t,e){var i={left:"width",top:"height",right:"width",bottom:"height"};Object.keys(i).forEach((function(n){var r=n==o?"left":"top";[o,s].includes(n)&&void 0!==t.style[n]&&!W(t.originStyle[r])?t.style[r]=e[i[n]]-t.offsetSize[i[n]]-k(t.style[n],e[i[n]]):t.style[n]=k(t.style[n],e[i[n]])}))},e.getAttributes=function(t){var e=t.attributes,i=void 0===e?{}:e,n=t.uid,r=t.url,o=t.src,s=t.replace,h=t.text;return n&&(i.uid=n),(r||o)&&(i.src=i.src||r||o),s&&(i.replace=s),h&&(i.text=h),i},e.getOffsetSize=function(t,e,i){void 0===i&&(i=h[3]);var n=e||{},r=n.margin,o=(r=void 0===r?{}:r).marginLeft,s=void 0===o?0:o,a=r.marginTop,l=void 0===a?0:a,d=r.marginRight,c=void 0===d?0:d,f=r.marginBottom,u=void 0===f?0:f,p=n.padding,g=(p=void 0===p?{}:p).paddingLeft,v=void 0===g?0:g,y=p.paddingTop,x=void 0===y?0:y,b=p.paddingRight,w=void 0===b?0:b,m=p.paddingBottom,S=void 0===m?0:m,z=n.border,I=(z=void 0===z?{}:z).borderWidth,M=void 0===I?0:I,B=n.borderTop,W=(B=void 0===B?{}:B).borderTopWidth,k=void 0===W?M:W,P=n.borderBottom,O=(P=void 0===P?{}:P).borderBottomWidth,T=void 0===O?M:O,L=n.borderRight,R=(L=void 0===L?{}:L).borderRightWidth,F=void 0===R?M:R,A=n.borderLeft,j=(A=void 0===A?{}:A).borderLeftWidth,E=void 0===j?M:j,H=s<0&&c<0?Math.abs(s+c):0,C=l<0&&u<0?Math.abs(l+u):0,D=s>=0&&c<0,Y=l>=0&&u<0;return i==h[0]&&(this[i].left=t.left+s+v+E+(D?2*-c:0),this[i].top=t.top+l+x+k+(Y?2*-u:0),this[i].width=t.width+(this[i].widthAdd?0:H),this[i].height=t.height+(this[i].heightAdd?0:C),this[i].widthAdd=H,this[i].heightAdd=C),i==h[1]&&(this[i].left=t.left+s+E+(D<0?-c:0),this[i].top=t.top+l+k+(Y?-u:0),this[i].width=t.width+v+w,this[i].height=t.height+x+S),i==h[2]&&(this[i].left=t.left+s+E/2+(D<0?-c:0),this[i].top=t.top+l+k/2+(Y?-u:0),this[i].width=t.width+v+w+E/2+F/2,this[i].height=t.height+x+S+T/2+k/2),i==h[3]&&(this[i].left=t.left+(D<0?-c:0),this[i].top=t.top+(Y?-u:0),this[i].width=t.width+v+w+E+F+s+c,this[i].height=t.height+x+S+T+k+u+l),this[i]},e.layoutBoxUpdate=function(t,e,i,n){var r=this;if(void 0===i&&(i=-1),"border-box"==e.boxSizing){var o=e||{},s=o.border,a=(s=void 0===s?{}:s).borderWidth,l=void 0===a?0:a,d=o.borderTop,c=(d=void 0===d?{}:d).borderTopWidth,f=void 0===c?l:c,u=o.borderBottom,p=(u=void 0===u?{}:u).borderBottomWidth,g=void 0===p?l:p,v=o.borderRight,y=(v=void 0===v?{}:v).borderRightWidth,x=void 0===y?l:y,b=o.borderLeft,w=(b=void 0===b?{}:b).borderLeftWidth,m=void 0===w?l:w,S=o.padding,z=(S=void 0===S?{}:S).paddingTop,I=void 0===z?0:z,M=S.paddingRight,B=void 0===M?0:M,W=S.paddingBottom,k=void 0===W?0:W,P=S.paddingLeft,O=void 0===P?0:P;i||(t.width-=O+B+x+m),1!==i||n||(t.height-=I+k+f+g)}this.layoutBox&&(h.forEach((function(i){return r.layoutBox[i]=r.getOffsetSize(t,e,i)})),this.layoutBox=Object.assign({},this.layoutBox,this.layoutBox.borderSize))},e.getBoxPosition=function(){var t=this.computedStyle,e=this.fixedLine,i=this.lines,n=t.left,r=void 0===n?0:n,o=t.top,s=void 0===o?0:o,h=F({},this.contentSize,{left:r,top:s}),a=this.contentSize.top-this.offsetSize.top,l=this.contentSize.left-this.offsetSize.left;if(this.root.fixedLine&&!this.root.isDone){this.root.isDone=!0;for(var d,c=E(this.root.fixedLine.elements);!(d=c()).done;){var f=d.value;f.setPosition(f,this.root.offsetSize),f.getBoxPosition()}}if(e)for(var u,p=E(e.elements);!(u=p()).done;){var g=u.value,v=F({},this.borderSize,{left:r,top:s});g.setPosition(g,v);var y=this.borderSize.top-this.offsetSize.top,x=this.borderSize.left-this.offsetSize.left;g.style.left+=r+x,g.style.top+=s+y,g.getBoxPosition()}if(i)for(var b,w=E(i);!(b=w()).done;){b.value.layout(h.top+a,h.left+l)}return this.layoutBoxUpdate(h,t),this.layoutBox},e.getBoxState=function(t,e){return this.isBlock(t)||this.isBlock(e)},e.isBlock=function(t){return void 0===t&&(t=this),t&&t.style.display==st},e.isFlex=function(t){return void 0===t&&(t=this),t&&t.style.display==at},e.isInFlow=function(){return!(this.isAbsolute||this.isFixed)},e.inFlexBox=function(t){return void 0===t&&(t=this),!!t.isInFlow()&&(!!t.parent&&(!(!t.parent||t.parent.style.display!==at)||void 0))},e.isInline=function(t){return void 0===t&&(t=this),t&&t.style.display==ht},e.contrastSize=function(t,e,i){var n=t;return i&&(n=Math.min(n,i)),e&&(n=Math.max(n,e)),n},e.measureText=function(t,e){var i=this.ctx.measureText(t),n=i.width,r=i.actualBoundingBoxAscent,o=i.actualBoundingBoxDescent;return{ascent:r,descent:o,width:n,fontHeight:r+o||.7*e+1}},e.getParentSize=function(t,e){if(void 0===t&&(t=this),void 0===e&&(e=!1),t&&t.parent){if(t.parent.contentSize.width)return t.parent.contentSize;if(e)return this.getParentSize(t.parent,e)}return null},e.getBoxWidthHeight=function(){var t=this,e=this.name,i=this.computedStyle,n=this.attributes,r=this.parent,o=void 0===r?{}:r,s=this.ctx,h=this.getChildren(),a=i.left,l=void 0===a?0:a,d=i.top,c=void 0===d?0:d,f=i.bottom,u=i.right,p=i.width,g=void 0===p?0:p,v=i.minWidth,y=i.maxWidth,x=i.minHeight,b=i.maxHeight,w=i.height,m=void 0===w?0:w,S=i.fontSize,z=i.fontWeight,I=i.fontFamily,M=i.fontStyle,B=i.position;i.textIndent;var W=i.lineClamp,P=i.lineHeight,O=i.padding,T=void 0===O?{}:O,L=i.margin,R=void 0===L?{}:L,F=i.border,A=(F=void 0===F?{}:F).borderWidth,j=void 0===A?0:A,E=i.borderRight,H=(E=void 0===E?{}:E).borderRightWidth,Y=void 0===H?j:H,$=i.borderLeft,U=($=void 0===$?{}:$).borderLeftWidth,N=void 0===U?j:U,X=o.contentSize&&o.contentSize.width,_=o.contentSize&&o.contentSize.height;if(D(g)&&X&&(g=k(g,X)),D(g)&&!X&&(g=null),D(m)&&_&&(m=k(m,_)),D(m)&&!_&&(m=null),D(v)&&X&&(v=k(v,X)),D(y)&&X&&(y=k(y,X)),D(x)&&_&&(x=k(x,_)),D(b)&&_&&(b=k(b,_)),i.padding&&X)for(var q in i.padding)Object.hasOwnProperty.call(T,q)&&(T[q]=k(T[q],X));var G=T.paddingRight,V=void 0===G?0:G,J=T.paddingLeft,Q=void 0===J?0:J;if(i.margin&&[R.marginLeft,R.marginRight].includes("auto"))if(g){var Z=X&&X-g-V-Q-N-Y||0;R.marginLeft==R.marginRight?R.marginLeft=R.marginRight=Z/2:C(R.marginLeft)?R.marginLeft=Z:R.marginRight=Z}else R.marginLeft=R.marginRight=0;var tt=R.marginRight,et=void 0===tt?0:tt,st=R.marginLeft,ht={width:g,height:m,left:0,top:0},at=Q+V+N+Y+(void 0===st?0:st)+et;if(this.offsetWidth=at,e==rt&&!this.attributes.widths){var dt=n.text||"";s.save(),s.setFonts({fontFamily:I,fontSize:S,fontWeight:z,fontStyle:M}),dt.length,"\n"==dt&&(dt="",this.isBr=!0),(""+dt).split("\n").map((function(e){var i=Array.from(e).map((function(e){var i=""+(/^[\u4e00-\u9fa5]+$/.test(e)?"cn":e)+I+S+z+M,n=ut.get(i);if(n)return{width:n,text:e};var r=t.measureText(e,S).width;return ut.set(i,r),{width:r,text:e}})),n=t.measureText(e,S),r=n.fontHeight,o=n.ascent,s=n.descent;t.attributes.fontHeight=r,t.attributes.ascent=o,t.attributes.descent=s,t.attributes.widths||(t.attributes.widths=[]),t.attributes.widths.push({widths:i,total:i.reduce((function(t,e){return t+e.width}),0)})})),s.restore()}if(e==nt&&null==g){var ct=n.width,ft=n.height;ht.width=this.contrastSize(Math.round(ct*m/ft)||0,v,y),this.layoutBoxUpdate(ht,i,0)}if(e==rt&&null==g){var pt=this.attributes.widths,gt=Math.max.apply(Math,pt.map((function(t){return t.total})));if(o&&X>0&&(gt>X||this.isBlock(this))&&!this.isAbsolute&&!this.isFixed)gt=X;ht.width=this.contrastSize(gt,v,y),this.layoutBoxUpdate(ht,i,0)}if(e==rt&&(o.style.flex||!this.attributes.lines)){var vt=this.attributes.widths.length;this.attributes.widths.forEach((function(t){return t.widths.reduce((function(t,e,i){return t+e.width>ht.width?(vt++,e.width):t+e.width}),0)})),vt=W&&vt>W?W:vt,this.attributes.lines=vt}if(e==nt&&null==m){var yt=n.width,xt=n.height;n.text,ht.height=this.contrastSize(k(ht.width*xt/yt)||0,x,b),this.layoutBoxUpdate(ht,i,1)}e==rt&&null==m&&(P=k(P,S),ht.height=this.contrastSize(k(this.attributes.lines*P),x,b),this.layoutBoxUpdate(ht,i,1,!0)),!g&&o&&o.children&&X&&(!this.isFlex(o)||o.isFlexCalc)&&([ot,rt].includes(e)&&this.isFlex()||e==ot&&this.isBlock(this)&&this.isInFlow())&&(ht.width=this.contrastSize(X-(o.isFlexCalc?0:at),v,y),this.layoutBoxUpdate(ht,i)),g&&!D(g)&&(ht.width=this.contrastSize(g,v,y),this.layoutBoxUpdate(ht,i,0)),m&&!D(m)&&(ht.height=this.contrastSize(ht.height,x,b),this.layoutBoxUpdate(ht,i,1));var bt=0;if(h.length){var wt=null,mt=!1;h.forEach((function(e,n){e.getBoxWidthHeight();var r=h[n+1];if(r&&r.isInFlow()&&(e.next=r),!t.line||!t.line.ids.includes(e.id))if(e.isInFlow()&&!e.inFlexBox()){var o=t.getBoxState(wt,e);if(e.isBr)return mt=!0;t.line&&t.line.canIEnter(e)&&!o&&!mt?t.line.add(e):(mt=!1,(new K).bind(e)),wt=e}else e.inFlexBox()?t.line&&(t.line.canIEnter(e)||"nowrap"==i.flexWrap)?t.line.add(e):(new it).bind(e):e.isFixed?t.root.fixedLine?t.root.fixedLine.fixedAdd(e):(new K).fixedBind(e):t.fixedLine?t.fixedLine.fixedAdd(e):(new K).fixedBind(e,1)})),this.lines&&(bt=this.lines.reduce((function(t,e){return t+e.height}),0))}var St=0,zt=0;if(!g&&(this.isAbsolute||this.isFixed)&&X){var It=B==lt?X:this.root.width,Mt=It-(D(l)?k(l,It):l)-(D(u)?k(u,It):u);St=i.left?Mt:this.lineMaxWidth}if(!m&&(null!=c?c:this.isAbsolute||this.isFixed&&_)){var Bt=B==lt?_:this.root.height,Wt=Bt-(D(c)?k(c,Bt):c)-(D(f)?k(f,Bt):f);zt=i.top?Wt:0}if(g&&!D(g)||ht.width||(ht.width=St||this.contrastSize((this.isBlock(this)&&!this.isInFlow()?X||o.lineMaxWidth:this.lineMaxWidth)||this.lineMaxWidth,v,y),this.layoutBoxUpdate(ht,i,0)),m||!bt&&!zt||(ht.height=zt||this.contrastSize(bt,x,b),this.layoutBoxUpdate(ht,i)),i.borderRadius&&this.borderSize&&this.borderSize.width)for(var q in i.borderRadius)Object.hasOwnProperty.call(i.borderRadius,q)&&(i.borderRadius[q]=k(i.borderRadius[q],this.borderSize.width));return this.layoutBox},e.layout=function(){return this.getBoxWidthHeight(),this.root.offsetSize=this.offsetSize,this.root.contentSize=this.contentSize,this.getBoxPosition(),this.offsetSize},t}(),gt=p,vt=u,yt=g,xt=f,bt=d.TOP,wt=d.MIDDLE,mt=d.BOTTOM,St=c.LEFT,zt=c.CENTER,It=c.RIGHT,Mt=function(){function r(t){var e,i,r=this;this.v="1.9.5.1",this.id=null,this.pixelRatio=1,this.width=0,this.height=0,this.sleep=1e3/30,this.count=0,this.isRate=!1,this.isDraw=!0,this.isCache=!0,this.fixed="",this.useCORS=!1,this.performance=!1,this.imageBus=[],this.createImage=function(t,e){return new Promise((function(i,n){var o=null;window||r.canvas.createImage?(o=r.canvas&&r.canvas.createImage?r.canvas.createImage():new Image,e&&o.setAttribute("crossOrigin","Anonymous"),o.src=t,o.onload=function(){i({width:o.naturalWidth||o.width,height:o.naturalHeight||o.height,path:o,src:this.src})},o.onerror=function(t){n(t)}):n({fail:"getImageInfo fail",src:t})}))},this.options=t,Object.assign(this,t),this.ctx=(e=t.context,i={get:function(t,i){if("setFonts"===i)return function(t){var i=t.fontFamily,r=void 0===i?"sans-serif":i,o=t.fontSize,s=void 0===o?14:o,h=t.fontWeight,a=void 0===h?"normal":h,l=t.fontStyle,d=void 0===l?"normal":l;I==n.MP_TOUTIAO&&(a="bold"==a?"bold":"",d="italic"==d?"italic":""),e.font="".concat(d," ").concat(a," ").concat(Math.round(s),"px ").concat(r)};if(!e.draw||!e.setFillStyle){if("setFillStyle"===i)return function(t){e.fillStyle=t};if("setStrokeStyle"===i)return function(t){e.strokeStyle=t};if("setLineWidth"===i)return function(t){e.lineWidth=t};if("setLineCap"===i)return function(t){e.lineCap=t};if("setFontSize"===i)return function(t){e.font="".concat(String(t),"px sans-serif")};if("setGlobalAlpha"===i)return function(t){e.globalAlpha=t};if("setLineJoin"===i)return function(t){e.lineJoin=t};if("setTextAlign"===i)return function(t){e.textAlign=t};if("setMiterLimit"===i)return function(t){e.miterLimit=t};if("setShadow"===i)return function(t,i,n,r){e.shadowOffsetX=t,e.shadowOffsetY=i,e.shadowBlur=n,e.shadowColor=r};if("setTextBaseline"===i)return function(t){e.textBaseline=t};if("createCircularGradient"===i)return function(){};if("draw"===i)return function(){};if("function"==typeof e[i])return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return e[i].apply(e,t)}}return t[i]},set:function(t,i,n){return e[i]=n,!0}},new Proxy(e,i)),this.progress=0,this.root={width:t.width,height:t.height,fontSizeRate:1,fixedLine:null},this.size=this.root;var o=0;Object.defineProperty(this,"progress",{configurable:!0,set:function(t){o=t,r.lifecycle("onProgress",t/r.count)},get:function(){return o||0}})}return r.prototype.lifecycle=function(t,e){this.options.listen&&this.options.listen[t]&&this.options.listen[t](e)},r.prototype.setContext=function(t){t&&(this.ctx=t)},r.prototype.init=function(){if(this.canvas.height||n.WEB==I){this.ctx.setTransform(1,0,0,1,0,0);var t=this.size.height*this.pixelRatio,e=this.size.width*this.pixelRatio;this.canvas.height=t,this.canvas.width=e,this.ctx.scale(this.pixelRatio,this.pixelRatio)}},r.prototype.clear=function(){this.ctx.clearRect(0,0,this.size.width,this.size.height)},r.prototype.clipPath=function(t,e,i,n,r,o,s){void 0===o&&(o=!1),void 0===s&&(s=!1);var h=this.ctx;if(/polygon/.test(r)){var a=r.match(/-?\d+(rpx|px|%)?\s+-?\d+(rpx|px|%)?/g)||[];h.beginPath(),a.map((function(r){var o=r.split(" "),s=o[0],h=o[1];return[k(s,i)+t,k(h,n)+e]})).forEach((function(t,e){0==e?h.moveTo(t[0],t[1]):h.lineTo(t[0],t[1])})),h.closePath(),s&&h.stroke(),o&&h.fill()}},r.prototype.roundRect=function(t,e,i,n,r,o,s){if(void 0===o&&(o=!1),void 0===s&&(s=!1),!(r<0)){var h=this.ctx;if(h.beginPath(),r){var a=r||{},l=a.borderTopLeftRadius,d=void 0===l?r||0:l,c=a.borderTopRightRadius,f=void 0===c?r||0:c,u=a.borderBottomRightRadius,p=void 0===u?r||0:u,g=a.borderBottomLeftRadius,v=void 0===g?r||0:g;h.arc(t+i-p,e+n-p,p,0,.5*Math.PI),h.lineTo(t+v,e+n),h.arc(t+v,e+n-v,v,.5*Math.PI,Math.PI),h.lineTo(t,e+d),h.arc(t+d,e+d,d,Math.PI,1.5*Math.PI),h.lineTo(t+i-f,e),h.arc(t+i-f,e+f,f,1.5*Math.PI,2*Math.PI),h.lineTo(t+i,e+n-p)}else h.rect(t,e,i,n);h.closePath(),s&&h.stroke(),o&&h.fill()}},r.prototype.setTransform=function(t,e){var i=e.transform,n=e.transformOrigin,r=this.ctx,o=i||{},s=o.scaleX,h=void 0===s?1:s,a=o.scaleY,l=void 0===a?1:a,d=o.translateX,c=void 0===d?0:d,f=o.translateY,u=void 0===f?0:f,p=o.rotate,g=void 0===p?0:p,v=o.skewX,y=void 0===v?0:v,x=o.skewY,b=void 0===x?0:x,w=t.left,m=t.top,S=t.width,z=t.height;c=k(c,S)||0,u=k(u,z)||0;var I=k("0%",1),M=k("50%",1),B=k("100%",1),P={top:I,center:M,bottom:B},O={left:I,center:M,right:B};if(n=n.split(" ").filter((function(t,e){return e<2})).reduce((function(t,e){if(/\d+/.test(e)){var i=k(e,1)/(/px|rpx$/.test(e)?W(t.x)?z:S:1);return W(t.x)?Object.assign(t,{y:i}):Object.assign(t,{x:i})}return W(O[e])&&!W(t.x)?Object.assign(t,{x:O[e]}):Object.assign(t,{y:P[e]||.5})}),{}),(c||u)&&r.translate(c,u),(h||l)&&r.scale(h,l),g){var T=w+S*n.x,L=m+z*n.y;r.translate(T,L),r.rotate(g*Math.PI/180),r.translate(-T,-L)}(y||b)&&r.transform(1,Math.tan(b*Math.PI/180),Math.tan(y*Math.PI/180),1,0,0)},r.prototype.setBackground=function(t,e,i,r,o){var s=this.ctx;t&&"transparent"!=t?O(t)?T(t,e,i,r,o,s):s.setFillStyle(t):[n.MP_TOUTIAO,n.MP_BAIDU].includes(I)?s.setFillStyle("rgba(0,0,0,0)"):s.setFillStyle("transparent")},r.prototype.setShadow=function(t){var e=t.boxShadow,i=void 0===e?[]:e,n=this.ctx;if(i.length){var r=i[0],o=i[1],s=i[2],h=i[3];n.setShadow(r,o,s,h)}},r.prototype.setBorder=function(t,e){var i=this.ctx,n=t.width,r=t.height,o=t.left,s=t.top,h=e.border,a=e.borderBottom,l=e.borderTop,d=e.borderRight,c=e.borderLeft,f=e.borderRadius,u=e.lineCap,p=h||{},g=p.borderWidth,v=void 0===g?0:g,y=p.borderStyle,x=p.borderColor,b=a||{},w=b.borderBottomWidth,m=void 0===w?v:w,S=b.borderBottomStyle,z=void 0===S?y:S,M=b.borderBottomColor,B=void 0===M?x:M,W=l||{},k=W.borderTopWidth,P=void 0===k?v:k,O=W.borderTopStyle,T=void 0===O?y:O,L=W.borderTopColor,R=void 0===L?x:L,F=d||{},A=F.borderRightWidth,j=void 0===A?v:A,E=F.borderRightStyle,H=void 0===E?y:E,C=F.borderRightColor,D=void 0===C?x:C,Y=c||{},$=Y.borderLeftWidth,U=void 0===$?v:$,N=Y.borderLeftStyle,X=void 0===N?y:N,_=Y.borderLeftColor,q=void 0===_?x:_,G=f||{},V=G.borderTopLeftRadius,J=void 0===V?f||0:V,Q=G.borderTopRightRadius,Z=void 0===Q?f||0:Q,K=G.borderBottomRightRadius,tt=void 0===K?f||0:K,et=G.borderBottomLeftRadius,it=void 0===et?f||0:et;if(a||c||l||d||h){var nt=function(t,e,n){"dashed"==e?/mp/.test(I)?i.setLineDash([Math.ceil(4*t/3),Math.ceil(4*t/3)]):i.setLineDash([Math.ceil(6*t),Math.ceil(6*t)]):"dotted"==e&&i.setLineDash([t,t]),i.setStrokeStyle(n)},rt=function(t,e,n,r,o,s,h,a,l,d,c,f,p,g,v){i.save(),i.setLineCap(v?"square":u),i.setLineWidth(f),nt(f,p,g),i.beginPath(),i.arc(t,e,h,Math.PI*l,Math.PI*d),i.lineTo(n,r),i.arc(o,s,a,Math.PI*d,Math.PI*c),i.stroke(),i.restore()};if(i.save(),h&&!a&&!c&&!l&&!d)return i.setLineWidth(v),nt(v,y,x),this.roundRect(o,s,n,r,f,!1,!!x),void i.restore();m&&rt(o+n-tt,s+r-tt,o+it,s+r,o+it,s+r-it,tt,it,.25,.5,.75,m,z,B,U&&j),U&&rt(o+it,s+r-it,o,s+J,o+J,s+J,it,J,.75,1,1.25,U,X,q,P&&m),P&&rt(o+J,s+J,o+n-Z,s,o+n-Z,s+Z,J,Z,1.25,1.5,1.75,P,T,R,U&&j),j&&rt(o+n-Z,s+Z,o+n,s+r-tt,o+n-tt,s+r-tt,Z,tt,1.75,2,.25,j,H,D,P&&m)}},r.prototype.setOpacity=function(t){var e=t.opacity,i=void 0===e?1:e;this.ctx.setGlobalAlpha(i)},r.prototype.drawPattern=function(t,n,r){return e(this,void 0,void 0,(function(){var e=this;return i(this,(function(i){return[2,new Promise((function(i,o){e.drawView(n,r,!0,!1,!0);var s=e,h=s.ctx;s.canvas;var a=n.width,l=n.height,d=n.left,c=n.top,f=r||{},u=f.borderRadius,p=void 0===u?0:u,g=f.backgroundImage,v=f.backgroundRepeat,y=void 0===v?"repeat":v;g&&function(t){var o=h.createPattern(t.src,y);h.setFillStyle(o),e.roundRect(d,c,a,l,p,!0,!1),e.setBorder(n,r),i()}(t)}))]}))}))},r.prototype.drawView=function(t,e,i,n,r){void 0===i&&(i=!0),void 0===n&&(n=!0),void 0===r&&(r=!0);var o=this.ctx,s=t.width,h=t.height,a=t.left,l=t.top,d=e||{},c=d.borderRadius,f=void 0===c?0:c,u=d.backgroundColor,p=void 0===u?"transparent":u,g=d.overflow;e.opacity&&this.setOpacity(e),this.setTransform(t,e),r&&(o.save(),this.setShadow(e)),i&&this.setBackground(p,s,h,a,l),e.clipPath?this.clipPath(a,l,s,h,e.clipPath,i,!1):this.roundRect(a,l,s,h,f,i,!1),r&&o.restore(),n&&this.setBorder(t,e),"hidden"==g&&o.clip()},r.prototype.drawImage=function(t,r,o,s){return void 0===r&&(r={}),void 0===o&&(o={}),void 0===s&&(s=!0),e(this,void 0,void 0,(function(){var h=this;return i(this,(function(a){switch(a.label){case 0:return[4,new Promise((function(a,l){return e(h,void 0,void 0,(function(){var e,h,l,d,c,f,u,p,g,v,y,x,b,w,m,S,z,M,B,O,T,L=this;return i(this,(function(i){return e=this.ctx,h=o.borderRadius,l=void 0===h?0:h,d=o.backgroundColor,c=void 0===d?"transparent":d,f=o.objectFit,u=void 0===f?"fill":f,p=o.backgroundSize,g=void 0===p?"fill":p,v=o.objectPosition,y=o.backgroundPosition,x=o.boxShadow,o.backgroundImage&&(u=g,v=y),x&&this.drawView(r,Object.assign(o,{backgroundColor:c||x&&(c||"#ffffff")}),!0,!1,!0),b=r.width,w=r.height,m=r.left,S=r.top,e.save(),z=r.contentSize.left-r.borderSize.left,M=r.contentSize.top-r.borderSize.top,s||(this.setOpacity(o),this.setTransform(r,o),this.setBackground(c,b,w,m,S),this.roundRect(m,S,b,w,l,!!(l||!x&&c),!1)),m+=z,S+=M,e.clip(),B=function(t){if("fill"!==u){var i=function(t,e,i){var n=t.objectFit,r=t.objectPosition,o=e.width/e.height,s=i.width/i.height,h=1,a="contain",l="cover";n==a&&o>=s||n==l&&o<s?h=e.height/i.height:(n==a&&o<s||n==l&&o>=s)&&(h=e.width/i.width);var d=i.width*h,c=i.height*h,f=r||[],u=f[0],p=f[1],g=W(u)?k(u,e.width):(e.width-d)*(P(u)?k(u,1):{left:0,center:.5,right:1}[u||"center"]),v=W(p)?k(p,e.height):(e.height-c)*(P(p)?k(p,1):{top:0,center:.5,bottom:1}[p||"center"]),y=function(t,e){return[(t-g)/h,(e-v)/h]},x=y(0,0),b=x[0],w=x[1],m=y(e.width,e.height),S=m[0],z=m[1],I=Math.max,M=Math.min;return{sx:I(b,0),sy:I(w,0),sw:M(S-b,i.width),sh:M(z-w,i.height),dx:I(g,0),dy:I(v,0),dw:M(d,e.width),dh:M(c,e.height)}}({objectFit:u,objectPosition:v},r.contentSize,t),o=i.sx,s=i.sy,h=i.sh,a=i.sw,l=i.dx,d=i.dy,c=i.dh,f=i.dw;I==n.MP_BAIDU?e.drawImage(t.src,l+m,d+S,f,c,o,s,a,h):e.drawImage(t.src,o,s,a,h,l+m,d+S,f,c)}else e.drawImage(t.src,m,S,b,w)},O=function(){e.restore(),L.drawView(r,o,!1,!0,!1),a(1)},T=function(t){B(t),O()},T(t),[2]}))}))}))];case 1:return a.sent(),[2]}}))}))},r.prototype.drawText=function(t,e,i,n){var r=this,o=this.ctx,s=e.borderSize,h=e.contentSize,a=e.left,l=e.top,d=h.width,c=h.height,f=h.left-s.left||0,u=h.top-s.top||0,p=i.color,g=i.lineHeight,v=i.fontSize,y=i.fontWeight,x=i.fontFamily,b=i.fontStyle,w=i.textIndent,m=void 0===w?0:w,S=i.textAlign,z=i.textStroke,I=i.verticalAlign,M=void 0===I?wt:I,B=i.backgroundColor,P=i.lineClamp,O=i.backgroundClip,T=i.textShadow,L=i.textDecoration;if(m=W(m)?m:0,this.drawView(e,i,O!=vt),g=k(g,v),t){o.save(),a+=f,l+=u;var R=n.fontHeight,F=n.descent,A=void 0===F?0:F,j=n.ascent,E=A+(void 0===j?0:j);switch(o.setFonts({fontFamily:x,fontSize:v,fontWeight:y,fontStyle:b}),o.setTextBaseline(wt),o.setTextAlign(S),O?this.setBackground(B,d,c,a,l):o.setFillStyle(p),S){case St:break;case zt:a+=.5*d;break;case It:a+=d}var H=n.lines*g,C=Math.ceil((c-H)/2);switch(C<0&&(C=0),M){case bt:break;case wt:l+=C;break;case mt:l+=2*C}var D=(g-R)/2,Y=g/2,$=function(t){var e=o.measureText(t),i=e.actualBoundingBoxDescent,n=void 0===i?0:i,r=e.actualBoundingBoxAscent;return M==bt?{fix:E?void 0===r?0:r:Y-D/2,lineY:E?0:D-D/2}:M==wt?{fix:E?Y+n/4:Y,lineY:E?0:D}:M==mt?{fix:E?g-n:Y+D/2,lineY:E?2*D:D+D/2}:{fix:0,height:0,lineY:0}},U=function(t,e,i){var r=t;switch(S){case St:r+=i;break;case zt:r=(t-=i/2)+i;break;case It:r=t,t-=i}if(L){o.setLineWidth(v/13),o.beginPath();var s=.1*n.fontHeight;/\bunderline\b/.test(L)&&(o.moveTo(t,e+n.fontHeight+s),o.lineTo(r,e+n.fontHeight+s)),/\boverline\b/.test(L)&&(o.moveTo(t,e-s),o.lineTo(r,e-s)),/\bline-through\b/.test(L)&&(o.moveTo(t,e+.5*n.fontHeight),o.lineTo(r,e+.5*n.fontHeight)),o.closePath(),o.setStrokeStyle(p),o.stroke()}},N=function(t,e,i){var n=function(){o.setLineWidth(z.width),o.setStrokeStyle(z.color),o.strokeText(t,e,i)},s="outset";z&&z.type!==s?(o.save(),r.setShadow({boxShadow:T}),o.fillText(t,e,i),o.restore(),n()):z&&z.type==s?(o.save(),r.setShadow({boxShadow:T}),n(),o.restore(),o.save(),o.fillText(t,e,i),o.restore()):(r.setShadow({boxShadow:T}),o.fillText(t,e,i))};if(!n.widths||1==n.widths.length&&n.widths[0].total+m<=h.width){var X=$(t),_=X.fix,q=void 0===_?0:_,G=X.lineY;return N(t,a+m,l+q),U(a+m,l+G,n&&n.widths&&n.widths[0].total||n.text),l+=g,o.restore(),void this.setBorder(e,i)}for(var V=l,J=a,Q="",Z=0,K=o.measureText("...").width,tt=n.widths,et=0;et<tt.length;et++){var it=tt[et].widths,nt=0;Q="",l+=1==(Z+=1)?0:g,1==Z&&m&&(nt=m,J=a+m);for(var rt=0;rt<it.length;rt++){1!==Z&&m&&(J=a);var ot=it[rt],st=ot.width,ht=ot.text,at=(it[rt+1]||{}).width;if(Q+=ht,(nt+=st)+(void 0===at?0:at)+(0==Z?m:0)+(Z==P?K:0)>h.width){Z>=P&&(Q+="…"),Z++,nt=0;var lt=$(Q);q=lt.fix,G=lt.lineY;N(Q,J,l+q),U(J,l+G,nt),l+=g,Q=""}else if(rt==it.length-1){et!=tt.length-1&&Z==P&&K+nt<h.width&&(Q+="…");var dt=$(Q);q=dt.fix,G=dt.lineY;N(Q,J,l+q),U(J,l+G,nt)}if(l>V+c||Z>P)break}}o.restore()}},r.prototype.source=function(t){return e(this,void 0,void 0,(function(){var e,n,r,o,s=this;return i(this,(function(i){switch(i.label){case 0:if(this.node=null,e=+new Date,"{}"==JSON.stringify(t))return[2];if(!t.type)for(n in t.type=xt,t.styles=t.styles||t.css||{},t)["views","children","type","css","styles"].includes(n)||(t.styles[n]=t[n],delete t[n]);return t.styles.boxSizing||(t.styles.boxSizing="border-box"),[4,this.create(t)];case 1:return(r=i.sent())?(o=r.layout()||{},this.size=o,this.node=r,this.onEffectFinished().then((function(t){return s.lifecycle("onEffectSuccess",t)})).catch((function(t){return s.lifecycle("onEffectFail",t)})),this.performance&&console.log("布局用时："+(+new Date-e)+"ms"),[2,this.size]):[2,console.warn("no node")]}}))}))},r.prototype.getImageInfo=function(t){return this.imageBus[t]||(this.imageBus[t]=this.createImage(t,this.useCORS)),this.imageBus[t]},r.prototype.create=function(n,r){return e(this,void 0,void 0,(function(){function e(i,n,r){void 0===n&&(n={}),void 0===r&&(r=!0);var o=[];return i.forEach((function(i){var s=i.styles,h=void 0===s?{}:s,a=i.children,l=void 0===a?[]:a,d=i.text,c=void 0===d?"":d,f=i.type,u=void 0===f?"":f,p={};p=t(r?t({},n):{},h);var g={},v={},y={};Object.keys(p).map((function(t){if(t.includes("padding")||t.includes("margin")){var e=V(t,p[t]);Object.keys(e).map((function(t){t.includes("Left")?v[t]=e[t]:t.includes("Right")?y[t]=e[t]:g[t]=e[t]}))}}));if(p.textIndent&&(v.textIndent=p.textIndent,delete n.textIndent),""!==c){var x=Array.from(c);x.forEach((function(t,e){var i=Object.assign({},p,g);0===e?Object.assign(i,v):e==x.length-1&&Object.assign(i,y),delete i.padding,delete i.margin,o.push({type:"text",text:t,styles:i})}))}if(u==gt||u==yt)o.push(i);else if("block"===h.display&&l.length>0){var b=e(l,p,!1);i.children=b,i.flattened=!0,o.push(i)}else if(l.length>0){b=e(l,p,r);o=o.concat(b)}})),o}var o,s,h,a,l,d,c,f,u,p,g,v,y,b,w,m,S,z,I,M,B;return i(this,(function(i){switch(i.label){case 0:if(!n)return[2];if(n.styles||(n.styles=n.css||{}),o=n.type,s=o==gt,h=[vt,yt].includes(o),a="textBox"==o,l=n.styles||{},d=l.backgroundImage,c=l.display,s&&!n.src&&!n.url)return[2];if(c==x)return[2];if(h||a){if(f=n.children,!n.text&&(!f||f&&!f.length))return[2];f&&f.length&&!n.flattened&&(u=e(n.children),n.type="view",n.children=u)}if(!(s||n.type==xt&&d))return[3,4];p=s?n.src:"",g=/url\(['"]?(.*?)['"]?\)/.exec(d),d&&g&&g[1]&&(p=g[1]||""),i.label=1;case 1:return i.trys.push([1,3,,4]),[4,this.getImageInfo(p)];case 2:return v=i.sent(),y=v.width,b=v.height,!(w=v.path)&&s?[2]:(w&&(n.attributes=Object.assign(n.attributes||{},{width:y,height:b,path:w,src:w,naturalSrc:p})),[3,4]);case 3:return m=i.sent(),n.type!=xt?[2]:(this.lifecycle("onEffectFail",t(t({},m),{src:p})),[3,4]);case 4:if(this.count+=1,S=new pt(n,r,this.root,this.ctx),!(z=n.views||n.children))return[3,8];I=0,i.label=5;case 5:return I<z.length?(M=z[I],[4,this.create(M,S)]):[3,8];case 6:(B=i.sent())&&S.add(B),i.label=7;case 7:return I++,[3,5];case 8:return[2,S]}}))}))},r.prototype.drawNode=function(t,n){return void 0===n&&(n=!1),e(this,void 0,void 0,(function(){var e,r,o,s,h,a,l,d,c,f,u,p,g,v,y,x,b,w,m,S,z,I,M;return i(this,(function(i){switch(i.label){case 0:return e=t.layoutBox,r=t.computedStyle,o=t.attributes,s=t.name,h=t.children,a=t.fixedLine,l=t.attributes,d=l.src,c=l.text,f=r.position,u=r.backgroundImage,p=r.backgroundRepeat,["fixed"].includes(f)&&!n?[2]:(this.ctx.save(),s!==xt?[3,7]:d&&u?p?[4,this.drawPattern(o,e,r)]:[3,2]:[3,5]);case 1:return i.sent(),[3,4];case 2:return[4,this.drawImage(o,e,r,!1)];case 3:i.sent(),i.label=4;case 4:return[3,6];case 5:this.drawView(e,r),i.label=6;case 6:return[3,10];case 7:return s===gt&&d?[4,this.drawImage(o,e,r,!1)]:[3,9];case 8:return i.sent(),[3,10];case 9:s===vt?this.drawText(c,e,r,o):s===yt&&QR.api&&console.warn("single"),i.label=10;case 10:if(this.progress+=1,v=(g=a||{}).beforeElements,y=g.afterElements,!v)return[3,14];x=0,b=v,i.label=11;case 11:return x<b.length?(M=b[x],[4,this.drawNode(M)]):[3,14];case 12:i.sent(),i.label=13;case 13:return x++,[3,11];case 14:if(!h)return[3,18];w=Object.values?Object.values(h):Object.keys(h).map((function(t){return h[t]})),m=0,S=w,i.label=15;case 15:return m<S.length?"absolute"===(M=S[m]).computedStyle.position?[3,17]:[4,this.drawNode(M)]:[3,18];case 16:i.sent(),i.label=17;case 17:return m++,[3,15];case 18:if(!y)return[3,22];z=0,I=y,i.label=19;case 19:return z<I.length?(M=I[z],[4,this.drawNode(M)]):[3,22];case 20:i.sent(),i.label=21;case 21:return z++,[3,19];case 22:return this.ctx.restore(),[2]}}))}))},r.prototype.render=function(t){var n=this;return void 0===t&&(t=30),new Promise((function(r,o){return e(n,void 0,void 0,(function(){var e,n,s,h,a,l,d,c,f,u;return i(this,(function(i){switch(i.label){case 0:return e=+new Date,this.init(),[4,(p=t,void 0===p&&(p=0),new Promise((function(t){return setTimeout(t,p)})))];case 1:i.sent(),i.label=2;case 2:if(i.trys.push([2,14,,15]),!this.node)return[3,12];if(n=this.root.fixedLine||{},s=n.beforeElements,h=n.afterElements,!s)return[3,6];a=0,l=s,i.label=3;case 3:return a<l.length?(f=l[a],[4,this.drawNode(f,!0)]):[3,6];case 4:i.sent(),i.label=5;case 5:return a++,[3,3];case 6:return[4,this.drawNode(this.node)];case 7:if(i.sent(),!h)return[3,11];d=0,c=h,i.label=8;case 8:return d<c.length?(f=c[d],[4,this.drawNode(f,!0)]):[3,11];case 9:i.sent(),i.label=10;case 10:return d++,[3,8];case 11:return r(this.node),[3,13];case 12:this.lifecycle("onEffectFail","node is empty"),i.label=13;case 13:return[3,15];case 14:return u=i.sent(),this.lifecycle("onEffectFail",u),o(u),[3,15];case 15:return this.performance&&console.log("渲染用时："+(+new Date-e-30)+"ms"),[2]}var p}))}))}))},r.prototype.onEffectFinished=function(){var t=this,e=Object.keys(this.imageBus).map((function(e){return t.imageBus[e]}));return Promise.all(e)},r.prototype.destroy=function(){this.node=[]},r.prototype.save=function(t){try{var e=t||{},i=e.fileType,n=void 0===i?"png":i,r=e.quality,o=void 0===r?1:r;return this.canvas.toDataURL("image/".concat(n),o)}catch(t){return this.lifecycle("onEffectFail","image cross domain"),t}},r}();n.WEB==I&&(window.Painter=Mt);export{Mt as Painter,Mt as default};
diff --git a/uni_modules/lime-painter/components/l-painter/utils.js b/uni_modules/lime-painter/components/l-painter/utils.js
new file mode 100644
index 0000000..cea5c6e
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/utils.js
@@ -0,0 +1,368 @@
+export const networkReg = /^(http|\/\/)/;
+export const isBase64 = (path) => /^data:image\/(\w+);base64/.test(path);
+export function sleep(delay) {
+	return new Promise(resolve => setTimeout(resolve, delay))
+}
+let {platform, SDKVersion} = uni.getSystemInfoSync() 
+export const isPC = /windows|mac/.test(platform)
+// 缓存图片
+let cache = {}
+export function isNumber(value) {
+	return /^-?\d+(\.\d+)?$/.test(value);
+}
+export function toPx(value, baseSize, isDecimal = false) {
+	// 如果是数字
+	if (typeof value === 'number') {
+		return value
+	}
+	// 如果是字符串数字
+	if (isNumber(value)) {
+		return value * 1
+	}
+	// 如果有单位
+	if (typeof value === 'string') {
+		const reg = /^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g
+		const results = reg.exec(value);
+		if (!value || !results) {
+			return 0;
+		}
+		const unit = results[3];
+		value = parseFloat(value);
+		let res = 0;
+		if (unit === 'rpx') {
+			res = uni.upx2px(value);
+		} else if (unit === 'px') {
+			res = value * 1;
+		} else if (unit === '%') {
+			res = value * toPx(baseSize) / 100;
+		} else if (unit === 'em') {
+			res = value * toPx(baseSize || 14);
+		}
+		return isDecimal ? res.toFixed(2) * 1 : Math.round(res);
+	}
+	return 0
+}
+
+// 计算版本
+export function compareVersion(v1, v2) {
+	v1 = v1.split('.')
+	v2 = v2.split('.')
+	const len = Math.max(v1.length, v2.length)
+	while (v1.length < len) {
+		v1.push('0')
+	}
+	while (v2.length < len) {
+		v2.push('0')
+	}
+	for (let i = 0; i < len; i++) {
+		const num1 = parseInt(v1[i], 10)
+		const num2 = parseInt(v2[i], 10)
+
+		if (num1 > num2) {
+			return 1
+		} else if (num1 < num2) {
+			return -1
+		}
+	}
+	return 0
+}
+
+function gte(version) {
+  // #ifdef MP-ALIPAY
+  SDKVersion = my.SDKVersion
+  // #endif
+  return compareVersion(SDKVersion, version) >= 0;
+}
+export function canIUseCanvas2d() {
+	// #ifdef MP-WEIXIN
+	return gte('2.9.2');
+	// #endif
+	// #ifdef MP-ALIPAY
+	return gte('2.7.15');
+	// #endif
+	// #ifdef MP-TOUTIAO
+	return gte('1.78.0');
+	// #endif
+	return false
+}
+
+// #ifdef MP
+export const prefix = () => {
+	// #ifdef MP-TOUTIAO
+	return tt
+	// #endif
+	// #ifdef MP-WEIXIN
+	return wx
+	// #endif
+	// #ifdef MP-BAIDU
+	return swan
+	// #endif
+	// #ifdef MP-ALIPAY
+	return my
+	// #endif
+	// #ifdef MP-QQ
+	return qq
+	// #endif
+	// #ifdef MP-360
+	return qh
+	// #endif
+}
+// #endif
+
+
+
+/**
+ * base64转路径
+ * @param {Object} base64
+ */
+export function base64ToPath(base64) {
+	const [, format] = /^data:image\/(\w+);base64,/.exec(base64) || [];
+
+	return new Promise((resolve, reject) => {
+		// #ifdef MP
+		const fs = uni.getFileSystemManager()
+		//自定义文件名
+		if (!format) {
+			reject(new Error('ERROR_BASE64SRC_PARSE'))
+		}
+		const time = new Date().getTime();
+		let pre = prefix()
+		// #ifdef MP-TOUTIAO
+		const filePath = `${pre.getEnvInfoSync().common.USER_DATA_PATH}/${time}.${format}`
+		// #endif
+		// #ifndef MP-TOUTIAO
+		const filePath = `${pre.env.USER_DATA_PATH}/${time}.${format}`
+		// #endif
+		fs.writeFile({
+			filePath,
+			data: base64.split(',')[1],
+			encoding: 'base64',
+			success() {
+				resolve(filePath)
+			},
+			fail(err) {
+				console.error(err)
+				reject(err)
+			}
+		})
+		// #endif
+
+		// #ifdef H5
+		// mime类型
+		let mimeString = base64.split(',')[0].split(':')[1].split(';')[0];
+		//base64 解码
+		let byteString = atob(base64.split(',')[1]);
+		//创建缓冲数组
+		let arrayBuffer = new ArrayBuffer(byteString.length);
+		//创建视图
+		let intArray = new Uint8Array(arrayBuffer);
+		for (let i = 0; i < byteString.length; i++) {
+			intArray[i] = byteString.charCodeAt(i);
+		}
+		resolve(URL.createObjectURL(new Blob([intArray], {
+			type: mimeString
+		})))
+		// #endif
+
+		// #ifdef APP-PLUS
+		const bitmap = new plus.nativeObj.Bitmap('bitmap' + Date.now())
+		bitmap.loadBase64Data(base64, () => {
+			if (!format) {
+				reject(new Error('ERROR_BASE64SRC_PARSE'))
+			}
+			const time = new Date().getTime();
+			const filePath = `_doc/uniapp_temp/${time}.${format}`
+			bitmap.save(filePath, {},
+				() => {
+					bitmap.clear()
+					resolve(filePath)
+				},
+				(error) => {
+					bitmap.clear()
+					reject(error)
+				})
+		}, (error) => {
+			bitmap.clear()
+			reject(error)
+		})
+		// #endif
+	})
+}
+
+/**
+ * 路径转base64
+ * @param {Object} string
+ */
+export function pathToBase64(path) {
+	if (/^data:/.test(path)) return path
+	return new Promise((resolve, reject) => {
+		// #ifdef H5
+		let image = new Image();
+		image.setAttribute("crossOrigin", 'Anonymous');
+		image.onload = function() {
+			let canvas = document.createElement('canvas');
+			canvas.width = this.naturalWidth;
+			canvas.height = this.naturalHeight;
+			canvas.getContext('2d').drawImage(image, 0, 0);
+			let result = canvas.toDataURL('image/png')
+			resolve(result);
+			canvas.height = canvas.width = 0
+		}
+		image.src = path + '?v=' + Math.random()
+		image.onerror = (error) => {
+			reject(error);
+		};
+		// #endif
+
+		// #ifdef MP
+		if (uni.canIUse('getFileSystemManager')) {
+			uni.getFileSystemManager().readFile({
+				filePath: path,
+				encoding: 'base64',
+				success: (res) => {
+					resolve('data:image/png;base64,' + res.data)
+				},
+				fail: (error) => {
+					console.error({error, path})
+					reject(error)
+				}
+			})
+		}
+		// #endif
+
+		// #ifdef APP-PLUS
+		plus.io.resolveLocalFileSystemURL(getLocalFilePath(path), (entry) => {
+			entry.file((file) => {
+				const fileReader = new plus.io.FileReader()
+				fileReader.onload = (data) => {
+					resolve(data.target.result)
+				}
+				fileReader.onerror = (error) => {
+					reject(error)
+				}
+				fileReader.readAsDataURL(file)
+			}, reject)
+		}, reject)
+		// #endif
+	})
+}
+
+
+
+export function getImageInfo(path, useCORS) {
+	const isCanvas2D = this && this.canvas && this.canvas.createImage
+	return new Promise(async (resolve, reject) => {
+		// let time = +new Date()
+		let src = path.replace(/^@\//,'/')
+		if (cache[path] && cache[path].errMsg) {
+			resolve(cache[path])
+		} else {
+			try {
+				// #ifdef MP || APP-PLUS
+				if (isBase64(path) && (isCanvas2D ? isPC : true)) {
+					src = await base64ToPath(path)
+				}
+				// #endif
+				// #ifdef H5
+				if(useCORS) {
+					src = await pathToBase64(path)
+				}
+				// #endif
+			} catch (error) {
+				reject({
+					...error,
+					src
+				})
+			}
+			// #ifndef APP-NVUE
+			if(isCanvas2D && !isPC) {
+				const img = this.canvas.createImage()
+				img.onload = function() {
+					const image = {
+						path: img,
+						width:  img.width,
+						height:  img.height
+					}
+					cache[path] = image
+					resolve(cache[path])
+				}
+				img.onerror = function(err) {
+					reject({err,path})
+				}
+				img.src = src
+				return
+			}
+			// #endif
+			uni.getImageInfo({
+				src,
+				success: (image) => {
+					const localReg = /^\.|^\/(?=[^\/])/;
+					// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-TOUTIAO
+					image.path = localReg.test(src) ?  `/${image.path}` : image.path;
+					// #endif
+					if(isCanvas2D) {
+						const img = this.canvas.createImage()
+						img.onload = function() {
+							image.path = img
+							cache[path] = image
+							resolve(cache[path])
+						}
+						img.onerror = function(err) {
+							reject({err,path})
+						}
+						img.src = src
+						return
+					}
+					// #ifdef APP-PLUS
+					// console.log('getImageInfo', +new Date() - time)
+					// ios 比较严格 可能需要设置跨域
+					if(uni.getSystemInfoSync().osName == 'ios' && useCORS) {
+						pathToBase64(image.path).then(base64 => {
+							image.path = base64
+							cache[path] = image
+							resolve(cache[path])
+						}).catch(err => {
+							console.error({err, path})
+							reject({err,path})
+						})
+						return
+					}
+					// #endif
+					cache[path] = image
+					resolve(cache[path])
+				},
+				fail(err) {
+					console.error({err, path})
+					reject({err,path})
+				}
+			})
+		}
+	})
+}
+
+
+// #ifdef APP-PLUS
+const getLocalFilePath = (path) => {
+	if (path.indexOf('_www') === 0 || path.indexOf('_doc') === 0 || path.indexOf('_documents') === 0 || path
+		.indexOf('_downloads') === 0) {
+		return path
+	}
+	if (path.indexOf('file://') === 0) {
+		return path
+	}
+	if (path.indexOf('/storage/emulated/0/') === 0) {
+		return path
+	}
+	if (path.indexOf('/') === 0) {
+		const localFilePath = plus.io.convertAbsoluteFileSystem(path)
+		if (localFilePath !== path) {
+			return localFilePath
+		} else {
+			path = path.substr(1)
+		}
+	}
+	return '_www/' + path
+}
+// #endif
+
+
diff --git a/uni_modules/lime-painter/components/lime-painter/lime-painter.vue b/uni_modules/lime-painter/components/lime-painter/lime-painter.vue
new file mode 100644
index 0000000..5427e6a
--- /dev/null
+++ b/uni_modules/lime-painter/components/lime-painter/lime-painter.vue
@@ -0,0 +1,248 @@
+<template>
+  <view class="page">
+    <!-- <demo-block title="json用法">
+      <image :src="picture" v-if="picture" mode="widthFix"></image>
+      <l-painter :board="poster" @success="picture = $event" isCanvasToTempFilePath ref="json" style="position: fixed;left: 1500rpx;width: 750rpx;" path-type="url"></l-painter>
+    </demo-block> -->
+    <!-- <demo-block title="基础用法">
+      <l-painter ref="painter">
+        <l-painter-view css="background: #07c160; height: 120rpx; width: 120rpx; display: inline-block">
+        </l-painter-view>
+        <l-painter-view
+          css="background: #1989fa; height: 120rpx; width: 120rpx; border-top-right-radius: 60rpx; border-bottom-left-radius: 60rpx; display: inline-block; margin: 0 30rpx;">
+        </l-painter-view>
+        <l-painter-view
+          css="background: #ff9d00; height: 120rpx; width: 120rpx; border-radius: 50%; display: inline-block">
+        </l-painter-view>
+      </l-painter>
+    </demo-block> -->
+    <!-- <demo-block title="View 容器">
+      <l-painter>
+        <l-painter-view css="background: #f0f0f0; padding-top: 100rpx;">
+          <l-painter-view css="background: #d9d9d9; width: 33.33%; height: 100rpx; display: inline-block">
+          </l-painter-view>
+          <l-painter-view css="background: #bfbfbf; width: 66.66%; height: 100rpx; display: inline-block">
+          </l-painter-view>
+        </l-painter-view>
+      </l-painter>
+    </demo-block> -->
+    <!-- <demo-block title="Text 文本">
+      <l-painter>
+        <l-painter-view css="background: #f5f5f5; padding: 30rpx; color: #222a29">
+          <l-painter-text text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼" />
+          <l-painter-text text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+            css="text-align:center; padding-top: 20rpx; text-decoration: line-through " />
+          <l-painter-text text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼" css="text-align:right; padding-top: 20rpx" />
+          <l-painter-text text="水调歌头\n明月几时有？把酒问青天。不知天上宫阙，今夕是何年。我欲乘风归去，又恐琼楼玉宇，高处不胜寒。起舞弄清影，何似在人间。"
+            css="line-clamp: 3; padding-top: 20rpx; background: linear-gradient(,#ff971b 0%, #1989fa 100%); background-clip: text" />
+        </l-painter-view>
+      </l-painter>
+    </demo-block> -->
+    <!-- <demo-block title="Image 图片">
+      <l-painter>
+        <l-painter-view>
+          <l-painter-text text="基础用法"
+            css="margin-top: 30rpx; display: block; padding-bottom:20rpx; color: #999" />
+          <l-painter-view>
+            <l-painter-image
+              src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+              css="width: 200rpx; height: 200rpx" />
+          </l-painter-view>
+        </l-painter-view>
+        <l-painter-view>
+          <l-painter-text text="填充方式"
+            css=" margin-top: 30rpx; display: block; padding-bottom:20rpx; color: #999" />
+          <l-painter-view css="display: inline-block; padding-right: 12rpx">
+            <l-painter-image
+              src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+              css="width: 200rpx; height: 200rpx; object-fit: contain; background: #f5f5f5" />
+            <l-painter-text text="contain" css="margin-top: 10rpx; display: block; text-align:center;" />
+          </l-painter-view>
+          <l-painter-view css="display: inline-block; padding: 0 12rpx">
+            <l-painter-image
+              src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+              css="width: 200rpx; height: 200rpx; object-fit: cover; background: #f5f5f5" />
+            <l-painter-text text="cover" css="margin-top: 10rpx; display: block; text-align:center;" />
+          </l-painter-view>
+          <l-painter-view css="display: inline-block; padding: 0 12rpx">
+            <l-painter-image
+              src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+              css="width: 200rpx; height: 200rpx; object-fit: fill; background: #f5f5f5" />
+            <l-painter-text text="fill" css="margin-top: 10rpx; display: block; text-align:center;" />
+          </l-painter-view>
+          <l-painter-view css="display: inline-block; margin-top: 30rpx">
+            <l-painter-image
+              src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+              css="width: 200rpx; height: 200rpx; object-fit: none; background: #f5f5f5" />
+            <l-painter-text text="none" css="margin-top: 10rpx; display: block; text-align:center;" />
+          </l-painter-view>
+        </l-painter-view>
+      </l-painter>
+    </demo-block> -->
+    <!-- <demo-block title="QRcode 二维码">
+      <l-painter>
+        <l-painter-qrcode text="limeui.qcoon.cn" css="width: 200rpx; height: 200rpx" />
+      </l-painter>
+    </demo-block> -->
+    <demo-block title="栗子海报">
+      <image v-if="picture2" :src="picture2" mode="widthFix"></image>
+      <l-painter
+        css="width: 750rpx; padding-bottom: 100rpx; background: linear-gradient(180deg,#ff971b 0%, #ff5000 100%)"
+        @fail="fail"
+        @done="done"
+        pathType="url"
+        ref="poster"
+        performance
+      >
+        <l-painter-image
+          src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+          css="background: #ffffff; object-fit: cover; margin-left: 40rpx; margin-top: 40rpx; width: 84rpx; border: 2rpx solid #ffffff; box-sizing: border-box; height: 84rpx; border-radius: 50%;" />
+        <l-painter-view css="margin-top: 40rpx; padding-left: 20rpx; display: inline-block">
+          <l-painter-text text="隔壁老王"
+                          css="display: block; padding-bottom: 10rpx; color: #ffffff; font-size: 32rpx; fontWeight: bold" />
+          <l-painter-text text="为您挑选了一个好物?" css="color: rgba(255,255,255,.7); font-size: 24rpx" />
+        </l-painter-view>
+        <l-painter-view
+          css="margin-left: 40rpx; margin-top: 30rpx; padding: 32rpx; box-sizing: border-box; background: #ffffff; border-radius: 16rpx; width: 670rpx; box-shadow: 0 20rpx 58rpx rgba(0,0,0,.15)">
+          <l-painter-image
+            src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+            css="object-fit: cover; object-position: 50% 50%; width: 606rpx; height: 606rpx;" />
+          <l-painter-view
+            css="margin-top: 32rpx; color: #FF0000; font-weight: bold; font-size: 28rpx; line-height: 1em;">
+            <l-painter-text text="￥" css="vertical-align: bottom" />
+            <l-painter-text text="39" css="vertical-align: bottom; font-size: 58rpx" />
+            <l-painter-text text=".39" css="vertical-align: bottom" />
+            <l-painter-text text="￥59.99"
+                            css="vertical-align: bottom; padding-left: 10rpx; font-weight: normal; text-decoration: line-through; color: #999999" />
+          </l-painter-view>
+          <l-painter-view css="margin-top: 32rpx; font-size: 26rpx; color: #8c5400">
+            <l-painter-text text="自营" css="color: #212121; background: #ffb400;" />
+            <l-painter-text text="30天最低价"
+                            css="margin-left: 16rpx; background: #fff4d9; text-decoration: line-through;" />
+            <l-painter-text text="满减优惠" css="margin-left: 16rpx; background: #fff4d9" />
+            <l-painter-text text="超高好评" css="margin-left: 16rpx; background: #fff4d9" />
+          </l-painter-view>
+          <l-painter-view css="margin-top: 30rpx; display: flex">
+            <l-painter-text uid="tag"
+                            css="position:absolute; top: 6rpx; padding: 5rpx 10rpx; color: #212121; background: #ffb400; font-size: 24rpx"
+                            text="京东自营"></l-painter-text>
+            <l-painter-text
+              css="text-indent: calc(tag.width + 10rpx); flex: 1; padding-right: 20rpx; box-sizing: border-box; line-clamp: 2; color: #333333; line-height: 1.8em; font-size: 36rpx;"
+              text="360儿童电话手表9X 智能语音问答定位支付手表 4G全网通20米游泳级防水视频通话拍照手表男女孩星空蓝"></l-painter-text>
+            <l-painter-qrcode css="width: 128rpx; height: 128rpx;" text="limeui.qcoon.cn"></l-painter-qrcode>
+          </l-painter-view>
+        </l-painter-view>
+      </l-painter>
+      <button type="default" @click="save">save</button>
+    </demo-block>
+  </view>
+</template>
+
+<script>
+  export default {
+    data: () => ({
+      picture: '',
+      picture2: '',
+      show: false,
+      'poster': {
+        'css': {
+          'width': '750rpx',
+          'height': '1333rpx',
+        },
+        'views': [{
+          'type': 'image',
+          'src': 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+          'css': {
+            'width': '750rpx',
+            'height': '1333rpx',
+            'background': 'white',
+            'position': 'fixed',
+            'top': '0',
+            'left': '0',
+            'zIndex': -1,
+          },
+        }, {
+          'css': {
+            'width': '750rpx',
+            'position': 'fixed',
+            'top': '610rpx',
+            'left': '303rpx',
+          },
+          'views': [{
+            'type': 'view',
+            'css': {
+              'width': '150rpx',
+              'height': '150rpx',
+              'background': '#FFF',
+            },
+            'views': [{
+              'type': 'image',
+              'src': 'data:image/png;base64,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',
+              'css': {
+                'width': '138rpx',
+                'height': '138rpx',
+                'marginTop': '6rpx',
+                'marginLeft': '6rpx',
+              },
+            }],
+          }],
+        }],
+      },
+    }),
+    mounted() {
+      this.$refs.poster.canvasToTempFilePathSync({
+        fileType: 'jpg',
+        quality: 1,
+        success: (res) => {
+          console.log(`mounted`, res.tempFilePath);
+          this.picture2 = res.tempFilePath;
+          this.saveImage();
+        },
+      });
+    },
+    methods: {
+      close() {
+        this.show = false;
+      },
+      fail(v) {
+        console.log(v);
+      },
+      done(v) {
+        console.log('绘制完成:');
+      },
+      save() {
+        this.$refs.poster.canvasToTempFilePathSync({
+          fileType: 'jpg',
+          quality: 1,
+          success: (res) => {
+            console.log(res.tempFilePath);
+            this.picture2 = res.tempFilePath;
+            this.saveImage();
+          },
+          fail(e) {
+            console.log('???????????', e);
+          },
+        });
+      },
+      // 保存图征
+      saveImage() {
+        // #ifndef H5
+        uni.saveImageToPhotosAlbum({
+          filePath: this.picture,
+          success(res) {
+            uni.showToast({
+              title: '已保存到相册',
+              icon: 'success',
+              duration: 2000,
+            });
+          },
+        });
+        // #endif
+      },
+    },
+  };
+</script>
+
+<style lang="stylus" scoped>
+
+</style>
diff --git a/uni_modules/lime-painter/hybrid/html/index.html b/uni_modules/lime-painter/hybrid/html/index.html
new file mode 100644
index 0000000..fdf884e
--- /dev/null
+++ b/uni_modules/lime-painter/hybrid/html/index.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<title></title>
+	<style type="text/css">
+		html,
+		body,
+		canvas {
+			padding: 0;
+			margin: 0;
+			width: 100%;
+			height: 100%;
+			overflow-y: hidden;
+			background-color: transparent;
+		}
+	</style>
+</head>
+
+<body>
+	<canvas id="lime-painter"></canvas>
+	<script type="text/javascript" src="./uni.webview.1.5.3.js"></script>
+	<script type="text/javascript" src="./painter.js"></script>
+	<script> 
+		var cache = [];
+		var painter = null;
+		var canvas = null;
+		var context = null;
+		var timer = null;
+		var pixelRatio = 1;
+		console.log = function (...args) {
+			postMessage(args);
+		};
+		// function stringify(key, value) {
+		// 	if (typeof value === 'object' && value !== null) {
+		// 		if (cache.indexOf(value) !== -1) {
+		// 			return;
+		// 		}
+		// 		cache.push(value);
+		// 	}
+		// 	return value;
+		// };
+
+		function emit(event, data) {
+			postMessage({
+				event,
+				data: (typeof data !== 'object' && data !== null ? data : JSON.stringify(data)) 
+			});
+			cache = [];
+		};
+		function postMessage(data) {
+			uni.postMessage({
+				data
+			});
+		};
+		
+		function init(dpr) {
+			canvas = document.querySelector('#lime-painter');
+			context = canvas.getContext('2d');
+			pixelRatio = dpr || window.devicePixelRatio;
+			painter = new Painter({
+				id: 'lime-painter',
+				context,
+				canvas,
+				pixelRatio,
+				width: canvas.offsetWidth,
+				height: canvas.offsetHeight,
+				listen: {
+					onProgress(v) {
+						emit('progressChange', v);
+					},
+					onEffectFail(err) {
+						//console.error(err)
+						emit('fail', err);
+					}
+				}
+			});
+			emit('inited', true);
+		};
+		function save(args) {
+			delete args.success;
+			delete args.fail;
+			clearTimeout(timer);
+			timer = setTimeout(() => {
+				const path = painter.save(args);
+				if (typeof path == 'string') {
+					const index = Math.ceil(path.length / 8);
+					for (var i = 0; i < 8; i++) {
+						if (i == 7) {
+							emit('success', path.substr(i * index, index));
+						} else {
+							emit('file', path.substr(i * index, index));
+						}
+					};
+				} else {
+					// console.log('canvas no data')
+					emit('fail', 'canvas no data');
+				};
+			}, 30);
+		};
+		async function source(args) {
+			let size = await painter.source(args);
+			emit('layoutChange', size);
+			if(!canvas.height) {
+				console.log('canvas no size')
+				emit('fail', 'canvas no size');
+			}
+			painter.render().catch(err => {
+				// console.error(err)
+				emit('fail', err);
+			});
+		};
+	</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/uni_modules/lime-painter/hybrid/html/painter.js b/uni_modules/lime-painter/hybrid/html/painter.js
new file mode 100644
index 0000000..fc3e2c2
--- /dev/null
+++ b/uni_modules/lime-painter/hybrid/html/painter.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).Painter={})}(this,(function(t){"use strict";var e=function(){return e=Object.assign||function(t){for(var e,i=1,n=arguments.length;i<n;i++)for(var r in e=arguments[i])Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t},e.apply(this,arguments)};function i(t,e,i,n){return new(i||(i=Promise))((function(r,o){function s(t){try{h(n.next(t))}catch(t){o(t)}}function a(t){try{h(n.throw(t))}catch(t){o(t)}}function h(t){var e;t.done?r(t.value):(e=t.value,e instanceof i?e:new i((function(t){t(e)}))).then(s,a)}h((n=n.apply(t,e||[])).next())}))}function n(t,e){var i,n,r,o,s={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(i)throw new TypeError("Generator is already executing.");for(;s;)try{if(i=1,n&&(r=2&o[0]?n.return:o[0]?n.throw||((r=n.return)&&r.call(n),0):n.next)&&!(r=r.call(n,o[1])).done)return r;switch(n=0,r&&(o=[2&o[0],r.value]),o[0]){case 0:case 1:r=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(r=s.trys,(r=r.length>0&&r[r.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!r||o[1]>r[0]&&o[1]<r[3])){s.label=o[1];break}if(6===o[0]&&s.label<r[1]){s.label=r[1],r=o;break}if(r&&s.label<r[2]){s.label=r[2],s.ops.push(o);break}r[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{i=r=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}var r={MP_WEIXIN:"mp-weixin",MP_QQ:"mp-qq",MP_ALIPAY:"mp-alipay",MP_BAIDU:"mp-baidu",MP_TOUTIAO:"mp-toutiao",MP_DINGDING:"mp-dingding",H5:"h5",WEB:"web",PLUS:"plus"},o="width",s="height",a="margin",h="center",c="flex-start",f="flex-end",d=["Top","Right","Bottom","Left"],l="left",u="right",p="top",g="bottom",v="middle",y=["contentSize","clientSize","borderSize","offsetSize"],b="row",x="column",w={TOP:p,MIDDLE:v,BOTTOM:g},m={LEFT:l,CENTER:h,RIGHT:u},S="view",z="text",I="image",M="qrcode",k="block",B="inline-block",W="none",P="flex",O="absolute",T="fixed",L="transparent",R="fill",F={display:k,color:"#000000",lineHeight:"1.4em",fontSize:14,fontWeight:400,fontFamily:"sans-serif",lineCap:"butt",flexDirection:b,flexWrap:"nowrap",textAlign:l,alignItems:c,justifyContent:c,position:"static",transformOrigin:"".concat(h," ").concat(h)},A={upx2px:function(t){return window.innerWidth/750*t},getSystemInfoSync:function(){return{screenWidth:window.innerWidth,screenHeight:window.innerHeight}},getImageInfo:function(t){var e=t.src,i=t.success,n=t.fail,r=new Image;r.onload=function(){i({width:r.naturalWidth,height:r.naturalHeight,path:r.src,src:e})},r.onerror=n,r.src=e}},E="object",j="undefined",C=typeof window==E?typeof uni==j||typeof uni!==j&&!uni.addInterceptor?r.WEB:r.H5:typeof swan==E?r.MP_BAIDU:typeof tt==E?r.MP_TOUTIAO:typeof plus===E?r.PLUS:typeof wx==E?r.MP_WEIXIN:void 0,H=C==r.MP_WEIXIN?wx:typeof uni!=j?uni.getImageInfo?{upx2px:function(t){return uni.upx2px(t)},getSystemInfoSync:function(){return uni.getSystemInfoSync()},getImageInfo:function(t){return uni.getImageInfo(t)},downloadFile:function(t){return uni.downloadFile(t)}}:Object.assign(uni,A):typeof window!=j?A:uni;if(!H.upx2px){var D=((H.getSystemInfoSync&&H.getSystemInfoSync()).screenWidth||375)/750;H.upx2px=function(t){return D*t}}function Y(t){return/^-?\d+(\.\d+)?$/.test(t)}function $(t,e,i){if(Y(t))return 1*t;if("string"==typeof t){var n=/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|vw|vh|px|%)$/g.exec(t);if(!t||!n)return 0;var r=n[3];t=parseFloat(t);var o=0;if("rpx"===r)o=H.upx2px(t);else if("px"===r)o=1*t;else if("%"===r&&e)o=t*$(e)/100;else if("em"===r&&e)o=t*$(e||14);else if(["vw","vh"].includes(r)){var s=H.getSystemInfoSync(),a=s.screenWidth,h=s.screenHeight;o=t*("vw"==r?a:h)/100}return 1*o.toFixed(2)}return 0}function U(t){return/%$/.test(t)}var N=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},_=function(t,e,i,n,r,o){t.startsWith("linear")?function(t,e,i,n,r,o){for(var s=function(t,e,i,n,r){void 0===n&&(n=0);void 0===r&&(r=0);var o=t.match(/([-]?\d{1,3})deg/),s=o&&o[1]?parseFloat(o[1]):0;s>=360&&(s-=360);s<0&&(s+=360);if(0===(s=Math.round(s)))return{x0:Math.round(e/2)+n,y0:i+r,x1:Math.round(e/2)+n,y1:r};if(180===s)return{x0:Math.round(e/2)+n,y0:r,x1:Math.round(e/2)+n,y1:i+r};if(90===s)return{x0:n,y0:Math.round(i/2)+r,x1:e+n,y1:Math.round(i/2)+r};if(270===s)return{x0:e+n,y0:Math.round(i/2)+r,x1:n,y1:Math.round(i/2)+r};var a=Math.round(180*Math.asin(e/Math.sqrt(Math.pow(e,2)+Math.pow(i,2)))/Math.PI);if(s===a)return{x0:n,y0:i+r,x1:e+n,y1:r};if(s===180-a)return{x0:n,y0:r,x1:e+n,y1:i+r};if(s===180+a)return{x0:e+n,y0:r,x1:n,y1:i+r};if(s===360-a)return{x0:e+n,y0:i+r,x1:n,y1:r};var h=0,c=0,f=0,d=0;if(s<a||s>180-a&&s<180||s>180&&s<180+a||s>360-a){var l=s*Math.PI/180,u=s<a||s>360-a?i/2:-i/2,p=Math.tan(l)*u,g=s<a||s>180-a&&s<180?e/2-p:-e/2-p;h=-(f=p+(v=Math.pow(Math.sin(l),2)*g)),c=-(d=u+v/Math.tan(l))}if(s>a&&s<90||s>90&&s<90+a||s>180+a&&s<270||s>270&&s<360-a){var v;l=(90-s)*Math.PI/180,p=s>a&&s<90||s>90&&s<90+a?e/2:-e/2,u=Math.tan(l)*p,g=s>a&&s<90||s>270&&s<360-a?i/2-u:-i/2-u;h=-(f=p+(v=Math.pow(Math.sin(l),2)*g)/Math.tan(l)),c=-(d=u+v)}return h=Math.round(h+e/2)+n,c=Math.round(i/2-c)+r,f=Math.round(f+e/2)+n,d=Math.round(i/2-d)+r,{x0:h,y0:c,x1:f,y1:d}}(r,t,e,i,n),a=s.x0,h=s.y0,c=s.x1,f=s.y1,d=o.createLinearGradient(a,h,c,f),l=r.match(/linear-gradient\((.+)\)/)[1],u=X(l.substring(l.indexOf(",")+1)),p=0;p<u.colors.length;p++)d.addColorStop(u.percents[p],u.colors[p]);o.setFillStyle(d)}(e,i,n,r,t,o):t.startsWith("radial")&&function(t,e,i,n,r,o){for(var s=X(r.match(/radial-gradient\((.+)\)/)[1]),a=Math.round(t/2)+i,h=Math.round(e/2)+n,c=o.createRadialGradient(a,h,0,a,h,Math.max(t,e)/2),f=0;f<s.colors.length;f++)c.addColorStop(s.percents[f],s.colors[f]);o.setFillStyle(c)}(e,i,n,r,t,o)};function X(t){for(var e=[],i=[],n=0,r=t.substring(0,t.length-1).split("%,");n<r.length;n++){var o=r[n];e.push(o.substring(0,o.lastIndexOf(" ")).trim()),i.push(o.substring(o.lastIndexOf(" "),o.length)/100)}return{colors:e,percents:i}}function q(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function G(){return G=Object.assign?Object.assign.bind():function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var n in i)Object.prototype.hasOwnProperty.call(i,n)&&(t[n]=i[n])}return t},G.apply(this,arguments)}function V(t,e){return V=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},V(t,e)}function J(t,e){(null==e||e>t.length)&&(e=t.length);for(var i=0,n=new Array(e);i<e;i++)n[i]=t[i];return n}function Q(t,e){var i="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(i)return(i=i.call(t)).next.bind(i);if(Array.isArray(t)||(i=function(t,e){if(t){if("string"==typeof t)return J(t,e);var i=Object.prototype.toString.call(t).slice(8,-1);return"Object"===i&&t.constructor&&(i=t.constructor.name),"Map"===i||"Set"===i?Array.from(t):"Arguments"===i||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(i)?J(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){i&&(t=i);var n=0;return function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function Z(t){return"number"==typeof t}function K(t){return"auto"===t||null===t}function et(t){return/%$/.test(t)}var it=I,nt=z,rt=S,ot=M,st=B,at=O,ht=T;function ct(t){return t.replace(/-([a-z])/g,(function(t,e){return e.toUpperCase()}))}function ft(t,e){var i,n,r=function(t){var e=t.match(/([a-z]+)/)[1];return[e,ct(t.split(e)[1])]}(t),o=r[0],s=r[1],a=e.split(" ");if(s)return(i={})[o+s]=e,i;if(a.length&&!s){var h=a[0],c=a[1],f=a[2],l=a[3];return(n={})[o+d[0]]=h,n[o+d[1]]=c||h,n[o+d[2]]=f||h,n[o+d[3]]=l||c||h,n}}function dt(t){t=t.trim();for(var e=new Array,i="+",n="",r=t.length,o=0;o<r;++o){if("."===t[o]||!isNaN(Number(t[o]))&&" "!==t[o])n+=t[o];else if("("===t[o]){for(var s=1,a=o;s>0;)"("===t[a+=1]&&(s+=1),")"===t[a]&&(s-=1);n="".concat(dt(t.slice(o+1,a))),o=a}if(isNaN(Number(t[o]))&&"."!==t[o]||o===r-1){var h=parseFloat(n);switch(i){case"+":e.push(h);break;case"-":e.push(-h);break;case"*":e.push(e.pop()*h);break;case"/":e.push(e.pop()/h)}i=t[o],n=""}}for(var c=0;e.length;)c+=e.pop();return c}var lt,ut=0,pt=function(){function t(){q(this,"elements",[]),q(this,"afterElements",[]),q(this,"beforeElements",[]),q(this,"ids",[]),q(this,"width",0),q(this,"height",0),q(this,"top",0),q(this,"left",0),q(this,"pre",null),q(this,"offsetX",0),q(this,"offsetY",0),ut++,this.id=ut}var e=t.prototype;return e.fixedBind=function(t,e){void 0===e&&(e=0),this.container=e?t.parent:t.root,this.container.fixedLine=this,this.fixedAdd(t)},e.fixedAdd=function(t){if(!this.ids.includes(t.id)){this.ids.push(t.id),this.elements.push(t);var e=t.computedStyle.zIndex;(void 0===e?0:e)>=0?this.afterElements.push(t):this.beforeElements.push(t),this.refreshLayout()}},e.bind=function(t){this.container=t.parent,this.container.line=null,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),this.isInline=t.isInline(),this.container.line=this,this.outerWidth=t.parent&&t.parent.contentSize.width?t.parent.contentSize.width:1/0,this.add(t)},e.getPreLine=function(){return this.container.lines[this.container.lines.length-2]},e.canIEnter=function(t){return!((100*t.offsetSize.width+100*this.width)/100>this.outerWidth)||(this.closeLine(),!1)},e.closeLine=function(){delete this.container.line},e.add=function(t){this.ids.includes(t.id)||(this.ids.push(t.id),this.elements.push(t),this.refreshWidthHeight(t))},e.refreshWidthHeight=function(t){t.offsetSize.height>this.height&&(this.height=t.offsetSize.height),this.width+=t.offsetSize.width||0,(this.container.lineMaxWidth||0)<this.width&&(this.container.lineMaxWidth=this.width)},e.refreshXAlign=function(){if(this.isInline){var t=this.container.contentSize.width-this.width,e=this.container.style.textAlign;e===h?t/=2:e===l&&(t=0),this.offsetX=t}},e.getOffsetY=function(t){if(!t||!t.style)return 0;var e=(t.style||{}).verticalAlign;return e===g?this.height-t.contentSize.height:e===v?(this.height-t.contentSize.height)/2:0},e.setIndent=function(t){var e=t.style.textIndent;if(e&&/^calc/.test(e)){var i=/^calc\((.+)\)$/.exec(e);if(i&&i[1]){var n=i[1].replace(/([^\s\(\+\-\*\/]+)\.(left|right|bottom|top|width|height)/g,(function(e){var i=e.split("."),n=i[0],r=i[1],o=t.parent.querySelector(n);if(o&&o.offsetSize){var s={right:o.offsetSize.left+o.offsetSize.width,bottom:o.offsetSize.top+o.offsetSize.height};return o.offsetSize[r]||s[r]||0}})),r=dt(n.replace(new RegExp(/-?[0-9]+(\.[0-9]+)?(rpx|px|%)/,"g"),$));t.style.textIndent=r}}},e.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style.top=i.top+r,t.style.left=n?n.offsetSize.left+n.offsetSize.width:i.left,t.getBoxPosition()}))},e.refreshLayout=function(){this.afterElements=this.afterElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex})),this.beforeElements=this.beforeElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex}))},t}(),gt="lineMaxHeight",vt="lineMaxWidth",yt=((lt={})[b]={width:o,contentWidth:o,lineMaxWidth:vt,left:l,top:p,height:s,lineMaxHeight:gt,marginLeft:"marginLeft"},lt[x]={width:s,contentWidth:s,lineMaxWidth:vt,left:p,top:l,height:o,lineMaxHeight:gt,marginLeft:"marginTop"},lt),bt=function(t){var e,i;function n(){var e;return q(function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(e=t.call(this)||this),"outerWidth",0),e.exactValue=0,e.flexTotal=0,e.width=0,e.key=null,e.flexDirection="row",e}i=t,(e=n).prototype=Object.create(i.prototype),e.prototype.constructor=e,V(e,i);var r=n.prototype;return r.bind=function(t){this.container=t.parent,this.container.line=this,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),t.parent&&(this.flexDirection=t.parent.style.flexDirection,this.key=yt[this.flexDirection]),this.initHeight(t),this.outerWidth=t.parent&&t.parent.contentSize[this.key.contentWidth]?t.parent.contentSize[this.key.contentWidth]:1/0,this.add(t)},r.add=function(t){this.ids.push(t.id);var e=t.style.flex;Z(e)?this.flexTotal+=e:Z(this.getWidth(t.style))&&(this.exactValue+=this.getWidth(t.offsetSize)),this.elements.push(t),this.refreshWidthHeight(t),t.next||this.closeLine()},r.closeLine=function(){this.calcFlex()},r.initHeight=function(t){this[this.key.height]=0},r.getWidth=function(t){return t[this.key.width]||0},r.getHeight=function(t){return t[this.key.height]||0},r.setWidth=function(t,e){t[this.key.width]=e},r.setHeight=function(t,e){t[this.key.height]=e},r.calcFlex=function(){var t=this,e=this.container.contentSize[this.key.contentWidth],i=0;this.elements.forEach((function(n){var r=n.style,o=n.contentSize,s=t.getWidth(r)||t.getWidth(o);Z(r.flex)&&(s=r.flex/t.flexTotal*(e-t.exactValue)),t.setWidth(n.computedStyle,s),n.isFlexCalc=!0,delete n.line,delete n.lines,delete n.lineMaxWidth,n.getBoxWidthHeight(),i=Math.max(i,t.getHeight(n.offsetSize))})),this.setHeight(this,i)},r.refreshWidthHeight=function(t){var e=this.container.style.alignItems;e&&!t.style.alignSelf&&(t.style.alignSelf=e);var i=this.getHeight(t.offsetSize);i>this[this.key.height]&&(this.container[this.key.lineMaxHeight]=this[this.key.height]=i),this[this.key.width]+=this.getWidth(t.offsetSize);var n=Math.min(this.getWidth(this),!this.getWidth(this.container.contentSize)&&1/0);(this.container[this.key.lineMaxWidth]||0)<n&&(this.container[this.key.lineMaxWidth]=n)},r.refreshXAlign=function(){var t=this,e=this.elements.reduce((function(e,i){return e+t.getWidth(i.offsetSize)}),0),i=(this.outerWidth==1/0?0:this.outerWidth-e)||0,n=this.container.style.justifyContent;n===h?i/=2:n===c?i=0:["space-between","space-around"].includes(n)&&(!function(e,i){void 0===i&&(i=0),i/=t.elements.length+(e?-1:1),t.elements.forEach((function(n,r){var o;e&&!r||(n.style.margin?n.style.margin[t.key.marginLeft]+=i:n.style.margin=((o={})[t.key.marginLeft]=i,o),n.getBoxPosition())})),i=0}("space-between"==n,i),i=0),this.offsetX=i||0,this.refreshYAlign()},r.refreshYAlign=function(){var t=this;if(1==this.container.lines.length)return 0;var e=this.container.lines.reduce((function(e,i){return e+t.getHeight(i)}),0),i=this.container.style.alignItems,n=this.getHeight(this.container.contentSize);if(i===h){var r=(n-e)/(this.container.lines.length+1);this.container.lines.forEach((function(t){t.offsetY=r}))}if(i===f){var o=n-e;this.container.lines[0].offsetY=o}},r.getOffsetY=function(t){if(this.container.lines.length>1)return 0;var e=t.style.alignSelf,i=this.getHeight(this.container.contentSize),n=i-this.getHeight(t.offsetSize);return e===f?n:e===h?n/2:"stretch"===e?(n&&t.name==S&&(t.style[this.key.width]=this.getWidth(t.offsetSize),t.style[this.key.height]=i,delete t.line,delete t.lines,t.getBoxWidthHeight()),0):0},r.layout=function(t,e){var i=this;this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements.forEach((function(t,e){i.setIndent(t);var n=i.elements[e-1],r=i.getOffsetY(t);t.style[i.key.top]=i[i.key.top]+r,t.style[i.key.left]=n?n.offsetSize[i.key.left]+i.getWidth(n.offsetSize):i[i.key.left],t.getBoxPosition()}))},n}(pt),xt=I,wt=z,mt=S,St=k,zt=B,It=P,Mt=O,kt=T,Bt=0,Wt={left:null,top:null,width:null,height:null},Pt=new Map,Ot=function(){function t(t,e,i,n){var r=this;q(this,"id",Bt++),q(this,"style",{left:null,top:null,width:null,height:null}),q(this,"computedStyle",{}),q(this,"originStyle",{}),q(this,"children",{}),q(this,"layoutBox",G({},Wt)),q(this,"contentSize",G({},Wt)),q(this,"clientSize",G({},Wt)),q(this,"borderSize",G({},Wt)),q(this,"offsetSize",G({},Wt)),this.ctx=n,this.root=i,e&&(this.parent=e),this.name=t.type||t.name,this.attributes=this.getAttributes(t);var o=function(t,e){var i,n=["color","fontSize","lineHeight","verticalAlign","fontWeight","textAlign"],r=t.type,o=void 0===r?rt:r,s=t.styles,h=void 0===s?{}:s,c=(e||{}).computedStyle,f=Object.assign({},F);if([nt,it,ot].includes(o)&&!h.display&&(f.display=st),c)for(var l=0;l<n.length;l++){var u=n[l];(h[u]||c[u])&&(h[u]=h[(i=u,i.replace(/([A-Z])/g,"-$1").toLowerCase())]||h[u]||c[u])}for(var p=function(t){var e,i,n,r,s=h[t];if(/-/.test(t)&&(t=ct(t),f[t]=s),/^(box|text)?shadow$/i.test(t)){var c=[];return s.replace(/((-?\d+(rpx|px|vw|vh)?\s+?){3})(.+)/,(function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];c=t[1].match(/-?\d+(rpx|px|vw|vh)?/g).map((function(t){return $(t)})).concat(t[4])})),/^text/.test(t)?f.textShadow=c:f.boxShadow=c,"continue"}if(/^border/i.test(t)&&!/radius$/i.test(t)){var l=t.match(/^border([BTRLa-z]+)?/)[0],u=t.match(/[W|S|C][a-z]+/),p=s.replace(/([\(,])\s+|\s+([\),])/g,"$1$2").split(" ").map((function(t){return/^\d/.test(t)?$(t,""):t}));return f[l]||(f[l]={}),1==p.length&&u?f[l][l+u[0]]=p[0]:f[l]=((e={})[l+"Width"]=Y(p[0])?p[0]:0,e[l+"Style"]=p[1]||"solid",e[l+"Color"]=p[2]||"black",e),"continue"}if(/^background(color)?$/i.test(t))return f.backgroundColor=s,"continue";if(/^objectPosition$/i.test(t))return f[t]=s.split(" "),"continue";if(/padding|margin|radius/i.test(t)){var g=/radius$/i.test(t),v="borderRadius",y=g?v:t.match(/[a-z]+/)[0],b=function(t,e){return"border".concat(t).concat(e,"Radius")},x=[0,0,0,0].map((function(t,e){return g?[b(d[0],d[3]),b(d[0],d[1]),b(d[2],d[1]),b(d[2],d[3])][e]:y+d[e]}));if("padding"===t||t===a||/^(border)?radius$/i.test(t)){p="".concat(s).split(" ").map((function(e){return/^-?\d+(rpx|px|vh|vw)?$/.test(e)?$(e):t!=a&&/auto/.test(e)?0:e}),[])||[0];var w=g?v:t,m=p[0],S=p[1],z=p[2],I=p[3];f[w]=((i={})[x[0]]=K(m)?0:m,i[x[1]]=Y(S)||K(S)?S:m,i[x[2]]=K(Y(z)?z:m)?0:Y(z)?z:m,i[x[3]]=Y(I)?I:null!=S?S:m,i)}else"object"==typeof f[y]||(f[y]=((n={})[x[0]]=f[y]||0,n[x[1]]=f[y]||0,n[x[2]]=f[y]||0,n[x[3]]=f[y]||0,n)),f[y][t]=y==a&&K(s)||et(s)?s:$(s);return"continue"}if(/^transform$/i.test(t))return f[t]={},s.replace(/([a-zA-Z]+)\(([0-9,-\.%rpxdeg\s]+)\)/g,(function(e,i,n){var r=n.split(",").map((function(t){return t.replace(/(^\s*)|(\s*$)/g,"")})),o=function(t,e){return t.includes("deg")?1*t:e&&!et(e)?$(t,e):t};i.includes("matrix")?f[t][i]=r.map((function(t){return 1*t})):i.includes("rotate")?f[t][i]=1*n.match(/^-?\d+(\.\d+)?/)[0]:/[X, Y]/.test(i)?f[t][i]=/[X]/.test(i)?o(r[0],h.width):o(r[0],h.height):(f[t][i+"X"]=o(r[0],h.width),f[t][i+"Y"]=o(r[1]||r[0],h.height))})),"continue";if(/^font$/i.test(t)&&console.warn("font 不支持简写"),/^textindent/i.test(t)&&(f[t]=/^calc/.test(s)?s:$(s)),/^textstroke/i.test(t)){var M=t.match(/color|width|type$/i),k=(l="textStroke",s.split(" ").map((function(t){return/^\d+(rpx|px|vh|vw)?$/.test(t)?$(t):t})));return M?f[l]?f[l][M[0]]=k[0]:f[l]=((r={})[M[0]]=k[0],r):f[l]={width:k[0],color:k[1],type:k[2]},"continue"}/^left|top$/i.test(t)&&![at,ht].includes(h.position)?f[t]=0:f[t]=/^-?[\d\.]+(px|rpx|vw|vh)?$/.test(s)?$(s):/em$/.test(s)&&o==nt?$(s,h.fontSize):s},g=0,v=Object.keys(h);g<v.length;g++)p(v[g]);return f}(t,e);this.isAbsolute=o.position==Mt,this.isFixed=o.position==kt,this.originStyle=o,this.styles=t.styles,Object.keys(o).forEach((function(t){Object.defineProperty(r.style,t,{configurable:!0,enumerable:!0,get:function(){return o[t]},set:function(e){o[t]=e}})}));var s={contentSize:G({},this.contentSize),clientSize:G({},this.clientSize),borderSize:G({},this.borderSize),offsetSize:G({},this.offsetSize)};Object.keys(s).forEach((function(t){Object.keys(r[t]).forEach((function(e){Object.defineProperty(r[t],e,{configurable:!0,enumerable:!0,get:function(){return s[t][e]},set:function(i){s[t][e]=i}})}))})),this.computedStyle=this.style}var e=t.prototype;return e.add=function(t){t.parent=this,this.children[t.id]=t},e.getChildren=function(){var t=this;return Object.keys(this.children).map((function(e){return t.children[e]}))},e.prev=function(t){void 0===t&&(t=this);var e=t.parent.getChildren();return e[e.findIndex((function(e){return e.id==t.id}))-1]},e.querySelector=function(t){var e=this.getChildren();if("string"!=typeof t)return null;var i=e.find((function(e){var i=e.id,n=e.attributes;return i==t||n&&n.uid==t}));return i||(this.parent&&this.parent.querySelector&&this.parent.querySelector(t)||null)},e.getLineRect=function(t,e){var i={width:0,height:0},n=e?e.lines:this.parent&&this.parent.lines;return n&&n.find((function(e){return e.ids.includes(t)}))||i},e.setPosition=function(t,e){var i={left:o,top:s,right:o,bottom:s};Object.keys(i).forEach((function(n){var r=n==u?l:p;[u,g].includes(n)&&void 0!==t.style[n]&&!Y(t.originStyle[r])?t.style[r]=e[i[n]]-t.offsetSize[i[n]]-$(t.style[n],e[i[n]]):t.style[n]=$(t.style[n],e[i[n]])}))},e.getAttributes=function(t){var e=t.attributes,i=void 0===e?{}:e,n=t.uid,r=t.url,o=t.src,s=t.replace,a=t.text;return n&&(i.uid=n),(r||o)&&(i.src=i.src||r||o),s&&(i.replace=s),a&&(i.text=a),i},e.getOffsetSize=function(t,e,i){void 0===i&&(i=y[3]);var n=e||{},r=n.margin,o=(r=void 0===r?{}:r).marginLeft,s=void 0===o?0:o,a=r.marginTop,h=void 0===a?0:a,c=r.marginRight,f=void 0===c?0:c,d=r.marginBottom,l=void 0===d?0:d,u=n.padding,p=(u=void 0===u?{}:u).paddingLeft,g=void 0===p?0:p,v=u.paddingTop,b=void 0===v?0:v,x=u.paddingRight,w=void 0===x?0:x,m=u.paddingBottom,S=void 0===m?0:m,z=n.border,I=(z=void 0===z?{}:z).borderWidth,M=void 0===I?0:I,k=n.borderTop,B=(k=void 0===k?{}:k).borderTopWidth,W=void 0===B?M:B,P=n.borderBottom,O=(P=void 0===P?{}:P).borderBottomWidth,T=void 0===O?M:O,L=n.borderRight,R=(L=void 0===L?{}:L).borderRightWidth,F=void 0===R?M:R,A=n.borderLeft,E=(A=void 0===A?{}:A).borderLeftWidth,j=void 0===E?M:E,C=s<0&&f<0?Math.abs(s+f):0,H=h<0&&l<0?Math.abs(h+l):0,D=s>=0&&f<0,Y=h>=0&&l<0;return i==y[0]&&(this[i].left=t.left+s+g+j+(D?2*-f:0),this[i].top=t.top+h+b+W+(Y?2*-l:0),this[i].width=t.width+(this[i].widthAdd?0:C),this[i].height=t.height+(this[i].heightAdd?0:H),this[i].widthAdd=C,this[i].heightAdd=H),i==y[1]&&(this[i].left=t.left+s+j+(D<0?-f:0),this[i].top=t.top+h+W+(Y?-l:0),this[i].width=t.width+g+w,this[i].height=t.height+b+S),i==y[2]&&(this[i].left=t.left+s+j/2+(D<0?-f:0),this[i].top=t.top+h+W/2+(Y?-l:0),this[i].width=t.width+g+w+j/2+F/2,this[i].height=t.height+b+S+T/2+W/2),i==y[3]&&(this[i].left=t.left+(D<0?-f:0),this[i].top=t.top+(Y?-l:0),this[i].width=t.width+g+w+j+F+s+f,this[i].height=t.height+b+S+T+W+l+h),this[i]},e.layoutBoxUpdate=function(t,e,i,n){var r=this;if(void 0===i&&(i=-1),"border-box"==e.boxSizing){var o=e||{},s=o.border,a=(s=void 0===s?{}:s).borderWidth,h=void 0===a?0:a,c=o.borderTop,f=(c=void 0===c?{}:c).borderTopWidth,d=void 0===f?h:f,l=o.borderBottom,u=(l=void 0===l?{}:l).borderBottomWidth,p=void 0===u?h:u,g=o.borderRight,v=(g=void 0===g?{}:g).borderRightWidth,b=void 0===v?h:v,x=o.borderLeft,w=(x=void 0===x?{}:x).borderLeftWidth,m=void 0===w?h:w,S=o.padding,z=(S=void 0===S?{}:S).paddingTop,I=void 0===z?0:z,M=S.paddingRight,k=void 0===M?0:M,B=S.paddingBottom,W=void 0===B?0:B,P=S.paddingLeft,O=void 0===P?0:P;i||(t.width-=O+k+b+m),1!==i||n||(t.height-=I+W+d+p)}this.layoutBox&&(y.forEach((function(i){return r.layoutBox[i]=r.getOffsetSize(t,e,i)})),this.layoutBox=Object.assign({},this.layoutBox,this.layoutBox.borderSize))},e.getBoxPosition=function(){var t=this.computedStyle,e=this.fixedLine,i=this.lines,n=t.left,r=void 0===n?0:n,o=t.top,s=void 0===o?0:o,a=G({},this.contentSize,{left:r,top:s}),h=this.contentSize.top-this.offsetSize.top,c=this.contentSize.left-this.offsetSize.left;if(this.root.fixedLine&&!this.root.isDone){this.root.isDone=!0;for(var f,d=Q(this.root.fixedLine.elements);!(f=d()).done;){var l=f.value;l.setPosition(l,this.root.offsetSize),l.getBoxPosition()}}if(e)for(var u,p=Q(e.elements);!(u=p()).done;){var g=u.value,v=G({},this.borderSize,{left:r,top:s});g.setPosition(g,v);var y=this.borderSize.top-this.offsetSize.top,b=this.borderSize.left-this.offsetSize.left;g.style.left+=r+b,g.style.top+=s+y,g.getBoxPosition()}if(i)for(var x,w=Q(i);!(x=w()).done;){x.value.layout(a.top+h,a.left+c)}return this.layoutBoxUpdate(a,t),this.layoutBox},e.getBoxState=function(t,e){return this.isBlock(t)||this.isBlock(e)},e.isBlock=function(t){return void 0===t&&(t=this),t&&t.style.display==St},e.isFlex=function(t){return void 0===t&&(t=this),t&&t.style.display==It},e.isInFlow=function(){return!(this.isAbsolute||this.isFixed)},e.inFlexBox=function(t){return void 0===t&&(t=this),!!t.isInFlow()&&(!!t.parent&&(!(!t.parent||t.parent.style.display!==It)||void 0))},e.isInline=function(t){return void 0===t&&(t=this),t&&t.style.display==zt},e.contrastSize=function(t,e,i){var n=t;return i&&(n=Math.min(n,i)),e&&(n=Math.max(n,e)),n},e.measureText=function(t,e){var i=this.ctx.measureText(t),n=i.width,r=i.actualBoundingBoxAscent,o=i.actualBoundingBoxDescent;return{ascent:r,descent:o,width:n,fontHeight:r+o||.7*e+1}},e.getParentSize=function(t,e){if(void 0===t&&(t=this),void 0===e&&(e=!1),t&&t.parent){if(t.parent.contentSize.width)return t.parent.contentSize;if(e)return this.getParentSize(t.parent,e)}return null},e.getBoxWidthHeight=function(){var t=this,e=this.name,i=this.computedStyle,n=this.attributes,r=this.parent,o=void 0===r?{}:r,s=this.ctx,a=this.getChildren(),h=i.left,c=void 0===h?0:h,f=i.top,d=void 0===f?0:f,l=i.bottom,u=i.right,p=i.width,g=void 0===p?0:p,v=i.minWidth,y=i.maxWidth,b=i.minHeight,x=i.maxHeight,w=i.height,m=void 0===w?0:w,S=i.fontSize,z=i.fontWeight,I=i.fontFamily,M=i.fontStyle,k=i.position;i.textIndent;var B=i.lineClamp,W=i.lineHeight,P=i.padding,O=void 0===P?{}:P,T=i.margin,L=void 0===T?{}:T,R=i.border,F=(R=void 0===R?{}:R).borderWidth,A=void 0===F?0:F,E=i.borderRight,j=(E=void 0===E?{}:E).borderRightWidth,C=void 0===j?A:j,H=i.borderLeft,D=(H=void 0===H?{}:H).borderLeftWidth,Y=void 0===D?A:D,U=o.contentSize&&o.contentSize.width,N=o.contentSize&&o.contentSize.height;if(et(g)&&U&&(g=$(g,U)),et(g)&&!U&&(g=null),et(m)&&N&&(m=$(m,N)),et(m)&&!N&&(m=null),et(v)&&U&&(v=$(v,U)),et(y)&&U&&(y=$(y,U)),et(b)&&N&&(b=$(b,N)),et(x)&&N&&(x=$(x,N)),i.padding&&U)for(var _ in i.padding)Object.hasOwnProperty.call(O,_)&&(O[_]=$(O[_],U));var X=O.paddingRight,q=void 0===X?0:X,G=O.paddingLeft,V=void 0===G?0:G;if(i.margin&&[L.marginLeft,L.marginRight].includes("auto"))if(g){var J=U&&U-g-q-V-Y-C||0;L.marginLeft==L.marginRight?L.marginLeft=L.marginRight=J/2:K(L.marginLeft)?L.marginLeft=J:L.marginRight=J}else L.marginLeft=L.marginRight=0;var Q=L.marginRight,Z=void 0===Q?0:Q,tt=L.marginLeft,it={width:g,height:m,left:0,top:0},nt=V+q+Y+C+(void 0===tt?0:tt)+Z;if(this.offsetWidth=nt,e==wt&&!this.attributes.widths){var rt=n.text||"";s.save(),s.setFonts({fontFamily:I,fontSize:S,fontWeight:z,fontStyle:M}),rt.length,"\n"==rt&&(rt="",this.isBr=!0),(""+rt).split("\n").map((function(e){var i=Array.from(e).map((function(e){var i=""+(/^[\u4e00-\u9fa5]+$/.test(e)?"cn":e)+I+S+z+M,n=Pt.get(i);if(n)return{width:n,text:e};var r=t.measureText(e,S).width;return Pt.set(i,r),{width:r,text:e}})),n=t.measureText(e,S),r=n.fontHeight,o=n.ascent,s=n.descent;t.attributes.fontHeight=r,t.attributes.ascent=o,t.attributes.descent=s,t.attributes.widths||(t.attributes.widths=[]),t.attributes.widths.push({widths:i,total:i.reduce((function(t,e){return t+e.width}),0)})})),s.restore()}if(e==xt&&null==g){var ot=n.width,st=n.height;it.width=this.contrastSize(Math.round(ot*m/st)||0,v,y),this.layoutBoxUpdate(it,i,0)}if(e==wt&&null==g){var at=this.attributes.widths,ht=Math.max.apply(Math,at.map((function(t){return t.total})));if(o&&U>0&&(ht>U||this.isBlock(this))&&!this.isAbsolute&&!this.isFixed)ht=U;it.width=this.contrastSize(ht,v,y),this.layoutBoxUpdate(it,i,0)}if(e==wt&&(o.style.flex||!this.attributes.lines)){var ct=this.attributes.widths.length;this.attributes.widths.forEach((function(t){return t.widths.reduce((function(t,e,i){return t+e.width>it.width?(ct++,e.width):t+e.width}),0)})),ct=B&&ct>B?B:ct,this.attributes.lines=ct}if(e==xt&&null==m){var ft=n.width,dt=n.height;n.text,it.height=this.contrastSize($(it.width*dt/ft)||0,b,x),this.layoutBoxUpdate(it,i,1)}e==wt&&null==m&&(W=$(W,S),it.height=this.contrastSize($(this.attributes.lines*W),b,x),this.layoutBoxUpdate(it,i,1,!0)),!g&&o&&o.children&&U&&(!this.isFlex(o)||o.isFlexCalc)&&([mt,wt].includes(e)&&this.isFlex()||e==mt&&this.isBlock(this)&&this.isInFlow())&&(it.width=this.contrastSize(U-(o.isFlexCalc?0:nt),v,y),this.layoutBoxUpdate(it,i)),g&&!et(g)&&(it.width=this.contrastSize(g,v,y),this.layoutBoxUpdate(it,i,0)),m&&!et(m)&&(it.height=this.contrastSize(it.height,b,x),this.layoutBoxUpdate(it,i,1));var lt=0;if(a.length){var ut=null,gt=!1;a.forEach((function(e,n){e.getBoxWidthHeight();var r=a[n+1];if(r&&r.isInFlow()&&(e.next=r),!t.line||!t.line.ids.includes(e.id))if(e.isInFlow()&&!e.inFlexBox()){var o=t.getBoxState(ut,e);if(e.isBr)return gt=!0;t.line&&t.line.canIEnter(e)&&!o&&!gt?t.line.add(e):(gt=!1,(new pt).bind(e)),ut=e}else e.inFlexBox()?t.line&&(t.line.canIEnter(e)||"nowrap"==i.flexWrap)?t.line.add(e):(new bt).bind(e):e.isFixed?t.root.fixedLine?t.root.fixedLine.fixedAdd(e):(new pt).fixedBind(e):t.fixedLine?t.fixedLine.fixedAdd(e):(new pt).fixedBind(e,1)})),this.lines&&(lt=this.lines.reduce((function(t,e){return t+e.height}),0))}var vt=0,yt=0;if(!g&&(this.isAbsolute||this.isFixed)&&U){var St=k==Mt?U:this.root.width,zt=St-(et(c)?$(c,St):c)-(et(u)?$(u,St):u);vt=i.left?zt:this.lineMaxWidth}if(!m&&(null!=d?d:this.isAbsolute||this.isFixed&&N)){var It=k==Mt?N:this.root.height,kt=It-(et(d)?$(d,It):d)-(et(l)?$(l,It):l);yt=i.top?kt:0}if(g&&!et(g)||it.width||(it.width=vt||this.contrastSize((this.isBlock(this)&&!this.isInFlow()?U||o.lineMaxWidth:this.lineMaxWidth)||this.lineMaxWidth,v,y),this.layoutBoxUpdate(it,i,0)),m||!lt&&!yt||(it.height=yt||this.contrastSize(lt,b,x),this.layoutBoxUpdate(it,i)),i.borderRadius&&this.borderSize&&this.borderSize.width)for(var _ in i.borderRadius)Object.hasOwnProperty.call(i.borderRadius,_)&&(i.borderRadius[_]=$(i.borderRadius[_],this.borderSize.width));return this.layoutBox},e.layout=function(){return this.getBoxWidthHeight(),this.root.offsetSize=this.offsetSize,this.root.contentSize=this.contentSize,this.getBoxPosition(),this.offsetSize},t}(),Tt=function(){var t,e,i,n,r,o,s=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],a=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],h=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],c=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],f=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],d=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],l=[],u=[],p=[],g=[],v=[],y=2;function b(t,e){var i;t>e&&(i=t,t=e,e=i),i=e,i*=e,i+=e,i>>=1,g[i+=t]=1}function x(t,i){var n;for(p[t+e*i]=1,n=-2;n<2;n++)p[t+n+e*(i-2)]=1,p[t-2+e*(i+n+1)]=1,p[t+2+e*(i+n)]=1,p[t+n+1+e*(i+2)]=1;for(n=0;n<2;n++)b(t-1,i+n),b(t+1,i-n),b(t-n,i-1),b(t+n,i+1)}function w(t){for(;t>=255;)t=((t-=255)>>8)+(255&t);return t}var m=[];function S(t,e,i,n){var r,o,s;for(r=0;r<n;r++)l[i+r]=0;for(r=0;r<e;r++){if(255!=(s=f[l[t+r]^l[i]]))for(o=1;o<n;o++)l[i+o-1]=l[i+o]^d[w(s+m[n-o])];else for(o=i;o<i+n;o++)l[o]=l[o+1];l[i+n-1]=255==s?0:d[w(s+m[0])]}}function z(t,e){var i;return t>e&&(i=t,t=e,e=i),i=e,i+=e*e,i>>=1,g[i+=t]}function I(t){var i,n,r,o;switch(t){case 0:for(n=0;n<e;n++)for(i=0;i<e;i++)i+n&1||z(i,n)||(p[i+n*e]^=1);break;case 1:for(n=0;n<e;n++)for(i=0;i<e;i++)1&n||z(i,n)||(p[i+n*e]^=1);break;case 2:for(n=0;n<e;n++)for(r=0,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,n)||(p[i+n*e]^=1);break;case 3:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=o,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,n)||(p[i+n*e]^=1);break;case 4:for(n=0;n<e;n++)for(r=0,o=n>>1&1,i=0;i<e;i++,r++)3==r&&(r=0,o=!o),o||z(i,n)||(p[i+n*e]^=1);break;case 5:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&n&1)+!(!r|!o)||z(i,n)||(p[i+n*e]^=1);break;case 6:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&n&1)+(r&&r==o)&1||z(i,n)||(p[i+n*e]^=1);break;case 7:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(r&&r==o)+(i+n&1)&1||z(i,n)||(p[i+n*e]^=1)}}function M(t){var e,i=0;for(e=0;e<=t;e++)v[e]>=5&&(i+=3+v[e]-5);for(e=3;e<t-1;e+=2)v[e-2]==v[e+2]&&v[e+2]==v[e-1]&&v[e-1]==v[e+1]&&3*v[e-1]==v[e]&&(0==v[e-3]||e+3>t||3*v[e-3]>=4*v[e]||3*v[e+3]>=4*v[e])&&(i+=40);return i}function k(){var t,i,n,r,o,s=0,a=0;for(i=0;i<e-1;i++)for(t=0;t<e-1;t++)(p[t+e*i]&&p[t+1+e*i]&&p[t+e*(i+1)]&&p[t+1+e*(i+1)]||!(p[t+e*i]||p[t+1+e*i]||p[t+e*(i+1)]||p[t+1+e*(i+1)]))&&(s+=3);for(i=0;i<e;i++){for(v[0]=0,n=r=t=0;t<e;t++)(o=p[t+e*i])==r?v[n]++:v[++n]=1,a+=(r=o)?1:-1;s+=M(n)}a<0&&(a=-a);var h=a,c=0;for(h+=h<<2,h<<=1;h>e*e;)h-=e*e,c++;for(s+=10*c,t=0;t<e;t++){for(v[0]=0,n=r=i=0;i<e;i++)(o=p[t+e*i])==r?v[n]++:v[++n]=1,r=o;s+=M(n)}return s}var B=null;return{api:{get ecclevel(){return y},set ecclevel(t){y=t},get size(){return _size},set size(t){_size=t},get canvas(){return B},set canvas(t){B=t},getFrame:function(v){return function(v){var M,B,W,P,O,T,L,R;P=v.length,t=0;do{if(t++,W=4*(y-1)+16*(t-1),i=c[W++],n=c[W++],r=c[W++],o=c[W],P<=(W=r*(i+n)+n-3+(t<=9)))break}while(t<40);for(e=17+4*t,O=r+(r+o)*(i+n)+n,P=0;P<O;P++)u[P]=0;for(l=v.slice(0),P=0;P<e*e;P++)p[P]=0;for(P=0;P<(e*(e+1)+1)/2;P++)g[P]=0;for(P=0;P<3;P++){for(W=0,B=0,1==P&&(W=e-7),2==P&&(B=e-7),p[B+3+e*(W+3)]=1,M=0;M<6;M++)p[B+M+e*W]=1,p[B+e*(W+M+1)]=1,p[B+6+e*(W+M)]=1,p[B+M+1+e*(W+6)]=1;for(M=1;M<5;M++)b(B+M,W+1),b(B+1,W+M+1),b(B+5,W+M),b(B+M+1,W+5);for(M=2;M<4;M++)p[B+M+e*(W+2)]=1,p[B+2+e*(W+M+1)]=1,p[B+4+e*(W+M)]=1,p[B+M+1+e*(W+4)]=1}if(t>1)for(P=s[t],B=e-7;;){for(M=e-7;M>P-3&&(x(M,B),!(M<P));)M-=P;if(B<=P+9)break;x(6,B-=P),x(B,6)}for(p[8+e*(e-8)]=1,B=0;B<7;B++)b(7,B),b(e-8,B),b(7,B+e-7);for(M=0;M<8;M++)b(M,7),b(M+e-8,7),b(M,e-8);for(M=0;M<9;M++)b(M,8);for(M=0;M<8;M++)b(M+e-8,8),b(8,M);for(B=0;B<7;B++)b(8,B+e-7);for(M=0;M<e-14;M++)1&M?(b(8+M,6),b(6,8+M)):(p[8+M+6*e]=1,p[6+e*(8+M)]=1);if(t>6)for(P=a[t-7],W=17,M=0;M<6;M++)for(B=0;B<3;B++,W--)1&(W>11?t>>W-12:P>>W)?(p[5-M+e*(2-B+e-11)]=1,p[2-B+e-11+e*(5-M)]=1):(b(5-M,2-B+e-11),b(2-B+e-11,5-M));for(B=0;B<e;B++)for(M=0;M<=B;M++)p[M+e*B]&&b(M,B);for(O=l.length,T=0;T<O;T++)u[T]=l.charCodeAt(T);if(l=u.slice(0),O>=(M=r*(i+n)+n)-2&&(O=M-2,t>9&&O--),T=O,t>9){for(l[T+2]=0,l[T+3]=0;T--;)P=l[T],l[T+3]|=255&P<<4,l[T+2]=P>>4;l[2]|=255&O<<4,l[1]=O>>4,l[0]=64|O>>12}else{for(l[T+1]=0,l[T+2]=0;T--;)P=l[T],l[T+2]|=255&P<<4,l[T+1]=P>>4;l[1]|=255&O<<4,l[0]=64|O>>4}for(T=O+3-(t<10);T<M;)l[T++]=236,l[T++]=17;for(m[0]=1,T=0;T<o;T++){for(m[T+1]=1,L=T;L>0;L--)m[L]=m[L]?m[L-1]^d[w(f[m[L]]+T)]:m[L-1];m[0]=d[w(f[m[0]]+T)]}for(T=0;T<=o;T++)m[T]=f[m[T]];for(W=M,B=0,T=0;T<i;T++)S(B,r,W,o),B+=r,W+=o;for(T=0;T<n;T++)S(B,r+1,W,o),B+=r+1,W+=o;for(B=0,T=0;T<r;T++){for(L=0;L<i;L++)u[B++]=l[T+L*r];for(L=0;L<n;L++)u[B++]=l[i*r+T+L*(r+1)]}for(L=0;L<n;L++)u[B++]=l[i*r+T+L*(r+1)];for(T=0;T<o;T++)for(L=0;L<i+n;L++)u[B++]=l[M+T+L*o];for(l=u,M=B=e-1,W=O=1,R=(r+o)*(i+n)+n,T=0;T<R;T++)for(P=l[T],L=0;L<8;L++,P<<=1){128&P&&(p[M+e*B]=1);do{O?M--:(M++,W?0!=B?B--:(W=!W,6==(M-=2)&&(M--,B=9)):B!=e-1?B++:(W=!W,6==(M-=2)&&(M--,B-=8))),O=!O}while(z(M,B))}for(l=p.slice(0),P=0,B=3e4,W=0;W<8&&(I(W),(M=k())<B&&(B=M,P=W),7!=P);W++)p=l.slice(0);for(P!=W&&I(P),B=h[P+(y-1<<3)],W=0;W<8;W++,B>>=1)1&B&&(p[e-1-W+8*e]=1,W<6?p[8+e*W]=1:p[8+e*(W+1)]=1);for(W=0;W<7;W++,B>>=1)1&B&&(p[8+e*(e-7+W)]=1,W?p[6-W+8*e]=1:p[7+8*e]=1);return p}(v)},utf16to8:function(t){var e,i,n,r;for(e="",n=t.length,i=0;i<n;i++)(r=t.charCodeAt(i))>=1&&r<=127?e+=t.charAt(i):r>2047?(e+=String.fromCharCode(224|r>>12&15),e+=String.fromCharCode(128|r>>6&63),e+=String.fromCharCode(128|r>>0&63)):(e+=String.fromCharCode(192|r>>6&31),e+=String.fromCharCode(128|r>>0&63));return e},draw:function(t,i,n,r,o){i.drawView(n,r);var s=i.ctx,a=n.contentSize,h=a.width,c=a.height,f=a.left,d=a.top;r.borderRadius,r.backgroundColor;var l=r.color,u=void 0===l?"#000000":l;r.border,n.contentSize.left,n.borderSize.left,n.contentSize.top,n.borderSize.top;if(y=o||y,s){s.save(),i.setOpacity(r),i.setTransform(n,r);var p=Math.min(h,c);t=this.utf16to8(t);var g=this.getFrame(t),v=p/e;s.setFillStyle(u);for(var b=0;b<e;b++)for(var x=0;x<e;x++)g[x*e+b]&&s.fillRect(f+v*b,d+v*x,v,v);s.restore(),i.setBorder(n,r)}else console.warn("No canvas provided to draw QR code in!")}}}}(),Lt=I,Rt=z,Ft=M,At=S,Et=w.TOP,jt=w.MIDDLE,Ct=w.BOTTOM,Ht=m.LEFT,Dt=m.CENTER,Yt=m.RIGHT,$t=function(){function t(t){var e,i,n=this;this.v="1.9.5.1",this.id=null,this.pixelRatio=1,this.width=0,this.height=0,this.sleep=1e3/30,this.count=0,this.isRate=!1,this.isDraw=!0,this.isCache=!0,this.fixed="",this.useCORS=!1,this.performance=!1,this.imageBus=[],this.createImage=function(t,e){return new Promise((function(i,r){var o=null;window||n.canvas.createImage?(o=n.canvas&&n.canvas.createImage?n.canvas.createImage():new Image,e&&o.setAttribute("crossOrigin","Anonymous"),o.src=t,o.onload=function(){i({width:o.naturalWidth||o.width,height:o.naturalHeight||o.height,path:o,src:this.src})},o.onerror=function(t){r(t)}):r({fail:"getImageInfo fail",src:t})}))},this.options=t,Object.assign(this,t),this.ctx=(e=t.context,i={get:function(t,i){if("setFonts"===i)return function(t){var i=t.fontFamily,n=void 0===i?"sans-serif":i,o=t.fontSize,s=void 0===o?14:o,a=t.fontWeight,h=void 0===a?"normal":a,c=t.fontStyle,f=void 0===c?"normal":c;C==r.MP_TOUTIAO&&(h="bold"==h?"bold":"",f="italic"==f?"italic":""),e.font="".concat(f," ").concat(h," ").concat(Math.round(s),"px ").concat(n)};if(!e.draw||!e.setFillStyle){if("setFillStyle"===i)return function(t){e.fillStyle=t};if("setStrokeStyle"===i)return function(t){e.strokeStyle=t};if("setLineWidth"===i)return function(t){e.lineWidth=t};if("setLineCap"===i)return function(t){e.lineCap=t};if("setFontSize"===i)return function(t){e.font="".concat(String(t),"px sans-serif")};if("setGlobalAlpha"===i)return function(t){e.globalAlpha=t};if("setLineJoin"===i)return function(t){e.lineJoin=t};if("setTextAlign"===i)return function(t){e.textAlign=t};if("setMiterLimit"===i)return function(t){e.miterLimit=t};if("setShadow"===i)return function(t,i,n,r){e.shadowOffsetX=t,e.shadowOffsetY=i,e.shadowBlur=n,e.shadowColor=r};if("setTextBaseline"===i)return function(t){e.textBaseline=t};if("createCircularGradient"===i)return function(){};if("draw"===i)return function(){};if("function"==typeof e[i])return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return e[i].apply(e,t)}}return t[i]},set:function(t,i,n){return e[i]=n,!0}},new Proxy(e,i)),this.progress=0,this.root={width:t.width,height:t.height,fontSizeRate:1,fixedLine:null},this.size=this.root;var o=0;Object.defineProperty(this,"progress",{configurable:!0,set:function(t){o=t,n.lifecycle("onProgress",t/n.count)},get:function(){return o||0}})}return t.prototype.lifecycle=function(t,e){this.options.listen&&this.options.listen[t]&&this.options.listen[t](e)},t.prototype.setContext=function(t){t&&(this.ctx=t)},t.prototype.init=function(){if(this.canvas.height||r.WEB==C){this.ctx.setTransform(1,0,0,1,0,0);var t=this.size.height*this.pixelRatio,e=this.size.width*this.pixelRatio;this.canvas.height=t,this.canvas.width=e,this.ctx.scale(this.pixelRatio,this.pixelRatio)}},t.prototype.clear=function(){this.ctx.clearRect(0,0,this.size.width,this.size.height)},t.prototype.clipPath=function(t,e,i,n,r,o,s){void 0===o&&(o=!1),void 0===s&&(s=!1);var a=this.ctx;if(/polygon/.test(r)){var h=r.match(/-?\d+(rpx|px|%)?\s+-?\d+(rpx|px|%)?/g)||[];a.beginPath(),h.map((function(r){var o=r.split(" "),s=o[0],a=o[1];return[$(s,i)+t,$(a,n)+e]})).forEach((function(t,e){0==e?a.moveTo(t[0],t[1]):a.lineTo(t[0],t[1])})),a.closePath(),s&&a.stroke(),o&&a.fill()}},t.prototype.roundRect=function(t,e,i,n,r,o,s){if(void 0===o&&(o=!1),void 0===s&&(s=!1),!(r<0)){var a=this.ctx;if(a.beginPath(),r){var h=r||{},c=h.borderTopLeftRadius,f=void 0===c?r||0:c,d=h.borderTopRightRadius,l=void 0===d?r||0:d,u=h.borderBottomRightRadius,p=void 0===u?r||0:u,g=h.borderBottomLeftRadius,v=void 0===g?r||0:g;a.arc(t+i-p,e+n-p,p,0,.5*Math.PI),a.lineTo(t+v,e+n),a.arc(t+v,e+n-v,v,.5*Math.PI,Math.PI),a.lineTo(t,e+f),a.arc(t+f,e+f,f,Math.PI,1.5*Math.PI),a.lineTo(t+i-l,e),a.arc(t+i-l,e+l,l,1.5*Math.PI,2*Math.PI),a.lineTo(t+i,e+n-p)}else a.rect(t,e,i,n);a.closePath(),s&&a.stroke(),o&&a.fill()}},t.prototype.setTransform=function(t,e){var i=e.transform,n=e.transformOrigin,r=this.ctx,o=i||{},s=o.scaleX,a=void 0===s?1:s,h=o.scaleY,c=void 0===h?1:h,f=o.translateX,d=void 0===f?0:f,l=o.translateY,u=void 0===l?0:l,p=o.rotate,g=void 0===p?0:p,v=o.skewX,y=void 0===v?0:v,b=o.skewY,x=void 0===b?0:b,w=t.left,m=t.top,S=t.width,z=t.height;d=$(d,S)||0,u=$(u,z)||0;var I=$("0%",1),M=$("50%",1),k=$("100%",1),B={top:I,center:M,bottom:k},W={left:I,center:M,right:k};if(n=n.split(" ").filter((function(t,e){return e<2})).reduce((function(t,e){if(/\d+/.test(e)){var i=$(e,1)/(/px|rpx$/.test(e)?Y(t.x)?z:S:1);return Y(t.x)?Object.assign(t,{y:i}):Object.assign(t,{x:i})}return Y(W[e])&&!Y(t.x)?Object.assign(t,{x:W[e]}):Object.assign(t,{y:B[e]||.5})}),{}),(d||u)&&r.translate(d,u),(a||c)&&r.scale(a,c),g){var P=w+S*n.x,O=m+z*n.y;r.translate(P,O),r.rotate(g*Math.PI/180),r.translate(-P,-O)}(y||x)&&r.transform(1,Math.tan(x*Math.PI/180),Math.tan(y*Math.PI/180),1,0,0)},t.prototype.setBackground=function(t,e,i,n,o){var s=this.ctx;t&&t!=L?N(t)?_(t,e,i,n,o,s):s.setFillStyle(t):[r.MP_TOUTIAO,r.MP_BAIDU].includes(C)?s.setFillStyle("rgba(0,0,0,0)"):s.setFillStyle(L)},t.prototype.setShadow=function(t){var e=t.boxShadow,i=void 0===e?[]:e,n=this.ctx;if(i.length){var r=i[0],o=i[1],s=i[2],a=i[3];n.setShadow(r,o,s,a)}},t.prototype.setBorder=function(t,e){var i=this.ctx,n=t.width,r=t.height,o=t.left,s=t.top,a=e.border,h=e.borderBottom,c=e.borderTop,f=e.borderRight,d=e.borderLeft,l=e.borderRadius,u=e.lineCap,p=a||{},g=p.borderWidth,v=void 0===g?0:g,y=p.borderStyle,b=p.borderColor,x=h||{},w=x.borderBottomWidth,m=void 0===w?v:w,S=x.borderBottomStyle,z=void 0===S?y:S,I=x.borderBottomColor,M=void 0===I?b:I,k=c||{},B=k.borderTopWidth,W=void 0===B?v:B,P=k.borderTopStyle,O=void 0===P?y:P,T=k.borderTopColor,L=void 0===T?b:T,R=f||{},F=R.borderRightWidth,A=void 0===F?v:F,E=R.borderRightStyle,j=void 0===E?y:E,H=R.borderRightColor,D=void 0===H?b:H,Y=d||{},$=Y.borderLeftWidth,U=void 0===$?v:$,N=Y.borderLeftStyle,_=void 0===N?y:N,X=Y.borderLeftColor,q=void 0===X?b:X,G=l||{},V=G.borderTopLeftRadius,J=void 0===V?l||0:V,Q=G.borderTopRightRadius,Z=void 0===Q?l||0:Q,K=G.borderBottomRightRadius,tt=void 0===K?l||0:K,et=G.borderBottomLeftRadius,it=void 0===et?l||0:et;if(h||d||c||f||a){var nt=function(t,e,n){"dashed"==e?/mp/.test(C)?i.setLineDash([Math.ceil(4*t/3),Math.ceil(4*t/3)]):i.setLineDash([Math.ceil(6*t),Math.ceil(6*t)]):"dotted"==e&&i.setLineDash([t,t]),i.setStrokeStyle(n)},rt=function(t,e,n,r,o,s,a,h,c,f,d,l,p,g,v){i.save(),i.setLineCap(v?"square":u),i.setLineWidth(l),nt(l,p,g),i.beginPath(),i.arc(t,e,a,Math.PI*c,Math.PI*f),i.lineTo(n,r),i.arc(o,s,h,Math.PI*f,Math.PI*d),i.stroke(),i.restore()};if(i.save(),a&&!h&&!d&&!c&&!f)return i.setLineWidth(v),nt(v,y,b),this.roundRect(o,s,n,r,l,!1,!!b),void i.restore();m&&rt(o+n-tt,s+r-tt,o+it,s+r,o+it,s+r-it,tt,it,.25,.5,.75,m,z,M,U&&A),U&&rt(o+it,s+r-it,o,s+J,o+J,s+J,it,J,.75,1,1.25,U,_,q,W&&m),W&&rt(o+J,s+J,o+n-Z,s,o+n-Z,s+Z,J,Z,1.25,1.5,1.75,W,O,L,U&&A),A&&rt(o+n-Z,s+Z,o+n,s+r-tt,o+n-tt,s+r-tt,Z,tt,1.75,2,.25,A,j,D,W&&m)}},t.prototype.setOpacity=function(t){var e=t.opacity,i=void 0===e?1:e;this.ctx.setGlobalAlpha(i)},t.prototype.drawPattern=function(t,e,r){return i(this,void 0,void 0,(function(){var i=this;return n(this,(function(n){return[2,new Promise((function(n,o){i.drawView(e,r,!0,!1,!0);var s=i,a=s.ctx;s.canvas;var h=e.width,c=e.height,f=e.left,d=e.top,l=r||{},u=l.borderRadius,p=void 0===u?0:u,g=l.backgroundImage,v=l.backgroundRepeat,y=void 0===v?"repeat":v;g&&function(t){var o=a.createPattern(t.src,y);a.setFillStyle(o),i.roundRect(f,d,h,c,p,!0,!1),i.setBorder(e,r),n()}(t)}))]}))}))},t.prototype.drawView=function(t,e,i,n,r){void 0===i&&(i=!0),void 0===n&&(n=!0),void 0===r&&(r=!0);var o=this.ctx,s=t.width,a=t.height,h=t.left,c=t.top,f=e||{},d=f.borderRadius,l=void 0===d?0:d,u=f.backgroundColor,p=void 0===u?L:u,g=f.overflow;e.opacity&&this.setOpacity(e),this.setTransform(t,e),r&&(o.save(),this.setShadow(e)),i&&this.setBackground(p,s,a,h,c),e.clipPath?this.clipPath(h,c,s,a,e.clipPath,i,!1):this.roundRect(h,c,s,a,l,i,!1),r&&o.restore(),n&&this.setBorder(t,e),"hidden"==g&&o.clip()},t.prototype.drawImage=function(t,e,o,s){return void 0===e&&(e={}),void 0===o&&(o={}),void 0===s&&(s=!0),i(this,void 0,void 0,(function(){var a=this;return n(this,(function(h){switch(h.label){case 0:return[4,new Promise((function(h,c){return i(a,void 0,void 0,(function(){var i,a,c,f,d,l,u,p,g,v,y,b,x,w,m,S,z,I,M,k,B,W=this;return n(this,(function(n){return i=this.ctx,a=o.borderRadius,c=void 0===a?0:a,f=o.backgroundColor,d=void 0===f?L:f,l=o.objectFit,u=void 0===l?R:l,p=o.backgroundSize,g=void 0===p?R:p,v=o.objectPosition,y=o.backgroundPosition,b=o.boxShadow,o.backgroundImage&&(u=g,v=y),b&&this.drawView(e,Object.assign(o,{backgroundColor:d||b&&(d||"#ffffff")}),!0,!1,!0),x=e.width,w=e.height,m=e.left,S=e.top,i.save(),z=e.contentSize.left-e.borderSize.left,I=e.contentSize.top-e.borderSize.top,s||(this.setOpacity(o),this.setTransform(e,o),this.setBackground(d,x,w,m,S),this.roundRect(m,S,x,w,c,!!(c||!b&&d),!1)),m+=z,S+=I,i.clip(),M=function(t){if(u!==R){var n=function(t,e,i){var n=t.objectFit,r=t.objectPosition,o=e.width/e.height,s=i.width/i.height,a=1,h="contain",c="cover";n==h&&o>=s||n==c&&o<s?a=e.height/i.height:(n==h&&o<s||n==c&&o>=s)&&(a=e.width/i.width);var f=i.width*a,d=i.height*a,l=r||[],u=l[0],p=l[1],g=Y(u)?$(u,e.width):(e.width-f)*(U(u)?$(u,1):{left:0,center:.5,right:1}[u||"center"]),v=Y(p)?$(p,e.height):(e.height-d)*(U(p)?$(p,1):{top:0,center:.5,bottom:1}[p||"center"]),y=function(t,e){return[(t-g)/a,(e-v)/a]},b=y(0,0),x=b[0],w=b[1],m=y(e.width,e.height),S=m[0],z=m[1],I=Math.max,M=Math.min;return{sx:I(x,0),sy:I(w,0),sw:M(S-x,i.width),sh:M(z-w,i.height),dx:I(g,0),dy:I(v,0),dw:M(f,e.width),dh:M(d,e.height)}}({objectFit:u,objectPosition:v},e.contentSize,t),o=n.sx,s=n.sy,a=n.sh,h=n.sw,c=n.dx,f=n.dy,d=n.dh,l=n.dw;C==r.MP_BAIDU?i.drawImage(t.src,c+m,f+S,l,d,o,s,h,a):i.drawImage(t.src,o,s,h,a,c+m,f+S,l,d)}else i.drawImage(t.src,m,S,x,w)},k=function(){i.restore(),W.drawView(e,o,!1,!0,!1),h(1)},B=function(t){M(t),k()},B(t),[2]}))}))}))];case 1:return h.sent(),[2]}}))}))},t.prototype.drawText=function(t,e,i,n){var r=this,o=this.ctx,s=e.borderSize,a=e.contentSize,h=e.left,c=e.top,f=a.width,d=a.height,l=a.left-s.left||0,u=a.top-s.top||0,p=i.color,g=i.lineHeight,v=i.fontSize,y=i.fontWeight,b=i.fontFamily,x=i.fontStyle,w=i.textIndent,m=void 0===w?0:w,S=i.textAlign,z=i.textStroke,I=i.verticalAlign,M=void 0===I?jt:I,k=i.backgroundColor,B=i.lineClamp,W=i.backgroundClip,P=i.textShadow,O=i.textDecoration;if(m=Y(m)?m:0,this.drawView(e,i,W!=Rt),g=$(g,v),t){o.save(),h+=l,c+=u;var T=n.fontHeight,L=n.descent,R=void 0===L?0:L,F=n.ascent,A=R+(void 0===F?0:F);switch(o.setFonts({fontFamily:b,fontSize:v,fontWeight:y,fontStyle:x}),o.setTextBaseline(jt),o.setTextAlign(S),W?this.setBackground(k,f,d,h,c):o.setFillStyle(p),S){case Ht:break;case Dt:h+=.5*f;break;case Yt:h+=f}var E=n.lines*g,j=Math.ceil((d-E)/2);switch(j<0&&(j=0),M){case Et:break;case jt:c+=j;break;case Ct:c+=2*j}var C=(g-T)/2,H=g/2,D=function(t){var e=o.measureText(t),i=e.actualBoundingBoxDescent,n=void 0===i?0:i,r=e.actualBoundingBoxAscent;return M==Et?{fix:A?void 0===r?0:r:H-C/2,lineY:A?0:C-C/2}:M==jt?{fix:A?H+n/4:H,lineY:A?0:C}:M==Ct?{fix:A?g-n:H+C/2,lineY:A?2*C:C+C/2}:{fix:0,height:0,lineY:0}},U=function(t,e,i){var r=t;switch(S){case Ht:r+=i;break;case Dt:r=(t-=i/2)+i;break;case Yt:r=t,t-=i}if(O){o.setLineWidth(v/13),o.beginPath();var s=.1*n.fontHeight;/\bunderline\b/.test(O)&&(o.moveTo(t,e+n.fontHeight+s),o.lineTo(r,e+n.fontHeight+s)),/\boverline\b/.test(O)&&(o.moveTo(t,e-s),o.lineTo(r,e-s)),/\bline-through\b/.test(O)&&(o.moveTo(t,e+.5*n.fontHeight),o.lineTo(r,e+.5*n.fontHeight)),o.closePath(),o.setStrokeStyle(p),o.stroke()}},N=function(t,e,i){var n=function(){o.setLineWidth(z.width),o.setStrokeStyle(z.color),o.strokeText(t,e,i)},s="outset";z&&z.type!==s?(o.save(),r.setShadow({boxShadow:P}),o.fillText(t,e,i),o.restore(),n()):z&&z.type==s?(o.save(),r.setShadow({boxShadow:P}),n(),o.restore(),o.save(),o.fillText(t,e,i),o.restore()):(r.setShadow({boxShadow:P}),o.fillText(t,e,i))};if(!n.widths||1==n.widths.length&&n.widths[0].total+m<=a.width){var _=D(t),X=_.fix,q=void 0===X?0:X,G=_.lineY;return N(t,h+m,c+q),U(h+m,c+G,n&&n.widths&&n.widths[0].total||n.text),c+=g,o.restore(),void this.setBorder(e,i)}for(var V=c,J=h,Q="",Z=0,K=o.measureText("...").width,tt=n.widths,et=0;et<tt.length;et++){var it=tt[et].widths,nt=0;Q="",c+=1==(Z+=1)?0:g,1==Z&&m&&(nt=m,J=h+m);for(var rt=0;rt<it.length;rt++){1!==Z&&m&&(J=h);var ot=it[rt],st=ot.width,at=ot.text,ht=(it[rt+1]||{}).width;if(Q+=at,(nt+=st)+(void 0===ht?0:ht)+(0==Z?m:0)+(Z==B?K:0)>a.width){Z>=B&&(Q+="…"),Z++,nt=0;var ct=D(Q);q=ct.fix,G=ct.lineY;N(Q,J,c+q),U(J,c+G,nt),c+=g,Q=""}else if(rt==it.length-1){et!=tt.length-1&&Z==B&&K+nt<a.width&&(Q+="…");var ft=D(Q);q=ft.fix,G=ft.lineY;N(Q,J,c+q),U(J,c+G,nt)}if(c>V+d||Z>B)break}}o.restore()}},t.prototype.source=function(t){return i(this,void 0,void 0,(function(){var e,i,r,o,s=this;return n(this,(function(n){switch(n.label){case 0:if(this.node=null,e=+new Date,"{}"==JSON.stringify(t))return[2];if(t.styles=t.styles||t.css||{},!t.type)for(i in t.type=At,t)["views","children","type","css","styles"].includes(i)||(t.styles[i]=t[i],delete t[i]);return t.styles.boxSizing||(t.styles.boxSizing="border-box"),[4,this.create(t)];case 1:return(r=n.sent())?(o=r.layout()||{},this.size=o,this.node=r,this.onEffectFinished().then((function(t){return s.lifecycle("onEffectSuccess",t)})).catch((function(t){return s.lifecycle("onEffectFail",t)})),this.performance&&console.log("布局用时："+(+new Date-e)+"ms"),[2,this.size]):[2,console.warn("no node")]}}))}))},t.prototype.getImageInfo=function(t){return this.imageBus[t]||(this.imageBus[t]=this.createImage(t,this.useCORS)),this.imageBus[t]},t.prototype.create=function(t,r){return i(this,void 0,void 0,(function(){function i(t,n,r){void 0===n&&(n={}),void 0===r&&(r=!0);var o=[];return t.forEach((function(t){var s=t.styles,a=void 0===s?{}:s,h=t.css,c=void 0===h?{}:h,f=t.children,d=void 0===f?[]:f,l=t.views,u=void 0===l?[]:l,p=t.text,g=void 0===p?"":p,v=t.type,y=void 0===v?"":v;!d&&u&&(t.children=d=u);var b={};b=e(e(r?e({},n):{},a),c);var x={},w={},m={};Object.keys(b).map((function(t){if(t.includes("padding")||t.includes("margin")){var e=ft(t,b[t]);Object.keys(e).map((function(t){t.includes("Left")?w[t]=e[t]:t.includes("Right")?m[t]=e[t]:x[t]=e[t]}))}}));if(b.textIndent&&(w.textIndent=b.textIndent,delete n.textIndent),""!==g){var S=Array.from(g);S.forEach((function(t,e){var i=Object.assign({},b,x);0===e?Object.assign(i,w):e==S.length-1&&Object.assign(i,m),delete i.padding,delete i.margin,o.push({type:"text",text:t,styles:i})}))}if(y==Lt||y==Ft)o.push(t);else if("block"===a.display&&d.length>0){var z=i(d,b,!1);t.children=z,t.flattened=!0,o.push(t)}else if(d.length>0){z=i(d,b,r);o=o.concat(z)}})),o}var o,s,a,h,c,f,d,l,u,p,g,v,y,b,x,w,m,S,z,I,M,k,B,P;return n(this,(function(n){switch(n.label){case 0:if(!t)return[2];if(t.styles||(t.styles=t.css||{}),o=t.type,s=t.show,a=void 0===s||s,h=o==Lt,c=[Rt,Ft].includes(o),f="textBox"==o,d=t.styles||{},l=d.backgroundImage,u=d.display,h&&!t.src&&!t.url)return[2];if(u==W||!a)return[2];if(c||f){if(p=t.children,g=t.views,!p&&g&&(t.children=p=g),!t.text&&(!p||p&&!p.length))return[2];p&&p.length&&!t.flattened&&(v=i(t.children||t.views),t.type="view",t.children=v)}if(!(h||t.type==At&&l))return[3,4];y=h?t.src:"",b=/url\(['"]?(.*?)['"]?\)/.exec(l),l&&b&&b[1]&&(y=b[1]||""),n.label=1;case 1:return n.trys.push([1,3,,4]),[4,this.getImageInfo(y)];case 2:return x=n.sent(),w=x.width,m=x.height,!(S=x.path)&&h?[2]:(S&&(t.attributes=Object.assign(t.attributes||{},{width:w,height:m,path:S,src:S,naturalSrc:y})),[3,4]);case 3:return z=n.sent(),t.type!=At?[2]:(this.lifecycle("onEffectFail",e(e({},z),{src:y})),[3,4]);case 4:if(this.count+=1,I=new Ot(t,r,this.root,this.ctx),!(M=t.children||t.views))return[3,8];k=0,n.label=5;case 5:return k<M.length?(B=M[k],[4,this.create(B,I)]):[3,8];case 6:(P=n.sent())&&I.add(P),n.label=7;case 7:return k++,[3,5];case 8:return[2,I]}}))}))},t.prototype.drawNode=function(t,e){return void 0===e&&(e=!1),i(this,void 0,void 0,(function(){var i,r,o,s,a,h,c,f,d,l,u,p,g,v,y,b,x,w,m,S,z,I,M;return n(this,(function(n){switch(n.label){case 0:return i=t.layoutBox,r=t.computedStyle,o=t.attributes,s=t.name,a=t.children,h=t.fixedLine,c=t.attributes,f=c.src,d=c.text,l=r.position,u=r.backgroundImage,p=r.backgroundRepeat,["fixed"].includes(l)&&!e?[2]:(this.ctx.save(),s!==At?[3,7]:f&&u?p?[4,this.drawPattern(o,i,r)]:[3,2]:[3,5]);case 1:return n.sent(),[3,4];case 2:return[4,this.drawImage(o,i,r,!1)];case 3:n.sent(),n.label=4;case 4:return[3,6];case 5:this.drawView(i,r),n.label=6;case 6:return[3,10];case 7:return s===Lt&&f?[4,this.drawImage(o,i,r,!1)]:[3,9];case 8:return n.sent(),[3,10];case 9:s===Rt?this.drawText(d,i,r,o):s===Ft&&Tt.api&&Tt.api.draw(d,this,i,r),n.label=10;case 10:if(this.progress+=1,v=(g=h||{}).beforeElements,y=g.afterElements,!v)return[3,14];b=0,x=v,n.label=11;case 11:return b<x.length?(M=x[b],[4,this.drawNode(M)]):[3,14];case 12:n.sent(),n.label=13;case 13:return b++,[3,11];case 14:if(!a)return[3,18];w=Object.values?Object.values(a):Object.keys(a).map((function(t){return a[t]})),m=0,S=w,n.label=15;case 15:return m<S.length?"absolute"===(M=S[m]).computedStyle.position?[3,17]:[4,this.drawNode(M)]:[3,18];case 16:n.sent(),n.label=17;case 17:return m++,[3,15];case 18:if(!y)return[3,22];z=0,I=y,n.label=19;case 19:return z<I.length?(M=I[z],[4,this.drawNode(M)]):[3,22];case 20:n.sent(),n.label=21;case 21:return z++,[3,19];case 22:return this.ctx.restore(),[2]}}))}))},t.prototype.render=function(t){var e=this;return void 0===t&&(t=30),new Promise((function(r,o){return i(e,void 0,void 0,(function(){var e,i,s,a,h,c,f,d,l,u;return n(this,(function(n){switch(n.label){case 0:return e=+new Date,this.init(),[4,(p=t,void 0===p&&(p=0),new Promise((function(t){return setTimeout(t,p)})))];case 1:n.sent(),n.label=2;case 2:if(n.trys.push([2,14,,15]),!this.node)return[3,12];if(i=this.root.fixedLine||{},s=i.beforeElements,a=i.afterElements,!s)return[3,6];h=0,c=s,n.label=3;case 3:return h<c.length?(l=c[h],[4,this.drawNode(l,!0)]):[3,6];case 4:n.sent(),n.label=5;case 5:return h++,[3,3];case 6:return[4,this.drawNode(this.node)];case 7:if(n.sent(),!a)return[3,11];f=0,d=a,n.label=8;case 8:return f<d.length?(l=d[f],[4,this.drawNode(l,!0)]):[3,11];case 9:n.sent(),n.label=10;case 10:return f++,[3,8];case 11:return r(this.node),[3,13];case 12:this.lifecycle("onEffectFail","node is empty"),n.label=13;case 13:return[3,15];case 14:return u=n.sent(),this.lifecycle("onEffectFail",u),o(u),[3,15];case 15:return this.performance&&console.log("渲染用时："+(+new Date-e-30)+"ms"),[2]}var p}))}))}))},t.prototype.onEffectFinished=function(){var t=this,e=Object.keys(this.imageBus).map((function(e){return t.imageBus[e]}));return Promise.all(e)},t.prototype.destroy=function(){this.node=[]},t.prototype.save=function(t){try{var e=t||{},i=e.fileType,n=void 0===i?"png":i,r=e.quality,o=void 0===r?1:r;return this.canvas.toDataURL("image/".concat(n),o)}catch(t){return this.lifecycle("onEffectFail","image cross domain"),t}},t}();r.WEB==C&&(window.Painter=$t),t.Painter=$t,t.default=$t,Object.defineProperty(t,"__esModule",{value:!0})}));
diff --git a/uni_modules/lime-painter/hybrid/html/uni.webview.1.5.3.js b/uni_modules/lime-painter/hybrid/html/uni.webview.1.5.3.js
new file mode 100644
index 0000000..d6524fa
--- /dev/null
+++ b/uni_modules/lime-painter/hybrid/html/uni.webview.1.5.3.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function i(e,i){return n.call(e,i)}var t=[];function o(){return window.__dcloud_weex_postMessage||window.__dcloud_weex_}var r=function(e,n){var i={options:{timestamp:+new Date},name:e,arg:n};if(o()){if("postMessage"===e){var r={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(r):window.__dcloud_weex_.postMessage(JSON.stringify(r))}var a={type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(a):window.__dcloud_weex_.postMessageToService(JSON.stringify(a))}if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:i,pageId:""},"*");if(0===t.length){var d=plus.webview.currentWebview();if(!d)throw new Error("plus.webview.currentWebview() is undefined");var s=d.parent(),w="";w=s?s.id:d.id,t.push(w)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}},"__uniapp__service");else{var u=JSON.stringify(i);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(u,",").concat(JSON.stringify(t),");"))}},a={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;r("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("redirectTo",{url:encodeURI(n)})},getEnv:function(e){o()?e({nvue:!0}):window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};r("postMessage",e.data||{})}},d=/uni-app/i.test(navigator.userAgent),s=/Html5Plus/i.test(navigator.userAgent),w=/complete|loaded|interactive/;var u=window.my&&navigator.userAgent.indexOf("AlipayClient")>-1;var g=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var c=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var v=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var m=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.qa&&/quickapp/i.test(navigator.userAgent);var f=window.ks&&window.ks.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var l=window.tt&&window.tt.miniProgram&&/Lark|Feishu/i.test(navigator.userAgent);var _=window.jd&&window.jd.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);for(var E,b=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},h=[function(e){if(d||s)return window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&w.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),a},function(e){if(m)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(c)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(u){document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(g)return document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(v)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(p){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(f)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.ks.miniProgram},function(e){if(l)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(_)return window.JDJSBridgeReady&&window.JDJSBridgeReady.invoke?setTimeout(e,0):document.addEventListener("JDJSBridgeReady",e),window.jd.miniProgram},function(e){return document.addEventListener("DOMContentLoaded",e),a}],y=0;y<h.length&&!(E=h[y](b));y++);E||(E={});var B="undefined"!=typeof uni?uni:{};if(!B.navigateTo)for(var S in E)i(E,S)&&(B[S]=E[S]);return B.webView=E,B}));
diff --git a/uni_modules/lime-painter/package.json b/uni_modules/lime-painter/package.json
new file mode 100644
index 0000000..113d661
--- /dev/null
+++ b/uni_modules/lime-painter/package.json
@@ -0,0 +1,93 @@
+{
+  "id": "lime-painter",
+  "displayName": "海报画板",
+  "version": "1.9.6.5",
+  "description": "一款canvas海报组件，更优雅的海报生成方案，有限的支持富文本",
+  "keywords": [
+    "海报",
+    "富文本",
+    "生成海报",
+    "生成二维码",
+    "JSON"
+],
+  "repository": "https://gitee.com/liangei/lime-painter", 
+  "engines": {
+    "HBuilderX": "^3.4.14"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "305716444"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "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": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+        "QQ": "y",
+        "钉钉": "u",
+        "快手": "u",
+        "飞书": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  },
+  "name": "lime-painter",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}
diff --git a/uni_modules/lime-painter/parser.js b/uni_modules/lime-painter/parser.js
new file mode 100644
index 0000000..da36a87
--- /dev/null
+++ b/uni_modules/lime-painter/parser.js
@@ -0,0 +1,388 @@
+/*
+ * HTML5 Parser By Sam Blowes
+ *
+ * Designed for HTML5 documents
+ *
+ * Original code by John Resig (ejohn.org)
+ * http://ejohn.org/blog/pure-javascript-html-parser/
+ * Original code by Erik Arvidsson, Mozilla Public License
+ * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
+ *
+ * ----------------------------------------------------------------------------
+ * License
+ * ----------------------------------------------------------------------------
+ *
+ * This code is triple licensed using Apache Software License 2.0,
+ * Mozilla Public License or GNU Public License
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Simple HTML Parser.
+ *
+ * The Initial Developer of the Original Code is Erik Arvidsson.
+ * Portions created by Erik Arvidssson are Copyright (C) 2004. All Rights
+ * Reserved.
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * ----------------------------------------------------------------------------
+ * Usage
+ * ----------------------------------------------------------------------------
+ *
+ * // Use like so:
+ * HTMLParser(htmlString, {
+ *     start: function(tag, attrs, unary) {},
+ *     end: function(tag) {},
+ *     chars: function(text) {},
+ *     comment: function(text) {}
+ * });
+ *
+ * // or to get an XML string:
+ * HTMLtoXML(htmlString);
+ *
+ * // or to get an XML DOM Document
+ * HTMLtoDOM(htmlString);
+ *
+ * // or to inject into an existing document/DOM node
+ * HTMLtoDOM(htmlString, document);
+ * HTMLtoDOM(htmlString, document.body);
+ *
+ */
+// Regular Expressions for parsing tags and attributes
+var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/;
+var endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/;
+var attr = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g; // Empty Elements - HTML 5
+
+var empty = makeMap('area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr'); // Block Elements - HTML 5
+// fixed by xxx 将 ins 标签从块级名单中移除
+
+var block = makeMap('a,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video'); // Inline Elements - HTML 5
+
+var inline = makeMap('abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'); // Elements that you can, intentionally, leave open
+// (and which close themselves)
+
+var closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'); // Attributes that have their values filled in disabled="disabled"
+
+var fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'); // Special Elements (can contain anything)
+
+var special = makeMap('script,style');
+function HTMLParser(html, handler) {
+  var index;
+  var chars;
+  var match;
+  var stack = [];
+  var last = html;
+
+  stack.last = function () {
+    return this[this.length - 1];
+  };
+
+  while (html) {
+    chars = true; // Make sure we're not in a script or style element
+
+    if (!stack.last() || !special[stack.last()]) {
+      // Comment
+      if (html.indexOf('<!--') == 0) {
+        index = html.indexOf('-->');
+
+        if (index >= 0) {
+          if (handler.comment) {
+            handler.comment(html.substring(4, index));
+          }
+
+          html = html.substring(index + 3);
+          chars = false;
+        } // end tag
+
+      } else if (html.indexOf('</') == 0) {
+        match = html.match(endTag);
+
+        if (match) {
+          html = html.substring(match[0].length);
+          match[0].replace(endTag, parseEndTag);
+          chars = false;
+        } // start tag
+
+      } else if (html.indexOf('<') == 0) {
+        match = html.match(startTag);
+
+        if (match) {
+          html = html.substring(match[0].length);
+          match[0].replace(startTag, parseStartTag);
+          chars = false;
+        }
+      }
+
+      if (chars) {
+        index = html.indexOf('<');
+        var text = index < 0 ? html : html.substring(0, index);
+        html = index < 0 ? '' : html.substring(index);
+
+        if (handler.chars) {
+          handler.chars(text);
+        }
+      }
+    } else {
+      html = html.replace(new RegExp('([\\s\\S]*?)<\/' + stack.last() + '[^>]*>'), function (all, text) {
+        text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, '$1$2');
+
+        if (handler.chars) {
+          handler.chars(text);
+        }
+
+        return '';
+      });
+      parseEndTag('', stack.last());
+    }
+
+    if (html == last) {
+      throw 'Parse Error: ' + html;
+    }
+
+    last = html;
+  } // Clean up any remaining tags
+
+
+  parseEndTag();
+
+  function parseStartTag(tag, tagName, rest, unary) {
+    tagName = tagName.toLowerCase();
+    if (block[tagName]) {
+      while (stack.last() && inline[stack.last()]) {
+        parseEndTag('', stack.last());
+      }
+    }
+
+    if (closeSelf[tagName] && stack.last() == tagName) {
+      parseEndTag('', tagName);
+    }
+
+    unary = empty[tagName] || !!unary;
+
+    if (!unary) {
+      stack.push(tagName);
+    }
+
+    if (handler.start) {
+      var attrs = [];
+      rest.replace(attr, function (match, name) {
+        var value = arguments[2] ? arguments[2] : arguments[3] ? arguments[3] : arguments[4] ? arguments[4] : fillAttrs[name] ? name : '';
+        attrs.push({
+          name: name,
+          value: value,
+          escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') // "
+
+        });
+      });
+
+      if (handler.start) {
+        handler.start(tagName, attrs, unary);
+      }
+    }
+  }
+
+  function parseEndTag(tag, tagName) {
+    // If no tag name is provided, clean shop
+    if (!tagName) {
+      var pos = 0;
+    } // Find the closest opened tag of the same type
+    else {
+        for (var pos = stack.length - 1; pos >= 0; pos--) {
+          if (stack[pos] == tagName) {
+            break;
+          }
+        }
+      }
+
+    if (pos >= 0) {
+      // Close all the open elements, up the stack
+      for (var i = stack.length - 1; i >= pos; i--) {
+        if (handler.end) {
+          handler.end(stack[i]);
+        }
+      } // Remove the open elements from the stack
+
+
+      stack.length = pos;
+    }
+  }
+}
+
+function makeMap(str) {
+  var obj = {};
+  var items = str.split(',');
+
+  for (var i = 0; i < items.length; i++) {
+    obj[items[i]] = true;
+  }
+
+  return obj;
+}
+
+function removeDOCTYPE(html) {
+  return html.replace(/<\?xml.*\?>\n/, '').replace(/<!doctype.*>\n/, '').replace(/<!DOCTYPE.*>\n/, '');
+}
+
+function parseAttrs(attrs) {
+  return attrs.reduce(function (pre, attr) {
+    var value = attr.value;
+    var name = attr.name;
+    if (pre[name]) {
+			pre[name] = pre[name] + " " + value;
+    } else {
+			pre[name] = value;
+    }
+
+    return pre;
+  }, {});
+}
+function convertStyleStringToJSON(styleString) {
+  var styles = styleString.split(";"); // 通过分号将样式字符串分割为多个样式声明
+  var result = {};
+
+  styles.forEach(function(style) {
+    var styleParts = style.split(":"); // 通过冒号将样式声明分割为属性和值
+    var property = styleParts[0].trim();
+    var value = styleParts[1] && styleParts[1].trim();
+
+    if (property && value) {
+      result[property] = value; // 将属性和值添加到结果对象中
+    }
+  });
+
+  return result;
+}
+function parseHtml(html) {
+  html = removeDOCTYPE(html);
+  var stacks = [];
+  var results = {
+    node: 'root',
+    children: []
+  };
+  HTMLParser(html, {
+    start: function start(tag, attrs, unary) {
+      var node = {
+        name: tag
+      };
+
+      if (attrs.length !== 0) {
+        node.attrs = parseAttrs(attrs);
+		node.styles = node.attrs.style ? convertStyleStringToJSON(node.attrs.style) : {}
+      }
+	
+	if(!node.type) {
+	  if(inline[node.name] && node.name !== 'img' ) {
+		node.type = 'text';
+		if(node.name == 'br') {
+			node.text = '\n'
+		} else if(node.name == 'strong'){
+			node.styles.fontWeight = 'bold'
+		}
+	  } else if(node.name == 'img'){
+		 node.type = 'image' 
+		 node.src =  node.attrs.src
+	  } else {
+		   node.type = 'view' 
+		   if(['h1','h2','h3','h4','h5','h6'].includes(node.name)) {
+			   node.styles.fontWeight = 'bold'
+		   }
+	  }
+	}		
+      if (unary) {
+        var parent = stacks[0] || results;
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      } else {
+        stacks.unshift(node);
+      }
+    },
+    end: function end(tag) {
+      var node = stacks.shift();
+      if (node.name !== tag) console.error('invalid state: mismatch end tag');
+      if (stacks.length === 0) {
+        results.children.push(node);
+      } else {
+        var parent = stacks[0];
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+        parent.children.push(node);
+      }
+	  const isTextBox = node.children && node.children.length > 1 && node.children.every(child => {
+		  return ['text','image'].includes(child.type)
+	  })
+	  if(isTextBox) {
+		  node.type = 'textBox'
+	  }
+    },
+    chars: function chars(text) {
+      var node = {
+        type: 'text',
+        text: text
+      };
+
+      if (stacks.length === 0) {
+        results.children.push(node);
+      } else {
+        var parent = stacks[0];
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      }
+    },
+    comment: function comment(text) {
+      var node = {
+        node: 'comment',
+        text: text
+      };
+      var parent = stacks[0];
+
+      if (!parent.children) {
+        parent.children = [];
+      }
+
+      parent.children.push(node);
+    }
+  });
+  return results.children;
+}
+
+export default parseHtml;
\ No newline at end of file
diff --git a/uni_modules/lime-painter/readme.md b/uni_modules/lime-painter/readme.md
new file mode 100644
index 0000000..9cfdb6d
--- /dev/null
+++ b/uni_modules/lime-painter/readme.md
@@ -0,0 +1,963 @@
+# Painter 画板 测试版
+
+> uniapp 海报画板，更优雅的海报生成方案  
+> [查看更多 站点 1](https://limeui.qcoon.cn/#/painter)  
+> [查看更多 站点 2](http://liangei.gitee.io/limeui/#/painter)  
+> Q 群：1169785031
+
+## 平台兼容
+
+| H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 头条小程序 | QQ 小程序 | App |
+| --- | ---------- | ------------ | ---------- | ---------- | --------- | --- |
+| √   | √          | √            | 未测       | √          | √         | √   |
+
+## 安装
+在市场导入**[海报画板](https://ext.dcloud.net.cn/plugin?id=2389)uni_modules**版本的即可，无需`import`
+
+## 代码演示
+
+### 插件demo
+- lime-painter 为 demo
+- 位于 uni_modules/lime-painter/components/lime-painter
+- 导入插件后直接使用可查看demo
+```vue
+<lime-painter />
+```
+
+
+### 基本用法
+
+- 插件提供 JSON 及 Template 的方式绘制海报
+- 参考 css 块状流布局模拟 css schema。
+- 另外flex布局还不是成完善，请谨慎使用，普通的流布局我觉得已经够用了。
+
+#### 方式一 Template
+
+- 提供`l-painter-view`、`l-painter-text`、`l-painter-image`、`l-painter-qrcode`四种类型组件
+- 通过 `css` 属性绘制样式，与 style 使用方式保持一致。
+```html
+<l-painter>
+	//如果使用Template出现顺序错乱，可使用`template` 等所有变量完成再显示
+	<template v-if="show">
+		<l-painter-view
+			css="background: #07c160; height: 120rpx; width: 120rpx; display: inline-block"
+		></l-painter-view>
+		<l-painter-view
+			css="background: #1989fa; height: 120rpx; width: 120rpx; border-top-right-radius: 60rpx; border-bottom-left-radius: 60rpx; display: inline-block; margin: 0 30rpx;"
+		></l-painter-view>
+		<l-painter-view
+			css="background: #ff9d00; height: 120rpx; width: 120rpx; border-radius: 50%; display: inline-block"
+		></l-painter-view>
+	<template>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+- 在 json 里四种类型组件的`type`为`view`、`text`、`image`、`qrcode`
+- 通过 `board` 设置海报所需的 JSON 数据进行绘制或`ref`获取组件实例调用组件内的`render(json)`
+- 所有类型的 schema 都具有`css`字段，css 的 key 值使用**驼峰**如：`lineHeight`
+
+```html
+<l-painter :board="poster"/>
+```
+
+```js
+data() {
+	return {
+		poster: {
+			css: {
+				// 根节点若无尺寸，自动获取父级节点
+				width: '750rpx'
+			},
+			views: [
+				{
+					css: {
+						background: "#07c160",
+						height: "120rpx",
+						width: "120rpx",
+						display: "inline-block"
+					},
+					type: "view"
+				},
+				{
+					css: {
+						background: "#1989fa",
+						height: "120rpx",
+						width: "120rpx",
+						borderTopRightRadius: "60rpx",
+						borderBottomLeftRadius: "60rpx",
+						display: "inline-block",
+						margin: "0 30rpx"
+					},
+					views: [],
+					type: "view"
+				},
+				{
+					css: {
+						background: "#ff9d00",
+						height: "120rpx",
+						width: "120rpx",
+						borderRadius: "50%",
+						display: "inline-block"
+					},
+					views: [],
+					type: "view"
+				},
+			]
+		}
+	}
+}
+```
+
+### View 容器
+
+- 类似于 `div` 可以嵌套承载更多的 view、text、image，qrcode 共同构建一颗完整的节点树
+- 在 JSON 里具有 `views` 的数组字段，用于嵌套承载节点。
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <l-painter-view css="background: #f0f0f0; padding-top: 100rpx;">
+    <l-painter-view
+      css="background: #d9d9d9; width: 33.33%; height: 100rpx; display: inline-block"
+    ></l-painter-view>
+    <l-painter-view
+      css="background: #bfbfbf; width: 66.66%; height: 100rpx; display: inline-block"
+    ></l-painter-view>
+  </l-painter-view>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+{
+	css: {},
+	views: [
+		{
+			type: 'view',
+			css: {
+				background: '#f0f0f0',
+				paddingTop: '100rpx'
+			},
+			views: [
+				{
+					type: 'view',
+					css: {
+						background: '#d9d9d9',
+						width: '33.33%',
+						height: '100rpx',
+						display: 'inline-block'
+					}
+				},
+				{
+					type: 'view',
+					css: {
+						background: '#bfbfbf',
+						width: '66.66%',
+						height: '100rpx',
+						display: 'inline-block'
+					}
+				}
+			],
+
+		}
+	]
+}
+```
+
+### Text 文本
+
+- 通过 `text` 属性填写文本内容。
+- 支持`\n`换行符
+- 支持省略号，使用 css 的`line-clamp`设置行数，当文字内容超过会显示省略号。
+- 支持`text-decoration`
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <l-painter-view css="background: #e0e2db; padding: 30rpx; color: #222a29">
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+    />
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+      css="text-align:center; padding-top: 20rpx; text-decoration: line-through "
+    />
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+      css="text-align:right; padding-top: 20rpx"
+    />
+    <l-painter-text
+      text="水调歌头\n明月几时有？把酒问青天。不知天上宫阙，今夕是何年。我欲乘风归去，又恐琼楼玉宇，高处不胜寒。起舞弄清影，何似在人间。"
+      css="line-clamp: 3; padding-top: 20rpx; background: linear-gradient(,#ff971b 0%, #ff5000 100%); background-clip: text"
+    />
+  </l-painter-view>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+// 基础用法
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置居中对齐
+		textAlign: 'center',
+		// 设置中划线
+		textDecoration: 'line-through'
+	}
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置右对齐
+		textAlign: 'right',
+	}
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置行数，超出显示省略号
+		lineClamp: 3,
+		// 渐变文字
+		background: 'linear-gradient(,#ff971b 0%, #1989fa 100%)',
+		backgroundClip: 'text'
+	}
+}
+```
+
+### Image 图片
+
+- 通过 `src` 属性填写图片路径。
+- 图片路径支持：网络图片，本地 static 里的图片路径，缓存路径，**字节的static目录是写相对路径**
+- 通过 `css` 的 `object-fit`属性可以设置图片的填充方式，可选值见下方 CSS 表格。
+- 通过 `css` 的 `object-position`配合 `object-fit` 可以设置图片的对齐方式，类似于`background-position`，详情见下方 CSS 表格。
+- 使用网络图片时：小程序需要去公众平台配置 [downloadFile](https://mp.weixin.qq.com/) 域名
+- 使用网络图片时：**H5 和 Nvue 需要决跨域问题**
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <!-- 基础用法 -->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx"
+  />
+  <!-- 填充方式 -->
+  <!-- css object-fit 设置 填充方式 见下方表格-->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx; object-fit: contain; background: #eee"
+  />
+  <!-- css object-position 设置 图片的对齐方式-->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx; object-fit: contain; object-position: 50% 50%; background: #eee"
+  />
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+// 基础用法
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx'
+	}
+},
+// 填充方式
+// css objectFit 设置 填充方式 见下方表格
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+		objectFit: 'contain'
+	}
+},
+// css objectPosition 设置 图片的对齐方式
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+		objectFit: 'contain',
+		objectPosition: '50% 50%'
+	}
+}
+```
+
+### Qrcode 二维码
+
+- 通过`text`属性填写需要生成二维码的文本。
+- 通过 `css` 里的 `color` 可设置生成码点的颜色。
+- 通过 `css` 里的 `background`可设置背景色。
+- 通过 `css `里的 `width`、`height`设置尺寸。
+
+#### 方式一 Template
+
+```html
+<l-painter>
+  <l-painter-qrcode
+    text="limeui.qcoon.cn"
+    css="width: 200rpx; height: 200rpx"
+  />
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+{
+	type: 'qrcode',
+	text: 'limeui.qcoon.cn',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+	}
+}
+```
+
+### 富文本
+- 这是一个有限支持的测试能力，只能通过JSON方式，不要抱太大希望!
+- 首先需要把富文本转成JSON,这需要引入`parser`这个包，如果你不使用是不会进入主包
+
+```html
+<l-painter ref="painter"/>
+```
+```js
+import parseHtml from '@/uni_modules/lime-painter/parser'
+const json = parseHtml(`<p><span>测试测试</span><img src="/static/logo.png"/></p>`)
+this.$refs.painter.render(json)
+```
+
+### 生成图片
+
+- 方式1、通过设置`isCanvasToTempFilePath`自动生成图片并在 `@success` 事件里接收海报临时路径
+- 方式2、通过调用内部方法生成图片：
+
+```html
+<l-painter ref="painter">...code</l-painter>
+```
+
+```js
+this.$refs.painter.canvasToTempFilePathSync({
+  fileType: "jpg",
+  // 如果返回的是base64是无法使用 saveImageToPhotosAlbum，需要设置 pathType为url
+  pathType: 'url',
+  quality: 1,
+  success: (res) => {
+    console.log(res.tempFilePath);
+	// 非H5 保存到相册
+	// H5 提示用户长按图另存
+	uni.saveImageToPhotosAlbum({
+		filePath: res.tempFilePath,
+		success: function () {
+			console.log('save success');
+		}
+	});
+  },
+});
+```
+
+### 主动调用方式
+
+- 通过获取组件实例内部的`render`函数 传递`JSON`即可
+
+```html
+<l-painter ref="painter" />
+```
+
+```js
+// 渲染
+this.$refs.painter.render(jsonSchema);
+// 生成图片
+this.$refs.painter.canvasToTempFilePathSync({
+  fileType: "jpg",
+  // 如果返回的是base64是无法使用 saveImageToPhotosAlbum，需要设置 pathType为url
+  pathType: 'url',
+  quality: 1,
+  success: (res) => {
+    console.log(res.tempFilePath);
+	// 非H5 保存到相册
+	uni.saveImageToPhotosAlbum({
+		filePath: res.tempFilePath,
+		success: function () {
+			console.log('save success');
+		}
+	});
+  },
+});
+```
+
+
+### H5跨域
+- 一般是需要后端或管理OSS资源的大佬处理
+- 一般OSS的处理方式:
+
+1、设置来源
+```cmd
+*
+```
+
+2、允许Methods
+```html
+GET
+```
+
+3、允许Headers
+```html
+access-control-allow-origin:*
+```
+
+4、最后如果还是不行,可试下给插件设置`useCORS`
+```html
+<l-painter useCORS>
+```
+
+
+
+### 海报示例
+
+- 提供一份示例，只把插件当成生成图片的工具，非必要不要在弹窗里使用。
+- 通过设置`isCanvasToTempFilePath`主动生成图片，再由 `@success` 事件接收海报临时路径
+- 设置`hidden`隐藏画板。
+请注意，示例用到了图片，海报的渲染是包括下载图片的时间，也许在某天图片会失效或访问超级慢，请更换为你的图片再查看，另外如果你是小程序请在使用示例时把**不校验合法域名**勾上！！！！！不然不显示还以为是插件的锅，求求了大佬们！
+#### 方式一 Template
+
+```html
+<image :src="path" mode="widthFix"></image>
+<l-painter
+  isCanvasToTempFilePath
+  @success="path = $event"
+  hidden
+  css="width: 750rpx; padding-bottom: 40rpx; background: linear-gradient(,#ff971b 0%, #ff5000 100%)"
+>
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="margin-left: 40rpx; margin-top: 40rpx; width: 84rpx;  height: 84rpx; border-radius: 50%;"
+  />
+  <l-painter-view
+    css="margin-top: 40rpx; padding-left: 20rpx; display: inline-block"
+  >
+    <l-painter-text
+      text="隔壁老王"
+      css="display: block; padding-bottom: 10rpx; color: #fff; font-size: 32rpx; fontWeight: bold"
+    />
+    <l-painter-text
+      text="为您挑选了一个好物"
+      css="color: rgba(255,255,255,.7); font-size: 24rpx"
+    />
+  </l-painter-view>
+  <l-painter-view
+    css="margin-left: 40rpx; margin-top: 30rpx; padding: 32rpx; box-sizing: border-box; background: #fff; border-radius: 16rpx; width: 670rpx; box-shadow: 0 20rpx 58rpx rgba(0,0,0,.15)"
+  >
+    <l-painter-image
+      src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+      css="object-fit: cover; object-position: 50% 50%; width: 606rpx; height: 606rpx; border-radius: 12rpx;"
+    />
+    <l-painter-view
+      css="margin-top: 32rpx; color: #FF0000; font-weight: bold; font-size: 28rpx; line-height: 1em;"
+    >
+      <l-painter-text text="￥" css="vertical-align: bottom" />
+      <l-painter-text
+        text="39"
+        css="vertical-align: bottom; font-size: 58rpx"
+      />
+      <l-painter-text text=".39" css="vertical-align: bottom" />
+      <l-painter-text
+        text="￥59.99"
+        css="vertical-align: bottom; padding-left: 10rpx; font-weight: normal; text-decoration: line-through; color: #999999"
+      />
+    </l-painter-view>
+    <l-painter-view css="margin-top: 32rpx; font-size: 26rpx; color: #8c5400">
+      <l-painter-text text="自营" css="color: #212121; background: #ffb400;" />
+      <l-painter-text
+        text="30天最低价"
+        css="margin-left: 16rpx; background: #fff4d9; text-decoration: line-through;"
+      />
+      <l-painter-text
+        text="满减优惠"
+        css="margin-left: 16rpx; background: #fff4d9"
+      />
+      <l-painter-text
+        text="超高好评"
+        css="margin-left: 16rpx; background: #fff4d9"
+      />
+    </l-painter-view>
+    <l-painter-view css="margin-top: 30rpx">
+      <l-painter-text
+        css="line-clamp: 2; color: #333333; line-height: 1.8em; font-size: 36rpx; width: 478rpx; padding-right:32rpx; box-sizing: border-box"
+        text="360儿童电话手表9X 智能语音问答定位支付手表 4G全网通20米游泳级防水视频通话拍照手表男女孩星空蓝"
+      ></l-painter-text>
+      <l-painter-qrcode
+        css="width: 128rpx; height: 128rpx;"
+        text="limeui.qcoon.cn"
+      ></l-painter-qrcode>
+    </l-painter-view>
+  </l-painter-view>
+</l-painter>
+```
+
+```js
+data() {
+	return {
+		path: ''
+	}
+}
+```
+
+#### 方式二 JSON
+
+```html
+<image :src="path" mode="widthFix"></image>
+<l-painter
+  :board="poster"
+  isCanvasToTempFilePath
+  @success="path = $event"
+  hidden
+/>
+```
+
+```js
+data() {
+	return {
+		path: '',
+		poster: {
+		    css: {
+		        width: "750rpx",
+		        paddingBottom: "40rpx",
+		        background: "linear-gradient(,#000 0%, #ff5000 100%)"
+		    },
+		    views: [
+		        {
+		            src: "https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg",
+		            type: "image",
+		            css: {
+		                background: "#fff",
+		                objectFit: "cover",
+		                marginLeft: "40rpx",
+		                marginTop: "40rpx",
+		                width: "84rpx",
+		                border: "2rpx solid #fff",
+		                boxSizing: "border-box",
+		                height: "84rpx",
+		                borderRadius: "50%"
+		            }
+		        },
+		        {
+		            type: "view",
+		            css: {
+		                marginTop: "40rpx",
+		                paddingLeft: "20rpx",
+		                display: "inline-block"
+		            },
+		            views: [
+		                {
+		                    text: "隔壁老王",
+		                    type: "text",
+		                    css: {
+		                        display: "block",
+		                        paddingBottom: "10rpx",
+		                        color: "#fff",
+		                        fontSize: "32rpx",
+		                        fontWeight: "bold"
+		                    }
+		                },
+		                {
+		                    text: "为您挑选了一个好物",
+		                    type: "text",
+		                    css: {
+		                        color: "rgba(255,255,255,.7)",
+		                        fontSize: "24rpx"
+		                    },
+		                }
+		            ],
+		        },
+		        {
+		            css: {
+		                marginLeft: "40rpx",
+		                marginTop: "30rpx",
+		                padding: "32rpx",
+		                boxSizing: "border-box",
+		                background: "#fff",
+		                borderRadius: "16rpx",
+		                width: "670rpx",
+		                boxShadow: "0 20rpx 58rpx rgba(0,0,0,.15)"
+		            },
+		            views: [
+		                {
+							src: "https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg",
+							type: "image",
+		                    css: {
+		                        objectFit: "cover",
+		                        objectPosition: "50% 50%",
+		                        width: "606rpx",
+		                        height: "606rpx"
+		                    },
+		                }, {
+		                    css: {
+		                        marginTop: "32rpx",
+		                        color: "#FF0000",
+		                        fontWeight: "bold",
+		                        fontSize: "28rpx",
+		                        lineHeight: "1em"
+		                    },
+		                    views: [{
+								text: "￥",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom"
+		                        },
+		                    }, {
+								text: "39",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom",
+		                            fontSize: "58rpx"
+		                        },
+		                    }, {
+								text: ".39",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom"
+		                        },
+		                    }, {
+								text: "￥59.99",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom",
+		                            paddingLeft: "10rpx",
+		                            fontWeight: "normal",
+		                            textDecoration: "line-through",
+		                            color: "#999999"
+		                        }
+		                    }],
+
+		                    type: "view"
+		                }, {
+		                    css: {
+		                        marginTop: "32rpx",
+		                        fontSize: "26rpx",
+		                        color: "#8c5400"
+		                    },
+		                    views: [{
+								text: "自营",
+								type: "text",
+		                        css: {
+		                            color: "#212121",
+		                            background: "#ffb400"
+		                        },
+		                    }, {
+								text: "30天最低价",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9",
+		                            textDecoration: "line-through"
+		                        },
+		                    }, {
+								text: "满减优惠",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9"
+		                        },
+		                    }, {
+								text: "超高好评",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9"
+		                        },
+
+		                    }],
+
+		                    type: "view"
+		                }, {
+		                    css: {
+		                        marginTop: "30rpx"
+		                    },
+		                    views: [
+								{
+									text: "360儿童电话手表9X 智能语音问答定位支付手表 4G全网通20米游泳级防水视频通话拍照手表男女孩星空蓝",
+									type: "text",
+									css: {
+										paddingRight: "32rpx",
+										boxSizing: "border-box",
+										lineClamp: 2,
+										color: "#333333",
+										lineHeight: "1.8em",
+										fontSize: "36rpx",
+										width: "478rpx"
+		                        },
+		                    }, {
+								text: "limeui.qcoon.cn",
+								type: "qrcode",
+		                        css: {
+		                            width: "128rpx",
+		                            height: "128rpx",
+		                        },
+
+		                    }],
+		                    type: "view"
+		                }],
+		            type: "view"
+		        }
+		    ]
+		}
+	}
+}
+```
+
+
+### 自定义字体
+- 需要平台的支持，已知微信小程序支持，其它的没试过，如果可行请告之
+
+```
+// 需要在app.vue中下载字体
+uni.loadFontFace({
+	global:true,
+	scopes: ['native'],
+	family: '自定义字体名称',
+	source: 'url("https://sungd.github.io/Pacifico.ttf")',
+  
+	success() {
+	  console.log('success')
+  }
+})
+
+
+// 然后就可以在插件的css中写font-family: '自定义字体名称'
+```
+
+
+### Nvue
+- 必须为HBX 3.4.11及以上
+
+
+### 原生小程序
+
+- 插件里的`painter.js`支持在原生小程序中使用
+- new Painter 之后在`source`里传入 JSON
+- 再调用`render`绘制海报
+- 如需生成图片，请查看微信小程序 cavnas 的[canvasToTempFilePath](https://developers.weixin.qq.com/miniprogram/dev/api/canvas/wx.canvasToTempFilePath.html)
+
+```html
+<canvas type="2d" id="painter" style="width: 100%"></canvas>
+```
+
+```js
+import { Painter } from "./painter";
+page({
+  data: {
+    poster: {
+      css: {
+        width: "750rpx",
+      },
+      views: [
+        {
+          type: "view",
+          css: {
+            background: "#d2d4c8",
+            paddingTop: "100rpx",
+          },
+          views: [
+            {
+              type: "view",
+              css: {
+                background: "#5f7470",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+            {
+              type: "view",
+              css: {
+                background: "#889696",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+            {
+              type: "view",
+              css: {
+                background: "#b8bdb5",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+  async onLoad() {
+    const res = await this.getCentext();
+    const painter = new Painter(res);
+    // 返回计算布局后的整个内容尺寸
+    const { width, height } = await painter.source(this.data.poster);
+    // 得到计算后的尺寸后 可给canvas尺寸赋值，达到动态响应效果
+    // 渲染
+    await painter.render();
+  },
+  // 获取canvas 2d
+  // 非2d 需要传一个 createImage 方法用于获取图片信息 即把 getImageInfo 的 success 通过 promise resolve 返回
+  getCentext() {
+    return new Promise((resolve) => {
+      wx.createSelectorQuery()
+        .select(`#painter`)
+        .node()
+        .exec((res) => {
+          let { node: canvas } = res[0];
+          resolve({
+            canvas,
+            context: canvas.getContext("2d"),
+            width: canvas.width,
+            height: canvas.height,
+			// createImage: getImageInfo()
+            pixelRatio: 2,
+          });
+        });
+    });
+  },
+});
+```
+
+### 旧版(1.6.x)更新
+
+- 由于 1.8.x 版放弃了以定位的方式，所以 1.6.x 版更新之后要每个样式都加上`position: absolute`
+- 旧版的 `image` mode 模式被放弃，使用`object-fit`
+- 旧版的 `isRenderImage` 改成 `is-canvas-to-temp-file-path`
+- 旧版的 `maxLines` 改成 `line-clamp`
+
+## API
+
+### Props
+
+| 参数                       | 说明                                                         | 类型             | 默认值       |
+| -------------------------- | ------------------------------------------------------------ | ---------------- | ------------ |
+| board                      | JSON 方式的海报元素对象集                                    | <em>object</em>  | -            |
+| css                        | 海报内容最外层的样式，可以理解为`body`                           | <em>object</em>  | 参数请向下看 |
+| custom-style               | canvas 元素的样式                                            | <em>string</em>  |              |
+| hidden               		 | 隐藏画板                                                    | <em>boolean</em>  |   `false`    |
+| is-canvas-to-temp-file-path | 是否生成图片，在`@success`事件接收图片地址                   | <em>boolean</em> | `false`      |
+| after-delay                | 生成图片错乱，可延时生成图片                                 | <em>number</em>  | `100`        |
+| type                       | canvas 类型，对微信头条支付宝小程序可有效,可选值：`2d`，`''` | <em>string</em>  | `2d`         |
+| file-type                  | 生成图片的后缀类型, 可选值：`png`、`jpg`                     | <em>string</em>  | `png`        |
+| path-type                  | 生成图片路径类型，可选值`url`、`base64`                      | <em>string</em>  | `-`          |
+| pixel-ratio                | 生成图片的像素密度，默认为对应手机的像素密度，`nvue`无效     | <em>number</em>  | `-`          |
+| hidpi                | H5和APP是否使用高清处理     | <em>boolean</em>  | `true`          |
+| width                      | **废弃** 画板的宽度，一般只用于通过内部方法时加上            | <em>number</em>  | ``           |
+| height                     | **废弃** 画板的高度 ，同上                                   | <em>number</em>  | ``           |
+
+### css
+| 属性名                                                                              | 支持的值或类型                                                                                                                                                                       | 默认值   |
+| ----------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------- |
+| (min\max)width                                                                      | 支持`%`、`rpx`、`px`                                                                                                                                                                 | -        |
+| height                                                                              | 同上                                                                                                                                                                                 | -        |
+| color                                                                               | `string`                                                                                                                                                                             | -        |
+| position                                                                            | 定位，可选值：`absolute`、`fixed`                                                                                                                                                    | -        |
+| ↳ left、top、right、bottom                                                          | 配合`position`才生效，支持`%`、`rpx`、`px`                                                                                                                                           | -        |
+| margin                                                                              | 可简写或各方向分别写，如：`margin-top`，支持`auto`、`rpx`、`px`                                                                                                                      | -        |
+| padding                                                                             | 可简写或各方向分别写，支持`rpx`、`px`                                                                                                                                                | -        |
+| border                                                                              | 可简写或各个值分开写：`border-width`、`border-style` 、`border-color`，简写请按顺序写                                                                                                | -        |
+| line-clamp                                                                          | `number`，超过行数显示省略号                                                                                                                                                         | -        |
+| vertical-align                                                                      | 文字垂直对齐，可选值：`bottom`、`top`、`middle`                                                                                                                                      | `middle` |
+| line-height                                                                         | 文字行高，支持`rpx`、`px`、`em`                                                                                                                                                      | `1.4em`  |
+| font-weight                                                                         | 文字粗细，可选值：`normal`、`bold`                                                                                                                                                   | `normal` |
+| font-size                                                                           | 文字大小，`string`，支持`rpx`、`px`                                                                                                                                                  | `14px`   |
+| text-decoration                                                                     | 文本修饰，可选值：`underline` 、`line-through`、`overline`                                                                                                                           | -        |
+| text-stroke                                                                         | 文字描边，可简写或各个值分开写，如：`text-stroke-color`, `text-stroke-width`                                                                                                              | -        |
+| text-align                                                                          | 文本水平对齐，可选值：`right` 、`center`                                                                                                                                             | `left`   |
+| display                                                                             | 框类型，可选值：`block`、`inline-block`、`flex`、`none`，当为`none`时是不渲染该段, `flex`功能简陋。                                                                                                            | -        |
+| flex                                                                                | 配合 display: flex; 属性定义了在分配多余空间,目前只用为数值如： flex: 1                                                                                                           | -        |
+| align-self                                                                          | 配合 display: flex; 单个项目垂直轴对齐方式: `flex-start` `flex-end` `center`                                                                                                         | `flex-start`        |
+| justify-content                                                                     | 配合 display: flex; 水平轴对齐方式: `flex-start` `flex-end` `center`                                                                                                         | `flex-start`        |
+| align-items                                                                         | 配合 display: flex; 垂直轴对齐方式: `flex-start` `flex-end` `center`                                                                                                  | `flex-start`        |
+| border-radius                                                                       | 圆角边框，支持`%`、`rpx`、`px`                                                                                                                                                       | -        |
+| box-sizing                                                                          | 可选值：`border-box`                                                                                                                                                                 | -        |
+| box-shadow                                                                          | 投影                                                                                                                                                                                 | -        |
+| background(color)                                                                   | 支持渐变，但必须写百分比！如:`linear-gradient(,#ff971b 0%, #ff5000 100%)`、`radial-gradient(#0ff 15%, #f0f 60%)`,目前 radial-gradient 渐变的圆心为元素中点，半径为最长边，不支持设置 | -        |
+| background-clip                                                                	  | 文字渐变，配合`background`背景渐变，设置`background-clip: text` 达到文字渐变效果 | -        |
+| background-image                                                                    | view 元素背景：`url(src)`,若只是设置背景图，请不要设置`background-repeat`                                                                                                                                                           | -        |
+| background-repeat                                                                   | 设置是否及如何重复背景纹理，可选值：`repeat`、`repeat-x`、`repeat-y`、`no-repeat`                                                                                                    | `repeat` |
+| [object-fit](https://developer.mozilla.org/zh-CN/docs/Web/CSS/object-fit/)          | 图片元素适应容器方式,类似于`mode`,可选值：`cover`、 `contain`、 `fill`、 `none`                                                                                                      | -        |
+| [object-position](https://developer.mozilla.org/zh-CN/docs/Web/CSS/object-position) | 图片的对齐方式，配合`object-fit`使用                                                                                                                                                 | -        |
+
+### 图片填充模式 object-fit
+
+| 名称    | 含义                                                   |
+| ------- | ------------------------------------------------------ |
+| contain | 保持宽高缩放图片，使图片的长边能完全显示出来           |
+| cover   | 保持宽高缩放图片，使图片的短边能完全显示出来，裁剪长边 |
+| fill    | 拉伸图片，使图片填满元素                               |
+| none    | 保持图片原有尺寸                                       |
+
+### 事件 Events
+
+| 事件名   | 说明                                                             | 返回值 |
+| -------- | ---------------------------------------------------------------- | ------ |
+| success  | 生成图片成功,若使用`is-canvas-to-temp-filePath` 可以接收图片地址 | path   |
+| fail     | 生成图片失败                                                     | error  |
+| done     | 绘制成功                                                         |        |
+| progress | 绘制进度                                                         | number |
+
+### 暴露函数 Expose
+| 事件名   | 说明                                                             | 返回值 |
+| -------- | ---------------------------------------------------------------- | ------ |
+| render(object)   |  渲染器，传入JSON 绘制海报 | promise   |
+| [canvasToTempFilePath](https://uniapp.dcloud.io/api/canvas/canvasToTempFilePath.html#canvastotempfilepath)(object)   | 把当前画布指定区域的内容导出生成指定大小的图片，并返回文件临时路径。    |   |
+| canvasToTempFilePathSync(object)    | 同步接口，同上                                                         |        |
+
+
+## 常见问题
+
+- 1、H5 端使用网络图片需要解决跨域问题。
+- 2、小程序使用网络图片需要去公众平台增加下载白名单！二级域名也需要配！
+- 3、H5 端生成图片是 base64，有时显示只有一半可以使用原生标签`<IMG/>`
+- 4、发生保存图片倾斜变形或提示 native buffer exceed size limit 时，使用 pixel-ratio="2"参数，降分辨率。
+- 5、h5 保存图片不需要调接口，提示用户长按图片保存。
+- 6、画板不能隐藏，包括`v-if`，`v-show`、`display:none`、`opacity:0`，另外也不要把画板放在弹窗里。如果需要隐藏画板请设置 `custom-style="position: fixed; left: 200%"`
+- 7、微信小程序真机调试请使用 **真机调试2.0**，不支持1.0。
+- 8、微信小程序打开调试时可以生但并闭无法生成时，这种情况一般是没有在公众号配置download域名
+- 9、HBX 3.4.5之前的版本不支持vue3
+- 10、在微信开发工具上 canvas 层级最高无法zindex，并不影响真机
+- 11、请不要导入非uni_modules插件
+- 12、关于QQ小程序 报 Propertyor method"toJSON"is not defined 请把基础库调到 1.50.3
+- 13、支付宝小程序 IDE 不支持 生成图片 请以真机调试结果为准
+- 14、返回值为字符串 `data:,` 大概是尺寸超过限制，设置 pixel-ratio="2"
+- 华为手机 APP 上无法生成图片，请使用 HBX2.9.11++（已过时，忽略这条）
+- IOS APP 请勿使用 HBX2.9.3.20201014 的版本！这个版本无法生成图片。（已过时，忽略这条）
+- 苹果微信 7.0.20 存在闪退和图片无法 onload 为微信 bug（已过时，忽略这条）
+- 微信小程序 IOS 旧接口 如父级设置圆角，子级也设会导致子级的失效，为旧接口BUG。
+- 微信小程序 安卓 旧接口 如使用图片必须加背景色，为旧接口BUG。
+- 微信小程序 安卓端 [图片可能在首次可以加载成功，再次加载会不触发任何事件](https://developers.weixin.qq.com/community/develop/doc/000ee2b8dacf4009337f51f4556800?highLine=canvas%25202d%2520createImage)，临时解决方法是给图片加个时间戳
+## 打赏
+
+如果你觉得本插件，解决了你的问题，赠人玫瑰，手留余香。
+
+![](https://testingcf.jsdelivr.net/gh/liangei/image@1.9/alipay.png)
+![](https://testingcf.jsdelivr.net/gh/liangei/image@1.9/wpay.png)
\ No newline at end of file
diff --git a/uni_modules/mp-html/README.md b/uni_modules/mp-html/README.md
new file mode 100644
index 0000000..f825383
--- /dev/null
+++ b/uni_modules/mp-html/README.md
@@ -0,0 +1,191 @@
+## 为减小组件包的大小，默认组件包中不包含编辑、latex 公式等扩展功能，需要使用扩展功能的请参考下方的 插件扩展 栏的说明
+
+## 功能介绍
+- 全端支持（含 `v3、NVUE`）
+- 支持丰富的标签（包括 `table`、`video`、`svg` 等）
+- 支持丰富的事件效果（自动预览图片、链接处理等）
+- 支持设置占位图（加载中、出错时、预览时）
+- 支持锚点跳转、长按复制等丰富功能
+- 支持大部分 *html* 实体
+- 丰富的插件（关键词搜索、内容编辑、`latex` 公式等）
+- 效率高、容错性强且轻量化
+
+查看 [功能介绍](https://jin-yufeng.gitee.io/mp-html/#/overview/feature) 了解更多
+
+## 使用方法
+- `uni_modules` 方式  
+  1. 点击右上角的 `使用 HBuilder X 导入插件` 按钮直接导入项目或点击 `下载插件 ZIP` 按钮下载插件包并解压到项目的 `uni_modules/mp-html` 目录下  
+  2. 在需要使用页面的 `(n)vue` 文件中添加  
+     ```html
+     <!-- 不需要引入，可直接使用 -->
+     <mp-html :content="html" />
+     ```
+     ```javascript
+     export default {
+       data() {
+         return {
+           html: '<div>Hello World!</div>'
+         }
+       }
+     }
+     ```
+  3. 需要更新版本时在 `HBuilder X` 中右键 `uni_modules/mp-html` 目录选择 `从插件市场更新` 即可  
+
+- 源码方式  
+  1. 从 [github](https://github.com/jin-yufeng/mp-html/tree/master/dist/uni-app) 或 [gitee](https://gitee.com/jin-yufeng/mp-html/tree/master/dist/uni-app) 下载源码  
+     插件市场的 **非 uni_modules 版本** 无法更新，不建议从插件市场获取  
+  2. 在需要使用页面的 `(n)vue` 文件中添加  
+     ```html
+     <mp-html :content="html" />
+     ```
+     ```javascript
+     import mpHtml from '@/components/mp-html/mp-html'
+     export default {
+       // HBuilderX 2.5.5+ 可以通过 easycom 自动引入
+       components: {
+         mpHtml
+       },
+       data() {
+         return {
+           html: '<div>Hello World!</div>'
+         }
+       }
+     }
+     ```
+
+- npm 方式  
+  1. 在项目根目录下执行  
+     ```bash
+     npm install mp-html
+     ```
+  2. 在需要使用页面的 `(n)vue` 文件中添加  
+     ```html
+     <mp-html :content="html" />
+     ```
+     ```javascript
+     import mpHtml from 'mp-html/dist/uni-app/components/mp-html/mp-html'
+     export default {
+       // 不可省略
+       components: {
+         mpHtml
+       },
+       data() {
+         return {
+           html: '<div>Hello World!</div>'
+         }
+       }
+     }
+     ```
+  3. 需要更新版本时执行以下命令即可  
+     ```bash
+     npm update mp-html
+     ```
+  
+  使用 *cli* 方式运行的项目，通过 *npm* 方式引入时，需要在 *vue.config.js* 中配置 *transpileDependencies*，详情可见 [#330](https://github.com/jin-yufeng/mp-html/issues/330#issuecomment-913617687)  
+  如果在 **nvue** 中使用还要将 `dist/uni-app/static` 目录下的内容拷贝到项目的 `static` 目录下，否则无法运行  
+
+查看 [快速开始](https://jin-yufeng.gitee.io/mp-html/#/overview/quickstart) 了解更多
+
+## 组件属性
+
+| 属性 | 类型 | 默认值 | 说明 |
+|:---:|:---:|:---:|---|
+| container-style | String |  | 容器的样式（[2.1.0+](https://jin-yufeng.gitee.io/mp-html/#/changelog/changelog#v210)） |
+| content | String |  | 用于渲染的 html 字符串 |
+| copy-link | Boolean | true | 是否允许外部链接被点击时自动复制 |
+| domain | String |  | 主域名（用于链接拼接） |
+| error-img | String |  | 图片出错时的占位图链接 |
+| lazy-load | Boolean | false | 是否开启图片懒加载 |
+| loading-img | String |  | 图片加载过程中的占位图链接 |
+| pause-video | Boolean | true | 是否在播放一个视频时自动暂停其他视频 |
+| preview-img | Boolean | true | 是否允许图片被点击时自动预览 |
+| scroll-table | Boolean | false | 是否给每个表格添加一个滚动层使其能单独横向滚动 |
+| selectable | Boolean | false | 是否开启文本长按复制 |
+| set-title | Boolean | true | 是否将 title 标签的内容设置到页面标题 |
+| show-img-menu | Boolean | true | 是否允许图片被长按时显示菜单 |
+| tag-style | Object |  | 设置标签的默认样式 |
+| use-anchor | Boolean | false | 是否使用锚点链接 |
+
+查看 [属性](https://jin-yufeng.gitee.io/mp-html/#/basic/prop) 了解更多
+
+## 组件事件
+
+| 名称 | 触发时机 |
+|:---:|---|
+| load | dom 树加载完毕时 |
+| ready | 图片加载完毕时 |
+| error | 发生渲染错误时 |
+| imgtap | 图片被点击时 |
+| linktap | 链接被点击时 |
+| play | 音视频播放时 |
+
+查看 [事件](https://jin-yufeng.gitee.io/mp-html/#/basic/event) 了解更多
+
+## api
+组件实例上提供了一些 `api` 方法可供调用
+
+| 名称 | 作用 |
+|:---:|---|
+| in | 将锚点跳转的范围限定在一个 scroll-view 内 |
+| navigateTo | 锚点跳转 |
+| getText | 获取文本内容 |
+| getRect | 获取富文本内容的位置和大小 |
+| setContent | 设置富文本内容 |
+| imgList | 获取所有图片的数组 |
+| pauseMedia | 暂停播放音视频（[2.2.2+](https://jin-yufeng.gitee.io/mp-html/#/changelog/changelog#v222)） |
+| setPlaybackRate | 设置音视频播放速率（[2.4.0+](https://jin-yufeng.gitee.io/mp-html/#/changelog/changelog#v240)） |
+
+查看 [api](https://jin-yufeng.gitee.io/mp-html/#/advanced/api) 了解更多
+
+## 插件扩展  
+除基本功能外，本组件还提供了丰富的扩展，可按照需要选用
+
+| 名称 | 作用 |
+|:---:|---|
+| audio | 音乐播放器 |
+| editable | 富文本 **编辑**（[示例项目](https://mp-html.oss-cn-hangzhou.aliyuncs.com/editable.zip)） |
+| emoji | 解析 emoji |
+| highlight | 代码块高亮显示 |
+| markdown | 渲染 markdown |
+| search | 关键词搜索 |
+| style | 匹配 style 标签中的样式 |
+| txv-video | 使用腾讯视频 |
+| img-cache | 图片缓存 by [@PentaTea](https://github.com/PentaTea) |
+| latex | 渲染 latex 公式 by [@Zeng-J](https://github.com/Zeng-J) |
+
+从插件市场导入的包中 **不含有** 扩展插件，使用插件需通过微信小程序 `富文本插件` 获取或参考以下方法进行打包：  
+1. 获取完整组件包  
+   ```bash
+   npm install mp-html
+   ```
+2. 编辑 `tools/config.js` 中的 `plugins` 项，选择需要的插件  
+3. 生成新的组件包  
+   在 `node_modules/mp-html` 目录下执行  
+   ```bash
+   npm install
+   npm run build:uni-app
+   ```
+4. 拷贝 `dist/uni-app` 中的内容到项目根目录  
+
+查看 [插件](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin) 了解更多
+
+## 关于 nvue
+`nvue` 使用原生渲染，不支持部分 `css` 样式，为实现和 `html` 相同的效果，组件内部通过 `web-view` 进行渲染，性能上差于原生，根据 `weex` 官方建议，`web` 标签仅应用在非常规的降级场景。因此，如果通过原生的方式（如 `richtext`）能够满足需要，则不建议使用本组件，如果有较多的富文本内容，则可以直接使用 `vue` 页面  
+由于渲染方式与其他端不同，有以下限制：  
+1. 不支持 `lazy-load` 属性
+2. 视频不支持全屏播放
+3. 如果在 `flex-direction: row` 的容器中使用，需要给组件设置宽度或设置 `flex: 1` 占满剩余宽度
+
+纯 `nvue` 模式下，[此问题](https://ask.dcloud.net.cn/question/119678) 修复前，不支持通过 `uni_modules` 引入，需要本地引入（将 [dist/uni-app](https://github.com/jin-yufeng/mp-html/tree/master/dist/uni-app) 中的内容拷贝到项目根目录下）  
+
+## 立即体验
+![富文本插件](https://mp-html.oss-cn-hangzhou.aliyuncs.com/qrcode.jpg)
+
+## 问题反馈
+遇到问题时，请先查阅 [常见问题](https://jin-yufeng.gitee.io/mp-html/#/question/faq) 和 [issue](https://github.com/jin-yufeng/mp-html/issues) 中是否已有相同的问题  
+可通过 [issue](https://github.com/jin-yufeng/mp-html/issues/new/choose) 、插件问答或发送邮件到 [mp_html@126.com](mailto:mp_html@126.com) 提问，不建议在评论区提问（不方便回复）  
+提问请严格按照 [issue 模板](https://github.com/jin-yufeng/mp-html/issues/new/choose) ，描述清楚使用环境、`html` 内容或可复现的 `demo` 项目以及复现方式，对于 **描述不清**、**无法复现** 或重复的问题将不予回复  
+
+欢迎加入 `QQ` 交流群：`699734691`  
+
+查看 [问题反馈](https://jin-yufeng.gitee.io/mp-html/#/question/feedback) 了解更多
diff --git a/uni_modules/mp-html/changelog.md b/uni_modules/mp-html/changelog.md
new file mode 100644
index 0000000..51d049e
--- /dev/null
+++ b/uni_modules/mp-html/changelog.md
@@ -0,0 +1,121 @@
+## v2.4.1（2022-12-25）
+1. `F` 修复了没有图片时 `ready` 事件可能不触发的问题
+2. `F` 修复了加载过程中可能出现 `Root label not found` 错误的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/470)
+3. `F` 修复了 `audio` 插件退出页面可能会报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/457)
+4. `F` 修复了 `vue3` 运行到 `app` 在 `HBuilder X 3.6.10` 以上报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/480)
+5. `F` 修复了 `nvue` 端链接中包含 `%22` 时可能无法显示的问题
+6. `F` 修复了 `vue3` 使用 `highlight` 插件可能报错的问题
+## v2.4.0（2022-08-27）
+1. `A` 增加了 [setPlaybackRate](https://jin-yufeng.gitee.io/mp-html/#/advanced/api#setPlaybackRate) 的 `api`，可以设置音视频的播放速率 [详细](https://github.com/jin-yufeng/mp-html/issues/452)
+2. `A` 示例小程序代码开源 [详细](https://github.com/jin-yufeng/mp-html-demo)
+3. `U` 优化 `ready` 事件触发时机，未设置懒加载的情况下基本可以准确触发 [详细](https://github.com/jin-yufeng/mp-html/issues/195)
+4. `U` `highlight` 插件在编辑状态下不进行高亮处理，便于编辑
+5. `F` 修复了 `flex` 布局下图片大小可能不正确的问题
+6. `F` 修复了 `selectable` 属性没有设置 `force` 也可能出现渲染异常的问题
+7. `F` 修复了表格中的图片大小可能不正确的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/448)
+8. `F` 修复了含有合并单元格的表格可能无法设置竖直对齐的问题
+9. `F` 修复了 `editable` 插件在 `scroll-view` 中使用时工具条位置可能不正确的问题
+10. `F` 修复了 `vue3` 使用 [search](advanced/plugin#search) 插件可能导致错误换行的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/449)
+## v2.3.2（2022-08-13）
+1. `A` 增加 [latex](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#latex) 插件，可以渲染数学公式 [详细](https://github.com/jin-yufeng/mp-html/pull/447) by [@Zeng-J](https://github.com/Zeng-J)
+2. `U` 优化根节点下有很多标签的长内容渲染速度
+3. `U` `highlight` 插件适配 `lang-xxx` 格式
+4. `F` 修复了 `table` 标签设置 `border` 属性后可能无法修改边框样式的问题 [详细](https://github.com/jin-yufeng/mp-html/pull/439) by [@zouxingjie](https://github.com/zouxingjie)
+5. `F` 修复了 `editable` 插件输入连续空格无效的问题
+6. `F` 修复了 `vue3` 图片设置 `inline` 会报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/438)
+7. `F` 修复了 `vue3` 使用 `table` 可能报错的问题
+## v2.3.1（2022-05-20）
+1. `U` `app` 端支持使用本地图片
+2. `U` 优化了微信小程序 `selectable` 属性在 `ios` 端的处理 [详细](https://jin-yufeng.gitee.io/mp-html/#/basic/prop#selectable)
+3. `F` 修复了 `editable` 插件不在顶部时 `tooltip` 位置可能错误的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/430)
+4. `F` 修复了 `vue3` 运行到微信小程序可能报错丢失内容的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/414)
+5. `F` 修复了 `vue3` 部分标签可能被错误换行的问题
+6. `F` 修复了 `editable` 插件 `app` 端插入视频无法预览的问题
+## v2.3.0（2022-04-01）
+1. `A` 增加了 `play` 事件，音视频播放时触发，可用于与页面其他音视频进行互斥播放 [详细](basic/event#play)
+2. `U` `show-img-menu` 属性支持控制预览时是否长按弹出菜单
+3. `U` 优化 `wxs` 处理，提高渲染性能 [详细](https://developers.weixin.qq.com/community/develop/article/doc/0006cc2b204740f601bd43fa25a413)  
+4. `U` `video` 标签支持 `object-fit` 属性
+5. `U` 增加支持一些常用实体编码 [详细](https://github.com/jin-yufeng/mp-html/issues/418)
+6. `F` 修复了图片仅设置高度可能不显示的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/410)
+7. `F` 修复了 `video` 标签高度设置为 `auto` 不显示的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/411)
+8. `F` 修复了使用 `grid` 布局时可能样式错误的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/413)
+9. `F` 修复了含有合并单元格的表格部分情况下显示异常的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/417)
+10. `F` 修复了 `editable` 插件连续插入内容时顺序不正确的问题
+11. `F` 修复了 `uni-app` 包 `vue3` 使用 `audio` 插件报错的问题
+12. `F` 修复了 `uni-app` 包 `highlight` 插件使用自定义的 `prism.min.js` 报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/416)
+## v2.2.2（2022-02-26）
+1. `A` 增加了 [pauseMedia](https://jin-yufeng.gitee.io/mp-html/#/advanced/api#pauseMedia) 的 `api`，可用于暂停播放音视频 [详细](https://github.com/jin-yufeng/mp-html/issues/317)
+2. `U` 优化了长内容的加载速度  
+3. `U` 适配 `vue3` [#389](https://github.com/jin-yufeng/mp-html/issues/389)、[#398](https://github.com/jin-yufeng/mp-html/pull/398) by [@zhouhuafei](https://github.com/zhouhuafei)、[#400](https://github.com/jin-yufeng/mp-html/issues/400)
+4. `F` 修复了小程序端图片高度设置为百分比时可能不显示的问题
+5. `F` 修复了 `highlight` 插件部分情况下可能显示不完整的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/403)
+## v2.2.1（2021-12-24）
+1. `A` `editable` 插件增加上下移动标签功能
+2. `U` `editable` 插件支持在文本中间光标处插入内容
+3. `F` 修复了 `nvue` 端设置 `margin` 后可能导致高度不正确的问题
+4. `F` 修复了 `highlight` 插件使用压缩版的 `prism.css` 可能导致背景失效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/367)
+5. `F` 修复了编辑状态下使用 `emoji` 插件内容为空时可能报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/371)
+6. `F` 修复了使用 `editable` 插件后将 `selectable` 属性设置为 `force` 不生效的问题
+## v2.2.0（2021-10-12）
+1. `A` 增加 `customElements` 配置项，便于添加自定义功能性标签 [详细](https://github.com/jin-yufeng/mp-html/issues/350)
+2. `A` `editable` 插件增加切换音视频自动播放状态的功能 [详细](https://github.com/jin-yufeng/mp-html/pull/341) by [@leeseett](https://github.com/leeseett)
+3. `A` `editable` 插件删除媒体标签时触发 `remove` 事件，便于删除已上传的文件
+4. `U` `editable` 插件 `insertImg` 方法支持同时插入多张图片 [详细](https://github.com/jin-yufeng/mp-html/issues/342)
+5. `U` `editable` 插入图片和音视频时支持拼接 `domian` 主域名
+6. `F` 修复了内部链接参数中包含 `://` 时被认为是外部链接的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/356)
+7. `F` 修复了部分 `svg` 标签名或属性名大小写不正确时不生效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/351)
+8. `F` 修复了 `nvue` 页面运行到非 `app` 平台时可能样式错误的问题
+## v2.1.5（2021-08-13）
+1. `A` 增加支持标签的 `dir` 属性
+2. `F` 修复了 `ruby` 标签文字与拼音没有居中对齐的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/325)
+3. `F` 修复了音视频标签内有 `a` 标签时可能无法播放的问题
+4. `F` 修复了 `externStyle` 中的 `class` 名包含下划线或数字时可能失效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/326)
+5. `F` 修复了 `h5` 端引入 `externStyle` 可能不生效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/326)
+## v2.1.4（2021-07-14）
+1. `F` 修复了 `rt` 标签无法设置样式的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/318)
+2. `F` 修复了表格中有单元格同时合并行和列时可能显示不正确的问题
+3. `F` 修复了 `app` 端无法关闭图片长按菜单的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/322)
+4. `F` 修复了 `editable` 插件只能添加图片链接不能修改的问题 [详细](https://github.com/jin-yufeng/mp-html/pull/312) by [@leeseett](https://github.com/leeseett)
+## v2.1.3（2021-06-12）
+1. `A` `editable` 插件增加 `insertTable` 方法
+2. `U` `editable` 插件支持编辑表格中的空白单元格 [详细](https://github.com/jin-yufeng/mp-html/issues/310)
+3. `F` 修复了 `externStyle` 中使用伪类可能失效的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/298)
+4. `F` 修复了多个组件同时使用时 `tag-style` 属性时可能互相影响的问题 [详细](https://github.com/jin-yufeng/mp-html/pull/305) by [@woodguoyu](https://github.com/woodguoyu)
+5. `F` 修复了包含 `linearGradient` 的 `svg` 可能无法显示的问题
+6. `F` 修复了编译到头条小程序时可能报错的问题
+7. `F` 修复了 `nvue` 端不触发 `click` 事件的问题
+8. `F` 修复了 `editable` 插件尾部插入时无法撤销的问题
+9. `F` 修复了 `editable` 插件的 `insertHtml` 方法只能在末尾插入的问题
+10. `F` 修复了 `editable` 插件插入音频不显示的问题
+## v2.1.2（2021-04-24）
+1. `A` 增加了 [img-cache](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#img-cache) 插件，可以在 `app` 端缓存图片 [详细](https://github.com/jin-yufeng/mp-html/issues/292) by [@PentaTea](https://github.com/PentaTea)
+2. `U` 支持通过 `container-style` 属性设置 `white-space` 来保留连续空格和换行符 [详细](https://jin-yufeng.gitee.io/mp-html/#/question/faq#space)
+3. `U` 代码风格符合 [standard](https://standardjs.com) 标准
+4. `U` `editable` 插件编辑状态下支持预览视频 [详细](https://github.com/jin-yufeng/mp-html/issues/286)
+5. `F` 修复了 `svg` 标签内嵌 `svg` 时无法显示的问题
+6. `F` 修复了编译到支付宝和头条小程序时部分区域不可复制的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/291)
+## v2.1.1（2021-04-09）
+1. 修复了对 `p` 标签设置 `tag-style` 可能不生效的问题
+2. 修复了 `svg` 标签中的文本无法显示的问题
+3. 修复了使用 `editable` 插件编辑表格时可能报错的问题
+4. 修复了使用 `highlight` 插件运行到头条小程序时可能没有样式的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/280)
+5. 修复了使用 `editable` 插件 `editable` 属性为 `false` 时会报错的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/284)
+6. 修复了 `style` 插件连续子选择器失效的问题
+7. 修复了 `editable` 插件无法修改图片和字体大小的问题
+## v2.1.0.2（2021-03-21）
+修复了 `nvue` 端使用可能报错的问题
+## v2.1.0（2021-03-20）
+1. `A` 增加了 [container-style](https://jin-yufeng.gitee.io/mp-html/#/basic/prop#container-style) 属性 [详细](https://gitee.com/jin-yufeng/mp-html/pulls/1)
+2. `A` 增加支持 `strike` 标签
+3. `A` `editable` 插件增加 `placeholder` 属性 [详细](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#editable)
+4. `A` `editable` 插件增加 `insertHtml` 方法 [详细](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#editable)
+5. `U` 外部样式支持标签名选择器 [详细](https://jin-yufeng.gitee.io/mp-html/#/overview/quickstart#setting)
+6. `F` 修复了 `nvue` 端部分情况下可能不显示的问题
+## v2.0.5（2021-03-12）
+1. `U` [linktap](https://jin-yufeng.gitee.io/mp-html/#/basic/event#linktap) 事件增加返回内部文本内容 `innerText` [详细](https://github.com/jin-yufeng/mp-html/issues/271)
+2. `U` [selectable](https://jin-yufeng.gitee.io/mp-html/#/basic/prop#selectable) 属性设置为 `force` 时能够在微信 `iOS` 端生效（文本块会变成 `inline-block`） [详细](https://github.com/jin-yufeng/mp-html/issues/267)
+3. `F` 修复了部分情况下竖向无法滚动的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/182)
+4. `F` 修复了多次修改富文本数据时部分内容可能不显示的问题
+5. `F` 修复了 [腾讯视频](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#txv-video) 插件可能无法播放的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/265)
+6. `F` 修复了 [highlight](https://jin-yufeng.gitee.io/mp-html/#/advanced/plugin#highlight) 插件没有设置高亮语言时没有应用默认样式的问题 [详细](https://github.com/jin-yufeng/mp-html/issues/276) by [@fuzui](https://github.com/fuzui)
diff --git a/uni_modules/mp-html/components/mp-html/mp-html.vue b/uni_modules/mp-html/components/mp-html/mp-html.vue
new file mode 100644
index 0000000..a9b5dec
--- /dev/null
+++ b/uni_modules/mp-html/components/mp-html/mp-html.vue
@@ -0,0 +1,498 @@
+<template>
+  <view id="_root" :class="(selectable?'_select ':'')+'_root'" :style="containerStyle">
+    <slot v-if="!nodes[0]" />
+    <!-- #ifndef APP-PLUS-NVUE -->
+    <node v-else :childs="nodes" :opts="[lazyLoad,loadingImg,errorImg,showImgMenu,selectable]" name="span" />
+    <!-- #endif -->
+    <!-- #ifdef APP-PLUS-NVUE -->
+    <web-view ref="web" src="/uni_modules/mp-html/static/app-plus/mp-html/local.html" :style="'margin-top:-2px;height:' + height + 'px'" @onPostMessage="_onMessage" />
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+/**
+ * mp-html v2.4.1
+ * @description 富文本组件
+ * @tutorial https://github.com/jin-yufeng/mp-html
+ * @property {String} container-style 容器的样式
+ * @property {String} content 用于渲染的 html 字符串
+ * @property {Boolean} copy-link 是否允许外部链接被点击时自动复制
+ * @property {String} domain 主域名，用于拼接链接
+ * @property {String} error-img 图片出错时的占位图链接
+ * @property {Boolean} lazy-load 是否开启图片懒加载
+ * @property {string} loading-img 图片加载过程中的占位图链接
+ * @property {Boolean} pause-video 是否在播放一个视频时自动暂停其他视频
+ * @property {Boolean} preview-img 是否允许图片被点击时自动预览
+ * @property {Boolean} scroll-table 是否给每个表格添加一个滚动层使其能单独横向滚动
+ * @property {Boolean | String} selectable 是否开启长按复制
+ * @property {Boolean} set-title 是否将 title 标签的内容设置到页面标题
+ * @property {Boolean} show-img-menu 是否允许图片被长按时显示菜单
+ * @property {Object} tag-style 标签的默认样式
+ * @property {Boolean | Number} use-anchor 是否使用锚点链接
+ * @event {Function} load dom 结构加载完毕时触发
+ * @event {Function} ready 所有图片加载完毕时触发
+ * @event {Function} imgtap 图片被点击时触发
+ * @event {Function} linktap 链接被点击时触发
+ * @event {Function} play 音视频播放时触发
+ * @event {Function} error 媒体加载出错时触发
+ */
+// #ifndef APP-PLUS-NVUE
+import node from './node/node'
+// #endif
+import Parser from './parser'
+const plugins=[]
+// #ifdef APP-PLUS-NVUE
+const dom = weex.requireModule('dom')
+// #endif
+export default {
+  name: 'mp-html',
+  data () {
+    return {
+      nodes: [],
+      // #ifdef APP-PLUS-NVUE
+      height: 3
+      // #endif
+    }
+  },
+  props: {
+    containerStyle: {
+      type: String,
+      default: ''
+    },
+    content: {
+      type: String,
+      default: ''
+    },
+    copyLink: {
+      type: [Boolean, String],
+      default: true
+    },
+    domain: String,
+    errorImg: {
+      type: String,
+      default: ''
+    },
+    lazyLoad: {
+      type: [Boolean, String],
+      default: false
+    },
+    loadingImg: {
+      type: String,
+      default: ''
+    },
+    pauseVideo: {
+      type: [Boolean, String],
+      default: true
+    },
+    previewImg: {
+      type: [Boolean, String],
+      default: true
+    },
+    scrollTable: [Boolean, String],
+    selectable: [Boolean, String],
+    setTitle: {
+      type: [Boolean, String],
+      default: true
+    },
+    showImgMenu: {
+      type: [Boolean, String],
+      default: true
+    },
+    tagStyle: Object,
+    useAnchor: [Boolean, Number]
+  },
+  // #ifdef VUE3
+  emits: ['load', 'ready', 'imgtap', 'linktap', 'play', 'error'],
+  // #endif
+  // #ifndef APP-PLUS-NVUE
+  components: {
+    node
+  },
+  // #endif
+  watch: {
+    content (content) {
+      this.setContent(content)
+    }
+  },
+  created () {
+    this.plugins = []
+    for (let i = plugins.length; i--;) {
+      this.plugins.push(new plugins[i](this))
+    }
+  },
+  mounted () {
+    if (this.content && !this.nodes.length) {
+      this.setContent(this.content)
+    }
+  },
+  beforeDestroy () {
+    this._hook('onDetached')
+  },
+  methods: {
+    /**
+     * @description 将锚点跳转的范围限定在一个 scroll-view 内
+     * @param {Object} page scroll-view 所在页面的示例
+     * @param {String} selector scroll-view 的选择器
+     * @param {String} scrollTop scroll-view scroll-top 属性绑定的变量名
+     */
+    in (page, selector, scrollTop) {
+      // #ifndef APP-PLUS-NVUE
+      if (page && selector && scrollTop) {
+        this._in = {
+          page,
+          selector,
+          scrollTop
+        }
+      }
+      // #endif
+    },
+
+    /**
+     * @description 锚点跳转
+     * @param {String} id 要跳转的锚点 id
+     * @param {Number} offset 跳转位置的偏移量
+     * @returns {Promise}
+     */
+    navigateTo (id, offset) {
+      return new Promise((resolve, reject) => {
+        if (!this.useAnchor) {
+          reject(Error('Anchor is disabled'))
+          return
+        }
+        offset = offset || parseInt(this.useAnchor) || 0
+        // #ifdef APP-PLUS-NVUE
+        if (!id) {
+          dom.scrollToElement(this.$refs.web, {
+            offset
+          })
+          resolve()
+        } else {
+          this._navigateTo = {
+            resolve,
+            reject,
+            offset
+          }
+          this.$refs.web.evalJs('uni.postMessage({data:{action:"getOffset",offset:(document.getElementById(' + id + ')||{}).offsetTop}})')
+        }
+        // #endif
+        // #ifndef APP-PLUS-NVUE
+        let deep = ' '
+        // #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO
+        deep = '>>>'
+        // #endif
+        const selector = uni.createSelectorQuery()
+          // #ifndef MP-ALIPAY
+          .in(this._in ? this._in.page : this)
+          // #endif
+          .select((this._in ? this._in.selector : '._root') + (id ? `${deep}#${id}` : '')).boundingClientRect()
+        if (this._in) {
+          selector.select(this._in.selector).scrollOffset()
+            .select(this._in.selector).boundingClientRect()
+        } else {
+          // 获取 scroll-view 的位置和滚动距离
+          selector.selectViewport().scrollOffset() // 获取窗口的滚动距离
+        }
+        selector.exec(res => {
+          if (!res[0]) {
+            reject(Error('Label not found'))
+            return
+          }
+          const scrollTop = res[1].scrollTop + res[0].top - (res[2] ? res[2].top : 0) + offset
+          if (this._in) {
+            // scroll-view 跳转
+            this._in.page[this._in.scrollTop] = scrollTop
+          } else {
+            // 页面跳转
+            uni.pageScrollTo({
+              scrollTop,
+              duration: 300
+            })
+          }
+          resolve()
+        })
+        // #endif
+      })
+    },
+
+    /**
+     * @description 获取文本内容
+     * @return {String}
+     */
+    getText (nodes) {
+      let text = '';
+      (function traversal (nodes) {
+        for (let i = 0; i < nodes.length; i++) {
+          const node = nodes[i]
+          if (node.type === 'text') {
+            text += node.text.replace(/&amp;/g, '&')
+          } else if (node.name === 'br') {
+            text += '\n'
+          } else {
+            // 块级标签前后加换行
+            const isBlock = node.name === 'p' || node.name === 'div' || node.name === 'tr' || node.name === 'li' || (node.name[0] === 'h' && node.name[1] > '0' && node.name[1] < '7')
+            if (isBlock && text && text[text.length - 1] !== '\n') {
+              text += '\n'
+            }
+            // 递归获取子节点的文本
+            if (node.children) {
+              traversal(node.children)
+            }
+            if (isBlock && text[text.length - 1] !== '\n') {
+              text += '\n'
+            } else if (node.name === 'td' || node.name === 'th') {
+              text += '\t'
+            }
+          }
+        }
+      })(nodes || this.nodes)
+      return text
+    },
+
+    /**
+     * @description 获取内容大小和位置
+     * @return {Promise}
+     */
+    getRect () {
+      return new Promise((resolve, reject) => {
+        uni.createSelectorQuery()
+          // #ifndef MP-ALIPAY
+          .in(this)
+          // #endif
+          .select('#_root').boundingClientRect().exec(res => res[0] ? resolve(res[0]) : reject(Error('Root label not found')))
+      })
+    },
+
+    /**
+     * @description 暂停播放媒体
+     */
+    pauseMedia () {
+      for (let i = (this._videos || []).length; i--;) {
+        this._videos[i].pause()
+      }
+      // #ifdef APP-PLUS
+      const command = 'for(var e=document.getElementsByTagName("video"),i=e.length;i--;)e[i].pause()'
+      // #ifndef APP-PLUS-NVUE
+      let page = this.$parent
+      while (!page.$scope) page = page.$parent
+      page.$scope.$getAppWebview().evalJS(command)
+      // #endif
+      // #ifdef APP-PLUS-NVUE
+      this.$refs.web.evalJs(command)
+      // #endif
+      // #endif
+    },
+
+    /**
+     * @description 设置媒体播放速率
+     * @param {Number} rate 播放速率
+     */
+    setPlaybackRate (rate) {
+      this.playbackRate = rate
+      for (let i = (this._videos || []).length; i--;) {
+        this._videos[i].playbackRate(rate)
+      }
+      // #ifdef APP-PLUS
+      const command = 'for(var e=document.getElementsByTagName("video"),i=e.length;i--;)e[i].playbackRate=' + rate
+      // #ifndef APP-PLUS-NVUE
+      let page = this.$parent
+      while (!page.$scope) page = page.$parent
+      page.$scope.$getAppWebview().evalJS(command)
+      // #endif
+      // #ifdef APP-PLUS-NVUE
+      this.$refs.web.evalJs(command)
+      // #endif
+      // #endif
+    },
+
+    /**
+     * @description 设置内容
+     * @param {String} content html 内容
+     * @param {Boolean} append 是否在尾部追加
+     */
+    setContent (content, append) {
+      if (!append || !this.imgList) {
+        this.imgList = []
+      }
+      const nodes = new Parser(this).parse(content)
+      // #ifdef APP-PLUS-NVUE
+      if (this._ready) {
+        this._set(nodes, append)
+      }
+      // #endif
+      this.$set(this, 'nodes', append ? (this.nodes || []).concat(nodes) : nodes)
+
+      // #ifndef APP-PLUS-NVUE
+      this._videos = []
+      this.$nextTick(() => {
+        this._hook('onLoad')
+        this.$emit('load')
+      })
+
+      if (this.lazyLoad || this.imgList._unloadimgs < this.imgList.length / 2) {
+        // 设置懒加载，每 350ms 获取高度，不变则认为加载完毕
+        let height = 0
+        const callback = rect => {
+          if (!rect || !rect.height) rect = {}
+          // 350ms 总高度无变化就触发 ready 事件
+          if (rect.height === height) {
+            this.$emit('ready', rect)
+          } else {
+            height = rect.height
+            setTimeout(() => {
+              this.getRect().then(callback).catch(callback)
+            }, 350)
+          }
+        }
+        this.getRect().then(callback).catch(callback)
+      } else {
+        // 未设置懒加载，等待所有图片加载完毕
+        if (!this.imgList._unloadimgs) {
+          this.getRect().then(rect => {
+            this.$emit('ready', rect)
+          }).catch(() => {
+            this.$emit('ready', {})
+          })
+        }
+      }
+      // #endif
+    },
+
+    /**
+     * @description 调用插件钩子函数
+     */
+    _hook (name) {
+      for (let i = plugins.length; i--;) {
+        if (this.plugins[i][name]) {
+          this.plugins[i][name]()
+        }
+      }
+    },
+
+    // #ifdef APP-PLUS-NVUE
+    /**
+     * @description 设置内容
+     */
+    _set (nodes, append) {
+      this.$refs.web.evalJs('setContent(' + JSON.stringify(nodes).replace(/%22/g, '') + ',' + JSON.stringify([this.containerStyle.replace(/(?:margin|padding)[^;]+/g, ''), this.errorImg, this.loadingImg, this.pauseVideo, this.scrollTable, this.selectable]) + ',' + append + ')')
+    },
+
+    /**
+     * @description 接收到 web-view 消息
+     */
+    _onMessage (e) {
+      const message = e.detail.data[0]
+      switch (message.action) {
+        // web-view 初始化完毕
+        case 'onJSBridgeReady':
+          this._ready = true
+          if (this.nodes) {
+            this._set(this.nodes)
+          }
+          break
+        // 内容 dom 加载完毕
+        case 'onLoad':
+          this.height = message.height
+          this._hook('onLoad')
+          this.$emit('load')
+          break
+        // 所有图片加载完毕
+        case 'onReady':
+          this.getRect().then(res => {
+            this.$emit('ready', res)
+          }).catch(() => {
+            this.$emit('ready', {})
+          })
+          break
+        // 总高度发生变化
+        case 'onHeightChange':
+          this.height = message.height
+          break
+        // 图片点击
+        case 'onImgTap':
+          this.$emit('imgtap', message.attrs)
+          if (this.previewImg) {
+            uni.previewImage({
+              current: parseInt(message.attrs.i),
+              urls: this.imgList
+            })
+          }
+          break
+        // 链接点击
+        case 'onLinkTap': {
+          const href = message.attrs.href
+          this.$emit('linktap', message.attrs)
+          if (href) {
+            // 锚点跳转
+            if (href[0] === '#') {
+              if (this.useAnchor) {
+                dom.scrollToElement(this.$refs.web, {
+                  offset: message.offset
+                })
+              }
+            } else if (href.includes('://')) {
+              // 打开外链
+              if (this.copyLink) {
+                plus.runtime.openWeb(href)
+              }
+            } else {
+              uni.navigateTo({
+                url: href,
+                fail () {
+                  uni.switchTab({
+                    url: href
+                  })
+                }
+              })
+            }
+          }
+          break
+        }
+        case 'onPlay':
+          this.$emit('play')
+          break
+        // 获取到锚点的偏移量
+        case 'getOffset':
+          if (typeof message.offset === 'number') {
+            dom.scrollToElement(this.$refs.web, {
+              offset: message.offset + this._navigateTo.offset
+            })
+            this._navigateTo.resolve()
+          } else {
+            this._navigateTo.reject(Error('Label not found'))
+          }
+          break
+        // 点击
+        case 'onClick':
+          this.$emit('tap')
+          this.$emit('click')
+          break
+        // 出错
+        case 'onError':
+          this.$emit('error', {
+            source: message.source,
+            attrs: message.attrs
+          })
+      }
+    }
+    // #endif
+  }
+}
+</script>
+
+<style>
+/* #ifndef APP-PLUS-NVUE */
+/* 根节点样式 */
+._root {
+  padding: 1px 0;
+  overflow-x: auto;
+  overflow-y: hidden;
+  -webkit-overflow-scrolling: touch;
+}
+
+/* 长按复制 */
+._select {
+  user-select: text;
+}
+/* #endif */
+</style>
diff --git a/uni_modules/mp-html/components/mp-html/node/node.vue b/uni_modules/mp-html/components/mp-html/node/node.vue
new file mode 100644
index 0000000..372bcd1
--- /dev/null
+++ b/uni_modules/mp-html/components/mp-html/node/node.vue
@@ -0,0 +1,576 @@
+<template>
+  <view :id="attrs.id" :class="'_block _'+name+' '+attrs.class" :style="attrs.style">
+    <block v-for="(n, i) in childs" v-bind:key="i">
+      <!-- 图片 -->
+      <!-- 占位图 -->
+      <image v-if="n.name==='img'&&!n.t&&((opts[1]&&!ctrl[i])||ctrl[i]<0)" class="_img" :style="n.attrs.style" :src="ctrl[i]<0?opts[2]:opts[1]" mode="widthFix" />
+      <!-- 显示图片 -->
+      <!-- #ifdef H5 || (APP-PLUS && VUE2) -->
+      <img v-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- #ifndef H5 || (APP-PLUS && VUE2) -->
+      <!-- 表格中的图片，使用 rich-text 防止大小不正确 -->
+      <rich-text v-if="n.name==='img'&&n.t" :style="'display:'+n.t" :nodes="'<img class=\'_img\' style=\''+n.attrs.style+'\' src=\''+n.attrs.src+'\'>'" :data-i="i" @tap.stop="imgTap" />
+      <!-- #endif -->
+      <!-- #ifndef H5 || APP-PLUS -->
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;height:1px;'+n.attrs.style" :src="n.attrs.src" :mode="!n.h?'widthFix':(!n.w?'heightFix':'')" :lazy-load="opts[0]" :webp="n.webp" :show-menu-by-longpress="opts[3]&&!n.attrs.ignore" :image-menu-prevent="!opts[3]||n.attrs.ignore" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- #ifdef APP-PLUS && VUE3 -->
+      <image v-else-if="n.name==='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;'+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :mode="!n.h?'widthFix':(!n.w?'heightFix':'')" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
+      <!-- #endif -->
+      <!-- 文本 -->
+      <!-- #ifdef MP-WEIXIN -->
+      <text v-else-if="n.text" :user-select="opts[4]=='force'&&isiOS" decode>{{n.text}}</text>
+      <!-- #endif -->
+      <!-- #ifndef MP-WEIXIN || MP-BAIDU || MP-ALIPAY || MP-TOUTIAO -->
+      <text v-else-if="n.text" decode>{{n.text}}</text>
+      <!-- #endif -->
+      <text v-else-if="n.name==='br'">\n</text>
+      <!-- 链接 -->
+      <view v-else-if="n.name==='a'" :id="n.attrs.id" :class="(n.attrs.href?'_a ':'')+n.attrs.class" hover-class="_hover" :style="'display:inline;'+n.attrs.style" :data-i="i" @tap.stop="linkTap">
+        <node name="span" :childs="n.children" :opts="opts" style="display:inherit" />
+      </view>
+      <!-- 视频 -->
+      <!-- #ifdef APP-PLUS -->
+      <view v-else-if="n.html" :id="n.attrs.id" :class="'_video '+n.attrs.class" :style="n.attrs.style" v-html="n.html" @vplay.stop="play" />
+      <!-- #endif -->
+      <!-- #ifndef APP-PLUS -->
+      <video v-else-if="n.name==='video'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :autoplay="n.attrs.autoplay" :controls="n.attrs.controls" :loop="n.attrs.loop" :muted="n.attrs.muted" :object-fit="n.attrs['object-fit']" :poster="n.attrs.poster" :src="n.src[ctrl[i]||0]" :data-i="i" @play="play" @error="mediaError" />
+      <!-- #endif -->
+      <!-- #ifdef H5 || APP-PLUS -->
+      <iframe v-else-if="n.name==='iframe'" :style="n.attrs.style" :allowfullscreen="n.attrs.allowfullscreen" :frameborder="n.attrs.frameborder" :src="n.attrs.src" />
+      <embed v-else-if="n.name==='embed'" :style="n.attrs.style" :src="n.attrs.src" />
+      <!-- #endif -->
+      <!-- #ifndef MP-TOUTIAO || ((H5 || APP-PLUS) && VUE3) -->
+      <!-- 音频 -->
+      <audio v-else-if="n.name==='audio'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :author="n.attrs.author" :controls="n.attrs.controls" :loop="n.attrs.loop" :name="n.attrs.name" :poster="n.attrs.poster" :src="n.src[ctrl[i]||0]" :data-i="i" @play="play" @error="mediaError" />
+      <!-- #endif -->
+      <view v-else-if="(n.name==='table'&&n.c)||n.name==='li'" :id="n.attrs.id" :class="'_'+n.name+' '+n.attrs.class" :style="n.attrs.style">
+        <node v-if="n.name==='li'" :childs="n.children" :opts="opts" />
+        <view v-else v-for="(tbody, x) in n.children" v-bind:key="x" :class="'_'+tbody.name+' '+tbody.attrs.class" :style="tbody.attrs.style">
+          <node v-if="tbody.name==='td'||tbody.name==='th'" :childs="tbody.children" :opts="opts" />
+          <block v-else v-for="(tr, y) in tbody.children" v-bind:key="y">
+            <view v-if="tr.name==='td'||tr.name==='th'" :class="'_'+tr.name+' '+tr.attrs.class" :style="tr.attrs.style">
+              <node :childs="tr.children" :opts="opts" />
+            </view>
+            <view v-else :class="'_'+tr.name+' '+tr.attrs.class" :style="tr.attrs.style">
+              <view v-for="(td, z) in tr.children" v-bind:key="z" :class="'_'+td.name+' '+td.attrs.class" :style="td.attrs.style">
+                <node :childs="td.children" :opts="opts" />
+              </view>
+            </view>
+          </block>
+        </view>
+      </view>
+      
+      <!-- 富文本 -->
+      <!-- #ifdef H5 || ((MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE2) -->
+      <rich-text v-else-if="!n.c&&!handler.isInline(n.name, n.attrs.style)" :id="n.attrs.id" :style="n.f" :user-select="opts[4]" :nodes="[n]" />
+      <!-- #endif -->
+      <!-- #ifndef H5 || ((MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE2) -->
+      <rich-text v-else-if="!n.c" :id="n.attrs.id" :style="n.f+';display:inline'" :preview="false" :selectable="opts[4]" :user-select="opts[4]" :nodes="[n]" />
+      <!-- #endif -->
+      <!-- 继续递归 -->
+      <view v-else-if="n.c===2" :id="n.attrs.id" :class="'_block _'+n.name+' '+n.attrs.class" :style="n.f+';'+n.attrs.style">
+        <node v-for="(n2, j) in n.children" v-bind:key="j" :style="n2.f" :name="n2.name" :attrs="n2.attrs" :childs="n2.children" :opts="opts" />
+      </view>
+      <node v-else :style="n.f" :name="n.name" :attrs="n.attrs" :childs="n.children" :opts="opts" />
+    </block>
+  </view>
+</template>
+<script module="handler" lang="wxs">
+// 行内标签列表
+var inlineTags = {
+  abbr: true,
+  b: true,
+  big: true,
+  code: true,
+  del: true,
+  em: true,
+  i: true,
+  ins: true,
+  label: true,
+  q: true,
+  small: true,
+  span: true,
+  strong: true,
+  sub: true,
+  sup: true
+}
+/**
+ * @description 判断是否为行内标签
+ */
+module.exports = {
+  isInline: function (tagName, style) {
+    return inlineTags[tagName] || (style || '').indexOf('display:inline') !== -1
+  }
+}
+</script>
+<script>
+
+import node from './node'
+export default {
+  name: 'node',
+  options: {
+    // #ifdef MP-WEIXIN
+    virtualHost: true,
+    // #endif
+    // #ifdef MP-TOUTIAO
+    addGlobalClass: false
+    // #endif
+  },
+  data () {
+    return {
+      ctrl: {},
+      // #ifdef MP-WEIXIN
+      isiOS: uni.getSystemInfoSync().system.includes('iOS')
+      // #endif
+    }
+  },
+  props: {
+    name: String,
+    attrs: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    childs: Array,
+    opts: Array
+  },
+  components: {
+
+    // #ifndef (H5 || APP-PLUS) && VUE3
+    node
+    // #endif
+  },
+  mounted () {
+    this.$nextTick(() => {
+      for (this.root = this.$parent; this.root.$options.name !== 'mp-html'; this.root = this.root.$parent);
+    })
+    // #ifdef H5 || APP-PLUS
+    if (this.opts[0]) {
+      let i
+      for (i = this.childs.length; i--;) {
+        if (this.childs[i].name === 'img') break
+      }
+      if (i !== -1) {
+        this.observer = uni.createIntersectionObserver(this).relativeToViewport({
+          top: 500,
+          bottom: 500
+        })
+        this.observer.observe('._img', res => {
+          if (res.intersectionRatio) {
+            this.$set(this.ctrl, 'load', 1)
+            this.observer.disconnect()
+          }
+        })
+      }
+    }
+    // #endif
+  },
+  beforeDestroy () {
+    // #ifdef H5 || APP-PLUS
+    if (this.observer) {
+      this.observer.disconnect()
+    }
+    // #endif
+  },
+  methods:{
+    // #ifdef MP-WEIXIN
+    toJSON () { return this },
+    // #endif
+    /**
+     * @description 播放视频事件
+     * @param {Event} e
+     */
+    play (e) {
+      this.root.$emit('play')
+      // #ifndef APP-PLUS
+      if (this.root.pauseVideo) {
+        let flag = false
+        const id = e.target.id
+        for (let i = this.root._videos.length; i--;) {
+          if (this.root._videos[i].id === id) {
+            flag = true
+          } else {
+            this.root._videos[i].pause() // 自动暂停其他视频
+          }
+        }
+        // 将自己加入列表
+        if (!flag) {
+          const ctx = uni.createVideoContext(id
+            // #ifndef MP-BAIDU
+            , this
+            // #endif
+          )
+          ctx.id = id
+          if (this.root.playbackRate) {
+            ctx.playbackRate(this.root.playbackRate)
+          }
+          this.root._videos.push(ctx)
+        }
+      }
+      // #endif
+    },
+
+    /**
+     * @description 图片点击事件
+     * @param {Event} e
+     */
+    imgTap (e) {
+      const node = this.childs[e.currentTarget.dataset.i]
+      if (node.a) {
+        this.linkTap(node.a)
+        return
+      }
+      if (node.attrs.ignore) return
+      // #ifdef H5 || APP-PLUS
+      node.attrs.src = node.attrs.src || node.attrs['data-src']
+      // #endif
+      this.root.$emit('imgtap', node.attrs)
+      // 自动预览图片
+      if (this.root.previewImg) {
+        uni.previewImage({
+          // #ifdef MP-WEIXIN
+          showmenu: this.root.showImgMenu,
+          // #endif
+          // #ifdef MP-ALIPAY
+          enablesavephoto: this.root.showImgMenu,
+          enableShowPhotoDownload: this.root.showImgMenu,
+          // #endif
+          current: parseInt(node.attrs.i),
+          urls: this.root.imgList
+        })
+      }
+    },
+
+    /**
+     * @description 图片长按
+     */
+    imgLongTap (e) {
+      // #ifdef APP-PLUS
+      const attrs = this.childs[e.currentTarget.dataset.i].attrs
+      if (this.opts[3] && !attrs.ignore) {
+        uni.showActionSheet({
+          itemList: ['保存图片'],
+          success: () => {
+            const save = path => {
+              uni.saveImageToPhotosAlbum({
+                filePath: path,
+                success () {
+                  uni.showToast({
+                    title: '保存成功'
+                  })
+                }
+              })
+            }
+            if (this.root.imgList[attrs.i].startsWith('http')) {
+              uni.downloadFile({
+                url: this.root.imgList[attrs.i],
+                success: res => save(res.tempFilePath)
+              })
+            } else {
+              save(this.root.imgList[attrs.i])
+            }
+          }
+        })
+      }
+      // #endif
+    },
+
+    /**
+     * @description 图片加载完成事件
+     * @param {Event} e
+     */
+    imgLoad (e) {
+      const i = e.currentTarget.dataset.i
+      /* #ifndef H5 || (APP-PLUS && VUE2) */
+      if (!this.childs[i].w) {
+        // 设置原宽度
+        this.$set(this.ctrl, i, e.detail.width)
+      } else /* #endif */ if ((this.opts[1] && !this.ctrl[i]) || this.ctrl[i] === -1) {
+        // 加载完毕，取消加载中占位图
+        this.$set(this.ctrl, i, 1)
+      }
+      this.checkReady()
+    },
+
+    /**
+     * @description 检查是否所有图片加载完毕
+     */
+    checkReady () {
+      if (!this.root.lazyLoad) {
+        this.root._unloadimgs -= 1
+        if (!this.root._unloadimgs) {
+          setTimeout(() => {
+            this.root.getRect().then(rect => {
+              this.root.$emit('ready', rect)
+            }).catch(() => {
+              this.root.$emit('ready', {})
+            })
+          }, 350)
+        }
+      }
+    },
+
+    /**
+     * @description 链接点击事件
+     * @param {Event} e
+     */
+    linkTap (e) {
+      const node = e.currentTarget ? this.childs[e.currentTarget.dataset.i] : {}
+      const attrs = node.attrs || e
+      const href = attrs.href
+      this.root.$emit('linktap', Object.assign({
+        innerText: this.root.getText(node.children || []) // 链接内的文本内容
+      }, attrs))
+      if (href) {
+        if (href[0] === '#') {
+          // 跳转锚点
+          this.root.navigateTo(href.substring(1)).catch(() => { })
+        } else if (href.split('?')[0].includes('://')) {
+          // 复制外部链接
+          if (this.root.copyLink) {
+            // #ifdef H5
+            window.open(href)
+            // #endif
+            // #ifdef MP
+            uni.setClipboardData({
+              data: href,
+              success: () =>
+                uni.showToast({
+                  title: '链接已复制'
+                })
+            })
+            // #endif
+            // #ifdef APP-PLUS
+            plus.runtime.openWeb(href)
+            // #endif
+          }
+        } else {
+          // 跳转页面
+          uni.navigateTo({
+            url: href,
+            fail () {
+              uni.switchTab({
+                url: href,
+                fail () { }
+              })
+            }
+          })
+        }
+      }
+    },
+
+    /**
+     * @description 错误事件
+     * @param {Event} e
+     */
+    mediaError (e) {
+      const i = e.currentTarget.dataset.i
+      const node = this.childs[i]
+      // 加载其他源
+      if (node.name === 'video' || node.name === 'audio') {
+        let index = (this.ctrl[i] || 0) + 1
+        if (index > node.src.length) {
+          index = 0
+        }
+        if (index < node.src.length) {
+          this.$set(this.ctrl, i, index)
+          return
+        }
+      } else if (node.name === 'img') {
+        // #ifdef H5 && VUE3
+        if (this.opts[0] && !this.ctrl.load) return
+        // #endif
+        // 显示错误占位图
+        if (this.opts[2]) {
+          this.$set(this.ctrl, i, -1)
+        }
+        this.checkReady()
+      }
+      if (this.root) {
+        this.root.$emit('error', {
+          source: node.name,
+          attrs: node.attrs,
+          // #ifndef H5 && VUE3
+          errMsg: e.detail.errMsg
+          // #endif
+        })
+      }
+    }
+  }
+}
+</script>
+<style>
+/* a 标签默认效果 */
+._a {
+  padding: 1.5px 0 1.5px 0;
+  color: #366092;
+  word-break: break-all;
+}
+
+/* a 标签点击态效果 */
+._hover {
+  text-decoration: underline;
+  opacity: 0.7;
+}
+
+/* 图片默认效果 */
+._img {
+  max-width: 100%;
+  -webkit-touch-callout: none;
+}
+
+/* 内部样式 */
+
+._block {
+  display: block;
+}
+
+._b,
+._strong {
+  font-weight: bold;
+}
+
+._code {
+  font-family: monospace;
+}
+
+._del {
+  text-decoration: line-through;
+}
+
+._em,
+._i {
+  font-style: italic;
+}
+
+._h1 {
+  font-size: 2em;
+}
+
+._h2 {
+  font-size: 1.5em;
+}
+
+._h3 {
+  font-size: 1.17em;
+}
+
+._h5 {
+  font-size: 0.83em;
+}
+
+._h6 {
+  font-size: 0.67em;
+}
+
+._h1,
+._h2,
+._h3,
+._h4,
+._h5,
+._h6 {
+  display: block;
+  font-weight: bold;
+}
+
+._image {
+  height: 1px;
+}
+
+._ins {
+  text-decoration: underline;
+}
+
+._li {
+  display: list-item;
+}
+
+._ol {
+  list-style-type: decimal;
+}
+
+._ol,
+._ul {
+  display: block;
+  padding-left: 40px;
+  margin: 1em 0;
+}
+
+._q::before {
+  content: '"';
+}
+
+._q::after {
+  content: '"';
+}
+
+._sub {
+  font-size: smaller;
+  vertical-align: sub;
+}
+
+._sup {
+  font-size: smaller;
+  vertical-align: super;
+}
+
+._thead,
+._tbody,
+._tfoot {
+  display: table-row-group;
+}
+
+._tr {
+  display: table-row;
+}
+
+._td,
+._th {
+  display: table-cell;
+  vertical-align: middle;
+}
+
+._th {
+  font-weight: bold;
+  text-align: center;
+}
+
+._ul {
+  list-style-type: disc;
+}
+
+._ul ._ul {
+  margin: 0;
+  list-style-type: circle;
+}
+
+._ul ._ul ._ul {
+  list-style-type: square;
+}
+
+._abbr,
+._b,
+._code,
+._del,
+._em,
+._i,
+._ins,
+._label,
+._q,
+._span,
+._strong,
+._sub,
+._sup {
+  display: inline;
+}
+
+/* #ifdef APP-PLUS */
+._video {
+  width: 300px;
+  height: 225px;
+}
+/* #endif */
+</style>
\ No newline at end of file
diff --git a/uni_modules/mp-html/components/mp-html/parser.js b/uni_modules/mp-html/components/mp-html/parser.js
new file mode 100644
index 0000000..cdbb135
--- /dev/null
+++ b/uni_modules/mp-html/components/mp-html/parser.js
@@ -0,0 +1,1333 @@
+/**
+ * @fileoverview html 解析器
+ */
+
+// 配置
+const config = {
+  // 信任的标签（保持标签名不变）
+  trustTags: makeMap('a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,ruby,rt,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video'),
+
+  // 块级标签（转为 div，其他的非信任标签转为 span）
+  blockTags: makeMap('address,article,aside,body,caption,center,cite,footer,header,html,nav,pre,section'),
+
+  // #ifdef (MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE3
+  // 行内标签
+  inlineTags: makeMap('abbr,b,big,code,del,em,i,ins,label,q,small,span,strong,sub,sup'),
+  // #endif
+
+  // 要移除的标签
+  ignoreTags: makeMap('area,base,canvas,embed,frame,head,iframe,input,link,map,meta,param,rp,script,source,style,textarea,title,track,wbr'),
+
+  // 自闭合的标签
+  voidTags: makeMap('area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr'),
+
+  // html 实体
+  entities: {
+    lt: '<',
+    gt: '>',
+    quot: '"',
+    apos: "'",
+    ensp: '\u2002',
+    emsp: '\u2003',
+    nbsp: '\xA0',
+    semi: ';',
+    ndash: '–',
+    mdash: '—',
+    middot: '·',
+    lsquo: '‘',
+    rsquo: '’',
+    ldquo: '“',
+    rdquo: '”',
+    bull: '•',
+    hellip: '…',
+    larr: '←',
+    uarr: '↑',
+    rarr: '→',
+    darr: '↓'
+  },
+
+  // 默认的标签样式
+  tagStyle: {
+    // #ifndef APP-PLUS-NVUE
+    address: 'font-style:italic',
+    big: 'display:inline;font-size:1.2em',
+    caption: 'display:table-caption;text-align:center',
+    center: 'text-align:center',
+    cite: 'font-style:italic',
+    dd: 'margin-left:40px',
+    mark: 'background-color:yellow',
+    pre: 'font-family:monospace;white-space:pre',
+    s: 'text-decoration:line-through',
+    small: 'display:inline;font-size:0.8em',
+    strike: 'text-decoration:line-through',
+    u: 'text-decoration:underline'
+    // #endif
+  },
+
+  // svg 大小写对照表
+  svgDict: {
+    animatetransform: 'animateTransform',
+    lineargradient: 'linearGradient',
+    viewbox: 'viewBox',
+    attributename: 'attributeName',
+    repeatcount: 'repeatCount',
+    repeatdur: 'repeatDur'
+  }
+}
+const tagSelector={}
+const {
+  windowWidth,
+  // #ifdef MP-WEIXIN
+  system
+  // #endif
+} = uni.getSystemInfoSync()
+const blankChar = makeMap(' ,\r,\n,\t,\f')
+let idIndex = 0
+
+// #ifdef H5 || APP-PLUS
+config.ignoreTags.iframe = undefined
+config.trustTags.iframe = true
+config.ignoreTags.embed = undefined
+config.trustTags.embed = true
+// #endif
+// #ifdef APP-PLUS-NVUE
+config.ignoreTags.source = undefined
+config.ignoreTags.style = undefined
+// #endif
+
+/**
+ * @description 创建 map
+ * @param {String} str 逗号分隔
+ */
+function makeMap (str) {
+  const map = Object.create(null)
+  const list = str.split(',')
+  for (let i = list.length; i--;) {
+    map[list[i]] = true
+  }
+  return map
+}
+
+/**
+ * @description 解码 html 实体
+ * @param {String} str 要解码的字符串
+ * @param {Boolean} amp 要不要解码 &amp;
+ * @returns {String} 解码后的字符串
+ */
+function decodeEntity (str, amp) {
+  let i = str.indexOf('&')
+  while (i !== -1) {
+    const j = str.indexOf(';', i + 3)
+    let code
+    if (j === -1) break
+    if (str[i + 1] === '#') {
+      // &#123; 形式的实体
+      code = parseInt((str[i + 2] === 'x' ? '0' : '') + str.substring(i + 2, j))
+      if (!isNaN(code)) {
+        str = str.substr(0, i) + String.fromCharCode(code) + str.substr(j + 1)
+      }
+    } else {
+      // &nbsp; 形式的实体
+      code = str.substring(i + 1, j)
+      if (config.entities[code] || (code === 'amp' && amp)) {
+        str = str.substr(0, i) + (config.entities[code] || '&') + str.substr(j + 1)
+      }
+    }
+    i = str.indexOf('&', i + 1)
+  }
+  return str
+}
+
+/**
+ * @description 合并多个块级标签，加快长内容渲染
+ * @param {Array} nodes 要合并的标签数组
+ */
+function mergeNodes (nodes) {
+  let i = nodes.length - 1
+  for (let j = i; j >= -1; j--) {
+    if (j === -1 || nodes[j].c || !nodes[j].name || (nodes[j].name !== 'div' && nodes[j].name !== 'p' && nodes[j].name[0] !== 'h') || (nodes[j].attrs.style || '').includes('inline')) {
+      if (i - j >= 5) {
+        nodes.splice(j + 1, i - j, {
+          name: 'div',
+          attrs: {},
+          children: nodes.slice(j + 1, i + 1)
+        })
+      }
+      i = j - 1
+    }
+  }
+}
+
+/**
+ * @description html 解析器
+ * @param {Object} vm 组件实例
+ */
+function Parser (vm) {
+  this.options = vm || {}
+  this.tagStyle = Object.assign({}, config.tagStyle, this.options.tagStyle)
+  this.imgList = vm.imgList || []
+  this.imgList._unloadimgs = 0
+  this.plugins = vm.plugins || []
+  this.attrs = Object.create(null)
+  this.stack = []
+  this.nodes = []
+  this.pre = (this.options.containerStyle || '').includes('white-space') && this.options.containerStyle.includes('pre') ? 2 : 0
+}
+
+/**
+ * @description 执行解析
+ * @param {String} content 要解析的文本
+ */
+Parser.prototype.parse = function (content) {
+  // 插件处理
+  for (let i = this.plugins.length; i--;) {
+    if (this.plugins[i].onUpdate) {
+      content = this.plugins[i].onUpdate(content, config) || content
+    }
+  }
+
+  new Lexer(this).parse(content)
+  // 出栈未闭合的标签
+  while (this.stack.length) {
+    this.popNode()
+  }
+  if (this.nodes.length > 50) {
+    mergeNodes(this.nodes)
+  }
+  return this.nodes
+}
+
+/**
+ * @description 将标签暴露出来（不被 rich-text 包含）
+ */
+Parser.prototype.expose = function () {
+  // #ifndef APP-PLUS-NVUE
+  for (let i = this.stack.length; i--;) {
+    const item = this.stack[i]
+    if (item.c || item.name === 'a' || item.name === 'video' || item.name === 'audio') return
+    item.c = 1
+  }
+  // #endif
+}
+
+/**
+ * @description 处理插件
+ * @param {Object} node 要处理的标签
+ * @returns {Boolean} 是否要移除此标签
+ */
+Parser.prototype.hook = function (node) {
+  for (let i = this.plugins.length; i--;) {
+    if (this.plugins[i].onParse && this.plugins[i].onParse(node, this) === false) {
+      return false
+    }
+  }
+  return true
+}
+
+/**
+ * @description 将链接拼接上主域名
+ * @param {String} url 需要拼接的链接
+ * @returns {String} 拼接后的链接
+ */
+Parser.prototype.getUrl = function (url) {
+  const domain = this.options.domain
+  if (url[0] === '/') {
+    if (url[1] === '/') {
+      // // 开头的补充协议名
+      url = (domain ? domain.split('://')[0] : 'http') + ':' + url
+    } else if (domain) {
+      // 否则补充整个域名
+      url = domain + url
+    } /* #ifdef APP-PLUS */ else {
+      url = plus.io.convertLocalFileSystemURL(url)
+    } /* #endif */
+  } else if (!url.includes('data:') && !url.includes('://')) {
+    if (domain) {
+      url = domain + '/' + url
+    } /* #ifdef APP-PLUS */ else {
+      url = plus.io.convertLocalFileSystemURL(url)
+    } /* #endif */
+  }
+  return url
+}
+
+/**
+ * @description 解析样式表
+ * @param {Object} node 标签
+ * @returns {Object}
+ */
+Parser.prototype.parseStyle = function (node) {
+  const attrs = node.attrs
+  const list = (this.tagStyle[node.name] || '').split(';').concat((attrs.style || '').split(';'))
+  const styleObj = {}
+  let tmp = ''
+
+  if (attrs.id && !this.xml) {
+    // 暴露锚点
+    if (this.options.useAnchor) {
+      this.expose()
+    } else if (node.name !== 'img' && node.name !== 'a' && node.name !== 'video' && node.name !== 'audio') {
+      attrs.id = undefined
+    }
+  }
+
+  // 转换 width 和 height 属性
+  if (attrs.width) {
+    styleObj.width = parseFloat(attrs.width) + (attrs.width.includes('%') ? '%' : 'px')
+    attrs.width = undefined
+  }
+  if (attrs.height) {
+    styleObj.height = parseFloat(attrs.height) + (attrs.height.includes('%') ? '%' : 'px')
+    attrs.height = undefined
+  }
+
+  for (let i = 0, len = list.length; i < len; i++) {
+    const info = list[i].split(':')
+    if (info.length < 2) continue
+    const key = info.shift().trim().toLowerCase()
+    let value = info.join(':').trim()
+    if ((value[0] === '-' && value.lastIndexOf('-') > 0) || value.includes('safe')) {
+      // 兼容性的 css 不压缩
+      tmp += `;${key}:${value}`
+    } else if (!styleObj[key] || value.includes('import') || !styleObj[key].includes('import')) {
+      // 重复的样式进行覆盖
+      if (value.includes('url')) {
+        // 填充链接
+        let j = value.indexOf('(') + 1
+        if (j) {
+          while (value[j] === '"' || value[j] === "'" || blankChar[value[j]]) {
+            j++
+          }
+          value = value.substr(0, j) + this.getUrl(value.substr(j))
+        }
+      } else if (value.includes('rpx')) {
+        // 转换 rpx（rich-text 内部不支持 rpx）
+        value = value.replace(/[0-9.]+\s*rpx/g, $ => parseFloat($) * windowWidth / 750 + 'px')
+      }
+      styleObj[key] = value
+    }
+  }
+
+  node.attrs.style = tmp
+  return styleObj
+}
+
+/**
+ * @description 解析到标签名
+ * @param {String} name 标签名
+ * @private
+ */
+Parser.prototype.onTagName = function (name) {
+  this.tagName = this.xml ? name : name.toLowerCase()
+  if (this.tagName === 'svg') {
+    this.xml = (this.xml || 0) + 1 // svg 标签内大小写敏感
+  }
+}
+
+/**
+ * @description 解析到属性名
+ * @param {String} name 属性名
+ * @private
+ */
+Parser.prototype.onAttrName = function (name) {
+  name = this.xml ? name : name.toLowerCase()
+  if (name.substr(0, 5) === 'data-') {
+    if (name === 'data-src' && !this.attrs.src) {
+      // data-src 自动转为 src
+      this.attrName = 'src'
+    } else if (this.tagName === 'img' || this.tagName === 'a') {
+      // a 和 img 标签保留 data- 的属性，可以在 imgtap 和 linktap 事件中使用
+      this.attrName = name
+    } else {
+      // 剩余的移除以减小大小
+      this.attrName = undefined
+    }
+  } else {
+    this.attrName = name
+    this.attrs[name] = 'T' // boolean 型属性缺省设置
+  }
+}
+
+/**
+ * @description 解析到属性值
+ * @param {String} val 属性值
+ * @private
+ */
+Parser.prototype.onAttrVal = function (val) {
+  const name = this.attrName || ''
+  if (name === 'style' || name === 'href') {
+    // 部分属性进行实体解码
+    this.attrs[name] = decodeEntity(val, true)
+  } else if (name.includes('src')) {
+    // 拼接主域名
+    this.attrs[name] = this.getUrl(decodeEntity(val, true))
+  } else if (name) {
+    this.attrs[name] = val
+  }
+}
+
+/**
+ * @description 解析到标签开始
+ * @param {Boolean} selfClose 是否有自闭合标识 />
+ * @private
+ */
+Parser.prototype.onOpenTag = function (selfClose) {
+  // 拼装 node
+  const node = Object.create(null)
+  node.name = this.tagName
+  node.attrs = this.attrs
+  // 避免因为自动 diff 使得 type 被设置为 null 导致部分内容不显示
+  if (this.options.nodes.length) {
+    node.type = 'node'
+  }
+  this.attrs = Object.create(null)
+
+  const attrs = node.attrs
+  const parent = this.stack[this.stack.length - 1]
+  const siblings = parent ? parent.children : this.nodes
+  const close = this.xml ? selfClose : config.voidTags[node.name]
+
+  // 替换标签名选择器
+  if (tagSelector[node.name]) {
+    attrs.class = tagSelector[node.name] + (attrs.class ? ' ' + attrs.class : '')
+  }
+
+  // 转换 embed 标签
+  if (node.name === 'embed') {
+    // #ifndef H5 || APP-PLUS
+    const src = attrs.src || ''
+    // 按照后缀名和 type 将 embed 转为 video 或 audio
+    if (src.includes('.mp4') || src.includes('.3gp') || src.includes('.m3u8') || (attrs.type || '').includes('video')) {
+      node.name = 'video'
+    } else if (src.includes('.mp3') || src.includes('.wav') || src.includes('.aac') || src.includes('.m4a') || (attrs.type || '').includes('audio')) {
+      node.name = 'audio'
+    }
+    if (attrs.autostart) {
+      attrs.autoplay = 'T'
+    }
+    attrs.controls = 'T'
+    // #endif
+    // #ifdef H5 || APP-PLUS
+    this.expose()
+    // #endif
+  }
+
+  // #ifndef APP-PLUS-NVUE
+  // 处理音视频
+  if (node.name === 'video' || node.name === 'audio') {
+    // 设置 id 以便获取 context
+    if (node.name === 'video' && !attrs.id) {
+      attrs.id = 'v' + idIndex++
+    }
+    // 没有设置 controls 也没有设置 autoplay 的自动设置 controls
+    if (!attrs.controls && !attrs.autoplay) {
+      attrs.controls = 'T'
+    }
+    // 用数组存储所有可用的 source
+    node.src = []
+    if (attrs.src) {
+      node.src.push(attrs.src)
+      attrs.src = undefined
+    }
+    this.expose()
+  }
+  // #endif
+
+  // 处理自闭合标签
+  if (close) {
+    if (!this.hook(node) || config.ignoreTags[node.name]) {
+      // 通过 base 标签设置主域名
+      if (node.name === 'base' && !this.options.domain) {
+        this.options.domain = attrs.href
+      } /* #ifndef APP-PLUS-NVUE */ else if (node.name === 'source' && parent && (parent.name === 'video' || parent.name === 'audio') && attrs.src) {
+        // 设置 source 标签（仅父节点为 video 或 audio 时有效）
+        parent.src.push(attrs.src)
+      } /* #endif */
+      return
+    }
+
+    // 解析 style
+    const styleObj = this.parseStyle(node)
+
+    // 处理图片
+    if (node.name === 'img') {
+      if (attrs.src) {
+        // 标记 webp
+        if (attrs.src.includes('webp')) {
+          node.webp = 'T'
+        }
+        // data url 图片如果没有设置 original-src 默认为不可预览的小图片
+        if (attrs.src.includes('data:') && !attrs['original-src']) {
+          attrs.ignore = 'T'
+        }
+        if (!attrs.ignore || node.webp || attrs.src.includes('cloud://')) {
+          for (let i = this.stack.length; i--;) {
+            const item = this.stack[i]
+            if (item.name === 'a') {
+              node.a = item.attrs
+            }
+            if (item.name === 'table' && !node.webp && !attrs.src.includes('cloud://')) {
+              if (!styleObj.display || styleObj.display.includes('inline')) {
+                node.t = 'inline-block'
+              } else {
+                node.t = styleObj.display
+              }
+              styleObj.display = undefined
+            }
+            // #ifndef H5 || APP-PLUS
+            const style = item.attrs.style || ''
+            if (style.includes('flex:') && !style.includes('flex:0') && !style.includes('flex: 0') && (!styleObj.width || parseInt(styleObj.width) > 100)) {
+              styleObj.width = '100% !important'
+              styleObj.height = ''
+              for (let j = i + 1; j < this.stack.length; j++) {
+                this.stack[j].attrs.style = (this.stack[j].attrs.style || '').replace('inline-', '')
+              }
+            } else if (style.includes('flex') && styleObj.width === '100%') {
+              for (let j = i + 1; j < this.stack.length; j++) {
+                const style = this.stack[j].attrs.style || ''
+                if (!style.includes(';width') && !style.includes(' width') && style.indexOf('width') !== 0) {
+                  styleObj.width = ''
+                  break
+                }
+              }
+            } else if (style.includes('inline-block')) {
+              if (styleObj.width && styleObj.width[styleObj.width.length - 1] === '%') {
+                item.attrs.style += ';max-width:' + styleObj.width
+                styleObj.width = ''
+              } else {
+                item.attrs.style += ';max-width:100%'
+              }
+            }
+            // #endif
+            item.c = 1
+          }
+          attrs.i = this.imgList.length.toString()
+          let src = attrs['original-src'] || attrs.src
+          // #ifndef H5 || MP-ALIPAY || APP-PLUS || MP-360
+          if (this.imgList.includes(src)) {
+            // 如果有重复的链接则对域名进行随机大小写变换避免预览时错位
+            let i = src.indexOf('://')
+            if (i !== -1) {
+              i += 3
+              let newSrc = src.substr(0, i)
+              for (; i < src.length; i++) {
+                if (src[i] === '/') break
+                newSrc += Math.random() > 0.5 ? src[i].toUpperCase() : src[i]
+              }
+              newSrc += src.substr(i)
+              src = newSrc
+            }
+          }
+          // #endif
+          this.imgList.push(src)
+          if (!node.t) {
+            this.imgList._unloadimgs += 1
+          }
+          // #ifdef H5 || APP-PLUS
+          if (this.options.lazyLoad) {
+            attrs['data-src'] = attrs.src
+            attrs.src = undefined
+          }
+          // #endif
+        }
+      }
+      if (styleObj.display === 'inline') {
+        styleObj.display = ''
+      }
+      // #ifndef APP-PLUS-NVUE
+      if (attrs.ignore) {
+        styleObj['max-width'] = styleObj['max-width'] || '100%'
+        attrs.style += ';-webkit-touch-callout:none'
+      }
+      // #endif
+      // 设置的宽度超出屏幕，为避免变形，高度转为自动
+      if (parseInt(styleObj.width) > windowWidth) {
+        styleObj.height = undefined
+      }
+      // 记录是否设置了宽高
+      if (!isNaN(parseInt(styleObj.width))) {
+        node.w = 'T'
+      }
+      if (!isNaN(parseInt(styleObj.height)) && (!styleObj.height.includes('%') || (parent && (parent.attrs.style || '').includes('height')))) {
+        node.h = 'T'
+      }
+    } else if (node.name === 'svg') {
+      siblings.push(node)
+      this.stack.push(node)
+      this.popNode()
+      return
+    }
+    for (const key in styleObj) {
+      if (styleObj[key]) {
+        attrs.style += `;${key}:${styleObj[key].replace(' !important', '')}`
+      }
+    }
+    attrs.style = attrs.style.substr(1) || undefined
+    // #ifdef (MP-WEIXIN || MP-QQ) && VUE3
+    if (!attrs.style) {
+      delete attrs.style
+    }
+    // #endif
+  } else {
+    if ((node.name === 'pre' || ((attrs.style || '').includes('white-space') && attrs.style.includes('pre'))) && this.pre !== 2) {
+      this.pre = node.pre = 1
+    }
+    node.children = []
+    this.stack.push(node)
+  }
+
+  // 加入节点树
+  siblings.push(node)
+}
+
+/**
+ * @description 解析到标签结束
+ * @param {String} name 标签名
+ * @private
+ */
+Parser.prototype.onCloseTag = function (name) {
+  // 依次出栈到匹配为止
+  name = this.xml ? name : name.toLowerCase()
+  let i
+  for (i = this.stack.length; i--;) {
+    if (this.stack[i].name === name) break
+  }
+  if (i !== -1) {
+    while (this.stack.length > i) {
+      this.popNode()
+    }
+  } else if (name === 'p' || name === 'br') {
+    const siblings = this.stack.length ? this.stack[this.stack.length - 1].children : this.nodes
+    siblings.push({
+      name,
+      attrs: {
+        class: tagSelector[name] || '',
+        style: this.tagStyle[name] || ''
+      }
+    })
+  }
+}
+
+/**
+ * @description 处理标签出栈
+ * @private
+ */
+Parser.prototype.popNode = function () {
+  const node = this.stack.pop()
+  let attrs = node.attrs
+  const children = node.children
+  const parent = this.stack[this.stack.length - 1]
+  const siblings = parent ? parent.children : this.nodes
+
+  if (!this.hook(node) || config.ignoreTags[node.name]) {
+    // 获取标题
+    if (node.name === 'title' && children.length && children[0].type === 'text' && this.options.setTitle) {
+      uni.setNavigationBarTitle({
+        title: children[0].text
+      })
+    }
+    siblings.pop()
+    return
+  }
+
+  if (node.pre && this.pre !== 2) {
+    // 是否合并空白符标识
+    this.pre = node.pre = undefined
+    for (let i = this.stack.length; i--;) {
+      if (this.stack[i].pre) {
+        this.pre = 1
+      }
+    }
+  }
+
+  const styleObj = {}
+
+  // 转换 svg
+  if (node.name === 'svg') {
+    if (this.xml > 1) {
+      // 多层 svg 嵌套
+      this.xml--
+      return
+    }
+    // #ifdef APP-PLUS-NVUE
+    (function traversal (node) {
+      if (node.name) {
+        // 调整 svg 的大小写
+        node.name = config.svgDict[node.name] || node.name
+        for (const item in node.attrs) {
+          if (config.svgDict[item]) {
+            node.attrs[config.svgDict[item]] = node.attrs[item]
+            node.attrs[item] = undefined
+          }
+        }
+        for (let i = 0; i < (node.children || []).length; i++) {
+          traversal(node.children[i])
+        }
+      }
+    })(node)
+    // #endif
+    // #ifndef APP-PLUS-NVUE
+    let src = ''
+    const style = attrs.style
+    attrs.style = ''
+    attrs.xmlns = 'http://www.w3.org/2000/svg';
+    (function traversal (node) {
+      if (node.type === 'text') {
+        src += node.text
+        return
+      }
+      const name = config.svgDict[node.name] || node.name
+      src += '<' + name
+      for (const item in node.attrs) {
+        const val = node.attrs[item]
+        if (val) {
+          src += ` ${config.svgDict[item] || item}="${val}"`
+        }
+      }
+      if (!node.children) {
+        src += '/>'
+      } else {
+        src += '>'
+        for (let i = 0; i < node.children.length; i++) {
+          traversal(node.children[i])
+        }
+        src += '</' + name + '>'
+      }
+    })(node)
+    node.name = 'img'
+    node.attrs = {
+      src: 'data:image/svg+xml;utf8,' + src.replace(/#/g, '%23'),
+      style,
+      ignore: 'T'
+    }
+    node.children = undefined
+    // #endif
+    this.xml = false
+    return
+  }
+
+  // #ifndef APP-PLUS-NVUE
+  // 转换 align 属性
+  if (attrs.align) {
+    if (node.name === 'table') {
+      if (attrs.align === 'center') {
+        styleObj['margin-inline-start'] = styleObj['margin-inline-end'] = 'auto'
+      } else {
+        styleObj.float = attrs.align
+      }
+    } else {
+      styleObj['text-align'] = attrs.align
+    }
+    attrs.align = undefined
+  }
+
+  // 转换 dir 属性
+  if (attrs.dir) {
+    styleObj.direction = attrs.dir
+    attrs.dir = undefined
+  }
+
+  // 转换 font 标签的属性
+  if (node.name === 'font') {
+    if (attrs.color) {
+      styleObj.color = attrs.color
+      attrs.color = undefined
+    }
+    if (attrs.face) {
+      styleObj['font-family'] = attrs.face
+      attrs.face = undefined
+    }
+    if (attrs.size) {
+      let size = parseInt(attrs.size)
+      if (!isNaN(size)) {
+        if (size < 1) {
+          size = 1
+        } else if (size > 7) {
+          size = 7
+        }
+        styleObj['font-size'] = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', 'xxx-large'][size - 1]
+      }
+      attrs.size = undefined
+    }
+  }
+  // #endif
+
+  // 一些编辑器的自带 class
+  if ((attrs.class || '').includes('align-center')) {
+    styleObj['text-align'] = 'center'
+  }
+
+  Object.assign(styleObj, this.parseStyle(node))
+
+  if (node.name !== 'table' && parseInt(styleObj.width) > windowWidth) {
+    styleObj['max-width'] = '100%'
+    styleObj['box-sizing'] = 'border-box'
+  }
+
+  // #ifndef APP-PLUS-NVUE
+  if (config.blockTags[node.name]) {
+    node.name = 'div'
+  } else if (!config.trustTags[node.name] && !this.xml) {
+    // 未知标签转为 span，避免无法显示
+    node.name = 'span'
+  }
+
+  if (node.name === 'a' || node.name === 'ad'
+    // #ifdef H5 || APP-PLUS
+    || node.name === 'iframe' // eslint-disable-line
+    // #endif
+  ) {
+    this.expose()
+  } else if (node.name === 'video') {
+    if ((styleObj.height || '').includes('auto')) {
+      styleObj.height = undefined
+    }
+    /* #ifdef APP-PLUS */
+    let str = '<video style="width:100%;height:100%"'
+    for (const item in attrs) {
+      if (attrs[item]) {
+        str += ' ' + item + '="' + attrs[item] + '"'
+      }
+    }
+    if (this.options.pauseVideo) {
+      str += ' onplay="this.dispatchEvent(new CustomEvent(\'vplay\',{bubbles:!0}));for(var e=document.getElementsByTagName(\'video\'),t=0;t<e.length;t++)e[t]!=this&&e[t].pause()"'
+    }
+    str += '>'
+    for (let i = 0; i < node.src.length; i++) {
+      str += '<source src="' + node.src[i] + '">'
+    }
+    str += '</video>'
+    node.html = str
+    /* #endif */
+  } else if ((node.name === 'ul' || node.name === 'ol') && node.c) {
+    // 列表处理
+    const types = {
+      a: 'lower-alpha',
+      A: 'upper-alpha',
+      i: 'lower-roman',
+      I: 'upper-roman'
+    }
+    if (types[attrs.type]) {
+      attrs.style += ';list-style-type:' + types[attrs.type]
+      attrs.type = undefined
+    }
+    for (let i = children.length; i--;) {
+      if (children[i].name === 'li') {
+        children[i].c = 1
+      }
+    }
+  } else if (node.name === 'table') {
+    // 表格处理
+    // cellpadding、cellspacing、border 这几个常用表格属性需要通过转换实现
+    let padding = parseFloat(attrs.cellpadding)
+    let spacing = parseFloat(attrs.cellspacing)
+    const border = parseFloat(attrs.border)
+    const bordercolor = styleObj['border-color']
+    const borderstyle = styleObj['border-style']
+    if (node.c) {
+      // padding 和 spacing 默认 2
+      if (isNaN(padding)) {
+        padding = 2
+      }
+      if (isNaN(spacing)) {
+        spacing = 2
+      }
+    }
+    if (border) {
+      attrs.style += `;border:${border}px ${borderstyle || 'solid'} ${bordercolor || 'gray'}`
+    }
+    if (node.flag && node.c) {
+      // 有 colspan 或 rowspan 且含有链接的表格通过 grid 布局实现
+      styleObj.display = 'grid'
+      if (spacing) {
+        styleObj['grid-gap'] = spacing + 'px'
+        styleObj.padding = spacing + 'px'
+      } else if (border) {
+        // 无间隔的情况下避免边框重叠
+        attrs.style += ';border-left:0;border-top:0'
+      }
+
+      const width = [] // 表格的列宽
+      const trList = [] // tr 列表
+      const cells = [] // 保存新的单元格
+      const map = {}; // 被合并单元格占用的格子
+
+      (function traversal (nodes) {
+        for (let i = 0; i < nodes.length; i++) {
+          if (nodes[i].name === 'tr') {
+            trList.push(nodes[i])
+          } else {
+            traversal(nodes[i].children || [])
+          }
+        }
+      })(children)
+
+      for (let row = 1; row <= trList.length; row++) {
+        let col = 1
+        for (let j = 0; j < trList[row - 1].children.length; j++) {
+          const td = trList[row - 1].children[j]
+          if (td.name === 'td' || td.name === 'th') {
+            // 这个格子被上面的单元格占用，则列号++
+            while (map[row + '.' + col]) {
+              col++
+            }
+            let style = td.attrs.style || ''
+            let start = style.indexOf('width') ? style.indexOf(';width') : 0
+            // 提取出 td 的宽度
+            if (start !== -1) {
+              let end = style.indexOf(';', start + 6)
+              if (end === -1) {
+                end = style.length
+              }
+              if (!td.attrs.colspan) {
+                width[col] = style.substring(start ? start + 7 : 6, end)
+              }
+              style = style.substr(0, start) + style.substr(end)
+            }
+            // 设置竖直对齐
+            style += ';display:flex'
+            start = style.indexOf('vertical-align')
+            if (start !== -1) {
+              const val = style.substr(start + 15, 10)
+              if (val.includes('middle')) {
+                style += ';align-items:center'
+              } else if (val.includes('bottom')) {
+                style += ';align-items:flex-end'
+              }
+            } else {
+              style += ';align-items:center'
+            }
+            // 设置水平对齐
+            start = style.indexOf('text-align')
+            if (start !== -1) {
+              const val = style.substr(start + 11, 10)
+              if (val.includes('center')) {
+                style += ';justify-content: center'
+              } else if (val.includes('right')) {
+                style += ';justify-content: right'
+              }
+            }
+            style = (border ? `;border:${border}px ${borderstyle || 'solid'} ${bordercolor || 'gray'}` + (spacing ? '' : ';border-right:0;border-bottom:0') : '') + (padding ? `;padding:${padding}px` : '') + ';' + style
+            // 处理列合并
+            if (td.attrs.colspan) {
+              style += `;grid-column-start:${col};grid-column-end:${col + parseInt(td.attrs.colspan)}`
+              if (!td.attrs.rowspan) {
+                style += `;grid-row-start:${row};grid-row-end:${row + 1}`
+              }
+              col += parseInt(td.attrs.colspan) - 1
+            }
+            // 处理行合并
+            if (td.attrs.rowspan) {
+              style += `;grid-row-start:${row};grid-row-end:${row + parseInt(td.attrs.rowspan)}`
+              if (!td.attrs.colspan) {
+                style += `;grid-column-start:${col};grid-column-end:${col + 1}`
+              }
+              // 记录下方单元格被占用
+              for (let rowspan = 1; rowspan < td.attrs.rowspan; rowspan++) {
+                for (let colspan = 0; colspan < (td.attrs.colspan || 1); colspan++) {
+                  map[(row + rowspan) + '.' + (col - colspan)] = 1
+                }
+              }
+            }
+            if (style) {
+              td.attrs.style = style
+            }
+            cells.push(td)
+            col++
+          }
+        }
+        if (row === 1) {
+          let temp = ''
+          for (let i = 1; i < col; i++) {
+            temp += (width[i] ? width[i] : 'auto') + ' '
+          }
+          styleObj['grid-template-columns'] = temp
+        }
+      }
+      node.children = cells
+    } else {
+      // 没有使用合并单元格的表格通过 table 布局实现
+      if (node.c) {
+        styleObj.display = 'table'
+      }
+      if (!isNaN(spacing)) {
+        styleObj['border-spacing'] = spacing + 'px'
+      }
+      if (border || padding) {
+        // 遍历
+        (function traversal (nodes) {
+          for (let i = 0; i < nodes.length; i++) {
+            const td = nodes[i]
+            if (td.name === 'th' || td.name === 'td') {
+              if (border) {
+                td.attrs.style = `border:${border}px ${borderstyle || 'solid'} ${bordercolor || 'gray'};${td.attrs.style || ''}`
+              }
+              if (padding) {
+                td.attrs.style = `padding:${padding}px;${td.attrs.style || ''}`
+              }
+            } else if (td.children) {
+              traversal(td.children)
+            }
+          }
+        })(children)
+      }
+    }
+    // 给表格添加一个单独的横向滚动层
+    if (this.options.scrollTable && !(attrs.style || '').includes('inline')) {
+      const table = Object.assign({}, node)
+      node.name = 'div'
+      node.attrs = {
+        style: 'overflow:auto'
+      }
+      node.children = [table]
+      attrs = table.attrs
+    }
+  } else if ((node.name === 'td' || node.name === 'th') && (attrs.colspan || attrs.rowspan)) {
+    for (let i = this.stack.length; i--;) {
+      if (this.stack[i].name === 'table') {
+        this.stack[i].flag = 1 // 指示含有合并单元格
+        break
+      }
+    }
+  } else if (node.name === 'ruby') {
+    // 转换 ruby
+    node.name = 'span'
+    for (let i = 0; i < children.length - 1; i++) {
+      if (children[i].type === 'text' && children[i + 1].name === 'rt') {
+        children[i] = {
+          name: 'div',
+          attrs: {
+            style: 'display:inline-block;text-align:center'
+          },
+          children: [{
+            name: 'div',
+            attrs: {
+              style: 'font-size:50%;' + (children[i + 1].attrs.style || '')
+            },
+            children: children[i + 1].children
+          }, children[i]]
+        }
+        children.splice(i + 1, 1)
+      }
+    }
+  } else if (node.c) {
+    (function traversal (node) {
+      node.c = 2
+      for (let i = node.children.length; i--;) {
+        const child = node.children[i]
+        // #ifdef (MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE3
+        if (child.name && (config.inlineTags[child.name] || ((child.attrs.style || '').includes('inline') && child.children)) && !child.c) {
+          traversal(child)
+        }
+        // #endif
+        if (!child.c || child.name === 'table') {
+          node.c = 1
+        }
+      }
+    })(node)
+  }
+
+  if ((styleObj.display || '').includes('flex') && !node.c) {
+    for (let i = children.length; i--;) {
+      const item = children[i]
+      if (item.f) {
+        item.attrs.style = (item.attrs.style || '') + item.f
+        item.f = undefined
+      }
+    }
+  }
+  // flex 布局时部分样式需要提取到 rich-text 外层
+  const flex = parent && ((parent.attrs.style || '').includes('flex') || (parent.attrs.style || '').includes('grid'))
+    // #ifdef MP-WEIXIN
+    // 检查基础库版本 virtualHost 是否可用
+    && !(node.c && wx.getNFCAdapter) // eslint-disable-line
+    // #endif
+    // #ifndef MP-WEIXIN || MP-QQ || MP-BAIDU || MP-TOUTIAO
+    && !node.c // eslint-disable-line
+  // #endif
+  if (flex) {
+    node.f = ';max-width:100%'
+  }
+
+  if (children.length >= 50 && node.c && !(styleObj.display || '').includes('flex')) {
+    mergeNodes(children)
+  }
+  // #endif
+
+  for (const key in styleObj) {
+    if (styleObj[key]) {
+      const val = `;${key}:${styleObj[key].replace(' !important', '')}`
+      /* #ifndef APP-PLUS-NVUE */
+      if (flex && ((key.includes('flex') && key !== 'flex-direction') || key === 'align-self' || key.includes('grid') || styleObj[key][0] === '-' || (key.includes('width') && val.includes('%')))) {
+        node.f += val
+        if (key === 'width') {
+          attrs.style += ';width:100%'
+        }
+      } else /* #endif */ {
+        attrs.style += val
+      }
+    }
+  }
+  attrs.style = attrs.style.substr(1) || undefined
+  // #ifdef (MP-WEIXIN || MP-QQ) && VUE3
+  for (const key in attrs) {
+    if (!attrs[key]) {
+      delete attrs[key]
+    }
+  }
+  // #endif
+}
+
+/**
+ * @description 解析到文本
+ * @param {String} text 文本内容
+ */
+Parser.prototype.onText = function (text) {
+  if (!this.pre) {
+    // 合并空白符
+    let trim = ''
+    let flag
+    for (let i = 0, len = text.length; i < len; i++) {
+      if (!blankChar[text[i]]) {
+        trim += text[i]
+      } else {
+        if (trim[trim.length - 1] !== ' ') {
+          trim += ' '
+        }
+        if (text[i] === '\n' && !flag) {
+          flag = true
+        }
+      }
+    }
+    // 去除含有换行符的空串
+    if (trim === ' ') {
+      if (flag) return
+      // #ifdef VUE3
+      else {
+        const parent = this.stack[this.stack.length - 1]
+        if (parent && parent.name[0] === 't') return
+      }
+      // #endif
+    }
+    text = trim
+  }
+  const node = Object.create(null)
+  node.type = 'text'
+  // #ifdef (MP-BAIDU || MP-ALIPAY || MP-TOUTIAO) && VUE3
+  node.attrs = {}
+  // #endif
+  node.text = decodeEntity(text)
+  if (this.hook(node)) {
+    // #ifdef MP-WEIXIN
+    if (this.options.selectable === 'force' && system.includes('iOS') && !uni.canIUse('rich-text.user-select')) {
+      this.expose()
+    }
+    // #endif
+    const siblings = this.stack.length ? this.stack[this.stack.length - 1].children : this.nodes
+    siblings.push(node)
+  }
+}
+
+/**
+ * @description html 词法分析器
+ * @param {Object} handler 高层处理器
+ */
+function Lexer (handler) {
+  this.handler = handler
+}
+
+/**
+ * @description 执行解析
+ * @param {String} content 要解析的文本
+ */
+Lexer.prototype.parse = function (content) {
+  this.content = content || ''
+  this.i = 0 // 标记解析位置
+  this.start = 0 // 标记一个单词的开始位置
+  this.state = this.text // 当前状态
+  for (let len = this.content.length; this.i !== -1 && this.i < len;) {
+    this.state()
+  }
+}
+
+/**
+ * @description 检查标签是否闭合
+ * @param {String} method 如果闭合要进行的操作
+ * @returns {Boolean} 是否闭合
+ * @private
+ */
+Lexer.prototype.checkClose = function (method) {
+  const selfClose = this.content[this.i] === '/'
+  if (this.content[this.i] === '>' || (selfClose && this.content[this.i + 1] === '>')) {
+    if (method) {
+      this.handler[method](this.content.substring(this.start, this.i))
+    }
+    this.i += selfClose ? 2 : 1
+    this.start = this.i
+    this.handler.onOpenTag(selfClose)
+    if (this.handler.tagName === 'script') {
+      this.i = this.content.indexOf('</', this.i)
+      if (this.i !== -1) {
+        this.i += 2
+        this.start = this.i
+      }
+      this.state = this.endTag
+    } else {
+      this.state = this.text
+    }
+    return true
+  }
+  return false
+}
+
+/**
+ * @description 文本状态
+ * @private
+ */
+Lexer.prototype.text = function () {
+  this.i = this.content.indexOf('<', this.i) // 查找最近的标签
+  if (this.i === -1) {
+    // 没有标签了
+    if (this.start < this.content.length) {
+      this.handler.onText(this.content.substring(this.start, this.content.length))
+    }
+    return
+  }
+  const c = this.content[this.i + 1]
+  if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
+    // 标签开头
+    if (this.start !== this.i) {
+      this.handler.onText(this.content.substring(this.start, this.i))
+    }
+    this.start = ++this.i
+    this.state = this.tagName
+  } else if (c === '/' || c === '!' || c === '?') {
+    if (this.start !== this.i) {
+      this.handler.onText(this.content.substring(this.start, this.i))
+    }
+    const next = this.content[this.i + 2]
+    if (c === '/' && ((next >= 'a' && next <= 'z') || (next >= 'A' && next <= 'Z'))) {
+      // 标签结尾
+      this.i += 2
+      this.start = this.i
+      this.state = this.endTag
+      return
+    }
+    // 处理注释
+    let end = '-->'
+    if (c !== '!' || this.content[this.i + 2] !== '-' || this.content[this.i + 3] !== '-') {
+      end = '>'
+    }
+    this.i = this.content.indexOf(end, this.i)
+    if (this.i !== -1) {
+      this.i += end.length
+      this.start = this.i
+    }
+  } else {
+    this.i++
+  }
+}
+
+/**
+ * @description 标签名状态
+ * @private
+ */
+Lexer.prototype.tagName = function () {
+  if (blankChar[this.content[this.i]]) {
+    // 解析到标签名
+    this.handler.onTagName(this.content.substring(this.start, this.i))
+    while (blankChar[this.content[++this.i]]);
+    if (this.i < this.content.length && !this.checkClose()) {
+      this.start = this.i
+      this.state = this.attrName
+    }
+  } else if (!this.checkClose('onTagName')) {
+    this.i++
+  }
+}
+
+/**
+ * @description 属性名状态
+ * @private
+ */
+Lexer.prototype.attrName = function () {
+  let c = this.content[this.i]
+  if (blankChar[c] || c === '=') {
+    // 解析到属性名
+    this.handler.onAttrName(this.content.substring(this.start, this.i))
+    let needVal = c === '='
+    const len = this.content.length
+    while (++this.i < len) {
+      c = this.content[this.i]
+      if (!blankChar[c]) {
+        if (this.checkClose()) return
+        if (needVal) {
+          // 等号后遇到第一个非空字符
+          this.start = this.i
+          this.state = this.attrVal
+          return
+        }
+        if (this.content[this.i] === '=') {
+          needVal = true
+        } else {
+          this.start = this.i
+          this.state = this.attrName
+          return
+        }
+      }
+    }
+  } else if (!this.checkClose('onAttrName')) {
+    this.i++
+  }
+}
+
+/**
+ * @description 属性值状态
+ * @private
+ */
+Lexer.prototype.attrVal = function () {
+  const c = this.content[this.i]
+  const len = this.content.length
+  if (c === '"' || c === "'") {
+    // 有冒号的属性
+    this.start = ++this.i
+    this.i = this.content.indexOf(c, this.i)
+    if (this.i === -1) return
+    this.handler.onAttrVal(this.content.substring(this.start, this.i))
+  } else {
+    // 没有冒号的属性
+    for (; this.i < len; this.i++) {
+      if (blankChar[this.content[this.i]]) {
+        this.handler.onAttrVal(this.content.substring(this.start, this.i))
+        break
+      } else if (this.checkClose('onAttrVal')) return
+    }
+  }
+  while (blankChar[this.content[++this.i]]);
+  if (this.i < len && !this.checkClose()) {
+    this.start = this.i
+    this.state = this.attrName
+  }
+}
+
+/**
+ * @description 结束标签状态
+ * @returns {String} 结束的标签名
+ * @private
+ */
+Lexer.prototype.endTag = function () {
+  const c = this.content[this.i]
+  if (blankChar[c] || c === '>' || c === '/') {
+    this.handler.onCloseTag(this.content.substring(this.start, this.i))
+    if (c !== '>') {
+      this.i = this.content.indexOf('>', this.i)
+      if (this.i === -1) return
+    }
+    this.start = ++this.i
+    this.state = this.text
+  } else {
+    this.i++
+  }
+}
+
+export default Parser
diff --git a/uni_modules/mp-html/package.json b/uni_modules/mp-html/package.json
new file mode 100644
index 0000000..982c9af
--- /dev/null
+++ b/uni_modules/mp-html/package.json
@@ -0,0 +1,76 @@
+{
+    "id": "mp-html",
+    "displayName": "mp-html 富文本组件【全端支持，支持编辑、latex等扩展】",
+    "version": "v2.4.1",
+    "description": "一个强大的富文本组件，高效轻量，功能丰富",
+    "keywords": [
+        "富文本",
+        "编辑器",
+        "html",
+        "rich-text",
+        "editor"
+    ],
+    "repository": "https://github.com/jin-yufeng/mp-html",
+    "dcloudext": {
+        "sale": {
+            "regular": {
+                "price": "0.00"
+            },
+            "sourcecode": {
+                "price": "0.00"
+            }
+        },
+        "contact": {
+            "qq": ""
+        },
+        "declaration": {
+            "ads": "无",
+            "data": "无",
+            "permissions": "无"
+        },
+        "npmurl": "https://www.npmjs.com/package/mp-html",
+        "type": "component-vue"
+    },
+    "uni_modules": {
+        "platforms": {
+            "cloud": {
+                "tcb": "y",
+                "aliyun": "y"
+            },
+            "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": "u",
+                    "Edge": "y",
+                    "Firefox": "y",
+                    "Safari": "y"
+                },
+                "小程序": {
+                    "微信": "y",
+                    "阿里": "y",
+                    "百度": "y",
+                    "字节跳动": "y",
+                    "QQ": "y"
+                },
+                "快应用": {
+                    "华为": "y",
+                    "联盟": "y"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/mp-html/static/app-plus/mp-html/js/handler.js b/uni_modules/mp-html/static/app-plus/mp-html/js/handler.js
new file mode 100644
index 0000000..1d986bd
--- /dev/null
+++ b/uni_modules/mp-html/static/app-plus/mp-html/js/handler.js
@@ -0,0 +1 @@
+"use strict";function t(t){for(var e=Object.create(null),n=t.attributes.length;n--;)e[t.attributes[n].name]=t.attributes[n].value;return e}function e(){a[1]&&(this.src=a[1],this.onerror=null),this.onclick=null,this.ontouchstart=null,uni.postMessage({data:{action:"onError",source:"img",attrs:t(this)}})}function n(){window.unloadimgs-=1,0===window.unloadimgs&&uni.postMessage({data:{action:"onReady"}})}function o(r,s,c){for(var d=0;d<r.length;d++)!function(d){var u=r[d],l=void 0;if(u.type&&"node"!==u.type)l=document.createTextNode(u.text.replace(/&amp;/g,"&"));else{var g=u.name;"svg"===g&&(c="http://www.w3.org/2000/svg"),"html"!==g&&"body"!==g||(g="div"),l=c?document.createElementNS(c,g):document.createElement(g);for(var p in u.attrs)l.setAttribute(p,u.attrs[p]);if(u.children&&o(u.children,l,c),"img"===g){if(window.unloadimgs+=1,l.onload=n,l.onerror=n,!l.src&&l.getAttribute("data-src")&&(l.src=l.getAttribute("data-src")),u.attrs.ignore||(l.onclick=function(e){e.stopPropagation(),uni.postMessage({data:{action:"onImgTap",attrs:t(this)}})}),a[2]){var h=new Image;h.src=l.src,l.src=a[2],h.onload=function(){l.src=this.src},h.onerror=function(){l.onerror()}}l.onerror=e}else if("a"===g)l.addEventListener("click",function(e){e.stopPropagation(),e.preventDefault();var n,o=this.getAttribute("href");o&&"#"===o[0]&&(n=(document.getElementById(o.substr(1))||{}).offsetTop),uni.postMessage({data:{action:"onLinkTap",attrs:t(this),offset:n}})},!0);else if("video"===g||"audio"===g)i.push(l),u.attrs.autoplay||u.attrs.controls||l.setAttribute("controls","true"),l.onplay=function(){if(uni.postMessage({data:{action:"onPlay"}}),a[3])for(var t=0;t<i.length;t++)i[t]!==this&&i[t].pause()},l.onerror=function(){uni.postMessage({data:{action:"onError",source:g,attrs:t(this)}})};else if("table"===g&&a[4]&&!l.style.cssText.includes("inline")){var f=document.createElement("div");f.style.overflow="auto",f.appendChild(l),l=f}else"svg"===g&&(c=void 0)}s.appendChild(l)}(d)}document.addEventListener("UniAppJSBridgeReady",function(){document.body.onclick=function(){return uni.postMessage({data:{action:"onClick"}})},uni.postMessage({data:{action:"onJSBridgeReady"}})});var a,i=[];window.setContent=function(t,e,n){var r=document.getElementById("content");e[0]&&(document.body.style.cssText=e[0]),e[5]||(r.style.userSelect="none"),n||(r.innerHTML="",i=[]),a=e,window.unloadimgs=0;var s=document.createDocumentFragment();o(t,s),r.appendChild(s);var c=r.scrollHeight;uni.postMessage({data:{action:"onLoad",height:c}}),window.unloadimgs||uni.postMessage({data:{action:"onReady",height:c}}),clearInterval(window.timer),window.timer=setInterval(function(){r.scrollHeight!==c&&(c=r.scrollHeight,uni.postMessage({data:{action:"onHeightChange",height:c}}))},350)},window.onunload=function(){clearInterval(window.timer)};
\ No newline at end of file
diff --git a/uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js b/uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js
new file mode 100644
index 0000000..b0c8445
--- /dev/null
+++ b/uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function t(e,t){return n.call(e,t)}var i=[],a=function(e,n){var t={options:{timestamp:+new Date},name:e,arg:n};if(window.__dcloud_weex_postMessage||window.__dcloud_weex_){if("postMessage"===e){var a={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(a):window.__dcloud_weex_.postMessage(JSON.stringify(a))}var o={type:"WEB_INVOKE_APPSERVICE",args:{data:t,webviewIds:i}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(o):window.__dcloud_weex_.postMessageToService(JSON.stringify(o))}if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:t,pageId:""},"*");if(0===i.length){var r=plus.webview.currentWebview();if(!r)throw new Error("plus.webview.currentWebview() is undefined");var d=r.parent(),s="";s=d?d.id:r.id,i.push(s)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:t,webviewIds:i}},"__uniapp__service");else{var w=JSON.stringify(t);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(w,",").concat(JSON.stringify(i),");"))}},o={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;a("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;a("redirectTo",{url:encodeURI(n)})},getEnv:function(e){window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};a("postMessage",e.data||{})}},r=/uni-app/i.test(navigator.userAgent),d=/Html5Plus/i.test(navigator.userAgent),s=/complete|loaded|interactive/;var w=window.my&&navigator.userAgent.indexOf("AlipayClient")>-1;var u=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var c=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var g=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var v=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.qa&&/quickapp/i.test(navigator.userAgent);for(var l,_=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},f=[function(e){if(r||d)return window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&s.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),o},function(e){if(v)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(c)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(w){document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(u)return document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(g)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(p){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){return document.addEventListener("DOMContentLoaded",e),o}],m=0;m<f.length&&!(l=f[m](_));m++);l||(l={});var E="undefined"!=typeof uni?uni:{};if(!E.navigateTo)for(var b in l)t(l,b)&&(E[b]=l[b]);return E.webView=l,E}));
\ No newline at end of file
diff --git a/uni_modules/mp-html/static/app-plus/mp-html/local.html b/uni_modules/mp-html/static/app-plus/mp-html/local.html
new file mode 100644
index 0000000..04355c9
--- /dev/null
+++ b/uni_modules/mp-html/static/app-plus/mp-html/local.html
@@ -0,0 +1 @@
+<head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><style>body,html{width:100%;height:100%;overflow-x:scroll;overflow-y:hidden}body{margin:0}video{width:300px;height:225px}img{max-width:100%;-webkit-touch-callout:none}</style></head><body><div id="content" style="overflow:hidden"></div><script type="text/javascript" src="./js/uni.webview.min.js"></script><script type="text/javascript" src="./js/handler.js"></script></body>
\ No newline at end of file
diff --git a/uni_modules/shmily-drag-image/README.md b/uni_modules/shmily-drag-image/README.md
new file mode 100644
index 0000000..08fc7d3
--- /dev/null
+++ b/uni_modules/shmily-drag-image/README.md
@@ -0,0 +1,112 @@
+# 图片拖拽排序插件
+<font color='red'>1. H5 和微信小程序已测试通过</font>
+
+<font color='red'>2. App 和其他平台小程序未测试，大概率支持</font>
+
+<font color='red'>3. 非uni_modules版本未更新</font>
+
+## shmily-drag-image
+
+> 点击预览、长按拖拽排序、自定义添加图片、删除确认、支持对象数组
+
+## 预览
+您可以通过微信扫码，查看最佳的演示效果。
+
+![wp](https://web.shmily.ren/shmily-drag-image/static/wp.jpg)
+
+## 基本使用：
+
+```
+<shmily-drag-image v-model="list"></shmily-drag-image>
+
+
+export default {
+  data() {
+    return {
+      list: [
+        'http://web.shmily.ren/shmily-drag-image/static/1.jpg',
+        'http://web.shmily.ren/shmily-drag-image/static/2.jpg',
+        'http://web.shmily.ren/shmily-drag-image/static/3.jpg',
+      ]
+    }
+  }
+}
+```
+
+## 自定义添加、删除确认：
+```
+<shmily-drag-image v-model="list" :addImage="addImage" :delImage="delImage"></shmily-drag-image>
+
+
+export default {
+  data() {
+    return {
+      list: [
+        'http://web.shmily.ren/shmily-drag-image/static/1.jpg',
+        'http://web.shmily.ren/shmily-drag-image/static/2.jpg',
+        'http://web.shmily.ren/shmily-drag-image/static/3.jpg',
+      ]
+    }
+  },
+  methods:{
+    addImage() {
+      // 将图片地址添加到图片数组
+      this.list.push('http://web.shmily.ren/shmily-drag-image/static/4.jpg')
+    },
+    delImage(done) {
+      uni.showModal({
+        content: '是否删除?',
+        success: (res) => {
+          if(res.confirm) {
+            // 执行 done() 删除
+            done()
+          }
+        }
+      })
+    }
+  }
+}
+```
+
+## 支持对象数组：
+```
+<shmily-drag-image v-model="list" keyName="src"></shmily-drag-image>
+
+
+export default {
+  data() {
+    return {
+      list: [
+        {
+          src: 'http://web.shmily.ren/shmily-drag-image/static/1.jpg',
+        },
+        {
+          src: 'http://web.shmily.ren/shmily-drag-image/static/2.jpg',
+        },
+        {
+          src: 'http://web.shmily.ren/shmily-drag-image/static/3.jpg',
+        }
+      ]
+    }
+  }
+}
+```
+
+---
+
+## 属性说明
+
+属性名 | 类型 | 默认值 | 说明
+:-:|:-:|:-:|---
+v-model | Array | [ ] | 图片数组，元素为图片地址字符串或对象，默认为`Array<String>`
+keyName | String | null | 从图片数组元素对象中读取的键名
+number | Number | 6 | 图片数量限制
+imageWidth | Number | 0 | 图片父容器宽度（实际显示的图片宽度为 imageWidth / 1.1 ），单位 rpx。imageWidth > 0 则 cols 无效
+cols | Number | 3 | 图片列数
+borderRadius | Number | 0 | 图片圆角，单位 rpx
+padding | Number | 10 | 图片周围空白填充，单位 rpx
+scale | Number | 1.1 | 拖动图片时放大倍数 [0, ∞)
+opacity | Number | 0.7 | 拖动图片时不透明度
+addImage | Function | null | 自定义添加，见上方示例
+delImage | Function | null | 删除确认，见上方示例
+
diff --git a/uni_modules/shmily-drag-image/changelog.md b/uni_modules/shmily-drag-image/changelog.md
new file mode 100644
index 0000000..d7d8029
--- /dev/null
+++ b/uni_modules/shmily-drag-image/changelog.md
@@ -0,0 +1,10 @@
+## 2.0.2（2022-09-17）
+- 修复图片删除
+## 2.0.1（2022-09-16）
+- 修改文档
+## 2.0.0（2022-09-16）
+- 支持 Vue 3
+- 图片数组支持对象元素
+- 新增删除确认
+- 解决了一些已知问题
+- 调整为 uni_modules 目录规范
diff --git a/uni_modules/shmily-drag-image/components/shmily-drag-image/shmily-drag-image.vue b/uni_modules/shmily-drag-image/components/shmily-drag-image/shmily-drag-image.vue
new file mode 100644
index 0000000..9044fc9
--- /dev/null
+++ b/uni_modules/shmily-drag-image/components/shmily-drag-image/shmily-drag-image.vue
@@ -0,0 +1,566 @@
+<template>
+  <view class="con">
+    <template v-if="viewWidth">
+      <movable-area class="area" :style="{ height: areaHeight }" @mouseenter="mouseenter" @mouseleave="mouseleave">
+        <movable-view v-for="(item, index) in imageList" :key="item.id" class="view" direction="all" :y="item.y"
+          :x="item.x" :damping="40" :disabled="item.disable" @change="onChange($event, item)"
+          @touchstart="touchstart(item)" @mousedown="touchstart(item)" @touchend="touchend(item)"
+          @mouseup="touchend(item)" :style="{
+          width: viewWidth + 'px', 
+          height: viewWidth + 'px', 
+          'z-index': item.zIndex, 
+          opacity: item.opacity 
+        }">
+          <view class="area-con" :style="{
+            width: childWidth, 
+            height: childWidth, 
+            borderRadius: borderRadius + 'rpx',
+            transform: 'scale(' + item.scale + ')' 
+          }">
+            <image @click="previewImage(item)" class="pre-image" :src="item.src" mode="aspectFill"></image>
+            <view class="del-con" @click="delImages(item, index)" @touchstart.stop="delImageMp(item, index)"
+              @touchend.stop="nothing()" @mousedown.stop="nothing()" @mouseup.stop="nothing()">
+              <view class="del-wrap">
+                <image class="del-image"
+                  src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAhCAYAAABX5MJvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAhdEVYdENyZWF0aW9uIFRpbWUAMjAyMDowNzoyNSAyMTo1NDoyOU4TkJAAAADcSURBVFhH7ZfRCoMwDEXLvkjwwVf/bH/emmAyN6glTW9WBjsgwm28OeCLpj81Sil7zvlJ90UiONS/yY5VogsO6XrBg3IEQ5a/s8vRSWUAKmLqp2w5jz5BiNQEGMo3GbloDLtFXJ1IkaEuhAiiY6gEIqB4yqACSk9piIBiKQ8VUFpLviKg3C2rESKgWERCBZSWiEfgIfffYvrrsAgoISJ3Apy3zuTxcSxLQkV6ykNEPKVQkZEyiAiiZKgDIaC4upACSlcn5fM/+WuDCAHF1E/Z/N9AhkMZnPNDPI+UDjPIXgAQIGjNAAAAAElFTkSuQmCC">
+                </image>
+              </view>
+            </view>
+          </view>
+        </movable-view>
+        <view class="add" v-if="imageList.length < number"
+          :style="{ top: add.y, left: add.x, width: viewWidth + 'px', height: viewWidth + 'px' }" @click="addImages">
+          <view class="add-wrap" :style="{ width: childWidth, height: childWidth, borderRadius: borderRadius + 'rpx' }">
+            <image style="width: 54rpx;height: 54rpx;"
+              src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAA2CAYAAACMRWrdAAABIUlEQVRoQ+2a2w2DMAxFeQzWrsMUbadAsEw3S1CqVgppKwLX8BEOP4iHTXx8uUgWdVXoVhdaV0VhSmf7vr/H8V3XzY6V3P9iD+nYOI5P7/01LMI596AwoZV0TIBXIUWFXhKLFBWYSFGhhxQN6SFFQ5i4ogITKSr0cEVDekjRECauqMBEigq9U7piOk2yAti27SUe5ljlTfPEQ6KZecTvwl4P3ytvOv06R2HDMNzes7+6aRrvnHvtf50L13Lp50rx88zcvNlS3JpwKQ67XyK04nq2nFbk/LqVjin0TvmBNgQ2S4UUDcliHgpMpKjQwxUN6SFFQ5i4ogITKSr0cEVDekjRECauqMAsVoph+hVPtYr5+03p9tbYQ96xrYtT4ootbAJGVxxVTapVswAAAABJRU5ErkJggg==">
+            </image>
+          </view>
+        </view>
+      </movable-area>
+
+    </template>
+  </view>
+</template>
+
+<script>
+  import FileApi from '@/sheep/api/infra/file';
+  export default {
+    emits: ['input', 'update:modelValue'],
+    props: {
+      // 排序图片
+      value: {
+        type: Array,
+        default: function() {
+          return []
+        }
+      },
+      // 排序图片
+      modelValue: {
+        type: Array,
+        default: function() {
+          return []
+        }
+      },
+      // 从 list 元素对象中读取的键名
+      keyName: {
+        type: String,
+        default: null
+      },
+      // 选择图片数量限制
+      number: {
+        type: Number,
+        default: 6
+      },
+      // 图片父容器宽度（实际显示的图片宽度为 imageWidth / 1.1 ），单位 rpx
+      // imageWidth > 0 则 cols 无效
+      imageWidth: {
+        type: Number,
+        default: 0
+      },
+      // 图片列数
+      cols: {
+        type: Number,
+        default: 3
+      },
+      // 图片圆角，单位 rpx
+      borderRadius: {
+        type: Number,
+        default: 0
+      },
+      // 图片周围空白填充，单位 rpx
+      padding: {
+        type: Number,
+        default: 10
+      },
+      // 拖动图片时放大倍数 [0, ∞)
+      scale: {
+        type: Number,
+        default: 1.1
+      },
+      // 拖动图片时不透明度
+      opacity: {
+        type: Number,
+        default: 0.7
+      },
+      // 自定义添加
+      addImage: {
+        type: Function,
+        default: null
+      },
+      // 删除确认
+      delImage: {
+        type: Function,
+        default: null
+      }
+    },
+    data() {
+      return {
+        imageList: [],
+        width: 0,
+        add: {
+          x: 0,
+          y: 0
+        },
+        colsValue: 0,
+        viewWidth: 0,
+        tempItem: null,
+        timer: null,
+        changeStatus: true,
+        preStatus: true,
+        first: true,
+      }
+    },
+    computed: {
+      areaHeight() {
+        let height = ''
+        // return '355px'
+        if (this.imageList.length < this.number) {
+          height = (Math.ceil((this.imageList.length + 1) / this.colsValue) * this.viewWidth).toFixed() + 'px'
+        } else {
+          height = (Math.ceil(this.imageList.length / this.colsValue) * this.viewWidth).toFixed() + 'px'
+        }
+        console.log('areaHeight', height)
+        return height
+      },
+      childWidth() {
+        return this.viewWidth - this.rpx2px(this.padding) * 2 + 'px'
+      },
+    },
+    watch: {
+      value: {
+        handler(n) {
+          if (!this.first && this.changeStatus) {
+            console.log('watch', n)
+            let flag = false
+            for (let i = 0; i < n.length; i++) {
+              if (flag) {
+                this.addProperties(this.getSrc(n[i]))
+                continue
+              }
+              if (this.imageList.length === i || this.imageList[i].src !== this.getSrc(n[i])) {
+                flag = true
+                this.imageList.splice(i)
+                this.addProperties(this.getSrc(n[i]))
+              }
+            }
+          }
+        },
+        deep: true
+      },
+      modelValue: {
+        handler(n) {
+          if (!this.first && this.changeStatus) {
+            console.log('watch', n)
+            let flag = false
+            for (let i = 0; i < n.length; i++) {
+              if (flag) {
+                this.addProperties(this.getSrc(n[i]))
+                continue
+              }
+              if (this.imageList.length === i || this.imageList[i].src !== this.getSrc(n[i])) {
+                flag = true
+                this.imageList.splice(i)
+                this.addProperties(this.getSrc(n[i]))
+              }
+            }
+          }
+        },
+        deep: true
+      },
+    },
+    created() {
+      this.width = uni.getSystemInfoSync().windowWidth
+    },
+    mounted() {
+      const query = uni.createSelectorQuery().in(this)
+      query.select('.con').boundingClientRect(data => {
+        this.colsValue = this.cols
+        this.viewWidth = data.width / this.cols
+        if (this.imageWidth > 0) {
+          this.viewWidth = this.rpx2px(this.imageWidth)
+          this.colsValue = Math.floor(data.width / this.viewWidth)
+        }
+        let list = this.value
+        // #ifdef VUE3
+        list = this.modelValue
+        // #endif
+        for (let item of list) {
+          this.addProperties(this.getSrc(item))
+        }
+        this.first = false
+
+      })
+      query.exec()
+    },
+    methods: {
+      getSrc(item) {
+        if(this.keyName !== null) {
+          return item[this.keyName]
+        }
+        return item
+      },
+      onChange(e, item) {
+        if (!item) return
+        item.oldX = e.detail.x
+        item.oldY = e.detail.y
+        if (e.detail.source === 'touch') {
+          if (item.moveEnd) {
+            item.offset = Math.sqrt(Math.pow(item.oldX - item.absX * this.viewWidth, 2) + Math.pow(item.oldY - item
+              .absY * this.viewWidth, 2))
+          }
+          let x = Math.floor((e.detail.x + this.viewWidth / 2) / this.viewWidth)
+          if (x >= this.colsValue) return
+          let y = Math.floor((e.detail.y + this.viewWidth / 2) / this.viewWidth)
+          let index = this.colsValue * y + x
+          if (item.index != index && index < this.imageList.length) {
+            this.changeStatus = false
+            for (let obj of this.imageList) {
+              if (item.index > index && obj.index >= index && obj.index < item.index) {
+                this.change(obj, 1)
+              } else if (item.index < index && obj.index <= index && obj.index > item.index) {
+                this.change(obj, -1)
+              } else if (obj.id != item.id) {
+                obj.offset = 0
+                obj.x = obj.oldX
+                obj.y = obj.oldY
+                setTimeout(() => {
+                  this.$nextTick(() => {
+                    obj.x = obj.absX * this.viewWidth
+                    obj.y = obj.absY * this.viewWidth
+                  })
+                }, 0)
+              }
+            }
+            item.index = index
+            item.absX = x
+            item.absY = y
+            if (!item.moveEnd) {
+              setTimeout(() => {
+                this.$nextTick(() => {
+                  item.x = item.absX * this.viewWidth
+                  item.y = item.absY * this.viewWidth
+                })
+              }, 0)
+            }
+            // console.log('bbb', JSON.parse(JSON.stringify(item)));
+            this.sortList()
+          }
+        }
+      },
+      change(obj, i) {
+        obj.index += i
+        obj.offset = 0
+        obj.x = obj.oldX
+        obj.y = obj.oldY
+        obj.absX = obj.index % this.colsValue
+        obj.absY = Math.floor(obj.index / this.colsValue)
+        setTimeout(() => {
+          this.$nextTick(() => {
+            obj.x = obj.absX * this.viewWidth
+            obj.y = obj.absY * this.viewWidth
+          })
+        }, 0)
+      },
+      touchstart(item) {
+        this.imageList.forEach(v => {
+          v.zIndex = v.index + 9
+        })
+        item.zIndex = 99
+        item.moveEnd = true
+        this.tempItem = item
+        this.timer = setTimeout(() => {
+          item.scale = this.scale
+          item.opacity = this.opacity
+          clearTimeout(this.timer)
+          this.timer = null
+        }, 200)
+      },
+      touchend(item) {
+        //this.previewImage(item)
+        item.scale = 1
+        item.opacity = 1
+        item.x = item.oldX
+        item.y = item.oldY
+        item.offset = 0
+        item.moveEnd = false
+        setTimeout(() => {
+          this.$nextTick(() => {
+            item.x = item.absX * this.viewWidth
+            item.y = item.absY * this.viewWidth
+            this.tempItem = null
+            this.changeStatus = true
+          })
+          // console.log('ccc', JSON.parse(JSON.stringify(item)));
+        }, 0)
+        // console.log('ddd', JSON.parse(JSON.stringify(item)));
+      },
+      previewImage(item) {
+        if (this.timer && this.preStatus && this.changeStatus && item.offset < 28.28) {
+          clearTimeout(this.timer)
+          this.timer = null
+          const list = this.modelValue
+          let srcList = list.map(v => this.getSrc(v))
+          console.log(list, srcList);
+          uni.previewImage({
+            urls: srcList,
+            current: item.src,
+            success: () => {
+              this.preStatus = false
+              setTimeout(() => {
+                this.preStatus = true
+              }, 600)
+            },
+            fail: (e) => {
+              console.log(e);
+            }
+          })
+        } else if (this.timer) {
+          clearTimeout(this.timer)
+          this.timer = null
+        }
+      },
+      mouseenter() {
+        //#ifdef H5
+        this.imageList.forEach(v => {
+          v.disable = false
+        })
+        //#endif
+
+      },
+      mouseleave() {
+        //#ifdef H5
+        if (this.tempItem) {
+          this.imageList.forEach(v => {
+            v.disable = true
+            v.zIndex = v.index + 9
+            v.offset = 0
+            v.moveEnd = false
+            if (v.id == this.tempItem.id) {
+              if (this.timer) {
+                clearTimeout(this.timer)
+                this.timer = null
+              }
+              v.scale = 1
+              v.opacity = 1
+              v.x = v.oldX
+              v.y = v.oldY
+              this.$nextTick(() => {
+                v.x = v.absX * this.viewWidth
+                v.y = v.absY * this.viewWidth
+                this.tempItem = null
+              })
+            }
+          })
+          this.changeStatus = true
+        }
+        //#endif
+      },
+      addImages() {
+        if (typeof this.addImage === 'function') {
+          this.addImage.bind(this.$parent)()
+        } else {
+          let checkNumber = this.number - this.imageList.length
+          uni.chooseImage({
+            count: checkNumber,
+            sourceType: ['album', 'camera'],
+            success: res => {
+              this.uploadImage(checkNumber, res);
+            }
+          })
+        }
+      },
+	  async uploadImage(checkNumber, res) {
+		let count = checkNumber <= res.tempFilePaths.length ? checkNumber : res.tempFilePaths.length
+		for (let i = 0; i < count; i++) {
+		  var path = res.tempFilePaths[i];
+		  var result = await FileApi.uploadFile(path);
+		  this.addProperties(result.data);
+		}
+	  	this.sortList();
+	  },
+      delImages(item, index) {
+        if (typeof this.delImage === 'function') {
+          this.delImage.bind(this.$parent)(() => {
+            this.delImageHandle(item, index)
+          })
+        } else {
+          this.delImageHandle(item, index)
+        }
+      },
+      delImageHandle(item, index) {
+        this.imageList.splice(index, 1)
+        for (let obj of this.imageList) {
+          if (obj.index > item.index) {
+            obj.index -= 1
+            obj.x = obj.oldX
+            obj.y = obj.oldY
+            obj.absX = obj.index % this.colsValue
+            obj.absY = Math.floor(obj.index / this.colsValue)
+            this.$nextTick(() => {
+              obj.x = obj.absX * this.viewWidth
+              obj.y = obj.absY * this.viewWidth
+            })
+          }
+        }
+        this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
+        this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+        this.sortList()
+      },
+      delImageMp(item, index) {
+        //#ifdef MP
+        this.delImages(item, index)
+        //#endif
+      },
+      sortList() {
+        console.log('sortList');
+        const result = []
+        let source = this.value
+        // #ifdef VUE3
+        source = this.modelValue
+        // #endif
+        
+        let list = this.imageList.slice()
+        list.sort((a, b) => {
+          return a.index - b.index
+        })
+        for (let s of list) {
+          let item = source.find(d => this.getSrc(d) == s.src)
+          if (item) {
+            result.push(item)
+          } else {
+            if(this.keyName !== null) {
+              result.push({
+                [this.keyName]: s.src
+              })
+            } else {
+              result.push(s.src)
+            }
+          }
+        }
+        
+        this.$emit("input", result);
+        this.$emit("update:modelValue", result);
+      },
+      addProperties(item) {
+        console.log(item);
+        let absX = this.imageList.length % this.colsValue
+        let absY = Math.floor(this.imageList.length / this.colsValue)
+        let x = absX * this.viewWidth
+        let y = absY * this.viewWidth
+        this.imageList.push({
+          src: item,
+          x,
+          y,
+          oldX: x,
+          oldY: y,
+          absX,
+          absY,
+          scale: 1,
+          zIndex: 9,
+          opacity: 1,
+          index: this.imageList.length,
+          id: this.guid(16),
+          disable: false,
+          offset: 0,
+          moveEnd: false
+        })
+        this.add.x = (this.imageList.length % this.colsValue) * this.viewWidth + 'px'
+        this.add.y = Math.floor(this.imageList.length / this.colsValue) * this.viewWidth + 'px'
+      },
+      nothing() {},
+      rpx2px(v) {
+        return this.width * v / 750
+      },
+      guid(len = 32) {
+        const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
+        const uuid = []
+        const radix = chars.length
+        for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix]
+        uuid.shift()
+        return `u${uuid.join('')}`
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .con {
+    // padding: 30rpx;
+
+    .area {
+      width: 100%;
+
+      .view {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .area-con {
+          position: relative;
+          overflow: hidden;
+
+          .pre-image {
+            width: 100%;
+            height: 100%;
+          }
+
+          .del-con {
+            position: absolute;
+            top: 0rpx;
+            right: 0rpx;
+            padding: 0 0 20rpx 20rpx;
+
+            .del-wrap {
+              width: 36rpx;
+              height: 36rpx;
+              background-color: rgba(0, 0, 0, 0.4);
+              border-radius: 0 0 0 10rpx;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+
+              .del-image {
+                width: 20rpx;
+                height: 20rpx;
+              }
+            }
+          }
+        }
+      }
+
+      .add {
+        position: absolute;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .add-wrap {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          background-color: #eeeeee;
+        }
+      }
+    }
+  }
+</style>
diff --git a/uni_modules/shmily-drag-image/package.json b/uni_modules/shmily-drag-image/package.json
new file mode 100644
index 0000000..139326a
--- /dev/null
+++ b/uni_modules/shmily-drag-image/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "shmily-drag-image",
+  "displayName": "图片拖拽排序",
+  "version": "2.0.2",
+  "description": "图片排序、图片拖动排序",
+  "keywords": [
+    "drag",
+    "图片",
+    "排序",
+    "拖拽",
+    "拖动"
+],
+  "repository": "https://github.com/shmilyany/shmily-drag-image",
+  "engines": {
+    "HBuilderX": "^3.2.8"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "617942150"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "n",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-badge/changelog.md b/uni_modules/uni-badge/changelog.md
new file mode 100644
index 0000000..544ecc1
--- /dev/null
+++ b/uni_modules/uni-badge/changelog.md
@@ -0,0 +1,29 @@
+## 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-badge](https://uniapp.dcloud.io/component/uniui/uni-badge)
+## 1.1.7（2021-11-08）
+- 优化 升级ui
+- 修改 size 属性默认值调整为 small
+- 修改 type 属性，默认值调整为 error，info 替换 default
+## 1.1.6（2021-09-22）
+- 修复 在字节小程序上样式不生效的 bug
+## 1.1.5（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.4（2021-07-29）
+- 修复 去掉 nvue 不支持css 的 align-self 属性，nvue 下不暂支持 absolute 属性
+## 1.1.3（2021-06-24）
+- 优化 示例项目
+## 1.1.1（2021-05-12）
+- 新增 组件示例地址
+## 1.1.0（2021-05-12）
+- 新增 uni-badge 的 absolute 属性，支持定位
+- 新增 uni-badge 的 offset 属性，支持定位偏移
+- 新增 uni-badge 的 is-dot 属性，支持仅显示有一个小点
+- 新增 uni-badge 的 max-num 属性，支持自定义封顶的数字值，超过 99 显示99+
+- 优化 uni-badge 属性 custom-style， 支持以对象形式自定义样式
+## 1.0.7（2021-05-07）
+- 修复 uni-badge 在 App 端，数字小于10时不是圆形的bug
+- 修复 uni-badge 在父元素不是 flex 布局时，宽度缩小的bug
+- 新增 uni-badge 属性 custom-style， 支持自定义样式
+## 1.0.6（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-badge/components/uni-badge/uni-badge.vue b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
new file mode 100644
index 0000000..1981b4e
--- /dev/null
+++ b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue
@@ -0,0 +1,268 @@
+<template>
+	<view class="uni-badge--x">
+		<slot />
+		<text v-if="text" :class="classNames" :style="[badgeWidth, positionStyle, customStyle, dotStyle]"
+			class="uni-badge" @click="onClick()">{{displayValue}}</text>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Badge 数字角标
+	 * @description 数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=21
+	 * @property {String} text 角标内容
+	 * @property {String} size = [normal|small] 角标内容
+	 * @property {String} type = [info|primary|success|warning|error] 颜色类型
+	 * 	@value info 灰色
+	 * 	@value primary 蓝色
+	 * 	@value success 绿色
+	 * 	@value warning 黄色
+	 * 	@value error 红色
+	 * @property {String} inverted = [true|false] 是否无需背景颜色
+	 * @property {Number} maxNum 展示封顶的数字值，超过 99 显示 99+
+	 * @property {String} absolute = [rightTop|rightBottom|leftBottom|leftTop] 开启绝对定位, 角标将定位到其包裹的标签的四角上		
+	 * 	@value rightTop 右上
+	 * 	@value rightBottom 右下
+	 * 	@value leftTop 左上
+	 * 	@value leftBottom 左下
+	 * @property {Array[number]} offset	距定位角中心点的偏移量，只有存在 absolute 属性时有效，例如：[-10, -10] 表示向外偏移 10px，[10, 10] 表示向 absolute 指定的内偏移 10px
+	 * @property {String} isDot = [true|false] 是否显示为一个小点
+	 * @event {Function} click 点击 Badge 触发事件
+	 * @example <uni-badge text="1"></uni-badge>
+	 */
+
+	export default {
+		name: 'UniBadge',
+		emits: ['click'],
+		props: {
+			type: {
+				type: String,
+				default: 'error'
+			},
+			inverted: {
+				type: Boolean,
+				default: false
+			},
+			isDot: {
+				type: Boolean,
+				default: false
+			},
+			maxNum: {
+				type: Number,
+				default: 99
+			},
+			absolute: {
+				type: String,
+				default: ''
+			},
+			offset: {
+				type: Array,
+				default () {
+					return [0, 0]
+				}
+			},
+			text: {
+				type: [String, Number],
+				default: ''
+			},
+			size: {
+				type: String,
+				default: 'small'
+			},
+			customStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {};
+		},
+		computed: {
+			width() {
+				return String(this.text).length * 8 + 12
+			},
+			classNames() {
+				const {
+					inverted,
+					type,
+					size,
+					absolute
+				} = this
+				return [
+					inverted ? 'uni-badge--' + type + '-inverted' : '',
+					'uni-badge--' + type,
+					'uni-badge--' + size,
+					absolute ? 'uni-badge--absolute' : ''
+				].join(' ')
+			},
+			positionStyle() {
+				if (!this.absolute) return {}
+				let w = this.width / 2,
+					h = 10
+				if (this.isDot) {
+					w = 5
+					h = 5
+				}
+				const x = `${- w  + this.offset[0]}px`
+				const y = `${- h + this.offset[1]}px`
+
+				const whiteList = {
+					rightTop: {
+						right: x,
+						top: y
+					},
+					rightBottom: {
+						right: x,
+						bottom: y
+					},
+					leftBottom: {
+						left: x,
+						bottom: y
+					},
+					leftTop: {
+						left: x,
+						top: y
+					}
+				}
+				const match = whiteList[this.absolute]
+				return match ? match : whiteList['rightTop']
+			},
+			badgeWidth() {
+				return {
+					width: `${this.width}px`
+				}
+			},
+			dotStyle() {
+				if (!this.isDot) return {}
+				return {
+					width: '10px',
+					height: '10px',
+					borderRadius: '10px'
+				}
+			},
+			displayValue() {
+				const {
+					isDot,
+					text,
+					maxNum
+				} = this
+				return isDot ? '' : (Number(text) > maxNum ? `${maxNum}+` : text)
+			}
+		},
+		methods: {
+			onClick() {
+				this.$emit('click');
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$uni-primary: #2979ff !default;
+	$uni-success: #4cd964 !default;
+	$uni-warning: #f0ad4e !default;
+	$uni-error: #dd524d !default;
+	$uni-info: #909399 !default;
+
+
+	$bage-size: 12px;
+	$bage-small: scale(0.8);
+
+	.uni-badge--x {
+		/* #ifdef APP-NVUE */
+		// align-self: flex-start;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		position: relative;
+	}
+
+	.uni-badge--absolute {
+		position: absolute;
+	}
+
+	.uni-badge--small {
+		transform: $bage-small;
+		transform-origin: center center;
+	}
+
+	.uni-badge {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		overflow: hidden;
+		box-sizing: border-box;
+		/* #endif */
+		justify-content: center;
+		flex-direction: row;
+		height: 20px;
+		line-height: 18px;
+		color: #fff;
+		border-radius: 100px;
+		background-color: $uni-info;
+		background-color: transparent;
+		border: 1px solid #fff;
+		text-align: center;
+		font-family: 'Helvetica Neue', Helvetica, sans-serif;
+		font-size: $bage-size;
+		/* #ifdef H5 */
+		z-index: 999;
+		cursor: pointer;
+		/* #endif */
+
+		&--info {
+			color: #fff;
+			background-color: $uni-info;
+		}
+
+		&--primary {
+			background-color: $uni-primary;
+		}
+
+		&--success {
+			background-color: $uni-success;
+		}
+
+		&--warning {
+			background-color: $uni-warning;
+		}
+
+		&--error {
+			background-color: $uni-error;
+		}
+
+		&--inverted {
+			padding: 0 5px 0 0;
+			color: $uni-info;
+		}
+
+		&--info-inverted {
+			color: $uni-info;
+			background-color: transparent;
+		}
+
+		&--primary-inverted {
+			color: $uni-primary;
+			background-color: transparent;
+		}
+
+		&--success-inverted {
+			color: $uni-success;
+			background-color: transparent;
+		}
+
+		&--warning-inverted {
+			color: $uni-warning;
+			background-color: transparent;
+		}
+
+		&--error-inverted {
+			color: $uni-error;
+			background-color: transparent;
+		}
+
+	}
+</style>
diff --git a/uni_modules/uni-badge/package.json b/uni_modules/uni-badge/package.json
new file mode 100644
index 0000000..7ba6d2f
--- /dev/null
+++ b/uni_modules/uni-badge/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-badge",
+  "displayName": "uni-badge 数字角标",
+  "version": "1.2.0",
+  "description": "数字角标（徽章）组件，在元素周围展示消息提醒，一般用于列表、九宫格、按钮等地方。",
+  "keywords": [
+    "",
+    "badge",
+    "uni-ui",
+    "uniui",
+    "数字角标",
+    "徽章"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": "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"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-badge/readme.md b/uni_modules/uni-badge/readme.md
new file mode 100644
index 0000000..bdf175d
--- /dev/null
+++ b/uni_modules/uni-badge/readme.md
@@ -0,0 +1,10 @@
+## Badge 数字角标
+> **组件名：uni-badge**
+> 代码块： `uBadge`
+
+数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景，
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-badge)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-card/changelog.md b/uni_modules/uni-card/changelog.md
new file mode 100644
index 0000000..c3cd8c4
--- /dev/null
+++ b/uni_modules/uni-card/changelog.md
@@ -0,0 +1,26 @@
+## 1.3.1（2021-12-20）
+- 修复 在vue页面下略缩图显示不正常的bug
+## 1.3.0（2021-11-19）
+- 重构插槽的用法 ，header 替换为 title 
+- 新增 actions 插槽
+- 新增 cover 封面图属性和插槽
+- 新增 padding 内容默认内边距离
+- 新增 margin 卡片默认外边距离
+- 新增 spacing 卡片默认内边距
+- 新增 shadow 卡片阴影属性
+- 取消 mode 属性，可使用组合插槽代替
+- 取消 note 属性 ，使用actions插槽代替
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-card](https://uniapp.dcloud.io/component/uniui/uni-card)
+## 1.2.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-07-01）
+- 优化 图文卡片无图片加载时，提供占位图标
+- 新增 header 插槽，自定义卡片头部（ 图文卡片 mode="style" 时，不支持）
+- 修复 thumbnail 不存在仍然占位的 bug
+## 1.1.7（2021-05-12）
+- 新增 组件示例地址
+## 1.1.6（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-card/components/uni-card/uni-card.vue b/uni_modules/uni-card/components/uni-card/uni-card.vue
new file mode 100644
index 0000000..38cf594
--- /dev/null
+++ b/uni_modules/uni-card/components/uni-card/uni-card.vue
@@ -0,0 +1,270 @@
+<template>
+	<view class="uni-card" :class="{ 'uni-card--full': isFull, 'uni-card--shadow': isShadow,'uni-card--border':border}"
+		:style="{'margin':isFull?0:margin,'padding':spacing,'box-shadow':isShadow?shadow:''}">
+		<!-- 封面 -->
+		<slot name="cover">
+			<view v-if="cover" class="uni-card__cover">
+				<image class="uni-card__cover-image" mode="widthFix" @click="onClick('cover')" :src="cover"></image>
+			</view>
+		</slot>
+		<slot name="title">
+			<view v-if="title || extra" class="uni-card__header">
+				<!-- 卡片标题 -->
+				<view class="uni-card__header-box" @click="onClick('title')">
+					<view v-if="thumbnail" class="uni-card__header-avatar">
+						<image class="uni-card__header-avatar-image" :src="thumbnail" mode="aspectFit" />
+					</view>
+					<view class="uni-card__header-content">
+						<text class="uni-card__header-content-title uni-ellipsis">{{ title }}</text>
+						<text v-if="title&&subTitle"
+							class="uni-card__header-content-subtitle uni-ellipsis">{{ subTitle }}</text>
+					</view>
+				</view>
+				<view class="uni-card__header-extra" @click="onClick('extra')">
+					<text class="uni-card__header-extra-text">{{ extra }}</text>
+				</view>
+			</view>
+		</slot>
+		<!-- 卡片内容 -->
+		<view class="uni-card__content" :style="{padding:padding}" @click="onClick('content')">
+			<slot></slot>
+		</view>
+		<view class="uni-card__actions" @click="onClick('actions')">
+			<slot name="actions"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Card 卡片
+	 * @description 卡片视图组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=22
+	 * @property {String} title 标题文字
+	 * @property {String} subTitle 副标题
+	 * @property {Number} padding 内容内边距
+	 * @property {Number} margin 卡片外边距
+	 * @property {Number} spacing 卡片内边距
+	 * @property {String} extra 标题额外信息
+	 * @property {String} cover 封面图（本地路径需要引入）
+	 * @property {String} thumbnail 标题左侧缩略图
+	 * @property {Boolean} is-full = [true | false] 卡片内容是否通栏，为 true 时将去除padding值
+	 * @property {Boolean} is-shadow = [true | false] 卡片内容是否开启阴影
+	 * @property {String} shadow 卡片阴影
+	 * @property {Boolean} border 卡片边框
+	 * @event {Function} click 点击 Card 触发事件
+	 */
+	export default {
+		name: 'UniCard',
+		emits: ['click'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			subTitle: {
+				type: String,
+				default: ''
+			},
+			padding: {
+				type: String,
+				default: '10px'
+			},
+			margin: {
+				type: String,
+				default: '15px'
+			},
+			spacing: {
+				type: String,
+				default: '0 10px'
+			},
+			extra: {
+				type: String,
+				default: ''
+			},
+			cover: {
+				type: String,
+				default: ''
+			},
+			thumbnail: {
+				type: String,
+				default: ''
+			},
+			isFull: {
+				// 内容区域是否通栏
+				type: Boolean,
+				default: false
+			},
+			isShadow: {
+				// 是否开启阴影
+				type: Boolean,
+				default: true
+			},
+			shadow: {
+				type: String,
+				default: '0px 0px 3px 1px rgba(0, 0, 0, 0.08)'
+			},
+			border: {
+				type: Boolean,
+				default: true
+			}
+		},
+		methods: {
+			onClick(type) {
+				this.$emit('click', type)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-border-3: #EBEEF5 !default;
+	$uni-shadow-base:0 0px 6px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+	$uni-main-color: #3a3a3a !default;
+	$uni-base-color: #6a6a6a !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-spacing-sm: 8px !default;
+	$uni-border-color:$uni-border-3;
+	$uni-shadow: $uni-shadow-base;
+	$uni-card-title: 15px;
+	$uni-cart-title-color:$uni-main-color;
+	$uni-card-subtitle: 12px;
+	$uni-cart-subtitle-color:$uni-secondary-color;
+	$uni-card-spacing: 10px;
+	$uni-card-content-color: $uni-base-color;
+
+	.uni-card {
+		margin: $uni-card-spacing;
+		padding: 0 $uni-spacing-sm;
+		border-radius: 4px;
+		overflow: hidden;
+		font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+		background-color: #fff;
+		flex: 1;
+
+		.uni-card__cover {
+			position: relative;
+			margin-top: $uni-card-spacing;
+			flex-direction: row;
+			overflow: hidden;
+			border-radius: 4px;
+			.uni-card__cover-image {
+				flex: 1;
+				// width: 100%;
+				/* #ifndef APP-PLUS */
+				vertical-align: middle;
+				/* #endif */
+			}
+		}
+
+		.uni-card__header {
+			display: flex;
+			border-bottom: 1px $uni-border-color solid;
+			flex-direction: row;
+			align-items: center;
+			padding: $uni-card-spacing;
+			overflow: hidden;
+
+			.uni-card__header-box {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				/* #endif */
+				flex: 1;
+				flex-direction: row;
+				align-items: center;
+				overflow: hidden;
+			}
+
+			.uni-card__header-avatar {
+				width: 40px;
+				height: 40px;
+				overflow: hidden;
+				border-radius: 5px;
+				margin-right: $uni-card-spacing;
+				.uni-card__header-avatar-image {
+					flex: 1;
+					width: 40px;
+					height: 40px;
+				}
+			}
+
+			.uni-card__header-content {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				/* #endif */
+				flex-direction: column;
+				justify-content: center;
+				flex: 1;
+				// height: 40px;
+				overflow: hidden;
+
+				.uni-card__header-content-title {
+					font-size: $uni-card-title;
+					color: $uni-cart-title-color;
+					// line-height: 22px;
+				}
+
+				.uni-card__header-content-subtitle {
+					font-size: $uni-card-subtitle;
+					margin-top: 5px;
+					color: $uni-cart-subtitle-color;
+				}
+			}
+
+			.uni-card__header-extra {
+				line-height: 12px;
+
+				.uni-card__header-extra-text {
+					font-size: 12px;
+					color: $uni-cart-subtitle-color;
+				}
+			}
+		}
+
+		.uni-card__content {
+			padding: $uni-card-spacing;
+			font-size: 14px;
+			color: $uni-card-content-color;
+			line-height: 22px;
+		}
+
+		.uni-card__actions {
+			font-size: 12px;
+		}
+	}
+
+	.uni-card--border {
+		border: 1px solid $uni-border-color;
+	}
+
+	.uni-card--shadow {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		box-shadow: $uni-shadow;
+		/* #endif */
+	}
+
+	.uni-card--full {
+		margin: 0;
+		border-left-width: 0;
+		border-left-width: 0;
+		border-radius: 0;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-card--full:after {
+		border-radius: 0;
+	}
+
+	/* #endif */
+	.uni-ellipsis {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-card/package.json b/uni_modules/uni-card/package.json
new file mode 100644
index 0000000..f16224d
--- /dev/null
+++ b/uni_modules/uni-card/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-card",
+  "displayName": "uni-card 卡片",
+  "version": "1.3.1",
+  "description": "Card 组件，提供常见的卡片样式。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "card",
+    "",
+    "卡片"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-icons",
+			"uni-scss"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-card/readme.md b/uni_modules/uni-card/readme.md
new file mode 100644
index 0000000..7434e71
--- /dev/null
+++ b/uni_modules/uni-card/readme.md
@@ -0,0 +1,12 @@
+
+
+## Card 卡片
+> **组件名：uni-card**
+> 代码块： `uCard`
+
+卡片视图组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-card)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-collapse/changelog.md b/uni_modules/uni-collapse/changelog.md
new file mode 100644
index 0000000..292e4c7
--- /dev/null
+++ b/uni_modules/uni-collapse/changelog.md
@@ -0,0 +1,36 @@
+## 1.4.3（2022-01-25）
+- 修复 初始化的时候 ，open 属性失效的bug
+## 1.4.2（2022-01-21）
+- 修复 微信小程序resize后组件收起的bug
+## 1.4.1（2021-11-22）
+- 修复 vue3中个别scss变量无法找到的问题
+## 1.4.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-collapse](https://uniapp.dcloud.io/component/uniui/uni-collapse)
+## 1.3.3（2021-08-17）
+- 优化 show-arrow 属性默认为true
+## 1.3.2（2021-08-17）
+- 新增 show-arrow 属性，控制是否显示右侧箭头
+## 1.3.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.3.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.2（2021-07-21）
+- 修复 由1.2.0版本引起的 change 事件返回 undefined 的Bug
+## 1.2.1（2021-07-21）
+- 优化 组件示例
+## 1.2.0（2021-07-21）
+- 新增 组件折叠动画
+- 新增 value\v-model 属性 ，动态修改面板折叠状态
+- 新增 title 插槽 ，可定义面板标题
+- 新增 border 属性 ，显示隐藏面板内容分隔线
+- 新增 title-border 属性 ，显示隐藏面板标题分隔线
+- 修复 resize 方法失效的Bug
+- 修复 change 事件返回参数不正确的Bug
+- 优化 H5、App 平台自动更具内容更新高度，无需调用 reszie() 方法
+## 1.1.7（2021-05-12）
+- 新增 组件示例地址
+## 1.1.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.1.5（2021-02-05）
+- 调整为uni_modules目录规范
\ No newline at end of file
diff --git a/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
new file mode 100644
index 0000000..d62a6a7
--- /dev/null
+++ b/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue
@@ -0,0 +1,402 @@
+<template>
+	<view class="uni-collapse-item">
+		<!-- onClick(!isOpen) -->
+		<view @click="onClick(!isOpen)" class="uni-collapse-item__title"
+			:class="{'is-open':isOpen &&titleBorder === 'auto' ,'uni-collapse-item-border':titleBorder !== 'none'}">
+			<view class="uni-collapse-item__title-wrap">
+				<slot name="title">
+					<view class="uni-collapse-item__title-box" :class="{'is-disabled':disabled}">
+						<image v-if="thumb" :src="thumb" class="uni-collapse-item__title-img" />
+						<text class="uni-collapse-item__title-text">{{ title }}</text>
+					</view>
+				</slot>
+			</view>
+			<view v-if="showArrow"
+				:class="{ 'uni-collapse-item__title-arrow-active': isOpen, 'uni-collapse-item--animation': showAnimation === true }"
+				class="uni-collapse-item__title-arrow">
+				<uni-icons :color="disabled?'#ddd':'#bbb'" size="14" type="bottom" />
+			</view>
+		</view>
+		<view class="uni-collapse-item__wrap" :class="{'is--transition':showAnimation}"
+			:style="{height: (isOpen?height:0) +'px'}">
+			<view :id="elId" ref="collapse--hook" class="uni-collapse-item__wrap-content"
+				:class="{open:isheight,'uni-collapse-item--border':border&&isOpen}">
+				<slot></slot>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = weex.requireModule('dom')
+	// #endif
+	/**
+	 * CollapseItem 折叠面板子组件
+	 * @description 折叠面板子组件
+	 * @property {String} title 标题文字
+	 * @property {String} thumb 标题左侧缩略图
+	 * @property {String} name 唯一标志符
+	 * @property {Boolean} open = [true|false] 是否展开组件
+	 * @property {Boolean} titleBorder = [true|false] 是否显示标题分隔线
+	 * @property {Boolean} border = [true|false] 是否显示分隔线
+	 * @property {Boolean} disabled = [true|false] 是否展开面板
+	 * @property {Boolean} showAnimation = [true|false] 开启动画
+	 * @property {Boolean} showArrow = [true|false] 是否显示右侧箭头
+	 */
+	export default {
+		name: 'uniCollapseItem',
+		props: {
+			// 列表标题
+			title: {
+				type: String,
+				default: ''
+			},
+			name: {
+				type: [Number, String],
+				default: ''
+			},
+			// 是否禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// #ifdef APP-PLUS
+			// 是否显示动画,app 端默认不开启动画，卡顿严重
+			showAnimation: {
+				type: Boolean,
+				default: false
+			},
+			// #endif
+			// #ifndef APP-PLUS
+			// 是否显示动画
+			showAnimation: {
+				type: Boolean,
+				default: true
+			},
+			// #endif
+			// 是否展开
+			open: {
+				type: Boolean,
+				default: false
+			},
+			// 缩略图
+			thumb: {
+				type: String,
+				default: ''
+			},
+			// 标题分隔线显示类型
+			titleBorder: {
+				type: String,
+				default: 'auto'
+			},
+			border: {
+				type: Boolean,
+				default: true
+			},
+			showArrow: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			// TODO 随机生生元素ID，解决百度小程序获取同一个元素位置信息的bug
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				isOpen: false,
+				isheight: null,
+				height: 0,
+				elId,
+				nameSync: 0
+			}
+		},
+		watch: {
+			open(val) {
+				this.isOpen = val
+				this.onClick(val, 'init')
+			}
+		},
+		updated(e) {
+			this.$nextTick(() => {
+				this.init(true)
+			})
+		},
+		created() {
+			this.collapse = this.getCollapse()
+			this.oldHeight = 0
+			this.onClick(this.open, 'init')
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			if (this.__isUnmounted) return
+			this.uninstall()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.__isUnmounted = true
+			this.uninstall()
+		},
+		// #endif
+		mounted() {
+			if (!this.collapse) return
+			if (this.name !== '') {
+				this.nameSync = this.name
+			} else {
+				this.nameSync = this.collapse.childrens.length + ''
+			}
+			if (this.collapse.names.indexOf(this.nameSync) === -1) {
+				this.collapse.names.push(this.nameSync)
+			} else {
+				console.warn(`name 值 ${this.nameSync} 重复`);
+			}
+			if (this.collapse.childrens.indexOf(this) === -1) {
+				this.collapse.childrens.push(this)
+			}
+			this.init()
+		},
+		methods: {
+			init(type) {
+				// #ifndef APP-NVUE
+				this.getCollapseHeight(type)
+				// #endif
+				// #ifdef APP-NVUE
+				this.getNvueHwight(type)
+				// #endif
+			},
+			uninstall() {
+				if (this.collapse) {
+					this.collapse.childrens.forEach((item, index) => {
+						if (item === this) {
+							this.collapse.childrens.splice(index, 1)
+						}
+					})
+					this.collapse.names.forEach((item, index) => {
+						if (item === this.nameSync) {
+							this.collapse.names.splice(index, 1)
+						}
+					})
+				}
+			},
+			onClick(isOpen, type) {
+				if (this.disabled) return
+				this.isOpen = isOpen
+				if (this.isOpen && this.collapse) {
+					this.collapse.setAccordion(this)
+				}
+				if (type !== 'init') {
+					this.collapse.onChange(isOpen, this)
+				}
+			},
+			getCollapseHeight(type, index = 0) {
+				const views = uni.createSelectorQuery().in(this)
+				views
+					.select(`#${this.elId}`)
+					.fields({
+						size: true
+					}, data => {
+						// TODO 百度中可能获取不到节点信息 ，需要循环获取
+						if (index >= 10) return
+						if (!data) {
+							index++
+							this.getCollapseHeight(false, index)
+							return
+						}
+						// #ifdef APP-NVUE
+						this.height = data.height + 1
+						// #endif
+						// #ifndef APP-NVUE
+						this.height = data.height
+						// #endif
+						this.isheight = true
+						if (type) return
+						this.onClick(this.isOpen, 'init')
+					})
+					.exec()
+			},
+			getNvueHwight(type) {
+				const result = dom.getComponentRect(this.$refs['collapse--hook'], option => {
+					if (option && option.result && option.size) {
+						// #ifdef APP-NVUE
+						this.height = option.size.height + 1
+						// #endif
+						// #ifndef APP-NVUE
+						this.height = option.size.height
+						// #endif
+						this.isheight = true
+						if (type) return
+						this.onClick(this.open, 'init')
+					}
+				})
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getCollapse(name = 'uniCollapse') {
+				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;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-collapse-item {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+
+		/* #endif */
+		&__title {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			width: 100%;
+			box-sizing: border-box;
+			/* #endif */
+			flex-direction: row;
+			align-items: center;
+			transition: border-bottom-color .3s;
+
+			// transition-property: border-bottom-color;
+			// transition-duration: 5s;
+			&-wrap {
+				width: 100%;
+				flex: 1;
+
+			}
+
+			&-box {
+				padding: 0 15px;
+				/* #ifndef APP-NVUE */
+				display: flex;
+				width: 100%;
+				box-sizing: border-box;
+				/* #endif */
+				flex-direction: row;
+				justify-content: space-between;
+				align-items: center;
+				height: 48px;
+				line-height: 48px;
+				background-color: #fff;
+				color: #303133;
+				font-size: 13px;
+				font-weight: 500;
+				/* #ifdef H5 */
+				cursor: pointer;
+				outline: none;
+
+				/* #endif */
+				&.is-disabled {
+					.uni-collapse-item__title-text {
+						color: #999;
+					}
+				}
+
+			}
+
+			&.uni-collapse-item-border {
+				border-bottom: 1px solid #ebeef5;
+			}
+
+			&.is-open {
+				border-bottom-color: transparent;
+			}
+
+			&-img {
+				height: 22px;
+				width: 22px;
+				margin-right: 10px;
+			}
+
+			&-text {
+				flex: 1;
+				font-size: 14px;
+				/* #ifndef APP-NVUE */
+				white-space: nowrap;
+				color: inherit;
+				/* #endif */
+				/* #ifdef APP-NVUE */
+				lines: 1;
+				/* #endif */
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+
+			&-arrow {
+				/* #ifndef APP-NVUE */
+				display: flex;
+				box-sizing: border-box;
+				/* #endif */
+				align-items: center;
+				justify-content: center;
+				width: 20px;
+				height: 20px;
+				margin-right: 10px;
+				transform: rotate(0deg);
+
+				&-active {
+					transform: rotate(-180deg);
+				}
+			}
+
+
+		}
+
+		&__wrap {
+			/* #ifndef APP-NVUE */
+			will-change: height;
+			box-sizing: border-box;
+			/* #endif */
+			background-color: #fff;
+			overflow: hidden;
+			position: relative;
+			height: 0;
+
+			&.is--transition {
+				// transition: all 0.3s;
+				transition-property: height, border-bottom-width;
+				transition-duration: 0.3s;
+				/* #ifndef APP-NVUE */
+				will-change: height;
+				/* #endif */
+			}
+
+
+
+			&-content {
+				position: absolute;
+				font-size: 13px;
+				color: #303133;
+				// transition: height 0.3s;
+				border-bottom-color: transparent;
+				border-bottom-style: solid;
+				border-bottom-width: 0;
+
+				&.uni-collapse-item--border {
+					border-bottom-width: 1px;
+					border-bottom-color: red;
+					border-bottom-color: #ebeef5;
+				}
+
+				&.open {
+					position: relative;
+				}
+			}
+		}
+
+		&--animation {
+			transition-property: transform;
+			transition-duration: 0.3s;
+			transition-timing-function: ease;
+		}
+
+	}
+</style>
diff --git a/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue b/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
new file mode 100644
index 0000000..384c39a
--- /dev/null
+++ b/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="uni-collapse">
+		<slot />
+	</view>
+</template>
+<script>
+	/**
+	 * Collapse 折叠面板
+	 * @description 展示可以折叠 / 展开的内容区域
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=23
+	 * @property {String|Array} value 当前激活面板改变时触发(如果是手风琴模式，参数类型为string，否则为array)
+	 * @property {Boolean} accordion = [true|false] 是否开启手风琴效果是否开启手风琴效果
+	 * @event {Function} change 切换面板时触发，如果是手风琴模式，返回类型为string，否则为array
+	 */
+	export default {
+		name: 'uniCollapse',
+		emits:['change','activeItem','input','update:modelValue'],
+		props: {
+			value: {
+				type: [String, Array],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Array],
+				default: ''
+			},
+			accordion: {
+				// 是否开启手风琴效果
+				type: [Boolean, String],
+				default: false
+			},
+		},
+		data() {
+			return {}
+		},
+		computed: {
+			// TODO 兼容 vue2 和 vue3
+			dataValue() {
+				let value = (typeof this.value === 'string' && this.value === '') ||
+					(Array.isArray(this.value) && this.value.length === 0)
+				let modelValue = (typeof this.modelValue === 'string' && this.modelValue === '') ||
+					(Array.isArray(this.modelValue) && this.modelValue.length === 0)
+				if (value) {
+					return this.modelValue
+				}
+				if (modelValue) {
+					return this.value
+				}
+
+				return this.value
+			}
+		},
+		watch: {
+			dataValue(val) {
+				this.setOpen(val)
+			}
+		},
+		created() {
+			this.childrens = []
+			this.names = []
+		},
+		mounted() {
+			this.$nextTick(()=>{
+				this.setOpen(this.dataValue)
+			})
+		},
+		methods: {
+			setOpen(val) {
+				let str = typeof val === 'string'
+				let arr = Array.isArray(val)
+				this.childrens.forEach((vm, index) => {
+					if (str) {
+						if (val === vm.nameSync) {
+							if (!this.accordion) {
+								console.warn('accordion 属性为 false ,v-model 类型应该为 array')
+								return
+							}
+							vm.isOpen = true
+						}
+					}
+					if (arr) {
+						val.forEach(v => {
+							if (v === vm.nameSync) {
+								if (this.accordion) {
+									console.warn('accordion 属性为 true ,v-model 类型应该为 string')
+									return
+								}
+								vm.isOpen = true
+							}
+						})
+					}
+				})
+				this.emit(val)
+			},
+			setAccordion(self) {
+				if (!this.accordion) return
+				this.childrens.forEach((vm, index) => {
+					if (self !== vm) {
+						vm.isOpen = false
+					}
+				})
+			},
+			resize() {
+				this.childrens.forEach((vm, index) => {
+					// #ifndef APP-NVUE
+					vm.getCollapseHeight()
+					// #endif
+					// #ifdef APP-NVUE
+					vm.getNvueHwight()
+					// #endif
+				})
+			},
+			onChange(isOpen, self) {
+				let activeItem = []
+
+				if (this.accordion) {
+					activeItem = isOpen ? self.nameSync : ''
+				} else {
+					this.childrens.forEach((vm, index) => {
+						if (vm.isOpen) {
+							activeItem.push(vm.nameSync)
+						}
+					})
+				}
+				this.$emit('change', activeItem)
+				this.emit(activeItem)
+			},
+			emit(val){
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-collapse {
+		/* #ifndef APP-NVUE */
+		width: 100%;
+		display: flex;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+		flex-direction: column;
+		background-color: #fff;
+	}
+</style>
diff --git a/uni_modules/uni-collapse/package.json b/uni_modules/uni-collapse/package.json
new file mode 100644
index 0000000..65349cf
--- /dev/null
+++ b/uni_modules/uni-collapse/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-collapse",
+  "displayName": "uni-collapse 折叠面板",
+  "version": "1.4.3",
+  "description": "Collapse 组件，可以折叠 / 展开的内容区域。",
+  "keywords": [
+    "uni-ui",
+    "折叠",
+    "折叠面板",
+    "手风琴"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-collapse/readme.md b/uni_modules/uni-collapse/readme.md
new file mode 100644
index 0000000..bc758eb
--- /dev/null
+++ b/uni_modules/uni-collapse/readme.md
@@ -0,0 +1,12 @@
+
+
+## Collapse 折叠面板
+> **组件名：uni-collapse**
+> 代码块： `uCollapse`
+> 关联组件：`uni-collapse-item`、`uni-icons`。
+
+
+折叠面板用来折叠/显示过长的内容或者是列表。通常是在多内容分类项使用，折叠不重要的内容，显示重要内容。点击可以展开折叠部分。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-collapse)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-combox/changelog.md b/uni_modules/uni-combox/changelog.md
new file mode 100644
index 0000000..23c2748
--- /dev/null
+++ b/uni_modules/uni-combox/changelog.md
@@ -0,0 +1,15 @@
+## 1.0.1（2021-11-23）
+- 优化 label、label-width 属性
+## 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-combox](https://uniapp.dcloud.io/component/uniui/uni-combox)
+## 0.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.0.6（2021-05-12）
+- 新增 组件示例地址
+## 0.0.5（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 0.0.4（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 0.0.3（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
new file mode 100644
index 0000000..d4cb79d
--- /dev/null
+++ b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
@@ -0,0 +1,275 @@
+<template>
+	<view class="uni-combox" :class="border ? '' : 'uni-combox__no-border'">
+		<view v-if="label" class="uni-combox__label" :style="labelStyle">
+			<text>{{label}}</text>
+		</view>
+		<view class="uni-combox__input-box">
+			<input class="uni-combox__input" type="text" :placeholder="placeholder" 
+			placeholder-class="uni-combox__input-plac" v-model="inputVal" @input="onInput" @focus="onFocus" 
+@blur="onBlur" />
+			<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" @click="toggleSelector">
+			</uni-icons>
+		</view>
+		<view class="uni-combox__selector" v-if="showSelector">
+			<view class="uni-popper__arrow"></view>
+			<scroll-view scroll-y="true" class="uni-combox__selector-scroll">
+				<view class="uni-combox__selector-empty" v-if="filterCandidatesLength === 0">
+					<text>{{emptyTips}}</text>
+				</view>
+				<view class="uni-combox__selector-item" v-for="(item,index) in filterCandidates" :key="index" 
+				@click="onSelectorClick(index)">
+					<text>{{item}}</text>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Combox 组合输入框
+	 * @description 组合输入框一般用于既可以输入也可以选择的场景
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1261
+	 * @property {String} label 左侧文字
+	 * @property {String} labelWidth 左侧内容宽度
+	 * @property {String} placeholder 输入框占位符
+	 * @property {Array} candidates 候选项列表
+	 * @property {String} emptyTips 筛选结果为空时显示的文字
+	 * @property {String} value 组合框的值
+	 */
+	export default {
+		name: 'uniCombox',
+		emits: ['input', 'update:modelValue'],
+		props: {
+			border: {
+				type: Boolean,
+				default: true
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			labelWidth: {
+				type: String,
+				default: 'auto'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			candidates: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			emptyTips: {
+				type: String,
+				default: '无匹配项'
+			},
+			// #ifndef VUE3
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
+		},
+		data() {
+			return {
+				showSelector: false,
+				inputVal: ''
+			}
+		},
+		computed: {
+			labelStyle() {
+				if (this.labelWidth === 'auto') {
+					return ""
+				}
+				return `width: ${this.labelWidth}`
+			},
+			filterCandidates() {
+				return this.candidates.filter((item) => {
+					return item.toString().indexOf(this.inputVal) > -1
+				})
+			},
+			filterCandidatesLength() {
+				return this.filterCandidates.length
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal) {
+					this.inputVal = newVal
+				},
+				immediate: true
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				handler(newVal) {
+					this.inputVal = newVal
+				},
+				immediate: true
+			},
+			// #endif
+		},
+		methods: {
+			toggleSelector() {
+				this.showSelector = !this.showSelector
+			},
+			onFocus() {
+				this.showSelector = true
+			},
+			onBlur() {
+				setTimeout(() => {
+					this.showSelector = false
+				}, 153)
+			},
+			onSelectorClick(index) {
+				this.inputVal = this.filterCandidates[index]
+				this.showSelector = false
+				this.$emit('input', this.inputVal)
+				this.$emit('update:modelValue', this.inputVal)
+			},
+			onInput() {
+				setTimeout(() => {
+					this.$emit('input', this.inputVal)
+					this.$emit('update:modelValue', this.inputVal)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-combox {
+		font-size: 14px;
+		border: 1px solid #DCDFE6;
+		border-radius: 4px;
+		padding: 6px 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// height: 40px;
+		flex-direction: row;
+		align-items: center;
+		// border-bottom: solid 1px #DDDDDD;
+	}
+
+	.uni-combox__label {
+		font-size: 16px;
+		line-height: 22px;
+		padding-right: 10px;
+		color: #999999;
+	}
+
+	.uni-combox__input-box {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-combox__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-combox__input-plac {
+		font-size: 14px;
+		color: #999;
+	}
+
+	.uni-combox__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 2;
+		padding: 4px 0;
+	}
+
+	.uni-combox__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.uni-combox__selector-empty,
+	.uni-combox__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 36px;
+		font-size: 14px;
+		text-align: center;
+		// border-bottom: solid 1px #DDDDDD;
+		padding: 0px 10px;
+	}
+
+	.uni-combox__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-combox__selector-empty:last-child,
+	.uni-combox__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	// picker 弹出层通用的指示小三角
+	.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;
+	}
+
+	.uni-combox__no-border {
+		border: none;
+	}
+</style>
diff --git a/uni_modules/uni-combox/package.json b/uni_modules/uni-combox/package.json
new file mode 100644
index 0000000..4a05c3f
--- /dev/null
+++ b/uni_modules/uni-combox/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-combox",
+  "displayName": "uni-combox 组合框",
+  "version": "1.0.1",
+  "description": "可以选择也可以输入的表单项 ",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "combox",
+    "组合框",
+    "select"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "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-combox/readme.md b/uni_modules/uni-combox/readme.md
new file mode 100644
index 0000000..ffa2cc8
--- /dev/null
+++ b/uni_modules/uni-combox/readme.md
@@ -0,0 +1,11 @@
+
+
+## Combox 组合框
+> **组件名：uni-combox**
+> 代码块： `uCombox`
+
+
+组合框组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-combox)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-countdown/changelog.md b/uni_modules/uni-countdown/changelog.md
new file mode 100644
index 0000000..f25beef
--- /dev/null
+++ b/uni_modules/uni-countdown/changelog.md
@@ -0,0 +1,24 @@
+## 1.2.2（2022-01-19）
+- 修复 在微信小程序中样式不生效的bug
+## 1.2.1（2022-01-18）
+- 新增 update 方法 ，在动态更新时间后，刷新组件
+## 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-countdown](https://uniapp.dcloud.io/component/uniui/uni-countdown)
+## 1.1.3（2021-10-18）
+- 重构
+- 新增 font-size 支持自定义字体大小
+## 1.1.2（2021-08-24）
+- 新增 支持国际化
+## 1.1.1（2021-07-30）
+- 优化 vue3下小程序事件警告的问题
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.5（2021-06-18）
+- 修复 uni-countdown 重复赋值跳两秒的 bug
+## 1.0.4（2021-05-12）
+- 新增 组件示例地址
+## 1.0.3（2021-05-08）
+- 修复 uni-countdown 不能控制倒计时的 bug
+## 1.0.2（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json
new file mode 100644
index 0000000..06309cb
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json
@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "day",
+	"uni-countdown.h": "h",
+	"uni-countdown.m": "m",
+	"uni-countdown.s": "s"
+}
diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/index.js b/uni_modules/uni-countdown/components/uni-countdown/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/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-countdown/components/uni-countdown/i18n/zh-Hans.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json
new file mode 100644
index 0000000..358cdd1
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json
@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "天",
+	"uni-countdown.h": "时",
+	"uni-countdown.m": "分",
+	"uni-countdown.s": "秒"
+}
diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json
new file mode 100644
index 0000000..e5a63de
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json
@@ -0,0 +1,6 @@
+{
+	"uni-countdown.day": "天",
+	"uni-countdown.h": "時",
+	"uni-countdown.m": "分",
+	"uni-countdown.s": "秒"
+}
diff --git a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
new file mode 100644
index 0000000..1f8ef4e
--- /dev/null
+++ b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue
@@ -0,0 +1,271 @@
+<template>
+	<view class="uni-countdown">
+		<text v-if="showDay" :style="[timeStyle]" class="uni-countdown__number">{{ d }}</text>
+		<text v-if="showDay" :style="[splitorStyle]" class="uni-countdown__splitor">{{dayText}}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ h }}</text>
+		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : hourText }}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ i }}</text>
+		<text :style="[splitorStyle]" class="uni-countdown__splitor">{{ showColon ? ':' : minuteText }}</text>
+		<text :style="[timeStyle]" class="uni-countdown__number">{{ s }}</text>
+		<text v-if="!showColon" :style="[splitorStyle]" class="uni-countdown__splitor">{{secondText}}</text>
+	</view>
+</template>
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * Countdown 倒计时
+	 * @description 倒计时组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=25
+	 * @property {String} backgroundColor 背景色
+	 * @property {String} color 文字颜色
+	 * @property {Number} day 天数
+	 * @property {Number} hour 小时
+	 * @property {Number} minute 分钟
+	 * @property {Number} second 秒
+	 * @property {Number} timestamp 时间戳
+	 * @property {Boolean} showDay = [true|false] 是否显示天数
+	 * @property {Boolean} show-colon = [true|false] 是否以冒号为分隔符
+	 * @property {String} splitorColor 分割符号颜色
+	 * @event {Function} timeup 倒计时时间到触发事件
+	 * @example <uni-countdown :day="1" :hour="1" :minute="12" :second="40"></uni-countdown>
+	 */
+	export default {
+		name: 'UniCountdown',
+		emits: ['timeup'],
+		props: {
+			showDay: {
+				type: Boolean,
+				default: true
+			},
+			showColon: {
+				type: Boolean,
+				default: true
+			},
+			start: {
+				type: Boolean,
+				default: true
+			},
+			backgroundColor: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333'
+			},
+			fontSize: {
+				type: Number,
+				default: 14
+			},
+			splitorColor: {
+				type: String,
+				default: '#333'
+			},
+			day: {
+				type: Number,
+				default: 0
+			},
+			hour: {
+				type: Number,
+				default: 0
+			},
+			minute: {
+				type: Number,
+				default: 0
+			},
+			second: {
+				type: Number,
+				default: 0
+			},
+			timestamp: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				timer: null,
+				syncFlag: false,
+				d: '00',
+				h: '00',
+				i: '00',
+				s: '00',
+				leftTime: 0,
+				seconds: 0
+			}
+		},
+		computed: {
+			dayText() {
+				return t("uni-countdown.day")
+			},
+			hourText(val) {
+				return t("uni-countdown.h")
+			},
+			minuteText(val) {
+				return t("uni-countdown.m")
+			},
+			secondText(val) {
+				return t("uni-countdown.s")
+			},
+			timeStyle() {
+				const {
+					color,
+					backgroundColor,
+					fontSize
+				} = this
+				return {
+					color,
+					backgroundColor,
+					fontSize: `${fontSize}px`,
+					width: `${fontSize * 22 / 14}px`, // 按字体大小为 14px 时的比例缩放
+ 					lineHeight: `${fontSize * 20 / 14}px`,
+					borderRadius: `${fontSize * 3 / 14}px`,
+				}
+			},
+			splitorStyle() {
+				const { splitorColor, fontSize, backgroundColor } = this
+				return {
+					color: splitorColor,
+					fontSize: `${fontSize * 12 / 14}px`,
+					margin: backgroundColor ? `${fontSize * 4 / 14}px` : ''
+				}
+			}
+		},
+		watch: {
+			day(val) {
+				this.changeFlag()
+			},
+			hour(val) {
+				this.changeFlag()
+			},
+			minute(val) {
+				this.changeFlag()
+			},
+			second(val) {
+				this.changeFlag()
+			},
+			start: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (newVal) {
+						this.startData();
+					} else {
+						if (!oldVal) return
+						clearInterval(this.timer)
+					}
+				}
+
+			}
+		},
+		created: function(e) {
+			this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+			this.countDown()
+		},
+		// #ifndef VUE3
+		destroyed() {
+			clearInterval(this.timer)
+		},
+		// #endif
+		// #ifdef VUE3
+		unmounted() {
+			clearInterval(this.timer)
+		},
+		// #endif
+		methods: {
+			toSeconds(timestamp, day, hours, minutes, seconds) {
+				if (timestamp) {
+					return timestamp - parseInt(new Date().getTime() / 1000, 10)
+				}
+				return day * 60 * 60 * 24 + hours * 60 * 60 + minutes * 60 + seconds
+			},
+			timeUp() {
+				clearInterval(this.timer)
+				this.$emit('timeup')
+			},
+			countDown() {
+				let seconds = this.seconds
+				let [day, hour, minute, second] = [0, 0, 0, 0]
+				if (seconds > 0) {
+					day = Math.floor(seconds / (60 * 60 * 24))
+					hour = Math.floor(seconds / (60 * 60)) - (day * 24)
+					minute = Math.floor(seconds / 60) - (day * 24 * 60) - (hour * 60)
+					second = Math.floor(seconds) - (day * 24 * 60 * 60) - (hour * 60 * 60) - (minute * 60)
+				} else {
+					this.timeUp()
+				}
+				if (day < 10) {
+					day = '0' + day
+				}
+				if (hour < 10) {
+					hour = '0' + hour
+				}
+				if (minute < 10) {
+					minute = '0' + minute
+				}
+				if (second < 10) {
+					second = '0' + second
+				}
+				this.d = day
+				this.h = hour
+				this.i = minute
+				this.s = second
+			},
+			startData() {
+				this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+				if (this.seconds <= 0) {
+					this.seconds = this.toSeconds(0, 0, 0, 0, 0)
+					this.countDown()
+					return
+				}
+				clearInterval(this.timer)
+				this.countDown()
+				this.timer = setInterval(() => {
+					this.seconds--
+					if (this.seconds < 0) {
+						this.timeUp()
+						return
+					}
+					this.countDown()
+				}, 1000)
+			},
+			update(){
+				this.startData();
+			},
+			changeFlag() {
+				if (!this.syncFlag) {
+					this.seconds = this.toSeconds(this.timestamp, this.day, this.hour, this.minute, this.second)
+					this.startData();
+					this.syncFlag = true;
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	$font-size: 14px;
+
+	.uni-countdown {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+
+		&__splitor {
+			margin: 0 2px;
+			font-size: $font-size;
+			color: #333;
+		}
+
+		&__number {
+			border-radius: 3px;
+			text-align: center;
+			font-size: $font-size;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-countdown/package.json b/uni_modules/uni-countdown/package.json
new file mode 100644
index 0000000..70e99ee
--- /dev/null
+++ b/uni_modules/uni-countdown/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-countdown",
+  "displayName": "uni-countdown 倒计时",
+  "version": "1.2.2",
+  "description": "CountDown 倒计时组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "countdown",
+    "倒计时"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-countdown/readme.md b/uni_modules/uni-countdown/readme.md
new file mode 100644
index 0000000..4bcb1aa
--- /dev/null
+++ b/uni_modules/uni-countdown/readme.md
@@ -0,0 +1,10 @@
+
+
+## CountDown 倒计时
+> **组件名：uni-countdown**
+> 代码块： `uCountDown`
+
+倒计时组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-countdown)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-data-checkbox/changelog.md b/uni_modules/uni-data-checkbox/changelog.md
new file mode 100644
index 0000000..c7a468a
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/changelog.md
@@ -0,0 +1,45 @@
+## 1.0.3（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 1.0.2（2022-06-30）
+- 优化 在 uni-forms 中的依赖注入方式
+## 1.0.1（2022-02-07）
+- 修复 multiple 为 true 时，v-model 的值为 null 报错的 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-checkbox](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
+## 0.2.5（2021-08-23）
+- 修复 在uni-forms中 modelValue 中不存在当前字段，当前字段必填写也不参与校验的问题
+## 0.2.4（2021-08-17）
+- 修复 单选 list 模式下 ，icon 为 left 时，选中图标不显示的问题
+## 0.2.3（2021-08-11）
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+## 0.2.2（2021-07-30）
+- 优化 在uni-forms组件，与label不对齐的问题
+## 0.2.1（2021-07-27）
+- 修复 单选默认值为0不能选中的Bug
+## 0.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.1.11（2021-07-06）
+- 优化 删除无用日志
+## 0.1.10（2021-07-05）
+- 修复 由 0.1.9 引起的非 nvue 端图标不显示的问题
+## 0.1.9（2021-07-05）
+- 修复 nvue 黑框样式问题
+## 0.1.8（2021-06-28）
+- 修复 selectedTextColor 属性不生效的Bug
+## 0.1.7（2021-06-02）
+- 新增 map 属性，可以方便映射text/value属性
+## 0.1.6（2021-05-26）
+- 修复 不关联服务空间的情况下组件报错的Bug
+## 0.1.5（2021-05-12）
+- 新增 组件示例地址
+## 0.1.4（2021-04-09）
+- 修复 nvue 下无法选中的问题
+## 0.1.3（2021-03-22）
+- 新增 disabled属性
+## 0.1.2（2021-02-24）
+- 优化 默认颜色显示
+## 0.1.1（2021-02-24）
+- 新增 支持nvue
+## 0.1.0（2021-02-18）
+- “暂无数据”显示居中
diff --git a/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
new file mode 100644
index 0000000..ccea7e9
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
@@ -0,0 +1,817 @@
+<template>
+	<view class="uni-data-checklist" :style="{'margin-top':isTop+'px'}">
+		<template v-if="!isLocal">
+			<view class="uni-data-loading">
+				<uni-load-more v-if="!mixinDatacomErrorMessage" status="loading" iconType="snow" :iconSize="18" :content-text="contentText"></uni-load-more>
+				<text v-else>{{mixinDatacomErrorMessage}}</text>
+			</view>
+		</template>
+		<template v-else>
+			<checkbox-group v-if="multiple" class="checklist-group" :class="{'is-list':mode==='list' || wrap}" @change="chagne">
+				<label class="checklist-box" :class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
+				 :style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
+					<checkbox class="hidden" hidden :disabled="disabled || !!item.disabled" :value="item[map.value]+''" :checked="item.selected" />
+					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="checkbox__inner"  :style="item.styleIcon">
+						<view class="checkbox__inner-icon"></view>
+					</view>
+					<view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
+						<view v-if="mode === 'list' && icon === 'right'" class="checkobx__list" :style="item.styleBackgroud"></view>
+					</view>
+				</label>
+			</checkbox-group>
+			<radio-group v-else class="checklist-group" :class="{'is-list':mode==='list','is-wrap':wrap}" @change="chagne">
+				<!-- -->
+				<label class="checklist-box" :class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
+				 :style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
+					<radio class="hidden" hidden :disabled="disabled || item.disabled" :value="item[map.value]+''" :checked="item.selected" />
+					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="radio__inner"
+					 :style="item.styleBackgroud">
+						<view class="radio__inner-icon" :style="item.styleIcon"></view>
+					</view>
+					<view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
+						<text class="checklist-text" :style="item.styleIconText">{{item[map.text]}}</text>
+						<view v-if="mode === 'list' && icon === 'right'" :style="item.styleRightIcon" class="checkobx__list"></view>
+					</view>
+				</label>
+			</radio-group>
+		</template>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染 checkbox 和 radio
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} mode = [default| list | button | tag] 显示模式
+	 * @value default  	默认横排模式
+	 * @value list		列表模式
+	 * @value button	按钮模式
+	 * @value tag 		标签模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {Array|String|Number} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Number|String} min 最小选择个数 ，multiple为true时生效
+	 * @property {Number|String} max 最大选择个数 ，multiple为true时生效
+	 * @property {Boolean} wrap 是否换行显示
+	 * @property {String} icon = [left|right]  list 列表模式下icon显示位置
+	 * @property {Boolean} selectedColor 选中颜色
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {Boolean} selectedTextColor 选中文本颜色，如不填写则自动显示
+	 * @property {Object} map 字段映射， 默认 map={text:'text',value:'value'}
+	 * @value left 左侧显示
+	 * @value right 右侧显示
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'uniDataChecklist',
+		mixins: [uniCloud.mixinDatacom || {}],
+		emits:['input','update:modelValue','change'],
+		props: {
+			mode: {
+				type: String,
+				default: 'default'
+			},
+
+			multiple: {
+				type: Boolean,
+				default: false
+			},
+			value: {
+				type: [Array, String, Number],
+				default () {
+					return ''
+				}
+			},
+			// TODO vue3
+			modelValue: {
+				type: [Array, String, Number],
+				default() {
+					return '';
+				}
+			},
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			min: {
+				type: [Number, String],
+				default: ''
+			},
+			max: {
+				type: [Number, String],
+				default: ''
+			},
+			wrap: {
+				type: Boolean,
+				default: false
+			},
+			icon: {
+				type: String,
+				default: 'left'
+			},
+			selectedColor: {
+				type: String,
+				default: ''
+			},
+			selectedTextColor: {
+				type: String,
+				default: ''
+			},
+			emptyText:{
+				type: String,
+				default: '暂无数据'
+			},
+			disabled:{
+				type: Boolean,
+				default: false
+			},
+			map:{
+				type: Object,
+				default(){
+					return {
+						text:'text',
+						value:'value'
+					}
+				}
+			}
+		},
+		watch: {
+			localdata: {
+				handler(newVal) {
+					this.range = newVal
+					this.dataList = this.getDataList(this.getSelectedValue(newVal))
+				},
+				deep: true
+			},
+			mixinDatacomResData(newVal) {
+				this.range = newVal
+				this.dataList = this.getDataList(this.getSelectedValue(newVal))
+			},
+			value(newVal) {
+				this.dataList = this.getDataList(newVal)
+				// fix by mehaotian is_reset 在 uni-forms 中定义
+				if(!this.is_reset){
+					this.is_reset = false
+					this.formItem && this.formItem.setValue(newVal)
+				}
+			},
+			modelValue(newVal) {
+				this.dataList = this.getDataList(newVal);
+				if(!this.is_reset){
+					this.is_reset = false
+					this.formItem && this.formItem.setValue(newVal)
+				}
+			}
+		},
+		data() {
+			return {
+				dataList: [],
+				range: [],
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				isLocal:true,
+				styles: {
+					selectedColor: '#2979ff',
+					selectedTextColor: '#666',
+				},
+				isTop:0
+			};
+		},
+		computed:{
+			dataValue(){
+				if(this.value === '')return this.modelValue
+				if(this.modelValue === '') return this.value
+				return this.value
+			}
+		},
+		created() {
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+			// this.formItem && this.formItem.setValue(this.value)
+
+			if (this.formItem) {
+				this.isTop = 6
+				if (this.formItem.name) {
+					// 如果存在name添加默认值,否则formData 中不存在这个字段不校验
+					if(!this.is_reset){
+						this.is_reset = false
+						this.formItem.setValue(this.dataValue)
+					}
+					this.rename = this.formItem.name
+					this.form.inputChildrens.push(this)
+				}
+			}
+
+			if (this.localdata && this.localdata.length !== 0) {
+				this.isLocal = true
+				this.range = this.localdata
+				this.dataList = this.getDataList(this.getSelectedValue(this.range))
+			} else {
+				if (this.collection) {
+					this.isLocal = false
+					this.loadData()
+				}
+			}
+		},
+		methods: {
+			loadData() {
+				this.mixinDatacomGet().then(res=>{
+					this.mixinDatacomResData = res.result.data
+					if(this.mixinDatacomResData.length === 0){
+						this.isLocal = false
+						this.mixinDatacomErrorMessage = this.emptyText
+					}else{
+						this.isLocal = true
+					}
+				}).catch(err=>{
+					this.mixinDatacomErrorMessage = err.message
+				})
+			},
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				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;
+			},
+			chagne(e) {
+				const values = e.detail.value
+
+				let detail = {
+					value: [],
+					data: []
+				}
+
+				if (this.multiple) {
+					this.range.forEach(item => {
+
+						if (values.includes(item[this.map.value] + '')) {
+							detail.value.push(item[this.map.value])
+							detail.data.push(item)
+						}
+					})
+				} else {
+					const range = this.range.find(item => (item[this.map.value] + '') === values)
+					if (range) {
+						detail = {
+							value: range[this.map.value],
+							data: range
+						}
+					}
+				}
+				this.formItem && this.formItem.setValue(detail.value)
+				// TODO 兼容 vue2
+				this.$emit('input', detail.value);
+				// // TOTO 兼容 vue3
+				this.$emit('update:modelValue', detail.value);
+				this.$emit('change', {
+					detail
+				})
+				if (this.multiple) {
+					// 如果 v-model 没有绑定 ，则走内部逻辑
+					// if (this.value.length === 0) {
+					this.dataList = this.getDataList(detail.value, true)
+					// }
+				} else {
+					this.dataList = this.getDataList(detail.value)
+				}
+			},
+
+			/**
+			 * 获取渲染的新数组
+			 * @param {Object} value 选中内容
+			 */
+			getDataList(value) {
+				// 解除引用关系，破坏原引用关系，避免污染源数据
+				let dataList = JSON.parse(JSON.stringify(this.range))
+				let list = []
+				if (this.multiple) {
+					if (!Array.isArray(value)) {
+						value = []
+					}
+				}
+				dataList.forEach((item, index) => {
+					item.disabled = item.disable || item.disabled || false
+					if (this.multiple) {
+						if (value.length > 0) {
+							let have = value.find(val => val === item[this.map.value])
+							item.selected = have !== undefined
+						} else {
+							item.selected = false
+						}
+					} else {
+						item.selected = value === item[this.map.value]
+					}
+
+					list.push(item)
+				})
+				return this.setRange(list)
+			},
+			/**
+			 * 处理最大最小值
+			 * @param {Object} list
+			 */
+			setRange(list) {
+				let selectList = list.filter(item => item.selected)
+				let min = Number(this.min) || 0
+				let max = Number(this.max) || ''
+				list.forEach((item, index) => {
+					if (this.multiple) {
+						if (selectList.length <= min) {
+							let have = selectList.find(val => val[this.map.value] === item[this.map.value])
+							if (have !== undefined) {
+								item.disabled = true
+							}
+						}
+
+						if (selectList.length >= max && max !== '') {
+							let have = selectList.find(val => val[this.map.value] === item[this.map.value])
+							if (have === undefined) {
+								item.disabled = true
+							}
+						}
+					}
+					this.setStyles(item, index)
+					list[index] = item
+				})
+				return list
+			},
+			/**
+			 * 设置 class
+			 * @param {Object} item
+			 * @param {Object} index
+			 */
+			setStyles(item, index) {
+				//  设置自定义样式
+				item.styleBackgroud = this.setStyleBackgroud(item)
+				item.styleIcon = this.setStyleIcon(item)
+				item.styleIconText = this.setStyleIconText(item)
+				item.styleRightIcon = this.setStyleRightIcon(item)
+			},
+
+			/**
+			 * 获取选中值
+			 * @param {Object} range
+			 */
+			getSelectedValue(range) {
+				if (!this.multiple) return this.dataValue
+				let selectedArr = []
+				range.forEach((item) => {
+					if (item.selected) {
+						selectedArr.push(item[this.map.value])
+					}
+				})
+				return this.dataValue && this.dataValue.length > 0 ? this.dataValue : selectedArr
+			},
+
+			/**
+			 * 设置背景样式
+			 */
+			setStyleBackgroud(item) {
+				let styles = {}
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+				if (this.mode !== 'list') {
+					styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+				}
+				if (this.mode === 'tag') {
+					styles['background-color'] = item.selected? selectedColor:'#f5f5f5'
+				}
+				let classles = ''
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleIcon(item) {
+				let styles = {}
+				let classles = ''
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+				styles['background-color'] = item.selected?selectedColor:'#fff'
+				styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+
+				if(!item.selected && item.disabled){
+					styles['background-color'] = '#F2F6FC'
+					styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+				}
+
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleIconText(item) {
+				let styles = {}
+				let classles = ''
+				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+				if (this.mode === 'tag') {
+					styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#666'
+				} else {
+					styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:selectedColor):'#666'
+				}
+				if(!item.selected && item.disabled){
+					styles.color = '#999'
+				}
+
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+				return classles
+			},
+			setStyleRightIcon(item) {
+				let styles = {}
+				let classles = ''
+				if (this.mode === 'list') {
+					styles['border-color'] = item.selected?this.styles.selectedColor:'#DCDFE6'
+				}
+				for (let i in styles) {
+					classles += `${i}:${styles[i]};`
+				}
+
+				return classles
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$checked-color: #2979ff;
+	$border-color: #DCDFE6;
+	$disable:0.4;
+
+	@mixin flex {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+	}
+
+	.uni-data-loading {
+		@include flex;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 36px;
+		padding-left: 10px;
+		color: #999;
+	}
+
+	.uni-data-checklist {
+		position: relative;
+		z-index: 0;
+		flex: 1;
+		// 多选样式
+		.checklist-group {
+			@include flex;
+			flex-direction: row;
+			flex-wrap: wrap;
+
+			&.is-list {
+				flex-direction: column;
+			}
+
+			.checklist-box {
+				@include flex;
+				flex-direction: row;
+				align-items: center;
+				position: relative;
+				margin: 5px 0;
+				margin-right: 25px;
+
+				.hidden {
+					position: absolute;
+					opacity: 0;
+				}
+
+				// 文字样式
+				.checklist-content {
+					@include flex;
+					flex: 1;
+					flex-direction: row;
+					align-items: center;
+					justify-content: space-between;
+					.checklist-text {
+						font-size: 14px;
+						color: #666;
+						margin-left: 5px;
+						line-height: 14px;
+					}
+
+					.checkobx__list {
+						border-right-width: 1px;
+						border-right-color: #007aff;
+						border-right-style: solid;
+						border-bottom-width:1px;
+						border-bottom-color: #007aff;
+						border-bottom-style: solid;
+						height: 12px;
+						width: 6px;
+						left: -5px;
+						transform-origin: center;
+						transform: rotate(45deg);
+						opacity: 0;
+					}
+				}
+
+				// 多选样式
+				.checkbox__inner {
+					/* #ifndef APP-NVUE */
+					flex-shrink: 0;
+					box-sizing: border-box;
+					/* #endif */
+					position: relative;
+					width: 16px;
+					height: 16px;
+					border: 1px solid $border-color;
+					border-radius: 4px;
+					background-color: #fff;
+					z-index: 1;
+					.checkbox__inner-icon {
+						position: absolute;
+						/* #ifdef APP-NVUE */
+						top: 2px;
+						/* #endif */
+						/* #ifndef APP-NVUE */
+						top: 1px;
+						/* #endif */
+						left: 5px;
+						height: 8px;
+						width: 4px;
+						border-right-width: 1px;
+						border-right-color: #fff;
+						border-right-style: solid;
+						border-bottom-width:1px ;
+						border-bottom-color: #fff;
+						border-bottom-style: solid;
+						opacity: 0;
+						transform-origin: center;
+						transform: rotate(40deg);
+					}
+				}
+
+				// 单选样式
+				.radio__inner {
+					@include flex;
+					/* #ifndef APP-NVUE */
+					flex-shrink: 0;
+					box-sizing: border-box;
+					/* #endif */
+					justify-content: center;
+					align-items: center;
+					position: relative;
+					width: 16px;
+					height: 16px;
+					border: 1px solid $border-color;
+					border-radius: 16px;
+					background-color: #fff;
+					z-index: 1;
+
+					.radio__inner-icon {
+						width: 8px;
+						height: 8px;
+						border-radius: 10px;
+						opacity: 0;
+					}
+				}
+
+				// 默认样式
+				&.is--default {
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+
+						.radio__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+						}
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					// 选中
+					&.is-checked {
+						.checkbox__inner {
+							border-color: $checked-color;
+							background-color: $checked-color;
+
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+						.radio__inner {
+							border-color: $checked-color;
+							.radio__inner-icon {
+								opacity: 1;
+								background-color: $checked-color;
+							}
+						}
+						.checklist-text {
+							color: $checked-color;
+						}
+						// 选中禁用
+						&.is-disable {
+							.checkbox__inner {
+								opacity: $disable;
+							}
+
+							.checklist-text {
+								opacity: $disable;
+							}
+							.radio__inner {
+								opacity: $disable;
+							}
+						}
+					}
+				}
+
+				// 按钮样式
+				&.is--button {
+					margin-right: 10px;
+					padding: 5px 10px;
+					border: 1px $border-color solid;
+					border-radius: 3px;
+					transition: border-color 0.2s;
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						border: 1px #eee solid;
+						opacity: $disable;
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+						.radio__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					&.is-checked {
+						border-color: $checked-color;
+						.checkbox__inner {
+							border-color: $checked-color;
+							background-color: $checked-color;
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+
+						.radio__inner {
+							border-color: $checked-color;
+
+							.radio__inner-icon {
+								opacity: 1;
+								background-color: $checked-color;
+							}
+						}
+
+						.checklist-text {
+							color: $checked-color;
+						}
+
+						// 选中禁用
+						&.is-disable {
+							opacity: $disable;
+						}
+					}
+				}
+
+				// 标签样式
+				&.is--tag {
+					margin-right: 10px;
+					padding: 5px 10px;
+					border: 1px $border-color solid;
+					border-radius: 3px;
+					background-color: #f5f5f5;
+
+					.checklist-text {
+						margin: 0;
+						color: #666;
+					}
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						opacity: $disable;
+					}
+
+					&.is-checked {
+						background-color: $checked-color;
+						border-color: $checked-color;
+
+						.checklist-text {
+							color: #fff;
+						}
+					}
+				}
+				// 列表样式
+				&.is--list {
+					/* #ifndef APP-NVUE */
+					display: flex;
+					/* #endif */
+					padding: 10px 15px;
+					padding-left: 0;
+					margin: 0;
+
+					&.is-list-border {
+						border-top: 1px #eee solid;
+					}
+
+					// 禁用
+					&.is-disable {
+						/* #ifdef H5 */
+						cursor: not-allowed;
+						/* #endif */
+						.checkbox__inner {
+							background-color: #F2F6FC;
+							border-color: $border-color;
+							/* #ifdef H5 */
+							cursor: not-allowed;
+							/* #endif */
+						}
+						.checklist-text {
+							color: #999;
+						}
+					}
+
+					&.is-checked {
+						.checkbox__inner {
+							border-color: $checked-color;
+							background-color: $checked-color;
+
+							.checkbox__inner-icon {
+								opacity: 1;
+								transform: rotate(45deg);
+							}
+						}
+						.radio__inner {
+							.radio__inner-icon {
+								opacity: 1;
+							}
+						}
+						.checklist-text {
+							color: $checked-color;
+						}
+
+						.checklist-content {
+							.checkobx__list {
+								opacity: 1;
+								border-color: $checked-color;
+							}
+						}
+
+						// 选中禁用
+						&.is-disable {
+							.checkbox__inner {
+								opacity: $disable;
+							}
+
+							.checklist-text {
+								opacity: $disable;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/uni_modules/uni-data-checkbox/package.json b/uni_modules/uni-data-checkbox/package.json
new file mode 100644
index 0000000..113c350
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "uni-data-checkbox",
+  "displayName": "uni-data-checkbox 数据选择器",
+  "version": "1.0.3",
+  "description": "通过数据驱动的单选框和复选框",
+  "keywords": [
+    "uni-ui",
+    "checkbox",
+    "单选",
+    "多选",
+    "单选多选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "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-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-data-checkbox/readme.md b/uni_modules/uni-data-checkbox/readme.md
new file mode 100644
index 0000000..6eb253d
--- /dev/null
+++ b/uni_modules/uni-data-checkbox/readme.md
@@ -0,0 +1,18 @@
+
+
+## DataCheckbox 数据驱动的单选复选框
+> **组件名：uni-data-checkbox**
+> 代码块： `uDataCheckbox`
+
+
+本组件是基于uni-app基础组件checkbox的封装。本组件要解决问题包括：
+
+1. 数据绑定型组件：给本组件绑定一个data，会自动渲染一组候选内容。再以往，开发者需要编写不少代码实现类似功能
+2. 自动的表单校验：组件绑定了data，且符合[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)组件的表单校验规范，搭配使用会自动实现表单校验
+3. 本组件合并了单选多选
+4. 本组件有若干风格选择，如普通的单选多选框、并列button风格、tag风格。开发者可以快速选择需要的风格。但作为一个封装组件，样式代码虽然不用自己写了，却会牺牲一定的样式自定义性
+
+在uniCloud开发中，`DB Schema`中配置了enum枚举等类型后，在web控制台的[自动生成表单](https://uniapp.dcloud.io/uniCloud/schema?id=autocode)功能中，会自动生成``uni-data-checkbox``组件并绑定好data
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-checkbox)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-data-picker/changelog.md b/uni_modules/uni-data-picker/changelog.md
new file mode 100644
index 0000000..0c45f8f
--- /dev/null
+++ b/uni_modules/uni-data-picker/changelog.md
@@ -0,0 +1,58 @@
+## 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.vue b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
new file mode 100644
index 0000000..a55c2a4
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
@@ -0,0 +1,539 @@
+<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>{{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="#e1e1e1" size="14"></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'],
+		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.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+			if (this.formItem) {
+				if (this.formItem.name) {
+					this.rename = this.formItem.name
+					this.form.inputChildrens.push(this)
+				}
+			}
+
+			this.$nextTick(() => {
+				this.load()
+			})
+		},
+		methods: {
+			clear() {
+				this.inputSelected.splice(0)
+				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.parentField && !this.selfField && this.hasValue) {
+					this.getNodeData(() => {
+						this.inputSelected = this.selected.slice(0)
+					})
+				} else if (this.hasValue) {
+					this.getTreePath(() => {
+						this.inputSelected = this.selected.slice(0)
+					})
+				}
+			},
+			getForm(name = 'uniForms') {
+				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;
+			},
+			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) {
+					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.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 {
+		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: 38px;
+		padding: 0 5px;
+		overflow: hidden;
+		/* #ifdef APP-NVUE */
+		height: 40px;
+		/* #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 */
+	}
+
+	.placeholder {
+		color: grey;
+	}
+
+	.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;
+		top: 20%;
+		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;
+	}
+
+	/* #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..c12fd54
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
@@ -0,0 +1,563 @@
+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: 20
+    },
+    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
+    },
+    postField() {
+      let fields = [this.field];
+      if (this.parentField) {
+        fields.push(`${this.parentField} as parent_value`);
+      }
+      return fields.join(',');
+    },
+    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 = []
+    },
+    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
+    },
+		getNodeData(callback) {
+		  if (this.loading) {
+		    return
+		  }
+		  this.loading = true
+		  this.getCommand({
+		    field: this.postField,
+				where: this._pathWhere()
+		  }).then((res) => {
+		    this.loading = false
+		    this.selected = res.result.data
+		    callback && callback()
+		  }).catch((err) => {
+		    this.loading = false
+		    this.errorMessage = err
+		  })
+		},
+    getTreePath(callback) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        getTreePath: {
+          startWith: `${this.selfField}=='${this.dataValue}'`
+        }
+      }).then((res) => {
+        this.loading = false
+        let treePath = []
+        this._extractTreePath(res.result.data, treePath)
+        this.selected = treePath
+        callback && callback()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    loadData() {
+      if (this.isLocaldata) {
+        this._processLocalData()
+        return
+      }
+
+      if (this.dataValue != null) {
+        this._loadNodeData((data) => {
+          this._treeData = data
+          this._updateBindData()
+          this._updateSelected()
+        })
+        return
+      }
+
+      if (this.stepSearh) {
+        this._loadNodeData((data) => {
+          this._treeData = data
+          this._updateBindData()
+        })
+      } else {
+        this._loadAllData((data) => {
+          this._treeData = []
+          this._extractTree(data, this._treeData, null)
+          this._updateBindData()
+        })
+      }
+    },
+    _loadAllData(callback) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        gettree: true,
+        startwith: `${this.selfField}=='${this.dataValue}'`
+      }).then((res) => {
+        this.loading = false
+        callback(res.result.data)
+        this.onDataChange()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    _loadNodeData(callback, pw) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        where: pw || this._postWhere(),
+        pageSize: 500
+      }).then((res) => {
+        this.loading = false
+        callback(res.result.data)
+        this.onDataChange()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    _pathWhere() {
+      let result = []
+      let where_field = this._getParentNameByField();
+      if (where_field) {
+        result.push(`${where_field} == '${this.dataValue}'`)
+      }
+
+      if (this.where) {
+        return `(${this.where}) && (${result.join(' || ')})`
+      }
+
+      return result.join(' || ')
+    },
+    _postWhere() {
+      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(' && ')
+    },
+    _nodeWhere() {
+      let result = []
+      let selected = this.selected
+      if (selected.length) {
+        result.push(`${this.parentField} == '${selected[selected.length - 1].value}'`)
+      }
+
+      if (this.where) {
+        return `(${this.where}) && (${result.join(' || ')})`
+      }
+
+      return result.join(' || ')
+    },
+    _getParentNameByField() {
+      const fields = this.field.split(',');
+      let where_field = 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') {
+          where_field = items[0].trim();
+          break;
+        }
+      }
+      return where_field
+    },
+    _isTreeView() {
+      return (this.parentField && this.selfField)
+    },
+    _updateSelected() {
+      var dl = this.dataList
+      var sl = this.selected
+      let textField = this.map.text
+      let valueField = this.map.value
+      for (var i = 0; i < sl.length; i++) {
+        var value = sl[i].value
+        var dl2 = dl[i]
+        for (var j = 0; j < dl2.length; j++) {
+          var item2 = dl2[j]
+          if (item2[valueField] === value) {
+            sl[i].text = item2[textField]
+            break
+          }
+        }
+      }
+    },
+    _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
+      }
+    },
+    _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++) {
+        var value = paths[i].value
+        var 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 []
+    },
+    _processLocalData() {
+      this._treeData = []
+      this._extractTree(this.localdata, this._treeData)
+
+      var 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)
+    }
+  }
+}
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..72f8b33
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
@@ -0,0 +1,333 @@
+<template>
+	<view class="uni-data-pickerview">
+		<scroll-view class="selected-area" scroll-x="true" scroll-y="false" :show-scrollbar="false">
+			<view class="selected-list">
+				<template v-for="(item,index) in selected">
+					<view class="selected-item"
+						:class="{'selected-item-active':index==selectedIndex, 'selected-item-text-overflow': ellipsis}"
+						:key="index" v-if="item.text" @click="handleSelect(index)">
+						<text class="">{{item.text}}</text>
+					</view>
+				</template>
+			</view>
+		</scroll-view>
+		<view class="tab-c">
+			<template v-for="(child, i) in dataList">
+				<scroll-view class="list" :key="i" v-if="i==selectedIndex" :scroll-y="true">
+					<view class="item" :class="{'is-disabled': !!item.disable}" v-for="(item, j) in child" :key="j"
+						@click="handleNodeClick(item, i, j)">
+						<text class="item-text item-text-overflow">{{item[map.text]}}</text>
+						<view class="check" v-if="selected.length > i && item[map.value] == selected[i].value"></view>
+					</view>
+				</scroll-view>
+			</template>
+
+			<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
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			if (this.managedMode) {
+				return
+			}
+
+			this.$nextTick(() => {
+				this.load()
+			})
+		},
+		methods: {
+			onPropsChange() {
+				this._treeData = []
+				this.selectedIndex = 0
+				this.load()
+			},
+			load() {
+				if (this.isLocaldata) {
+					this.loadData()
+				} else if (this.dataValue.length) {
+					this.getTreePath((res) => {
+						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._isTreeView() && !hasNodes) {
+					this.onSelectedChange(node, true)
+					return
+				}
+
+				if (this.isLocaldata && (!hasNodes || isleaf)) {
+					this.onSelectedChange(node, true)
+					return
+				}
+
+				if (!isleaf && !hasNodes) {
+					this._loadNodeData((data) => {
+						if (!data.length) {
+							node.isleaf = true
+						} else {
+							this._treeData.push(...data)
+							this._updateBindData(node)
+						}
+						this.onSelectedChange(node, node.isleaf)
+					}, this._nodeWhere())
+					return
+				}
+
+				this.onSelectedChange(node, false)
+			},
+			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 >
+	.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;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		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 #007aff;
+	}
+
+	.selected-item-text {
+		color: #007aff;
+	}
+
+	.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 #007aff;
+		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..ab4029e
--- /dev/null
+++ b/uni_modules/uni-data-picker/package.json
@@ -0,0 +1,92 @@
+{
+  "id": "uni-data-picker",
+  "displayName": "uni-data-picker 数据驱动的picker选择器",
+  "version": "1.0.4",
+  "description": "单列、多列级联选择器，常用于省市区城市选择、公司部门选择、多级分类等场景",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "picker",
+    "级联",
+    "省市区",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+      "uni-load-more",
+			"uni-icons",
+			"uni-scss"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-data-picker/readme.md b/uni_modules/uni-data-picker/readme.md
new file mode 100644
index 0000000..6cda224
--- /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-dateformat/changelog.md b/uni_modules/uni-dateformat/changelog.md
new file mode 100644
index 0000000..d551d7b
--- /dev/null
+++ b/uni_modules/uni-dateformat/changelog.md
@@ -0,0 +1,10 @@
+## 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-dateformat](https://uniapp.dcloud.io/component/uniui/uni-dateformat)
+## 0.0.5（2021-07-08）
+- 调整 默认时间不再是当前时间，而是显示'-'字符
+## 0.0.4（2021-05-12）
+- 新增 组件示例地址
+## 0.0.3（2021-02-04）
+- 调整为uni_modules目录规范
+- 修复 iOS 平台日期格式化出错的问题
diff --git a/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js b/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js
new file mode 100644
index 0000000..e00d559
--- /dev/null
+++ b/uni_modules/uni-dateformat/components/uni-dateformat/date-format.js
@@ -0,0 +1,200 @@
+// yyyy-MM-dd hh:mm:ss.SSS 所有支持的类型
+function pad(str, length = 2) {
+	str += ''
+	while (str.length < length) {
+		str = '0' + str
+	}
+	return str.slice(-length)
+}
+
+const parser = {
+	yyyy: (dateObj) => {
+		return pad(dateObj.year, 4)
+	},
+	yy: (dateObj) => {
+		return pad(dateObj.year)
+	},
+	MM: (dateObj) => {
+		return pad(dateObj.month)
+	},
+	M: (dateObj) => {
+		return dateObj.month
+	},
+	dd: (dateObj) => {
+		return pad(dateObj.day)
+	},
+	d: (dateObj) => {
+		return dateObj.day
+	},
+	hh: (dateObj) => {
+		return pad(dateObj.hour)
+	},
+	h: (dateObj) => {
+		return dateObj.hour
+	},
+	mm: (dateObj) => {
+		return pad(dateObj.minute)
+	},
+	m: (dateObj) => {
+		return dateObj.minute
+	},
+	ss: (dateObj) => {
+		return pad(dateObj.second)
+	},
+	s: (dateObj) => {
+		return dateObj.second
+	},
+	SSS: (dateObj) => {
+		return pad(dateObj.millisecond, 3)
+	},
+	S: (dateObj) => {
+		return dateObj.millisecond
+	},
+}
+
+// 这都n年了iOS依然不认识2020-12-12，需要转换为2020/12/12
+function getDate(time) {
+	if (time instanceof Date) {
+		return time
+	}
+	switch (typeof time) {
+		case 'string':
+			{
+				// 2020-12-12T12:12:12.000Z、2020-12-12T12:12:12.000
+				if (time.indexOf('T') > -1) {
+					return new Date(time)
+				}
+				return new Date(time.replace(/-/g, '/'))
+			}
+		default:
+			return new Date(time)
+	}
+}
+
+export function formatDate(date, format = 'yyyy/MM/dd hh:mm:ss') {
+	if (!date && date !== 0) {
+		return ''
+	}
+	date = getDate(date)
+	const dateObj = {
+		year: date.getFullYear(),
+		month: date.getMonth() + 1,
+		day: date.getDate(),
+		hour: date.getHours(),
+		minute: date.getMinutes(),
+		second: date.getSeconds(),
+		millisecond: date.getMilliseconds()
+	}
+	const tokenRegExp = /yyyy|yy|MM|M|dd|d|hh|h|mm|m|ss|s|SSS|SS|S/
+	let flag = true
+	let result = format
+	while (flag) {
+		flag = false
+		result = result.replace(tokenRegExp, function(matched) {
+			flag = true
+			return parser[matched](dateObj)
+		})
+	}
+	return result
+}
+
+export function friendlyDate(time, {
+	locale = 'zh',
+	threshold = [60000, 3600000],
+	format = 'yyyy/MM/dd hh:mm:ss'
+}) {
+	if (time === '-') {
+		return time
+	}
+	if (!time && time !== 0) {
+		return ''
+	}
+	const localeText = {
+		zh: {
+			year: '年',
+			month: '月',
+			day: '天',
+			hour: '小时',
+			minute: '分钟',
+			second: '秒',
+			ago: '前',
+			later: '后',
+			justNow: '刚刚',
+			soon: '马上',
+			template: '{num}{unit}{suffix}'
+		},
+		en: {
+			year: 'year',
+			month: 'month',
+			day: 'day',
+			hour: 'hour',
+			minute: 'minute',
+			second: 'second',
+			ago: 'ago',
+			later: 'later',
+			justNow: 'just now',
+			soon: 'soon',
+			template: '{num} {unit} {suffix}'
+		}
+	}
+	const text = localeText[locale] || localeText.zh
+	let date = getDate(time)
+	let ms = date.getTime() - Date.now()
+	let absMs = Math.abs(ms)
+	if (absMs < threshold[0]) {
+		return ms < 0 ? text.justNow : text.soon
+	}
+	if (absMs >= threshold[1]) {
+		return formatDate(date, format)
+	}
+	let num
+	let unit
+	let suffix = text.later
+	if (ms < 0) {
+		suffix = text.ago
+		ms = -ms
+	}
+	const seconds = Math.floor((ms) / 1000)
+	const minutes = Math.floor(seconds / 60)
+	const hours = Math.floor(minutes / 60)
+	const days = Math.floor(hours / 24)
+	const months = Math.floor(days / 30)
+	const years = Math.floor(months / 12)
+	switch (true) {
+		case years > 0:
+			num = years
+			unit = text.year
+			break
+		case months > 0:
+			num = months
+			unit = text.month
+			break
+		case days > 0:
+			num = days
+			unit = text.day
+			break
+		case hours > 0:
+			num = hours
+			unit = text.hour
+			break
+		case minutes > 0:
+			num = minutes
+			unit = text.minute
+			break
+		default:
+			num = seconds
+			unit = text.second
+			break
+	}
+
+	if (locale === 'en') {
+		if (num === 1) {
+			num = 'a'
+		} else {
+			unit += 's'
+		}
+	}
+
+	return text.template.replace(/{\s*num\s*}/g, num + '').replace(/{\s*unit\s*}/g, unit).replace(/{\s*suffix\s*}/g,
+		suffix)
+}
diff --git a/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue b/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue
new file mode 100644
index 0000000..c5ed030
--- /dev/null
+++ b/uni_modules/uni-dateformat/components/uni-dateformat/uni-dateformat.vue
@@ -0,0 +1,88 @@
+<template>
+	<text>{{dateShow}}</text>
+</template>
+
+<script>
+	import {friendlyDate} from './date-format.js'
+	/**
+	 * Dateformat 日期格式化
+	 * @description 日期格式化组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3279
+	 * @property {Object|String|Number} date 日期对象/日期字符串/时间戳
+	 * @property {String} locale 格式化使用的语言
+	 * 	@value zh 中文
+	 * 	@value en 英文
+	 * @property {Array} threshold 应用不同类型格式化的阈值
+	 * @property {String} format 输出日期字符串时的格式
+	 */
+	export default {
+		name: 'uniDateformat',
+		props: {
+			date: {
+				type: [Object, String, Number],
+				default () {
+					return '-'
+				}
+			},
+			locale: {
+				type: String,
+				default: 'zh',
+			},
+			threshold: {
+				type: Array,
+				default () {
+					return [0, 0]
+				}
+			},
+			format: {
+				type: String,
+				default: 'yyyy/MM/dd hh:mm:ss'
+			},
+			// refreshRate使用不当可能导致性能问题，谨慎使用
+			refreshRate: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		data() {
+			return {
+				refreshMark: 0
+			}
+		},
+		computed: {
+			dateShow() {
+				this.refreshMark
+				return friendlyDate(this.date, {
+					locale: this.locale,
+					threshold: this.threshold,
+					format: this.format
+				})
+			}
+		},
+		watch: {
+			refreshRate: {
+				handler() {
+					this.setAutoRefresh()
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			refresh() {
+				this.refreshMark++
+			},
+			setAutoRefresh() {
+				clearInterval(this.refreshInterval)
+				if (this.refreshRate) {
+					this.refreshInterval = setInterval(() => {
+						this.refresh()
+					}, parseInt(this.refreshRate))
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/uni_modules/uni-dateformat/package.json b/uni_modules/uni-dateformat/package.json
new file mode 100644
index 0000000..786a670
--- /dev/null
+++ b/uni_modules/uni-dateformat/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-dateformat",
+  "displayName": "uni-dateformat 日期格式化",
+  "version": "1.0.0",
+  "description": "日期格式化组件，可以将日期格式化为1分钟前、刚刚等形式",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "日期格式化",
+    "时间格式化",
+    "格式化时间",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-dateformat/readme.md b/uni_modules/uni-dateformat/readme.md
new file mode 100644
index 0000000..37ddb6e
--- /dev/null
+++ b/uni_modules/uni-dateformat/readme.md
@@ -0,0 +1,11 @@
+
+
+### DateFormat 日期格式化
+> **组件名：uni-dateformat**
+> 代码块： `uDateformat`
+
+
+日期格式化组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-dateformat)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/changelog.md b/uni_modules/uni-datetime-picker/changelog.md
new file mode 100644
index 0000000..9611a30
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/changelog.md
@@ -0,0 +1,89 @@
+## 2.2.4（2022-03-31）
+- 修复 Vue3 下动态赋值,单选类型未响应的 bug
+## 2.2.3（2022-03-28）
+- 修复 Vue3 下动态赋值未响应的 bug
+## 2.2.2（2021-12-10）
+- 修复 clear-icon 属性在小程序平台不生效的 bug
+## 2.2.1（2021-12-10）
+- 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的 bug
+## 2.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-datetime-picker](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+## 2.1.5（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 2.1.4（2021-09-10）
+- 修复 hide-second 在移动端的 bug
+- 修复 单选赋默认值时，赋值日期未高亮的 bug
+- 修复 赋默认值时，移动端未正确显示时间的 bug
+## 2.1.3（2021-09-09）
+- 新增 hide-second 属性，支持只使用时分，隐藏秒
+## 2.1.2（2021-09-03）
+- 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- 优化 调整字号大小，美化日历界面
+- 修复 因国际化导致的 placeholder 失效的 bug
+## 2.1.1（2021-08-24）
+- 新增 支持国际化
+- 优化 范围选择器在 pc 端过宽的问题
+## 2.1.0（2021-08-09）
+- 新增 适配 vue3
+## 2.0.19（2021-08-09）
+- 新增 支持作为 uni-forms 子组件相关功能
+- 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的 bug
+## 2.0.18（2021-08-05）
+- 修复 type 属性动态赋值无效的 bug
+- 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- 修复 组件未赋值时范围选左、右日历相同的 bug
+## 2.0.17（2021-08-04）
+- 修复 范围选未正确显示当前值的 bug
+- 修复 h5 平台（移动端）报错 'cale' of undefined 的 bug
+## 2.0.16（2021-07-21）
+- 新增 return-type 属性支持返回 date 日期对象
+## 2.0.15（2021-07-14）
+- 修复 单选日期类型，初始赋值后不在当前日历的 bug
+- 新增 clearIcon 属性，显示框的清空按钮可配置显示隐藏（仅 pc 有效）
+- 优化 移动端移除显示框的清空按钮，无实际用途
+## 2.0.14（2021-07-14）
+- 修复 组件赋值为空，界面未更新的 bug
+- 修复 start 和 end 不能动态赋值的 bug
+- 修复 范围选类型，用户选择后再次选择右侧日历（结束日期）显示不正确的 bug
+## 2.0.13（2021-07-08）
+- 修复 范围选择不能动态赋值的 bug
+## 2.0.12（2021-07-08）
+- 修复 范围选择的初始时间在一个月内时，造成无法选择的bug
+## 2.0.11（2021-07-08）
+- 优化 弹出层在超出视窗边缘定位不准确的问题
+## 2.0.10（2021-07-08）
+- 修复 范围起始点样式的背景色与今日样式的字体前景色融合，导致日期字体看不清的 bug
+- 优化 弹出层在超出视窗边缘被遮盖的问题
+## 2.0.9（2021-07-07）
+- 新增 maskClick 事件
+- 修复 特殊情况日历 rpx 布局错误的 bug，rpx -> px
+- 修复 范围选择时清空返回值不合理的bug，['', ''] -> []
+## 2.0.8（2021-07-07）
+- 新增 日期时间显示框支持插槽
+## 2.0.7（2021-07-01）
+- 优化 添加 uni-icons 依赖
+## 2.0.6（2021-05-22）
+- 修复 图标在小程序上不显示的 bug
+- 优化 重命名引用组件，避免潜在组件命名冲突
+## 2.0.5（2021-05-20）
+- 优化 代码目录扁平化
+## 2.0.4（2021-05-12）
+- 新增 组件示例地址
+## 2.0.3（2021-05-10）
+- 修复 ios 下不识别 '-' 日期格式的 bug
+- 优化 pc 下弹出层添加边框和阴影
+## 2.0.2（2021-05-08）
+- 修复 在 admin 中获取弹出层定位错误的bug
+## 2.0.1（2021-05-08）
+- 修复 type 属性向下兼容，默认值从 date 变更为 datetime
+## 2.0.0（2021-04-30）
+- 支持日历形式的日期+时间的范围选择
+ > 注意：此版本不向后兼容，不再支持单独时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）
+## 1.0.6（2021-03-18）
+- 新增 hide-second 属性，时间支持仅选择时、分
+- 修复 选择跟显示的日期不一样的 bug
+- 修复 chang事件触发2次的 bug
+- 修复 分、秒 end 范围错误的 bug
+- 优化 更好的 nvue 适配
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
new file mode 100644
index 0000000..3d2dbea
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
@@ -0,0 +1,185 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked-x':weeks.afterMultiple,
+		}" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)">
+		<view class="uni-calendar-item__weeks-box-item" :class="{
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
+				'uni-calendar-item--checked-range-text': checkHover,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">
+			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
+		</view>
+		<view :class="{'uni-calendar-item--isDay': weeks.isDay}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			checkHover: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			},
+			handleMousemove(weeks) {
+				this.$emit('handleMouse', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 1px 0;
+		position: relative;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: 14px;
+		// font-family: Lato-Bold, Lato;
+		font-weight: bold;
+		color: #455997;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: 12px;
+		color: #333;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 40px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: #dd524d;
+
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
+		// background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+		cursor: default;
+	}
+
+	.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+		color: #D1D1D1;
+	}
+
+	.uni-calendar-item--isDay {
+		position: absolute;
+		top: 10px;
+		right: 17%;
+		background-color: #dd524d;
+		width:6px;
+		height: 6px;
+		border-radius: 50%;
+	}
+
+	.uni-calendar-item--extra {
+		color: #dd524d;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
+		background-color: #007aff;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #fff;
+	}
+
+	.uni-calendar-item--checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+		color: #333;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color:  #F6F7FC;
+		// color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+		background-color: #409eff;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #F6F7FC;
+	}
+
+	.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+	.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--before-checked-x {
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		box-sizing: border-box;
+		background-color: #F6F7FC;
+	}
+
+	.uni-calendar-item--after-checked-x {
+		border-top-right-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: #F6F7FC;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js
new file mode 100644
index 0000000..b8d7d6f
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js
@@ -0,0 +1,546 @@
+/**
+* @1900-2100区间内的公历、农历互转
+* @charset UTF-8
+* @github  https://github.com/jjonline/calendar.js
+* @Author  Jea杨(JJonline@JJonline.Cn)
+* @Time    2014-7-21
+* @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+* @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+* @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+* @Version 1.0.3
+* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+*/
+/* eslint-disable */
+var calendar = {
+
+  /**
+      * 农历1900-2100的润大小信息表
+      * @Array Of Property
+      * @return Hex
+      */
+  lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+    /** Add By JJonline@JJonline.Cn**/
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+    0x0d520], // 2100
+
+  /**
+      * 公历每个月份的天数普通表
+      * @Array Of Property
+      * @return Number
+      */
+  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+  /**
+      * 天干地支之天干速查表
+      * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+      * @return Cn string
+      */
+  Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+  /**
+      * 天干地支之地支速查表
+      * @Array Of Property
+      * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+      * @return Cn string
+      */
+  Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5'],
+
+  /**
+      * 天干地支之地支速查表<=>生肖
+      * @Array Of Property
+      * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+      * @return Cn string
+      */
+  Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a'],
+
+  /**
+      * 24节气速查表
+      * @Array Of Property
+      * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+      * @return Cn string
+      */
+  solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'],
+
+  /**
+      * 1900-2100各年的24节气日期速查表
+      * @Array Of Property
+      * @return 0x string For splice
+      */
+  sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'],
+
+  /**
+      * 数字转中文速查表
+      * @Array Of Property
+      * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+      * @return Cn string
+      */
+  nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341'],
+
+  /**
+      * 日期转农历称呼速查表
+      * @Array Of Property
+      * @trans ['初','十','廿','卅']
+      * @return Cn string
+      */
+  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+  /**
+      * 月份转农历称呼速查表
+      * @Array Of Property
+      * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+      * @return Cn string
+      */
+  nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a'],
+
+  /**
+      * 返回农历y年一整年的总天数
+      * @param lunar Year
+      * @return Number
+      * @eg:var count = calendar.lYearDays(1987) ;//count=387
+      */
+  lYearDays: function (y) {
+    var i; var sum = 348
+    for (i = 0x8000; i > 0x8; i >>= 1) { sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0 }
+    return (sum + this.leapDays(y))
+  },
+
+  /**
+      * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+      * @param lunar Year
+      * @return Number (0-12)
+      * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+      */
+  leapMonth: function (y) { // 闰字编码 \u95f0
+    return (this.lunarInfo[y - 1900] & 0xf)
+  },
+
+  /**
+      * 返回农历y年闰月的天数 若该年没有闰月则返回0
+      * @param lunar Year
+      * @return Number (0、29、30)
+      * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+      */
+  leapDays: function (y) {
+    if (this.leapMonth(y)) {
+      return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+    }
+    return (0)
+  },
+
+  /**
+      * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+      * @param lunar Year
+      * @return Number (-1、29、30)
+      * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+      */
+  monthDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
+    return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+  },
+
+  /**
+      * 返回公历(!)y年m月的天数
+      * @param solar Year
+      * @return Number (-1、28、29、30、31)
+      * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+      */
+  solarDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var ms = m - 1
+    if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+      return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+    } else {
+      return (this.solarMonth[ms])
+    }
+  },
+
+  /**
+     * 农历年份转换为干支纪年
+     * @param  lYear 农历年的年份数
+     * @return Cn string
+     */
+  toGanZhiYear: function (lYear) {
+    var ganKey = (lYear - 3) % 10
+    var zhiKey = (lYear - 3) % 12
+    if (ganKey == 0) ganKey = 10// 如果余数为0则为最后一个天干
+    if (zhiKey == 0) zhiKey = 12// 如果余数为0则为最后一个地支
+    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+  },
+
+  /**
+     * 公历月、日判断所属星座
+     * @param  cMonth [description]
+     * @param  cDay [description]
+     * @return Cn string
+     */
+  toAstro: function (cMonth, cDay) {
+    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7'// 座
+  },
+
+  /**
+      * 传入offset偏移量返回干支
+      * @param offset 相对甲子的偏移量
+      * @return Cn string
+      */
+  toGanZhi: function (offset) {
+    return this.Gan[offset % 10] + this.Zhi[offset % 12]
+  },
+
+  /**
+      * 传入公历(!)y年获得该年第n个节气的公历日期
+      * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+      * @return day Number
+      * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+      */
+  getTerm: function (y, n) {
+    if (y < 1900 || y > 2100) { return -1 }
+    if (n < 1 || n > 24) { return -1 }
+    var _table = this.sTermInfo[y - 1900]
+    var _info = [
+      parseInt('0x' + _table.substr(0, 5)).toString(),
+      parseInt('0x' + _table.substr(5, 5)).toString(),
+      parseInt('0x' + _table.substr(10, 5)).toString(),
+      parseInt('0x' + _table.substr(15, 5)).toString(),
+      parseInt('0x' + _table.substr(20, 5)).toString(),
+      parseInt('0x' + _table.substr(25, 5)).toString()
+    ]
+    var _calday = [
+      _info[0].substr(0, 1),
+      _info[0].substr(1, 2),
+      _info[0].substr(3, 1),
+      _info[0].substr(4, 2),
+
+      _info[1].substr(0, 1),
+      _info[1].substr(1, 2),
+      _info[1].substr(3, 1),
+      _info[1].substr(4, 2),
+
+      _info[2].substr(0, 1),
+      _info[2].substr(1, 2),
+      _info[2].substr(3, 1),
+      _info[2].substr(4, 2),
+
+      _info[3].substr(0, 1),
+      _info[3].substr(1, 2),
+      _info[3].substr(3, 1),
+      _info[3].substr(4, 2),
+
+      _info[4].substr(0, 1),
+      _info[4].substr(1, 2),
+      _info[4].substr(3, 1),
+      _info[4].substr(4, 2),
+
+      _info[5].substr(0, 1),
+      _info[5].substr(1, 2),
+      _info[5].substr(3, 1),
+      _info[5].substr(4, 2)
+    ]
+    return parseInt(_calday[n - 1])
+  },
+
+  /**
+      * 传入农历数字月份返回汉语通俗表示法
+      * @param lunar month
+      * @return Cn string
+      * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+      */
+  toChinaMonth: function (m) { // 月 => \u6708
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var s = this.nStr3[m - 1]
+    s += '\u6708'// 加上月字
+    return s
+  },
+
+  /**
+      * 传入农历日期数字返回汉字表示法
+      * @param lunar day
+      * @return Cn string
+      * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+      */
+  toChinaDay: function (d) { // 日 => \u65e5
+    var s
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'; break
+      case 20:
+        s = '\u4e8c\u5341'; break
+        break
+      case 30:
+        s = '\u4e09\u5341'; break
+        break
+      default :
+        s = this.nStr2[Math.floor(d / 10)]
+        s += this.nStr1[d % 10]
+    }
+    return (s)
+  },
+
+  /**
+      * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+      * @param y year
+      * @return Cn string
+      * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+      */
+  getAnimal: function (y) {
+    return this.Animals[(y - 4) % 12]
+  },
+
+  /**
+      * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+      * @param y  solar year
+      * @param m  solar month
+      * @param d  solar day
+      * @return JSON object
+      * @eg:console.log(calendar.solar2lunar(1987,11,01));
+      */
+  solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
+    // 年份限定、上限
+    if (y < 1900 || y > 2100) {
+      return -1// undefined转换为数字变为NaN
+    }
+    // 公历传参最下限
+    if (y == 1900 && m == 1 && d < 31) {
+      return -1
+    }
+    // 未传参  获得当天
+    if (!y) {
+      var objDate = new Date()
+    } else {
+      var objDate = new Date(y, parseInt(m) - 1, d)
+    }
+    var i; var leap = 0; var temp = 0
+    // 修正ymd参数
+    var y = objDate.getFullYear()
+    var m = objDate.getMonth() + 1
+    var d = objDate.getDate()
+    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+      temp = this.lYearDays(i)
+      offset -= temp
+    }
+    if (offset < 0) {
+      offset += temp; i--
+    }
+
+    // 是否今天
+    var isTodayObj = new Date()
+    var isToday = false
+    if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+      isToday = true
+    }
+    // 星期几
+    var nWeek = objDate.getDay()
+    var cWeek = this.nStr1[nWeek]
+    // 数字表示周几顺应天朝周一开始的惯例
+    if (nWeek == 0) {
+      nWeek = 7
+    }
+    // 农历年
+    var year = i
+    var leap = this.leapMonth(i) // 闰哪个月
+    var isLeap = false
+
+    // 效验闰月
+    for (i = 1; i < 13 && offset > 0; i++) {
+      // 闰月
+      if (leap > 0 && i == (leap + 1) && isLeap == false) {
+        --i
+        isLeap = true; temp = this.leapDays(year) // 计算农历闰月天数
+      } else {
+        temp = this.monthDays(year, i)// 计算农历普通月天数
+      }
+      // 解除闰月
+      if (isLeap == true && i == (leap + 1)) { isLeap = false }
+      offset -= temp
+    }
+    // 闰月导致数组下标重叠取反
+    if (offset == 0 && leap > 0 && i == leap + 1) {
+      if (isLeap) {
+        isLeap = false
+      } else {
+        isLeap = true; --i
+      }
+    }
+    if (offset < 0) {
+      offset += temp; --i
+    }
+    // 农历月
+    var month = i
+    // 农历日
+    var day = offset + 1
+    // 天干地支处理
+    var sm = m - 1
+    var gzY = this.toGanZhiYear(year)
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode = this.getTerm(y, (m * 2 - 1))// 返回当月「节」为几日开始
+    var secondNode = this.getTerm(y, (m * 2))// 返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    if (d >= firstNode) {
+      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+    }
+
+    // 传入的日期的节气与否
+    var isTerm = false
+    var Term = null
+    if (firstNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 2]
+    }
+    if (secondNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 1]
+    }
+    // 日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    // 该日期所属的星座
+    var astro = this.toAstro(m, d)
+
+    return { 'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': this.getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month), 'IDayCn': this.toChinaDay(day), 'cYear': y, 'cMonth': m, 'cDay': d, 'gzYear': gzY, 'gzMonth': gzM, 'gzDay': gzD, 'isToday': isToday, 'isLeap': isLeap, 'nWeek': nWeek, 'ncWeek': '\u661f\u671f' + cWeek, 'isTerm': isTerm, 'Term': Term, 'astro': astro }
+  },
+
+  /**
+      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+      * @param y  lunar year
+      * @param m  lunar month
+      * @param d  lunar day
+      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+      * @return JSON object
+      * @eg:console.log(calendar.lunar2solar(1987,9,10));
+      */
+  lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+    var isLeapMonth = !!isLeapMonth
+    var leapOffset = 0
+    var leapMonth = this.leapMonth(y)
+    var leapDay = this.leapDays(y)
+    if (isLeapMonth && (leapMonth != m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) { return -1 }// 超出了最大极限值
+    var day = this.monthDays(y, m)
+    var _day = day
+    // bugFix 2016-9-25
+    // if month is leap, _day use leapDays method
+    if (isLeapMonth) {
+      _day = this.leapDays(y, m)
+    }
+    if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
+
+    // 计算农历的时间差
+    var offset = 0
+    for (var i = 1900; i < y; i++) {
+      offset += this.lYearDays(i)
+    }
+    var leap = 0; var isAdd = false
+    for (var i = 1; i < m; i++) {
+      leap = this.leapMonth(y)
+      if (!isAdd) { // 处理闰月
+        if (leap <= i && leap > 0) {
+          offset += this.leapDays(y); isAdd = true
+        }
+      }
+      offset += this.monthDays(y, i)
+    }
+    // 转换闰月农历 需补充该年闰月的前一个月的时差
+    if (isLeapMonth) { offset += day }
+    // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    var cY = calObj.getUTCFullYear()
+    var cM = calObj.getUTCMonth() + 1
+    var cD = calObj.getUTCDate()
+
+    return this.solar2lunar(cY, cM, cD)
+  }
+}
+
+export default calendar
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
new file mode 100644
index 0000000..e0a1f09
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -0,0 +1,897 @@
+<template>
+	<view class="uni-calendar" @mouseleave="leaveCale">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@click="clean"></view>
+		<view v-if="insert || show" class="uni-calendar__content"
+			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
+			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
+				<view v-if="left" class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + ' 年 ' + ( nowDate.month||'') +' 月'}}</text>
+				</picker>
+				<view v-if="right" class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+				<view v-if="!insert" class="dialog-close" @click="clean">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+
+				<!-- <text class="uni-calendar__backtoday" @click="backtoday">回到今天</text> -->
+			</view>
+			<view class="uni-calendar__box">
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+				<view class="uni-calendar__weeks" style="padding-bottom: 7px;">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{monText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar"
+							:selected="selected" :lunar="lunar" :checkHover="range" @change="choiceDate"
+							@handleMouse="handleMouse">
+						</calendar-item>
+					</view>
+				</view>
+			</view>
+			<view v-if="!insert && !range && typeHasTime" class="uni-date-changed uni-calendar--fixed-top"
+				style="padding: 0 80px;">
+				<view class="uni-date-changed--time-date">{{tempSingleDate ? tempSingleDate : selectDateText}}</view>
+				<time-picker type="time" :start="reactStartTime" :end="reactEndTime" v-model="time"
+					:disabled="!tempSingleDate" :border="false" :hide-second="hideSecond" class="time-picker-style">
+				</time-picker>
+			</view>
+
+			<view v-if="!insert && range && typeHasTime" class="uni-date-changed uni-calendar--fixed-top">
+				<view class="uni-date-changed--time-start">
+					<view class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : startDateText}}
+					</view>
+					<time-picker type="time" :start="reactStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
+					</time-picker>
+				</view>
+				<uni-icons type="arrowthinright" color="#999" style="line-height: 50px;"></uni-icons>
+				<view class="uni-date-changed--time-end">
+					<view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view>
+					<time-picker type="time" :end="reactEndTime" v-model="timeRange.endTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.after" class="time-picker-style">
+					</time-picker>
+				</view>
+			</view>
+			<view v-if="!insert" class="uni-date-changed uni-date-btn--ok">
+				<!-- <view class="uni-calendar__header-btn-box">
+					<text class="uni-calendar__button-text uni-calendar--fixed-width">{{okText}}</text>
+				</view> -->
+				<view class="uni-datetime-picker--btn" @click="confirm">确认</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Calendar from './util.js';
+	import calendarItem from './calendar-item.vue'
+	import timePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {Boolean} lunar 显示农历
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem,
+			timePicker
+		},
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			defTime: {
+				type: [String, Object],
+				default: ''
+			},
+			selectableTimes: {
+				type: [Object],
+				default () {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			typeHasTime: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			},
+			left: {
+				type: Boolean,
+				default: true
+			},
+			right: {
+				type: Boolean,
+				default: true
+			},
+			checkHover: {
+				type: Boolean,
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			pleStatus: {
+				type: Object,
+				default () {
+					return {
+						before: '',
+						after: '',
+						data: [],
+						fulldate: ''
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: '',
+				aniMaskShow: false,
+				firstEnter: true,
+				time: '',
+				timeRange: {
+					startTime: '',
+					endTime: ''
+				},
+				tempSingleDate: '',
+				tempRange: {
+					before: '',
+					after: ''
+				}
+			}
+		},
+		watch: {
+			date: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!this.range) {
+						this.tempSingleDate = newVal
+						setTimeout(() => {
+							this.init(newVal)
+						}, 100)
+					}
+				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
+			},
+			startDate(val) {
+				this.cale.resetSatrtDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val) {
+				this.cale.resetEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			},
+			pleStatus: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					const {
+						before,
+						after,
+						fulldate,
+						which
+					} = newVal
+					this.tempRange.before = before
+					this.tempRange.after = after
+					setTimeout(() => {
+						if (fulldate) {
+							this.cale.setHoverMultiple(fulldate)
+							if (before && after) {
+								this.cale.lastHover = true
+								if (this.rangeWithinMonth(after, before)) return
+								this.setDate(before)
+							} else {
+								this.cale.setMultiple(fulldate)
+								this.setDate(this.nowDate.fullDate)
+								this.calendar.fullDate = ''
+								this.cale.lastHover = false
+							}
+						} else {
+							this.cale.setDefaultMultiple(before, after)
+							if (which === 'left') {
+								this.setDate(before)
+								this.weeks = this.cale.weeks
+							} else {
+								this.setDate(after)
+								this.weeks = this.cale.weeks
+							}
+							this.cale.lastHover = true
+						}
+					}, 16)
+				}
+			}
+		},
+		computed: {
+			reactStartTime() {
+				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
+				const res = activeDate === this.startDate ? this.selectableTimes.start : ''
+				return res
+			},
+			reactEndTime() {
+				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
+				const res = activeDate === this.endDate ? this.selectableTimes.end : ''
+				return res
+			},
+			/**
+			 * for i18n
+			 */
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			monText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				// date: new Date(),
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+				// multipleStatus: this.pleStatus
+			})
+			// 选中某一天
+			// this.cale.setDate(this.date)
+			this.init(this.date)
+			// this.setDay
+		},
+		methods: {
+			leaveCale() {
+				this.firstEnter = true
+			},
+			handleMouse(weeks) {
+				if (weeks.disable) return
+				if (this.cale.lastHover) return
+				let {
+					before,
+					after
+				} = this.cale.multipleStatus
+				if (!before) return
+				this.calendar = weeks
+				// 设置范围选
+				this.cale.setHoverMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				// hover时，进入一个日历，更新另一个
+				if (this.firstEnter) {
+					this.$emit('firstEnterCale', this.cale.multipleStatus)
+					this.firstEnter = false
+				}
+			},
+			rangeWithinMonth(A, B) {
+				const [yearA, monthA] = A.split('-')
+				const [yearB, monthB] = B.split('-')
+				return yearA === yearB && monthA === monthB
+			},
+
+			// 取消穿透
+			clean() {
+				this.close()
+			},
+
+			clearCalender() {
+				if (this.range) {
+					this.timeRange.startTime = ''
+					this.timeRange.endTime = ''
+					this.tempRange.before = ''
+					this.tempRange.after = ''
+					this.cale.multipleStatus.before = ''
+					this.cale.multipleStatus.after = ''
+					this.cale.multipleStatus.data = []
+					this.cale.lastHover = false
+				} else {
+					this.time = ''
+					this.tempSingleDate = ''
+				}
+				this.calendar.fullDate = ''
+				this.setDate()
+			},
+
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.init(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.calendar = this.cale.getInfo(date)
+			},
+			// choiceDate(weeks) {
+			// 	if (weeks.disable) return
+			// 	this.calendar = weeks
+			// 	// 设置多选
+			// 	this.cale.setMultiple(this.calendar.fullDate, true)
+			// 	this.weeks = this.cale.weeks
+			// 	this.tempSingleDate = this.calendar.fullDate
+			// 	this.tempRange.before = this.cale.multipleStatus.before
+			// 	this.tempRange.after = this.cale.multipleStatus.after
+			// 	this.change()
+			// },
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					// this.cale.setDate(this.date)
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change() {
+				if (!this.insert) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					lunar,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					time: this.time,
+					timeRange: this.timeRange,
+					fulldate: fullDate,
+					lunar,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				this.calendar.userChecked = true
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate, true)
+				this.weeks = this.cale.weeks
+				this.tempSingleDate = this.calendar.fullDate
+				this.tempRange.before = this.cale.multipleStatus.before
+				this.tempRange.after = this.cale.multipleStatus.after
+				this.change()
+			},
+			/**
+			 * 回到今天
+			 */
+			backtoday() {
+				let date = this.cale.getDate(new Date()).fullDate
+				// this.cale.setDate(date)
+				this.init(date)
+				this.change()
+			},
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				if (startDate <= endDate) {
+					return true
+				} else {
+					return false
+				}
+			},
+			/**
+			 * 上个月
+			 */
+			pre() {
+				const preDate = this.cale.getDate(this.nowDate.fullDate, -1, 'month').fullDate
+				this.setDate(preDate)
+				this.monthSwitch()
+
+			},
+			/**
+			 * 下个月
+			 */
+			next() {
+				const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, 'month').fullDate
+				this.setDate(nextDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		bottom: calc(var(--window-bottom));
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__content-mobile {
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.1);
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+	}
+
+	.uni-calendar__header-mobile {
+		padding: 10px;
+		padding-bottom: 0;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: rgba(0, 0, 0, 0.4);
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: #fff;
+		background-color: #f1f1f1;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: 15px;
+		color: #666;
+	}
+
+	.uni-calendar__button-text {
+		text-align: center;
+		width: 100px;
+		font-size: 14px;
+		color: #007aff;
+		/* #ifndef APP-NVUE */
+		letter-spacing: 3px;
+		/* #endif */
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 9px;
+		height: 9px;
+		border-left-color: #808080;
+		border-left-style: solid;
+		border-left-width: 1px;
+		border-top-color: #555555;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 40px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 12px;
+		color: #B2B2B2;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+		// padding: 0 10px;
+		padding-bottom: 7px;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: #999;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+
+	.uni-date-changed {
+		padding: 0 10px;
+		// line-height: 50px;
+		text-align: center;
+		color: #333;
+		border-top-color: #DCDCDC;
+		;
+		border-top-style: solid;
+		border-top-width: 1px;
+		flex: 1;
+	}
+
+	.uni-date-btn--ok {
+		padding: 20px 15px;
+	}
+
+	.uni-date-changed--time-start {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-end {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-date {
+		color: #999;
+		line-height: 50px;
+		margin-right: 5px;
+		// opacity: 0.6;
+	}
+
+	.time-picker-style {
+		// width: 62px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center
+	}
+
+	.mr-10 {
+		margin-right: 10px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 25px;
+		margin-top: 10px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #737987;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.uni-datetime-picker--btn {
+		border-radius: 100px;
+		height: 40px;
+		line-height: 40px;
+		background-color: #007aff;
+		color: #fff;
+		font-size: 16px;
+		letter-spacing: 5px;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-datetime-picker--btn:active {
+		opacity: 0.7;
+	}
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
new file mode 100644
index 0000000..cc76311
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
@@ -0,0 +1,19 @@
+{
+	"uni-datetime-picker.selectDate": "select date",
+	"uni-datetime-picker.selectTime": "select time",
+	"uni-datetime-picker.selectDateTime": "select datetime",
+	"uni-datetime-picker.startDate": "start date",
+	"uni-datetime-picker.endDate": "end date",
+	"uni-datetime-picker.startTime": "start time",
+	"uni-datetime-picker.endTime": "end time",
+	"uni-datetime-picker.ok": "ok",
+	"uni-datetime-picker.clear": "clear",
+	"uni-datetime-picker.cancel": "cancel",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/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-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
new file mode 100644
index 0000000..7bc7405
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
@@ -0,0 +1,19 @@
+{
+	"uni-datetime-picker.selectDate": "选择日期",
+	"uni-datetime-picker.selectTime": "选择时间",
+	"uni-datetime-picker.selectDateTime": "选择日期时间",
+	"uni-datetime-picker.startDate": "开始日期",
+	"uni-datetime-picker.endDate": "结束日期",
+	"uni-datetime-picker.startTime": "开始时间",
+	"uni-datetime-picker.endTime": "结束时间",
+	"uni-datetime-picker.ok": "确定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
new file mode 100644
index 0000000..7d37043
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
@@ -0,0 +1,19 @@
+{
+	"uni-datetime-picker.selectDate": "選擇日期",
+	"uni-datetime-picker.selectTime": "選擇時間",
+	"uni-datetime-picker.selectDateTime": "選擇日期時間",
+	"uni-datetime-picker.startDate": "開始日期",
+	"uni-datetime-picker.endDate": "結束日期",
+	"uni-datetime-picker.startTime": "開始时间",
+	"uni-datetime-picker.endTime": "結束时间",
+	"uni-datetime-picker.ok": "確定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/keypress.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/keypress.js
new file mode 100644
index 0000000..9601aba
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-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
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
new file mode 100644
index 0000000..699aa63
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -0,0 +1,927 @@
+<template>
+	<view class="uni-datetime-picker">
+		<view @click="initTimePicker">
+			<slot>
+				<view class="uni-datetime-picker-timebox-pointer"
+					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
+					<text class="uni-datetime-picker-text">{{time}}</text>
+					<view v-if="!time" class="uni-datetime-picker-time">
+						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @click="tiggerTimePicker"></view>
+		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
+			:style="fixNvueBug">
+			<view class="uni-title">
+				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+			</view>
+			<view v-if="dateShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
+					@change="bindDateChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign sign-left">-</text>
+				<text class="uni-datetime-picker-sign sign-right">-</text>
+			</view>
+			<view v-if="timeShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
+					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!hideSecond">
+						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
+				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
+			</view>
+			<view class="uni-datetime-picker-btn">
+				<view @click="clearTime">
+					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+				</view>
+				<view class="uni-datetime-picker-btn-group">
+					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
+						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
+					</view>
+					<view @click="setTime">
+						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- #ifdef H5 -->
+		<!-- <keypress v-if="visible" @esc="tiggerTimePicker" @enter="setTime" /> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress'
+	// #endif
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 可以同时选择日期和时间的选择器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} type = [datetime | date | time] 显示模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {String|Number} value 默认值
+	 * @property {String|Number} start 起始日期或时间
+	 * @property {String|Number} end 起始日期或时间
+	 * @property {String} return-type = [timestamp | string]
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'UniDatetimePicker',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		data() {
+			return {
+				indicatorStyle: `height: 50px;`,
+				visible: false,
+				fixNvueBug: {},
+				dateShow: true,
+				timeShow: true,
+				title: '日期和时间',
+				// 输入框当前时间
+				time: '',
+				// 当前的年月日时分秒
+				year: 1920,
+				month: 0,
+				day: 0,
+				hour: 0,
+				minute: 0,
+				second: 0,
+				// 起始时间
+				startYear: 1920,
+				startMonth: 1,
+				startDay: 1,
+				startHour: 0,
+				startMinute: 0,
+				startSecond: 0,
+				// 结束时间
+				endYear: 2120,
+				endMonth: 12,
+				endDay: 31,
+				endHour: 23,
+				endMinute: 59,
+				endSecond: 59,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		watch: {
+			value: {
+				handler(newVal, oldVal) {
+					if (newVal) {
+						this.parseValue(this.fixIosDateFormat(newVal)) //兼容 iOS、safari 日期格式
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			type: {
+				handler(newValue) {
+					if (newValue === 'date') {
+						this.dateShow = true
+						this.timeShow = false
+						this.title = '日期'
+					} else if (newValue === 'time') {
+						this.dateShow = false
+						this.timeShow = true
+						this.title = '时间'
+					} else {
+						this.dateShow = true
+						this.timeShow = true
+						this.title = '日期和时间'
+					}
+				},
+				immediate: true
+			},
+			start: {
+				handler(newVal) {
+					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'start') //兼容 iOS、safari 日期格式
+				},
+				immediate: true
+			},
+			end: {
+				handler(newVal) {
+					this.parseDatetimeRange(this.fixIosDateFormat(newVal), 'end') //兼容 iOS、safari 日期格式
+				},
+				immediate: true
+			},
+
+			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			months(newVal) {
+				this.checkValue('month', this.month, newVal)
+			},
+			days(newVal) {
+				this.checkValue('day', this.day, newVal)
+			},
+			hours(newVal) {
+				this.checkValue('hour', this.hour, newVal)
+			},
+			minutes(newVal) {
+				this.checkValue('minute', this.minute, newVal)
+			},
+			seconds(newVal) {
+				this.checkValue('second', this.second, newVal)
+			}
+		},
+		computed: {
+			// 当前年、月、日、时、分、秒选择范围
+			years() {
+				return this.getCurrentRange('year')
+			},
+
+			months() {
+				return this.getCurrentRange('month')
+			},
+
+			days() {
+				return this.getCurrentRange('day')
+			},
+
+			hours() {
+				return this.getCurrentRange('hour')
+			},
+
+			minutes() {
+				return this.getCurrentRange('minute')
+			},
+
+			seconds() {
+				return this.getCurrentRange('second')
+			},
+
+			// picker 当前值数组
+			ymd() {
+				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
+			},
+			hms() {
+				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
+			},
+
+			// 当前 date 是 start
+			currentDateIsStart() {
+				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
+			},
+
+			// 当前 date 是 end
+			currentDateIsEnd() {
+				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
+			},
+
+			// 当前年、月、日、时、分、秒的最小值和最大值
+			minYear() {
+				return this.startYear
+			},
+			maxYear() {
+				return this.endYear
+			},
+			minMonth() {
+				if (this.year === this.startYear) {
+					return this.startMonth
+				} else {
+					return 1
+				}
+			},
+			maxMonth() {
+				if (this.year === this.endYear) {
+					return this.endMonth
+				} else {
+					return 12
+				}
+			},
+			minDay() {
+				if (this.year === this.startYear && this.month === this.startMonth) {
+					return this.startDay
+				} else {
+					return 1
+				}
+			},
+			maxDay() {
+				if (this.year === this.endYear && this.month === this.endMonth) {
+					return this.endDay
+				} else {
+					return this.daysInMonth(this.year, this.month)
+				}
+			},
+			minHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart) {
+						return this.startHour
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					return this.startHour
+				}
+			},
+			maxHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd) {
+						return this.endHour
+					} else {
+						return 23
+					}
+				}
+				if (this.type === 'time') {
+					return this.endHour
+				}
+			},
+			minMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+			},
+			maxMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+			},
+			minSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+			},
+			maxSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+			},
+
+			/**
+			 * for i18n
+			 */
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			}
+		},
+
+		mounted() {
+			// #ifdef APP-NVUE
+			const res = uni.getSystemInfoSync();
+			this.fixNvueBug = {
+				top: res.windowHeight / 2,
+				left: res.windowWidth / 2
+			}
+			// #endif
+		},
+
+		methods: {
+			/**
+			 * @param {Object} item
+			 * 小于 10 在前面加个 0
+			 */
+
+			lessThanTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			/**
+			 * 解析时分秒字符串，例如：00:00:00
+			 * @param {String} timeString
+			 */
+			parseTimeType(timeString) {
+				if (timeString) {
+					let timeArr = timeString.split(':')
+					this.hour = Number(timeArr[0])
+					this.minute = Number(timeArr[1])
+					this.second = Number(timeArr[2])
+				}
+			},
+
+			/**
+			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
+			 * @param {String | Number} datetime
+			 */
+			initPickerValue(datetime) {
+				let defaultValue = null
+				if (datetime) {
+					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
+				} else {
+					defaultValue = Date.now()
+					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
+				}
+				this.parseValue(defaultValue)
+			},
+
+			/**
+			 * 初始值规则：
+			 * - 用户设置初始值 value
+			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
+			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
+			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
+			 * 	- 无起始终止时间，则初始值为 value
+			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
+			 * @param {Object} value
+			 * @param {Object} dateBase
+			 */
+			compareValueWithStartAndEnd(value, start, end) {
+				let winner = null
+				value = this.superTimeStamp(value)
+				start = this.superTimeStamp(start)
+				end = this.superTimeStamp(end)
+
+				if (start && end) {
+					if (value < start) {
+						winner = new Date(start)
+					} else if (value > end) {
+						winner = new Date(end)
+					} else {
+						winner = new Date(value)
+					}
+				} else if (start && !end) {
+					winner = start <= value ? new Date(value) : new Date(start)
+				} else if (!start && end) {
+					winner = value <= end ? new Date(value) : new Date(end)
+				} else {
+					winner = new Date(value)
+				}
+
+				return winner
+			},
+
+			/**
+			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
+			 * @param {Object} value
+			 */
+			superTimeStamp(value) {
+				let dateBase = ''
+				if (this.type === 'time' && value && typeof value === 'string') {
+					const now = new Date()
+					const year = now.getFullYear()
+					const month = now.getMonth() + 1
+					const day = now.getDate()
+					dateBase = year + '/' + month + '/' + day + ' '
+				}
+				if (Number(value) && typeof value !== NaN) {
+					value = parseInt(value)
+					dateBase = 0
+				}
+				return this.createTimeStamp(dateBase + value)
+			},
+
+			/**
+			 * 解析默认值 value，字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseValue(value) {
+				if (!value) {
+					return
+				}
+				if (this.type === 'time' && typeof value === "string") {
+					this.parseTimeType(value)
+				} else {
+					let defaultDate = null
+					defaultDate = new Date(value)
+					if (this.type !== 'time') {
+						this.year = defaultDate.getFullYear()
+						this.month = defaultDate.getMonth() + 1
+						this.day = defaultDate.getDate()
+					}
+					if (this.type !== 'date') {
+						this.hour = defaultDate.getHours()
+						this.minute = defaultDate.getMinutes()
+						this.second = defaultDate.getSeconds()
+					}
+				}
+				if (this.hideSecond) {
+					this.second = 0
+				}
+			},
+
+			/**
+			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseDatetimeRange(point, pointType) {
+				// 时间为空，则重置为初始值
+				if (!point) {
+					if (pointType === 'start') {
+						this.startYear = 1920
+						this.startMonth = 1
+						this.startDay = 1
+						this.startHour = 0
+						this.startMinute = 0
+						this.startSecond = 0
+					}
+					if (pointType === 'end') {
+						this.endYear = 2120
+						this.endMonth = 12
+						this.endDay = 31
+						this.endHour = 23
+						this.endMinute = 59
+						this.endSecond = 59
+					}
+					return
+				}
+				if (this.type === 'time') {
+					const pointArr = point.split(':')
+					this[pointType + 'Hour'] = Number(pointArr[0])
+					this[pointType + 'Minute'] = Number(pointArr[1])
+					this[pointType + 'Second'] = Number(pointArr[2])
+				} else {
+					if (!point) {
+						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
+						return
+					}
+					if (Number(point) && Number(point) !== NaN) {
+						point = parseInt(point)
+					}
+					// datetime 的 end 没有时分秒, 则不限制
+					const hasTime = /[0-9]:[0-9]/
+					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
+							point)) {
+						point = point + ' 23:59:59'
+					}
+					const pointDate = new Date(point)
+					this[pointType + 'Year'] = pointDate.getFullYear()
+					this[pointType + 'Month'] = pointDate.getMonth() + 1
+					this[pointType + 'Day'] = pointDate.getDate()
+					if (this.type === 'datetime') {
+						this[pointType + 'Hour'] = pointDate.getHours()
+						this[pointType + 'Minute'] = pointDate.getMinutes()
+						this[pointType + 'Second'] = pointDate.getSeconds()
+					}
+				}
+			},
+
+			// 获取 年、月、日、时、分、秒 当前可选范围
+			getCurrentRange(value) {
+				const range = []
+				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
+					range.push(i)
+				}
+				return range
+			},
+
+			// 字符串首字母大写
+			capitalize(str) {
+				return str.charAt(0).toUpperCase() + str.slice(1)
+			},
+
+			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			checkValue(name, value, values) {
+				if (values.indexOf(value) === -1) {
+					this[name] = values[0]
+				}
+			},
+
+			// 每个月的实际天数
+			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
+				return new Date(year, month, 0).getDate();
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			/**
+			 * 生成时间戳
+			 * @param {Object} time
+			 */
+			createTimeStamp(time) {
+				if (!time) return
+				if (typeof time === "number") {
+					return time
+				} else {
+					time = time.replace(/-/g, '/')
+					if (this.type === 'date') {
+						time = time + ' ' + '00:00:00'
+					}
+					return Date.parse(time)
+				}
+			},
+
+			/**
+			 * 生成日期或时间的字符串
+			 */
+			createDomSting() {
+				const yymmdd = this.year +
+					'-' +
+					this.lessThanTen(this.month) +
+					'-' +
+					this.lessThanTen(this.day)
+
+				let hhmmss = this.lessThanTen(this.hour) +
+					':' +
+					this.lessThanTen(this.minute)
+
+				if (!this.hideSecond) {
+					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
+				}
+
+				if (this.type === 'date') {
+					return yymmdd
+				} else if (this.type === 'time') {
+					return hhmmss
+				} else {
+					return yymmdd + ' ' + hhmmss
+				}
+			},
+
+			/**
+			 * 初始化返回值，并抛出 change 事件
+			 */
+			initTime(emit = true) {
+				this.time = this.createDomSting()
+				if (!emit) return
+				if (this.returnType === 'timestamp' && this.type !== 'time') {
+					this.$emit('change', this.createTimeStamp(this.time))
+					this.$emit('input', this.createTimeStamp(this.time))
+					this.$emit('update:modelValue', this.createTimeStamp(this.time))
+				} else {
+					this.$emit('change', this.time)
+					this.$emit('input', this.time)
+					this.$emit('update:modelValue', this.time)
+				}
+			},
+
+			/**
+			 * 用户选择日期或时间更新 data
+			 * @param {Object} e
+			 */
+			bindDateChange(e) {
+				const val = e.detail.value
+				this.year = this.years[val[0]]
+				this.month = this.months[val[1]]
+				this.day = this.days[val[2]]
+			},
+			bindTimeChange(e) {
+				const val = e.detail.value
+				this.hour = this.hours[val[0]]
+				this.minute = this.minutes[val[1]]
+				this.second = this.seconds[val[2]]
+			},
+
+			/**
+			 * 初始化弹出层
+			 */
+			initTimePicker() {
+				if (this.disabled) return
+				const value = this.fixIosDateFormat(this.value)
+				this.initPickerValue(value)
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 触发或关闭弹框
+			 */
+			tiggerTimePicker(e) {
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 用户点击“清空”按钮，清空当前值
+			 */
+			clearTime() {
+				this.time = ''
+				this.$emit('change', this.time)
+				this.$emit('input', this.time)
+				this.$emit('update:modelValue', this.time)
+				this.tiggerTimePicker()
+			},
+
+			/**
+			 * 用户点击“确定”按钮
+			 */
+			setTime() {
+				this.initTime()
+				this.tiggerTimePicker()
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-datetime-picker {
+		/* #ifndef APP-NVUE */
+		/* width: 100%; */
+		/* #endif */
+	}
+
+	.uni-datetime-picker-view {
+		height: 130px;
+		width: 270px;
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-item {
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-btn {
+		margin-top: 60px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-datetime-picker-btn-text {
+		font-size: 14px;
+		color: #007AFF;
+	}
+
+	.uni-datetime-picker-btn-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-datetime-picker-cancel {
+		margin-right: 30px;
+	}
+
+	.uni-datetime-picker-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-duration: 0.3s;
+		z-index: 998;
+	}
+
+	.uni-datetime-picker-popup {
+		border-radius: 8px;
+		padding: 30px;
+		width: 270px;
+		/* #ifdef APP-NVUE */
+		height: 500px;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 330px;
+		/* #endif */
+		background-color: #fff;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		transition-duration: 0.3s;
+		z-index: 999;
+	}
+
+	.fix-nvue-height {
+		/* #ifdef APP-NVUE */
+		height: 330px;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-time {
+		color: grey;
+	}
+
+	.uni-datetime-picker-column {
+		height: 50px;
+	}
+
+	.uni-datetime-picker-timebox {
+
+		border: 1px solid #E5E5E5;
+		border-radius: 5px;
+		padding: 7px 10px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-timebox-pointer {
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-datetime-picker-disabled {
+		opacity: 0.4;
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-text {
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-sign {
+		position: absolute;
+		top: 53px;
+		/* 减掉 10px 的元素高度，兼容nvue */
+		color: #999;
+		/* #ifdef APP-NVUE */
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.sign-left {
+		left: 86px;
+	}
+
+	.sign-right {
+		right: 86px;
+	}
+
+	.sign-center {
+		left: 135px;
+	}
+
+	.uni-datetime-picker__container-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40px;
+	}
+
+	.time-hide-second {
+		width: 180px;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
new file mode 100644
index 0000000..9174181
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -0,0 +1,995 @@
+<template>
+	<view class="uni-date">
+		<view class="uni-date-editor" @click="show">
+			<slot>
+				<view class="uni-date-editor--x" :class="{'uni-date-editor--x__disabled': disabled,
+		'uni-date-x--border': border}">
+					<view v-if="!isRange" class="uni-date-x uni-date-single">
+						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
+						<input class="uni-date__x-input" type="text" v-model="singleVal"
+							:placeholder="singlePlaceholderText" :disabled="true" />
+					</view>
+					<view v-else class="uni-date-x uni-date-range">
+						<uni-icons type="calendar" color="#e1e1e1" size="22"></uni-icons>
+						<input class="uni-date__x-input t-c" type="text" v-model="range.startDate"
+							:placeholder="startPlaceholderText" :disabled="true" />
+						<slot>
+							<view class="">{{rangeSeparator}}</view>
+						</slot>
+						<input class="uni-date__x-input t-c" type="text" v-model="range.endDate"
+							:placeholder="endPlaceholderText" :disabled="true" />
+					</view>
+					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
+						<uni-icons type="clear" color="#e1e1e1" size="18"></uni-icons>
+					</view>
+				</view>
+			</slot>
+		</view>
+
+		<view v-show="popup" class="uni-date-mask" @click="close"></view>
+		<view v-if="!isPhone" ref="datePicker" v-show="popup" class="uni-date-picker__container">
+			<view v-if="!isRange" class="uni-date-single--x" :style="popover">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="uni-date-changed popup-x-header">
+					<input class="uni-date__input t-c" type="text" v-model="tempSingleDate"
+						:placeholder="selectDateText" />
+					<time-picker type="time" v-model="time" :border="false" :disabled="!tempSingleDate"
+						:start="reactStartTime" :end="reactEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						<input class="uni-date__input t-c" type="text" v-model="time" :placeholder="selectTimeText"
+							:disabled="!tempSingleDate" />
+					</time-picker>
+				</view>
+				<calendar ref="pcSingle" :showMonth="false" :start-date="caleRange.startDate"
+					:end-date="caleRange.endDate" :date="defSingleDate" @change="singleChange"
+					style="padding: 0 8px;" />
+				<view v-if="hasTime" class="popup-x-footer">
+					<!-- <text class="">此刻</text> -->
+					<text class="confirm" @click="confirmSingleChange">{{okText}}</text>
+				</view>
+				<view class="uni-date-popper__arrow"></view>
+			</view>
+
+			<view v-else class="uni-date-range--x" :style="popover">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="popup-x-header uni-date-changed">
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
+							:placeholder="startDateText" />
+						<time-picker type="time" v-model="tempRange.startTime" :start="reactStartTime" :border="false"
+							:disabled="!tempRange.startDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text"
+								v-model="tempRange.startTime" :placeholder="startTimeText"
+								:disabled="!tempRange.startDate" />
+						</time-picker>
+					</view>
+					<uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
+							:placeholder="endDateText" />
+						<time-picker type="time" v-model="tempRange.endTime" :end="reactEndTime" :border="false"
+							:disabled="!tempRange.endDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
+								:placeholder="endTimeText" :disabled="!tempRange.endDate" />
+						</time-picker>
+					</view>
+				</view>
+				<view class="popup-x-body">
+					<calendar ref="left" :showMonth="false" :start-date="caleRange.startDate"
+						:end-date="caleRange.endDate" :range="true" @change="leftChange" :pleStatus="endMultipleStatus"
+						@firstEnterCale="updateRightCale" @monthSwitch="leftMonthSwitch" style="padding: 0 8px;" />
+					<calendar ref="right" :showMonth="false" :start-date="caleRange.startDate"
+						:end-date="caleRange.endDate" :range="true" @change="rightChange"
+						:pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
+						@monthSwitch="rightMonthSwitch" style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
+				</view>
+				<view v-if="hasTime" class="popup-x-footer">
+					<text class="" @click="clear">{{clearText}}</text>
+					<text class="confirm" @click="confirmRangeChange">{{okText}}</text>
+				</view>
+			</view>
+		</view>
+		<calendar v-show="isPhone" ref="mobile" :clearDate="false" :date="defSingleDate" :defTime="reactMobDefTime"
+			:start-date="caleRange.startDate" :end-date="caleRange.endDate" :selectableTimes="mobSelectableTime"
+			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :typeHasTime="hasTime" :insert="false"
+			:hideSecond="hideSecond" @confirm="mobileChange" />
+	</view>
+</template>
+<script>
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
+	 * @property {String} type 选择器类型
+	 * @property {String|Number|Array|Date} value 绑定值
+	 * @property {String} placeholder 单选择时的占位内容
+	 * @property {String} start 起始时间
+	 * @property {String} end 终止时间
+	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
+	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
+	 * @property {String} range-separator 选择范围时的分隔符
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} disabled = [true|false] 是否禁用
+	 * @property {Boolean} clearIcon = [true|false] 是否显示清除按钮（仅PC端适用）
+	 * @event {Function} change 确定日期时触发的事件
+	 * @event {Function} show 打开弹出层
+	 * @event {Function} close 关闭弹出层
+	 * @event {Function} clear 清除上次选中的状态和值
+	 **/
+	import calendar from './calendar.vue'
+	import timePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	export default {
+		name: 'UniDatetimePicker',
+		components: {
+			calendar,
+			timePicker
+		},
+		data() {
+			return {
+				isRange: false,
+				hasTime: false,
+				mobileRange: false,
+				// 单选
+				singleVal: '',
+				tempSingleDate: '',
+				defSingleDate: '',
+				time: '',
+				// 范围选
+				caleRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				range: {
+					startDate: '',
+					// startTime: '',
+					endDate: '',
+					// endTime: ''
+				},
+				tempRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				// 左右日历同步数据
+				startMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				endMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				visible: false,
+				popup: false,
+				popover: null,
+				isEmitValue: false,
+				isPhone: false,
+				isFirstShow: true,
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+				type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			rangeSeparator: {
+				type: String,
+				default: '-'
+			},
+			border: {
+				type: [Boolean],
+				default: true
+			},
+			disabled: {
+				type: [Boolean],
+				default: false
+			},
+			clearIcon: {
+				type: [Boolean],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			}
+		},
+		watch: {
+			type: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (newVal.indexOf('time') !== -1) {
+						this.hasTime = true
+					} else {
+						this.hasTime = false
+					}
+					if (newVal.indexOf('range') !== -1) {
+						this.isRange = true
+					} else {
+						this.isRange = false
+					}
+				}
+			},
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			start: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!newVal) return
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.caleRange.startDate = defDate
+					if (this.hasTime) {
+						this.caleRange.startTime = defTime
+					}
+				}
+			},
+			end: {
+				immediate: true,
+				handler(newVal, oldVal) {
+					if (!newVal) return
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.caleRange.endDate = defDate
+					if (this.hasTime) {
+						this.caleRange.endTime = defTime
+					}
+				}
+			},
+		},
+		computed: {
+			reactStartTime() {
+				const activeDate = this.isRange ? this.tempRange.startDate : this.tempSingleDate
+				const res = activeDate === this.caleRange.startDate ? this.caleRange.startTime : ''
+				return res
+			},
+			reactEndTime() {
+				const activeDate = this.isRange ? this.tempRange.endDate : this.tempSingleDate
+				const res = activeDate === this.caleRange.endDate ? this.caleRange.endTime : ''
+				return res
+			},
+			reactMobDefTime() {
+				const times = {
+					start: this.tempRange.startTime,
+					end: this.tempRange.endTime
+				}
+				return this.isRange ? times : this.time
+			},
+			mobSelectableTime() {
+				return {
+					start: this.caleRange.startTime,
+					end: this.caleRange.endTime
+				}
+			},
+			datePopupWidth() {
+				// todo
+				return this.isRange ? 653 : 301
+			},
+
+			/**
+			 * for i18n
+			 */
+			singlePlaceholderText() {
+				return this.placeholder || (this.type === 'date' ? this.selectDateText : t(
+					"uni-datetime-picker.selectDateTime"))
+			},
+			startPlaceholderText() {
+				return this.startPlaceholder || this.startDateText
+			},
+			endPlaceholderText() {
+				return this.endPlaceholder || this.endDateText
+			},
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			startTimeText() {
+				return t("uni-datetime-picker.startTime")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			endTimeText() {
+				return t("uni-datetime-picker.endTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			showClearIcon() {
+				const {
+					clearIcon,
+					disabled,
+					singleVal,
+					range
+				} = this
+				const bool = clearIcon && !disabled && (singleVal || (range.startDate && range.endDate))
+				return bool
+			}
+		},
+		created() {
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+
+			// if (this.formItem) {
+			// 	if (this.formItem.name) {
+			// 		this.rename = this.formItem.name
+			// 		this.form.inputChildrens.push(this)
+			// 	}
+			// }
+		},
+		mounted() {
+			this.platform()
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniForms') {
+				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;
+			},
+			initPicker(newVal) {
+				if (!newVal || Array.isArray(newVal) && !newVal.length) {
+					this.$nextTick(() => {
+						this.clear(false)
+					})
+					return
+				}
+				if (!Array.isArray(newVal) && !this.isRange) {
+					const {
+						defDate,
+						defTime
+					} = this.parseDate(newVal)
+					this.singleVal = defDate
+					this.tempSingleDate = defDate
+					this.defSingleDate = defDate
+					if (this.hasTime) {
+						this.singleVal = defDate + ' ' + defTime
+						this.time = defTime
+					}
+				} else {
+					const [before, after] = newVal
+					if (!before && !after) return
+					const defBefore = this.parseDate(before)
+					const defAfter = this.parseDate(after)
+					const startDate = defBefore.defDate
+					const endDate = defAfter.defDate
+					this.range.startDate = this.tempRange.startDate = startDate
+					this.range.endDate = this.tempRange.endDate = endDate
+
+					if (this.hasTime) {
+						this.range.startDate = defBefore.defDate + ' ' + defBefore.defTime
+						this.range.endDate = defAfter.defDate + ' ' + defAfter.defTime
+						this.tempRange.startTime = defBefore.defTime
+						this.tempRange.endTime = defAfter.defTime
+					}
+					const defaultRange = {
+						before: defBefore.defDate,
+						after: defAfter.defDate
+					}
+					this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, defaultRange, {
+						which: 'right'
+					})
+					this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
+						which: 'left'
+					})
+				}
+			},
+			updateLeftCale(e) {
+				const left = this.$refs.left
+				// 设置范围选
+				left.cale.setHoverMultiple(e.after)
+				left.setDate(this.$refs.left.nowDate.fullDate)
+			},
+			updateRightCale(e) {
+				const right = this.$refs.right
+				// 设置范围选
+				right.cale.setHoverMultiple(e.after)
+				right.setDate(this.$refs.right.nowDate.fullDate)
+			},
+			platform() {
+				const systemInfo = uni.getSystemInfoSync()
+				this.isPhone = systemInfo.windowWidth <= 500
+				this.windowWidth = systemInfo.windowWidth
+			},
+			show(event) {
+				if (this.disabled) {
+					return
+				}
+				this.platform()
+				if (this.isPhone) {
+					this.$refs.mobile.open()
+					return
+				}
+				this.popover = {
+					top: '10px'
+				}
+				const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor")
+				dateEditor.boundingClientRect(rect => {
+					if (this.windowWidth - rect.left < this.datePopupWidth) {
+						this.popover.right = 0
+					}
+				}).exec()
+				setTimeout(() => {
+					this.popup = !this.popup
+					if (!this.isPhone && this.isRange && this.isFirstShow) {
+						this.isFirstShow = false
+						const {
+							startDate,
+							endDate
+						} = this.range
+						if (startDate && endDate) {
+							if (this.diffDate(startDate, endDate) < 30) {
+								this.$refs.right.next()
+							}
+						} else {
+							this.$refs.right.next()
+							this.$refs.right.cale.lastHover = false
+						}
+					}
+
+				}, 50)
+			},
+
+			close() {
+				setTimeout(() => {
+					this.popup = false
+					this.$emit('maskClick', this.value)
+				}, 20)
+			},
+			setEmit(value) {
+				if (this.returnType === "timestamp" || this.returnType === "date") {
+					if (!Array.isArray(value)) {
+						if (!this.hasTime) {
+							value = value + ' ' + '00:00:00'
+						}
+						value = this.createTimestamp(value)
+						if (this.returnType === "date") {
+							value = new Date(value)
+						}
+					} else {
+						if (!this.hasTime) {
+							value[0] = value[0] + ' ' + '00:00:00'
+							value[1] = value[1] + ' ' + '00:00:00'
+						}
+						value[0] = this.createTimestamp(value[0])
+						value[1] = this.createTimestamp(value[1])
+						if (this.returnType === "date") {
+							value[0] = new Date(value[0])
+							value[1] = new Date(value[1])
+						}
+					}
+				}
+				this.formItem && this.formItem.setValue(value)
+				this.$emit('change', value)
+				this.$emit('input', value)
+				this.$emit('update:modelValue', value)
+				this.isEmitValue = true
+			},
+			createTimestamp(date) {
+				date = this.fixIosDateFormat(date)
+				return Date.parse(new Date(date))
+			},
+			singleChange(e) {
+				this.tempSingleDate = e.fulldate
+				if (this.hasTime) return
+				this.confirmSingleChange()
+			},
+
+			confirmSingleChange() {
+				if (!this.tempSingleDate) {
+					this.popup = false
+					return
+				}
+				if (this.hasTime) {
+					this.singleVal = this.tempSingleDate + ' ' + (this.time ? this.time : '00:00:00')
+				} else {
+					this.singleVal = this.tempSingleDate
+				}
+				this.setEmit(this.singleVal)
+				this.popup = false
+			},
+
+			leftChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, obj)
+			},
+
+			rightChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, obj)
+			},
+
+			mobileChange(e) {
+				if (this.isRange) {
+					const {
+						before,
+						after
+					} = e.range
+					this.handleStartAndEnd(before, after, true)
+					if (this.hasTime) {
+						const {
+							startTime,
+							endTime
+						} = e.timeRange
+						this.tempRange.startTime = startTime
+						this.tempRange.endTime = endTime
+					}
+					this.confirmRangeChange()
+
+				} else {
+					if (this.hasTime) {
+						this.singleVal = e.fulldate + ' ' + e.time
+					} else {
+						this.singleVal = e.fulldate
+					}
+					this.setEmit(this.singleVal)
+				}
+				this.$refs.mobile.close()
+			},
+
+			rangeChange(before, after) {
+				if (!(before && after)) return
+				this.handleStartAndEnd(before, after, true)
+				if (this.hasTime) return
+				this.confirmRangeChange()
+			},
+
+			confirmRangeChange() {
+				if (!this.tempRange.startDate && !this.tempRange.endDate) {
+					this.popup = false
+					return
+				}
+				let start, end
+				if (!this.hasTime) {
+					start = this.range.startDate = this.tempRange.startDate
+					end = this.range.endDate = this.tempRange.endDate
+				} else {
+					start = this.range.startDate = this.tempRange.startDate + ' ' +
+						(this.tempRange.startTime ? this.tempRange.startTime : '00:00:00')
+					end = this.range.endDate = this.tempRange.endDate + ' ' +
+						(this.tempRange.endTime ? this.tempRange.endTime : '00:00:00')
+				}
+				const displayRange = [start, end]
+				this.setEmit(displayRange)
+				this.popup = false
+			},
+
+			handleStartAndEnd(before, after, temp = false) {
+				if (!(before && after)) return
+				const type = temp ? 'tempRange' : 'range'
+				if (this.dateCompare(before, after)) {
+					this[type].startDate = before
+					this[type].endDate = after
+				} else {
+					this[type].startDate = after
+					this[type].endDate = before
+				}
+			},
+
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				if (startDate <= endDate) {
+					return true
+				} else {
+					return false
+				}
+			},
+
+			/**
+			 * 比较时间差
+			 */
+			diffDate(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				const diff = (endDate - startDate) / (24 * 60 * 60 * 1000)
+				return Math.abs(diff)
+			},
+
+			clear(needEmit = true) {
+				if (!this.isRange) {
+					this.singleVal = ''
+					this.tempSingleDate = ''
+					this.time = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
+					}
+					if (needEmit) {
+						this.formItem && this.formItem.setValue('')
+						this.$emit('change', '')
+						this.$emit('input', '')
+						this.$emit('update:modelValue', '')
+					}
+				} else {
+					this.range.startDate = ''
+					this.range.endDate = ''
+					this.tempRange.startDate = ''
+					this.tempRange.startTime = ''
+					this.tempRange.endDate = ''
+					this.tempRange.endTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.left && this.$refs.left.clearCalender()
+						this.$refs.right && this.$refs.right.clearCalender()
+						this.$refs.right && this.$refs.right.next()
+					}
+					if (needEmit) {
+						this.formItem && this.formItem.setValue([])
+						this.$emit('change', [])
+						this.$emit('input', [])
+						this.$emit('update:modelValue', [])
+					}
+				}
+			},
+
+			parseDate(date) {
+				date = this.fixIosDateFormat(date)
+				const defVal = new Date(date)
+				const year = defVal.getFullYear()
+				const month = defVal.getMonth() + 1
+				const day = defVal.getDate()
+				const hour = defVal.getHours()
+				const minute = defVal.getMinutes()
+				const second = defVal.getSeconds()
+				const defDate = year + '-' + this.lessTen(month) + '-' + this.lessTen(day)
+				const defTime = this.lessTen(hour) + ':' + this.lessTen(minute) + (this.hideSecond ? '' : (':' + this
+					.lessTen(second)))
+				return {
+					defDate,
+					defTime
+				}
+			},
+
+			lessTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			leftMonthSwitch(e) {
+			},
+			rightMonthSwitch(e) {
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-date-x {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 10px;
+		border-radius: 4px;
+		background-color: #fff;
+		color: #666;
+		font-size: 14px;
+	}
+
+	.uni-date-x--border {
+		box-sizing: border-box;
+		border-radius: 4px;
+		border: 1px solid #dcdfe6;
+	}
+
+	.uni-date-editor--x {
+		position: relative;
+	}
+
+	.uni-date-editor--x .uni-date__icon-clear {
+		position: absolute;
+		top: 0;
+		right: 0;
+		display: inline-block;
+		box-sizing: border-box;
+		border: 9px solid transparent;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-date__x-input {
+		padding: 0 8px;
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.t-c {
+		text-align: center;
+	}
+
+	.uni-date__input {
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.uni-date-range__input {
+		text-align: center;
+		max-width: 142px;
+	}
+
+	.uni-date-picker__container {
+		position: relative;
+		/* 		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		box-sizing: border-box;
+		z-index: 996;
+		font-size: 14px; */
+	}
+
+	.uni-date-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0);
+		transition-duration: 0.3s;
+		z-index: 996;
+	}
+
+	.uni-date-single--x {
+		/* padding: 0 8px; */
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-range--x {
+		/* padding: 0 8px; */
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-editor--x__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	.uni-date-editor--logo {
+		width: 16px;
+		height: 16px;
+		vertical-align: middle;
+	}
+
+	/* 添加时间 */
+	.popup-x-header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		/* justify-content: space-between; */
+	}
+
+	.popup-x-header--datetime {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+	}
+
+	.popup-x-body {
+		display: flex;
+	}
+
+	.popup-x-footer {
+		padding: 0 15px;
+		border-top-color: #F1F1F1;
+		border-top-style: solid;
+		border-top-width: 1px;
+		/* background-color: #fff; */
+		line-height: 40px;
+		text-align: right;
+		color: #666;
+	}
+
+	.popup-x-footer text:hover {
+		color: #007aff;
+		cursor: pointer;
+		opacity: 0.8;
+	}
+
+	.popup-x-footer .confirm {
+		margin-left: 20px;
+		color: #007aff;
+	}
+
+	.uni-date-changed {
+		/* background-color: #fff; */
+		text-align: center;
+		color: #333;
+		border-bottom-color: #F1F1F1;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+		/* padding: 0 50px; */
+	}
+
+	.uni-date-changed--time text {
+		/* padding: 0 20px; */
+		height: 50px;
+		line-height: 50px;
+	}
+
+	.uni-date-changed .uni-date-changed--time {
+		/* display: flex; */
+		flex: 1;
+	}
+
+	.uni-date-changed--time-date {
+		color: #333;
+		opacity: 0.6;
+	}
+
+	.mr-50 {
+		margin-right: 50px;
+	}
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	.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;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
new file mode 100644
index 0000000..efa5773
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -0,0 +1,410 @@
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range,
+		// multipleStatus
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+		// this.multipleStatus = multipleStatus
+		this.lastHover = false
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let isinfo = false
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+				disableBefore = this.dateCompare(this.startDate, nowDate)
+			}
+
+			if (this.endDate) {
+				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+				disableAfter = this.dateCompare(nowDate, this.endDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(nowDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(nowDate, this.multipleStatus.before, this.multipleStatus.after),
+				month: full.month,
+				disable: !(disableBefore && disableAfter),
+				isDay,
+				userChecked: false
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 *  比较真实起始日期
+	 */
+
+	isLogicBefore(currentDay, before, after) {
+		let logicBefore = before
+		if (before && after) {
+			logicBefore = this.dateCompare(before, after) ? before : after
+		}
+		return this.dateEqual(logicBefore, currentDay)
+	}
+
+	isLogicAfter(currentDay, before, after) {
+		let logicAfter = after
+		if (before && after) {
+			logicAfter = this.dateCompare(before, after) ? after : before
+		}
+		return this.dateEqual(logicAfter, currentDay)
+	}
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+		if (!this.range) return
+		if (before && after) {
+			if (!this.lastHover) {
+				this.lastHover = true
+				return
+			}
+			this.multipleStatus.before = fullDate
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+			this.multipleStatus.fulldate = ''
+			this.lastHover = false
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+				this.lastHover = false
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+				this.lastHover = true
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 *  鼠标 hover 更新多选状态
+	 */
+	setHoverMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (this.lastHover) return
+
+		if (!before) {
+			this.multipleStatus.before = fullDate
+		} else {
+			this.multipleStatus.after = fullDate
+			if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+			} else {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 更新默认值多选状态
+	 */
+	setDefaultMultiple(before, after) {
+		this.multipleStatus.before = before
+		this.multipleStatus.after = after
+		if (before && after) {
+			if (this.dateCompare(before, after)) {
+				this.multipleStatus.data = this.geDateAll(before, after);
+				this._getWeek(after)
+			} else {
+				this.multipleStatus.data = this.geDateAll(after, before);
+				this._getWeek(before)
+			}
+		}
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			fullDate,
+			year,
+			month,
+			date,
+			day
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar
diff --git a/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/package.json
new file mode 100644
index 0000000..0e44103
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.4",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "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-datetime-picker/readme.md b/uni_modules/uni-datetime-picker/readme.md
new file mode 100644
index 0000000..162fbef
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/readme.md
@@ -0,0 +1,21 @@
+
+
+> `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
+## DatetimePicker 时间选择器
+
+> **组件名：uni-datetime-picker**
+> 代码块： `uDatetimePicker`
+
+
+该组件的优势是，支持**时间戳**输入和输出（起始时间、终止时间也支持时间戳），可**同时选择**日期和时间。
+
+若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
+
+**_点击 picker 默认值规则：_**
+
+- 若设置初始值 value, 会显示在 picker 显示框中
+- 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-drawer/changelog.md b/uni_modules/uni-drawer/changelog.md
new file mode 100644
index 0000000..6d2488c
--- /dev/null
+++ b/uni_modules/uni-drawer/changelog.md
@@ -0,0 +1,13 @@
+## 1.2.1（2021-11-22）
+- 修复 vue3中个别scss变量无法找到的问题
+## 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-drawer](https://uniapp.dcloud.io/component/uniui/uni-drawer)
+## 1.1.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-02-04）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-drawer/components/uni-drawer/keypress.js b/uni_modules/uni-drawer/components/uni-drawer/keypress.js
new file mode 100644
index 0000000..62dda46
--- /dev/null
+++ b/uni_modules/uni-drawer/components/uni-drawer/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-drawer/components/uni-drawer/uni-drawer.vue b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
new file mode 100644
index 0000000..2471521
--- /dev/null
+++ b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
@@ -0,0 +1,183 @@
+<template>
+	<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
+		<view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')" />
+		<view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer}" :style="{width:drawerWidth+'px'}">
+			<slot />
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress @esc="close('mask')" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+	/**
+	 * Drawer 抽屉
+	 * @description 抽屉侧滑菜单
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=26
+	 * @property {Boolean} mask = [true | false] 是否显示遮罩
+	 * @property {Boolean} maskClick = [true | false] 点击遮罩是否关闭
+	 * @property {Boolean} mode = [left | right] Drawer 滑出位置
+	 * 	@value left 从左侧滑出
+	 * 	@value right 从右侧侧滑出
+	 * @property {Number} width 抽屉的宽度 ，仅 vue 页面生效
+	 * @event {Function} close 组件关闭时触发事件
+	 */
+	export default {
+		name: 'UniDrawer',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits:['change'],
+		props: {
+			/**
+			 * 显示模式（左、右），只在初始化生效
+			 */
+			mode: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 蒙层显示状态
+			 */
+			mask: {
+				type: Boolean,
+				default: true
+			},
+			/**
+			 * 遮罩是否可点击关闭
+			 */
+			maskClick:{
+				type: Boolean,
+				default: true
+			},
+			/**
+			 * 抽屉宽度
+			 */
+			width: {
+				type: Number,
+				default: 220
+			}
+		},
+		data() {
+			return {
+				visibleSync: false,
+				showDrawer: false,
+				rightMode: false,
+				watchTimer: null,
+				drawerWidth: 220
+			}
+		},
+		created() {
+			// #ifndef APP-NVUE
+			this.drawerWidth = this.width
+			// #endif
+			this.rightMode = this.mode === 'right'
+		},
+		methods: {
+			clear(){},
+			close(type) {
+				// fixed by mehaotian 抽屉尚未完全关闭或遮罩禁止点击时不触发以下逻辑
+				if((type === 'mask' && !this.maskClick) || !this.visibleSync) return
+				this._change('showDrawer', 'visibleSync', false)
+			},
+			open() {
+				// fixed by mehaotian 处理重复点击打开的事件
+				if(this.visibleSync) return
+				this._change('visibleSync', 'showDrawer', true)
+			},
+			_change(param1, param2, status) {
+				this[param1] = status
+				if (this.watchTimer) {
+					clearTimeout(this.watchTimer)
+				}
+				this.watchTimer = setTimeout(() => {
+					this[param2] = status
+					this.$emit('change',status)
+				}, status ? 50 : 300)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-mask: rgba($color: #000000, $alpha: 0.4) ;
+	// 抽屉宽度
+	$drawer-width: 220px;
+
+	.uni-drawer {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		overflow: hidden;
+		z-index: 999;
+	}
+
+	.uni-drawer__content {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: absolute;
+		top: 0;
+		width: $drawer-width;
+		bottom: 0;
+		background-color: $uni-bg-color;
+		transition: transform 0.3s ease;
+	}
+
+	.uni-drawer--left {
+		left: 0;
+		/* #ifdef APP-NVUE */
+		transform: translateX(-$drawer-width);
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		transform: translateX(-100%);
+		/* #endif */
+	}
+
+	.uni-drawer--right {
+		right: 0;
+		/* #ifdef APP-NVUE */
+		transform: translateX($drawer-width);
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		transform: translateX(100%);
+		/* #endif */
+	}
+
+	.uni-drawer__content--visible {
+		transform: translateX(0px);
+	}
+
+
+	.uni-drawer__mask {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		opacity: 0;
+		position: absolute;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		background-color: $uni-mask;
+		transition: opacity 0.3s;
+	}
+
+	.uni-drawer__mask--visible {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		opacity: 1;
+	}
+</style>
diff --git a/uni_modules/uni-drawer/package.json b/uni_modules/uni-drawer/package.json
new file mode 100644
index 0000000..dd056e4
--- /dev/null
+++ b/uni_modules/uni-drawer/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-drawer",
+  "displayName": "uni-drawer 抽屉",
+  "version": "1.2.1",
+  "description": "抽屉式导航，用于展示侧滑菜单，侧滑导航。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "drawer",
+    "抽屉",
+    "侧滑导航"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-drawer/readme.md b/uni_modules/uni-drawer/readme.md
new file mode 100644
index 0000000..dcf6e6b
--- /dev/null
+++ b/uni_modules/uni-drawer/readme.md
@@ -0,0 +1,10 @@
+
+
+## Drawer 抽屉
+> **组件名：uni-drawer**
+> 代码块： `uDrawer`
+
+抽屉侧滑菜单。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-drawer)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-easyinput/changelog.md b/uni_modules/uni-easyinput/changelog.md
new file mode 100644
index 0000000..6c6b083
--- /dev/null
+++ b/uni_modules/uni-easyinput/changelog.md
@@ -0,0 +1,41 @@
+## 1.0.5（2022-06-07）
+- 优化 clearable 显示策略
+## 1.0.4（2022-06-07）
+- 优化 clearable 显示策略
+## 1.0.3（2022-05-20）
+- 修复 关闭图标某些情况下无法取消的bug
+## 1.0.2（2022-04-12）
+- 修复 默认值不生效的bug
+## 1.0.1（2022-04-02）
+- 修复 value不能为0的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-easyinput](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+## 0.1.4（2021-08-20）
+- 修复 在 uni-forms 的动态表单中默认值校验不通过的 bug
+## 0.1.3（2021-08-11）
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+## 0.1.2（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 0.1.1
+- 优化 errorMessage 属性支持 Boolean 类型
+## 0.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.0.16（2021-06-29）
+- 修复 confirmType 属性（仅 type="text" 生效）导致多行文本框无法换行的 bug
+## 0.0.15（2021-06-21）
+- 修复 passwordIcon 属性拼写错误的 bug
+## 0.0.14（2021-06-18）
+- 新增 passwordIcon 属性，当type=password时是否显示小眼睛图标
+- 修复 confirmType 属性不生效的问题
+## 0.0.13（2021-06-04）
+- 修复 disabled 状态可清出内容的 bug
+## 0.0.12（2021-05-12）
+- 新增 组件示例地址
+## 0.0.11（2021-05-07）
+- 修复 input-border 属性不生效的问题
+## 0.0.10（2021-04-30）
+- 修复 ios 遮挡文字、显示一半的问题
+## 0.0.9（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/common.js b/uni_modules/uni-easyinput/components/uni-easyinput/common.js
new file mode 100644
index 0000000..46a41ee
--- /dev/null
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/common.js
@@ -0,0 +1,54 @@
+/**
+ * @desc 函数防抖
+ * @param func 目标函数
+ * @param wait 延迟执行毫秒数
+ * @param immediate true - 立即执行， false - 延迟执行
+ */
+export const debounce = function(func, wait = 1000, immediate = true) {
+        let timer;
+        return function() {
+            let context = this,
+                args = arguments;
+            if (timer) clearTimeout(timer);
+            if (immediate) {
+                let callNow = !timer;
+                timer = setTimeout(() => {
+                    timer = null;
+                }, wait);
+                if (callNow) func.apply(context, args);
+            } else {
+                timer = setTimeout(() => {
+                    func.apply(context, args);
+                }, wait)
+            }
+        }
+    }
+    /**
+     * @desc 函数节流
+     * @param func 函数
+     * @param wait 延迟执行毫秒数
+     * @param type 1 使用表时间戳，在时间段开始的时候触发 2 使用表定时器，在时间段结束的时候触发
+     */
+export const throttle = (func, wait = 1000, type = 1) => {
+    let previous = 0;
+    let timeout;
+    return function() {
+        let context = this;
+        let args = arguments;
+        if (type === 1) {
+            let now = Date.now();
+
+            if (now - previous > wait) {
+                func.apply(context, args);
+                previous = now;
+            }
+        } else if (type === 2) {
+            if (!timeout) {
+                timeout = setTimeout(() => {
+                    timeout = null;
+                    func.apply(context, args)
+                }, wait)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
new file mode 100644
index 0000000..c8bf584
--- /dev/null
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -0,0 +1,538 @@
+<template>
+	<view
+		class="uni-easyinput"
+		:class="{ 'uni-easyinput-error': msg }"
+		:style="{ color: inputBorder && msg ? '#e43d33' : styles.color }"
+	>
+		<view
+			class="uni-easyinput__content"
+			:class="{
+				'is-input-border': inputBorder,
+				'is-input-error-border': inputBorder && msg,
+				'is-textarea': type === 'textarea',
+				'is-disabled': disabled
+			}"
+			:style="{
+				'border-color': inputBorder && msg ? '#dd524d' : styles.borderColor,
+				'background-color': disabled ? styles.disableColor : ''
+			}"
+		>
+			<uni-icons
+				v-if="prefixIcon"
+				class="content-clear-icon"
+				:type="prefixIcon"
+				color="#c0c4cc"
+				@click="onClickIcon('prefix')"
+			></uni-icons>
+			<textarea
+				v-if="type === 'textarea'"
+				class="uni-easyinput__content-textarea"
+				:class="{ 'input-padding': inputBorder }"
+				:name="name"
+				:value="val"
+				:placeholder="placeholder"
+				:placeholderStyle="placeholderStyle"
+				:disabled="disabled"
+				placeholder-class="uni-easyinput__placeholder-class"
+				:maxlength="inputMaxlength"
+				:focus="focused"
+				:autoHeight="autoHeight"
+				@input="onInput"
+				@blur="onBlur"
+				@focus="onFocus"
+				@confirm="onConfirm"
+			></textarea>
+			<input
+				v-else
+				:type="type === 'password' ? 'text' : type"
+				class="uni-easyinput__content-input"
+				:style="{
+					'padding-right': type === 'password' || clearable || prefixIcon ? '' : '10px',
+					'padding-left': paddingLeft + 'px'
+
+				}"
+				:name="name"
+				:value="val"
+				:password="!showPassword && type === 'password'"
+				:placeholder="placeholder"
+				:placeholderStyle="placeholderStyle"
+				placeholder-class="uni-easyinput__placeholder-class"
+				:disabled="disabled"
+				:maxlength="inputMaxlength"
+				:focus="focused"
+				:confirmType="confirmType"
+				@focus="onFocus"
+				@blur="onBlur"
+				@input="onInput"
+				@change="onInput"
+				@confirm="onConfirm"
+				:cursor-spacing="30"
+				always-embed
+			/>
+			<template v-if="type === 'password' && passwordIcon">
+				<uni-icons
+					v-if="val"
+					class="content-clear-icon"
+					:class="{ 'is-textarea-icon': type === 'textarea' }"
+					:type="showPassword ? 'eye-slash-filled' : 'eye-filled'"
+					:size="18"
+					color="#c0c4cc"
+					@click="onEyes"
+				></uni-icons>
+			</template>
+			<template v-else-if="suffixIcon">
+				<uni-icons
+					v-if="suffixIcon"
+					class="content-clear-icon"
+					:type="suffixIcon"
+					color="#c0c4cc"
+					@click="onClickIcon('suffix')"
+				></uni-icons>
+			</template>
+			<template v-else>
+				<uni-icons
+					class="content-clear-icon"
+					:class="{ 'is-textarea-icon': type === 'textarea' }"
+					type="clear"
+					:size="clearSize"
+					v-if="clearable && val && !disabled"
+					color="#c0c4cc"
+					@click="onClear"
+				></uni-icons>
+			</template>
+			<slot name="right"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+// import {
+// 	debounce,
+// 	throttle
+// } from './common.js'
+/**
+ * Easyinput 输入框
+ * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=3455
+ * @property {String}	value	输入内容
+ * @property {String }	type	输入框的类型（默认text） password/text/textarea/..
+ * 	@value text			文本输入键盘
+ * 	@value textarea	多行文本输入键盘
+ * 	@value password	密码输入键盘
+ * 	@value number		数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
+ * 	@value idcard		身份证输入键盘，信、支付宝、百度、QQ小程序
+ * 	@value digit		带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
+ * @property {Boolean}	clearable	是否显示右侧清空内容的图标控件，点击可清空输入框内容（默认true）
+ * @property {Boolean}	autoHeight	是否自动增高输入区域，type为textarea时有效（默认false）
+ * @property {String }	placeholder	输入框的提示文字
+ * @property {String }	placeholderStyle	placeholder的样式(内联样式，字符串)，如"color: #ddd"
+ * @property {Boolean}	focus	是否自动获得焦点（默认false）
+ * @property {Boolean}	disabled	是否禁用（默认false）
+ * @property {Number }	maxlength	最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+ * @property {String }	confirmType	设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+ * @property {Number }	clearSize	清除图标的大小，单位px（默认15）
+ * @property {String}	prefixIcon	输入框头部图标
+ * @property {String}	suffixIcon	输入框尾部图标
+ * @property {Boolean}	trim	是否自动去除两端的空格
+ * @value both	去除两端空格
+ * @value left	去除左侧空格
+ * @value right	去除右侧空格
+ * @value start	去除左侧空格
+ * @value end		去除右侧空格
+ * @value all		去除全部空格
+ * @value none	不去除空格
+ * @property {Boolean}	inputBorder	是否显示input输入框的边框（默认true）
+ * @property {Boolean}	passwordIcon	type=password时是否显示小眼睛图标
+ * @property {Object}	styles	自定义颜色
+ * @event {Function}	input	输入框内容发生变化时触发
+ * @event {Function}	focus	输入框获得焦点时触发
+ * @event {Function}	blur	输入框失去焦点时触发
+ * @event {Function}	confirm	点击完成按钮时触发
+ * @event {Function}	iconClick	点击图标时触发
+ * @example <uni-easyinput v-model="mobile"></uni-easyinput>
+ */
+
+export default {
+	name: 'uni-easyinput',
+	emits: ['click', 'iconClick', 'update:modelValue', 'input', 'focus', 'blur', 'confirm'],
+	model: {
+		prop: 'modelValue',
+		event: 'update:modelValue'
+	},
+	props: {
+		name: String,
+		value: [Number, String],
+		modelValue: [Number, String],
+		type: {
+			type: String,
+			default: 'text'
+		},
+		clearable: {
+			type: Boolean,
+			default: true
+		},
+		autoHeight: {
+			type: Boolean,
+			default: false
+		},
+		placeholder: String,
+		placeholderStyle: String,
+		focus: {
+			type: Boolean,
+			default: false
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		maxlength: {
+			type: [Number, String],
+			default: 140
+		},
+		confirmType: {
+			type: String,
+			default: 'done'
+		},
+		clearSize: {
+			type: [Number, String],
+			default: 15
+		},
+		inputBorder: {
+			type: Boolean,
+			default: true
+		},
+		prefixIcon: {
+			type: String,
+			default: ''
+		},
+		suffixIcon: {
+			type: String,
+			default: ''
+		},
+		trim: {
+			type: [Boolean, String],
+			default: true
+		},
+		passwordIcon: {
+			type: Boolean,
+			default: true
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {
+					color: '#333',
+					disableColor: '#F7F6F6',
+					borderColor: '#e5e5e5'
+				};
+			}
+		},
+		errorMessage: {
+			type: [String, Boolean],
+			default: ''
+		},
+		paddingLeft:{
+			type: [Number, String],
+			default: 0
+		}
+	},
+	data() {
+		return {
+			focused: false,
+			errMsg: '',
+			val: '',
+			showMsg: '',
+			border: false,
+			isFirstBorder: false,
+			showClearIcon: false,
+			showPassword: false
+		};
+	},
+	computed: {
+		msg() {
+			return this.errorMessage || this.errMsg;
+		},
+		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
+		inputMaxlength() {
+			return Number(this.maxlength);
+		}
+	},
+	watch: {
+		value(newVal) {
+			if (this.errMsg) this.errMsg = '';
+			this.val = newVal;
+			// fix by mehaotian is_reset 在 uni-forms 中定义
+			if (this.form && this.formItem && !this.is_reset) {
+				this.is_reset = false;
+				this.formItem.setValue(newVal);
+			}
+		},
+		modelValue(newVal) {
+			if (this.errMsg) this.errMsg = '';
+			this.val = newVal;
+			if (this.form && this.formItem && !this.is_reset) {
+				this.is_reset = false;
+				this.formItem.setValue(newVal);
+			}
+		},
+		focus(newVal) {
+			this.$nextTick(() => {
+				this.focused = this.focus;
+			});
+		}
+	},
+	created() {
+		if (!this.value && this.value !== 0) {
+			this.val = this.modelValue;
+		}
+		if (!this.modelValue && this.modelValue !== 0) {
+			this.val = this.value;
+		}
+		this.form = this.getForm('uniForms');
+		this.formItem = this.getForm('uniFormsItem');
+		if (this.form && this.formItem) {
+			if (this.formItem.name) {
+				if (!this.is_reset) {
+					this.is_reset = false;
+					this.formItem.setValue(this.val);
+				}
+				this.rename = this.formItem.name;
+				this.form.inputChildrens.push(this);
+			}
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.focused = this.focus;
+		});
+	},
+	methods: {
+		/**
+		 * 初始化变量值
+		 */
+		init() {},
+		onClickIcon(type) {
+			this.$emit('iconClick', type);
+		},
+		/**
+		 * 获取父元素实例
+		 */
+		getForm(name = 'uniForms') {
+			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;
+		},
+
+		onEyes() {
+			this.showPassword = !this.showPassword;
+		},
+		onInput(event) {
+			let value = event.detail.value;
+			// 判断是否去除空格
+			if (this.trim) {
+				if (typeof this.trim === 'boolean' && this.trim) {
+					value = this.trimStr(value);
+				}
+				if (typeof this.trim === 'string') {
+					value = this.trimStr(value, this.trim);
+				}
+			}
+			if (this.errMsg) this.errMsg = '';
+			this.val = value;
+			// TODO 兼容 vue2
+			this.$emit('input', value);
+			// TODO　兼容　vue3
+			this.$emit('update:modelValue', value);
+		},
+		onFocus(event) {
+			this.$emit('focus', event);
+		},
+		onBlur(event) {
+			let value = event.detail.value;
+			this.$emit('blur', event);
+		},
+		onConfirm(e) {
+			this.$emit('confirm', e.detail.value);
+		},
+		onClear(event) {
+			this.val = '';
+			// TODO 兼容 vue2
+			this.$emit('input', '');
+			// TODO 兼容 vue2
+			// TODO　兼容　vue3
+			this.$emit('update:modelValue', '');
+		},
+		fieldClick() {
+			this.$emit('click');
+		},
+		trimStr(str, pos = 'both') {
+			if (pos === 'both') {
+				return str.trim();
+			} else if (pos === 'left') {
+				return str.trimLeft();
+			} else if (pos === 'right') {
+				return str.trimRight();
+			} else if (pos === 'start') {
+				return str.trimStart();
+			} else if (pos === 'end') {
+				return str.trimEnd();
+			} else if (pos === 'all') {
+				return str.replace(/\s+/g, '');
+			} else if (pos === 'none') {
+				return str;
+			}
+			return str;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+$uni-error: #e43d33;
+$uni-border-1: #dcdfe6 !default;
+.uni-easyinput {
+	/* #ifndef APP-NVUE */
+	width: 100%;
+	/* #endif */
+	flex: 1;
+	position: relative;
+	text-align: left;
+	color: #333;
+	font-size: 14px;
+}
+
+.uni-easyinput__content {
+	flex: 1;
+	/* #ifndef APP-NVUE */
+	width: 100%;
+	display: flex;
+	box-sizing: border-box;
+	min-height: 72rpx;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+}
+
+.uni-easyinput__content-input {
+	/* #ifndef APP-NVUE */
+	width: auto;
+	/* #endif */
+	position: relative;
+	overflow: hidden;
+	flex: 1;
+	line-height: 56rpx;
+	font-size: 28rpx;
+	height: 56rpx;
+}
+.uni-easyinput__placeholder-class {
+	color: #bbbbbb;
+	font-size: 28rpx;
+	font-weight: 400;
+	line-height: normal;
+}
+.is-textarea {
+	align-items: flex-start;
+}
+
+.is-textarea-icon {
+	margin-top: 5px;
+}
+
+.uni-easyinput__content-textarea {
+	position: relative;
+	overflow: hidden;
+	flex: 1;
+	line-height: 1.5;
+	font-size: 14px;
+	padding-top: 6px;
+	padding-bottom: 10px;
+	height: 80px;
+	/* #ifndef APP-NVUE */
+	min-height: 80px;
+	width: auto;
+	/* #endif */
+}
+
+.input-padding {
+	padding-left: 10px;
+}
+
+.content-clear-icon {
+	padding: 0 5px;
+}
+
+.label-icon {
+	margin-right: 5px;
+	margin-top: -1px;
+}
+
+// 显示边框
+.is-input-border {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	box-sizing: border-box;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+	border: 1px solid $uni-border-1;
+	border-radius: 4px;
+}
+
+.uni-error-message {
+	position: absolute;
+	bottom: -17px;
+	left: 0;
+	line-height: 12px;
+	color: $uni-error;
+	font-size: 12px;
+	text-align: left;
+}
+
+.uni-error-msg--boeder {
+	position: relative;
+	bottom: 0;
+	line-height: 22px;
+}
+
+.is-input-error-border {
+	border-color: $uni-error;
+	.uni-easyinput__placeholder-class {
+		// color: mix(#fff, $uni-error, 50%);
+	}
+}
+
+.uni-easyinput--border {
+	margin-bottom: 0;
+	padding: 10px 15px;
+	// padding-bottom: 0;
+	border-top: 1px #eee solid;
+}
+
+.uni-easyinput-error {
+	padding-bottom: 0;
+}
+
+.is-first-border {
+	/* #ifndef APP-NVUE */
+	border: none;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	border-width: 0;
+	/* #endif */
+}
+
+.is-disabled {
+	border-color: red;
+	background-color: #f7f6f6;
+	color: #d5d5d5;
+	.uni-easyinput__placeholder-class {
+		color: #d5d5d5;
+		font-size: 12px;
+	}
+}
+</style>
diff --git a/uni_modules/uni-easyinput/package.json b/uni_modules/uni-easyinput/package.json
new file mode 100644
index 0000000..15482b2
--- /dev/null
+++ b/uni_modules/uni-easyinput/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-easyinput",
+  "displayName": "uni-easyinput 增强输入框",
+  "version": "1.0.5",
+  "description": "Easyinput 组件是对原生input组件的增强",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "input",
+    "uni-easyinput",
+    "输入框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-easyinput/readme.md b/uni_modules/uni-easyinput/readme.md
new file mode 100644
index 0000000..f1faf8f
--- /dev/null
+++ b/uni_modules/uni-easyinput/readme.md
@@ -0,0 +1,11 @@
+
+
+### Easyinput 增强输入框
+> **组件名：uni-easyinput**
+> 代码块： `uEasyinput`
+
+
+easyinput 组件是对原生input组件的增强 ，是专门为配合表单组件[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)而设计的，easyinput 内置了边框，图标等，同时包含 input 所有功能
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-fab/changelog.md b/uni_modules/uni-fab/changelog.md
new file mode 100644
index 0000000..24e26b1
--- /dev/null
+++ b/uni_modules/uni-fab/changelog.md
@@ -0,0 +1,17 @@
+## 1.2.2（2021-12-29）
+- 更新 组件依赖
+## 1.2.1（2021-11-19）
+- 修复 阴影颜色不正确的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-fab](https://uniapp.dcloud.io/component/uniui/uni-fab)
+## 1.1.1（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 按钮背景色调整
+- 优化 兼容pc端
diff --git a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
new file mode 100644
index 0000000..39fac19
--- /dev/null
+++ b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
@@ -0,0 +1,529 @@
+<template>
+  <view class="uni-cursor-point">
+    <view
+      v-if="popMenu && (leftBottom || rightBottom || leftTop || rightTop) && content.length > 0"
+      :class="{
+        'uni-fab--leftBottom': leftBottom,
+        'uni-fab--rightBottom': rightBottom,
+        'uni-fab--leftTop': leftTop,
+        'uni-fab--rightTop': rightTop,
+      }"
+      class="uni-fab"
+    >
+      <view
+        :class="{
+          'uni-fab__content--left': horizontal === 'left',
+          'uni-fab__content--right': horizontal === 'right',
+          'uni-fab__content--flexDirection': direction === 'vertical',
+          'uni-fab__content--flexDirectionStart': flexDirectionStart,
+          'uni-fab__content--flexDirectionEnd': flexDirectionEnd,
+          'uni-fab__content--other-platform': !isAndroidNvue,
+        }"
+        :style="{ width: boxWidth, height: boxHeight }"
+        class="uni-fab__content"
+        elevation="5"
+      >
+        <view
+          v-if="flexDirectionStart || horizontalLeft"
+          class="uni-fab__item uni-fab__item--first"
+        />
+        <view
+          v-for="(item, index) in content"
+          :key="index"
+          :class="{
+            'uni-fab__item--active': isShow,
+            'horizontal-margin': direction == 'horizontal',
+          }"
+          class="uni-fab__item"
+          @click="_onItemClick(index, item)"
+        >
+          <image
+            :src="item.active ? item.selectedIconPath : item.iconPath"
+            class="uni-fab__item-image"
+            mode="aspectFit"
+          />
+          <text
+            class="uni-fab__item-text"
+            :class="{ 'vertical-margin': direction == 'vertical' }"
+            :style="{ color: pattern[index].color }"
+            >{{ item.text }}</text
+          >
+        </view>
+        <view
+          v-if="flexDirectionEnd || horizontalRight"
+          class="uni-fab__item uni-fab__item--first"
+        />
+      </view>
+    </view>
+    <view
+      :class="{
+        'uni-fab__circle--leftBottom': leftBottom,
+        'uni-fab__circle--rightBottom': rightBottom,
+        'uni-fab__circle--leftTop': leftTop,
+        'uni-fab__circle--rightTop': rightTop,
+        'uni-fab__content--other-platform': !isAndroidNvue,
+      }"
+      class="uni-fab__circle uni-fab__plus"
+      :style="{ 'background-color': 'var(--ui-BG-Main)' }"
+      @click="_onClick"
+    >
+      <uni-icons
+        class="fab-circle-icon"
+        type="plusempty"
+        color="#fff"
+        size="20"
+        :class="{ 'uni-fab__plus--active': isShow && content.length > 0 }"
+      ></uni-icons>
+      <!-- <view class="fab-circle-v"  :class="{'uni-fab__plus--active': isShow && content.length > 0}"></view>
+			<view class="fab-circle-h" :class="{'uni-fab__plus--active': isShow  && content.length > 0}"></view> -->
+    </view>
+  </view>
+</template>
+
+<script>
+import sheep from '@/sheep';
+const { safeAreaInsets } = sheep.$platform.device;
+let platform = 'other';
+// #ifdef APP-NVUE
+platform = uni.getSystemInfoSync().platform;
+// #endif
+
+/**
+ * Fab 悬浮按钮
+ * @description 点击可展开一个图形按钮菜单
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=144
+ * @property {Object} pattern 可选样式配置项
+ * @property {Object} horizontal = [left | right] 水平对齐方式
+ * 	@value left 左对齐
+ * 	@value right 右对齐
+ * @property {Object} vertical = [bottom | top] 垂直对齐方式
+ * 	@value bottom 下对齐
+ * 	@value top 上对齐
+ * @property {Object} direction = [horizontal | vertical] 展开菜单显示方式
+ * 	@value horizontal 水平显示
+ * 	@value vertical 垂直显示
+ * @property {Array} content 展开菜单内容配置项
+ * @property {Boolean} popMenu 是否使用弹出菜单
+ * @event {Function} trigger 展开菜单点击事件，返回点击信息
+ * @event {Function} fabClick 悬浮按钮点击事件
+ */
+export default {
+  name: 'UniFab',
+  emits: ['fabClick', 'trigger'],
+  props: {
+    pattern: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    horizontal: {
+      type: String,
+      default: 'left',
+    },
+    vertical: {
+      type: String,
+      default: 'bottom',
+    },
+    direction: {
+      type: String,
+      default: 'horizontal',
+    },
+    content: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    popMenu: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      fabShow: false,
+      isShow: false,
+      isAndroidNvue: platform === 'android',
+      styles: [
+        {
+          // color: '#3c3e49',
+          // selectedColor: '#007AFF',
+          // backgroundColor: '#fff',
+          // buttonColor: '#007AFF',
+          // iconColor: '#fff'
+        },
+      ],
+    };
+  },
+  computed: {
+    contentWidth(e) {
+      return (this.content.length + 1) * 130 + 'rpx';
+    },
+    contentWidthMin() {
+      return '100rpx';
+    },
+    // 动态计算宽度
+    boxWidth() {
+      return this.getPosition(3, 'horizontal');
+    },
+    // 动态计算高度
+    boxHeight() {
+      return this.getPosition(3, 'vertical');
+    },
+    // 计算左下位置
+    leftBottom() {
+      return this.getPosition(0, 'left', 'bottom');
+    },
+    // 计算右下位置
+    rightBottom() {
+      return this.getPosition(0, 'right', 'bottom');
+    },
+    // 计算左上位置
+    leftTop() {
+      return this.getPosition(0, 'left', 'top');
+    },
+    rightTop() {
+      return this.getPosition(0, 'right', 'top');
+    },
+    flexDirectionStart() {
+      return this.getPosition(1, 'vertical', 'top');
+    },
+    flexDirectionEnd() {
+      return this.getPosition(1, 'vertical', 'bottom');
+    },
+    horizontalLeft() {
+      return this.getPosition(2, 'horizontal', 'left');
+    },
+    horizontalRight() {
+      return this.getPosition(2, 'horizontal', 'right');
+    },
+  },
+  watch: {
+    // pattern: {
+    // 	handler(val, oldVal) {
+    // 		this.styles = Object.assign({}, this.styles, val)
+    // 	},
+    // 	deep: true
+    // }
+  },
+  created() {
+    this.isShow = this.show;
+    if (this.top === 0) {
+      this.fabShow = true;
+    }
+    // 初始化样式
+    // this.styles = Object.assign({}, this.styles, this.pattern)
+  },
+  methods: {
+    _onClick() {
+      this.$emit('fabClick');
+      if (!this.popMenu) {
+        return;
+      }
+      this.isShow = !this.isShow;
+    },
+    open() {
+      this.isShow = true;
+    },
+    close() {
+      this.isShow = false;
+    },
+    /**
+     * 按钮点击事件
+     */
+    _onItemClick(index, item) {
+      this.$emit('trigger', {
+        index,
+        item,
+      });
+    },
+    /**
+     * 获取 位置信息
+     */
+    getPosition(types, paramA, paramB) {
+      if (types === 0) {
+        return this.horizontal === paramA && this.vertical === paramB;
+      } else if (types === 1) {
+        return this.direction === paramA && this.vertical === paramB;
+      } else if (types === 2) {
+        return this.direction === paramA && this.horizontal === paramB;
+      } else {
+        return this.isShow && this.direction === paramA ? this.contentWidth : this.contentWidthMin;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" >
+$uni-shadow-base: 0 1px 5px 2px
+  rgba(
+    $color: #000000,
+    $alpha: 0.3,
+  ) !default;
+
+.horizontal-margin {
+  margin-right: 20rpx;
+}
+.vertical-margin {
+  margin-bottom: 20rpx;
+}
+.uni-fab {
+  position: fixed;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  justify-content: center;
+  align-items: center;
+  z-index: 12;
+  border-radius: 45px;
+  // box-shadow: $uni-shadow-base;
+}
+
+.uni-cursor-point {
+  /* #ifdef H5 */
+  cursor: pointer;
+  /* #endif */
+}
+
+.uni-fab--active {
+  opacity: 1;
+}
+
+.uni-fab--leftBottom {
+  left: 15px;
+  bottom: 30px;
+  /* #ifdef H5 */
+  left: calc(30px + var(--window-left));
+  bottom: calc(60px + var(--window-bottom));
+  /* #endif */
+  // padding: 10px;
+}
+
+.uni-fab--leftTop {
+  left: 15px;
+  top: 30px;
+  /* #ifdef H5 */
+  left: calc(15px + var(--window-left));
+  top: calc(30px + var(--window-top));
+  /* #endif */
+  // padding: 10px;
+}
+
+.uni-fab--rightBottom {
+  right: 24rpx;
+  bottom: calc(100rpx + env(safe-area-inset-bottom));
+  /* #ifdef H5 */
+  right: calc(24rpx + var(--window-right));
+  bottom: calc(100rpx + var(--window-bottom));
+  /* #endif */
+  // padding: 10px;
+}
+
+.uni-fab--rightTop {
+  right: 15px;
+  top: 30px;
+  /* #ifdef H5 */
+  right: calc(15px + var(--window-right));
+  top: calc(30px + var(--window-top));
+  /* #endif */
+  // padding: 10px;
+}
+
+.uni-fab__circle {
+  position: fixed;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  justify-content: center;
+  align-items: center;
+  width: 64rpx;
+  height: 64rpx;
+  background-color: #3c3e49;
+  border-radius: 50%;
+  z-index: 13;
+  // box-shadow: $uni-shadow-base;
+}
+
+.uni-fab__circle--leftBottom {
+  left: 15px;
+  bottom: 30px;
+  /* #ifdef H5 */
+  left: calc(15px + var(--window-left));
+  bottom: calc(30px + var(--window-bottom));
+  /* #endif */
+}
+
+.uni-fab__circle--leftTop {
+  left: 15px;
+  top: 30px;
+  /* #ifdef H5 */
+  left: calc(15px + var(--window-left));
+  top: calc(30px + var(--window-top));
+  /* #endif */
+}
+
+.uni-fab__circle--rightBottom {
+  right: 40rpx;
+  bottom: calc(120rpx + env(safe-area-inset-bottom));
+  /* #ifdef H5 */
+  right: calc(40rpx + var(--window-right));
+  bottom: calc(120rpx + var(--window-bottom));
+  /* #endif */
+}
+
+.uni-fab__circle--rightTop {
+  right: 15px;
+  top: 30px;
+  /* #ifdef H5 */
+  right: calc(15px + var(--window-right));
+  top: calc(30px + var(--window-top));
+  /* #endif */
+}
+
+.uni-fab__circle--left {
+  left: 0;
+}
+
+.uni-fab__circle--right {
+  right: 0;
+}
+
+.uni-fab__circle--top {
+  top: 0;
+}
+
+.uni-fab__circle--bottom {
+  bottom: 0;
+}
+
+.uni-fab__plus {
+  font-weight: bold;
+}
+
+// .fab-circle-v {
+// 	position: absolute;
+// 	width: 2px;
+// 	height: 24px;
+// 	left: 0;
+// 	top: 0;
+// 	right: 0;
+// 	bottom: 0;
+// 	/* #ifndef APP-NVUE */
+// 	margin: auto;
+// 	/* #endif */
+// 	background-color: white;
+// 	transform: rotate(0deg);
+// 	transition: transform 0.3s;
+// }
+
+// .fab-circle-h {
+// 	position: absolute;
+// 	width: 24px;
+// 	height: 2px;
+// 	left: 0;
+// 	top: 0;
+// 	right: 0;
+// 	bottom: 0;
+// 	/* #ifndef APP-NVUE */
+// 	margin: auto;
+// 	/* #endif */
+// 	background-color: white;
+// 	transform: rotate(0deg);
+// 	transition: transform 0.3s;
+// }
+
+.fab-circle-icon {
+  transform: rotate(0deg);
+  transition: transform 0.3s;
+  font-weight: 200;
+}
+
+.uni-fab__plus--active {
+  transform: rotate(135deg);
+}
+
+.uni-fab__content {
+  /* #ifndef APP-NVUE */
+  box-sizing: border-box;
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  border-radius: 55px;
+  overflow: hidden;
+  transition-property: width, height;
+  transition-duration: 0.2s;
+  width: 64rpx;
+  border-color: #dddddd;
+  border-width: 1rpx;
+  border-style: solid;
+}
+
+.uni-fab__content--other-platform {
+  border-width: 0px;
+  // box-shadow: $uni-shadow-base;
+}
+
+.uni-fab__content--left {
+  justify-content: flex-start;
+}
+
+.uni-fab__content--right {
+  justify-content: flex-end;
+}
+
+.uni-fab__content--flexDirection {
+  flex-direction: column;
+  justify-content: flex-end;
+}
+
+.uni-fab__content--flexDirectionStart {
+  flex-direction: column;
+  justify-content: flex-start;
+}
+
+.uni-fab__content--flexDirectionEnd {
+  flex-direction: column;
+  justify-content: flex-end;
+}
+
+.uni-fab__item {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 100rpx;
+  // height: 84rpx;
+  opacity: 0;
+  transition: opacity 0.2s;
+}
+
+.uni-fab__item--active {
+  opacity: 1;
+}
+
+.uni-fab__item-image {
+  width: 52rpx;
+  height: 52rpx;
+}
+
+.uni-fab__item-text {
+  color: #ffffff;
+  display: table;
+  font-size: 24rpx;
+  margin-top: 4px;
+}
+
+.uni-fab__item--first {
+  width: 100rpx;
+  height: 100rpx;
+  margin-bottom: 0 !important;
+}
+</style>
diff --git a/uni_modules/uni-fab/package.json b/uni_modules/uni-fab/package.json
new file mode 100644
index 0000000..0f27daa
--- /dev/null
+++ b/uni_modules/uni-fab/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-fab",
+  "displayName": "uni-fab 悬浮按钮",
+  "version": "1.2.2",
+  "description": "悬浮按钮 fab button ，点击可展开一个图标按钮菜单。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "按钮",
+    "悬浮按钮",
+    "fab"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss","uni-icons"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-fab/readme.md b/uni_modules/uni-fab/readme.md
new file mode 100644
index 0000000..9a444e8
--- /dev/null
+++ b/uni_modules/uni-fab/readme.md
@@ -0,0 +1,9 @@
+## Fab 悬浮按钮
+> **组件名：uni-fab**
+> 代码块： `uFab`
+
+
+点击可展开一个图形按钮菜单
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-fab)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-fav/changelog.md b/uni_modules/uni-fav/changelog.md
new file mode 100644
index 0000000..d8a08d4
--- /dev/null
+++ b/uni_modules/uni-fav/changelog.md
@@ -0,0 +1,19 @@
+## 1.2.1（2022-05-30）
+- 新增 stat 属性 ，是否开启uni统计功能
+## 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-fav](https://uniapp.dcloud.io/component/uniui/uni-fav)
+## 1.1.1（2021-08-24）
+- 新增 支持国际化
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.6（2021-05-12）
+- 新增 组件示例地址
+## 1.0.5（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.4（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.0.3（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.0.2（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-fav/components/uni-fav/i18n/en.json b/uni_modules/uni-fav/components/uni-fav/i18n/en.json
new file mode 100644
index 0000000..9a0759e
--- /dev/null
+++ b/uni_modules/uni-fav/components/uni-fav/i18n/en.json
@@ -0,0 +1,4 @@
+{
+	"uni-fav.collect": "collect",
+	"uni-fav.collected": "collected"
+}
diff --git a/uni_modules/uni-fav/components/uni-fav/i18n/index.js b/uni_modules/uni-fav/components/uni-fav/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-fav/components/uni-fav/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-fav/components/uni-fav/i18n/zh-Hans.json b/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hans.json
new file mode 100644
index 0000000..67c89bf
--- /dev/null
+++ b/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hans.json
@@ -0,0 +1,4 @@
+{
+	"uni-fav.collect": "收藏",
+	"uni-fav.collected": "已收藏"
+}
diff --git a/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hant.json b/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hant.json
new file mode 100644
index 0000000..67c89bf
--- /dev/null
+++ b/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hant.json
@@ -0,0 +1,4 @@
+{
+	"uni-fav.collect": "收藏",
+	"uni-fav.collected": "已收藏"
+}
diff --git a/uni_modules/uni-fav/components/uni-fav/uni-fav.vue b/uni_modules/uni-fav/components/uni-fav/uni-fav.vue
new file mode 100644
index 0000000..d2c58df
--- /dev/null
+++ b/uni_modules/uni-fav/components/uni-fav/uni-fav.vue
@@ -0,0 +1,161 @@
+<template>
+	<view :class="[circle === true || circle === 'true' ? 'uni-fav--circle' : '']" :style="[{ backgroundColor: checked ? bgColorChecked : bgColor }]"
+	 @click="onClick" class="uni-fav">
+		<!-- #ifdef MP-ALIPAY -->
+		<view class="uni-fav-star" v-if="!checked && (star === true || star === 'true')">
+			<uni-icons :color="fgColor" :style="{color: checked ? fgColorChecked : fgColor}" size="14" type="star-filled" />
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef MP-ALIPAY -->
+		<uni-icons :color="fgColor" :style="{color: checked ? fgColorChecked : fgColor}" class="uni-fav-star" size="14" type="star-filled"
+		 v-if="!checked && (star === true || star === 'true')" />
+		<!-- #endif -->
+		<text :style="{color: checked ? fgColorChecked : fgColor}" class="uni-fav-text">{{ checked ? contentFav : contentDefault }}</text>
+	</view>
+</template>
+
+<script>
+
+	/**
+	 * Fav 收藏按钮
+	 * @description 用于收藏功能，可点击切换选中、不选中的状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=864
+	 * @property {Boolean} star = [true|false] 按钮是否带星星
+	 * @property {String} bgColor 未收藏时的背景色
+	 * @property {String} bgColorChecked 已收藏时的背景色
+	 * @property {String} fgColor 未收藏时的文字颜色
+	 * @property {String} fgColorChecked 已收藏时的文字颜色
+	 * @property {Boolean} circle = [true|false] 是否为圆角
+	 * @property {Boolean} checked = [true|false] 是否为已收藏
+	 * @property {Object} contentText = [true|false] 收藏按钮文字
+	 * @property {Boolean} stat 是否开启统计功能
+	 * @event {Function} click 点击 fav按钮触发事件
+	 * @example <uni-fav :checked="true"/>
+	 */
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+
+	export default {
+		name: "UniFav",
+		// TODO 兼容 vue3，需要注册事件
+		emits: ['click'],
+		props: {
+			star: {
+				type: [Boolean, String],
+				default: true
+			},
+			bgColor: {
+				type: String,
+				default: "#eeeeee"
+			},
+			fgColor: {
+				type: String,
+				default: "#666666"
+			},
+			bgColorChecked: {
+				type: String,
+				default: "#007aff"
+			},
+			fgColorChecked: {
+				type: String,
+				default: "#FFFFFF"
+			},
+			circle: {
+				type: [Boolean, String],
+				default: false
+			},
+			checked: {
+				type: Boolean,
+				default: false
+			},
+			contentText: {
+				type: Object,
+				default () {
+					return {
+						contentDefault: "",
+						contentFav: ""
+					};
+				}
+			},
+			stat:{
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			contentDefault() {
+				return this.contentText.contentDefault || t("uni-fav.collect")
+			},
+			contentFav() {
+				return this.contentText.contentFav || t("uni-fav.collected")
+			},
+		},
+		watch: {
+			checked() {
+				if (uni.report && this.stat) {
+					if (this.checked) {
+						uni.report("收藏", "收藏");
+					} else {
+						uni.report("取消收藏", "取消收藏");
+					}
+				}
+			}
+		},
+		methods: {
+			onClick() {
+				this.$emit("click");
+			}
+		}
+	};
+</script>
+
+<style lang="scss" >
+	$fav-height: 25px;
+
+	.uni-fav {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 60px;
+		height: $fav-height;
+		line-height: $fav-height;
+		text-align: center;
+		border-radius: 3px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-fav--circle {
+		border-radius: 30px;
+	}
+
+	.uni-fav-star {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		height: $fav-height;
+		line-height: 24px;
+		margin-right: 3px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-fav-text {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		height: $fav-height;
+		line-height: $fav-height;
+		align-items: center;
+		justify-content: center;
+		font-size: 12px;
+	}
+</style>
diff --git a/uni_modules/uni-fav/package.json b/uni_modules/uni-fav/package.json
new file mode 100644
index 0000000..cc14697
--- /dev/null
+++ b/uni_modules/uni-fav/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-fav",
+  "displayName": "uni-fav 收藏按钮",
+  "version": "1.2.1",
+  "description": " Fav 收藏组件，可自定义颜色、大小。",
+  "keywords": [
+    "fav",
+    "uni-ui",
+    "uniui",
+    "收藏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-fav/readme.md b/uni_modules/uni-fav/readme.md
new file mode 100644
index 0000000..4de125d
--- /dev/null
+++ b/uni_modules/uni-fav/readme.md
@@ -0,0 +1,10 @@
+
+
+## Fav 收藏按钮
+> **组件名：uni-fav**
+> 代码块： `uFav`
+
+用于收藏功能，可点击切换选中、不选中的状态。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-fav)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-forms/changelog.md b/uni_modules/uni-forms/changelog.md
new file mode 100644
index 0000000..26e120b
--- /dev/null
+++ b/uni_modules/uni-forms/changelog.md
@@ -0,0 +1,60 @@
+## 1.3.2（2021-12-09）
+-
+## 1.3.1（2021-11-19）
+- 修复 label 插槽不生效的bug
+## 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-forms](https://uniapp.dcloud.io/component/uniui/uni-forms)
+## 1.2.7（2021-08-13）
+- 修复 没有添加校验规则的字段依然报错的Bug
+## 1.2.6（2021-08-11）
+- 修复 重置表单错误信息无法清除的问题
+## 1.2.5（2021-08-11）
+- 优化 组件文档
+## 1.2.4（2021-08-11）
+- 修复 表单验证只生效一次的问题
+## 1.2.3（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.2（2021-07-26）
+- 修复 vue2 下条件编译导致destroyed生命周期失效的Bug
+- 修复 1.2.1 引起的示例在小程序平台报错的Bug
+## 1.2.1（2021-07-22）
+- 修复 动态校验表单，默认值为空的情况下校验失效的Bug
+- 修复 不指定name属性时，运行报错的Bug
+- 优化 label默认宽度从65调整至70，使required为true且四字时不换行
+- 优化 组件示例，新增动态校验示例代码
+- 优化 组件文档，使用方式更清晰
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.2（2021-06-25）
+- 修复 pattern 属性在微信小程序平台无效的问题
+## 1.1.1（2021-06-22）
+- 修复 validate-trigger属性为submit且err-show-type属性为toast时不能弹出的Bug
+## 1.1.0（2021-06-22）
+- 修复 只写setRules方法而导致校验不生效的Bug
+- 修复 由上个办法引发的错误提示文字错位的Bug
+## 1.0.48（2021-06-21）
+- 修复 不设置 label 属性 ，无法设置label插槽的问题
+## 1.0.47（2021-06-21）
+- 修复 不设置label属性，label-width属性不生效的bug
+- 修复 setRules 方法与rules属性冲突的问题
+## 1.0.46（2021-06-04）
+- 修复 动态删减数据导致报错的问题
+## 1.0.45（2021-06-04）
+- 新增 modelValue 属性 ，value 即将废弃
+## 1.0.44（2021-06-02）
+- 新增 uni-forms-item 可以设置单独的 rules
+- 新增 validate 事件增加 keepitem 参数，可以选择那些字段不过滤
+- 优化 submit 事件重命名为 validate
+## 1.0.43（2021-05-12）
+- 新增 组件示例地址
+## 1.0.42（2021-04-30）
+- 修复 自定义检验器失效的问题
+## 1.0.41（2021-03-05）
+- 更新 校验器
+- 修复 表单规则设置类型为 number 的情况下，值为0校验失败的Bug
+## 1.0.40（2021-03-04）
+- 修复 动态显示uni-forms-item的情况下，submit 方法获取值错误的Bug
+## 1.0.39（2021-02-05）
+- 调整为uni_modules目录规范
+- 修复 校验器传入 int 等类型 ，返回String类型的Bug
diff --git a/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue b/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
new file mode 100644
index 0000000..184122a
--- /dev/null
+++ b/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
@@ -0,0 +1,536 @@
+<template>
+	<view class="">
+		<view
+			class="uni-forms-item"
+			:class="{
+				'uni-forms-item--border': border,
+				'is-first-border': border && isFirstBorder,
+				'uni-forms-item-error': msg
+			}"
+		>
+			<view class="uni-forms-item__box">
+				<view class="uni-forms-item__inner" :class="['is-direction-' + labelPos]">
+					<view class="uni-forms-item__label" :style="{ width: labelWid, justifyContent: justifyContent }">
+						<slot name="label">
+							<text v-if="required" class="is-required">*</text>
+							<uni-icons
+								v-if="leftIcon"
+								class="label-icon"
+								size="16"
+								:type="leftIcon"
+								:color="iconColor"
+							/>
+							<text class="label-text">{{ label }}</text>
+
+							<view v-if="label" class="label-seat"></view>
+						</slot>
+					</view>
+					<view class="uni-forms-item__content" :class="{ 'is-input-error-border': msg }"><slot></slot></view>
+				</view>
+				<view
+					v-if="msg"
+					class="uni-error-message"
+					:class="{ 'uni-error-msg--boeder': border }"
+					:style="{
+						paddingLeft: labelLeft
+					}"
+				>
+					<text class="uni-error-message-text">{{ showMsg === 'undertext' ? msg : '' }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * Field 输入框
+ * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=21001
+ * @property {Boolean} 	required 			是否必填，左边显示红色"*"号（默认false）
+ * @property {String} validateTrigger = [bind|submit]	校验触发器方式 默认 submit 可选
+ * 	@value bind 	发生变化时触发
+ * 	@value submit 	提交时触发
+ * @property {String } 	leftIcon 			label左边的图标，限 uni-ui 的图标名称
+ * @property {String } 	iconColor 			左边通过icon配置的图标的颜色（默认#606266）
+ * @property {String } 	label 				输入框左边的文字提示
+ * @property {Number } 	labelWidth 			label的宽度，单位px（默认65）
+ * @property {String } 	labelAlign = [left|center|right] label的文字对齐方式（默认left）
+ * 	@value left		label 左侧显示
+ * 	@value center	label 居中
+ * 	@value right	label 右侧对齐
+ * @property {String } 	labelPosition = [top|left] label的文字的位置（默认left）
+ * 	@value top	顶部显示 label
+ * 	@value left	左侧显示 label
+ * @property {String } 	errorMessage 		显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
+ * @property {String } 	name 				表单域的属性名，在使用校验规则时必填
+ */
+
+export default {
+	name: 'uniFormsItem',
+	props: {
+		// 自定义内容
+		custom: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示报错信息
+		showMessage: {
+			type: Boolean,
+			default: true
+		},
+		name: String,
+		required: Boolean,
+		validateTrigger: {
+			type: String,
+			default: ''
+		},
+		leftIcon: String,
+		iconColor: {
+			type: String,
+			default: '#606266'
+		},
+		label: String,
+		// 左边标题的宽度单位px
+		labelWidth: {
+			type: [Number, String],
+			default: ''
+		},
+		// 对齐方式，left|center|right
+		labelAlign: {
+			type: String,
+			default: ''
+		},
+		// lable的位置，可选为 left-左边，top-上边
+		labelPosition: {
+			type: String,
+			default: ''
+		},
+		errorMessage: {
+			type: [String, Boolean],
+			default: ''
+		},
+		// 表单校验规则
+		rules: {
+			type: Array,
+			default() {
+				return [];
+			}
+		}
+	},
+	data() {
+		return {
+			errorTop: false,
+			errorBottom: false,
+			labelMarginBottom: '',
+			errorWidth: '',
+			errMsg: '',
+			val: '',
+			labelPos: '',
+			labelWid: '',
+			labelAli: '',
+			showMsg: 'undertext',
+			border: false,
+			isFirstBorder: false,
+			isArray: false,
+			arrayField: ''
+		};
+	},
+	computed: {
+		msg() {
+			return this.errorMessage || this.errMsg;
+		},
+		fieldStyle() {
+			let style = {};
+			if (this.labelPos == 'top') {
+				style.padding = '0 0';
+				this.labelMarginBottom = '6px';
+			}
+			if (this.labelPos == 'left' && this.msg !== false && this.msg != '') {
+				style.paddingBottom = '0px';
+				this.errorBottom = true;
+				this.errorTop = false;
+			} else if (this.labelPos == 'top' && this.msg !== false && this.msg != '') {
+				this.errorBottom = false;
+				this.errorTop = true;
+			} else {
+				// style.paddingBottom = ''
+				this.errorTop = false;
+				this.errorBottom = false;
+			}
+			return style;
+		},
+
+		// uni不支持在computed中写style.justifyContent = 'center'的形式，故用此方法
+		justifyContent() {
+			if (this.labelAli === 'left') return 'flex-start';
+			if (this.labelAli === 'center') return 'center';
+			if (this.labelAli === 'right') return 'flex-end';
+		},
+		labelLeft() {
+			return (this.labelPos === 'left' ? parseInt(this.labelWid) : 0) + 'rpx';
+		}
+	},
+	watch: {
+		validateTrigger(trigger) {
+			this.formTrigger = trigger;
+		}
+	},
+	created() {
+		this.form = this.getForm();
+		this.group = this.getForm('uniGroup');
+		this.formRules = [];
+		this.formTrigger = this.validateTrigger;
+		// 处理 name，是否数组
+		if (this.name && this.name.indexOf('[') !== -1 && this.name.indexOf(']') !== -1) {
+			this.isArray = true;
+			this.arrayField = this.name;
+			// fix by mehaotian 修改不修改的情况，动态值不检验的问题
+			this.form.formData[this.name] = this.form._getValue(this.name, '');
+		}
+	},
+	mounted() {
+		if (this.form) {
+			this.form.childrens.push(this);
+		}
+		this.init();
+	},
+	// #ifndef VUE3
+	destroyed() {
+		if (this.__isUnmounted) return;
+		this.unInit();
+	},
+	// #endif
+	// #ifdef VUE3
+	unmounted() {
+		this.__isUnmounted = true;
+		this.unInit();
+	},
+	// #endif
+	methods: {
+		init() {
+			if (this.form) {
+				let {
+					formRules,
+					validator,
+					formData,
+					value,
+					labelPosition,
+					labelWidth,
+					labelAlign,
+					errShowType
+				} = this.form;
+				this.labelPos = this.labelPosition ? this.labelPosition : labelPosition;
+
+				if (this.label) {
+					this.labelWid = this.labelWidth ? this.labelWidth : labelWidth || 140;
+				} else {
+					this.labelWid = this.labelWidth ? this.labelWidth : labelWidth || 'auto';
+				}
+				if (this.labelWid && this.labelWid !== 'auto') {
+					this.labelWid += 'rpx';
+				}
+				this.labelAli = this.labelAlign ? this.labelAlign : labelAlign;
+
+				// 判断第一个 item
+				if (!this.form.isFirstBorder) {
+					this.form.isFirstBorder = true;
+					this.isFirstBorder = true;
+				}
+
+				// 判断 group 里的第一个 item
+				if (this.group) {
+					if (!this.group.isFirstBorder) {
+						this.group.isFirstBorder = true;
+						this.isFirstBorder = true;
+					}
+				}
+
+				this.border = this.form.border;
+				this.showMsg = errShowType;
+				let name = this.isArray ? this.arrayField : this.name;
+				if (!name) return;
+				if (formRules && this.rules.length > 0) {
+					if (!formRules[name]) {
+						formRules[name] = {
+							rules: this.rules
+						};
+					}
+					validator.updateSchema(formRules);
+				}
+				this.formRules = formRules[name] || {};
+				this.validator = validator;
+			} else {
+				this.labelPos = this.labelPosition || 'left';
+				this.labelWid = this.labelWidth || 130;
+				this.labelAli = this.labelAlign || 'left';
+			}
+		},
+		unInit() {
+			if (this.form) {
+				this.form.childrens.forEach((item, index) => {
+					if (item === this) {
+						this.form.childrens.splice(index, 1);
+						delete this.form.formData[item.name];
+					}
+				});
+			}
+		},
+		/**
+		 * 获取父元素实例
+		 */
+		getForm(name = 'uniForms') {
+			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;
+		},
+
+		/**
+		 * 移除该表单项的校验结果
+		 */
+		clearValidate() {
+			this.errMsg = '';
+		},
+		/**
+		 * 子组件调用，如 easyinput
+		 * @param {Object} value
+		 */
+		setValue(value) {
+			let name = this.isArray ? this.arrayField : this.name;
+			if (name) {
+				if (this.errMsg) this.errMsg = '';
+				// 给组件赋值
+				this.form.formData[name] = this.form._getValue(name, value);
+				if (!this.formRules || (typeof this.formRules && JSON.stringify(this.formRules) === '{}')) return;
+				this.triggerCheck(this.form._getValue(this.name, value));
+			}
+		},
+
+		/**
+		 * 校验规则
+		 * @param {Object} value
+		 */
+		async triggerCheck(value, formTrigger) {
+			let promise = null;
+			this.errMsg = '';
+			// fix by mehaotian 解决没有检验规则的情况下，抛出错误的问题
+			if (!this.validator || Object.keys(this.formRules).length === 0) return;
+			const isNoField = this.isRequired(this.formRules.rules || []);
+			let isTrigger = this.isTrigger(
+				this.formRules.validateTrigger,
+				this.validateTrigger,
+				this.form.validateTrigger
+			);
+			let result = null;
+			if (!!isTrigger || formTrigger) {
+				let name = this.isArray ? this.arrayField : this.name;
+				result = await this.validator.validateUpdate(
+					{
+						[name]: value
+					},
+					this.form.formData
+				);
+			}
+			// 判断是否必填,非必填，不填不校验，填写才校验
+			if (!isNoField && (value === undefined || value === '')) {
+				result = null;
+			}
+			const inputComp = this.form.inputChildrens.find(child => child.rename === this.name);
+			if ((isTrigger || formTrigger) && result && result.errorMessage) {
+				if (inputComp) {
+					inputComp.errMsg = result.errorMessage;
+				}
+				if (this.form.errShowType === 'toast') {
+					uni.showToast({
+						title: result.errorMessage || '校验错误',
+						icon: 'none'
+					});
+				}
+				if (this.form.errShowType === 'modal') {
+					uni.showModal({
+						title: '提示',
+						content: result.errorMessage || '校验错误'
+					});
+				}
+			} else {
+				if (inputComp) {
+					inputComp.errMsg = '';
+				}
+			}
+
+			this.errMsg = !result ? '' : result.errorMessage;
+			// 触发validate事件
+			this.form.validateCheck(result ? result : null);
+			// typeof callback === 'function' && callback(result ? result : null);
+			// if (promise) return promise
+			return result ? result : null;
+		},
+		/**
+		 * 触发时机
+		 * @param {Object} event
+		 */
+		isTrigger(rule, itemRlue, parentRule) {
+			let rl = true;
+			//  bind  submit
+			if (rule === 'submit' || !rule) {
+				if (rule === undefined) {
+					if (itemRlue !== 'bind') {
+						if (!itemRlue) {
+							return parentRule === 'bind' ? true : false;
+						}
+						return false;
+					}
+					return true;
+				}
+				return false;
+			}
+			return true;
+		},
+		// 是否有必填字段
+		isRequired(rules) {
+			let isNoField = false;
+			for (let i = 0; i < rules.length; i++) {
+				const ruleData = rules[i];
+				if (ruleData.required) {
+					isNoField = true;
+					break;
+				}
+			}
+			return isNoField;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.uni-forms-item {
+	position: relative;
+	padding: 0px;
+	text-align: left;
+	color: #333;
+	font-size: 14px;
+	// margin-bottom: 22px;
+}
+
+.uni-forms-item__box {
+	position: relative;
+}
+
+.uni-forms-item__inner {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	// flex-direction: row;
+	// align-items: center;
+	padding-bottom: 22px;
+	// margin-bottom: 22px;
+}
+
+.is-direction-left {
+	flex-direction: row;
+}
+
+.is-direction-top {
+	flex-direction: column;
+}
+
+.uni-forms-item__label {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	flex-shrink: 0;
+	box-sizing: border-box;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+	width: 65px;
+	// line-height: 2;
+	// margin-top: 3px;
+	padding: 5px 0;
+	height: 72rpx;
+	// margin-right: 5px;
+
+	.label-text {
+		font-size: 28rpx;
+		color: #333333;
+	}
+	.label-seat {
+		margin-right: 5px;
+	}
+}
+
+.uni-forms-item__content {
+	/* #ifndef APP-NVUE */
+	width: 100%;
+	box-sizing: border-box;
+	min-height: 36px;
+	/* #endif */
+	flex: 1;
+}
+
+.label-icon {
+	margin-right: 5px;
+	margin-top: -1px;
+}
+
+// 必填
+.is-required {
+	// color: $uni-color-error;
+	color: #dd524d;
+	font-weight: bold;
+}
+
+.uni-error-message {
+	position: absolute;
+	bottom: 0px;
+	left: 0;
+	text-align: left;
+}
+
+.uni-error-message-text {
+	line-height: 44rpx;
+	color: #dd524d;
+	font-size: 24rpx;
+}
+
+.uni-error-msg--boeder {
+	position: relative;
+	bottom: 0;
+	line-height: 22px;
+}
+
+.is-input-error-border {
+	border-color: #dd524d;
+}
+
+.uni-forms-item--border {
+	margin-bottom: 0;
+	padding: 10px 0;
+	border-top: 1px #eee solid;
+
+	.uni-forms-item__inner {
+		padding: 0;
+	}
+}
+
+.uni-forms-item-error {
+	// padding-bottom: 0;
+}
+
+.is-first-border {
+	/* #ifndef APP-NVUE */
+	border: none;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	border-width: 0;
+	/* #endif */
+}
+
+.uni-forms--no-padding {
+	padding: 0;
+}
+</style>
diff --git a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
new file mode 100644
index 0000000..d8b4e66
--- /dev/null
+++ b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
@@ -0,0 +1,472 @@
+<template>
+	<view class="uni-forms" :class="{ 'uni-forms--top': !border }">
+		<form @submit.stop="submitForm" @reset="resetForm">
+			<slot></slot>
+		</form>
+	</view>
+</template>
+
+<script>
+	// #ifndef VUE3
+	import Vue from 'vue';
+	Vue.prototype.binddata = function(name, value, formName) {
+		if (formName) {
+			this.$refs[formName].setValue(name, value);
+		} else {
+			let formVm;
+			for (let i in this.$refs) {
+				const vm = this.$refs[i];
+				if (vm && vm.$options && vm.$options.name === 'uniForms') {
+					formVm = vm;
+					break;
+				}
+			}
+			if (!formVm) return console.error('当前 uni-froms 组件缺少 ref 属性');
+			formVm.setValue(name, value);
+		}
+	};
+	// #endif
+
+
+
+	import Validator from './validate.js';
+	/**
+	 * Forms 表单
+	 * @description 由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=2773
+	 * @property {Object} rules	表单校验规则
+	 * @property {String} validateTrigger = [bind|submit]	校验触发器方式 默认 submit
+	 * @value bind		发生变化时触发
+	 * @value submit	提交时触发
+	 * @property {String} labelPosition = [top|left]	label 位置 默认 left
+	 * @value top		顶部显示 label
+	 * @value left	左侧显示 label
+	 * @property {String} labelWidth	label 宽度，默认 65px
+	 * @property {String} labelAlign = [left|center|right]	label 居中方式  默认 left
+	 * @value left		label 左侧显示
+	 * @value center	label 居中
+	 * @value right		label 右侧对齐
+	 * @property {String} errShowType = [undertext|toast|modal]	校验错误信息提示方式
+	 * @value undertext	错误信息在底部显示
+	 * @value toast			错误信息toast显示
+	 * @value modal			错误信息modal显示
+	 * @event {Function} submit	提交时触发
+	 */
+
+	export default {
+		name: 'uniForms',
+		components: {},
+		emits:['input','reset','validate','submit'],
+		props: {
+			// 即将弃用
+			value: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			// 替换 value 属性
+			modelValue: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			// 表单校验规则
+			rules: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			// 校验触发器方式，默认 关闭
+			validateTrigger: {
+				type: String,
+				default: ''
+			},
+			// label 位置，可选值 top/left
+			labelPosition: {
+				type: String,
+				default: 'left'
+			},
+			// label 宽度，单位 px
+			labelWidth: {
+				type: [String, Number],
+				default: ''
+			},
+			// label 居中方式，可选值 left/center/right
+			labelAlign: {
+				type: String,
+				default: 'left'
+			},
+			errShowType: {
+				type: String,
+				default: 'undertext'
+			},
+			border: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				formData: {}
+			};
+		},
+		computed: {
+			dataValue() {
+				if (JSON.stringify(this.modelValue) === '{}') {
+					return this.value
+				} else {
+					return this.modelValue
+				}
+			}
+		},
+		watch: {
+			rules(newVal) {
+				// 如果规则发生变化，要初始化组件
+				this.init(newVal);
+			},
+			labelPosition() {
+				this.childrens.forEach(vm => {
+					vm.init()
+				})
+			}
+		},
+		created() {
+			// #ifdef VUE3
+			let getbinddata = getApp().$vm.$.appContext.config.globalProperties.binddata
+			if (!getbinddata) {
+				getApp().$vm.$.appContext.config.globalProperties.binddata = function(name, value, formName) {
+					if (formName) {
+						this.$refs[formName].setValue(name, value);
+					} else {
+						let formVm;
+						for (let i in this.$refs) {
+							const vm = this.$refs[i];
+							if (vm && vm.$options && vm.$options.name === 'uniForms') {
+								formVm = vm;
+								break;
+							}
+						}
+						if (!formVm) return console.error('当前 uni-froms 组件缺少 ref 属性');
+						formVm.setValue(name, value);
+					}
+				}
+			}
+			// #endif
+
+			// 存放watch 监听数组
+			this.unwatchs = [];
+			// 存放子组件数组
+			this.childrens = [];
+			// 存放 easyInput 组件
+			this.inputChildrens = [];
+			// 存放 dataCheckbox 组件
+			this.checkboxChildrens = [];
+			// 存放规则
+			this.formRules = [];
+			this.init(this.rules);
+		},
+		// mounted() {
+		// 	this.init(this.rules)
+		// },
+		methods: {
+			init(formRules) {
+				// 判断是否有规则
+				if (Object.keys(formRules).length === 0) {
+					this.formData = this.dataValue
+					return
+				};
+				this.formRules = formRules;
+				this.validator = new Validator(formRules);
+				this.registerWatch();
+			},
+			// 监听 watch
+			registerWatch() {
+				// 取消监听,避免多次调用 init 重复执行 $watch
+				this.unwatchs.forEach(v => v());
+				this.childrens.forEach((v) => {
+					v.init()
+				})
+				// watch 每个属性 ，需要知道具体那个属性发变化
+				Object.keys(this.dataValue).forEach(key => {
+					let watch = this.$watch(
+						'dataValue.' + key,
+						value => {
+							if (!value) return
+							// 如果是对象 ，则平铺内容
+							if (value.toString() === '[object Object]') {
+								for (let i in value) {
+									let name = `${key}[${i}]`;
+									this.formData[name] = this._getValue(name, value[i]);
+								}
+							} else {
+								this.formData[key] = this._getValue(key, value);
+							}
+						},
+						{
+							deep: true,
+							immediate: true
+						}
+					);
+					this.unwatchs.push(watch);
+				});
+			},
+			/**
+			 * 公开给用户使用
+			 * 设置校验规则
+			 * @param {Object} formRules
+			 */
+			setRules(formRules) {
+				this.init(formRules);
+			},
+			/**
+			 * 公开给用户使用
+			 * 设置自定义表单组件 value 值
+			 *  @param {String} name 字段名称
+			 *  @param {String} value 字段值
+			 */
+			setValue(name, value, callback) {
+				let example = this.childrens.find(child => child.name === name);
+				if (!example) return null;
+				value = this._getValue(example.name, value);
+				this.formData[name] = value;
+				example.val = value;
+				return example.triggerCheck(value, callback);
+			},
+
+			/**
+			 * 表单重置
+			 * @param {Object} event
+			 */
+			resetForm(event) {
+				this.childrens.forEach(item => {
+					item.errMsg = '';
+					const inputComp = this.inputChildrens.find(child => child.rename === item.name);
+					if (inputComp) {
+						inputComp.errMsg = '';
+						// fix by mehaotian 不触发其他组件的 setValue
+						inputComp.is_reset = true
+						inputComp.$emit('input', inputComp.multiple ? [] : '');
+						inputComp.$emit('update:modelValue', inputComp.multiple ? [] : '');
+					}
+				});
+
+				this.childrens.forEach(item => {
+					if (item.name) {
+						this.formData[item.name] = this._getValue(item.name, '');
+					}
+				});
+
+				this.$emit('reset', event);
+			},
+
+			/**
+			 * 触发表单校验，通过 @validate 获取
+			 * @param {Object} validate
+			 */
+			validateCheck(validate) {
+				if (validate === null) validate = null;
+				this.$emit('validate', validate);
+			},
+			/**
+			 * 校验所有或者部分表单
+			 */
+			async validateAll(invalidFields, type, keepitem, callback) {
+				let childrens = []
+				for (let i in invalidFields) {
+					const item = this.childrens.find(v => v.name === i)
+					if (item) {
+						childrens.push(item)
+					}
+				}
+
+				if (!callback && typeof keepitem === 'function') {
+					callback = keepitem;
+				}
+
+				let promise;
+				if (!callback && typeof callback !== 'function' && Promise) {
+					promise = new Promise((resolve, reject) => {
+						callback = function(valid, invalidFields) {
+							!valid ? resolve(invalidFields) : reject(valid);
+						};
+					});
+				}
+
+				let results = [];
+				let newFormData = {};
+				if (this.validator) {
+					for (let key in childrens) {
+						const child = childrens[key];
+						let name = child.isArray ? child.arrayField : child.name;
+						if (child.isArray) {
+							if (child.name.indexOf('[') !== -1 && child.name.indexOf(']') !== -1) {
+								const fieldData = child.name.split('[');
+								const fieldName = fieldData[0];
+								const fieldValue = fieldData[1].replace(']', '');
+								if (!newFormData[fieldName]) {
+									newFormData[fieldName] = {};
+								}
+								newFormData[fieldName][fieldValue] = this._getValue(name, invalidFields[name]);
+							}
+						} else {
+							newFormData[name] = this._getValue(name, invalidFields[name]);
+						}
+						const result = await child.triggerCheck(invalidFields[name], true);
+						if (result) {
+							results.push(result);
+							if (this.errShowType === 'toast' || this.errShowType === 'modal') break;
+						}
+					}
+				} else {
+					newFormData = invalidFields
+				}
+				if (Array.isArray(results)) {
+					if (results.length === 0) results = null;
+				}
+
+				if (Array.isArray(keepitem)) {
+					keepitem.forEach(v => {
+						newFormData[v] = this.dataValue[v];
+					});
+				}
+
+				if (type === 'submit') {
+					this.$emit('submit', {
+						detail: {
+							value: newFormData,
+							errors: results
+						}
+					});
+				} else {
+					this.$emit('validate', results);
+				}
+
+				callback && typeof callback === 'function' && callback(results, newFormData);
+
+				if (promise && callback) {
+					return promise;
+				} else {
+					return null;
+				}
+			},
+			submitForm() {},
+			/**
+			 * 外部调用方法
+			 * 手动提交校验表单
+			 * 对整个表单进行校验的方法，参数为一个回调函数。
+			 */
+			submit(keepitem, callback, type) {
+				for (let i in this.dataValue) {
+					const itemData = this.childrens.find(v => v.name === i);
+					if (itemData) {
+						if (this.formData[i] === undefined) {
+							this.formData[i] = this._getValue(i, this.dataValue[i]);
+						}
+					}
+				}
+				if (!type) {
+					console.warn('submit 方法即将废弃，请使用validate方法代替！');
+				}
+				return this.validateAll(this.formData, 'submit', keepitem, callback);
+			},
+
+			/**
+			 * 外部调用方法
+			 * 校验表单
+			 * 对整个表单进行校验的方法，参数为一个回调函数。
+			 */
+			validate(keepitem, callback) {
+				return this.submit(keepitem, callback, true);
+			},
+
+			/**
+			 * 部分表单校验
+			 * @param {Object} props
+			 * @param {Object} cb
+			 */
+			validateField(props, callback) {
+				props = [].concat(props);
+				let invalidFields = {};
+				this.childrens.forEach(item => {
+					if (props.indexOf(item.name) !== -1) {
+						invalidFields = Object.assign({}, invalidFields, {
+							[item.name]: this.formData[item.name]
+						});
+					}
+				});
+				return this.validateAll(invalidFields, 'submit', [], callback);
+			},
+
+			/**
+			 * 对整个表单进行重置，将所有字段值重置为初始值并移除校验结果
+			 */
+			resetFields() {
+				this.resetForm();
+			},
+
+			/**
+			 * 移除表单项的校验结果。传入待移除的表单项的 prop 属性或者 prop 组成的数组，如不传则移除整个表单的校验结果
+			 */
+			clearValidate(props) {
+				props = [].concat(props);
+				this.childrens.forEach(item => {
+					const inputComp = this.inputChildrens.find(child => child.rename === item.name);
+					if (props.length === 0) {
+						item.errMsg = '';
+						if (inputComp) {
+							inputComp.errMsg = '';
+						}
+					} else {
+						if (props.indexOf(item.name) !== -1) {
+							item.errMsg = '';
+							if (inputComp) {
+								inputComp.errMsg = '';
+							}
+						}
+					}
+				});
+			},
+			/**
+			 * 把 value 转换成指定的类型
+			 * @param {Object} key
+			 * @param {Object} value
+			 */
+			_getValue(key, value) {
+				const rules = (this.formRules[key] && this.formRules[key].rules) || [];
+				const isRuleNum = rules.find(val => val.format && this.type_filter(val.format));
+				const isRuleBool = rules.find(val => (val.format && val.format === 'boolean') || val.format === 'bool');
+				// 输入值为 number
+				if (isRuleNum) {
+					value = isNaN(value) ? value : value === '' || value === null ? null : Number(value);
+				}
+				// 简单判断真假值
+				if (isRuleBool) {
+					value = !value ? false : true;
+				}
+				return value;
+			},
+			/**
+			 * 过滤数字类型
+			 * @param {Object} format
+			 */
+			type_filter(format) {
+				return format === 'int' || format === 'double' || format === 'number' || format === 'timestamp';
+			}
+		}
+	};
+</script>
+
+<style lang="scss" >
+	.uni-forms {
+		// overflow: hidden;
+		// padding: 10px 15px;
+	}
+
+	.uni-forms--top {
+		// padding: 10px 15px;
+		// padding-top: 22px;
+	}
+</style>
diff --git a/uni_modules/uni-forms/components/uni-forms/validate.js b/uni_modules/uni-forms/components/uni-forms/validate.js
new file mode 100644
index 0000000..1834c6c
--- /dev/null
+++ b/uni_modules/uni-forms/components/uni-forms/validate.js
@@ -0,0 +1,486 @@
+var pattern = {
+	email: /^\S+?@\S+?\.\S+?$/,
+	idcard: /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+	url: new RegExp(
+		"^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$",
+		'i')
+};
+
+const FORMAT_MAPPING = {
+	"int": 'integer',
+	"bool": 'boolean',
+	"double": 'number',
+	"long": 'number',
+	"password": 'string'
+	// "fileurls": 'array'
+}
+
+function formatMessage(args, resources = '') {
+	var defaultMessage = ['label']
+	defaultMessage.forEach((item) => {
+		if (args[item] === undefined) {
+			args[item] = ''
+		}
+	})
+
+	let str = resources
+	for (let key in args) {
+		let reg = new RegExp('{' + key + '}')
+		str = str.replace(reg, args[key])
+	}
+	return str
+}
+
+function isEmptyValue(value, type) {
+	if (value === undefined || value === null) {
+		return true;
+	}
+
+	if (typeof value === 'string' && !value) {
+		return true;
+	}
+
+	if (Array.isArray(value) && !value.length) {
+		return true;
+	}
+
+	if (type === 'object' && !Object.keys(value).length) {
+		return true;
+	}
+
+	return false;
+}
+
+const types = {
+	integer(value) {
+		return types.number(value) && parseInt(value, 10) === value;
+	},
+	string(value) {
+		return typeof value === 'string';
+	},
+	number(value) {
+		if (isNaN(value)) {
+			return false;
+		}
+		return typeof value === 'number';
+	},
+	"boolean": function(value) {
+		return typeof value === 'boolean';
+	},
+	"float": function(value) {
+		return types.number(value) && !types.integer(value);
+	},
+	array(value) {
+		return Array.isArray(value);
+	},
+	object(value) {
+		return typeof value === 'object' && !types.array(value);
+	},
+	date(value) {
+		return value instanceof Date;
+	},
+	timestamp(value) {
+		if (!this.integer(value) || Math.abs(value).toString().length > 16) {
+			return false
+		}
+		return true;
+	},
+	file(value) {
+		return typeof value.url === 'string';
+	},
+	email(value) {
+		return typeof value === 'string' && !!value.match(pattern.email) && value.length < 255;
+	},
+	url(value) {
+		return typeof value === 'string' && !!value.match(pattern.url);
+	},
+	pattern(reg, value) {
+		try {
+			return new RegExp(reg).test(value);
+		} catch (e) {
+			return false;
+		}
+	},
+	method(value) {
+		return typeof value === 'function';
+	},
+	idcard(value) {
+		return typeof value === 'string' && !!value.match(pattern.idcard);
+	},
+	'url-https'(value) {
+		return this.url(value) && value.startsWith('https://');
+	},
+	'url-scheme'(value) {
+		return value.startsWith('://');
+	},
+	'url-web'(value) {
+		return false;
+	}
+}
+
+class RuleValidator {
+
+	constructor(message) {
+		this._message = message
+	}
+
+	async validateRule(fieldKey, fieldValue, value, data, allData) {
+		var result = null
+
+		let rules = fieldValue.rules
+
+		let hasRequired = rules.findIndex((item) => {
+			return item.required
+		})
+		if (hasRequired < 0) {
+			if (value === null || value === undefined) {
+				return result
+			}
+			if (typeof value === 'string' && !value.length) {
+				return result
+			}
+		}
+
+		var message = this._message
+
+		if (rules === undefined) {
+			return message['default']
+		}
+
+		for (var i = 0; i < rules.length; i++) {
+			let rule = rules[i]
+			let vt = this._getValidateType(rule)
+
+			Object.assign(rule, {
+				label: fieldValue.label || `["${fieldKey}"]`
+			})
+
+			if (RuleValidatorHelper[vt]) {
+				result = RuleValidatorHelper[vt](rule, value, message)
+				if (result != null) {
+					break
+				}
+			}
+
+			if (rule.validateExpr) {
+				let now = Date.now()
+				let resultExpr = rule.validateExpr(value, allData, now)
+				if (resultExpr === false) {
+					result = this._getMessage(rule, rule.errorMessage || this._message['default'])
+					break
+				}
+			}
+
+			if (rule.validateFunction) {
+				result = await this.validateFunction(rule, value, data, allData, vt)
+				if (result !== null) {
+					break
+				}
+			}
+		}
+
+		if (result !== null) {
+			result = message.TAG + result
+		}
+
+		return result
+	}
+
+	async validateFunction(rule, value, data, allData, vt) {
+		let result = null
+		try {
+			let callbackMessage = null
+			const res = await rule.validateFunction(rule, value, allData || data, (message) => {
+				callbackMessage = message
+			})
+			if (callbackMessage || (typeof res === 'string' && res) || res === false) {
+				result = this._getMessage(rule, callbackMessage || res, vt)
+			}
+		} catch (e) {
+			result = this._getMessage(rule, e.message, vt)
+		}
+		return result
+	}
+
+	_getMessage(rule, message, vt) {
+		return formatMessage(rule, message || rule.errorMessage || this._message[vt] || message['default'])
+	}
+
+	_getValidateType(rule) {
+		var result = ''
+		if (rule.required) {
+			result = 'required'
+		} else if (rule.format) {
+			result = 'format'
+		} else if (rule.arrayType) {
+			result = 'arrayTypeFormat'
+		} else if (rule.range) {
+			result = 'range'
+		} else if (rule.maximum !== undefined || rule.minimum !== undefined) {
+			result = 'rangeNumber'
+		} else if (rule.maxLength !== undefined || rule.minLength !== undefined) {
+			result = 'rangeLength'
+		} else if (rule.pattern) {
+			result = 'pattern'
+		} else if (rule.validateFunction) {
+			result = 'validateFunction'
+		}
+		return result
+	}
+}
+
+const RuleValidatorHelper = {
+	required(rule, value, message) {
+		if (rule.required && isEmptyValue(value, rule.format || typeof value)) {
+			return formatMessage(rule, rule.errorMessage || message.required);
+		}
+
+		return null
+	},
+
+	range(rule, value, message) {
+		const {
+			range,
+			errorMessage
+		} = rule;
+
+		let list = new Array(range.length);
+		for (let i = 0; i < range.length; i++) {
+			const item = range[i];
+			if (types.object(item) && item.value !== undefined) {
+				list[i] = item.value;
+			} else {
+				list[i] = item;
+			}
+		}
+
+		let result = false
+		if (Array.isArray(value)) {
+			result = (new Set(value.concat(list)).size === list.length);
+		} else {
+			if (list.indexOf(value) > -1) {
+				result = true;
+			}
+		}
+
+		if (!result) {
+			return formatMessage(rule, errorMessage || message['enum']);
+		}
+
+		return null
+	},
+
+	rangeNumber(rule, value, message) {
+		if (!types.number(value)) {
+			return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
+		}
+
+		let {
+			minimum,
+			maximum,
+			exclusiveMinimum,
+			exclusiveMaximum
+		} = rule;
+		let min = exclusiveMinimum ? value <= minimum : value < minimum;
+		let max = exclusiveMaximum ? value >= maximum : value > maximum;
+
+		if (minimum !== undefined && min) {
+			return formatMessage(rule, rule.errorMessage || message['number'][exclusiveMinimum ?
+				'exclusiveMinimum' : 'minimum'
+			])
+		} else if (maximum !== undefined && max) {
+			return formatMessage(rule, rule.errorMessage || message['number'][exclusiveMaximum ?
+				'exclusiveMaximum' : 'maximum'
+			])
+		} else if (minimum !== undefined && maximum !== undefined && (min || max)) {
+			return formatMessage(rule, rule.errorMessage || message['number'].range)
+		}
+
+		return null
+	},
+
+	rangeLength(rule, value, message) {
+		if (!types.string(value) && !types.array(value)) {
+			return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
+		}
+
+		let min = rule.minLength;
+		let max = rule.maxLength;
+		let val = value.length;
+
+		if (min !== undefined && val < min) {
+			return formatMessage(rule, rule.errorMessage || message['length'].minLength)
+		} else if (max !== undefined && val > max) {
+			return formatMessage(rule, rule.errorMessage || message['length'].maxLength)
+		} else if (min !== undefined && max !== undefined && (val < min || val > max)) {
+			return formatMessage(rule, rule.errorMessage || message['length'].range)
+		}
+
+		return null
+	},
+
+	pattern(rule, value, message) {
+		if (!types['pattern'](rule.pattern, value)) {
+			return formatMessage(rule, rule.errorMessage || message.pattern.mismatch);
+		}
+
+		return null
+	},
+
+	format(rule, value, message) {
+		var customTypes = Object.keys(types);
+		var format = FORMAT_MAPPING[rule.format] ? FORMAT_MAPPING[rule.format] : (rule.format || rule.arrayType);
+
+		if (customTypes.indexOf(format) > -1) {
+			if (!types[format](value)) {
+				return formatMessage(rule, rule.errorMessage || message.typeError);
+			}
+		}
+
+		return null
+	},
+
+	arrayTypeFormat(rule, value, message) {
+		if (!Array.isArray(value)) {
+			return formatMessage(rule, rule.errorMessage || message.typeError);
+		}
+
+		for (let i = 0; i < value.length; i++) {
+			const element = value[i];
+			let formatResult = this.format(rule, element, message)
+			if (formatResult !== null) {
+				return formatResult
+			}
+		}
+
+		return null
+	}
+}
+
+class SchemaValidator extends RuleValidator {
+
+	constructor(schema, options) {
+		super(SchemaValidator.message);
+
+		this._schema = schema
+		this._options = options || null
+	}
+
+	updateSchema(schema) {
+		this._schema = schema
+	}
+
+	async validate(data, allData) {
+		let result = this._checkFieldInSchema(data)
+		if (!result) {
+			result = await this.invokeValidate(data, false, allData)
+		}
+		return result.length ? result[0] : null
+	}
+
+	async validateAll(data, allData) {
+		let result = this._checkFieldInSchema(data)
+		if (!result) {
+			result = await this.invokeValidate(data, true, allData)
+		}
+		return result
+	}
+
+	async validateUpdate(data, allData) {
+		let result = this._checkFieldInSchema(data)
+		if (!result) {
+			result = await this.invokeValidateUpdate(data, false, allData)
+		}
+		return result.length ? result[0] : null
+	}
+
+	async invokeValidate(data, all, allData) {
+		let result = []
+		let schema = this._schema
+		for (let key in schema) {
+			let value = schema[key]
+			let errorMessage = await this.validateRule(key, value, data[key], data, allData)
+			if (errorMessage != null) {
+				result.push({
+					key,
+					errorMessage
+				})
+				if (!all) break
+			}
+		}
+		return result
+	}
+
+	async invokeValidateUpdate(data, all, allData) {
+		let result = []
+		for (let key in data) {
+			let errorMessage = await this.validateRule(key, this._schema[key], data[key], data, allData)
+			if (errorMessage != null) {
+				result.push({
+					key,
+					errorMessage
+				})
+				if (!all) break
+			}
+		}
+		return result
+	}
+
+	_checkFieldInSchema(data) {
+		var keys = Object.keys(data)
+		var keys2 = Object.keys(this._schema)
+		if (new Set(keys.concat(keys2)).size === keys2.length) {
+			return ''
+		}
+
+		var noExistFields = keys.filter((key) => {
+			return keys2.indexOf(key) < 0;
+		})
+		var errorMessage = formatMessage({
+			field: JSON.stringify(noExistFields)
+		}, SchemaValidator.message.TAG + SchemaValidator.message['defaultInvalid'])
+		return [{
+			key: 'invalid',
+			errorMessage
+		}]
+	}
+}
+
+function Message() {
+	return {
+		TAG: "",
+		default: '验证错误',
+		defaultInvalid: '提交的字段{field}在数据库中并不存在',
+		validateFunction: '验证无效',
+		required: '{label}必填',
+		'enum': '{label}超出范围',
+		timestamp: '{label}格式无效',
+		whitespace: '{label}不能为空',
+		typeError: '{label}类型无效',
+		date: {
+			format: '{label}日期{value}格式无效',
+			parse: '{label}日期无法解析,{value}无效',
+			invalid: '{label}日期{value}无效'
+		},
+		length: {
+			minLength: '{label}长度不能少于{minLength}',
+			maxLength: '{label}长度不能超过{maxLength}',
+			range: '{label}必须介于{minLength}和{maxLength}之间'
+		},
+		number: {
+			minimum: '{label}不能小于{minimum}',
+			maximum: '{label}不能大于{maximum}',
+			exclusiveMinimum: '{label}不能小于等于{minimum}',
+			exclusiveMaximum: '{label}不能大于等于{maximum}',
+			range: '{label}必须介于{minimum}and{maximum}之间'
+		},
+		pattern: {
+			mismatch: '{label}格式不匹配'
+		}
+	};
+}
+
+
+SchemaValidator.message = new Message();
+
+export default SchemaValidator
diff --git a/uni_modules/uni-forms/package.json b/uni_modules/uni-forms/package.json
new file mode 100644
index 0000000..dfa7af4
--- /dev/null
+++ b/uni_modules/uni-forms/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-forms",
+  "displayName": "uni-forms 表单",
+  "version": "1.3.2",
+  "description": "由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据",
+  "keywords": [
+    "uni-ui",
+    "表单",
+    "校验",
+    "表单校验",
+    "表单验证"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-forms/readme.md b/uni_modules/uni-forms/readme.md
new file mode 100644
index 0000000..63d5a04
--- /dev/null
+++ b/uni_modules/uni-forms/readme.md
@@ -0,0 +1,23 @@
+
+
+## Forms 表单
+
+> **组件名：uni-forms**
+> 代码块： `uForms`、`uni-forms-item`
+> 关联组件：`uni-forms-item`、`uni-easyinput`、`uni-data-checkbox`、`uni-group`。
+
+
+uni-app的内置组件已经有了 `<form>`组件，用于提交表单内容。
+
+然而几乎每个表单都需要做表单验证，为了方便做表单验证，减少重复开发，`uni ui` 又基于 `<form>`组件封装了 `<uni-forms>`组件，内置了表单验证功能。
+
+`<uni-forms>` 提供了 `rules`属性来描述校验规则、`<uni-forms-item>`子组件来包裹具体的表单项，以及给原生或三方组件提供了 `binddata()` 来设置表单值。
+
+每个要校验的表单项，不管input还是checkbox，都必须放在`<uni-forms-item>`组件中，且一个`<uni-forms-item>`组件只能放置一个表单项。
+
+`<uni-forms-item>`组件内部预留了显示error message的区域，默认是在表单项的底部。
+
+另外，`<uni-forms>`组件下面的各个表单项，可以通过`<uni-group>`包裹为不同的分组。同一`<uni-group>`下的不同表单项目将聚拢在一起，同其他group保持垂直间距。`<uni-group>`仅影响视觉效果。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-forms)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-goods-nav/changelog.md b/uni_modules/uni-goods-nav/changelog.md
new file mode 100644
index 0000000..c6264c6
--- /dev/null
+++ b/uni_modules/uni-goods-nav/changelog.md
@@ -0,0 +1,18 @@
+## 1.2.1（2022-05-30）
+- 新增 stat属性，是否开启uni统计功能
+## 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-goods-nav](https://uniapp.dcloud.io/component/uniui/uni-goods-nav)
+## 1.1.1（2021-08-24）
+- 新增 支持国际化
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.5（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/en.json b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/en.json
new file mode 100644
index 0000000..dcdba41
--- /dev/null
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/en.json
@@ -0,0 +1,6 @@
+{
+	"uni-goods-nav.options.shop": "shop",
+	"uni-goods-nav.options.cart": "cart",
+	"uni-goods-nav.buttonGroup.addToCart": "add to cart",
+	"uni-goods-nav.buttonGroup.buyNow": "buy now"
+}
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/index.js b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/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-goods-nav/components/uni-goods-nav/i18n/zh-Hans.json b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hans.json
new file mode 100644
index 0000000..48ee344
--- /dev/null
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hans.json
@@ -0,0 +1,6 @@
+{
+	"uni-goods-nav.options.shop": "店铺",
+	"uni-goods-nav.options.cart": "购物车",
+	"uni-goods-nav.buttonGroup.addToCart": "加入购物车",
+	"uni-goods-nav.buttonGroup.buyNow": "立即购买"
+}
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hant.json b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hant.json
new file mode 100644
index 0000000..d0a0255
--- /dev/null
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/i18n/zh-Hant.json
@@ -0,0 +1,6 @@
+{
+	"uni-goods-nav.options.shop": "店鋪",
+	"uni-goods-nav.options.cart": "購物車",
+	"uni-goods-nav.buttonGroup.addToCart": "加入購物車",
+	"uni-goods-nav.buttonGroup.buyNow": "立即購買"
+}
diff --git a/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue b/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
new file mode 100644
index 0000000..8a16b17
--- /dev/null
+++ b/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue
@@ -0,0 +1,229 @@
+<template>
+	<view class="uni-goods-nav">
+		<!-- 底部占位 -->
+		<view class="uni-tab__seat" />
+		<view class="uni-tab__cart-box flex">
+			<view class="flex uni-tab__cart-sub-left">
+				<view v-for="(item,index) in options" :key="index" class="flex uni-tab__cart-button-left uni-tab__shop-cart" @click="onClick(index,item)">
+					<view class="uni-tab__icon">
+						<uni-icons :type="item.icon" size="20" color="#646566"></uni-icons>
+						<!-- <image class="image" :src="item.icon" mode="widthFix" /> -->
+					</view>
+					<text class="uni-tab__text">{{ item.text }}</text>
+					<view class="flex uni-tab__dot-box">
+						<text v-if="item.info" :class="{ 'uni-tab__dots': item.info > 9 }" class="uni-tab__dot " :style="{'backgroundColor':item.infoBackgroundColor?item.infoBackgroundColor:'#ff0000',
+						color:item.infoColor?item.infoColor:'#fff'
+						}">{{ item.info }}</text>
+					</view>
+				</view>
+			</view>
+			<view :class="{'uni-tab__right':fill}" class="flex uni-tab__cart-sub-right ">
+				<view v-for="(item,index) in buttonGroup" :key="index" :style="{background:item.backgroundColor,color:item.color}"
+				 class="flex uni-tab__cart-button-right" @click="buttonClick(index,item)"><text :style="{color:item.color}" class="uni-tab__cart-button-right-text">{{ item.text }}</text></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	/**
+	 * GoodsNav 商品导航
+	 * @description 商品加入购物车、立即购买等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=865
+	 * @property {Array} options 组件参数
+	 * @property {Array} buttonGroup 组件按钮组参数
+	 * @property {Boolean} fill = [true | false] 组件按钮组参数
+	 * @property {Boolean} stat 是否开启统计功能
+	 * @event {Function} click 左侧点击事件
+	 * @event {Function} buttonClick 右侧按钮组点击事件
+	 * @example <uni-goods-nav :fill="true"  options="" buttonGroup="buttonGroup"  @click="" @buttonClick="" />
+	 */
+	export default {
+		name: 'UniGoodsNav',
+		emits:['click','buttonClick'],
+		props: {
+			options: {
+				type: Array,
+				default () {
+					return [{
+						icon: 'shop',
+						text: t("uni-goods-nav.options.shop"),
+					}, {
+						icon: 'cart',
+						text: t("uni-goods-nav.options.cart")
+					}]
+				}
+			},
+			buttonGroup: {
+				type: Array,
+				default () {
+					return [{
+							text: t("uni-goods-nav.buttonGroup.addToCart"),
+							backgroundColor: 'linear-gradient(90deg, #FFCD1E, #FF8A18)',
+							color: '#fff'
+						},
+						{
+							text: t("uni-goods-nav.buttonGroup.buyNow"),
+							backgroundColor: 'linear-gradient(90deg, #FE6035, #EF1224)',
+							color: '#fff'
+						}
+					]
+				}
+			},
+			fill: {
+				type: Boolean,
+				default: false
+			},
+			stat:{
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			onClick(index, item) {
+				this.$emit('click', {
+					index,
+					content: item,
+				})
+			},
+			buttonClick(index, item) {
+				if (uni.report && this.stat) {
+					uni.report(item.text, item.text)
+				}
+				this.$emit('buttonClick', {
+					index,
+					content: item
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.flex {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-goods-nav {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+	}
+
+	.uni-tab__cart-box {
+		flex: 1;
+		height: 50px;
+		background-color: #fff;
+		z-index: 900;
+	}
+
+	.uni-tab__cart-sub-left {
+		padding: 0 5px;
+	}
+
+	.uni-tab__cart-sub-right {
+		flex: 1;
+	}
+
+	.uni-tab__right {
+		margin: 5px 0;
+		margin-right: 10px;
+		border-radius: 100px;
+		overflow: hidden;
+	}
+
+	.uni-tab__cart-button-left {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// flex: 1;
+		position: relative;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		margin: 0 10px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-tab__icon {
+		width: 18px;
+		height: 18px;
+	}
+
+	.image {
+		width: 18px;
+		height: 18px;
+	}
+
+	.uni-tab__text {
+		margin-top: 3px;
+		font-size: 12px;
+		color: #646566;
+	}
+
+	.uni-tab__cart-button-right {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+		flex: 1;
+		justify-content: center;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-tab__cart-button-right-text {
+		font-size: 14px;
+		color: #fff;
+	}
+
+	.uni-tab__cart-button-right:active {
+		opacity: 0.7;
+	}
+
+	.uni-tab__dot-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+		position: absolute;
+		right: -2px;
+		top: 2px;
+		justify-content: center;
+		align-items: center;
+		// width: 0;
+		// height: 0;
+	}
+
+	.uni-tab__dot {
+		// width: 30rpx;
+		// height: 30rpx;
+		padding: 0 4px;
+		line-height: 15px;
+		color: #ffffff;
+		text-align: center;
+		font-size: 12px;
+		background-color: #ff0000;
+		border-radius: 15px;
+	}
+
+	.uni-tab__dots {
+		padding: 0 4px;
+		// width: auto;
+		border-radius: 15px;
+	}
+</style>
diff --git a/uni_modules/uni-goods-nav/package.json b/uni_modules/uni-goods-nav/package.json
new file mode 100644
index 0000000..636e45e
--- /dev/null
+++ b/uni_modules/uni-goods-nav/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-goods-nav",
+  "displayName": "uni-goods-nav 商品导航",
+  "version": "1.2.1",
+  "description": "商品导航组件主要用于电商类应用底部导航，可自定义加入购物车，购买等操作",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "商品导航"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-goods-nav/readme.md b/uni_modules/uni-goods-nav/readme.md
new file mode 100644
index 0000000..07df93f
--- /dev/null
+++ b/uni_modules/uni-goods-nav/readme.md
@@ -0,0 +1,10 @@
+
+
+## GoodsNav 商品导航
+> **组件名：uni-goods-nav**
+> 代码块： `uGoodsNav`
+
+商品加入购物车，立即购买等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-goods-nav)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-grid/changelog.md b/uni_modules/uni-grid/changelog.md
new file mode 100644
index 0000000..d301166
--- /dev/null
+++ b/uni_modules/uni-grid/changelog.md
@@ -0,0 +1,13 @@
+## 1.4.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-grid](https://uniapp.dcloud.io/component/uniui/uni-grid)
+## 1.3.2（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.3.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.3.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.2.4（2021-05-12）
+- 新增 组件示例地址
+## 1.2.3（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue b/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue
new file mode 100644
index 0000000..ecaeb25
--- /dev/null
+++ b/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue
@@ -0,0 +1,140 @@
+<template>
+	<view
+		:style="'width:' + width + ';' + (square ? 'height:' + width : '')"
+		class="uni-grid-item grid-item"
+	>
+		<view
+			:class="{
+				'uni-grid-item--border': showBorder,
+				'uni-grid-item--border-top': showBorder && index < column,
+				'uni-highlight': highlight
+			}"
+			:style="{
+				'border-right-color': borderColor,
+				'border-bottom-color': borderColor,
+				'border-top-color': borderColor
+			}"
+			class="uni-grid-item__box"
+			@click="_onClick"
+		>
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * GridItem 宫格
+ * @description 宫格组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=27
+ * @property {Number} index 子组件的唯一标识 ，点击gird会返回当前的标识
+ */
+export default {
+	name: 'UniGridItem',
+	inject: ['grid'],
+	props: {
+		index: {
+			type: Number,
+			default: 0
+		}
+	},
+	data() {
+		return {
+			column: 0,
+			showBorder: true,
+			square: true,
+			highlight: true,
+			left: 0,
+			top: 0,
+			openNum: 2,
+			width: 0,
+			borderColor: '#e5e5e5'
+		};
+	},
+	created() {
+		this.column = this.grid.column;
+		this.showBorder = this.grid.showBorder;
+		this.square = this.grid.square;
+		this.highlight = this.grid.highlight;
+		this.top = this.hor === 0 ? this.grid.hor : this.hor;
+		this.left = this.ver === 0 ? this.grid.ver : this.ver;
+		this.borderColor = this.grid.borderColor;
+		this.grid.children.push(this);
+		// this.grid.init()
+		this.width = this.grid.width;
+	},
+	beforeDestroy() {
+		this.grid.children.forEach((item, index) => {
+			if (item === this) {
+				this.grid.children.splice(index, 1);
+			}
+		});
+	},
+	methods: {
+		_onClick() {
+			this.grid.change({
+				detail: {
+					index: this.index
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.uni-grid-item {
+	/* #ifndef APP-NVUE */
+	height: 100%;
+	display: flex;
+	/* #endif */
+	/* #ifdef H5 */
+	cursor: pointer;
+	/* #endif */
+}
+
+.uni-grid-item__box {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	width: 100%;
+	/* #endif */
+	position: relative;
+	flex: 1;
+	flex-direction: column;
+	// justify-content: center;
+	// align-items: center;
+}
+
+.uni-grid-item--border {
+	position: relative;
+	/* #ifdef APP-NVUE */
+	border-bottom-color: #d2d2d2;
+	border-bottom-style: solid;
+	border-bottom-width: 0.5px;
+	border-right-color: #d2d2d2;
+	border-right-style: solid;
+	border-right-width: 0.5px;
+	/* #endif */
+	/* #ifndef APP-NVUE */
+	z-index: 0;
+	border-bottom: 1px #d2d2d2 solid;
+	border-right: 1px #d2d2d2 solid;
+	/* #endif */
+}
+.uni-grid-item--border-top {
+	position: relative;
+	/* #ifdef APP-NVUE */
+	border-top-color: #d2d2d2;
+	border-top-style: solid;
+	border-top-width: 0.5px;
+	/* #endif */
+	/* #ifndef APP-NVUE */
+	border-top: 1px #d2d2d2 solid;
+	z-index: 0;
+	/* #endif */
+}
+
+.uni-highlight:active {
+	background-color: #f1f1f1;
+}
+</style>
diff --git a/uni_modules/uni-grid/components/uni-grid/uni-grid.vue b/uni_modules/uni-grid/components/uni-grid/uni-grid.vue
new file mode 100644
index 0000000..0edc7ff
--- /dev/null
+++ b/uni_modules/uni-grid/components/uni-grid/uni-grid.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="uni-grid-wrap">
+		<view :id="elId" ref="uni-grid" class="uni-grid" :class="{ 'uni-grid--border': showBorder }" :style="{ 'border-left-color':borderColor}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom');
+	// #endif
+
+	/**
+	 * Grid 宫格
+	 * @description 宫格组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=27
+	 * @property {Number} column 每列显示个数
+	 * @property {String} borderColor 边框颜色
+	 * @property {Boolean} showBorder 是否显示边框
+	 * @property {Boolean} square 是否方形显示
+	 * @property {Boolean} Boolean 点击背景是否高亮
+	 * @event {Function} change 点击 grid 触发，e={detail:{index:0}}，index 为当前点击 gird 下标
+	 */
+	export default {
+		name: 'UniGrid',
+		emits:['change'],
+		props: {
+			// 每列显示个数
+			column: {
+				type: Number,
+				default: 3
+			},
+			// 是否显示边框
+			showBorder: {
+				type: Boolean,
+				default: true
+			},
+			// 边框颜色
+			borderColor: {
+				type: String,
+				default: '#D2D2D2'
+			},
+			// 是否正方形显示,默认为 true
+			square: {
+				type: Boolean,
+				default: true
+			},
+			highlight: {
+				type: Boolean,
+				default: true
+			}
+		},
+		provide() {
+			return {
+				grid: this
+			}
+		},
+		data() {
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				elId,
+				width: 0
+			}
+		},
+		created() {
+			this.children = []
+		},
+		mounted() {
+			this.$nextTick(()=>{
+				this.init()
+			})
+		},
+		methods: {
+			init() {
+				setTimeout(() => {
+					this._getSize((width) => {
+						this.children.forEach((item, index) => {
+							item.width = width
+						})
+					})
+				}, 50)
+			},
+			change(e) {
+				this.$emit('change', e)
+			},
+			_getSize(fn) {
+				// #ifndef APP-NVUE
+				uni.createSelectorQuery()
+					.in(this)
+					.select(`#${this.elId}`)
+					.boundingClientRect()
+					.exec(ret => {
+						this.width = parseInt((ret[0].width - 1) / this.column) + 'px'
+						fn(this.width)
+					})
+				// #endif
+				// #ifdef APP-NVUE
+				dom.getComponentRect(this.$refs['uni-grid'], (ret) => {
+					this.width = parseInt((ret.size.width - 1) / this.column) + 'px'
+					fn(this.width)
+				})
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-grid-wrap {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+		/* #ifdef H5 */
+		width: 100%;
+		/* #endif */
+	}
+
+	.uni-grid {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// flex: 1;
+		flex-direction: row;
+		flex-wrap: wrap;
+	}
+
+	.uni-grid--border {
+		position: relative;
+		/* #ifdef APP-NVUE */
+		border-left-color: #D2D2D2;
+		border-left-style: solid;
+		border-left-width: 0.5px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		z-index: 1;
+		border-left: 1px #D2D2D2 solid;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-grid/package.json b/uni_modules/uni-grid/package.json
new file mode 100644
index 0000000..ccb2c91
--- /dev/null
+++ b/uni_modules/uni-grid/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-grid",
+  "displayName": "uni-grid 宫格",
+  "version": "1.4.0",
+  "description": "Grid 宫格组件，提供移动端常见的宫格布局，如九宫格。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "九宫格",
+    "表格"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss","uni-icons"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-grid/readme.md b/uni_modules/uni-grid/readme.md
new file mode 100644
index 0000000..0aa44cc
--- /dev/null
+++ b/uni_modules/uni-grid/readme.md
@@ -0,0 +1,11 @@
+
+
+## Grid 宫格
+> **组件名：uni-grid**
+> 代码块： `uGrid`
+
+
+宫格组件。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-grid)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-group/changelog.md b/uni_modules/uni-group/changelog.md
new file mode 100644
index 0000000..a7024fd
--- /dev/null
+++ b/uni_modules/uni-group/changelog.md
@@ -0,0 +1,16 @@
+## 1.2.2（2022-05-30）
+- 新增 stat属性，是否开启uni统计功能
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 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-group](https://uniapp.dcloud.io/component/uniui/uni-group)
+## 1.1.7（2021-11-08）
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+- 优化 组件文档
+## 1.0.3（2021-05-12）
+- 新增 组件示例地址
+## 1.0.2（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-group/components/uni-group/uni-group.vue b/uni_modules/uni-group/components/uni-group/uni-group.vue
new file mode 100644
index 0000000..3425ecd
--- /dev/null
+++ b/uni_modules/uni-group/components/uni-group/uni-group.vue
@@ -0,0 +1,134 @@
+<template>
+	<view class="uni-group" :class="['uni-group--'+mode ,margin?'group-margin':'']" :style="{marginTop: `${top}px` }">
+		<slot name="title">
+			<view v-if="title" class="uni-group__title" :style="{'padding-left':border?'30px':'15px'}">
+				<text class="uni-group__title-text">{{ title }}</text>
+			</view>
+		</slot>
+		<view class="uni-group__content" :class="{'group-conent-padding':border}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Group 分组
+	 * @description 表单字段分组
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3281
+	 * @property {String} title 主标题
+	 * @property {Number} top 分组间隔
+	 * @property {Number} mode 模式
+	 */
+	export default {
+		name: 'uniGroup',
+		emits:['click'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			top: {
+				type: [Number, String],
+				default: 10
+			},
+			mode: {
+				type: String,
+				default: 'default'
+			},
+			stat:{
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				margin: false,
+				border: false
+			}
+		},
+		watch: {
+			title(newVal) {
+				if (uni.report && this.stat && newVal !== '') {
+					uni.report('title', newVal)
+				}
+			}
+		},
+		created() {
+			this.form = this.getForm()
+			if (this.form) {
+				this.margin = true
+				this.border = this.form.border
+			}
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm() {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== 'uniForms') {
+					parent = parent.$parent;
+					if (!parent) return false
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-group {
+		background: #fff;
+		margin-top: 10px;
+		// border: 1px red solid;
+	}
+
+	.group-margin {
+		// margin: 0 -15px;
+	}
+
+	.uni-group__title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding-left: 15px;
+		height: 40px;
+		background-color: #eee;
+		font-weight: normal;
+		color: #666;
+	}
+
+	.uni-group__content {
+		padding: 15px;
+		// padding-bottom: 5px;
+		// background-color: #FFF;
+	}
+
+	.group-conent-padding {
+		padding: 0 15px;
+	}
+
+	.uni-group__title-text {
+		font-size: 14px;
+		color: #666;
+	}
+
+	.distraction {
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-group--card {
+		margin: 10px;
+		border-radius: 5px;
+		overflow: hidden;
+		box-shadow: 0 0 5px 1px rgba($color: #000000, $alpha: 0.08);
+	}
+</style>
diff --git a/uni_modules/uni-group/package.json b/uni_modules/uni-group/package.json
new file mode 100644
index 0000000..ea00a08
--- /dev/null
+++ b/uni_modules/uni-group/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-group",
+  "displayName": "uni-group 分组",
+  "version": "1.2.2",
+  "description": "分组组件可用于将组件用于分组，添加间隔，以产生明显的区块",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "group",
+    "分组",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-group/readme.md b/uni_modules/uni-group/readme.md
new file mode 100644
index 0000000..bae67f4
--- /dev/null
+++ b/uni_modules/uni-group/readme.md
@@ -0,0 +1,9 @@
+
+## Group 分组
+> **组件名：uni-group**
+> 代码块： `uGroup`
+
+分组组件可用于将组件分组，添加间隔，以产生明显的区块。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-group)
+#### 如使用过程中有任何问题，或者您对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..6449885
--- /dev/null
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,22 @@
+## 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/icons.js b/uni_modules/uni-icons/components/uni-icons/icons.js
new file mode 100644
index 0000000..7889936
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -0,0 +1,1169 @@
+export default {
+  "id": "2852637",
+  "name": "uniui图标库",
+  "font_family": "uniicons",
+  "css_prefix_text": "uniui-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "25027049",
+      "name": "yanse",
+      "font_class": "color",
+      "unicode": "e6cf",
+      "unicode_decimal": 59087
+    },
+    {
+      "icon_id": "25027048",
+      "name": "wallet",
+      "font_class": "wallet",
+      "unicode": "e6b1",
+      "unicode_decimal": 59057
+    },
+    {
+      "icon_id": "25015720",
+      "name": "settings-filled",
+      "font_class": "settings-filled",
+      "unicode": "e6ce",
+      "unicode_decimal": 59086
+    },
+    {
+      "icon_id": "25015434",
+      "name": "shimingrenzheng-filled",
+      "font_class": "auth-filled",
+      "unicode": "e6cc",
+      "unicode_decimal": 59084
+    },
+    {
+      "icon_id": "24934246",
+      "name": "shop-filled",
+      "font_class": "shop-filled",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "24934159",
+      "name": "staff-filled-01",
+      "font_class": "staff-filled",
+      "unicode": "e6cb",
+      "unicode_decimal": 59083
+    },
+    {
+      "icon_id": "24932461",
+      "name": "VIP-filled",
+      "font_class": "vip-filled",
+      "unicode": "e6c6",
+      "unicode_decimal": 59078
+    },
+    {
+      "icon_id": "24932462",
+      "name": "plus_circle_fill",
+      "font_class": "plus-filled",
+      "unicode": "e6c7",
+      "unicode_decimal": 59079
+    },
+    {
+      "icon_id": "24932463",
+      "name": "folder_add-filled",
+      "font_class": "folder-add-filled",
+      "unicode": "e6c8",
+      "unicode_decimal": 59080
+    },
+    {
+      "icon_id": "24932464",
+      "name": "yanse-filled",
+      "font_class": "color-filled",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "24932465",
+      "name": "tune-filled",
+      "font_class": "tune-filled",
+      "unicode": "e6ca",
+      "unicode_decimal": 59082
+    },
+    {
+      "icon_id": "24932455",
+      "name": "a-rilidaka-filled",
+      "font_class": "calendar-filled",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "24932456",
+      "name": "notification-filled",
+      "font_class": "notification-filled",
+      "unicode": "e6c1",
+      "unicode_decimal": 59073
+    },
+    {
+      "icon_id": "24932457",
+      "name": "wallet-filled",
+      "font_class": "wallet-filled",
+      "unicode": "e6c2",
+      "unicode_decimal": 59074
+    },
+    {
+      "icon_id": "24932458",
+      "name": "paihangbang-filled",
+      "font_class": "medal-filled",
+      "unicode": "e6c3",
+      "unicode_decimal": 59075
+    },
+    {
+      "icon_id": "24932459",
+      "name": "gift-filled",
+      "font_class": "gift-filled",
+      "unicode": "e6c4",
+      "unicode_decimal": 59076
+    },
+    {
+      "icon_id": "24932460",
+      "name": "fire-filled",
+      "font_class": "fire-filled",
+      "unicode": "e6c5",
+      "unicode_decimal": 59077
+    },
+    {
+      "icon_id": "24928001",
+      "name": "refreshempty",
+      "font_class": "refreshempty",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "24926853",
+      "name": "location-ellipse",
+      "font_class": "location-filled",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "24926735",
+      "name": "person-filled",
+      "font_class": "person-filled",
+      "unicode": "e69d",
+      "unicode_decimal": 59037
+    },
+    {
+      "icon_id": "24926703",
+      "name": "personadd-filled",
+      "font_class": "personadd-filled",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
+    {
+      "icon_id": "24923351",
+      "name": "back",
+      "font_class": "back",
+      "unicode": "e6b9",
+      "unicode_decimal": 59065
+    },
+    {
+      "icon_id": "24923352",
+      "name": "forward",
+      "font_class": "forward",
+      "unicode": "e6ba",
+      "unicode_decimal": 59066
+    },
+    {
+      "icon_id": "24923353",
+      "name": "arrowthinright",
+      "font_class": "arrow-right",
+      "unicode": "e6bb",
+      "unicode_decimal": 59067
+    },
+		{
+		  "icon_id": "24923353",
+		  "name": "arrowthinright",
+		  "font_class": "arrowthinright",
+		  "unicode": "e6bb",
+		  "unicode_decimal": 59067
+		},
+    {
+      "icon_id": "24923354",
+      "name": "arrowthinleft",
+      "font_class": "arrow-left",
+      "unicode": "e6bc",
+      "unicode_decimal": 59068
+    },
+		{
+		  "icon_id": "24923354",
+		  "name": "arrowthinleft",
+		  "font_class": "arrowthinleft",
+		  "unicode": "e6bc",
+		  "unicode_decimal": 59068
+		},
+    {
+      "icon_id": "24923355",
+      "name": "arrowthinup",
+      "font_class": "arrow-up",
+      "unicode": "e6bd",
+      "unicode_decimal": 59069
+    },
+		{
+		  "icon_id": "24923355",
+		  "name": "arrowthinup",
+		  "font_class": "arrowthinup",
+		  "unicode": "e6bd",
+		  "unicode_decimal": 59069
+		},
+    {
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrow-down",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },{
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrowthindown",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },
+    {
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "bottom",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },{
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "arrowdown",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },
+    {
+      "icon_id": "24923346",
+      "name": "arrowright",
+      "font_class": "right",
+      "unicode": "e6b5",
+      "unicode_decimal": 59061
+    },
+		{
+		  "icon_id": "24923346",
+		  "name": "arrowright",
+		  "font_class": "arrowright",
+		  "unicode": "e6b5",
+		  "unicode_decimal": 59061
+		},
+    {
+      "icon_id": "24923347",
+      "name": "arrowup",
+      "font_class": "top",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+		{
+		  "icon_id": "24923347",
+		  "name": "arrowup",
+		  "font_class": "arrowup",
+		  "unicode": "e6b6",
+		  "unicode_decimal": 59062
+		},
+    {
+      "icon_id": "24923348",
+      "name": "arrowleft",
+      "font_class": "left",
+      "unicode": "e6b7",
+      "unicode_decimal": 59063
+    },
+		{
+		  "icon_id": "24923348",
+		  "name": "arrowleft",
+		  "font_class": "arrowleft",
+		  "unicode": "e6b7",
+		  "unicode_decimal": 59063
+		},
+    {
+      "icon_id": "24923334",
+      "name": "eye",
+      "font_class": "eye",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "24923335",
+      "name": "eye-filled",
+      "font_class": "eye-filled",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "24923336",
+      "name": "eye-slash",
+      "font_class": "eye-slash",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
+      "icon_id": "24923337",
+      "name": "eye-slash-filled",
+      "font_class": "eye-slash-filled",
+      "unicode": "e6b4",
+      "unicode_decimal": 59060
+    },
+    {
+      "icon_id": "24923305",
+      "name": "info-filled",
+      "font_class": "info-filled",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "24923299",
+      "name": "reload-01",
+      "font_class": "reload",
+      "unicode": "e6b2",
+      "unicode_decimal": 59058
+    },
+    {
+      "icon_id": "24923195",
+      "name": "mic_slash_fill",
+      "font_class": "micoff-filled",
+      "unicode": "e6b0",
+      "unicode_decimal": 59056
+    },
+    {
+      "icon_id": "24923165",
+      "name": "map-pin-ellipse",
+      "font_class": "map-pin-ellipse",
+      "unicode": "e6ac",
+      "unicode_decimal": 59052
+    },
+    {
+      "icon_id": "24923166",
+      "name": "map-pin",
+      "font_class": "map-pin",
+      "unicode": "e6ad",
+      "unicode_decimal": 59053
+    },
+    {
+      "icon_id": "24923167",
+      "name": "location",
+      "font_class": "location",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
+      "icon_id": "24923064",
+      "name": "starhalf",
+      "font_class": "starhalf",
+      "unicode": "e683",
+      "unicode_decimal": 59011
+    },
+    {
+      "icon_id": "24923065",
+      "name": "star",
+      "font_class": "star",
+      "unicode": "e688",
+      "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "24923066",
+      "name": "star-filled",
+      "font_class": "star-filled",
+      "unicode": "e68f",
+      "unicode_decimal": 59023
+    },
+    {
+      "icon_id": "24899646",
+      "name": "a-rilidaka",
+      "font_class": "calendar",
+      "unicode": "e6a0",
+      "unicode_decimal": 59040
+    },
+    {
+      "icon_id": "24899647",
+      "name": "fire",
+      "font_class": "fire",
+      "unicode": "e6a1",
+      "unicode_decimal": 59041
+    },
+    {
+      "icon_id": "24899648",
+      "name": "paihangbang",
+      "font_class": "medal",
+      "unicode": "e6a2",
+      "unicode_decimal": 59042
+    },
+    {
+      "icon_id": "24899649",
+      "name": "font",
+      "font_class": "font",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
+    {
+      "icon_id": "24899650",
+      "name": "gift",
+      "font_class": "gift",
+      "unicode": "e6a4",
+      "unicode_decimal": 59044
+    },
+    {
+      "icon_id": "24899651",
+      "name": "link",
+      "font_class": "link",
+      "unicode": "e6a5",
+      "unicode_decimal": 59045
+    },
+    {
+      "icon_id": "24899652",
+      "name": "notification",
+      "font_class": "notification",
+      "unicode": "e6a6",
+      "unicode_decimal": 59046
+    },
+    {
+      "icon_id": "24899653",
+      "name": "staff",
+      "font_class": "staff",
+      "unicode": "e6a7",
+      "unicode_decimal": 59047
+    },
+    {
+      "icon_id": "24899654",
+      "name": "VIP",
+      "font_class": "vip",
+      "unicode": "e6a8",
+      "unicode_decimal": 59048
+    },
+    {
+      "icon_id": "24899655",
+      "name": "folder_add",
+      "font_class": "folder-add",
+      "unicode": "e6a9",
+      "unicode_decimal": 59049
+    },
+    {
+      "icon_id": "24899656",
+      "name": "tune",
+      "font_class": "tune",
+      "unicode": "e6aa",
+      "unicode_decimal": 59050
+    },
+    {
+      "icon_id": "24899657",
+      "name": "shimingrenzheng",
+      "font_class": "auth",
+      "unicode": "e6ab",
+      "unicode_decimal": 59051
+    },
+    {
+      "icon_id": "24899565",
+      "name": "person",
+      "font_class": "person",
+      "unicode": "e699",
+      "unicode_decimal": 59033
+    },
+    {
+      "icon_id": "24899566",
+      "name": "email-filled",
+      "font_class": "email-filled",
+      "unicode": "e69a",
+      "unicode_decimal": 59034
+    },
+    {
+      "icon_id": "24899567",
+      "name": "phone-filled",
+      "font_class": "phone-filled",
+      "unicode": "e69b",
+      "unicode_decimal": 59035
+    },
+    {
+      "icon_id": "24899568",
+      "name": "phone",
+      "font_class": "phone",
+      "unicode": "e69c",
+      "unicode_decimal": 59036
+    },
+    {
+      "icon_id": "24899570",
+      "name": "email",
+      "font_class": "email",
+      "unicode": "e69e",
+      "unicode_decimal": 59038
+    },
+    {
+      "icon_id": "24899571",
+      "name": "personadd",
+      "font_class": "personadd",
+      "unicode": "e69f",
+      "unicode_decimal": 59039
+    },
+    {
+      "icon_id": "24899558",
+      "name": "chatboxes-filled",
+      "font_class": "chatboxes-filled",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
+    {
+      "icon_id": "24899559",
+      "name": "contact",
+      "font_class": "contact",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "24899560",
+      "name": "chatbubble-filled",
+      "font_class": "chatbubble-filled",
+      "unicode": "e694",
+      "unicode_decimal": 59028
+    },
+    {
+      "icon_id": "24899561",
+      "name": "contact-filled",
+      "font_class": "contact-filled",
+      "unicode": "e695",
+      "unicode_decimal": 59029
+    },
+    {
+      "icon_id": "24899562",
+      "name": "chatboxes",
+      "font_class": "chatboxes",
+      "unicode": "e696",
+      "unicode_decimal": 59030
+    },
+    {
+      "icon_id": "24899563",
+      "name": "chatbubble",
+      "font_class": "chatbubble",
+      "unicode": "e697",
+      "unicode_decimal": 59031
+    },
+    {
+      "icon_id": "24881290",
+      "name": "upload-filled",
+      "font_class": "upload-filled",
+      "unicode": "e68e",
+      "unicode_decimal": 59022
+    },
+    {
+      "icon_id": "24881292",
+      "name": "upload",
+      "font_class": "upload",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "24881293",
+      "name": "weixin",
+      "font_class": "weixin",
+      "unicode": "e691",
+      "unicode_decimal": 59025
+    },
+    {
+      "icon_id": "24881274",
+      "name": "compose",
+      "font_class": "compose",
+      "unicode": "e67f",
+      "unicode_decimal": 59007
+    },
+    {
+      "icon_id": "24881275",
+      "name": "qq",
+      "font_class": "qq",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "24881276",
+      "name": "download-filled",
+      "font_class": "download-filled",
+      "unicode": "e681",
+      "unicode_decimal": 59009
+    },
+    {
+      "icon_id": "24881277",
+      "name": "pengyouquan",
+      "font_class": "pyq",
+      "unicode": "e682",
+      "unicode_decimal": 59010
+    },
+    {
+      "icon_id": "24881279",
+      "name": "sound",
+      "font_class": "sound",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "24881280",
+      "name": "trash-filled",
+      "font_class": "trash-filled",
+      "unicode": "e685",
+      "unicode_decimal": 59013
+    },
+    {
+      "icon_id": "24881281",
+      "name": "sound-filled",
+      "font_class": "sound-filled",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
+    {
+      "icon_id": "24881282",
+      "name": "trash",
+      "font_class": "trash",
+      "unicode": "e687",
+      "unicode_decimal": 59015
+    },
+    {
+      "icon_id": "24881284",
+      "name": "videocam-filled",
+      "font_class": "videocam-filled",
+      "unicode": "e689",
+      "unicode_decimal": 59017
+    },
+    {
+      "icon_id": "24881285",
+      "name": "spinner-cycle",
+      "font_class": "spinner-cycle",
+      "unicode": "e68a",
+      "unicode_decimal": 59018
+    },
+    {
+      "icon_id": "24881286",
+      "name": "weibo",
+      "font_class": "weibo",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "24881288",
+      "name": "videocam",
+      "font_class": "videocam",
+      "unicode": "e68c",
+      "unicode_decimal": 59020
+    },
+    {
+      "icon_id": "24881289",
+      "name": "download",
+      "font_class": "download",
+      "unicode": "e68d",
+      "unicode_decimal": 59021
+    },
+    {
+      "icon_id": "24879601",
+      "name": "help",
+      "font_class": "help",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "24879602",
+      "name": "navigate-filled",
+      "font_class": "navigate-filled",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "24879603",
+      "name": "plusempty",
+      "font_class": "plusempty",
+      "unicode": "e67b",
+      "unicode_decimal": 59003
+    },
+    {
+      "icon_id": "24879604",
+      "name": "smallcircle",
+      "font_class": "smallcircle",
+      "unicode": "e67c",
+      "unicode_decimal": 59004
+    },
+    {
+      "icon_id": "24879605",
+      "name": "minus-filled",
+      "font_class": "minus-filled",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "24879606",
+      "name": "micoff",
+      "font_class": "micoff",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "24879588",
+      "name": "closeempty",
+      "font_class": "closeempty",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "24879589",
+      "name": "clear",
+      "font_class": "clear",
+      "unicode": "e66d",
+      "unicode_decimal": 58989
+    },
+    {
+      "icon_id": "24879590",
+      "name": "navigate",
+      "font_class": "navigate",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "24879591",
+      "name": "minus",
+      "font_class": "minus",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "24879592",
+      "name": "image",
+      "font_class": "image",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "24879593",
+      "name": "mic",
+      "font_class": "mic",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "24879594",
+      "name": "paperplane",
+      "font_class": "paperplane",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "24879595",
+      "name": "close",
+      "font_class": "close",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "24879596",
+      "name": "help-filled",
+      "font_class": "help-filled",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "24879597",
+      "name": "plus-filled",
+      "font_class": "paperplane-filled",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "24879598",
+      "name": "plus",
+      "font_class": "plus",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "24879599",
+      "name": "mic-filled",
+      "font_class": "mic-filled",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "24879600",
+      "name": "image-filled",
+      "font_class": "image-filled",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "24855900",
+      "name": "locked-filled",
+      "font_class": "locked-filled",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "24855901",
+      "name": "info",
+      "font_class": "info",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "24855903",
+      "name": "locked",
+      "font_class": "locked",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "24855884",
+      "name": "camera-filled",
+      "font_class": "camera-filled",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "24855885",
+      "name": "chat-filled",
+      "font_class": "chat-filled",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "24855886",
+      "name": "camera",
+      "font_class": "camera",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "24855887",
+      "name": "circle",
+      "font_class": "circle",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "24855888",
+      "name": "checkmarkempty",
+      "font_class": "checkmarkempty",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "24855889",
+      "name": "chat",
+      "font_class": "chat",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "24855890",
+      "name": "circle-filled",
+      "font_class": "circle-filled",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "24855891",
+      "name": "flag",
+      "font_class": "flag",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "24855892",
+      "name": "flag-filled",
+      "font_class": "flag-filled",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "24855893",
+      "name": "gear-filled",
+      "font_class": "gear-filled",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "24855894",
+      "name": "home",
+      "font_class": "home",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "24855895",
+      "name": "home-filled",
+      "font_class": "home-filled",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "24855896",
+      "name": "gear",
+      "font_class": "gear",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "24855897",
+      "name": "smallcircle-filled",
+      "font_class": "smallcircle-filled",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "24855898",
+      "name": "map-filled",
+      "font_class": "map-filled",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "24855899",
+      "name": "map",
+      "font_class": "map",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "24855825",
+      "name": "refresh-filled",
+      "font_class": "refresh-filled",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "24855826",
+      "name": "refresh",
+      "font_class": "refresh",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "24855808",
+      "name": "cloud-upload",
+      "font_class": "cloud-upload",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "24855809",
+      "name": "cloud-download-filled",
+      "font_class": "cloud-download-filled",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "24855810",
+      "name": "cloud-download",
+      "font_class": "cloud-download",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "24855811",
+      "name": "cloud-upload-filled",
+      "font_class": "cloud-upload-filled",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "24855813",
+      "name": "redo",
+      "font_class": "redo",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "24855814",
+      "name": "images-filled",
+      "font_class": "images-filled",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "24855815",
+      "name": "undo-filled",
+      "font_class": "undo-filled",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "24855816",
+      "name": "more",
+      "font_class": "more",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "24855817",
+      "name": "more-filled",
+      "font_class": "more-filled",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "24855818",
+      "name": "undo",
+      "font_class": "undo",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "24855819",
+      "name": "images",
+      "font_class": "images",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "24855821",
+      "name": "paperclip",
+      "font_class": "paperclip",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "24855822",
+      "name": "settings",
+      "font_class": "settings",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "24855823",
+      "name": "search",
+      "font_class": "search",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "24855824",
+      "name": "redo-filled",
+      "font_class": "redo-filled",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "24841702",
+      "name": "list",
+      "font_class": "list",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "24841489",
+      "name": "mail-open-filled",
+      "font_class": "mail-open-filled",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "24841491",
+      "name": "hand-thumbsdown-filled",
+      "font_class": "hand-down-filled",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "24841492",
+      "name": "hand-thumbsdown",
+      "font_class": "hand-down",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "24841493",
+      "name": "hand-thumbsup-filled",
+      "font_class": "hand-up-filled",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "24841494",
+      "name": "hand-thumbsup",
+      "font_class": "hand-up",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "24841496",
+      "name": "heart-filled",
+      "font_class": "heart-filled",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "24841498",
+      "name": "mail-open",
+      "font_class": "mail-open",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "24841488",
+      "name": "heart",
+      "font_class": "heart",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "24839963",
+      "name": "loop",
+      "font_class": "loop",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "24839866",
+      "name": "pulldown",
+      "font_class": "pulldown",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "24813798",
+      "name": "scan",
+      "font_class": "scan",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "24813786",
+      "name": "bars",
+      "font_class": "bars",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "24813788",
+      "name": "cart-filled",
+      "font_class": "cart-filled",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "24813790",
+      "name": "checkbox",
+      "font_class": "checkbox",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "24813791",
+      "name": "checkbox-filled",
+      "font_class": "checkbox-filled",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "24813794",
+      "name": "shop",
+      "font_class": "shop",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "24813795",
+      "name": "headphones",
+      "font_class": "headphones",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "24813796",
+      "name": "cart",
+      "font_class": "cart",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    }
+  ]
+}
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..05a5aa6
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,12 @@
+<template>
+	
+</template>
+
+<script>
+	
+</script>
+
+<style lang="scss">
+	
+
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uni.ttf b/uni_modules/uni-icons/components/uni-icons/uni.ttf
new file mode 100644
index 0000000..60a1968
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uni.ttf differ
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..2f56eab
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,663 @@
+.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-gift-filled:before {
+  content: "\e6c4";
+}
+
+.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-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6be";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowdown:before {
+  content: "\e6b8";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-arrowright:before {
+  content: "\e6b5";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-arrowup:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowleft:before {
+  content: "\e6b7";
+}
+
+.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-cart-filled:before {
+  content: "\e629";
+}
+
+.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..835f33b
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf differ
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000..d1c4e77
--- /dev/null
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "1.3.5",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-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-link/changelog.md b/uni_modules/uni-link/changelog.md
new file mode 100644
index 0000000..2cfbf59
--- /dev/null
+++ b/uni_modules/uni-link/changelog.md
@@ -0,0 +1,17 @@
+## 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-link](https://uniapp.dcloud.io/component/uniui/uni-link)
+## 1.1.7（2021-11-08）
+## 0.0.7（2021-09-03）
+- 修复 在 nvue 下不显示的 bug
+## 0.0.6（2021-07-30）
+- 新增 支持自定义插槽
+## 0.0.5（2021-06-21）
+- 新增 download 属性，H5平台下载文件名
+## 0.0.4（2021-05-12）
+- 新增 组件示例地址
+## 0.0.3（2021-03-09）
+- 新增 href 属性支持 tel:|mailto:
+
+## 0.0.2（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-link/components/uni-link/uni-link.vue b/uni_modules/uni-link/components/uni-link/uni-link.vue
new file mode 100644
index 0000000..27c5468
--- /dev/null
+++ b/uni_modules/uni-link/components/uni-link/uni-link.vue
@@ -0,0 +1,128 @@
+<template>
+	<a v-if="isShowA" class="uni-link" :href="href"
+		:class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
+		:style="{color,fontSize:fontSize+'px'}" :download="download">
+		<slot>{{text}}</slot>
+	</a>
+	<!-- #ifndef APP-NVUE -->
+	<text v-else class="uni-link" :class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
+		:style="{color,fontSize:fontSize+'px'}" @click="openURL">
+		<slot>{{text}}</slot>
+	</text>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<text v-else class="uni-link" :class="{'uni-link--withline':showUnderLine===true||showUnderLine==='true'}"
+		:style="{color,fontSize:fontSize+'px'}" @click="openURL">
+		{{text}}
+	</text>
+	<!-- #endif -->
+</template>
+
+<script>
+	/**
+	 * Link 外部网页超链接组件
+	 * @description uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打开新网页
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1182
+	 * @property {String} href 点击后打开的外部网页url
+	 * @property {String} text 显示的文字
+	 * @property {String} downlaod H5平台下载文件名
+	 * @property {Boolean} showUnderLine 是否显示下划线
+	 * @property {String} copyTips 在小程序端复制链接时显示的提示语
+	 * @property {String} color 链接文字颜色
+	 * @property {String} fontSize 链接文字大小
+	 * @example * <uni-link href="https://ext.dcloud.net.cn" text="https://ext.dcloud.net.cn"></uni-link>
+	 */
+	export default {
+		name: 'uniLink',
+		props: {
+			href: {
+				type: String,
+				default: ''
+			},
+			text: {
+				type: String,
+				default: ''
+			},
+			download: {
+				type: String,
+				default: ''
+			},
+			showUnderLine: {
+				type: [Boolean, String],
+				default: true
+			},
+			copyTips: {
+				type: String,
+				default: '已自动复制网址，请在手机浏览器里粘贴该网址'
+			},
+			color: {
+				type: String,
+				default: '#999999'
+			},
+			fontSize: {
+				type: [Number, String],
+				default: 14
+			}
+		},
+		computed: {
+			isShowA() {
+				// #ifdef H5
+				this._isH5 = true;
+				// #endif
+				if ((this.isMail() || this.isTel()) && this._isH5 === true) {
+					return true;
+				}
+				return false;
+			}
+		},
+		created() {
+			this._isH5 = null;
+		},
+		methods: {
+			isMail() {
+				return this.href.startsWith('mailto:');
+			},
+			isTel() {
+				return this.href.startsWith('tel:');
+			},
+			openURL() {
+				// #ifdef APP-PLUS
+				if (this.isTel()) {
+					this.makePhoneCall(this.href.replace('tel:', ''));
+				} else {
+					plus.runtime.openURL(this.href);
+				}
+				// #endif
+				// #ifdef H5
+				window.open(this.href)
+				// #endif
+				// #ifdef MP
+				uni.setClipboardData({
+					data: this.href
+				});
+				uni.showModal({
+					content: this.copyTips,
+					showCancel: false
+				});
+				// #endif
+			},
+			makePhoneCall(phoneNumber) {
+				uni.makePhoneCall({
+					phoneNumber
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	/* #ifndef APP-NVUE */
+	.uni-link {
+		cursor: pointer;
+	}
+
+	/* #endif */
+	.uni-link--withline {
+		text-decoration: underline;
+	}
+</style>
diff --git a/uni_modules/uni-link/package.json b/uni_modules/uni-link/package.json
new file mode 100644
index 0000000..77b1986
--- /dev/null
+++ b/uni_modules/uni-link/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-link",
+  "displayName": "uni-link 超链接",
+  "version": "1.0.0",
+  "description": "uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "link",
+    "超链接",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-link/readme.md b/uni_modules/uni-link/readme.md
new file mode 100644
index 0000000..7f09e94
--- /dev/null
+++ b/uni_modules/uni-link/readme.md
@@ -0,0 +1,11 @@
+
+
+## Link 链接
+> **组件名：uni-link**
+> 代码块： `uLink`
+
+
+uni-link是一个外部网页超链接组件，在小程序内复制url，在app内打开外部浏览器，在h5端打开新网页。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-link)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-list/changelog.md b/uni_modules/uni-list/changelog.md
new file mode 100644
index 0000000..6aa6e4e
--- /dev/null
+++ b/uni_modules/uni-list/changelog.md
@@ -0,0 +1,20 @@
+## 1.2.1（2022-03-30）
+- 删除无用文件
+## 1.2.0（2021-11-23）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-list](https://uniapp.dcloud.io/component/uniui/uni-list)
+## 1.1.3（2021-08-30）
+- 修复 在vue3中to属性在发行应用的时候报错的bug
+## 1.1.2（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.1（2021-07-21）
+- 修复 与其他组件嵌套使用时，点击失效的Bug
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.17（2021-05-12）
+- 新增 组件示例地址
+## 1.0.16（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.0.15（2021-02-05）
+- 调整为uni_modules目录规范
+- 修复 uni-list-chat 角标显示不正常的问题
diff --git a/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue b/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
new file mode 100644
index 0000000..b9349c2
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list-ad/uni-list-ad.vue
@@ -0,0 +1,107 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell>
+		<!-- #endif -->
+		<view class="uni-list-ad">
+			<view v-if="borderShow" :class="{'uni-list--border':border,'uni-list-item--first':isFirstChild}"></view>
+			<ad style="width: 200px;height: 300px;border-width: 1px;border-color: red;border-style: solid;" adpid="1111111111"
+			 unit-id="" appid="" apid="" type="feed" @error="aderror" @close="closeAd"></ad>
+		</view>
+		<!-- #ifdef APP-NVUE -->
+	</cell>
+	<!-- #endif -->
+
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom');
+	// #endif
+	export default {
+		name: 'UniListAd',
+		props: {
+			title: {
+				type: String,
+				default: '',
+
+			}
+		},
+		// inject: ['list'],
+		data() {
+			return {
+				isFirstChild: false,
+				border: false,
+				borderShow: true,
+			}
+		},
+
+		mounted() {
+			this.list = this.getForm()
+			if (this.list) {
+				if (!this.list.firstChildAppend) {
+					this.list.firstChildAppend = true
+					this.isFirstChild = true
+				}
+				this.border = this.list.border
+			}
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniList') {
+				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;
+			},
+			aderror(e) {
+				console.log("aderror: " + JSON.stringify(e.detail));
+			},
+			closeAd(e) {
+				this.borderShow = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-list-ad {
+		position: relative;
+		border: 1px red solid;
+	}
+
+	.uni-list--border {
+		position: relative;
+		padding-bottom: 1px;
+		/* #ifdef APP-PLUS */
+		border-top-color: $uni-border-color;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+		margin-left: $uni-spacing-row-lg;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-list--border:after {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		content: '';
+		-webkit-transform: scaleY(.5);
+		transform: scaleY(.5);
+		background-color: $uni-border-color;
+	}
+
+	.uni-list-item--first:after {
+		height: 0px;
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss b/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss
new file mode 100644
index 0000000..311f8d9
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.scss
@@ -0,0 +1,58 @@
+/**
+ * 这里是 uni-list 组件内置的常用样式变量
+ * 如果需要覆盖样式，这里提供了基本的组件样式变量，您可以尝试修改这里的变量，去完成样式替换，而不用去修改源码
+ *
+ */
+
+// 背景色
+$background-color : #fff;
+// 分割线颜色
+$divide-line-color : #e5e5e5;
+
+// 默认头像大小，如需要修改此值，注意同步修改 js 中的值 const avatarWidth = xx ，目前只支持方形头像
+// nvue 页面不支持修改头像大小
+$avatar-width : 45px ;
+
+// 头像边框
+$avatar-border-radius: 5px;
+$avatar-border-color: #eee;
+$avatar-border-width: 1px;
+
+// 标题文字样式
+$title-size : 16px;
+$title-color : #3b4144;
+$title-weight : normal;
+
+// 描述文字样式
+$note-size : 12px;
+$note-color : #999;
+$note-weight : normal;
+
+// 右侧额外内容默认样式
+$right-text-size : 12px;
+$right-text-color : #999;
+$right-text-weight : normal;
+
+// 角标样式
+// nvue 页面不支持修改圆点位置以及大小
+// 角标在左侧时，角标的位置，默认为 0 ，负数左/下移动，正数右/上移动
+$badge-left: 0px;
+$badge-top: 0px;
+
+// 显示圆点时，圆点大小
+$dot-width: 10px;
+$dot-height: 10px;
+
+// 显示角标时，角标大小和字体大小
+$badge-size : 18px;
+$badge-font : 12px;
+// 显示角标时，角标前景色
+$badge-color : #fff;
+// 显示角标时，角标背景色
+$badge-background-color : #ff5a5f;
+// 显示角标时，角标左右间距
+$badge-space : 6px;
+
+// 状态样式
+// 选中颜色
+$hover : #f5f5f5;
diff --git a/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue b/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
new file mode 100644
index 0000000..2b31008
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue
@@ -0,0 +1,538 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell>
+		<!-- #endif -->
+		<view :hover-class="!clickable && !link ? '' : 'uni-list-chat--hover'" class="uni-list-chat" @click.stop="onClick">
+			<view :class="{ 'uni-list--border': border, 'uni-list-chat--first': isFirstChild }"></view>
+			<view class="uni-list-chat__container">
+				<view class="uni-list-chat__header-warp">
+					<view v-if="avatarCircle || avatarList.length === 0" class="uni-list-chat__header" :class="{ 'header--circle': avatarCircle }">
+						<image class="uni-list-chat__header-image" :class="{ 'header--circle': avatarCircle }" :src="avatar" mode="aspectFill"></image>
+					</view>
+					<!-- 头像组 -->
+					<view v-else class="uni-list-chat__header">
+						<view v-for="(item, index) in avatarList" :key="index" class="uni-list-chat__header-box" :class="computedAvatar"
+						 :style="{ width: imageWidth + 'px', height: imageWidth + 'px' }">
+							<image class="uni-list-chat__header-image" :style="{ width: imageWidth + 'px', height: imageWidth + 'px' }" :src="item.url"
+							 mode="aspectFill"></image>
+						</view>
+					</view>
+				</view>
+				<view v-if="badgeText && badgePositon === 'left'" class="uni-list-chat__badge uni-list-chat__badge-pos" :class="[isSingle]">
+					<text class="uni-list-chat__badge-text">{{ badgeText === 'dot' ? '' : badgeText }}</text>
+				</view>
+				<view class="uni-list-chat__content">
+					<view class="uni-list-chat__content-main">
+						<text class="uni-list-chat__content-title uni-ellipsis">{{ title }}</text>
+						<text class="uni-list-chat__content-note uni-ellipsis">{{ note }}</text>
+					</view>
+					<view class="uni-list-chat__content-extra">
+						<slot>
+							<text class="uni-list-chat__content-extra-text">{{ time }}</text>
+							<view v-if="badgeText && badgePositon === 'right'" class="uni-list-chat__badge" :class="[isSingle, badgePositon === 'right' ? 'uni-list-chat--right' : '']">
+								<text class="uni-list-chat__badge-text">{{ badgeText === 'dot' ? '' : badgeText }}</text>
+							</view>
+						</slot>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- #ifdef APP-NVUE -->
+	</cell>
+	<!-- #endif -->
+</template>
+
+<script>
+	// 头像大小
+	const avatarWidth = 45;
+
+	/**
+	 * ListChat 聊天列表
+	 * @description 聊天列表,用于创建聊天类列表
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=24
+	 * @property {String} 	title 							标题
+	 * @property {String} 	note 							描述
+	 * @property {Boolean} 	clickable = [true|false] 		是否开启点击反馈，默认为false
+	 * @property {String} 	badgeText						数字角标内容
+	 * @property {String}  	badgePositon = [left|right]		角标位置，默认为 right
+	 * @property {String} 	link = [false｜navigateTo|redirectTo|reLaunch|switchTab] 是否展示右侧箭头并开启点击反馈，默认为false
+	 *  @value false	 	不开启
+	 *  @value navigateTo 	同 uni.navigateTo()
+	 * 	@value redirectTo 	同 uni.redirectTo()
+	 * 	@value reLaunch   	同 uni.reLaunch()
+	 * 	@value switchTab  	同 uni.switchTab()
+	 * @property {String | PageURIString} 	to  			跳转目标页面
+	 * @property {String} 	time							右侧时间显示
+	 * @property {Boolean} 	avatarCircle = [true|false]		是否显示圆形头像，默认为false
+	 * @property {String} 	avatar							头像地址，avatarCircle 不填时生效
+	 * @property {Array} 	avatarList 						头像组，格式为 [{url:''}]
+	 * @event {Function} 	click 							点击 uniListChat 触发事件
+	 */
+	export default {
+		name: 'UniListChat',
+		emits:['click'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			note: {
+				type: String,
+				default: ''
+			},
+			clickable: {
+				type: Boolean,
+				default: false
+			},
+			link: {
+				type: [Boolean, String],
+				default: false
+			},
+			to: {
+				type: String,
+				default: ''
+			},
+			badgeText: {
+				type: [String, Number],
+				default: ''
+			},
+			badgePositon: {
+				type: String,
+				default: 'right'
+			},
+			time: {
+				type: String,
+				default: ''
+			},
+			avatarCircle: {
+				type: Boolean,
+				default: false
+			},
+			avatar: {
+				type: String,
+				default: ''
+			},
+			avatarList: {
+				type: Array,
+				default () {
+					return [];
+				}
+			}
+		},
+		// inject: ['list'],
+		computed: {
+			isSingle() {
+				if (this.badgeText === 'dot') {
+					return 'uni-badge--dot';
+				} else {
+					const badgeText = this.badgeText.toString();
+					if (badgeText.length > 1) {
+						return 'uni-badge--complex';
+					} else {
+						return 'uni-badge--single';
+					}
+				}
+			},
+			computedAvatar() {
+				if (this.avatarList.length > 4) {
+					this.imageWidth = avatarWidth * 0.31;
+					return 'avatarItem--3';
+				} else if (this.avatarList.length > 1) {
+					this.imageWidth = avatarWidth * 0.47;
+					return 'avatarItem--2';
+				} else {
+					this.imageWidth = avatarWidth;
+					return 'avatarItem--1';
+				}
+			}
+		},
+		data() {
+			return {
+				isFirstChild: false,
+				border: true,
+				// avatarList: 3,
+				imageWidth: 50
+			};
+		},
+		mounted() {
+			this.list = this.getForm()
+			if (this.list) {
+				if (!this.list.firstChildAppend) {
+					this.list.firstChildAppend = true;
+					this.isFirstChild = true;
+				}
+				this.border = this.list.border;
+			}
+		},
+		methods: {
+			/**
+			 * 获取父元素实例
+			 */
+			getForm(name = 'uniList') {
+				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;
+			},
+			onClick() {
+				if (this.to !== '') {
+					this.openPage();
+					return;
+				}
+
+				if (this.clickable || this.link) {
+					this.$emit('click', {
+						data: {}
+					});
+				}
+			},
+			openPage() {
+				if (['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'].indexOf(this.link) !== -1) {
+					this.pageApi(this.link);
+				} else {
+					this.pageApi('navigateTo');
+				}
+			},
+			pageApi(api) {
+				uni[api]({
+					url: this.to,
+					success: res => {
+						this.$emit('click', {
+							data: res
+						});
+					},
+					fail: err => {
+						this.$emit('click', {
+							data: err
+						});
+						console.error(err.errMsg);
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" >
+	$uni-font-size-lg:16px;
+	$uni-spacing-row-sm: 5px;
+	$uni-spacing-row-base: 10px;
+	$uni-spacing-row-lg: 15px;
+	$background-color: #fff;
+	$divide-line-color: #e5e5e5;
+	$avatar-width: 45px;
+	$avatar-border-radius: 5px;
+	$avatar-border-color: #eee;
+	$avatar-border-width: 1px;
+	$title-size: 16px;
+	$title-color: #3b4144;
+	$title-weight: normal;
+	$note-size: 12px;
+	$note-color: #999;
+	$note-weight: normal;
+	$right-text-size: 12px;
+	$right-text-color: #999;
+	$right-text-weight: normal;
+	$badge-left: 0px;
+	$badge-top: 0px;
+	$dot-width: 10px;
+	$dot-height: 10px;
+	$badge-size: 18px;
+	$badge-font: 12px;
+	$badge-color: #fff;
+	$badge-background-color: #ff5a5f;
+	$badge-space: 6px;
+	$hover: #f5f5f5;
+
+	.uni-list-chat {
+		font-size: $uni-font-size-lg;
+		position: relative;
+		flex-direction: column;
+		justify-content: space-between;
+		background-color: $background-color;
+	}
+
+	// .uni-list-chat--disabled {
+	// 	opacity: 0.3;
+	// }
+
+	.uni-list-chat--hover {
+		background-color: $hover;
+	}
+
+	.uni-list--border {
+		position: relative;
+		margin-left: $uni-spacing-row-lg;
+		/* #ifdef APP-PLUS */
+		border-top-color: $divide-line-color;
+		border-top-style: solid;
+		border-top-width: 0.5px;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-list--border:after {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		content: '';
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+		background-color: $divide-line-color;
+	}
+
+	.uni-list-item--first:after {
+		height: 0px;
+	}
+
+	/* #endif */
+
+	.uni-list-chat--first {
+		border-top-width: 0px;
+	}
+
+	.uni-ellipsis {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		/* #endif */
+	}
+
+	.uni-ellipsis-2 {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		/* #endif */
+
+		/* #ifdef APP-NVUE */
+		lines: 2;
+		/* #endif */
+	}
+
+	.uni-list-chat__container {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+		padding: $uni-spacing-row-base $uni-spacing-row-lg;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__header-warp {
+		position: relative;
+	}
+
+	.uni-list-chat__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		align-content: center;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		flex-wrap: wrap-reverse;
+		/* #ifdef APP-NVUE */
+		width: 50px;
+		height: 50px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		width: $avatar-width;
+		height: $avatar-width;
+		/* #endif */
+
+		border-radius: $avatar-border-radius;
+		border-color: $avatar-border-color;
+		border-width: $avatar-border-width;
+		border-style: solid;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__header-box {
+		/* #ifndef APP-PLUS */
+		box-sizing: border-box;
+		display: flex;
+		width: $avatar-width;
+		height: $avatar-width;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 50px;
+		height: 50px;
+		/* #endif */
+		overflow: hidden;
+		border-radius: 2px;
+	}
+
+	.uni-list-chat__header-image {
+		margin: 1px;
+		/* #ifdef APP-NVUE */
+		width: 50px;
+		height: 50px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		width: $avatar-width;
+		height: $avatar-width;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-list-chat__header-image {
+		display: block;
+		width: 100%;
+		height: 100%;
+	}
+
+	.avatarItem--1 {
+		width: 100%;
+		height: 100%;
+	}
+
+	.avatarItem--2 {
+		width: 47%;
+		height: 47%;
+	}
+
+	.avatarItem--3 {
+		width: 32%;
+		height: 32%;
+	}
+
+	/* #endif */
+	.header--circle {
+		border-radius: 50%;
+	}
+
+	.uni-list-chat__content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+		overflow: hidden;
+		padding: 2px 0;
+	}
+
+	.uni-list-chat__content-main {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: space-between;
+		padding-left: $uni-spacing-row-base;
+		flex: 1;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__content-title {
+		font-size: $title-size;
+		color: $title-color;
+		font-weight: $title-weight;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__content-note {
+		margin-top: 3px;
+		color: $note-color;
+		font-size: $note-size;
+		font-weight: $title-weight;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__content-extra {
+		/* #ifndef APP-NVUE */
+		flex-shrink: 0;
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: space-between;
+		align-items: flex-end;
+		margin-left: 5px;
+	}
+
+	.uni-list-chat__content-extra-text {
+		color: $right-text-color;
+		font-size: $right-text-size;
+		font-weight: $right-text-weight;
+		overflow: hidden;
+	}
+
+	.uni-list-chat__badge-pos {
+		position: absolute;
+		/* #ifdef APP-NVUE */
+		left: 55px;
+		top: 3px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		left: calc(#{$avatar-width} + 10px - #{$badge-space} + #{$badge-left});
+		top: calc(#{$uni-spacing-row-base}/ 2 + 1px + #{$badge-top});
+		/* #endif */
+	}
+
+	.uni-list-chat__badge {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		border-radius: 100px;
+		background-color: $badge-background-color;
+	}
+
+	.uni-list-chat__badge-text {
+		color: $badge-color;
+		font-size: $badge-font;
+	}
+
+	.uni-badge--single {
+		/* #ifndef APP-NVUE */
+		// left: calc(#{$avatar-width} + 7px + #{$badge-left});
+		/* #endif */
+		width: $badge-size;
+		height: $badge-size;
+	}
+
+	.uni-badge--complex {
+		/* #ifdef APP-NVUE */
+		left: 50px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		width: auto;
+		/* #endif */
+		height: $badge-size;
+		padding: 0 $badge-space;
+	}
+
+	.uni-badge--dot {
+		/* #ifdef APP-NVUE */
+		left: 60px;
+		top: 6px;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		left: calc(#{$avatar-width} + 15px - #{$dot-width}/ 2 + 1px + #{$badge-left});
+		/* #endif */
+		width: $dot-width;
+		height: $dot-height;
+		padding: 0;
+	}
+
+	.uni-list-chat--right {
+		/* #ifdef APP-NVUE */
+		left: 0;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
new file mode 100644
index 0000000..d1182d7
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
@@ -0,0 +1,475 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell>
+		<!-- #endif -->
+
+		<view
+			:class="{ 'uni-list-item--disabled': disabled }"
+			:hover-class="(!clickable && !link) || disabled || showSwitch ? '' : 'uni-list-item--hover'"
+			class="uni-list-item"
+			@click="onClick"
+		>
+			<view v-if="!isFirstChild" class="border--left" :class="{ 'uni-list--border': border }"></view>
+			<view
+				class="uni-list-item__container"
+				:class="{ 'container--right': showArrow || link, 'flex--direction': direction === 'column' }"
+			>
+				<slot name="header">
+					<view class="uni-list-item__header">
+						<view v-if="thumb" class="uni-list-item__icon">
+							<image :src="thumb" class="uni-list-item__icon-img" :class="['uni-list--' + thumbSize]" />
+						</view>
+						<view v-else-if="showExtraIcon" class="uni-list-item__icon">
+							<uni-icons :color="extraIcon.color" :size="extraIcon.size" :type="extraIcon.type" />
+						</view>
+					</view>
+				</slot>
+				<slot name="body">
+					<view
+						class="uni-list-item__content"
+						:class="{ 'uni-list-item__content--center': thumb || showExtraIcon || showBadge || showSwitch }"
+					>
+						<text
+							v-if="title"
+							class="uni-list-item__content-title"
+							:class="[ellipsis !== 0 && ellipsis <= 2 ? 'uni-ellipsis-' + ellipsis : '']"
+						>
+							{{ title }}
+						</text>
+						<text v-if="note" class="uni-list-item__content-note">{{ note }}</text>
+					</view>
+				</slot>
+				<slot name="footer">
+					<view
+						v-if="rightText || showBadge || showSwitch"
+						class="uni-list-item__extra"
+						:class="{ 'flex--justify': direction === 'column' }"
+					>
+						<text v-if="rightText" class="uni-list-item__extra-text">{{ rightText }}</text>
+						<uni-badge v-if="showBadge" :type="badgeType" :text="badgeText" :custom-style="badgeStyle" />
+						<switch
+							v-if="showSwitch"
+							:disabled="disabled"
+							:checked="switchChecked"
+							@change="onSwitchChange"
+						/>
+					</view>
+				</slot>
+			</view>
+			<button v-if="showArrow || link" class="ss-reset-button ss-flex ss-col-center ss-row-center">
+			  <text class="_icon-forward ss-p-x-20" style="color: #bbbbbb; font-size: 32rpx"></text>
+			</button>
+		</view>
+		<!-- #ifdef APP-NVUE -->
+	</cell>
+	<!-- #endif -->
+</template>
+
+<script>
+/**
+ * ListItem 列表子组件
+ * @description 列表子组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=24
+ * @property {String} 	title 							标题
+ * @property {String} 	note 							描述
+ * @property {String} 	thumb 							左侧缩略图，若thumb有值，则不会显示扩展图标
+ * @property {String}  	thumbSize = [lg|base|sm]		略缩图大小
+ * 	@value 	 lg			大图
+ * 	@value 	 base		一般
+ * 	@value 	 sm			小图
+ * @property {String} 	badgeText						数字角标内容
+ * @property {String} 	badgeType 						数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)
+ * @property {Object}   badgeStyle           数字角标样式
+ * @property {String} 	rightText 						右侧文字内容
+ * @property {Boolean} 	disabled = [true|false]			是否禁用
+ * @property {Boolean} 	clickable = [true|false] 		是否开启点击反馈
+ * @property {String} 	link = [navigateTo|redirectTo|reLaunch|switchTab] 是否展示右侧箭头并开启点击反馈
+ *  @value 	navigateTo 	同 uni.navigateTo()
+ * 	@value redirectTo 	同 uni.redirectTo()
+ * 	@value reLaunch   	同 uni.reLaunch()
+ * 	@value switchTab  	同 uni.switchTab()
+ * @property {String | PageURIString} 	to  			跳转目标页面
+ * @property {Boolean} 	showBadge = [true|false] 		是否显示数字角标
+ * @property {Boolean} 	showSwitch = [true|false] 		是否显示Switch
+ * @property {Boolean} 	switchChecked = [true|false] 	Switch是否被选中
+ * @property {Boolean} 	showExtraIcon = [true|false] 	左侧是否显示扩展图标
+ * @property {Object} 	extraIcon 						扩展图标参数，格式为 {color: '#4cd964',size: '22',type: 'spinner'}
+ * @property {String} 	direction = [row|column]		排版方向
+ * @value row 			水平排列
+ * @value column 		垂直排列
+ * @event {Function} 	click 							点击 uniListItem 触发事件
+ * @event {Function} 	switchChange 					点击切换 Switch 时触发
+ */
+export default {
+	name: 'UniListItem',
+	emits: ['click', 'switchChange'],
+	props: {
+		direction: {
+			type: String,
+			default: 'row'
+		},
+		title: {
+			type: String,
+			default: ''
+		},
+		note: {
+			type: String,
+			default: ''
+		},
+		ellipsis: {
+			type: [Number, String],
+			default: 0
+		},
+		disabled: {
+			type: [Boolean, String],
+			default: false
+		},
+		clickable: {
+			type: Boolean,
+			default: false
+		},
+		showArrow: {
+			type: [Boolean, String],
+			default: false
+		},
+		link: {
+			type: [Boolean, String],
+			default: false
+		},
+		to: {
+			type: String,
+			default: ''
+		},
+		showBadge: {
+			type: [Boolean, String],
+			default: false
+		},
+		showSwitch: {
+			type: [Boolean, String],
+			default: false
+		},
+		switchChecked: {
+			type: [Boolean, String],
+			default: false
+		},
+		badgeText: {
+			type: String,
+			default: ''
+		},
+		badgeType: {
+			type: String,
+			default: 'success'
+		},
+		badgeStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		rightText: {
+			type: String,
+			default: ''
+		},
+		thumb: {
+			type: String,
+			default: ''
+		},
+		thumbSize: {
+			type: String,
+			default: 'base'
+		},
+		showExtraIcon: {
+			type: [Boolean, String],
+			default: false
+		},
+		extraIcon: {
+			type: Object,
+			default() {
+				return {
+					type: '',
+					color: '#000000',
+					size: 20
+				};
+			}
+		},
+		border: {
+			type: Boolean,
+			default: true
+		}
+	},
+	// inject: ['list'],
+	data() {
+		return {
+			isFirstChild: false
+		};
+	},
+	mounted() {
+		this.list = this.getForm();
+		// 判断是否存在 uni-list 组件
+		if (this.list) {
+			if (!this.list.firstChildAppend) {
+				this.list.firstChildAppend = true;
+				this.isFirstChild = true;
+			}
+		}
+	},
+	methods: {
+		/**
+		 * 获取父元素实例
+		 */
+		getForm(name = 'uniList') {
+			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;
+		},
+		onClick() {
+			if (this.to !== '') {
+				this.openPage();
+				return;
+			}
+			if (this.clickable || this.link) {
+				this.$emit('click', {
+					data: {}
+				});
+			}
+		},
+		onSwitchChange(e) {
+			this.$emit('switchChange', e.detail);
+		},
+		openPage() {
+			if (['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'].indexOf(this.link) !== -1) {
+				this.pageApi(this.link);
+			} else {
+				this.pageApi('navigateTo');
+			}
+		},
+		pageApi(api) {
+			let callback = {
+				url: this.to,
+				success: res => {
+					this.$emit('click', {
+						data: res
+					});
+				},
+				fail: err => {
+					this.$emit('click', {
+						data: err
+					});
+				}
+			};
+			switch (api) {
+				case 'navigateTo':
+					uni.navigateTo(callback);
+					break;
+				case 'redirectTo':
+					uni.redirectTo(callback);
+					break;
+				case 'reLaunch':
+					uni.reLaunch(callback);
+					break;
+				case 'switchTab':
+					uni.switchTab(callback);
+					break;
+				default:
+					uni.navigateTo(callback);
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+$uni-font-size-sm: 12px;
+$uni-font-size-base: 14px;
+$uni-font-size-lg: 16px;
+$uni-spacing-col-lg: 12px;
+$uni-spacing-row-lg: 15px;
+$uni-img-size-sm: 20px;
+$uni-img-size-base: 26px;
+$uni-img-size-lg: 40px;
+$uni-border-color: #e5e5e5;
+$uni-bg-color-hover: #f1f1f1;
+$uni-text-color-grey: #999;
+$list-item-pd: $uni-spacing-col-lg $uni-spacing-row-lg;
+.uni-list-item {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	font-size: $uni-font-size-lg;
+	position: relative;
+	justify-content: space-between;
+	align-items: center;
+	// background-color: #fff;
+	flex-direction: row;
+	/* #ifdef H5 */
+	cursor: pointer;
+	/* #endif */
+}
+.uni-list-item--disabled {
+	opacity: 0.3;
+}
+.uni-list-item--hover {
+	background-color: $uni-bg-color-hover;
+}
+.uni-list-item__container {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	padding: $list-item-pd;
+	padding-left: $uni-spacing-row-lg;
+	flex: 1;
+	overflow: hidden;
+	// align-items: center;
+}
+.container--right {
+	padding-right: 0;
+}
+// .border--left {
+// 	margin-left: $uni-spacing-row-lg;
+// }
+.uni-list--border {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	/* #ifdef APP-NVUE */
+	border-top-color: $uni-border-color;
+	border-top-style: solid;
+	border-top-width: 0.5px;
+	/* #endif */
+}
+/* #ifndef APP-NVUE */
+.uni-list--border:after {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	height: 1px;
+	content: '';
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	background-color: $uni-border-color;
+}
+/* #endif */
+.uni-list-item__content {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	padding-right: 8px;
+	flex: 1;
+	color: #3b4144;
+	// overflow: hidden;
+	flex-direction: column;
+	justify-content: space-between;
+	overflow: hidden;
+}
+.uni-list-item__content--center {
+	justify-content: center;
+}
+.uni-list-item__content-title {
+	font-size: $uni-font-size-base;
+	color: #3b4144;
+	overflow: hidden;
+}
+.uni-list-item__content-note {
+	margin-top: 6rpx;
+	color: $uni-text-color-grey;
+	font-size: $uni-font-size-sm;
+	overflow: hidden;
+}
+.uni-list-item__extra {
+	// width: 25%;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: flex-end;
+	align-items: center;
+}
+.uni-list-item__header {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+}
+.uni-list-item__icon {
+	margin-right: 18rpx;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+}
+.uni-list-item__icon-img {
+	/* #ifndef APP-NVUE */
+	display: block;
+	/* #endif */
+	height: $uni-img-size-base;
+	width: $uni-img-size-base;
+	margin-right: 10px;
+}
+.uni-icon-wrapper {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	align-items: center;
+	padding: 0 10px;
+}
+.flex--direction {
+	flex-direction: column;
+	/* #ifndef APP-NVUE */
+	align-items: initial;
+	/* #endif */
+}
+.flex--justify {
+	/* #ifndef APP-NVUE */
+	justify-content: initial;
+	/* #endif */
+}
+.uni-list--lg {
+	height: $uni-img-size-lg;
+	width: $uni-img-size-lg;
+}
+.uni-list--base {
+	height: $uni-img-size-base;
+	width: $uni-img-size-base;
+}
+.uni-list--sm {
+	height: $uni-img-size-sm;
+	width: $uni-img-size-sm;
+}
+.uni-list-item__extra-text {
+	color: $uni-text-color-grey;
+	font-size: $uni-font-size-sm;
+}
+.uni-ellipsis-1 {
+	/* #ifndef APP-NVUE */
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	lines: 1;
+	text-overflow: ellipsis;
+	/* #endif */
+}
+.uni-ellipsis-2 {
+	/* #ifndef APP-NVUE */
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	lines: 2;
+	text-overflow: ellipsis;
+	/* #endif */
+}
+</style>
diff --git a/uni_modules/uni-list/components/uni-list/uni-list.vue b/uni_modules/uni-list/components/uni-list/uni-list.vue
new file mode 100644
index 0000000..85103f2
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list/uni-list.vue
@@ -0,0 +1,108 @@
+<template>
+	<!-- #ifndef APP-NVUE -->
+	<view class="uni-list uni-border-top-bottom">
+		<view v-if="border" class="uni-list--border-top"></view>
+		<slot />
+		<view v-if="border" class="uni-list--border-bottom"></view>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<list class="uni-list" :class="{ 'uni-list--border': border }" :enableBackToTop="enableBackToTop" loadmoreoffset="15"><slot /></list>
+	<!-- #endif -->
+</template>
+
+<script>
+/**
+ * List 列表
+ * @description 列表组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=24
+ * @property {String} 	border = [true|false] 		标题
+ */
+export default {
+	name: 'uniList',
+	'mp-weixin': {
+		options: {
+			multipleSlots: false
+		}
+	},
+	props: {
+		enableBackToTop: {
+			type: [Boolean, String],
+			default: false
+		},
+		scrollY: {
+			type: [Boolean, String],
+			default: false
+		},
+		border: {
+			type: Boolean,
+			default: true
+		}
+	},
+	// provide() {
+	// 	return {
+	// 		list: this
+	// 	};
+	// },
+	created() {
+		this.firstChildAppend = false;
+	},
+	methods: {
+		loadMore(e) {
+			this.$emit('scrolltolower');
+		}
+	}
+};
+</script>
+<style lang="scss" >
+$uni-bg-color:#ffffff;
+$uni-border-color:#e5e5e5;
+.uni-list {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	// background-color: $uni-bg-color;
+	position: relative;
+	flex-direction: column;
+}
+
+.uni-list--border {
+	position: relative;
+	/* #ifdef APP-NVUE */
+	border-top-color: $uni-border-color;
+	border-top-style: solid;
+	border-top-width: 0.5px;
+	border-bottom-color: $uni-border-color;
+	border-bottom-style: solid;
+	border-bottom-width: 0.5px;
+	/* #endif */
+	z-index: -1;
+}
+
+/* #ifndef APP-NVUE */
+
+.uni-list--border-top {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	height: 1px;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	background-color: $uni-border-color;
+	z-index: 1;
+}
+
+.uni-list--border-bottom {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	left: 0;
+	height: 1px;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	background-color: $uni-border-color;
+}
+
+/* #endif */
+</style>
diff --git a/uni_modules/uni-list/components/uni-list/uni-refresh.vue b/uni_modules/uni-list/components/uni-list/uni-refresh.vue
new file mode 100644
index 0000000..3b4c5a2
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list/uni-refresh.vue
@@ -0,0 +1,65 @@
+<template>
+    <!-- #ifdef APP-NVUE -->
+    <refresh :display="display" @refresh="onrefresh" @pullingdown="onpullingdown">
+        <slot />
+    </refresh>
+    <!-- #endif -->
+    <!-- #ifndef APP-NVUE -->
+    <view ref="uni-refresh" class="uni-refresh" v-show="isShow">
+        <slot />
+    </view>
+    <!-- #endif -->
+</template>
+
+<script>
+    export default {
+        name: 'UniRefresh',
+        props: {
+            display: {
+                type: [String],
+                default: "hide"
+            }
+        },
+        data() {
+            return {
+                pulling: false
+            }
+        },
+        computed: {
+            isShow() {
+                if (this.display === "show" || this.pulling === true) {
+                    return true;
+                }
+                return false;
+            }
+        },
+        created() {},
+        methods: {
+            onchange(value) {
+                this.pulling = value;
+            },
+            onrefresh(e) {
+                this.$emit("refresh", e);
+            },
+            onpullingdown(e) {
+                // #ifdef APP-NVUE
+                this.$emit("pullingdown", e);
+                // #endif
+                // #ifndef APP-NVUE
+                var detail = {
+                    viewHeight: 90,
+                    pullingDistance: e.height
+                }
+                this.$emit("pullingdown", detail);
+                // #endif
+            }
+        }
+    }
+</script>
+
+<style>
+    .uni-refresh {
+        height: 0;
+        overflow: hidden;
+    }
+</style>
diff --git a/uni_modules/uni-list/components/uni-list/uni-refresh.wxs b/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
new file mode 100644
index 0000000..818a6b7
--- /dev/null
+++ b/uni_modules/uni-list/components/uni-list/uni-refresh.wxs
@@ -0,0 +1,87 @@
+var pullDown = {
+    threshold: 95,
+    maxHeight: 200,
+    callRefresh: 'onrefresh',
+    callPullingDown: 'onpullingdown',
+    refreshSelector: '.uni-refresh'
+};
+
+function ready(newValue, oldValue, ownerInstance, instance) {
+    var state = instance.getState()
+    state.canPullDown = newValue;
+    // console.log(newValue);
+}
+
+function touchStart(e, instance) {
+    var state = instance.getState();
+    state.refreshInstance = instance.selectComponent(pullDown.refreshSelector);
+    state.canPullDown = (state.refreshInstance != null && state.refreshInstance != undefined);
+    if (!state.canPullDown) {
+        return
+    }
+
+    // console.log("touchStart");
+
+    state.height = 0;
+    state.touchStartY = e.touches[0].pageY || e.changedTouches[0].pageY;
+    state.refreshInstance.setStyle({
+        'height': 0
+    });
+    state.refreshInstance.callMethod("onchange", true);
+}
+
+function touchMove(e, ownerInstance) {
+    var instance = e.instance;
+    var state = instance.getState();
+    if (!state.canPullDown) {
+        return
+    }
+
+    var oldHeight = state.height;
+    var endY = e.touches[0].pageY || e.changedTouches[0].pageY;
+    var height = endY - state.touchStartY;
+    if (height > pullDown.maxHeight) {
+        return;
+    }
+
+    var refreshInstance = state.refreshInstance;
+    refreshInstance.setStyle({
+        'height': height + 'px'
+    });
+
+    height = height < pullDown.maxHeight ? height : pullDown.maxHeight;
+    state.height = height;
+    refreshInstance.callMethod(pullDown.callPullingDown, {
+        height: height
+    });
+}
+
+function touchEnd(e, ownerInstance) {
+    var state = e.instance.getState();
+    if (!state.canPullDown) {
+        return
+    }
+
+    state.refreshInstance.callMethod("onchange", false);
+
+    var refreshInstance = state.refreshInstance;
+    if (state.height > pullDown.threshold) {
+        refreshInstance.callMethod(pullDown.callRefresh);
+        return;
+    }
+
+    refreshInstance.setStyle({
+        'height': 0
+    });
+}
+
+function propObserver(newValue, oldValue, instance) {
+    pullDown = newValue;
+}
+
+module.exports = {
+    touchmove: touchMove,
+    touchstart: touchStart,
+    touchend: touchEnd,
+    propObserver: propObserver
+}
diff --git a/uni_modules/uni-list/package.json b/uni_modules/uni-list/package.json
new file mode 100644
index 0000000..66e8bef
--- /dev/null
+++ b/uni_modules/uni-list/package.json
@@ -0,0 +1,91 @@
+{
+  "id": "uni-list",
+  "displayName": "uni-list 列表",
+  "version": "1.2.1",
+  "description": "List 组件 ，帮助使用者快速构建列表。",
+  "keywords": [
+    "",
+    "uni-ui",
+    "uniui",
+    "列表",
+    "",
+    "list"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+      "uni-badge",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-list/readme.md b/uni_modules/uni-list/readme.md
new file mode 100644
index 0000000..32c2865
--- /dev/null
+++ b/uni_modules/uni-list/readme.md
@@ -0,0 +1,346 @@
+## List 列表
+> **组件名：uni-list**
+> 代码块： `uList`、`uListItem`
+> 关联组件：`uni-list-item`、`uni-badge`、`uni-icons`、`uni-list-chat`、`uni-list-ad`
+
+
+List 列表组件，包含基本列表样式、可扩展插槽机制、长列表性能优化、多端兼容。
+
+在vue页面里，它默认使用页面级滚动。在app-nvue页面里，它默认使用原生list组件滚动。这样的长列表，在滚动出屏幕外后，系统会回收不可见区域的渲染内存资源，不会造成滚动越长手机越卡的问题。
+
+uni-list组件是父容器，里面的核心是uni-list-item子组件，它代表列表中的一个可重复行，子组件可以无限循环。
+
+uni-list-item有很多风格，uni-list-item组件通过内置的属性，满足一些常用的场景。当内置属性不满足需求时，可以通过扩展插槽来自定义列表内容。
+
+内置属性可以覆盖的场景包括：导航列表、设置列表、小图标列表、通信录列表、聊天记录列表。
+
+涉及很多大图或丰富内容的列表，比如类今日头条的新闻列表、类淘宝的电商列表，需要通过扩展插槽实现。
+
+下文均有样例给出。
+
+uni-list不包含下拉刷新和上拉翻页。上拉翻页另见组件：[uni-load-more](https://ext.dcloud.net.cn/plugin?id=29)
+
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+> **注意事项**
+> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
+> - 组件需要依赖 `sass` 插件 ，请自行手动安装
+> - 组件内部依赖 `'uni-icons'` 、`uni-badge` 组件
+> - `uni-list` 和 `uni-list-item` 需要配套使用，暂不支持单独使用 `uni-list-item`
+> - 只有开启点击反馈后，会有点击选中效果
+> - 使用插槽时，可以完全自定义内容
+> - note 、rightText 属性暂时没做限制，不支持文字溢出隐藏，使用时应该控制长度显示或通过默认插槽自行扩展
+> - 支付宝小程序平台需要在支付宝小程序开发者工具里开启 component2 编译模式，开启方式： 详情 --> 项目配置 --> 启用 component2 编译
+> - 如果需要修改 `switch`、`badge` 样式，请使用插槽自定义
+> - 在 `HBuilderX` 低版本中，可能会出现组件显示 `undefined` 的问题，请升级最新的 `HBuilderX` 或者 `cli`
+> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
+ 
+
+### 基本用法 
+
+- 设置 `title` 属性，可以显示列表标题
+- 设置 `disabled` 属性，可以禁用当前项
+
+```html
+<uni-list>
+	<uni-list-item  title="列表文字" ></uni-list-item>
+	<uni-list-item :disabled="true" title="列表禁用状态" ></uni-list-item>
+</uni-list>
+			 
+```
+
+### 多行内容显示
+
+- 设置 `note` 属性 ，可以在第二行显示描述文本信息
+
+```html
+<uni-list>
+	<uni-list-item title="列表文字" note="列表描述信息"></uni-list-item>
+	<uni-list-item :disabled="true" title="列表文字" note="列表禁用状态"></uni-list-item>
+</uni-list>
+
+```
+
+### 右侧显示角标、switch
+
+- 设置 `show-badge` 属性 ，可以显示角标内容
+- 设置 `show-switch` 属性，可以显示 switch 开关
+
+```html
+<uni-list>
+	<uni-list-item  title="列表右侧显示角标" :show-badge="true" badge-text="12" ></uni-list-item>
+	<uni-list-item title="列表右侧显示 switch"  :show-switch="true"  @switchChange="switchChange" ></uni-list-item>
+</uni-list>
+
+```
+
+### 左侧显示略缩图、图标  
+
+- 设置 `thumb` 属性 ，可以在列表左侧显示略缩图
+- 设置 `show-extra-icon` 属性，并指定 `extra-icon` 可以在左侧显示图标
+
+```html
+ <uni-list>
+ 	<uni-list-item title="列表左侧带略缩图" note="列表描述信息" thumb="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png"
+ 	 thumb-size="lg" rightText="右侧文字"></uni-list-item>
+ 	<uni-list-item :show-extra-icon="true" :extra-icon="extraIcon1" title="列表左侧带扩展图标" ></uni-list-item>
+</uni-list>
+```
+
+### 开启点击反馈和右侧箭头
+- 设置 `clickable` 为 `true` ，则表示这是一个可点击的列表，会默认给一个点击效果，并可以监听 `click` 事件
+- 设置 `link` 属性，会自动开启点击反馈，并给列表右侧添加一个箭头
+- 设置 `to` 属性，可以跳转页面，`link` 的值表示跳转方式，如果不指定，默认为 `navigateTo`
+
+```html
+
+<uni-list>
+	<uni-list-item title="开启点击反馈" clickable  @click="onClick" ></uni-list-item>
+	<uni-list-item title="默认 navigateTo 方式跳转页面" link to="/pages/vue/index/index" @click="onClick($event,1)" ></uni-list-item>
+	<uni-list-item title="reLaunch 方式跳转页面" link="reLaunch" to="/pages/vue/index/index" @click="onClick($event,1)" ></uni-list-item>
+</uni-list>
+
+```
+
+
+### 聊天列表示例
+- 设置 `clickable` 为 `true` ，则表示这是一个可点击的列表，会默认给一个点击效果，并可以监听 `click` 事件
+- 设置 `link` 属性，会自动开启点击反馈，`link` 的值表示跳转方式，如果不指定，默认为 `navigateTo`
+- 设置 `to` 属性，可以跳转页面
+- `time` 属性，通常会设置成时间显示，但是这个属性不仅仅可以设置时间，你可以传入任何文本，注意文本长度可能会影响显示
+- `avatar` 和 `avatarList` 属性同时只会有一个生效，同时设置的话，`avatarList` 属性的长度大于1 ，`avatar` 属性将失效
+- 可以通过默认插槽自定义列表右侧内容
+
+```html
+
+<uni-list>
+	<uni-list :border="true">
+		<!-- 显示圆形头像 -->
+		<uni-list-chat :avatar-circle="true" title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" ></uni-list-chat>
+		<!-- 右侧带角标 -->
+		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-text="12" :badge-style="{backgroundColor:'#FF80AB'}"></uni-list-chat>
+		<!-- 头像显示圆点 -->
+		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
+		<!-- 头像显示角标 -->
+		<uni-list-chat title="uni-app" avatar="https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="99"></uni-list-chat>
+		<!-- 显示多头像 -->
+		<uni-list-chat title="uni-app" :avatar-list="avatarList" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot"></uni-list-chat>
+		<!-- 自定义右侧内容 -->
+		<uni-list-chat title="uni-app" :avatar-list="avatarList" note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left" badge-text="dot">
+			<view class="chat-custom-right">
+				<text class="chat-custom-text">刚刚</text>
+				<!-- 需要使用 uni-icons 请自行引入 -->
+				<uni-icons type="star-filled" color="#999" size="18"></uni-icons>
+			</view>
+		</uni-list-chat>
+	</uni-list>
+</uni-list>
+
+```
+
+```javascript
+
+export default {
+	components: {},
+	data() {
+		return {
+			avatarList: [{
+				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
+			}, {
+				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
+			}, {
+				url: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/460d46d0-4fcc-11eb-8ff1-d5dcf8779628.png'
+			}]
+		}
+	}
+}
+
+```
+
+
+```css
+
+.chat-custom-right {
+	flex: 1;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-end;
+}
+
+.chat-custom-text {
+	font-size: 12px;
+	color: #999;
+}
+
+```
+
+## API
+
+### List Props
+
+属性名			|类型		|默认值		|	说明																									
+:-:				|:-:		|:-:		|	:-:	
+border			|Boolean	|true		|	是否显示边框
+
+
+### ListItem Props
+
+属性名			|类型		|默认值		|	说明																					
+:-:				|:-:		|:-:		|	:-:	
+title			|String		|-			|	标题
+note			|String		|-			|	描述
+ellipsis		|Number		|0			|	title 是否溢出隐藏，可选值，0:默认;  1:显示一行;	2:显示两行;【nvue 暂不支持】
+thumb			|String		|-			|	左侧缩略图，若thumb有值，则不会显示扩展图标
+thumbSize		|String 	|medium 	|	略缩图尺寸，可选值，lg:大图;  medium:一般;	sm:小图;
+showBadge		|Boolean	|false		|	是否显示数字角标	
+badgeText		|String		|-			|	数字角标内容
+badgeType		|String		|-			|	数字角标类型，参考[uni-icons](https://ext.dcloud.net.cn/plugin?id=21)	
+badgeStyle  |Object   |-      | 数字角标样式，使用uni-badge的custom-style参数
+rightText		|String		|-			|	右侧文字内容
+disabled		|Boolean	|false		|	是否禁用	
+showArrow 		|Boolean	|true		|	是否显示箭头图标			
+link			|String 	|navigateTo	|	新页面跳转方式，可选值见下表
+to				|String		|-			|	新页面跳转地址，如填写此属性，click 会返回页面是否跳转成功			
+clickable		|Boolean	|false		|	是否开启点击反馈
+showSwitch	    |Boolean	|false		|	是否显示Switch																			
+switchChecked	|Boolean	|false		|	Switch是否被选中																			
+showExtraIcon   |Boolean	|false		|	左侧是否显示扩展图标																		
+extraIcon		|Object		|-			|	扩展图标参数，格式为 ``{color: '#4cd964',size: '22',type: 'spinner'}``，参考 [uni-icons](https://ext.dcloud.net.cn/plugin?id=28)	
+direction		| String	|row		|	排版方向，可选值，row:水平排列;  column:垂直排列; 3个插槽是水平排还是垂直排，也受此属性控制
+
+
+#### Link Options
+
+属性名				|	说明
+:-:					|	:-:
+navigateTo 	| 	同 uni.navigateTo()
+redirectTo 	|	同 uni.reLaunch()
+reLaunch		|	同 uni.reLaunch()
+switchTab  	|	同 uni.switchTab()
+
+### ListItem Events
+
+事件称名			|说明									|返回参数			
+:-:				|:-:									|:-:				
+click			|点击 uniListItem 触发事件，需开启点击反馈	|-					
+switchChange	|点击切换 Switch 时触发，需显示 switch		|e={value:checked}	
+
+
+
+### ListItem Slots
+
+名称	 	|	说明					
+:-:		|	:-:						
+header	|	左/上内容插槽，可完全自定义默认显示
+body	|	中间内容插槽，可完全自定义中间内容				
+footer	|	右/下内容插槽，可完全自定义右侧内容		
+
+
+> **通过插槽扩展**
+> 需要注意的是当使用插槽时，内置样式将会失效，只保留排版样式，此时的样式需要开发者自己实现
+> 如果	`uni-list-item` 组件内置属性样式无法满足需求，可以使用插槽来自定义uni-list-item里的内容。
+> uni-list-item提供了3个可扩展的插槽：`header`、`body`、`footer`
+> - 当 `direction` 属性为 `row` 时表示水平排列，此时 `header` 表示列表的左边部分，`body` 表示列表的中间部分，`footer` 表示列表的右边部分
+> - 当 `direction` 属性为 `column` 时表示垂直排列，此时 `header` 表示列表的上边部分，`body` 表示列表的中间部分，`footer` 表示列表的下边部分
+> 开发者可以只用1个插槽，也可以3个一起使用。在插槽中可自主编写view标签，实现自己所需的效果。
+
+	
+**示例**
+
+```html
+<uni-list>
+	<uni-list-item title="自定义右侧插槽" note="列表描述信息" link>
+		<template slot="header">
+			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
+		</template>
+	</uni-list-item>
+	<uni-list-item>
+		<!-- 自定义 header -->
+		<view slot="header" class="slot-box"><image class="slot-image" src="/static/logo.png" mode="widthFix"></image></view>
+		<!-- 自定义 body -->
+		<text slot="body" class="slot-box slot-text">自定义插槽</text>
+		<!-- 自定义 footer-->
+		<template slot="footer">
+			<image class="slot-image" src="/static/logo.png" mode="widthFix"></image>
+		</template>
+	</uni-list-item>
+</uni-list>
+```
+
+
+
+
+
+### ListItemChat Props
+
+属性名			|类型		|默认值		|	说明																		
+:-:				|:-:		|:-:		|	:-:	
+title 			|String		|-			|	标题
+note 			|String		|-			|	描述
+clickable		|Boolean	|false		|	是否开启点击反馈
+badgeText		|String		|-			|	数字角标内容，设置为 `dot` 将显示圆点
+badgePositon 	|String		|right		|	角标位置
+link			|String 	|navigateTo	|	是否展示右侧箭头并开启点击反馈，可选值见下表
+clickable		|Boolean	|false		|	是否开启点击反馈
+to				|String		|-			|	跳转页面地址，如填写此属性，click 会返回页面是否跳转成功	
+time			|String 	|-			|	右侧时间显示
+avatarCircle 	|Boolean 	|false		|	是否显示圆形头像
+avatar			|String 	|-			|	头像地址，avatarCircle 不填时生效
+avatarList 		|Array	 	|-			|	头像组，格式为 [{url:''}]
+
+#### Link Options
+
+属性名		|	说明
+:-:			|	:-:
+navigateTo 	| 	同 uni.navigateTo()
+redirectTo 	|	同 uni.reLaunch()
+reLaunch	|	同 uni.reLaunch()
+switchTab  	|	同 uni.switchTab()
+
+### ListItemChat Slots
+
+名称	 	|	说明					
+:-		|	:-						
+default	|	自定义列表右侧内容（包括时间和角标显示）
+
+### ListItemChat Events
+事件称名			|	说明						|	返回参数			
+:-:				|	:-:						|	:-:	
+@click			|	点击 uniListChat 触发事件	|	{data:{}}	，如有 to 属性，会返回页面跳转信息	
+
+
+
+
+
+
+## 基于uni-list扩展的页面模板
+
+通过扩展插槽，可实现多种常见样式的列表
+
+**新闻列表类**
+
+1. 云端一体混合布局：[https://ext.dcloud.net.cn/plugin?id=2546](https://ext.dcloud.net.cn/plugin?id=2546)
+2. 云端一体垂直布局，大图模式：[https://ext.dcloud.net.cn/plugin?id=2583](https://ext.dcloud.net.cn/plugin?id=2583)
+3. 云端一体垂直布局，多行图文混排：[https://ext.dcloud.net.cn/plugin?id=2584](https://ext.dcloud.net.cn/plugin?id=2584)
+4. 云端一体垂直布局，多图模式：[https://ext.dcloud.net.cn/plugin?id=2585](https://ext.dcloud.net.cn/plugin?id=2585)
+5. 云端一体水平布局，左图右文：[https://ext.dcloud.net.cn/plugin?id=2586](https://ext.dcloud.net.cn/plugin?id=2586)
+6. 云端一体水平布局，左文右图：[https://ext.dcloud.net.cn/plugin?id=2587](https://ext.dcloud.net.cn/plugin?id=2587)
+7. 云端一体垂直布局，无图模式，主标题+副标题：[https://ext.dcloud.net.cn/plugin?id=2588](https://ext.dcloud.net.cn/plugin?id=2588)
+
+**商品列表类**
+
+1. 云端一体列表/宫格视图互切：[https://ext.dcloud.net.cn/plugin?id=2651](https://ext.dcloud.net.cn/plugin?id=2651)
+2. 云端一体列表（宫格模式）：[https://ext.dcloud.net.cn/plugin?id=2671](https://ext.dcloud.net.cn/plugin?id=2671)
+3. 云端一体列表（列表模式）：[https://ext.dcloud.net.cn/plugin?id=2672](https://ext.dcloud.net.cn/plugin?id=2672)
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/list/list](https://hellouniapp.dcloud.net.cn/pages/extUI/list/list)
\ No newline at end of file
diff --git a/uni_modules/uni-load-more/changelog.md b/uni_modules/uni-load-more/changelog.md
new file mode 100644
index 0000000..8f03f1d
--- /dev/null
+++ b/uni_modules/uni-load-more/changelog.md
@@ -0,0 +1,19 @@
+## 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..e5eff4d
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -0,0 +1,399 @@
+<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(() => {
+		platform = uni.getSystemInfoSync().platform
+	}, 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+ALSwAAA6CSURBVHja1FsLkFZV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'
+			}
+		},
+		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..2fa6f04
--- /dev/null
+++ b/uni_modules/uni-load-more/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-load-more",
+  "displayName": "uni-load-more 加载更多",
+  "version": "1.3.3",
+  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "加载更多",
+    "load-more"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-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-nav-bar/changelog.md b/uni_modules/uni-nav-bar/changelog.md
new file mode 100644
index 0000000..c2d841b
--- /dev/null
+++ b/uni_modules/uni-nav-bar/changelog.md
@@ -0,0 +1,39 @@
+## 1.3.5（2022-05-24）
+- 新增 stat 属性 ，可开启统计title 上报 ，仅使用了title 属性且项目开启了uni统计生效
+## 1.3.4（2022-01-24）
+- 更新 组件示例
+## 1.3.3（2022-01-24）
+- 新增 left-width/right-width属性 ，可修改左右两侧的宽度
+## 1.3.2（2022-01-18）
+- 修复 在vue下，标题不垂直居中的bug
+## 1.3.1（2022-01-18）
+- 修复 height 属性类型错误
+## 1.3.0（2022-01-18）
+- 新增 height 属性,可修改组件高度
+- 新增 dark 属性可可开启暗黑模式
+- 优化 标题字数过多显示省略号
+- 优化 插槽，插入内容可完全覆盖
+## 1.2.1（2022-01-10）
+- 修复 color 属性不生效的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-nav-bar](https://uniapp.dcloud.io/component/uniui/uni-nav-bar)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.11（2021-05-12）
+- 新增 组件示例地址
+## 1.0.10（2021-04-30）
+- 修复 在nvue下fixed为true，宽度不能撑满的Bug
+## 1.0.9（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.8（2021-04-14）
+- uni-ui 修复 uni-nav-bar 当 fixed 属性为 true 时铺不满屏幕的 bug
+
+## 1.0.7（2021-02-25）
+- 修复 easycom 下，找不到 uni-status-bar 的bug
+
+## 1.0.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
new file mode 100644
index 0000000..cbfc168
--- /dev/null
+++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
@@ -0,0 +1,348 @@
+<template>
+	<view class="uni-navbar" :class="{'uni-dark':dark}">
+		<view :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
+			:style="{ 'background-color': themeBgColor }" class="uni-navbar__content">
+			<status-bar v-if="statusBar" />
+			<view :style="{ color: themeColor,backgroundColor: themeBgColor ,height:navbarHeight}"
+				class="uni-navbar__header">
+				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left"
+					:style="{width:leftIconWidth}">
+					<slot name="left">
+						<view class="uni-navbar__content_view" v-if="leftIcon.length > 0">
+							<uni-icons :color="themeColor" :type="leftIcon" size="20" />
+						</view>
+						<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length > 0 }" class="uni-navbar-btn-text"
+							v-if="leftText.length">
+							<text :style="{ color: themeColor, fontSize: '12px' }">{{ leftText }}</text>
+						</view>
+					</slot>
+				</view>
+				<view class="uni-navbar__header-container " @tap="onClickTitle">
+					<slot>
+						<view class="uni-navbar__header-container-inner" v-if="title.length>0">
+							<text class="uni-nav-bar-text uni-ellipsis-1"
+								:style="{color: themeColor }">{{ title }}</text>
+						</view>
+					</slot>
+				</view>
+				<view @click="onClickRight" class="uni-navbar__header-btns uni-navbar__header-btns-right"
+					:style="{width:rightIconWidth}">
+					<slot name="right">
+						<view v-if="rightIcon.length">
+							<uni-icons :color="themeColor" :type="rightIcon" size="22" />
+						</view>
+						<view class="uni-navbar-btn-text" v-if="rightText.length && !rightIcon.length">
+							<text class="uni-nav-bar-right-text" :style="{ color: themeColor}">{{ rightText }}</text>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+		<view class="uni-navbar__placeholder" v-if="fixed">
+			<status-bar v-if="statusBar" />
+			<view class="uni-navbar__placeholder-view" :style="{ height:navbarHeight}" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import statusBar from "./uni-status-bar.vue";
+	const getVal = (val) => typeof val === 'number' ? val + 'px' : val;
+
+	/**
+	 * NavBar 自定义导航栏
+	 * @description 导航栏组件，主要用于头部导航
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=52
+	 * @property {Boolean} dark 开启黑暗模式
+	 * @property {String} title 标题文字
+	 * @property {String} leftText 左侧按钮文本
+	 * @property {String} rightText 右侧按钮文本
+	 * @property {String} leftIcon 左侧按钮图标（图标类型参考 [Icon 图标](http://ext.dcloud.net.cn/plugin?id=28) type 属性）
+	 * @property {String} rightIcon 右侧按钮图标（图标类型参考 [Icon 图标](http://ext.dcloud.net.cn/plugin?id=28) type 属性）
+	 * @property {String} color 图标和文字颜色
+	 * @property {String} backgroundColor 导航栏背景颜色
+	 * @property {Boolean} fixed = [true|false] 是否固定顶部
+	 * @property {Boolean} statusBar = [true|false] 是否包含状态栏
+	 * @property {Boolean} shadow = [true|false] 导航栏下是否有阴影
+	 * @property {Boolean} stat 是否开启统计标题上报
+	 * @event {Function} clickLeft 左侧按钮点击时触发
+	 * @event {Function} clickRight 右侧按钮点击时触发
+	 * @event {Function} clickTitle 中间标题点击时触发
+	 */
+	export default {
+		name: "UniNavBar",
+		components: {
+			statusBar
+		},
+		emits: ['clickLeft', 'clickRight', 'clickTitle'],
+		props: {
+			dark: {
+				type: Boolean,
+				default: false
+			},
+			title: {
+				type: String,
+				default: ""
+			},
+			leftText: {
+				type: String,
+				default: ""
+			},
+			rightText: {
+				type: String,
+				default: ""
+			},
+			leftIcon: {
+				type: String,
+				default: ""
+			},
+			rightIcon: {
+				type: String,
+				default: ""
+			},
+			fixed: {
+				type: [Boolean, String],
+				default: false
+			},
+			color: {
+				type: String,
+				default: ""
+			},
+			backgroundColor: {
+				type: String,
+				default: ""
+			},
+			statusBar: {
+				type: [Boolean, String],
+				default: false
+			},
+			shadow: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			height: {
+				type: [Number, String],
+				default: 44
+			},
+			leftWidth: {
+				type: [Number, String],
+				default: 60
+			},
+			rightWidth: {
+				type: [Number, String],
+				default: 60
+			},
+			stat: {
+				type: [Boolean, String],
+				default: ''
+			}
+		},
+		computed: {
+			themeBgColor() {
+				if (this.dark) {
+					// 默认值
+					if (this.backgroundColor) {
+						return this.backgroundColor
+					} else {
+						return this.dark ? '#333' : '#FFF'
+					}
+				}
+				return this.backgroundColor || '#FFF'
+			},
+			themeColor() {
+				if (this.dark) {
+					// 默认值
+					if (this.color) {
+						return this.color
+					} else {
+						return this.dark ? '#fff' : '#333'
+					}
+				}
+				return this.color || '#333'
+			},
+			navbarHeight() {
+				return getVal(this.height)
+			},
+			leftIconWidth() {
+				return getVal(this.leftWidth)
+			},
+			rightIconWidth() {
+				return getVal(this.rightWidth)
+			}
+		},
+		mounted() {
+			if (uni.report && this.stat && this.title !== '') {
+				uni.report('title', this.title)
+			}
+		},
+		methods: {
+			onClickLeft() {
+				this.$emit("clickLeft");
+			},
+			onClickRight() {
+				this.$emit("clickRight");
+			},
+			onClickTitle() {
+				this.$emit("clickTitle");
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$nav-height: 44px;
+
+	.uni-navbar {
+		// box-sizing: border-box;
+	}
+
+	.uni-nav-bar-text {
+		/* #ifdef APP-PLUS */
+		font-size: 34rpx;
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		font-size: 14px;
+		/* #endif */
+	}
+
+	.uni-nav-bar-right-text {
+		font-size: 12px;
+	}
+
+	.uni-navbar__content {
+		position: relative;
+		// background-color: #fff;
+		// box-sizing: border-box;
+		background-color: transparent;
+	}
+
+	.uni-navbar__content_view {
+		// box-sizing: border-box;
+	}
+
+	.uni-navbar-btn-text {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: flex-start;
+		align-items: center;
+		line-height: 12px;
+	}
+
+	.uni-navbar__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding: 0 10px;
+		flex-direction: row;
+		height: $nav-height;
+		font-size: 12px;
+	}
+
+	.uni-navbar__header-btns {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		display: flex;
+		/* #endif */
+		flex-wrap: nowrap;
+		flex-direction: row;
+		width: 120rpx;
+		// padding: 0 6px;
+		justify-content: center;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-navbar__header-btns-left {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		width: 120rpx;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.uni-navbar__header-btns-right {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		// width: 150rpx;
+		// padding-right: 30rpx;
+		justify-content: flex-end;
+		align-items: center;
+	}
+
+	.uni-navbar__header-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		padding: 0 10px;
+		overflow: hidden;
+	}
+
+	.uni-navbar__header-container-inner {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		font-size: 12px;
+		overflow: hidden;
+		// box-sizing: border-box;
+	}
+
+
+	.uni-navbar__placeholder-view {
+		height: $nav-height;
+	}
+
+	.uni-navbar--fixed {
+		position: fixed;
+		z-index: 998;
+		/* #ifdef H5 */
+		left: var(--window-left);
+		right: var(--window-right);
+		/* #endif */
+		/* #ifndef H5 */
+		left: 0;
+		right: 0;
+		/* #endif */
+
+	}
+
+	.uni-navbar--shadow {
+		box-shadow: 0 1px 6px #ccc;
+	}
+
+	.uni-navbar--border {
+		border-bottom-width: 1rpx;
+		border-bottom-style: solid;
+		border-bottom-color: #eee;
+	}
+
+	.uni-ellipsis-1 {
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		text-overflow: ellipsis;
+		/* #endif */
+	}
+
+	// 暗主题配置
+	.uni-dark {}
+</style>
diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
new file mode 100644
index 0000000..6a68874
--- /dev/null
+++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
@@ -0,0 +1,27 @@
+<template>
+	<view :style="{ height: statusBarHeight }" class="uni-status-bar">
+		<slot />
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'UniStatusBar',
+		data() {
+			return {
+				statusBarHeight: 20
+			}
+		},
+		mounted() {
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-status-bar {
+		// width: 750rpx;
+		height: 20px;
+		// height: var(--status-bar-height);
+	}
+</style>
diff --git a/uni_modules/uni-nav-bar/package.json b/uni_modules/uni-nav-bar/package.json
new file mode 100644
index 0000000..a69ed4f
--- /dev/null
+++ b/uni_modules/uni-nav-bar/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-nav-bar",
+  "displayName": "uni-nav-bar 自定义导航栏",
+  "version": "1.3.5",
+  "description": "自定义导航栏组件，主要用于头部导航。",
+  "keywords": [
+    "uni-ui",
+    "导航",
+    "导航栏",
+    "自定义导航栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-nav-bar/readme.md b/uni_modules/uni-nav-bar/readme.md
new file mode 100644
index 0000000..3934b32
--- /dev/null
+++ b/uni_modules/uni-nav-bar/readme.md
@@ -0,0 +1,15 @@
+
+
+## NavBar 导航栏
+> **组件名：uni-nav-bar**
+> 代码块： `uNavBar`
+
+导航栏组件，主要用于头部导航。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-nav-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
diff --git a/uni_modules/uni-notice-bar/changelog.md b/uni_modules/uni-notice-bar/changelog.md
new file mode 100644
index 0000000..9ee75a0
--- /dev/null
+++ b/uni_modules/uni-notice-bar/changelog.md
@@ -0,0 +1,16 @@
+## 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-notice-bar](https://uniapp.dcloud.io/component/uniui/uni-notice-bar)
+## 1.1.1（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 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-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.6（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
new file mode 100644
index 0000000..424430d
--- /dev/null
+++ b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue
@@ -0,0 +1,395 @@
+<template>
+	<view v-if="show" class="uni-noticebar" :style="{ backgroundColor: backgroundColor }" @click="onClick">
+		<uni-icons v-if="showIcon === true || showIcon === 'true'" class="uni-noticebar-icon" type="sound"
+			:color="color" size="22" />
+		<view ref="textBox" class="uni-noticebar__content-wrapper"
+			:class="{'uni-noticebar__content-wrapper--scrollable':scrollable, 'uni-noticebar__content-wrapper--single':!scrollable && (single || moreText)}">
+			<view :id="elIdBox" class="uni-noticebar__content"
+				:class="{'uni-noticebar__content--scrollable':scrollable, 'uni-noticebar__content--single':!scrollable && (single || moreText)}">
+				<text :id="elId" ref="animationEle" class="uni-noticebar__content-text"
+					:class="{'uni-noticebar__content-text--scrollable':scrollable,'uni-noticebar__content-text--single':!scrollable && (single || showGetMore)}"
+					:style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay}">{{text}}</text>
+			</view>
+		</view>
+		<view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more uni-cursor-point"
+			@click="clickMore">
+			<text v-if="moreText.length > 0" :style="{ color: moreColor }" class="uni-noticebar__more-text">{{ moreText }}</text>
+			<uni-icons v-else type="right" :color="moreColor" size="16" />
+		</view>
+		<view class="uni-noticebar-close uni-cursor-point" v-if="(showClose === true || showClose === 'true') && (showGetMore === false || showGetMore === 'false')">
+			<uni-icons
+				type="closeempty" :color="color" size="16" @click="close" />
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = weex.requireModule('dom');
+	const animation = weex.requireModule('animation');
+	// #endif
+
+	/**
+	 * NoticeBar 自定义导航栏
+	 * @description 通告栏组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=30
+	 * @property {Number} speed 文字滚动的速度，默认100px/秒
+	 * @property {String} text 显示文字
+	 * @property {String} backgroundColor 背景颜色
+	 * @property {String} color 文字颜色
+	 * @property {String} moreColor 查看更多文字的颜色
+	 * @property {String} moreText 设置“查看更多”的文本
+	 * @property {Boolean} single = [true|false] 是否单行
+	 * @property {Boolean} scrollable = [true|false] 是否滚动，为true时，NoticeBar为单行
+	 * @property {Boolean} showIcon = [true|false] 是否显示左侧喇叭图标
+	 * @property {Boolean} showClose = [true|false] 是否显示左侧关闭按钮
+	 * @property {Boolean} showGetMore = [true|false] 是否显示右侧查看更多图标，为true时，NoticeBar为单行
+	 * @event {Function} click 点击 NoticeBar 触发事件
+	 * @event {Function} close 关闭 NoticeBar 触发事件
+	 * @event {Function} getmore 点击”查看更多“时触发事件
+	 */
+
+	export default {
+		name: 'UniNoticeBar',
+		emits: ['click', 'getmore', 'close'],
+		props: {
+			text: {
+				type: String,
+				default: ''
+			},
+			moreText: {
+				type: String,
+				default: ''
+			},
+			backgroundColor: {
+				type: String,
+				default: '#FFF9EA'
+			},
+			speed: {
+				// 默认1s滚动100px
+				type: Number,
+				default: 100
+			},
+			color: {
+				type: String,
+				default: '#FF9A43'
+			},
+			moreColor: {
+				type: String,
+				default: '#FF9A43'
+			},
+			single: {
+				// 是否单行
+				type: [Boolean, String],
+				default: false
+			},
+			scrollable: {
+				// 是否滚动，添加后控制单行效果取消
+				type: [Boolean, String],
+				default: false
+			},
+			showIcon: {
+				// 是否显示左侧icon
+				type: [Boolean, String],
+				default: false
+			},
+			showGetMore: {
+				// 是否显示右侧查看更多
+				type: [Boolean, String],
+				default: false
+			},
+			showClose: {
+				// 是否显示左侧关闭按钮
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		data() {
+			const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			const elIdBox = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+			return {
+				textWidth: 0,
+				boxWidth: 0,
+				wrapWidth: '',
+				webviewHide: false,
+				// #ifdef APP-NVUE
+				stopAnimation: false,
+				// #endif
+				elId: elId,
+				elIdBox: elIdBox,
+				show: true,
+				animationDuration: 'none',
+				animationPlayState: 'paused',
+				animationDelay: '0s'
+			}
+		},
+		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
+			this.$nextTick(() => {
+				this.initSize()
+			})
+		},
+		// #ifdef APP-NVUE
+		beforeDestroy() {
+			this.stopAnimation = true
+		},
+		// #endif
+		methods: {
+			initSize() {
+				if (this.scrollable) {
+					// #ifndef APP-NVUE
+					let query = [],
+						boxWidth = 0,
+						textWidth = 0;
+					let textQuery = new Promise((resolve, reject) => {
+						uni.createSelectorQuery()
+							// #ifndef MP-ALIPAY
+							.in(this)
+							// #endif
+							.select(`#${this.elId}`)
+							.boundingClientRect()
+							.exec(ret => {
+								this.textWidth = ret[0].width
+								resolve()
+							})
+					})
+					let boxQuery = new Promise((resolve, reject) => {
+						uni.createSelectorQuery()
+							// #ifndef MP-ALIPAY
+							.in(this)
+							// #endif
+							.select(`#${this.elIdBox}`)
+							.boundingClientRect()
+							.exec(ret => {
+								this.boxWidth = ret[0].width
+								resolve()
+							})
+					})
+					query.push(textQuery)
+					query.push(boxQuery)
+					Promise.all(query).then(() => {
+						this.animationDuration = `${this.textWidth / this.speed}s`
+						this.animationDelay = `-${this.boxWidth / this.speed}s`
+						setTimeout(() => {
+							this.animationPlayState = 'running'
+						}, 1000)
+					})
+					// #endif
+					// #ifdef APP-NVUE
+					dom.getComponentRect(this.$refs['animationEle'], (res) => {
+						let winWidth = uni.getSystemInfoSync().windowWidth
+						this.textWidth = res.size.width
+						animation.transition(this.$refs['animationEle'], {
+							styles: {
+								transform: `translateX(-${winWidth}px)`
+							},
+							duration: 0,
+							timingFunction: 'linear',
+							delay: 0
+						}, () => {
+							if (!this.stopAnimation) {
+								animation.transition(this.$refs['animationEle'], {
+									styles: {
+										transform: `translateX(-${this.textWidth}px)`
+									},
+									timingFunction: 'linear',
+									duration: (this.textWidth - winWidth) / this.speed * 1000,
+									delay: 1000
+								}, () => {
+									if (!this.stopAnimation) {
+										this.loopAnimation()
+									}
+								});
+							}
+						});
+					})
+					// #endif
+				}
+				// #ifdef APP-NVUE
+				if (!this.scrollable && (this.single || this.moreText)) {
+					dom.getComponentRect(this.$refs['textBox'], (res) => {
+						this.wrapWidth = res.size.width
+					})
+				}
+				// #endif
+			},
+			loopAnimation() {
+				// #ifdef APP-NVUE
+				animation.transition(this.$refs['animationEle'], {
+					styles: {
+						transform: `translateX(0px)`
+					},
+					duration: 0
+				}, () => {
+					if (!this.stopAnimation) {
+						animation.transition(this.$refs['animationEle'], {
+							styles: {
+								transform: `translateX(-${this.textWidth}px)`
+							},
+							duration: this.textWidth / this.speed * 1000,
+							timingFunction: 'linear',
+							delay: 0
+						}, () => {
+							if (!this.stopAnimation) {
+								this.loopAnimation()
+							}
+						});
+					}
+				});
+				// #endif
+			},
+			clickMore() {
+				this.$emit('getmore')
+			},
+			close() {
+				this.show = false;
+				this.$emit('close')
+			},
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-noticebar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		width: 100%;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 10px 12px;
+		margin-bottom: 10px;
+	}
+
+	.uni-cursor-point {
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-noticebar-close {
+		margin-left: 8px;
+		margin-right: 5px;
+	}
+
+	.uni-noticebar-icon {
+		margin-right: 5px;
+	}
+
+	.uni-noticebar__content-wrapper {
+		flex: 1;
+		flex-direction: column;
+		overflow: hidden;
+	}
+
+	.uni-noticebar__content-wrapper--single {
+		/* #ifndef APP-NVUE */
+		line-height: 18px;
+		/* #endif */
+	}
+
+	.uni-noticebar__content-wrapper--single,
+	.uni-noticebar__content-wrapper--scrollable {
+		flex-direction: row;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-noticebar__content-wrapper--scrollable {
+		position: relative;
+		height: 18px;
+	}
+
+	/* #endif */
+
+	.uni-noticebar__content--scrollable {
+		/* #ifdef APP-NVUE */
+		flex: 0;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		flex: 1;
+		display: block;
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.uni-noticebar__content--single {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex: none;
+		width: 100%;
+		justify-content: center;
+		/* #endif */
+	}
+
+	.uni-noticebar__content-text {
+		font-size: 14px;
+		line-height: 18px;
+		/* #ifndef APP-NVUE */
+		word-break: break-all;
+		/* #endif */
+	}
+
+	.uni-noticebar__content-text--single {
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: block;
+		width: 100%;
+		white-space: nowrap;
+		/* #endif */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.uni-noticebar__content-text--scrollable {
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		padding-left: 750rpx;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		position: absolute;
+		display: block;
+		height: 18px;
+		line-height: 18px;
+		white-space: nowrap;
+		padding-left: 100%;
+		animation: notice 10s 0s linear infinite both;
+		animation-play-state: paused;
+		/* #endif */
+	}
+
+	.uni-noticebar__more {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-items: center;
+		padding-left: 5px;
+	}
+
+	.uni-noticebar__more-text {
+		font-size: 14px;
+	}
+
+	@keyframes notice {
+		100% {
+			transform: translate3d(-100%, 0, 0);
+		}
+	}
+</style>
diff --git a/uni_modules/uni-notice-bar/package.json b/uni_modules/uni-notice-bar/package.json
new file mode 100644
index 0000000..97719a0
--- /dev/null
+++ b/uni_modules/uni-notice-bar/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-notice-bar",
+  "displayName": "uni-notice-bar 通告栏",
+  "version": "1.2.0",
+  "description": "NoticeBar 通告栏组件，常用于展示公告信息，可设为滚动公告",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "通告栏",
+    "公告",
+    "跑马灯"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-notice-bar/readme.md b/uni_modules/uni-notice-bar/readme.md
new file mode 100644
index 0000000..fb2ede2
--- /dev/null
+++ b/uni_modules/uni-notice-bar/readme.md
@@ -0,0 +1,13 @@
+
+
+## NoticeBar 通告栏
+> **组件名：uni-notice-bar**
+> 代码块： `uNoticeBar`
+
+
+通告栏组件 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-notice-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-number-box/changelog.md b/uni_modules/uni-number-box/changelog.md
new file mode 100644
index 0000000..5925c32
--- /dev/null
+++ b/uni_modules/uni-number-box/changelog.md
@@ -0,0 +1,25 @@
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 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-number-box](https://uniapp.dcloud.io/component/uniui/uni-number-box)
+## 1.1.2（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.1.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-04-20）
+- 修复 uni-number-box 浮点数运算不精确的 bug
+- 修复 uni-number-box change 事件触发不正确的 bug
+- 新增 uni-number-box v-model 双向绑定
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+
+## 1.0.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 v-model
+- 新增 支持 focus、blur 事件
+- 新增 支持 PC 端
diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
new file mode 100644
index 0000000..8d255fb
--- /dev/null
+++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="uni-numbox">
+		<view @click="_calcValue('minus')" class="uni-numbox__minus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }" :style="{color}">-</text>
+		</view>
+		<input :disabled="disabled" @focus="_onFocus" @blur="_onBlur" class="uni-numbox__value" type="number"
+			v-model="inputValue" :style="{background, color}" />
+		<view @click="_calcValue('plus')" class="uni-numbox__plus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }" :style="{color}">+</text>
+		</view>
+	</view>
+</template>
+<script>
+	/**
+	 * NumberBox 数字输入框
+	 * @description 带加减按钮的数字输入框
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=31
+	 * @property {Number} value 输入框当前值
+	 * @property {Number} min 最小值
+	 * @property {Number} max 最大值
+	 * @property {Number} step 每次点击改变的间隔大小
+	 * @property {String} background 背景色
+	 * @property {String} color 字体颜色（前景色）
+	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
+	 * @event {Function} change 输入框值改变时触发的事件，参数为输入框当前的 value
+	 * @event {Function} focus 输入框聚焦时触发的事件，参数为 event 对象
+	 * @event {Function} blur 输入框失焦时触发的事件，参数为 event 对象
+	 */
+
+	export default {
+		name: "UniNumberBox",
+		emits: ['change', 'input', 'update:modelValue', 'blur', 'focus'],
+		props: {
+			value: {
+				type: [Number, String],
+				default: 1
+			},
+			modelValue: {
+				type: [Number, String],
+				default: 1
+			},
+			min: {
+				type: Number,
+				default: 0
+			},
+			max: {
+				type: Number,
+				default: 100
+			},
+			step: {
+				type: Number,
+				default: 1
+			},
+			background: {
+				type: String,
+				default: '#f5f5f5'
+			},
+			color: {
+				type: String,
+				default: '#333'
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				inputValue: 0
+			};
+		},
+		watch: {
+			value(val) {
+				this.inputValue = +val;
+			},
+			modelValue(val) {
+				this.inputValue = +val;
+			}
+		},
+		created() {
+			if (this.value === 1) {
+				this.inputValue = +this.modelValue;
+			}
+			if (this.modelValue === 1) {
+				this.inputValue = +this.value;
+			}
+		},
+		methods: {
+			_calcValue(type) {
+				if (this.disabled) {
+					return;
+				}
+				const scale = this._getDecimalScale();
+				let value = this.inputValue * scale;
+				let step = this.step * scale;
+				if (type === "minus") {
+					value -= step;
+					if (value < (this.min * scale)) {
+						return;
+					}
+					if (value > (this.max * scale)) {
+						value = this.max * scale
+					}
+				}
+
+				if (type === "plus") {
+					value += step;
+					if (value > (this.max * scale)) {
+						return;
+					}
+					if (value < (this.min * scale)) {
+						value = this.min * scale
+					}
+				}
+
+				this.inputValue = (value / scale).toFixed(String(scale).length - 1);
+				this.$emit("change", +this.inputValue);
+				// TODO vue2 兼容
+				this.$emit("input", +this.inputValue);
+				// TODO vue3 兼容
+				this.$emit("update:modelValue", +this.inputValue);
+			},
+			_getDecimalScale() {
+
+				let scale = 1;
+				// 浮点型
+				if (~~this.step !== this.step) {
+					scale = Math.pow(10, String(this.step).split(".")[1].length);
+				}
+				return scale;
+			},
+			_onBlur(event) {
+				this.$emit('blur', event)
+				let value = event.detail.value;
+				if (!value) {
+					// this.inputValue = 0;
+					return;
+				}
+				value = +value;
+				if (value > this.max) {
+					value = this.max;
+				} else if (value < this.min) {
+					value = this.min;
+				}
+				const scale = this._getDecimalScale();
+				this.inputValue = value.toFixed(String(scale).length - 1);
+				this.$emit("change", +this.inputValue);
+				this.$emit("input", +this.inputValue);
+			},
+			_onFocus(event) {
+				this.$emit('focus', event)
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	$box-height: 26px;
+	$bg: #f5f5f5;
+	$br: 2px;
+	$color: #333;
+
+	.uni-numbox {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-numbox-btns {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 0 8px;
+		background-color: $bg;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-numbox__value {
+		margin: 0 2px;
+		background-color: $bg;
+		width: 40px;
+		height: $box-height;
+		text-align: center;
+		font-size: 14px;
+		border-left-width: 0;
+		border-right-width: 0;
+		color: $color;
+	}
+
+	.uni-numbox__minus {
+		border-top-left-radius: $br;
+		border-bottom-left-radius: $br;
+	}
+
+	.uni-numbox__plus {
+		border-top-right-radius: $br;
+		border-bottom-right-radius: $br;
+	}
+
+	.uni-numbox--text {
+		// fix nvue
+		line-height: 20px;
+
+		font-size: 20px;
+		font-weight: 300;
+		color: $color;
+	}
+
+	.uni-numbox .uni-numbox--disabled {
+		color: #c0c0c0 !important;
+		/* #ifdef H5 */
+		cursor: not-allowed;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-number-box/package.json b/uni_modules/uni-number-box/package.json
new file mode 100644
index 0000000..ad82336
--- /dev/null
+++ b/uni_modules/uni-number-box/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-number-box",
+  "displayName": "uni-number-box 数字输入框",
+  "version": "1.2.1",
+  "description": "NumberBox 带加减按钮的数字输入框组件，用户可以控制每次点击增加的数值，支持小数。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "数字输入框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-number-box/readme.md b/uni_modules/uni-number-box/readme.md
new file mode 100644
index 0000000..affc56f
--- /dev/null
+++ b/uni_modules/uni-number-box/readme.md
@@ -0,0 +1,13 @@
+
+
+## NumberBox 数字输入框
+> **组件名：uni-number-box**
+> 代码块： `uNumberBox`
+
+
+带加减按钮的数字输入框。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-number-box)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-rate/changelog.md b/uni_modules/uni-rate/changelog.md
new file mode 100644
index 0000000..8a98a61
--- /dev/null
+++ b/uni_modules/uni-rate/changelog.md
@@ -0,0 +1,25 @@
+## 1.3.1（2022-02-25）
+- 修复 条件判断 `NaN` 错误的 bug
+## 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-rate](https://uniapp.dcloud.io/component/uniui/uni-rate)
+## 1.2.2（2021-09-10）
+- 优化 默认值修改为 0 颗星
+## 1.2.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.2.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.2（2021-05-12）
+- 新增 组件示例地址
+## 1.1.1（2021-04-21）
+- 修复 布局变化后 uni-rate  星星计算不准确的 bug
+- 优化 添加依赖 uni-icons, 导入 uni-rate 自动下载依赖
+## 1.1.0（2021-04-16）
+- 修复 uni-rate 属性 margin 值为 string 组件失效的 bug
+
+## 1.0.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.8（2021-02-05）
+- 调整为uni_modules目录规范
+- 支持 pc 端
diff --git a/uni_modules/uni-rate/components/uni-rate/uni-rate.vue b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
new file mode 100644
index 0000000..857f5f9
--- /dev/null
+++ b/uni_modules/uni-rate/components/uni-rate/uni-rate.vue
@@ -0,0 +1,361 @@
+<template>
+	<view>
+		<view ref="uni-rate" class="uni-rate">
+			<view class="uni-rate__icon" :class="{'uni-cursor-not-allowed': disabled}"
+				:style="{ 'margin-right': marginNumber + 'px' }" v-for="(star, index) in stars" :key="index"
+				@touchstart.stop="touchstart" @touchmove.stop="touchmove" @mousedown.stop="mousedown"
+				@mousemove.stop="mousemove" @mouseleave="mouseleave">
+				<uni-icons :color="color" :size="size" :type="isFill ? 'star-filled' : 'star'" />
+				<!-- #ifdef APP-NVUE -->
+				<view :style="{ width: star.activeWitch.replace('%','')*size/100+'px'}" class="uni-rate__icon-on">
+					<uni-icons style="text-align: left;" :color="disabled?'#ccc':activeColor" :size="size"
+						type="star-filled" />
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef APP-NVUE -->
+				<view :style="{ width: star.activeWitch}" class="uni-rate__icon-on">
+					<uni-icons :color="disabled?disabledColor:activeColor" :size="size" type="star-filled" />
+				</view>
+				<!-- #endif -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom');
+	// #endif
+	/**
+	 * Rate 评分
+	 * @description 评分组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=33
+	 * @property {Boolean} 	isFill = [true|false] 		星星的类型，是否为实心类型, 默认为实心
+	 * @property {String} 	color 						未选中状态的星星颜色，默认为 "#ececec"
+	 * @property {String} 	activeColor 				选中状态的星星颜色，默认为 "#ffca3e"
+	 * @property {String} 	disabledColor 				禁用状态的星星颜色，默认为 "#c0c0c0"
+	 * @property {Number} 	size 						星星的大小
+	 * @property {Number} 	value/v-model 				当前评分
+	 * @property {Number} 	max 						最大评分评分数量，目前一分一颗星
+	 * @property {Number} 	margin 						星星的间距，单位 px
+	 * @property {Boolean} 	disabled = [true|false] 	是否为禁用状态，默认为 false
+	 * @property {Boolean} 	readonly = [true|false] 	是否为只读状态，默认为 false
+	 * @property {Boolean} 	allowHalf = [true|false] 	是否实现半星，默认为 false
+	 * @property {Boolean} 	touchable = [true|false] 	是否支持滑动手势，默认为 true
+	 * @event {Function} change 						uniRate 的 value 改变时触发事件，e={value:Number}
+	 */
+
+	export default {
+		name: "UniRate",
+		props: {
+			isFill: {
+				// 星星的类型，是否镂空
+				type: [Boolean, String],
+				default: true
+			},
+			color: {
+				// 星星未选中的颜色
+				type: String,
+				default: "#ececec"
+			},
+			activeColor: {
+				// 星星选中状态颜色
+				type: String,
+				default: "#ffca3e"
+			},
+			disabledColor: {
+				// 星星禁用状态颜色
+				type: String,
+				default: "#c0c0c0"
+			},
+			size: {
+				// 星星的大小
+				type: [Number, String],
+				default: 24
+			},
+			value: {
+				// 当前评分
+				type: [Number, String],
+				default: 0
+			},
+			modelValue: {
+				// 当前评分
+				type: [Number, String],
+				default: 0
+			},
+			max: {
+				// 最大评分
+				type: [Number, String],
+				default: 5
+			},
+			margin: {
+				// 星星的间距
+				type: [Number, String],
+				default: 0
+			},
+			disabled: {
+				// 是否可点击
+				type: [Boolean, String],
+				default: false
+			},
+			readonly: {
+				// 是否只读
+				type: [Boolean, String],
+				default: false
+			},
+			allowHalf: {
+				// 是否显示半星
+				type: [Boolean, String],
+				default: false
+			},
+			touchable: {
+				// 是否支持滑动手势
+				type: [Boolean, String],
+				default: true
+			}
+		},
+		data() {
+			return {
+				valueSync: "",
+				userMouseFristMove: true,
+				userRated: false,
+				userLastRate: 1
+			};
+		},
+		watch: {
+			value(newVal) {
+				this.valueSync = Number(newVal);
+			},
+			modelValue(newVal) {
+				this.valueSync = Number(newVal);
+			},
+		},
+		computed: {
+			stars() {
+				const value = this.valueSync ? this.valueSync : 0;
+				const starList = [];
+				const floorValue = Math.floor(value);
+				const ceilValue = Math.ceil(value);
+				for (let i = 0; i < this.max; i++) {
+					if (floorValue > i) {
+						starList.push({
+							activeWitch: "100%"
+						});
+					} else if (ceilValue - 1 === i) {
+						starList.push({
+							activeWitch: (value - floorValue) * 100 + "%"
+						});
+					} else {
+						starList.push({
+							activeWitch: "0"
+						});
+					}
+				}
+				return starList;
+			},
+
+			marginNumber() {
+				return Number(this.margin)
+			}
+		},
+		created() {
+			this.valueSync = Number(this.value || this.modelValue);
+			this._rateBoxLeft = 0
+			this._oldValue = null
+		},
+		mounted() {
+			setTimeout(() => {
+				this._getSize()
+			}, 100)
+			// #ifdef H5
+			this.PC = this.IsPC()
+			// #endif
+		},
+		methods: {
+			touchstart(e) {
+				// #ifdef H5
+				if (this.IsPC()) return
+				// #endif
+				if (this.readonly || this.disabled) return
+				const {
+					clientX,
+					screenX
+				} = e.changedTouches[0]
+				// TODO 做一下兼容，只有 Nvue 下才有 screenX，其他平台式 clientX
+				this._getRateCount(clientX || screenX)
+			},
+			touchmove(e) {
+				// #ifdef H5
+				if (this.IsPC()) return
+				// #endif
+				if (this.readonly || this.disabled || !this.touchable) return
+				const {
+					clientX,
+					screenX
+				} = e.changedTouches[0]
+				this._getRateCount(clientX || screenX)
+			},
+
+			/**
+			 * 兼容 PC @tian
+			 */
+
+			mousedown(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.readonly || this.disabled) return
+				const {
+					clientX,
+				} = e
+				this.userLastRate = this.valueSync
+				this._getRateCount(clientX)
+				this.userRated = true
+				// #endif
+			},
+			mousemove(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.userRated) return
+				if (this.userMouseFristMove) {
+					console.log('---mousemove----', this.valueSync);
+					this.userLastRate = this.valueSync
+					this.userMouseFristMove = false
+				}
+				if (this.readonly || this.disabled || !this.touchable) return
+				const {
+					clientX,
+				} = e
+				this._getRateCount(clientX)
+				// #endif
+			},
+			mouseleave(e) {
+				// #ifdef H5
+				if (!this.IsPC()) return
+				if (this.readonly || this.disabled || !this.touchable) return
+				if (this.userRated) {
+					this.userRated = false
+					return
+				}
+				this.valueSync = this.userLastRate
+				// #endif
+			},
+			// #ifdef H5
+			IsPC() {
+				var userAgentInfo = navigator.userAgent;
+				var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+				var flag = true;
+				for (let v = 0; v < Agents.length - 1; v++) {
+					if (userAgentInfo.indexOf(Agents[v]) > 0) {
+						flag = false;
+						break;
+					}
+				}
+				return flag;
+			},
+			// #endif
+
+			/**
+			 * 获取星星个数
+			 */
+			_getRateCount(clientX) {
+				this._getSize()
+				const size = Number(this.size)
+				if (isNaN(size)) {
+					return new Error('size 属性只能设置为数字')
+				}
+				const rateMoveRange = clientX - this._rateBoxLeft
+				let index = parseInt(rateMoveRange / (size + this.marginNumber))
+				index = index < 0 ? 0 : index;
+				index = index > this.max ? this.max : index;
+				const range = parseInt(rateMoveRange - (size + this.marginNumber) * index);
+				let value = 0;
+				if (this._oldValue === index && !this.PC) return;
+				this._oldValue = index;
+				if (this.allowHalf) {
+					if (range > (size / 2)) {
+						value = index + 1
+					} else {
+						value = index + 0.5
+					}
+				} else {
+					value = index + 1
+				}
+
+				value = Math.max(0.5, Math.min(value, this.max))
+				this.valueSync = value
+				this._onChange()
+			},
+
+			/**
+			 * 触发动态修改
+			 */
+			_onChange() {
+
+				this.$emit("input", this.valueSync);
+				this.$emit("update:modelValue", this.valueSync);
+				this.$emit("change", {
+					value: this.valueSync
+				});
+			},
+			/**
+			 * 获取星星距离屏幕左侧距离
+			 */
+			_getSize() {
+				// #ifndef APP-NVUE
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.uni-rate')
+					.boundingClientRect()
+					.exec(ret => {
+						if (ret) {
+							this._rateBoxLeft = ret[0].left
+						}
+					})
+				// #endif
+				// #ifdef APP-NVUE
+				dom.getComponentRect(this.$refs['uni-rate'], (ret) => {
+					const size = ret.size
+					if (size) {
+						this._rateBoxLeft = size.left
+					}
+				})
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.uni-rate {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		line-height: 1;
+		font-size: 0;
+		flex-direction: row;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-rate__icon {
+		position: relative;
+		line-height: 1;
+		font-size: 0;
+	}
+
+	.uni-rate__icon-on {
+		overflow: hidden;
+		position: absolute;
+		top: 0;
+		left: 0;
+		line-height: 1;
+		text-align: left;
+	}
+
+	.uni-cursor-not-allowed {
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-rate/package.json b/uni_modules/uni-rate/package.json
new file mode 100644
index 0000000..64e8e33
--- /dev/null
+++ b/uni_modules/uni-rate/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-rate",
+  "displayName": "uni-rate 评分",
+  "version": "1.3.1",
+  "description": "Rate 评分组件，可自定义评分星星图标的大小、间隔、评分数。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "评分"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-rate/readme.md b/uni_modules/uni-rate/readme.md
new file mode 100644
index 0000000..eae7b5c
--- /dev/null
+++ b/uni_modules/uni-rate/readme.md
@@ -0,0 +1,12 @@
+
+
+## Rate 评分
+> **组件名：uni-rate**
+> 代码块： `uRate`
+> 关联组件：`uni-icons`
+
+
+评分组件，多用于购买商品后，对商品进行评价等场景
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-rate)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-row/changelog.md b/uni_modules/uni-row/changelog.md
new file mode 100644
index 0000000..5b465bc
--- /dev/null
+++ b/uni_modules/uni-row/changelog.md
@@ -0,0 +1,10 @@
+## 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-row](https://uniapp.dcloud.io/component/uniui/uni-row)
+## 0.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.0.4（2021-05-12）
+- 新增 组件示例地址
+## 0.0.3（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增uni-row组件
diff --git a/uni_modules/uni-row/components/uni-col/uni-col.vue b/uni_modules/uni-row/components/uni-col/uni-col.vue
new file mode 100644
index 0000000..84e2deb
--- /dev/null
+++ b/uni_modules/uni-row/components/uni-col/uni-col.vue
@@ -0,0 +1,317 @@
+<template>
+	<!-- #ifndef APP-NVUE -->
+	<view :class="['uni-col', sizeClass, pointClassList]" :style="{
+		paddingLeft:`${Number(gutter)}rpx`,
+		paddingRight:`${Number(gutter)}rpx`,
+	}">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<!-- 在nvue上，类名样式不生效，换为style -->
+	<!-- 设置right正值失效，设置 left 负值 -->
+	<view :class="['uni-col']" :style="{
+		paddingLeft:`${Number(gutter)}rpx`,
+		paddingRight:`${Number(gutter)}rpx`,
+		width:`${nvueWidth}rpx`,
+		position:'relative',
+		marginLeft:`${marginLeft}rpx`,
+		left:`${right === 0 ? left : -right}rpx`
+	}">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+</template>
+
+<script>
+	/**
+	 * Col	布局-列
+	 * @description	搭配uni-row使用，构建布局。
+	 * @tutorial	https://ext.dcloud.net.cn/plugin?id=3958
+	 *
+	 * @property	{span} type = Number 栅格占据的列数
+	 * 						默认 24
+	 * @property	{offset} type = Number 栅格左侧的间隔格数
+	 * @property	{push} type = Number 栅格向右移动格数
+	 * @property	{pull} type = Number 栅格向左移动格数
+	 * @property	{xs} type = [Number, Object] <768px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{sm} type = [Number, Object] ≥768px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{md} type = [Number, Object] ≥992px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{lg} type = [Number, Object] ≥1200px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{xl} type = [Number, Object] ≥1920px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 */
+	const ComponentClass = 'uni-col';
+
+	// -1 默认值，因为在微信小程序端只给Number会有默认值0
+	export default {
+		name: 'uniCol',
+		// #ifdef MP-WEIXIN
+		options: {
+			virtualHost: true // 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现
+		},
+		// #endif
+		props: {
+			span: {
+				type: Number,
+				default: 24
+			},
+			offset: {
+				type: Number,
+				default: -1
+			},
+			pull: {
+				type: Number,
+				default: -1
+			},
+			push: {
+				type: Number,
+				default: -1
+			},
+			xs: [Number, Object],
+			sm: [Number, Object],
+			md: [Number, Object],
+			lg: [Number, Object],
+			xl: [Number, Object]
+		},
+		data() {
+			return {
+				gutter: 0,
+				sizeClass: '',
+				parentWidth: 0,
+				nvueWidth: 0,
+				marginLeft: 0,
+				right: 0,
+				left: 0
+			}
+		},
+		created() {
+			// 字节小程序中，在computed中读取$parent为undefined
+			let parent = this.$parent;
+
+			while (parent && parent.$options.componentName !== 'uniRow') {
+				parent = parent.$parent;
+			}
+
+			this.updateGutter(parent.gutter)
+			parent.$watch('gutter', (gutter) => {
+				this.updateGutter(gutter)
+			})
+
+			// #ifdef APP-NVUE
+			this.updateNvueWidth(parent.width)
+			parent.$watch('width', (width) => {
+				this.updateNvueWidth(width)
+			})
+			// #endif
+		},
+		computed: {
+			sizeList() {
+				let {
+					span,
+					offset,
+					pull,
+					push
+				} = this;
+
+				return {
+					span,
+					offset,
+					pull,
+					push
+				}
+			},
+			// #ifndef APP-NVUE
+			pointClassList() {
+				let classList = [];
+
+				['xs', 'sm', 'md', 'lg', 'xl'].forEach(point => {
+					const props = this[point];
+					if (typeof props === 'number') {
+						classList.push(`${ComponentClass}-${point}-${props}`)
+					} else if (typeof props === 'object' && props) {
+						Object.keys(props).forEach(pointProp => {
+							classList.push(
+								pointProp === 'span' ?
+								`${ComponentClass}-${point}-${props[pointProp]}` :
+								`${ComponentClass}-${point}-${pointProp}-${props[pointProp]}`
+							)
+						})
+					}
+				});
+
+				// 支付宝小程序使用 :class=[ ['a','b'] ]，渲染错误
+				return classList.join(' ');
+			}
+			// #endif
+		},
+		methods: {
+			updateGutter(parentGutter) {
+				parentGutter = Number(parentGutter);
+				if (!isNaN(parentGutter)) {
+					this.gutter = parentGutter / 2
+				}
+			},
+			// #ifdef APP-NVUE
+			updateNvueWidth(width) {
+				// 用于在nvue端，span，offset，pull，push的计算
+				this.parentWidth = width;
+				['span', 'offset', 'pull', 'push'].forEach(size => {
+					const curSize = this[size];
+					if ((curSize || curSize === 0) && curSize !== -1) {
+						let RPX = 1 / 24 * curSize * width
+						RPX = Number(RPX);
+						switch (size) {
+							case 'span':
+								this.nvueWidth = RPX
+								break;
+							case 'offset':
+								this.marginLeft = RPX
+								break;
+							case 'pull':
+								this.right = RPX
+								break;
+							case 'push':
+								this.left = RPX
+								break;
+						}
+					}
+				});
+			}
+			// #endif
+		},
+		watch: {
+			sizeList: {
+				immediate: true,
+				handler(newVal) {
+					// #ifndef APP-NVUE
+					let classList = [];
+					for (let size in newVal) {
+						const curSize = newVal[size];
+						if ((curSize || curSize === 0) && curSize !== -1) {
+							classList.push(
+								size === 'span' ?
+								`${ComponentClass}-${curSize}` :
+								`${ComponentClass}-${size}-${curSize}`
+							)
+						}
+					}
+					// 支付宝小程序使用 :class=[ ['a','b'] ]，渲染错误
+					this.sizeClass = classList.join(' ');
+					// #endif
+					// #ifdef APP-NVUE
+					this.updateNvueWidth(this.parentWidth);
+					// #endif
+				}
+			}
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+	/* breakpoints */
+	$--sm: 768px !default;
+	$--md: 992px !default;
+	$--lg: 1200px !default;
+	$--xl: 1920px !default;
+
+	$breakpoints: ('xs' : (max-width: $--sm - 1),
+	'sm' : (min-width: $--sm),
+	'md' : (min-width: $--md),
+	'lg' : (min-width: $--lg),
+	'xl' : (min-width: $--xl));
+
+	$layout-namespace: ".uni-";
+	$col: $layout-namespace+"col";
+
+	@function getSize($size) {
+		/* TODO 1/24 * $size * 100 * 1%; 使用计算后的值，为了解决 vue3 控制台报错 */
+		@return 0.04166666666 * $size * 100 * 1%;
+	}
+
+	@mixin res($key, $map:$breakpoints) {
+		@if map-has-key($map, $key) {
+			@media screen and #{inspect(map-get($map,$key))} {
+				@content;
+			}
+		}
+
+		@else {
+			@warn "Undeinfed point: `#{$key}`";
+		}
+	}
+
+	/* #ifndef APP-NVUE */
+	#{$col} {
+		float: left;
+		box-sizing: border-box;
+	}
+
+	#{$col}-0 {
+		/* #ifdef APP-NVUE */
+		width: 0;
+		height: 0;
+		margin-top: 0;
+		margin-right: 0;
+		margin-bottom: 0;
+		margin-left: 0;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: none;
+		/* #endif */
+	}
+
+	@for $i from 0 through 24 {
+		#{$col}-#{$i} {
+			width: getSize($i);
+		}
+
+		#{$col}-offset-#{$i} {
+			margin-left: getSize($i);
+		}
+
+		#{$col}-pull-#{$i} {
+			position: relative;
+			right: getSize($i);
+		}
+
+		#{$col}-push-#{$i} {
+			position: relative;
+			left: getSize($i);
+		}
+	}
+
+	@each $point in map-keys($breakpoints) {
+		@include res($point) {
+			#{$col}-#{$point}-0 {
+				display: none;
+			}
+
+			@for $i from 0 through 24 {
+				#{$col}-#{$point}-#{$i} {
+					width: getSize($i);
+				}
+
+				#{$col}-#{$point}-offset-#{$i} {
+					margin-left: getSize($i);
+				}
+
+				#{$col}-#{$point}-pull-#{$i} {
+					position: relative;
+					right: getSize($i);
+				}
+
+				#{$col}-#{$point}-push-#{$i} {
+					position: relative;
+					left: getSize($i);
+				}
+			}
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-row/components/uni-row/uni-row.vue b/uni_modules/uni-row/components/uni-row/uni-row.vue
new file mode 100644
index 0000000..f8e8542
--- /dev/null
+++ b/uni_modules/uni-row/components/uni-row/uni-row.vue
@@ -0,0 +1,190 @@
+<template>
+	<view :class="[ 'uni-row', typeClass , justifyClass, alignClass, ]" :style="{
+		marginLeft:`${Number(marginValue)}rpx`,
+		marginRight:`${Number(marginValue)}rpx`,
+	}">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	const ComponentClass = 'uni-row';
+	const modifierSeparator = '--';
+	/**
+	 * Row	布局-行
+	 * @description	流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。
+	 * @tutorial	https://ext.dcloud.net.cn/plugin?id=3958
+	 *
+	 * @property	{gutter} type = Number 栅格间隔
+	 * @property	{justify} type = String flex 布局下的水平排列方式
+	 * 						可选	start/end/center/space-around/space-between	start
+	 * 						默认值	start
+	 * @property	{align} type = String flex 布局下的垂直排列方式
+	 * 						可选	top/middle/bottom
+	 * 						默认值	top
+	 * @property	{width} type = String|Number nvue下需要自行配置宽度用于计算
+	 * 						默认值 750
+	 */
+
+
+	export default {
+		name: 'uniRow',
+		componentName: 'uniRow',
+		// #ifdef MP-WEIXIN
+		options: {
+			virtualHost: true // 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现，可使用flex布局
+		},
+		// #endif
+		props: {
+			type: String,
+			gutter: Number,
+			justify: {
+				type: String,
+				default: 'start'
+			},
+			align: {
+				type: String,
+				default: 'top'
+			},
+			// nvue如果使用span等属性，需要配置宽度
+			width: {
+				type: [String, Number],
+				default: 750
+			}
+		},
+		created() {
+			// #ifdef APP-NVUE
+			this.type = 'flex';
+			// #endif
+		},
+		computed: {
+			marginValue() {
+				// #ifndef APP-NVUE
+				if (this.gutter) {
+					return -(this.gutter / 2);
+				}
+				// #endif
+				return 0;
+			},
+			typeClass() {
+				return this.type === 'flex' ? `${ComponentClass + modifierSeparator}flex` : '';
+			},
+			justifyClass() {
+				return this.justify !== 'start' ? `${ComponentClass + modifierSeparator}flex-justify-${this.justify}` : ''
+			},
+			alignClass() {
+				return this.align !== 'top' ? `${ComponentClass + modifierSeparator}flex-align-${this.align}` : ''
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$layout-namespace: ".uni-";
+	$row:$layout-namespace+"row";
+	$modifier-separator: "--";
+
+	@mixin utils-clearfix {
+		$selector: &;
+
+		@at-root {
+
+			/* #ifndef APP-NVUE */
+			#{$selector}::before,
+			#{$selector}::after {
+				display: table;
+				content: "";
+			}
+
+			#{$selector}::after {
+				clear: both;
+			}
+
+			/* #endif */
+		}
+
+	}
+
+	@mixin utils-flex ($direction: row) {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: $direction;
+	}
+
+	@mixin set-flex($state) {
+		@at-root &-#{$state} {
+			@content
+		}
+	}
+
+	#{$row} {
+		position: relative;
+		flex-direction: row;
+
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+
+		// 非nvue使用float布局
+		@include utils-clearfix;
+
+		// 在QQ、字节、百度小程序平台，编译后使用shadow dom，不可使用flex布局，使用float
+		@at-root {
+
+			/* #ifndef MP-QQ || MP-TOUTIAO || MP-BAIDU */
+			&#{$modifier-separator}flex {
+				@include utils-flex;
+				flex-wrap: wrap;
+				flex: 1;
+
+				&:before,
+				&:after {
+					/* #ifndef APP-NVUE */
+					display: none;
+					/* #endif */
+				}
+
+				@include set-flex(justify-center) {
+					justify-content: center;
+				}
+
+				@include set-flex(justify-end) {
+					justify-content: flex-end;
+				}
+
+				@include set-flex(justify-space-between) {
+					justify-content: space-between;
+				}
+
+				@include set-flex(justify-space-around) {
+					justify-content: space-around;
+				}
+
+				@include set-flex(align-middle) {
+					align-items: center;
+				}
+
+				@include set-flex(align-bottom) {
+					align-items: flex-end;
+				}
+			}
+
+			/* #endif */
+		}
+
+	}
+
+	// 字节、QQ配置后不生效
+	// 此处用法无法使用scoped
+	/* #ifdef MP-WEIXIN || MP-TOUTIAO || MP-QQ */
+	:host {
+		display: block;
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-row/package.json b/uni_modules/uni-row/package.json
new file mode 100644
index 0000000..3f52fa6
--- /dev/null
+++ b/uni_modules/uni-row/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-row",
+  "displayName": "uni-row 布局-行",
+  "version": "1.0.0",
+  "description": "流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "栅格",
+    "布局",
+    "layout"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-row/readme.md b/uni_modules/uni-row/readme.md
new file mode 100644
index 0000000..3c9c8b9
--- /dev/null
+++ b/uni_modules/uni-row/readme.md
@@ -0,0 +1,10 @@
+## Layout 布局
+
+> **组件名 uni-row、uni-col**
+> 代码块： `uRow`、`uCol`
+
+
+流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-row)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
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/manifest.json b/uni_modules/uni-scss/manifest.json
new file mode 100644
index 0000000..9f8baee
--- /dev/null
+++ b/uni_modules/uni-scss/manifest.json
@@ -0,0 +1,95 @@
+{
+	"name" : "",
+	"appid" : "",
+	"description": "应用描述",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"modules": {
+			"OAuth": {},
+			"Payment": {},
+			"Push": {},
+			"Share": {},
+			"Speech": {},
+			"VideoPlayer": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
+					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_SMS\"/>",
+					"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+					"<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
+					"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
+					"<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {
+				"UIBackgroundModes": ["audio"]
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"speech": {
+					"ifly": {}
+				}
+			},
+			"orientation": ["portrait-primary"]
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"h5": {
+		"template": "template.h5.html",
+		"router": {
+			"mode": "history",
+			"base": "/h5/"
+		}
+	}
+}
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..b41fdd3
--- /dev/null
+++ b/uni_modules/uni-search-bar/changelog.md
@@ -0,0 +1,33 @@
+## 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..d4e5c12
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json
@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "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..318b6ef
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json
@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "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..2befbcc
--- /dev/null
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
@@ -0,0 +1,298 @@
+<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"
+				@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 {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"
+			},
+			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.$emit("clear", {
+					value: this.searchVal
+				})
+				this.searchVal = ""
+			},
+			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: 5px;
+		// background-color: #fff;
+	}
+
+	.uni-searchbar__box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		overflow: hidden;
+		position: relative;
+		flex: 1;
+		// justify-content: center;
+		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;
+	}
+
+	.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;
+	}
+
+	.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..9352c57
--- /dev/null
+++ b/uni_modules/uni-search-bar/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-search-bar",
+  "displayName": "uni-search-bar 搜索栏",
+  "version": "1.2.3",
+  "description": "搜索栏组件，通常用于搜索商品、文章等",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "搜索框",
+    "搜索栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-segmented-control/changelog.md b/uni_modules/uni-segmented-control/changelog.md
new file mode 100644
index 0000000..a44385d
--- /dev/null
+++ b/uni_modules/uni-segmented-control/changelog.md
@@ -0,0 +1,9 @@
+## 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-segmented-control](https://uniapp.dcloud.io/component/uniui/uni-segmented-control)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.5（2021-05-12）
+- 新增 项目示例地址
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
new file mode 100644
index 0000000..044a495
--- /dev/null
+++ b/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue
@@ -0,0 +1,145 @@
+<template>
+	<view :class="[styleType === 'text'?'segmented-control--text' : 'segmented-control--button' ]"
+		:style="{ borderColor: styleType === 'text' ? '' : activeColor }" class="segmented-control">
+		<view v-for="(item, index) in values" :class="[ styleType === 'text' ? '': 'segmented-control__item--button',
+		index === currentIndex&&styleType === 'button' ? 'segmented-control__item--button--active': '',
+		index === 0&&styleType === 'button' ? 'segmented-control__item--button--first': '',
+			index === values.length - 1&&styleType === 'button' ? 'segmented-control__item--button--last': '' ]" :key="index"
+			:style="{ backgroundColor: index === currentIndex && styleType === 'button' ? activeColor : '',borderColor: index === currentIndex&&styleType === 'text'||styleType === 'button'?activeColor:'transparent' }"
+			class="segmented-control__item" @click="_onClick(index)">
+			<view>
+				<text :style="{color:
+				    index === currentIndex
+				      ? styleType === 'text'
+				        ? activeColor
+				        : '#fff'
+				      : styleType === 'text'
+				        ? '#000'
+				        : activeColor}" class="segmented-control__text" :class="styleType === 'text' && index === currentIndex ? 'segmented-control__item--text': ''">{{ item }}</text>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * SegmentedControl 分段器
+	 * @description 用作不同视图的显示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=54
+	 * @property {Number} current 当前选中的tab索引值，从0计数
+	 * @property {String} styleType = [button|text] 分段器样式类型
+	 * 	@value button 按钮类型
+	 * 	@value text 文字类型
+	 * @property {String} activeColor 选中的标签背景色与边框颜色
+	 * @property {Array} values 选项数组
+	 * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
+	 */
+
+	export default {
+		name: 'UniSegmentedControl',
+		emits: ['clickItem'],
+		props: {
+			current: {
+				type: Number,
+				default: 0
+			},
+			values: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			activeColor: {
+				type: String,
+				default: '#2979FF'
+			},
+			styleType: {
+				type: String,
+				default: 'button'
+			}
+		},
+		data() {
+			return {
+				currentIndex: 0
+			}
+		},
+		watch: {
+			current(val) {
+				if (val !== this.currentIndex) {
+					this.currentIndex = val
+				}
+			}
+		},
+		created() {
+			this.currentIndex = this.current
+		},
+		methods: {
+			_onClick(index) {
+				if (this.currentIndex !== index) {
+					this.currentIndex = index
+					this.$emit('clickItem', {
+						currentIndex: index
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.segmented-control {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: row;
+		height: 36px;
+		overflow: hidden;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.segmented-control__item {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		box-sizing: border-box;
+		/* #endif */
+		position: relative;
+		flex: 1;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.segmented-control__item--button {
+		border-style: solid;
+		border-top-width: 1px;
+		border-bottom-width: 1px;
+		border-right-width: 1px;
+		border-left-width: 0;
+	}
+
+	.segmented-control__item--button--first {
+		border-left-width: 1px;
+		border-top-left-radius: 5px;
+		border-bottom-left-radius: 5px;
+	}
+
+	.segmented-control__item--button--last {
+		border-top-right-radius: 5px;
+		border-bottom-right-radius: 5px;
+	}
+
+	.segmented-control__item--text {
+		border-bottom-style: solid;
+		border-bottom-width: 2px;
+		padding: 6px 0;
+	}
+
+	.segmented-control__text {
+		font-size: 14px;
+		line-height: 20px;
+		text-align: center;
+	}
+</style>
diff --git a/uni_modules/uni-segmented-control/package.json b/uni_modules/uni-segmented-control/package.json
new file mode 100644
index 0000000..6cae41d
--- /dev/null
+++ b/uni_modules/uni-segmented-control/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-segmented-control",
+  "displayName": "uni-segmented-control 分段器",
+  "version": "1.2.0",
+  "description": "分段器由至少 2 个分段控件组成，用作不同视图的显示",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "分段器",
+    "segement",
+    "顶部选择"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-segmented-control/readme.md b/uni_modules/uni-segmented-control/readme.md
new file mode 100644
index 0000000..3527b03
--- /dev/null
+++ b/uni_modules/uni-segmented-control/readme.md
@@ -0,0 +1,13 @@
+
+
+## SegmentedControl 分段器
+> **组件名：uni-segmented-control**
+> 代码块： `uSegmentedControl`
+
+
+用作不同视图的显示
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-segmented-control)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-steps/changelog.md b/uni_modules/uni-steps/changelog.md
new file mode 100644
index 0000000..cb9d367
--- /dev/null
+++ b/uni_modules/uni-steps/changelog.md
@@ -0,0 +1,16 @@
+## 1.1.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.1.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-steps](https://uniapp.dcloud.io/component/uniui/uni-steps)
+## 1.0.8（2021-05-12）
+- 新增 项目示例地址
+## 1.0.7（2021-05-06）
+- 修复 uni-steps 横向布局时，多行文字高度不合理的 bug
+## 1.0.6（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.5（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-steps/components/uni-steps/uni-steps.vue b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
new file mode 100644
index 0000000..a6c8f28
--- /dev/null
+++ b/uni_modules/uni-steps/components/uni-steps/uni-steps.vue
@@ -0,0 +1,269 @@
+<template>
+	<view class="uni-steps">
+		<view :class="[direction==='column'?'uni-steps__column':'uni-steps__row']">
+			<view :class="[direction==='column'?'uni-steps__column-text-container':'uni-steps__row-text-container']">
+				<view v-for="(item,index) in options" :key="index"
+					:class="[direction==='column'?'uni-steps__column-text':'uni-steps__row-text']">
+					<text :style="{color:index === active?activeColor:deactiveColor}"
+						:class="[direction==='column'?'uni-steps__column-title':'uni-steps__row-title']">{{item.title}}</text>
+					<text :style="{color: deactiveColor}"
+						:class="[direction==='column'?'uni-steps__column-desc':'uni-steps__row-desc']">{{item.desc}}</text>
+				</view>
+			</view>
+			<view :class="[direction==='column'?'uni-steps__column-container':'uni-steps__row-container']">
+				<view :class="[direction==='column'?'uni-steps__column-line-item':'uni-steps__row-line-item']"
+					v-for="(item,index) in options" :key="index">
+					<view
+						:class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--before':'uni-steps__row-line--before']"
+						:style="{backgroundColor:index<=active&&index!==0?activeColor:index===0?'transparent':deactiveColor}">
+					</view>
+					<view :class="[direction==='column'?'uni-steps__column-check':'uni-steps__row-check']"
+						v-if="index === active">
+						<uni-icons :color="activeColor" :type="activeIcon" size="14"></uni-icons>
+					</view>
+					<view v-else :class="[direction==='column'?'uni-steps__column-circle':'uni-steps__row-circle']"
+						:style="{backgroundColor:index<active?activeColor:deactiveColor}"></view>
+					<view
+						:class="[direction==='column'?'uni-steps__column-line':'uni-steps__row-line',direction==='column'?'uni-steps__column-line--after':'uni-steps__row-line--after']"
+						:style="{backgroundColor:index<active&&index!==options.length-1?activeColor:index===options.length-1?'transparent':deactiveColor}">
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Steps 步骤条
+	 * @description 评分组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=34
+	 * @property {Number} active 当前步骤
+	 * @property {String} direction = [row|column] 当前步骤
+	 * 	@value row 横向
+	 * 	@value column 纵向
+	 * @property {String} activeColor 选中状态的颜色
+	 * @property {Array} options 数据源，格式为：[{title:'xxx',desc:'xxx'},{title:'xxx',desc:'xxx'}]
+	 */
+
+	export default {
+		name: 'UniSteps',
+		props: {
+			direction: {
+				// 排列方向 row column
+				type: String,
+				default: 'row'
+			},
+			activeColor: {
+				// 激活状态颜色
+				type: String,
+				default: '#2979FF'
+			},
+			deactiveColor: {
+				// 未激活状态颜色
+				type: String,
+				default: '#B7BDC6'
+			},
+			active: {
+				// 当前步骤
+				type: Number,
+				default: 0
+			},
+			activeIcon: {
+				// 当前步骤
+				type: String,
+				default: 'checkbox-filled'
+			},
+			options: {
+				type: Array,
+				default () {
+					return []
+				}
+			} // 数据
+		},
+		data() {
+			return {}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #2979ff !default;
+	$uni-border-color:#EDEDED;
+	.uni-steps {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		width: 100%;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-steps__row {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-steps__column {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row-reverse;
+	}
+
+	.uni-steps__row-text-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: flex-end;
+		margin-bottom: 8px;
+	}
+
+	.uni-steps__column-text-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		flex: 1;
+	}
+
+	.uni-steps__row-text {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+	}
+
+	.uni-steps__column-text {
+		padding: 6px 0px;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+		border-bottom-color: $uni-border-color;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-steps__row-title {
+		font-size: 14px;
+		line-height: 16px;
+		text-align: center;
+	}
+
+	.uni-steps__column-title {
+		font-size: 14px;
+		text-align: left;
+		line-height: 18px;
+	}
+
+	.uni-steps__row-desc {
+		font-size: 12px;
+		line-height: 14px;
+		text-align: center;
+	}
+
+	.uni-steps__column-desc {
+		font-size: 12px;
+		text-align: left;
+		line-height: 18px;
+	}
+
+	.uni-steps__row-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-steps__column-container {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		width: 30px;
+		flex-direction: column;
+	}
+
+	.uni-steps__row-line-item {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+		height: 14px;
+		line-height: 14px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-steps__column-line-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		flex: 1;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-steps__row-line {
+		flex: 1;
+		height: 1px;
+		background-color: #B7BDC6;
+	}
+
+	.uni-steps__column-line {
+		width: 1px;
+		background-color: #B7BDC6;
+	}
+
+	.uni-steps__row-line--after {
+		transform: translateX(1px);
+	}
+
+	.uni-steps__column-line--after {
+		flex: 1;
+		transform: translate(0px, 1px);
+	}
+
+	.uni-steps__row-line--before {
+		transform: translateX(-1px);
+	}
+
+	.uni-steps__column-line--before {
+		height: 6px;
+		transform: translate(0px, -13px);
+	}
+
+	.uni-steps__row-circle {
+		width: 5px;
+		height: 5px;
+		border-radius: 50%;
+		background-color: #B7BDC6;
+		margin: 0px 3px;
+	}
+
+	.uni-steps__column-circle {
+		width: 5px;
+		height: 5px;
+		border-radius: 50%;
+		background-color: #B7BDC6;
+		margin: 4px 0px 5px 0px;
+	}
+
+	.uni-steps__row-check {
+		margin: 0px 6px;
+	}
+
+	.uni-steps__column-check {
+		height: 14px;
+		line-height: 14px;
+		margin: 2px 0px;
+	}
+</style>
diff --git a/uni_modules/uni-steps/package.json b/uni_modules/uni-steps/package.json
new file mode 100644
index 0000000..c687b40
--- /dev/null
+++ b/uni_modules/uni-steps/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-steps",
+  "displayName": "uni-steps 步骤条",
+  "version": "1.1.1",
+  "description": "步骤条组件，提供横向和纵向两种布局格式。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "步骤条",
+    "时间轴"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-steps/readme.md b/uni_modules/uni-steps/readme.md
new file mode 100644
index 0000000..da7a4bf
--- /dev/null
+++ b/uni_modules/uni-steps/readme.md
@@ -0,0 +1,13 @@
+
+
+## Steps 步骤条
+> **组件名：uni-steps**
+> 代码块： `uSteps`
+
+
+步骤条，常用于显示进度
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-steps)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-swiper-dot/changelog.md b/uni_modules/uni-swiper-dot/changelog.md
new file mode 100644
index 0000000..85cf54d
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/changelog.md
@@ -0,0 +1,12 @@
+## 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-swiper-dot](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.6（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 clickItem 事件，支持指示点控制轮播
+- 新增 支持 pc 可用
diff --git a/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
new file mode 100644
index 0000000..e66b6c7
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
@@ -0,0 +1,218 @@
+<template>
+	<view class="uni-swiper__warp">
+		<slot />
+		<view v-if="mode === 'default'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='default'>
+			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
+        'width': (index === current? dots.width*2:dots.width ) + 'px','height':dots.width/2 +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
+			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-bar" />
+		</view>
+		<view v-if="mode === 'dot'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='dot'>
+			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
+        'width': dots.width + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item" />
+		</view>
+		<view v-if="mode === 'round'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='round'>
+			<view v-for="(item,index) in info" @click="clickItem(index)" :class="[index === current&&'uni-swiper__dots-long']" :style="{
+		    'width':(index === current? dots.width*3:dots.width ) + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item " />
+		</view>
+		<view v-if="mode === 'nav'" key='nav' :style="{'background-color':dotsStyles.backgroundColor,'bottom':'0'}" class="uni-swiper__dots-box uni-swiper__dots-nav">
+			<text :style="{'color':dotsStyles.color}" class="uni-swiper__dots-nav-item">{{ (current+1)+"/"+info.length +' ' +info[current][field] }}</text>
+		</view>
+		<view v-if="mode === 'indexes'" key='indexes' :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box">
+			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
+        'width':dots.width + 'px','height':dots.height +'px' ,'color':index === current?dots.selectedColor:dots.color,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
+			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-indexes"><text class="uni-swiper__dots-indexes-text">{{ index+1 }}</text></view>
+		</view>
+	</view>
+</template>
+
+<script>
+
+	/**
+	 * SwiperDod 轮播图指示点
+	 * @description 自定义轮播图指示点
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=284
+	 * @property {Number} current 当前指示点索引，必须是通过 `swiper` 的 `change` 事件获取到的 `e.detail.current`
+	 * @property {String} mode = [default|round|nav|indexes] 指示点的类型
+	 * 	@value defualt 默认指示点
+	 * 	@value round 圆形指示点
+	 * 	@value nav 条形指示点
+	 * 	@value indexes 索引指示点
+	 * @property {String} field mode 为 nav 时，显示的内容字段（mode = nav 时必填）
+	 * @property {String} info 轮播图的数据，通过数组长度决定指示点个数
+	 * @property {Object} dotsStyles 指示点样式
+	 * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
+	 */
+
+	export default {
+		name: 'UniSwiperDot',
+		emits:['clickItem'],
+		props: {
+			info: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			current: {
+				type: Number,
+				default: 0
+			},
+			dotsStyles: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 类型 ：default(默认) indexes long nav
+			mode: {
+				type: String,
+				default: 'default'
+			},
+			// 只在 nav 模式下生效，变量名称
+			field: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				dots: {
+					width: 6,
+					height: 6,
+					bottom: 10,
+					color: '#fff',
+					backgroundColor: 'rgba(0, 0, 0, .3)',
+					border: '1px rgba(0, 0, 0, .3) solid',
+					selectedBackgroundColor: '#333',
+					selectedBorder: '1px rgba(0, 0, 0, .9) solid'
+				}
+			}
+		},
+		watch: {
+			dotsStyles(newVal) {
+				this.dots = Object.assign(this.dots, this.dotsStyles)
+			},
+			mode(newVal) {
+				if (newVal === 'indexes') {
+					this.dots.width = 14
+					this.dots.height = 14
+				} else {
+					this.dots.width = 6
+					this.dots.height = 6
+				}
+			}
+
+		},
+		created() {
+			if (this.mode === 'indexes') {
+				this.dots.width = 12
+				this.dots.height = 12
+			}
+			this.dots = Object.assign(this.dots, this.dotsStyles)
+		},
+		methods: {
+			clickItem(index) {
+				this.$emit('clickItem', index)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-swiper__warp {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: column;
+		position: relative;
+		overflow: hidden;
+	}
+
+	.uni-swiper__dots-box {
+		position: absolute;
+		bottom: 10px;
+		left: 0;
+		right: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-swiper__dots-item {
+		width: 8px;
+		border-radius: 100px;
+		margin-left: 6px;
+		background-color: rgba(0, 0, 0, 0.4);
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+		/* #ifdef H5 */
+		// border-width: 5px 0;
+		// border-style: solid;
+		// border-color: transparent;
+		// background-clip: padding-box;
+		/* #endif */
+		// transition: width 0.2s linear;  不要取消注释，不然会不能变色
+	}
+
+	.uni-swiper__dots-item:first-child {
+		margin: 0;
+	}
+
+	.uni-swiper__dots-default {
+		border-radius: 100px;
+	}
+
+	.uni-swiper__dots-long {
+		border-radius: 50px;
+	}
+
+	.uni-swiper__dots-bar {
+		border-radius: 50px;
+	}
+
+	.uni-swiper__dots-nav {
+		bottom: 0px;
+		// height: 26px;
+		padding: 8px 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		justify-content: flex-start;
+		align-items: center;
+		background-color: rgba(0, 0, 0, 0.2);
+	}
+
+	.uni-swiper__dots-nav-item {
+		/* overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap; */
+		font-size: 14px;
+		color: #fff;
+		margin: 0 15px;
+	}
+
+	.uni-swiper__dots-indexes {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		// flex: 1;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-swiper__dots-indexes-text {
+		color: #fff;
+		font-size: 12px;
+		line-height: 14px;
+	}
+</style>
diff --git a/uni_modules/uni-swiper-dot/package.json b/uni_modules/uni-swiper-dot/package.json
new file mode 100644
index 0000000..f2dd8d2
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-swiper-dot",
+  "displayName": "uni-swiper-dot 轮播图指示点",
+  "version": "1.2.0",
+  "description": "自定义轮播图指示点组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "轮播图指示点",
+    "dot",
+    "swiper"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-swiper-dot/readme.md b/uni_modules/uni-swiper-dot/readme.md
new file mode 100644
index 0000000..7d397e2
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/readme.md
@@ -0,0 +1,11 @@
+
+
+## SwiperDot 轮播图指示点
+> **组件名：uni-swiper-dot**
+> 代码块： `uSwiperDot`
+
+
+自定义轮播图指示点
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-tag/changelog.md b/uni_modules/uni-tag/changelog.md
new file mode 100644
index 0000000..c0c5839
--- /dev/null
+++ b/uni_modules/uni-tag/changelog.md
@@ -0,0 +1,21 @@
+## 2.1.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-tag](https://uniapp.dcloud.io/component/uniui/uni-tag)
+## 2.0.0（2021-11-09）
+- 新增 提供组件设计资源，组件样式调整
+- 移除 插槽
+- 移除 type 属性的 royal 选项
+## 1.1.1（2021-08-11）
+- type 不是 default 时，size 为 small 字体大小显示不正确
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-06-18）
+- 修复 uni-tag 在字节跳动小程序上 css 类名编译错误的 bug
+## 1.0.6（2021-06-04）
+- 修复 未定义 sass 变量 "$uni-color-royal" 的bug
+## 1.0.5（2021-05-10）
+- 修复 royal 类型无效的bug
+- 修复 uni-tag 宽度不自适应的bug
+- 新增 uni-tag 支持属性 custom-style 自定义样式
+## 1.0.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-tag/components/uni-tag/uni-tag.vue b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
new file mode 100644
index 0000000..418c955
--- /dev/null
+++ b/uni_modules/uni-tag/components/uni-tag/uni-tag.vue
@@ -0,0 +1,252 @@
+<template>
+	<text class="uni-tag" v-if="text" :class="classes" :style="customStyle" @click="onClick">{{text}}</text>
+</template>
+
+<script>
+	/**
+	 * Tag 标签
+	 * @description 用于展示1个或多个文字标签，可点击切换选中、不选中的状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=35
+	 * @property {String} text 标签内容
+	 * @property {String} size = [default|small|mini] 大小尺寸
+	 * 	@value default 正常
+	 * 	@value small 小尺寸
+	 * 	@value mini 迷你尺寸
+	 * @property {String} type = [default|primary|success｜warning｜error]  颜色类型
+	 * 	@value default 灰色
+	 * 	@value primary 蓝色
+	 * 	@value success 绿色
+	 * 	@value warning 黄色
+	 * 	@value error 红色
+	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
+	 * @property {Boolean} inverted = [true|false] 是否无需背景颜色（空心标签）
+	 * @property {Boolean} circle = [true|false] 是否为圆角
+	 * @event {Function} click 点击 Tag 触发事件
+	 */
+
+	export default {
+		name: "UniTag",
+		emits: ['click'],
+		props: {
+			type: {
+				// 标签类型default、primary、success、warning、error、royal
+				type: String,
+				default: "default"
+			},
+			size: {
+				// 标签大小 normal, small
+				type: String,
+				default: "normal"
+			},
+			// 标签内容
+			text: {
+				type: String,
+				default: ""
+			},
+			disabled: {
+				// 是否为禁用状态
+				type: [Boolean, String],
+				default: false
+			},
+			inverted: {
+				// 是否为空心
+				type: [Boolean, String],
+				default: false
+			},
+			circle: {
+				// 是否为圆角样式
+				type: [Boolean, String],
+				default: false
+			},
+			mark: {
+				// 是否为标记样式
+				type: [Boolean, String],
+				default: false
+			},
+			customStyle: {
+				type: String,
+				default: ''
+			}
+		},
+		computed: {
+			classes() {
+				const {
+					type,
+					disabled,
+					inverted,
+					circle,
+					mark,
+					size,
+					isTrue
+				} = this
+				const classArr = [
+					'uni-tag--' + type,
+					'uni-tag--' + size,
+					isTrue(disabled) ? 'uni-tag--disabled' : '',
+					isTrue(inverted) ? 'uni-tag--' + type + '--inverted' : '',
+					isTrue(circle) ? 'uni-tag--circle' : '',
+					isTrue(mark) ? 'uni-tag--mark' : '',
+					// type === 'default' ? 'uni-tag--default' : 'uni-tag-text',
+					isTrue(inverted) ? 'uni-tag--inverted uni-tag-text--' + type : '',
+					size === 'small' ? 'uni-tag-text--small' : ''
+				]
+				// 返回类的字符串，兼容字节小程序
+				return classArr.join(' ')
+			}
+		},
+		methods: {
+			isTrue(value) {
+				return value === true || value === 'true'
+			},
+			onClick() {
+				if (this.isTrue(this.disabled)) return
+				this.$emit("click");
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$uni-primary: #2979ff !default;
+	$uni-success: #18bc37 !default;
+	$uni-warning: #f3a73f !default;
+	$uni-error: #e43d33 !default;
+	$uni-info: #8f939c !default;
+
+
+	$tag-default-pd: 4px 7px;
+	$tag-small-pd: 2px 5px;
+	$tag-mini-pd: 1px 3px;
+
+	.uni-tag {
+		line-height: 14px;
+		font-size: 12px;
+		font-weight: 200;
+		padding: $tag-default-pd;
+		color: #fff;
+		border-radius: 3px;
+		background-color: $uni-info;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-info;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+
+		// size attr
+		&--default {
+			font-size: 12px;
+		}
+
+		&--default--inverted {
+			color: $uni-info;
+			border-color: $uni-info;
+		}
+
+		&--small {
+			padding: $tag-small-pd;
+			font-size: 12px;
+			border-radius: 2px;
+		}
+
+		&--mini {
+			padding: $tag-mini-pd;
+			font-size: 12px;
+			border-radius: 2px;
+		}
+
+		// type attr
+		&--primary {
+			background-color: $uni-primary;
+			border-color: $uni-primary;
+			color: #fff;
+		}
+
+		&--success {
+			color: #fff;
+			background-color: $uni-success;
+			border-color: $uni-success;
+		}
+
+		&--warning {
+			color: #fff;
+			background-color: $uni-warning;
+			border-color: $uni-warning;
+		}
+
+		&--error {
+			color: #fff;
+			background-color: $uni-error;
+			border-color: $uni-error;
+		}
+
+		&--primary--inverted {
+			color: $uni-primary;
+			border-color: $uni-primary;
+		}
+
+		&--success--inverted {
+			color: $uni-success;
+			border-color: $uni-success;
+		}
+
+		&--warning--inverted {
+			color: $uni-warning;
+			border-color: $uni-warning;
+		}
+
+		&--error--inverted {
+			color: $uni-error;
+			border-color: $uni-error;
+		}
+
+		&--inverted {
+			background-color: #fff;
+		}
+
+		// other attr
+		&--circle {
+			border-radius: 15px !important;
+		}
+
+		&--mark {
+			border-top-left-radius: 0 !important;
+			border-bottom-left-radius: 0 !important;
+			border-top-right-radius: 15px !important;
+			border-bottom-right-radius: 15px !important;
+		}
+
+		&--disabled {
+			opacity: 0.5;
+			/* #ifdef H5 */
+			cursor: not-allowed;
+			/* #endif */
+		}
+	}
+
+
+	.uni-tag-text {
+		color: #fff;
+		font-size: 14px;
+
+		&--primary {
+			color: $uni-primary;
+		}
+
+		&--success {
+			color: $uni-success;
+		}
+
+		&--warning {
+			color: $uni-warning;
+		}
+
+		&--error {
+			color: $uni-error;
+		}
+
+		&--small {
+			font-size: 12px;
+		}
+	}
+</style>
diff --git a/uni_modules/uni-tag/package.json b/uni_modules/uni-tag/package.json
new file mode 100644
index 0000000..1878088
--- /dev/null
+++ b/uni_modules/uni-tag/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-tag",
+  "displayName": "uni-tag 标签",
+  "version": "2.1.0",
+  "description": "Tag 组件，用于展示1个或多个文字标签，可点击切换选中、不选中的状态。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "",
+    "tag",
+    "标签"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-tag/readme.md b/uni_modules/uni-tag/readme.md
new file mode 100644
index 0000000..6e78ff5
--- /dev/null
+++ b/uni_modules/uni-tag/readme.md
@@ -0,0 +1,13 @@
+
+
+## Tag 标签
+> **组件名：uni-tag**
+> 代码块： `uTag`
+
+
+用于展示1个或多个文字标签，可点击切换选中、不选中的状态 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-tag)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-title/changelog.md b/uni_modules/uni-title/changelog.md
new file mode 100644
index 0000000..7626216
--- /dev/null
+++ b/uni_modules/uni-title/changelog.md
@@ -0,0 +1,10 @@
+## 1.1.1（2022-05-19）
+- 修改组件描述
+## 1.1.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-title](https://uniapp.dcloud.io/component/uniui/uni-title)
+## 1.0.2（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
+## 1.0.1（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-title/components/uni-title/uni-title.vue b/uni_modules/uni-title/components/uni-title/uni-title.vue
new file mode 100644
index 0000000..bf4f926
--- /dev/null
+++ b/uni_modules/uni-title/components/uni-title/uni-title.vue
@@ -0,0 +1,171 @@
+<template>
+	<view class="uni-title__box" :style="{'align-items':textAlign}">
+		<text class="uni-title__base" :class="['uni-'+type]" :style="{'color':color}">{{title}}</text>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Title 标题
+	 * @description 标题，通常用于记录页面标题，使用当前组件，uni-app 如果开启统计，将会自动统计页面标题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1066
+	 * @property {String} type = [h1|h2|h3|h4|h5] 标题类型
+	 * 	@value h1 一级标题
+	 * 	@value h2 二级标题
+	 * 	@value h3 三级标题
+	 * 	@value h4 四级标题
+	 * 	@value h5 五级标题
+	 * @property {String} title 标题内容
+	 * @property {String} align = [left|center|right] 对齐方式
+	 * 	@value left 做对齐
+	 * 	@value center 居中对齐
+	 * 	@value right 右对齐
+	 * @property {String} color 字体颜色
+	 * @property {Boolean} stat = [true|false] 是否开启统计功能呢，如不填写type值，默认为开启，填写 type 属性，默认为关闭
+	 */
+	export default {
+		name:"UniTitle",
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			align: {
+				type: String,
+				default: 'left'
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			stat: {
+				type: [Boolean, String],
+				default: ''
+			}
+		},
+		data() {
+			return {
+
+			};
+		},
+		computed: {
+			textAlign() {
+				let align = 'center';
+				switch (this.align) {
+					case 'left':
+						align = 'flex-start'
+						break;
+					case 'center':
+						align = 'center'
+						break;
+					case 'right':
+						align = 'flex-end'
+						break;
+				}
+				return align
+			}
+		},
+		watch: {
+			title(newVal) {
+				if (this.isOpenStat()) {
+					// 上报数据
+					if (uni.report) {
+						uni.report('title', this.title)
+					}
+				}
+			}
+		},
+		mounted() {
+			if (this.isOpenStat()) {
+				// 上报数据
+				if (uni.report) {
+					uni.report('title', this.title)
+				}
+			}
+		},
+		methods: {
+			isOpenStat() {
+				if (this.stat === '') {
+					this.isStat = false
+				}
+				let stat_type = (typeof(this.stat) === 'boolean' && this.stat) || (typeof(this.stat) === 'string' && this.stat !==
+					'')
+				if (this.type === "") {
+					this.isStat = true
+					if (this.stat.toString() === 'false') {
+						this.isStat = false
+					}
+				}
+
+				if (this.type !== '') {
+					this.isStat = true
+					if (stat_type) {
+						this.isStat = true
+					} else {
+						this.isStat = false
+					}
+				}
+				return this.isStat
+			}
+		}
+	}
+</script>
+
+<style>
+	/* .uni-title {
+
+	} */
+	.uni-title__box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: flex-start;
+		justify-content: center;
+		padding: 8px 0;
+		flex: 1;
+	}
+
+	.uni-title__base {
+		font-size: 15px;
+		color: #333;
+		font-weight: 500;
+	}
+
+	.uni-h1 {
+		font-size: 20px;
+		color: #333;
+		font-weight: bold;
+	}
+
+	.uni-h2 {
+		font-size: 18px;
+		color: #333;
+		font-weight: bold;
+	}
+
+	.uni-h3 {
+		font-size: 16px;
+		color: #333;
+		font-weight: bold;
+		/* font-weight: 400; */
+	}
+
+	.uni-h4 {
+		font-size: 14px;
+		color: #333;
+		font-weight: bold;
+		/* font-weight: 300; */
+	}
+
+	.uni-h5 {
+		font-size: 12px;
+		color: #333;
+		font-weight: bold;
+		/* font-weight: 200; */
+	}
+</style>
diff --git a/uni_modules/uni-title/package.json b/uni_modules/uni-title/package.json
new file mode 100644
index 0000000..2249f5a
--- /dev/null
+++ b/uni_modules/uni-title/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "uni-title",
+  "displayName": "uni-title 章节标题",
+  "version": "1.1.1",
+  "description": "章节标题，通常用于记录页面标题，使用当前组件，uni-app 如果开启统计，将会自动统计页面标题",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "标题",
+    "章节",
+    "章节标题",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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-title/readme.md b/uni_modules/uni-title/readme.md
new file mode 100644
index 0000000..0e60b1b
--- /dev/null
+++ b/uni_modules/uni-title/readme.md
@@ -0,0 +1,14 @@
+
+
+## Title 标题
+> **组件名：uni-title**
+> 代码块： `uTitle`
+
+
+章节标题，通常用于记录页面标题，使用当前组件，uni-app 如果开启统计，将会自动统计页面标题 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-title)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
diff --git a/uni_modules/uni-tooltip/changelog.md b/uni_modules/uni-tooltip/changelog.md
new file mode 100644
index 0000000..00f1572
--- /dev/null
+++ b/uni_modules/uni-tooltip/changelog.md
@@ -0,0 +1,10 @@
+## 0.2.1（2022-05-09）
+- 修复 content 为空时仍然弹出的bug
+## 0.2.0（2022-05-07）
+**注意：破坏性更新**
+- 更新 text 属性变更为 content
+- 更新 移除 width 属性
+## 0.1.1（2022-04-27）
+- 修复 组件根 text 嵌套组件 warning
+## 0.1.0（2022-04-21）
+- 初始化
diff --git a/uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue b/uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue
new file mode 100644
index 0000000..ffbb6fa
--- /dev/null
+++ b/uni_modules/uni-tooltip/components/uni-tooltip/uni-tooltip.vue
@@ -0,0 +1,68 @@
+<template>
+	<view class="uni-tooltip">
+		<slot></slot>
+		<view v-if="content || $slots.content" class="uni-tooltip-popup">
+			<slot name="content">
+				{{content}}
+			</slot>
+		</view>
+	</view>
+</template>
+
+
+<script>
+	/**
+	 * Tooltip 提示文字
+	 * @description 常用于展示鼠标 hover 时的提示信息。
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-tooltip
+	 * @property {String} content   弹出层显示的内容
+	 * @property {String}  placement出现位置, 目前只支持 left
+	 */
+
+
+	export default {
+		name: "uni-tooltip",
+		data() {
+			return {
+
+			};
+		},
+		props: {
+			content: {
+				type: String,
+				default: ''
+			},
+
+			placement: {
+				type: String,
+				default: 'bottom'
+			},
+		}
+	}
+</script>
+
+<style>
+	.uni-tooltip {
+		position: relative;
+		cursor: pointer;
+	}
+
+	.uni-tooltip-popup {
+		z-index: 1;
+		display: none;
+		position: absolute;
+		left: 0;
+		background-color: #333;
+		border-radius: 8px;
+		color: #fff;
+		font-size: 12px;
+		text-align: left;
+		line-height: 16px;
+		padding: 12px;
+	}
+
+
+	.uni-tooltip:hover .uni-tooltip-popup {
+		display: block;
+	}
+</style>
diff --git a/uni_modules/uni-tooltip/package.json b/uni_modules/uni-tooltip/package.json
new file mode 100644
index 0000000..b626efb
--- /dev/null
+++ b/uni_modules/uni-tooltip/package.json
@@ -0,0 +1,83 @@
+{
+  "id": "uni-tooltip",
+  "displayName": "uni-tooltip",
+  "version": "0.2.1",
+  "description": "Tooltip 提示文字",
+  "keywords": [
+    "uni-tooltip",
+    "uni-ui",
+    "tooltip",
+    "tip",
+    "文字提示"
+],
+  "repository": "",
+"engines": {
+  },
+  "dcloudext": {
+    "category": [
+        "前端组件",
+        "通用组件"
+    ],
+    "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": "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",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-tooltip/readme.md b/uni_modules/uni-tooltip/readme.md
new file mode 100644
index 0000000..faafa2e
--- /dev/null
+++ b/uni_modules/uni-tooltip/readme.md
@@ -0,0 +1,8 @@
+## Badge 数字角标
+> **组件名：uni-tooltip**
+> 代码块： `uTooltip`
+
+数字角标一般和其它控件（列表、9宫格等）配合使用，用于进行数量提示，默认为实心灰色背景，
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-tooltip)
+#### 如使用过程中有任何问题，或者您对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..b1a824b
--- /dev/null
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,20 @@
+## 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..5f54365
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,128 @@
+// 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
+		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..2d57030
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,299 @@
+<template>
+	<view
+		v-if="isShow"
+		ref="ani"
+		:animation="animationData"
+		:class="customClass"
+		:style="transformStyles"
+		@click="onClick"
+	>
+		<slot></slot>
+	</view>
+	  <!-- #ifdef MP -->
+  <view v-else style="display: none">
+    <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: ''
+		}
+	},
+	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 ? 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>
+
+<style></style>
diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
new file mode 100644
index 0000000..d15fdf0
--- /dev/null
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.1",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "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/vk-uview-ui/components/u-avatar/u-avatar.vue b/uni_modules/vk-uview-ui/components/u-avatar/u-avatar.vue
new file mode 100644
index 0000000..9979812
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-avatar/u-avatar.vue
@@ -0,0 +1,270 @@
+<template>
+  <view class="u-avatar" :style="[wrapStyle]" @tap="click">
+    <image
+      @error="loadError"
+      :style="[imgStyle]"
+      class="u-avatar__img"
+      v-if="!uText && avatar"
+      :src="avatar"
+      :mode="imgMode"
+    ></image>
+    <text
+      class="u-line-1"
+      v-else-if="uText"
+      :style="{
+        fontSize: '38rpx'
+      }"
+    >
+      {{ uText }}
+    </text>
+    <slot v-else></slot>
+    <view
+      class="u-avatar__sex"
+      v-if="showSex"
+      :class="['u-avatar__sex--' + sexIcon]"
+      :style="[uSexStyle]"
+    >
+      <u-icon :name="sexIcon" size="20"></u-icon>
+    </view>
+    <view class="u-avatar__level" v-if="showLevel" :style="[uLevelStyle]">
+      <u-icon :name="levelIcon" size="20"></u-icon>
+    </view>
+  </view>
+</template>
+
+<script>
+let base64Avatar =
+  "data:image/png;base64,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";
+/**
+ * avatar 头像
+ * @description 本组件一般用于展示头像的地方，如个人中心，或者评论列表页的用户头像展示等场所。
+ * @tutorial https://www.uviewui.com/components/avatar.html
+ * @property {String} bg-color 背景颜色，一般显示文字时用（默认#ffffff）
+ * @property {String} src 头像路径，如加载失败，将会显示默认头像
+ * @property {String Number} size 头像尺寸，可以为指定字符串(large, default, mini)，或者数值，单位rpx（默认default）
+ *  @value large				大
+ * 	@value default 			常规
+ * 	@value mini 				小
+ * @property {String} mode 显示类型，见上方说明（默认circle）
+ * 	@value circle			圆型
+ * 	@value square 		方型
+ * @property {String} sex-icon 性别图标，man-男，woman-女（默认man）
+ * 	@value man				男
+ * 	@value woman 			女
+ * @property {String} level-icon 等级图标（默认level）
+ * @property {String} sex-bg-color 性别图标背景颜色
+ * @property {String} level-bg-color 等级图标背景颜色
+ * @property {String} show-sex 是否显示性别图标（默认false）
+ * @property {String} show-level 是否显示等级图标（默认false）
+ * @property {String} img-mode 头像图片的裁剪类型，与uni的image组件的mode参数一致，如效果达不到需求，可尝试传widthFix值（默认aspectFill）
+ * @property {String} index 用户传递的标识符值，如果是列表循环，可穿v-for的index值
+ * @event {Function} click 头像被点击
+ * @example <u-avatar :src="src"></u-avatar>
+ */
+export default {
+  name: "u-avatar",
+  emits: ["click"],
+  props: {
+    // 背景颜色
+    bgColor: {
+      type: String,
+      default: "transparent"
+    },
+    // 头像路径
+    src: {
+      type: String,
+      default: ""
+    },
+    // 尺寸，large-大，default-中等，mini-小，如果为数值，则单位为rpx
+    // 宽度等于高度
+    size: {
+      type: [String, Number],
+      default: "default"
+    },
+    // 头像模型，square-带圆角方形，circle-圆形
+    mode: {
+      type: String,
+      default: "circle"
+    },
+    // 文字内容
+    text: {
+      type: String,
+      default: ""
+    },
+    // 图片的裁剪模型
+    imgMode: {
+      type: String,
+      default: "aspectFill"
+    },
+    // 标识符
+    index: {
+      type: [String, Number],
+      default: ""
+    },
+    // 右上角性别角标，man-男，woman-女
+    sexIcon: {
+      type: String,
+      default: "man"
+    },
+    // 右下角的等级图标
+    levelIcon: {
+      type: String,
+      default: "level"
+    },
+    // 右下角等级图标背景颜色
+    levelBgColor: {
+      type: String,
+      default: ""
+    },
+    // 右上角性别图标的背景颜色
+    sexBgColor: {
+      type: String,
+      default: ""
+    },
+    // 是否显示性别图标
+    showSex: {
+      type: Boolean,
+      default: false
+    },
+    // 是否显示等级图标
+    showLevel: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      error: false,
+      // 头像的地址，因为如果加载错误，需要赋值为默认图片，props值无法修改，所以需要一个中间值
+      avatar: this.src ? this.src : base64Avatar
+    };
+  },
+  watch: {
+    src(n) {
+      // 用户可能会在头像加载失败时，再次修改头像值，所以需要重新赋值
+      if (!n) {
+        // 如果传入null或者''，或者undefined，显示默认头像
+        this.avatar = base64Avatar;
+        this.error = true;
+      } else {
+        this.avatar = n;
+        this.error = false;
+      }
+    }
+  },
+  computed: {
+    wrapStyle() {
+      let style = {};
+      style.height =
+        this.size == "large"
+          ? "120rpx"
+          : this.size == "default"
+          ? "90rpx"
+          : this.size == "mini"
+          ? "70rpx"
+          : this.size + "rpx";
+      style.width = style.height;
+      style.flex = `0 0 ${style.height}`;
+      style.backgroundColor = this.bgColor;
+      style.borderRadius = this.mode == "circle" ? "500px" : "5px";
+      if (this.text) style.padding = `0 6rpx`;
+      return style;
+    },
+    imgStyle() {
+      let style = {};
+      style.borderRadius = this.mode == "circle" ? "500px" : "5px";
+      return style;
+    },
+    // 取字符串的第一个字符
+    uText() {
+      return String(this.text)[0];
+    },
+    // 性别图标的自定义样式
+    uSexStyle() {
+      let style = {};
+      if (this.sexBgColor) style.backgroundColor = this.sexBgColor;
+      return style;
+    },
+    // 等级图标的自定义样式
+    uLevelStyle() {
+      let style = {};
+      if (this.levelBgColor) style.backgroundColor = this.levelBgColor;
+      return style;
+    }
+  },
+  methods: {
+    // 图片加载错误时，显示默认头像
+    loadError() {
+      this.error = true;
+      this.avatar = base64Avatar;
+    },
+    click() {
+      this.$emit("click", this.index);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-avatar {
+  /* #ifndef APP-NVUE */
+  display: inline-flex;
+  /* #endif */
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  color: $u-content-color;
+  border-radius: 10px;
+  position: relative;
+
+  &__img {
+    width: 100%;
+    height: 100%;
+  }
+
+  &__sex {
+    position: absolute;
+    width: 32rpx;
+    color: #ffffff;
+    height: 32rpx;
+    @include vue-flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 100rpx;
+    top: 5%;
+    z-index: 1;
+    right: -7%;
+    border: 1px #ffffff solid;
+
+    &--man {
+      background-color: $u-type-primary;
+    }
+
+    &--woman {
+      background-color: $u-type-error;
+    }
+
+    &--none {
+      background-color: $u-type-warning;
+    }
+  }
+
+  &__level {
+    position: absolute;
+    width: 32rpx;
+    color: #ffffff;
+    height: 32rpx;
+    @include vue-flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 100rpx;
+    bottom: 5%;
+    z-index: 1;
+    right: -7%;
+    border: 1px #ffffff solid;
+    background-color: $u-type-warning;
+  }
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-count-down/u-count-down.vue b/uni_modules/vk-uview-ui/components/u-count-down/u-count-down.vue
new file mode 100644
index 0000000..0d7cc21
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-count-down/u-count-down.vue
@@ -0,0 +1,175 @@
+<template>
+	<view class="u-count-down">
+		<slot>
+			<text class="u-count-down__text" :style="customStyle">{{ formattedTime }}</text>
+		</slot>
+	</view>
+</template>
+
+<script>
+import { isSameSecond, parseFormat, parseTimeData } from "./utils";
+/**
+ * u-count-down 倒计时
+ * @description 该组件一般使用于某个活动的截止时间上，通过数字的变化，给用户明确的时间感受，提示用户进行某一个行为操作。
+ * @tutorial https://uviewui.com/components/countDown.html
+ * @property {String | Number}	timestamp		倒计时时长，单位ms （默认 0 ）
+ * @property {String}			format		时间格式，DD-日，HH-时，mm-分，ss-秒，SSS-毫秒  （默认 'HH:mm:ss' ）
+ * @property {Boolean}			autoStart	是否自动开始倒计时 （默认 true ）
+ * @event {Function} end 倒计时结束时触发
+ * @event {Function} change 倒计时变化时触发
+ * @event {Function} start	开始倒计时
+ * @event {Function} pause	暂停倒计时
+ * @event {Function} reset	重设倒计时，若 auto-start 为 true，重设后会自动开始倒计时
+ * @example <u-count-down :timestamp="timestamp"></u-count-down>
+ */
+export default {
+	name: "u-count-down",  
+	emits: ["change", "end", "finish"],
+	props: {
+		// 倒计时时长，单位ms
+		timestamp: {
+			type: [String, Number],
+			default: 0
+		},
+		// 时间格式，DD-日，HH-时，mm-分，ss-秒，SSS-毫秒
+		format: {
+			type: String,
+			default: "DD:HH:mm:ss"
+		},
+		// 是否自动开始倒计时
+		autoStart: {
+			type: Boolean,
+			default: true
+		},
+		customStyle: {
+			type: [String, Object],
+			default: ""
+		}
+	},
+	data() {
+		return {
+			timer: null,
+			// 各单位(天，时，分等)剩余时间
+			timeData: parseTimeData(0),
+			// 格式化后的时间，如"03:23:21"
+			formattedTime: "0",
+			// 倒计时是否正在进行中
+			runing: false,
+			endTime: 0, // 结束的毫秒时间戳
+			remainTime: 0 // 剩余的毫秒时间
+		};
+	},
+	watch: {
+		timestamp(n) {
+			this.reset();
+		},
+		format(newVal, oldVal) {
+			this.pause();
+			this.start();
+		}
+	},
+	mounted() {
+		this.init();
+	},
+	methods: {
+		init() {
+			this.reset();
+		},
+		// 开始倒计时
+		start() {
+			if (this.runing) return;
+			// 标识为进行中
+			this.runing = true;
+			// 结束时间戳 = 此刻时间戳 + 剩余的时间
+			this.endTime = Date.now() + this.remainTime;
+			this.toTick();
+		},
+		// 根据是否展示毫秒，执行不同操作函数
+		toTick() {
+			if (this.format.indexOf("SSS") > -1) {
+				this.microTick();
+			} else {
+				this.macroTick();
+			}
+		},
+		macroTick() {
+			this.clearTimeout();
+			// 每隔一定时间，更新一遍定时器的值
+			// 同时此定时器的作用也能带来毫秒级的更新
+			this.timer = setTimeout(() => {
+				// 获取剩余时间
+				const remain = this.getRemainTime();
+				// 重设剩余时间
+				if (!isSameSecond(remain, this.remainTime) || remain === 0) {
+					this.setRemainTime(remain);
+				}
+				// 如果剩余时间不为0，则继续检查更新倒计时
+				if (this.remainTime !== 0) {
+					this.macroTick();
+				}
+			}, 30);
+		},
+		microTick() {
+			this.clearTimeout();
+			this.timer = setTimeout(() => {
+				this.setRemainTime(this.getRemainTime());
+				if (this.remainTime !== 0) {
+					this.microTick();
+				}
+			}, 30);
+		},
+		// 获取剩余的时间
+		getRemainTime() {
+			// 取最大值，防止出现小于0的剩余时间值
+			return Math.max(this.endTime - Date.now(), 0);
+		},
+		// 设置剩余的时间
+		setRemainTime(remain) {
+			this.remainTime = remain;
+			// 根据剩余的毫秒时间，得出该有天，小时，分钟等的值，返回一个对象
+			const timeData = parseTimeData(remain);
+			this.$emit("change", timeData);
+			// 得出格式化后的时间
+			this.formattedTime = parseFormat(this.format, timeData);
+			// 如果时间已到，停止倒计时
+			if (remain <= 0) {
+				this.pause(); 
+				this.$emit("end");
+				this.$emit("finish");
+			}
+		},
+		// 重置倒计时
+		reset() {
+			this.pause();
+			this.remainTime = this.timestamp;
+			this.setRemainTime(this.remainTime);
+			if (this.autoStart) {
+				this.start();
+			}
+		},
+		// 暂停倒计时
+		pause() {
+			this.runing = false;
+			this.clearTimeout();
+		},
+		// 清空定时器
+		clearTimeout() {
+			clearTimeout(this.timer);
+			this.timer = null;
+		}
+	},
+	// #ifndef VUE3
+	beforeDestroy() {
+		this.clearTimeout();
+	},
+	// #endif
+	
+	// #ifdef VUE3
+	beforeUnmount() {
+		this.clearTimeout();
+	},
+	// #endif
+};
+</script>
+
+<style lang="scss"></style>
diff --git a/uni_modules/vk-uview-ui/components/u-count-down/utils.js b/uni_modules/vk-uview-ui/components/u-count-down/utils.js
new file mode 100644
index 0000000..8c75005
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-count-down/utils.js
@@ -0,0 +1,62 @@
+// 补0，如1 -> 01
+function padZero(num, targetLength = 2) {
+    let str = `${num}`
+    while (str.length < targetLength) {
+        str = `0${str}`
+    }
+    return str
+}
+const SECOND = 1000
+const MINUTE = 60 * SECOND
+const HOUR = 60 * MINUTE
+const DAY = 24 * HOUR
+export function parseTimeData(time) {
+    const days = Math.floor(time / DAY)
+    const hours = Math.floor((time % DAY) / HOUR)
+    const minutes = Math.floor((time % HOUR) / MINUTE)
+    const seconds = Math.floor((time % MINUTE) / SECOND)
+    const milliseconds = Math.floor(time % SECOND)
+    return {
+        days,
+        hours,
+        minutes,
+        seconds,
+        milliseconds
+    }
+}
+export function parseFormat(format, timeData) {
+    let {
+        days,
+        hours,
+        minutes,
+        seconds,
+        milliseconds
+    } = timeData
+    // 如果格式化字符串中不存在DD(天)，则将天的时间转为小时中去
+    if (format.indexOf('DD') === -1) {
+        hours += days * 24
+    } else {
+        // 对天补0
+        format = format.replace('DD', padZero(days))
+    }
+    // 其他同理于DD的格式化处理方式
+    if (format.indexOf('HH') === -1) {
+        minutes += hours * 60
+    } else {
+        format = format.replace('HH', padZero(hours))
+    }
+    if (format.indexOf('mm') === -1) {
+        seconds += minutes * 60
+    } else {
+        format = format.replace('mm', padZero(minutes))
+    }
+    if (format.indexOf('ss') === -1) {
+        milliseconds += seconds * 1000
+    } else {
+        format = format.replace('ss', padZero(seconds))
+    }
+    return format.replace('SSS', padZero(milliseconds, 3))
+}
+export function isSameSecond(time1, time2) {
+    return Math.floor(time1 / 1000) === Math.floor(time2 / 1000)
+}
diff --git a/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue b/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue
new file mode 100644
index 0000000..ed95a9c
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue
@@ -0,0 +1,369 @@
+<template>
+	<view :style="[customStyle]" class="u-icon" @tap="click" :class="['u-icon--' + labelPos]">
+		<image class="u-icon__img" v-if="isImg" :src="name" :mode="imgMode" :style="[imgStyle]"></image>
+		<view
+			v-else
+			class="u-icon__icon"
+			:class="customClass"
+			:style="[iconStyle]"
+			:hover-class="hoverClass"
+			@touchstart="touchstart"
+		>
+			<text
+				v-if="showDecimalIcon"
+				:style="[decimalIconStyle]"
+				:class="decimalIconClass"
+				:hover-class="hoverClass"
+				class="u-icon__decimal"
+			></text>
+		</view>
+		<!-- 这里进行空字符串判断，如果仅仅是v-if="label"，可能会出现传递0的时候，结果也无法显示，微信小程序不传值默认为null，故需要增加null的判断 -->
+		<text
+			v-if="label !== '' && label !== null"
+			class="u-icon__label"
+			:style="{
+				color: labelColor,
+				fontSize: $u.addUnit(labelSize),
+				marginLeft: labelPos == 'right' ? $u.addUnit(marginLeft) : 0,
+				marginTop: labelPos == 'bottom' ? $u.addUnit(marginTop) : 0,
+				marginRight: labelPos == 'left' ? $u.addUnit(marginRight) : 0,
+				marginBottom: labelPos == 'top' ? $u.addUnit(marginBottom) : 0
+			}"
+		>
+			{{ label }}
+		</text>
+	</view>
+</template>
+
+<script>
+/**
+ * icon 图标
+ * @description 基于字体的图标集，包含了大多数常见场景的图标。
+ * @tutorial https://www.uviewui.com/components/icon.html
+ * @property {String} name 图标名称，见示例图标集
+ * @property {String} color 图标颜色（默认inherit）
+ * @property {String | Number} size 图标字体大小，单位rpx（默认32）
+ * @property {String | Number} label-size label字体大小，单位rpx（默认28）
+ * @property {String} label 图标右侧的label文字（默认28）
+ * @property {String} label-pos label文字相对于图标的位置，只能right或bottom（默认right）
+ * @property {String} label-color label字体颜色（默认#606266）
+ * @property {Object} custom-style icon的样式，对象形式
+ * @property {String} custom-prefix 自定义字体图标库时，需要写上此值
+ * @property {String | Number} margin-left label在右侧时与图标的距离，单位rpx（默认6）
+ * @property {String | Number} margin-top label在下方时与图标的距离，单位rpx（默认6）
+ * @property {String | Number} margin-bottom label在上方时与图标的距离，单位rpx（默认6）
+ * @property {String | Number} margin-right label在左侧时与图标的距离，单位rpx（默认6）
+ * @property {String} label-pos label相对于图标的位置，只能right或bottom（默认right）
+ * @property {String} index 一个用于区分多个图标的值，点击图标时通过click事件传出
+ * @property {String} hover-class 图标按下去的样式类，用法同uni的view组件的hover-class参数，详情见官网
+ * @property {String} width 显示图片小图标时的宽度
+ * @property {String} height 显示图片小图标时的高度
+ * @property {String} top 图标在垂直方向上的定位
+ * @property {String} top 图标在垂直方向上的定位
+ * @property {String} top 图标在垂直方向上的定位
+ * @property {Boolean} show-decimal-icon 是否为DecimalIcon
+ * @property {String} inactive-color 背景颜色，可接受主题色，仅Decimal时有效
+ * @property {String | Number} percent 显示的百分比，仅Decimal时有效
+ * @event {Function} click 点击图标时触发
+ * @example <u-icon name="photo" color="#2979ff" size="28"></u-icon>
+ */
+export default {
+	name: "u-icon",
+	emits: ["click", "touchstart"],
+	props: {
+		// 图标类名
+		name: {
+			type: String,
+			default: ""
+		},
+		// 图标颜色，可接受主题色
+		color: {
+			type: String,
+			default: ""
+		},
+		// 字体大小，单位rpx
+		size: {
+			type: [Number, String],
+			default: "inherit"
+		},
+		// 是否显示粗体
+		bold: {
+			type: Boolean,
+			default: false
+		},
+		// 点击图标的时候传递事件出去的index（用于区分点击了哪一个）
+		index: {
+			type: [Number, String],
+			default: ""
+		},
+		// 触摸图标时的类名
+		hoverClass: {
+			type: String,
+			default: ""
+		},
+		// 自定义扩展前缀，方便用户扩展自己的图标库
+		customPrefix: {
+			type: String,
+			default: "uicon"
+		},
+		// 图标右边或者下面的文字
+		label: {
+			type: [String, Number],
+			default: ""
+		},
+		// label的位置，只能右边或者下边
+		labelPos: {
+			type: String,
+			default: "right"
+		},
+		// label的大小
+		labelSize: {
+			type: [String, Number],
+			default: "28"
+		},
+		// label的颜色
+		labelColor: {
+			type: String,
+			default: "#606266"
+		},
+		// label与图标的距离(横向排列)
+		marginLeft: {
+			type: [String, Number],
+			default: "6"
+		},
+		// label与图标的距离(竖向排列)
+		marginTop: {
+			type: [String, Number],
+			default: "6"
+		},
+		// label与图标的距离(竖向排列)
+		marginRight: {
+			type: [String, Number],
+			default: "6"
+		},
+		// label与图标的距离(竖向排列)
+		marginBottom: {
+			type: [String, Number],
+			default: "6"
+		},
+		// 图片的mode
+		imgMode: {
+			type: String,
+			default: "widthFix"
+		},
+		// 自定义样式
+		customStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 用于显示图片小图标时，图片的宽度
+		width: {
+			type: [String, Number],
+			default: ""
+		},
+		// 用于显示图片小图标时，图片的高度
+		height: {
+			type: [String, Number],
+			default: ""
+		},
+		// 用于解决某些情况下，让图标垂直居中的用途
+		top: {
+			type: [String, Number],
+			default: 0
+		},
+		// 是否为DecimalIcon
+		showDecimalIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 背景颜色，可接受主题色，仅Decimal时有效
+		inactiveColor: {
+			type: String,
+			default: "#ececec"
+		},
+		// 显示的百分比，仅Decimal时有效
+		percent: {
+			type: [Number, String],
+			default: "50"
+		}
+	},
+	computed: {
+		customClass() {
+			let classes = [];
+			let { customPrefix, name } = this;
+			let index = name.indexOf("-icon-");
+			if (index > -1) {
+				customPrefix = name.substring(0, index + 5);
+				classes.push(name);
+			} else {
+				classes.push(`${customPrefix}-${name}`);
+			}
+			// uView的自定义图标类名为u-iconfont
+			if (customPrefix === "uicon") {
+				classes.push("u-iconfont");
+			} else {
+				classes.push(customPrefix);
+			}
+			// 主题色，通过类配置
+			if (
+				this.showDecimalIcon &&
+				this.inactiveColor &&
+				this.$u.config.type.includes(this.inactiveColor)
+			) {
+				classes.push("u-icon__icon--" + this.inactiveColor);
+			} else if (this.color && this.$u.config.type.includes(this.color))
+				classes.push("u-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.size == "inherit" ? "inherit" : this.$u.addUnit(this.size),
+				fontWeight: this.bold ? "bold" : "normal",
+				// 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
+				top: this.$u.addUnit(this.top)
+			};
+			// 非主题色值时，才当作颜色值
+			if (
+				this.showDecimalIcon &&
+				this.inactiveColor &&
+				!this.$u.config.type.includes(this.inactiveColor)
+			) {
+				style.color = this.inactiveColor;
+			} else if (this.color && !this.$u.config.type.includes(this.color)) style.color = this.color;
+
+			return style;
+		},
+		// 判断传入的name属性，是否图片路径，只要带有"/"均认为是图片形式
+		isImg() {
+			return this.name.indexOf("/") !== -1;
+		},
+		imgStyle() {
+			let style = {};
+			// 如果设置width和height属性，则优先使用，否则使用size属性
+			style.width = this.width ? this.$u.addUnit(this.width) : this.$u.addUnit(this.size);
+			style.height = this.height ? this.$u.addUnit(this.height) : this.$u.addUnit(this.size);
+			return style;
+		},
+		decimalIconStyle() {
+			let style = {};
+			style = {
+				fontSize: this.size == "inherit" ? "inherit" : this.$u.addUnit(this.size),
+				fontWeight: this.bold ? "bold" : "normal",
+				// 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
+				top: this.$u.addUnit(this.top),
+				width: this.percent + "%"
+			};
+			// 非主题色值时，才当作颜色值
+			if (this.color && !this.$u.config.type.includes(this.color)) style.color = this.color;
+			return style;
+		},
+		decimalIconClass() {
+			let classes = [];
+			classes.push(this.customPrefix + "-" + this.name);
+			// uView的自定义图标类名为u-iconfont
+			if (this.customPrefix == "uicon") {
+				classes.push("u-iconfont");
+			} else {
+				classes.push(this.customPrefix);
+			}
+			// 主题色，通过类配置
+			if (this.color && this.$u.config.type.includes(this.color))
+				classes.push("u-icon__icon--" + this.color);
+			else classes.push("u-icon__icon--primary");
+			// 阿里，头条，百度小程序通过数组绑定类名时，无法直接使用[a, b, c]的形式，否则无法识别
+			// 故需将其拆成一个字符串的形式，通过空格隔开各个类名
+			//#ifdef MP-ALIPAY || MP-TOUTIAO || MP-BAIDU
+			classes = classes.join(" ");
+			//#endif
+			return classes;
+		}
+	},
+	methods: {
+		click() {
+			this.$emit("click", this.index);
+		},
+		touchstart() {
+			this.$emit("touchstart", this.index);
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import "../../libs/css/style.components.scss";
+@import "../../iconfont.css";
+
+.u-icon {
+	display: inline-flex;
+	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 {
+		position: relative;
+
+		&--primary {
+			color: $u-type-primary;
+		}
+
+		&--success {
+			color: $u-type-success;
+		}
+
+		&--error {
+			color: $u-type-error;
+		}
+
+		&--warning {
+			color: $u-type-warning;
+		}
+
+		&--info {
+			color: $u-type-info;
+		}
+	}
+
+	&__decimal {
+		position: absolute;
+		top: 0;
+		left: 0;
+		display: inline-block;
+		overflow: hidden;
+	}
+
+	&__img {
+		height: auto;
+		will-change: transform;
+	}
+
+	&__label {
+		line-height: 1;
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-image/u-image.vue b/uni_modules/vk-uview-ui/components/u-image/u-image.vue
new file mode 100644
index 0000000..44c760e
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-image/u-image.vue
@@ -0,0 +1,283 @@
+<template>
+	<view class="u-image" @tap="onClick" :style="[wrapStyle, backgroundStyle]">
+		<image
+			v-if="!isError"
+			:src="src"
+			:mode="mode"
+			@error="onErrorHandler"
+			@load="onLoadHandler"
+			:lazy-load="lazyLoad"
+			class="u-image__image"
+			:show-menu-by-longpress="showMenuByLongpress"
+			:style="{
+				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius)
+			}"
+		></image>
+		<view
+			v-if="showLoading && loading"
+			class="u-image__loading"
+			:style="{
+				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius),
+				backgroundColor: bgColor
+			}"
+		>
+			<slot v-if="$slots.loading" name="loading" />
+			<u-icon v-else :name="loadingIcon" :width="width" :height="height"></u-icon>
+		</view>
+		<view
+			v-if="showError && isError && !loading"
+			class="u-image__error"
+			:style="{
+				borderRadius: shape == 'circle' ? '50%' : $u.addUnit(borderRadius)
+			}"
+		>
+			<slot v-if="$slots.error" name="error" />
+			<u-icon v-else :name="errorIcon" :width="width" :height="height"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * Image 图片
+ * @description 此组件为uni-app的image组件的加强版，在继承了原有功能外，还支持淡入动画、加载中、加载失败提示、圆角值和形状等。
+ * @tutorial https://uviewui.com/components/image.html
+ * @property {String} src 图片地址
+ * @property {String} mode 裁剪模式，见官网说明
+ * 	@value scaleToFill		不保持纵横比缩放图片，使图片的宽高完全拉伸至填满 image 元素
+ * 	@value aspectFit			保持纵横比缩放图片，使图片的长边能完全显示出来。也就是说，可以完整地将图片显示出来。
+ * 	@value aspectFill			保持纵横比缩放图片，只保证图片的短边能完全显示出来。也就是说，图片通常只在水平或垂直方向是完整的，另一个方向将会发生截取。
+ * 	@value widthFix				宽度不变，高度自动变化，保持原图宽高比不变
+ * 	@value heightFix			高度不变，宽度自动变化，保持原图宽高比不变 App 和 H5 平台 HBuilderX 2.9.3+ 支持、微信小程序需要基础库 2.10.3
+ * 	@value top						不缩放图片，只显示图片的顶部区域
+ * 	@value bottom					不缩放图片，只显示图片的底部区域
+ * 	@value center					不缩放图片，只显示图片的中间区域
+ * 	@value left						不缩放图片，只显示图片的左边区域
+ * 	@value right					不缩放图片，只显示图片的右边区域
+ * 	@value top left				不缩放图片，只显示图片的左上边区域
+ * 	@value top right			不缩放图片，只显示图片的右上边区域
+ * 	@value bottom left		不缩放图片，只显示图片的左下边区域
+ * 	@value bottom right		不缩放图片，只显示图片的右下边区域
+ * @property {String | Number} width 宽度，单位任意，如果为数值，则为rpx单位（默认100%）
+ * @property {String | Number} height 高度，单位任意，如果为数值，则为rpx单位（默认 auto）
+ * @property {String} shape 图片形状，circle-圆形，square-方形（默认square）
+ * @property {String | Number} border-radius 圆角值，单位任意，如果为数值，则为rpx单位（默认 0）
+ * @property {Boolean} lazy-load 是否懒加载，仅微信小程序、App、百度小程序、字节跳动小程序有效（默认 true）
+ * @property {Boolean} show-menu-by-longpress 是否开启长按图片显示识别小程序码菜单，仅微信小程序有效（默认 false）
+ * @property {String} loading-icon 加载中的图标，或者小图片（默认 photo）
+ * @property {String} error-icon 加载失败的图标，或者小图片（默认 error-circle）
+ * @property {Boolean} show-loading 是否显示加载中的图标或者自定义的slot（默认 true）
+ * @property {Boolean} show-error 是否显示加载错误的图标或者自定义的slot（默认 true）
+ * @property {Boolean} fade 是否需要淡入效果（默认 true）
+ * @property {String Number} width 传入图片路径时图片的宽度
+ * @property {String Number} height 传入图片路径时图片的高度
+ * @property {Boolean} webp 只支持网络资源，只对微信小程序有效（默认 false）
+ * @property {String | Number} duration 搭配fade参数的过渡时间，单位ms（默认 500）
+ * @event {Function} click 点击图片时触发
+ * @event {Function} error 图片加载失败时触发
+ * @event {Function} load 图片加载成功时触发
+ * @example <u-image width="100%" height="300rpx" :src="src"></u-image>
+ */
+export default {
+	name: 'u-image',
+  emits: ["click", "error", "load"],
+	props: {
+		// 图片地址
+		src: {
+			type: String,
+			default: ''
+		},
+		// 裁剪模式
+		mode: {
+			type: String,
+			default: 'aspectFill'
+		},
+		// 宽度，单位任意
+		width: {
+			type: [String, Number],
+			default: '100%'
+		},
+		// 高度，单位任意
+		height: {
+			type: [String, Number],
+			default: 'auto'
+		},
+		// 图片形状，circle-圆形，square-方形
+		shape: {
+			type: String,
+			default: 'square'
+		},
+		// 圆角，单位任意
+		borderRadius: {
+			type: [String, Number],
+			default: 0
+		},
+		// 是否懒加载，微信小程序、App、百度小程序、字节跳动小程序
+		lazyLoad: {
+			type: Boolean,
+			default: true
+		},
+		// 开启长按图片显示识别微信小程序码菜单
+		showMenuByLongpress: {
+			type: Boolean,
+			default: true
+		},
+		// 加载中的图标，或者小图片
+		loadingIcon: {
+			type: String,
+			default: 'photo'
+		},
+		// 加载失败的图标，或者小图片
+		errorIcon: {
+			type: String,
+			default: 'error-circle'
+		},
+		// 是否显示加载中的图标或者自定义的slot
+		showLoading: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示加载错误的图标或者自定义的slot
+		showError: {
+			type: Boolean,
+			default: true
+		},
+		// 是否需要淡入效果
+		fade: {
+			type: Boolean,
+			default: true
+		},
+		// 只支持网络资源，只对微信小程序有效
+		webp: {
+			type: Boolean,
+			default: false
+		},
+		// 过渡时间，单位ms
+		duration: {
+			type: [String, Number],
+			default: 500
+		},
+		// 背景颜色，用于深色页面加载图片时，为了和背景色融合
+		bgColor: {
+			type: String,
+			default: '#f3f4f6'
+		}
+	},
+	data() {
+		return {
+			// 图片是否加载错误，如果是，则显示错误占位图
+			isError: false,
+			// 初始化组件时，默认为加载中状态
+			loading: true,
+			// 不透明度，为了实现淡入淡出的效果
+			opacity: 1,
+			// 过渡时间，因为props的值无法修改，故需要一个中间值
+			durationTime: this.duration,
+			// 图片加载完成时，去掉背景颜色，因为如果是png图片，就会显示灰色的背景
+			backgroundStyle: {}
+		};
+	},
+	watch: {
+		src: {
+			immediate: true,
+			handler (n) {
+				if(!n) {
+					// 如果传入null或者''，或者false，或者undefined，标记为错误状态
+					this.isError = true;
+					this.loading = false;
+				} else {
+					this.isError = false;
+					this.loading = true;
+				}
+			}
+		}
+	},
+	computed: {
+		wrapStyle() {
+			let style = {};
+			// 通过调用addUnit()方法，如果有单位，如百分比，px单位等，直接返回，如果是纯粹的数值，则加上rpx单位
+			style.width = this.$u.addUnit(this.width);
+			style.height = this.$u.addUnit(this.height);
+			// 如果是配置了圆形，设置50%的圆角，否则按照默认的配置值
+			style.borderRadius = this.shape == 'circle' ? '50%' : this.$u.addUnit(this.borderRadius);
+			// 如果设置圆角，必须要有hidden，否则可能圆角无效
+			style.overflow = this.borderRadius > 0 ? 'hidden' : 'visible';
+			if (this.fade) {
+				style.opacity = this.opacity;
+				style.transition = `opacity ${Number(this.durationTime) / 1000}s ease-in-out`;
+			}
+			return style;
+		}
+	},
+	methods: {
+		// 点击图片
+		onClick() {
+			this.$emit('click');
+		},
+		// 图片加载失败
+		onErrorHandler(err) {
+			this.loading = false;
+			this.isError = true;
+			this.$emit('error', err);
+		},
+		// 图片加载完成，标记loading结束
+		onLoadHandler() {
+			this.loading = false;
+			this.isError = false;
+			this.$emit('load');
+			// 如果不需要动画效果，就不执行下方代码，同时移除加载时的背景颜色
+			// 否则无需fade效果时，png图片依然能看到下方的背景色
+			if (!this.fade) return this.removeBgColor();
+			// 原来opacity为1(不透明，是为了显示占位图)，改成0(透明，意味着该元素显示的是背景颜色，默认的灰色)，再改成1，是为了获得过渡效果
+			this.opacity = 0;
+			// 这里设置为0，是为了图片展示到背景全透明这个过程时间为0，延时之后延时之后重新设置为duration，是为了获得背景透明(灰色)
+			// 到图片展示的过程中的淡入效果
+			this.durationTime = 0;
+			// 延时50ms，否则在浏览器H5，过渡效果无效
+			setTimeout(() => {
+				this.durationTime = this.duration;
+				this.opacity = 1;
+				setTimeout(() => {
+					this.removeBgColor();
+				}, this.durationTime);
+			}, 50);
+		},
+		// 移除图片的背景色
+		removeBgColor() {
+			// 淡入动画过渡完成后，将背景设置为透明色，否则png图片会看到灰色的背景
+			this.backgroundStyle = {
+				backgroundColor: 'transparent'
+			};
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import '../../libs/css/style.components.scss';
+
+.u-image {
+	position: relative;
+	transition: opacity 0.5s ease-in-out;
+
+	&__image {
+		width: 100%;
+		height: 100%;
+	}
+
+	&__loading,
+	&__error {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		background-color: $u-bg-color;
+		color: $u-tips-color;
+		font-size: 46rpx;
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-input/u-input.vue b/uni_modules/vk-uview-ui/components/u-input/u-input.vue
new file mode 100644
index 0000000..e932147
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-input/u-input.vue
@@ -0,0 +1,466 @@
+<template>
+	<view
+		class="u-input"
+		:class="{
+			'u-input--border': border,
+			'u-input--error': validateState
+		}"
+		:style="{
+			padding: padding ? padding : `0 ${border ? 20 : 0}rpx`,
+			borderColor: borderColor,
+			textAlign: inputAlignCom,
+			backgroundColor: backgroundColor,
+		}"
+		@tap.stop="inputClick"
+	>
+		<textarea
+			v-if="type == 'textarea'"
+			class="u-input__input u-input__textarea"
+			:style="[getStyle]"
+			:value="defaultValue"
+			:placeholder="placeholder"
+			:placeholderStyle="placeholderStyle"
+			:disabled="disabled"
+			:maxlength="inputMaxlength"
+			:fixed="fixed"
+			:focus="focus"
+			:autoHeight="autoHeight"
+			:selection-end="uSelectionEnd"
+			:selection-start="uSelectionStart"
+			:cursor-spacing="getCursorSpacing"
+			:show-confirm-bar="showConfirmbar"
+			:adjust-position="adjustPosition"
+			@input="handleInput"
+			@blur="handleBlur"
+			@focus="onFocus"
+			@confirm="onConfirm"
+		/>
+		<input
+			v-else
+			class="u-input__input"
+			:type="type == 'password' ? 'text' : type"
+			:style="[getStyle]"
+			:value="defaultValue"
+			:password="type == 'password' && !showPassword"
+			:placeholder="placeholder"
+			:placeholderStyle="placeholderStyle"
+			:disabled="disabled || type === 'select'"
+			:maxlength="inputMaxlength"
+			:focus="focus"
+			:confirmType="confirmType"
+			:cursor-spacing="getCursorSpacing"
+			:selection-end="uSelectionEnd"
+			:selection-start="uSelectionStart"
+			:show-confirm-bar="showConfirmbar"
+			:adjust-position="adjustPosition"
+			@focus="onFocus"
+			@blur="handleBlur"
+			@input="handleInput"
+			@confirm="onConfirm"
+		/>
+		<view class="u-input__right-icon u-flex">
+			<view
+				class="u-input__right-icon__clear u-input__right-icon__item"
+				@tap="onClear"
+				v-if="clearableCom && valueCom != '' && focused"
+			>
+				<u-icon size="32" name="close-circle-fill" color="#c0c4cc" />
+			</view>
+			<view
+				class="u-input__right-icon__clear u-input__right-icon__item"
+				v-if="passwordIcon && type == 'password'"
+			>
+				<u-icon
+					size="32"
+					:name="!showPassword ? 'eye' : 'eye-fill'"
+					color="#c0c4cc"
+					@click="showPassword = !showPassword"
+				/>
+			</view>
+			<view
+				class="u-input__right-icon--select u-input__right-icon__item"
+				v-if="type == 'select'"
+				:class="{
+					'u-input__right-icon--select--reverse': selectOpen
+				}"
+			>
+				<u-icon name="arrow-down-fill" size="26" color="#c0c4cc"></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import Emitter from "../../libs/util/emitter.js";
+
+/**
+ * input 输入框
+ * @description 此组件为一个输入框，默认没有边框和样式，是专门为配合表单组件u-form而设计的，利用它可以快速实现表单验证，输入内容，下拉选择等功能。
+ * @tutorial https://vkuviewdoc.fsq.pub/components/input.html
+ * @property {String} type 模式选择，见官网说明
+ * 	@value text						文本输入键盘
+ * 	@value number 				数字输入键盘
+ * 	@value idcard 				身份证输入键盘
+ * 	@value digit					带小数点的数字键盘
+ * 	@value password				密码输入键盘
+ * @property {Boolean} clearable 是否显示右侧的清除图标(默认true)
+ * @property {} v-model 用于双向绑定输入框的值
+ * @property {String} input-align 输入框文字的对齐方式(默认left)
+ * @property {String} placeholder placeholder显示值(默认 '请输入内容')
+ * @property {Boolean} disabled 是否禁用输入框(默认false)
+ * @property {String Number} maxlength 输入框的最大可输入长度(默认140)
+ * @property {String Number} selection-start 光标起始位置，自动聚焦时有效，需与selection-end搭配使用（默认-1）
+ * @property {String Number} maxlength 光标结束位置，自动聚焦时有效，需与selection-start搭配使用（默认-1）
+ * @property {String Number} cursor-spacing 指定光标与键盘的距离，单位px(默认0)
+ * @property {String} placeholderStyle placeholder的样式，字符串形式，如"color: red;"(默认 "color: #c0c4cc;")
+ * @property {String} confirm-type 设置键盘右下角按钮的文字，仅在type为text时生效(默认done)
+ * @property {Object} custom-style 自定义输入框的样式，对象形式
+ * @property {Boolean} focus 是否自动获得焦点(默认false)
+ * @property {Boolean} fixed 如果type为textarea，且在一个"position:fixed"的区域，需要指明为true(默认false)
+ * @property {Boolean} password-icon type为password时，是否显示右侧的密码查看图标(默认true)
+ * @property {Boolean} border 是否显示边框(默认false)
+ * @property {String} border-color 输入框的边框颜色(默认#dcdfe6)
+ * @property {Boolean} auto-height 是否自动增高输入区域，type为textarea时有效(默认true)
+ * @property {String Number} height 高度，单位rpx(text类型时为70，textarea时为100)
+ * @example <u-input v-model="value" :type="type" :border="border" />
+ */
+export default {
+	name: "u-input",
+	emits: ["update:modelValue", "input", "change", "confirm", "clear", "blur", "focus", "click", "touchstart"],
+	mixins: [Emitter],
+	props: {
+		value: {
+			type: [String, Number],
+			default: ""
+		},
+		modelValue: {
+			type: [String, Number],
+			default: ""
+		},
+		// 输入框的类型，textarea，text，number
+		type: {
+			type: String,
+			default: "text"
+		},
+		inputAlign: {
+			type: String,
+			default: ""
+		},
+		placeholder: {
+			type: String,
+			default: "请输入内容"
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		maxlength: {
+			type: [Number, String],
+			default: 140
+		},
+		placeholderStyle: {
+			type: String,
+			default: "color: #c0c4cc;"
+		},
+		confirmType: {
+			type: String,
+			default: "done"
+		},
+		// 输入框的自定义样式
+		customStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 如果 textarea 是在一个 position:fixed 的区域，需要显示指定属性 fixed 为 true
+		fixed: {
+			type: Boolean,
+			default: false
+		},
+		// 是否自动获得焦点
+		focus: {
+			type: Boolean,
+			default: false
+		},
+		// 密码类型时，是否显示右侧的密码图标
+		passwordIcon: {
+			type: Boolean,
+			default: true
+		},
+		// input|textarea是否显示边框
+		border: {
+			type: Boolean,
+			default: false
+		},
+		// 输入框的边框颜色
+		borderColor: {
+			type: String,
+			default: "#dcdfe6"
+		},
+		autoHeight: {
+			type: Boolean,
+			default: true
+		},
+		// type=select时，旋转右侧的图标，标识当前处于打开还是关闭select的状态
+		// open-打开，close-关闭
+		selectOpen: {
+			type: Boolean,
+			default: false
+		},
+		// 高度，单位rpx
+		height: {
+			type: [Number, String],
+			default: ""
+		},
+		// 是否可清空
+		clearable: {
+			type: [Boolean, String],
+		},
+		// 指定光标与键盘的距离，单位 px
+		cursorSpacing: {
+			type: [Number, String],
+			default: 0
+		},
+		// 光标起始位置，自动聚焦时有效，需与selection-end搭配使用
+		selectionStart: {
+			type: [Number, String],
+			default: -1
+		},
+		// 光标结束位置，自动聚焦时有效，需与selection-start搭配使用
+		selectionEnd: {
+			type: [Number, String],
+			default: -1
+		},
+		// 是否自动去除两端的空格
+		trim: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示键盘上方带有”完成“按钮那一栏
+		showConfirmbar: {
+			type: Boolean,
+			default: true
+		},
+		// 弹出键盘时是否自动调节高度，uni-app默认值是true
+		adjustPosition: {
+			type: Boolean,
+			default: true
+		},
+		// input的背景色
+		backgroundColor: {
+			type: String,
+		},
+		// input的padding
+		padding: {
+			type: String,
+		},
+	},
+	data() {
+		return {
+			defaultValue: "",
+			inputHeight: 70, // input的高度
+			textareaHeight: 100, // textarea的高度
+			validateState: false, // 当前input的验证状态，用于错误时，边框是否改为红色
+			focused: false, // 当前是否处于获得焦点的状态
+			showPassword: false, // 是否预览密码
+			lastValue: "" ,// 用于头条小程序，判断@input中，前后的值是否发生了变化，因为头条中文下，按下键没有输入内容，也会触发@input时间
+			uForm:{
+				inputAlign: "",
+				clearable: ""
+			}
+		};
+	},
+	watch: {
+		valueCom(nVal, oVal) {
+			this.defaultValue = nVal;
+			// 当值发生变化，且为select类型时(此时input被设置为disabled，不会触发@input事件)，模拟触发@input事件
+			if (nVal != oVal && this.type == "select")
+				this.handleInput({
+					detail: {
+						value: nVal
+					}
+				});
+		}
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		inputAlignCom(){
+			return this.inputAlign || this.uForm.inputAlign || "left";
+		},
+		clearableCom(){
+			if (typeof this.clearable == "boolean") return this.clearable;
+			if (typeof this.uForm.clearable == "boolean") return this.uForm.clearable;
+			return true;
+		},
+		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，给用户可以传入字符串数值
+		inputMaxlength() {
+			return Number(this.maxlength);
+		},
+		getStyle() {
+			let style = {};
+			// 如果没有自定义高度，就根据type为input还是textare来分配一个默认的高度
+			style.minHeight = this.height
+				? this.height + "rpx"
+				: this.type == "textarea"
+				? this.textareaHeight + "rpx"
+				: this.inputHeight + "rpx";
+			style = Object.assign(style, this.customStyle);
+			return style;
+		},
+		//
+		getCursorSpacing() {
+			return Number(this.cursorSpacing);
+		},
+		// 光标起始位置
+		uSelectionStart() {
+			return String(this.selectionStart);
+		},
+		// 光标结束位置
+		uSelectionEnd() {
+			return String(this.selectionEnd);
+		}
+	},
+	created() {
+		// 监听u-form-item发出的错误事件，将输入框边框变红色
+		// #ifndef VUE3
+		this.$on("onFormItemError", this.onFormItemError);
+		// #endif
+		this.defaultValue = this.valueCom;
+	},
+	mounted() {
+		let parent = this.$u.$parent.call(this, 'u-form');
+		if (parent) {
+			Object.keys(this.uForm).map(key => {
+				this.uForm[key] = parent[key];
+			});
+		}
+	},
+	methods: {
+		/**
+		 * change 事件
+		 * @param event
+		 */
+		handleInput(event) {
+			let value = event.detail.value;
+			// 判断是否去除空格
+			if (this.trim) value = this.$u.trim(value);
+			// vue 原生的方法 return 出去
+			this.$emit("input", value);
+			this.$emit("update:modelValue", value);
+			// 当前model 赋值
+			this.defaultValue = value;
+			// 过一个生命周期再发送事件给u-form-item，否则this.$emit('input')更新了父组件的值，但是微信小程序上
+			// 尚未更新到u-form-item，导致获取的值为空，从而校验混论
+			// 这里不能延时时间太短，或者使用this.$nextTick，否则在头条上，会造成混乱
+			setTimeout(() => {
+				// 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理
+				// #ifdef MP-TOUTIAO
+				if (this.$u.trim(value) == this.lastValue) return;
+				this.lastValue = value;
+				// #endif
+				// 将当前的值发送到 u-form-item 进行校验
+				this.dispatch("u-form-item", "onFieldChange", value);
+			}, 40);
+		},
+		/**
+		 * blur 事件
+		 * @param event
+		 */
+		handleBlur(event) {
+			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
+			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
+			setTimeout(() => {
+				this.focused = false;
+			}, 100);
+			// vue 原生的方法 return 出去
+			this.$emit("blur", event.detail.value);
+			setTimeout(() => {
+				// 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理
+				// #ifdef MP-TOUTIAO
+				if (this.$u.trim(value) == this.lastValue) return;
+				this.lastValue = value;
+				// #endif
+				// 将当前的值发送到 u-form-item 进行校验
+				this.dispatch("u-form-item", "onFieldBlur", event.detail.value);
+			}, 40);
+		},
+		onFormItemError(status) {
+			this.validateState = status;
+		},
+		onFocus(event) {
+			this.focused = true;
+			this.$emit("focus");
+		},
+		onConfirm(e) {
+			this.$emit("confirm", e.detail.value);
+		},
+		onClear(event) {
+			this.$emit("input", "");
+			this.$emit("update:modelValue", "");
+			this.$emit("clear");
+		},
+		inputClick() {
+			this.$emit("click");
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-input {
+	position: relative;
+	flex: 1;
+	@include vue-flex;
+
+	&__input {
+		//height: $u-form-item-height;
+		font-size: 28rpx;
+		color: $u-main-color;
+		flex: 1;
+	}
+
+	&__textarea {
+		width: auto;
+		font-size: 28rpx;
+		color: $u-main-color;
+		padding: 10rpx 0;
+		line-height: normal;
+		flex: 1;
+	}
+
+	&--border {
+		border-radius: 6rpx;
+		border-radius: 4px;
+		border: 1px solid $u-form-item-border-color;
+	}
+
+	&--error {
+		border-color: $u-type-error !important;
+	}
+
+	&__right-icon {
+		&__item {
+			margin-left: 10rpx;
+		}
+
+		&--select {
+			transition: transform 0.4s;
+
+			&--reverse {
+				transform: rotate(-180deg);
+			}
+		}
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-lazy-load/u-lazy-load.vue b/uni_modules/vk-uview-ui/components/u-lazy-load/u-lazy-load.vue
new file mode 100644
index 0000000..f872922
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-lazy-load/u-lazy-load.vue
@@ -0,0 +1,254 @@
+<template>
+	<view class="u-wrap" :style="{
+			  opacity: Number(opacity),
+			  borderRadius: borderRadius + 'rpx',
+			  // 因为time值需要改变,所以不直接用duration值(不能改变父组件prop传过来的值)
+			  transition: `opacity ${time / 1000}s ease-in-out`
+		   }"
+	 :class="'u-lazy-item-' + elIndex">
+		<view :class="'u-lazy-item-' + elIndex">
+			<image :style="{borderRadius: borderRadius + 'rpx', height: imgHeight}" v-if="!isError" class="u-lazy-item"
+			 :src="isShow ? image : loadingImg" :mode="imgMode" @load="imgLoaded" @error="loadError" @tap="clickImg"></image>
+			<image :style="{borderRadius: borderRadius + 'rpx', height: imgHeight}" class="u-lazy-item error" v-else :src="errorImg"
+			 :mode="imgMode" @load="errorImgLoaded" @tap="clickImg"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * lazyLoad 懒加载
+	 * @description 懒加载使用的场景为：页面有很多图片时，APP会同时加载所有的图片，导致页面卡顿，各个位置的图片出现前后不一致等.
+	 * @tutorial https://www.uviewui.com/components/lazyLoad.html
+	 * @property {String Number} index 用户自定义值，在事件触发时回调，用以区分是哪个图片
+	 * @property {String} image 图片路径
+	 * @property {String} loading-img 预加载时的占位图
+	 * @property {String} error-img 图片加载出错时的占位图
+	 * @property {String} threshold 触发加载时的位置，见上方说明，单位 rpx（默认300）
+	 * @property {String Number} duration 图片加载成功时，淡入淡出时间，单位ms（默认）
+	 * @property {String} effect 图片加载成功时，淡入淡出的css动画效果（默认ease-in-out）
+	 * @property {Boolean} is-effect 图片加载成功时，是否启用淡入淡出效果（默认true）
+	 * @property {String Number} border-radius 图片圆角值，单位rpx（默认0）
+	 * @property {String Number} height 图片高度，注意：实际高度可能受img-mode参数影响（默认450）
+	 * @property {String Number} mg-mode 图片的裁剪模式，详见image组件裁剪模式（默认widthFix）
+	 * @event {Function} click 点击图片时触发
+	 * @event {Function} load 图片加载成功时触发
+	 * @event {Function} error 图片加载失败时触发
+	 * @example <u-lazy-load :image="image" :loading-img="loadingImg" :error-img="errorImg"></u-lazy-load>
+	 */
+	export default {
+		name: 'u-lazy-load',
+    emits: ["click", "load", "error"],
+		props: {
+			index: {
+				type: [Number, String]
+			},
+			// 要显示的图片
+			image: {
+				type: String,
+				default: ''
+			},
+			// 图片裁剪模式
+			imgMode: {
+				type: String,
+				default: 'widthFix'
+			},
+			// 占位图片路径
+			loadingImg: {
+				type: String,
+				default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAMAAAC3Ycb+AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OUM0QjNBQjkyQUQ2MTFFQTlCNUQ4RTIzNDE5RUIxNjciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OUM0QjNBQkEyQUQ2MTFFQTlCNUQ4RTIzNDE5RUIxNjciPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo5QzRCM0FCNzJBRDYxMUVBOUI1RDhFMjM0MTlFQjE2NyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo5QzRCM0FCODJBRDYxMUVBOUI1RDhFMjM0MTlFQjE2NyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PtRHfPcAAAAzUExURZWVldfX18PDw62trZubm9zc3Li4uKGhoebm5tLS0uHh4c3Nzaenp729vcjIyLKysuvr6141L40AAAcXSURBVHja7NzZlqpGAEBR5lG0//9rIw7IJKJi4or7PGTdtN10wr5SVAEGf/qqArsAiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAIiIAAERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAgAgJEQIAICBABERAg+nmQFMi5Jis+sIniED23jSzIgLTtg2D//iYme/8QBM/9lQ+CAEhbNLM3N9hEHAThX7GPCiBfAxK1b51kD+R7QMLjXg7iCsgWIPUh7pfVozG791oeBPngm48G583uW5GkBvI+SBaM2xXDn1oqum423bX/mgF5FySc2cv93Voug9TdZotsggnkBZB2NzbhrSY5HnoG07jei8dvzsJB/c3W60SALILE46+WCztsbhPR7R2VJq0ukEcT49nyy8QhaKcRa3fYHZD4+ufqOJAcgDz8/59vtw1I3QP5K6JsOG0vm3hce4I8LQp/BaRZGJC3AAn7IKOKXbC+7EdA5vdmmVwOLksgRThqOqiH4XEGsht+peoPUE8U/jJIO5OLH4GEwUslV5G0PTBG5Uiw/Y2jyigO3l9HAHKv9PYb82LloH74dZBoBUgar+l48NsNvtD0fkez9iwrAvIYZDRCl+Xs149Hm/KZmQ+QjUCiO1ei4ru7EsgnQYrkznlQb7thCuRfAzlOAPN72427P4VA/i2Q/DKT/Ls/VR8fvIBsDZIuz7TPF6TCbnk4GJkB2RokejTjuE7/unlgCuSTIO0Cy+Plp6vDfnQlBchy8QtjSHVd3EgmK1bHLm+H6+nXYbz2DuQRSPnqoL7vvq0u70on4zvxgCyWD3b9UyDVdW24PaWaiGTnFZJwPIQAebDpIKheBIm7n124ZthMJipAlkqHO+IZkP1tbfzOJark/A7MgKyvvl60fRqkvXfhuow+t9+q00+0/yyBrK8ZngOtBzldhw2X9tvpNGty0gvkmbPeJ0Cy/r09s/stbmfo0yMWkEdjevgKyOn2t2pxv7UXoibTdCDLje9/Ww1ymqzn87dbp92242ZmMRjI8hASvwKSLq4udqN6ksw8nxXN3tszD9L8Gkg+2mFrQYql5az4tvFj5xOx4VwnSdeBtGdyPwUytxK77pBVlNHdO7OK3rh/eTPUvdutT3fO52tuHMqD4N7llv8pyOQQ//w19YVDfX27+Sfuby9/6nau4pdA8vEdOZuChEH/quHt0Jg+IRJ/5+PrHwKZXfjbDiS73Zo7mu5UkzX7uTsXe0e/7nC3ePf1O69+BUg2XDfZCqSqOu7rGVf8cHBe8zhC2b61dtUHXv0OkGo6ZL4JkpbRYXdUaFevivx2M/1GIOctNh949TtAoumQ+TpIHMX54CJu+8BDd8FkE5BqcZh/59XvAClmTvKfB0nDqIlHo3T70SftyW1eX9dXtgQJqs1f/Q6QaOa/7wmQKtxH8eiGoCRuovODIO3VxOMmruZbHrLyD7z6DSDtGyT7ew1kf9hNn07c986JTovzzem0Id9wUG+Vk/IDr34DSNR7huZJkMFT6vEhqrPx/j5cnlZML8N6/PAzh9Y99Flm5Yde/c9BquDOkvkKkMP58dA4qi9vivE8JOvGz/j8FokfPpr288+pH2ZPOZrLmeGD+7KOh6dqYWJ48ki7yUg0tz0go/fv/LLddfV3sgOLJyaGPY/zrSlh1a36Arkzoue9CyG35ze6E6/dzO2Ga0EGHqdRJIkfn9/8OEjTW8Vq91ZWh39FeehWA7Nu9ft8CpUEk1WWOyDF0OPyEU2Pnzf/bZC0P6IPzmAvu7KauQBVrgKpJ0tG2arHzX8e5Pb3PezNs/PrX+3JMyCLn9XXf37tPFHvt09WfCDDjx+yyn1/p1V11j7GnB/q3leLuVva79S/tzed+db08YpF4uOZtmz/9oXWMq6BCAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAERECACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiACAgQAQEiIEAEBIiAALELvqt/BBgACqVeUBXxcCkAAAAASUVORK5CYII='
+			},
+			// 加载失败的错误占位图
+			errorImg: {
+				type: String,
+				default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAMAAAC3Ycb+AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ODdDMjhENDYyQUQ2MTFFQTlDQ0VBODgxQjFFOEEyMEMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6ODdDMjhENDcyQUQ2MTFFQTlDQ0VBODgxQjFFOEEyMEMiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4N0MyOEQ0NDJBRDYxMUVBOUNDRUE4ODFCMUU4QTIwQyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo4N0MyOEQ0NTJBRDYxMUVBOUNDRUE4ODFCMUU4QTIwQyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhLwhikAAAAzUExURZWVldfX162t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'
+			},
+			// 图片进入可见区域前多少像素时，单位rpx，开始加载图片
+			// 负数为图片超出屏幕底部多少距离后触发懒加载，正数为图片顶部距离屏幕底部多少距离时触发(图片还没出现在屏幕上)
+			threshold: {
+				type: [Number, String],
+				default: 100
+			},
+			// 淡入淡出动画的过渡时间
+			duration: {
+				type: [Number, String],
+				default: 500
+			},
+			// 渡效果的速度曲线，各个之间差别不大，因为这是淡入淡出，且时间很短，不是那些变形或者移动的情况，会明显
+			// linear|ease|ease-in|ease-out|ease-in-out|cubic-bezier(n,n,n,n);
+			effect: {
+				type: String,
+				default: 'ease-in-out'
+			},
+			// 是否使用过渡效果
+			isEffect: {
+				type: Boolean,
+				default: true
+			},
+			// 圆角值
+			borderRadius: {
+				type: [Number, String],
+				default: 0
+			},
+			// 图片高度，单位rpx
+			height: {
+				type: [Number, String],
+				default: '450'
+			}
+		},
+		data() {
+			return {
+				isShow: false,
+				opacity: 1,
+				time: this.duration,
+				loadStatus: '', // 默认是懒加载中的状态
+				isError: false, // 图片加载失败
+				elIndex: this.$u.guid()
+			}
+		},
+		computed: {
+			// 将threshold从rpx转为px
+			getThreshold() {
+				// 先取绝对值，因为threshold可能是负数，最后根据this.threshold是正数或者负数，重新还原
+				let thresholdPx = uni.upx2px(Math.abs(this.threshold));
+				return this.threshold < 0 ? -thresholdPx : thresholdPx;
+			},
+			// 计算图片的高度，可能为auto，带%，或者直接数值
+			imgHeight() {
+				return this.$u.addUnit(this.height);
+			}
+		},
+		created() {
+			// 由于一些特殊原因，不能将此变量放到data中定义
+			this.observer = {};
+		},
+		watch: {
+			isShow(nVal) {
+				// 如果是不开启过渡效果，直接返回
+				if (!this.isEffect) return;
+				this.time = 0;
+				// 原来opacity为1(不透明，是为了显示占位图)，改成0(透明，意味着该元素显示的是背景颜色，默认的白色)，再改成1，是为了获得过渡效果
+				this.opacity = 0;
+				// 延时30ms，否则在浏览器H5，过渡效果无效
+				setTimeout(() => {
+					this.time = this.duration;
+					this.opacity = 1;
+				}, 30)
+			},
+			// 图片路径发生变化时，需要重新标记一些变量，否则会一直卡在某一个状态，比如isError
+			image(n) {
+				if(!n) {
+					// 如果传入null或者''，或者undefined，标记为错误状态
+					this.isError = true;
+				} else {
+					this.init();
+					this.isError = false;
+				}
+			}
+		},
+		methods: {
+			// 用于重新初始化
+			init() {
+				this.isError = false;
+				this.loadStatus = '';
+			},
+			// 点击图片触发的事件,loadlazy-还是懒加载中状态，loading-图片正在加载，loaded-图片加加载完成
+			clickImg() {
+				let whichImg = '';
+				// 如果isShow为false，意味着图片还没开始加载，点击的只能是最开始的占位图
+				if (this.isShow == false) whichImg = 'lazyImg';
+				// 如果isError为true，意味着图片加载失败，这是只剩下错误的占位图，所以点击的只能是错误占位图
+				// 当然，也可以给错误的占位图元素绑定点击事件，看你喜欢~
+				else if (this.isError == true) whichImg = 'errorImg';
+				// 总共三张图片，除了两个占位图，剩下的只能是正常的那张图片了
+				else whichImg = 'realImg';
+				// 只通知当前图片的index
+				this.$emit('click', this.index);
+			},
+			// 图片加载完成事件，可能是加载占位图时触发，也可能是加载真正的图片完成时触发，通过isShow区分
+			imgLoaded() {
+				// 占位图加载完成
+				if (this.loadStatus == '') {
+					this.loadStatus = 'lazyed';
+				}
+				// 真正的图片加载完成 
+				else if (this.loadStatus == 'lazyed') {
+					this.loadStatus = 'loaded';
+					this.$emit('load', this.index);
+				}
+			},
+			// 错误的图片加载完成
+			errorImgLoaded() {
+				this.$emit('error', this.index);
+			},
+			// 图片加载失败
+			loadError() {
+				this.isError = true;
+			},
+			disconnectObserver(observerName) {
+				const observer = this[observerName];
+				observer && observer.disconnect();
+			},
+		},
+    // #ifndef VUE3
+    // 组件销毁前，将实例从u-form的缓存中移除
+    beforeDestroy() {
+      // 销毁页面时，可能还没触发某张很底部的懒加载图片，所以把这个事件给去掉
+      //observer.disconnect();
+    },
+    // #endif
+    
+    // #ifdef VUE3
+    beforeUnmount() {
+      
+    },
+    // #endif
+		mounted() {
+			// 此uOnReachBottom事件由mixin.js发出，目的是让页面到底时，保证所有图片都进行加载，做到绝对稳定且可靠
+			this.$nextTick(() => {
+				uni.$once('uOnReachBottom', () => {
+					if (!this.isShow) this.isShow = true;
+				});
+			})
+			// mounted的时候，不一定挂载了这个元素，延时30ms，否则会报错或者不报错，但是也没有效果
+			setTimeout(() => {
+				// 这里是组件内获取布局状态，不能用uni.createIntersectionObserver，而必须用this.createIntersectionObserver
+				this.disconnectObserver('contentObserver');
+				const contentObserver = uni.createIntersectionObserver(this);
+				// 要理解这里怎么计算的，请看这个：
+				// https://blog.csdn.net/qq_25324335/article/details/83687695
+				contentObserver.relativeToViewport({
+					bottom: this.getThreshold,
+				}).observe('.u-lazy-item-' + this.elIndex, (res) => {
+					if (res.intersectionRatio > 0) {
+						// 懒加载状态改变
+						this.isShow = true;
+						// 如果图片已经加载，去掉监听，减少性能的消耗
+						this.disconnectObserver('contentObserver');
+					}
+				})
+				this.contentObserver = contentObserver;
+			}, 30)
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	.u-wrap {
+		background-color: #eee;
+		overflow: hidden;
+	}
+
+	.u-lazy-item {
+		width: 100%;
+		// 骗系统开启硬件加速
+		transform: transition3d(0, 0, 0);
+		// 防止图片加载“闪一下”
+		will-change: transform;
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-loading/u-loading.vue b/uni_modules/vk-uview-ui/components/u-loading/u-loading.vue
new file mode 100644
index 0000000..35930a1
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-loading/u-loading.vue
@@ -0,0 +1,108 @@
+<template>
+	<view v-if="show" class="u-loading" :class="mode == 'circle' ? 'u-loading-circle' : 'u-loading-flower'" :style="[cricleStyle]">
+	</view>
+</template>
+
+<script>
+	/**
+	 * loading 加载动画
+	 * @description 警此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
+	 * @tutorial https://www.uviewui.com/components/loading.html
+	 * @property {String} mode 模式选择，见官网说明（默认circle）
+	 * 	@value circle					圆型
+	 * 	@value flower 				花型
+	 * @property {String} color 动画活动区域的颜色，只对 mode = flower 模式有效（默认#c7c7c7）
+	 * @property {String Number} size 加载图标的大小，单位rpx（默认34）
+	 * @property {Boolean} show 是否显示动画（默认true）
+	 * @example <u-loading mode="circle"></u-loading>
+	 */
+	export default {
+		name: "u-loading",
+		props: {
+			// 动画的类型
+			mode: {
+				type: String,
+				default: 'circle'
+			},
+			// 动画的颜色
+			color: {
+				type: String,
+				default: '#c7c7c7'
+			},
+			// 加载图标的大小，单位rpx
+			size: {
+				type: [String, Number],
+				default: '34'
+			},
+			// 是否显示动画
+			show: {
+				type: Boolean,
+				default: true
+			}
+		},
+		computed: {
+			// 加载中圆圈动画的样式
+			cricleStyle() {
+				let style = {};
+				style.width = this.size + 'rpx';
+				style.height = this.size + 'rpx';
+				if (this.mode == 'circle') style.borderColor = `#e4e4e4 #e4e4e4 #e4e4e4 ${this.color ? this.color : '#c7c7c7'}`;
+				return style;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-loading-circle {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		vertical-align: middle;
+		width: 28rpx;
+		height: 28rpx;
+		background: 0 0;
+		border-radius: 50%;
+		border: 2px solid;
+		border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
+		animation: u-circle 1s linear infinite;
+	}
+
+	.u-loading-flower {
+		width: 20px;
+		height: 20px;
+		display: inline-block;
+		vertical-align: middle;
+		-webkit-animation: u-flower 1s steps(12) infinite;
+		animation: u-flower 1s steps(12) infinite;
+		background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
+		background-size: 100%;
+	}
+
+	@keyframes u-flower {
+		0% {
+			-webkit-transform: rotate(0deg);
+			transform: rotate(0deg);
+		}
+
+		to {
+			-webkit-transform: rotate(1turn);
+			transform: rotate(1turn);
+		}
+	}
+
+	@keyframes u-circle {
+		0% {
+			-webkit-transform: rotate(0deg);
+			transform: rotate(0deg);
+		}
+
+		to {
+			-webkit-transform: rotate(1turn);
+			transform: rotate(1turn);
+		}
+	}
+
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-loadmore/u-loadmore.vue b/uni_modules/vk-uview-ui/components/u-loadmore/u-loadmore.vue
new file mode 100644
index 0000000..e7cbbea
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-loadmore/u-loadmore.vue
@@ -0,0 +1,204 @@
+<template>
+	<view class="u-load-more-wrap" :style="{
+		backgroundColor: bgColor,
+		marginBottom: marginBottom + 'rpx',
+		marginTop: marginTop + 'rpx',
+		height: $u.addUnit(height)
+	}">
+		<u-line color="#d4d4d4" length="50"></u-line>
+		<!-- 加载中和没有更多的状态才显示两边的横线 -->
+		<view :class="status == 'loadmore' || status == 'nomore' ? 'u-more' : ''" class="u-load-more-inner">
+			<view class="u-loadmore-icon-wrap">
+				<u-loading class="u-loadmore-icon" :color="iconColor" :mode="iconType == 'circle' ? 'circle' : 'flower'" :show="status == 'loading' && icon"></u-loading>
+			</view>
+			<!-- 如果没有更多的状态下，显示内容为dot（粗点），加载特定样式 -->
+			<view class="u-line-1" :style="[loadTextStyle]" :class="[(status == 'nomore' && isDot == true) ? 'u-dot-text' : 'u-more-text']" @tap="loadMore">
+				{{ showText }}
+			</view>
+		</view>
+		<u-line color="#d4d4d4" length="50"></u-line>
+	</view>
+</template>
+
+<script>
+	/**
+	 * loadmore 加载更多
+	 * @description 此组件一般用于标识页面底部加载数据时的状态。
+	 * @tutorial https://www.uviewui.com/components/loadMore.html
+	 * @property {String} status 组件状态（默认loadmore）
+	 * @property {String} bg-color 组件背景颜色，在页面是非白色时会用到（默认#ffffff）
+	 * @property {Boolean} icon 加载中时是否显示图标（默认true）
+	 * @property {String} icon-type 加载中时的图标类型（默认circle）
+	 * @property {String} icon-color icon-type为circle时有效，加载中的动画图标的颜色（默认#b7b7b7）
+	 * @property {Boolean} is-dot status为nomore时，内容显示为一个"●"（默认false）
+	 * @property {String} color 字体颜色（默认#606266）
+	 * @property {String Number} margin-top 到上一个相邻元素的距离
+	 * @property {String Number} margin-bottom 到下一个相邻元素的距离
+	 * @property {Object} load-text 自定义显示的文字，见上方说明示例
+	 * @event {Function} loadmore status为loadmore时，点击组件会发出此事件
+	 * @example <u-loadmore :status="status" icon-type="iconType" load-text="loadText" />
+	 */
+	export default {
+		name: "u-loadmore",
+    emits: ["loadmore"],
+		props: {
+			// 组件背景色
+			bgColor: {
+				type: String,
+				default: 'transparent'
+			},
+			// 是否显示加载中的图标
+			icon: {
+				type: Boolean,
+				default: true
+			},
+			// 字体大小
+			fontSize: {
+				type: String,
+				default: '28'
+			},
+			// 字体颜色
+			color: {
+				type: String, 
+				default: '#606266'
+			},
+			// 组件状态，loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
+			status: {
+				type: String,
+				default: 'loadmore'
+			},
+			// 加载中状态的图标，flower-花朵状图标，circle-圆圈状图标
+			iconType: {
+				type: String,
+				default: 'circle'
+			},
+			// 显示的文字
+			loadText: {
+				type: Object,
+				default () {
+					return {
+						loadmore: '加载更多',
+						loading: '正在加载...',
+						nomore: '没有更多了'
+					}
+				}
+			},
+			// 在“没有更多”状态下，是否显示粗点
+			isDot: {
+				type: Boolean,
+				default: false
+			},
+			// 加载中显示圆圈动画时，动画的颜色
+			iconColor: {
+				type: String,
+				default: '#b7b7b7'
+			},
+			// 上边距
+			marginTop: {
+				type: [String, Number],
+				default: 0
+			},
+			// 下边距
+			marginBottom: {
+				type: [String, Number],
+				default: 0
+			},
+			// 高度，单位rpx
+			height: {
+				type: [String, Number],
+				default: 'auto'
+			}
+		},
+		data() {
+			return {
+				// 粗点
+				dotText: "●"
+			}
+		},
+		computed: {
+			// 加载的文字显示的样式
+			loadTextStyle() {
+				return {
+					color: this.color,
+					fontSize: this.fontSize + 'rpx',
+					position: 'relative',
+					zIndex: 1,
+					backgroundColor: this.bgColor,
+					// 如果是加载中状态，动画和文字需要距离近一点
+				}
+			},
+			// 加载中圆圈动画的样式
+			cricleStyle() {
+				return {
+					borderColor: `#e5e5e5 #e5e5e5 #e5e5e5 ${this.circleColor}`
+				}
+			},
+			// 加载中花朵动画形式
+			// 动画由base64图片生成，暂不支持修改
+			flowerStyle() {
+				return {
+				}
+			},
+			// 显示的提示文字
+			showText() {
+				let text = '';
+				if(this.status == 'loadmore') text = this.loadText.loadmore;
+				else if(this.status == 'loading') text = this.loadText.loading;
+				else if(this.status == 'nomore' && this.isDot) text = this.dotText;
+				else text = this.loadText.nomore;
+				return text;
+			}
+		},
+		methods: {
+			loadMore() {
+				// 只有在“加载更多”的状态下才发送点击事件，内容不满一屏时无法触发底部上拉事件，所以需要点击来触发
+				if(this.status == 'loadmore') this.$emit('loadmore');
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+	
+	/* #ifdef MP */
+	// 在mp.scss中，赋予了u-line为flex: 1，这里需要一个明确的长度，所以重置掉它
+	// 在组件内部，把组件名(u-line)当做选择器，在微信开发工具会提示不合法，但不影响使用
+	u-line {
+		flex: none;
+	}
+	/* #endif */
+	
+	.u-load-more-wrap {
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+	}
+	
+	.u-load-more-inner {
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+		padding: 0 12rpx;
+	}
+	
+	.u-more {
+		position: relative;
+		@include vue-flex;
+		justify-content: center;
+	}
+	
+	.u-dot-text {
+		font-size: 28rpx;
+	}
+	
+	.u-loadmore-icon-wrap {
+		margin-right: 8rpx;
+	}
+	
+	.u-loadmore-icon {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-mask/u-mask.vue b/uni_modules/vk-uview-ui/components/u-mask/u-mask.vue
new file mode 100644
index 0000000..cd33923
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-mask/u-mask.vue
@@ -0,0 +1,137 @@
+<template>
+	<view class="u-mask" hover-stop-propagation :style="[maskStyle, zoomStyle, filterStyle]" @tap="click" @touchmove.stop.prevent="() => {}" :class="{
+		'u-mask-zoom': zoom,
+		'u-mask-show': show
+	}">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * mask 遮罩
+	 * @description 创建一个遮罩层，用于强调特定的页面元素，并阻止用户对遮罩下层的内容进行操作，一般用于弹窗场景
+	 * @tutorial https://www.uviewui.com/components/mask.html
+	 * @property {Boolean} show 是否显示遮罩（默认false）
+	 * @property {String Number} z-index z-index 层级（默认1070）
+	 * @property {Object} custom-style 自定义样式对象，见上方说明
+	 * @property {String Number} duration 动画时长，单位毫秒（默认300）
+	 * @property {Boolean} zoom 是否使用scale对遮罩进行缩放（默认true）
+	 * @property {Boolean} mask-click-able 遮罩是否可点击，为false时点击不会发送click事件（默认true）
+	 * @event {Function} click mask-click-able为true时，点击遮罩发送此事件
+	 * @example <u-mask :show="show" @click="show = false"></u-mask>
+	 */
+	export default {
+		name: "u-mask",
+		emits: ["click"],
+		props: {
+			// 是否显示遮罩
+			show: {
+				type: Boolean,
+				default: false
+			},
+			// 层级z-index
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+			// 用户自定义样式
+			customStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 遮罩的动画样式， 是否使用使用zoom进行scale进行缩放
+			zoom: {
+				type: Boolean,
+				default: true
+			},
+			// 遮罩的过渡时间，单位为ms
+			duration: {
+				type: [Number, String],
+				default: 300
+			},
+			// 是否可以通过点击遮罩进行关闭
+			maskClickAble: {
+				type: Boolean,
+				default: true
+			},
+			// 遮罩的模糊度
+			blur: {
+				type: [Number, String],
+				default: 0
+			},
+		},
+		data() {
+			return {
+				zoomStyle: {
+					transform: ''
+				},
+				scale: 'scale(1.2, 1.2)'
+			}
+		},
+		watch: {
+			show(n) {
+				if(n && this.zoom) {
+					// 当展示遮罩的时候，设置scale为1，达到缩小(原来为1.2)的效果
+					this.zoomStyle.transform = 'scale(1, 1)';
+				} else if(!n && this.zoom) {
+					// 当隐藏遮罩的时候，设置scale为1.2，达到放大(因为显示遮罩时已重置为1)的效果
+					this.zoomStyle.transform = this.scale;
+				}
+			}
+		},
+		computed: {
+			maskStyle() {
+				let style = {};
+				style.backgroundColor = "rgba(0, 0, 0, 0.6)";
+				if(this.show) style.zIndex = this.zIndex ? this.zIndex : this.$u.zIndex.mask;
+				else style.zIndex = -1;
+				style.transition = `all ${this.duration / 1000}s ease-in-out`;
+				// 判断用户传递的对象是否为空，不为空就进行合并
+				if (Object.keys(this.customStyle).length) style = { 
+					...style,
+					...this.customStyle
+				};
+				return style;
+			},
+			filterStyle() {
+				let { blur } = this;
+				let style = {};
+				if (blur) {
+					style.backdropFilter = `blur(${blur}rpx)`;
+				}
+				return style;
+			}
+		},
+		methods: {
+			click() {
+				if (!this.maskClickAble) return;
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		opacity: 0;
+		transition: transform 0.3s;
+	}
+
+	.u-mask-show {
+		opacity: 1;
+	}
+	
+	.u-mask-zoom {
+		transform: scale(1.2, 1.2);
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-modal/u-modal.vue b/uni_modules/vk-uview-ui/components/u-modal/u-modal.vue
new file mode 100644
index 0000000..bf8b4fc
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-modal/u-modal.vue
@@ -0,0 +1,339 @@
+<template>
+	<view>
+		<u-popup
+			:blur="blur"
+			:zoom="zoom"
+			mode="center"
+			:popup="false"
+			:z-index="uZIndex"
+			v-model="popupValue"
+			:length="width"
+			:mask-close-able="maskCloseAble"
+			:border-radius="borderRadius"
+			@close="popupClose"
+			:negative-top="negativeTop"
+		>
+			<view class="u-model">
+				<view v-if="showTitle" class="u-model__title u-line-1" :style="[titleStyle]">
+					{{ title }}
+				</view>
+				<view class="u-model__content">
+					<view :style="[contentStyle]" v-if="$slots.default || $slots.$default"><slot /></view>
+					<view v-else class="u-model__content__message" :style="[contentStyle]">
+						{{ content }}
+					</view>
+				</view>
+				<view class="u-model__footer u-border-top" v-if="showCancelButton || showConfirmButton">
+					<view
+						v-if="showCancelButton"
+						:hover-stay-time="100"
+						hover-class="u-model__btn--hover"
+						class="u-model__footer__button"
+						:style="[cancelBtnStyle]"
+						@tap="cancel"
+					>
+						{{ cancelText }}
+					</view>
+					<view
+						v-if="showConfirmButton || $slots['confirm-button']"
+						:hover-stay-time="100"
+						:hover-class="asyncClose ? 'none' : 'u-model__btn--hover'"
+						class="u-model__footer__button hairline-left"
+						:style="[confirmBtnStyle]"
+						@tap="confirm"
+					>
+						<slot v-if="$slots['confirm-button']" name="confirm-button"></slot>
+						<block v-else>
+							<u-loading mode="circle" :color="confirmColor" v-if="loading"></u-loading>
+							<block v-else>{{ confirmText }}</block>
+						</block>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+/**
+ * modal 模态框
+ * @description 弹出模态框，常用于消息提示、消息确认、在当前页面内完成特定的交互操作
+ * @tutorial https://www.uviewui.com/components/modal.html
+ * @property {Boolean} value 是否显示模态框
+ * @property {String | Number} z-index 层级
+ * @property {String} title 模态框标题（默认"提示"）
+ * @property {String | Number} width 模态框宽度（默认600）
+ * @property {String} content 模态框内容（默认"内容"）
+ * @property {Boolean} show-title 是否显示标题（默认true）
+ * @property {Boolean} async-close 是否异步关闭，只对确定按钮有效（默认false）
+ * @property {Boolean} show-confirm-button 是否显示确认按钮（默认true）
+ * @property {Stringr | Number} negative-top modal往上偏移的值
+ * @property {Boolean} show-cancel-button 是否显示取消按钮（默认false）
+ * @property {Boolean} mask-close-able 是否允许点击遮罩关闭modal（默认false）
+ * @property {String} confirm-text 确认按钮的文字内容（默认"确认"）
+ * @property {String} cancel-text 取消按钮的文字内容（默认"取消"）
+ * @property {String} cancel-color 取消按钮的颜色（默认"#606266"）
+ * @property {String} confirm-color 确认按钮的文字内容（默认"#2979ff"）
+ * @property {String | Number} border-radius 模态框圆角值，单位rpx（默认16）
+ * @property {Object} title-style 自定义标题样式，对象形式
+ * @property {Object} content-style 自定义内容样式，对象形式
+ * @property {Object} cancel-style 自定义取消按钮样式，对象形式
+ * @property {Object} confirm-style 自定义确认按钮样式，对象形式
+ * @property {Boolean} zoom 是否开启缩放模式（默认true）
+ * @event {Function} confirm 确认按钮被点击
+ * @event {Function} cancel 取消按钮被点击
+ * @example <u-modal :src="title" :content="content"></u-modal>
+ */
+export default {
+	name: "u-modal",
+	emits: ["update:modelValue", "input", "confirm", "cancel"],
+	props: {
+		// 是否显示Modal
+		value: {
+			type: Boolean,
+			default: false
+		},
+		modelValue: {
+			type: Boolean,
+			default: false
+		},
+		// 层级z-index
+		zIndex: {
+			type: [Number, String],
+			default: ""
+		},
+		// 标题
+		title: {
+			type: [String],
+			default: "提示"
+		},
+		// 弹窗宽度，可以是数值(rpx)，百分比，auto等
+		width: {
+			type: [Number, String],
+			default: 600
+		},
+		// 弹窗内容
+		content: {
+			type: String,
+			default: "内容"
+		},
+		// 是否显示标题
+		showTitle: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示确认按钮
+		showConfirmButton: {
+			type: Boolean,
+			default: true
+		},
+		// 是否显示取消按钮
+		showCancelButton: {
+			type: Boolean,
+			default: false
+		},
+		// 确认文案
+		confirmText: {
+			type: String,
+			default: "确认"
+		},
+		// 取消文案
+		cancelText: {
+			type: String,
+			default: "取消"
+		},
+		// 确认按钮颜色
+		confirmColor: {
+			type: String,
+			default: "#2979ff"
+		},
+		// 取消文字颜色
+		cancelColor: {
+			type: String,
+			default: "#606266"
+		},
+		// 圆角值
+		borderRadius: {
+			type: [Number, String],
+			default: 16
+		},
+		// 标题的样式
+		titleStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 内容的样式
+		contentStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 取消按钮的样式
+		cancelStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 确定按钮的样式
+		confirmStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 是否开启缩放效果
+		zoom: {
+			type: Boolean,
+			default: true
+		},
+		// 是否异步关闭，只对确定按钮有效
+		asyncClose: {
+			type: Boolean,
+			default: false
+		},
+		// 是否允许点击遮罩关闭modal
+		maskCloseAble: {
+			type: Boolean,
+			default: false
+		},
+		// 给一个负的margin-top，往上偏移，避免和键盘重合的情况
+		negativeTop: {
+			type: [String, Number],
+			default: 0
+		},
+		// 遮罩的模糊度
+		blur: {
+			type: [Number, String],
+			default: 0
+		}
+	},
+	data() {
+		return {
+			loading: false, // 确认按钮是否正在加载中
+			popupValue: false
+		};
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		cancelBtnStyle() {
+			return Object.assign(
+				{
+					color: this.cancelColor
+				},
+				this.cancelStyle
+			);
+		},
+		confirmBtnStyle() {
+			return Object.assign(
+				{
+					color: this.confirmColor
+				},
+				this.confirmStyle
+			);
+		},
+		uZIndex() {
+			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+		}
+	},
+	watch: {
+		// 如果是异步关闭时，外部修改v-model的值为false时，重置内部的loading状态
+		// 避免下次打开的时候，状态混乱
+		valueCom:{
+			immediate: true,
+			handler(n){
+				if (n === true) this.loading = false;
+				this.popupValue = n;
+			}
+		}
+	},
+	methods: {
+		confirm() {
+			// 异步关闭
+			if (this.asyncClose) {
+				this.loading = true;
+			} else {
+				this.$emit("input", false);
+				this.$emit("update:modelValue", false);
+			}
+			this.$emit("confirm");
+		},
+		cancel() {
+			this.$emit("cancel");
+			this.$emit("input", false);
+			this.$emit("update:modelValue", false);
+			// 目前popup弹窗关闭有一个延时操作，此处做一个延时
+			// 避免确认按钮文字变成了"确定"字样，modal还没消失，造成视觉不好的效果
+			setTimeout(() => {
+				this.loading = false;
+			}, 300);
+		},
+		// 点击遮罩关闭modal，设置v-model的值为false，否则无法第二次弹起modal
+		popupClose() {
+			this.$emit("input", false);
+			this.$emit("update:modelValue", false);
+		},
+		// 清除加载中的状态
+		clearLoading() {
+			this.loading = false;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-model {
+	height: auto;
+	overflow: hidden;
+	font-size: 32rpx;
+	background-color: #fff;
+
+	&__btn--hover {
+		background-color: rgb(230, 230, 230);
+	}
+
+	&__title {
+		padding-top: 48rpx;
+		font-weight: 500;
+		text-align: center;
+		color: $u-main-color;
+	}
+
+	&__content {
+		&__message {
+			padding: 48rpx;
+			font-size: 30rpx;
+			text-align: center;
+			color: $u-content-color;
+		}
+	}
+
+	&__footer {
+		@include vue-flex;
+
+		&__button {
+			flex: 1;
+			height: 100rpx;
+			line-height: 100rpx;
+			font-size: 32rpx;
+			box-sizing: border-box;
+			cursor: pointer;
+			text-align: center;
+			border-radius: 4rpx;
+		}
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-navbar/u-navbar.vue b/uni_modules/vk-uview-ui/components/u-navbar/u-navbar.vue
new file mode 100644
index 0000000..450242e
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-navbar/u-navbar.vue
@@ -0,0 +1,315 @@
+<template>
+	<view class="">
+		<view class="u-navbar" :style="[navbarStyle]" :class="{ 'u-navbar-fixed': isFixed, 'u-border-bottom': borderBottom }">
+			<view class="u-status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
+			<view class="u-navbar-inner" :style="[navbarInnerStyle]">
+				<view class="u-back-wrap" v-if="isBack" @tap="goBack">
+					<view class="u-icon-wrap">
+						<u-icon :name="backIconName" :color="backIconColor" :size="backIconSize"></u-icon>
+					</view>
+					<view class="u-icon-wrap u-back-text u-line-1" v-if="backText" :style="[backTextStyle]">{{ backText }}</view>
+				</view>
+				<view class="u-navbar-content-title" v-if="title" :style="[titleStyle]">
+					<view
+					    class="u-title u-line-1"
+					    :style="{
+							color: titleColor,
+							fontSize: titleSize + 'rpx',
+							fontWeight: titleBold ? 'bold' : 'normal'
+						}">
+						{{ title }}
+					</view>
+				</view>
+				<view class="u-slot-content">
+					<slot></slot>
+				</view>
+				<view class="u-slot-right">
+					<slot name="right"></slot>
+				</view>
+			</view>
+		</view>
+		<!-- 解决fixed定位后导航栏塌陷的问题 -->
+		<view class="u-navbar-placeholder" v-if="isFixed && !immersive" :style="{ width: '100%', height: Number(navbarHeight) + statusBarHeight + 'px' }"></view>
+	</view>
+</template>
+
+<script>
+	// 获取系统状态栏的高度
+	let systemInfo = uni.getSystemInfoSync();
+	let menuButtonInfo = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	/**
+	 * navbar 自定义导航栏
+	 * @description 此组件一般用于在特殊情况下，需要自定义导航栏的时候用到，一般建议使用uniapp自带的导航栏。
+	 * @tutorial https://www.uviewui.com/components/navbar.html
+	 * @property {String Number} height 导航栏高度(不包括状态栏高度在内，内部自动加上)，注意这里的单位是px（默认44）
+	 * @property {String} back-icon-color 左边返回图标的颜色（默认#606266）
+	 * @property {String} back-icon-name 左边返回图标的名称，只能为uView自带的图标（默认arrow-left）
+	 * @property {String Number} back-icon-size 左边返回图标的大小，单位rpx（默认30）
+	 * @property {String} back-text 返回图标右边的辅助提示文字
+	 * @property {Object} back-text-style 返回图标右边的辅助提示文字的样式，对象形式（默认{ color: '#606266' }）
+	 * @property {String} title 导航栏标题，如设置为空字符，将会隐藏标题占位区域
+	 * @property {String Number} title-width 导航栏标题的最大宽度，内容超出会以省略号隐藏，单位rpx（默认250）
+	 * @property {String} title-color 标题的颜色（默认#606266）
+	 * @property {String Number} title-size 导航栏标题字体大小，单位rpx（默认32）
+	 * @property {Function} custom-back 自定义返回逻辑方法
+	 * @property {String Number} z-index 固定在顶部时的z-index值（默认980）
+	 * @property {Boolean} is-back 是否显示导航栏左边返回图标和辅助文字（默认true）
+	 * @property {Object} background 导航栏背景设置，见官网说明（默认{ background: '#ffffff' }）
+	 * @property {Boolean} is-fixed 导航栏是否固定在顶部（默认true）
+	 * @property {Boolean} immersive 沉浸式，允许fixed定位后导航栏塌陷，仅fixed定位下生效（默认false）
+	 * @property {Boolean} border-bottom 导航栏底部是否显示下边框，如定义了较深的背景颜色，可取消此值（默认true）
+	 * @example <u-navbar back-text="返回" title="剑未配妥，出门已是江湖"></u-navbar>
+	 */
+	export default {
+		name: "u-navbar",
+		props: {
+			// 导航栏高度，单位px，非rpx
+			height: {
+				type: [String, Number],
+				default: ''
+			},
+			// 返回箭头的颜色
+			backIconColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 左边返回的图标
+			backIconName: {
+				type: String,
+				default: 'nav-back'
+			},
+			// 左边返回图标的大小，rpx
+			backIconSize: {
+				type: [String, Number],
+				default: '44'
+			},
+			// 返回的文字提示
+			backText: {
+				type: String,
+				default: ''
+			},
+			// 返回的文字的 样式
+			backTextStyle: {
+				type: Object,
+				default () {
+					return {
+						color: '#606266'
+					}
+				}
+			},
+			// 导航栏标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 标题的宽度，如果需要自定义右侧内容，且右侧内容很多时，可能需要减少这个宽度，单位rpx
+			titleWidth: {
+				type: [String, Number],
+				default: '250'
+			},
+			// 标题的颜色
+			titleColor: {
+				type: String,
+				default: '#606266'
+			},
+			// 标题字体是否加粗
+			titleBold: {
+				type: Boolean,
+				default: false
+			},
+			// 标题的字体大小
+			titleSize: {
+				type: [String, Number],
+				default: 32
+			},
+			isBack: {
+				type: [Boolean, String],
+				default: true
+			},
+			// 对象形式，因为用户可能定义一个纯色，或者线性渐变的颜色
+			background: {
+				type: Object,
+				default () {
+					return {
+						background: '#ffffff'
+					}
+				}
+			},
+			// 导航栏是否固定在顶部
+			isFixed: {
+				type: Boolean,
+				default: true
+			},
+			// 是否沉浸式，允许fixed定位后导航栏塌陷，仅fixed定位下生效
+			immersive: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示导航栏的下边框
+			borderBottom: {
+				type: Boolean,
+				default: true
+			},
+			zIndex: {
+				type: [String, Number],
+				default: ''
+			},
+			// 自定义返回逻辑
+			customBack: {
+				type: Function,
+				default: null
+			}
+		},
+		data() {
+			return {
+				menuButtonInfo: menuButtonInfo,
+				statusBarHeight: systemInfo.statusBarHeight
+			};
+		},
+		computed: {
+			// 导航栏内部盒子的样式
+			navbarInnerStyle() {
+				let style = {};
+				// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+				style.height = this.navbarHeight + 'px';
+				// // 如果是各家小程序，导航栏内部的宽度需要减少右边胶囊的宽度
+				// #ifdef MP
+				let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
+				style.marginRight = rightButtonWidth + 'px';
+				// #endif
+				return style;
+			},
+			// 整个导航栏的样式
+			navbarStyle() {
+				let style = {};
+				style.zIndex = this.zIndex ? this.zIndex : this.$u.zIndex.navbar;
+				// 合并用户传递的背景色对象
+				Object.assign(style, this.background);
+				return style;
+			},
+			// 导航中间的标题的样式
+			titleStyle() {
+				let style = {};
+				// #ifndef MP
+				style.left = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				style.right = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				// #endif
+				// #ifdef MP
+				// 此处是为了让标题显示区域即使在小程序有右侧胶囊的情况下也能处于屏幕的中间，是通过绝对定位实现的
+				let rightButtonWidth = systemInfo.windowWidth - menuButtonInfo.left;
+				style.left = (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + 'px';
+				style.right = rightButtonWidth - (systemInfo.windowWidth - uni.upx2px(this.titleWidth)) / 2 + rightButtonWidth +
+					'px';
+				// #endif
+				style.width = uni.upx2px(this.titleWidth) + 'px';
+				return style;
+			},
+			// 转换字符数值为真正的数值
+			navbarHeight() {
+				// #ifdef APP-PLUS || H5
+				return this.height ? this.height : 44;
+				// #endif
+				// #ifdef MP
+				// 小程序特别处理，让导航栏高度 = 胶囊高度 + 两倍胶囊顶部与状态栏底部的距离之差(相当于同时获得了导航栏底部与胶囊底部的距离)
+				// 此方法有缺陷，暂不用(会导致少了几个px)，采用直接固定值的方式
+				// return menuButtonInfo.height + (menuButtonInfo.top - this.statusBarHeight) * 2;//导航高度
+				let height = systemInfo.platform == 'ios' ? 44 : 48;
+				return this.height ? this.height : height;
+				// #endif
+			}
+		},
+		created() {},
+		methods: {
+			goBack() {
+				// 如果自定义了点击返回按钮的函数，则执行，否则执行返回逻辑
+				if (typeof this.customBack === 'function') {
+					// 在微信，支付宝等环境(H5正常)，会导致父组件定义的customBack()函数体中的this变成子组件的this
+					// 通过bind()方法，绑定父组件的this，让this.customBack()的this为父组件的上下文
+					this.customBack.bind(this.$u.$parent.call(this))();
+				} else {
+					uni.navigateBack();
+				}
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	.u-navbar {
+		width: 100%;
+	}
+
+	.u-navbar-fixed {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		z-index: 991;
+	}
+
+	.u-status-bar {
+		width: 100%;
+	}
+
+	.u-navbar-inner {
+		@include vue-flex;
+		justify-content: space-between;
+		position: relative;
+		align-items: center;
+	}
+
+	.u-back-wrap {
+		@include vue-flex;
+		align-items: center;
+		flex: 1;
+		flex-grow: 0;
+		padding: 14rpx 14rpx 14rpx 24rpx;
+	}
+
+	.u-back-text {
+		padding-left: 4rpx;
+		font-size: 30rpx;
+	}
+
+	.u-navbar-content-title {
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		flex: 1;
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 60rpx;
+		text-align: center;
+		flex-shrink: 0;
+	}
+
+	.u-navbar-centent-slot {
+		flex: 1;
+	}
+
+	.u-title {
+		line-height: 60rpx;
+		font-size: 32rpx;
+		flex: 1;
+	}
+
+	.u-navbar-right {
+		flex: 1;
+		@include vue-flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.u-slot-content {
+		flex: 1;
+		@include vue-flex;
+		align-items: center;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-notice-bar/u-notice-bar.vue b/uni_modules/vk-uview-ui/components/u-notice-bar/u-notice-bar.vue
new file mode 100644
index 0000000..f5a05a2
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-notice-bar/u-notice-bar.vue
@@ -0,0 +1,273 @@
+<template>
+	<view class="u-notice-bar-wrap" v-if="isShow" :style="{
+		borderRadius: borderRadius + 'rpx',
+	}">
+		<block v-if="mode == 'horizontal' && isCircular">
+			<u-row-notice
+				:type="type"
+				:color="color"
+				:bgColor="bgColor"
+				:list="list"
+				:volumeIcon="volumeIcon"
+				:moreIcon="moreIcon"
+				:volumeSize="volumeSize"
+				:closeIcon="closeIcon"
+				:mode="mode"
+				:fontSize="fontSize"
+				:speed="speed"
+				:playState="playState"
+				:padding="padding"
+				@getMore="getMore"
+				@close="close"
+				@click="click"
+			></u-row-notice>
+		</block>
+		<block v-if="mode == 'vertical' || (mode == 'horizontal' && !isCircular)">
+			<u-column-notice
+				:type="type"
+				:color="color"
+				:bgColor="bgColor"
+				:list="list"
+				:volumeIcon="volumeIcon"
+				:moreIcon="moreIcon"
+				:closeIcon="closeIcon"
+				:mode="mode"
+				:volumeSize="volumeSize"
+				:disable-touch="disableTouch"
+				:fontSize="fontSize"
+				:duration="duration"
+				:playState="playState"
+				:padding="padding"
+				@getMore="getMore"
+				@close="close"
+				@click="click"
+				@end="end"
+			></u-column-notice>
+		</block>
+	</view>
+</template>
+<script>
+/**
+ * noticeBar 滚动通知
+ * @description 该组件用于滚动通告场景，有多种模式可供选择
+ * @tutorial https://www.uviewui.com/components/noticeBar.html
+ * @property {Array} list 滚动内容，数组形式，见上方说明
+ * @property {String} type 显示的主题（默认warning）
+ * @property {Boolean} volume-icon 是否显示小喇叭图标（默认true）
+ * @property {Boolean} more-icon 是否显示右边的向右箭头（默认false）
+ * @property {Boolean} close-icon 是否显示关闭图标（默认false）
+ * @property {Boolean} autoplay 是否自动播放（默认true）
+ * @property {String} color 文字颜色
+ * @property {String Number} bg-color 背景颜色
+ * @property {String} mode 滚动模式（默认horizontal）
+ * @property {Boolean} show 是否显示（默认true）
+ * @property {String Number} font-size 字体大小，单位rpx（默认28）
+ * @property {String Number} volume-size 左边喇叭的大小（默认34）
+ * @property {String Number} duration 滚动周期时长，只对步进模式有效，横向衔接模式无效，单位ms（默认2000）
+ * @property {String Number} speed 水平滚动时的滚动速度，即每秒移动多少距离，只对水平衔接方式有效，单位rpx（默认160）
+ * @property {String Number} font-size 字体大小，单位rpx（默认28）
+ * @property {Boolean} is-circular mode为horizontal时，指明是否水平衔接滚动（默认true）
+ * @property {String} play-state 播放状态，play - 播放，paused - 暂停（默认play）
+ * @property {String Number} border-radius 通知栏圆角（默认为0）
+ * @property {String Number} padding 内边距，字符串，与普通的内边距css写法一直（默认"18rpx 24rpx"）
+ * @property {Boolean} no-list-hidden 列表为空时，是否显示组件（默认false）
+ * @property {Boolean} disable-touch 是否禁止通过手动滑动切换通知，只有mode = vertical，或者mode = horizontal且is-circular = false时有效（默认true）
+ * @event {Function} click 点击通告文字触发，只有mode = vertical，或者mode = horizontal且is-circular = false时有效
+ * @event {Function} close 点击右侧关闭图标触发
+ * @event {Function} getMore 点击右侧向右图标触发
+ * @event {Function} end 列表的消息每次被播放一个周期时触发，只有mode = vertical，或者mode = horizontal且is-circular = false时有效
+ * @example <u-notice-bar :more-icon="true" :list="list"></u-notice-bar>
+ */
+export default {
+	name: "u-notice-bar",
+  emits: ["click", "close", "getMore", "end"],
+	props: {
+		// 显示的内容，数组
+		list: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		// 显示的主题，success|error|primary|info|warning
+		type: {
+			type: String,
+			default: 'warning'
+		},
+		// 是否显示左侧的音量图标
+		volumeIcon: {
+			type: Boolean,
+			default: true
+		},
+		// 音量喇叭的大小
+		volumeSize: {
+			type: [Number, String],
+			default: 34
+		},
+		// 是否显示右侧的右箭头图标
+		moreIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否显示右侧的关闭图标
+		closeIcon: {
+			type: Boolean,
+			default: false
+		},
+		// 是否自动播放
+		autoplay: {
+			type: Boolean,
+			default: true
+		},
+		// 文字颜色，各图标也会使用文字颜色
+		color: {
+			type: String,
+			default: ''
+		},
+		// 背景颜色
+		bgColor: {
+			type: String,
+			default: ''
+		},
+		// 滚动方向，horizontal-水平滚动，vertical-垂直滚动
+		mode: {
+			type: String,
+			default: 'horizontal'
+		},
+		// 是否显示
+		show: {
+			type: Boolean,
+			default: true
+		},
+		// 字体大小，单位rpx
+		fontSize: {
+			type: [Number, String],
+			default: 28
+		},
+		// 滚动一个周期的时间长，单位ms
+		duration: {
+			type: [Number, String],
+			default: 2000
+		},
+		// 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度
+		speed: {
+			type: [Number, String],
+			default: 160
+		},
+		// 水平滚动时，是否采用衔接形式滚动
+		// 水平衔接模式，采用的是swiper组件，水平滚动
+		isCircular: {
+			type: Boolean,
+			default: true
+		},
+		// 播放状态，play-播放，paused-暂停
+		playState: {
+			type: String,
+			default: 'play'
+		},
+		// 是否禁止用手滑动切换
+		// 目前HX2.6.11，只支持App 2.5.5+、H5 2.5.5+、支付宝小程序、字节跳动小程序
+		disableTouch: {
+			type: Boolean,
+			default: true
+		},
+		// 滚动通知设置圆角
+		borderRadius: {
+			type: [Number, String],
+			default: 0
+		},
+		// 通知的边距
+		padding: {
+			type: [Number, String],
+			default: '18rpx 24rpx'
+		},
+		// list列表为空时，是否显示组件
+		noListHidden: {
+			type: Boolean,
+			default: true
+		}
+	},
+	computed: {
+		// 如果设置show为false，或者设置了noListHidden为true，且list长度又为零的话，隐藏组件
+		isShow() {
+			if(this.show == false || (this.noListHidden == true && this.list.length == 0)) return false;
+			else return true;
+		}
+	},
+	methods: {
+		// 点击通告栏
+		click(index) {
+			this.$emit('click', index);
+		},
+		// 点击关闭按钮
+		close() {
+			this.$emit('close');
+		},
+		// 点击更多箭头按钮
+		getMore() {
+			this.$emit('getMore');
+		},
+		// 滚动一个周期结束，只对垂直，或者水平步进形式有效
+		end() {
+			this.$emit('end');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-notice-bar-wrap {
+	overflow: hidden;
+}
+
+.u-notice-bar {
+	padding: 18rpx 24rpx;
+	overflow: hidden;
+}
+
+.u-direction-row {
+	@include vue-flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.u-left-icon {
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-notice-box {
+	flex: 1;
+	@include vue-flex;
+	overflow: hidden;
+	margin-left: 12rpx;
+}
+
+.u-right-icon {
+	margin-left: 12rpx;
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-notice-content {
+	line-height: 1;
+	white-space: nowrap;
+	font-size: 26rpx;
+	animation: u-loop-animation 10s linear infinite both;
+	text-align: right;
+	// 这一句很重要，为了能让滚动左右连接起来
+	padding-left: 100%;
+}
+
+@keyframes u-loop-animation {
+	0% {
+		transform: translate3d(0, 0, 0);
+	}
+
+	100% {
+		transform: translate3d(-100%, 0, 0);
+	}
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-search/u-search.vue b/uni_modules/vk-uview-ui/components/u-search/u-search.vue
new file mode 100644
index 0000000..eb5fc32
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-search/u-search.vue
@@ -0,0 +1,357 @@
+<template>
+	<view class="u-search" @tap="clickHandler" :style="{
+		margin: margin,
+	}">
+		<view
+			class="u-content"
+			:style="{
+				backgroundColor: bgColor,
+				borderRadius: shape == 'round' ? '100rpx' : '10rpx',
+				border: borderStyle,
+				height: height + 'rpx'
+			}"
+		>
+			<view class="u-icon-wrap">
+				<u-icon class="u-clear-icon" :size="30" :name="searchIcon" :color="searchIconColor ? searchIconColor : color"></u-icon>
+			</view>
+			<input
+				confirm-type="search"
+				@blur="blur"
+				:value="valueCom"
+				@confirm="search"
+				@input="inputChange"
+				:disabled="disabled"
+				@focus="getFocus"
+				:focus="focus"
+				:maxlength="maxlength"
+				placeholder-class="u-placeholder-class"
+				:placeholder="placeholder"
+				:placeholder-style="`color: ${placeholderColor}`"
+				class="u-input"
+				type="text"
+				:style="[{
+					textAlign: inputAlign,
+					color: color,
+					backgroundColor: bgColor,
+				}, inputStyle]"
+			/>
+			<view class="u-close-wrap" v-if="keyword && clearabled && focused" @tap="clear">
+				<u-icon class="u-clear-icon" name="close-circle-fill" size="34" color="#c0c4cc"></u-icon>
+			</view>
+		</view>
+		<view :style="[actionStyle]" class="u-action" 
+			:class="[showActionBtn || show ? 'u-action-active' : '']" 
+			@tap.stop.prevent="custom"
+		>{{ actionText }}</view>
+	</view>
+</template>
+
+<script>
+/**
+ * search 搜索框
+ * @description 搜索组件，集成了常见搜索框所需功能，用户可以一键引入，开箱即用。
+ * @tutorial https://www.uviewui.com/components/search.html
+ * @property {String} shape 搜索框形状，round-圆形，square-方形（默认round）
+ * @property {String} bg-color 搜索框背景颜色（默认#f2f2f2）
+ * @property {String} border-color 边框颜色，配置了颜色，才会有边框
+ * @property {String} placeholder 占位文字内容（默认“请输入关键字”）
+ * @property {Boolean} clearabled 是否启用清除控件（默认true）
+ * @property {Boolean} focus 是否自动获得焦点（默认false）
+ * @property {Boolean} show-action 是否显示右侧控件（默认true）
+ * @property {String} action-text 右侧控件文字（默认“搜索”）
+ * @property {Object} action-style 右侧控件的样式，对象形式
+ * @property {String} input-align 输入框内容水平对齐方式（默认left）
+ * @property {Object} input-style 自定义输入框样式，对象形式
+ * @property {Boolean} disabled 是否启用输入框（默认false）
+ * @property {String} search-icon-color 搜索图标的颜色，默认同输入框字体颜色
+ * @property {String} color 输入框字体颜色（默认#606266）
+ * @property {String} placeholder-color placeholder的颜色（默认#909399）
+ * @property {String} search-icon 输入框左边的图标，可以为uView图标名称或图片路径
+ * @property {String} margin 组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30rpx"
+ * @property {Boolean} animation 是否开启动画，见上方说明（默认false）
+ * @property {String} value 输入框初始值
+ * @property {String | Number} maxlength 输入框最大能输入的长度，-1为不限制长度
+ * @property {Boolean} input-style input输入框的样式，可以定义文字颜色，大小等，对象形式
+ * @property {String | Number} height 输入框高度，单位rpx（默认64）
+ * @event {Function} change 输入框内容发生变化时触发
+ * @event {Function} search 用户确定搜索时触发，用户按回车键，或者手机键盘右下角的"搜索"键时触发
+ * @event {Function} custom 用户点击右侧控件时触发
+ * @event {Function} clear 用户点击清除按钮时触发
+ * @example <u-search placeholder="日照香炉生紫烟" v-model="keyword"></u-search>
+ */
+export default {
+	name: "u-search",
+  emits: ["update:modelValue", "input", "change", "search", "custom", "clear", "focus", "blur"],
+	props: {
+    // 输入框的初始化内容
+    value: {
+    	type: String,
+    	default: ''
+    },
+    modelValue: {
+      type: String,
+      default: ''
+    },
+		// 搜索框形状，round-圆形，square-方形
+		shape: {
+			type: String,
+			default: 'round'
+		},
+		// 搜索框背景色，默认值#f2f2f2
+		bgColor: {
+			type: String,
+			default: '#f2f2f2'
+		},
+		// 占位提示文字
+		placeholder: {
+			type: String,
+			default: '请输入关键字'
+		},
+		// 是否启用清除控件
+		clearabled: {
+			type: Boolean,
+			default: true
+		},
+		// 是否自动聚焦
+		focus: {
+			type: Boolean,
+			default: false
+		},
+		// 是否在搜索框右侧显示取消按钮
+		showAction: {
+			type: Boolean,
+			default: true
+		},
+		// 右边控件的样式
+		actionStyle: {
+			type: Object,
+			default() {
+				return {};
+			}
+		},
+		// 取消按钮文字
+		actionText: {
+			type: String,
+			default: '搜索'
+		},
+		// 输入框内容对齐方式，可选值为 left|center|right
+		inputAlign: {
+			type: String,
+			default: 'left'
+		},
+		// 是否启用输入框
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 开启showAction时，是否在input获取焦点时才显示
+		animation: {
+			type: Boolean,
+			default: false
+		},
+		// 边框颜色，只要配置了颜色，才会有边框
+		borderColor: {
+			type: String,
+			default: 'none'
+		},
+		// 搜索框高度，单位rpx
+		height: {
+			type: [Number, String],
+			default: 64
+		},
+		// input输入框的样式，可以定义文字颜色，大小等，对象形式
+		inputStyle: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		// 输入框最大能输入的长度，-1为不限制长度(来自uniapp文档)
+		maxlength: {
+			type: [Number, String],
+			default: '-1'
+		},
+		// 搜索图标的颜色，默认同输入框字体颜色
+		searchIconColor: {
+			type: String,
+			default: ''
+		},
+		// 输入框字体颜色
+		color: {
+			type: String,
+			default: '#606266'
+		},
+		// placeholder的颜色
+		placeholderColor: {
+			type: String,
+			default: '#909399'
+		},
+		// 组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30rpx"、"30rpx 20rpx"等写法
+		margin: {
+			type: String,
+			default: '0'
+		},
+		// 左边输入框的图标，可以为uView图标名称或图片路径
+		searchIcon: {
+			type: String,
+			default: 'search'
+		}
+	},
+	data() {
+		return {
+			keyword: '',
+			showClear: false, // 是否显示右边的清除图标
+			show: false,
+			// 标记input当前状态是否处于聚焦中，如果是，才会显示右侧的清除控件
+			focused: this.focus
+			// 绑定输入框的值
+			// inputValue: this.value
+		};
+	},
+	watch: {
+		keyword(nVal) {
+			// 双向绑定值，让v-model绑定的值双向变化
+			this.$emit('input', nVal);
+      this.$emit("update:modelValue", nVal);
+			// 触发change事件，事件效果和v-model双向绑定的效果一样，让用户多一个选择
+			this.$emit('change', nVal);
+		},
+		valueCom: {
+			immediate: true,
+			handler(nVal) {
+				this.keyword = nVal;
+			}
+		}
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+		
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		showActionBtn() {
+			if (!this.animation && this.showAction) return true;
+			else return false;
+		},
+		// 样式，根据用户传入的颜色值生成，如果不传入，默认为none
+		borderStyle() {
+			if (this.borderColor) return `1px solid ${this.borderColor}`;
+			else return 'none';
+		},
+	},
+	methods: {
+		// 目前HX2.6.9 v-model双向绑定无效，故监听input事件获取输入框内容的变化
+		inputChange(e) {
+			this.keyword = e.detail.value;
+		},
+		// 清空输入
+		// 也可以作为用户通过this.$refs形式调用清空输入框内容
+		clear() {
+			this.keyword = '';
+			// 延后发出事件，避免在父组件监听clear事件时，value为更新前的值(不为空)
+			this.$nextTick(() => {
+				this.$emit('clear');
+			})
+		},
+		// 确定搜索
+		search(e) {
+			this.$emit('search', e.detail.value);
+			try{
+				// 收起键盘
+				uni.hideKeyboard();
+			}catch(e){}
+		},
+		// 点击右边自定义按钮的事件
+		custom() {
+			this.$emit('custom', this.keyword);
+			try{
+				// 收起键盘
+				uni.hideKeyboard();
+			}catch(e){}
+		},
+		// 获取焦点
+		getFocus() {
+			this.focused = true;
+			// 开启右侧搜索按钮展开的动画效果
+			if (this.animation && this.showAction) this.show = true;
+			this.$emit('focus', this.keyword);
+		},
+		// 失去焦点
+		blur() {
+			// 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
+			// 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
+			setTimeout(() => {
+				this.focused = false;
+			}, 100)
+			this.show = false;
+			this.$emit('blur', this.keyword);
+		},
+		// 点击搜索框，只有disabled=true时才发出事件，因为禁止了输入，意味着是想跳转真正的搜索页
+		clickHandler() {
+			if(this.disabled) this.$emit('click');
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-search {
+	@include vue-flex;
+	align-items: center;
+	flex: 1;
+}
+
+.u-content {
+	@include vue-flex;
+	align-items: center;
+	padding: 0 18rpx;
+	flex: 1;
+}
+
+.u-clear-icon {
+	@include vue-flex;
+	align-items: center;
+}
+
+.u-input {
+	flex: 1;
+	font-size: 28rpx;
+	line-height: 1;
+	margin: 0 10rpx;
+	color: $u-tips-color;
+}
+
+.u-close-wrap {
+	width: 40rpx;
+	height: 100%;
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 50%;
+}
+
+.u-placeholder-class {
+	color: $u-tips-color;
+}
+
+.u-action {
+	font-size: 28rpx;
+	color: $u-main-color;
+	width: 0;
+	overflow: hidden;
+	transition: all 0.3s;
+	white-space: nowrap;
+	text-align: center;
+}
+
+.u-action-active {
+	width: 80rpx;
+	margin-left: 10rpx;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-swiper-plus/components/u-swiper-indicator.vue b/uni_modules/vk-uview-ui/components/u-swiper-plus/components/u-swiper-indicator.vue
new file mode 100644
index 0000000..ee2c8f9
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-swiper-plus/components/u-swiper-indicator.vue
@@ -0,0 +1,135 @@
+<template>
+	<view class="u-swiper-indicator">
+		<view
+			class="u-swiper-indicator__wrapper"
+			v-if="indicatorMode === 'line'"
+			:class="[`u-swiper-indicator__wrapper--${indicatorMode}`]"
+			:style="{
+				width: $u.addUnit(lineWidth * length),
+				backgroundColor: indicatorInactiveColor
+			}"
+		>
+			<view
+				class="u-swiper-indicator__wrapper--line__bar"
+				:style="[lineStyle]"
+			></view>
+		</view>
+		<view
+			class="u-swiper-indicator__wrapper"
+			v-if="indicatorMode === 'dot'"
+		>
+			<view
+				class="u-swiper-indicator__wrapper__dot"
+				v-for="(item, index) in length"
+				:key="index"
+				:class="[index === current && 'u-swiper-indicator__wrapper__dot--active']"
+				:style="[dotStyle(index)]"
+			>
+
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * SwiperIndicator 轮播图指示器
+	 * @description 该组件一般用于导航轮播，广告展示等场景,可开箱即用，
+	 * @tutorial https://www.uviewui.com/components/swiper.html
+	 * @property {String | Number}	length					轮播的长度（默认 0 ）
+	 * @property {String | Number}	current					当前处于活动状态的轮播的索引（默认 0 ）
+	 * @property {String}			indicatorActiveColor	指示器非激活颜色
+	 * @property {String}			indicatorInactiveColor	指示器的激活颜色
+	 * @property {String}			indicatorMode			指示器模式（默认 'line' ）
+	 * @example	<u-swiper :list="list4" indicator keyName="url" :autoplay="false"></u-swiper>
+	 */
+	export default {
+		name: 'u-swiper-indicator',
+		props:{
+			// 轮播的长度
+			length: {
+				type: [String, Number],
+				default: 0
+			},
+			// 当前处于活动状态的轮播的索引
+			current: {
+				type: [String, Number],
+				default: 0
+			},
+			// 指示器非激活颜色
+			indicatorActiveColor: {
+				type: String,
+				default: ''
+			},
+			// 指示器的激活颜色
+			indicatorInactiveColor: {
+				type: String,
+				default: ''
+			},
+			// 指示器模式，line-线型，dot-点型
+			indicatorMode: {
+				type: String,
+				default: 'line'
+			}
+		},
+		data() {
+			return {
+				lineWidth: 22
+			}
+		},
+		computed: {
+			// 指示器为线型的样式
+			lineStyle() {
+				let style = {}
+				style.width = uni.$u.addUnit(this.lineWidth)
+				style.transform = `translateX(${ uni.$u.addUnit(this.current * this.lineWidth) })`
+				style.backgroundColor = this.indicatorActiveColor
+				return style
+			},
+			// 指示器为点型的样式
+			dotStyle() {
+				return index => {
+					let style = {}
+					style.backgroundColor = index === this.current ? this.indicatorActiveColor : this.indicatorInactiveColor
+					return style
+				}
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../../libs/css/style.components.scss";
+
+	.u-swiper-indicator {
+
+		&__wrapper {
+			@include vue-flex;
+
+			&--line {
+				border-radius: 100px;
+				height: 4px;
+
+				&__bar {
+					width: 22px;
+					height: 4px;
+					border-radius: 100px;
+					background-color: #FFFFFF;
+					transition: transform 0.3s;
+				}
+			}
+
+			&__dot {
+				width: 5px;
+				height: 5px;
+				border-radius: 100px;
+				margin: 0 4px;
+
+				&--active {
+					width: 12px;
+				}
+			}
+
+		}
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-swiper-plus/u-swiper-plus.vue b/uni_modules/vk-uview-ui/components/u-swiper-plus/u-swiper-plus.vue
new file mode 100644
index 0000000..db9d87a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-swiper-plus/u-swiper-plus.vue
@@ -0,0 +1,529 @@
+<template>
+	<view
+		class="u-swiper"
+		:style="{
+			backgroundColor: bgColor,
+			height: $u.addUnit(height),
+			borderRadius: $u.addUnit(radius)
+		}"
+	>
+		<view
+			class="u-swiper__loading"
+			v-if="loading"
+		>
+			<u-loading mode="circle"></u-loading>
+		</view>
+		<swiper
+			v-else
+			class="u-swiper__wrapper"
+			:style="{
+				height: $u.addUnit(height),
+			}"
+			@change="change"
+			:circular="circular"
+			:interval="interval"
+			:duration="duration"
+			:autoplay="autoplayCom"
+			:current="currentIndex"
+			:currentItemId="currentItemId"
+			:previousMargin="$u.addUnit(previousMargin)"
+			:nextMargin="$u.addUnit(nextMargin)"
+			:acceleration="acceleration"
+			:displayMultipleItems="displayMultipleItems"
+			:easingFunction="easingFunction"
+		>
+			<swiper-item
+				class="u-swiper__wrapper__item"
+				v-for="(item, index) in list"
+				:key="index"
+			>
+				<view
+					class="u-swiper__wrapper__item__wrapper"
+					:style="[itemStyle(index)]"
+				>
+					<!-- 在nvue中，image图片的宽度默认为屏幕宽度，需要通过flex:1撑开，另外必须设置高度才能显示图片 -->
+					<image
+						class="u-swiper__wrapper__item__wrapper__image"
+						v-if="getItemType(item) === 'image'"
+						:src="getSource(item)"
+						:mode="imgMode"
+						@tap="clickHandler(index)"
+						:style="{
+							height: $u.addUnit(height),
+							borderRadius: $u.addUnit(radius)
+						}"
+					></image>
+					<!-- #ifdef H5 || MP-WEIXIN || APP-NVUE -->
+					<!-- 只有h5和微信小程序和nvue可以直接播放视频 -->
+					<video
+						class="u-swiper__wrapper__item__wrapper__video"
+						v-if="getItemType(item) === 'video'"
+						:id="`video-${index}`"
+						:enable-progress-gesture="false"
+						:src="getSource(item)"
+						:poster="getPoster(item,'auto')"
+						:title="showTitle && $u.test.object(item) && item.title ? item.title : ''"
+						:style="{
+							height: $u.addUnit(height)
+						}"
+						:controls="true"
+						:show-mute-btn="true"
+						:autoplay="videoAutoplayFn(index)"
+						:muted="videoMuted"
+						:object-fit="item.objectFit"
+						@tap="clickHandler(index)"
+						@ended="videoEnded(index)"
+					></video>
+					<!-- #endif -->
+					<!-- #ifndef H5 || MP-WEIXIN || APP-NVUE-->
+					<!-- 其他端只能展示图片，点击图片播放视频 -->
+					<image
+						v-if="getItemType(item) === 'video'"
+						class="u-swiper__wrapper__item__wrapper__image"
+						:src="getPoster(item)"
+						mode="aspectFill"
+						:style="{
+							height: $u.addUnit(height),
+							borderRadius: $u.addUnit(radius)
+						}"
+					></image>
+					<image
+						v-if="getItemType(item) === 'video'"
+						class="play-btn"
+						src="data:image/png;base64,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"
+						mode="widthFix"
+						@tap.stop="previewVideo(index)"
+					></image>
+					<!-- #endif -->
+					<text
+						v-if="showTitle && $u.test.object(item) && item.title && $u.test.image(getSource(item))"
+						class="u-swiper__wrapper__item__wrapper__title u-line-1"
+					>{{ item.title }}</text>
+				</view>
+			</swiper-item>
+		</swiper>
+		<view class="u-swiper__indicator" :style="[$u.addStyle(indicatorStyle)]">
+			<slot name="indicator">
+				<u-swiper-indicator
+					v-if="!loading && indicator && !showTitle"
+					:indicatorActiveColor="indicatorActiveColor"
+					:indicatorInactiveColor="indicatorInactiveColor"
+					:length="list.length"
+					:current="currentIndex"
+					:indicatorMode="indicatorMode"
+				></u-swiper-indicator>
+			</slot>
+		</view>
+
+		<u-popup v-model="videoPopup.show" mode="center" :duration="0" :blur="10" :closeable="true">
+			<video
+				v-if="videoPopup.show"
+				class="u-swiper__wrapper__item__wrapper__video"
+				:enable-progress-gesture="false"
+				:src="videoPopup.url"
+				:poster="videoPopup.poster"
+				style="height: 60vh;"
+				:controls="true"
+				:show-mute-btn="true"
+				:autoplay="true"
+				:muted="false"
+				object-fit="contain"
+				@ended="videoEnded(index)"
+			></video>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import uSwiperIndicator from "./components/u-swiper-indicator"
+	/**
+	 * Swiper 轮播图
+	 * @description 该组件一般用于导航轮播，广告展示等场景,可开箱即用，
+	 * @tutorial https://www.uviewui.com/components/swiper.html
+	 * @property {Array}			list					轮播图数据
+	 * @property {Boolean}			indicator				是否显示面板指示器（默认 false ）
+	 * @property {String}			indicatorActiveColor	指示器非激活颜色（默认 '#FFFFFF' ）
+	 * @property {String}			indicatorInactiveColor	指示器的激活颜色（默认 'rgba(255, 255, 255, 0.35)' ）
+	 * @property {String | Object}	indicatorStyle			指示器样式，可通过bottom，left，right进行定位
+	 * @property {String}			indicatorMode			指示器模式（默认 'line' ）
+	 * @property {Boolean}			autoplay				是否自动切换（默认 true ）
+	 * @property {String | Number}	current					当前所在滑块的 index（默认 0 ）
+	 * @property {String}			currentItemId			当前所在滑块的 item-id ，不能与 current 被同时指定
+	 * @property {String | Number}	interval				滑块自动切换时间间隔（ms）（默认 3000 ）
+	 * @property {String | Number}	duration				滑块切换过程所需时间（ms）（默认 300 ）
+	 * @property {Boolean}			circular				播放到末尾后是否重新回到开头（默认 false ）
+	 * @property {String | Number}	previousMargin			前边距，可用于露出前一项的一小部分，nvue和支付宝不支持（默认 0 ）
+	 * @property {String | Number}	nextMargin				后边距，可用于露出后一项的一小部分，nvue和支付宝不支持（默认 0 ）
+	 * @property {Boolean}			acceleration			当开启时，会根据滑动速度，连续滑动多屏，支付宝不支持（默认 false ）
+	 * @property {Number}			displayMultipleItems	同时显示的滑块数量，nvue、支付宝小程序不支持（默认 1 ）
+	 * @property {String}			easingFunction			指定swiper切换缓动动画类型， 只对微信小程序有效（默认 'default' ）
+	 * @property {String}			keyName					list数组中指定对象的目标属性名（默认 'url' ）
+	 * @property {String}			imgMode					图片的裁剪模式（默认 'aspectFill' ）
+	 * @property {String | Number}	height					组件高度（默认 130 ）
+	 * @property {String}			bgColor					背景颜色（默认 	'#f3f4f6' ）
+	 * @property {String | Number}	radius					组件圆角，数值或带单位的字符串（默认 4 ）
+	 * @property {Boolean}			loading					是否加载中（默认 false ）
+	 * @property {Boolean}			showTitle				是否显示标题，要求数组对象中有title属性（默认 false ）
+	 * @event {Function(index)}	click	点击轮播图时触发	index：点击了第几张图片，从0开始
+	 * @event {Function(index)}	change	轮播图切换时触发(自动或者手动切换)	index：切换到了第几张图片，从0开始
+	 * @example	<u-swiper :list="list4" keyName="url" :autoplay="false"></u-swiper>
+	 */
+	export default {
+		name: 'u-swiper',
+		emits: ["click", "change"],
+		components:{
+			uSwiperIndicator
+		},
+		props: {
+			// 列表数组，元素可为字符串，如为对象可通过keyName指定目标属性名
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 是否显示面板指示器
+			indicator: {
+			    type: Boolean,
+			    default: false
+			},
+			// 指示器非激活颜色
+			indicatorActiveColor: {
+			    type: String,
+			    default: "#FFFFFF"
+			},
+			// 指示器的激活颜色
+			indicatorInactiveColor: {
+			    type: String,
+			    default: "rgba(255, 255, 255, 0.35)"
+			},
+			// 指示器样式，可通过bottom，left，right进行定位
+			indicatorStyle: {
+			    type: [String, Object],
+			    default: '',
+			},
+			// 指示器模式，line-线型，dot-点型
+			indicatorMode: {
+			    type: String,
+			    default: 'line',
+			},
+			// 是否自动切换
+			autoplay: {
+			    type: Boolean,
+			    default: true
+			},
+			// 当前所在滑块的 index
+			current: {
+			    type: [String, Number],
+			    default: 0
+			},
+			// 当前所在滑块的 item-id ，不能与 current 被同时指定
+			currentItemId: {
+			    type: String,
+			    default: '',
+			},
+			// 滑块自动切换时间间隔
+			interval: {
+			    type: [String, Number],
+			    default: 3000
+			},
+			// 滑块切换过程所需时间
+			duration: {
+			    type: [String, Number],
+			    default: 300
+			},
+			// 播放到末尾后是否重新回到开头
+			circular: {
+			    type: Boolean,
+			    default: false
+			},
+			// 前边距，可用于露出前一项的一小部分，nvue和支付宝不支持
+			previousMargin: {
+			    type: [String, Number],
+			    default: 0
+			},
+			// 后边距，可用于露出后一项的一小部分，nvue和支付宝不支持
+			nextMargin: {
+			    type: [String, Number],
+			    default: 0
+			},
+			// 当开启时，会根据滑动速度，连续滑动多屏，支付宝不支持
+			acceleration: {
+			    type: Boolean,
+			    default: false
+			},
+			// 同时显示的滑块数量，nvue、支付宝小程序不支持
+			displayMultipleItems: {
+			    type: Number,
+			    default: 1
+			},
+			// 指定swiper切换缓动动画类型，有效值：default、linear、easeInCubic、easeOutCubic、easeInOutCubic
+			// 只对微信小程序有效
+			easingFunction: {
+			    type: String,
+			    default: 'default'
+			},
+			// list数组中指定对象的目标属性名
+			keyName: {
+			    type: String,
+			    default: 'url'
+			},
+			// 图片的裁剪模式
+			imgMode: {
+			    type: String,
+			    default: 'aspectFill'
+			},
+			// 组件高度
+			height: {
+			    type: [String, Number],
+			    default: 130
+			},
+			// 背景颜色
+			bgColor: {
+			    type: String,
+			    default: '#f3f4f6'
+			},
+			// 组件圆角，数值或带单位的字符串
+			radius: {
+			    type: [String, Number],
+			    default: 4
+			},
+			// 是否加载中
+			loading: {
+			    type: Boolean,
+			    default: false
+			},
+			// 是否显示标题，要求数组对象中有title属性
+			showTitle: {
+			    type: Boolean,
+			    default: false
+			},
+			// 视频是否自动播放
+			videoAutoplay: {
+			    type: Boolean,
+			    default: false
+			},
+			// 视频是否静音播放
+			videoMuted: {
+			    type: Boolean,
+			    default: false
+			},
+		},
+		data() {
+			return {
+				$u: uni.$u,
+				currentIndex: 0,
+				videoPopup: {
+					show: false,
+					url: ""
+				}
+			}
+		},
+		watch: {
+			current(val, preVal) {
+				if(val === preVal) return;
+				this.currentIndex = val; // 和上游数据关联上
+			},
+
+			// #ifdef H5 || MP-WEIXIN || APP-NVUE
+			currentIndex(newVal, oldVal){
+				if (this.checkIsVideo(oldVal)) {
+					// 如果是视频，则暂停
+					this.videoPopup.show = false;
+					this.videoPopup.url = "";
+					let videoContext = uni.createVideoContext(`video-${oldVal}`, this);
+					videoContext.pause();
+					videoContext.exitFullScreen();
+				}
+				if (this.checkIsVideo(newVal) && this.videoAutoplay) {
+					// 如果是视频，则播放
+					let videoContext = uni.createVideoContext(`video-${newVal}`, this);
+					videoContext.play();
+				}
+			}
+			// #endif
+		},
+		computed: {
+			itemStyle() {
+				return index => {
+					const style = {}
+					// #ifndef APP-NVUE || MP-TOUTIAO
+					// 左右流出空间的写法不支持nvue和头条
+					// 只有配置了此二值，才加上对应的圆角，以及缩放
+					if (this.nextMargin && this.previousMargin) {
+						style.borderRadius = uni.$u.addUnit(this.radius)
+						if (index !== this.currentIndex) style.transform = 'scale(0.92)'
+					}
+					// #endif
+					return style
+				}
+			},
+			mutedCom() {
+				// #ifdef H5
+				return true;
+				// #endif
+				// #ifndef H5
+				return false;
+				// #endif
+			},
+			currentIsVideoCom(){
+				let { currentIndex } = this;
+				return this.checkIsVideo(currentIndex);
+			},
+			autoplayCom() {
+				let { autoplay, currentIsVideoCom } = this;
+				return currentIsVideoCom ? false : autoplay;
+			},
+		},
+		methods: {
+      getItemType(item) {
+        if (typeof item === 'string') return uni.$u.test.video(this.getSource(item)) ? 'video' : 'image'
+        if (typeof item === 'object' && this.keyName) {
+          if (!item.type) return uni.$u.test.video(this.getSource(item)) ? 'video' : 'image'
+          if (item.type === 'image') return 'image'
+          if (item.type === 'video') return 'video'
+          return 'image'
+        }
+      },
+			// 获取目标路径，可能数组中为字符串，对象的形式，额外可指定对象的目标属性名keyName
+			getSource(item) {
+				if (typeof item === 'string') return item
+				if (typeof item === 'object' && this.keyName) return item[this.keyName]
+				else uni.$u.error('请按格式传递列表参数')
+				return ''
+			},
+			// 轮播切换事件
+			change(e) {
+				// 当前的激活索引
+				const {
+					current
+				} = e.detail
+				this.currentIndex = current
+				this.$emit('change', e.detail)
+			},
+			// 当一个轮播item为视频时，获取它的视频海报
+			getPoster(item, mode) {
+				let { height } = this;
+				if (mode === "auto") {
+					return;
+				}
+				if (typeof item === 'object' && item.poster) {
+					return item.poster;
+				}
+				let url = this.getSource(item);
+				if (url.indexOf("cdn.bspapp.com")>-1 || url.indexOf("aliyuncs.com")>-1) {
+					// 只有阿里云oss才支持
+					let poster = `${url}?x-oss-process=video/snapshot,t_2000,f_jpg,w_0,h_0,m_fast,ar_auto`;
+					return poster;
+				} else {
+					return;
+				}
+			},
+			// 点击某个item
+			clickHandler(index) {
+				this.$emit('click', index)
+			},
+			// 下一页
+			nextPage(){
+				let { currentIndex=0, list=[] } = this;
+				currentIndex++;
+				currentIndex = currentIndex % list.length;
+				this.currentIndex = currentIndex;
+			},
+			// 视频播放完毕后
+			videoEnded(index){
+				if (!this.videoPopup.show) {
+					setTimeout(() => {
+						this.nextPage();
+					}, 1000);
+				}
+			},
+			// 检测当前轮播显示的是否是视频
+			checkIsVideo(index){
+				let { list, currentIndex } = this;
+				if (typeof index === "undefined") index = currentIndex;
+				let item = list[index];
+				return this.getItemType(item) === "video" ? true : false;
+			},
+			// 预览视频
+			previewVideo(index){
+				let { list, currentIndex } = this;
+				if (typeof index === "undefined") index = currentIndex;
+				let item = list[index];
+				this.videoPopup.show = true;
+				this.videoPopup.url = this.getSource(item);
+			},
+			videoAutoplayFn(index){
+				let { list, current, videoAutoplay } = this;
+				if (index === current && videoAutoplay) {
+					return true;
+				} else {
+					return false;
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-swiper {
+		@include vue-flex;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+		overflow: hidden;
+
+		&__wrapper {
+			flex: 1;
+
+			&__item {
+				flex: 1;
+
+				&__wrapper {
+					@include vue-flex;
+					position: relative;
+					overflow: hidden;
+					transition: transform 0.3s;
+					flex: 1;
+
+					&__image {
+						flex: 1;
+					}
+
+					&__video {
+						flex: 1;
+					}
+
+					&__title {
+						position: absolute;
+						background-color: rgba(0, 0, 0, 0.3);
+						bottom: 0;
+						left: 0;
+						right: 0;
+						font-size: 28rpx;
+						padding: 12rpx 24rpx;
+						color: #FFFFFF;
+						flex: 1;
+					}
+				}
+			}
+		}
+
+		&__indicator {
+			position: absolute;
+			bottom: 10px;
+		}
+
+		.play-btn{
+			position: absolute;
+			width: 100rpx;
+			height: 100rpx;
+			top:calc(50% - 50rpx);
+			left:calc(50% - 50rpx);
+			display: block;
+			z-index: 99;
+		}
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-swiper/u-swiper.vue b/uni_modules/vk-uview-ui/components/u-swiper/u-swiper.vue
new file mode 100644
index 0000000..95e00d7
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-swiper/u-swiper.vue
@@ -0,0 +1,341 @@
+<template>
+	<view class="u-swiper-wrap" :style="{
+		borderRadius: `${borderRadius}rpx`
+	}">
+		<swiper :current="elCurrent" @change="change" @animationfinish="animationfinish" :interval="interval" :circular="circular" :duration="duration" :autoplay="autoplay"
+		 :previous-margin="effect3d ? effect3dPreviousMargin + 'rpx' : '0'" :next-margin="effect3d ? effect3dPreviousMargin + 'rpx' : '0'"
+		 :style="{
+				height: height + 'rpx',
+				backgroundColor: bgColor
+			}">
+			<swiper-item class="u-swiper-item" v-for="(item, index) in list" :key="index">
+				<view class="u-list-image-wrap" @tap.stop.prevent="listClick(index)" :class="[uCurrent != index ? 'u-list-scale' : '']" :style="{
+						borderRadius: `${borderRadius}rpx`,
+						transform: effect3d && uCurrent != index ? 'scaleY(0.9)' : 'scaleY(1)',
+						margin: effect3d && uCurrent != index ? '0 20rpx' : 0,
+					}">
+					<image class="u-swiper-image" :src="item[name] || item" :mode="imgMode"></image>
+					<view v-if="title && item.title" class="u-swiper-title u-line-1" :style="[{
+							'padding-bottom': titlePaddingBottom
+						}, titleStyle]">
+						{{ item.title }}
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+		<view class="u-swiper-indicator" :style="{
+				top: indicatorPos == 'topLeft' || indicatorPos == 'topCenter' || indicatorPos == 'topRight' ? '12rpx' : 'auto',
+				bottom: indicatorPos == 'bottomLeft' || indicatorPos == 'bottomCenter' || indicatorPos == 'bottomRight' ? '12rpx' : 'auto',
+				justifyContent: justifyContent,
+				padding: `0 ${effect3d ? '74rpx' : '24rpx'}`
+			}">
+			<block v-if="mode == 'rect'">
+				<view class="u-indicator-item-rect" :class="{ 'u-indicator-item-rect-active': index == uCurrent }" v-for="(item, index) in list"
+				 :key="index"></view>
+			</block>
+			<block v-if="mode == 'dot'">
+				<view class="u-indicator-item-dot" :class="{ 'u-indicator-item-dot-active': index == uCurrent }" v-for="(item, index) in list"
+				 :key="index"></view>
+			</block>
+			<block v-if="mode == 'round'">
+				<view class="u-indicator-item-round" :class="{ 'u-indicator-item-round-active': index == uCurrent }" v-for="(item, index) in list"
+				 :key="index"></view>
+			</block>
+			<block v-if="mode == 'number'">
+				<view class="u-indicator-item-number">{{ uCurrent + 1 }}/{{ list.length }}</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * swiper 轮播图
+	 * @description 该组件一般用于导航轮播，广告展示等场景,可开箱即用
+	 * @tutorial https://www.uviewui.com/components/swiper.html
+	 * @property {Array} list 轮播图数据，见官网"基本使用"说明
+	 * @property {Boolean} title 是否显示标题文字，需要配合list参数，见官网说明（默认false）
+	 * @property {String} mode 指示器模式，见官网说明（默认round）
+	 * @property {String Number} height 轮播图组件高度，单位rpx（默认250）
+	 * @property {String} indicator-pos 指示器的位置（默认bottomCenter）
+	 * @property {Boolean} effect3d 是否开启3D效果（默认false）
+	 * @property {Boolean} autoplay 是否自动播放（默认true）
+	 * @property {String Number} interval 自动轮播时间间隔，单位ms（默认2500）
+	 * @property {Boolean} circular 是否衔接播放，见官网说明（默认true）
+	 * @property {String} bg-color 背景颜色（默认#f3f4f6）
+	 * @property {String Number} border-radius 轮播图圆角值，单位rpx（默认8）
+	 * @property {Object} title-style 自定义标题样式
+	 * @property {String Number} effect3d-previous-margin mode = true模式的情况下，激活项与前后项之间的距离，单位rpx（默认50）
+	 * @property {String} img-mode 图片的裁剪模式，详见image组件裁剪模式（默认aspectFill）
+	 * @event {Function} click 点击轮播图时触发
+	 * @example <u-swiper :list="list" mode="dot" indicator-pos="bottomRight"></u-swiper>
+	 */
+	export default {
+		name: "u-swiper",
+    emits: ["click", "change"],
+		props: {
+			// 轮播图的数据,格式如：[{image: 'xxxx', title: 'xxxx'}，{image: 'yyyy', title: 'yyyy'}]，其中title字段可选
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 是否显示title标题
+			title: {
+				type: Boolean,
+				default: false
+			},
+			// 用户自定义的指示器的样式
+			indicator: {
+				type: Object,
+				default () {
+					return {};
+				}
+			},
+			// 圆角值
+			borderRadius: {
+				type: [Number, String],
+				default: 8
+			},
+			// 隔多久自动切换
+			interval: {
+				type: [String, Number],
+				default: 3000
+			},
+			// 指示器的模式，rect|dot|number|round
+			mode: {
+				type: String,
+				default: 'round'
+			},
+			// list的高度，单位rpx
+			height: {
+				type: [Number, String],
+				default: 250
+			},
+			// 指示器的位置，topLeft|topCenter|topRight|bottomLeft|bottomCenter|bottomRight
+			indicatorPos: {
+				type: String,
+				default: 'bottomCenter'
+			},
+			// 是否开启缩放效果
+			effect3d: {
+				type: Boolean,
+				default: false
+			},
+			// 3D模式的情况下，激活item与前后item之间的距离，单位rpx
+			effect3dPreviousMargin: {
+				type: [Number, String],
+				default: 50
+			},
+			// 是否自动播放
+			autoplay: {
+				type: Boolean,
+				default: true
+			},
+			// 自动轮播时间间隔，单位ms
+			duration: {
+				type: [Number, String],
+				default: 500
+			},
+			// 是否衔接滑动，即到最后一张时接着滑动，是否自动切换到第一张
+			circular: {
+				type: Boolean,
+				default: true
+			},
+			// 图片的裁剪模式 
+			imgMode: {
+				type: String,
+				default: 'aspectFill'
+			},
+			// 从list数组中读取的图片的属性名
+			name: {
+				type: String,
+				default: 'image'
+			},
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: '#f3f4f6'
+			},
+			// 初始化时，默认显示第几项
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			// 标题的样式，对象形式
+			titleStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+		watch: {
+			// 如果外部的list发生变化，判断长度是否被修改，如果前后长度不一致，重置uCurrent值，避免溢出
+			list(nVal, oVal) {
+				if(nVal.length !== oVal.length) this.uCurrent = 0;
+			},
+			// 监听外部current的变化，实时修改内部依赖于此测uCurrent值，如果更新了current，而不是更新uCurrent，
+			// 就会错乱，因为指示器是依赖于uCurrent的
+			current(n) {
+				this.uCurrent = n;
+			}
+		},
+		data() {
+			return {
+				uCurrent: this.current // 当前活跃的swiper-item的index
+			};
+		},
+		computed: {
+			justifyContent() {
+				if (this.indicatorPos == 'topLeft' || this.indicatorPos == 'bottomLeft') return 'flex-start';
+				if (this.indicatorPos == 'topCenter' || this.indicatorPos == 'bottomCenter') return 'center';
+				if (this.indicatorPos == 'topRight' || this.indicatorPos == 'bottomRight') return 'flex-end';
+			},
+			titlePaddingBottom() {
+				let tmp = 0;
+				if (this.mode == 'none') return '12rpx';
+				if (['bottomLeft', 'bottomCenter', 'bottomRight'].indexOf(this.indicatorPos) >= 0 && this.mode == 'number') {
+					tmp = '60rpx';
+				} else if (['bottomLeft', 'bottomCenter', 'bottomRight'].indexOf(this.indicatorPos) >= 0 && this.mode != 'number') {
+					tmp = '40rpx';
+				} else {
+					tmp = '12rpx';
+				}
+				return tmp;
+			},
+			// 因为uni的swiper组件的current参数只接受Number类型，这里做一个转换
+			elCurrent() {
+				return Number(this.current);
+			}
+		},
+		methods: {
+			listClick(index) {
+				this.$emit('click', index);
+			},
+			change(e) {
+				let current = e.detail.current;
+				this.uCurrent = current;
+				// 发出change事件，表示当前自动切换的index，从0开始
+				this.$emit('change', current);
+			},
+			// 头条小程序不支持animationfinish事件，改由change事件
+			// 暂不监听此事件，因为不再给swiper绑定uCurrent属性
+			animationfinish(e) {
+				// #ifndef MP-TOUTIAO
+				// this.uCurrent = e.detail.current;
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-swiper-wrap {
+		position: relative;
+		overflow: hidden;
+		transform: translateY(0);
+	}
+
+	.u-swiper-image {
+		width: 100%;
+		will-change: transform;
+		height: 100%;
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		/* #ifdef H5 */
+		pointer-events: none;
+		/* #endif */
+	}
+
+	.u-swiper-indicator {
+		padding: 0 24rpx;
+		position: absolute;
+		@include vue-flex;
+		width: 100%;
+		z-index: 1;
+	}
+
+	.u-indicator-item-rect {
+		width: 26rpx;
+		height: 8rpx;
+		margin: 0 6rpx;
+		transition: all 0.5s;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.u-indicator-item-rect-active {
+		background-color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-indicator-item-dot {
+		width: 14rpx;
+		height: 14rpx;
+		margin: 0 6rpx;
+		border-radius: 20rpx;
+		transition: all 0.5s;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.u-indicator-item-dot-active {
+		background-color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-indicator-item-round {
+		width: 14rpx;
+		height: 14rpx;
+		margin: 0 6rpx;
+		border-radius: 20rpx;
+		transition: all 0.5s;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.u-indicator-item-round-active {
+		width: 34rpx;
+		background-color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-indicator-item-number {
+		padding: 6rpx 16rpx;
+		line-height: 1;
+		background-color: rgba(0, 0, 0, 0.3);
+		border-radius: 100rpx;
+		font-size: 26rpx;
+		color: rgba(255, 255, 255, 0.8);
+	}
+
+	.u-list-scale {
+		transform-origin: center center;
+	}
+
+	.u-list-image-wrap {
+		width: 100%;
+		height: 100%;
+		flex: 1;
+		transition: all 0.5s;
+		overflow: hidden;
+		box-sizing: content-box;
+		position: relative;
+	}
+
+	.u-swiper-title {
+		position: absolute;
+		background-color: rgba(0, 0, 0, 0.3);
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		font-size: 28rpx;
+		padding: 12rpx 24rpx;
+		color: rgba(255, 255, 255, 0.9);
+	}
+
+	.u-swiper-item {
+		@include vue-flex;
+		overflow: hidden;
+		align-items: center;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-switch/u-switch.vue b/uni_modules/vk-uview-ui/components/u-switch/u-switch.vue
new file mode 100644
index 0000000..4f16f83
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-switch/u-switch.vue
@@ -0,0 +1,191 @@
+<template>
+	<view
+		class="u-switch"
+		:class="[valueCom == true ? 'u-switch--on' : '', disabled ? 'u-switch--disabled' : '']"
+		@tap="onClick"
+		:style="[switchStyle]"
+	>
+		<view
+			class="u-switch__node node-class"
+			:style="{
+				width: $u.addUnit(size),
+				height: $u.addUnit(size)
+			}"
+		>
+			<u-loading
+				:show="loading"
+				class="u-switch__loading"
+				:size="size * 0.6"
+				:color="loadingColor"
+			/>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * switch 开关选择器
+ * @description 选择开关一般用于只有两个选择，且只能选其一的场景。
+ * @tutorial https://www.uviewui.com/components/switch.html
+ * @property {Boolean} loading 是否处于加载中（默认false）
+ * @property {Boolean} disabled 是否禁用（默认false）
+ * @property {String Number} size 开关尺寸，单位rpx（默认50）
+ * @property {String} active-color 打开时的背景色（默认#2979ff）
+ * @property {Boolean} inactive-color 关闭时的背景色（默认#ffffff）
+ * @property {Boolean | Number | String} active-value 打开选择器时通过change事件发出的值（默认true）
+ * @property {Boolean | Number | String} inactive-value 关闭选择器时通过change事件发出的值（默认false）
+ * @event {Function} change 在switch打开或关闭时触发
+ * @example <u-switch v-model="checked" active-color="red" inactive-color="#eee"></u-switch>
+ */
+export default {
+	name: "u-switch",
+	emits: ["update:modelValue", "input", "change"],
+	props: {
+		// 通过v-model双向绑定的值
+		value: {
+			type: Boolean,
+			default: false
+		},
+		modelValue: {
+			type: Boolean,
+			default: false
+		},
+		// 是否为加载中状态
+		loading: {
+			type: Boolean,
+			default: false
+		},
+		// 是否为禁用装填
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		// 开关尺寸，单位rpx
+		size: {
+			type: [Number, String],
+			default: 50
+		},
+		// 打开时的背景颜色
+		activeColor: {
+			type: String,
+			default: "#2979ff"
+		},
+		// 关闭时的背景颜色
+		inactiveColor: {
+			type: String,
+			default: "#ffffff"
+		},
+		// 是否使手机发生短促震动，目前只在iOS的微信小程序有效(2020-05-06)
+		vibrateShort: {
+			type: Boolean,
+			default: false
+		},
+		// 打开选择器时的值
+		activeValue: {
+			type: [Number, String, Boolean],
+			default: true
+		},
+		// 关闭选择器时的值
+		inactiveValue: {
+			type: [Number, String, Boolean],
+			default: false
+		}
+	},
+	data() {
+		return {};
+	},
+	computed: {
+		valueCom() {
+			// #ifndef VUE3
+			return this.value;
+			// #endif
+
+			// #ifdef VUE3
+			return this.modelValue;
+			// #endif
+		},
+		switchStyle() {
+			let style = {};
+			style.fontSize = this.size + "rpx";
+			style.backgroundColor = this.valueCom ? this.activeColor : this.inactiveColor;
+			return style;
+		},
+		loadingColor() {
+			return this.valueCom ? this.activeColor : null;
+		}
+	},
+	methods: {
+		onClick() {
+			if (!this.disabled && !this.loading) {
+				// 使手机产生短促震动，微信小程序有效，APP(HX 2.6.8)和H5无效
+				if (this.vibrateShort) uni.vibrateShort();
+				this.$emit("input", !this.valueCom);
+				this.$emit("update:modelValue", !this.valueCom);
+				// 放到下一个生命周期，因为双向绑定的value修改父组件状态需要时间，且是异步的
+				this.$nextTick(() => {
+					this.$emit("change", this.valueCom ? this.activeValue : this.inactiveValue);
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/style.components.scss";
+
+.u-switch {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: inline-block;
+	/* #endif */
+	box-sizing: initial;
+	width: 2em;
+	height: 1em;
+	background-color: #fff;
+	border: 1px solid rgba(0, 0, 0, 0.1);
+	border-radius: 1em;
+	transition: background-color 0.3s;
+	font-size: 50rpx;
+}
+
+.u-switch__node {
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border-radius: 100%;
+	z-index: 1;
+	background-color: #fff;
+	background-color: #fff;
+	box-shadow: 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1),
+		0 3px 3px 0 rgba(0, 0, 0, 0.05);
+	box-shadow: 0 3px 1px 0 rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.1),
+		0 3px 3px 0 rgba(0, 0, 0, 0.05);
+	transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+	transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05),
+		-webkit-transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+	transition: transform cubic-bezier(0.3, 1.05, 0.4, 1.05);
+	transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+}
+
+.u-switch__loading {
+	@include vue-flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.u-switch--on {
+	background-color: #1989fa;
+}
+
+.u-switch--on .u-switch__node {
+	transform: translateX(100%);
+}
+
+.u-switch--disabled {
+	opacity: 0.4;
+}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-table/u-table.vue b/uni_modules/vk-uview-ui/components/u-table/u-table.vue
new file mode 100644
index 0000000..2bf44f0
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-table/u-table.vue
@@ -0,0 +1,85 @@
+<template>
+	<view class="u-table" :style="[tableStyle]">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * table 表格
+	 * @description 表格组件一般用于展示大量结构化数据的场景
+	 * @tutorial https://www.uviewui.com/components/table.html
+	 * @property {String} border-color 表格边框的颜色（默认#e4e7ed）
+	 * @property {String} bg-color 表格的背景颜色（默认#ffffff）
+	 * @property {String} align 单元格的内容对齐方式，作用类似css的text-align（默认center）
+	 * @property {String} padding 单元格的内边距，同css的padding写法（默认10rpx 0）
+	 * @property {String Number} font-size 单元格字体大小，单位rpx（默认28）
+	 * @property {String} color 单元格字体颜色（默认#606266）
+	 * @property {Object} th-style th单元格的样式，对象形式(将th所需参数放在table组件，是为了避免每一个th组件要写一遍）
+	 * @event {Function} click 点击组件时触发
+	 * @event {Function} close 点击关闭按钮时触发
+	 * @example <u-table></u-table>
+	 */
+	export default {
+		name: "u-table",
+    emits: ["click", "close"],
+		props: {
+			borderColor: {
+				type: String,
+				default: '#e4e7ed'
+			},
+			align: {
+				type: String,
+				default: 'center'
+			},
+			// td的内边距
+			padding: {
+				type: String,
+				default: '10rpx 6rpx'
+			},
+			// 字体大小
+			fontSize: {
+				type: [String, Number],
+				default: 28
+			},
+			// 字体颜色
+			color: {
+				type: String,
+				default: '#606266'
+			},
+			// th的自定义样式
+			thStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// table的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			}
+		},
+		data() {
+			return {}
+		},
+		computed: {
+			tableStyle() {
+				let style = {};
+				style.borderLeft = `solid 1px ${this.borderColor}`;
+				style.borderTop = `solid 1px ${this.borderColor}`;
+				style.backgroundColor = this.bgColor;;
+				return style;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-table {
+		width: 100%;
+		box-sizing: border-box;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue b/uni_modules/vk-uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
new file mode 100644
index 0000000..c4c70e6
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue
@@ -0,0 +1,490 @@
+<template>
+	<view class="u-tabs" :style="{
+			zIndex: zIndex,
+			background: bgColor
+		}">
+		<scroll-view scroll-x class="u-scroll-view" :scroll-left="scrollLeft" scroll-with-animation :style="{ zIndex: zIndex + 1 }">
+			<view class="u-tabs-scroll-box" :class="{'u-tabs-scroll-flex': !isScroll}">
+				<view class="u-tabs-item" :style="[tabItemStyle(index)]"
+				 v-for="(item, index) in getTabs" :key="index" :class="[preId + index]" @tap="emit(index)">
+					<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
+					{{ item[name] || item['name']}}
+				</view>
+				<view v-if="showBar" class="u-scroll-bar" :style="[tabBarStyle]"></view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import colorGradient from '../../libs/function/colorGradient';
+	let color = colorGradient;
+	const { windowWidth } = uni.getSystemInfoSync();
+	const preId = 'UEl_';
+
+	/**
+	 * tabsSwiper 全屏选项卡
+	 * @description 该组件内部实现主要依托于uniapp的scroll-view和swiper组件，主要特色是切换过程中，tabsSwiper文字的颜色可以渐变，底部滑块可以 跟随式滑动，活动tab滚动居中等。应用场景可以用于需要左右切换页面，比如商城的订单中心(待收货-待付款-待评价-已退货)等应用场景。
+	 * @tutorial https://www.uviewui.com/components/tabsSwiper.html
+	 * @property {Boolean} is-scroll tabs是否可以左右拖动（默认true）
+	 * @property {Array} list 标签数组，元素为对象，如[{name: '推荐'}]
+	 * @property {String Number} current 指定哪个tab为激活状态（默认0）
+	 * @property {String Number} height 导航栏的高度，单位rpx（默认80）
+	 * @property {String Number} font-size tab文字大小，单位rpx（默认30）
+	 * @property {String Number} swiper-width tabs组件外部swiper的宽度，默认为屏幕宽度，单位rpx（默认750）
+	 * @property {String} active-color 滑块和激活tab文字的颜色（默认#2979ff）
+	 * @property {String} inactive-color tabs文字颜色（默认#303133）
+	 * @property {String Number} bar-width 滑块宽度，单位rpx（默认40）
+	 * @property {String Number} bar-height 滑块高度，单位rpx（默认6）
+	 * @property {Object} bar-style 底部滑块的样式，对象形式
+	 * @property {Object} active-item-style 活动tabs item的样式，对象形式
+	 * @property {Boolean} show-bar 是否显示底部的滑块（默认true）
+	 * @property {String Number} gutter 单个tab标签的左右内边距之和，单位rpx（默认40）
+	 * @property {String} bg-color tabs导航栏的背景颜色（默认#ffffff）
+	 * @property {String} name 组件内部读取的list参数中的属性名，见官网说明（默认name）
+	 * @property {String} count 组件内部读取的list参数中的属性名（badge徽标数），同name属性的使用，见官网说明（默认count）
+	 * @property {Array} offset 设置badge徽标数的位置偏移，格式为 [x, y]，也即设置的为top和right的值，单位rpx（默认[5, 20]）
+	 * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
+	 * @event {Function} change 点击标签时触发
+	 * @example <u-tabs-swiper ref="tabs" :list="list" :is-scroll="false"></u-tabs-swiper>
+	 */
+	export default {
+		name: "u-tabs-swiper",
+    emits: ["update:modelValue", "input", "change"],
+		props: {
+			// 导航菜单是否需要滚动，如只有2或者3个的时候，就不需要滚动了，此时使用flex平分tab的宽度
+			isScroll: {
+				type: Boolean,
+				default: true
+			},
+			//需循环的标签列表
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 当前活动tab的索引
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			// 导航栏的高度和行高，单位rpx
+			height: {
+				type: [Number, String],
+				default: 80
+			},
+			// 字体大小，单位rpx
+			fontSize: {
+				type: [Number, String],
+				default: 30
+			},
+			// 过渡动画时长, 单位s
+			// duration: {
+			// 	type: [Number, String],
+			// 	default: 0.5
+			// },
+			swiperWidth: {
+				//line3生效, 外部swiper的宽度, 单位rpx
+				type: [String, Number],
+				default: 750
+			},
+			// 选中项的主题颜色
+			activeColor: {
+				type: String,
+				default: '#303133'
+			},
+			// 未选中项的颜色
+			inactiveColor: {
+				type: String,
+				default: '#303133'
+			},
+			// 菜单底部移动的bar的宽度，单位rpx
+			barWidth: {
+				type: [Number, String],
+				default: 40
+			},
+			// 移动bar的高度
+			barHeight: {
+				type: [Number, String],
+				default: 6
+			},
+			// 单个tab的左或右内边距（各占一半），单位rpx
+			gutter: {
+				type: [Number, String],
+				default: 40
+			},
+			// 如果是绝对定位，添加z-index值
+			zIndex: {
+				type: [Number, String],
+				default: 1
+			},
+			// 导航栏的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			//滚动至中心目标类型
+			autoCenterMode: {
+				type: String,
+				default: 'window'
+			},
+			// 读取传入的数组对象的属性(tab名称)
+			name: {
+				type: String,
+				default: 'name'
+			},
+			// 读取传入的数组对象的属性(徽标数)
+			count: {
+				type: String,
+				default: 'count'
+			},
+			// 徽标数位置偏移
+			offset: {
+				type: Array,
+				default: () => {
+					return [5, 20]
+				}
+			},
+			// 活动tab字体是否加粗
+			bold: {
+				type: Boolean,
+				default: true
+			},
+			// 当前活动tab item的样式
+			activeItemStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 是否显示底部的滑块
+			showBar: {
+				type: Boolean,
+				default: true
+			},
+			// 底部滑块的自定义样式
+			barStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				scrollLeft: 0, // 滚动scroll-view的左边滚动距离
+				tabQueryInfo: [], // 存放对tab菜单查询后的节点信息
+				windowWidth: 0, // 屏幕宽度，单位为px
+				//scrollBarLeft: 0, // 移动bar需要通过translateX()移动的距离
+				animationFinishCurrent: this.current,
+				componentsWidth: 0,
+				line3AddDx: 0,
+				line3Dx: 0,
+				preId,
+				sW: 0,
+				tabsInfo: [],
+				colorGradientArr: [],
+				colorStep: 100 // 两个颜色之间的渐变等分
+			};
+		},
+		computed: {
+			// 获取当前活跃的current值
+			getCurrent() {
+				const current = Number(this.current);
+				// 判断是否超出边界
+				if (current > this.getTabs.length - 1) {
+					return this.getTabs.length - 1;
+				}
+				if (current < 0) return 0;
+				return current;
+			},
+			getTabs() {
+				return this.list;
+			},
+			// 滑块需要移动的距离
+			scrollBarLeft() {
+				var barleft = Number(this.line3Dx) + Number(this.line3AddDx);
+				return barleft > 0 ? barleft : 21;
+			},
+			// 滑块的宽度转为px单位
+			barWidthPx() {
+				return uni.upx2px(this.barWidth);
+			},
+			// tab的样式
+			tabItemStyle() {
+				return (index) => {
+					let style = {
+						height: this.height + 'rpx',
+						lineHeight: this.height + 'rpx',
+						padding: `0 ${this.gutter / 2}rpx`,
+						color: this.tabsInfo.length > 0 ? (this.tabsInfo[index] ? this.tabsInfo[index].color : this.activeColor) : this.inactiveColor,
+						fontSize: this.fontSize + 'rpx',
+						zIndex: this.zIndex + 2,
+						fontWeight: (index == this.getCurrent && this.bold) ? 'bold' : 'bold'
+					};
+					if(index == this.getCurrent) {
+						// 给选中的tab item添加外部自定义的样式
+						style = Object.assign(style, this.activeItemStyle);
+					}
+					return style;
+				}
+			},
+			// 底部滑块的样式
+			tabBarStyle() {
+				let style = {
+					width: this.barWidthPx + 'px',
+					height: this.barHeight + 'rpx',
+					borderRadius: '100px',
+					backgroundColor: '#3cc9a4',
+					left: this.scrollBarLeft + 'px'
+				};
+				return Object.assign(style, this.barStyle);
+			}
+		},
+		watch: {
+			current(n, o) {
+				this.change(n);
+				this.setFinishCurrent(n);
+			},
+			list() {
+				this.$nextTick(() => {
+					this.init();
+				})
+			}
+		},
+		mounted() {
+			this.init();
+		},
+		methods: {
+			async init() {
+				this.countPx();
+				await this.getTabsInfo();
+				this.countLine3Dx();
+				this.getQuery(() => {
+					this.setScrollViewToCenter();
+				});
+				// 颜色渐变过程数组
+				this.colorGradientArr = color.colorGradient(this.inactiveColor, this.activeColor, this.colorStep);
+			},
+			// 获取各个tab的节点信息
+			getTabsInfo() {
+				return new Promise((resolve, reject) => {
+					let view = uni.createSelectorQuery().in(this);
+					for (let i = 0; i < this.list.length; i++) {
+						view.select('.' + preId + i).boundingClientRect();
+					}
+					view.exec(res => {
+						const arr = [];
+						for (let i = 0; i < res.length; i++) {
+							// 给每个tab添加其文字颜色属性
+							res[i].color = this.inactiveColor;
+							// 当前tab直接赋予activeColor
+							if (i == this.getCurrent) res[i].color = this.activeColor;
+							arr.push(res[i]);
+						}
+						this.tabsInfo = arr;
+						resolve();
+					});
+				})
+			},
+			// 当swiper滑动结束，计算滑块最终要停留的位置
+			countLine3Dx() {
+				const tab = this.tabsInfo[this.animationFinishCurrent];
+				// 让滑块中心点和当前tab中心重合
+				if (tab) this.line3Dx = tab.left + tab.width / 2 - this.barWidthPx / 2 - this.tabsInfo[0].left;
+			},
+			countPx() {
+				// swiper宽度由rpx转为px单位，因为dx等，都是px单位
+				this.sW = uni.upx2px(Number(this.swiperWidth));
+			},
+			emit(index) {
+				this.$emit('change', index);
+			},
+			change() {
+				this.setScrollViewToCenter();
+			},
+			getQuery(cb) {
+				try {
+					let view = uni.createSelectorQuery().in(this).select('.u-tabs');
+					view.fields({
+							size: true
+						},
+						data => {
+							if (data) {
+								this.componentsWidth = data.width;
+								if (cb && typeof cb === 'function') cb(data);
+							} else {
+								this.getQuery(cb);
+							}
+						}
+					).exec();
+				} catch (e) {
+					this.componentsWidth = windowWidth;
+				}
+			},
+			// 把活动tab移动到屏幕中心点
+			setScrollViewToCenter() {
+				let tab;
+				tab = this.tabsInfo[this.animationFinishCurrent];
+				if (tab) {
+					let tabCenter = tab.left + tab.width / 2;
+					let fatherWidth;
+					// 活动tab移动到中心时，以屏幕还是tab组件为宽度为基准
+					if (this.autoCenterMode === 'window') {
+						fatherWidth = windowWidth;
+					} else {
+						fatherWidth = this.componentsWidth;
+					}
+					this.scrollLeft = tabCenter - fatherWidth / 2;
+				}
+			},
+			setDx(dx) {
+				let nextTabIndex = dx > 0 ? this.animationFinishCurrent + 1 : this.animationFinishCurrent - 1;
+				// 判断索引是否超出边界
+				nextTabIndex = nextTabIndex <= 0 ? 0 : nextTabIndex;
+				nextTabIndex = nextTabIndex >= this.list.length ? this.list.length - 1 : nextTabIndex;
+				const tab = this.tabsInfo[nextTabIndex];
+				// 当前tab中心点x轴坐标
+				let nowTab = this.tabsInfo[this.animationFinishCurrent];
+				let nowTabX = nowTab.left + nowTab.width / 2;
+				// 下一个tab
+				let nextTab = this.tabsInfo[nextTabIndex];
+				let nextTabX = nextTab.left + nextTab.width / 2;
+				// 两个tab之间的距离，因为下一个tab可能在当前tab的左边或者右边，取绝对值即可
+				let distanceX = Math.abs(nextTabX - nowTabX);
+				this.line3AddDx = (dx / this.sW) * distanceX;
+				this.setTabColor(this.animationFinishCurrent, nextTabIndex, dx);
+			},
+			// 设置tab的颜色
+			setTabColor(nowTabIndex, nextTabIndex, dx) {
+				let colorIndex = Math.abs(Math.ceil((dx / this.sW) * 100));
+				let colorLength = this.colorGradientArr.length;
+				// 处理超出索引边界的情况
+				colorIndex = colorIndex >= colorLength ? colorLength - 1 : colorIndex <= 0 ? 0 : colorIndex;
+				// 设置下一个tab的颜色
+				this.tabsInfo[nextTabIndex].color = this.colorGradientArr[colorIndex];
+				// 设置当前tab的颜色
+				this.tabsInfo[nowTabIndex].color = this.colorGradientArr[colorLength - 1 - colorIndex];
+			},
+			// swiper结束滑动
+			setFinishCurrent(current) {
+				// 如果滑动的索引不一致，修改tab颜色变化，因为可能会有直接点击tab的情况
+				this.tabsInfo.map((val, index) => {
+					if (current == index) val.color = this.activeColor;
+					else val.color = this.inactiveColor;
+					return val;
+				});
+				this.line3AddDx = 0;
+				this.animationFinishCurrent = current;
+				this.countLine3Dx();
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	@import "../../libs/css/style.components.scss";
+
+	view,
+	scroll-view {
+		box-sizing: border-box;
+	}
+
+	.u-tabs {
+		width: 100%;
+		transition-property: background-color, color;
+	}
+
+	/* #ifndef APP-NVUE */
+	::-webkit-scrollbar,
+	::-webkit-scrollbar,
+	::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+	/* #endif */
+
+	/* #ifdef H5 */
+	// 通过样式穿透，隐藏H5下，scroll-view下的滚动条
+	scroll-view ::v-deep ::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+
+	/* #endif */
+
+	.u-scroll-view {
+		width: 100%;
+		white-space: nowrap;
+		position: relative;
+	}
+
+	.u-tabs-scroll-box {
+		position: relative;
+	}
+
+	.u-tabs-scroll-flex {
+		@include vue-flex;
+		justify-content: space-between;
+	}
+
+	.u-tabs-scroll-flex .u-tabs-item {
+		flex: 1;
+	}
+
+	.u-tabs-item {
+		position: relative;
+		display: inline-block;
+		text-align: center;
+		transition-property: background-color, color, font-weight;
+	}
+
+	.content {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.boxStyle {
+		pointer-events: none;
+		position: absolute;
+		transition-property: all;
+	}
+
+	.boxStyle2 {
+		pointer-events: none;
+		position: absolute;
+		bottom: 0;
+		transition-property: all;
+		transform: translateY(-100%);
+	}
+
+	.itemBackgroundBox {
+		pointer-events: none;
+		position: absolute;
+		top: 0;
+		transition-property: left, background-color;
+		@include vue-flex;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.itemBackground {
+		height: 100%;
+		width: 100%;
+		transition-property: all;
+	}
+
+	.u-scroll-bar {
+		position: absolute;
+		bottom: 4rpx;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-tabs/u-tabs.vue b/uni_modules/vk-uview-ui/components/u-tabs/u-tabs.vue
new file mode 100644
index 0000000..56a193a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-tabs/u-tabs.vue
@@ -0,0 +1,399 @@
+<template>
+	<view class="u-tabs" :style="{
+		background: bgColor
+	}">
+		<!-- $u.getRect()对组件根节点无效，因为写了.in(this)，故这里获取内层接点尺寸 -->
+		<view :id="id">
+			<scroll-view scroll-x class="u-scroll-view" :scroll-left="scrollLeft" scroll-with-animation>
+				<view class="u-scroll-box" :id="id" :class="{'u-tabs-scroll-flex': !isScroll}">
+					<view class="u-tab-item u-line-1" :id="'u-tab-item-' + index" v-for="(item, index) in list" :key="index" @tap="clickTab(index)"
+					 :style="[tabItemStyle(index)]">
+						<u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
+						{{ item[name] || item['name']}}
+					</view>
+					<view v-if="showBar" class="u-tab-bar" :style="[tabBarStyle]"></view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * tabs 标签
+	 * @description 该组件，是一个tabs标签组件，在标签多的时候，可以配置为左右滑动，标签少的时候，可以禁止滑动。 该组件的一个特点是配置为滚动模式时，激活的tab会自动移动到组件的中间位置。
+	 * @tutorial https://www.uviewui.com/components/tabs.html
+	 * @property {Boolean} is-scroll tabs是否可以左右拖动（默认true）
+	 * @property {Array} list 标签数组，元素为对象，如[{name: '推荐'}]
+	 * @property {String Number} current 指定哪个tab为激活状态（默认0）
+	 * @property {String Number} height 导航栏的高度，单位rpx（默认80）
+	 * @property {String Number} font-size tab文字大小，单位rpx（默认30）
+	 * @property {String Number} duration 滑块移动一次所需的时间，单位秒（默认0.5）
+	 * @property {String} active-color 滑块和激活tab文字的颜色（默认#2979ff）
+	 * @property {String} inactive-color tabs文字颜色（默认#303133）
+	 * @property {String Number} bar-width 滑块宽度，单位rpx（默认40）
+	 * @property {Object} active-item-style 活动tabs item的样式，对象形式
+	 * @property {Object} bar-style 底部滑块的样式，对象形式
+	 * @property {Boolean} show-bar 是否显示底部的滑块（默认true）
+	 * @property {String Number} bar-height 滑块高度，单位rpx（默认6）
+	 * @property {String Number} item-width 标签的宽度（默认auto）
+	 * @property {String Number} gutter 单个tab标签的左右内边距之和，单位rpx（默认40）
+	 * @property {String} bg-color tabs导航栏的背景颜色（默认#ffffff）
+	 * @property {String} name 组件内部读取的list参数中的属性名（tab名称），见官网说明（默认name）
+	 * @property {String} count 组件内部读取的list参数中的属性名（badge徽标数），同name属性的使用，见官网说明（默认count）
+	 * @property {Array} offset 设置badge徽标数的位置偏移，格式为 [x, y]，也即设置的为top和right的值，单位rpx（默认[5, 20]）
+	 * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
+	 * @event {Function} change 点击标签时触发
+	 * @example <u-tabs ref="tabs" :list="list" :is-scroll="false"></u-tabs>
+	 */
+	export default {
+		name: "u-tabs",
+    emits: ["update:modelValue", "input", "change"],
+		props: {
+      // 通过双向绑定控制组件的弹出与收起
+      value: {
+      	type: [Number, String],
+      	default: 0
+      },
+      modelValue: {
+        type: [Number, String],
+        default: 0
+      },
+      // 当前活动tab的索引（请使用 v-model="current" 代替 :current="current" @change="change" 其他不变）
+      current: {
+      	type: [Number, String],
+      	default: 0
+      },
+			// 导航菜单是否需要滚动，如只有2或者3个的时候，就不需要滚动了，此时使用flex平分tab的宽度
+			isScroll: {
+				type: Boolean,
+				default: true
+			},
+			//需循环的标签列表
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 导航栏的高度和行高
+			height: {
+				type: [String, Number],
+				default: 80
+			},
+			// 字体大小
+			fontSize: {
+				type: [String, Number],
+				default: 30
+			},
+			// 过渡动画时长, 单位ms
+			duration: {
+				type: [String, Number],
+				default: 0.5
+			},
+			// 选中项的主题颜色
+			activeColor: {
+				type: String,
+				default: '#2979ff'
+			},
+			// 未选中项的颜色
+			inactiveColor: {
+				type: String,
+				default: '#303133'
+			},
+			// 菜单底部移动的bar的宽度，单位rpx
+			barWidth: {
+				type: [String, Number],
+				default: 40
+			},
+			// 移动bar的高度
+			barHeight: {
+				type: [String, Number],
+				default: 6
+			},
+			// 单个tab的左或有内边距（左右相同）
+			gutter: {
+				type: [String, Number],
+				default: 30
+			},
+			// 导航栏的背景颜色
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			// 读取传入的数组对象的属性(tab名称)
+			name: {
+				type: String,
+				default: 'name'
+			},
+			// 读取传入的数组对象的属性(徽标数)
+			count: {
+				type: String,
+				default: 'count'
+			},
+			// 徽标数位置偏移
+			offset: {
+				type: Array,
+				default: () => {
+					return [5, 20]
+				}
+			},
+			// 活动tab字体是否加粗
+			bold: {
+				type: Boolean,
+				default: true
+			},
+			// 当前活动tab item的样式
+			activeItemStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 是否显示底部的滑块
+			showBar: {
+				type: Boolean,
+				default: true
+			},
+			// 底部滑块的自定义样式
+			barStyle: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 标签的宽度
+			itemWidth: {
+				type: [Number, String],
+				default: 'auto'
+			}
+		},
+		data() {
+			return {
+				scrollLeft: 0, // 滚动scroll-view的左边滚动距离
+				tabQueryInfo: [], // 存放对tab菜单查询后的节点信息
+				componentWidth: 0, // 屏幕宽度，单位为px
+				scrollBarLeft: 0, // 移动bar需要通过translateX()移动的距离
+				parentLeft: 0, // 父元素(tabs组件)到屏幕左边的距离
+				id: this.$u.guid(), // id值
+				currentIndex: this.current,
+				barFirstTimeMove: true, // 滑块第一次移动时(页面刚生成时)，无需动画，否则给人怪异的感觉
+			};
+		},
+		watch: {
+			// 监听tab的变化，重新计算tab菜单的布局信息，因为实际使用中菜单可能是通过
+			// 后台获取的（如新闻app顶部的菜单），获取返回需要一定时间，所以list变化时，重新获取布局信息
+			list(n, o) {
+				// list变动时，重制内部索引，否则可能导致超出数组边界的情况
+				if(n.length !== o.length) this.currentIndex = 0;
+				// 用$nextTick等待视图更新完毕后再计算tab的局部信息，否则可能因为tab还没生成就获取，就会有问题
+				this.$nextTick(() => {
+					this.init();
+				});
+			},
+			current: {
+				immediate: true,
+				handler(nVal, oVal) {
+					// 视图更新后再执行移动操作
+					this.$nextTick(() => {
+						this.currentIndex = nVal;
+						this.scrollByIndex();
+					});
+				}
+			},
+      valueCom: {
+        immediate: true,
+        handler(nVal, oVal) {
+        	// 视图更新后再执行移动操作
+        	this.$nextTick(() => {
+        		this.currentIndex = nVal;
+        		this.scrollByIndex();
+        	});
+        }
+      }
+		},
+		computed: {
+			valueCom() {
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+			},
+			// 移动bar的样式
+			tabBarStyle() {
+				let style = {
+					width: this.barWidth + 'rpx',
+					transform: `translate(${this.scrollBarLeft}px, -100%)`,
+					// 滑块在页面渲染后第一次滑动时，无需动画效果
+					'transition-duration': `${this.barFirstTimeMove ? 0 : this.duration }s`,
+					'background-color': this.activeColor,
+					height: this.barHeight + 'rpx',
+					// 设置一个很大的值，它会自动取能用的最大值，不用高度的一半，是因为高度可能是单数，会有小数出现
+					'border-radius': `${this.barHeight / 2}px`
+				};
+				Object.assign(style, this.barStyle);
+				return style;
+			},
+			// tab的样式
+			tabItemStyle() {
+				return (index) => {
+					let style = {
+						height: this.height + 'rpx',
+						'line-height': this.height + 'rpx',
+						'font-size': this.fontSize + 'rpx',
+						'transition-duration': `${this.duration}s`,
+						padding: this.isScroll ? `0 ${this.gutter}rpx` : '',
+						flex: this.isScroll ? 'auto' : '1',
+						width: this.$u.addUnit(this.itemWidth)
+					};
+					// 字体加粗
+					if (index == this.currentIndex && this.bold) style.fontWeight = 'bold';
+					if (index == this.currentIndex) {
+						style.color = this.activeColor;
+						// 给选中的tab item添加外部自定义的样式
+						style = Object.assign(style, this.activeItemStyle);
+					} else {
+						style.color = this.inactiveColor;
+					}
+					return style;
+				}
+			}
+		},
+		methods: {
+			// 设置一个init方法，方便多处调用
+			async init() {
+				// 获取tabs组件的尺寸信息
+				let tabRect = await this.$uGetRect('#' + this.id);
+				// tabs组件距离屏幕左边的宽度
+				this.parentLeft = tabRect.left;
+				// tabs组件的宽度
+				this.componentWidth = tabRect.width;
+				this.getTabRect();
+			},
+			// 点击某一个tab菜单
+			clickTab(index) {
+				// 点击当前活动tab，不触发事件
+				if(index == this.currentIndex) return ;
+				// 发送事件给父组件
+				this.$emit('change', index);
+        this.$emit('input', index);
+        this.$emit("update:modelValue", index);
+			},
+			// 查询tab的布局信息
+			getTabRect() {
+				// 创建节点查询
+				let query = uni.createSelectorQuery().in(this);
+				// 历遍所有tab，这里是执行了查询，最终使用exec()会一次性返回查询的数组结果
+				for (let i = 0; i < this.list.length; i++) {
+					// 只要size和rect两个参数
+					query.select(`#u-tab-item-${i}`).fields({
+						size: true,
+						rect: true
+					});
+				}
+				// 执行查询，一次性获取多个结果
+				query.exec(
+					function(res) {
+						this.tabQueryInfo = res;
+						// 初始化滚动条和移动bar的位置
+						this.scrollByIndex();
+					}.bind(this)
+				);
+			},
+			// 滚动scroll-view，让活动的tab处于屏幕的中间位置
+			scrollByIndex() {
+				// 当前活动tab的布局信息，有tab菜单的width和left(为元素左边界到父元素左边界的距离)等信息
+				let tabInfo = this.tabQueryInfo[this.currentIndex];
+				if (!tabInfo) return;
+				// 活动tab的宽度
+				let tabWidth = tabInfo.width;
+				// 活动item的左边到tabs组件左边的距离，用item的left减去tabs的left
+				let offsetLeft = tabInfo.left - this.parentLeft;
+				// 将活动的tabs-item移动到屏幕正中间，实际上是对scroll-view的移动
+				let scrollLeft = offsetLeft - (this.componentWidth - tabWidth) / 2;
+				this.scrollLeft = scrollLeft < 0 ? 0 : scrollLeft;
+				// 当前活动item的中点点到左边的距离减去滑块宽度的一半，即可得到滑块所需的移动距离
+				let left = tabInfo.left + tabInfo.width / 2 - this.parentLeft;
+				// 计算当前活跃item到组件左边的距离
+				this.scrollBarLeft = left - uni.upx2px(this.barWidth) / 2;
+				// 第一次移动滑块的时候，barFirstTimeMove为true，放到延时中将其设置false
+				// 延时是因为scrollBarLeft作用于computed计算时，需要一个过程需，否则导致出错
+				if(this.barFirstTimeMove == true) {
+					setTimeout(() => {
+						this.barFirstTimeMove = false;
+					}, 100)
+				}
+			}
+		},
+		mounted() {
+			this.init();
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	view,
+	scroll-view {
+		box-sizing: border-box;
+	}
+
+	/* #ifndef APP-NVUE */
+	::-webkit-scrollbar,
+	::-webkit-scrollbar,
+	::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+	/* #endif */
+
+	.u-scroll-box {
+		position: relative;
+		/* #ifdef MP-TOUTIAO */
+		white-space: nowrap;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	// 通过样式穿透，隐藏H5下，scroll-view下的滚动条
+	scroll-view ::v-deep ::-webkit-scrollbar {
+		display: none;
+		width: 0 !important;
+		height: 0 !important;
+		-webkit-appearance: none;
+		background: transparent;
+	}
+	/* #endif */
+
+	.u-scroll-view {
+		width: 100%;
+		white-space: nowrap;
+		position: relative;
+	}
+
+	.u-tab-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		text-align: center;
+		transition-property: background-color, color;
+	}
+
+	.u-tab-bar {
+		position: absolute;
+		bottom: 0;
+	}
+
+	.u-tabs-scroll-flex {
+		@include vue-flex;
+		justify-content: space-between;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-tag/u-tag.vue b/uni_modules/vk-uview-ui/components/u-tag/u-tag.vue
new file mode 100644
index 0000000..18ef59f
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-tag/u-tag.vue
@@ -0,0 +1,295 @@
+<template>
+	<view v-if="show" :class="[
+		disabled ? 'u-disabled' : '',
+		'u-size-' + size,
+		'u-shape-' + shape,
+		'u-mode-' + mode + '-' + type
+	]"
+	 class="u-tag" :style="[customStyle]" @tap="clickTag">
+		{{text}}
+		<view class="u-icon-wrap" @tap.stop>
+			<u-icon @click="close" size="22" v-if="closeable" :color="closeIconColor" 
+			name="close" class="u-close-icon" :style="[iconStyle]"></u-icon>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * tag 提示
+	 * @description 该组件一般用于标记和选择
+	 * @tutorial https://www.uviewui.com/components/tag.html
+	 * @property {String} type 主题类型（默认primary）
+	 * @property {String} size 标签大小（默认default）
+	 * @property {String} shape 标签形状（默认square）
+	 * @property {String} text 标签的文字内容
+	 * @property {String} bg-color 自定义标签的背景颜色
+	 * @property {String} border-color 标签的边框颜色
+	 * @property {String} close-color 关闭按钮的颜色
+	 * @property {String Number} index 点击标签时，会通过click事件返回该值
+	 * @property {String} mode 模式选择，见官网说明（默认light）
+	 * @property {Boolean} closeable 是否可关闭，设置为true，文字右边会出现一个关闭图标（默认false）
+	 * @property {Boolean} show 标签显示与否（默认true）
+	 * @event {Function} click 点击标签触发
+	 * @event {Function} close closeable为true时，点击标签关闭按钮触发
+	 * @example <u-tag text="雪月夜" type="success" />
+	 */
+	export default {
+		name: 'u-tag',
+    emits: ["click", "close"],
+		// 是否禁用这个标签，禁用的话，会屏蔽点击事件
+		props: {
+			// 标签类型info、primary、success、warning、error
+			type: {
+				type: String,
+				default: 'primary'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			// 标签的大小，分为default（默认），mini（较小）
+			size: {
+				type: String,
+				default: 'default'
+			},
+			// tag的形状，circle（两边半圆形）, square（方形，带圆角），circleLeft（左边是半圆），circleRight（右边是半圆）
+			shape: {
+				type: String,
+				default: 'square'
+			},
+			// 标签文字
+			text: {
+				type: [String, Number],
+				default: ''
+			},
+			// 背景颜色，默认为空字符串，即不处理
+			bgColor: {
+				type: String,
+				default: ''
+			},
+			// 标签字体颜色，默认为空字符串，即不处理
+			color: {
+				type: String,
+				default: ''
+			},
+			// 镂空形式标签的边框颜色
+			borderColor: {
+				type: String,
+				default: ''
+			},
+			// 关闭按钮图标的颜色
+			closeColor: {
+				type: String,
+				default: ''
+			},
+			// 点击时返回的索引值，用于区分例遍的数组哪个元素被点击了
+			index: {
+				type: [Number, String],
+				default: ''
+			},
+			// 模式选择，dark|light|plain
+			mode: {
+				type: String,
+				default: 'light'
+			},
+			// 是否可关闭
+			closeable: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示
+			show: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			customStyle() {
+				let style = {};
+				// 文字颜色（如果有此值，会覆盖type值的颜色）
+				if(this.color) style.color = this.color;
+				// tag的背景颜色（如果有此值，会覆盖type值的颜色）
+				if(this.bgColor) style.backgroundColor = this.bgColor;
+				// 如果是镂空型tag，没有传递边框颜色（borderColor）的话，使用文字的颜色（color属性）
+				if(this.mode == 'plain' && this.color && !this.borderColor) style.borderColor = this.color;
+				else style.borderColor = this.borderColor;
+				return style;
+			},
+			iconStyle() {
+				if(!this.closeable) return ;
+				let style = {};
+				if(this.size == 'mini') style.fontSize = '20rpx';
+				else style.fontSize = '22rpx';
+				if(this.mode == 'plain' || this.mode == 'light') style.color = this.type;
+				else if(this.mode == 'dark')  style.color = "#ffffff";
+				if(this.closeColor) style.color = this.closeColor;
+				return style;
+			},
+			// 关闭图标的颜色
+			closeIconColor() {
+				// 如果定义了关闭图标的颜色，就用此值，否则用字体颜色的值
+				// 如果上面的二者都没有，如果是dark深色模式，图标就为白色
+				// 最后如果上面的三者都不合适，就返回type值给图标获取颜色
+				let color = '';
+				if(this.closeColor) return this.closeColor;
+				else if(this.color) return this.color;
+				else if(this.mode == 'dark') return '#ffffff';
+				else return this.type;
+			}
+		},
+		methods: {
+			// 标签被点击
+			clickTag() {
+				// 如果是disabled状态，不发送点击事件
+				if(this.disabled) return ;
+				this.$emit('click', this.index);
+			},
+			// 点击标签关闭按钮
+			close() {
+				this.$emit('close', this.index);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-tag {
+		box-sizing: border-box;
+		align-items: center;
+		border-radius: 6rpx;
+		/* #ifndef APP-NVUE */
+		display: inline-block;
+		/* #endif */
+		line-height: 1;
+	}
+	
+	.u-size-default {
+		font-size: 22rpx;
+		padding: 12rpx 22rpx;
+	}
+	
+	.u-size-mini {
+		font-size: 20rpx;
+		padding: 6rpx 12rpx;
+	}
+
+	.u-mode-light-primary {
+		background-color: $u-type-primary-light;
+		color: $u-type-primary;
+		border: 1px solid $u-type-primary-disabled;
+	}
+	
+	.u-mode-light-success {
+		background-color: $u-type-success-light;
+		color: $u-type-success;
+		border: 1px solid $u-type-success-disabled;
+	}
+	
+	.u-mode-light-error {
+		background-color: $u-type-error-light;
+		color: $u-type-error;
+		border: 1px solid $u-type-error-disabled;
+	}
+	
+	.u-mode-light-warning {
+		background-color: $u-type-warning-light;
+		color: $u-type-warning;
+		border: 1px solid $u-type-warning-disabled;
+	}
+	
+	.u-mode-light-info {
+		background-color: $u-type-info-light;
+		color: $u-type-info;
+		border: 1px solid $u-type-info-disabled;
+	}
+	
+	.u-mode-dark-primary {
+		background-color: $u-type-primary;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-success {
+		background-color: $u-type-success;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-error {
+		background-color: $u-type-error;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-warning {
+		background-color: $u-type-warning;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-dark-info {
+		background-color: $u-type-info;
+		color: #FFFFFF;
+	}
+	
+	.u-mode-plain-primary {
+		background-color: #FFFFFF;
+		color: $u-type-primary;
+		border: 1px solid $u-type-primary;
+	}
+	
+	.u-mode-plain-success {
+		background-color: #FFFFFF;
+		color: $u-type-success;
+		border: 1px solid $u-type-success;
+	}
+	
+	.u-mode-plain-error {
+		background-color: #FFFFFF;
+		color: $u-type-error;
+		border: 1px solid $u-type-error;
+	}
+	
+	.u-mode-plain-warning {
+		background-color: #FFFFFF;
+		color: $u-type-warning;
+		border: 1px solid $u-type-warning;
+	}
+	
+	.u-mode-plain-info {
+		background-color: #FFFFFF;
+		color: $u-type-info;
+		border: 1px solid $u-type-info;
+	}
+	
+	.u-disabled {
+		opacity: 0.55;
+	}
+
+	.u-shape-circle {
+		border-radius: 100rpx;
+	}
+	
+	.u-shape-circleRight {
+		border-radius:  0 100rpx 100rpx 0;
+	}
+
+	.u-shape-circleLeft {
+		border-radius: 100rpx 0 0 100rpx;
+	}
+	
+	.u-close-icon {
+		margin-left: 14rpx;
+		font-size: 22rpx;
+		color: $u-type-success;
+	}
+	
+	.u-icon-wrap {
+		display: inline-flex;
+		transform: scale(0.86);
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-td/u-td.vue b/uni_modules/vk-uview-ui/components/u-td/u-td.vue
new file mode 100644
index 0000000..b00ad8b
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-td/u-td.vue
@@ -0,0 +1,66 @@
+<template>
+	<view class="u-td" :style="[tdStyle]">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * td td单元格
+	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配u-table使用）
+	 * @tutorial https://www.uviewui.com/components/table.html#td-props
+	 * @property {String Number} width 单元格宽度百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比，单元格宽度默认为均分tr的长度（默认auto）
+	 * @example <u-td>二年级</u-td>
+	 */
+	export default {
+		name: "u-td",
+		props: {
+			// 宽度，百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比
+			width: {
+				type: [Number, String],
+				default: 'auto'
+			}
+		},
+		data() {
+			return {
+				tdStyle: {
+					
+				}
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			this.parent = this.$u.$parent.call(this, 'u-table');
+			if (this.parent) {
+				// 将父组件的相关参数，合并到本组件
+				let style = {};
+				if (this.width != "auto") style.flex = `0 0 ${this.width}`;
+				style.textAlign = this.parent.align;
+				style.fontSize = this.parent.fontSize + 'rpx';
+				style.padding = this.parent.padding;
+				style.borderBottom = `solid 1px ${this.parent.borderColor}`;
+				style.borderRight = `solid 1px ${this.parent.borderColor}`;
+				style.color = this.parent.color;
+				this.tdStyle = style;
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-td {
+		@include vue-flex;
+		flex-direction: column;
+		flex: 1;
+		justify-content: center;
+		font-size: 28rpx;
+		color: $u-content-color;
+		align-self: stretch;
+		box-sizing: border-box;
+		height: 100%;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-th/u-th.vue b/uni_modules/vk-uview-ui/components/u-th/u-th.vue
new file mode 100644
index 0000000..c736b9b
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-th/u-th.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="u-th" :style="[thStyle]">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * th th单元格
+	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配u-table使用）
+	 * @tutorial https://www.uviewui.com/components/table.html#td-props
+	 * @property {String Number} width 标题单元格宽度百分比或者具体带单位的值，如30%，200rpx等，一般使用百分比，单元格宽度默认为均分tr的长度
+	 * @example 暂无示例
+	 */
+	export default {
+		name: "u-th",
+		props: {
+			// 宽度，百分比或者具体带单位的值，如30%， 200rpx等，一般使用百分比
+			width: {
+				type: [Number, String],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				thStyle: {}
+			}
+		},
+		created() {
+			this.parent = false;
+		},
+		mounted() {
+			this.parent = this.$u.$parent.call(this, 'u-table');
+			if (this.parent) {
+				// 将父组件的相关参数，合并到本组件
+				let style = {};
+				if (this.width) style.flex = `0 0 ${this.width}`;
+				style.textAlign = this.parent.align;
+				style.padding = this.parent.padding;
+				style.borderBottom = `solid 1px ${this.parent.borderColor}`;
+				style.borderRight = `solid 1px ${this.parent.borderColor}`;
+				Object.assign(style, this.parent.thStyle);
+				this.thStyle = style;
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-th {
+		@include vue-flex;
+		flex-direction: column;
+		flex: 1;
+		justify-content: center;
+		font-size: 28rpx;
+		color: $u-main-color;
+		font-weight: bold;
+		background-color: rgb(245, 246, 248);
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-time-line-item/u-time-line-item.vue b/uni_modules/vk-uview-ui/components/u-time-line-item/u-time-line-item.vue
new file mode 100644
index 0000000..be86fdc
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-time-line-item/u-time-line-item.vue
@@ -0,0 +1,83 @@
+<template>
+	<view class="u-time-axis-item">
+		<slot name="content" />
+		<view class="u-time-axis-node" :style="[nodeStyle]">
+			<slot name="node">
+				<view class="u-dot">
+				</view>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * timeLineItem 时间轴Item
+	 * @description 时间轴组件一般用于物流信息展示，各种跟时间相关的记录等场景。(搭配u-time-line使用)
+	 * @tutorial https://www.uviewui.com/components/timeLine.html
+	 * @property {String} bg-color 左边节点的背景颜色，一般通过slot内容自定义背景颜色即可（默认#ffffff）
+	 * @property {String Number} node-top 节点左边图标绝对定位的top值，单位rpx
+	 * @example <u-time-line-item node-top="2">...</u-time-line-item>
+	 */
+	export default {
+		name: "u-time-line-item",
+		props: {
+			// 节点的背景颜色
+			bgColor: {
+				type: String,
+				default: "#ffffff"
+			},
+			// 节点左边图标绝对定位的top值
+			nodeTop: {
+				type: [String, Number],
+				default: ""
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+			nodeStyle() {
+				let style = {
+					backgroundColor: this.bgColor,
+				};
+				if (this.nodeTop != "") style.top = this.nodeTop + 'rpx';
+				return style;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-time-axis-item {
+		@include vue-flex;
+		flex-direction: column;
+		width: 100%;
+		position: relative;
+		margin-bottom: 32rpx;
+	}
+
+	.u-time-axis-node {
+		position: absolute;
+		top: 12rpx;
+		left: -40rpx;
+		transform-origin: 0;
+		transform: translateX(-50%);
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		z-index: 1;
+		font-size: 24rpx;
+	}
+
+	.u-dot {
+		height: 16rpx;
+		width: 16rpx;
+		border-radius: 100rpx;
+		background: #ddd;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-time-line/u-time-line.vue b/uni_modules/vk-uview-ui/components/u-time-line/u-time-line.vue
new file mode 100644
index 0000000..f3c7587
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-time-line/u-time-line.vue
@@ -0,0 +1,43 @@
+<template>
+	<view class="u-time-axis">
+		<slot />
+	</view>
+</template>
+
+<script>
+	/**
+	 * timeLine 时间轴
+	 * @description 时间轴组件一般用于物流信息展示，各种跟时间相关的记录等场景。
+	 * @tutorial https://www.uviewui.com/components/timeLine.html
+	 * @example <u-time-line></u-time-line>
+	 */
+	export default {
+		name: "u-time-line",
+		data() {
+			return {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-time-axis {
+		padding-left: 40rpx;
+		position: relative;
+	}
+
+	.u-time-axis::before {
+		content: " ";
+		position: absolute;
+		left: 0;
+		top: 12rpx;
+		width: 1px;
+		bottom: 0;
+		border-left: 1px solid #ddd;
+		transform-origin: 0 0;
+		transform: scaleX(0.5);
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-toast/u-toast.vue b/uni_modules/vk-uview-ui/components/u-toast/u-toast.vue
new file mode 100644
index 0000000..d219f67
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-toast/u-toast.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="u-toast" :class="[isShow ? 'u-show' : '', 'u-type-' + tmpConfig.type, 'u-position-' + tmpConfig.position]" :style="{
+		zIndex: uZIndex
+	}">
+		<view class="u-icon-wrap">
+			<u-icon v-if="tmpConfig.icon" class="u-icon" :name="iconName" :size="30" :color="tmpConfig.type"></u-icon>
+		</view>
+		<text class="u-text">{{tmpConfig.title}}</text>
+	</view>
+</template>
+
+<script>
+	/**
+	 * toast 消息提示
+	 * @description 此组件表现形式类似uni的uni.showToastAPI，但也有不同的地方。
+	 * @tutorial https://www.uviewui.com/components/toast.html
+	 * @property {String} z-index toast展示时的z-index值
+	 * @event {Function} show 显示toast，如需一进入页面就显示toast，请在onReady生命周期调用
+	 * @example <u-toast ref="uToast" />
+	 */
+	export default {
+		name: "u-toast",
+		props: {
+			// z-index值
+			zIndex: {
+				type: [Number, String],
+				default: ''
+			},
+		},
+		data() {
+			return {
+				isShow: false,
+				timer: null, // 定时器
+				config: {
+					params: {}, // URL跳转的参数，对象
+					title: '', // 显示文本
+					type: '', // 主题类型，primary，success，error，warning，black
+					duration: 2000, // 显示的时间，毫秒
+					isTab: false, // 是否跳转tab页面
+					url: '', // toast消失后是否跳转页面，有则跳转，优先级高于back参数
+					icon: true, // 显示的图标
+					position: 'center', // toast出现的位置
+					callback: null, // 执行完后的回调函数
+					back: false, // 结束toast是否自动返回上一页
+				},
+				tmpConfig: {}, // 将用户配置和内置配置合并后的临时配置变量
+			};
+		},
+		computed: {
+			iconName() {
+				// 只有不为none，并且type为error|warning|success|info时候，才显示图标
+				if (['error', 'warning', 'success', 'info'].indexOf(this.tmpConfig.type) >= 0 && this.tmpConfig.icon) {
+					let icon = this.$u.type2icon(this.tmpConfig.type);
+					return icon;
+				}
+			},
+			uZIndex() {
+				// 显示toast时候，如果用户有传递z-index值，有限使用
+				return this.isShow ? (this.zIndex ? this.zIndex : this.$u.zIndex.toast) : '999999';
+			}
+		},
+		methods: {
+			// 显示toast组件，由父组件通过this.$refs.xxx.show(options)形式调用
+			show(options) {
+				// 不降结果合并到this.config变量，避免多次条用u-toast，前后的配置造成混论
+				this.tmpConfig = this.$u.deepMerge(this.config, options);
+				if (this.timer) {
+					// 清除定时器
+					clearTimeout(this.timer);
+					this.timer = null;
+				}
+				this.isShow = true;
+				this.timer = setTimeout(() => {
+					// 倒计时结束，清除定时器，隐藏toast组件
+					this.isShow = false;
+					clearTimeout(this.timer);
+					this.timer = null;
+					// 判断是否存在callback方法，如果存在就执行
+					typeof(this.tmpConfig.callback) === 'function' && this.tmpConfig.callback();
+					this.timeEnd();
+				}, this.tmpConfig.duration);
+			},
+			// 隐藏toast组件，由父组件通过this.$refs.xxx.hide()形式调用
+			hide() {
+				this.isShow = false;
+				if (this.timer) {
+					// 清除定时器
+					clearTimeout(this.timer);
+					this.timer = null;
+				}
+			},
+			// 倒计时结束之后，进行的一些操作
+			timeEnd() {
+				// 如果带有url值，根据isTab为true或者false进行跳转
+				if (this.tmpConfig.url) {
+					// 如果url没有"/"开头，添加上，因为uni的路由跳转需要"/"开头
+					if (this.tmpConfig.url[0] != '/') this.tmpConfig.url = '/' + this.tmpConfig.url;
+					// 判断是否有传递显式的参数
+					if (Object.keys(this.tmpConfig.params).length) {
+						// 判断用户传递的url中，是否带有参数
+						// 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
+						// 如果有params参数，转换后无需带上"?"
+						let query = '';
+						if (/.*\/.*\?.*=.*/.test(this.tmpConfig.url)) {
+							// object对象转为get类型的参数
+							query = this.$u.queryParams(this.tmpConfig.params, false);
+							this.tmpConfig.url = this.tmpConfig.url + "&" + query;
+						} else {
+							query = this.$u.queryParams(this.tmpConfig.params);
+							this.tmpConfig.url += query;
+						}
+					}
+					// 如果是跳转tab页面，就使用uni.switchTab
+					if (this.tmpConfig.isTab) {
+						uni.switchTab({
+							url: this.tmpConfig.url
+						});
+					} else {
+						uni.navigateTo({
+							url: this.tmpConfig.url
+						});
+					}
+				} else if(this.tmpConfig.back) {
+					// 回退到上一页
+					this.$u.route({
+						type: 'back'
+					})
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+
+	.u-toast {
+		position: fixed;
+		z-index: -1;
+		transition: opacity 0.3s;
+		text-align: center;
+		color: #fff;
+		border-radius: 8rpx;
+		background: #585858;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 28rpx;
+		opacity: 0;
+		pointer-events: none;
+		padding: 18rpx 40rpx;
+	}
+
+	.u-toast.u-show {
+		opacity: 1;
+	}
+
+	.u-icon {
+		margin-right: 10rpx;
+		@include vue-flex;
+		align-items: center;
+		line-height: normal;
+	}
+
+	.u-position-center {
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%,-50%);
+		/* #ifndef APP-NVUE */
+		max-width: 70%;
+		/* #endif */
+	}
+
+	.u-position-top {
+		left: 50%;
+		top: 20%;
+		transform: translate(-50%,-50%);
+	}
+
+	.u-position-bottom {
+		left: 50%;
+		bottom: 20%;
+		transform: translate(-50%,-50%);
+	}
+
+	.u-type-primary {
+		color: $u-type-primary;
+		background-color: $u-type-primary-light;
+		border: 1px solid rgb(215, 234, 254);
+	}
+
+	.u-type-success {
+		color: $u-type-success;
+		background-color: $u-type-success-light;
+		border: 1px solid #BEF5C8;
+	}
+
+	.u-type-error {
+		color: $u-type-error;
+		background-color: $u-type-error-light;
+		border: 1px solid #fde2e2;
+	}
+
+	.u-type-warning {
+		color: $u-type-warning;
+		background-color: $u-type-warning-light;
+		border: 1px solid #faecd8;
+	}
+
+	.u-type-info {
+		color: $u-type-info;
+		background-color: $u-type-info-light;
+		border: 1px solid #ebeef5;
+	}
+
+	.u-type-default {
+		color: #fff;
+		background-color: #585858;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-tr/u-tr.vue b/uni_modules/vk-uview-ui/components/u-tr/u-tr.vue
new file mode 100644
index 0000000..06aed4a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-tr/u-tr.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="u-tr">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	/**
+	 * tr 表格行标签
+	 * @description 表格组件一般用于展示大量结构化数据的场景（搭配<u-table>使用）
+	 * @tutorial https://www.uviewui.com/components/table.html
+	 * @example <u-tr></u-tr>
+	 */
+	export default {
+		name: "u-tr",
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-tr {
+		@include vue-flex;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/u-verification-code/u-verification-code.vue b/uni_modules/vk-uview-ui/components/u-verification-code/u-verification-code.vue
new file mode 100644
index 0000000..66cb774
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/u-verification-code/u-verification-code.vue
@@ -0,0 +1,175 @@
+<template>
+	<view class="u-code-wrap">
+		<!-- 此组件功能由js完成，无需写html逻辑 -->
+	</view>
+</template>
+
+<script>
+	/**
+	 * verificationCode 验证码输入框
+	 * @description 考虑到用户实际发送验证码的场景，可能是一个按钮，也可能是一段文字，提示语各有不同，所以本组件 不提供界面显示，只提供提示语，由用户将提示语嵌入到具体的场景
+	 * @tutorial https://www.uviewui.com/components/verificationCode.html
+	 * @property {Number String} seconds 倒计时所需的秒数（默认60）
+	 * @property {String} start-text 开始前的提示语，见官网说明（默认获取验证码）
+	 * @property {String} change-text 倒计时期间的提示语，必须带有字母"x"，见官网说明（默认X秒重新获取）
+	 * @property {String} end-text 倒计结束的提示语，见官网说明（默认重新获取）
+	 * @property {Boolean} keep-running 是否在H5刷新或各端返回再进入时继续倒计时（默认false）
+	 * @event {Function} change 倒计时期间，每秒触发一次
+	 * @event {Function} start 开始倒计时触发
+	 * @event {Function} end 结束倒计时触发
+	 * @example <u-verification-code :seconds="seconds" @end="end" @start="start" ref="uCode" 
+	 */
+	export default {
+		name: "u-verification-code",
+    emits: ["start", "end", "change"],
+		props: {
+			// 倒计时总秒数
+			seconds: {
+				type: [String, Number],
+				default: 60
+			},
+			// 尚未开始时提示
+			startText: {
+				type: String,
+				default: '获取验证码'
+			},
+			// 正在倒计时中的提示
+			changeText: {
+				type: String,
+				default: 'X秒重新获取'
+			},
+			// 倒计时结束时的提示
+			endText: {
+				type: String,
+				default: '重新获取'
+			},
+			// 是否在H5刷新或各端返回再进入时继续倒计时
+			keepRunning: {
+				type: Boolean,
+				default: false
+			},
+			// 为了区分多个页面，或者一个页面多个倒计时组件本地存储的继续倒计时变了
+			uniqueKey: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				secNum: this.seconds,
+				timer: null,
+				canGetCode: true, // 是否可以执行验证码操作
+			}
+		},
+		mounted() {
+			this.checkKeepRunning();
+		},
+		watch: {
+			seconds: {
+				immediate: true,
+				handler(n) {
+					this.secNum = n;
+				}
+			}
+		},
+		methods: {
+			checkKeepRunning() {
+				// 获取上一次退出页面(H5还包括刷新)时的时间戳，如果没有上次的保存，此值可能为空
+				let lastTimestamp = Number(uni.getStorageSync(this.uniqueKey + '_$uCountDownTimestamp'));
+				if(!lastTimestamp) return this.changeEvent(this.startText);
+				// 当前秒的时间戳
+				let nowTimestamp = Math.floor((+ new Date()) / 1000);
+				// 判断当前的时间戳，是否小于上一次的本该按设定结束，却提前结束的时间戳
+				if(this.keepRunning && lastTimestamp && lastTimestamp > nowTimestamp) {
+					// 剩余尚未执行完的倒计秒数
+					this.secNum = lastTimestamp - nowTimestamp;
+					// 清除本地保存的变量
+					uni.removeStorageSync(this.uniqueKey + '_$uCountDownTimestamp');
+					// 开始倒计时
+					this.start();
+				} else {
+					// 如果不存在需要继续上一次的倒计时，执行正常的逻辑
+					this.changeEvent(this.startText);
+				}
+			},
+			// 开始倒计时
+			start() {
+				// 防止快速点击获取验证码的按钮而导致内部产生多个定时器导致混乱
+				if(this.timer) {
+					clearInterval(this.timer);
+					this.timer = null;
+				}
+				this.$emit('start');
+				this.canGetCode = false;
+				// 这里放这句，是为了一开始时就提示，否则要等setInterval的1秒后才会有提示
+				this.changeEvent(this.changeText.replace(/x|X/, this.secNum));
+				this.setTimeToStorage();
+				this.timer = setInterval(() => {
+					if (--this.secNum) {
+						// 用当前倒计时的秒数替换提示字符串中的"x"字母
+						this.changeEvent(this.changeText.replace(/x|X/, this.secNum));
+					} else {
+						clearInterval(this.timer);
+						this.timer = null;
+						this.changeEvent(this.endText);
+						this.secNum = this.seconds;
+						this.$emit('end');
+						this.canGetCode = true;
+					}
+				}, 1000);
+			},
+			// 重置，可以让用户再次获取验证码
+			reset() {
+				this.canGetCode = true;
+				clearInterval(this.timer);
+				this.secNum = this.seconds;
+				this.changeEvent(this.endText);
+			},
+			changeEvent(text) {
+				this.$emit('change', text);
+			},
+			// 保存时间戳，为了防止倒计时尚未结束，H5刷新或者各端的右上角返回上一页再进来
+			setTimeToStorage() {
+				if(!this.keepRunning || !this.timer) return;
+				// 记录当前的时间戳，为了下次进入页面，如果还在倒计时内的话，继续倒计时
+				// 倒计时尚未结束，结果大于0；倒计时已经开始，就会小于初始值，如果等于初始值，说明没有开始倒计时，无需处理
+				if(this.secNum > 0 && this.secNum <= this.seconds) {
+					// 获取当前时间戳(+ new Date()为特殊写法)，除以1000变成秒，再去除小数部分
+					let nowTimestamp = Math.floor((+ new Date()) / 1000);
+					// 将本该结束时候的时间戳保存起来 => 当前时间戳 + 剩余的秒数
+					uni.setStorage({
+						key: this.uniqueKey + '_$uCountDownTimestamp',
+						data: nowTimestamp + Number(this.secNum)
+					})
+				}
+			}
+		},
+		// 组件销毁的时候，清除定时器，否则定时器会继续存在，系统不会自动清除
+    // #ifndef VUE3
+    beforeDestroy() {
+      this.setTimeToStorage();
+      clearTimeout(this.timer);
+      this.timer = null;
+    },
+    // #endif
+    
+    // #ifdef VUE3
+    beforeUnmount() {
+      this.setTimeToStorage();
+      clearTimeout(this.timer);
+      this.timer = null;
+    },
+    // #endif
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/style.components.scss";
+	
+	.u-code-wrap {
+		width: 0;
+		height: 0;
+		position: fixed;
+		z-index: -1;
+	}
+</style>
diff --git a/uni_modules/vk-uview-ui/components/vk-uview-ui/vk-uview-ui.vue b/uni_modules/vk-uview-ui/components/vk-uview-ui/vk-uview-ui.vue
new file mode 100644
index 0000000..bcd3662
--- /dev/null
+++ b/uni_modules/vk-uview-ui/components/vk-uview-ui/vk-uview-ui.vue
@@ -0,0 +1,15 @@
+<template>
+</template>
+
+<template>
+	<view></view>
+</template>
+
+<script>
+	export default {
+		
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/vk-uview-ui/iconfont.css b/uni_modules/vk-uview-ui/iconfont.css
new file mode 100644
index 0000000..836c718
--- /dev/null
+++ b/uni_modules/vk-uview-ui/iconfont.css
@@ -0,0 +1,910 @@
+/* #ifdef APP-PLUS */
+@font-face {
+	font-family: "uicon-iconfont";
+	font-weight: normal;
+	font-style: normal;
+	font-display: auto;
+	src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
+}
+
+/* #endif */
+
+/* 支付宝，百度，头条小程序目前读取大的本地字体文件，导致无法显示图标，故用在线加载的方式-2020-05-12 */
+/* #ifndef APP-PLUS */
+@font-face {
+	font-family: "uicon-iconfont";
+	src: url('//at.alicdn.com/t/font_1529455_k4s6di1d1.eot?t=1596960292384');
+	/* IE9 */
+	src: url('//at.alicdn.com/t/font_1529455_k4s6di1d1.eot?t=1596960292384#iefix') format('embedded-opentype'),
+		/* IE6-IE8 */
+		url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.woff?t=1596960292384') format('woff'),
+		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.ttf?t=1596960292384') format('truetype'),
+		/* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+		url('//at.alicdn.com/t/font_1529455_k4s6di1d1.svg?t=1596960292384#iconfont') format('svg');
+}
+
+/* #endif */
+
+.u-iconfont {
+	position: relative;
+	display: flex;
+	font: normal normal normal 14px/1 "uicon-iconfont";
+	font-size: inherit;
+	text-rendering: auto;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.u-iconfont::before {
+	display: flex;
+	align-items: center;
+}
+
+.uicon-en:before {
+	content: "\e70a";
+}
+
+.uicon-zh:before {
+	content: "\e692";
+}
+
+.uicon-level:before {
+	content: "\e693";
+}
+
+.uicon-woman:before {
+	content: "\e69c";
+}
+
+.uicon-man:before {
+	content: "\e697";
+}
+
+.uicon-column-line:before {
+	content: "\e68e";
+}
+
+.uicon-empty-page:before {
+	content: "\e627";
+}
+
+.uicon-empty-data:before {
+	content: "\e62f";
+}
+
+.uicon-empty-car:before {
+	content: "\e602";
+}
+
+.uicon-empty-order:before {
+	content: "\e639";
+}
+
+.uicon-empty-address:before {
+	content: "\e646";
+}
+
+.uicon-empty-message:before {
+	content: "\e6a9";
+}
+
+.uicon-empty-search:before {
+	content: "\e664";
+}
+
+.uicon-empty-favor:before {
+	content: "\e67c";
+}
+
+.uicon-empty-coupon:before {
+	content: "\e682";
+}
+
+.uicon-empty-history:before {
+	content: "\e684";
+}
+
+.uicon-empty-permission:before {
+	content: "\e686";
+}
+
+.uicon-empty-news:before {
+	content: "\e687";
+}
+
+.uicon-empty-wifi:before {
+	content: "\e688";
+}
+
+.uicon-empty-list:before {
+	content: "\e68b";
+}
+
+.uicon-arrow-left-double:before {
+	content: "\e68c";
+}
+
+.uicon-arrow-right-double:before {
+	content: "\e68d";
+}
+
+.uicon-red-packet:before {
+	content: "\e691";
+}
+
+.uicon-red-packet-fill:before {
+	content: "\e690";
+}
+
+.uicon-order:before {
+	content: "\e68f";
+}
+
+.uicon-nav-back-arrow:before {
+	content: "\e67f";
+}
+
+.uicon-nav-back:before {
+	content: "\e683";
+}
+
+.uicon-checkbox-mark:before {
+	content: "\e6a8";
+}
+
+.uicon-arrow-up-fill:before {
+	content: "\e6b0";
+}
+
+.uicon-arrow-down-fill:before {
+	content: "\e600";
+}
+
+.uicon-backspace:before {
+	content: "\e67b";
+}
+
+.uicon-android-circle-fill:before {
+	content: "\e67e";
+}
+
+.uicon-android-fill:before {
+	content: "\e67d";
+}
+
+.uicon-question:before {
+	content: "\e715";
+}
+
+.uicon-pause:before {
+	content: "\e8fa";
+}
+
+.uicon-close:before {
+	content: "\e685";
+}
+
+.uicon-volume-up:before {
+	content: "\e633";
+}
+
+.uicon-volume-off:before {
+	content: "\e644";
+}
+
+.uicon-info:before {
+	content: "\e653";
+}
+
+.uicon-error:before {
+	content: "\e6d3";
+}
+
+.uicon-lock-opened-fill:before {
+	content: "\e974";
+}
+
+.uicon-lock-fill:before {
+	content: "\e979";
+}
+
+.uicon-lock:before {
+	content: "\e97a";
+}
+
+.uicon-photo-fill:before {
+	content: "\e98b";
+}
+
+.uicon-photo:before {
+	content: "\e98d";
+}
+
+.uicon-account-fill:before {
+	content: "\e614";
+}
+
+.uicon-minus-people-fill:before {
+	content: "\e615";
+}
+
+.uicon-plus-people-fill:before {
+	content: "\e626";
+}
+
+.uicon-account:before {
+	content: "\e628";
+}
+
+.uicon-thumb-down-fill:before {
+	content: "\e726";
+}
+
+.uicon-thumb-down:before {
+	content: "\e727";
+}
+
+.uicon-thumb-up-fill:before {
+	content: "\e72f";
+}
+
+.uicon-thumb-up:before {
+	content: "\e733";
+}
+
+.uicon-person-delete-fill:before {
+	content: "\e66a";
+}
+
+.uicon-cut:before {
+	content: "\e948";
+}
+
+.uicon-fingerprint:before {
+	content: "\e955";
+}
+
+.uicon-home-fill:before {
+	content: "\e964";
+}
+
+.uicon-home:before {
+	content: "\e965";
+}
+
+.uicon-hourglass-half-fill:before {
+	content: "\e966";
+}
+
+.uicon-hourglass:before {
+	content: "\e967";
+}
+
+.uicon-lock-open:before {
+	content: "\e973";
+}
+
+.uicon-integral-fill:before {
+	content: "\e703";
+}
+
+.uicon-integral:before {
+	content: "\e704";
+}
+
+.uicon-coupon:before {
+	content: "\e8ae";
+}
+
+.uicon-coupon-fill:before {
+	content: "\e8c4";
+}
+
+.uicon-kefu-ermai:before {
+	content: "\e656";
+}
+
+.uicon-scan:before {
+	content: "\e662";
+}
+
+.uicon-rmb:before {
+	content: "\e608";
+}
+
+.uicon-rmb-circle-fill:before {
+	content: "\e657";
+}
+
+.uicon-rmb-circle:before {
+	content: "\e677";
+}
+
+.uicon-gift:before {
+	content: "\e65b";
+}
+
+.uicon-gift-fill:before {
+	content: "\e65c";
+}
+
+.uicon-bookmark-fill:before {
+	content: "\e63b";
+}
+
+.uicon-zhuanfa:before {
+	content: "\e60b";
+}
+
+.uicon-eye-off-outline:before {
+	content: "\e62b";
+}
+
+.uicon-eye-off:before {
+	content: "\e648";
+}
+
+.uicon-pause-circle:before {
+	content: "\e643";
+}
+
+.uicon-play-circle:before {
+	content: "\e647";
+}
+
+.uicon-pause-circle-fill:before {
+	content: "\e654";
+}
+
+.uicon-play-circle-fill:before {
+	content: "\e655";
+}
+
+.uicon-grid:before {
+	content: "\e673";
+}
+
+.uicon-play-right:before {
+	content: "\e610";
+}
+
+.uicon-play-left:before {
+	content: "\e66d";
+}
+
+.uicon-calendar:before {
+	content: "\e66e";
+}
+
+.uicon-rewind-right:before {
+	content: "\e66f";
+}
+
+.uicon-rewind-left:before {
+	content: "\e671";
+}
+
+.uicon-skip-forward-right:before {
+	content: "\e672";
+}
+
+.uicon-skip-back-left:before {
+	content: "\e674";
+}
+
+.uicon-play-left-fill:before {
+	content: "\e675";
+}
+
+.uicon-play-right-fill:before {
+	content: "\e676";
+}
+
+.uicon-grid-fill:before {
+	content: "\e678";
+}
+
+.uicon-rewind-left-fill:before {
+	content: "\e679";
+}
+
+.uicon-rewind-right-fill:before {
+	content: "\e67a";
+}
+
+.uicon-pushpin:before {
+	content: "\e7e3";
+}
+
+.uicon-star:before {
+	content: "\e65f";
+}
+
+.uicon-star-fill:before {
+	content: "\e669";
+}
+
+.uicon-server-fill:before {
+	content: "\e751";
+}
+
+.uicon-server-man:before {
+	content: "\e6bc";
+}
+
+.uicon-edit-pen:before {
+	content: "\e612";
+}
+
+.uicon-edit-pen-fill:before {
+	content: "\e66b";
+}
+
+.uicon-wifi:before {
+	content: "\e667";
+}
+
+.uicon-wifi-off:before {
+	content: "\e668";
+}
+
+.uicon-file-text:before {
+	content: "\e663";
+}
+
+.uicon-file-text-fill:before {
+	content: "\e665";
+}
+
+.uicon-more-dot-fill:before {
+	content: "\e630";
+}
+
+.uicon-minus:before {
+	content: "\e618";
+}
+
+.uicon-minus-circle:before {
+	content: "\e61b";
+}
+
+.uicon-plus:before {
+	content: "\e62d";
+}
+
+.uicon-plus-circle:before {
+	content: "\e62e";
+}
+
+.uicon-minus-circle-fill:before {
+	content: "\e652";
+}
+
+.uicon-plus-circle-fill:before {
+	content: "\e661";
+}
+
+.uicon-email:before {
+	content: "\e611";
+}
+
+.uicon-email-fill:before {
+	content: "\e642";
+}
+
+.uicon-phone:before {
+	content: "\e622";
+}
+
+.uicon-phone-fill:before {
+	content: "\e64f";
+}
+
+.uicon-clock:before {
+	content: "\e60f";
+}
+
+.uicon-car:before {
+	content: "\e60c";
+}
+
+.uicon-car-fill:before {
+	content: "\e636";
+}
+
+.uicon-warning:before {
+	content: "\e694";
+}
+
+.uicon-warning-fill:before {
+	content: "\e64d";
+}
+
+.uicon-search:before {
+	content: "\e62a";
+}
+
+.uicon-baidu-circle-fill:before {
+	content: "\e680";
+}
+
+.uicon-baidu:before {
+	content: "\e681";
+}
+
+.uicon-facebook:before {
+	content: "\e689";
+}
+
+.uicon-facebook-circle-fill:before {
+	content: "\e68a";
+}
+
+.uicon-qzone:before {
+	content: "\e695";
+}
+
+.uicon-qzone-circle-fill:before {
+	content: "\e696";
+}
+
+.uicon-moments-circel-fill:before {
+	content: "\e69a";
+}
+
+.uicon-moments:before {
+	content: "\e69b";
+}
+
+.uicon-qq-circle-fill:before {
+	content: "\e6a0";
+}
+
+.uicon-qq-fill:before {
+	content: "\e6a1";
+}
+
+.uicon-weibo:before {
+	content: "\e6a4";
+}
+
+.uicon-weibo-circle-fill:before {
+	content: "\e6a5";
+}
+
+.uicon-taobao:before {
+	content: "\e6a6";
+}
+
+.uicon-taobao-circle-fill:before {
+	content: "\e6a7";
+}
+
+.uicon-twitter:before {
+	content: "\e6aa";
+}
+
+.uicon-twitter-circle-fill:before {
+	content: "\e6ab";
+}
+
+.uicon-weixin-circle-fill:before {
+	content: "\e6b1";
+}
+
+.uicon-weixin-fill:before {
+	content: "\e6b2";
+}
+
+.uicon-zhifubao-circle-fill:before {
+	content: "\e6b8";
+}
+
+.uicon-zhifubao:before {
+	content: "\e6b9";
+}
+
+.uicon-zhihu:before {
+	content: "\e6ba";
+}
+
+.uicon-zhihu-circle-fill:before {
+	content: "\e709";
+}
+
+.uicon-list:before {
+	content: "\e650";
+}
+
+.uicon-list-dot:before {
+	content: "\e616";
+}
+
+.uicon-setting:before {
+	content: "\e61f";
+}
+
+.uicon-bell:before {
+	content: "\e609";
+}
+
+.uicon-bell-fill:before {
+	content: "\e640";
+}
+
+.uicon-attach:before {
+	content: "\e632";
+}
+
+.uicon-shopping-cart:before {
+	content: "\e621";
+}
+
+.uicon-shopping-cart-fill:before {
+	content: "\e65d";
+}
+
+.uicon-tags:before {
+	content: "\e629";
+}
+
+.uicon-share:before {
+	content: "\e631";
+}
+
+.uicon-question-circle-fill:before {
+	content: "\e666";
+}
+
+.uicon-question-circle:before {
+	content: "\e625";
+}
+
+.uicon-error-circle:before {
+	content: "\e624";
+}
+
+.uicon-checkmark-circle:before {
+	content: "\e63d";
+}
+
+.uicon-close-circle:before {
+	content: "\e63f";
+}
+
+.uicon-info-circle:before {
+	content: "\e660";
+}
+
+.uicon-md-person-add:before {
+	content: "\e6e4";
+}
+
+.uicon-md-person-fill:before {
+	content: "\e6ea";
+}
+
+.uicon-bag-fill:before {
+	content: "\e617";
+}
+
+.uicon-bag:before {
+	content: "\e619";
+}
+
+.uicon-chat-fill:before {
+	content: "\e61e";
+}
+
+.uicon-chat:before {
+	content: "\e620";
+}
+
+.uicon-more-circle:before {
+	content: "\e63e";
+}
+
+.uicon-more-circle-fill:before {
+	content: "\e645";
+}
+
+.uicon-volume:before {
+	content: "\e66c";
+}
+
+.uicon-volume-fill:before {
+	content: "\e670";
+}
+
+.uicon-reload:before {
+	content: "\e788";
+}
+
+.uicon-camera:before {
+	content: "\e7d7";
+}
+
+.uicon-heart:before {
+	content: "\e7df";
+}
+
+.uicon-heart-fill:before {
+	content: "\e851";
+}
+
+.uicon-minus-square-fill:before {
+	content: "\e855";
+}
+
+.uicon-plus-square-fill:before {
+	content: "\e856";
+}
+
+.uicon-pushpin-fill:before {
+	content: "\e86e";
+}
+
+.uicon-camera-fill:before {
+	content: "\e870";
+}
+
+.uicon-setting-fill:before {
+	content: "\e872";
+}
+
+.uicon-google:before {
+	content: "\e87a";
+}
+
+.uicon-ie:before {
+	content: "\e87b";
+}
+
+.uicon-apple-fill:before {
+	content: "\e881";
+}
+
+.uicon-chrome-circle-fill:before {
+	content: "\e885";
+}
+
+.uicon-github-circle-fill:before {
+	content: "\e887";
+}
+
+.uicon-IE-circle-fill:before {
+	content: "\e889";
+}
+
+.uicon-google-circle-fill:before {
+	content: "\e88a";
+}
+
+.uicon-arrow-down:before {
+	content: "\e60d";
+}
+
+.uicon-arrow-left:before {
+	content: "\e60e";
+}
+
+.uicon-map:before {
+	content: "\e61d";
+}
+
+.uicon-man-add-fill:before {
+	content: "\e64c";
+}
+
+.uicon-tags-fill:before {
+	content: "\e651";
+}
+
+.uicon-arrow-leftward:before {
+	content: "\e601";
+}
+
+.uicon-arrow-rightward:before {
+	content: "\e603";
+}
+
+.uicon-arrow-downward:before {
+	content: "\e604";
+}
+
+.uicon-arrow-right:before {
+	content: "\e605";
+}
+
+.uicon-arrow-up:before {
+	content: "\e606";
+}
+
+.uicon-arrow-upward:before {
+	content: "\e607";
+}
+
+.uicon-bookmark:before {
+	content: "\e60a";
+}
+
+.uicon-eye:before {
+	content: "\e613";
+}
+
+.uicon-man-delete:before {
+	content: "\e61a";
+}
+
+.uicon-man-add:before {
+	content: "\e61c";
+}
+
+.uicon-trash:before {
+	content: "\e623";
+}
+
+.uicon-error-circle-fill:before {
+	content: "\e62c";
+}
+
+.uicon-calendar-fill:before {
+	content: "\e634";
+}
+
+.uicon-checkmark-circle-fill:before {
+	content: "\e635";
+}
+
+.uicon-close-circle-fill:before {
+	content: "\e637";
+}
+
+.uicon-clock-fill:before {
+	content: "\e638";
+}
+
+.uicon-checkmark:before {
+	content: "\e63a";
+}
+
+.uicon-download:before {
+	content: "\e63c";
+}
+
+.uicon-eye-fill:before {
+	content: "\e641";
+}
+
+.uicon-mic-off:before {
+	content: "\e649";
+}
+
+.uicon-mic:before {
+	content: "\e64a";
+}
+
+.uicon-info-circle-fill:before {
+	content: "\e64b";
+}
+
+.uicon-map-fill:before {
+	content: "\e64e";
+}
+
+.uicon-trash-fill:before {
+	content: "\e658";
+}
+
+.uicon-volume-off-fill:before {
+	content: "\e659";
+}
+
+.uicon-volume-up-fill:before {
+	content: "\e65a";
+}
+
+.uicon-share-fill:before {
+	content: "\e65e";
+}
diff --git a/uni_modules/vk-uview-ui/index.js b/uni_modules/vk-uview-ui/index.js
new file mode 100644
index 0000000..de6fa2f
--- /dev/null
+++ b/uni_modules/vk-uview-ui/index.js
@@ -0,0 +1,149 @@
+// 引入全局mixin
+import mixin from './libs/mixin/mixin.js'
+// 引入关于是否mixin集成小程序分享的配置
+// import wxshare from './libs/mixin/mpShare.js'
+// 全局挂载引入http相关请求拦截插件
+import http from './libs/request'
+
+function wranning(str) {
+	// 开发环境进行信息输出,主要是一些报错信息
+	// 这个环境的来由是在程序编写时候,点击hx编辑器运行调试代码的时候,详见:
+	// 	https://uniapp.dcloud.io/frame?id=%e5%bc%80%e5%8f%91%e7%8e%af%e5%a2%83%e5%92%8c%e7%94%9f%e4%ba%a7%e7%8e%af%e5%a2%83
+	if (process.env.NODE_ENV === 'development') {
+		console.warn(str)
+	}
+}
+
+// 尝试判断在根目录的/store中是否有$u.mixin.js，此文件uView默认为需要挂在到全局的vuex的state变量
+// HX2.6.11版本,放到try中,控制台依然会警告,暂时不用此方式，
+// let vuexStore = {};
+// try {
+// 	vuexStore = require("@/store/$u.mixin.js");
+// } catch (e) {
+// 	//TODO handle the exception
+// }
+
+// post类型对象参数转为get类型url参数
+import queryParams from './libs/function/queryParams.js'
+// 路由封装
+import route from './libs/function/route.js'
+// 时间格式化
+import timeFormat from './libs/function/timeFormat.js'
+// 时间戳格式化,返回多久之前
+import timeFrom from './libs/function/timeFrom.js'
+// 颜色渐变相关,colorGradient-颜色渐变,hexToRgb-十六进制颜色转rgb颜色,rgbToHex-rgb转十六进制
+import colorGradient from './libs/function/colorGradient.js'
+// 生成全局唯一guid字符串
+import guid from './libs/function/guid.js'
+// 主题相关颜色,info|success|warning|primary|default|error,此颜色已在uview.scss中定义,但是为js中也能使用,故也定义一份
+import color from './libs/function/color.js'
+// 根据type获取图标名称
+import type2icon from './libs/function/type2icon.js'
+// 打乱数组的顺序
+import randomArray from './libs/function/randomArray.js'
+// 对象和数组的深度克隆
+import deepClone from './libs/function/deepClone.js'
+// 对象深度拷贝
+import deepMerge from './libs/function/deepMerge.js'
+// 添加单位
+import addUnit from './libs/function/addUnit.js'
+
+// 规则检验
+import test from './libs/function/test.js'
+// 随机数
+import random from './libs/function/random.js'
+// 去除空格
+import trim from './libs/function/trim.js'
+// toast提示，对uni.showToast的封装
+import toast from './libs/function/toast.js'
+// 获取父组件参数
+import getParent from './libs/function/getParent.js'
+// 获取整个父组件
+import $parent from './libs/function/$parent.js'
+// 获取sys()和os()工具方法
+// 获取设备信息，挂载到$u的sys()(system的缩写)属性中，
+// 同时把安卓和ios平台的名称"ios"和"android"挂到$u.os()中，方便取用
+import {sys, os} from './libs/function/sys.js'
+// 防抖方法
+import debounce from './libs/function/debounce.js'
+// 节流方法
+import throttle from './libs/function/throttle.js'
+// 对象转字符串，或者字符串转对象
+import addStyle from './libs/function/addStyle.js'
+
+
+// 配置信息
+import config from './libs/config/config.js'
+// 各个需要fixed的地方的z-index配置文件
+import zIndex from './libs/config/zIndex.js'
+
+const $u = {
+	queryParams: queryParams,
+	route: route,
+	timeFormat: timeFormat,
+	date: timeFormat, // 另名date
+	timeFrom,
+	colorGradient: colorGradient.colorGradient,
+	colorToRgba: colorGradient.colorToRgba,
+	guid,
+	color,
+	sys,
+	os,
+	type2icon,
+	randomArray,
+	wranning,
+	get: http.get,
+	post: http.post,
+	put: http.put,
+	'delete': http.delete,
+	hexToRgb: colorGradient.hexToRgb,
+	rgbToHex: colorGradient.rgbToHex,
+	test,
+	random,
+	deepClone,
+	deepMerge,
+	getParent,
+	$parent,
+	addUnit,
+	trim,
+	type: ['primary', 'success', 'error', 'warning', 'info'],
+	http,
+	toast,
+	config, // uView配置信息相关，比如版本号
+	zIndex,
+	debounce,
+	throttle,
+	addStyle
+}
+
+// $u挂载到uni对象上
+uni.$u = $u
+
+const install = Vue => {
+	Vue.mixin(mixin) 
+  // #ifndef VUE3
+	if (Vue.prototype.openShare) {
+		Vue.mixin(mpShare);
+	}
+	// Vue.mixin(vuexStore);
+	// 时间格式化，同时两个名称，date和timeFormat
+	Vue.filter('timeFormat', (timestamp, format) => {
+		return timeFormat(timestamp, format)
+	})
+	Vue.filter('date', (timestamp, format) => {
+		return timeFormat(timestamp, format)
+	})
+	// 将多久以前的方法，注入到全局过滤器
+	Vue.filter('timeFrom', (timestamp, format) => {
+		return timeFrom(timestamp, format)
+	})
+	Vue.prototype.$u = $u
+  // #endif
+  // #ifdef VUE3
+  Vue.config.globalProperties.$u = $u
+  // #endif
+}
+
+export default {
+	install
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/index.scss b/uni_modules/vk-uview-ui/index.scss
new file mode 100644
index 0000000..84daa72
--- /dev/null
+++ b/uni_modules/vk-uview-ui/index.scss
@@ -0,0 +1,23 @@
+// 引入公共基础类
+@import "./libs/css/common.scss";
+@import "./libs/css/color.scss";
+
+// 非nvue的样式
+/* #ifndef APP-NVUE */
+@import "./libs/css/style.vue.scss";
+/* #endif */
+
+// nvue的特有样式
+/* #ifdef APP-NVUE */
+@import "./libs/css/style.nvue.scss";
+/* #endif */
+
+// 小程序特有的样式
+/* #ifdef MP */
+@import "./libs/css/style.mp.scss";
+/* #endif */
+
+// H5特有的样式
+/* #ifdef H5 */
+@import "./libs/css/style.h5.scss";
+/* #endif */
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/address/areas.json b/uni_modules/vk-uview-ui/libs/address/areas.json
new file mode 100644
index 0000000..16bef97
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/address/areas.json
@@ -0,0 +1 @@
+[[[{"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":"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":"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":"130181","name":"辛集市"},{"code":"130183","name":"晋州市"},{"code":"130184","name":"新乐市"}],[{"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":"130302","name":"海港区"},{"code":"130303","name":"山海关区"},{"code":"130304","name":"北戴河区"},{"code":"130306","name":"抚宁区"},{"code":"130321","name":"青龙满族自治县"},{"code":"130322","name":"昌黎县"},{"code":"130324","name":"卢龙县"}],[{"code":"130402","name":"邯山区"},{"code":"130403","name":"丛台区"},{"code":"130404","name":"复兴区"},{"code":"130406","name":"峰峰矿区"},{"code":"130407","name":"肥乡区"},{"code":"130408","name":"永年区"},{"code":"130423","name":"临漳县"},{"code":"130424","name":"成安县"},{"code":"130425","name":"大名县"},{"code":"130426","name":"涉县"},{"code":"130427","name":"磁县"},{"code":"130430","name":"邱县"},{"code":"130431","name":"鸡泽县"},{"code":"130432","name":"广平县"},{"code":"130433","name":"馆陶县"},{"code":"130434","name":"魏县"},{"code":"130435","name":"曲周县"},{"code":"130481","name":"武安市"}],[{"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":"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":"130682","name":"定州市"},{"code":"130683","name":"安国市"},{"code":"130684","name":"高碑店市"}],[{"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":"130802","name":"双桥区"},{"code":"130803","name":"双滦区"},{"code":"130804","name":"鹰手营子矿区"},{"code":"130821","name":"承德县"},{"code":"130822","name":"兴隆县"},{"code":"130824","name":"滦平县"},{"code":"130825","name":"隆化县"},{"code":"130826","name":"丰宁满族自治县"},{"code":"130827","name":"宽城满族自治县"},{"code":"130828","name":"围场满族蒙古族自治县"},{"code":"130881","name":"平泉市"}],[{"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":"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":"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":"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":"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":"140302","name":"城区"},{"code":"140303","name":"矿区"},{"code":"140311","name":"郊区"},{"code":"140321","name":"平定县"},{"code":"140322","name":"盂县"}],[{"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":"140502","name":"城区"},{"code":"140521","name":"沁水县"},{"code":"140522","name":"阳城县"},{"code":"140524","name":"陵川县"},{"code":"140525","name":"泽州县"},{"code":"140581","name":"高平市"}],[{"code":"140602","name":"朔城区"},{"code":"140603","name":"平鲁区"},{"code":"140621","name":"山阴县"},{"code":"140622","name":"应县"},{"code":"140623","name":"右玉县"},{"code":"140624","name":"怀仁县"}],[{"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":"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":"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":"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":"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":"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":"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":"150302","name":"海勃湾区"},{"code":"150303","name":"海南区"},{"code":"150304","name":"乌达区"}],[{"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":"150502","name":"科尔沁区"},{"code":"150521","name":"科尔沁左翼中旗"},{"code":"150522","name":"科尔沁左翼后旗"},{"code":"150523","name":"开鲁县"},{"code":"150524","name":"库伦旗"},{"code":"150525","name":"奈曼旗"},{"code":"150526","name":"扎鲁特旗"},{"code":"150581","name":"霍林郭勒市"}],[{"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":"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":"150802","name":"临河区"},{"code":"150821","name":"五原县"},{"code":"150822","name":"磴口县"},{"code":"150823","name":"乌拉特前旗"},{"code":"150824","name":"乌拉特中旗"},{"code":"150825","name":"乌拉特后旗"},{"code":"150826","name":"杭锦后旗"}],[{"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":"152201","name":"乌兰浩特市"},{"code":"152202","name":"阿尔山市"},{"code":"152221","name":"科尔沁右翼前旗"},{"code":"152222","name":"科尔沁右翼中旗"},{"code":"152223","name":"扎赉特旗"},{"code":"152224","name":"突泉县"}],[{"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":"152921","name":"阿拉善左旗"},{"code":"152922","name":"阿拉善右旗"},{"code":"152923","name":"额济纳旗"}]],[[{"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":"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":"210302","name":"铁东区"},{"code":"210303","name":"铁西区"},{"code":"210304","name":"立山区"},{"code":"210311","name":"千山区"},{"code":"210321","name":"台安县"},{"code":"210323","name":"岫岩满族自治县"},{"code":"210381","name":"海城市"}],[{"code":"210402","name":"新抚区"},{"code":"210403","name":"东洲区"},{"code":"210404","name":"望花区"},{"code":"210411","name":"顺城区"},{"code":"210421","name":"抚顺县"},{"code":"210422","name":"新宾满族自治县"},{"code":"210423","name":"清原满族自治县"}],[{"code":"210502","name":"平山区"},{"code":"210503","name":"溪湖区"},{"code":"210504","name":"明山区"},{"code":"210505","name":"南芬区"},{"code":"210521","name":"本溪满族自治县"},{"code":"210522","name":"桓仁满族自治县"}],[{"code":"210602","name":"元宝区"},{"code":"210603","name":"振兴区"},{"code":"210604","name":"振安区"},{"code":"210624","name":"宽甸满族自治县"},{"code":"210681","name":"东港市"},{"code":"210682","name":"凤城市"}],[{"code":"210702","name":"古塔区"},{"code":"210703","name":"凌河区"},{"code":"210711","name":"太和区"},{"code":"210726","name":"黑山县"},{"code":"210727","name":"义县"},{"code":"210781","name":"凌海市"},{"code":"210782","name":"北镇市"}],[{"code":"210802","name":"站前区"},{"code":"210803","name":"西市区"},{"code":"210804","name":"鲅鱼圈区"},{"code":"210811","name":"老边区"},{"code":"210881","name":"盖州市"},{"code":"210882","name":"大石桥市"}],[{"code":"210902","name":"海州区"},{"code":"210903","name":"新邱区"},{"code":"210904","name":"太平区"},{"code":"210905","name":"清河门区"},{"code":"210911","name":"细河区"},{"code":"210921","name":"阜新蒙古族自治县"},{"code":"210922","name":"彰武县"}],[{"code":"211002","name":"白塔区"},{"code":"211003","name":"文圣区"},{"code":"211004","name":"宏伟区"},{"code":"211005","name":"弓长岭区"},{"code":"211011","name":"太子河区"},{"code":"211021","name":"辽阳县"},{"code":"211081","name":"灯塔市"}],[{"code":"211102","name":"双台子区"},{"code":"211103","name":"兴隆台区"},{"code":"211104","name":"大洼区"},{"code":"211122","name":"盘山县"}],[{"code":"211202","name":"银州区"},{"code":"211204","name":"清河区"},{"code":"211221","name":"铁岭县"},{"code":"211223","name":"西丰县"},{"code":"211224","name":"昌图县"},{"code":"211281","name":"调兵山市"},{"code":"211282","name":"开原市"}],[{"code":"211302","name":"双塔区"},{"code":"211303","name":"龙城区"},{"code":"211321","name":"朝阳县"},{"code":"211322","name":"建平县"},{"code":"211324","name":"喀喇沁左翼蒙古族自治县"},{"code":"211381","name":"北票市"},{"code":"211382","name":"凌源市"}],[{"code":"211402","name":"连山区"},{"code":"211403","name":"龙港区"},{"code":"211404","name":"南票区"},{"code":"211421","name":"绥中县"},{"code":"211422","name":"建昌县"},{"code":"211481","name":"兴城市"}]],[[{"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":"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":"220302","name":"铁西区"},{"code":"220303","name":"铁东区"},{"code":"220322","name":"梨树县"},{"code":"220323","name":"伊通满族自治县"},{"code":"220381","name":"公主岭市"},{"code":"220382","name":"双辽市"}],[{"code":"220402","name":"龙山区"},{"code":"220403","name":"西安区"},{"code":"220421","name":"东丰县"},{"code":"220422","name":"东辽县"}],[{"code":"220502","name":"东昌区"},{"code":"220503","name":"二道江区"},{"code":"220521","name":"通化县"},{"code":"220523","name":"辉南县"},{"code":"220524","name":"柳河县"},{"code":"220581","name":"梅河口市"},{"code":"220582","name":"集安市"}],[{"code":"220602","name":"浑江区"},{"code":"220605","name":"江源区"},{"code":"220621","name":"抚松县"},{"code":"220622","name":"靖宇县"},{"code":"220623","name":"长白朝鲜族自治县"},{"code":"220681","name":"临江市"}],[{"code":"220702","name":"宁江区"},{"code":"220721","name":"前郭尔罗斯蒙古族自治县"},{"code":"220722","name":"长岭县"},{"code":"220723","name":"乾安县"},{"code":"220781","name":"扶余市"}],[{"code":"220802","name":"洮北区"},{"code":"220821","name":"镇赉县"},{"code":"220822","name":"通榆县"},{"code":"220881","name":"洮南市"},{"code":"220882","name":"大安市"}],[{"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":"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":"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":"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":"230402","name":"向阳区"},{"code":"230403","name":"工农区"},{"code":"230404","name":"南山区"},{"code":"230405","name":"兴安区"},{"code":"230406","name":"东山区"},{"code":"230407","name":"兴山区"},{"code":"230421","name":"萝北县"},{"code":"230422","name":"绥滨县"}],[{"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":"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":"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":"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":"230902","name":"新兴区"},{"code":"230903","name":"桃山区"},{"code":"230904","name":"茄子河区"},{"code":"230921","name":"勃利县"}],[{"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":"231102","name":"爱辉区"},{"code":"231121","name":"嫩江县"},{"code":"231123","name":"逊克县"},{"code":"231124","name":"孙吴县"},{"code":"231181","name":"北安市"},{"code":"231182","name":"五大连池市"}],[{"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":"232701","name":"加格达奇区"},{"code":"232702","name":"松岭区"},{"code":"232703","name":"新林区"},{"code":"232704","name":"呼中区"},{"code":"232721","name":"呼玛县"},{"code":"232722","name":"塔河县"},{"code":"232723","name":"漠河县"}]],[[{"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":"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":"320205","name":"锡山区"},{"code":"320206","name":"惠山区"},{"code":"320211","name":"滨湖区"},{"code":"320213","name":"梁溪区"},{"code":"320214","name":"新吴区"},{"code":"320281","name":"江阴市"},{"code":"320282","name":"宜兴市"}],[{"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":"320402","name":"天宁区"},{"code":"320404","name":"钟楼区"},{"code":"320411","name":"新北区"},{"code":"320412","name":"武进区"},{"code":"320413","name":"金坛区"},{"code":"320481","name":"溧阳市"}],[{"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":"320602","name":"崇川区"},{"code":"320611","name":"港闸区"},{"code":"320612","name":"通州区"},{"code":"320621","name":"海安县"},{"code":"320623","name":"如东县"},{"code":"320681","name":"启东市"},{"code":"320682","name":"如皋市"},{"code":"320684","name":"海门市"}],[{"code":"320703","name":"连云区"},{"code":"320706","name":"海州区"},{"code":"320707","name":"赣榆区"},{"code":"320722","name":"东海县"},{"code":"320723","name":"灌云县"},{"code":"320724","name":"灌南县"}],[{"code":"320803","name":"淮安区"},{"code":"320804","name":"淮阴区"},{"code":"320812","name":"清江浦区"},{"code":"320813","name":"洪泽区"},{"code":"320826","name":"涟水县"},{"code":"320830","name":"盱眙县"},{"code":"320831","name":"金湖县"}],[{"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":"321002","name":"广陵区"},{"code":"321003","name":"邗江区"},{"code":"321012","name":"江都区"},{"code":"321023","name":"宝应县"},{"code":"321081","name":"仪征市"},{"code":"321084","name":"高邮市"}],[{"code":"321102","name":"京口区"},{"code":"321111","name":"润州区"},{"code":"321112","name":"丹徒区"},{"code":"321181","name":"丹阳市"},{"code":"321182","name":"扬中市"},{"code":"321183","name":"句容市"}],[{"code":"321202","name":"海陵区"},{"code":"321203","name":"高港区"},{"code":"321204","name":"姜堰区"},{"code":"321281","name":"兴化市"},{"code":"321282","name":"靖江市"},{"code":"321283","name":"泰兴市"}],[{"code":"321302","name":"宿城区"},{"code":"321311","name":"宿豫区"},{"code":"321322","name":"沭阳县"},{"code":"321323","name":"泗阳县"},{"code":"321324","name":"泗洪县"}]],[[{"code":"330102","name":"上城区"},{"code":"330105","name":"拱墅区"},{"code":"330106","name":"西湖区"},{"code":"330108","name":"滨江区"},{"code":"330109","name":"萧山区"},{"code":"330110","name":"余杭区"},{"code":"330111","name":"富阳区"},{"code":"330112","name":"临安区"},{"code":"330113","name":"临平区"},{"code":"330114","name":"钱塘区"},{"code":"330122","name":"桐庐县"},{"code":"330127","name":"淳安县"},{"code":"330182","name":"建德市"}],[{"code":"330203","name":"海曙区"},{"code":"330205","name":"江北区"},{"code":"330206","name":"北仑区"},{"code":"330211","name":"镇海区"},{"code":"330212","name":"鄞州区"},{"code":"330213","name":"奉化区"},{"code":"330225","name":"象山县"},{"code":"330226","name":"宁海县"},{"code":"330281","name":"余姚市"},{"code":"330282","name":"慈溪市"}],[{"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":"330402","name":"南湖区"},{"code":"330411","name":"秀洲区"},{"code":"330421","name":"嘉善县"},{"code":"330424","name":"海盐县"},{"code":"330481","name":"海宁市"},{"code":"330482","name":"平湖市"},{"code":"330483","name":"桐乡市"}],[{"code":"330502","name":"吴兴区"},{"code":"330503","name":"南浔区"},{"code":"330521","name":"德清县"},{"code":"330522","name":"长兴县"},{"code":"330523","name":"安吉县"}],[{"code":"330602","name":"越城区"},{"code":"330603","name":"柯桥区"},{"code":"330604","name":"上虞区"},{"code":"330624","name":"新昌县"},{"code":"330681","name":"诸暨市"},{"code":"330683","name":"嵊州市"}],[{"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":"330802","name":"柯城区"},{"code":"330803","name":"衢江区"},{"code":"330822","name":"常山县"},{"code":"330824","name":"开化县"},{"code":"330825","name":"龙游县"},{"code":"330881","name":"江山市"}],[{"code":"330902","name":"定海区"},{"code":"330903","name":"普陀区"},{"code":"330921","name":"岱山县"},{"code":"330922","name":"嵊泗县"}],[{"code":"331002","name":"椒江区"},{"code":"331003","name":"黄岩区"},{"code":"331004","name":"路桥区"},{"code":"331022","name":"三门县"},{"code":"331023","name":"天台县"},{"code":"331024","name":"仙居县"},{"code":"331081","name":"温岭市"},{"code":"331082","name":"临海市"},{"code":"331083","name":"玉环市"}],[{"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":"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":"340202","name":"镜湖区"},{"code":"340203","name":"弋江区"},{"code":"340207","name":"鸠江区"},{"code":"340208","name":"三山区"},{"code":"340221","name":"芜湖县"},{"code":"340222","name":"繁昌县"},{"code":"340223","name":"南陵县"},{"code":"340225","name":"无为县"}],[{"code":"340302","name":"龙子湖区"},{"code":"340303","name":"蚌山区"},{"code":"340304","name":"禹会区"},{"code":"340311","name":"淮上区"},{"code":"340321","name":"怀远县"},{"code":"340322","name":"五河县"},{"code":"340323","name":"固镇县"}],[{"code":"340402","name":"大通区"},{"code":"340403","name":"田家庵区"},{"code":"340404","name":"谢家集区"},{"code":"340405","name":"八公山区"},{"code":"340406","name":"潘集区"},{"code":"340421","name":"凤台县"},{"code":"340422","name":"寿县"}],[{"code":"340503","name":"花山区"},{"code":"340504","name":"雨山区"},{"code":"340506","name":"博望区"},{"code":"340521","name":"当涂县"},{"code":"340522","name":"含山县"},{"code":"340523","name":"和县"}],[{"code":"340602","name":"杜集区"},{"code":"340603","name":"相山区"},{"code":"340604","name":"烈山区"},{"code":"340621","name":"濉溪县"}],[{"code":"340705","name":"铜官区"},{"code":"340706","name":"义安区"},{"code":"340711","name":"郊区"},{"code":"340722","name":"枞阳县"}],[{"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":"341002","name":"屯溪区"},{"code":"341003","name":"黄山区"},{"code":"341004","name":"徽州区"},{"code":"341021","name":"歙县"},{"code":"341022","name":"休宁县"},{"code":"341023","name":"黟县"},{"code":"341024","name":"祁门县"}],[{"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":"341202","name":"颍州区"},{"code":"341203","name":"颍东区"},{"code":"341204","name":"颍泉区"},{"code":"341221","name":"临泉县"},{"code":"341222","name":"太和县"},{"code":"341225","name":"阜南县"},{"code":"341226","name":"颍上县"},{"code":"341282","name":"界首市"}],[{"code":"341302","name":"埇桥区"},{"code":"341321","name":"砀山县"},{"code":"341322","name":"萧县"},{"code":"341323","name":"灵璧县"},{"code":"341324","name":"泗县"}],[{"code":"341502","name":"金安区"},{"code":"341503","name":"裕安区"},{"code":"341504","name":"叶集区"},{"code":"341522","name":"霍邱县"},{"code":"341523","name":"舒城县"},{"code":"341524","name":"金寨县"},{"code":"341525","name":"霍山县"}],[{"code":"341602","name":"谯城区"},{"code":"341621","name":"涡阳县"},{"code":"341622","name":"蒙城县"},{"code":"341623","name":"利辛县"}],[{"code":"341702","name":"贵池区"},{"code":"341721","name":"东至县"},{"code":"341722","name":"石台县"},{"code":"341723","name":"青阳县"}],[{"code":"341802","name":"宣州区"},{"code":"341821","name":"郎溪县"},{"code":"341822","name":"广德县"},{"code":"341823","name":"泾县"},{"code":"341824","name":"绩溪县"},{"code":"341825","name":"旌德县"},{"code":"341881","name":"宁国市"}]],[[{"code":"350102","name":"鼓楼区"},{"code":"350103","name":"台江区"},{"code":"350104","name":"仓山区"},{"code":"350105","name":"马尾区"},{"code":"350111","name":"晋安区"},{"code":"350112","name":"长乐区"},{"code":"350121","name":"闽侯县"},{"code":"350122","name":"连江县"},{"code":"350123","name":"罗源县"},{"code":"350124","name":"闽清县"},{"code":"350125","name":"永泰县"},{"code":"350128","name":"平潭县"},{"code":"350181","name":"福清市"}],[{"code":"350203","name":"思明区"},{"code":"350205","name":"海沧区"},{"code":"350206","name":"湖里区"},{"code":"350211","name":"集美区"},{"code":"350212","name":"同安区"},{"code":"350213","name":"翔安区"}],[{"code":"350302","name":"城厢区"},{"code":"350303","name":"涵江区"},{"code":"350304","name":"荔城区"},{"code":"350305","name":"秀屿区"},{"code":"350322","name":"仙游县"}],[{"code":"350404","name":"三元区"},{"code":"350405","name":"沙县区"},{"code":"350421","name":"明溪县"},{"code":"350423","name":"清流县"},{"code":"350424","name":"宁化县"},{"code":"350425","name":"大田县"},{"code":"350426","name":"尤溪县"},{"code":"350428","name":"将乐县"},{"code":"350429","name":"泰宁县"},{"code":"350430","name":"建宁县"},{"code":"350481","name":"永安市"}],[{"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":"350602","name":"芗城区"},{"code":"350603","name":"龙文区"},{"code":"350604","name":"龙海区"},{"code":"350605","name":"长泰区"},{"code":"350622","name":"云霄县"},{"code":"350623","name":"漳浦县"},{"code":"350624","name":"诏安县"},{"code":"350626","name":"东山县"},{"code":"350627","name":"南靖县"},{"code":"350628","name":"平和县"},{"code":"350629","name":"华安县"}],[{"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":"350802","name":"新罗区"},{"code":"350803","name":"永定区"},{"code":"350821","name":"长汀县"},{"code":"350823","name":"上杭县"},{"code":"350824","name":"武平县"},{"code":"350825","name":"连城县"},{"code":"350881","name":"漳平市"}],[{"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":"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":"360202","name":"昌江区"},{"code":"360203","name":"珠山区"},{"code":"360222","name":"浮梁县"},{"code":"360281","name":"乐平市"}],[{"code":"360302","name":"安源区"},{"code":"360313","name":"湘东区"},{"code":"360321","name":"莲花县"},{"code":"360322","name":"上栗县"},{"code":"360323","name":"芦溪县"}],[{"code":"360402","name":"濂溪区"},{"code":"360403","name":"浔阳区"},{"code":"360404","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":"360502","name":"渝水区"},{"code":"360521","name":"分宜县"}],[{"code":"360602","name":"月湖区"},{"code":"360622","name":"余江区"},{"code":"360681","name":"贵溪市"}],[{"code":"360702","name":"章贡区"},{"code":"360703","name":"南康区"},{"code":"360704","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":"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":"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":"361002","name":"临川区"},{"code":"361003","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":"361030","name":"广昌县"}],[{"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":"370102","name":"历下区"},{"code":"370103","name":"市中区"},{"code":"370104","name":"槐荫区"},{"code":"370105","name":"天桥区"},{"code":"370112","name":"历城区"},{"code":"370113","name":"长清区"},{"code":"370114","name":"章丘区"},{"code":"370124","name":"平阴县"},{"code":"370125","name":"济阳县"},{"code":"370126","name":"商河县"}],[{"code":"370202","name":"市南区"},{"code":"370203","name":"市北区"},{"code":"370211","name":"黄岛区"},{"code":"370212","name":"崂山区"},{"code":"370213","name":"李沧区"},{"code":"370214","name":"城阳区"},{"code":"370215","name":"即墨区"},{"code":"370281","name":"胶州市"},{"code":"370283","name":"平度市"},{"code":"370285","name":"莱西市"}],[{"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":"370402","name":"市中区"},{"code":"370403","name":"薛城区"},{"code":"370404","name":"峄城区"},{"code":"370405","name":"台儿庄区"},{"code":"370406","name":"山亭区"},{"code":"370481","name":"滕州市"}],[{"code":"370502","name":"东营区"},{"code":"370503","name":"河口区"},{"code":"370505","name":"垦利区"},{"code":"370522","name":"利津县"},{"code":"370523","name":"广饶县"}],[{"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":"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":"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":"370902","name":"泰山区"},{"code":"370911","name":"岱岳区"},{"code":"370921","name":"宁阳县"},{"code":"370923","name":"东平县"},{"code":"370982","name":"新泰市"},{"code":"370983","name":"肥城市"}],[{"code":"371002","name":"环翠区"},{"code":"371003","name":"文登区"},{"code":"371082","name":"荣成市"},{"code":"371083","name":"乳山市"}],[{"code":"371102","name":"东港区"},{"code":"371103","name":"岚山区"},{"code":"371121","name":"五莲县"},{"code":"371122","name":"莒县"}],[{"code":"371202","name":"莱城区"},{"code":"371203","name":"钢城区"}],[{"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":"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":"371502","name":"东昌府区"},{"code":"371521","name":"阳谷县"},{"code":"371522","name":"莘县"},{"code":"371523","name":"茌平县"},{"code":"371524","name":"东阿县"},{"code":"371525","name":"冠县"},{"code":"371526","name":"高唐县"},{"code":"371581","name":"临清市"}],[{"code":"371602","name":"滨城区"},{"code":"371603","name":"沾化区"},{"code":"371621","name":"惠民县"},{"code":"371622","name":"阳信县"},{"code":"371623","name":"无棣县"},{"code":"371625","name":"博兴县"},{"code":"371626","name":"邹平县"}],[{"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":"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":"410202","name":"龙亭区"},{"code":"410203","name":"顺河回族区"},{"code":"410204","name":"鼓楼区"},{"code":"410205","name":"禹王台区"},{"code":"410212","name":"祥符区"},{"code":"410221","name":"杞县"},{"code":"410222","name":"通许县"},{"code":"410223","name":"尉氏县"},{"code":"410225","name":"兰考县"}],[{"code":"410302","name":"老城区"},{"code":"410303","name":"西工区"},{"code":"410304","name":"瀍河回族区"},{"code":"410305","name":"涧西区"},{"code":"410307","name":"偃师区"},{"code":"410308","name":"孟津区"},{"code":"410311","name":"洛龙区"},{"code":"410323","name":"新安县"},{"code":"410324","name":"栾川县"},{"code":"410325","name":"嵩县"},{"code":"410326","name":"汝阳县"},{"code":"410327","name":"宜阳县"},{"code":"410328","name":"洛宁县"},{"code":"410329","name":"伊川县"}],[{"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":"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":"410602","name":"鹤山区"},{"code":"410603","name":"山城区"},{"code":"410611","name":"淇滨区"},{"code":"410621","name":"浚县"},{"code":"410622","name":"淇县"}],[{"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":"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":"410902","name":"华龙区"},{"code":"410922","name":"清丰县"},{"code":"410923","name":"南乐县"},{"code":"410926","name":"范县"},{"code":"410927","name":"台前县"},{"code":"410928","name":"濮阳县"}],[{"code":"411002","name":"魏都区"},{"code":"411003","name":"建安区"},{"code":"411024","name":"鄢陵县"},{"code":"411025","name":"襄城县"},{"code":"411081","name":"禹州市"},{"code":"411082","name":"长葛市"}],[{"code":"411102","name":"源汇区"},{"code":"411103","name":"郾城区"},{"code":"411104","name":"召陵区"},{"code":"411121","name":"舞阳县"},{"code":"411122","name":"临颍县"}],[{"code":"411202","name":"湖滨区"},{"code":"411203","name":"陕州区"},{"code":"411221","name":"渑池县"},{"code":"411224","name":"卢氏县"},{"code":"411281","name":"义马市"},{"code":"411282","name":"灵宝市"}],[{"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":"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":"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":"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":"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":"419001","name":"济源市"}]],[[{"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":"420202","name":"黄石港区"},{"code":"420203","name":"西塞山区"},{"code":"420204","name":"下陆区"},{"code":"420205","name":"铁山区"},{"code":"420222","name":"阳新县"},{"code":"420281","name":"大冶市"}],[{"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":"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":"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":"420702","name":"梁子湖区"},{"code":"420703","name":"华容区"},{"code":"420704","name":"鄂城区"}],[{"code":"420802","name":"东宝区"},{"code":"420804","name":"掇刀区"},{"code":"420821","name":"京山县"},{"code":"420822","name":"沙洋县"},{"code":"420881","name":"钟祥市"}],[{"code":"420902","name":"孝南区"},{"code":"420921","name":"孝昌县"},{"code":"420922","name":"大悟县"},{"code":"420923","name":"云梦县"},{"code":"420981","name":"应城市"},{"code":"420982","name":"安陆市"},{"code":"420984","name":"汉川市"}],[{"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":"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":"421202","name":"咸安区"},{"code":"421221","name":"嘉鱼县"},{"code":"421222","name":"通城县"},{"code":"421223","name":"崇阳县"},{"code":"421224","name":"通山县"},{"code":"421281","name":"赤壁市"}],[{"code":"421303","name":"曾都区"},{"code":"421321","name":"随县"},{"code":"421381","name":"广水市"}],[{"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":"429004","name":"仙桃市"},{"code":"429005","name":"潜江市"},{"code":"429006","name":"天门市"},{"code":"429021","name":"神农架林区"}]],[[{"code":"430102","name":"芙蓉区"},{"code":"430103","name":"天心区"},{"code":"430104","name":"岳麓区"},{"code":"430105","name":"开福区"},{"code":"430111","name":"雨花区"},{"code":"430112","name":"望城区"},{"code":"430121","name":"长沙县"},{"code":"430181","name":"浏阳市"},{"code":"430182","name":"宁乡市"}],[{"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":"430302","name":"雨湖区"},{"code":"430304","name":"岳塘区"},{"code":"430321","name":"湘潭县"},{"code":"430381","name":"湘乡市"},{"code":"430382","name":"韶山市"}],[{"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":"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":"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":"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":"430802","name":"永定区"},{"code":"430811","name":"武陵源区"},{"code":"430821","name":"慈利县"},{"code":"430822","name":"桑植县"}],[{"code":"430902","name":"资阳区"},{"code":"430903","name":"赫山区"},{"code":"430921","name":"南县"},{"code":"430922","name":"桃江县"},{"code":"430923","name":"安化县"},{"code":"430981","name":"沅江市"}],[{"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":"431102","name":"零陵区"},{"code":"431103","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":"431181","name":"祁阳市"}],[{"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":"431302","name":"娄星区"},{"code":"431321","name":"双峰县"},{"code":"431322","name":"新化县"},{"code":"431381","name":"冷水江市"},{"code":"431382","name":"涟源市"}],[{"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":"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":"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":"440303","name":"罗湖区"},{"code":"440304","name":"福田区"},{"code":"440305","name":"南山区"},{"code":"440306","name":"宝安区"},{"code":"440307","name":"龙岗区"},{"code":"440308","name":"盐田区"},{"code":"440309","name":"龙华区"},{"code":"440310","name":"坪山区"}],[{"code":"440402","name":"香洲区"},{"code":"440403","name":"斗门区"},{"code":"440404","name":"金湾区"}],[{"code":"440507","name":"龙湖区"},{"code":"440511","name":"金平区"},{"code":"440512","name":"濠江区"},{"code":"440513","name":"潮阳区"},{"code":"440514","name":"潮南区"},{"code":"440515","name":"澄海区"},{"code":"440523","name":"南澳县"}],[{"code":"440604","name":"禅城区"},{"code":"440605","name":"南海区"},{"code":"440606","name":"顺德区"},{"code":"440607","name":"三水区"},{"code":"440608","name":"高明区"}],[{"code":"440703","name":"蓬江区"},{"code":"440704","name":"江海区"},{"code":"440705","name":"新会区"},{"code":"440781","name":"台山市"},{"code":"440783","name":"开平市"},{"code":"440784","name":"鹤山市"},{"code":"440785","name":"恩平市"}],[{"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":"440902","name":"茂南区"},{"code":"440904","name":"电白区"},{"code":"440981","name":"高州市"},{"code":"440982","name":"化州市"},{"code":"440983","name":"信宜市"}],[{"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":"441302","name":"惠城区"},{"code":"441303","name":"惠阳区"},{"code":"441322","name":"博罗县"},{"code":"441323","name":"惠东县"},{"code":"441324","name":"龙门县"}],[{"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":"441502","name":"城区"},{"code":"441521","name":"海丰县"},{"code":"441523","name":"陆河县"},{"code":"441581","name":"陆丰市"}],[{"code":"441602","name":"源城区"},{"code":"441621","name":"紫金县"},{"code":"441622","name":"龙川县"},{"code":"441623","name":"连平县"},{"code":"441624","name":"和平县"},{"code":"441625","name":"东源县"}],[{"code":"441702","name":"江城区"},{"code":"441704","name":"阳东区"},{"code":"441721","name":"阳西县"},{"code":"441781","name":"阳春市"}],[{"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":"441901","name":"东城街道"},{"code":"441902","name":"南城街道"},{"code":"441903","name":"万江街道"},{"code":"441904","name":"莞城街道"},{"code":"441905","name":"石碣镇"},{"code":"441906","name":"石龙镇"},{"code":"441907","name":"茶山镇"},{"code":"441908","name":"石排镇"},{"code":"441909","name":"企石镇"},{"code":"441910","name":"横沥镇"},{"code":"441911","name":"桥头镇"},{"code":"441912","name":"谢岗镇"},{"code":"441913","name":"东坑镇"},{"code":"441914","name":"常平镇"},{"code":"441915","name":"寮步镇"},{"code":"441916","name":"樟木头镇"},{"code":"441917","name":"大朗镇"},{"code":"441918","name":"黄江镇"},{"code":"441919","name":"清溪镇"},{"code":"441920","name":"塘厦镇"},{"code":"441921","name":"凤岗镇"},{"code":"441922","name":"大岭山镇"},{"code":"441923","name":"长安镇"},{"code":"441924","name":"虎门镇"},{"code":"441925","name":"厚街镇"},{"code":"441926","name":"沙田镇"},{"code":"441927","name":"道滘镇"},{"code":"441928","name":"洪梅镇"},{"code":"441929","name":"麻涌镇"},{"code":"441930","name":"望牛墩镇"},{"code":"441931","name":"中堂镇"},{"code":"441932","name":"高埗镇"},{"code":"441933","name":"松山湖管委会"},{"code":"441934","name":"虎门港管委会"},{"code":"441935","name":"东莞生态园"}],[{"code":"442001","name":"石岐区街道"},{"code":"442002","name":"东区街道"},{"code":"442003","name":"火炬开发区"},{"code":"442004","name":"西区街道"},{"code":"442005","name":"南区街道"},{"code":"442006","name":"五桂山街道"},{"code":"442007","name":"小榄镇"},{"code":"442008","name":"黄圃镇"},{"code":"442009","name":"民众镇"},{"code":"442010","name":"东凤镇"},{"code":"442011","name":"东升镇"},{"code":"442012","name":"古镇镇"},{"code":"442013","name":"沙溪镇"},{"code":"442014","name":"坦洲镇"},{"code":"442015","name":"港口镇"},{"code":"442016","name":"三角镇"},{"code":"442017","name":"横栏镇"},{"code":"442018","name":"南头镇"},{"code":"442019","name":"阜沙镇"},{"code":"442020","name":"南朗镇"},{"code":"442021","name":"三乡镇"},{"code":"442022","name":"板芙镇"},{"code":"442023","name":"大涌镇"},{"code":"442024","name":"神湾镇"}],[{"code":"445102","name":"湘桥区"},{"code":"445103","name":"潮安区"},{"code":"445122","name":"饶平县"}],[{"code":"445202","name":"榕城区"},{"code":"445203","name":"揭东区"},{"code":"445222","name":"揭西县"},{"code":"445224","name":"惠来县"},{"code":"445281","name":"普宁市"}],[{"code":"445302","name":"云城区"},{"code":"445303","name":"云安区"},{"code":"445321","name":"新兴县"},{"code":"445322","name":"郁南县"},{"code":"445381","name":"罗定市"}]],[[{"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":"450181","name":"横州市"}],[{"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":"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":"450403","name":"万秀区"},{"code":"450405","name":"长洲区"},{"code":"450406","name":"龙圩区"},{"code":"450421","name":"苍梧县"},{"code":"450422","name":"藤县"},{"code":"450423","name":"蒙山县"},{"code":"450481","name":"岑溪市"}],[{"code":"450502","name":"海城区"},{"code":"450503","name":"银海区"},{"code":"450512","name":"铁山港区"},{"code":"450521","name":"合浦县"}],[{"code":"450602","name":"港口区"},{"code":"450603","name":"防城区"},{"code":"450621","name":"上思县"},{"code":"450681","name":"东兴市"}],[{"code":"450702","name":"钦南区"},{"code":"450703","name":"钦北区"},{"code":"450721","name":"灵山县"},{"code":"450722","name":"浦北县"}],[{"code":"450802","name":"港北区"},{"code":"450803","name":"港南区"},{"code":"450804","name":"覃塘区"},{"code":"450821","name":"平南县"},{"code":"450881","name":"桂平市"}],[{"code":"450902","name":"玉州区"},{"code":"450903","name":"福绵区"},{"code":"450921","name":"容县"},{"code":"450922","name":"陆川县"},{"code":"450923","name":"博白县"},{"code":"450924","name":"兴业县"},{"code":"450981","name":"北流市"}],[{"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":"451102","name":"八步区"},{"code":"451103","name":"平桂区"},{"code":"451121","name":"昭平县"},{"code":"451122","name":"钟山县"},{"code":"451123","name":"富川瑶族自治县"}],[{"code":"451202","name":"金城江区"},{"code":"451203","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":"451302","name":"兴宾区"},{"code":"451321","name":"忻城县"},{"code":"451322","name":"象州县"},{"code":"451323","name":"武宣县"},{"code":"451324","name":"金秀瑶族自治县"},{"code":"451381","name":"合山市"}],[{"code":"451402","name":"江州区"},{"code":"451421","name":"扶绥县"},{"code":"451422","name":"宁明县"},{"code":"451423","name":"龙州县"},{"code":"451424","name":"大新县"},{"code":"451425","name":"天等县"},{"code":"451481","name":"凭祥市"}]],[[{"code":"460105","name":"秀英区"},{"code":"460106","name":"龙华区"},{"code":"460107","name":"琼山区"},{"code":"460108","name":"美兰区"}],[{"code":"460202","name":"海棠区"},{"code":"460203","name":"吉阳区"},{"code":"460204","name":"天涯区"},{"code":"460205","name":"崖州区"}],[{"code":"460321","name":"西沙群岛"},{"code":"460322","name":"南沙群岛"},{"code":"460323","name":"中沙群岛的岛礁及其海域"}],[{"code":"460401","name":"那大镇"},{"code":"460402","name":"和庆镇"},{"code":"460403","name":"南丰镇"},{"code":"460404","name":"大成镇"},{"code":"460405","name":"雅星镇"},{"code":"460406","name":"兰洋镇"},{"code":"460407","name":"光村镇"},{"code":"460408","name":"木棠镇"},{"code":"460409","name":"海头镇"},{"code":"460410","name":"峨蔓镇"},{"code":"460411","name":"三都镇"},{"code":"460412","name":"王五镇"},{"code":"460413","name":"白马井镇"},{"code":"460414","name":"中和镇"},{"code":"460415","name":"排浦镇"},{"code":"460416","name":"东成镇"},{"code":"460417","name":"新州镇"},{"code":"460418","name":"国营西培农场"},{"code":"460419","name":"国营西联农场"},{"code":"460420","name":"国营蓝洋农场"},{"code":"460421","name":"国营八一农场"},{"code":"460422","name":"洋浦经济开发区"},{"code":"460423","name":"华南热作学院"},{"code":"460424","name":"红岭农场"}],[{"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":"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":"500155","name":"梁平区"},{"code":"500156","name":"武隆区"}],[{"code":"500229","name":"城口县"},{"code":"500230","name":"丰都县"},{"code":"500231","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":"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":"510117","name":"郫都区"},{"code":"510121","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":"510302","name":"自流井区"},{"code":"510303","name":"贡井区"},{"code":"510304","name":"大安区"},{"code":"510311","name":"沿滩区"},{"code":"510321","name":"荣县"},{"code":"510322","name":"富顺县"}],[{"code":"510402","name":"东区"},{"code":"510403","name":"西区"},{"code":"510411","name":"仁和区"},{"code":"510421","name":"米易县"},{"code":"510422","name":"盐边县"}],[{"code":"510502","name":"江阳区"},{"code":"510503","name":"纳溪区"},{"code":"510504","name":"龙马潭区"},{"code":"510521","name":"泸县"},{"code":"510522","name":"合江县"},{"code":"510524","name":"叙永县"},{"code":"510525","name":"古蔺县"}],[{"code":"510603","name":"旌阳区"},{"code":"510604","name":"罗江区"},{"code":"510623","name":"中江县"},{"code":"510681","name":"广汉市"},{"code":"510682","name":"什邡市"},{"code":"510683","name":"绵竹市"}],[{"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":"510802","name":"利州区"},{"code":"510811","name":"昭化区"},{"code":"510812","name":"朝天区"},{"code":"510821","name":"旺苍县"},{"code":"510822","name":"青川县"},{"code":"510823","name":"剑阁县"},{"code":"510824","name":"苍溪县"}],[{"code":"510903","name":"船山区"},{"code":"510904","name":"安居区"},{"code":"510921","name":"蓬溪县"},{"code":"510922","name":"射洪县"},{"code":"510923","name":"大英县"}],[{"code":"511002","name":"市中区"},{"code":"511011","name":"东兴区"},{"code":"511024","name":"威远县"},{"code":"511025","name":"资中县"},{"code":"511083","name":"隆昌市"}],[{"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":"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":"511402","name":"东坡区"},{"code":"511403","name":"彭山区"},{"code":"511421","name":"仁寿县"},{"code":"511423","name":"洪雅县"},{"code":"511424","name":"丹棱县"},{"code":"511425","name":"青神县"}],[{"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":"511602","name":"广安区"},{"code":"511603","name":"前锋区"},{"code":"511621","name":"岳池县"},{"code":"511622","name":"武胜县"},{"code":"511623","name":"邻水县"},{"code":"511681","name":"华蓥市"}],[{"code":"511702","name":"通川区"},{"code":"511703","name":"达川区"},{"code":"511722","name":"宣汉县"},{"code":"511723","name":"开江县"},{"code":"511724","name":"大竹县"},{"code":"511725","name":"渠县"},{"code":"511781","name":"万源市"}],[{"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":"511902","name":"巴州区"},{"code":"511903","name":"恩阳区"},{"code":"511921","name":"通江县"},{"code":"511922","name":"南江县"},{"code":"511923","name":"平昌县"}],[{"code":"512002","name":"雁江区"},{"code":"512021","name":"安岳县"},{"code":"512022","name":"乐至县"}],[{"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":"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":"513401","name":"西昌市"},{"code":"513402","name":"会理市"},{"code":"513422","name":"木里藏族自治县"},{"code":"513423","name":"盐源县"},{"code":"513424","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":"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":"520201","name":"钟山区"},{"code":"520203","name":"六枝特区"},{"code":"520221","name":"水城县"},{"code":"520281","name":"盘州市"}],[{"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":"520402","name":"西秀区"},{"code":"520403","name":"平坝区"},{"code":"520422","name":"普定县"},{"code":"520423","name":"镇宁布依族苗族自治县"},{"code":"520424","name":"关岭布依族苗族自治县"},{"code":"520425","name":"紫云苗族布依族自治县"}],[{"code":"520502","name":"七星关区"},{"code":"520521","name":"大方县"},{"code":"520523","name":"金沙县"},{"code":"520524","name":"织金县"},{"code":"520525","name":"纳雍县"},{"code":"520526","name":"威宁彝族回族苗族自治县"},{"code":"520527","name":"赫章县"},{"code":"520581","name":"黔西市"}],[{"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":"522301","name":"兴义市"},{"code":"522322","name":"兴仁县"},{"code":"522323","name":"普安县"},{"code":"522324","name":"晴隆县"},{"code":"522325","name":"贞丰县"},{"code":"522326","name":"望谟县"},{"code":"522327","name":"册亨县"},{"code":"522328","name":"安龙县"}],[{"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":"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":"530102","name":"五华区"},{"code":"530103","name":"盘龙区"},{"code":"530111","name":"官渡区"},{"code":"530112","name":"西山区"},{"code":"530113","name":"东川区"},{"code":"530114","name":"呈贡区"},{"code":"530115","name":"晋宁区"},{"code":"530124","name":"富民县"},{"code":"530125","name":"宜良县"},{"code":"530126","name":"石林彝族自治县"},{"code":"530127","name":"嵩明县"},{"code":"530128","name":"禄劝彝族苗族自治县"},{"code":"530129","name":"寻甸回族彝族自治县"},{"code":"530181","name":"安宁市"}],[{"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":"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":"530502","name":"隆阳区"},{"code":"530521","name":"施甸县"},{"code":"530523","name":"龙陵县"},{"code":"530524","name":"昌宁县"},{"code":"530581","name":"腾冲市"}],[{"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":"530702","name":"古城区"},{"code":"530721","name":"玉龙纳西族自治县"},{"code":"530722","name":"永胜县"},{"code":"530723","name":"华坪县"},{"code":"530724","name":"宁蒗彝族自治县"}],[{"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":"530902","name":"临翔区"},{"code":"530921","name":"凤庆县"},{"code":"530922","name":"云县"},{"code":"530923","name":"永德县"},{"code":"530924","name":"镇康县"},{"code":"530925","name":"双江拉祜族佤族布朗族傣族自治县"},{"code":"530926","name":"耿马傣族佤族自治县"},{"code":"530927","name":"沧源佤族自治县"}],[{"code":"532301","name":"楚雄市"},{"code":"532302","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":"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":"532601","name":"文山市"},{"code":"532622","name":"砚山县"},{"code":"532623","name":"西畴县"},{"code":"532624","name":"麻栗坡县"},{"code":"532625","name":"马关县"},{"code":"532626","name":"丘北县"},{"code":"532627","name":"广南县"},{"code":"532628","name":"富宁县"}],[{"code":"532801","name":"景洪市"},{"code":"532822","name":"勐海县"},{"code":"532823","name":"勐腊县"}],[{"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":"533102","name":"瑞丽市"},{"code":"533103","name":"芒市"},{"code":"533122","name":"梁河县"},{"code":"533123","name":"盈江县"},{"code":"533124","name":"陇川县"}],[{"code":"533301","name":"泸水市"},{"code":"533323","name":"福贡县"},{"code":"533324","name":"贡山独龙族怒族自治县"},{"code":"533325","name":"兰坪白族普米族自治县"}],[{"code":"533401","name":"香格里拉市"},{"code":"533422","name":"德钦县"},{"code":"533423","name":"维西傈僳族自治县"}]],[[{"code":"540102","name":"城关区"},{"code":"540103","name":"堆龙德庆区"},{"code":"540104","name":"达孜区"},{"code":"540121","name":"林周县"},{"code":"540122","name":"当雄县"},{"code":"540123","name":"尼木县"},{"code":"540124","name":"曲水县"},{"code":"540127","name":"墨竹工卡县"}],[{"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":"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":"540402","name":"巴宜区"},{"code":"540421","name":"工布江达县"},{"code":"540422","name":"米林县"},{"code":"540423","name":"墨脱县"},{"code":"540424","name":"波密县"},{"code":"540425","name":"察隅县"},{"code":"540426","name":"朗县"}],[{"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":"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":"542521","name":"普兰县"},{"code":"542522","name":"札达县"},{"code":"542523","name":"噶尔县"},{"code":"542524","name":"日土县"},{"code":"542525","name":"革吉县"},{"code":"542526","name":"改则县"},{"code":"542527","name":"措勤县"}]],[[{"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":"610118","name":"鄠邑区"},{"code":"610122","name":"蓝田县"},{"code":"610124","name":"周至县"}],[{"code":"610202","name":"王益区"},{"code":"610203","name":"印台区"},{"code":"610204","name":"耀州区"},{"code":"610222","name":"宜君县"}],[{"code":"610302","name":"渭滨区"},{"code":"610303","name":"金台区"},{"code":"610304","name":"陈仓区"},{"code":"610305","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":"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":"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":"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":"610702","name":"汉台区"},{"code":"610703","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":"610802","name":"榆阳区"},{"code":"610803","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":"610881","name":"神木市"}],[{"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":"610929","name":"白河县"},{"code":"610981","name":"旬阳市"}],[{"code":"611002","name":"商州区"},{"code":"611021","name":"洛南县"},{"code":"611022","name":"丹凤县"},{"code":"611023","name":"商南县"},{"code":"611024","name":"山阳县"},{"code":"611025","name":"镇安县"},{"code":"611026","name":"柞水县"}]],[[{"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":"雄关区"},{"code":"620202","name":"镜铁区"},{"code":"620203","name":"长城区"}],[{"code":"620302","name":"金川区"},{"code":"620321","name":"永昌县"}],[{"code":"620402","name":"白银区"},{"code":"620403","name":"平川区"},{"code":"620421","name":"靖远县"},{"code":"620422","name":"会宁县"},{"code":"620423","name":"景泰县"}],[{"code":"620502","name":"秦州区"},{"code":"620503","name":"麦积区"},{"code":"620521","name":"清水县"},{"code":"620522","name":"秦安县"},{"code":"620523","name":"甘谷县"},{"code":"620524","name":"武山县"},{"code":"620525","name":"张家川回族自治县"}],[{"code":"620602","name":"凉州区"},{"code":"620621","name":"民勤县"},{"code":"620622","name":"古浪县"},{"code":"620623","name":"天祝藏族自治县"}],[{"code":"620702","name":"甘州区"},{"code":"620721","name":"肃南裕固族自治县"},{"code":"620722","name":"民乐县"},{"code":"620723","name":"临泽县"},{"code":"620724","name":"高台县"},{"code":"620725","name":"山丹县"}],[{"code":"620802","name":"崆峒区"},{"code":"620821","name":"泾川县"},{"code":"620822","name":"灵台县"},{"code":"620823","name":"崇信县"},{"code":"620824","name":"华亭县"},{"code":"620825","name":"庄浪县"},{"code":"620826","name":"静宁县"}],[{"code":"620902","name":"肃州区"},{"code":"620921","name":"金塔县"},{"code":"620922","name":"瓜州县"},{"code":"620923","name":"肃北蒙古族自治县"},{"code":"620924","name":"阿克塞哈萨克族自治县"},{"code":"620981","name":"玉门市"},{"code":"620982","name":"敦煌市"}],[{"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":"621102","name":"安定区"},{"code":"621121","name":"通渭县"},{"code":"621122","name":"陇西县"},{"code":"621123","name":"渭源县"},{"code":"621124","name":"临洮县"},{"code":"621125","name":"漳县"},{"code":"621126","name":"岷县"}],[{"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":"622901","name":"临夏市"},{"code":"622921","name":"临夏县"},{"code":"622922","name":"康乐县"},{"code":"622923","name":"永靖县"},{"code":"622924","name":"广河县"},{"code":"622925","name":"和政县"},{"code":"622926","name":"东乡族自治县"},{"code":"622927","name":"积石山保安族东乡族撒拉族自治县"}],[{"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":"630102","name":"城东区"},{"code":"630103","name":"城中区"},{"code":"630104","name":"城西区"},{"code":"630105","name":"城北区"},{"code":"630121","name":"大通回族土族自治县"},{"code":"630122","name":"湟中县"},{"code":"630123","name":"湟源县"}],[{"code":"630202","name":"乐都区"},{"code":"630203","name":"平安区"},{"code":"630222","name":"民和回族土族自治县"},{"code":"630223","name":"互助土族自治县"},{"code":"630224","name":"化隆回族自治县"},{"code":"630225","name":"循化撒拉族自治县"}],[{"code":"632221","name":"门源回族自治县"},{"code":"632222","name":"祁连县"},{"code":"632223","name":"海晏县"},{"code":"632224","name":"刚察县"}],[{"code":"632321","name":"同仁县"},{"code":"632322","name":"尖扎县"},{"code":"632323","name":"泽库县"},{"code":"632324","name":"河南蒙古族自治县"}],[{"code":"632521","name":"共和县"},{"code":"632522","name":"同德县"},{"code":"632523","name":"贵德县"},{"code":"632524","name":"兴海县"},{"code":"632525","name":"贵南县"}],[{"code":"632621","name":"玛沁县"},{"code":"632622","name":"班玛县"},{"code":"632623","name":"甘德县"},{"code":"632624","name":"达日县"},{"code":"632625","name":"久治县"},{"code":"632626","name":"玛多县"}],[{"code":"632701","name":"玉树市"},{"code":"632722","name":"杂多县"},{"code":"632723","name":"称多县"},{"code":"632724","name":"治多县"},{"code":"632725","name":"囊谦县"},{"code":"632726","name":"曲麻莱县"}],[{"code":"632801","name":"格尔木市"},{"code":"632802","name":"德令哈市"},{"code":"632821","name":"乌兰县"},{"code":"632822","name":"都兰县"},{"code":"632823","name":"天峻县"},{"code":"632824","name":"冷湖行政委员会"},{"code":"632825","name":"大柴旦行政委员会"},{"code":"632826","name":"茫崖行政委员会"}]],[[{"code":"640104","name":"兴庆区"},{"code":"640105","name":"西夏区"},{"code":"640106","name":"金凤区"},{"code":"640121","name":"永宁县"},{"code":"640122","name":"贺兰县"},{"code":"640181","name":"灵武市"}],[{"code":"640202","name":"大武口区"},{"code":"640205","name":"惠农区"},{"code":"640221","name":"平罗县"}],[{"code":"640302","name":"利通区"},{"code":"640303","name":"红寺堡区"},{"code":"640323","name":"盐池县"},{"code":"640324","name":"同心县"},{"code":"640381","name":"青铜峡市"}],[{"code":"640402","name":"原州区"},{"code":"640422","name":"西吉县"},{"code":"640423","name":"隆德县"},{"code":"640424","name":"泾源县"},{"code":"640425","name":"彭阳县"}],[{"code":"640502","name":"沙坡头区"},{"code":"640521","name":"中宁县"},{"code":"640522","name":"海原县"}]],[[{"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":"650202","name":"独山子区"},{"code":"650203","name":"克拉玛依区"},{"code":"650204","name":"白碱滩区"},{"code":"650205","name":"乌尔禾区"}],[{"code":"650402","name":"高昌区"},{"code":"650421","name":"鄯善县"},{"code":"650422","name":"托克逊县"}],[{"code":"650502","name":"伊州区"},{"code":"650521","name":"巴里坤哈萨克自治县"},{"code":"650522","name":"伊吾县"}],[{"code":"652301","name":"昌吉市"},{"code":"652302","name":"阜康市"},{"code":"652323","name":"呼图壁县"},{"code":"652324","name":"玛纳斯县"},{"code":"652325","name":"奇台县"},{"code":"652327","name":"吉木萨尔县"},{"code":"652328","name":"木垒哈萨克自治县"}],[{"code":"652701","name":"博乐市"},{"code":"652702","name":"阿拉山口市"},{"code":"652722","name":"精河县"},{"code":"652723","name":"温泉县"}],[{"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":"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":"653001","name":"阿图什市"},{"code":"653022","name":"阿克陶县"},{"code":"653023","name":"阿合奇县"},{"code":"653024","name":"乌恰县"}],[{"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":"653201","name":"和田市"},{"code":"653221","name":"和田县"},{"code":"653222","name":"墨玉县"},{"code":"653223","name":"皮山县"},{"code":"653224","name":"洛浦县"},{"code":"653225","name":"策勒县"},{"code":"653226","name":"于田县"},{"code":"653227","name":"民丰县"}],[{"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":"654201","name":"塔城市"},{"code":"654202","name":"乌苏市"},{"code":"654203","name":"沙湾市"},{"code":"654221","name":"额敏县"},{"code":"654224","name":"托里县"},{"code":"654225","name":"裕民县"},{"code":"654226","name":"和布克赛尔蒙古自治县"}],[{"code":"654301","name":"阿勒泰市"},{"code":"654321","name":"布尔津县"},{"code":"654322","name":"富蕴县"},{"code":"654323","name":"福海县"},{"code":"654324","name":"哈巴河县"},{"code":"654325","name":"青河县"},{"code":"654326","name":"吉木乃县"}],[{"code":"659001","name":"石河子市"},{"code":"659002","name":"阿拉尔市"},{"code":"659003","name":"图木舒克市"},{"code":"659004","name":"五家渠市"},{"code":"659005","name":"北屯市"},{"code":"659006","name":"铁门关市"},{"code":"659007","name":"双河市"},{"code":"659008","name":"可克达拉市"},{"code":"659009","name":"昆玉市"}]],[[{"code":"710101","name":"中正区"},{"code":"710102","name":"大同区"},{"code":"710103","name":"中山区"},{"code":"710104","name":"松山区"},{"code":"710105","name":"大安区"},{"code":"710106","name":"万华区"},{"code":"710107","name":"信义区"},{"code":"710108","name":"士林区"},{"code":"710109","name":"北投区"},{"code":"710110","name":"内湖区"},{"code":"710111","name":"南港区"},{"code":"710112","name":"文山区"}],[{"code":"710201","name":"新兴区"},{"code":"710202","name":"前金区"},{"code":"710203","name":"苓雅区"},{"code":"710204","name":"盐埕区"},{"code":"710205","name":"鼓山区"},{"code":"710206","name":"旗津区"},{"code":"710207","name":"前镇区"},{"code":"710208","name":"三民区"},{"code":"710209","name":"左营区"},{"code":"710210","name":"楠梓区"},{"code":"710211","name":"小港区"},{"code":"710242","name":"仁武区"},{"code":"710243","name":"大社区"},{"code":"710244","name":"冈山区"},{"code":"710245","name":"路竹区"},{"code":"710246","name":"阿莲区"},{"code":"710247","name":"田寮区"},{"code":"710248","name":"燕巢区"},{"code":"710249","name":"桥头区"},{"code":"710250","name":"梓官区"},{"code":"710251","name":"弥陀区"},{"code":"710252","name":"永安区"},{"code":"710253","name":"湖内区"},{"code":"710254","name":"凤山区"},{"code":"710255","name":"大寮区"},{"code":"710256","name":"林园区"},{"code":"710257","name":"鸟松区"},{"code":"710258","name":"大树区"},{"code":"710259","name":"旗山区"},{"code":"710260","name":"美浓区"},{"code":"710261","name":"六龟区"},{"code":"710262","name":"内门区"},{"code":"710263","name":"杉林区"},{"code":"710264","name":"甲仙区"},{"code":"710265","name":"桃源区"},{"code":"710266","name":"那玛夏区"},{"code":"710267","name":"茂林区"},{"code":"710268","name":"茄萣区"}],[{"code":"710301","name":"中西区"},{"code":"710302","name":"东区"},{"code":"710303","name":"南区"},{"code":"710304","name":"北区"},{"code":"710305","name":"安平区"},{"code":"710306","name":"安南区"},{"code":"710339","name":"永康区"},{"code":"710340","name":"归仁区"},{"code":"710341","name":"新化区"},{"code":"710342","name":"左镇区"},{"code":"710343","name":"玉井区"},{"code":"710344","name":"楠西区"},{"code":"710345","name":"南化区"},{"code":"710346","name":"仁德区"},{"code":"710347","name":"关庙区"},{"code":"710348","name":"龙崎区"},{"code":"710349","name":"官田区"},{"code":"710350","name":"麻豆区"},{"code":"710351","name":"佳里区"},{"code":"710352","name":"西港区"},{"code":"710353","name":"七股区"},{"code":"710354","name":"将军区"},{"code":"710355","name":"学甲区"},{"code":"710356","name":"北门区"},{"code":"710357","name":"新营区"},{"code":"710358","name":"后壁区"},{"code":"710359","name":"白河区"},{"code":"710360","name":"东山区"},{"code":"710361","name":"六甲区"},{"code":"710362","name":"下营区"},{"code":"710363","name":"柳营区"},{"code":"710364","name":"盐水区"},{"code":"710365","name":"善化区"},{"code":"710366","name":"大内区"},{"code":"710367","name":"山上区"},{"code":"710368","name":"新市区"},{"code":"710369","name":"安定区"}],[{"code":"710401","name":"中区"},{"code":"710402","name":"东区"},{"code":"710403","name":"南区"},{"code":"710404","name":"西区"},{"code":"710405","name":"北区"},{"code":"710406","name":"北屯区"},{"code":"710407","name":"西屯区"},{"code":"710408","name":"南屯区"},{"code":"710431","name":"太平区"},{"code":"710432","name":"大里区"},{"code":"710433","name":"雾峰区"},{"code":"710434","name":"乌日区"},{"code":"710435","name":"丰原区"},{"code":"710436","name":"后里区"},{"code":"710437","name":"石冈区"},{"code":"710438","name":"东势区"},{"code":"710439","name":"和平区"},{"code":"710440","name":"新社区"},{"code":"710441","name":"潭子区"},{"code":"710442","name":"大雅区"},{"code":"710443","name":"神冈区"},{"code":"710444","name":"大肚区"},{"code":"710445","name":"沙鹿区"},{"code":"710446","name":"龙井区"},{"code":"710447","name":"梧栖区"},{"code":"710448","name":"清水区"},{"code":"710449","name":"大甲区"},{"code":"710450","name":"外埔区"},{"code":"710451","name":"大安区"}],[{"code":"710614","name":"南投市"},{"code":"710615","name":"中寮乡"},{"code":"710616","name":"草屯镇"},{"code":"710617","name":"国姓乡"},{"code":"710618","name":"埔里镇"},{"code":"710619","name":"仁爱乡"},{"code":"710620","name":"名间乡"},{"code":"710621","name":"集集镇"},{"code":"710622","name":"水里乡"},{"code":"710623","name":"鱼池乡"},{"code":"710624","name":"信义乡"},{"code":"710625","name":"竹山镇"},{"code":"710626","name":"鹿谷乡"}],[{"code":"710701","name":"仁爱区"},{"code":"710702","name":"信义区"},{"code":"710703","name":"中正区"},{"code":"710704","name":"中山区"},{"code":"710705","name":"安乐区"},{"code":"710706","name":"暖暖区"},{"code":"710707","name":"七堵区"}],[{"code":"710801","name":"东区"},{"code":"710802","name":"北区"},{"code":"710803","name":"香山区"}],[{"code":"710901","name":"东区"},{"code":"710902","name":"西区"}],[{"code":"711130","name":"万里区"},{"code":"711131","name":"金山区"},{"code":"711132","name":"板桥区"},{"code":"711133","name":"汐止区"},{"code":"711134","name":"深坑区"},{"code":"711135","name":"石碇区"},{"code":"711136","name":"瑞芳区"},{"code":"711137","name":"平溪区"},{"code":"711138","name":"双溪区"},{"code":"711139","name":"贡寮区"},{"code":"711140","name":"新店区"},{"code":"711141","name":"坪林区"},{"code":"711142","name":"乌来区"},{"code":"711143","name":"永和区"},{"code":"711144","name":"中和区"},{"code":"711145","name":"土城区"},{"code":"711146","name":"三峡区"},{"code":"711147","name":"树林区"},{"code":"711148","name":"莺歌区"},{"code":"711149","name":"三重区"},{"code":"711150","name":"新庄区"},{"code":"711151","name":"泰山区"},{"code":"711152","name":"林口区"},{"code":"711153","name":"芦洲区"},{"code":"711154","name":"五股区"},{"code":"711155","name":"八里区"},{"code":"711156","name":"淡水区"},{"code":"711157","name":"三芝区"},{"code":"711158","name":"石门区"}],[{"code":"711214","name":"宜兰市"},{"code":"711215","name":"头城镇"},{"code":"711216","name":"礁溪乡"},{"code":"711217","name":"壮围乡"},{"code":"711218","name":"员山乡"},{"code":"711219","name":"罗东镇"},{"code":"711220","name":"三星乡"},{"code":"711221","name":"大同乡"},{"code":"711222","name":"五结乡"},{"code":"711223","name":"冬山乡"},{"code":"711224","name":"苏澳镇"},{"code":"711225","name":"南澳乡"}],[{"code":"711314","name":"竹北市"},{"code":"711315","name":"湖口乡"},{"code":"711316","name":"新丰乡"},{"code":"711317","name":"新埔镇"},{"code":"711318","name":"关西镇"},{"code":"711319","name":"芎林乡"},{"code":"711320","name":"宝山乡"},{"code":"711321","name":"竹东镇"},{"code":"711322","name":"五峰乡"},{"code":"711323","name":"横山乡"},{"code":"711324","name":"尖石乡"},{"code":"711325","name":"北埔乡"},{"code":"711326","name":"峨眉乡"}],[{"code":"711414","name":"中坜区"},{"code":"711415","name":"平镇区"},{"code":"711416","name":"龙潭区"},{"code":"711417","name":"杨梅区"},{"code":"711418","name":"新屋区"},{"code":"711419","name":"观音区"},{"code":"711420","name":"桃园区"},{"code":"711421","name":"龟山区"},{"code":"711422","name":"八德区"},{"code":"711423","name":"大溪区"},{"code":"711424","name":"复兴区"},{"code":"711425","name":"大园区"},{"code":"711426","name":"芦竹区"}],[{"code":"711519","name":"竹南镇"},{"code":"711520","name":"头份市"},{"code":"711521","name":"三湾乡"},{"code":"711522","name":"南庄乡"},{"code":"711523","name":"狮潭乡"},{"code":"711524","name":"后龙镇"},{"code":"711525","name":"通霄镇"},{"code":"711526","name":"苑里镇"},{"code":"711527","name":"苗栗市"},{"code":"711528","name":"造桥乡"},{"code":"711529","name":"头屋乡"},{"code":"711530","name":"公馆乡"},{"code":"711531","name":"大湖乡"},{"code":"711532","name":"泰安乡"},{"code":"711533","name":"铜锣乡"},{"code":"711534","name":"三义乡"},{"code":"711535","name":"西湖乡"},{"code":"711536","name":"卓兰镇"}],[{"code":"711727","name":"彰化市"},{"code":"711728","name":"芬园乡"},{"code":"711729","name":"花坛乡"},{"code":"711730","name":"秀水乡"},{"code":"711731","name":"鹿港镇"},{"code":"711732","name":"福兴乡"},{"code":"711733","name":"线西乡"},{"code":"711734","name":"和美镇"},{"code":"711735","name":"伸港乡"},{"code":"711736","name":"员林市"},{"code":"711737","name":"社头乡"},{"code":"711738","name":"永靖乡"},{"code":"711739","name":"埔心乡"},{"code":"711740","name":"溪湖镇"},{"code":"711741","name":"大村乡"},{"code":"711742","name":"埔盐乡"},{"code":"711743","name":"田中镇"},{"code":"711744","name":"北斗镇"},{"code":"711745","name":"田尾乡"},{"code":"711746","name":"埤头乡"},{"code":"711747","name":"溪州乡"},{"code":"711748","name":"竹塘乡"},{"code":"711749","name":"二林镇"},{"code":"711750","name":"大城乡"},{"code":"711751","name":"芳苑乡"},{"code":"711752","name":"二水乡"}],[{"code":"711919","name":"番路乡"},{"code":"711920","name":"梅山乡"},{"code":"711921","name":"竹崎乡"},{"code":"711922","name":"阿里山乡"},{"code":"711923","name":"中埔乡"},{"code":"711924","name":"大埔乡"},{"code":"711925","name":"水上乡"},{"code":"711926","name":"鹿草乡"},{"code":"711927","name":"太保市"},{"code":"711928","name":"朴子市"},{"code":"711929","name":"东石乡"},{"code":"711930","name":"六脚乡"},{"code":"711931","name":"新港乡"},{"code":"711932","name":"民雄乡"},{"code":"711933","name":"大林镇"},{"code":"711934","name":"溪口乡"},{"code":"711935","name":"义竹乡"},{"code":"711936","name":"布袋镇"}],[{"code":"712121","name":"斗南镇"},{"code":"712122","name":"大埤乡"},{"code":"712123","name":"虎尾镇"},{"code":"712124","name":"土库镇"},{"code":"712125","name":"褒忠乡"},{"code":"712126","name":"东势乡"},{"code":"712127","name":"台西乡"},{"code":"712128","name":"仑背乡"},{"code":"712129","name":"麦寮乡"},{"code":"712130","name":"斗六市"},{"code":"712131","name":"林内乡"},{"code":"712132","name":"古坑乡"},{"code":"712133","name":"莿桐乡"},{"code":"712134","name":"西螺镇"},{"code":"712135","name":"二仑乡"},{"code":"712136","name":"北港镇"},{"code":"712137","name":"水林乡"},{"code":"712138","name":"口湖乡"},{"code":"712139","name":"四湖乡"},{"code":"712140","name":"元长乡"}],[{"code":"712434","name":"屏东市"},{"code":"712435","name":"三地门乡"},{"code":"712436","name":"雾台乡"},{"code":"712437","name":"玛家乡"},{"code":"712438","name":"九如乡"},{"code":"712439","name":"里港乡"},{"code":"712440","name":"高树乡"},{"code":"712441","name":"盐埔乡"},{"code":"712442","name":"长治乡"},{"code":"712443","name":"麟洛乡"},{"code":"712444","name":"竹田乡"},{"code":"712445","name":"内埔乡"},{"code":"712446","name":"万丹乡"},{"code":"712447","name":"潮州镇"},{"code":"712448","name":"泰武乡"},{"code":"712449","name":"来义乡"},{"code":"712450","name":"万峦乡"},{"code":"712451","name":"崁顶乡"},{"code":"712452","name":"新埤乡"},{"code":"712453","name":"南州乡"},{"code":"712454","name":"林边乡"},{"code":"712455","name":"东港镇"},{"code":"712456","name":"琉球乡"},{"code":"712457","name":"佳冬乡"},{"code":"712458","name":"新园乡"},{"code":"712459","name":"枋寮乡"},{"code":"712460","name":"枋山乡"},{"code":"712461","name":"春日乡"},{"code":"712462","name":"狮子乡"},{"code":"712463","name":"车城乡"},{"code":"712464","name":"牡丹乡"},{"code":"712465","name":"恒春镇"},{"code":"712466","name":"满州乡"}],[{"code":"712517","name":"台东市"},{"code":"712518","name":"绿岛乡"},{"code":"712519","name":"兰屿乡"},{"code":"712520","name":"延平乡"},{"code":"712521","name":"卑南乡"},{"code":"712522","name":"鹿野乡"},{"code":"712523","name":"关山镇"},{"code":"712524","name":"海端乡"},{"code":"712525","name":"池上乡"},{"code":"712526","name":"东河乡"},{"code":"712527","name":"成功镇"},{"code":"712528","name":"长滨乡"},{"code":"712529","name":"金峰乡"},{"code":"712530","name":"大武乡"},{"code":"712531","name":"达仁乡"},{"code":"712532","name":"太麻里乡"}],[{"code":"712615","name":"花莲市"},{"code":"712616","name":"新城乡"},{"code":"712618","name":"秀林乡"},{"code":"712619","name":"吉安乡"},{"code":"712620","name":"寿丰乡"},{"code":"712621","name":"凤林镇"},{"code":"712622","name":"光复乡"},{"code":"712623","name":"丰滨乡"},{"code":"712624","name":"瑞穗乡"},{"code":"712625","name":"万荣乡"},{"code":"712626","name":"玉里镇"},{"code":"712627","name":"卓溪乡"},{"code":"712628","name":"富里乡"}],[{"code":"712707","name":"马公市"},{"code":"712708","name":"西屿乡"},{"code":"712709","name":"望安乡"},{"code":"712710","name":"七美乡"},{"code":"712711","name":"白沙乡"},{"code":"712712","name":"湖西乡"}]],[[{"code":"810101","name":"中西区"},{"code":"810102","name":"东区"},{"code":"810103","name":"九龙城区"},{"code":"810104","name":"观塘区"},{"code":"810105","name":"南区"},{"code":"810106","name":"深水埗区"},{"code":"810107","name":"湾仔区"},{"code":"810108","name":"黄大仙区"},{"code":"810109","name":"油尖旺区"},{"code":"810110","name":"离岛区"},{"code":"810111","name":"葵青区"},{"code":"810112","name":"北区"},{"code":"810113","name":"西贡区"},{"code":"810114","name":"沙田区"},{"code":"810115","name":"屯门区"},{"code":"810116","name":"大埔区"},{"code":"810117","name":"荃湾区"},{"code":"810118","name":"元朗区"}]],[[{"code":"820101","name":"澳门半岛"},{"code":"820102","name":"凼仔"},{"code":"820103","name":"路凼城"},{"code":"820104","name":"路环"}]]]
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/address/citys.json b/uni_modules/vk-uview-ui/libs/address/citys.json
new file mode 100644
index 0000000..a4b90fe
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/address/citys.json
@@ -0,0 +1 @@
+[[{"code":"110100","name":"北京市"}],[{"code":"120100","name":"天津市"}],[{"code":"130100","name":"石家庄市"},{"code":"130200","name":"唐山市"},{"code":"130300","name":"秦皇岛市"},{"code":"130400","name":"邯郸市"},{"code":"130500","name":"邢台市"},{"code":"130600","name":"保定市"},{"code":"130700","name":"张家口市"},{"code":"130800","name":"承德市"},{"code":"130900","name":"沧州市"},{"code":"131000","name":"廊坊市"},{"code":"131100","name":"衡水市"}],[{"code":"140100","name":"太原市"},{"code":"140200","name":"大同市"},{"code":"140300","name":"阳泉市"},{"code":"140400","name":"长治市"},{"code":"140500","name":"晋城市"},{"code":"140600","name":"朔州市"},{"code":"140700","name":"晋中市"},{"code":"140800","name":"运城市"},{"code":"140900","name":"忻州市"},{"code":"141000","name":"临汾市"},{"code":"141100","name":"吕梁市"}],[{"code":"150100","name":"呼和浩特市"},{"code":"150200","name":"包头市"},{"code":"150300","name":"乌海市"},{"code":"150400","name":"赤峰市"},{"code":"150500","name":"通辽市"},{"code":"150600","name":"鄂尔多斯市"},{"code":"150700","name":"呼伦贝尔市"},{"code":"150800","name":"巴彦淖尔市"},{"code":"150900","name":"乌兰察布市"},{"code":"152200","name":"兴安盟"},{"code":"152500","name":"锡林郭勒盟"},{"code":"152900","name":"阿拉善盟"}],[{"code":"210100","name":"沈阳市"},{"code":"210200","name":"大连市"},{"code":"210300","name":"鞍山市"},{"code":"210400","name":"抚顺市"},{"code":"210500","name":"本溪市"},{"code":"210600","name":"丹东市"},{"code":"210700","name":"锦州市"},{"code":"210800","name":"营口市"},{"code":"210900","name":"阜新市"},{"code":"211000","name":"辽阳市"},{"code":"211100","name":"盘锦市"},{"code":"211200","name":"铁岭市"},{"code":"211300","name":"朝阳市"},{"code":"211400","name":"葫芦岛市"}],[{"code":"220100","name":"长春市"},{"code":"220200","name":"吉林市"},{"code":"220300","name":"四平市"},{"code":"220400","name":"辽源市"},{"code":"220500","name":"通化市"},{"code":"220600","name":"白山市"},{"code":"220700","name":"松原市"},{"code":"220800","name":"白城市"},{"code":"222400","name":"延边朝鲜族自治州"}],[{"code":"230100","name":"哈尔滨市"},{"code":"230200","name":"齐齐哈尔市"},{"code":"230300","name":"鸡西市"},{"code":"230400","name":"鹤岗市"},{"code":"230500","name":"双鸭山市"},{"code":"230600","name":"大庆市"},{"code":"230700","name":"伊春市"},{"code":"230800","name":"佳木斯市"},{"code":"230900","name":"七台河市"},{"code":"231000","name":"牡丹江市"},{"code":"231100","name":"黑河市"},{"code":"231200","name":"绥化市"},{"code":"232700","name":"大兴安岭地区"}],[{"code":"310100","name":"上海市"}],[{"code":"320100","name":"南京市"},{"code":"320200","name":"无锡市"},{"code":"320300","name":"徐州市"},{"code":"320400","name":"常州市"},{"code":"320500","name":"苏州市"},{"code":"320600","name":"南通市"},{"code":"320700","name":"连云港市"},{"code":"320800","name":"淮安市"},{"code":"320900","name":"盐城市"},{"code":"321000","name":"扬州市"},{"code":"321100","name":"镇江市"},{"code":"321200","name":"泰州市"},{"code":"321300","name":"宿迁市"}],[{"code":"330100","name":"杭州市"},{"code":"330200","name":"宁波市"},{"code":"330300","name":"温州市"},{"code":"330400","name":"嘉兴市"},{"code":"330500","name":"湖州市"},{"code":"330600","name":"绍兴市"},{"code":"330700","name":"金华市"},{"code":"330800","name":"衢州市"},{"code":"330900","name":"舟山市"},{"code":"331000","name":"台州市"},{"code":"331100","name":"丽水市"}],[{"code":"340100","name":"合肥市"},{"code":"340200","name":"芜湖市"},{"code":"340300","name":"蚌埠市"},{"code":"340400","name":"淮南市"},{"code":"340500","name":"马鞍山市"},{"code":"340600","name":"淮北市"},{"code":"340700","name":"铜陵市"},{"code":"340800","name":"安庆市"},{"code":"341000","name":"黄山市"},{"code":"341100","name":"滁州市"},{"code":"341200","name":"阜阳市"},{"code":"341300","name":"宿州市"},{"code":"341500","name":"六安市"},{"code":"341600","name":"亳州市"},{"code":"341700","name":"池州市"},{"code":"341800","name":"宣城市"}],[{"code":"350100","name":"福州市"},{"code":"350200","name":"厦门市"},{"code":"350300","name":"莆田市"},{"code":"350400","name":"三明市"},{"code":"350500","name":"泉州市"},{"code":"350600","name":"漳州市"},{"code":"350700","name":"南平市"},{"code":"350800","name":"龙岩市"},{"code":"350900","name":"宁德市"}],[{"code":"360100","name":"南昌市"},{"code":"360200","name":"景德镇市"},{"code":"360300","name":"萍乡市"},{"code":"360400","name":"九江市"},{"code":"360500","name":"新余市"},{"code":"360600","name":"鹰潭市"},{"code":"360700","name":"赣州市"},{"code":"360800","name":"吉安市"},{"code":"360900","name":"宜春市"},{"code":"361000","name":"抚州市"},{"code":"361100","name":"上饶市"}],[{"code":"370100","name":"济南市"},{"code":"370200","name":"青岛市"},{"code":"370300","name":"淄博市"},{"code":"370400","name":"枣庄市"},{"code":"370500","name":"东营市"},{"code":"370600","name":"烟台市"},{"code":"370700","name":"潍坊市"},{"code":"370800","name":"济宁市"},{"code":"370900","name":"泰安市"},{"code":"371000","name":"威海市"},{"code":"371100","name":"日照市"},{"code":"371200","name":"莱芜市"},{"code":"371300","name":"临沂市"},{"code":"371400","name":"德州市"},{"code":"371500","name":"聊城市"},{"code":"371600","name":"滨州市"},{"code":"371700","name":"菏泽市"}],[{"code":"410100","name":"郑州市"},{"code":"410200","name":"开封市"},{"code":"410300","name":"洛阳市"},{"code":"410400","name":"平顶山市"},{"code":"410500","name":"安阳市"},{"code":"410600","name":"鹤壁市"},{"code":"410700","name":"新乡市"},{"code":"410800","name":"焦作市"},{"code":"410900","name":"濮阳市"},{"code":"411000","name":"许昌市"},{"code":"411100","name":"漯河市"},{"code":"411200","name":"三门峡市"},{"code":"411300","name":"南阳市"},{"code":"411400","name":"商丘市"},{"code":"411500","name":"信阳市"},{"code":"411600","name":"周口市"},{"code":"411700","name":"驻马店市"},{"code":"419000","name":"省直辖县级行政区划"}],[{"code":"420100","name":"武汉市"},{"code":"420200","name":"黄石市"},{"code":"420300","name":"十堰市"},{"code":"420500","name":"宜昌市"},{"code":"420600","name":"襄阳市"},{"code":"420700","name":"鄂州市"},{"code":"420800","name":"荆门市"},{"code":"420900","name":"孝感市"},{"code":"421000","name":"荆州市"},{"code":"421100","name":"黄冈市"},{"code":"421200","name":"咸宁市"},{"code":"421300","name":"随州市"},{"code":"422800","name":"恩施土家族苗族自治州"},{"code":"429000","name":"省直辖县级行政区划"}],[{"code":"430100","name":"长沙市"},{"code":"430200","name":"株洲市"},{"code":"430300","name":"湘潭市"},{"code":"430400","name":"衡阳市"},{"code":"430500","name":"邵阳市"},{"code":"430600","name":"岳阳市"},{"code":"430700","name":"常德市"},{"code":"430800","name":"张家界市"},{"code":"430900","name":"益阳市"},{"code":"431000","name":"郴州市"},{"code":"431100","name":"永州市"},{"code":"431200","name":"怀化市"},{"code":"431300","name":"娄底市"},{"code":"433100","name":"湘西土家族苗族自治州"}],[{"code":"440100","name":"广州市"},{"code":"440200","name":"韶关市"},{"code":"440300","name":"深圳市"},{"code":"440400","name":"珠海市"},{"code":"440500","name":"汕头市"},{"code":"440600","name":"佛山市"},{"code":"440700","name":"江门市"},{"code":"440800","name":"湛江市"},{"code":"440900","name":"茂名市"},{"code":"441200","name":"肇庆市"},{"code":"441300","name":"惠州市"},{"code":"441400","name":"梅州市"},{"code":"441500","name":"汕尾市"},{"code":"441600","name":"河源市"},{"code":"441700","name":"阳江市"},{"code":"441800","name":"清远市"},{"code":"441900","name":"东莞市"},{"code":"442000","name":"中山市"},{"code":"445100","name":"潮州市"},{"code":"445200","name":"揭阳市"},{"code":"445300","name":"云浮市"}],[{"code":"450100","name":"南宁市"},{"code":"450200","name":"柳州市"},{"code":"450300","name":"桂林市"},{"code":"450400","name":"梧州市"},{"code":"450500","name":"北海市"},{"code":"450600","name":"防城港市"},{"code":"450700","name":"钦州市"},{"code":"450800","name":"贵港市"},{"code":"450900","name":"玉林市"},{"code":"451000","name":"百色市"},{"code":"451100","name":"贺州市"},{"code":"451200","name":"河池市"},{"code":"451300","name":"来宾市"},{"code":"451400","name":"崇左市"}],[{"code":"460100","name":"海口市"},{"code":"460200","name":"三亚市"},{"code":"460300","name":"三沙市"},{"code":"460400","name":"儋州市"},{"code":"469000","name":"省直辖县级行政区划"}],[{"code":"500100","name":"重庆市"},{"code":"500200","name":"县"}],[{"code":"510100","name":"成都市"},{"code":"510300","name":"自贡市"},{"code":"510400","name":"攀枝花市"},{"code":"510500","name":"泸州市"},{"code":"510600","name":"德阳市"},{"code":"510700","name":"绵阳市"},{"code":"510800","name":"广元市"},{"code":"510900","name":"遂宁市"},{"code":"511000","name":"内江市"},{"code":"511100","name":"乐山市"},{"code":"511300","name":"南充市"},{"code":"511400","name":"眉山市"},{"code":"511500","name":"宜宾市"},{"code":"511600","name":"广安市"},{"code":"511700","name":"达州市"},{"code":"511800","name":"雅安市"},{"code":"511900","name":"巴中市"},{"code":"512000","name":"资阳市"},{"code":"513200","name":"阿坝藏族羌族自治州"},{"code":"513300","name":"甘孜藏族自治州"},{"code":"513400","name":"凉山彝族自治州"}],[{"code":"520100","name":"贵阳市"},{"code":"520200","name":"六盘水市"},{"code":"520300","name":"遵义市"},{"code":"520400","name":"安顺市"},{"code":"520500","name":"毕节市"},{"code":"520600","name":"铜仁市"},{"code":"522300","name":"黔西南布依族苗族自治州"},{"code":"522600","name":"黔东南苗族侗族自治州"},{"code":"522700","name":"黔南布依族苗族自治州"}],[{"code":"530100","name":"昆明市"},{"code":"530300","name":"曲靖市"},{"code":"530400","name":"玉溪市"},{"code":"530500","name":"保山市"},{"code":"530600","name":"昭通市"},{"code":"530700","name":"丽江市"},{"code":"530800","name":"普洱市"},{"code":"530900","name":"临沧市"},{"code":"532300","name":"楚雄彝族自治州"},{"code":"532500","name":"红河哈尼族彝族自治州"},{"code":"532600","name":"文山壮族苗族自治州"},{"code":"532800","name":"西双版纳傣族自治州"},{"code":"532900","name":"大理白族自治州"},{"code":"533100","name":"德宏傣族景颇族自治州"},{"code":"533300","name":"怒江傈僳族自治州"},{"code":"533400","name":"迪庆藏族自治州"}],[{"code":"540100","name":"拉萨市"},{"code":"540200","name":"日喀则市"},{"code":"540300","name":"昌都市"},{"code":"540400","name":"林芝市"},{"code":"540500","name":"山南市"},{"code":"542400","name":"那曲地区"},{"code":"542500","name":"阿里地区"}],[{"code":"610100","name":"西安市"},{"code":"610200","name":"铜川市"},{"code":"610300","name":"宝鸡市"},{"code":"610400","name":"咸阳市"},{"code":"610500","name":"渭南市"},{"code":"610600","name":"延安市"},{"code":"610700","name":"汉中市"},{"code":"610800","name":"榆林市"},{"code":"610900","name":"安康市"},{"code":"611000","name":"商洛市"}],[{"code":"620100","name":"兰州市"},{"code":"620200","name":"嘉峪关市"},{"code":"620300","name":"金昌市"},{"code":"620400","name":"白银市"},{"code":"620500","name":"天水市"},{"code":"620600","name":"武威市"},{"code":"620700","name":"张掖市"},{"code":"620800","name":"平凉市"},{"code":"620900","name":"酒泉市"},{"code":"621000","name":"庆阳市"},{"code":"621100","name":"定西市"},{"code":"621200","name":"陇南市"},{"code":"622900","name":"临夏回族自治州"},{"code":"623000","name":"甘南藏族自治州"}],[{"code":"630100","name":"西宁市"},{"code":"630200","name":"海东市"},{"code":"632200","name":"海北藏族自治州"},{"code":"632300","name":"黄南藏族自治州"},{"code":"632500","name":"海南藏族自治州"},{"code":"632600","name":"果洛藏族自治州"},{"code":"632700","name":"玉树藏族自治州"},{"code":"632800","name":"海西蒙古族藏族自治州"}],[{"code":"640100","name":"银川市"},{"code":"640200","name":"石嘴山市"},{"code":"640300","name":"吴忠市"},{"code":"640400","name":"固原市"},{"code":"640500","name":"中卫市"}],[{"code":"650100","name":"乌鲁木齐市"},{"code":"650200","name":"克拉玛依市"},{"code":"650400","name":"吐鲁番市"},{"code":"650500","name":"哈密市"},{"code":"652300","name":"昌吉回族自治州"},{"code":"652700","name":"博尔塔拉蒙古自治州"},{"code":"652800","name":"巴音郭楞蒙古自治州"},{"code":"652900","name":"阿克苏地区"},{"code":"653000","name":"克孜勒苏柯尔克孜自治州"},{"code":"653100","name":"喀什地区"},{"code":"653200","name":"和田地区"},{"code":"654000","name":"伊犁哈萨克自治州"},{"code":"654200","name":"塔城地区"},{"code":"654300","name":"阿勒泰地区"},{"code":"659000","name":"自治区直辖县级行政区划"}],[{"code":"710100","name":"台北市"},{"code":"710200","name":"高雄市"},{"code":"710300","name":"台南市"},{"code":"710400","name":"台中市"},{"code":"710600","name":"南投县"},{"code":"710700","name":"基隆市"},{"code":"710800","name":"新竹市"},{"code":"710900","name":"嘉义市"},{"code":"711100","name":"新北市"},{"code":"711200","name":"宜兰县"},{"code":"711300","name":"新竹县"},{"code":"711400","name":"桃园市"},{"code":"711500","name":"苗栗县"},{"code":"711700","name":"彰化县"},{"code":"711900","name":"嘉义县"},{"code":"712100","name":"云林县"},{"code":"712400","name":"屏东县"},{"code":"712500","name":"台东县"},{"code":"712600","name":"花莲县"},{"code":"712700","name":"澎湖县"}],[{"code":"810100","name":"香港特别行政区"}],[{"code":"820100","name":"澳门特别行政区"}]]
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/address/provinces.json b/uni_modules/vk-uview-ui/libs/address/provinces.json
new file mode 100644
index 0000000..1c9db43
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/address/provinces.json
@@ -0,0 +1 @@
+[{"code":"110000","name":"北京市"},{"code":"120000","name":"天津市"},{"code":"130000","name":"河北省"},{"code":"140000","name":"山西省"},{"code":"150000","name":"内蒙古自治区"},{"code":"210000","name":"辽宁省"},{"code":"220000","name":"吉林省"},{"code":"230000","name":"黑龙江省"},{"code":"310000","name":"上海市"},{"code":"320000","name":"江苏省"},{"code":"330000","name":"浙江省"},{"code":"340000","name":"安徽省"},{"code":"350000","name":"福建省"},{"code":"360000","name":"江西省"},{"code":"370000","name":"山东省"},{"code":"410000","name":"河南省"},{"code":"420000","name":"湖北省"},{"code":"430000","name":"湖南省"},{"code":"440000","name":"广东省"},{"code":"450000","name":"广西壮族自治区"},{"code":"460000","name":"海南省"},{"code":"500000","name":"重庆市"},{"code":"510000","name":"四川省"},{"code":"520000","name":"贵州省"},{"code":"530000","name":"云南省"},{"code":"540000","name":"西藏自治区"},{"code":"610000","name":"陕西省"},{"code":"620000","name":"甘肃省"},{"code":"630000","name":"青海省"},{"code":"640000","name":"宁夏回族自治区"},{"code":"650000","name":"新疆维吾尔自治区"},{"code":"710000","name":"台湾省"},{"code":"810000","name":"香港特别行政区"},{"code":"820000","name":"澳门特别行政区"}]
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/config/config.js b/uni_modules/vk-uview-ui/libs/config/config.js
new file mode 100644
index 0000000..2241530
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/config/config.js
@@ -0,0 +1,15 @@
+// 第一版 1.10.1 版本发布于2021-11-18
+let version = '1.10.1';
+
+export default {
+	v: version,
+	version: version,
+	// 主题名称
+	type: [
+		'primary',
+		'success',
+		'info',
+		'error',
+		'warning'
+	]
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/config/zIndex.js b/uni_modules/vk-uview-ui/libs/config/zIndex.js
new file mode 100644
index 0000000..d60e5bd
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/config/zIndex.js
@@ -0,0 +1,20 @@
+// uniapp在H5中各API的z-index值如下：
+/**
+ * actionsheet: 999
+ * modal: 999
+ * navigate: 998
+ * tabbar: 998
+ * toast: 999
+ */
+
+export default {
+	toast: 10090,
+	noNetwork: 10080,
+	// popup包含popup，actionsheet，keyboard，picker的值
+	popup: 10075,
+	mask: 10070,
+	navbar: 980,
+	topTips: 975,
+	sticky: 970,
+	indexListSticky: 965,
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/css/color.scss b/uni_modules/vk-uview-ui/libs/css/color.scss
new file mode 100644
index 0000000..279bc40
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/color.scss
@@ -0,0 +1,155 @@
+.u-type-primary-light {
+	color: $u-type-primary-light;
+}
+
+.u-type-warning-light {
+	color: $u-type-warning-light;
+}
+
+.u-type-success-light {
+	color: $u-type-success-light;
+}
+
+.u-type-error-light {
+	color: $u-type-error-light;
+}
+
+.u-type-info-light {
+	color: $u-type-info-light;
+}
+
+.u-type-primary-light-bg {
+	background-color: $u-type-primary-light;
+}
+
+.u-type-warning-light-bg {
+	background-color: $u-type-warning-light;
+}
+
+.u-type-success-light-bg {
+	background-color: $u-type-success-light;
+}
+
+.u-type-error-light-bg {
+	background-color: $u-type-error-light;
+}
+
+.u-type-info-light-bg {
+	background-color: $u-type-info-light;
+}
+
+.u-type-primary-dark {
+	color: $u-type-primary-dark;
+}
+
+.u-type-warning-dark {
+	color: $u-type-warning-dark;
+}
+
+.u-type-success-dark {
+	color: $u-type-success-dark;
+}
+
+.u-type-error-dark {
+	color: $u-type-error-dark;
+}
+
+.u-type-info-dark {
+	color: $u-type-info-dark;
+}
+
+.u-type-primary-dark-bg {
+	background-color: $u-type-primary-dark;
+}
+
+.u-type-warning-dark-bg {
+	background-color: $u-type-warning-dark;
+}
+
+.u-type-success-dark-bg {
+	background-color: $u-type-success-dark;
+}
+
+.u-type-error-dark-bg {
+	background-color: $u-type-error-dark;
+}
+
+.u-type-info-dark-bg {
+	background-color: $u-type-info-dark;
+}
+
+.u-type-primary-disabled {
+	color: $u-type-primary-disabled;
+}
+
+.u-type-warning-disabled {
+	color: $u-type-warning-disabled;
+}
+
+.u-type-success-disabled {
+	color: $u-type-success-disabled;
+}
+
+.u-type-error-disabled {
+	color: $u-type-error-disabled;
+}
+
+.u-type-info-disabled {
+	color: $u-type-info-disabled;
+}
+
+.u-type-primary {
+	color: $u-type-primary;
+}
+
+.u-type-warning {
+	color: $u-type-warning;
+}
+
+.u-type-success {
+	color: $u-type-success;
+}
+
+.u-type-error {
+	color: $u-type-error;
+}
+
+.u-type-info {
+	color: $u-type-info;
+}
+
+.u-type-primary-bg {
+	background-color: $u-type-primary;
+}
+
+.u-type-warning-bg {
+	background-color: $u-type-warning;
+}
+
+.u-type-success-bg {
+	background-color: $u-type-success;
+}
+
+.u-type-error-bg {
+	background-color: $u-type-error;
+}
+
+.u-type-info-bg {
+	background-color: $u-type-info;
+}
+
+.u-main-color {
+	color: $u-main-color;
+}
+
+.u-content-color {
+	color: $u-content-color;
+}
+
+.u-tips-color {
+	color: $u-tips-color;
+}
+
+.u-light-color {
+	color: $u-light-color;
+}
diff --git a/uni_modules/vk-uview-ui/libs/css/common.scss b/uni_modules/vk-uview-ui/libs/css/common.scss
new file mode 100644
index 0000000..29eb7f4
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/common.scss
@@ -0,0 +1,176 @@
+.u-relative,
+.u-rela {
+	position: relative;
+}
+
+.u-absolute,
+.u-abso {
+	position: absolute;
+}
+
+// nvue不能用标签命名样式，不能放在微信组件中，否则微信开发工具会报警告，无法使用标签名当做选择器
+/* #ifndef APP-NVUE */
+image {
+	display: inline-block;
+}
+
+// 在weex，也即nvue中，所有元素默认为border-box
+view,
+text {
+	box-sizing: border-box;
+}
+/* #endif */
+
+.u-font-xs {
+	font-size: 22rpx;
+}
+
+.u-font-sm {
+	font-size: 26rpx;
+}
+
+.u-font-md {
+	font-size: 28rpx;
+}
+
+.u-font-lg {
+	font-size: 30rpx;
+}
+
+.u-font-xl {
+	font-size: 34rpx;
+}
+
+.u-flex {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+}
+
+.u-flex-wrap {
+	flex-wrap: wrap;
+}
+
+.u-flex-nowrap {
+	flex-wrap: nowrap;
+}
+
+.u-col-center {
+	align-items: center;
+}
+
+.u-col-top {
+	align-items: flex-start;
+}
+
+.u-col-bottom {
+	align-items: flex-end;
+}
+
+.u-row-center {
+	justify-content: center;
+}
+
+.u-row-left {
+	justify-content: flex-start;
+}
+
+.u-row-right {
+	justify-content: flex-end;
+}
+
+.u-row-between {
+	justify-content: space-between;
+}
+
+.u-row-around {
+	justify-content: space-around;
+}
+
+.u-text-left {
+	text-align: left;
+}
+
+.u-text-center {
+	text-align: center;
+}
+
+.u-text-right {
+	text-align: right;
+}
+
+.u-flex-col {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+// 定义flex等分
+@for $i from 0 through 12 {
+	.u-flex-#{$i} {
+		flex: $i;
+	}
+}
+
+// 定义字体(px)单位，小于20都为px单位字体
+@for $i from 9 to 20 {
+	.u-font-#{$i} {
+		font-size: $i + px;
+	}
+}
+
+// 定义字体(rpx)单位，大于或等于20的都为rpx单位字体
+@for $i from 20 through 40 {
+	.u-font-#{$i} {
+		font-size: $i + rpx;
+	}
+}
+
+// 定义内外边距，历遍1-80
+@for $i from 0 through 80 {
+	// 只要双数和能被5除尽的数
+	@if $i % 2 == 0 or $i % 5 == 0 {
+		// 得出：u-margin-30或者u-m-30
+		.u-margin-#{$i}, .u-m-#{$i} {
+			margin: $i + rpx!important;
+		}
+		
+		// 得出：u-padding-30或者u-p-30
+		.u-padding-#{$i}, .u-p-#{$i} {
+			padding: $i + rpx!important;
+		}
+		
+		@each $short, $long in l left, t top, r right, b bottom {
+			// 缩写版，结果如： u-m-l-30
+			// 定义外边距
+			.u-m-#{$short}-#{$i} {
+				margin-#{$long}: $i + rpx!important;
+			}
+			
+			// 定义内边距
+			.u-p-#{$short}-#{$i} {
+				padding-#{$long}: $i + rpx!important;
+			}
+			
+			// 完整版，结果如：u-margin-left-30
+			// 定义外边距
+			.u-margin-#{$long}-#{$i} {
+				margin-#{$long}: $i + rpx!important;
+			}
+			
+			// 定义内边距
+			.u-padding-#{$long}-#{$i} {
+				padding-#{$long}: $i + rpx!important;
+			}
+		}
+	}
+}
+
+// 重置nvue的默认关于flex的样式
+.u-reset-nvue {
+	flex-direction: row;
+	align-items: center;
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/css/style.components.scss b/uni_modules/vk-uview-ui/libs/css/style.components.scss
new file mode 100644
index 0000000..6835876
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/style.components.scss
@@ -0,0 +1,7 @@
+// 定义混入指令，用于在非nvue环境下的flex定义，因为nvue没有display属性，会报错
+@mixin vue-flex($direction: row) {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	flex-direction: $direction;
+	/* #endif */
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/css/style.h5.scss b/uni_modules/vk-uview-ui/libs/css/style.h5.scss
new file mode 100644
index 0000000..62839eb
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/style.h5.scss
@@ -0,0 +1,8 @@
+/* H5的时候，隐藏滚动条 */
+::-webkit-scrollbar {
+	display: none;  
+	width: 0 !important;  
+	height: 0 !important;  
+	-webkit-appearance: none;  
+	background: transparent;  
+}
diff --git a/uni_modules/vk-uview-ui/libs/css/style.mp.scss b/uni_modules/vk-uview-ui/libs/css/style.mp.scss
new file mode 100644
index 0000000..ca1d3e0
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/style.mp.scss
@@ -0,0 +1,72 @@
+/* start--微信小程序编译后页面有组件名的元素，特别处理--start */
+/* #ifdef MP-WEIXIN || MP-QQ */
+u-td, u-th {
+	flex: 1;
+	align-self: stretch;
+}
+
+.u-td {
+	height: 100%;
+}
+
+u-icon {
+	display: inline-flex;
+	align-items: center;
+}
+
+// 各家小程序宫格组件外层设置为100%，避免受到父元素display: flex;的影响
+u-grid {
+	width: 100%;
+	flex: 0 0 100%;
+}
+
+// 避免小程序线条组件因为父组件display: flex;而失效
+u-line {
+	flex: 1;
+}
+
+u-switch {
+	display: inline-flex;
+	align-items: center;
+}
+
+u-dropdown {
+	flex: 1;
+}
+/* #endif */
+/* end-微信小程序编译后页面有组件名的元素，特别处理--end */
+
+
+/* #ifdef MP-QQ || MP-TOUTIAO */
+// 需要做这一切额外的兼容，都是因为TX的无能
+u-icon {
+	line-height: 0;
+}
+/* #endif */
+
+/* start--头条小程序编译后页面有组件名的元素，特别处理--start */
+// 由于头条小程序不支持直接组件名形式写样式，目前只能在写组件的时候给组件加上对应的类名
+/* #ifdef MP-TOUTIAO */
+.u-td, .u-th, .u-tr {
+	flex: 1;
+	align-self: stretch;
+}
+
+.u-row, .u-col {
+	flex: 1;
+	align-self: stretch;
+}
+
+// 避免小程序线条组件因为父组件display: flex;而失效
+.u-line {
+	flex: 1;
+}
+
+.u-dropdown {
+	flex: 1;
+}
+/* #endif */
+/* end-头条小程序编译后页面有组件名的元素，特别处理--end */
+
+
+
diff --git a/uni_modules/vk-uview-ui/libs/css/style.nvue.scss b/uni_modules/vk-uview-ui/libs/css/style.nvue.scss
new file mode 100644
index 0000000..4a6192a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/style.nvue.scss
@@ -0,0 +1,3 @@
+.nvue {
+	font-size: 24rpx;
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/css/style.vue.scss b/uni_modules/vk-uview-ui/libs/css/style.vue.scss
new file mode 100644
index 0000000..1ab3707
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/css/style.vue.scss
@@ -0,0 +1,175 @@
+page {
+	color: $u-main-color;
+	font-size: 28rpx;
+}
+
+/* start--去除webkit的默认样式--start */
+.u-fix-ios-appearance {
+	-webkit-appearance:none;
+}
+/* end--去除webkit的默认样式--end */
+
+/* start--icon图标外层套一个view，让其达到更好的垂直居中的效果--start */
+.u-icon-wrap {
+	display: flex;
+	align-items: center;
+}
+/* end-icon图标外层套一个view，让其达到更好的垂直居中的效果--end */
+
+/* start--iPhoneX底部安全区定义--start */
+.safe-area-inset-bottom {
+  padding-bottom: 0;  
+  padding-bottom: constant(safe-area-inset-bottom);  
+  padding-bottom: env(safe-area-inset-bottom);  
+} 
+/* end-iPhoneX底部安全区定义--end */
+
+/* start--各种hover点击反馈相关的类名-start */
+.u-hover-class {
+	// background-color: #f7f8f9!important;
+	opacity: 0.6;
+}
+
+.u-cell-hover {
+	background-color: #f7f8f9!important;
+}
+/* end--各种hover点击反馈相关的类名--end */
+
+/* start--文本行数限制--start */
+.u-line-1 {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.u-line-2 {
+    -webkit-line-clamp: 2;
+}
+
+.u-line-3 {
+    -webkit-line-clamp: 3;
+}
+
+.u-line-4 {
+    -webkit-line-clamp: 4;
+}
+
+.u-line-5 {
+    -webkit-line-clamp: 5;
+}
+
+.u-line-2, .u-line-3, .u-line-4, .u-line-5 {
+    overflow: hidden;
+	word-break: break-all;
+    text-overflow: ellipsis; 
+    display: -webkit-box; // 弹性伸缩盒
+    -webkit-box-orient: vertical; // 设置伸缩盒子元素排列方式
+}
+
+/* end--文本行数限制--end */
+
+
+/* start--Retina 屏幕下的 1px 边框--start */
+.u-border,
+.u-border-bottom,
+.u-border-left,
+.u-border-right,
+.u-border-top,
+.u-border-top-bottom {
+	position: relative
+}
+
+.u-border-bottom:after,
+.u-border-left:after,
+.u-border-right:after,
+.u-border-top-bottom:after,
+.u-border-top:after,
+.u-border:after {
+	/* #ifndef APP-NVUE */
+	content: ' ';
+	/* #endif */
+	position: absolute;
+	left: 0;
+	top: 0;
+	pointer-events: none;
+	box-sizing: border-box;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	// 多加0.1%，能解决有时候边框缺失的问题
+	width: 199.8%;
+	height: 199.7%;
+	transform: scale(0.5, 0.5);
+	border: 0 solid $u-border-color;
+	z-index: 2;
+}
+
+.u-border-top:after {
+	border-top-width: 1px
+}
+
+.u-border-left:after {
+	border-left-width: 1px
+}
+
+.u-border-right:after {
+	border-right-width: 1px
+}
+
+.u-border-bottom:after {
+	border-bottom-width: 1px
+}
+
+.u-border-top-bottom:after {
+	border-width: 1px 0
+}
+
+.u-border:after {
+	border-width: 1px
+}
+/* end--Retina 屏幕下的 1px 边框--end */
+
+
+/* start--clearfix--start */
+.u-clearfix:after,
+.clearfix:after {
+	/* #ifndef APP-NVUE */
+	content: '';
+	/* #endif */
+	display: table;
+	clear: both
+}
+/* end--clearfix--end */
+
+/* start--高斯模糊tabbar底部处理--start */
+.u-blur-effect-inset {
+	width: 750rpx;  
+	height: var(--window-bottom);   
+	background-color: #FFFFFF;  
+}
+/* end--高斯模糊tabbar底部处理--end */
+
+/* start--提升H5端uni.toast()的层级，避免被uView的modal等遮盖--start */
+/* #ifdef H5 */
+uni-toast {
+    z-index: 10090;
+}
+uni-toast .uni-toast {
+   z-index: 10090;
+}
+/* #endif */
+/* end--提升H5端uni.toast()的层级，避免被uView的modal等遮盖--end */
+
+/* start--去除button的所有默认样式--start */
+.u-reset-button {
+	padding: 0;
+	font-size: inherit;
+	line-height: inherit;
+	background-color: transparent;
+	color: inherit;
+}
+
+.u-reset-button::after {
+   border: none;
+}
+/* end--去除button的所有默认样式--end */
+
diff --git a/uni_modules/vk-uview-ui/libs/function/$parent.js b/uni_modules/vk-uview-ui/libs/function/$parent.js
new file mode 100644
index 0000000..80515c4
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/$parent.js
@@ -0,0 +1,18 @@
+// 获取父组件的参数，因为支付宝小程序不支持provide/inject的写法
+// this.$parent在非H5中，可以准确获取到父组件，但是在H5中，需要多次this.$parent.$parent.xxx
+// 这里默认值等于undefined有它的含义，因为最顶层元素(组件)的$parent就是undefined，意味着不传name
+// 值(默认为undefined)，就是查找最顶层的$parent
+export default 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;
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/addStyle.js b/uni_modules/vk-uview-ui/libs/function/addStyle.js
new file mode 100644
index 0000000..62d8147
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/addStyle.js
@@ -0,0 +1,42 @@
+import test from './test.js'
+/**
+ * @description 样式转换
+ * 对象转字符串，或者字符串转对象
+ * @param {object | string} customStyle 需要转换的目标
+ * @param {String} target 转换的目的，object-转为对象，string-转为字符串
+ * @returns {object|string}
+ */
+function addStyle(customStyle, target = 'object') {
+	// 字符串转字符串，对象转对象情形，直接返回
+	if (test.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)
+}
+
+export default addStyle
diff --git a/uni_modules/vk-uview-ui/libs/function/addUnit.js b/uni_modules/vk-uview-ui/libs/function/addUnit.js
new file mode 100644
index 0000000..247fae2
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/addUnit.js
@@ -0,0 +1,8 @@
+import validation from './test.js';
+
+// 添加单位，如果有rpx，%，px等单位结尾或者值为auto，直接返回，否则加上rpx单位结尾
+export default function addUnit(value = 'auto', unit = 'rpx') {
+    value = String(value);
+	// 用uView内置验证规则中的number判断是否为数值
+    return validation.number(value) ? `${value}${unit}` : value;
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/bem.js b/uni_modules/vk-uview-ui/libs/function/bem.js
new file mode 100644
index 0000000..f3149d7
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/bem.js
@@ -0,0 +1,4 @@
+function bem(name, conf) {
+  
+}
+export default { bem }
diff --git a/uni_modules/vk-uview-ui/libs/function/color.js b/uni_modules/vk-uview-ui/libs/function/color.js
new file mode 100644
index 0000000..dafb8c1
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/color.js
@@ -0,0 +1,37 @@
+// 为了让用户能够自定义主题，会逐步弃用此文件，各颜色通过css提供
+// 为了给某些特殊场景使用和向后兼容，无需删除此文件(2020-06-20)
+let color = {
+	primary: "#2979ff",
+	primaryDark: "#2b85e4",
+	primaryDisabled: "#a0cfff",
+	primaryLight: "#ecf5ff",
+	bgColor: "#f3f4f6",
+	
+	info: "#909399",
+	infoDark: "#82848a",
+	infoDisabled: "#c8c9cc",
+	infoLight: "#f4f4f5",
+	
+	warning: "#ff9900",
+	warningDark: "#f29100",
+	warningDisabled: "#fcbd71",
+	warningLight: "#fdf6ec",
+	
+	error: "#fa3534",
+	errorDark: "#dd6161",
+	errorDisabled: "#fab6b6",
+	errorLight: "#fef0f0",
+	
+	success: "#19be6b",
+	successDark: "#18b566",
+	successDisabled: "#71d5a1",
+	successLight: "#dbf1e1",
+	
+	mainColor: "#303133",
+	contentColor: "#606266",
+	tipsColor: "#909399",
+	lightColor: "#c0c4cc",
+	borderColor: "#e4e7ed"
+}
+
+export default color;
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/colorGradient.js b/uni_modules/vk-uview-ui/libs/function/colorGradient.js
new file mode 100644
index 0000000..eca30a2
--- /dev/null
+++ b/uni_modules/vk-uview-ui/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) {
+	let startRGB = hexToRgb(startColor, false); //转换为rgb数组模式
+	let startR = startRGB[0];
+	let startG = startRGB[1];
+	let startB = startRGB[2];
+
+	let endRGB = hexToRgb(endColor, false);
+	let endR = endRGB[0];
+	let endG = endRGB[1];
+	let endB = endRGB[2];
+
+	let sR = (endR - startR) / step; //总差值
+	let sG = (endG - startG) / step;
+	let sB = (endB - startB) / step;
+	let 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)) + ')');
+		colorArr.push(hex);
+	}
+	return colorArr;
+}
+
+// 将hex表示方式转换为rgb表示方式(这里返回rgb数组模式)
+function hexToRgb(sColor, str = true) {
+	let reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+	sColor = 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;
+		}
+		//处理六位的颜色值
+		let sColorChange = [];
+		for (let i = 1; i < 7; i += 2) {
+			sColorChange.push(parseInt("0x" + sColor.slice(i, i + 2)));
+		}
+		if(!str) {
+			return sColorChange;
+		} else {
+			return `rgb(${sColorChange[0]},${sColorChange[1]},${sColorChange[2]})`;
+		}
+	} else if (/^(rgb|RGB)/.test(sColor)) {
+		let arr = sColor.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(",")
+		return arr.map(val => Number(val));
+	} else {
+		return sColor;
+	}
+};
+
+// 将rgb表示方式转换为hex表示方式
+function rgbToHex(rgb) {
+	let _this = rgb;
+	let reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+	if (/^(rgb|RGB)/.test(_this)) {
+		let 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;
+	} else if (reg.test(_this)) {
+		let aNum = _this.replace(/#/, "").split("");
+		if (aNum.length === 6) {
+			return _this;
+		} else 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 = 0.3) {
+	color = rgbToHex(color)
+	// 十六进制颜色值的正则表达式
+	var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
+	/* 16进制颜色转为RGB格式 */
+	let sColor = color.toLowerCase()
+	if (sColor && reg.test(sColor)) {
+		if (sColor.length === 4) {
+			var sColorNew = '#'
+			for (let i = 1; i < 4; i += 1) {
+				sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
+			}
+			sColor = sColorNew
+		}
+		// 处理六位的颜色值
+		var 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 + ')'
+	} 
+	else {
+		return sColor
+	}
+}
+
+export default {
+	colorGradient,
+	hexToRgb,
+	rgbToHex,
+	colorToRgba
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/debounce.js b/uni_modules/vk-uview-ui/libs/function/debounce.js
new file mode 100644
index 0000000..4f1027b
--- /dev/null
+++ b/uni_modules/vk-uview-ui/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) {
+		var callNow = !timeout;
+		timeout = setTimeout(function() {
+			timeout = null;
+		}, wait);
+		if (callNow) typeof func === 'function' && func();
+	} else {
+		// 设置定时器，当最后一次操作后，timeout不会再被清除，所以在延时wait毫秒后执行func回调方法
+		timeout = setTimeout(function() {
+			typeof func === 'function' && func();
+		}, wait);
+	}
+}
+
+export default debounce
diff --git a/uni_modules/vk-uview-ui/libs/function/deepClone.js b/uni_modules/vk-uview-ui/libs/function/deepClone.js
new file mode 100644
index 0000000..3db999a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/deepClone.js
@@ -0,0 +1,23 @@
+// 判断arr是否为一个数组，返回一个bool值
+function isArray (arr) {
+    return Object.prototype.toString.call(arr) === '[object Array]';
+}
+
+// 深度克隆
+function deepClone (obj) {
+	// 对常见的“非”值，直接返回原来值
+	if([null, undefined, NaN, false].includes(obj)) return obj;
+    if(typeof obj !== "object" && typeof obj !== 'function') {
+		//原始类型直接返回
+        return obj;
+    }
+    var o = isArray(obj) ? [] : {};
+    for(let i in obj) {
+        if(obj.hasOwnProperty(i)){
+            o[i] = typeof obj[i] === "object" ? deepClone(obj[i]) : obj[i];
+        }
+    }
+    return o;
+}
+
+export default deepClone;
diff --git a/uni_modules/vk-uview-ui/libs/function/deepMerge.js b/uni_modules/vk-uview-ui/libs/function/deepMerge.js
new file mode 100644
index 0000000..81d2d18
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/deepMerge.js
@@ -0,0 +1,30 @@
+import deepClone from "./deepClone";
+
+// JS对象深度合并
+function deepMerge(target = {}, source = {}) {
+	target = deepClone(target);
+	if (typeof target !== 'object' || typeof source !== 'object') return false;
+	for (var prop in source) {
+		if (!source.hasOwnProperty(prop)) continue;
+		if (prop in target) {
+			if (typeof target[prop] !== 'object') {
+				target[prop] = source[prop];
+			} else {
+				if (typeof source[prop] !== 'object') {
+					target[prop] = source[prop];
+				} else {
+					if (target[prop].concat && source[prop].concat) {
+						target[prop] = target[prop].concat(source[prop]);
+					} else {
+						target[prop] = deepMerge(target[prop], source[prop]);
+					}
+				}
+			}
+		} else {
+			target[prop] = source[prop];
+		}
+	}
+	return target;
+}
+
+export default deepMerge;
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/getParent.js b/uni_modules/vk-uview-ui/libs/function/getParent.js
new file mode 100644
index 0000000..9cb45c4
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/getParent.js
@@ -0,0 +1,47 @@
+// 获取父组件的参数，因为支付宝小程序不支持provide/inject的写法
+// this.$parent在非H5中，可以准确获取到父组件，但是在H5中，需要多次this.$parent.$parent.xxx
+export default function getParent(name, keys) {
+	let parent = this.$parent;
+	// 通过while历遍，这里主要是为了H5需要多层解析的问题
+	while (parent) {
+		// 父组件
+		if (parent.$options.name !== name) {
+			// 如果组件的name不相等，继续上一级寻找
+			parent = parent.$parent;
+		} else {
+			let data = {};
+			// 判断keys是否数组，如果传过来的是一个数组，那么直接使用数组元素值当做键值去父组件寻找
+			if(Array.isArray(keys)) {
+				keys.map(val => {
+					data[val] = parent[val] ? parent[val] : '';
+				})
+			} else {
+				// 历遍传过来的对象参数
+				for(let i in keys) {
+					// 如果子组件有此值则用，无此值则用父组件的值
+					// 判断是否空数组，如果是，则用父组件的值，否则用子组件的值
+					if(Array.isArray(keys[i])) {
+						if(keys[i].length) {
+							data[i] = keys[i];
+						} else {
+							data[i] = parent[i];
+						}
+					} else if(keys[i].constructor === Object) {
+						// 判断是否对象，如果是对象，且有属性，那么使用子组件的值，否则使用父组件的值
+						if(Object.keys(keys[i]).length) {
+							data[i] = keys[i];
+						} else {
+							data[i] = parent[i];
+						}
+					} else {
+						// 只要子组件有传值，即使是false值，也是“传值”了，也需要覆盖父组件的同名参数
+						data[i] = (keys[i] || keys[i] === false) ? keys[i] : parent[i];
+					}
+				}
+			}
+			return data;
+		}
+	}
+
+	return {};
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/guid.js b/uni_modules/vk-uview-ui/libs/function/guid.js
new file mode 100644
index 0000000..8497664
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/guid.js
@@ -0,0 +1,41 @@
+/**
+ * 本算法来源于简书开源代码，详见：https://www.jianshu.com/p/fdbf293d0a85
+ * 全局唯一标识符（uuid，Globally Unique Identifier）,也称作 uuid(Universally Unique IDentifier) 
+ * 一般用于多个组件之间,给它一个唯一的标识符,或者v-for循环的时候,如果使用数组的index可能会导致更新列表出现问题
+ * 最可能的情况是左滑删除item或者对某条信息流"不喜欢"并去掉它的时候,会导致组件内的数据可能出现错乱
+ * v-for的时候,推荐使用后端返回的id而不是循环的index
+ * @param {Number} len uuid的长度
+ * @param {Boolean} firstU 将返回的首字母置为"u"
+ * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
+ */
+function guid(len = 32, firstU = true, radix = null) {
+	let chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+	let 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('');
+	} else {
+		return uuid.join('');
+	}
+}
+
+export default guid;
diff --git a/uni_modules/vk-uview-ui/libs/function/md5.js b/uni_modules/vk-uview-ui/libs/function/md5.js
new file mode 100644
index 0000000..786dd40
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/md5.js
@@ -0,0 +1,385 @@
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+var hexcase = 0;   /* hex output format. 0 - lowercase; 1 - uppercase        */
+var b64pad  = "";  /* base-64 pad character. "=" for strict RFC compliance   */
+
+/*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+function hex_md5(s)    { return rstr2hex(rstr_md5(str2rstr_utf8(s))); }
+function b64_md5(s)    { return rstr2b64(rstr_md5(str2rstr_utf8(s))); }
+function any_md5(s, e) { return rstr2any(rstr_md5(str2rstr_utf8(s)), e); }
+function hex_hmac_md5(k, d)
+  { return rstr2hex(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
+function b64_hmac_md5(k, d)
+  { return rstr2b64(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
+function any_hmac_md5(k, d, e)
+  { return rstr2any(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d)), e); }
+
+/*
+ * Perform a simple self-test to see if the VM is working
+ */
+function md5_vm_test()
+{
+  return hex_md5("abc").toLowerCase() == "900150983cd24fb0d6963f7d28e17f72";
+}
+
+/*
+ * Calculate the MD5 of a raw string
+ */
+function rstr_md5(s)
+{
+  return binl2rstr(binl_md5(rstr2binl(s), s.length * 8));
+}
+
+/*
+ * Calculate the HMAC-MD5, of a key and some data (raw strings)
+ */
+function rstr_hmac_md5(key, data)
+{
+  var bkey = rstr2binl(key);
+  if(bkey.length > 16) bkey = binl_md5(bkey, key.length * 8);
+
+  var ipad = Array(16), opad = Array(16);
+  for(var i = 0; i < 16; i++)
+  {
+    ipad[i] = bkey[i] ^ 0x36363636;
+    opad[i] = bkey[i] ^ 0x5C5C5C5C;
+  }
+
+  var hash = binl_md5(ipad.concat(rstr2binl(data)), 512 + data.length * 8);
+  return binl2rstr(binl_md5(opad.concat(hash), 512 + 128));
+}
+
+/*
+ * Convert a raw string to a hex string
+ */
+function rstr2hex(input)
+{
+  try { hexcase } catch(e) { hexcase=0; }
+  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+  var output = "";
+  var x;
+  for(var i = 0; i < input.length; i++)
+  {
+    x = input.charCodeAt(i);
+    output += hex_tab.charAt((x >>> 4) & 0x0F)
+           +  hex_tab.charAt( x        & 0x0F);
+  }
+  return output;
+}
+
+/*
+ * Convert a raw string to a base-64 string
+ */
+function rstr2b64(input)
+{
+  try { b64pad } catch(e) { b64pad=''; }
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  var output = "";
+  var len = input.length;
+  for(var i = 0; i < len; i += 3)
+  {
+    var triplet = (input.charCodeAt(i) << 16)
+                | (i + 1 < len ? input.charCodeAt(i+1) << 8 : 0)
+                | (i + 2 < len ? input.charCodeAt(i+2)      : 0);
+    for(var j = 0; j < 4; j++)
+    {
+      if(i * 8 + j * 6 > input.length * 8) output += b64pad;
+      else output += tab.charAt((triplet >>> 6*(3-j)) & 0x3F);
+    }
+  }
+  return output;
+}
+
+/*
+ * Convert a raw string to an arbitrary string encoding
+ */
+function rstr2any(input, encoding)
+{
+  var divisor = encoding.length;
+  var i, j, q, x, quotient;
+
+  /* Convert to an array of 16-bit big-endian values, forming the dividend */
+  var dividend = Array(Math.ceil(input.length / 2));
+  for(i = 0; i < dividend.length; i++)
+  {
+    dividend[i] = (input.charCodeAt(i * 2) << 8) | input.charCodeAt(i * 2 + 1);
+  }
+
+  /*
+   * Repeatedly perform a long division. The binary array forms the dividend,
+   * the length of the encoding is the divisor. Once computed, the quotient
+   * forms the dividend for the next step. All remainders are stored for later
+   * use.
+   */
+  var full_length = Math.ceil(input.length * 8 /
+                                    (Math.log(encoding.length) / Math.log(2)));
+  var remainders = Array(full_length);
+  for(j = 0; j < full_length; j++)
+  {
+    quotient = Array();
+    x = 0;
+    for(i = 0; i < dividend.length; i++)
+    {
+      x = (x << 16) + dividend[i];
+      q = Math.floor(x / divisor);
+      x -= q * divisor;
+      if(quotient.length > 0 || q > 0)
+        quotient[quotient.length] = q;
+    }
+    remainders[j] = x;
+    dividend = quotient;
+  }
+
+  /* Convert the remainders to the output string */
+  var output = "";
+  for(i = remainders.length - 1; i >= 0; i--)
+    output += encoding.charAt(remainders[i]);
+
+  return output;
+}
+
+/*
+ * Encode a string as utf-8.
+ * For efficiency, this assumes the input is valid utf-16.
+ */
+function str2rstr_utf8(input)
+{
+  var output = "";
+  var i = -1;
+  var x, y;
+
+  while(++i < input.length)
+  {
+    /* Decode utf-16 surrogate pairs */
+    x = input.charCodeAt(i);
+    y = i + 1 < input.length ? input.charCodeAt(i + 1) : 0;
+    if(0xD800 <= x && x <= 0xDBFF && 0xDC00 <= y && y <= 0xDFFF)
+    {
+      x = 0x10000 + ((x & 0x03FF) << 10) + (y & 0x03FF);
+      i++;
+    }
+
+    /* Encode output as utf-8 */
+    if(x <= 0x7F)
+      output += String.fromCharCode(x);
+    else if(x <= 0x7FF)
+      output += String.fromCharCode(0xC0 | ((x >>> 6 ) & 0x1F),
+                                    0x80 | ( x         & 0x3F));
+    else if(x <= 0xFFFF)
+      output += String.fromCharCode(0xE0 | ((x >>> 12) & 0x0F),
+                                    0x80 | ((x >>> 6 ) & 0x3F),
+                                    0x80 | ( x         & 0x3F));
+    else if(x <= 0x1FFFFF)
+      output += String.fromCharCode(0xF0 | ((x >>> 18) & 0x07),
+                                    0x80 | ((x >>> 12) & 0x3F),
+                                    0x80 | ((x >>> 6 ) & 0x3F),
+                                    0x80 | ( x         & 0x3F));
+  }
+  return output;
+}
+
+/*
+ * Encode a string as utf-16
+ */
+function str2rstr_utf16le(input)
+{
+  var output = "";
+  for(var i = 0; i < input.length; i++)
+    output += String.fromCharCode( input.charCodeAt(i)        & 0xFF,
+                                  (input.charCodeAt(i) >>> 8) & 0xFF);
+  return output;
+}
+
+function str2rstr_utf16be(input)
+{
+  var output = "";
+  for(var i = 0; i < input.length; i++)
+    output += String.fromCharCode((input.charCodeAt(i) >>> 8) & 0xFF,
+                                   input.charCodeAt(i)        & 0xFF);
+  return output;
+}
+
+/*
+ * Convert a raw string to an array of little-endian words
+ * Characters >255 have their high-byte silently ignored.
+ */
+function rstr2binl(input)
+{
+  var output = Array(input.length >> 2);
+  for(var i = 0; i < output.length; i++)
+    output[i] = 0;
+  for(var i = 0; i < input.length * 8; i += 8)
+    output[i>>5] |= (input.charCodeAt(i / 8) & 0xFF) << (i%32);
+  return output;
+}
+
+/*
+ * Convert an array of little-endian words to a string
+ */
+function binl2rstr(input)
+{
+  var output = "";
+  for(var i = 0; i < input.length * 32; i += 8)
+    output += String.fromCharCode((input[i>>5] >>> (i % 32)) & 0xFF);
+  return output;
+}
+
+/*
+ * Calculate the MD5 of an array of little-endian words, and a bit length.
+ */
+function binl_md5(x, len)
+{
+  /* append padding */
+  x[len >> 5] |= 0x80 << ((len) % 32);
+  x[(((len + 64) >>> 9) << 4) + 14] = len;
+
+  var a =  1732584193;
+  var b = -271733879;
+  var c = -1732584194;
+  var d =  271733878;
+
+  for(var i = 0; i < x.length; i += 16)
+  {
+    var olda = a;
+    var oldb = b;
+    var oldc = c;
+    var oldd = d;
+
+    a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
+    d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
+    c = md5_ff(c, d, a, b, x[i+ 2], 17,  606105819);
+    b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
+    a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
+    d = md5_ff(d, a, b, c, x[i+ 5], 12,  1200080426);
+    c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
+    b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
+    a = md5_ff(a, b, c, d, x[i+ 8], 7 ,  1770035416);
+    d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
+    c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
+    b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
+    a = md5_ff(a, b, c, d, x[i+12], 7 ,  1804603682);
+    d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
+    c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
+    b = md5_ff(b, c, d, a, x[i+15], 22,  1236535329);
+
+    a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
+    d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
+    c = md5_gg(c, d, a, b, x[i+11], 14,  643717713);
+    b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
+    a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
+    d = md5_gg(d, a, b, c, x[i+10], 9 ,  38016083);
+    c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
+    b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
+    a = md5_gg(a, b, c, d, x[i+ 9], 5 ,  568446438);
+    d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
+    c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
+    b = md5_gg(b, c, d, a, x[i+ 8], 20,  1163531501);
+    a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
+    d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
+    c = md5_gg(c, d, a, b, x[i+ 7], 14,  1735328473);
+    b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
+
+    a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
+    d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
+    c = md5_hh(c, d, a, b, x[i+11], 16,  1839030562);
+    b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
+    a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
+    d = md5_hh(d, a, b, c, x[i+ 4], 11,  1272893353);
+    c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
+    b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
+    a = md5_hh(a, b, c, d, x[i+13], 4 ,  681279174);
+    d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
+    c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
+    b = md5_hh(b, c, d, a, x[i+ 6], 23,  76029189);
+    a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
+    d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
+    c = md5_hh(c, d, a, b, x[i+15], 16,  530742520);
+    b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
+
+    a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
+    d = md5_ii(d, a, b, c, x[i+ 7], 10,  1126891415);
+    c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
+    b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
+    a = md5_ii(a, b, c, d, x[i+12], 6 ,  1700485571);
+    d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
+    c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
+    b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
+    a = md5_ii(a, b, c, d, x[i+ 8], 6 ,  1873313359);
+    d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
+    c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
+    b = md5_ii(b, c, d, a, x[i+13], 21,  1309151649);
+    a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
+    d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
+    c = md5_ii(c, d, a, b, x[i+ 2], 15,  718787259);
+    b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
+
+    a = safe_add(a, olda);
+    b = safe_add(b, oldb);
+    c = safe_add(c, oldc);
+    d = safe_add(d, oldd);
+  }
+  return Array(a, b, c, d);
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function md5_cmn(q, a, b, x, s, t)
+{
+  return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
+}
+function md5_ff(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+}
+function md5_gg(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+}
+function md5_hh(a, b, c, d, x, s, t)
+{
+  return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+}
+function md5_ii(a, b, c, d, x, s, t)
+{
+  return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+}
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y)
+{
+  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+  return (msw << 16) | (lsw & 0xFFFF);
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function bit_rol(num, cnt)
+{
+  return (num << cnt) | (num >>> (32 - cnt));
+}
+
+export default {
+	md5 : function(str){
+		return hex_md5(str);
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/queryParams.js b/uni_modules/vk-uview-ui/libs/function/queryParams.js
new file mode 100644
index 0000000..81c7e5e
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/queryParams.js
@@ -0,0 +1,58 @@
+/**
+ * 对象转url参数
+ * @param {*} data,对象
+ * @param {*} isPrefix,是否自动加上"?"
+ */
+function queryParams(data = {}, isPrefix = true, arrayFormat = 'brackets') {
+	let prefix = isPrefix ? '?' : ''
+	let _result = []
+	if (['indices', 'brackets', 'repeat', 'comma'].indexOf(arrayFormat) == -1) arrayFormat = 'brackets';
+	for (let key in data) {
+		let 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('&') : ''
+}
+
+export default queryParams;
diff --git a/uni_modules/vk-uview-ui/libs/function/random.js b/uni_modules/vk-uview-ui/libs/function/random.js
new file mode 100644
index 0000000..e155279
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/random.js
@@ -0,0 +1,10 @@
+function random(min, max) {
+	if (min >= 0 && max > 0 && max >= min) {
+		let gab = max - min + 1;
+		return Math.floor(Math.random() * gab + min);
+	} else {
+		return 0;
+	}
+}
+
+export default random;
diff --git a/uni_modules/vk-uview-ui/libs/function/randomArray.js b/uni_modules/vk-uview-ui/libs/function/randomArray.js
new file mode 100644
index 0000000..590a048
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/randomArray.js
@@ -0,0 +1,7 @@
+// 打乱数组
+function randomArray(array = []) {
+	// 原理是sort排序,Math.random()产生0<= x < 1之间的数,会导致x-0.05大于或者小于0
+	return array.sort(() => Math.random() - 0.5);
+}
+
+export default randomArray
diff --git a/uni_modules/vk-uview-ui/libs/function/route.js b/uni_modules/vk-uview-ui/libs/function/route.js
new file mode 100644
index 0000000..28a81b7
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/route.js
@@ -0,0 +1,122 @@
+/**
+ * 路由跳转方法，该方法相对于直接使用uni.xxx的好处是使用更加简单快捷
+ * 并且带有路由拦截功能
+ */
+
+class Router {
+	constructor() {
+		// 原始属性定义
+		this.config = {
+			type: 'navigateTo',
+			url: '',
+			delta: 1, // navigateBack页面后退时,回退的层数
+			params: {}, // 传递的参数
+			animationType: 'pop-in', // 窗口动画,只在APP有效
+			animationDuration: 300, // 窗口动画持续时间,单位毫秒,只在APP有效
+			intercept: false, // 是否需要拦截
+		}
+		// 因为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 = uni.$u.queryParams(params, false);
+			// 因为已有get参数,所以后面拼接的参数需要带上"&"隔开
+			return url += "&" + query
+		} else {
+			// 直接拼接参数，因为此处url中没有后面的query参数，也就没有"?/&"之类的符号
+			query = uni.$u.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 = uni.$u.deepClone(options, this.config)
+			// 否则正常使用mergeConfig中的url和params进行拼接
+			mergeConfig.url = this.mixinParam(options.url, options.params)
+		}
+		
+		if(params.intercept) {
+			this.config.intercept = params.intercept
+		}
+		// params参数也带给拦截器
+		mergeConfig.params = params
+		// 合并内外部参数
+		mergeConfig = uni.$u.deepMerge(this.config, mergeConfig)
+		// 判断用户是否定义了拦截器
+		if (typeof uni.$u.routeIntercept === 'function') {
+			// 定一个promise，根据用户执行resolve(true)或者resolve(false)来决定是否进行路由跳转
+			const isNext = await new Promise((resolve, reject) => {
+				uni.$u.routeIntercept(mergeConfig, resolve)
+			})
+			// 如果isNext为true，则执行路由跳转
+			isNext && this.openPage(mergeConfig)
+		} else {
+			this.openPage(mergeConfig)
+		}
+	}
+
+	// 执行路由跳转
+	openPage(config) {
+		// 解构参数
+		const {
+			url,
+			type,
+			delta,
+			animationType,
+			animationDuration
+		} = config
+		if (config.type == 'navigateTo' || config.type == 'to') {
+			uni.navigateTo({
+				url,
+				animationType,
+				animationDuration
+			});
+		}
+		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/vk-uview-ui/libs/function/sys.js b/uni_modules/vk-uview-ui/libs/function/sys.js
new file mode 100644
index 0000000..00f6a28
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/sys.js
@@ -0,0 +1,9 @@
+export function os() {
+	return uni.getSystemInfoSync().platform;
+};
+
+export function sys() {
+	return uni.getSystemInfoSync();
+}
+
+
diff --git a/uni_modules/vk-uview-ui/libs/function/test.js b/uni_modules/vk-uview-ui/libs/function/test.js
new file mode 100644
index 0000000..9d584ed
--- /dev/null
+++ b/uni_modules/vk-uview-ui/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[23456789]\d{9}$/.test(value)
+}
+
+/**
+ * 验证URL格式
+ */
+function url(value) {
+	return /http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w-.\/?%&=]*)?/.test(value)
+}
+
+/**
+ * 验证日期格式
+ */
+function date(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{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value)
+}
+
+/**
+ * 验证整数
+ */
+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);
+	} else if (value.length === 8) {
+		return xreg.test(value);
+	} else {
+		return false;
+	}
+}
+
+/**
+ * 金额,只允许2位小数
+ */
+function amount(value) {
+	//金额，只允许保留两位小数
+	return /^[1-9]\d*(,\d{3})*(\.\d{1,2})?$|^0\.\d{1,2}$/.test(value);
+}
+
+/**
+ * 中文
+ */
+function chinese(value) {
+	let reg = /^[\u4e00-\u9fa5]+$/gi;
+	return reg.test(value);
+}
+
+/**
+ * 只能输入字母
+ */
+function letter(value) {
+	return /^[a-zA-Z]*$/.test(value);
+}
+
+/**
+ * 只能是字母或者数字
+ */
+function enOrNum(value) {
+	//英文或者数字
+	let 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) {
+	let 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 (0 === value || isNaN(value)) return true;
+			break;
+		case 'object':
+			if (null === value || value.length === 0) return true;
+			for (var i in value) {
+				return false;
+			}
+			return true;
+	}
+	return false;
+}
+
+/**
+ * 是否json字符串
+ */
+function jsonString(value) {
+	if (typeof value == 'string') {
+		try {
+			var obj = JSON.parse(value);
+			if (typeof obj == 'object' && obj) {
+				return true;
+			} else {
+				return false;
+			}
+		} catch (e) {
+			return false;
+		}
+	}
+	return false;
+}
+
+
+/**
+ * 是否数组
+ */
+function array(value) {
+	if (typeof Array.isArray === "function") {
+		return Array.isArray(value);
+	} else {
+		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];
+		return new RegExp(/\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg)$/).test(newValue);
+}
+
+/**
+ * 是否视频格式
+ * @param {Object} value
+ */
+function video(value) {
+	const newValue = value.split('?')[0];
+	return new RegExp(/\.(mp4|mpg|mpeg|dat|asf|avi|rm|rmvb|mov|wmv|flv|mkv|m3u8|3gp)$/).test(newValue);
+}
+
+/**
+ * 是否为正则对象
+ * @param {Object}
+ * @return {Boolean}
+ */
+function regExp(o) {
+		return o && Object.prototype.toString.call(o) === '[object RegExp]'
+}
+
+/**
+ * 验证字符串
+ */
+function string(value) {
+		return typeof value === 'string'
+}
+
+export default {
+	email,
+	mobile,
+	url,
+	date,
+	dateISO,
+	number,
+	digits,
+	idCard,
+	carNo,
+	amount,
+	chinese,
+	letter,
+	enOrNum,
+	contains,
+	range,
+	rangeLength,
+	empty,
+	isEmpty: empty,
+	jsonString,
+	landline,
+	object,
+	array,
+	code,
+	func,
+	promise,
+	video,
+	image,
+	regExp,
+	string
+}
diff --git a/uni_modules/vk-uview-ui/libs/function/throttle.js b/uni_modules/vk-uview-ui/libs/function/throttle.js
new file mode 100644
index 0000000..c5d28e3
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/throttle.js
@@ -0,0 +1,34 @@
+let timeoutArr = [];
+let flagArr = [];
+/**
+ * 节流函数
+ * 节流原理：在一定时间内，只能触发一次
+ * @param {Function} fn 要执行的回调函数 
+ * @param {Number} time 延时的时间
+ * @param {Boolean} isImmediate 是否立即执行
+ * @param {String} timeoutName 定时器ID
+ * @return null
+ */
+function throttle(fn, time = 500, isImmediate = true, timeoutName = "default") {
+	if(!timeoutArr[timeoutName]) timeoutArr[timeoutName] = null;
+	if (isImmediate) {
+		if (!flagArr[timeoutName]) {
+			flagArr[timeoutName] = true;
+			// 如果是立即执行，则在time毫秒内开始时执行
+			if(typeof fn === 'function') fn();
+			timeoutArr[timeoutName] = setTimeout(() => {
+				flagArr[timeoutName] = false;
+			}, time);
+		}
+	} else {
+		if (!flagArr[timeoutName]) {
+			flagArr[timeoutName] = true;
+			// 如果是非立即执行，则在time毫秒内的结束处执行
+			timeoutArr[timeoutName] = setTimeout(() => {
+				flagArr[timeoutName] = false;
+				if(typeof fn === 'function') fn();
+			}, time);
+		}
+	}
+};
+export default throttle
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/function/timeFormat.js b/uni_modules/vk-uview-ui/libs/function/timeFormat.js
new file mode 100644
index 0000000..0372f2f
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/timeFormat.js
@@ -0,0 +1,51 @@
+// 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')
+		let str = this
+		// 返回 String(str) 这里是为了使返回的值是字符串字面量，在控制台中更符合直觉
+		if (str.length >= maxLength) return String(str)
+
+		let fillLength = maxLength - str.length,
+			times = Math.ceil(fillLength / fillString.length)
+		while (times >>= 1) {
+			fillString += fillString
+			if (times === 1) {
+				fillString += fillString
+			}
+		}
+		return fillString.slice(0, fillLength) + str;
+	}
+}
+
+// 其他更多是格式化有如下:
+// yyyy:mm:dd|yyyy:mm|yyyy年mm月dd日|yyyy年mm月dd日 hh时MM分等,可自定义组合
+function timeFormat(dateTime = null, fmt = 'yyyy-mm-dd') {
+	// 如果为null,则格式化当前时间
+	if (!dateTime) dateTime = Number(new Date());
+	// 如果dateTime长度为10或者13，则为秒和毫秒的时间戳，如果超过13位，则为其他的时间格式
+	if (dateTime.toString().length == 10) dateTime *= 1000;
+	let date = new Date(dateTime);
+	let ret;
+	let opt = {
+		"y+": date.getFullYear().toString(), // 年
+		"m+": (date.getMonth() + 1).toString(), // 月
+		"d+": date.getDate().toString(), // 日
+		"h+": date.getHours().toString(), // 时
+		"M+": date.getMinutes().toString(), // 分
+		"s+": date.getSeconds().toString() // 秒
+		// 有其他格式化字符需求可以继续添加，必须转化成字符串
+	};
+	for (let k in opt) {
+		ret = new RegExp("(" + k + ")").exec(fmt);
+		if (ret) {
+			fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+		};
+	};
+	return fmt;
+}
+
+export default timeFormat
diff --git a/uni_modules/vk-uview-ui/libs/function/timeFrom.js b/uni_modules/vk-uview-ui/libs/function/timeFrom.js
new file mode 100644
index 0000000..68cd990
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/timeFrom.js
@@ -0,0 +1,47 @@
+import timeFormat from '../../libs/function/timeFormat.js';
+
+/**
+ * 时间戳转为多久之前
+ * @param String timestamp 时间戳
+ * @param String | Boolean format 如果为时间格式字符串，超出一定时间范围，返回固定的时间格式；
+ * 如果为布尔值false，无论什么时间，都返回多久以前的格式
+ */
+function timeFrom(dateTime = null, format = 'yyyy-mm-dd') {
+	// 如果为null,则格式化当前时间
+	if (!dateTime) dateTime = Number(new Date());
+	// 如果dateTime长度为10或者13，则为秒和毫秒的时间戳，如果超过13位，则为其他的时间格式
+	if (dateTime.toString().length == 10) dateTime *= 1000;
+	let timestamp = + new Date(Number(dateTime));
+
+	let timer = (Number(new Date()) - timestamp) / 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;
+}
+
+export default timeFrom;
diff --git a/uni_modules/vk-uview-ui/libs/function/toast.js b/uni_modules/vk-uview-ui/libs/function/toast.js
new file mode 100644
index 0000000..91afa73
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/toast.js
@@ -0,0 +1,9 @@
+function toast(title, duration = 1500) {
+	uni.showToast({
+		title: title,
+		icon: 'none',
+		duration: duration
+	})
+}
+
+export default toast
diff --git a/uni_modules/vk-uview-ui/libs/function/trim.js b/uni_modules/vk-uview-ui/libs/function/trim.js
new file mode 100644
index 0000000..72adc37
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/trim.js
@@ -0,0 +1,15 @@
+function trim(str, pos = 'both') {
+	if (pos == 'both') {
+		return str.replace(/^\s+|\s+$/g, "");
+	} else if (pos == "left") {
+		return str.replace(/^\s*/, '');
+	} else if (pos == 'right') {
+		return str.replace(/(\s*$)/g, "");
+	} else if (pos == 'all') {
+		return str.replace(/\s+/g, "");
+	} else {
+		return str;
+	}
+}
+
+export default trim
diff --git a/uni_modules/vk-uview-ui/libs/function/type2icon.js b/uni_modules/vk-uview-ui/libs/function/type2icon.js
new file mode 100644
index 0000000..23cb40e
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/function/type2icon.js
@@ -0,0 +1,35 @@
+/**
+ * 根据主题type值,获取对应的图标
+ * @param String type 主题名称,primary|info|error|warning|success
+ * @param String 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;
+}
+
+export default type2icon
diff --git a/uni_modules/vk-uview-ui/libs/mixin/mixin.js b/uni_modules/vk-uview-ui/libs/mixin/mixin.js
new file mode 100644
index 0000000..9f97371
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/mixin/mixin.js
@@ -0,0 +1,86 @@
+export default {
+	data() {
+		return {}
+	},
+	onLoad() {
+		// getRect挂载到$u上，因为这方法需要使用in(this)，所以无法把它独立成一个单独的文件导出
+		this.$u.getRect = this.$uGetRect
+	},
+	methods: {
+		// 查询节点信息
+		// 目前此方法在支付宝小程序中无法获取组件跟接点的尺寸，为支付宝的bug(2020-07-21)
+		// 解决办法为在组件根部再套一个没有任何作用的view元素
+		$uGetRect(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 = false;
+			// 这里的本质原理是，通过获取父组件实例(也即u-radio-group的this)
+			// 将父组件this中对应的参数，赋值给本组件(u-radio的this)的parentData对象中对应的属性
+			// 之所以需要这么做，是因为所有端中，头条小程序不支持通过this.parent.xxx去监听父组件参数的变化
+			this.parent = this.$u.$parent.call(this, parentName);
+			if(this.parent) {
+				// 历遍parentData中的属性，将parent中的同名属性赋值给parentData
+				Object.keys(this.parentData).map(key => {
+					this.parentData[key] = this.parent[key];
+				});
+				// #ifdef VUE3
+				this.parentData.value = this.parent.modelValue;
+				// #endif
+			}
+		},
+		// 阻止事件冒泡
+		preventEvent(e) {
+			e && e.stopPropagation && e.stopPropagation()
+		}
+	},
+	onReachBottom() {
+		uni.$emit('uOnReachBottom')
+	},
+  // #ifndef VUE3
+  beforeDestroy() {
+    // 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况
+    // 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱
+    if(this.parent && uni.$u.test.array(this.parent.children)) {
+    	// 组件销毁时，移除父组件中的children数组中对应的实例
+    	const childrenList = this.parent.children
+    	childrenList.map((child, index) => {
+    		// 如果相等，则移除
+    		if(child === this) {
+    			childrenList.splice(index, 1)
+    		}
+    	})
+    }
+  },
+  // #endif
+  
+  // #ifdef VUE3
+  beforeUnmount() {
+    // 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况
+    // 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱
+    if(this.parent && uni.$u.test.array(this.parent.children)) {
+    	// 组件销毁时，移除父组件中的children数组中对应的实例
+    	const childrenList = this.parent.children
+    	childrenList.map((child, index) => {
+    		// 如果相等，则移除
+    		if(child === this) {
+    			childrenList.splice(index, 1)
+    		}
+    	})
+    }
+  },
+  // #endif
+}
diff --git a/uni_modules/vk-uview-ui/libs/mixin/mpShare.js b/uni_modules/vk-uview-ui/libs/mixin/mpShare.js
new file mode 100644
index 0000000..aa9c2d7
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/mixin/mpShare.js
@@ -0,0 +1,18 @@
+export default {
+	onLoad() {
+		// 设置默认的转发参数
+		this.$u.mpShare = {
+			title: '', // 默认为小程序名称
+			path: '', // 默认为当前页面路径
+			imageUrl: '' // 默认为当前页面的截图
+		}
+	},
+	onShareAppMessage() {
+		return this.$u.mpShare
+	},
+	// #ifdef MP-WEIXIN
+	onShareTimeline() {
+		return this.$u.mpShare
+	}
+	// #endif
+}
diff --git a/uni_modules/vk-uview-ui/libs/request/index.js b/uni_modules/vk-uview-ui/libs/request/index.js
new file mode 100644
index 0000000..1f5f471
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/request/index.js
@@ -0,0 +1,169 @@
+import deepMerge from "../function/deepMerge";
+import validate from "../function/test";
+class Request {
+	// 设置全局默认配置
+	setConfig(customConfig) {
+		// 深度合并对象，否则会造成对象深层属性丢失
+		this.config = deepMerge(this.config, customConfig);
+	}
+
+	// 主要请求部分
+	request(options = {}) {
+		// 检查请求拦截
+		if (this.interceptor.request && typeof this.interceptor.request === 'function') {
+			let tmpConfig = {};
+			let interceptorRequest = this.interceptor.request(options);
+			if (interceptorRequest === false) {
+				// 返回一个处于pending状态中的Promise，来取消原promise，避免进入then()回调
+				return new Promise(()=>{});
+			}
+			this.options = interceptorRequest;
+		}
+		options.dataType = options.dataType || this.config.dataType;
+		options.responseType = options.responseType || this.config.responseType;
+		options.url = options.url || '';
+		options.params = options.params || {};
+		options.header = Object.assign({}, this.config.header, options.header);
+		options.method = options.method || this.config.method;
+
+		return new Promise((resolve, reject) => {
+			options.complete = (response) => {
+				// 请求返回后，隐藏loading(如果请求返回快的话，可能会没有loading)
+				uni.hideLoading();
+				// 清除定时器，如果请求回来了，就无需loading
+				clearTimeout(this.config.timer);
+				this.config.timer = null;
+				// 判断用户对拦截返回数据的要求，如果originalData为true，返回所有的数据(response)到拦截器，否则只返回response.data
+				if(this.config.originalData) {
+					// 判断是否存在拦截器
+					if (this.interceptor.response && typeof this.interceptor.response === 'function') {
+						let resInterceptors = this.interceptor.response(response);
+						// 如果拦截器不返回false，就将拦截器返回的内容给this.$u.post的then回调
+						if (resInterceptors !== false) {
+							resolve(resInterceptors);
+						} else {
+							// 如果拦截器返回false，意味着拦截器定义者认为返回有问题，直接接入catch回调
+							reject(response);
+						}
+					} else {
+						// 如果要求返回原始数据，就算没有拦截器，也返回最原始的数据
+						resolve(response);
+					}
+				} else {
+					if (response.statusCode == 200) {
+						if (this.interceptor.response && typeof this.interceptor.response === 'function') {
+							let resInterceptors = this.interceptor.response(response.data);
+							if (resInterceptors !== false) {
+								resolve(resInterceptors);
+							} else {
+								reject(response.data);
+							}
+						} else {
+							// 如果不是返回原始数据(originalData=false)，且没有拦截器的情况下，返回纯数据给then回调
+							resolve(response.data);
+						}
+					} else {
+						// 不返回原始数据的情况下，服务器状态码不为200，modal弹框提示
+						// if(response.errMsg) {
+						// 	uni.showModal({
+						// 		title: response.errMsg
+						// 	});
+						// }
+						reject(response)
+					}
+				}
+			}
+
+			// 判断用户传递的URL是否/开头,如果不是,加上/，这里使用了uView的test.js验证库的url()方法
+			options.url = validate.url(options.url) ? options.url : (this.config.baseUrl + (options.url.indexOf('/') == 0 ?
+				options.url : '/' + options.url));
+			
+			// 是否显示loading
+			// 加一个是否已有timer定时器的判断，否则有两个同时请求的时候，后者会清除前者的定时器id
+			// 而没有清除前者的定时器，导致前者超时，一直显示loading
+			if(this.config.showLoading && !this.config.timer) {
+				this.config.timer = setTimeout(() => {
+					uni.showLoading({
+						title: this.config.loadingText,
+						mask: this.config.loadingMask
+					})
+					this.config.timer = null;
+				}, this.config.loadingTime);
+			}
+			uni.request(options);
+		})
+		// .catch(res => {
+		// 	// 如果返回reject()，不让其进入this.$u.post().then().catch()后面的catct()
+		// 	// 因为很多人都会忘了写后面的catch()，导致报错捕获不到catch
+		// 	return new Promise(()=>{});
+		// })
+	}
+
+	constructor() {
+		this.config = {
+			baseUrl: '', // 请求的根域名
+			// 默认的请求头
+			header: {},
+			method: 'POST',
+			// 设置为json，返回后uni.request会对数据进行一次JSON.parse
+			dataType: 'json',
+			// 此参数无需处理，因为5+和支付宝小程序不支持，默认为text即可
+			responseType: 'text',
+			showLoading: true, // 是否显示请求中的loading
+			loadingText: '请求中...',
+			loadingTime: 800, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms
+			timer: null, // 定时器
+			originalData: false, // 是否在拦截器中返回服务端的原始数据，见文档说明
+			loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
+		}
+	
+		// 拦截器
+		this.interceptor = {
+			// 请求前的拦截
+			request: null,
+			// 请求后的拦截
+			response: null
+		}
+
+		// get请求
+		this.get = (url, data = {}, header = {}) => {
+			return this.request({
+				method: 'GET',
+				url,
+				header,
+				data
+			})
+		}
+
+		// post请求
+		this.post = (url, data = {}, header = {}) => {
+			return this.request({
+				url,
+				method: 'POST',
+				header,
+				data
+			})
+		}
+		
+		// put请求，不支持支付宝小程序(HX2.6.15)
+		this.put = (url, data = {}, header = {}) => {
+			return this.request({
+				url,
+				method: 'PUT',
+				header,
+				data
+			})
+		}
+		
+		// delete请求，不支持支付宝和头条小程序(HX2.6.15)
+		this.delete = (url, data = {}, header = {}) => {
+			return this.request({
+				url,
+				method: 'DELETE',
+				header,
+				data
+			})
+		}
+	}
+}
+export default new Request
diff --git a/uni_modules/vk-uview-ui/libs/store/index.js b/uni_modules/vk-uview-ui/libs/store/index.js
new file mode 100644
index 0000000..a5927b3
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/store/index.js
@@ -0,0 +1,19 @@
+// 暂时不用vuex模块方式实现，将该方法直接放入到/store/index.js中
+const module = {
+	actions: {
+		$uStore({rootState}, params) {
+			let nameArr = params.name.split('.');
+			if(nameArr.length >= 2) {
+				let obj = rootState[nameArr[0]];
+				for(let i = 1; i < nameArr.length - 1; i ++) {
+					obj = obj[nameArr[i]];
+				}
+				obj[nameArr[nameArr.length - 1]] = params.value;
+			} else {
+				rootState[params.name] = params.value;
+			}
+		}
+	}
+}
+
+export default module
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/libs/util/async-validator.js b/uni_modules/vk-uview-ui/libs/util/async-validator.js
new file mode 100644
index 0000000..d7215b9
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/util/async-validator.js
@@ -0,0 +1,1356 @@
+function _extends() {
+	_extends = Object.assign || function(target) {
+		for (var i = 1; i < arguments.length; i++) {
+			var source = arguments[i];
+
+			for (var key in source) {
+				if (Object.prototype.hasOwnProperty.call(source, key)) {
+					target[key] = source[key];
+				}
+			}
+		}
+
+		return target;
+	};
+
+	return _extends.apply(this, arguments);
+}
+
+/* eslint no-console:0 */
+var formatRegExp = /%[sdj%]/g;
+var warning = function warning() {}; // don't print warning message when in production env or node runtime
+
+if (typeof process !== 'undefined' && process.env && process.env.NODE_ENV !== 'production' && typeof window !==
+	'undefined' && typeof document !== 'undefined') {
+	warning = function warning(type, errors) {
+		if (typeof console !== 'undefined' && console.warn) {
+			if (errors.every(function(e) {
+					return typeof e === 'string';
+				})) {
+				console.warn(type, errors);
+			}
+		}
+	};
+}
+
+function convertFieldsError(errors) {
+	if (!errors || !errors.length) return null;
+	var fields = {};
+	errors.forEach(function(error) {
+		var field = error.field;
+		fields[field] = fields[field] || [];
+		fields[field].push(error);
+	});
+	return fields;
+}
+
+function format() {
+	for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+		args[_key] = arguments[_key];
+	}
+
+	var i = 1;
+	var f = args[0];
+	var len = args.length;
+
+	if (typeof f === 'function') {
+		return f.apply(null, args.slice(1));
+	}
+
+	if (typeof f === 'string') {
+		var str = String(f).replace(formatRegExp, function(x) {
+			if (x === '%%') {
+				return '%';
+			}
+
+			if (i >= len) {
+				return x;
+			}
+
+			switch (x) {
+				case '%s':
+					return String(args[i++]);
+
+				case '%d':
+					return Number(args[i++]);
+
+				case '%j':
+					try {
+						return JSON.stringify(args[i++]);
+					} catch (_) {
+						return '[Circular]';
+					}
+
+					break;
+
+				default:
+					return x;
+			}
+		});
+
+		for (var arg = args[i]; i < len; arg = args[++i]) {
+			str += " " + arg;
+		}
+
+		return str;
+	}
+
+	return f;
+}
+
+function isNativeStringType(type) {
+	return type === 'string' || type === 'url' || type === 'hex' || type === 'email' || type === 'pattern';
+}
+
+function isEmptyValue(value, type) {
+	if (value === undefined || value === null) {
+		return true;
+	}
+
+	if (type === 'array' && Array.isArray(value) && !value.length) {
+		return true;
+	}
+
+	if (isNativeStringType(type) && typeof value === 'string' && !value) {
+		return true;
+	}
+
+	return false;
+}
+
+function asyncParallelArray(arr, func, callback) {
+	var results = [];
+	var total = 0;
+	var arrLength = arr.length;
+
+	function count(errors) {
+		results.push.apply(results, errors);
+		total++;
+
+		if (total === arrLength) {
+			callback(results);
+		}
+	}
+
+	arr.forEach(function(a) {
+		func(a, count);
+	});
+}
+
+function asyncSerialArray(arr, func, callback) {
+	var index = 0;
+	var arrLength = arr.length;
+
+	function next(errors) {
+		if (errors && errors.length) {
+			callback(errors);
+			return;
+		}
+
+		var original = index;
+		index = index + 1;
+
+		if (original < arrLength) {
+			func(arr[original], next);
+		} else {
+			callback([]);
+		}
+	}
+
+	next([]);
+}
+
+function flattenObjArr(objArr) {
+	var ret = [];
+	Object.keys(objArr).forEach(function(k) {
+		ret.push.apply(ret, objArr[k]);
+	});
+	return ret;
+}
+
+function asyncMap(objArr, option, func, callback) {
+	if (option.first) {
+		var _pending = new Promise(function(resolve, reject) {
+			var next = function next(errors) {
+				callback(errors);
+				return errors.length ? reject({
+					errors: errors,
+					fields: convertFieldsError(errors)
+				}) : resolve();
+			};
+
+			var flattenArr = flattenObjArr(objArr);
+			asyncSerialArray(flattenArr, func, next);
+		});
+
+		_pending["catch"](function(e) {
+			return e;
+		});
+
+		return _pending;
+	}
+
+	var firstFields = option.firstFields || [];
+
+	if (firstFields === true) {
+		firstFields = Object.keys(objArr);
+	}
+
+	var objArrKeys = Object.keys(objArr);
+	var objArrLength = objArrKeys.length;
+	var total = 0;
+	var results = [];
+	var pending = new Promise(function(resolve, reject) {
+		var next = function next(errors) {
+			results.push.apply(results, errors);
+			total++;
+
+			if (total === objArrLength) {
+				callback(results);
+				return results.length ? reject({
+					errors: results,
+					fields: convertFieldsError(results)
+				}) : resolve();
+			}
+		};
+
+		if (!objArrKeys.length) {
+			callback(results);
+			resolve();
+		}
+
+		objArrKeys.forEach(function(key) {
+			var arr = objArr[key];
+
+			if (firstFields.indexOf(key) !== -1) {
+				asyncSerialArray(arr, func, next);
+			} else {
+				asyncParallelArray(arr, func, next);
+			}
+		});
+	});
+	pending["catch"](function(e) {
+		return e;
+	});
+	return pending;
+}
+
+function complementError(rule) {
+	return function(oe) {
+		if (oe && oe.message) {
+			oe.field = oe.field || rule.fullField;
+			return oe;
+		}
+
+		return {
+			message: typeof oe === 'function' ? oe() : oe,
+			field: oe.field || rule.fullField
+		};
+	};
+}
+
+function deepMerge(target, source) {
+	if (source) {
+		for (var s in source) {
+			if (source.hasOwnProperty(s)) {
+				var value = source[s];
+
+				if (typeof value === 'object' && typeof target[s] === 'object') {
+					target[s] = _extends({}, target[s], {}, value);
+				} else {
+					target[s] = value;
+				}
+			}
+		}
+	}
+
+	return target;
+}
+
+/**
+ *  Rule for validating required fields.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function required(rule, value, source, errors, options, type) {
+	if (rule.required && (!source.hasOwnProperty(rule.field) || isEmptyValue(value, type || rule.type))) {
+		errors.push(format(options.messages.required, rule.fullField));
+	}
+}
+
+/**
+ *  Rule for validating whitespace.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function whitespace(rule, value, source, errors, options) {
+	if (/^\s+$/.test(value) || value === '') {
+		errors.push(format(options.messages.whitespace, rule.fullField));
+	}
+}
+
+/* eslint max-len:0 */
+
+var pattern = {
+	// http://emailregex.com/
+	email: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
+	url: new RegExp(
+		"^(?!mailto:)(?:(?:http|https|ftp)://|//)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-*)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$",
+		'i'),
+	hex: /^#?([a-f0-9]{6}|[a-f0-9]{3})$/i
+};
+var types = {
+	integer: function integer(value) {
+		return types.number(value) && parseInt(value, 10) === value;
+	},
+	"float": function float(value) {
+		return types.number(value) && !types.integer(value);
+	},
+	array: function array(value) {
+		return Array.isArray(value);
+	},
+	regexp: function regexp(value) {
+		if (value instanceof RegExp) {
+			return true;
+		}
+
+		try {
+			return !!new RegExp(value);
+		} catch (e) {
+			return false;
+		}
+	},
+	date: function date(value) {
+		return typeof value.getTime === 'function' && typeof value.getMonth === 'function' && typeof value.getYear ===
+			'function';
+	},
+	number: function number(value) {
+		if (isNaN(value)) {
+			return false;
+		}
+
+		// 修改源码，将字符串数值先转为数值
+		return typeof +value === 'number';
+	},
+	object: function object(value) {
+		return typeof value === 'object' && !types.array(value);
+	},
+	method: function method(value) {
+		return typeof value === 'function';
+	},
+	email: function email(value) {
+		return typeof value === 'string' && !!value.match(pattern.email) && value.length < 255;
+	},
+	url: function url(value) {
+		return typeof value === 'string' && !!value.match(pattern.url);
+	},
+	hex: function hex(value) {
+		return typeof value === 'string' && !!value.match(pattern.hex);
+	}
+};
+/**
+ *  Rule for validating the type of a value.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function type(rule, value, source, errors, options) {
+	if (rule.required && value === undefined) {
+		required(rule, value, source, errors, options);
+		return;
+	}
+
+	var custom = ['integer', 'float', 'array', 'regexp', 'object', 'method', 'email', 'number', 'date', 'url', 'hex'];
+	var ruleType = rule.type;
+
+	if (custom.indexOf(ruleType) > -1) {
+		if (!types[ruleType](value)) {
+			errors.push(format(options.messages.types[ruleType], rule.fullField, rule.type));
+		} // straight typeof check
+
+	} else if (ruleType && typeof value !== rule.type) {
+		errors.push(format(options.messages.types[ruleType], rule.fullField, rule.type));
+	}
+}
+
+/**
+ *  Rule for validating minimum and maximum allowed values.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function range(rule, value, source, errors, options) {
+	var len = typeof rule.len === 'number';
+	var min = typeof rule.min === 'number';
+	var max = typeof rule.max === 'number'; // 正则匹配码点范围从U+010000一直到U+10FFFF的文字（补充平面Supplementary Plane）
+
+	var spRegexp = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
+	var val = value;
+	var key = null;
+	var num = typeof value === 'number';
+	var str = typeof value === 'string';
+	var arr = Array.isArray(value);
+
+	if (num) {
+		key = 'number';
+	} else if (str) {
+		key = 'string';
+	} else if (arr) {
+		key = 'array';
+	} // if the value is not of a supported type for range validation
+	// the validation rule rule should use the
+	// type property to also test for a particular type
+
+
+	if (!key) {
+		return false;
+	}
+
+	if (arr) {
+		val = value.length;
+	}
+
+	if (str) {
+		// 处理码点大于U+010000的文字length属性不准确的bug，如"𠮷𠮷𠮷".lenght !== 3
+		val = value.replace(spRegexp, '_').length;
+	}
+
+	if (len) {
+		if (val !== rule.len) {
+			errors.push(format(options.messages[key].len, rule.fullField, rule.len));
+		}
+	} else if (min && !max && val < rule.min) {
+		errors.push(format(options.messages[key].min, rule.fullField, rule.min));
+	} else if (max && !min && val > rule.max) {
+		errors.push(format(options.messages[key].max, rule.fullField, rule.max));
+	} else if (min && max && (val < rule.min || val > rule.max)) {
+		errors.push(format(options.messages[key].range, rule.fullField, rule.min, rule.max));
+	}
+}
+
+var ENUM = 'enum';
+/**
+ *  Rule for validating a value exists in an enumerable list.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function enumerable(rule, value, source, errors, options) {
+	rule[ENUM] = Array.isArray(rule[ENUM]) ? rule[ENUM] : [];
+
+	if (rule[ENUM].indexOf(value) === -1) {
+		errors.push(format(options.messages[ENUM], rule.fullField, rule[ENUM].join(', ')));
+	}
+}
+
+/**
+ *  Rule for validating a regular expression pattern.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param source The source object being validated.
+ *  @param errors An array of errors that this rule may add
+ *  validation errors to.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function pattern$1(rule, value, source, errors, options) {
+	if (rule.pattern) {
+		if (rule.pattern instanceof RegExp) {
+			// if a RegExp instance is passed, reset `lastIndex` in case its `global`
+			// flag is accidentally set to `true`, which in a validation scenario
+			// is not necessary and the result might be misleading
+			rule.pattern.lastIndex = 0;
+
+			if (!rule.pattern.test(value)) {
+				errors.push(format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
+			}
+		} else if (typeof rule.pattern === 'string') {
+			var _pattern = new RegExp(rule.pattern);
+
+			if (!_pattern.test(value)) {
+				errors.push(format(options.messages.pattern.mismatch, rule.fullField, value, rule.pattern));
+			}
+		}
+	}
+}
+
+var rules = {
+	required: required,
+	whitespace: whitespace,
+	type: type,
+	range: range,
+	"enum": enumerable,
+	pattern: pattern$1
+};
+
+/**
+ *  Performs validation for string types.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function string(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, 'string') && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options, 'string');
+
+		if (!isEmptyValue(value, 'string')) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+			rules.pattern(rule, value, source, errors, options);
+
+			if (rule.whitespace === true) {
+				rules.whitespace(rule, value, source, errors, options);
+			}
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a function.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function method(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a number.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function number(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (value === '') {
+			value = undefined;
+		}
+
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a boolean.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function _boolean(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates the regular expression type.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function regexp(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (!isEmptyValue(value)) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a number is an integer.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function integer(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a number is a floating point number.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function floatFn(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates an array.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function array(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, 'array') && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options, 'array');
+
+		if (!isEmptyValue(value, 'array')) {
+			rules.type(rule, value, source, errors, options);
+			rules.range(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates an object.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function object(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+var ENUM$1 = 'enum';
+/**
+ *  Validates an enumerable list.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function enumerable$1(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (value !== undefined) {
+			rules[ENUM$1](rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Validates a regular expression pattern.
+ *
+ *  Performs validation when a rule only contains
+ *  a pattern property but is not declared as a string type.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function pattern$2(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, 'string') && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (!isEmptyValue(value, 'string')) {
+			rules.pattern(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+function date(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field); 
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+
+		if (!isEmptyValue(value)) {
+			var dateObject;
+
+			if (typeof value === 'number') {
+				dateObject = new Date(value);
+			} else {
+				dateObject = value;
+			}
+
+			rules.type(rule, dateObject, source, errors, options);
+
+			if (dateObject) {
+				rules.range(rule, dateObject.getTime(), source, errors, options);
+			}
+		}
+	}
+
+	callback(errors);
+}
+
+function required$1(rule, value, callback, source, options) {
+	var errors = [];
+	var type = Array.isArray(value) ? 'array' : typeof value;
+	rules.required(rule, value, source, errors, options, type);
+	callback(errors);
+}
+
+function type$1(rule, value, callback, source, options) {
+	var ruleType = rule.type;
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value, ruleType) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options, ruleType);
+
+		if (!isEmptyValue(value, ruleType)) {
+			rules.type(rule, value, source, errors, options);
+		}
+	}
+
+	callback(errors);
+}
+
+/**
+ *  Performs validation for any type.
+ *
+ *  @param rule The validation rule.
+ *  @param value The value of the field on the source object.
+ *  @param callback The callback function.
+ *  @param source The source object being validated.
+ *  @param options The validation options.
+ *  @param options.messages The validation messages.
+ */
+
+function any(rule, value, callback, source, options) {
+	var errors = [];
+	var validate = rule.required || !rule.required && source.hasOwnProperty(rule.field);
+
+	if (validate) {
+		if (isEmptyValue(value) && !rule.required) {
+			return callback();
+		}
+
+		rules.required(rule, value, source, errors, options);
+	}
+
+	callback(errors);
+}
+
+var validators = {
+	string: string,
+	method: method,
+	number: number,
+	"boolean": _boolean,
+	regexp: regexp,
+	integer: integer,
+	"float": floatFn,
+	array: array,
+	object: object,
+	"enum": enumerable$1,
+	pattern: pattern$2,
+	date: date,
+	url: type$1,
+	hex: type$1,
+	email: type$1,
+	required: required$1,
+	any: any
+};
+
+function newMessages() {
+	return {
+		"default": 'Validation error on field %s',
+		required: '%s is required',
+		"enum": '%s must be one of %s',
+		whitespace: '%s cannot be empty',
+		date: {
+			format: '%s date %s is invalid for format %s',
+			parse: '%s date could not be parsed, %s is invalid ',
+			invalid: '%s date %s is invalid'
+		},
+		types: {
+			string: '%s is not a %s',
+			method: '%s is not a %s (function)',
+			array: '%s is not an %s',
+			object: '%s is not an %s',
+			number: '%s is not a %s',
+			date: '%s is not a %s',
+			"boolean": '%s is not a %s',
+			integer: '%s is not an %s',
+			"float": '%s is not a %s',
+			regexp: '%s is not a valid %s',
+			email: '%s is not a valid %s',
+			url: '%s is not a valid %s',
+			hex: '%s is not a valid %s'
+		},
+		string: {
+			len: '%s must be exactly %s characters',
+			min: '%s must be at least %s characters',
+			max: '%s cannot be longer than %s characters',
+			range: '%s must be between %s and %s characters'
+		},
+		number: {
+			len: '%s must equal %s',
+			min: '%s cannot be less than %s',
+			max: '%s cannot be greater than %s',
+			range: '%s must be between %s and %s'
+		},
+		array: {
+			len: '%s must be exactly %s in length',
+			min: '%s cannot be less than %s in length',
+			max: '%s cannot be greater than %s in length',
+			range: '%s must be between %s and %s in length'
+		},
+		pattern: {
+			mismatch: '%s value %s does not match pattern %s'
+		},
+		clone: function clone() {
+			var cloned = JSON.parse(JSON.stringify(this));
+			cloned.clone = this.clone;
+			return cloned;
+		}
+	};
+}
+var messages = newMessages();
+
+/**
+ *  Encapsulates a validation schema.
+ *
+ *  @param descriptor An object declaring validation rules
+ *  for this schema.
+ */
+
+function Schema(descriptor) {
+	this.rules = null;
+	this._messages = messages;
+	this.define(descriptor);
+}
+
+Schema.prototype = {
+	messages: function messages(_messages) {
+		if (_messages) {
+			this._messages = deepMerge(newMessages(), _messages);
+		}
+
+		return this._messages;
+	},
+	define: function define(rules) {
+		if (!rules) {
+			throw new Error('Cannot configure a schema with no rules');
+		}
+
+		if (typeof rules !== 'object' || Array.isArray(rules)) {
+			throw new Error('Rules must be an object');
+		}
+
+		this.rules = {};
+		var z;
+		var item;
+
+		for (z in rules) {
+			if (rules.hasOwnProperty(z)) {
+				item = rules[z];
+				this.rules[z] = Array.isArray(item) ? item : [item];
+			}
+		}
+	},
+	validate: function validate(source_, o, oc) {
+		var _this = this;
+
+		if (o === void 0) {
+			o = {};
+		}
+
+		if (oc === void 0) {
+			oc = function oc() {};
+		}
+
+		var source = source_;
+		var options = o;
+		var callback = oc;
+
+		if (typeof options === 'function') {
+			callback = options;
+			options = {};
+		}
+
+		if (!this.rules || Object.keys(this.rules).length === 0) {
+			if (callback) {
+				callback();
+			}
+
+			return Promise.resolve();
+		}
+
+		function complete(results) {
+			var i;
+			var errors = [];
+			var fields = {};
+
+			function add(e) {
+				if (Array.isArray(e)) {
+					var _errors;
+
+					errors = (_errors = errors).concat.apply(_errors, e);
+				} else {
+					errors.push(e);
+				}
+			}
+
+			for (i = 0; i < results.length; i++) {
+				add(results[i]);
+			}
+
+			if (!errors.length) {
+				errors = null;
+				fields = null;
+			} else {
+				fields = convertFieldsError(errors);
+			}
+
+			callback(errors, fields);
+		}
+
+		if (options.messages) {
+			var messages$1 = this.messages();
+
+			if (messages$1 === messages) {
+				messages$1 = newMessages();
+			}
+
+			deepMerge(messages$1, options.messages);
+			options.messages = messages$1;
+		} else {
+			options.messages = this.messages();
+		}
+
+		var arr;
+		var value;
+		var series = {};
+		var keys = options.keys || Object.keys(this.rules);
+		keys.forEach(function(z) {
+			arr = _this.rules[z];
+			value = source[z];
+			arr.forEach(function(r) {
+				var rule = r;
+
+				if (typeof rule.transform === 'function') {
+					if (source === source_) {
+						source = _extends({}, source);
+					}
+
+					value = source[z] = rule.transform(value);
+				}
+
+				if (typeof rule === 'function') {
+					rule = {
+						validator: rule
+					};
+				} else {
+					rule = _extends({}, rule);
+				}
+
+				rule.validator = _this.getValidationMethod(rule);
+				rule.field = z;
+				rule.fullField = rule.fullField || z;
+				rule.type = _this.getType(rule);
+
+				if (!rule.validator) {
+					return;
+				}
+
+				series[z] = series[z] || [];
+				series[z].push({
+					rule: rule,
+					value: value,
+					source: source,
+					field: z
+				});
+			});
+		});
+		var errorFields = {};
+		return asyncMap(series, options, function(data, doIt) {
+			var rule = data.rule;
+			var deep = (rule.type === 'object' || rule.type === 'array') && (typeof rule.fields === 'object' || typeof rule.defaultField ===
+				'object');
+			deep = deep && (rule.required || !rule.required && data.value);
+			rule.field = data.field;
+
+			function addFullfield(key, schema) {
+				return _extends({}, schema, {
+					fullField: rule.fullField + "." + key
+				});
+			}
+
+			function cb(e) {
+				if (e === void 0) {
+					e = [];
+				}
+
+				var errors = e;
+
+				if (!Array.isArray(errors)) {
+					errors = [errors];
+				}
+
+				if (!options.suppressWarning && errors.length) {
+					Schema.warning('async-validator:', errors);
+				}
+
+				if (errors.length && rule.message) {
+					errors = [].concat(rule.message);
+				}
+
+				errors = errors.map(complementError(rule));
+
+				if (options.first && errors.length) {
+					errorFields[rule.field] = 1;
+					return doIt(errors);
+				}
+
+				if (!deep) {
+					doIt(errors);
+				} else {
+					// if rule is required but the target object
+					// does not exist fail at the rule level and don't
+					// go deeper
+					if (rule.required && !data.value) {
+						if (rule.message) {
+							errors = [].concat(rule.message).map(complementError(rule));
+						} else if (options.error) {
+							errors = [options.error(rule, format(options.messages.required, rule.field))];
+						} else {
+							errors = [];
+						}
+
+						return doIt(errors);
+					}
+
+					var fieldsSchema = {};
+
+					if (rule.defaultField) {
+						for (var k in data.value) {
+							if (data.value.hasOwnProperty(k)) {
+								fieldsSchema[k] = rule.defaultField;
+							}
+						}
+					}
+
+					fieldsSchema = _extends({}, fieldsSchema, {}, data.rule.fields);
+
+					for (var f in fieldsSchema) {
+						if (fieldsSchema.hasOwnProperty(f)) {
+							var fieldSchema = Array.isArray(fieldsSchema[f]) ? fieldsSchema[f] : [fieldsSchema[f]];
+							fieldsSchema[f] = fieldSchema.map(addFullfield.bind(null, f));
+						}
+					}
+
+					var schema = new Schema(fieldsSchema);
+					schema.messages(options.messages);
+
+					if (data.rule.options) {
+						data.rule.options.messages = options.messages;
+						data.rule.options.error = options.error;
+					}
+
+					schema.validate(data.value, data.rule.options || options, function(errs) {
+						var finalErrors = [];
+
+						if (errors && errors.length) {
+							finalErrors.push.apply(finalErrors, errors);
+						}
+
+						if (errs && errs.length) {
+							finalErrors.push.apply(finalErrors, errs);
+						}
+
+						doIt(finalErrors.length ? finalErrors : null);
+					});
+				}
+			}
+
+			var res;
+
+			if (rule.asyncValidator) {
+				res = rule.asyncValidator(rule, data.value, cb, data.source, options);
+			} else if (rule.validator) {
+				res = rule.validator(rule, data.value, cb, data.source, options);
+
+				if (res === true) {
+					cb();
+				} else if (res === false) {
+					cb(rule.message || rule.field + " fails");
+				} else if (res instanceof Array) {
+					cb(res);
+				} else if (res instanceof Error) {
+					cb(res.message);
+				}
+			}
+
+			if (res && res.then) {
+				res.then(function() {
+					return cb();
+				}, function(e) {
+					return cb(e);
+				});
+			}
+		}, function(results) {
+			complete(results);
+		});
+	},
+	getType: function getType(rule) {
+		if (rule.type === undefined && rule.pattern instanceof RegExp) {
+			rule.type = 'pattern';
+		}
+
+		if (typeof rule.validator !== 'function' && rule.type && !validators.hasOwnProperty(rule.type)) {
+			throw new Error(format('Unknown rule type %s', rule.type));
+		}
+
+		return rule.type || 'string';
+	},
+	getValidationMethod: function getValidationMethod(rule) {
+		if (typeof rule.validator === 'function') {
+			return rule.validator;
+		}
+
+		var keys = Object.keys(rule);
+		var messageIndex = keys.indexOf('message');
+
+		if (messageIndex !== -1) {
+			keys.splice(messageIndex, 1);
+		}
+
+		if (keys.length === 1 && keys[0] === 'required') {
+			return validators.required;
+		}
+
+		return validators[this.getType(rule)] || false;
+	}
+};
+
+Schema.register = function register(type, validator) {
+	if (typeof validator !== 'function') {
+		throw new Error('Cannot register a validator by type, validator is not a function');
+	}
+
+	validators[type] = validator;
+};
+
+Schema.warning = warning;
+Schema.messages = messages;
+
+export default Schema;
+//# sourceMappingURL=index.js.map
diff --git a/uni_modules/vk-uview-ui/libs/util/emitter.js b/uni_modules/vk-uview-ui/libs/util/emitter.js
new file mode 100644
index 0000000..41f236a
--- /dev/null
+++ b/uni_modules/vk-uview-ui/libs/util/emitter.js
@@ -0,0 +1,64 @@
+/**
+ * 递归使用 call 方式this指向
+ * @param componentName // 需要找的组件的名称
+ * @param eventName // 事件名称
+ * @param params // 需要传递的参数
+ */
+function broadcast(componentName, eventName, params) {
+    // 循环子节点找到名称一样的子节点 否则 递归 当前子节点
+    var $children;
+    // #ifndef VUE3
+    $children = this.$children;
+    $children.map(child=>{
+      if (componentName===child.$options.name) {
+          child.$emit.apply(child,[eventName].concat(params))
+      }else {
+          broadcast.apply(child,[componentName,eventName].concat(params))
+      }
+    })
+    // #endif
+    // #ifdef VUE3
+    //$children = this.uForm.fields;
+    // #endif
+}
+export default {
+    methods: {
+        /**
+         * 派发 (向上查找) (一个)
+         * @param componentName // 需要找的组件的名称
+         * @param eventName // 事件名称
+         * @param params // 需要传递的参数
+         */
+        dispatch(componentName, eventName, params) {
+            let parent = this.$parent || this.$root;//$parent 找到最近的父节点 $root 根节点
+            let name = parent.$options.name; // 获取当前组件实例的name
+            // 如果当前有节点 && 当前没名称 且 当前名称等于需要传进来的名称的时候就去查找当前的节点
+            // 循环出当前名称的一样的组件实例
+            while (parent && (!name||name!==componentName)) {
+                parent = parent.$parent;
+                if (parent) {
+                    name = parent.$options.name;
+                }
+            }
+            // 有节点表示当前找到了name一样的实例
+            if (parent) {
+              // #ifndef VUE3
+              parent.$emit.apply(parent,[eventName].concat(params))
+              // #endif
+              
+              // #ifdef VUE3
+              parent[eventName](params)
+              // #endif
+            }
+        },
+        /**
+         * 广播 (向下查找) (广播多个)
+         * @param componentName // 需要找的组件的名称
+         * @param eventName // 事件名称
+         * @param params // 需要传递的参数
+         */
+        broadcast(componentName, eventName, params) {
+            broadcast.call(this,componentName, eventName, params)
+        }
+    }
+}
diff --git a/uni_modules/vk-uview-ui/package.json b/uni_modules/vk-uview-ui/package.json
new file mode 100644
index 0000000..3eb2282
--- /dev/null
+++ b/uni_modules/vk-uview-ui/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "vk-uview-ui",
+	"name": "vk-uview-ui",
+  "displayName": "【开箱即用】uView Vue3 横空出世，继承uView1意志，再战江湖，风云再起！",
+  "version": "1.5.2",
+  "description": "同时支持 Vue3.0 和 Vue2.0，你没看错，现在 uView 支持 Vue3.0 了！（不支持nvue，此版本为uView1.0的分支）",
+  "keywords": [
+    "vk-uview-ui",
+    "vk云开发",
+    "vue3.0",
+    "uniapp",
+    "uview"
+],
+  "repository": "https://gitee.com/vk-uni/vk-uview-ui.git",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": "https://vkuviewdoc.fsq.pub",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "n",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/vk-uview-ui/theme.scss b/uni_modules/vk-uview-ui/theme.scss
new file mode 100644
index 0000000..f3bb36d
--- /dev/null
+++ b/uni_modules/vk-uview-ui/theme.scss
@@ -0,0 +1,38 @@
+// 此文件为uView的主题变量，这些变量目前只能通过uni.scss引入才有效，另外由于
+// uni.scss中引入的样式会同时混入到全局样式文件和单独每一个页面的样式中，造成微信程序包太大，
+// 故uni.scss只建议放scss变量名相关样式，其他的样式可以通过main.js或者App.vue引入
+
+$u-main-color: #303133;
+$u-content-color: #606266;
+$u-tips-color: #909399;
+$u-light-color: #c0c4cc;
+$u-border-color: #e4e7ed;
+$u-bg-color: #f3f4f6;
+
+$u-type-primary: #2979ff;
+$u-type-primary-light: #ecf5ff;
+$u-type-primary-disabled: #a0cfff;
+$u-type-primary-dark: #2b85e4;
+
+$u-type-warning: #ff9900;
+$u-type-warning-disabled: #fcbd71;
+$u-type-warning-dark: #f29100;
+$u-type-warning-light: #fdf6ec;
+
+$u-type-success: #19be6b;
+$u-type-success-disabled: #71d5a1;
+$u-type-success-dark: #18b566;
+$u-type-success-light: #dbf1e1;
+
+$u-type-error: #fa3534;
+$u-type-error-disabled: #fab6b6;
+$u-type-error-dark: #dd6161;
+$u-type-error-light: #fef0f0;
+
+$u-type-info: #909399;
+$u-type-info-disabled: #c8c9cc;
+$u-type-info-dark: #82848a;
+$u-type-info-light: #f4f4f5;
+
+$u-form-item-height: 70rpx;
+$u-form-item-border-color: #dcdfe6;
diff --git a/uni_modules/z-paging/components/z-paging-cell/z-paging-cell.vue b/uni_modules/z-paging/components/z-paging-cell/z-paging-cell.vue
new file mode 100644
index 0000000..78ac633
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging-cell/z-paging-cell.vue
@@ -0,0 +1,39 @@
+<!-- z-paging -->
+<!-- github地址:https://github.com/SmileZXLee/uni-z-paging -->
+<!-- dcloud地址:https://ext.dcloud.net.cn/plugin?id=3935 -->
+<!-- 反馈QQ群：790460711 -->
+
+<!-- z-paging-cell，用于在nvue中使用cell包裹，vue中使用view包裹 -->
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell :style="[cellStyle]" @touchstart="onTouchstart">
+		<slot />
+	</cell>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<view :style="[cellStyle]" @touchstart="onTouchstart">
+		<slot />
+	</view>
+	<!-- #endif -->
+</template>
+
+<script>
+	export default {
+		name: "z-paging-cell",
+		props: {
+			//cellStyle
+			cellStyle: {
+				type: Object,
+				default: function() {
+                    return {}
+                }
+			}
+		},
+		methods: {
+			onTouchstart(e) {
+				this.$emit('touchstart', e);
+			}
+		}
+	}
+</script>
+
diff --git a/uni_modules/z-paging/components/z-paging-empty-view/z-paging-empty-view.vue b/uni_modules/z-paging/components/z-paging-empty-view/z-paging-empty-view.vue
new file mode 100644
index 0000000..31e3287
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging-empty-view/z-paging-empty-view.vue
@@ -0,0 +1,189 @@
+<!-- z-paging -->
+<!-- github地址:https://github.com/SmileZXLee/uni-z-paging -->
+<!-- dcloud地址:https://ext.dcloud.net.cn/plugin?id=3935 -->
+<!-- 反馈QQ群：790460711 -->
+
+<!-- 空数据占位view，此组件支持easycom规范，可以在项目中直接引用 -->
+<template>
+	<view :class="{'zp-container':true,'zp-container-fixed':emptyViewFixed}" :style="[finalEmptyViewStyle]" @click="emptyViewClick">
+		<view class="zp-main">
+			<image v-if="!emptyViewImg.length" :class="{'zp-main-image-rpx':unit==='rpx','zp-main-image-px':unit==='px'}" :style="[emptyViewImgStyle]" :src="emptyImg" />
+			<image v-else :class="{'zp-main-image-rpx':unit==='rpx','zp-main-image-px':unit==='px'}" mode="aspectFit" :style="[emptyViewImgStyle]" :src="emptyViewImg" />
+			<text class="zp-main-title" :class="{'zp-main-title-rpx':unit==='rpx','zp-main-title-px':unit==='px'}" :style="[emptyViewTitleStyle]">{{emptyViewText}}</text>
+			<text v-if="showEmptyViewReload" :class="{'zp-main-error-btn':true,'zp-main-error-btn-rpx':unit==='rpx','zp-main-error-btn-px':unit==='px'}" :style="[emptyViewReloadStyle]" @click.stop="reloadClick">{{emptyViewReloadText}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import zStatic from '../z-paging/js/z-paging-static'
+	export default {
+		name: "z-paging-empty-view",
+		data() {
+			return {
+				
+			};
+		},
+		props: {
+			// 空数据描述文字
+			emptyViewText: {
+				type: String,
+				default: '没有数据哦~'
+			},
+			// 空数据图片
+			emptyViewImg: {
+				type: String,
+				default: ''
+			},
+			// 是否显示空数据图重新加载按钮
+			showEmptyViewReload: {
+				type: Boolean,
+				default: false
+			},
+			// 空数据点击重新加载文字
+			emptyViewReloadText: {
+				type: String,
+				default: '重新加载'
+			},
+			// 是否是加载失败
+			isLoadFailed: {
+				type: Boolean,
+				default: false
+			},
+			// 空数据图样式
+			emptyViewStyle: {
+				type: Object,
+				default: function() {
+                    return {}
+                }
+			},
+			// 空数据图img样式
+			emptyViewImgStyle: {
+				type: Object,
+				default: function() {
+				    return {}
+				}
+			},
+			// 空数据图描述文字样式
+			emptyViewTitleStyle: {
+				type: Object,
+				default: function() {
+				    return {}
+				}
+			},
+			// 空数据图重新加载按钮样式
+			emptyViewReloadStyle: {
+				type: Object,
+				default: function() {
+				    return {}
+				}
+			},
+			// 空数据图z-index
+			emptyViewZIndex: {
+				type: Number,
+				default: 9
+			},
+			// 空数据图片是否使用fixed布局并铺满z-paging
+			emptyViewFixed: {
+				type: Boolean,
+				default: true
+			},
+			// 空数据图中布局的单位，默认为rpx
+			unit: {
+				type: String,
+				default: 'rpx'
+			}
+		},
+		computed: {
+			emptyImg() {
+                return this.isLoadFailed ? zStatic.base64Error : zStatic.base64Empty;
+			},
+			finalEmptyViewStyle(){
+				this.emptyViewStyle['z-index'] = this.emptyViewZIndex;
+				return this.emptyViewStyle;
+			}
+		},
+		methods: {
+			// 点击了reload按钮
+			reloadClick() {
+				this.$emit('reload');
+			},
+			// 点击了空数据view
+			emptyViewClick() {
+				this.$emit('viewClick');
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.zp-container{
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+	}
+	.zp-container-fixed {
+		/* #ifndef APP-NVUE */
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+	}
+
+	.zp-main{
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+        padding: 50rpx 0rpx;
+	}
+
+	.zp-main-image-rpx {
+		width: 240rpx;
+		height: 240rpx;
+	}
+	.zp-main-image-px {
+		width: 120px;
+		height: 120px;
+	}
+
+	.zp-main-title {
+		color: #aaaaaa;
+		text-align: center;
+	}
+	.zp-main-title-rpx {
+		font-size: 28rpx;
+		margin-top: 10rpx;
+		padding: 0rpx 20rpx;
+	}
+	.zp-main-title-px {
+		font-size: 14px;
+		margin-top: 5px;
+		padding: 0px 10px;
+	}
+
+	.zp-main-error-btn {
+		border: solid 1px #dddddd;
+		color: #aaaaaa;
+	}
+	.zp-main-error-btn-rpx {
+		font-size: 28rpx;
+		padding: 8rpx 24rpx;
+		border-radius: 6rpx;
+		margin-top: 50rpx;
+	}
+	.zp-main-error-btn-px {
+		font-size: 14px;
+		padding: 4px 12px;
+		border-radius: 3px;
+		margin-top: 25px;
+	}
+</style>
diff --git a/uni_modules/z-paging/components/z-paging-swiper-item/z-paging-swiper-item.vue b/uni_modules/z-paging/components/z-paging-swiper-item/z-paging-swiper-item.vue
new file mode 100644
index 0000000..64a7bb0
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging-swiper-item/z-paging-swiper-item.vue
@@ -0,0 +1,143 @@
+<!-- z-paging -->
+<!-- github地址:https://github.com/SmileZXLee/uni-z-paging -->
+<!-- dcloud地址:https://ext.dcloud.net.cn/plugin?id=3935 -->
+<!-- 反馈QQ群：790460711 -->
+
+<!-- 滑动切换选项卡swiper-item，此组件支持easycom规范，可以在项目中直接引用 -->
+<template>
+	<view class="zp-swiper-item-container">
+		<z-paging ref="paging" :fixed="false" 
+			:auto="false" :useVirtualList="useVirtualList" :useInnerList="useInnerList" :cellKeyName="cellKeyName" :innerListStyle="innerListStyle" 
+			:preloadPage="preloadPage" :cellHeightMode="cellHeightMode" :virtualScrollFps="virtualScrollFps" :virtualListCol="virtualListCol"
+			@query="_queryList" @listChange="_updateList">
+			<slot />
+			<template #header>
+				<slot name="header"/>
+			</template>
+			<template #cell="{item,index}">
+				<slot name="cell" :item="item" :index="index"/>
+			</template>
+			<template #footer>
+				<slot name="footer"/>
+			</template>
+		</z-paging>
+	</view>
+</template>
+
+<script>
+	import zPaging from '../z-paging/z-paging'
+	export default {
+		name: "z-paging-swiper-item",
+		components: { zPaging },
+		data() {
+			return {
+				firstLoaded: false
+			}
+		},
+		props: {
+			// 当前组件的index，也就是当前组件是swiper中的第几个
+			tabIndex: {
+				type: Number,
+				default: function() {
+					return 0
+				}
+			},
+			// 当前swiper切换到第几个index
+			currentIndex: {
+				type: Number,
+				default: function() {
+					return 0
+				}
+			},
+			// 是否使用虚拟列表，默认为否
+			useVirtualList: {
+				type: Boolean,
+				default: false
+			},
+			// 是否在z-paging内部循环渲染列表(内置列表)，默认为否。若use-virtual-list为true，则此项恒为true
+			useInnerList: {
+				type: Boolean,
+				default: false
+			},
+			// 内置列表cell的key名称，仅nvue有效，在nvue中开启use-inner-list时必须填此项
+			cellKeyName: {
+				type: String,
+				default: ''
+			},
+			// innerList样式
+			innerListStyle: {
+				type: Object,
+				default: function() {
+					return {};
+				}
+			},
+			// 预加载的列表可视范围(列表高度)页数，默认为12，即预加载当前页及上下各12页的cell。此数值越大，则虚拟列表中加载的dom越多，内存消耗越大(会维持在一个稳定值)，但增加预加载页面数量可缓解快速滚动短暂白屏问题
+			preloadPage: {
+				type: [Number, String],
+				default: 12
+			},
+			// 虚拟列表cell高度模式，默认为fixed，也就是每个cell高度完全相同，将以第一个cell高度为准进行计算。可选值【dynamic】，即代表高度是动态非固定的，【dynamic】性能低于【fixed】。
+			cellHeightMode: {
+				type: String,
+				default: 'fixed'
+			},
+			// 虚拟列表列数，默认为1。常用于每行有多列的情况，例如每行有2列数据，需要将此值设置为2
+			virtualListCol: {
+				type: [Number, String],
+				default: 1
+			},
+			// 虚拟列表scroll取样帧率，默认为60，过高可能出现卡顿等问题
+			virtualScrollFps: {
+				type: [Number, String],
+				default: 60
+			},
+		},
+		watch: {
+			currentIndex: {
+				handler(newVal, oldVal) {
+					if (newVal === this.tabIndex) {
+						// 懒加载，当滑动到当前的item时，才去加载
+						if (!this.firstLoaded) {
+							this.$nextTick(()=>{
+								let delay = 5;
+								// #ifdef MP-TOUTIAO
+								delay = 100;
+								// #endif
+								setTimeout(() => {
+									this.$refs.paging.reload().catch(() => {});
+								}, delay);
+							})
+						}
+					}
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			reload(data) {
+				return this.$refs.paging.reload(data);
+			},
+			complete(data) {
+				this.firstLoaded = true;
+				return this.$refs.paging.complete(data);
+			},
+			_queryList(pageNo, pageSize, from) {
+				this.$emit('query', pageNo, pageSize, from);
+			},
+			_updateList(list) {
+				this.$emit('updateList', list);
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.zp-swiper-item-container {
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/z-paging/components/z-paging-swiper/z-paging-swiper.vue b/uni_modules/z-paging/components/z-paging-swiper/z-paging-swiper.vue
new file mode 100644
index 0000000..e965bed
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging-swiper/z-paging-swiper.vue
@@ -0,0 +1,167 @@
+<!-- z-paging -->
+<!-- github地址:https://github.com/SmileZXLee/uni-z-paging -->
+<!-- dcloud地址:https://ext.dcloud.net.cn/plugin?id=3935 -->
+<!-- 反馈QQ群：790460711 -->
+
+<!-- 滑动切换选项卡swiper容器，此组件支持easycom规范，可以在项目中直接引用 -->
+<template>
+	<view :class="fixed?'zp-swiper-container zp-swiper-container-fixed':'zp-swiper-container'" :style="[finalSwiperStyle]">
+		<!-- #ifndef APP-PLUS -->
+		<view v-if="cssSafeAreaInsetBottom===-1" class="zp-safe-area-inset-bottom"></view>
+		<!-- #endif -->
+		<slot v-if="zSlots.top" name="top" />
+		<view class="zp-swiper-super">
+			<view v-if="zSlots.left" :class="{'zp-swiper-left':true,'zp-absoulte':isOldWebView}">
+				<slot name="left" />
+			</view>
+			<view :class="{'zp-swiper':true,'zp-absoulte':isOldWebView}" :style="[swiperContentStyle]">
+				<slot />
+			</view>
+			<view v-if="zSlots.right" :class="{'zp-swiper-right':true,'zp-absoulte zp-right':isOldWebView}">
+				<slot name="right" />
+			</view>
+		</view>
+		<slot v-if="zSlots.bottom" name="bottom" />
+	</view>
+</template>
+
+<script>
+	import commonLayoutModule from '../z-paging/js/modules/common-layout'
+	
+	export default {
+		name: "z-paging-swiper",
+		mixins: [commonLayoutModule],
+		data() {
+			return {
+				swiperContentStyle: {}
+			};
+		},
+		props: {
+			// 是否使用fixed布局，默认为是
+			fixed: {
+				type: Boolean,
+				default: true
+			},
+			// 是否开启底部安全区域适配
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			// z-paging-swiper样式
+			swiperStyle: {
+				type: Object,
+				default: function() {
+					return {};
+				},
+			}
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.systemInfo = uni.getSystemInfoSync();
+				setTimeout(this.updateFixedLayout, 100)
+			})
+			// #ifndef APP-PLUS
+			this._getCssSafeAreaInsetBottom();
+			// #endif
+			this.updateLeftAndRightWidth();
+
+			this.swiperContentStyle = { 'flex': '1' };
+			// #ifndef APP-NVUE
+			this.swiperContentStyle = { width: '100%',height: '100%' };
+			// #endif
+		},
+		computed: {
+			finalSwiperStyle() {
+				const swiperStyle = { ...this.swiperStyle };
+				if (!this.systemInfo) return swiperStyle;
+				const windowTop = this.windowTop;
+				const windowBottom = this.systemInfo.windowBottom;
+				if (this.fixed) {
+					if (windowTop && !swiperStyle.top) {
+						swiperStyle.top = windowTop + 'px';
+					}
+					if (!swiperStyle.bottom) {
+						let bottom = windowBottom || 0;
+						bottom += this.safeAreaInsetBottom ? this.safeAreaBottom : 0;
+						if (bottom > 0) {
+							swiperStyle.bottom = bottom + 'px';
+						}
+					}
+				}
+				return swiperStyle;
+			}
+		},
+		methods: {
+			// 更新slot="left"和slot="right"宽度，当slot="left"或slot="right"宽度动态改变时调用
+			updateLeftAndRightWidth() {
+				if (!this.isOldWebView) return;
+				this.$nextTick(() => this._updateLeftAndRightWidth(this.swiperContentStyle, 'zp-swiper'));
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.zp-swiper-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		flex: 1;
+	}
+
+	.zp-swiper-container-fixed {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		height: auto;
+		width: auto;
+		/* #endif */
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+	}
+	
+	.zp-safe-area-inset-bottom {
+		position: absolute;
+		/* #ifndef APP-PLUS */
+		height: env(safe-area-inset-bottom);
+		/* #endif */
+	}
+
+	.zp-swiper-super {
+		flex: 1;
+		overflow: hidden;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+	
+	.zp-swiper-left,.zp-swiper-right{
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		/* #endif */
+	}
+
+	.zp-swiper {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		width: 100%;
+		/* #endif */
+	}
+	
+	.zp-absoulte {
+		/* #ifndef APP-NVUE */
+		position: absolute;
+		top: 0;
+		width: auto;
+		/* #endif */
+	}
+	
+	.zp-swiper-item {
+		height: 100%;
+	}
+</style>
diff --git a/uni_modules/z-paging/components/z-paging/components/z-paging-load-more.vue b/uni_modules/z-paging/components/z-paging/components/z-paging-load-more.vue
new file mode 100644
index 0000000..04ad799
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/components/z-paging-load-more.vue
@@ -0,0 +1,178 @@
+<!-- [z-paging]上拉加载更多view -->
+<template>
+	<view class="zp-l-container" :class="{'zp-l-container-rpx':c.unit==='rpx','zp-l-container-px':c.unit==='px'}" :style="[c.customStyle]" @click="doClick">
+		<template v-if="!c.hideContent">
+			<!-- 底部加载更多没有更多数据分割线 -->
+			<text v-if="c.showNoMoreLine&&finalStatus===M.NoMore" :class="{'zp-l-line-rpx':c.unit==='rpx','zp-l-line-px':c.unit==='px'}" :style="[{backgroundColor:zTheme.line[ts]},c.noMoreLineCustomStyle]" />
+			<!-- 底部加载更多loading -->
+			<!-- #ifndef APP-NVUE -->
+			<image v-if="finalStatus===M.Loading&&!!c.loadingIconCustomImage"
+				:src="c.loadingIconCustomImage" :style="[c.iconCustomStyle]" :class="{'zp-l-line-loading-custom-image':true,'zp-l-line-loading-custom-image-animated':c.loadingAnimated,'zp-l-line-loading-custom-image-rpx':c.unit==='rpx','zp-l-line-loading-custom-image-px':c.unit==='px'}" />
+			<image v-if="finalStatus===M.Loading&&finalLoadingIconType==='flower'&&!c.loadingIconCustomImage.length"
+				:class="{'zp-line-loading-image':true,'zp-line-loading-image-rpx':c.unit==='rpx','zp-line-loading-image-px':c.unit==='px'}" :style="[c.iconCustomStyle]" :src="zTheme.flower[ts]" />
+			<!-- #endif -->
+			<!-- #ifdef APP-NVUE -->
+			<!-- 在nvue中底部加载更多loading使用系统自带的 -->
+			<view>
+				<loading-indicator v-if="finalStatus===M.Loading&&finalLoadingIconType!=='circle'" :class="{'zp-line-loading-image-rpx':c.unit==='rpx','zp-line-loading-image-px':c.unit==='px'}" :style="[{color:zTheme.indicator[ts]}]" :animating="true" />
+			</view>
+			<!-- #endif -->
+			<!-- 底部加载更多文字 -->
+			<text v-if="finalStatus===M.Loading&&finalLoadingIconType==='circle'&&!c.loadingIconCustomImage.length"
+				class="zp-l-circle-loading-view" :class="{'zp-l-circle-loading-view-rpx':c.unit==='rpx','zp-l-circle-loading-view-px':c.unit==='px'}" :style="[{borderColor:zTheme.circleBorder[ts],borderTopColor:zTheme.circleBorderTop[ts]},c.iconCustomStyle]" />
+			<text v-if="!c.isChat||(!c.chatDefaultAsLoading&&finalStatus===M.Default)||finalStatus===M.Fail" :class="{'zp-l-text-rpx':c.unit==='rpx','zp-l-text-px':c.unit==='px'}" :style="[{color:zTheme.title[ts]},c.titleCustomStyle]">{{ownLoadingMoreText}}</text>
+			<!-- 底部加载更多没有更多数据分割线 -->
+			<text v-if="c.showNoMoreLine&&finalStatus===M.NoMore" :class="{'zp-l-line-rpx':c.unit==='rpx','zp-l-line-px':c.unit==='px'}" :style="[{backgroundColor:zTheme.line[ts]},c.noMoreLineCustomStyle]" />
+		</template>
+	</view>
+</template>
+<script>
+	import zStatic from '../js/z-paging-static'
+	import Enum from '../js/z-paging-enum'
+	export default {
+		name: 'z-paging-load-more',
+		data() {
+			return {
+				M: Enum.More,
+				zTheme: {
+					title: { white: '#efefef', black: '#a4a4a4' },
+					line: { white: '#efefef', black: '#eeeeee' },
+					circleBorder: { white: '#aaaaaa', black: '#c8c8c8' },
+					circleBorderTop: { white: '#ffffff', black: '#444444' },
+					flower: { white: zStatic.base64FlowerWhite, black: zStatic.base64Flower },
+					indicator: { white: '#eeeeee', black: '#777777' }
+				}
+			};
+		},
+		props: ['zConfig'],
+		computed: {
+			ts() {
+				return this.c.defaultThemeStyle;
+			},
+			// 底部加载更多配置
+			c() {
+				return this.zConfig || {};
+			},
+			// 底部加载更多文字
+			ownLoadingMoreText() {
+				const statusTextArr = [this.c.defaultText,this.c.loadingText,this.c.noMoreText,this.c.failText];
+				return statusTextArr[this.finalStatus];
+			},
+			// 底部加载更多状态
+			finalStatus() {
+				if (this.c.defaultAsLoading && this.c.status === this.M.Default) return this.M.Loading;
+				return this.c.status;
+			},
+			// 加载更多icon类型
+			finalLoadingIconType() {
+				// #ifdef APP-NVUE
+				return 'flower';
+				// #endif
+				return this.c.loadingIconType;
+			}
+		},
+		methods: {
+			// 点击了加载更多
+			doClick() {
+				this.$emit('doClick');
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	@import "../css/z-paging-static.css";
+
+	.zp-l-container {
+		/* #ifndef APP-NVUE */
+		clear: both;
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+	}
+	.zp-l-container-rpx {
+		height: 80rpx;
+		font-size: 27rpx;
+	}
+	.zp-l-container-px {
+		height: 40px;
+		font-size: 14px;
+	}
+
+	.zp-l-line-loading-custom-image {
+		color: #a4a4a4;
+	}
+	.zp-l-line-loading-custom-image-rpx {
+		margin-right: 8rpx;
+		width: 28rpx;
+		height: 28rpx;
+	}
+	.zp-l-line-loading-custom-image-px {
+		margin-right: 4px;
+		width: 14px;
+		height: 14px;
+	}
+	
+	.zp-l-line-loading-custom-image-animated{
+		/* #ifndef APP-NVUE */
+		animation: loading-circle 1s linear infinite;
+		/* #endif */
+	}
+
+	.zp-l-circle-loading-view {
+		border: 3rpx solid #dddddd;
+		border-radius: 50%;
+		/* #ifndef APP-NVUE */
+		animation: loading-circle 1s linear infinite;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 30rpx;
+		height: 30rpx;
+		/* #endif */
+	}
+	.zp-l-circle-loading-view-rpx {
+		margin-right: 8rpx;
+		width: 23rpx;
+		height: 23rpx;
+	}
+	.zp-l-circle-loading-view-px {
+		margin-right: 4px;
+		width: 12px;
+		height: 12px;
+	}
+
+	.zp-l-text-rpx {
+		font-size: 30rpx;
+		margin: 0rpx 6rpx;
+	}
+	.zp-l-text-px {
+		font-size: 15px;
+		margin: 0px 3px;
+	}
+
+	.zp-l-line-rpx {
+		height: 1px;
+		width: 100rpx;
+		margin: 0rpx 10rpx;
+	}
+	.zp-l-line-px {
+		height: 1px;
+		width: 50px;
+		margin: 0rpx 5px;
+	}
+
+	/* #ifndef APP-NVUE */
+	@keyframes loading-circle {
+		0% {
+			-webkit-transform: rotate(0deg);
+			transform: rotate(0deg);
+		}
+		100% {
+			-webkit-transform: rotate(360deg);
+			transform: rotate(360deg);
+		}
+	}
+	/* #endif */
+</style>
diff --git a/uni_modules/z-paging/components/z-paging/components/z-paging-refresh.vue b/uni_modules/z-paging/components/z-paging/components/z-paging-refresh.vue
new file mode 100644
index 0000000..4a7ca61
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/components/z-paging-refresh.vue
@@ -0,0 +1,208 @@
+<!-- [z-paging]下拉刷新view -->
+<template>
+	<view style="height: 100%;">
+		<view :class="showUpdateTime?'zp-r-container zp-r-container-padding':'zp-r-container'">
+			<view class="zp-r-left">
+				<!-- 非加载中(继续下拉刷新、松手立即刷新状态图片) -->
+				<image v-if="status!==R.Loading" :class="leftImageClass" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
+				<!-- 加载状态图片 -->
+				<!-- #ifndef APP-NVUE -->
+				<image v-else :class="{'zp-line-loading-image':refreshingAnimated,'zp-r-left-image':true,'zp-r-left-image-pre-size-rpx':unit==='rpx','zp-r-left-image-pre-size-px':unit==='px'}" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
+				<!-- #endif -->
+				<!-- 在nvue中，加载状态loading使用系统loading -->
+				<!-- #ifdef APP-NVUE -->
+				<view v-else :style="[{'margin-right':showUpdateTime?addUnit(18,unit):addUnit(12, unit)}]">
+					<loading-indicator :class="isIos?{'zp-loading-image-ios-rpx':unit==='rpx','zp-loading-image-ios-px':unit==='px'}:{'zp-loading-image-android-rpx':unit==='rpx','zp-loading-image-android-px':unit==='px'}" 
+					:style="[{color:zTheme.indicator[ts]},imgStyle]" :animating="true" />
+				</view>
+				<!-- #endif -->
+			</view>
+			<!-- 右侧文字内容 -->
+			<view class="zp-r-right">
+				<!-- 右侧下拉刷新状态文字 -->
+				<text class="zp-r-right-text" :style="[rightTextStyle,titleStyle]">{{currentTitle}}</text>
+				<!-- 右侧下拉刷新时间文字 -->
+				<text v-if="showUpdateTime&&refresherTimeText.length" class="zp-r-right-text" :class="{'zp-r-right-time-text-rpx':unit==='rpx','zp-r-right-time-text-px':unit==='px'}" :style="[{color:zTheme.title[ts]},updateTimeStyle]">
+					{{refresherTimeText}}
+				</text>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import zStatic from '../js/z-paging-static'
+	import u from '../js/z-paging-utils'
+	import Enum from '../js/z-paging-enum'
+	
+	export default {
+		name: 'z-paging-refresh',
+		data() {
+			return {
+				R: Enum.Refresher,
+				isIos: uni.getSystemInfoSync().platform === 'ios',
+				refresherTimeText: '',
+				zTheme: {
+					title: { white: '#efefef', black: '#555555' },
+					arrow: { white: zStatic.base64ArrowWhite, black: zStatic.base64Arrow },
+					flower: { white: zStatic.base64FlowerWhite, black: zStatic.base64Flower },
+					success: { white: zStatic.base64SuccessWhite, black: zStatic.base64Success },
+					indicator: { white: '#eeeeee', black: '#777777' }
+				}
+			};
+		},
+		props: ['status', 'defaultThemeStyle', 'defaultText', 'pullingText', 'refreshingText', 'completeText', 'goF2Text', 'defaultImg', 'pullingImg', 
+			'refreshingImg', 'completeImg', 'refreshingAnimated', 'showUpdateTime', 'updateTimeKey', 'imgStyle', 'titleStyle', 'updateTimeStyle', 'updateTimeTextMap', 'unit'
+		],
+		computed: {
+			ts() {
+				return this.defaultThemeStyle;
+			},
+			// 当前状态数组
+			statusTextArr() {
+				this.updateTime();
+				return [this.defaultText, this.pullingText, this.refreshingText, this.completeText, this.goF2Text];
+			},
+			// 当前状态文字
+			currentTitle() {
+				return this.statusTextArr[this.status] || this.defaultText;
+			},
+			// 左侧图片class
+			leftImageClass() {
+				const preSizeClass = `zp-r-left-image-pre-size-${this.unit}`;
+				if (this.status === this.R.Complete) return preSizeClass;
+				return `zp-r-left-image ${preSizeClass} ${this.status === this.R.Default ? 'zp-r-arrow-down' : 'zp-r-arrow-top'}`;
+			},
+			// 左侧图片style
+			leftImageStyle() {
+				const showUpdateTime = this.showUpdateTime;
+				const size = showUpdateTime ? u.addUnit(36, this.unit) : u.addUnit(34, this.unit);
+				return {width: size,height: size,'margin-right': showUpdateTime ? u.addUnit(20, this.unit) : u.addUnit(9, this.unit)};
+			},
+			// 左侧图片src
+			leftImageSrc() {
+				const R = this.R;
+				const status = this.status;
+				if (status === R.Default) {
+					if (!!this.defaultImg) return this.defaultImg;
+					return this.zTheme.arrow[this.ts];
+				} else if (status === R.ReleaseToRefresh) {
+					if (!!this.pullingImg) return this.pullingImg;
+					if (!!this.defaultImg) return this.defaultImg;
+					return this.zTheme.arrow[this.ts];
+				} else if (status === R.Loading) {
+					if (!!this.refreshingImg) return this.refreshingImg;
+					return this.zTheme.flower[this.ts];;
+				} else if (status === R.Complete) {
+					if (!!this.completeImg) return this.completeImg;
+					return this.zTheme.success[this.ts];;
+				} else if (status === R.GoF2) {
+					return this.zTheme.arrow[this.ts];
+				}
+				return '';
+			},
+			// 右侧文字style
+			rightTextStyle() {
+				let stl = {};
+				// #ifdef APP-NVUE
+				const textHeight = this.showUpdateTime ? u.addUnit(40, this.unit) : u.addUnit(80, this.unit);
+				stl = {'height': textHeight, 'line-height': textHeight}
+				// #endif
+				stl['color'] = this.zTheme.title[this.ts];
+				stl['font-size'] = u.addUnit(30, this.unit);
+				return stl;
+			}
+		},
+		methods: {
+			// 添加单位
+			addUnit(value, unit) {
+				return u.addUnit(value, unit);
+			},
+			// 更新下拉刷新时间
+			updateTime() {
+				if (this.showUpdateTime) {
+					this.refresherTimeText = u.getRefesrherFormatTimeByKey(this.updateTimeKey, this.updateTimeTextMap);
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	@import "../css/z-paging-static.css";
+
+	.zp-r-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		height: 100%;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.zp-r-container-padding {
+		/* #ifdef APP-NVUE */
+		padding: 7px 0rpx;
+		/* #endif */
+	}
+
+	.zp-r-left {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		overflow: hidden;
+		/* #ifdef MP-ALIPAY */
+		margin-top: -4rpx;
+		/* #endif */
+	}
+
+	.zp-r-left-image {
+		transition-duration: .2s;
+		transition-property: transform;
+		color: #666666;
+	}
+	
+	.zp-r-left-image-pre-size-rpx {
+		/* #ifndef APP-NVUE */
+		width: 34rpx;
+		height: 34rpx;
+		overflow: hidden;
+		/* #endif */
+	}
+	
+	.zp-r-left-image-pre-size-px {
+		/* #ifndef APP-NVUE */
+		width: 17px;
+		height: 17px;
+		overflow: hidden;
+		/* #endif */
+	}
+
+	.zp-r-arrow-top {
+		transform: rotate(0deg);
+	}
+
+	.zp-r-arrow-down {
+		transform: rotate(180deg);
+	}
+
+	.zp-r-right {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.zp-r-right-time-text-rpx {
+		margin-top: 10rpx;
+		font-size: 26rpx;
+	}
+	.zp-r-right-time-text-px {
+		margin-top: 5px;
+		font-size: 13px;
+	}
+</style>
diff --git a/uni_modules/z-paging/components/z-paging/config/index.js b/uni_modules/z-paging/components/z-paging/config/index.js
new file mode 100644
index 0000000..15a37e2
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/config/index.js
@@ -0,0 +1,3 @@
+// z-paging全局配置文件，注意避免更新时此文件被覆盖，若被覆盖，可在此文件中右键->点击本地历史记录，找回覆盖前的配置
+
+export default {}
\ No newline at end of file
diff --git a/uni_modules/z-paging/components/z-paging/css/z-paging-main.css b/uni_modules/z-paging/components/z-paging/css/z-paging-main.css
new file mode 100644
index 0000000..6990e3a
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/css/z-paging-main.css
@@ -0,0 +1,237 @@
+/* [z-paging]公共css*/
+
+.z-paging-content {
+	position: relative;
+	flex-direction: column;
+	/* #ifndef APP-NVUE */
+	overflow: hidden;
+	/* #endif */
+}
+
+.z-paging-content-full {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	width: 100%;
+	height: 100%;
+	/* #endif */
+}
+
+.z-paging-content-fixed, .zp-loading-fixed {
+	position: fixed;
+	/* #ifndef APP-NVUE */
+	height: auto;
+	width: auto;
+	/* #endif */
+	top: 0;
+	left: 0;
+	bottom: 0;
+	right: 0;
+}
+
+.zp-f2-content {
+	width: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background-color: white;
+}
+
+.zp-page-top, .zp-page-bottom {
+	/* #ifndef APP-NVUE */
+	width: auto;
+	/* #endif */
+	position: fixed;
+	left: 0;
+	right: 0;
+	z-index: 999;
+}
+
+.zp-page-left, .zp-page-right {
+	/* #ifndef APP-NVUE */
+	height: 100%;
+	/* #endif */
+}
+
+.zp-scroll-view-super {
+	flex: 1;
+	overflow: hidden;
+	position: relative;
+}
+
+.zp-view-super {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+}
+
+.zp-scroll-view-container, .zp-scroll-view {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	height: 100%;
+	width: 100%;
+	/* #endif */
+}
+
+.zp-absoulte {
+	/* #ifndef APP-NVUE */
+	position: absolute;
+	top: 0;
+	width: auto;
+	/* #endif */
+}
+
+.zp-scroll-view-absolute {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+/* #ifndef APP-NVUE */
+.zp-scroll-view-hide-scrollbar ::-webkit-scrollbar {
+	display: none;
+	-webkit-appearance: none;
+	width: 0 !important;
+	height: 0 !important;
+	background: transparent;
+}
+/* #endif */
+
+.zp-paging-touch-view {
+	width: 100%;
+	height: 100%;
+	position: relative;
+}
+
+.zp-fixed-bac-view {
+	position: absolute;
+	width: 100%;
+	top: 0;
+	left: 0;
+	height: 200px;
+}
+
+.zp-paging-main {
+	height: 100%;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+.zp-paging-container {
+	flex: 1;
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+}
+
+.zp-chat-record-loading-custom-image {
+	width: 35rpx;
+	height: 35rpx;
+	/* #ifndef APP-NVUE */
+	animation: loading-flower 1s linear infinite;
+	/* #endif */
+}
+
+.zp-page-bottom-keyboard-placeholder-animate {
+	transition-property: height;
+	transition-duration: 0.15s;
+	/* #ifndef APP-NVUE */
+	will-change: height;
+	/* #endif */
+}
+
+.zp-custom-refresher-container {
+	overflow: hidden;
+}
+
+.zp-custom-refresher-refresh {
+	/* #ifndef APP-NVUE */
+	display: block;
+	/* #endif */
+}
+
+.zp-back-to-top {
+	z-index: 999;
+	position: absolute;
+	bottom: 0rpx;
+	transition-duration: .3s;
+	transition-property: opacity;
+}
+.zp-back-to-top-rpx {
+	width: 90rpx;
+	height: 90rpx;
+	bottom: 0rpx;
+	right: 25rpx;
+}
+.zp-back-to-top-px {
+	width: 38px;
+	height: 38px;
+	bottom: 0px;
+	right: 13px;
+}
+
+.zp-back-to-top-show {
+	opacity: 1;
+}
+
+.zp-back-to-top-hide {
+	opacity: 0;
+}
+
+.zp-back-to-top-img {
+	/* #ifndef APP-NVUE */
+	width: 100%;
+	height: 100%;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	flex: 1;
+	/* #endif */
+	z-index: 999;
+}
+
+.zp-empty-view {
+	/* #ifdef APP-NVUE */
+	height: 100%;
+	/* #endif */
+	flex: 1;
+}
+
+.zp-empty-view-center {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+
+.zp-loading-fixed {
+	z-index: 9999;
+}
+
+.zp-safe-area-inset-bottom {
+	position: absolute;
+	/* #ifndef APP-PLUS */
+	height: env(safe-area-inset-bottom);
+	/* #endif */
+}
+
+.zp-n-refresh-container {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	justify-content: center;
+	width: 750rpx;
+}
+
+.zp-n-list-container{
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	flex: 1;
+}
diff --git a/uni_modules/z-paging/components/z-paging/css/z-paging-static.css b/uni_modules/z-paging/components/z-paging/css/z-paging-static.css
new file mode 100644
index 0000000..de445c2
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/css/z-paging-static.css
@@ -0,0 +1,50 @@
+/* [z-paging]公用的静态css资源 */
+
+.zp-line-loading-image {
+	/* #ifndef APP-NVUE */
+	animation: loading-flower 1s steps(12) infinite;
+	/* #endif */
+	color: #666666;
+}
+.zp-line-loading-image-rpx {
+	margin-right: 8rpx;
+	width: 34rpx;
+	height: 34rpx;
+}
+.zp-line-loading-image-px {
+	margin-right: 4px;
+	width: 17px;
+	height: 17px;
+}
+
+.zp-loading-image-ios-rpx {
+	width: 40rpx;
+	height: 40rpx;
+}
+.zp-loading-image-ios-px {
+	width: 20px;
+	height: 20px;
+}
+
+.zp-loading-image-android-rpx {
+	width: 34rpx;
+	height: 34rpx;
+}
+.zp-loading-image-android-px {
+	width: 17px;
+	height: 17px;
+}
+
+/* #ifndef APP-NVUE */
+@keyframes loading-flower {
+	0% {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	}
+	to {
+		-webkit-transform: rotate(1turn);
+		transform: rotate(1turn);
+	}
+}
+/* #endif */
+
diff --git a/uni_modules/z-paging/components/z-paging/i18n/en.json b/uni_modules/z-paging/components/z-paging/i18n/en.json
new file mode 100644
index 0000000..48fbe60
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/i18n/en.json
@@ -0,0 +1,23 @@
+{	
+	"zp.refresher.default": "Pull down to refresh",
+	"zp.refresher.pulling": "Release to refresh",
+	"zp.refresher.refreshing": "Refreshing...",
+	"zp.refresher.complete": "Refresh succeeded",
+	"zp.refresher.f2": "Refresh to enter 2f",
+	
+	"zp.loadingMore.default": "Click to load more",
+	"zp.loadingMore.loading": "Loading...",
+	"zp.loadingMore.noMore": "No more data",
+	"zp.loadingMore.fail": "Load failed,click to reload",
+	
+	"zp.emptyView.title": "No data",
+	"zp.emptyView.reload": "Reload",
+	"zp.emptyView.error": "Sorry,load failed",
+	
+	"zp.refresherUpdateTime.title": "Last update: ",
+	"zp.refresherUpdateTime.none": "None",
+	"zp.refresherUpdateTime.today": "Today",
+	"zp.refresherUpdateTime.yesterday": "Yesterday",
+	
+	"zp.systemLoading.title": "Loading..."
+}
diff --git a/uni_modules/z-paging/components/z-paging/i18n/index.js b/uni_modules/z-paging/components/z-paging/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/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/z-paging/components/z-paging/i18n/zh-Hans.json b/uni_modules/z-paging/components/z-paging/i18n/zh-Hans.json
new file mode 100644
index 0000000..440ca63
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/i18n/zh-Hans.json
@@ -0,0 +1,23 @@
+{	
+	"zp.refresher.default": "继续下拉刷新",
+	"zp.refresher.pulling": "松开立即刷新",
+	"zp.refresher.refreshing": "正在刷新...",
+	"zp.refresher.complete": "刷新成功",
+	"zp.refresher.f2": "松手进入二楼",
+	
+	"zp.loadingMore.default": "点击加载更多",
+	"zp.loadingMore.loading": "正在加载...",
+	"zp.loadingMore.noMore": "没有更多了",
+	"zp.loadingMore.fail": "加载失败，点击重新加载",
+	
+	"zp.emptyView.title": "没有数据哦~",
+	"zp.emptyView.reload": "重新加载",
+	"zp.emptyView.error": "很抱歉，加载失败",
+	
+	"zp.refresherUpdateTime.title": "最后更新：",
+	"zp.refresherUpdateTime.none": "无",
+	"zp.refresherUpdateTime.today": "今天",
+	"zp.refresherUpdateTime.yesterday": "昨天",
+	
+	"zp.systemLoading.title": "加载中..."
+}
diff --git a/uni_modules/z-paging/components/z-paging/i18n/zh-Hant.json b/uni_modules/z-paging/components/z-paging/i18n/zh-Hant.json
new file mode 100644
index 0000000..b3d5502
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/i18n/zh-Hant.json
@@ -0,0 +1,23 @@
+{	
+	"zp.refresher.default": "繼續下拉重繪",
+	"zp.refresher.pulling": "鬆開立即重繪",
+	"zp.refresher.refreshing": "正在重繪...",
+	"zp.refresher.complete": "重繪成功",
+	"zp.refresher.f2": "鬆手進入二樓",
+	
+	"zp.loadingMore.default": "點擊加載更多",
+	"zp.loadingMore.loading": "正在加載...",
+	"zp.loadingMore.noMore": "沒有更多了",
+	"zp.loadingMore.fail": "加載失敗，點擊重新加載",
+	
+	"zp.emptyView.title": "沒有數據哦~",
+	"zp.emptyView.reload": "重新加載",
+	"zp.emptyView.error": "很抱歉，加載失敗",
+	
+	"zp.refresherUpdateTime.title": "最後更新：",
+	"zp.refresherUpdateTime.none": "無",
+	"zp.refresherUpdateTime.today": "今天",
+	"zp.refresherUpdateTime.yesterday": "昨天",
+	
+	"zp.systemLoading.title": "加載中..."
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js b/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js
new file mode 100644
index 0000000..adb6e1b
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js
@@ -0,0 +1,25 @@
+// [z-paging]useZPaging hooks
+
+import { onPageScroll, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
+
+function useZPaging(paging) {
+	const cPaging = !!paging ? paging.value || paging : null;
+	
+	onPullDownRefresh(() => {
+		if (!cPaging || !cPaging.value) return;
+		cPaging.value.reload().catch(() => {});
+	})
+	
+	onPageScroll(e => {
+		if (!cPaging || !cPaging.value) return;
+		cPaging.value.updatePageScrollTop(e.scrollTop);
+		e.scrollTop < 10 && cPaging.value.doChatRecordLoadMore();
+	})
+	
+	onReachBottom(() => {
+		if (!cPaging || !cPaging.value) return;
+		cPaging.value.pageReachBottom();
+	})
+}
+
+export default useZPaging
\ No newline at end of file
diff --git a/uni_modules/z-paging/components/z-paging/js/hooks/useZPagingComp.js b/uni_modules/z-paging/components/z-paging/js/hooks/useZPagingComp.js
new file mode 100644
index 0000000..f9bc5ab
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/hooks/useZPagingComp.js
@@ -0,0 +1,25 @@
+// [z-paging]useZPagingComp hooks
+
+function useZPagingComp(paging) {
+	const cPaging = !!paging ? paging.value || paging : null;
+	
+	const reload = () => {
+		if (!cPaging || !cPaging.value) return;
+		cPaging.value.reload().catch(() => {});
+	}
+	const updatePageScrollTop = scrollTop => {
+		if (!cPaging || !cPaging.value) return;
+		cPaging.value.updatePageScrollTop(scrollTop);
+	}
+	const doChatRecordLoadMore = () => {
+		if (!cPaging || !cPaging.value) return;
+		cPaging.value.doChatRecordLoadMore();
+	}
+	const pageReachBottom = () => {
+		if (!cPaging || !cPaging.value) return;
+		cPaging.value.pageReachBottom();
+	}
+	return { reload, updatePageScrollTop, doChatRecordLoadMore, pageReachBottom };
+}
+
+export default useZPagingComp
\ No newline at end of file
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/back-to-top.js b/uni_modules/z-paging/components/z-paging/js/modules/back-to-top.js
new file mode 100644
index 0000000..dd159f2
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/back-to-top.js
@@ -0,0 +1,125 @@
+// [z-paging]点击返回顶部view模块
+import u from '.././z-paging-utils'
+
+export default {
+	props: {
+		// 自动显示点击返回顶部按钮，默认为否
+		autoShowBackToTop: {
+			type: Boolean,
+			default: u.gc('autoShowBackToTop', false)
+		},
+		// 点击返回顶部按钮显示/隐藏的阈值(滚动距离)，单位为px，默认为400rpx
+		backToTopThreshold: {
+			type: [Number, String],
+			default: u.gc('backToTopThreshold', '400rpx')
+		},
+		// 点击返回顶部按钮的自定义图片地址，默认使用z-paging内置的图片
+		backToTopImg: {
+			type: String,
+			default: u.gc('backToTopImg', '')
+		},
+		// 点击返回顶部按钮返回到顶部时是否展示过渡动画，默认为是
+		backToTopWithAnimate: {
+			type: Boolean,
+			default: u.gc('backToTopWithAnimate', true)
+		},
+		// 点击返回顶部按钮与底部的距离，注意添加单位px或rpx，默认为160rpx
+		backToTopBottom: {
+			type: [Number, String],
+			default: u.gc('backToTopBottom', '400rpx')
+		},
+		// 点击返回顶部按钮的自定义样式
+		backToTopStyle: {
+			type: Object,
+			default: u.gc('backToTopStyle', {}),
+		},
+		// iOS点击顶部状态栏、安卓双击标题栏时，滚动条返回顶部，只支持竖向，默认为是
+		enableBackToTop: {
+			type: Boolean,
+			default: u.gc('enableBackToTop', true)
+		},
+	},
+	data() {
+		return {
+			// 点击返回顶部的class
+			backToTopClass: 'zp-back-to-top zp-back-to-top-hide',
+			// 上次点击返回顶部的时间
+			lastBackToTopShowTime: 0,
+			// 点击返回顶部显示的class是否在展示中，使得按钮展示/隐藏过度效果更自然
+			showBackToTopClass: false,
+		}
+	},
+	computed: {
+		backToTopThresholdUnitConverted() {
+			return u.addUnit(this.backToTopThreshold, this.unit);
+		},
+		backToTopBottomUnitConverted() {
+			return u.addUnit(this.backToTopBottom, this.unit);
+		},
+		finalEnableBackToTop() {
+			return this.usePageScroll ? false : this.enableBackToTop;
+		},
+		finalBackToTopThreshold() {
+			return u.convertToPx(this.backToTopThresholdUnitConverted);
+		},
+		finalBackToTopStyle() {
+			const backToTopStyle = this.backToTopStyle;
+			if (!backToTopStyle.bottom) {
+				backToTopStyle.bottom = this.windowBottom + u.convertToPx(this.backToTopBottomUnitConverted) + 'px';
+			}
+			if(!backToTopStyle.position){
+				backToTopStyle.position = this.usePageScroll ? 'fixed': 'absolute';
+			}
+			return backToTopStyle;
+		},
+		finalBackToTopClass() {
+			return `${this.backToTopClass} zp-back-to-top-${this.unit}`;
+		}
+	},
+	methods: {
+		// 点击了返回顶部
+		_backToTopClick() {
+			let callbacked = false;
+			this.$emit('backToTopClick', toTop => {
+				(toTop === undefined || toTop === true) && this._handleToTop();
+				callbacked = true;
+			});
+			// 如果用户没有禁止默认的返回顶部事件，则触发滚动到顶部
+			this.$nextTick(() => {
+				!callbacked && this._handleToTop();
+			})
+		},
+		// 处理滚动到顶部
+		_handleToTop() {
+			!this.backToTopWithAnimate && this._checkShouldShowBackToTop(0);
+			this.scrollToTop(this.backToTopWithAnimate);
+		},
+		// 判断是否要显示返回顶部按钮
+		_checkShouldShowBackToTop(scrollTop) {
+			if (!this.autoShowBackToTop) {
+				this.showBackToTopClass = false;
+				return;
+			}
+			if (scrollTop > this.finalBackToTopThreshold) {
+				if (!this.showBackToTopClass) {
+					// 记录当前点击返回顶部按钮显示的class生效了
+					this.showBackToTopClass = true;
+					this.lastBackToTopShowTime = new Date().getTime();
+					// 当滚动到需要展示返回顶部的阈值内，则延迟300毫秒展示返回到顶部按钮
+					u.delay(() => {
+						this.backToTopClass = 'zp-back-to-top zp-back-to-top-show';
+					}, 300)
+				}
+			} else {
+				// 如果当前点击返回顶部按钮显示的class是生效状态并且滚动小于触发阈值，则隐藏返回顶部按钮
+				if (this.showBackToTopClass) {
+					this.backToTopClass = 'zp-back-to-top zp-back-to-top-hide';
+					u.delay(() => {
+						this.showBackToTopClass = false;
+					}, new Date().getTime() - this.lastBackToTopShowTime < 500 ? 0 : 300)
+				}
+			}
+		},
+	}
+}
+
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/chat-record-mode.js b/uni_modules/z-paging/components/z-paging/js/modules/chat-record-mode.js
new file mode 100644
index 0000000..daacf0c
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/chat-record-mode.js
@@ -0,0 +1,149 @@
+// [z-paging]聊天记录模式模块
+import u from '.././z-paging-utils'
+
+export default {
+	props: {
+		// 使用聊天记录模式，默认为否
+		useChatRecordMode: {
+			type: Boolean,
+			default: u.gc('useChatRecordMode', false)
+		},
+		// 使用聊天记录模式时滚动到顶部后，列表垂直移动偏移距离。默认0rpx。单位px（暂时无效）
+		chatRecordMoreOffset: {
+			type: [Number, String],
+			default: u.gc('chatRecordMoreOffset', '0rpx')
+		},
+		// 使用聊天记录模式时是否自动隐藏键盘：在用户触摸列表时候自动隐藏键盘，默认为是
+		autoHideKeyboardWhenChat: {
+			type: Boolean,
+			default: u.gc('autoHideKeyboardWhenChat', true)
+		},
+		// 使用聊天记录模式中键盘弹出时是否自动调整slot="bottom"高度，默认为是
+		autoAdjustPositionWhenChat: {
+			type: Boolean,
+			default: u.gc('autoAdjustPositionWhenChat', true)
+		},
+		// 使用聊天记录模式中键盘弹出时占位高度偏移距离。默认0rpx。单位px
+		chatAdjustPositionOffset: {
+			type: [Number, String],
+			default: u.gc('chatAdjustPositionOffset', '0rpx')
+		},
+		// 使用聊天记录模式中键盘弹出时是否自动滚动到底部，默认为否
+		autoToBottomWhenChat: {
+			type: Boolean,
+			default: u.gc('autoToBottomWhenChat', false)
+		},
+		// 使用聊天记录模式中reload时是否显示chatLoading，默认为否
+		showChatLoadingWhenReload: {
+			type: Boolean,
+			default: u.gc('showChatLoadingWhenReload', false)
+		},
+		// 在聊天记录模式中滑动到顶部状态为默认状态时，以加载中的状态展示，默认为是。若设置为否，则默认会显示【点击加载更多】，然后才会显示loading
+		chatLoadingMoreDefaultAsLoading: {
+			type: Boolean,
+			default: u.gc('chatLoadingMoreDefaultAsLoading', true)
+		},
+	},
+	data() {
+		return {
+			// 键盘高度
+			keyboardHeight: 0,
+			// 键盘高度是否未改变，此时占位高度变化不需要动画效果
+			isKeyboardHeightChanged: false,
+		}
+	},
+	computed: {
+		finalChatRecordMoreOffset() {
+			return u.convertToPx(this.chatRecordMoreOffset);
+		},
+		finalChatAdjustPositionOffset() {
+			return u.convertToPx(this.chatAdjustPositionOffset);
+		},
+		// 聊天记录模式旋转180度style
+		chatRecordRotateStyle() {
+			let cellStyle;
+			// 在vue中，直接将列表倒置，因此在vue的cell中，也直接写style="transform: scaleY(-1)"转回来即可。
+			// #ifndef APP-NVUE
+			cellStyle = this.useChatRecordMode ? { transform: 'scaleY(-1)' } : {};
+			// #endif
+			
+			// 在nvue中，需要考虑数据量不满一页的情况，因为nvue中的list无法通过flex-end修改不满一页的起始位置，会导致不满一页时列表数据从底部开始，因此需要特别判断
+			// 当数据不满一屏的时候，不进行列表倒置
+			// #ifdef APP-NVUE
+			cellStyle = this.useChatRecordMode ? { transform: this.isFirstPageAndNoMore ? 'scaleY(1)' : 'scaleY(-1)' } : {};
+			// #endif
+			
+			this.$emit('update:cellStyle', cellStyle);
+			this.$emit('cellStyleChange', cellStyle);
+			
+			// 在聊天记录模式中，如果列表没有倒置并且当前是第一页，则需要自动滚动到最底部
+			this.$nextTick(() => {
+				if (this.isFirstPage && this.isChatRecordModeAndNotInversion) {
+					this.$nextTick(() => {
+						// 这里多次触发滚动到底部是为了避免在某些情况下，即使是在nextTick但是cell未渲染完毕导致滚动到底部位置不正确的问题
+						this._scrollToBottom(false);
+						u.delay(() => {
+							this._scrollToBottom(false);
+							u.delay(() => {
+								this._scrollToBottom(false);
+							}, 50)
+						}, 50)
+					})
+				}
+			})
+			return cellStyle;
+		},
+		// 是否是聊天记录列表并且有配置transform
+		isChatRecordModeHasTransform() {
+			return this.useChatRecordMode && this.chatRecordRotateStyle && this.chatRecordRotateStyle.transform;
+		},
+		// 是否是聊天记录列表并且列表未倒置
+		isChatRecordModeAndNotInversion() {
+			return this.isChatRecordModeHasTransform && this.chatRecordRotateStyle.transform === 'scaleY(1)';
+		},
+		// 是否是聊天记录列表并且列表倒置
+		isChatRecordModeAndInversion() {
+			return this.isChatRecordModeHasTransform && this.chatRecordRotateStyle.transform === 'scaleY(-1)';
+		},
+		// 最终的聊天记录模式中底部安全区域的高度，如果开启了底部安全区域并且键盘未弹出，则添加底部区域高度
+		chatRecordModeSafeAreaBottom() {
+			return this.safeAreaInsetBottom && !this.keyboardHeight ? this.safeAreaBottom : 0;
+		}
+	},
+	mounted() {
+		// 监听键盘高度变化（H5、百度小程序、抖音小程序、飞书小程序不支持）
+		// #ifndef H5 || MP-BAIDU || MP-TOUTIAO
+		if (this.useChatRecordMode) {
+			uni.onKeyboardHeightChange(this._handleKeyboardHeightChange);
+		}
+		// #endif
+	},
+	methods: {
+		// 添加聊天记录
+		addChatRecordData(data, toBottom = true, toBottomWithAnimate = true) {
+			if (!this.useChatRecordMode) return;
+			this.isTotalChangeFromAddData = true;
+			this.addDataFromTop(data, toBottom, toBottomWithAnimate);
+		},
+		// 手动触发滚动到顶部加载更多，聊天记录模式时有效
+		doChatRecordLoadMore() {
+			this.useChatRecordMode && this._onLoadingMore('click');
+		},
+		// 处理键盘高度变化
+		_handleKeyboardHeightChange(res) {
+			this.$emit('keyboardHeightChange', res);
+			if (this.autoAdjustPositionWhenChat) {
+				this.isKeyboardHeightChanged = true;
+				this.keyboardHeight = res.height > 0 ? res.height + this.finalChatAdjustPositionOffset : res.height;
+			}
+			if (this.autoToBottomWhenChat && this.keyboardHeight > 0) {
+				u.delay(() => {
+					this.scrollToBottom(false);
+					u.delay(() => {
+						this.scrollToBottom(false);
+					})
+				})
+			} 
+		}
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/common-layout.js b/uni_modules/z-paging/components/z-paging/js/modules/common-layout.js
new file mode 100644
index 0000000..c4933ed
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/common-layout.js
@@ -0,0 +1,141 @@
+// [z-paging]通用布局相关模块
+
+// #ifdef APP-NVUE
+const weexDom = weex.requireModule('dom');
+// #endif
+
+export default {
+	data() {
+		return {
+			systemInfo: null,
+			cssSafeAreaInsetBottom: -1,
+			isReadyDestroy: false,
+		}
+	},
+	computed: {
+		// 顶部可用距离
+		windowTop() {
+			if (!this.systemInfo) return 0;
+			// 暂时修复vue3中隐藏系统导航栏后windowTop获取不正确的问题，具体bug详见https://ask.dcloud.net.cn/question/141634
+			// 感谢litangyu！！https://github.com/SmileZXLee/uni-z-paging/issues/25
+			// #ifdef VUE3 && H5
+			const pageHeadNode = document.getElementsByTagName("uni-page-head");
+			if (!pageHeadNode.length) return 0;
+			// #endif
+			return this.systemInfo.windowTop || 0;
+		},
+		// 底部安全区域高度
+		safeAreaBottom() {
+			if (!this.systemInfo) return 0;
+			let safeAreaBottom = 0;
+			// #ifdef APP-PLUS
+			safeAreaBottom = this.systemInfo.safeAreaInsets.bottom || 0 ;
+			// #endif
+			// #ifndef APP-PLUS
+			safeAreaBottom = Math.max(this.cssSafeAreaInsetBottom, 0);
+			// #endif
+			return safeAreaBottom;
+		},
+		// 是否是比较老的webview，在一些老的webview中，需要进行一些特殊处理
+		isOldWebView() {
+			// #ifndef APP-NVUE || MP-KUAISHOU
+			try {
+				const systemInfos = uni.getSystemInfoSync().system.split(' ');
+				const deviceType = systemInfos[0];
+				const version = parseInt(systemInfos[1]);
+				if ((deviceType === 'iOS' && version <= 10) || (deviceType === 'Android' && version <= 6)) {
+					return true;
+				}
+			} catch(e) {
+				return false;
+			}
+			// #endif
+			return false;
+		},
+		// 当前组件的$slots，兼容不同平台
+		zSlots() {
+			// #ifdef VUE2
+			
+			// #ifdef MP-ALIPAY
+			return this.$slots;
+			// #endif
+			
+			return this.$scopedSlots || this.$slots;
+			// #endif
+			
+			return this.$slots;
+		},
+	},
+	beforeDestroy() {
+		this.isReadyDestroy = true;
+	},
+	// #ifdef VUE3
+	unmounted() {
+		this.isReadyDestroy = true;
+	},
+	// #endif
+	methods: {
+		// 更新fixed模式下z-paging的布局
+		updateFixedLayout() {
+			this.fixed && this.$nextTick(() => {
+				this.systemInfo = uni.getSystemInfoSync();
+			})
+		},
+		// 获取节点尺寸
+		_getNodeClientRect(select, inDom = true, scrollOffset = false) {
+			if (this.isReadyDestroy) {
+				return Promise.resolve(false);
+			};
+			// nvue中获取节点信息
+			// #ifdef APP-NVUE
+			select = select.replace(/[.|#]/g, '');
+			const ref = this.$refs[select];
+			return new Promise((resolve, reject) => {
+				if (ref) {
+					weexDom.getComponentRect(ref, option => {
+						resolve(option && option.result ? [option.size] : false);
+					})
+				} else {
+					resolve(false);
+				}
+			});
+			return;
+			// #endif
+			
+			// vue中获取节点信息
+			//#ifdef MP-ALIPAY
+			inDom = false;
+			//#endif
+			let res = !!inDom ? uni.createSelectorQuery().in(inDom === true ? this : inDom) : uni.createSelectorQuery();
+			scrollOffset ? res.select(select).scrollOffset() : res.select(select).boundingClientRect();
+			return new Promise((resolve, reject) => {
+				res.exec(data => {
+					resolve((data && data != '' && data != undefined && data.length) ? data : false);
+				});
+			});
+		},
+		// 获取slot="left"和slot="right"宽度并且更新布局
+		_updateLeftAndRightWidth(targetStyle, parentNodePrefix) {
+			this.$nextTick(() => {
+				let delayTime = 0;
+				// #ifdef MP-BAIDU
+				delayTime = 10;
+				// #endif
+				setTimeout(() => {
+					['left','right'].map(position => {
+						this._getNodeClientRect(`.${parentNodePrefix}-${position}`).then(res => {
+							this.$set(targetStyle, position, res ? res[0].width + 'px' : '0px');
+						});
+					})
+				}, delayTime)
+			})
+		},
+		// 通过获取css设置的底部安全区域占位view高度设置bottom距离（直接通过systemInfo在部分平台上无法获取到底部安全区域）
+		_getCssSafeAreaInsetBottom(success) {
+			this._getNodeClientRect('.zp-safe-area-inset-bottom').then(res => {
+				this.cssSafeAreaInsetBottom = res ? res[0].height : -1;
+				res && success && success();
+			});
+		}
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/data-handle.js b/uni_modules/z-paging/components/z-paging/js/modules/data-handle.js
new file mode 100644
index 0000000..249cb81
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/data-handle.js
@@ -0,0 +1,738 @@
+// [z-paging]数据处理模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import Enum from '.././z-paging-enum'
+import interceptor from '../z-paging-interceptor'
+
+export default {
+	props: {
+		// 自定义初始的pageNo，默认为1
+		defaultPageNo: {
+			type: [Number, String],
+			default: u.gc('defaultPageNo', 1),
+			observer: function(newVal) {
+				this.pageNo = newVal;
+			},
+		},
+		// 自定义pageSize，默认为10
+		defaultPageSize: {
+			type: [Number, String],
+			default: u.gc('defaultPageSize', 10),
+			validator: (value) => {
+				if (value <= 0) u.consoleErr('default-page-size必须大于0！');
+				return value > 0;
+			}
+		},
+		// 为保证数据一致，设置当前tab切换时的标识key，并在complete中传递相同key，若二者不一致，则complete将不会生效
+		dataKey: {
+			type: [Number, String, Object],
+			default: u.gc('dataKey', null),
+		},
+		// 使用缓存，若开启将自动缓存第一页的数据，默认为否。请注意，因考虑到切换tab时不同tab数据不同的情况，默认仅会缓存组件首次加载时第一次请求到的数据，后续的下拉刷新操作不会更新缓存。
+		useCache: {
+			type: Boolean,
+			default: u.gc('useCache', false)
+		},
+		// 使用缓存时缓存的key，用于区分不同列表的缓存数据，useCache为true时必须设置，否则缓存无效
+		cacheKey: {
+			type: String,
+			default: u.gc('cacheKey', null)
+		},
+		// 缓存模式，默认仅会缓存组件首次加载时第一次请求到的数据，可设置为always，即代表总是缓存，每次列表刷新(下拉刷新、调用reload等)都会更新缓存
+		cacheMode: {
+			type: String,
+			default: u.gc('cacheMode', Enum.CacheMode.Default)
+		},
+		// 自动注入的list名，可自动修改父view(包含ref="paging")中对应name的list值
+		autowireListName: {
+			type: String,
+			default: u.gc('autowireListName', '')
+		},
+		// 自动注入的query名，可自动调用父view(包含ref="paging")中的query方法
+		autowireQueryName: {
+			type: String,
+			default: u.gc('autowireQueryName', '')
+		},
+		// 获取分页数据Function，功能与@query类似。若设置了fetch则@query将不再触发
+		fetch: {
+			type: Function,
+			default: null
+		},
+		// fetch的附加参数，fetch配置后有效
+		fetchParams: {
+			type: Object,
+			default: u.gc('fetchParams', null)
+		},
+		// z-paging mounted后自动调用reload方法(mounted后自动调用接口)，默认为是
+		auto: {
+			type: Boolean,
+			default: u.gc('auto', true)
+		},
+		// 用户下拉刷新时是否触发reload方法，默认为是
+		reloadWhenRefresh: {
+			type: Boolean,
+			default: u.gc('reloadWhenRefresh', true)
+		},
+		// reload时自动滚动到顶部，默认为是
+		autoScrollToTopWhenReload: {
+			type: Boolean,
+			default: u.gc('autoScrollToTopWhenReload', true)
+		},
+		// reload时立即自动清空原list，默认为是，若立即自动清空，则在reload之后、请求回调之前页面是空白的
+		autoCleanListWhenReload: {
+			type: Boolean,
+			default: u.gc('autoCleanListWhenReload', true)
+		},
+		// 列表刷新时自动显示下拉刷新view，默认为否
+		showRefresherWhenReload: {
+			type: Boolean,
+			default: u.gc('showRefresherWhenReload', false)
+		},
+		// 列表刷新时自动显示加载更多view，且为加载中状态，默认为否
+		showLoadingMoreWhenReload: {
+			type: Boolean,
+			default: u.gc('showLoadingMoreWhenReload', false)
+		},
+		// 组件created时立即触发reload(可解决一些情况下先看到页面再看到loading的问题)，auto为true时有效。为否时将在mounted+nextTick后触发reload，默认为否
+		createdReload: {
+			type: Boolean,
+			default: u.gc('createdReload', false)
+		},
+		// 本地分页时上拉加载更多延迟时间，单位为毫秒，默认200毫秒
+		localPagingLoadingTime: {
+			type: [Number, String],
+			default: u.gc('localPagingLoadingTime', 200)
+		},
+		// 自动拼接complete中传过来的数组(使用聊天记录模式时无效)
+		concat: {
+			type: Boolean,
+			default: u.gc('concat', true)
+		},
+		// 请求失败是否触发reject，默认为是
+		callNetworkReject: {
+			type: Boolean,
+			default: u.gc('callNetworkReject', true)
+		},
+		// 父组件v-model所绑定的list的值
+		value: {
+			type: Array,
+			default: function() {
+				return [];
+			}
+		},
+		// #ifdef VUE3
+		modelValue: {
+			type: Array,
+			default: function() {
+				return [];
+			}
+		}
+		// #endif
+	},
+	data (){
+		return {
+			currentData: [],
+			totalData: [],
+			realTotalData: [],
+			totalLocalPagingList: [],
+			dataPromiseResultMap: {
+				reload: null,
+				complete: null,
+				localPaging: null
+			},
+			isSettingCacheList: false,
+			pageNo: 1,
+			currentRefreshPageSize: 0,
+			isLocalPaging: false,
+			isAddedData: false,
+			isTotalChangeFromAddData: false,
+			privateConcat: true,
+			myParentQuery: -1,
+			firstPageLoaded: false,
+			pagingLoaded: false,
+			loaded: false,
+			isUserReload: true,
+			fromEmptyViewReload: false,
+			queryFrom: '',
+			listRendering: false,
+			isHandlingRefreshToPage: false,
+			isFirstPageAndNoMore: false,
+			totalDataChangeThrow: true
+		}
+	},
+	computed: {
+		pageSize() {
+			return this.defaultPageSize;
+		},
+		finalConcat() {
+			return this.concat && this.privateConcat;
+		},
+		finalUseCache() {
+			if (this.useCache && !this.cacheKey) {
+				u.consoleErr('use-cache为true时，必须设置cache-key，否则缓存无效！');
+			}
+			return this.useCache && !!this.cacheKey;
+		},
+		finalCacheKey() {
+			return this.cacheKey ? `${c.cachePrefixKey}-${this.cacheKey}` : null; 
+		},
+		isFirstPage() {
+			return this.pageNo === this.defaultPageNo;
+		}
+	},
+	watch: {
+		totalData(newVal, oldVal) {
+			this._totalDataChange(newVal, oldVal, this.totalDataChangeThrow);
+			this.totalDataChangeThrow = true;
+		},
+		currentData(newVal, oldVal) {
+			this._currentDataChange(newVal, oldVal);
+		},
+		useChatRecordMode(newVal, oldVal) {
+			if (newVal) {
+				this.nLoadingMoreFixedHeight = false;
+			}
+		},
+		value: {
+			handler(newVal) {
+				// 当v-model绑定的数据源被更改时，此时数据源改变不emit input事件，避免循环调用
+				if (newVal !== this.totalData) {
+					this.totalDataChangeThrow = false;
+					this.totalData = newVal;
+				}
+			},
+			immediate: true
+		},
+		// #ifdef VUE3
+		modelValue: {
+			handler(newVal) {
+				// 当v-model绑定的数据源被更改时，此时数据源改变不emit input事件，避免循环调用
+				if (newVal !== this.totalData) {
+					this.totalDataChangeThrow = false;
+					this.totalData = newVal;
+				}
+			},
+			immediate: true
+		}
+		// #endif
+	},
+	methods: {
+		// 请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为是否成功(默认为是）
+		complete(data, success = true) {
+			this.customNoMore = -1;
+			return this.addData(data, success);
+		},
+		//【保证数据一致】请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为dataKey，需与:data-key绑定的一致，第三个参数为是否成功(默认为是）
+		completeByKey(data, dataKey = null, success = true) {
+			if (dataKey !== null && this.dataKey !== null && dataKey !== this.dataKey) {
+				this.isFirstPage && this.endRefresh();
+				return new Promise(resolve => resolve());
+			}
+			this.customNoMore = -1;
+			return this.addData(data, success);
+		},
+		//【通过total判断是否有更多数据】请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为total(列表总数)，第三个参数为是否成功(默认为是）
+		completeByTotal(data, total, success = true) {
+			if (total == 'undefined') {
+				this.customNoMore = -1;
+			} else {
+				const dataTypeRes = this._checkDataType(data, success, false);
+				data = dataTypeRes.data;
+				success = dataTypeRes.success;
+				if (total >= 0 && success) {
+					return new Promise((resolve, reject) => {
+						this.$nextTick(() => {
+							let nomore = false;
+							const realTotalDataCount = this.pageNo == this.defaultPageNo ? 0 : this.realTotalData.length;
+							const dataLength = this.privateConcat ? data.length : 0;
+							let exceedCount = realTotalDataCount + dataLength - total;
+							// 没有更多数据了
+							if (exceedCount >= 0) {
+								nomore = true;
+								// 仅截取total内部分的数据
+								exceedCount = this.defaultPageSize - exceedCount;
+								if (this.privateConcat && exceedCount > 0 && exceedCount < data.length) {
+									data = data.splice(0, exceedCount);
+								}
+							}
+							this.completeByNoMore(data, nomore, success).then(res => resolve(res)).catch(() => reject());
+						})
+					});
+				}
+			}
+			return this.addData(data, success);
+		},
+		//【自行判断是否有更多数据】请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为是否没有更多数据，第三个参数为是否成功(默认是是）
+		completeByNoMore(data, nomore, success = true) {
+			if (nomore != 'undefined') {
+				this.customNoMore = nomore == true ? 1 : 0;
+			}
+			return this.addData(data, success);
+		},
+		// 请求结束且请求失败时调用，支持传入请求失败原因
+		completeByError(errorMsg) {
+			this.customerEmptyViewErrorText = errorMsg;
+			return this.complete(false);
+		},
+		// 与上方complete方法功能一致，新版本中设置服务端回调数组请使用complete方法
+		addData(data, success = true) {
+			if (!this.fromCompleteEmit) {
+				this.disabledCompleteEmit = true;
+				this.fromCompleteEmit = false;
+			}
+			const currentTimeStamp = u.getTime();
+			const disTime = currentTimeStamp - this.requestTimeStamp;
+			let minDelay = this.minDelay;
+			if (this.isFirstPage && this.finalShowRefresherWhenReload) {
+				minDelay = Math.max(400, minDelay);
+			}
+			const addDataDalay = (this.requestTimeStamp > 0 && disTime < minDelay) ? minDelay - disTime : 0;
+			this.$nextTick(() => {
+				u.delay(() => {
+					this._addData(data, success, false);
+				}, this.delay > 0 ? this.delay : addDataDalay)
+			})
+			
+			return new Promise((resolve, reject) => {
+				this.dataPromiseResultMap.complete = { resolve, reject };
+			});
+		},
+		// 从顶部添加数据，不会影响分页的pageNo和pageSize
+		addDataFromTop(data, toTop = true, toTopWithAnimate = true) {
+			// 数据是否拼接到顶部，如果是聊天记录模式并且列表没有倒置，则应该拼接在底部
+			let addFromTop = !this.isChatRecordModeAndNotInversion;
+			data = Object.prototype.toString.call(data) !== '[object Array]' ? [data] : (addFromTop ? data.reverse() : data);
+			// #ifndef APP-NVUE
+			this.finalUseVirtualList && this._setCellIndex(data, 'top')
+			// #endif
+			
+			this.totalData = addFromTop ? [...data, ...this.totalData] : [...this.totalData, ...data];
+			if (toTop) {
+				u.delay(() => this.useChatRecordMode ? this.scrollToBottom(toTopWithAnimate) : this.scrollToTop(toTopWithAnimate));
+			}
+		},
+		// 重新设置列表数据，调用此方法不会影响pageNo和pageSize，也不会触发请求。适用场景：当需要删除列表中某一项时，将删除对应项后的数组通过此方法传递给z-paging。(当出现类似的需要修改列表数组的场景时，请使用此方法，请勿直接修改page中:list.sync绑定的数组)
+		resetTotalData(data) {
+			this.isTotalChangeFromAddData = true;
+			data = Object.prototype.toString.call(data) !== '[object Array]' ? [data] : data;
+			this.totalData = data;
+		},
+		// 设置本地分页数据，请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging作分页处理（若调用了此方法，则上拉加载更多时内部会自动分页，不会触发@query所绑定的事件）
+		setLocalPaging(data, success = true) {
+			this.isLocalPaging = true;
+			this.$nextTick(() => {
+				this._addData(data, success, true);
+			})
+			return new Promise((resolve, reject) => {
+				this.dataPromiseResultMap.localPaging = { resolve, reject };
+			});
+		},
+		// 重新加载分页数据，pageNo会恢复为默认值，相当于下拉刷新的效果(animate为true时会展示下拉刷新动画，默认为false)
+		reload(animate = this.showRefresherWhenReload) {
+			if (animate) {
+				this.privateShowRefresherWhenReload = animate;
+				this.isUserPullDown = true;
+			}
+			if (!this.showLoadingMoreWhenReload) {
+				this.listRendering = true;
+			}
+			this.$nextTick(() => {
+				this._preReload(animate, false);
+			})
+			return new Promise((resolve, reject) => {
+				this.dataPromiseResultMap.reload = { resolve, reject };
+			});
+		},
+		// 刷新列表数据，pageNo和pageSize不会重置，列表数据会重新从服务端获取。必须保证@query绑定的方法中的pageNo和pageSize和传给服务端的一致
+		refresh() {
+			return this._handleRefreshWithDisPageNo(this.pageNo - this.defaultPageNo + 1);
+		},
+		// 刷新列表数据至指定页，例如pageNo=5时则代表刷新列表至第5页，此时pageNo会变为5，列表会展示前5页的数据。必须保证@query绑定的方法中的pageNo和pageSize和传给服务端的一致
+		refreshToPage(pageNo) {
+			this.isHandlingRefreshToPage = true;
+			return this._handleRefreshWithDisPageNo(pageNo + this.defaultPageNo - 1);
+		},
+		// 手动更新列表缓存数据，将自动截取v-model绑定的list中的前pageSize条覆盖缓存，请确保在list数据更新到预期结果后再调用此方法
+		updateCache() {
+			if (this.finalUseCache && this.totalData.length) {
+				this._saveLocalCache(this.totalData.slice(0, Math.min(this.totalData.length, this.pageSize)));
+			}
+		},
+		// 清空分页数据
+		clean() {
+			this._reload(true);
+			this._addData([], true, false);
+		},
+		// 清空分页数据
+		clear() {
+			this.clean();
+		},
+		// reload之前的一些处理
+		_preReload(animate = this.showRefresherWhenReload, isFromMounted = true, retryCount = 0) {
+			const showRefresher = this.finalRefresherEnabled && this.useCustomRefresher;
+			// #ifndef APP-NVUE
+			// 如果获取slot="refresher"高度失败，则不触发reload，直到获取slot="refresher"高度成功
+			if (this.customRefresherHeight === -1 && showRefresher) {
+				u.delay(() => {
+					retryCount ++;
+					// 如果重试次数是10的倍数(也就是每500毫秒)，尝试重新获取一下slot="refresher"高度
+					// 此举是为了解决在某些特殊情况下，z-paging组件mounted了，但是未展示在用户面前，（比如在tabbar页面中，未切换到对应tabbar但是通过代码让z-paging展示了，此时控制台会报Error: Not Found：Page，因为这时候去获取dom节点信息获取不到）
+					// 当用户在某个时刻让此z-paging展示在面前时，即可顺利获取到slot="refresher"高度，递归停止
+					if (retryCount % 10 === 0) {
+						this._updateCustomRefresherHeight();
+					}
+					this._preReload(animate, isFromMounted, retryCount);
+				}, c.delayTime / 2);
+				return;
+			}
+			// #endif
+			this.isUserReload = true;
+			this.loadingType = Enum.LoadingType.Refresher;
+			if (animate) {
+				this.privateShowRefresherWhenReload = animate;
+				// #ifndef APP-NVUE
+				if (this.useCustomRefresher) {
+					this._doRefresherRefreshAnimate();
+				} else {
+					this.refresherTriggered = true;
+				}
+				// #endif
+				// #ifdef APP-NVUE
+				this.refresherStatus = Enum.Refresher.Loading;
+				this.refresherRevealStackCount ++;
+				u.delay(() => {
+					this._getNodeClientRect('zp-n-refresh-container', false).then((node) => {
+						if (node) {
+							let nodeHeight = node[0].height;
+							this.nShowRefresherReveal = true;
+							this.nShowRefresherRevealHeight = nodeHeight;
+							u.delay(() => {
+								this._nDoRefresherEndAnimation(0, -nodeHeight, false, false);
+								u.delay(() => {
+									this._nDoRefresherEndAnimation(nodeHeight, 0);
+								}, 10)
+							}, 10)
+						}
+						this._reload(false, isFromMounted);
+						this._doRefresherLoad(false);
+					});
+				}, this.pagingLoaded ? 10 : 100)
+				return;
+				// #endif
+			} else {
+				this._refresherEnd(false, false, false, false);
+			}
+			this._reload(false, isFromMounted);
+		},
+		// 重新加载分页数据
+		_reload(isClean = false, isFromMounted = false, isUserPullDown = false) {
+			this.isAddedData = false;
+			this.insideOfPaging = -1;
+			this.cacheScrollNodeHeight = -1;
+			this.pageNo = this.defaultPageNo;
+			this._cleanRefresherEndTimeout();
+			!this.privateShowRefresherWhenReload && !isClean && this._startLoading(true);
+			this.firstPageLoaded = true;
+			this.isTotalChangeFromAddData = false;
+			if (!this.isSettingCacheList) {
+				this.totalData = [];
+			}
+			if (!isClean) {
+				this._emitQuery(this.pageNo, this.defaultPageSize, isUserPullDown ? Enum.QueryFrom.UserPullDown : Enum.QueryFrom.Reload);
+				let delay = 0;
+				// #ifdef MP-TOUTIAO
+				delay = 5;
+				// #endif
+				u.delay(this._callMyParentQuery, delay);
+				if (!isFromMounted && this.autoScrollToTopWhenReload) {
+					let checkedNRefresherLoading = true;
+					// #ifdef APP-NVUE
+					checkedNRefresherLoading = !this.nRefresherLoading;
+					// #endif
+					checkedNRefresherLoading && this._scrollToTop(false);
+				}
+			}
+			// #ifdef APP-NVUE
+			this.$nextTick(() => {
+				this.nShowBottom = this.realTotalData.length > 0;
+			})
+			// #endif
+		},
+		// 处理服务端返回的数组
+		_addData(data, success, isLocal) {
+			this.isAddedData = true;
+			this.fromEmptyViewReload = false;
+			this.isTotalChangeFromAddData = true;
+			this.refresherTriggered = false;
+			this._endSystemLoadingAndRefresh();
+			const tempIsUserPullDown = this.isUserPullDown;
+			if (this.showRefresherUpdateTime && this.isFirstPage) {
+				u.setRefesrherTime(u.getTime(), this.refresherUpdateTimeKey);
+				this.$refs.refresh && this.$refs.refresh.updateTime();
+			}
+			if (!isLocal && tempIsUserPullDown && this.isFirstPage) {
+				this.isUserPullDown = false;
+			}
+			if (!this.isFirstPage) {
+				this.listRendering = true;
+				this.$nextTick(() => {
+					u.delay(() => this.listRendering = false);
+				})
+			} else {
+				this.listRendering = false;
+			}
+			let dataTypeRes = this._checkDataType(data, success, isLocal);
+			data = dataTypeRes.data;
+			success = dataTypeRes.success;
+			let delayTime = c.delayTime;
+			if (this.useChatRecordMode) delayTime = 0;
+			this.loadingForNow = false;
+			u.delay(() => {
+				this.pagingLoaded = true;
+				this.$nextTick(()=>{
+					!isLocal && this._refresherEnd(delayTime > 0, true, tempIsUserPullDown);
+				})
+			})
+			if (this.isFirstPage) {
+				this.isLoadFailed = !success;
+				this.$emit('isLoadFailedChange', this.isLoadFailed);
+				if (this.finalUseCache && success && (this.cacheMode === Enum.CacheMode.Always ? true : this.isSettingCacheList)) {
+					this._saveLocalCache(data);
+				}
+			}
+			this.isSettingCacheList = false;
+			if (success) {
+				if (!(this.privateConcat === false && !this.isHandlingRefreshToPage && this.loadingStatus === Enum.More.NoMore)) {
+					this.loadingStatus = Enum.More.Default;
+				}
+				if (isLocal) {
+					// 如果当前是本地分页，则必然是由setLocalPaging方法触发，此时直接本地加载第一页数据即可。后续本地分页加载更多方法由滚动到底部加载更多事件处理
+					this.totalLocalPagingList = data;
+					const localPageNo = this.defaultPageNo;
+					const localPageSize = this.queryFrom !== Enum.QueryFrom.Refresh ? this.defaultPageSize : this.currentRefreshPageSize;
+					this._localPagingQueryList(localPageNo, localPageSize, 0, res => {
+						this.completeByTotal(res, this.totalLocalPagingList.length);
+					})
+				} else {
+					// 如果当前不是本地分页，则按照正常分页逻辑进行数据处理&emit数据
+					let dataChangeDelayTime = 0;
+					// #ifdef APP-NVUE
+					if (this.privateShowRefresherWhenReload && this.finalNvueListIs === 'waterfall') {
+						dataChangeDelayTime = 150;
+					}
+					// #endif
+					u.delay(() => {
+						this._currentDataChange(data, this.currentData);
+						this._callDataPromise(true, this.totalData);
+					}, dataChangeDelayTime)
+				}
+				if (this.isHandlingRefreshToPage) {
+					this.isHandlingRefreshToPage = false;
+					this.pageNo = this.defaultPageNo + Math.ceil(data.length / this.pageSize) - 1;
+					if (data.length % this.pageSize !== 0) {
+						this.customNoMore = 1;
+					}
+				}
+			} else {
+				this._currentDataChange(data, this.currentData);
+				this._callDataPromise(false);
+				this.loadingStatus = Enum.More.Fail;
+				this.isHandlingRefreshToPage = false;
+				if (this.loadingType === Enum.LoadingType.LoadingMore) {
+					this.pageNo --;
+				}
+			}
+		},
+		// 所有数据改变时调用
+		_totalDataChange(newVal, oldVal, eventThrow=true) {
+			if ((!this.isUserReload || !this.autoCleanListWhenReload) && this.firstPageLoaded && !newVal.length && oldVal.length) {
+				return;
+			}
+			this._doCheckScrollViewShouldFullHeight(newVal);
+			if(!this.realTotalData.length && !newVal.length){
+				eventThrow = false;
+			}
+			this.realTotalData = newVal;
+			// emit列表更新事件
+			if (eventThrow) {
+				this.$emit('input', newVal);
+				// #ifdef VUE3
+				this.$emit('update:modelValue', newVal);
+				// #endif
+				this.$emit('update:list', newVal);
+				this.$emit('listChange', newVal);
+				this._callMyParentList(newVal);
+			}
+			this.firstPageLoaded = false;
+			this.isTotalChangeFromAddData = false;
+			this.$nextTick(() => {
+				u.delay(()=>{
+					// emit z-paging内容区域高度改变事件
+					this._getNodeClientRect('.zp-paging-container-content').then(res => {
+						res && this.$emit('contentHeightChanged', res[0].height);
+					});
+				}, c.delayTime * (this.isIos ? 1 : 3))
+				// #ifdef APP-NVUE
+				// 在nvue中延时600毫秒展示底部加载更多，避免底部加载更多太早加载闪一下的问题
+				u.delay(() => {
+					this.nShowBottom = true;
+				}, c.delayTime * 6, 'nShowBottomDelay');
+				// #endif
+			})
+		},
+		// 当前数据改变时调用
+		_currentDataChange(newVal, oldVal) {
+			newVal = [...newVal];
+			// #ifndef APP-NVUE
+			this.finalUseVirtualList && this._setCellIndex(newVal, 'bottom');
+			// #endif
+			if (this.isFirstPage && this.finalConcat) {
+				this.totalData = [];
+			}
+			// customNoMore：-1代表交由z-paging自行判断；1代表没有更多了；0代表还有更多数据
+			if (this.customNoMore !== -1) {
+				// 如果customNoMore等于1 或者 customNoMore不是0并且新增数组长度为0(也就是不是明确的还有更多数据并且新增的数组长度为0)，则没有更多数据了
+				if (this.customNoMore === 1 || (this.customNoMore !== 0 && !newVal.length)) {
+					this.loadingStatus = Enum.More.NoMore;
+				}
+			} else {
+				// 如果新增的数据数组长度为0 或者 新增的数组长度小于默认的pageSize，则没有更多数据了
+				if (!newVal.length || (newVal.length && newVal.length < this.defaultPageSize)) {
+					this.loadingStatus = Enum.More.NoMore;
+				}
+			}
+			if (!this.totalData.length) {
+				// #ifdef APP-NVUE
+				// 如果在聊天记录模式+nvue中，并且数据不满一页时需要将列表倒序，因为此时没有将列表旋转180度，数组中第0条数据应当在最底下显示
+				if (this.useChatRecordMode && this.finalConcat && this.isFirstPage && this.loadingStatus === Enum.More.NoMore) {
+					newVal.reverse();
+				}
+				// #endif
+				this.totalData = newVal;
+			} else {
+				if (this.finalConcat) {
+					const currentScrollTop = this.oldScrollTop;
+					this.totalData = [...this.totalData, ...newVal];
+					// 此处是为了解决在微信小程序中，在某些情况下滚动到底部加载更多后滚动位置直接变为最底部的问题，因此需要通过代码强制滚动回加载更多前的位置
+					// #ifdef MP-WEIXIN
+					if (!this.isIos && !this.refresherOnly && !this.usePageScroll && newVal.length) {
+						this.loadingMoreTimeStamp = u.getTime();
+						this.$nextTick(() => {
+							this.scrollToY(currentScrollTop);
+						})
+					}
+					// #endif
+				} else {
+					this.totalData = newVal;
+				}
+			}
+			this.privateConcat = true;
+		},
+		// 根据pageNo处理refresh操作
+		_handleRefreshWithDisPageNo(pageNo) {
+			if (!this.isHandlingRefreshToPage && !this.realTotalData.length) return this.reload();
+			if (pageNo >= 1) {
+				this.loading = true;
+				this.privateConcat = false;
+				const totalPageSize = pageNo * this.pageSize;
+				this.currentRefreshPageSize = totalPageSize;
+				// 如果调用refresh时是本地分页，则在组件内部自己处理分页逻辑，不emit query相关事件
+				if (this.isLocalPaging && this.isHandlingRefreshToPage) {
+					this._localPagingQueryList(this.defaultPageNo, totalPageSize, 0, res => {
+						this.complete(res);
+					})
+				} else {
+					// emit query相关事件
+					this._emitQuery(this.defaultPageNo, totalPageSize, Enum.QueryFrom.Refresh);
+					this._callMyParentQuery(this.defaultPageNo, totalPageSize);
+				}
+			}
+			return new Promise((resolve, reject) => {
+				this.dataPromiseResultMap.reload = { resolve, reject };
+			});
+		},
+		// 本地分页请求
+		_localPagingQueryList(pageNo, pageSize, localPagingLoadingTime, callback) {
+			pageNo = Math.max(1, pageNo);
+			pageSize = Math.max(1, pageSize);
+			const totalPagingList = [...this.totalLocalPagingList];
+			const pageNoIndex = (pageNo - 1) * pageSize;
+			const finalPageNoIndex = Math.min(totalPagingList.length, pageNoIndex + pageSize);
+			const resultPagingList = totalPagingList.splice(pageNoIndex, finalPageNoIndex - pageNoIndex);
+			u.delay(() => callback(resultPagingList), localPagingLoadingTime)
+		},
+		// 存储列表缓存数据
+		_saveLocalCache(data) {
+			uni.setStorageSync(this.finalCacheKey, data);
+		},
+		// 通过缓存数据填充列表数据
+		_setListByLocalCache() {
+			this.totalData = uni.getStorageSync(this.finalCacheKey) || [];
+			this.isSettingCacheList = true;
+		},
+		// 修改父view的list
+		_callMyParentList(newVal) {
+			if (this.autowireListName.length) {
+				const myParent = u.getParent(this.$parent);
+				if (myParent && myParent[this.autowireListName]) {
+					myParent[this.autowireListName] = newVal;
+				}
+			}
+		},
+		// 调用父view的query
+		_callMyParentQuery(customPageNo = 0, customPageSize = 0) {
+			if (this.autowireQueryName) {
+				if (this.myParentQuery === -1) {
+					const myParent = u.getParent(this.$parent);
+					if (myParent && myParent[this.autowireQueryName]) {
+						this.myParentQuery = myParent[this.autowireQueryName];
+					}
+				} 
+				if (this.myParentQuery !== -1) {
+					customPageSize > 0 ? this.myParentQuery(customPageNo, customPageSize) : this.myParentQuery(this.pageNo, this.defaultPageSize);
+				}
+			}
+		},
+		// emit query事件
+		_emitQuery(pageNo, pageSize, from){
+			this.queryFrom = from;
+			this.requestTimeStamp = u.getTime();
+			const [lastItem] = this.realTotalData.slice(-1);
+			if (this.fetch) {
+				const fetchParams = interceptor._handleFetchParams({pageNo, pageSize, from, lastItem: lastItem || null}, this.fetchParams);
+				const fetchResult = this.fetch(fetchParams);
+				if (!interceptor._handleFetchResult(fetchResult, this, fetchParams)) {
+					u.isPromise(fetchResult) ? fetchResult.then(res => {
+						this.complete(res);
+					}).catch(err => {
+						this.complete(false);
+					}) : this.complete(fetchResult)
+				}
+			} else {
+				this.$emit('query', ...interceptor._handleQuery(pageNo, pageSize, from, lastItem || null));
+			}
+		},
+		// 触发数据改变promise
+		_callDataPromise(success, totalList) {
+			for (const key in this.dataPromiseResultMap) {
+				const obj = this.dataPromiseResultMap[key];
+				if (!obj) continue;
+				success ? obj.resolve({ totalList, noMore: this.loadingStatus === Enum.More.NoMore }) : this.callNetworkReject && obj.reject(`z-paging-${key}-error`);
+			}
+		},
+		// 检查complete data的类型
+		_checkDataType(data, success, isLocal) {
+			const dataType = Object.prototype.toString.call(data);
+			if (dataType === '[object Boolean]') {
+				success = data;
+				data = [];
+			} else if (dataType !== '[object Array]') {
+				data = [];
+				if (dataType !== '[object Undefined]' && dataType !== '[object Null]') {
+					u.consoleErr(`${isLocal ? 'setLocalPaging' : 'complete'}参数类型不正确，第一个参数类型必须为Array!`);
+				}
+			}
+			return { data, success };
+		},
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/empty.js b/uni_modules/z-paging/components/z-paging/js/modules/empty.js
new file mode 100644
index 0000000..6c99f56
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/empty.js
@@ -0,0 +1,144 @@
+// [z-paging]空数据图view模块
+import u from '.././z-paging-utils'
+
+export default {
+	props: {
+		// 是否强制隐藏空数据图，默认为否
+		hideEmptyView: {
+			type: Boolean,
+			default: u.gc('hideEmptyView', false)
+		},
+		// 空数据图描述文字，默认为“没有数据哦~”
+		emptyViewText: {
+			type: [String, Object],
+			default: u.gc('emptyViewText', null)
+		},
+		// 是否显示空数据图重新加载按钮(无数据时)，默认为否
+		showEmptyViewReload: {
+			type: Boolean,
+			default: u.gc('showEmptyViewReload', false)
+		},
+		// 加载失败时是否显示空数据图重新加载按钮，默认为是
+		showEmptyViewReloadWhenError: {
+			type: Boolean,
+			default: u.gc('showEmptyViewReloadWhenError', true)
+		},
+		// 空数据图点击重新加载文字，默认为“重新加载”
+		emptyViewReloadText: {
+			type: [String, Object],
+			default: u.gc('emptyViewReloadText', null)
+		},
+		// 空数据图图片，默认使用z-paging内置的图片
+		emptyViewImg: {
+			type: String,
+			default: u.gc('emptyViewImg', '')
+		},
+		// 空数据图“加载失败”描述文字，默认为“很抱歉，加载失败”
+		emptyViewErrorText: {
+			type: [String, Object],
+			default: u.gc('emptyViewErrorText', null)
+		},
+		// 空数据图“加载失败”图片，默认使用z-paging内置的图片
+		emptyViewErrorImg: {
+			type: String,
+			default: u.gc('emptyViewErrorImg', '')
+		},
+		// 空数据图样式
+		emptyViewStyle: {
+			type: Object,
+			default: u.gc('emptyViewStyle', {})
+		},
+		// 空数据图容器样式
+		emptyViewSuperStyle: {
+			type: Object,
+			default: u.gc('emptyViewSuperStyle', {})
+		},
+		// 空数据图img样式
+		emptyViewImgStyle: {
+			type: Object,
+			default: u.gc('emptyViewImgStyle', {})
+		},
+		// 空数据图描述文字样式
+		emptyViewTitleStyle: {
+			type: Object,
+			default: u.gc('emptyViewTitleStyle', {})
+		},
+		// 空数据图重新加载按钮样式
+		emptyViewReloadStyle: {
+			type: Object,
+			default: u.gc('emptyViewReloadStyle', {})
+		},
+		// 空数据图片是否铺满z-paging，默认为否，即填充满z-paging内列表(滚动区域)部分。若设置为否，则为填铺满整个z-paging
+		emptyViewFixed: {
+			type: Boolean,
+			default: u.gc('emptyViewFixed', false)
+		},
+		// 空数据图片是否垂直居中，默认为是，若设置为否即为从空数据容器顶部开始显示。emptyViewFixed为false时有效
+		emptyViewCenter: {
+			type: Boolean,
+			default: u.gc('emptyViewCenter', true)
+		},
+		// 加载中时是否自动隐藏空数据图，默认为是
+		autoHideEmptyViewWhenLoading: {
+			type: Boolean,
+			default: u.gc('autoHideEmptyViewWhenLoading', true)
+		},
+		// 用户下拉列表触发下拉刷新加载中时是否自动隐藏空数据图，默认为是
+		autoHideEmptyViewWhenPull: {
+			type: Boolean,
+			default: u.gc('autoHideEmptyViewWhenPull', true)
+		},
+		// 空数据view的z-index，默认为9
+		emptyViewZIndex: {
+			type: Number,
+			default: u.gc('emptyViewZIndex', 9)
+		},
+	},
+	data() {
+		return {
+			customerEmptyViewErrorText: ''
+		}
+	},
+	computed: {
+		finalEmptyViewImg() {
+			return this.isLoadFailed ? this.emptyViewErrorImg : this.emptyViewImg;
+		},
+		finalShowEmptyViewReload() {
+			return this.isLoadFailed ? this.showEmptyViewReloadWhenError : this.showEmptyViewReload;
+		},
+		// 是否展示空数据图
+		showEmpty() {
+			if (this.refresherOnly || this.hideEmptyView || this.realTotalData.length) return false;
+			if (this.autoHideEmptyViewWhenLoading) {
+				if (this.isAddedData && !this.firstPageLoaded && !this.loading) return true;
+			} else {
+				return true;
+			}
+			return !this.autoHideEmptyViewWhenPull && !this.isUserReload;
+		},
+	},
+	methods: {
+		// 点击了空数据view重新加载按钮
+		_emptyViewReload() {
+			let callbacked = false;
+			this.$emit('emptyViewReload', reload => {
+				if (reload === undefined || reload === true) {
+					this.fromEmptyViewReload = true;
+					this.reload().catch(() => {});
+				}
+				callbacked = true;
+			});
+			// 如果用户没有禁止默认的点击重新加载刷新列表事件，则触发列表重新刷新
+			this.$nextTick(() => {
+				if (!callbacked) {
+					this.fromEmptyViewReload = true;
+					this.reload().catch(() => {});
+				}
+			})
+		},
+		// 点击了空数据view
+		_emptyViewClick() {
+			this.$emit('emptyViewClick');
+		},
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/i18n.js b/uni_modules/z-paging/components/z-paging/js/modules/i18n.js
new file mode 100644
index 0000000..b521c8e
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/i18n.js
@@ -0,0 +1,119 @@
+// [z-paging]i18n模块
+import { initVueI18n } from '@dcloudio/uni-i18n'
+import messages from '../../i18n/index.js'
+const { t } = initVueI18n(messages)
+
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import interceptor from '../z-paging-interceptor'
+
+const language = uni.getSystemInfoSync().language;
+export default {
+	data() {
+		return {
+			language
+		}
+	},
+	computed: {
+		finalLanguage() {
+			try {
+				const local = uni.getLocale();
+				const language = this.language;
+				return local === 'auto' ? interceptor._handleLanguage2Local(language, this._language2Local(language)) : local;
+			} catch (e) {
+				// 如果获取系统本地语言异常，则默认返回中文，uni.getLocale在部分低版本HX或者cli中可能报找不到的问题
+				return 'zh-Hans';
+			}
+		},
+		// 最终的下拉刷新默认状态的文字
+		finalRefresherDefaultText() {
+			return this._getI18nText('zp.refresher.default', this.refresherDefaultText);
+		},
+		// 最终的下拉刷新下拉中的文字
+		finalRefresherPullingText() {
+			return this._getI18nText('zp.refresher.pulling', this.refresherPullingText);
+		},
+		// 最终的下拉刷新中文字
+		finalRefresherRefreshingText() {
+			return this._getI18nText('zp.refresher.refreshing', this.refresherRefreshingText);
+		},
+		// 最终的下拉刷新完成文字
+		finalRefresherCompleteText() {
+			return this._getI18nText('zp.refresher.complete', this.refresherCompleteText);
+		},
+		// 最终的下拉刷新上次更新时间文字
+		finalRefresherUpdateTimeTextMap() {
+			return {
+				title: t('zp.refresherUpdateTime.title'),
+				none: t('zp.refresherUpdateTime.none'),
+				today: t('zp.refresherUpdateTime.today'),
+				yesterday: t('zp.refresherUpdateTime.yesterday')
+			};
+		},
+		// 最终的继续下拉进入二楼文字
+		finalRefresherGoF2Text() {
+			return this._getI18nText('zp.refresher.f2', this.refresherGoF2Text);
+		},
+		// 最终的底部加载更多默认状态文字
+		finalLoadingMoreDefaultText() {
+			return this._getI18nText('zp.loadingMore.default', this.loadingMoreDefaultText);
+		},
+		// 最终的底部加载更多加载中文字
+		finalLoadingMoreLoadingText() {
+			return this._getI18nText('zp.loadingMore.loading', this.loadingMoreLoadingText);
+		},
+		// 最终的底部加载更多没有更多数据文字
+		finalLoadingMoreNoMoreText() {
+			return this._getI18nText('zp.loadingMore.noMore', this.loadingMoreNoMoreText);
+		},
+		// 最终的底部加载更多加载失败文字
+		finalLoadingMoreFailText() {
+			return this._getI18nText('zp.loadingMore.fail', this.loadingMoreFailText);
+		},
+		// 最终的空数据图title
+		finalEmptyViewText() {
+			return this.isLoadFailed ? this.finalEmptyViewErrorText : this._getI18nText('zp.emptyView.title', this.emptyViewText);
+		},
+		// 最终的空数据图reload title
+		finalEmptyViewReloadText() {
+			return this._getI18nText('zp.emptyView.reload', this.emptyViewReloadText);
+		},
+		// 最终的空数据图加载失败文字
+		finalEmptyViewErrorText() {
+			return this.customerEmptyViewErrorText || this._getI18nText('zp.emptyView.error', this.emptyViewErrorText);
+		},
+		// 最终的系统loading title
+		finalSystemLoadingText() {
+			return this._getI18nText('zp.systemLoading.title', this.systemLoadingText);
+		},
+	},
+	methods: {
+		// 获取当前z-paging的语言
+		getLanguage() {
+			return this.finalLanguage;
+		},
+		// 获取国际化转换后的文本
+		_getI18nText(key, value) {
+			const dataType = Object.prototype.toString.call(value);
+			if (dataType === '[object Object]') {
+				const nextValue = value[this.finalLanguage];
+				if (nextValue) return nextValue;
+			} else if (dataType === '[object String]') {
+				return value;
+			}
+			return t(key);
+		},
+		// 系统language转i18n local
+		_language2Local(language) {
+			const formatedLanguage = language.toLowerCase().replace(new RegExp('_', ''), '-');
+			if (formatedLanguage.indexOf('zh') !== -1) {
+				if (formatedLanguage === 'zh' || formatedLanguage === 'zh-cn' || formatedLanguage.indexOf('zh-hans') !== -1) {
+					return 'zh-Hans';
+				}
+				return 'zh-Hant';
+			}
+			if (formatedLanguage.indexOf('en') !== -1) return 'en';
+			return language;
+		}
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/load-more.js b/uni_modules/z-paging/components/z-paging/js/modules/load-more.js
new file mode 100644
index 0000000..40af1a6
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/load-more.js
@@ -0,0 +1,370 @@
+// [z-paging]滚动到底部加载更多模块
+import u from '.././z-paging-utils'
+import Enum from '.././z-paging-enum'
+
+export default {
+	props: {
+		// 自定义底部加载更多样式
+		loadingMoreCustomStyle: {
+			type: Object,
+			default: u.gc('loadingMoreCustomStyle', {})
+		},
+		// 自定义底部加载更多文字样式
+		loadingMoreTitleCustomStyle: {
+			type: Object,
+			default: u.gc('loadingMoreTitleCustomStyle', {})
+		},
+		// 自定义底部加载更多加载中动画样式
+		loadingMoreLoadingIconCustomStyle: {
+			type: Object,
+			default: u.gc('loadingMoreLoadingIconCustomStyle', {})
+		},
+		// 自定义底部加载更多加载中动画图标类型，可选flower或circle，默认为flower
+		loadingMoreLoadingIconType: {
+			type: String,
+			default: u.gc('loadingMoreLoadingIconType', 'flower')
+		},
+		// 自定义底部加载更多加载中动画图标图片
+		loadingMoreLoadingIconCustomImage: {
+			type: String,
+			default: u.gc('loadingMoreLoadingIconCustomImage', '')
+		},
+		// 底部加载更多加载中view是否展示旋转动画，默认为是
+		loadingMoreLoadingAnimated: {
+			type: Boolean,
+			default: u.gc('loadingMoreLoadingAnimated', true)
+		},
+		// 是否启用加载更多数据(含滑动到底部加载更多数据和点击加载更多数据)，默认为是
+		loadingMoreEnabled: {
+			type: Boolean,
+			default: u.gc('loadingMoreEnabled', true)
+		},
+		// 是否启用滑动到底部加载更多数据，默认为是
+		toBottomLoadingMoreEnabled: {
+			type: Boolean,
+			default: u.gc('toBottomLoadingMoreEnabled', true)
+		},
+		// 滑动到底部状态为默认状态时，以加载中的状态展示，默认为否。若设置为是，可避免滚动到底部看到默认状态然后立刻变为加载中状态的问题，但分页数量未超过一屏时，不会显示【点击加载更多】
+		loadingMoreDefaultAsLoading: {
+			type: Boolean,
+			default: u.gc('loadingMoreDefaultAsLoading', false)
+		},
+		// 滑动到底部"默认"文字，默认为【点击加载更多】
+		loadingMoreDefaultText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreDefaultText', null)
+		},
+		// 滑动到底部"加载中"文字，默认为【正在加载...】
+		loadingMoreLoadingText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreLoadingText', null)
+		},
+		// 滑动到底部"没有更多"文字，默认为【没有更多了】
+		loadingMoreNoMoreText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreNoMoreText', null)
+		},
+		// 滑动到底部"加载失败"文字，默认为【加载失败，点击重新加载】
+		loadingMoreFailText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreFailText', null)
+		},
+		// 当没有更多数据且分页内容未超出z-paging时是否隐藏没有更多数据的view，默认为否
+		hideNoMoreInside: {
+			type: Boolean,
+			default: u.gc('hideNoMoreInside', false)
+		},
+		// 当没有更多数据且分页数组长度少于这个值时，隐藏没有更多数据的view，默认为0，代表不限制。
+		hideNoMoreByLimit: {
+			type: Number,
+			default: u.gc('hideNoMoreByLimit', 0)
+		},
+		// 是否显示默认的加载更多text，默认为是
+		showDefaultLoadingMoreText: {
+			type: Boolean,
+			default: u.gc('showDefaultLoadingMoreText', true)
+		},
+		// 是否显示没有更多数据的view
+		showLoadingMoreNoMoreView: {
+			type: Boolean,
+			default: u.gc('showLoadingMoreNoMoreView', true)
+		},
+		// 是否显示没有更多数据的分割线，默认为是
+		showLoadingMoreNoMoreLine: {
+			type: Boolean,
+			default: u.gc('showLoadingMoreNoMoreLine', true)
+		},
+		// 自定义底部没有更多数据的分割线样式
+		loadingMoreNoMoreLineCustomStyle: {
+			type: Object,
+			default: u.gc('loadingMoreNoMoreLineCustomStyle', {})
+		},
+		// 当分页未满一屏时，是否自动加载更多，默认为否(nvue无效)
+		insideMore: {
+			type: Boolean,
+			default: u.gc('insideMore', false)
+		},
+		// 距底部/右边多远时（单位px），触发 scrolltolower 事件，默认为100rpx
+		lowerThreshold: {
+			type: [Number, String],
+			default: u.gc('lowerThreshold', '100rpx')
+		},
+	},
+	data() {
+		return {
+			M: Enum.More,
+			// 底部加载更多状态
+			loadingStatus: Enum.More.Default,
+			// 在渲染之后的底部加载更多状态
+			loadingStatusAfterRender: Enum.More.Default,
+			// 底部加载更多时间戳
+			loadingMoreTimeStamp: 0,
+			// 底部加载更多slot
+			loadingMoreDefaultSlot: null,
+			// 是否展示底部加载更多
+			showLoadingMore: false,
+			// 是否是开发者自定义的加载更多，-1代表交由z-paging自行判断；1代表没有更多了；0代表还有更多数据
+			customNoMore: -1,
+		}
+	},
+	computed: {
+		// 底部加载更多配置
+		zLoadMoreConfig() {
+			return {
+				status: this.loadingStatusAfterRender,
+				defaultAsLoading: this.loadingMoreDefaultAsLoading || (this.useChatRecordMode && this.chatLoadingMoreDefaultAsLoading),
+				defaultThemeStyle: this.finalLoadingMoreThemeStyle,
+				customStyle: this.loadingMoreCustomStyle,
+				titleCustomStyle: this.loadingMoreTitleCustomStyle,
+				iconCustomStyle: this.loadingMoreLoadingIconCustomStyle,
+				loadingIconType: this.loadingMoreLoadingIconType,
+				loadingIconCustomImage: this.loadingMoreLoadingIconCustomImage,
+				loadingAnimated: this.loadingMoreLoadingAnimated,
+				showNoMoreLine: this.showLoadingMoreNoMoreLine,
+				noMoreLineCustomStyle: this.loadingMoreNoMoreLineCustomStyle,
+				defaultText: this.finalLoadingMoreDefaultText,
+				loadingText: this.finalLoadingMoreLoadingText,
+				noMoreText: this.finalLoadingMoreNoMoreText,
+				failText: this.finalLoadingMoreFailText,
+				hideContent: !this.loadingMoreDefaultAsLoading && this.listRendering,
+				unit: this.unit,
+				isChat: this.useChatRecordMode,
+				chatDefaultAsLoading: this.chatLoadingMoreDefaultAsLoading
+			};
+		},
+		// 最终的底部加载更多主题
+		finalLoadingMoreThemeStyle() {
+			return this.loadingMoreThemeStyle.length ? this.loadingMoreThemeStyle : this.defaultThemeStyle;
+		},
+		// 最终的底部加载更多触发阈值
+		finalLowerThreshold() {
+			return u.convertToPx(this.lowerThreshold);
+		},
+		// 是否显示默认状态下的底部加载更多
+		showLoadingMoreDefault() {
+			return this._showLoadingMore('Default');
+		},
+		// 是否显示加载中状态下的底部加载更多
+		showLoadingMoreLoading() {
+			return this._showLoadingMore('Loading');
+		},
+		// 是否显示没有更多了状态下的底部加载更多
+		showLoadingMoreNoMore() {
+			return this._showLoadingMore('NoMore');
+		},
+		// 是否显示加载失败状态下的底部加载更多
+		showLoadingMoreFail() {
+			return this._showLoadingMore('Fail');
+		},
+		// 是否显示自定义状态下的底部加载更多
+		showLoadingMoreCustom() {
+			return this._showLoadingMore('Custom');
+		}
+	},
+	methods: {
+		// 页面滚动到底部时通知z-paging进行进一步处理
+		pageReachBottom() {
+			!this.useChatRecordMode && this._onLoadingMore('toBottom');
+		},
+		// 手动触发上拉加载更多(非必须，可依据具体需求使用)
+		doLoadMore(type) {
+			this._onLoadingMore(type);
+		},
+		// 通过@scroll事件检测是否滚动到了底部(顺带检测下是否滚动到了顶部)
+		_checkScrolledToBottom(scrollDiff, checked = false) {
+			// 如果当前scroll-view高度未获取，则获取其高度
+			if (this.cacheScrollNodeHeight === -1) {
+				// 获取当前scroll-view高度
+				this._getNodeClientRect('.zp-scroll-view').then((res) => {
+					if (res) {
+						const scrollNodeHeight = res[0].height;
+						// 缓存当前scroll-view高度，如果获取过了不再获取
+						this.cacheScrollNodeHeight = scrollNodeHeight;
+						// // scrollDiff - this.cacheScrollNodeHeight = 当前滚动区域的顶部与内容底部的距离 - scroll-view高度 = 当前滚动区域的底部与内容底部的距离(也就是最终的与底部的距离)
+						if (scrollDiff - scrollNodeHeight <= this.finalLowerThreshold) {
+							// 如果与底部的距离小于阈值，则判断为滚动到了底部，触发滚动到底部事件
+							this._onLoadingMore('toBottom');
+						}
+					}
+				});
+			} else {
+				// scrollDiff - this.cacheScrollNodeHeight = 当前滚动区域的顶部与内容底部的距离 - scroll-view高度 = 当前滚动区域的底部与内容底部的距离(也就是最终的与底部的距离)
+				if (scrollDiff - this.cacheScrollNodeHeight <= this.finalLowerThreshold) {
+					// 如果与底部的距离小于阈值，则判断为滚动到了底部，触发滚动到底部事件
+					this._onLoadingMore('toBottom');
+				} else if (scrollDiff - this.cacheScrollNodeHeight <= 500 && !checked) {
+					// 如果与底部的距离小于500px，则获取当前滚动的位置，延迟150毫秒重复上述步骤再次检测(避免@scroll触发时获取的scrollTop不正确导致的其他问题，此时获取的scrollTop不一定可信)。防止因为部分性能较差安卓设备@scroll采样率过低导致的滚动到底部但是依然没有触发的问题
+					u.delay(() => {
+						this._getNodeClientRect('.zp-scroll-view', true, true).then((res) => {
+							if (res) {
+								this.oldScrollTop = res[0].scrollTop;
+								const newScrollDiff = res[0].scrollHeight - this.oldScrollTop;
+								this._checkScrolledToBottom(newScrollDiff, true);
+							}
+						})
+					}, 150, 'checkScrolledToBottomDelay')
+				}
+				// 检测一下是否已经滚动到了顶部了，因为在安卓中滚动到顶部时scrollTop不一定为0(和滚动到底部一样的原因)，所以需要在scrollTop小于150px时，通过获取.zp-scroll-view的scrollTop再判断一下
+				if (this.oldScrollTop <= 150 && this.oldScrollTop !== 0) {
+					u.delay(() => {
+						// 这里再判断一下是否确实已经滚动到顶部了，如果已经滚动到顶部了，则不用再判断了，再次判断的原因是可能150毫秒之后oldScrollTop才是0
+						if (this.oldScrollTop !== 0) {
+							this._getNodeClientRect('.zp-scroll-view', true, true).then((res) => {
+								// 如果150毫秒后.zp-scroll-view的scrollTop为0，则认为已经滚动到了顶部了
+								if (res && res[0].scrollTop === 0 && this.oldScrollTop !== 0) {
+									this._onScrollToUpper();
+								}
+							})
+						}
+					}, 150, 'checkScrolledToTopDelay')
+				}
+			}
+		},
+		// 触发加载更多时调用,from:toBottom-滑动到底部触发；1、click-点击加载更多触发
+		_onLoadingMore(from = 'click') {
+			// 如果是ios并且是滚动到底部的，则在滚动到底部时候尝试将列表设置为禁止滚动然后设置为允许滚动，以禁止底部bounce的效果
+			if (this.isIos && from === 'toBottom' && !this.scrollToBottomBounceEnabled && this.scrollEnable) {
+				this.scrollEnable = false;
+				this.$nextTick(() => {
+					this.scrollEnable = true;
+				})
+			}
+			// emit scrolltolower
+			this.$emit('scrolltolower', from);
+			// 如果是只使用下拉刷新 或者 禁用底部加载更多 或者 底部加载更多不是默认状态或加载失败状态 或者 是加载中状态 或者 空数据图已经展示了，则return，不触发内部加载更多逻辑
+			if (this.refresherOnly || !this.loadingMoreEnabled || !(this.loadingStatus === Enum.More.Default || this.loadingStatus === Enum.More.Fail) || this.loading || this.showEmpty) return;
+			// #ifdef MP-WEIXIN
+			if (!this.isIos && !this.refresherOnly && !this.usePageScroll) {
+				const currentTimestamp = u.getTime();
+				// 在非ios平台+scroll-view中节流处理
+				if (this.loadingMoreTimeStamp > 0 && currentTimestamp - this.loadingMoreTimeStamp < 100) {
+					this.loadingMoreTimeStamp = 0;
+					return;
+				}
+			}
+			// #endif
+			// 处理加载更多数据
+			this._doLoadingMore();
+		},
+		// 处理开始加载更多
+		_doLoadingMore() {
+			if (this.pageNo >= this.defaultPageNo && this.loadingStatus !== Enum.More.NoMore) {
+				this.pageNo ++;
+				this._startLoading(false);
+				if (this.isLocalPaging) {
+					// 如果是本地分页，则在组件内部对数据进行分页处理，不触发@query事件
+					this._localPagingQueryList(this.pageNo, this.defaultPageSize, this.localPagingLoadingTime, res => {
+						this.completeByTotal(res, this.totalLocalPagingList.length);
+						this.queryFrom = Enum.QueryFrom.LoadingMore;
+					})
+				} else {
+					// emit @query相关加载更多事件
+					this._emitQuery(this.pageNo, this.defaultPageSize, Enum.QueryFrom.LoadingMore);
+					this._callMyParentQuery();
+				}
+				// 设置当前加载状态为底部加载更多状态
+				this.loadingType = Enum.LoadingType.LoadingMore;
+			}
+		},
+		// (预处理)判断当没有更多数据且分页内容未超出z-paging时是否显示没有更多数据的view
+		_preCheckShowNoMoreInside(newVal, scrollViewNode, pagingContainerNode) {
+			if (this.loadingStatus === Enum.More.NoMore && this.hideNoMoreByLimit > 0 && newVal.length) {
+				this.showLoadingMore = newVal.length > this.hideNoMoreByLimit;
+			} else if ((this.loadingStatus === Enum.More.NoMore && this.hideNoMoreInside && newVal.length) || (this.insideMore && this.insideOfPaging !== false && newVal.length)) {
+				this.$nextTick(() => {
+					this._checkShowNoMoreInside(newVal, scrollViewNode, pagingContainerNode);
+				})
+				if (this.insideMore && this.insideOfPaging !== false && newVal.length) {
+					this.showLoadingMore = newVal.length;
+				}
+			} else {
+				this.showLoadingMore = newVal.length;
+			}
+		},
+		// 判断当没有更多数据且分页内容未超出z-paging时是否显示没有更多数据的view
+		async _checkShowNoMoreInside(totalData, oldScrollViewNode, oldPagingContainerNode) {
+			try {
+				const scrollViewNode = oldScrollViewNode || await this._getNodeClientRect('.zp-scroll-view');
+				// 在页面滚动模式下
+				if (this.usePageScroll) {
+					if (scrollViewNode) {
+						// 获取滚动内容总高度
+						const scrollViewTotalH = scrollViewNode[0].top + scrollViewNode[0].height;
+						// 如果滚动内容总高度小于窗口高度，则认为内容未超出z-paging
+						this.insideOfPaging = scrollViewTotalH < this.windowHeight;
+						// 如果需要没有更多数据时，隐藏底部加载更多view，并且内容未超过z-paging，则隐藏底部加载更多
+						if (this.hideNoMoreInside) {
+							this.showLoadingMore = !this.insideOfPaging;
+						}
+						// 如果需要内容未超过z-paging时自动加载更多，则触发加载更多
+						this._updateInsideOfPaging();
+					}
+				} else {
+					// 在scroll-view滚动模式下
+					const pagingContainerNode = oldPagingContainerNode || await this._getNodeClientRect('.zp-paging-container-content');
+					// 获取滚动内容总高度
+					const pagingContainerH = pagingContainerNode ? pagingContainerNode[0].height : 0;
+					// 获取z-paging内置scroll-view高度
+					const scrollViewH = scrollViewNode ? scrollViewNode[0].height : 0;
+					// 如果滚动内容总高度小于z-paging内置scroll-view高度，则认为内容未超出z-paging
+					this.insideOfPaging = pagingContainerH < scrollViewH;
+					if (this.hideNoMoreInside) {
+						this.showLoadingMore = !this.insideOfPaging;
+					}
+					// 如果需要内容未超过z-paging时自动加载更多，则触发加载更多
+					this._updateInsideOfPaging();
+				}
+			} catch (e) {
+				// 如果发生了异常，判断totalData数组长度为0，则认为内容未超出z-paging
+				this.insideOfPaging = !totalData.length;
+				if (this.hideNoMoreInside) {
+					this.showLoadingMore = !this.insideOfPaging;
+				}
+				// 如果需要内容未超过z-paging时自动加载更多，则触发加载更多
+				this._updateInsideOfPaging();
+			}
+		},
+		// 是否要展示上拉加载更多view
+		_showLoadingMore(type) {
+			if (!this.showLoadingMoreWhenReload && (!(this.loadingStatus === Enum.More.Default ? this.nShowBottom : true) || !this.realTotalData.length)) return false;
+			if (((!this.showLoadingMoreWhenReload || this.isUserPullDown || this.loadingStatus !== Enum.More.Loading) && !this.showLoadingMore) || 
+			(!this.loadingMoreEnabled && (!this.showLoadingMoreWhenReload || this.isUserPullDown || this.loadingStatus !== Enum.More.Loading)) || this.refresherOnly) {
+				return false;
+			}
+			if (this.useChatRecordMode && type !== 'Loading') return false;
+			if (!this.zSlots) return false;
+			if (type === 'Custom') {
+				return this.showDefaultLoadingMoreText && !(this.loadingStatus === Enum.More.NoMore && !this.showLoadingMoreNoMoreView);
+			}
+			const res = this.loadingStatus === Enum.More[type] && this.zSlots[`loadingMore${type}`] && (type === 'NoMore' ? this.showLoadingMoreNoMoreView : true);
+			if (res) {
+				// #ifdef APP-NVUE
+				if (!this.isIos) {
+					this.nLoadingMoreFixedHeight = false;
+				}
+				//  #endif
+			}
+			return res;
+		},
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/loading.js b/uni_modules/z-paging/components/z-paging/js/modules/loading.js
new file mode 100644
index 0000000..19596ce
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/loading.js
@@ -0,0 +1,95 @@
+// [z-paging]loading相关模块
+import u from '.././z-paging-utils'
+import Enum from '.././z-paging-enum'
+
+export default {
+	props: {
+		// 第一次加载后自动隐藏loading slot，默认为是
+		autoHideLoadingAfterFirstLoaded: {
+			type: Boolean,
+			default: u.gc('autoHideLoadingAfterFirstLoaded', true)
+		},
+		// loading slot是否铺满屏幕并固定，默认为否
+		loadingFullFixed: {
+			type: Boolean,
+			default: u.gc('loadingFullFixed', false)
+		},
+		// 是否自动显示系统Loading：即uni.showLoading，若开启则将在刷新列表时(调用reload、refresh时)显示，下拉刷新和滚动到底部加载更多不会显示，默认为false。
+		autoShowSystemLoading: {
+			type: Boolean,
+			default: u.gc('autoShowSystemLoading', false)
+		},
+		// 显示系统Loading时是否显示透明蒙层，防止触摸穿透，默认为是(H5、App、微信小程序、百度小程序有效)
+		systemLoadingMask: {
+			type: Boolean,
+			default: u.gc('systemLoadingMask', true)
+		},
+		// 显示系统Loading时显示的文字，默认为"加载中"
+		systemLoadingText: {
+			type: [String, Object],
+			default: u.gc('systemLoadingText', null)
+		},
+	},
+	data() {
+		return {
+			loading: false,
+			loadingForNow: false,
+		}
+	},
+	watch: {
+		// loading状态
+		loadingStatus(newVal) {
+			this.$emit('loadingStatusChange', newVal);
+			this.$nextTick(() => {
+				this.loadingStatusAfterRender = newVal;
+			})
+			if (this.useChatRecordMode) {
+				if (this.isFirstPage && (newVal === Enum.More.NoMore || newVal === Enum.More.Fail)) {
+					this.isFirstPageAndNoMore = true;
+					return;
+				}
+			}
+			this.isFirstPageAndNoMore = false;
+		},
+		loading(newVal){
+			if (newVal) {
+				this.loadingForNow = newVal;
+			}
+		},
+	},
+	computed: {
+		// 是否显示loading
+		showLoading() {
+			if (this.firstPageLoaded || !this.loading || !this.loadingForNow) return false;
+			if (this.finalShowSystemLoading) {
+				// 显示系统loading
+				uni.showLoading({
+					title: this.finalSystemLoadingText,
+					mask: this.systemLoadingMask
+				})
+			}
+			return this.autoHideLoadingAfterFirstLoaded ? (this.fromEmptyViewReload ? true : !this.pagingLoaded) : this.loadingType === Enum.LoadingType.Refresher;
+		},
+		// 最终的是否显示系统loading
+		finalShowSystemLoading() {
+			return this.autoShowSystemLoading && this.loadingType === Enum.LoadingType.Refresher;
+		}
+	},
+	methods: {
+		// 处理开始加载更多状态
+		_startLoading(isReload = false) {
+			if ((this.showLoadingMoreWhenReload && !this.isUserPullDown) || !isReload) {
+				this.loadingStatus = Enum.More.Loading;
+			}
+			this.loading = true;
+		},
+		// 停止系统loading和refresh
+		_endSystemLoadingAndRefresh(){
+			this.finalShowSystemLoading && uni.hideLoading();
+			!this.useCustomRefresher && uni.stopPullDownRefresh();
+			// #ifdef APP-NVUE
+			this.usePageScroll && uni.stopPullDownRefresh();
+			// #endif
+		}
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/nvue.js b/uni_modules/z-paging/components/z-paging/js/modules/nvue.js
new file mode 100644
index 0000000..300b084
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/nvue.js
@@ -0,0 +1,255 @@
+// [z-paging]nvue独有部分模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import Enum from '.././z-paging-enum'
+
+// #ifdef APP-NVUE
+const weexAnimation = weex.requireModule('animation');
+// #endif
+export default {
+	props: {
+		// #ifdef APP-NVUE
+		// nvue中修改列表类型，可选值有list、waterfall和scroller，默认为list
+		nvueListIs: {
+			type: String,
+			default: u.gc('nvueListIs', 'list')
+		},
+		// nvue waterfall配置，仅在nvue中且nvueListIs=waterfall时有效，配置参数详情参见：https://uniapp.dcloud.io/component/waterfall
+		nvueWaterfallConfig: {
+			type: Object,
+			default: u.gc('nvueWaterfallConfig', {})
+		},
+		// nvue 控制是否回弹效果，iOS不支持动态修改
+		nvueBounce: {
+			type: Boolean,
+			default: u.gc('nvueBounce', true)
+		},
+		// nvue中通过代码滚动到顶部/底部时，是否加快动画效果(无滚动动画时无效)，默认为否
+		nvueFastScroll: {
+			type: Boolean,
+			default: u.gc('nvueFastScroll', false)
+		},
+		// nvue中list的id
+		nvueListId: {
+			type: String,
+			default: u.gc('nvueListId', '')
+		},
+		// nvue中refresh组件的样式
+		nvueRefresherStyle: {
+			type: Object,
+			default: u.gc('nvueRefresherStyle', {})
+		},
+		// nvue中是否按分页模式(类似竖向swiper)显示List，默认为false
+		nvuePagingEnabled: {
+			type: Boolean,
+			default: u.gc('nvuePagingEnabled', false)
+		},
+		// 是否隐藏nvue列表底部的tagView，此view用于标识滚动到底部位置，若隐藏则滚动到底部功能将失效，在nvue中实现吸顶+swiper功能时需将最外层z-paging的此属性设置为true。默认为否
+		hideNvueBottomTag: {
+			type: Boolean,
+			default: u.gc('hideNvueBottomTag', false)
+		},
+		// nvue中控制onscroll事件触发的频率：表示两次onscroll事件之间列表至少滚动了10px。注意，将该值设置为较小的数值会提高滚动事件采样的精度，但同时也会降低页面的性能
+		offsetAccuracy: {
+			type: Number,
+			default: u.gc('offsetAccuracy', 10)
+		},
+		// #endif
+	},
+	data() {
+		return {
+			nRefresherLoading: false,
+			nListIsDragging: false,
+			nShowBottom: true,
+			nFixFreezing: false,
+			nShowRefresherReveal: false,
+			nLoadingMoreFixedHeight: false,
+			nShowRefresherRevealHeight: 0,
+			nOldShowRefresherRevealHeight: -1,
+			nRefresherWidth: uni.upx2px(750),
+			nF2Opacity: 0
+		}
+	},
+	computed: {
+		// #ifdef APP-NVUE
+		nScopedSlots() {
+			// #ifdef VUE2
+			return this.$scopedSlots;
+			// #endif
+			// #ifdef VUE3
+			return null;
+			// #endif
+		},
+		nWaterfallColumnCount() {
+			if (this.finalNvueListIs !== 'waterfall') return 0;
+			return this._nGetWaterfallConfig('column-count', 2);
+		},
+		nWaterfallColumnWidth() {
+			return this._nGetWaterfallConfig('column-width', 'auto');
+		},
+		nWaterfallColumnGap() {
+			return this._nGetWaterfallConfig('column-gap', 'normal');
+		},
+		nWaterfallLeftGap() {
+			return this._nGetWaterfallConfig('left-gap', 0);
+		},
+		nWaterfallRightGap() {
+			return this._nGetWaterfallConfig('right-gap', 0);
+		},
+		nViewIs() {
+			const is = this.finalNvueListIs;
+			return is === 'scroller' || is === 'view' ? 'view' : is === 'waterfall' ? 'header' : 'cell';
+		},
+		nSafeAreaBottomHeight() {
+			return this.safeAreaInsetBottom ? this.safeAreaBottom : 0;
+		},
+		finalNvueListIs() {
+			if (this.usePageScroll) return 'view';
+			const nvueListIsLowerCase = this.nvueListIs.toLowerCase();
+			if (['list','waterfall','scroller'].indexOf(nvueListIsLowerCase) !== -1) return nvueListIsLowerCase;
+			return 'list';
+		},
+		finalNvueSuperListIs() {
+			return this.usePageScroll ? 'view' : 'scroller';
+		},
+		finalNvueRefresherEnabled() {
+			return this.finalNvueListIs !== 'view' && this.finalRefresherEnabled && !this.nShowRefresherReveal && !this.useChatRecordMode;
+		},
+		// #endif
+	},
+	mounted(){
+		// #ifdef APP-NVUE
+		//旋转屏幕时更新宽度
+		uni.onWindowResize((res) => {
+			// this._nUpdateRefresherWidth();
+		})
+		// #endif
+	},
+	methods: {
+		// #ifdef APP-NVUE
+		// 列表滚动时触发
+		_nOnScroll(e) {
+			this.$emit('scroll', e);
+			const contentOffsetY = -e.contentOffset.y;
+			this.oldScrollTop = contentOffsetY;
+			this.nListIsDragging = e.isDragging;
+			this._checkShouldShowBackToTop(contentOffsetY, contentOffsetY - 1);
+		},
+		// 列表滚动结束
+		_nOnScrollend(e) {
+			this.$emit('scrollend', e);
+		},
+		// 下拉刷新刷新中
+		_nOnRrefresh() {
+			if (this.nShowRefresherReveal) return;
+			// 进入刷新状态
+			this.nRefresherLoading = true;
+			if (this.refresherStatus === Enum.Refresher.GoF2) {
+				this._handleGoF2();
+				this.$nextTick(() => {
+					this._nRefresherEnd();
+				})
+			} else {
+				this.refresherStatus = Enum.Refresher.Loading;
+				this._doRefresherLoad();
+			}
+			
+		},
+		// 下拉刷新下拉中
+		_nOnPullingdown(e) {
+			if (this.refresherStatus === Enum.Refresher.Loading || (this.isIos && !this.nListIsDragging)) return;
+			this._emitTouchmove(e);
+			let { viewHeight, pullingDistance } = e;
+			// 更新下拉刷新状态
+			// 下拉刷新距离超过阈值
+			if (pullingDistance >= viewHeight) {
+				// 如果开启了下拉进入二楼并且下拉刷新距离超过进入二楼阈值，则当前下拉刷新状态为松手进入二楼，否则为松手立即刷新
+				// (pullingDistance - viewHeight) + this.finalRefresherThreshold 不等同于pullingDistance，此处是为了兼容不同平台下拉相同距离pullingDistance不一致的问题，pullingDistance仅与viewHeight互相关联
+				this.refresherStatus = this.refresherF2Enabled && (pullingDistance - viewHeight) + this.finalRefresherThreshold >= this.finalRefresherF2Threshold ? Enum.Refresher.GoF2 : Enum.Refresher.ReleaseToRefresh;
+			} else {
+				// 下拉刷新距离未超过阈值，显示默认状态
+				this.refresherStatus = Enum.Refresher.Default;
+			}
+		},
+		// 下拉刷新结束
+		_nRefresherEnd(doEnd = true) {
+			if (doEnd) {
+			   this._nDoRefresherEndAnimation(0, -this.nShowRefresherRevealHeight); 
+			   !this.usePageScroll && this.$refs['zp-n-list'].resetLoadmore();
+			   this.nRefresherLoading = false;
+			}
+		},
+		// 执行主动触发下拉刷新动画
+		_nDoRefresherEndAnimation(height, translateY, animate = true, checkStack = true) {
+			// 清除下拉刷新相关timeout
+			this._cleanRefresherCompleteTimeout();
+			this._cleanRefresherEndTimeout();
+			
+			if (!this.finalShowRefresherWhenReload) {
+				// 如果reload不需要自动展示下拉刷新view，则在complete duration结束后再把下拉刷新状态设置回默认
+				this.refresherEndTimeout = u.delay(() => {
+					this.refresherStatus = Enum.Refresher.Default;
+				}, this.refresherCompleteDuration);
+				return;
+			}
+			// 用户处理用户在短时间内多次调用reload的情况，此时下拉刷新view不需要重复显示，只需要保证最后一次reload对应的请求结束后收回下拉刷新view即可
+			const stackCount = this.refresherRevealStackCount;
+			if (height === 0 && checkStack) {
+				this.refresherRevealStackCount --;
+				if (stackCount > 1) return;
+				this.refresherEndTimeout = u.delay(() => {
+					this.refresherStatus = Enum.Refresher.Default;
+				}, this.refresherCompleteDuration);
+			}
+			if (stackCount > 1) {
+				this.refresherStatus = Enum.Refresher.Loading;
+			}
+			
+			const duration = animate ? 200 : 0;
+			if (this.nOldShowRefresherRevealHeight !== height) {
+				if (height > 0) {
+					this.nShowRefresherReveal = true;
+				}
+				// 展示下拉刷新view
+				weexAnimation.transition(this.$refs['zp-n-list-refresher-reveal'], {
+					styles: {
+						height: `${height}px`,
+						transform: `translateY(${translateY}px)`,
+					},
+					duration,
+					timingFunction: 'linear',
+					needLayout: true,
+					delay: 0
+				})
+			}
+			u.delay(() => {
+				if (animate) {
+					this.nShowRefresherReveal = height > 0;
+				}
+			}, duration > 0 ? duration - 60 : 0);
+			this.nOldShowRefresherRevealHeight = height;
+		},
+		// 滚动到底部加载更多
+		_nOnLoadmore() {
+			if (this.nShowRefresherReveal || !this.totalData.length) return;
+			this.useChatRecordMode ? this.doChatRecordLoadMore() : this._onLoadingMore('toBottom');
+		},
+		// 获取nvue waterfall单项配置
+		_nGetWaterfallConfig(key, defaultValue) {
+			return this.nvueWaterfallConfig[key] || defaultValue;
+		},
+		// 更新nvue 下拉刷新view容器的宽度
+		_nUpdateRefresherWidth() {
+			u.delay(() => {
+				this.$nextTick(()=>{
+					this._getNodeClientRect('.zp-n-list').then(node => {
+						if (node) {
+							this.nRefresherWidth = node[0].width || this.nRefresherWidth;
+						}
+					})
+				})
+			})	
+		}
+		// #endif
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/refresher.js b/uni_modules/z-paging/components/z-paging/js/modules/refresher.js
new file mode 100644
index 0000000..9507ddd
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/refresher.js
@@ -0,0 +1,824 @@
+// [z-paging]下拉刷新view模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import Enum from '.././z-paging-enum'
+
+// #ifdef APP-NVUE
+const weexAnimation = weex.requireModule('animation');
+// #endif
+export default {
+	props: {
+		// 下拉刷新的主题样式，支持black，white，默认black
+		refresherThemeStyle: {
+			type: String,
+			default: u.gc('refresherThemeStyle', '')
+		},
+		// 自定义下拉刷新中左侧图标的样式
+		refresherImgStyle: {
+			type: Object,
+			default: u.gc('refresherImgStyle', {})
+		},
+		// 自定义下拉刷新中右侧状态描述文字的样式
+		refresherTitleStyle: {
+			type: Object,
+			default: u.gc('refresherTitleStyle', {})
+		},
+		// 自定义下拉刷新中右侧最后更新时间文字的样式(show-refresher-update-time为true时有效)
+		refresherUpdateTimeStyle: {
+			type: Object,
+			default: u.gc('refresherUpdateTimeStyle', {})
+		},
+		// 在微信小程序和QQ小程序中，是否实时监听下拉刷新中进度，默认为否
+		watchRefresherTouchmove: {
+			type: Boolean,
+			default: u.gc('watchRefresherTouchmove', false)
+		},
+		// 底部加载更多的主题样式，支持black，white，默认black
+		loadingMoreThemeStyle: {
+			type: String,
+			default: u.gc('loadingMoreThemeStyle', '')
+		},
+		// 是否只使用下拉刷新，设置为true后将关闭mounted自动请求数据、关闭滚动到底部加载更多，强制隐藏空数据图。默认为否
+		refresherOnly: {
+			type: Boolean,
+			default: u.gc('refresherOnly', false)
+		},
+		// 自定义下拉刷新默认状态下回弹动画时间，单位为毫秒，默认为100毫秒，nvue无效
+		refresherDefaultDuration: {
+			type: [Number, String],
+			default: u.gc('refresherDefaultDuration', 100)
+		},
+		// 自定义下拉刷新结束以后延迟回弹的时间，单位为毫秒，默认为0
+		refresherCompleteDelay: {
+			type: [Number, String],
+			default: u.gc('refresherCompleteDelay', 0)
+		},
+		// 自定义下拉刷新结束回弹动画时间，单位为毫秒，默认为300毫秒(refresherEndBounceEnabled为false时，refresherCompleteDuration为设定值的1/3)，nvue无效
+		refresherCompleteDuration: {
+			type: [Number, String],
+			default: u.gc('refresherCompleteDuration', 300)
+		},
+		// 自定义下拉刷新中是否允许列表滚动，默认为是
+		refresherRefreshingScrollable: {
+			type: Boolean,
+			default: u.gc('refresherRefreshingScrollable', true)
+		},
+		// 自定义下拉刷新结束状态下是否允许列表滚动，默认为否
+		refresherCompleteScrollable: {
+			type: Boolean,
+			default: u.gc('refresherCompleteScrollable', false)
+		},
+		// 是否使用自定义的下拉刷新，默认为是，即使用z-paging的下拉刷新。设置为false即代表使用uni scroll-view自带的下拉刷新，h5、App、微信小程序以外的平台不支持uni scroll-view自带的下拉刷新
+		useCustomRefresher: {
+			type: Boolean,
+			default: u.gc('useCustomRefresher', true)
+		},
+		// 自定义下拉刷新下拉帧率，默认为40，过高可能会出现抖动问题
+		refresherFps: {
+			type: [Number, String],
+			default: u.gc('refresherFps', 40)
+		},
+		// 自定义下拉刷新允许触发的最大下拉角度，默认为40度，当下拉角度小于设定值时，自定义下拉刷新动画不会被触发
+		refresherMaxAngle: {
+			type: [Number, String],
+			default: u.gc('refresherMaxAngle', 40)
+		},
+		// 自定义下拉刷新的角度由未达到最大角度变到达到最大角度时，是否继续下拉刷新手势，默认为否
+		refresherAngleEnableChangeContinued: {
+			type: Boolean,
+			default: u.gc('refresherAngleEnableChangeContinued', false)
+		},
+		// 自定义下拉刷新默认状态下的文字
+		refresherDefaultText: {
+			type: [String, Object],
+			default: u.gc('refresherDefaultText', null)
+		},
+		// 自定义下拉刷新松手立即刷新状态下的文字
+		refresherPullingText: {
+			type: [String, Object],
+			default: u.gc('refresherPullingText', null)
+		},
+		// 自定义下拉刷新刷新中状态下的文字
+		refresherRefreshingText: {
+			type: [String, Object],
+			default: u.gc('refresherRefreshingText', null)
+		},
+		// 自定义下拉刷新刷新结束状态下的文字
+		refresherCompleteText: {
+			type: [String, Object],
+			default: u.gc('refresherCompleteText', null)
+		},
+		// 自定义继续下拉进入二楼文字
+		refresherGoF2Text: {
+			type: [String, Object],
+			default: u.gc('refresherGoF2Text', null)
+		},
+		// 自定义下拉刷新默认状态下的图片
+		refresherDefaultImg: {
+			type: String,
+			default: u.gc('refresherDefaultImg', null)
+		},
+		// 自定义下拉刷新松手立即刷新状态下的图片，默认与refresherDefaultImg一致
+		refresherPullingImg: {
+			type: String,
+			default: u.gc('refresherPullingImg', null)
+		},
+		// 自定义下拉刷新刷新中状态下的图片
+		refresherRefreshingImg: {
+			type: String,
+			default: u.gc('refresherRefreshingImg', null)
+		},
+		// 自定义下拉刷新刷新结束状态下的图片
+		refresherCompleteImg: {
+			type: String,
+			default: u.gc('refresherCompleteImg', null)
+		},
+		// 自定义下拉刷新刷新中状态下是否展示旋转动画
+		refresherRefreshingAnimated: {
+			type: Boolean,
+			default: u.gc('refresherRefreshingAnimated', true)
+		},
+		// 是否开启自定义下拉刷新刷新结束回弹效果，默认为是
+		refresherEndBounceEnabled: {
+			type: Boolean,
+			default: u.gc('refresherEndBounceEnabled', true)
+		},
+		// 是否开启自定义下拉刷新，默认为是
+		refresherEnabled: {
+			type: Boolean,
+			default: u.gc('refresherEnabled', true)
+		},
+		// 设置自定义下拉刷新阈值，默认为80rpx
+		refresherThreshold: {
+			type: [Number, String],
+			default: u.gc('refresherThreshold', '80rpx')
+		},
+		// 设置系统下拉刷新默认样式，支持设置 black，white，none，none 表示不使用默认样式，默认为black
+		refresherDefaultStyle: {
+			type: String,
+			default: u.gc('refresherDefaultStyle', 'black')
+		},
+		// 设置自定义下拉刷新区域背景
+		refresherBackground: {
+			type: String,
+			default: u.gc('refresherBackground', 'transparent')
+		},
+		// 设置固定的自定义下拉刷新区域背景
+		refresherFixedBackground: {
+			type: String,
+			default: u.gc('refresherFixedBackground', 'transparent')
+		},
+		// 设置固定的自定义下拉刷新区域高度，默认为0
+		refresherFixedBacHeight: {
+			type: [Number, String],
+			default: u.gc('refresherFixedBacHeight', 0)
+		},
+		// 设置自定义下拉刷新下拉超出阈值后继续下拉位移衰减的比例，范围0-1，值越大代表衰减越多。默认为0.65(nvue无效)
+		refresherOutRate: {
+			type: Number,
+			default: u.gc('refresherOutRate', 0.65)
+		},
+		// 是否开启下拉进入二楼功能，默认为否
+		refresherF2Enabled: {
+			type: Boolean,
+			default: u.gc('refresherF2Enabled', false)
+		},
+		// 下拉进入二楼阈值，默认为200rpx
+		refresherF2Threshold: {
+			type: [Number, String],
+			default: u.gc('refresherF2Threshold', '200rpx')
+		},
+		// 下拉进入二楼动画时间，单位为毫秒，默认为200毫秒
+		refresherF2Duration: {
+			type: [Number, String],
+			default: u.gc('refresherF2Duration', 200)
+		},
+		// 下拉进入二楼状态松手后是否弹出二楼，默认为是
+		showRefresherF2: {
+			type: Boolean,
+			default: u.gc('showRefresherF2', true)
+		},
+		// 设置自定义下拉刷新下拉时实际下拉位移与用户下拉距离的比值，默认为0.75，即代表若用户下拉10px，则实际位移为7.5px(nvue无效)
+		refresherPullRate: {
+			type: Number,
+			default: u.gc('refresherPullRate', 0.75)
+		},
+		// 是否显示最后更新时间，默认为否
+		showRefresherUpdateTime: {
+			type: Boolean,
+			default: u.gc('showRefresherUpdateTime', false)
+		},
+		// 如果需要区别不同页面的最后更新时间，请为不同页面的z-paging的`refresher-update-time-key`设置不同的字符串
+		refresherUpdateTimeKey: {
+			type: String,
+			default: u.gc('refresherUpdateTimeKey', 'default')
+		},
+		// 下拉刷新时下拉到“松手立即刷新”或“松手进入二楼”状态时是否使手机短振动，默认为否（h5无效）
+		refresherVibrate: {
+			type: Boolean,
+			default: u.gc('refresherVibrate', false)
+		},
+		// 下拉刷新时是否禁止下拉刷新view跟随用户触摸竖直移动，默认为否。注意此属性只是禁止下拉刷新view移动，其他下拉刷新逻辑依然会正常触发
+		refresherNoTransform: {
+			type: Boolean,
+			default: u.gc('refresherNoTransform', false)
+		},
+		// 是否开启下拉刷新状态栏占位，适用于隐藏导航栏时，下拉刷新需要避开状态栏高度的情况，默认为否
+		useRefresherStatusBarPlaceholder: {
+			type: Boolean,
+			default: u.gc('useRefresherStatusBarPlaceholder', false)
+		},
+	},
+	data() {
+		return {
+			R: Enum.Refresher,
+			//下拉刷新状态
+			refresherStatus: Enum.Refresher.Default,
+			refresherTouchstartY: 0,
+			lastRefresherTouchmove: null,
+			refresherReachMaxAngle: true,
+			refresherTransform: 'translateY(0px)',
+			refresherTransition: '',
+			finalRefresherDefaultStyle: 'black',
+			refresherRevealStackCount: 0,
+			refresherCompleteTimeout: null,
+			refresherCompleteSubTimeout: null,
+			refresherEndTimeout: null,
+			isTouchmovingTimeout: null,
+			refresherTriggered: false,
+			isTouchmoving: false,
+			isTouchEnded: false,
+			isUserPullDown: false,
+			privateRefresherEnabled: -1,
+			privateShowRefresherWhenReload: false,
+			customRefresherHeight: -1,
+			showCustomRefresher: false,
+			doRefreshAnimateAfter: false,
+			isRefresherInComplete: false,
+			showF2: false,
+			f2Transform: '',
+			pullDownTimeStamp: 0,
+			moveDis: 0,
+			oldMoveDis: 0,
+			currentDis: 0,
+			oldCurrentMoveDis: 0,
+			oldRefresherTouchmoveY: 0,
+			oldTouchDirection: '',
+			oldEmitedTouchDirection: '',
+			oldPullingDistance: -1,
+			refresherThresholdUpdateTag: 0
+		}
+	},
+	watch: {
+		refresherDefaultStyle: {
+			handler(newVal) {
+				if (newVal.length) {
+					this.finalRefresherDefaultStyle = newVal;
+				}
+			},
+			immediate: true
+		},
+		refresherStatus(newVal) {
+			newVal === Enum.Refresher.Loading && this._cleanRefresherEndTimeout();
+			this.refresherVibrate && (newVal === Enum.Refresher.ReleaseToRefresh || newVal === Enum.Refresher.GoF2) && this._doVibrateShort();
+			this.$emit('refresherStatusChange', newVal);
+			this.$emit('update:refresherStatus', newVal);
+		},
+		// 监听当前下拉刷新启用/禁用状态
+		refresherEnabled(newVal) {
+			// 当禁用下拉刷新时，强制收回正在展示的下拉刷新view
+			!newVal && this.endRefresh();
+		}
+	},
+	computed: {
+		pullDownDisTimeStamp() {
+			return 1000 / this.refresherFps;
+		},
+		refresherThresholdUnitConverted() {
+			return u.addUnit(this.refresherThreshold, this.unit);
+		},
+		finalRefresherEnabled() {
+			if (this.useChatRecordMode) return false;
+			if (this.privateRefresherEnabled === -1) return this.refresherEnabled;
+			return this.privateRefresherEnabled === 1;
+		},
+		finalRefresherThreshold() {
+			let refresherThreshold = this.refresherThresholdUnitConverted;
+			let idDefault = false;
+			if (refresherThreshold === u.addUnit(80, this.unit)) {
+				idDefault = true;
+				if (this.showRefresherUpdateTime) {
+					refresherThreshold = u.addUnit(120, this.unit);
+				}
+			}
+			if (idDefault && this.customRefresherHeight > 0) return this.customRefresherHeight + this.finalRefresherThresholdPlaceholder;
+			return u.convertToPx(refresherThreshold) + this.finalRefresherThresholdPlaceholder;
+		},
+		finalRefresherF2Threshold() {
+			return u.convertToPx(u.addUnit(this.refresherF2Threshold, this.unit));
+		},
+		finalRefresherThresholdPlaceholder() {
+			return this.useRefresherStatusBarPlaceholder ? this.statusBarHeight : 0;
+		},
+		finalRefresherFixedBacHeight() {
+			return u.convertToPx(this.refresherFixedBacHeight);
+		},
+		finalRefresherThemeStyle() {
+			return this.refresherThemeStyle.length ? this.refresherThemeStyle : this.defaultThemeStyle;
+		},
+		finalRefresherOutRate() {
+			let rate = this.refresherOutRate;
+			rate = Math.max(0,rate);
+			rate = Math.min(1,rate);
+			return rate;
+		},
+		finalRefresherPullRate() {
+			let rate = this.refresherPullRate;
+			rate = Math.max(0,rate);
+			return rate;
+		},
+		finalRefresherTransform() {
+			if (this.refresherNoTransform || this.refresherTransform === 'translateY(0px)') return 'none';
+			return this.refresherTransform;
+		},
+		finalShowRefresherWhenReload() {
+			return this.showRefresherWhenReload || this.privateShowRefresherWhenReload;
+		},
+		finalRefresherTriggered() {
+			if (!(this.finalRefresherEnabled && !this.useCustomRefresher)) return false;
+			return this.refresherTriggered;
+		},
+		showRefresher() {
+			const showRefresher = this.finalRefresherEnabled && this.useCustomRefresher;
+			// #ifndef APP-NVUE
+			this.active && this.customRefresherHeight === -1 && showRefresher && this.updateCustomRefresherHeight();
+			// #endif
+			return showRefresher;
+		},
+		hasTouchmove() {
+			// #ifdef VUE2
+			// #ifdef APP-VUE || H5
+			if (this.$listeners && !this.$listeners.refresherTouchmove) return false;
+			// #endif
+			// #ifdef MP-WEIXIN || MP-QQ
+			return this.watchRefresherTouchmove;
+			// #endif
+			return true;
+			// #endif
+			return this.watchRefresherTouchmove;
+		},
+	},
+	methods: {
+		// 终止下拉刷新状态
+		endRefresh() {
+			this.totalData = this.realTotalData;
+			this._refresherEnd();
+			this._endSystemLoadingAndRefresh();
+			this._handleScrollViewBounce({ bounce: true });
+			this.$nextTick(() => {
+				this.refresherTriggered = false;
+			})
+		},
+		// 手动更新自定义下拉刷新view高度
+		updateCustomRefresherHeight() {
+			u.delay(() => this.$nextTick(this._updateCustomRefresherHeight));
+		},
+		// 关闭二楼
+		closeF2() {
+			this._handleCloseF2();
+		},
+		// 自定义下拉刷新被触发
+		_onRefresh(fromScrollView = false, isUserPullDown = true) {
+			if (fromScrollView && !(this.finalRefresherEnabled && !this.useCustomRefresher)) return;
+			this.$emit('onRefresh');
+			this.$emit('Refresh');
+			// #ifdef APP-NVUE
+			if (this.loading) {
+				u.delay(this._nRefresherEnd, 500)
+				return;
+			}
+			// #endif
+			if (this.loading || this.isRefresherInComplete) return;
+			this.loadingType = Enum.LoadingType.Refresher;
+			if (this.nShowRefresherReveal) return;
+			this.isUserPullDown = isUserPullDown;
+			this.isUserReload = !isUserPullDown;
+			this._startLoading(true);
+			this.refresherTriggered = true;
+			if(this.reloadWhenRefresh && isUserPullDown){
+				this.useChatRecordMode ? this._onLoadingMore('click') : this._reload(false, false, isUserPullDown);
+			}
+		},
+		// 自定义下拉刷新被复位
+		_onRestore() {
+			this.refresherTriggered = 'restore';
+			this.$emit('onRestore');
+			this.$emit('Restore');
+		},
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		// touch开始
+		_refresherTouchstart(e) {
+			this._handleListTouchstart();
+			if (this._touchDisabled()) return;
+			this._handleRefresherTouchstart(u.getTouch(e));
+		},
+		// #endif
+		// 进一步处理touch开始结果
+		_handleRefresherTouchstart(touch) {
+			if (!this.loading && this.isTouchEnded) {
+				this.isTouchmoving = false;
+			}
+			this.loadingType = Enum.LoadingType.Refresher;
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this.isTouchEnded = false;
+			this.refresherTransition = '';
+			this.refresherTouchstartY = touch.touchY;
+			this.$emit('refresherTouchstart', this.refresherTouchstartY);
+			this.lastRefresherTouchmove = touch;
+			this._cleanRefresherCompleteTimeout();
+			this._cleanRefresherEndTimeout();
+		},
+		
+		// 非appvue或微信小程序或QQ小程序或h5平台，使用js控制下拉刷新
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		// touch中
+		_refresherTouchmove(e) {
+			const currentTimeStamp = u.getTime();
+			let touch = null;
+			let refresherTouchmoveY = 0;
+			if (this.watchTouchDirectionChange) {
+				// 检测下拉刷新方向改变
+				touch = u.getTouch(e);
+				refresherTouchmoveY = touch.touchY;
+				const direction  = refresherTouchmoveY > this.oldRefresherTouchmoveY ? 'top' : 'bottom';
+				// 只有在方向改变的时候才emit相关事件
+				if (direction === this.oldTouchDirection && direction !== this.oldEmitedTouchDirection) {
+					this._handleTouchDirectionChange({ direction });
+					this.oldEmitedTouchDirection = direction;
+				}
+				this.oldTouchDirection = direction;
+				this.oldRefresherTouchmoveY = refresherTouchmoveY;
+			}
+			// 节流处理，在pullDownDisTimeStamp时间内的下拉刷新中事件不进行处理
+			if (this.pullDownTimeStamp && currentTimeStamp - this.pullDownTimeStamp <= this.pullDownDisTimeStamp) return;
+			// 如果不允许下拉，则return
+			if (this._touchDisabled()) return;
+			this.pullDownTimeStamp = Number(currentTimeStamp);
+			touch = u.getTouch(e);
+			refresherTouchmoveY = touch.touchY;
+			// 获取当前touch的y - 初始touch的y，计算它们的差
+			let moveDis = refresherTouchmoveY - this.refresherTouchstartY;
+			if (moveDis < 0) return;
+			// 对下拉刷新的角度进行限制
+			if (this.refresherMaxAngle >= 0 && this.refresherMaxAngle <= 90 && this.lastRefresherTouchmove && this.lastRefresherTouchmove.touchY <= refresherTouchmoveY) {
+				if (!moveDis && !this.refresherAngleEnableChangeContinued && this.moveDis < 1 && !this.refresherReachMaxAngle) return;
+				const x = Math.abs(touch.touchX - this.lastRefresherTouchmove.touchX);
+				const y = Math.abs(refresherTouchmoveY - this.lastRefresherTouchmove.touchY);
+				const z = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
+				if ((x || y) && x > 1) {
+					// 获取下拉刷新前后两次位移的角度
+					const angle = Math.asin(y / z) / Math.PI * 180;
+					// 如果角度小于配置要求，则return
+					if (angle < this.refresherMaxAngle) {
+						this.lastRefresherTouchmove = touch;
+						this.refresherReachMaxAngle = false;
+						return;
+					}
+				}
+			}
+			// 获取最终的moveDis
+			moveDis = this._getFinalRefresherMoveDis(moveDis);
+			// 处理下拉刷新位移
+			this._handleRefresherTouchmove(moveDis, touch);
+			// 下拉刷新时，禁止页面滚动以防止页面向下滚动和下拉刷新同时作用导致下拉刷新位置偏移超过预期
+			if (!this.disabledBounce) {
+				// #ifndef MP-LARK
+				this._handleScrollViewBounce({ bounce: false });
+				// #endif
+				this.disabledBounce = true;
+			}
+			this._emitTouchmove({ pullingDistance: moveDis, dy: this.moveDis - this.oldMoveDis });
+		},
+		// #endif
+		// 进一步处理touch中结果
+		_handleRefresherTouchmove(moveDis, touch) {
+			this.refresherReachMaxAngle = true;
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this.isTouchmoving = true;
+			this.isTouchEnded = false;
+			// 更新下拉刷新状态
+			// 下拉刷新距离超过阈值
+			if (moveDis >= this.finalRefresherThreshold) {
+				// 如果开启了下拉进入二楼并且下拉刷新距离超过进入二楼阈值，则当前下拉刷新状态为松手进入二楼，否则为松手立即刷新
+				this.refresherStatus = this.refresherF2Enabled && moveDis >= this.finalRefresherF2Threshold ? Enum.Refresher.GoF2 : Enum.Refresher.ReleaseToRefresh;
+			} else {
+				// 下拉刷新距离未超过阈值，显示默认状态
+				this.refresherStatus = Enum.Refresher.Default;
+			}
+			// #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5
+			// this.scrollEnable = false;
+			// 通过transform控制下拉刷新view垂直偏移
+			this.refresherTransform = `translateY(${moveDis}px)`;
+			this.lastRefresherTouchmove = touch;
+			// #endif
+			this.moveDis = moveDis;
+		},
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		// touch结束
+		_refresherTouchend(e) {
+			// 下拉刷新用户手离开屏幕，允许列表滚动
+			this._handleScrollViewBounce({bounce: true});
+			if (this._touchDisabled() || !this.isTouchmoving) return;
+			const touch = u.getTouch(e);
+			let refresherTouchendY = touch.touchY;
+			let moveDis = refresherTouchendY - this.refresherTouchstartY;
+			moveDis = this._getFinalRefresherMoveDis(moveDis);
+			this._handleRefresherTouchend(moveDis);
+			this.disabledBounce = false;
+		},
+		// #endif
+		// 进一步处理touch结束结果
+		_handleRefresherTouchend(moveDis) {
+			// #ifndef APP-PLUS || H5 || MP-WEIXIN
+			if (!this.isTouchmoving) return;
+			// #endif
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this.refresherReachMaxAngle = true;
+			this.isTouchEnded = true;
+			const refresherThreshold = this.finalRefresherThreshold;
+			if (moveDis >= refresherThreshold && (this.refresherStatus === Enum.Refresher.ReleaseToRefresh || this.refresherStatus === Enum.Refresher.GoF2)) {
+				// 如果是松手进入二楼状态，则触发进入二楼
+				if (this.refresherStatus === Enum.Refresher.GoF2) {
+					this._handleGoF2();
+					this._refresherEnd();
+				} else {
+					// 如果是松手立即刷新状态，则触发下拉刷新
+					// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+					this.refresherTransform = `translateY(${refresherThreshold}px)`;
+					this.refresherTransition = 'transform .1s linear';
+					// #endif
+					u.delay(() => {
+						this._emitTouchmove({ pullingDistance: refresherThreshold, dy: this.moveDis - refresherThreshold });
+					}, 0.1);
+					this.moveDis = refresherThreshold;
+					this.refresherStatus = Enum.Refresher.Loading;
+					this._doRefresherLoad();
+				}
+			} else {
+				this._refresherEnd();
+				this.isTouchmovingTimeout = u.delay(() => {
+					this.isTouchmoving = false;
+				}, this.refresherDefaultDuration);
+			}
+			this.scrollEnable = true;
+			this.$emit('refresherTouchend', moveDis);
+		},
+		// 处理列表触摸开始事件
+		_handleListTouchstart() {
+			if (this.useChatRecordMode && this.autoHideKeyboardWhenChat) {
+				uni.hideKeyboard();
+				this.$emit('hidedKeyboard');
+			}
+		},
+		// 处理scroll-view bounce是否生效
+		_handleScrollViewBounce({ bounce }) {
+			if (!this.usePageScroll && !this.scrollToTopBounceEnabled) {
+				if (this.wxsScrollTop <= 5) {
+					// #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5
+					this.refresherTransition = '';
+					// #endif
+					this.scrollEnable = bounce;
+				} else if (bounce) {
+					this.scrollEnable = bounce;
+				}
+			}
+		},
+		// wxs正在下拉状态改变处理
+		_handleWxsPullingDownStatusChange(onPullingDown) {
+			this.wxsOnPullingDown = onPullingDown;
+			if (onPullingDown && !this.useChatRecordMode) {
+				this.renderPropScrollTop = 0;
+			}
+		},
+		// wxs正在下拉处理
+		_handleWxsPullingDown({ moveDis, diffDis }){
+			this._emitTouchmove({ pullingDistance: moveDis,dy: diffDis });
+		},
+		// wxs触摸方向改变
+		_handleTouchDirectionChange({ direction }) {
+			this.$emit('touchDirectionChange',direction);
+		},
+		// wxs通知更新其props
+		_handlePropUpdate(){
+			this.wxsPropType = u.getTime().toString();
+		},
+		// 下拉刷新结束
+		_refresherEnd(shouldEndLoadingDelay = true, fromAddData = false, isUserPullDown = false, setLoading = true) {
+			if (this.loadingType === Enum.LoadingType.Refresher) {
+				const refresherCompleteDelay = (fromAddData && (isUserPullDown || this.showRefresherWhenReload)) ? this.refresherCompleteDelay : 0;
+				const refresherStatus = refresherCompleteDelay > 0 ? Enum.Refresher.Complete : Enum.Refresher.Default;
+				if (this.finalShowRefresherWhenReload) {
+					const stackCount = this.refresherRevealStackCount;
+					this.refresherRevealStackCount --;
+					if (stackCount > 1) return;
+				}
+				this._cleanRefresherEndTimeout();
+				this.refresherEndTimeout = u.delay(() => {
+					this.refresherStatus = refresherStatus;
+				}, this.refresherStatus !== Enum.Refresher.Default && refresherStatus === Enum.Refresher.Default ? this.refresherCompleteDuration : 0);
+				
+				// #ifndef APP-NVUE
+				if (refresherCompleteDelay > 0) {
+					this.isRefresherInComplete = true;
+				}
+				// #endif
+				this._cleanRefresherCompleteTimeout();
+				this.refresherCompleteTimeout = u.delay(() => {
+					let animateDuration = 1;
+					const animateType = this.refresherEndBounceEnabled && fromAddData ? 'cubic-bezier(0.19,1.64,0.42,0.72)' : 'linear';
+					if (fromAddData) {
+						animateDuration = this.refresherEndBounceEnabled ? this.refresherCompleteDuration / 1000 : this.refresherCompleteDuration / 3000;
+					}
+					this.refresherTransition = `transform ${fromAddData ? animateDuration : this.refresherDefaultDuration / 1000}s ${animateType}`;
+					// #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5
+					this.refresherTransform = 'translateY(0px)';
+					this.currentDis = 0;
+					// #endif
+					// #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5
+					this.wxsPropType = this.refresherTransition + 'end' + u.getTime();
+					// #endif
+					// #ifdef APP-NVUE
+					this._nRefresherEnd();
+					// #endif
+					this.moveDis = 0;
+					// #ifndef APP-NVUE
+					if (refresherStatus === Enum.Refresher.Complete) {
+						if (this.refresherCompleteSubTimeout) {
+							clearTimeout(this.refresherCompleteSubTimeout);
+							this.refresherCompleteSubTimeout = null;
+						}
+						this.refresherCompleteSubTimeout = u.delay(() => {
+							this.$nextTick(() => {
+								this.refresherStatus = Enum.Refresher.Default;
+								this.isRefresherInComplete = false;
+							})
+						}, animateDuration * 800);
+					}
+					// #endif
+					this._emitTouchmove({ pullingDistance: 0, dy: this.moveDis });
+				}, refresherCompleteDelay);
+			}
+			if (setLoading) {
+				u.delay(() => this.loading = false, shouldEndLoadingDelay ? 10 : 0);
+				isUserPullDown && this._onRestore();
+			}
+		},
+		// 处理进入二楼
+		_handleGoF2() {
+			if (this.showF2 || !this.refresherF2Enabled) return;
+			this.$emit('refresherF2Change', 'go');
+			
+			if (!this.showRefresherF2) return;
+			// #ifndef APP-NVUE
+			this.f2Transform = `translateY(${-this.superContentHeight}px)`;
+			this.showF2 = true;
+			u.delay(() => {
+				this.f2Transform = 'translateY(0px)';
+			}, 100, 'f2ShowDelay')
+			// #endif
+			
+			// #ifdef APP-NVUE
+			this.showF2 = true;
+			this.$nextTick(() => {
+				weexAnimation.transition(this.$refs['zp-n-f2'], {
+					styles: { transform: `translateY(${-this.superContentHeight}px)` },
+					duration: 0,
+					timingFunction: 'linear',
+					needLayout: true,
+					delay: 0
+				})
+				this.nF2Opacity = 1;
+			})
+			u.delay(() => {
+				weexAnimation.transition(this.$refs['zp-n-f2'], {
+					styles: { transform: 'translateY(0px)' },
+					duration: this.refresherF2Duration,
+					timingFunction: 'linear',
+					needLayout: true,
+					delay: 0
+				})
+			}, 10, 'f2GoDelay')
+			// #endif
+		},
+		// 处理退出二楼
+		_handleCloseF2() {
+			if (!this.showF2 || !this.refresherF2Enabled) return;
+			this.$emit('refresherF2Change', 'close');
+			
+			if (!this.showRefresherF2) return;
+			// #ifndef APP-NVUE
+			this.f2Transform = `translateY(${-this.superContentHeight}px)`;
+			// #endif
+			
+			// #ifdef APP-NVUE
+			weexAnimation.transition(this.$refs['zp-n-f2'], {
+				styles: { transform: `translateY(${-this.superContentHeight}px)` },
+				duration: this.refresherF2Duration,
+				timingFunction: 'linear',
+				needLayout: true,
+				delay: 0
+			})
+			// #endif
+			
+			u.delay(() => {
+				this.showF2 = false;
+				this.nF2Opacity = 0;
+			}, this.refresherF2Duration, 'f2CloseDelay')
+		},
+		// 模拟用户手动触发下拉刷新
+		_doRefresherRefreshAnimate() {
+			this._cleanRefresherCompleteTimeout();
+			// 用户处理用户在短时间内多次调用reload的情况，此时下拉刷新view不需要重复显示，只需要保证最后一次reload对应的请求结束后收回下拉刷新view即可
+			// #ifndef APP-NVUE
+			const doRefreshAnimateAfter = !this.doRefreshAnimateAfter && (this.finalShowRefresherWhenReload) && this
+				.customRefresherHeight === -1 && this.refresherThreshold === u.addUnit(80, this.unit);
+			if (doRefreshAnimateAfter) {
+				this.doRefreshAnimateAfter = true;
+				return;
+			}
+			// #endif
+			this.refresherRevealStackCount ++;
+			// #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5
+			this.refresherTransform = `translateY(${this.finalRefresherThreshold}px)`;
+			// #endif
+			// #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5
+			this.wxsPropType = 'begin' + u.getTime();
+			// #endif
+			this.moveDis = this.finalRefresherThreshold;
+			this.refresherStatus = Enum.Refresher.Loading;
+			this.isTouchmoving = true;
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this._doRefresherLoad(false);
+		},
+		// 触发下拉刷新
+		_doRefresherLoad(isUserPullDown = true) {
+			this._onRefresh(false,isUserPullDown);
+			this.loading = true;
+		},
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		// 获取处理后的moveDis
+		_getFinalRefresherMoveDis(moveDis) {
+			let diffDis = moveDis - this.oldCurrentMoveDis;
+			this.oldCurrentMoveDis = moveDis;
+			if (diffDis > 0) {
+				// 根据配置的下拉刷新用户手势位移与实际需要的位移比率计算最终的diffDis
+				diffDis = diffDis * this.finalRefresherPullRate;
+				if (this.currentDis > this.finalRefresherThreshold) {
+					diffDis = diffDis * (1 - this.finalRefresherOutRate);
+				}
+			}
+			// 控制diffDis过大的情况，比如进入页面突然猛然下拉，此时diffDis不应进行太大的偏移
+			diffDis = diffDis > 100 ? diffDis / 100 : diffDis;
+			this.currentDis += diffDis;
+			this.currentDis = Math.max(0, this.currentDis);
+			return this.currentDis;
+		},
+		// 判断touch手势是否要触发
+		_touchDisabled() {
+			const checkOldScrollTop = this.oldScrollTop > 5;
+			return this.loading || this.isRefresherInComplete || this.useChatRecordMode || !this.refresherEnabled || !this.useCustomRefresher ||(this.usePageScroll && this.useCustomRefresher && this.pageScrollTop > 10) || (!(this.usePageScroll && this.useCustomRefresher) && checkOldScrollTop);
+		},
+		// #endif
+		// 更新自定义下拉刷新view高度
+		_updateCustomRefresherHeight() {
+			this._getNodeClientRect('.zp-custom-refresher-slot-view').then((res) => {
+				this.customRefresherHeight = res ? res[0].height : 0;
+				this.showCustomRefresher = this.customRefresherHeight > 0;
+				if (this.doRefreshAnimateAfter) {
+					this.doRefreshAnimateAfter = false;
+					this._doRefresherRefreshAnimate();
+				}
+			});
+		},
+		// emit pullingDown事件
+		_emitTouchmove(e) {
+			// #ifndef APP-NVUE
+			e.viewHeight = this.finalRefresherThreshold;
+			// #endif
+			e.rate = e.viewHeight > 0 ? e.pullingDistance / e.viewHeight : 0;
+			this.hasTouchmove && this.oldPullingDistance !== e.pullingDistance && this.$emit('refresherTouchmove', e);
+			this.oldPullingDistance = e.pullingDistance;
+		},
+		// 清除refresherCompleteTimeout
+		_cleanRefresherCompleteTimeout() {
+			this.refresherCompleteTimeout = this._cleanTimeout(this.refresherCompleteTimeout);
+			// #ifdef APP-NVUE
+			this._nRefresherEnd(false);
+			// #endif
+		},
+		// 清除refresherEndTimeout
+		_cleanRefresherEndTimeout() {
+			this.refresherEndTimeout = this._cleanTimeout(this.refresherEndTimeout);
+		},
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/scroller.js b/uni_modules/z-paging/components/z-paging/js/modules/scroller.js
new file mode 100644
index 0000000..c44180a
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/scroller.js
@@ -0,0 +1,518 @@
+// [z-paging]scroll相关模块
+import u from '.././z-paging-utils'
+import Enum from '.././z-paging-enum'
+
+// #ifdef APP-NVUE
+const weexDom = weex.requireModule('dom');
+// #endif
+
+export default {
+	props: {
+		// 使用页面滚动，默认为否，当设置为是时则使用页面的滚动而非此组件内部的scroll-view的滚动，使用页面滚动时z-paging无需设置确定的高度且对于长列表展示性能更高，但配置会略微繁琐
+		usePageScroll: {
+			type: Boolean,
+			default: u.gc('usePageScroll', false)
+		},
+		// 是否可以滚动，使用内置scroll-view和nvue时有效，默认为是
+		scrollable: {
+			type: Boolean,
+			default: u.gc('scrollable', true)
+		},
+		// 控制是否出现滚动条，默认为是
+		showScrollbar: {
+			type: Boolean,
+			default: u.gc('showScrollbar', true)
+		},
+		// 是否允许横向滚动，默认为否
+		scrollX: {
+			type: Boolean,
+			default: u.gc('scrollX', false)
+		},
+		// iOS设备上滚动到顶部时是否允许回弹效果，默认为否。关闭回弹效果后可使滚动到顶部与下拉刷新更连贯，但是有吸顶view时滚动到顶部时可能出现抖动。
+		scrollToTopBounceEnabled: {
+			type: Boolean,
+			default: u.gc('scrollToTopBounceEnabled', false)
+		},
+		// iOS设备上滚动到底部时是否允许回弹效果，默认为是。
+		scrollToBottomBounceEnabled: {
+			type: Boolean,
+			default: u.gc('scrollToBottomBounceEnabled', true)
+		},
+		// 在设置滚动条位置时使用动画过渡，默认为否
+		scrollWithAnimation: {
+			type: Boolean,
+			default: u.gc('scrollWithAnimation', false)
+		},
+		// 值应为某子元素id（id不能以数字开头）。设置哪个方向可滚动，则在哪个方向滚动到该元素
+		scrollIntoView: {
+			type: String,
+			default: u.gc('scrollIntoView', '')
+		},
+	},
+	data() {
+		return {
+			scrollTop: 0,
+			oldScrollTop: 0,
+			scrollViewStyle: {},
+			scrollViewContainerStyle: {},
+			scrollViewInStyle: {},
+			pageScrollTop: -1,
+			scrollEnable: true,
+			privateScrollWithAnimation: -1,
+			cacheScrollNodeHeight: -1,
+			superContentHeight: 0,
+		}
+	},
+	watch: {
+		oldScrollTop(newVal) {
+			!this.usePageScroll && this._scrollTopChange(newVal,false);
+		},
+		pageScrollTop(newVal) {
+			this.usePageScroll && this._scrollTopChange(newVal,true);
+		},
+		usePageScroll: {
+			handler(newVal) {
+				this.loaded && this.autoHeight && this._setAutoHeight(!newVal);
+				// #ifdef H5
+				if (newVal) {
+					this.$nextTick(() => {
+						const mainScrollRef = this.$refs['zp-scroll-view'].$refs.main;
+						if (mainScrollRef) {
+							mainScrollRef.style = {};
+						}
+					})
+				}
+				// #endif
+			},
+			immediate: true
+		},
+		finalScrollTop(newVal) {
+			this.renderPropScrollTop = newVal < 6 ? 0 : 10;
+		}
+	},
+	computed: {
+		finalScrollWithAnimation() {
+			if (this.privateScrollWithAnimation !== -1) {
+				return this.privateScrollWithAnimation === 1;
+			}
+			return this.scrollWithAnimation;
+		},
+		finalScrollViewStyle() {
+			if (this.superContentZIndex != 1) {
+				this.scrollViewStyle['z-index'] = this.superContentZIndex;
+				this.scrollViewStyle['position'] = 'relative';
+			}
+			return this.scrollViewStyle;
+		},
+		finalScrollTop() {
+			return this.usePageScroll ? this.pageScrollTop : this.oldScrollTop;
+		},
+		// 当前是否是旧版webview
+		finalIsOldWebView() {
+			return this.isOldWebView && !this.usePageScroll;
+		},
+		// 当前scroll-view/list-view是否允许滚动
+		finalScrollable() {
+			return this.scrollable && !this.usePageScroll && this.scrollEnable 
+			&& (this.refresherCompleteScrollable ? true : this.refresherStatus !== Enum.Refresher.Complete)
+			&& (this.refresherRefreshingScrollable ? true : this.refresherStatus !== Enum.Refresher.Loading);
+		}
+	},
+	methods: {
+		// 滚动到顶部，animate为是否展示滚动动画，默认为是
+		scrollToTop(animate, checkReverse = true) {
+			// 如果是聊天记录模式并且列表倒置了，则滚动到顶部实际上是滚动到底部
+			if (this.useChatRecordMode && checkReverse && !this.isChatRecordModeAndNotInversion) {
+				this.scrollToBottom(animate, false);
+				return;
+			}
+			this.$nextTick(() => {
+				this._scrollToTop(animate, false);
+				// #ifdef APP-NVUE
+				if (this.nvueFastScroll && animate) {
+					u.delay(() => {
+						this._scrollToTop(false, false);
+					});
+				}
+				// #endif
+			})
+		},
+		// 滚动到底部，animate为是否展示滚动动画，默认为是
+		scrollToBottom(animate, checkReverse = true) {
+			// 如果是聊天记录模式并且列表倒置了，则滚动到底部实际上是滚动到顶部
+			if (this.useChatRecordMode && checkReverse && !this.isChatRecordModeAndNotInversion) {
+				this.scrollToTop(animate, false);
+				return;
+			}
+			this.$nextTick(() => {
+				this._scrollToBottom(animate);
+				// #ifdef APP-NVUE
+				if (this.nvueFastScroll && animate) {
+					u.delay(() => {
+						this._scrollToBottom(false);
+					});
+				}
+				// #endif
+			})
+		},
+		// 滚动到指定view(vue中有效)。sel为需要滚动的view的id值，不包含"#"；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewById(sel, offset, animate) {
+			this._scrollIntoView(sel, offset, animate);
+		},
+		// 滚动到指定view(vue中有效)。nodeTop为需要滚动的view的top值(通过uni.createSelectorQuery()获取)；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewByNodeTop(nodeTop, offset, animate) {
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this._scrollIntoViewByNodeTop(nodeTop, offset, animate);
+			})
+		},
+		// 滚动到指定位置(vue中有效)。y为与顶部的距离，单位为px；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollToY(y, offset, animate) {
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this._scrollToY(y, offset, animate);
+			})
+		},
+		// 滚动到指定view(nvue中和虚拟列表中有效)。index为需要滚动的view的index(第几个，从0开始)；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewByIndex(index, offset, animate) {
+			if (index >= this.realTotalData.length) {
+				u.consoleErr('当前滚动的index超出已渲染列表长度，请先通过refreshToPage加载到对应index页并等待渲染成功后再调用此方法！')
+				return;
+			}
+			this.$nextTick(() => {
+				// #ifdef APP-NVUE
+				// 在nvue中，根据index获取对应节点信息并滚动到此节点位置
+				this._scrollIntoView(index, offset, animate);
+				// #endif
+				// #ifndef APP-NVUE
+				if (this.finalUseVirtualList) {
+					const isCellFixed = this.cellHeightMode === Enum.CellHeightMode.Fixed;
+					u.delay(() => {
+						if (this.finalUseVirtualList) {
+							// 虚拟列表 + 每个cell高度完全相同模式下，此时滚动到对应index的cell就是滚动到scrollTop = cellHeight * index的位置
+							// 虚拟列表 + 高度是动态非固定的模式下，此时滚动到对应index的cell就是滚动到scrollTop = 缓存的cell高度数组中第index个的lastTotalHeight的位置
+							const scrollTop = isCellFixed ? this.virtualCellHeight * index : this.virtualHeightCacheList[index].lastTotalHeight;
+							this.scrollToY(scrollTop, offset, animate);
+						}
+					}, isCellFixed ? 0 : 100)
+				}
+				// #endif
+			})
+		},
+		// 滚动到指定view(nvue中有效)。view为需要滚动的view(通过`this.$refs.xxx`获取)，不包含"#"；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewByView(view, offset, animate) {
+			this._scrollIntoView(view, offset, animate);
+		},
+		// 当使用页面滚动并且自定义下拉刷新时，请在页面的onPageScroll中调用此方法，告知z-paging当前的pageScrollTop，否则会导致在任意位置都可以下拉刷新
+		updatePageScrollTop(value) {
+			this.pageScrollTop = value;
+		},
+		// 当使用页面滚动并且设置了slot="top"时，默认初次加载会自动获取其高度，并使内部容器下移，当slot="top"的view高度动态改变时，在其高度需要更新时调用此方法
+		updatePageScrollTopHeight() {
+			this._updatePageScrollTopOrBottomHeight('top');
+		},
+		// 当使用页面滚动并且设置了slot="bottom"时，默认初次加载会自动获取其高度，并使内部容器下移，当slot="bottom"的view高度动态改变时，在其高度需要更新时调用此方法
+		updatePageScrollBottomHeight() {
+			this._updatePageScrollTopOrBottomHeight('bottom');
+		},
+		// 更新slot="left"和slot="right"宽度，当slot="left"或slot="right"宽度动态改变时调用
+		updateLeftAndRightWidth() {
+			if (!this.finalIsOldWebView) return;
+			this.$nextTick(() => this._updateLeftAndRightWidth(this.scrollViewContainerStyle, 'zp-page'));
+		},
+		// 更新z-paging内置scroll-view的scrollTop
+		updateScrollViewScrollTop(scrollTop, animate = true) {
+			this._updatePrivateScrollWithAnimation(animate);
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this.scrollTop = scrollTop;
+				this.oldScrollTop = this.scrollTop;
+			});
+		},
+		
+		// 当滚动到顶部时
+		_onScrollToUpper() {
+			this.$emit('scrolltoupper');
+			this.$emit('scrollTopChange', 0);
+			this.$nextTick(() => {
+				this.oldScrollTop = 0;
+			})
+		},
+		// 当滚动到底部时
+		_onScrollToLower(e) {
+			(!e.detail || !e.detail.direction || e.detail.direction === 'bottom') && this._onLoadingMore(this.useChatRecordMode ? 'click' : 'toBottom')
+		},
+		// 滚动到顶部
+		_scrollToTop(animate = true, isPrivate = true) {
+			// #ifdef APP-NVUE
+			// 在nvue中需要通过weex.scrollToElement滚动到顶部，此时在顶部插入了一个view，使得滚动到这个view位置
+			const el = this.$refs['zp-n-list-top-tag'];
+			if (this.usePageScroll) {
+				this._getNodeClientRect('zp-page-scroll-top', false).then(node => {
+					const nodeHeight = node ? node[0].height : 0;
+					weexDom.scrollToElement(el, {
+						offset: -nodeHeight,
+						animated: animate
+					});
+				});
+			} else {
+				if (!this.isIos && this.nvueListIs === 'scroller') {
+					this._getNodeClientRect('zp-n-refresh-container', false).then(node => {
+						const nodeHeight = node ? node[0].height : 0;
+						weexDom.scrollToElement(el, {
+							offset: -nodeHeight,
+							animated: animate
+						});
+					});
+				} else {
+					weexDom.scrollToElement(el, {
+						offset: 0,
+						animated: animate
+					});
+				}
+			}
+			return;
+			// #endif
+			if (this.usePageScroll) {
+				this.$nextTick(() => {
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: animate ? 100 : 0,
+					});
+				});
+				return;
+			}
+			this._updatePrivateScrollWithAnimation(animate);
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this.scrollTop = 0;
+				this.oldScrollTop = this.scrollTop;
+			});
+		},
+		// 滚动到底部
+		async _scrollToBottom(animate = true) {
+			// #ifdef APP-NVUE
+			// 在nvue中需要通过weex.scrollToElement滚动到顶部，此时在底部插入了一个view，使得滚动到这个view位置
+			const el = this.$refs['zp-n-list-bottom-tag'];
+			if (el) {
+				weexDom.scrollToElement(el, {
+					offset: 0,
+					animated: animate
+				});
+			} else {
+				u.consoleErr('滚动到底部失败，因为您设置了hideNvueBottomTag为true');
+			}
+			return;
+			// #endif
+			if (this.usePageScroll) {
+				this.$nextTick(() => {
+					uni.pageScrollTo({
+						scrollTop: Number.MAX_VALUE,
+						duration: animate ? 100 : 0,
+					});
+				});
+				return;
+			}
+			try {
+				this._updatePrivateScrollWithAnimation(animate);
+				const pagingContainerNode = await this._getNodeClientRect('.zp-paging-container');
+				const scrollViewNode = await this._getNodeClientRect('.zp-scroll-view');
+				const pagingContainerH = pagingContainerNode ? pagingContainerNode[0].height : 0;
+				const scrollViewH = scrollViewNode ? scrollViewNode[0].height : 0;
+				if (pagingContainerH > scrollViewH) {
+					this.scrollTop = this.oldScrollTop;
+					this.$nextTick(() => {
+						this.scrollTop = pagingContainerH - scrollViewH + this.virtualPlaceholderTopHeight;
+						this.oldScrollTop = this.scrollTop;
+					});
+				}
+			} catch (e) {}
+		},
+		// 滚动到指定view
+		_scrollIntoView(sel, offset = 0, animate = false, finishCallback) {
+			try {
+				this.scrollTop = this.oldScrollTop;
+				this.$nextTick(() => {
+					// #ifdef APP-NVUE
+					const refs = this.$parent.$refs;
+					if (!refs) return;
+					const dataType = Object.prototype.toString.call(sel);
+					let el = null;
+					if (dataType === '[object Number]') {
+						const els = refs[`z-paging-${sel}`];
+						el = els ? els[0] : null;
+					} else if (dataType === '[object Array]') {
+						el = sel[0];
+					} else {
+						el = sel;
+					}
+					if (el) {
+						weexDom.scrollToElement(el, {
+							offset: -offset,
+							animated: animate
+						});
+					} else {
+						u.consoleErr('在nvue中滚动到指定位置，cell必须设置 :ref="`z-paging-${index}`"');
+					}
+					return;
+					// #endif
+					this._getNodeClientRect('#' + sel.replace('#', ''), this.$parent).then((node) => {
+						if (node) {
+							let nodeTop = node[0].top;
+							this._scrollIntoViewByNodeTop(nodeTop, offset, animate);
+							finishCallback && finishCallback();
+						}
+					});
+				});
+			} catch (e) {}
+		},
+		// 通过nodeTop滚动到指定view
+		_scrollIntoViewByNodeTop(nodeTop, offset = 0, animate = false) {
+			// 如果是聊天记录模式并且列表倒置了，此时nodeTop需要等于scroll-view高度 - nodeTop
+			if (this.isChatRecordModeAndInversion) {
+				this._getNodeClientRect('.zp-scroll-view').then(sNode => {
+					if (sNode) {
+						this._scrollToY(sNode[0].height - nodeTop, offset, animate, true);
+					}
+				})
+			} else {
+				this._scrollToY(nodeTop, offset, animate, true);
+			}
+		},
+		// 滚动到指定位置
+		_scrollToY(y, offset = 0, animate = false, addScrollTop = false) {
+			this._updatePrivateScrollWithAnimation(animate);
+			u.delay(() => {
+				if (this.usePageScroll) {
+					if (addScrollTop && this.pageScrollTop !== -1) {
+					   y += this.pageScrollTop; 
+					}
+					const scrollTop = y - offset;
+					uni.pageScrollTo({
+						scrollTop,
+						duration: animate ? 100 : 0
+					});
+				} else {
+					if (addScrollTop) {
+					   y += this.oldScrollTop; 
+					}
+					this.scrollTop = y - offset;
+				}
+			}, 10)
+		},
+		// scroll-view滚动中
+		_scroll(e) {
+			this.$emit('scroll', e);
+			const scrollTop = e.detail.scrollTop;
+			// #ifndef APP-NVUE
+			this.finalUseVirtualList && this._updateVirtualScroll(scrollTop, this.oldScrollTop - scrollTop);
+			// #endif
+			this.oldScrollTop = scrollTop;
+			// 滚动区域内容的总高度 - 当前滚动的scrollTop = 当前滚动区域的顶部与内容底部的距离
+			const scrollDiff = e.detail.scrollHeight - this.oldScrollTop;
+			// 在非ios平台滚动中，再次验证一下是否滚动到了底部。因为在一些安卓设备中，有概率滚动到底部不触发@scrolltolower事件，因此添加双重检测逻辑
+			!this.isIos && this._checkScrolledToBottom(scrollDiff);
+		},
+		// 更新内置的scroll-view是否启用滚动动画
+		_updatePrivateScrollWithAnimation(animate) {
+			this.privateScrollWithAnimation = animate ? 1 : 0;
+			u.delay(() => this.$nextTick(() => {
+				// 在滚动结束后将滚动动画状态设置回初始状态
+				this.privateScrollWithAnimation = -1;
+			}), 100, 'updateScrollWithAnimationDelay')
+		},
+		// 检测scrollView是否要铺满屏幕
+		_doCheckScrollViewShouldFullHeight(totalData) {
+			if (this.autoFullHeight && this.usePageScroll && this.isTotalChangeFromAddData) {
+				// #ifndef APP-NVUE
+				this.$nextTick(() => {
+					this._checkScrollViewShouldFullHeight((scrollViewNode, pagingContainerNode) => {
+						this._preCheckShowNoMoreInside(totalData, scrollViewNode, pagingContainerNode)
+					});
+				})
+				// #endif
+				// #ifdef APP-NVUE
+				this._preCheckShowNoMoreInside(totalData)
+				// #endif
+			} else {
+				this._preCheckShowNoMoreInside(totalData)
+			} 
+		},
+		// 检测z-paging是否要全屏覆盖(当使用页面滚动并且不满全屏时，默认z-paging需要铺满全屏，避免数据过少时内部的empty-view无法正确展示)
+		async _checkScrollViewShouldFullHeight(callback) {
+			try {
+				const scrollViewNode = await this._getNodeClientRect('.zp-scroll-view');
+				const pagingContainerNode = await this._getNodeClientRect('.zp-paging-container-content');
+				if (!scrollViewNode || !pagingContainerNode) return;
+				const scrollViewHeight = pagingContainerNode[0].height;
+				const scrollViewTop = scrollViewNode[0].top;
+				if (this.isAddedData && scrollViewHeight + scrollViewTop <= this.windowHeight) {
+					this._setAutoHeight(true, scrollViewNode);
+					callback(scrollViewNode, pagingContainerNode);
+				} else {
+					this._setAutoHeight(false);
+					callback(null, null);
+				}
+			} catch (e) {
+				callback(null, null);
+			}
+		},
+		// 更新缓存中z-paging整个内容容器高度
+		async _updateCachedSuperContentHeight() {
+			const superContentNode = await this._getNodeClientRect('.z-paging-content');
+			if (superContentNode) {
+				this.superContentHeight = superContentNode[0].height;
+			}
+		},
+		// scrollTop改变时触发
+		_scrollTopChange(newVal, isPageScrollTop){
+			this.$emit('scrollTopChange', newVal);
+			this.$emit('update:scrollTop', newVal);
+			this._checkShouldShowBackToTop(newVal);
+			// 之前在安卓中scroll-view有概率滚动到顶部时scrollTop不为0导致下拉刷新判断异常，因此判断scrollTop在105之内都允许下拉刷新，但此方案会导致某些情况（例如滚动到距离顶部10px处）下拉抖动，因此改为通过获取zp-scroll-view的节点信息中的scrollTop进行验证的方案
+			// const scrollTop = this.isIos ? (newVal > 5 ? 6 : 0) : (newVal > 105 ? 106 : (newVal > 5 ? 6 : 0));
+			const scrollTop = newVal > 5 ? 6 : 0;
+			if (isPageScrollTop && this.wxsPageScrollTop !== scrollTop) {
+				this.wxsPageScrollTop = scrollTop;
+			} else if (!isPageScrollTop && this.wxsScrollTop !== scrollTop) {
+				this.wxsScrollTop = scrollTop;
+				if (scrollTop > 6) {
+					this.scrollEnable = true;
+				}
+			}
+		},
+		// 更新使用页面滚动时slot="top"或"bottom"插入view的高度
+		_updatePageScrollTopOrBottomHeight(type) {
+			// #ifndef APP-NVUE
+			if (!this.usePageScroll) return;
+			// #endif
+			this._doCheckScrollViewShouldFullHeight(this.realTotalData);
+			const node = `.zp-page-${type}`;
+			const marginText = `margin${type.slice(0,1).toUpperCase() + type.slice(1)}`;
+			let safeAreaInsetBottomAdd = this.safeAreaInsetBottom;
+			this.$nextTick(() => {
+				let delayTime = 0;
+				// #ifdef MP-BAIDU || APP-NVUE
+				delayTime = 50;
+				// #endif
+				u.delay(() => {
+					this._getNodeClientRect(node).then((res) => {
+						if (res) {
+							let pageScrollNodeHeight = res[0].height;
+							if (type === 'bottom') {
+								if (safeAreaInsetBottomAdd) {
+									pageScrollNodeHeight += this.safeAreaBottom;
+								}
+							} else {
+								this.cacheTopHeight = pageScrollNodeHeight;
+							}
+							this.$set(this.scrollViewStyle, marginText, `${pageScrollNodeHeight}px`);
+						} else if (safeAreaInsetBottomAdd) {
+							this.$set(this.scrollViewStyle, marginText, `${this.safeAreaBottom}px`);
+						}
+					});
+				}, delayTime)
+			})
+		},
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/virtual-list.js b/uni_modules/z-paging/components/z-paging/js/modules/virtual-list.js
new file mode 100644
index 0000000..d309098
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/modules/virtual-list.js
@@ -0,0 +1,512 @@
+// [z-paging]虚拟列表模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import Enum from '.././z-paging-enum'
+
+export default {
+	props: {
+		// 是否使用虚拟列表，默认为否
+		useVirtualList: {
+			type: Boolean,
+			default: u.gc('useVirtualList', false)
+		},
+		// 在使用虚拟列表时，是否使用兼容模式，默认为否
+		useCompatibilityMode: {
+			type: Boolean,
+			default: u.gc('useCompatibilityMode', false)
+		},
+		// 使用兼容模式时传递的附加数据
+		extraData: {
+			type: Object,
+			default: u.gc('extraData', {})
+		},
+		// 是否在z-paging内部循环渲染列表(内置列表)，默认为否。若use-virtual-list为true，则此项恒为true
+		useInnerList: {
+			type: Boolean,
+			default: u.gc('useInnerList', false)
+		},
+		// 强制关闭inner-list，默认为false，如果为true将强制关闭innerList，适用于开启了虚拟列表后需要强制关闭inner-list的情况
+		forceCloseInnerList: {
+			type: Boolean,
+			default: u.gc('forceCloseInnerList', false)
+		},
+		// 内置列表cell的key名称，仅nvue有效，在nvue中开启use-inner-list时必须填此项
+		cellKeyName: {
+			type: String,
+			default: u.gc('cellKeyName', '')
+		},
+		// innerList样式
+		innerListStyle: {
+			type: Object,
+			default: u.gc('innerListStyle', {})
+		},
+		// innerCell样式
+		innerCellStyle: {
+			type: Object,
+			default: u.gc('innerCellStyle', {})
+		},
+		// 预加载的列表可视范围(列表高度)页数，默认为12，即预加载当前页及上下各12页的cell。此数值越大，则虚拟列表中加载的dom越多，内存消耗越大(会维持在一个稳定值)，但增加预加载页面数量可缓解快速滚动短暂白屏问题
+		preloadPage: {
+			type: [Number, String],
+			default: u.gc('preloadPage', 12),
+			validator: (value) => {
+				if (value <= 0) u.consoleErr('preload-page必须大于0！');
+				return value > 0;
+			}
+		},
+		// 虚拟列表cell高度模式，默认为fixed，也就是每个cell高度完全相同，将以第一个cell高度为准进行计算。可选值【dynamic】，即代表高度是动态非固定的，【dynamic】性能低于【fixed】。
+		cellHeightMode: {
+			type: String,
+			default: u.gc('cellHeightMode', Enum.CellHeightMode.Fixed)
+		},
+		// 固定的cell高度，cellHeightMode=fixed才有效，若设置了值，则不计算第一个cell高度而使用设置的cell高度
+		fixedCellHeight: {
+			type: [Number, String],
+			default: u.gc('fixedCellHeight', 0)
+		},
+		// 虚拟列表列数，默认为1。常用于每行有多列的情况，例如每行有2列数据，需要将此值设置为2
+		virtualListCol: {
+			type: [Number, String],
+			default: u.gc('virtualListCol', 1)
+		},
+		// 虚拟列表scroll取样帧率，默认为80，过低容易出现白屏问题，过高容易出现卡顿问题
+		virtualScrollFps: {
+			type: [Number, String],
+			default: u.gc('virtualScrollFps', 80)
+		},
+	},
+	data() {
+		return {
+			virtualListKey: u.getInstanceId(),
+			virtualPageHeight: 0,
+			virtualCellHeight: 0,
+			virtualScrollTimeStamp: 0,
+			
+			virtualList: [],
+			virtualPlaceholderTopHeight: 0,
+			virtualPlaceholderBottomHeight: 0,
+			virtualTopRangeIndex: 0,
+			virtualBottomRangeIndex: 0,
+			lastVirtualTopRangeIndex: 0,
+			lastVirtualBottomRangeIndex: 0,
+			virtualItemInsertedCount: 0,
+			
+			virtualHeightCacheList: [],
+			
+			getCellHeightRetryCount: {
+				fixed: 0,
+				dynamic: 0
+			},
+			pagingOrgTop: -1,
+			updateVirtualListFromDataChange: false
+		}
+	},
+	watch: {
+		// 监听总数据的改变，刷新虚拟列表布局
+		realTotalData() {
+			this.updateVirtualListRender();
+		},
+		// 监听虚拟列表渲染数组的改变并emit
+		virtualList(newVal){
+			this.$emit('update:virtualList', newVal);
+			this.$emit('virtualListChange', newVal);
+		}
+	},
+	computed: {
+		virtualCellIndexKey() {
+			return c.listCellIndexKey;
+		},
+		finalUseVirtualList() {
+			if (this.useVirtualList && this.usePageScroll){
+				u.consoleErr('使用页面滚动时，开启虚拟列表无效！');
+			}
+			return this.useVirtualList && !this.usePageScroll;
+		},
+		finalUseInnerList() {
+			return this.useInnerList || (this.finalUseVirtualList && !this.forceCloseInnerList);
+		},
+		finalCellKeyName() {
+			// #ifdef APP-NVUE
+			if (this.finalUseVirtualList && !this.cellKeyName.length){
+				u.consoleErr('在nvue中开启use-virtual-list必须设置cell-key-name，否则将可能导致列表渲染错误！');
+			}
+			// #endif
+			return this.cellKeyName;
+		},
+		finalVirtualPageHeight(){
+			return this.virtualPageHeight > 0 ? this.virtualPageHeight : this.windowHeight;
+		},
+		finalFixedCellHeight() {
+			return u.convertToPx(this.fixedCellHeight);
+		},
+		virtualRangePageHeight(){
+			return this.finalVirtualPageHeight * this.preloadPage;
+		},
+		virtualScrollDisTimeStamp() {
+			return 1000 / this.virtualScrollFps;
+		},
+	},
+	methods: {
+		// 在使用动态高度虚拟列表时，若在列表数组中需要插入某个item，需要调用此方法；item:需要插入的item，index:插入的cell位置，若index为2，则插入的item在原list的index=1之后，index从0开始
+		doInsertVirtualListItem(item, index) {
+			if (this.cellHeightMode !== Enum.CellHeightMode.Dynamic) return;
+			this.virtualItemInsertedCount ++;
+			if (!item || Object.prototype.toString.call(item) !== '[object Object]') {
+				item = { item };
+			}
+			const cellIndexKey = this.virtualCellIndexKey;
+			item[cellIndexKey] = `custom-${this.virtualItemInsertedCount}`;
+			item[c.listCellIndexUniqueKey] = `${this.virtualListKey}-${item[cellIndexKey]}`;
+			this.$nextTick(async () => {
+				let retryCount = 0;
+				while (retryCount <= 10) {
+					await u.wait(c.delayTime);
+					
+					const cellNode = await this._getNodeClientRect(`#zp-id-${item[cellIndexKey]}`, this.finalUseInnerList);
+					// 如果获取当前cell的节点信息失败，则重试（不超过10次）
+					if (!cellNode) {
+						retryCount ++;
+						continue;
+					} 
+					
+					const currentHeight = cellNode ? cellNode[0].height : 0;
+					const lastHeightCache = this.virtualHeightCacheList[index - 1];
+					const lastTotalHeight = lastHeightCache ? lastHeightCache.totalHeight : 0;
+					// 在缓存的cell高度数组中，插入此cell高度信息
+					this.virtualHeightCacheList.splice(index, 0, {
+						height: currentHeight,
+						lastTotalHeight,
+						totalHeight: lastTotalHeight + currentHeight
+					});
+					
+					// 从当前index起后续的cell缓存高度的lastTotalHeight和totalHeight需要加上当前cell的高度
+					for (let i = index + 1; i < this.virtualHeightCacheList.length; i++) {
+						const thisNode = this.virtualHeightCacheList[i];
+						thisNode.lastTotalHeight += currentHeight;
+						thisNode.totalHeight += currentHeight;
+					}
+					
+					this._updateVirtualScroll(this.oldScrollTop);
+					break;
+				}
+			})
+		},
+		// 在使用动态高度虚拟列表时，手动更新指定cell的缓存高度(当cell高度在初始化之后再次改变时调用)；index:需要更新的cell在列表中的位置，从0开始
+		didUpdateVirtualListCell(index) {
+			if (this.cellHeightMode !== Enum.CellHeightMode.Dynamic) return;
+			const currentNode = this.virtualHeightCacheList[index];
+			this.$nextTick(() => {
+				this._getNodeClientRect(`#zp-id-${index}`, this.finalUseInnerList).then(cellNode => {
+					// 更新当前cell的高度
+					const cellNodeHeight = cellNode ? cellNode[0].height : 0;
+					const heightDis = cellNodeHeight - currentNode.height;
+					currentNode.height = cellNodeHeight;
+					currentNode.totalHeight = currentNode.lastTotalHeight + cellNodeHeight;
+					
+					// 从当前index起后续的cell缓存高度的lastTotalHeight和totalHeight需要加上当前cell变化的高度
+					for (let i = index + 1; i < this.virtualHeightCacheList.length; i++) {
+						const thisNode = this.virtualHeightCacheList[i];
+						thisNode.totalHeight += heightDis;
+						thisNode.lastTotalHeight += heightDis;
+					}
+				});
+			})
+		},
+		// 在使用动态高度虚拟列表时，若删除了列表数组中的某个item，需要调用此方法以更新高度缓存数组；index:删除的cell在列表中的位置，从0开始
+		didDeleteVirtualListCell(index) {
+			if (this.cellHeightMode !== Enum.CellHeightMode.Dynamic) return;
+			const currentNode = this.virtualHeightCacheList[index];
+			// 从当前index起后续的cell缓存高度的lastTotalHeight和totalHeight需要减去当前cell的高度
+			for (let i = index + 1; i < this.virtualHeightCacheList.length; i++) {
+				const thisNode = this.virtualHeightCacheList[i];
+				thisNode.totalHeight -= currentNode.height;
+				thisNode.lastTotalHeight -= currentNode.height;
+			}
+			// 将当前cell的高度信息从高度缓存数组中删除
+			this.virtualHeightCacheList.splice(index, 1);
+		},
+		// 手动触发虚拟列表渲染更新，可用于解决例如修改了虚拟列表数组中元素，但展示未更新的情况
+		updateVirtualListRender() {
+			// #ifndef APP-NVUE
+			if (this.finalUseVirtualList) {
+				this.updateVirtualListFromDataChange = true;
+				this.$nextTick(() => {
+					this.getCellHeightRetryCount.fixed = 0;
+					if (this.realTotalData.length) {
+						this.cellHeightMode === Enum.CellHeightMode.Fixed && this.isFirstPage && this._updateFixedCellHeight()
+					} else {
+						this._resetDynamicListState(!this.isUserPullDown);
+					}
+					this._updateVirtualScroll(this.oldScrollTop);
+				})
+			}
+			// #endif
+		},
+		// 初始化虚拟列表
+		_virtualListInit() {
+			this.$nextTick(() => {
+				u.delay(() => {
+					// 获取虚拟列表滚动区域的高度
+					this._getNodeClientRect('.zp-scroll-view').then(node => {
+						if (node) {
+							this.pagingOrgTop = node[0].top;
+							this.virtualPageHeight = node[0].height;
+						}
+					});
+				});
+			})
+		},
+		// cellHeightMode为fixed时获取第一个cell高度
+		_updateFixedCellHeight() {
+			if (!this.finalFixedCellHeight) {
+				this.$nextTick(() => {
+					u.delay(() => {
+						this._getNodeClientRect(`#zp-id-${0}`,this.finalUseInnerList).then(cellNode => {
+							if (!cellNode) {
+								if (this.getCellHeightRetryCount.fixed > 10) return;
+								this.getCellHeightRetryCount.fixed ++;
+								// 如果获取第一个cell的节点信息失败，则重试（不超过10次）
+								this._updateFixedCellHeight();
+							} else {
+								this.virtualCellHeight = cellNode[0].height;
+								this._updateVirtualScroll(this.oldScrollTop);
+							}
+						});
+					}, c.delayTime, 'updateFixedCellHeightDelay');
+				})
+			} else {
+				this.virtualCellHeight = this.finalFixedCellHeight;
+			}
+		},
+		// cellHeightMode为dynamic时获取每个cell高度
+		_updateDynamicCellHeight(list, dataFrom = 'bottom') {
+			const dataFromTop = dataFrom === 'top';
+			const heightCacheList = this.virtualHeightCacheList;
+			const currentCacheList = dataFromTop ?  [] : heightCacheList;
+			let listTotalHeight = 0;
+			this.$nextTick(() => {
+				u.delay(async () => {
+					for (let i = 0; i < list.length; i++) {
+						const cellNode = await this._getNodeClientRect(`#zp-id-${list[i][this.virtualCellIndexKey]}`, this.finalUseInnerList);
+						const currentHeight = cellNode ? cellNode[0].height : 0;
+						if (!cellNode) {
+							if (this.getCellHeightRetryCount.dynamic <= 10) {
+								heightCacheList.splice(heightCacheList.length - i, i);
+								this.getCellHeightRetryCount.dynamic ++;
+								// 如果获取当前cell的节点信息失败，则重试（不超过10次）
+								this._updateDynamicCellHeight(list, dataFrom);
+							}
+							return;
+						} 
+						const lastHeightCache = currentCacheList.length ? currentCacheList.slice(-1)[0] : null;
+						const lastTotalHeight = lastHeightCache ? lastHeightCache.totalHeight : 0;
+						// 缓存当前cell的高度信息：height-当前cell高度；lastTotalHeight-前面所有cell的高度总和；totalHeight-包含当前cell的所有高度总和
+						currentCacheList.push({
+							height: currentHeight,
+							lastTotalHeight,
+							totalHeight: lastTotalHeight + currentHeight
+						});
+						if (dataFromTop) {
+							listTotalHeight += currentHeight;
+						}
+					}
+					// 如果数据是从顶部拼接的
+					if (dataFromTop && list.length) {
+						for (let i = 0; i < heightCacheList.length; i++) {
+							// 更新之前所有项的缓存高度，需要加上此次插入的所有cell高度之和（因为是从顶部插入的cell）
+							const heightCacheItem = heightCacheList[i];
+							heightCacheItem.lastTotalHeight += listTotalHeight;
+							heightCacheItem.totalHeight += listTotalHeight;
+						}
+						this.virtualHeightCacheList = currentCacheList.concat(heightCacheList);
+					}
+					this._updateVirtualScroll(this.oldScrollTop);
+				}, c.delayTime, 'updateDynamicCellHeightDelay')
+			})
+		},
+		// 设置cellItem的index
+		_setCellIndex(list, dataFrom = 'bottom') {
+			let currentItemIndex = 0;
+			const cellIndexKey = this.virtualCellIndexKey;
+			([Enum.QueryFrom.Refresh, Enum.QueryFrom.Reload].indexOf(this.queryFrom) >= 0) && this._resetDynamicListState();
+			if (this.totalData.length) {
+				if (dataFrom === 'bottom') {
+					currentItemIndex = this.realTotalData.length;
+					const lastItem = this.realTotalData.length ? this.realTotalData.slice(-1)[0] : null;
+					if (lastItem && lastItem[cellIndexKey] !== undefined) {
+						currentItemIndex = lastItem[cellIndexKey] + 1;
+					}
+				} else if (dataFrom === 'top') {
+					const firstItem = this.realTotalData.length ? this.realTotalData[0] : null;
+					if (firstItem && firstItem[cellIndexKey] !== undefined) {
+						currentItemIndex = firstItem[cellIndexKey] - list.length;
+					}
+				}
+			} else {
+				this._resetDynamicListState();
+			}
+			for (let i = 0; i < list.length; i++) {
+				let item = list[i];
+				if (!item || Object.prototype.toString.call(item) !== '[object Object]') {
+					item = { item };
+				}
+				if (item[c.listCellIndexUniqueKey]) {
+					item = u.deepCopy(item);
+				}
+				item[cellIndexKey] = currentItemIndex + i;
+				item[c.listCellIndexUniqueKey] = `${this.virtualListKey}-${item[cellIndexKey]}`;
+				list[i] = item;
+			}
+			this.getCellHeightRetryCount.dynamic = 0;
+			this.cellHeightMode === Enum.CellHeightMode.Dynamic && this._updateDynamicCellHeight(list, dataFrom);
+		},
+		// 更新scroll滚动（虚拟列表滚动时触发）
+		_updateVirtualScroll(scrollTop, scrollDiff = 0) {
+			const currentTimeStamp = u.getTime();
+			scrollTop === 0 && this._resetTopRange();
+			if (scrollTop !== 0 && this.virtualScrollTimeStamp && currentTimeStamp - this.virtualScrollTimeStamp <= this.virtualScrollDisTimeStamp) {
+				return;
+			}
+			this.virtualScrollTimeStamp = currentTimeStamp;
+			
+			let scrollIndex = 0;
+			const cellHeightMode = this.cellHeightMode;
+			if (cellHeightMode === Enum.CellHeightMode.Fixed) {
+				// 如果是固定高度的虚拟列表
+				// 计算当前滚动到的cell的index = scrollTop / 虚拟列表cell的固定高度
+				scrollIndex = parseInt(scrollTop / this.virtualCellHeight) || 0;
+				// 更新顶部和底部占位view的高度（为兼容考虑，顶部采用transformY的方式占位)
+				this._updateFixedTopRangeIndex(scrollIndex);
+				this._updateFixedBottomRangeIndex(scrollIndex);
+			} else if(cellHeightMode === Enum.CellHeightMode.Dynamic) {
+				// 如果是不固定高度的虚拟列表
+				// 当前滚动的方向
+				const scrollDirection = scrollDiff > 0 ? 'top' : 'bottom';
+				// 视图区域的高度
+				const rangePageHeight = this.virtualRangePageHeight;
+				// 顶部视图区域外的高度（顶部不需要渲染而是需要占位部分的高度）
+				const topRangePageOffset = scrollTop - rangePageHeight;
+				// 底部视图区域外的高度（底部不需要渲染而是需要占位部分的高度）
+				const bottomRangePageOffset = scrollTop + this.finalVirtualPageHeight + rangePageHeight;
+				
+				let virtualBottomRangeIndex = 0;
+				let virtualPlaceholderBottomHeight = 0;
+				let reachedLimitBottom = false;
+				const heightCacheList = this.virtualHeightCacheList;
+				const lastHeightCache = !!heightCacheList ? heightCacheList.slice(-1)[0] : null;
+				
+				let startTopRangeIndex = this.virtualTopRangeIndex;
+				// 如果是向底部滚动（顶部占位的高度不断增大，顶部的实际渲染cell数量不断减少）
+				if (scrollDirection === 'bottom') {
+					// 从顶部视图边缘的cell的位置开始向后查找
+					for (let i = startTopRangeIndex; i < heightCacheList.length; i++){
+						const heightCacheItem = heightCacheList[i];
+						// 如果查找到某个cell对应的totalHeight大于顶部视图区域外的高度，则此cell为顶部视图边缘的cell
+						if (heightCacheItem && heightCacheItem.totalHeight > topRangePageOffset) {
+							// 记录顶部视图边缘cell的index并更新顶部占位区域的高度并停止继续查找
+							this.virtualTopRangeIndex = i;
+							this.virtualPlaceholderTopHeight = heightCacheItem.lastTotalHeight;
+							break;
+						}
+					}
+				} else {
+					// 如果是向顶部滚动（顶部占位的高度不断减少，顶部的实际渲染cell数量不断增加）
+					let topRangeMatched = false;
+					// 从顶部视图边缘的cell的位置开始向前查找
+					for (let i = startTopRangeIndex; i >= 0; i--){
+						const heightCacheItem = heightCacheList[i];
+						// 如果查找到某个cell对应的totalHeight小于顶部视图区域外的高度，则此cell为顶部视图边缘的cell
+						if (heightCacheItem && heightCacheItem.totalHeight < topRangePageOffset) {
+							// 记录顶部视图边缘cell的index并更新顶部占位区域的高度并停止继续查找
+							this.virtualTopRangeIndex = i;
+							this.virtualPlaceholderTopHeight = heightCacheItem.lastTotalHeight;
+							topRangeMatched = true;
+							break;
+						}
+					}
+					// 如果查找不到，则认为顶部占位高度为0了，顶部cell不需要继续复用，重置topRangeIndex和placeholderTopHeight
+					!topRangeMatched && this._resetTopRange();
+				}
+				// 从顶部视图边缘的cell的位置开始向后查找
+				for (let i = this.virtualTopRangeIndex; i < heightCacheList.length; i++){
+					const heightCacheItem = heightCacheList[i];
+					// 如果查找到某个cell对应的totalHeight大于底部视图区域外的高度，则此cell为底部视图边缘的cell
+					if (heightCacheItem && heightCacheItem.totalHeight > bottomRangePageOffset) {
+						// 记录底部视图边缘cell的index并更新底部占位区域的高度并停止继续查找
+						virtualBottomRangeIndex = i;
+						virtualPlaceholderBottomHeight = lastHeightCache.totalHeight - heightCacheItem.totalHeight;
+						reachedLimitBottom = true;
+						break;
+					}
+				}
+				if (!reachedLimitBottom || this.virtualBottomRangeIndex === 0) {
+					this.virtualBottomRangeIndex = this.realTotalData.length ? this.realTotalData.length - 1 : this.pageSize;
+					this.virtualPlaceholderBottomHeight = 0;
+				} else {
+					this.virtualBottomRangeIndex = virtualBottomRangeIndex;
+					this.virtualPlaceholderBottomHeight = virtualPlaceholderBottomHeight;
+				}
+				this._updateVirtualList();
+			}
+		},
+		// 更新fixedCell模式下topRangeIndex&placeholderTopHeight
+		_updateFixedTopRangeIndex(scrollIndex) {
+			let virtualTopRangeIndex = this.virtualCellHeight === 0 ? 0 : scrollIndex - (parseInt(this.finalVirtualPageHeight / this.virtualCellHeight) || 1) * this.preloadPage;
+			virtualTopRangeIndex *= this.virtualListCol;
+			virtualTopRangeIndex = Math.max(0, virtualTopRangeIndex);
+			this.virtualTopRangeIndex = virtualTopRangeIndex;
+			this.virtualPlaceholderTopHeight = (virtualTopRangeIndex / this.virtualListCol) * this.virtualCellHeight;
+		},
+		// 更新fixedCell模式下bottomRangeIndex&placeholderBottomHeight
+		_updateFixedBottomRangeIndex(scrollIndex) {
+			let virtualBottomRangeIndex = this.virtualCellHeight === 0 ? this.pageSize : scrollIndex + (parseInt(this.finalVirtualPageHeight / this.virtualCellHeight) || 1) * (this.preloadPage + 1);
+			virtualBottomRangeIndex *= this.virtualListCol;
+			virtualBottomRangeIndex = Math.min(this.realTotalData.length, virtualBottomRangeIndex);
+			this.virtualBottomRangeIndex = virtualBottomRangeIndex;
+			this.virtualPlaceholderBottomHeight = (this.realTotalData.length - virtualBottomRangeIndex) * this.virtualCellHeight / this.virtualListCol;
+			this._updateVirtualList();
+		},
+		// 更新virtualList
+		_updateVirtualList() {
+			const shouldUpdateList = this.updateVirtualListFromDataChange || (this.lastVirtualTopRangeIndex !== this.virtualTopRangeIndex || this.lastVirtualBottomRangeIndex !== this.virtualBottomRangeIndex);
+			if (shouldUpdateList) {
+				this.updateVirtualListFromDataChange = false;
+				this.lastVirtualTopRangeIndex =  this.virtualTopRangeIndex;
+				this.lastVirtualBottomRangeIndex = this.virtualBottomRangeIndex;
+				this.virtualList = this.realTotalData.slice(this.virtualTopRangeIndex, this.virtualBottomRangeIndex + 1);
+			}
+		},
+		// 重置动态cell模式下的高度缓存数据、虚拟列表和滚动状态
+		_resetDynamicListState(resetVirtualList = false) {
+			this.virtualHeightCacheList = [];
+			if (resetVirtualList) {
+				this.virtualList = [];
+			}
+			this.virtualTopRangeIndex = 0;
+			this.virtualPlaceholderTopHeight = 0;
+		},
+		// 重置topRangeIndex和placeholderTopHeight
+		_resetTopRange() {
+			this.virtualTopRangeIndex = 0;
+			this.virtualPlaceholderTopHeight = 0;
+			this._updateVirtualList();
+		},
+		// 检测虚拟列表当前滚动位置，如发现滚动位置不正确则重新计算虚拟列表相关参数(为解决在App中可能出现的长时间进入后台后打开App白屏的问题)
+		_checkVirtualListScroll() {
+			if (this.finalUseVirtualList) {
+				this.$nextTick(() => {
+					this._getNodeClientRect('.zp-paging-touch-view').then(node => {
+						const currentTop = node ? node[0].top : 0;
+						if (!node || (currentTop === this.pagingOrgTop && this.virtualPlaceholderTopHeight !== 0)) {
+							this._updateVirtualScroll(0);
+						}
+					});
+				})
+			}
+		},
+		// 处理使用内置列表时点击了cell事件
+		_innerCellClick(item, index) {
+			this.$emit('innerCellClick', item, index);
+		}
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-constant.js b/uni_modules/z-paging/components/z-paging/js/z-paging-constant.js
new file mode 100644
index 0000000..db65a90
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-constant.js
@@ -0,0 +1,19 @@
+// [z-paging]常量
+
+export default {
+	// 当前版本号
+	version: '2.7.11',
+	// 延迟操作的通用时间
+	delayTime: 100,
+	// 请求失败时候全局emit使用的key
+	errorUpdateKey: 'z-paging-error-emit',
+	// 全局emit complete的key
+	completeUpdateKey: 'z-paging-complete-emit',
+	// z-paging缓存的前缀key
+	cachePrefixKey: 'z-paging-cache',
+	
+	// 虚拟列表中列表index的key
+	listCellIndexKey: 'zp_index',
+	// 虚拟列表中列表的唯一key
+	listCellIndexUniqueKey: 'zp_unique_index'
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-enum.js b/uni_modules/z-paging/components/z-paging/js/z-paging-enum.js
new file mode 100644
index 0000000..043d5b9
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-enum.js
@@ -0,0 +1,45 @@
+// [z-paging]枚举
+
+export default {
+	// 当前加载类型 0.下拉刷新 1.上拉加载更多
+	LoadingType: {
+		Refresher: 0,
+		LoadingMore: 1
+	},
+	// 下拉刷新状态 0.默认状态 1.松手立即刷新 2.刷新中 3.刷新结束 4.松手进入二楼
+	Refresher: {
+		Default: 0,
+		ReleaseToRefresh: 1,
+		Loading: 2,
+		Complete: 3,
+		GoF2: 4
+	},
+	// 底部加载更多状态 0.默认状态 1.加载中 2.没有更多数据 3.加载失败
+	More: {
+		Default: 0,
+		Loading: 1,
+		NoMore: 2,
+		Fail: 3
+	},
+	// @query触发来源 0.用户主动下拉刷新 1.通过reload触发 2.通过refresh触发 3.通过滚动到底部加载更多或点击底部加载更多触发
+	QueryFrom: {
+		UserPullDown: 0,
+		Reload: 1,
+		Refresh: 2,
+		LoadingMore: 3
+	},
+	// 虚拟列表cell高度模式
+	CellHeightMode: {
+		// 固定高度
+		Fixed: 'fixed',
+		// 动态高度
+		Dynamic: 'dynamic'
+	},
+	// 列表缓存模式
+	CacheMode: {
+		// 默认模式，只会缓存一次
+		Default: 'default',
+		// 总是缓存，每次列表刷新(下拉刷新、调用reload等)都会更新缓存
+		Always: 'always'
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-interceptor.js b/uni_modules/z-paging/components/z-paging/js/z-paging-interceptor.js
new file mode 100644
index 0000000..147291a
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-interceptor.js
@@ -0,0 +1,97 @@
+// [z-paging]拦截器
+
+const queryKey = 'Query';
+const fetchParamsKey = 'FetchParams';
+const fetchResultKey = 'FetchResult';
+const language2LocalKey = 'Language2Local';
+
+// 拦截&处理@query事件
+function handleQuery(callback) {
+	_addHandleByKey(queryKey, callback);
+	return this;
+}
+
+// 拦截&处理@query事件(私有，请勿调用)
+function _handleQuery(pageNo, pageSize, from, lastItem) {
+	const callback = _getHandleByKey(queryKey);
+	return callback ? callback(pageNo, pageSize, from, lastItem) : [pageNo, pageSize, from];
+}
+
+// 拦截&处理:fetch参数
+function handleFetchParams(callback) {
+	_addHandleByKey(fetchParamsKey, callback);
+	return this;
+}
+
+// 拦截&处理:fetch参数(私有，请勿调用)
+function _handleFetchParams(parmas, extraParams) {
+	const callback = _getHandleByKey(fetchParamsKey);
+	return callback ? callback(parmas, extraParams || {}) : { pageNo: parmas.pageNo, pageSize: parmas.pageSize, ...(extraParams || {}) };
+}
+
+// 拦截&处理:fetch结果
+function handleFetchResult(callback) {
+	_addHandleByKey(fetchResultKey, callback);
+	return this;
+}
+
+// 拦截&处理:fetch结果(私有，请勿调用)
+function _handleFetchResult(result, paging, params) {
+	const callback = _getHandleByKey(fetchResultKey);
+	callback && callback(result, paging, params);
+	return callback ? true : false;
+}
+
+// 拦截&处理系统language转i18n local
+function handleLanguage2Local(callback) {
+	_addHandleByKey(language2LocalKey, callback);
+	return this;
+}
+
+// 拦截&处理系统language转i18n local(私有，请勿调用)
+function _handleLanguage2Local(language, local) {
+	const callback = _getHandleByKey(language2LocalKey);
+	return callback ? callback(language, local) : local;
+}
+
+// 获取当前app对象
+function _getApp(){
+	// #ifndef APP-NVUE
+	return getApp();
+	// #endif
+	// #ifdef APP-NVUE
+	return getApp({ allowDefault: true });
+	// #endif
+}
+
+// 是否可以访问globalData
+function _hasGlobalData() {
+	return _getApp() && _getApp().globalData;
+}
+
+// 添加处理函数
+function _addHandleByKey(key, callback) {
+	try {
+		setTimeout(function() {
+			if (_hasGlobalData()) {
+				_getApp().globalData[`zp_handle${key}Callback`] = callback;
+			}
+		}, 1);
+	} catch (_) {}
+}
+
+// 获取处理回调函数
+function _getHandleByKey(key) {
+	return _hasGlobalData() ? _getApp().globalData[`zp_handle${key}Callback`] : null;
+}
+
+export default {
+	handleQuery,
+	_handleQuery,
+	handleFetchParams,
+	_handleFetchParams,
+	handleFetchResult,
+	_handleFetchResult,
+	handleLanguage2Local,
+	_handleLanguage2Local
+};
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-main.js b/uni_modules/z-paging/components/z-paging/js/z-paging-main.js
new file mode 100644
index 0000000..11e18de
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-main.js
@@ -0,0 +1,503 @@
+// [z-paging]核心js
+
+import zStatic from './z-paging-static'
+import c from './z-paging-constant'
+import u from './z-paging-utils'
+
+import zPagingRefresh from '../components/z-paging-refresh'
+import zPagingLoadMore from '../components/z-paging-load-more'
+import zPagingEmptyView from '../../z-paging-empty-view/z-paging-empty-view'
+
+// modules
+import commonLayoutModule from './modules/common-layout'
+import dataHandleModule from './modules/data-handle'
+import i18nModule from './modules/i18n'
+import nvueModule from './modules/nvue'
+import emptyModule from './modules/empty'
+import refresherModule from './modules/refresher'
+import loadMoreModule from './modules/load-more'
+import loadingModule from './modules/loading'
+import chatRecordModerModule from './modules/chat-record-mode'
+import scrollerModule from './modules/scroller'
+import backToTopModule from './modules/back-to-top'
+import virtualListModule from './modules/virtual-list'
+
+import Enum from './z-paging-enum'
+
+const systemInfo = uni.getSystemInfoSync();
+
+export default {
+	name: "z-paging",
+	components: {
+		zPagingRefresh,
+		zPagingLoadMore,
+		zPagingEmptyView
+	},
+	mixins: [
+		commonLayoutModule,
+		dataHandleModule,
+		i18nModule,
+		nvueModule,
+		emptyModule,
+		refresherModule,
+		loadMoreModule,
+		loadingModule,
+		chatRecordModerModule,
+		scrollerModule,
+		backToTopModule,
+		virtualListModule
+	],
+	data() {
+		return {
+			// --------------静态资源---------------
+			base64Arrow: zStatic.base64Arrow,
+			base64Flower: zStatic.base64Flower,
+			base64BackToTop: zStatic.base64BackToTop,
+
+			// -------------全局数据相关--------------
+			// 当前加载类型
+			loadingType: Enum.LoadingType.Refresher,
+			requestTimeStamp: 0,
+			wxsPropType: '',
+			renderPropScrollTop: -1,
+			checkScrolledToBottomTimeOut: null,
+			cacheTopHeight: -1,
+			statusBarHeight: systemInfo.statusBarHeight,
+
+			// --------------状态&判断---------------
+			insideOfPaging: -1,
+			isLoadFailed: false,
+			isIos: systemInfo.platform === 'ios',
+			disabledBounce: false,
+			fromCompleteEmit: false,
+			disabledCompleteEmit: false,
+			pageLaunched: false,
+			active: false,
+			
+			// ---------------wxs相关---------------
+			wxsIsScrollTopInTopRange: true,
+			wxsScrollTop: 0,
+			wxsPageScrollTop: 0,
+			wxsOnPullingDown: false,
+		};
+	},
+	props: {
+		// 调用complete后延迟处理的时间，单位为毫秒，默认0毫秒，优先级高于minDelay
+		delay: {
+			type: [Number, String],
+			default: u.gc('delay', 0),
+		},
+		// 触发@query后最小延迟处理的时间，单位为毫秒，默认0毫秒，优先级低于delay（假设设置为300毫秒，若分页请求时间小于300毫秒，则在调用complete后延迟[300毫秒-请求时长]；若请求时长大于300毫秒，则不延迟），当show-refresher-when-reload为true或reload(true)时，其最小值为400
+		minDelay: {
+			type: [Number, String],
+			default: u.gc('minDelay', 0),
+		},
+		// 设置z-paging的style，部分平台(如微信小程序)无法直接修改组件的style，可使用此属性代替
+		pagingStyle: {
+			type: Object,
+			default: u.gc('pagingStyle', {}),
+		},
+		// z-paging的高度，优先级低于pagingStyle中设置的height；传字符串，如100px、100rpx、100%
+		height: {
+			type: String,
+			default: u.gc('height', '')
+		},
+		// z-paging的宽度，优先级低于pagingStyle中设置的width；传字符串，如100px、100rpx、100%
+		width: {
+			type: String,
+			default: u.gc('width', '')
+		},
+		// z-paging的最大宽度，优先级低于pagingStyle中设置的max-width；传字符串，如100px、100rpx、100%。默认为空，也就是铺满窗口宽度，若设置了特定值则会自动添加margin: 0 auto
+		maxWidth: {
+			type: String,
+			default: u.gc('maxWidth', '')
+		},
+		// z-paging的背景色，优先级低于pagingStyle中设置的background。传字符串，如"#ffffff"
+		bgColor: {
+			type: String,
+			default: u.gc('bgColor', '')
+		},
+		// 设置z-paging的容器(插槽的父view)的style
+		pagingContentStyle: {
+			type: Object,
+			default: u.gc('pagingContentStyle', {}),
+		},
+		// z-paging是否自动高度，若自动高度则会自动铺满屏幕
+		autoHeight: {
+			type: Boolean,
+			default: u.gc('autoHeight', false)
+		},
+		// z-paging是否自动高度时，附加的高度，注意添加单位px或rpx，若需要减少高度，则传负数
+		autoHeightAddition: {
+			type: [Number, String],
+			default: u.gc('autoHeightAddition', '0px')
+		},
+		// loading(下拉刷新、上拉加载更多)的主题样式，支持black，white，默认black
+		defaultThemeStyle: {
+			type: String,
+			default: u.gc('defaultThemeStyle', 'black')
+		},
+		// z-paging是否使用fixed布局，若使用fixed布局，则z-paging的父view无需固定高度，z-paging高度默认为100%，默认为是(当使用内置scroll-view滚动时有效)
+		fixed: {
+			type: Boolean,
+			default: u.gc('fixed', true)
+		},
+		// 是否开启底部安全区域适配
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: u.gc('safeAreaInsetBottom', false)
+		},
+		// 开启底部安全区域适配后，是否使用placeholder形式实现，默认为否。为否时滚动区域会自动避开底部安全区域，也就是所有滚动内容都不会挡住底部安全区域，若设置为是，则滚动时滚动内容会挡住底部安全区域，但是当滚动到底部时才会避开底部安全区域
+		useSafeAreaPlaceholder: {
+			type: Boolean,
+			default: u.gc('useSafeAreaPlaceholder', false)
+		},
+		// z-paging bottom的背景色，默认透明，传字符串，如"#ffffff"
+		bottomBgColor: {
+			type: String,
+			default: u.gc('bottomBgColor', '')
+		},
+		// slot="top"的view的z-index，默认为99，仅使用页面滚动时有效
+		topZIndex: {
+			type: Number,
+			default: u.gc('topZIndex', 99)
+		},
+		// z-paging内容容器父view的z-index，默认为1
+		superContentZIndex: {
+			type: Number,
+			default: u.gc('superContentZIndex', 1)
+		},
+		// z-paging内容容器部分的z-index，默认为1
+		contentZIndex: {
+			type: Number,
+			default: u.gc('contentZIndex', 1)
+		},
+		// z-paging二楼的z-index，默认为100
+		f2ZIndex: {
+			type: Number,
+			default: u.gc('f2ZIndex', 100)
+		},
+		// 使用页面滚动时，是否在不满屏时自动填充满屏幕，默认为是
+		autoFullHeight: {
+			type: Boolean,
+			default: u.gc('autoFullHeight', true)
+		},
+		// 是否监听列表触摸方向改变，默认为否
+		watchTouchDirectionChange: {
+			type: Boolean,
+			default: u.gc('watchTouchDirectionChange', false)
+		},
+		// z-paging中布局的单位，默认为rpx
+		unit: {
+			type: String,
+			default: u.gc('unit', 'rpx')
+		}
+	},
+	created() {
+		// 组件创建时，检测是否开始加载状态
+		if (this.createdReload && !this.refresherOnly && this.auto) {
+			this._startLoading();
+			this.$nextTick(this._preReload);
+		}
+	},
+	mounted() {
+		this.active = true;
+		this.wxsPropType = u.getTime().toString();
+		this.renderJsIgnore;
+		if (!this.createdReload && !this.refresherOnly && this.auto) {
+			// 开始预加载
+			u.delay(() => this.$nextTick(this._preReload), 0);
+		}
+		// 如果开启了列表缓存，在初始化的时候通过缓存数据填充列表数据
+		this.finalUseCache && this._setListByLocalCache();
+		let delay = 0;
+		// #ifdef H5 || MP
+		delay = c.delayTime;
+		// #endif
+		this.$nextTick(() => {
+			// 初始化systemInfo
+			this.systemInfo = uni.getSystemInfoSync();
+			// 初始化z-paging高度
+			!this.usePageScroll && this.autoHeight && this._setAutoHeight();
+			this.loaded = true;
+			u.delay(() => {
+				// 更新fixed模式下z-paging的布局，主要是更新windowTop、windowBottom
+				this.updateFixedLayout();
+				// 更新缓存中z-paging整个内容容器高度
+				this._updateCachedSuperContentHeight();
+			});
+		})
+		// 初始化页面滚动模式下slot="top"、slot="bottom"高度
+		this.updatePageScrollTopHeight();
+		this.updatePageScrollBottomHeight();
+		// 初始化slot="left"、slot="right"宽度
+		this.updateLeftAndRightWidth();
+		if (this.finalRefresherEnabled && this.useCustomRefresher) {
+			this.$nextTick(() => {
+				this.isTouchmoving = true;
+			})
+		}
+		// 监听uni.$emit中全局emit的complete error等事件
+		this._onEmit();
+		// #ifdef APP-NVUE
+		if (!this.isIos && !this.useChatRecordMode) {
+			this.nLoadingMoreFixedHeight = true;
+		}
+		// 在nvue中更新nvue下拉刷新view容器的宽度，而不是写死默认的750rpx，需要考虑列表宽度不是铺满屏幕的情况
+		this._nUpdateRefresherWidth();
+		// #endif
+		// #ifndef APP-NVUE
+		// 虚拟列表模式时，初始化数据
+		this.finalUseVirtualList && this._virtualListInit();
+		// #endif
+		// #ifndef APP-PLUS
+		this.$nextTick(() => {
+			// 非app平台中，在通过获取css设置的底部安全区域占位view高度设置bottom距离后，更新页面滚动底部高度
+			setTimeout(() => {
+				this._getCssSafeAreaInsetBottom(() => this.safeAreaInsetBottom && this.updatePageScrollBottomHeight());
+			}, delay)
+		})
+		// #endif
+	},
+	destroyed() {
+		this._handleUnmounted();
+	},
+	// #ifdef VUE3
+	unmounted() {
+		this._handleUnmounted();
+	},
+	// #endif
+	watch: {
+		defaultThemeStyle: {
+			handler(newVal) {
+				if (newVal.length) {
+					this.finalRefresherDefaultStyle = newVal;
+				}
+			},
+			immediate: true
+		},
+		autoHeight(newVal) {
+			this.loaded && !this.usePageScroll && this._setAutoHeight(newVal);
+		},
+		autoHeightAddition(newVal) {
+			this.loaded && !this.usePageScroll && this.autoHeight && this._setAutoHeight(newVal);
+		},
+	},
+	computed: {
+		// 当前z-paging的内置样式
+		finalPagingStyle() {
+			const pagingStyle = { ...this.pagingStyle };
+			if (!this.systemInfo) return pagingStyle;
+			const { windowTop, windowBottom } = this;
+			if (!this.usePageScroll && this.fixed) {
+				if (windowTop && !pagingStyle.top) {
+					pagingStyle.top = windowTop + 'px';
+				}
+				if (windowBottom && !pagingStyle.bottom) {
+					pagingStyle.bottom = windowBottom + 'px';
+				}
+			}
+			if (this.bgColor.length && !pagingStyle['background']) {
+				pagingStyle['background'] = this.bgColor;
+			}
+			if (this.height.length && !pagingStyle['height']) {
+				pagingStyle['height'] = this.height;
+			}
+			if (this.width.length && !pagingStyle['width']) {
+				pagingStyle['width'] = this.width;
+			}
+			if (this.maxWidth.length && !pagingStyle['max-width']) {
+				pagingStyle['max-width'] = this.maxWidth;
+				pagingStyle['margin'] = '0 auto';
+			}
+			return pagingStyle;
+		},
+		// 当前z-paging内容的样式
+		finalPagingContentStyle() {
+			if (this.contentZIndex != 1) {
+				this.pagingContentStyle['z-index'] = this.contentZIndex;
+				this.pagingContentStyle['position'] = 'relative';
+			}
+			return this.pagingContentStyle;
+		},
+		
+		renderJsIgnore() {
+			if ((this.usePageScroll && this.useChatRecordMode) || (!this.refresherEnabled && this.scrollable) || !this.useCustomRefresher) {
+				this.$nextTick(() => {
+					this.renderPropScrollTop = 10;
+				})
+			}
+			return 0;
+		},
+		windowHeight() {
+			if (!this.systemInfo) return 0;
+			return this.systemInfo.windowHeight || 0;
+		},
+		windowBottom() {
+			if (!this.systemInfo) return 0;
+			let windowBottom = this.systemInfo.windowBottom || 0;
+			// 如果开启底部安全区域适配并且不使用placeholder的形式体现并且不是聊天记录模式（因为聊天记录模式在keyboardHeight计算初已添加了底部安全区域），在windowBottom添加底部安全区域高度
+			if (this.safeAreaInsetBottom && !this.useSafeAreaPlaceholder && !this.useChatRecordMode) {
+				windowBottom += this.safeAreaBottom;
+			}
+			return windowBottom;
+		},
+		isIosAndH5() {
+			// #ifndef H5
+			return false;
+			// #endif
+			return this.isIos;
+		}
+	},
+	methods: {
+		// 当前版本号
+		getVersion() {
+			return `z-paging v${c.version}`;
+		},
+		// 设置nvue List的specialEffects
+		setSpecialEffects(args) {
+			this.setListSpecialEffects(args);
+		},
+		// 与setSpecialEffects等效，兼容旧版本
+		setListSpecialEffects(args) {
+			this.nFixFreezing = args && Object.keys(args).length;
+			if (this.isIos) {
+				this.privateRefresherEnabled = 0;
+			}
+			!this.usePageScroll && this.$refs['zp-n-list'].setSpecialEffects(args);
+		},
+		// #ifdef APP-VUE
+		// 当app长时间进入后台后进入前台，因系统内存管理导致app重新加载时，进行一些适配处理
+		_handlePageLaunch() {
+			// 首次触发不进行处理，只有进入后台后打开app重新加载时才处理
+			if (this.pageLaunched) {
+				// 解决在vue3+ios中，app ReLaunch时顶部下拉刷新展示位置向下偏移的问题
+				// #ifdef VUE3
+				this.refresherThresholdUpdateTag = 1;
+				this.$nextTick(() => {
+					this.refresherThresholdUpdateTag = 0;
+				})
+				// #endif
+				// 解决使用虚拟列表时，app ReLaunch时白屏问题
+				this._checkVirtualListScroll();
+			}
+			this.pageLaunched = true;
+		},
+		// #endif
+		// 使手机发生较短时间的振动（15ms）
+		_doVibrateShort() {
+			// #ifndef H5
+			
+			// #ifdef APP-PLUS
+			if (this.isIos) {
+				const UISelectionFeedbackGenerator = plus.ios.importClass('UISelectionFeedbackGenerator');
+				const feedbackGenerator = new UISelectionFeedbackGenerator();
+				feedbackGenerator.init();
+				setTimeout(() => {
+					feedbackGenerator.selectionChanged();
+				}, 0)
+			} else {
+				plus.device.vibrate(15);
+			}
+			// #endif
+			// #ifndef APP-PLUS
+			uni.vibrateShort();
+			// #endif
+			
+			// #endif
+		},
+		// 设置z-paging高度
+		async _setAutoHeight(shouldFullHeight = true, scrollViewNode = null) {
+			let heightKey = 'min-height';
+			// #ifndef APP-NVUE
+			heightKey = 'min-height';
+			// #endif
+			try {
+				if (shouldFullHeight) {
+					// 如果需要铺满全屏，则计算当前全屏可是区域的高度
+					let finalScrollViewNode = scrollViewNode || await this._getNodeClientRect('.zp-scroll-view');
+					let finalScrollBottomNode = await this._getNodeClientRect('.zp-page-bottom');
+					if (finalScrollViewNode) {
+						const scrollViewTop = finalScrollViewNode[0].top;
+						let scrollViewHeight = this.windowHeight - scrollViewTop;
+						scrollViewHeight -= finalScrollBottomNode ? finalScrollBottomNode[0].height : 0;
+						const additionHeight = u.convertToPx(this.autoHeightAddition);
+						const finalHeight = scrollViewHeight + additionHeight - (this.insideMore ? 1 : 0) + 'px !important';
+						this.$set(this.scrollViewStyle, heightKey, finalHeight);
+						this.$set(this.scrollViewInStyle, heightKey, finalHeight);
+					}
+				} else {
+					this.$delete(this.scrollViewStyle, heightKey);
+					this.$delete(this.scrollViewInStyle, heightKey);
+				}
+			} catch (e) {}
+		},
+		// 组件销毁后续处理
+		_handleUnmounted() {
+			this.active = false;
+			this._offEmit();
+			// 取消监听键盘高度变化事件（H5、百度小程序、抖音小程序、飞书小程序、QQ小程序、快手小程序不支持）
+			// #ifndef H5 || MP-BAIDU || MP-TOUTIAO || MP-QQ || MP-KUAISHOU
+			this.useChatRecordMode && uni.offKeyboardHeightChange(this._handleKeyboardHeightChange);
+			// #endif
+		},
+		// 触发更新是否超出页面状态
+		_updateInsideOfPaging() {
+			this.insideMore && this.insideOfPaging === true && setTimeout(this.doLoadMore, 200)
+		},
+		// 清除timeout
+		_cleanTimeout(timeout) {
+			if (timeout) {
+				clearTimeout(timeout);
+				timeout = null;
+			}
+			return timeout;
+		},
+		// 添加全局emit监听
+		_onEmit() {
+			uni.$on(c.errorUpdateKey, (errorMsg) => {
+				if (this.loading) {
+					if (!!errorMsg) {
+						this.customerEmptyViewErrorText = errorMsg;
+					}
+					this.complete(false).catch(() => {});
+				}
+			})
+			uni.$on(c.completeUpdateKey, (data) => {
+				setTimeout(() => {
+					if (this.loading) {
+						if (!this.disabledCompleteEmit) {
+							const type = data.type || 'normal';
+							const list = data.list || data;
+							const rule = data.rule;
+							this.fromCompleteEmit = true;
+							switch (type){
+								case 'normal':
+									this.complete(list);
+									break;
+								case 'total':
+									this.completeByTotal(list, rule);
+									break;
+								case 'nomore':
+									this.completeByNoMore(list, rule);
+									break;
+								case 'key':
+									this.completeByKey(list, rule);
+									break;
+								default:
+									break;
+							}
+						} else {
+							this.disabledCompleteEmit = false;
+						}
+					}
+				}, 1);
+			})
+		},
+		// 销毁全局emit和listener监听
+		_offEmit(){
+			uni.$off(c.errorUpdateKey);
+			uni.$off(c.completeUpdateKey);
+		},
+	},
+};
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-mixin.js b/uni_modules/z-paging/components/z-paging/js/z-paging-mixin.js
new file mode 100644
index 0000000..9d09caf
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-mixin.js
@@ -0,0 +1,22 @@
+// [z-paging]使用页面滚动时引入此mixin，用于监听和处理onPullDownRefresh等页面生命周期方法
+
+export default {
+	onPullDownRefresh() {
+		if (this.isPagingRefNotFound()) return;
+		this.$refs.paging.reload().catch(() => {});
+	},
+	onPageScroll(e) {
+		if (this.isPagingRefNotFound()) return;
+		this.$refs.paging.updatePageScrollTop(e.scrollTop);
+		e.scrollTop < 10 && this.$refs.paging.doChatRecordLoadMore();
+	},
+	onReachBottom() {
+		if (this.isPagingRefNotFound()) return;
+		this.$refs.paging.pageReachBottom();
+	},
+	methods: {
+		isPagingRefNotFound() {
+			return !this.$refs.paging;
+		}
+	}
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-static.js b/uni_modules/z-paging/components/z-paging/js/z-paging-static.js
new file mode 100644
index 0000000..dbd02bc
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-static.js
@@ -0,0 +1,13 @@
+// [z-paging]公用的静态图片资源
+
+export default {
+	base64Arrow: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAD1BMVEVHcExRUVFMTExRUVFRUVE9CdWsAAAABHRSTlMAjjrY9ZnUjwAAAQFJREFUWMPt2MsNgzAMgGEEE1B1gKJmAIRYoCH7z9RCXrabh33iYktcIv35EEg5ZBh07pvxJU6MFSPOSRnjnBUjUsaciRUjMsb4xIoRCWNiYsUInzE5sWKEyxiYWDbyefqHx1zIeiYTk7mQYziTYecxHvEJjwmIT3hMQELCYSISEg4TkZj0mYTEpM8kJCU9JiMp6TEZyUmbAUhO2gxAQNJiIAKSFgMRmNQZhMCkziAEJTUGIyipMRjBSZkhCE7KDEFIUmTeGCHJxWz0zXaE0GTCG8ZFtEaS347r/1fe11YyHYVfubxayfjoHmc0YYwmmmiiiSaaaKLJ7ckyz5ve+dw3Xw2emdwm9xSbAAAAAElFTkSuQmCC',
+	base64ArrowWhite: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAElBMVEVHcEz///////////////////+IGTx/AAAABnRSTlMA/dAkXZOhASU/AAABYElEQVRYw+2YwXLCIBCGsdAHWGbyAKZ4zxi9O017rxLf/1UaWFAgA1m8dcpedNSPf/l/Vh0Ya/Wn6hN0JcGvoCqRM4C8VBFiDwBqqNuJKV0rAnCgy3AUqZE57x0iqTL8Br4U3WBf/YWaIlTKfAcELU/h9w72CSVPa3C3OCDvhpHbRp/s2vq4fHhCeiCl2A3m4Qd71DQR257mFBlMcTlbFnFWzNtHxewYEfSiaLS4el8d8nyhmKJd1CF4eOS0keLMAuSxubLBIeIGQW8YHCFFo7EH9+YDcQt9FMZEswTheaNxTHwHT8SZorJjMrEVwo4Zo0U8HSEyZvJMOg4RjnmmRr8nDYeIz3OMkbfE/QhBo+U9RnZJxjGCRh/WKmHEMWLNkfPKsGh/CWJk1JjG0kcuJggTt34VDP8aWAFhp4nybVb5+9qQhjSkIQ1pSEMa8k+Q5U9rV3dF8MpFBK+/7miVq1/HZ2qmo9D+pAAAAABJRU5ErkJggg==',
+	base64Flower: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAKlBMVEVHcEzDw8Ovr6+pqamUlJTCwsKenp61tbWxsbGysrLNzc2bm5u5ubmjo6MpovhuAAAACnRSTlMA/P79/sHDhiZS0DxZowAABBBJREFUWMPtl89rE0EUx7ctTXatB3MI1SWnDbUKPUgXqh4ED8Uf7KUVSm3ooVSpSii0Fn/gD4j4o+APiEoVmos9FO2celiqZVgwgaKHPQiCCkv+F99kM7Ozm5kxq1dfD91k9pPve9/3ZjbRNHHok/mKli4eIPNgSuRObuN9SqSEzM20iGnm0yIbqCuV7NSSSIV7uyPM6JMBYdeTOanh/QihJYZsUCSby+VkMj2AvOt0rAeQAwqE3lfKMZVlQCZk1QOCKkkVPadITCfIRNKxfoJI5+0OIFtJx14CMSg1mRSDko7VAfksRQzEbGYqxOJcVTWMCH2I1/IACNW0PWU2M8cmAVHtnH5mM1VRWtwKZjOd5JbF6s1IbaYqaotjNlPHgDAnlAizubTR6ovMYn052g/U5qcmOpi0WL8xTS/3IfSet5m8MEr5ajjF5le6dq/OJpobrdY0t3i9QgefWrxW9/1BLhk0E9m8FeUMhhXal499iD0eQRfDF+ts/tttORRerfp+oV7f4xJj82iUYm1Yzod+ZQEAlS/8mMBwKebVmCVp1f0JLS6zKd17+iwRKTARVg2SHtz3iEbBH+Q+U28zW2Jiza8Tjb1YFoYZMsJyjDqp3M9XBQdSdPLFdxEpvOB37JrHcmR/y9+LgoTlCFGZEa2sc6d4PGlweEa2JSVPoVm+IfGG3ZL037iV9oH+P+Jxc4HGVflNq1M0pivao/EopO4b/ojVCP9GjmiXOeS0DOn1o/iiccT4ORnyvBGF3yUywkQajW4Ti0SGuiy/wVSg/L8w+X/8Q+hvUx8Xd90z4oV5a1i88MbFWHz0WZZ1UrTwBGPX3Rat9AFiXRMRjoMdIdJLEOt2h7jrYOzgOamKZSWSNspOS0X8SAqRYmxRL7sg4eLzYmNehcxh3uoyud/BH2Udux4ywxFTc1xC7Mgf4vMhc5S+kSH3Y7yj+qpwIWSoPTVCOOPVthGx9FbGqrwFw6wSFxJr+17zeKcztt3u+2roAEVgUjDd+AHGuxHy2rZHaa8JMkTHEeyi85ANPO9j9BVuBRD2FY5LDMo/Sz/2hReqGIs/KiFin+CsPsYO/yvM3jL2vE8EbX7/Bf8ejtr2GLN65bioAdgLd8Bis/mD5GmP2qeqyo2ZwQEOtAjRIDH7mBKpUcMoApbZJ5UIxkEwxyMZyMxW/uKFvHCFR3SSmerHyDNQ2dF4JG6zIMpBgLfjSF9x1D6smFcYnGApjmSLICO3ecCDWrQ48geba9DI3STy2i7ax6WIB62fSyIZIiO3GFQqSURp8wCo7GhJBGwuSovJBNjb7kT6FPVnIa9qJ2Ko+l9mefGIdinaMp0yC1URYiwsdfNE45EuA5Cx9EhalfvN5s+UyItm81vaB3p4joniN+SCP7Qc1hblAAAAAElFTkSuQmCC',
+	base64FlowerWhite: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAElBMVEX///9HcEz///////////////84chYNAAAABnRSTlP/AGzCOYZj5g1nAAACfklEQVRYw+2YTVPDIBCGtza9Jw25a0bvcax30o73OOr//yvma2F3YWlpPTijXNpAHrK8LLALVPFium2vNIFSbwGKTGQA2GUiHcD29yDNy3sMIdUBQl7r2H8mOEVqAHgPkYZUS6Qc2zYhQqtjyDZEximCZwWZLIBeIgYShs2NzxKpSUehYpMJhURGb+O+w5BpMCAREKPnCDHbIY20SzhM5yxziAXpOiBXydrekT9i5XDEq4NIIHHgyU5mRGqviII4mREJJA4QJzMiILwlRJzpKxJKvCBm8OsBBbLux0tsPl4RKYm5aPu6jw1U4mGxEUR9g8M1PcqBEp/WJliNgYOXueBzS4jZSIcgY5lCtevgDSgyzE+rAfuOTQMq0yzvoGH18qju27Mayzs4fPyMziCx81NJa5RNfW7vPYK9KOfDiVkBxFHG8hAj9txuoBuSWORsFfkpBf7xKFLSeaOefEojh5jz22DJEqMP8fUyaKdQx+RnG+yXMpe8Aars8ueR1pVH/bW3FyyvPRw90upLDHwpgBDtg4aUBNkxRLXMAi03IhcZtr1m+FeI/O/JNyDmmL1djLOauSlNflBpW18RQ2bPqXI22MXXEk75KRHTnkPkYbESbdKP2ZFk0r5sIwffAjy1lx+vx7NLjB6/E7Jfv5ERKhzpN0w8IDE8IGFDv5dhz10s7GFiXRZcUeLCEG5P5nDq9k4PFDcoMpE3GY4OuxuCXhmuyNB6k0RsLIAvqp9NE5r8ZCSS8gxnUp7ODdYhZTqxuiJ9uyJJtPmpqJ7wVj+XVieS903iViHziqAhchLEJAyb7jWU647EpUofQ0ziUuXXXhDddtlllSwjgSQu7r4BRWhQqfDPMVwAAAAASUVORK5CYII=',
+	base64Success: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAElBMVEVRUVFHcExTU1NRUVFRUVFRUVFOSlSUAAAABnRSTlP/AI6+VySB3ZENAAACcElEQVRYw+2YyYKCMAyGI8hdpdxdZu7gcpdZ7jL6/s8yYheSNi0aPdqbwOffpGmaFOYPD3gj4bisN7vddv17N/JVgxn5x12IWgIaWTuO/IE3PseQbwjGPo2cgRmHFLJwdm/X643zwiqOKPPJ1nj3sjEP2iiifZWj5bhopSyGaEO2HX5fbQJzwJ+W7x/jw5ZFjsEU0PMph9xE8i5EqprKALW95eJQURkgzw98uJ/JvwGecR7bIjWWsUgVrrIfFZ2HlLy3sKETD1mmRLRMRhGVssRa0xJkdn3SpJBymBkM8+pSSDXMDNyDaToVHd2fgpNt0sjwiUZO19+jGQ+gQEg9Oq+bufmAVGihomNmjQG7UG3020vrlm7lkFnKFGU3kZ0KGAdmKe821pipQ+qEKcrZeTL2g5FsUks4cStjEZWwXg0b0n4GxmEpkWwIs5VBynjgK7xZaz1/0D7OxkVuLpsY5BQNFyLS84VBjjbg0iL2r2EQHBOxBhikuUOkdxODVF1cxHoWtPPsiyXO455Iv34hssCO8EV4ZIYTjS8SR4qYSHRiTiYQ4ZFbHi0iIhhBTi6dTCgSWRcnw4h4yGTuyTAiOGBIWGoZTgSHJQl+LcOJ4OCnW6yX2bMnJ9pidCOXtkTkTrIGpYuOynAiOF14SamMiOCk5Ke+mq8BcOrrvym8d0zKIQnWT+M1WwOQNO4fFiWb18hhERxJPx2fblbPHHyC41VyiAtKBUFBIih7JMWVoIQTFIr3lKPN80WvoLSWFPC653ioTZA0I0FrQ7qU6asaK0H7JmkSJa2ooOGVtNUsc3j9FYHkIkJy3SG6VHnfXKXGP9t4N9Q4Ye98AAAAAElFTkSuQmCC',
+	base64SuccessWhite: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAGFBMVEVHcEz///////////////////////////8dS1W+AAAAB3RSTlMAiVYk6KvDHLfaegAAAo1JREFUWMPtWEtzmzAQNhCTq910ytXpiyvxTNOr60zrayepx9d02gnX4sTm7xcEiJX2gdnkGJ1A4tOnfWqXyeR1vMRYzrcPD9v5h5MBl3/Ldvx4cxIg/FWC8X0xjLjalM54uhhCfCrRuJURX0pi3EmIqZV7O59vrRZmguStHL9b7S7ftfLwOtiZDw7AHMtmquAQ12b5Wwbnordm8g9zLLO49qc/m2n6aKnhwPOGZ08hAiNHhheiHae1lOUPGZpQkPKa3q0mOUjaRzSRaGUjpy/mmWSwySSpllcEteBKAT52KEnSbblA51pJEPxBQoiH1FP4E3s5+FJv07h6/ylD6ui7B+9fq/ehrFB98ghec9EoVtyjK8pqCHLmCBOwMWSCeWFNN4MbPAk55NhsvoFHSSVR0k5TCTTEzlUGcqV/nVp7n9oIVkmtaqbAEqEgfdgHJPwsEAyZ9r4VAZXFjpEwyaw3+H2v42KYxKhs1XvY/gSSGv+IHyUSuHXCeZhLAgVI3EjgSGo1Fb3xO0tGGU9S2/KAIbtjxpJASG73qox6w5LUq0cEOa+iIONIWIilQSQ0pPa2jgaRQAgQP7c0mITRWGxpMAmEQFN2NAQJNCV0mI6GIIEO47hlQ0ORQLd0nL+hoUjg1m6I1TRr8uYEAriBHLcVFQ5UEMiBe3XkTBEG04WXlGKGxPnMS305XQPA1Ocn2JiuAZwE66fxnKwBnDTuXxZTMq85lwW6kt5ndLqZPefiU1yvmktcUSooChJF2aMprhQlnKJQ5FxRKkcVRa+itNYU8Io2oVkY14w0NMWYlqft91Bj9VHq+ca3b43BxjWJmla0sfKohlfTVpPN+93L/yLQ/IjQ/O5Q/VR5HdL4D7mlxmjwVdELAAAAAElFTkSuQmCC',
+	base64Empty: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAMAAAAL34HQAAALeGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNi4wLWMwMDIgNzkuMTY0NDg4LCAyMDIwLzA3LzEwLTIyOjA2OjUzICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIiB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDI0LTAxLTEzVDE5OjA5OjQwKzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyNC0wMS0xM1QxOTowOTo0MCswODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ZWQwMWYzNWQtOWRjOC00MDBiLWEyMmQtNjM5OGZiNzVhNGRiIiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6ZDhlMzQ3ZmEtMDY2My1jYTRiLTgzNTctNTk4YjBkNGIzOTU2IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiBwaG90b3Nob3A6SUNDUHJvZmlsZT0ic1JHQiBJRUM2MTk2Ni0yLjEiIHRpZmY6T3JpZW50YXRpb249IjEiIHRpZmY6WFJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6WVJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiIGV4aWY6Q29sb3JTcGFjZT0iMSIgZXhpZjpQaXhlbFhEaW1lbnNpb249IjMwMCIgZXhpZjpQaXhlbFlEaW1lbnNpb249IjMwMCI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBzdEV2dDp3aGVuPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjQwNjg2NzJkLWY5NDMtOTU0Mi1iMDBiLTVlMDExNmE1NmIzZSIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxMDoyNjoxNiswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDphYmJkZmUyZC0xY2Q2LTJiNDgtYjUyNS05YzlhZjdlNjA4NDMiIHN0RXZ0OndoZW49IjIwMjQtMDEtMTNUMTE6MjM6NDArMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY29udmVydGVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJmcm9tIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3AgdG8gaW1hZ2UvcG5nIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJkZXJpdmVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJjb252ZXJ0ZWQgZnJvbSBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIHRvIGltYWdlL3BuZyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6YTQ5MjM5MDAtNDhiZC03YTQ1LWI4NGItYmVlZTVjOWUxYTM1IiBzdEV2dDp3aGVuPSIyMDI0LTAxLTEzVDExOjIzOjQwKzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmVkMDFmMzVkLTlkYzgtNDAwYi1hMjJkLTYzOThmYjc1YTRkYiIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxOTowOTo0MCswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDx4bXBNTTpEZXJpdmVkRnJvbSBz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',
+	base64Error: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAMAAAAL34HQAAALeGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNi4wLWMwMDIgNzkuMTY0NDg4LCAyMDIwLzA3LzEwLTIyOjA2OjUzICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIiB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDI0LTAxLTEzVDE5OjEwOjEwKzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyNC0wMS0xM1QxOToxMDoxMCswODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MTQ3NTExNjAtZDY5MC00ZTkzLWFhNGUtNGMwYTViNGU1ZGFjIiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6YzRiNzlkYWMtZTJmYS1iNzQ0LWIxM2ItOWU1N2VjMDhhM2YwIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiBwaG90b3Nob3A6SUNDUHJvZmlsZT0ic1JHQiBJRUM2MTk2Ni0yLjEiIHRpZmY6T3JpZW50YXRpb249IjEiIHRpZmY6WFJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6WVJlc29sdXRpb249IjMwMDAwMDAvMTAwMDAiIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiIGV4aWY6Q29sb3JTcGFjZT0iMSIgZXhpZjpQaXhlbFhEaW1lbnNpb249IjMwMCIgZXhpZjpQaXhlbFlEaW1lbnNpb249IjMwMCI+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6ZDA4MDI4MDItMzUyYS04NTRhLTkxYjctNmRlNmQ1MmViM2QwIiBzdEV2dDp3aGVuPSIyMDIyLTAyLTIyVDIxOjIxOjQ1KzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjQwNjg2NzJkLWY5NDMtOTU0Mi1iMDBiLTVlMDExNmE1NmIzZSIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxMDoyNjoxNiswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpjZjk1NTE1OC04MjFiLTA4NDUtYWJmNS05YTE1NGM1ZTY4NjEiIHN0RXZ0OndoZW49IjIwMjQtMDEtMTNUMTE6MDQ6MDQrMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY29udmVydGVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJmcm9tIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3AgdG8gaW1hZ2UvcG5nIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJkZXJpdmVkIiBzdEV2dDpwYXJhbWV0ZXJzPSJjb252ZXJ0ZWQgZnJvbSBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIHRvIGltYWdlL3BuZyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6ZGM1Y2IyNWItZDZlNC0yZjQ2LTgyODQtZmUwOTNlY2M2ZTkxIiBzdEV2dDp3aGVuPSIyMDI0LTAxLTEzVDExOjA0OjA0KzA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjE0NzUxMTYwLWQ2OTAtNGU5My1hYTRlLTRjMGE1YjRlNWRhYyIgc3RFdnQ6d2hlbj0iMjAyNC0wMS0xM1QxOToxMDoxMCswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKE1hY2ludG9zaCkiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDx4bXBNTTpEZXJpdmVkRnJvbSBz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',
+	base64BackToTop: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADIBAMAAABfdrOtAAAAElBMVEVRUVH+/v5HcEyZmZlRUVFRUVGm1ByOAAAABnRSTlPMzADMTZAJBBGsAAAEnElEQVR42t2cS27jMAyGf7/2U+QCQeDsbeQCgZDujaC5/1UmkzaJn+JDFGcw3LdfflKibJkkDnxrL7dbg7sNt6+L4O8OYBM+B0ys+QrGkHZG+OEEQ8g6go8Bx1GIGMdpNOQyIG6XdMgnSPtKhLQDGEZFBgYMkhKFtGBb0EIEjDgFRowoBVaMGAWpMedEfxMiZtwpUsgZCqtlkCNUdpVAWigtCCCDFtLwIWeoreZCWiRYYEKGFEjDg+yRZCUH0iLRAgNyToXUNCRZyMqWhGnUN2IPm3wSlwJ7IUspyCBkIQUZhCykIIeQuRTkEDKXAuM9srrtYbrZN7Y98giZSoFd+t1OxmMITG0dcrSFXFchZ1tIvQZpYWxhBbK3hpQrkMEa0iwh5t4a+QvZvDXyF7J5a+Qv5PPW21/I5623v5DPW29/IaO3Xv5Clrw1y1/Ikrdm+Qs5svw83yNnSJ5BQb4F/F7EIEJSnThGBAXxkFQfLOviQUE8JAUPsosHBfGQfDAtHhREQ1JxIV00KIgmrnRI84S0yAd5BAXxxJUck0f6Qnwr9qmr6xF5xLMjcwn/iudIEAdWnyjkEXlQKZiRVzoqRyLbgeUKKR8Q4alY7cSnoxzSf2ggsqehKr6YVpcXpOd7H93f60cKhOd7Re2LteUF4eLqiVS1mr0ge4io6C2+soaFkJ7MuuuQs1yITEp9hwwKISIpzR2iESKSIoT0rLNwuVHQqoSIpAQJpGce60vIUSdEIuUqgPTsJ5QFZK8UIpBS8iG94GFrDjlrhfCl8CG96Llxmle4kEr6vKWBPIVo9kqDQSRk9/3cWoikcCFPAd33v4dIChPyEvLzBA6RlEYWke4JEUnhKXkLeUEKxRHJFfKCQHGucIW8IdZSRkLeEGMpYyEjiK2UsZARxFTKRMgYYillImQMMZQyFTKB2EmZCplAuFLIHT8TMoWwpQwiIVMIUwqpZP5bp5CCvCTiQKr5f5lCQN+tPCBn2ZvVDFJwIDUP0m1BYAfZYRNSsCB7BqTbhoARePIxtZ9tgwWkoJcwCalmv3MBAemtO4R6dah2HaKQqj8Zvp9sQDjvJ21+SPCBHPJDDk6QITekEV7gqCC19CpKAym9IMfckKv4olMBCeIrWwVEfvkshzQekO9r9P1/ALk+IG1eSPCDiCJfyG+FyU+A6ZCa/piZDinpz7LpkCv5gdkAEshP5emQhv7onw6pGeULyZCSUYiRDAmMkpJkCKs4JhFSq8p8hJBSVbAkhARV6ZUQoisik0FqXTmcDHLVFfbJIEFXoiiCNMpiSxGkVJaNiiBBWQArgTTaUl4JpNQWJUsgQVteXQg+AKkLxQWFGKW+5J2+eVp4S168X3CF1CltCKdTJ8lb84YK2bUBO+wZW0Pqv9nk4tKu49N45NJC5dMM5tLW5tOg59Jq6NM06dL+abFXwr/RkuvTXJwae1abtE/Dt0/ruksTvs84AZ/BCC4jHnyGVfiM3VBQFANEXEah+Ax18RlP4zNox2dkkM/wI58xTn8yDCXGYCDV3W5RGSajtXyGhG1jbpbjzpwGt/0MJft8jqC7iUbQ/QZaxdnKqcIftwAAAABJRU5ErkJggg==',
+}
diff --git a/uni_modules/z-paging/components/z-paging/js/z-paging-utils.js b/uni_modules/z-paging/components/z-paging/js/z-paging-utils.js
new file mode 100644
index 0000000..b06c6fe
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/js/z-paging-utils.js
@@ -0,0 +1,270 @@
+// [z-paging]工具类
+
+import zLocalConfig from '../config/index'
+import c from './z-paging-constant'
+
+const storageKey = 'Z-PAGING-REFRESHER-TIME-STORAGE-KEY';
+let config = null;
+let configLoaded = false;
+const timeoutMap = {};
+
+// 获取默认配置信息
+function gc(key, defaultValue) {
+	// 这里return一个函数以解决在vue3+appvue中，props默认配置读取在main.js之前执行导致uni.$zp全局配置无效的问题。相当于props的default中传入一个带有返回值的函数
+	return () => {
+		// 处理z-paging全局配置
+		_handleDefaultConfig();
+		// 如果全局配置不存在，则返回默认值
+		if (!config) return defaultValue;
+		const value = config[key];
+		// 如果全局配置存在但对应的配置项不存在，则返回默认值；反之返回配置项
+		return value === undefined ? defaultValue : value;
+	};
+}
+
+// 获取最终的touch位置
+function getTouch(e) {
+	let touch = null;
+	if (e.touches && e.touches.length) {
+		touch = e.touches[0];
+	} else if (e.changedTouches && e.changedTouches.length) {
+		touch = e.changedTouches[0];
+	} else if (e.datail && e.datail != {}) {
+		touch = e.datail;
+	} else {
+		return { touchX: 0, touchY: 0 }
+	}
+	return {
+		touchX: touch.clientX,
+		touchY: touch.clientY
+	};
+}
+
+// 判断当前手势是否在z-paging内触发
+function getTouchFromZPaging(target) {
+	if (target && target.tagName && target.tagName !== 'BODY' && target.tagName !== 'UNI-PAGE-BODY') {
+		const classList = target.classList;
+		if (classList && classList.contains('z-paging-content')) {
+			// 此处额外记录当前z-paging是否是页面滚动、是否滚动到了顶部、是否是聊天记录模式以传给renderjs。避免不同z-paging组件renderjs内部判断数据互相影响导致的各种问题
+			return {
+				isFromZp: true,
+				isPageScroll: classList.contains('z-paging-content-page'),
+				isReachedTop: classList.contains('z-paging-reached-top'),
+				isUseChatRecordMode: classList.contains('z-paging-use-chat-record-mode')
+			};
+		} else {
+			return getTouchFromZPaging(target.parentNode);
+		}
+	} else {
+		return { isFromZp: false };
+	}
+}
+
+// 递归获取z-paging所在的parent，如果查找不到则返回null
+function getParent(parent) {
+	if (!parent) return null;
+	if (parent.$refs.paging) return parent;
+	return getParent(parent.$parent);
+}
+
+// 打印错误信息
+function consoleErr(err) {
+	console.error(`[z-paging]${err}`);
+}
+
+// 延时操作，如果key存在，调用时清除对应key之前的延时操作
+function delay(callback, ms = c.delayTime, key) {
+	const timeout = setTimeout(callback, ms);;
+	if (!!key) {
+		timeoutMap[key] && clearTimeout(timeoutMap[key]);
+		timeoutMap[key] = timeout;
+	}
+	return timeout;
+}
+
+// 设置下拉刷新时间
+function setRefesrherTime(time, key) {
+	const datas = getRefesrherTime() || {};
+	datas[key] = time;
+	uni.setStorageSync(storageKey, datas);
+}
+
+// 获取下拉刷新时间
+function getRefesrherTime() {
+	return uni.getStorageSync(storageKey);
+}
+
+// 通过下拉刷新标识key获取下拉刷新时间
+function getRefesrherTimeByKey(key) {
+	const datas = getRefesrherTime();
+	return datas && datas[key] ? datas[key] : null;
+}
+
+// 通过下拉刷新标识key获取下拉刷新时间(格式化之后)
+function getRefesrherFormatTimeByKey(key, textMap) {
+	const time = getRefesrherTimeByKey(key);
+	const timeText = time ? _timeFormat(time, textMap) : textMap.none;
+	return `${textMap.title}${timeText}`;
+}
+
+// 将文本的px或者rpx转为px的值
+function convertToPx(text) {
+	const dataType = Object.prototype.toString.call(text);
+	if (dataType === '[object Number]') return text;
+	let isRpx = false;
+	if (text.indexOf('rpx') !== -1 || text.indexOf('upx') !== -1) {
+		text = text.replace('rpx', '').replace('upx', '');
+		isRpx = true;
+	} else if (text.indexOf('px') !== -1) {
+		text = text.replace('px', '');
+	}
+	if (!isNaN(text)) {
+		if (isRpx) return Number(uni.upx2px(text));
+		return Number(text);
+	}
+	return 0;
+}
+
+// 获取当前时间
+function getTime() {
+	return (new Date()).getTime();
+}
+
+// 获取z-paging实例id，随机生成10位数字+字母
+function getInstanceId() {
+    const s = [];
+    const hexDigits = "0123456789abcdef";
+    for (let i = 0; i < 10; i++) {
+        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+    }
+    return s.join('') + getTime();
+}
+
+// 等待一段时间
+function wait(ms) {
+	return new Promise(resolve => {
+		setTimeout(resolve, ms);
+	});
+}
+
+// 是否是promise
+function isPromise(func) {
+	return Object.prototype.toString.call(func) === '[object Promise]';
+}
+
+// 添加单位
+function addUnit(value, unit) {
+	if (Object.prototype.toString.call(value) === '[object String]') {
+		let tempValue = value;
+		tempValue = tempValue.replace('rpx', '').replace('upx', '').replace('px', '');
+		if (value.indexOf('rpx') === -1 && value.indexOf('upx') === -1 && value.indexOf('px') !== -1) {
+			tempValue = parseFloat(tempValue) * 2;
+		}
+		value = tempValue;
+	}
+	return unit === 'rpx' ? value + 'rpx' : (value / 2) + 'px';
+}
+
+// 深拷贝
+function deepCopy(obj) {
+	if (typeof obj !== 'object' || obj === null) return obj;
+	let newObj = Array.isArray(obj) ? [] : {};
+	for (let key in obj) {
+		if (obj.hasOwnProperty(key)) {
+			newObj[key] = deepCopy(obj[key]);
+		}
+	}
+	return newObj;
+}
+
+// ------------------ 私有方法 ------------------------
+// 处理全局配置
+function _handleDefaultConfig() {
+	// 确保只加载一次全局配置
+	if (configLoaded) return;
+	// 优先从config.js中读取
+	if (zLocalConfig && Object.keys(zLocalConfig).length) {
+		config = zLocalConfig;
+	}
+	// 如果在config.js中读取不到，则尝试到uni.$zp读取
+	if (!config && uni.$zp) {
+		config = uni.$zp.config;
+	}
+	// 将config中的短横线写法全部转为驼峰写法，使得读取配置时可以直接通过key去匹配，而非读取每个配置时候再去转，减少不必要的性能开支
+	config = config ? Object.keys(config).reduce((result, key) => {
+	    result[_toCamelCase(key)] = config[key];
+	    return result;
+	}, {}) : null;
+	configLoaded = true;
+}
+
+// 时间格式化
+function _timeFormat(time, textMap) {
+	const date = new Date(time);
+	const currentDate = new Date();
+	// 设置time对应的天，去除时分秒，使得可以直接比较日期
+	const dateDay = new Date(time).setHours(0, 0, 0, 0);
+	// 设置当前的天，去除时分秒，使得可以直接比较日期
+	const currentDateDay = new Date().setHours(0, 0, 0, 0);
+	const disTime = dateDay - currentDateDay;
+	let dayStr = '';
+	const timeStr = _dateTimeFormat(date);
+	if (disTime === 0) {
+		dayStr = textMap.today;
+	} else if (disTime === -86400000) {
+		dayStr = textMap.yesterday;
+	} else {
+		dayStr = _dateDayFormat(date, date.getFullYear() !== currentDate.getFullYear());
+	}
+	return `${dayStr} ${timeStr}`;
+}
+
+// date格式化为年月日
+function _dateDayFormat(date, showYear = true) {
+	const year = date.getFullYear();
+	const month = date.getMonth() + 1;
+	const day = date.getDate();
+	return showYear ? `${year}-${_fullZeroToTwo(month)}-${_fullZeroToTwo(day)}` : `${_fullZeroToTwo(month)}-${_fullZeroToTwo(day)}`;
+}
+
+// data格式化为时分
+function _dateTimeFormat(date) {
+	const hour = date.getHours();
+	const minute = date.getMinutes();
+	return `${_fullZeroToTwo(hour)}:${_fullZeroToTwo(minute)}`;
+}
+
+// 不满2位在前面填充0
+function _fullZeroToTwo(str) {
+	str = str.toString();
+	return str.length === 1 ? '0' + str : str;
+}
+
+// 驼峰转短横线
+function _toKebab(value) {
+	return value.replace(/([A-Z])/g, "-$1").toLowerCase();
+}
+
+// 短横线转驼峰
+function _toCamelCase(value) {
+    return value.replace(/-([a-z])/g, (_, group1) => group1.toUpperCase());
+}
+
+
+export default {
+	gc,
+	setRefesrherTime,
+	getRefesrherFormatTimeByKey,
+	getTouch,
+	getTouchFromZPaging,
+	getParent,
+	convertToPx,
+	getTime,
+	getInstanceId,
+	consoleErr,
+	delay,
+	wait,
+	isPromise,
+	addUnit,
+	deepCopy
+};
diff --git a/uni_modules/z-paging/components/z-paging/wxs/z-paging-renderjs.js b/uni_modules/z-paging/components/z-paging/wxs/z-paging-renderjs.js
new file mode 100644
index 0000000..359f1ac
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/wxs/z-paging-renderjs.js
@@ -0,0 +1,67 @@
+// [z-paging]使用renderjs在app-vue和h5中对touchmove事件冒泡进行处理
+
+import u from '../js/z-paging-utils'
+const data = {
+	startY: 0,
+	isTouchFromZPaging: false,
+	isUsePageScroll: false,
+	isReachedTop: true,
+	isIosAndH5: false,
+	useChatRecordMode: false,
+	appLaunched: false
+}
+
+export default {
+	mounted() {
+		if (window) {
+			this._handleTouch();
+			// #ifdef APP-VUE
+			this.$ownerInstance.callMethod('_handlePageLaunch');
+			// #endif
+		}
+	},
+	methods: {
+		// 接收逻辑层发送的数据（是否是ios+h5）
+		renderPropIsIosAndH5Change(newVal) {
+			if (newVal === -1) return;
+			data.isIosAndH5 = newVal;
+		},
+
+		// 拦截处理touch事件
+		_handleTouch() {
+			if (!window.$zPagingRenderJsInited) {
+				window.$zPagingRenderJsInited = true;
+				window.addEventListener('touchstart', this._handleTouchstart, { passive: true })
+				window.addEventListener('touchmove', this._handleTouchmove, { passive: false })
+			}
+		},
+		// 处理touch开始
+		_handleTouchstart(e) {
+			const touch = u.getTouch(e);
+			data.startY = touch.touchY;
+			const touchResult = u.getTouchFromZPaging(e.target);
+			data.isTouchFromZPaging = touchResult.isFromZp;
+			data.isUsePageScroll = touchResult.isPageScroll;
+			data.isReachedTop = touchResult.isReachedTop;
+			data.useChatRecordMode = touchResult.isUseChatRecordMode;
+		},
+		// 处理touch中
+		_handleTouchmove(e) {
+			const touch = u.getTouch(e);
+			const moveY = touch.touchY - data.startY;
+			// 如果是在z-paging内触摸并且（是在顶部位置且是下拉的情况下（或不是聊天记录滚动模式并且在iOS+h5+scroll-view并且是往上拉的情况：避免在此平台中滚动到底部后上拉有个系统灰色遮罩导致列表被短暂锁定的问题））
+			// (data.useChatRecordMode ? moveY < 0 : moveY > 0)是为了判断是否是上拉的情况，聊天记录模式列表倒置，因此moveY < 0为上拉
+			if (data.isTouchFromZPaging && ((data.isReachedTop && (data.useChatRecordMode ? moveY < 0 : moveY > 0)) || (!data.useChatRecordMode && data.isIosAndH5 && !data.isUsePageScroll && moveY < 0))) {
+				if (e.cancelable && !e.defaultPrevented) {
+					// 阻止事件冒泡，以避免在一些平台中下拉刷新时整个page跟着一起下拉&在iOS+h5+scroll-view中在底部上拉有个系统灰色遮罩导致列表被短暂锁定的问题
+					e.preventDefault();
+				}
+			}
+		},
+		// 移除touch相关事件监听
+		_removeAllEventListener(){
+			window.removeEventListener('touchstart');
+			window.removeEventListener('touchmove');
+		}
+	}
+};
diff --git a/uni_modules/z-paging/components/z-paging/wxs/z-paging-wxs.wxs b/uni_modules/z-paging/components/z-paging/wxs/z-paging-wxs.wxs
new file mode 100644
index 0000000..ed21959
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/wxs/z-paging-wxs.wxs
@@ -0,0 +1,382 @@
+// [z-paging]微信小程序、QQ小程序、app-vue、h5上使用wxs实现自定义下拉刷新，降低逻辑层与视图层的通信折损，提升性能
+
+var currentDis = 0;
+var isPCFlag = -1;
+var startY = -1;
+
+// 监听js层传过来的数据
+function propObserver(newVal, oldVal, ownerIns, ins) {
+	var state = ownerIns.getState() || {};
+	state.currentIns = ins;
+	var dataset = ins.getDataset();
+	var loading = dataset.loading == true;
+	// 如果是下拉刷新结束，更新transform
+	if (newVal && newVal.indexOf('end') != -1) {
+		var transition = newVal.split('end')[0];
+		_setTransform('translateY(0px)', ins, false, transition);
+		state.moveDis = 0;
+		state.oldMoveDis = 0;
+		currentDis = 0;
+	} else if (newVal && newVal.indexOf('begin') != -1) {
+		// 如果是下拉刷新开始，更新transform
+		var refresherThreshold = ins.getDataset().refresherthreshold;
+		_setTransformValue(refresherThreshold, ins, state, false);
+	}
+}
+
+// touch开始
+function touchstart(e, ownerIns) {
+	var ins = _getIns(ownerIns);
+	var state = {};
+	var dataset = {};
+	ownerIns.callMethod('_handleListTouchstart');
+	if (ins) {
+		state = ins.getState();
+		dataset = ins.getDataset();
+		if (_touchDisabled(e, ins, 0)) return;
+	}
+	var isTouchEnded = state.isTouchEnded;
+	state.oldMoveDis = 0;
+	var touch = _getTouch(e);
+	var loading = _isTrue(dataset.loading);
+	state.startY = touch.touchY;
+	startY = state.startY;
+	state.lastTouch = touch;
+	if (!loading && isTouchEnded) {
+		state.isTouchmoving = false;
+	}
+	state.isTouchEnded = false;
+	// 通知js层touch开始
+	ownerIns.callMethod('_handleRefresherTouchstart', touch);
+}
+
+// touch中
+function touchmove(e, ownerIns) {
+	var touch = _getTouch(e);
+	var ins = _getIns(ownerIns);
+	var dataset = ins.getDataset();
+	var refresherThreshold = dataset.refresherthreshold;
+	var refresherF2Threshold = dataset.refresherf2threshold;
+	var refresherF2Enabled = _isTrue(dataset.refresherf2enabled);
+	var isIos = _isTrue(dataset.isios);
+	var state = ins.getState();
+	var watchTouchDirectionChange = _isTrue(dataset.watchtouchdirectionchange);
+	var moveDisObj = {};
+	var moveDis = 0;
+	var prevent = false;
+	// 如果需要监听touch方向的改变
+	if (watchTouchDirectionChange) {
+		moveDisObj = _getMoveDis(e, ins);
+		moveDis = moveDisObj.currentDis;
+		prevent = moveDisObj.isDown;
+		var direction = prevent ? 'top' : 'bottom';
+		// 确保只在touch方向改变时通知一次js层，而不是touchmove中持续通知
+		if (prevent == state.oldTouchDirection && prevent != state.oldEmitedTouchDirection) {
+			ownerIns.callMethod('_handleTouchDirectionChange', { direction: direction }); 
+			state.oldEmitedTouchDirection = prevent;
+		}
+		state.oldTouchDirection = prevent;
+	}
+	// 判断是否允许下拉刷新
+	if (_touchDisabled(e, ins, 1)) {
+		_handlePullingDown(state, ownerIns, false);
+		return true;
+	}
+	// 判断下拉刷新的角度是否在要求范围内
+	if (!_getAngleIsInRange(e, touch, state, dataset)) {
+		_handlePullingDown(state, ownerIns, false);
+		return true;
+	}
+	moveDisObj = _getMoveDis(e, ins);
+	moveDis = moveDisObj.currentDis;
+	prevent = moveDisObj.isDown;
+	if (moveDis < 0) {
+		// moveDis小于0，将transform重置为0
+		_setTransformValue(0, ins, state, false);
+		_handlePullingDown(state, ownerIns, false);
+		return true;
+	}
+	if (prevent && !state.disabledBounce) {
+		// 如果是用户下拉并且需要触发下拉刷新，需要通知js层将列表禁止滚动，防止在下拉刷新过程中列表也可以滚动导致的下拉刷新偏移过大的问题（在下拉刷新过程中仅通知一次）
+		ownerIns.callMethod('_handleScrollViewBounce', { bounce: false });
+		state.disabledBounce = true;
+		_handlePullingDown(state, ownerIns, prevent);
+		return !prevent;
+	}
+	// 更新transform
+	_setTransformValue(moveDis, ins, state, false);
+	var oldRefresherStatus = state.refresherStatus;
+	var oldIsTouchmoving = _isTrue(dataset.oldistouchmoving);
+	var hasTouchmove = _isTrue(dataset.hastouchmove);
+	var isTouchmoving = state.isTouchmoving;
+	state.refresherStatus = moveDis >= refresherThreshold ? (refresherF2Enabled && moveDis > refresherF2Threshold ? 'goF2' : 'releaseToRefresh') : 'default';
+	if (!isTouchmoving) {
+		state.isTouchmoving = true;
+		isTouchmoving = true;
+	}
+	if (state.isTouchEnded) {
+		state.isTouchEnded = false;
+	}
+	// 如果需要实时监听下拉位置偏移，则需要实时通知js层，此操作会使wxs层与js层频繁通信从而导致在一些性能较差设备中下拉刷新卡顿
+	if (hasTouchmove) {
+		ownerIns.callMethod('_handleWxsPullingDown', { moveDis: moveDis, diffDis: moveDisObj.diffDis });
+	}
+	// 在下拉刷新状态改变时通知js层
+	if (oldRefresherStatus == undefined || oldRefresherStatus != state.refresherStatus || oldIsTouchmoving != isTouchmoving) {
+		ownerIns.callMethod('_handleRefresherTouchmove', moveDis, touch);
+	}
+	_handlePullingDown(state, ownerIns, prevent);
+	return !prevent;
+}
+
+// touch结束
+function touchend(e, ownerIns) {
+	var touch = _getTouch(e);
+	var ins = _getIns(ownerIns);
+	var dataset = ins.getDataset();
+	var state = ins.getState();
+	if (state.disabledBounce) {
+		// 通知js允许列表滚动
+		ownerIns.callMethod('_handleScrollViewBounce', { bounce: true });
+		state.disabledBounce = false;
+	}
+	if (_touchDisabled(e, ins, 2)) return;
+	state.reachMaxAngle = true;
+	state.hitReachMaxAngleCount = 0;
+	state.fixedIsTopHitCount = 0;
+	if (!state.isTouchmoving) return;
+	var oldRefresherStatus = state.refresherStatus;
+	var oldMoveDis = state.moveDis;
+	var refresherThreshold = ins.getDataset().refresherthreshold;
+	var moveDis = _getMoveDis(e, ins).currentDis;
+	if (!(moveDis >= refresherThreshold && oldRefresherStatus === 'releaseToRefresh')) {
+		state.isTouchmoving = false;
+	}
+	// 通知js层touch结束
+	ownerIns.callMethod('_handleRefresherTouchend', moveDis);
+	state.isTouchEnded = true;
+	if (oldMoveDis < refresherThreshold) return;
+	var animate = false;
+	if (moveDis >= refresherThreshold) {
+		moveDis = refresherThreshold;
+		animate = true;
+	}
+	_setTransformValue(moveDis, ins, state, animate);
+}
+
+// #ifdef H5
+// 判断是否是pc平台
+function isPC() {
+	if (!navigator) return false;
+	if (isPCFlag != -1) return isPCFlag;
+	var agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
+	isPCFlag = agents.every(function(item) { return navigator.userAgent.indexOf(item) < 0 });
+	return isPCFlag;
+}
+
+var movable = false;
+
+// 在pc平台监听mousedown、mousemove、mouseup等相关事件并转为对应touch事件处理，使得在pc平台也支持通过鼠标进行下拉刷新
+
+function mousedown(e, ins) {
+	if (!isPC()) return;
+	touchstart(e, ins);
+	movable = true;
+}
+
+function mousemove(e, ins) {
+	if (!isPC() || !movable) return;
+	touchmove(e, ins);
+}
+
+function mouseup(e, ins) {
+	if (!isPC()) return;
+	touchend(e, ins);
+	movable = false;
+}
+
+function mouseleave(e, ins) {
+	if (!isPC()) return;
+	movable = false;
+}
+// #endif
+
+
+// 修改视图层transform
+function _setTransformValue(value, ins, state, animate) {
+	value = value || 0;
+	if (state.moveDis == value) return;
+	state.moveDis = value;
+	_setTransform('translateY(' + value + 'px)', ins, animate, '');
+}
+
+// 设置视图层transform，直接在视图层操作下拉刷新，使得js层不需要频繁和视图层通信，从而大大提升下拉刷新性能
+function _setTransform(transform, ins, animate, transition) {
+	var dataset = ins.getDataset();
+	if (_isTrue(dataset.refreshernotransform)) return;
+	transform = transform == 'translateY(0px)' ? 'none' : transform;
+	ins.requestAnimationFrame(function() {
+		var stl = { 'transform': transform };
+		if (animate) {
+			stl['transition'] = 'transform .1s linear';
+		}
+		if (transition.length) {
+			stl['transition'] = transition;
+		}
+		ins.setStyle(stl);
+	})
+}
+
+// 进一步处理下拉刷新的偏移数据
+function _getMoveDis(e, ins) {
+	var state = ins.getState();
+	var refresherThreshold = parseFloat(ins.getDataset().refresherthreshold);
+	var refresherOutRate = parseFloat(ins.getDataset().refresheroutrate);
+	var refresherPullRate = parseFloat(ins.getDataset().refresherpullrate);
+	var touch = _getTouch(e);
+	var currentStartY = !state.startY || state.startY == 'NaN' ? startY : state.startY;
+	var moveDis = touch.touchY - currentStartY;
+	var oldMoveDis = state.oldMoveDis || 0;
+	state.oldMoveDis = moveDis;
+	// 获取当前下拉刷新位置与上次的偏移量
+	var diffDis = moveDis - oldMoveDis;
+	if (diffDis > 0) {
+		// 对偏移量进行进一步处理，通过refresherPullRate等配置进行约束
+		diffDis = diffDis * refresherPullRate;
+		if (currentDis > refresherThreshold) {
+			diffDis = diffDis * (1 - refresherOutRate);
+		}
+	}
+	// 控制diffDis过大的情况，比如进入页面突然猛然下拉，此时diffDis不应进行太大的偏移
+	diffDis = diffDis > 100 ? diffDis / 100 : (diffDis > 20 ? diffDis / 2.2 : diffDis);
+	currentDis += diffDis;
+	currentDis = Math.max(0, currentDis);
+	return {
+		currentDis: currentDis,
+		diffDis: diffDis,
+		isDown: diffDis > 0
+	};
+}
+
+// 获取经过统一格式包装的当前touch对象
+function _getTouch(e) {
+	var touch = e;
+	if (e.touches && e.touches.length) {
+		touch = e.touches[0];
+	} else if (e.changedTouches && e.changedTouches.length) {
+		touch = e.changedTouches[0];
+	} else if (e.datail && e.datail != {}) {
+		touch = e.datail;
+	}
+	return {
+		touchX: touch.clientX,
+		touchY: touch.clientY
+	};
+}
+
+// 获取当前currentIns
+function _getIns(ownerIns) {
+	var ins = ownerIns.getState().currentIns;
+	if (!ins) {
+		ownerIns.callMethod('_handlePropUpdate');
+	}
+	return ins;
+}
+
+// 判断当前状态是否允许下拉刷新
+function _touchDisabled(e, ins, processTag) {
+	var dataset = ins.getDataset();
+	var state = ins.getState();
+	var loading = _isTrue(dataset.loading);
+	var useChatRecordMode = _isTrue(dataset.usechatrecordmode);
+	var refresherEnabled = _isTrue(dataset.refresherenabled);
+	var useCustomRefresher = _isTrue(dataset.usecustomrefresher);
+	var usePageScroll = _isTrue(dataset.usepagescroll);
+	var pageScrollTop = parseFloat(dataset.pagescrolltop);
+	var scrollTop = parseFloat(dataset.scrolltop);
+	var finalScrollTop = usePageScroll ? pageScrollTop : scrollTop;
+	var fixedIsTop = false;
+	// 是否要处理滚动到顶部scrollTop不为0时候的容错，为解决在安卓中scroll-view有概率滚动到顶部时scrollTop不为0导致下拉刷新判断异常，但此方案会导致某些情况（例如滚动到距离顶部10px处）下拉抖动，因此改为通过获取zp-scroll-view的节点信息中的scrollTop进行验证的方案
+	var handleFaultTolerantMove = false;
+	if (handleFaultTolerantMove && finalScrollTop == (state.startScrollTop || 0) && finalScrollTop <= 105) {
+		fixedIsTop = true;
+	}
+	var fixedIsTopHitCount = state.fixedIsTopHitCount || 0;
+	if (fixedIsTop) {
+		fixedIsTopHitCount ++;
+		if (fixedIsTopHitCount <= 2) {
+			fixedIsTop = false;
+		}
+		state.fixedIsTopHitCount = fixedIsTopHitCount;
+	} else {
+		state.fixedIsTopHitCount = 0;
+	}
+	if (handleFaultTolerantMove && processTag === 0) {
+		state.startScrollTop = finalScrollTop || 0;
+	}
+	if (handleFaultTolerantMove && processTag === 2) {
+		fixedIsTop = true;
+	}
+	return loading || useChatRecordMode || !refresherEnabled || !useCustomRefresher || 
+	((usePageScroll && useCustomRefresher && pageScrollTop > 5) && !fixedIsTop) || 
+	((!usePageScroll && useCustomRefresher && scrollTop > 5) && !fixedIsTop);
+}
+
+// 判断下拉刷新的角度是否在要求范围内
+function _getAngleIsInRange(e, touch, state, dataset) {
+	var maxAngle = dataset.refreshermaxangle;
+	var refresherAecc = _isTrue(dataset.refresheraecc);
+	var lastTouch = state.lastTouch;
+	var reachMaxAngle = state.reachMaxAngle;
+	var moveDis = state.oldMoveDis;
+	if (!lastTouch) return true;
+	if (maxAngle >= 0 && maxAngle <= 90 && lastTouch) {
+		// 考虑下拉刷新手势由水平移动转为垂直方向移动的情况，此时不应当只判断垂直方向角度是否符合要求，应当直接禁止以避免在swiper中使用下拉刷新时，横向切换swiper途中手未离开屏幕还可以下拉刷新的问题
+		if ((!moveDis || moveDis < 1) && !refresherAecc && reachMaxAngle != null && !reachMaxAngle) return false;
+		var x = Math.abs(touch.touchX - lastTouch.touchX);
+		var y = Math.abs(touch.touchY - lastTouch.touchY);
+		var z = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
+		if ((x || y) && x > 1) {
+			// 获取下拉刷新前后两次位移的角度
+			var angle = Math.asin(y / z) / Math.PI * 180;
+			if (angle < maxAngle) {
+				// 如果角度小于配置要求，则return，同时通过hitReachMaxAngleCount控制角度判断的灵敏程度以最大程度兼容各种使用场景
+				var hitReachMaxAngleCount = state.hitReachMaxAngleCount || 0;
+				state.hitReachMaxAngleCount = ++hitReachMaxAngleCount;
+				if (state.hitReachMaxAngleCount > 2) {
+					state.lastTouch = touch;
+					state.reachMaxAngle = false;
+				}
+				return false;
+			}
+		}
+	}
+	state.lastTouch = touch;
+	return true;
+}
+
+// 进一步处理是否在下拉刷新并通知js层
+function _handlePullingDown(state, ins, onPullingDown) {
+	var oldOnPullingDown = state.onPullingDown || false;
+	if (oldOnPullingDown != onPullingDown) {
+		ins.callMethod('_handleWxsPullingDownStatusChange', onPullingDown);
+	}
+	state.onPullingDown = onPullingDown;
+}
+
+// 判断js层传过来的值是否为true
+function _isTrue(value) {
+	value = (typeof(value) === 'string' ? JSON.parse(value) : value) || false;
+	return value == true || value == 'true';
+}
+
+module.exports = {
+	touchstart: touchstart,
+	touchmove: touchmove,
+	touchend: touchend,
+	mousedown: mousedown,
+	mousemove: mousemove,
+	mouseup: mouseup,
+	mouseleave: mouseleave,
+	propObserver: propObserver
+}
diff --git a/uni_modules/z-paging/components/z-paging/z-paging.vue b/uni_modules/z-paging/components/z-paging/z-paging.vue
new file mode 100644
index 0000000..6afa0fa
--- /dev/null
+++ b/uni_modules/z-paging/components/z-paging/z-paging.vue
@@ -0,0 +1,345 @@
+ <!--                        _             
+  ____     _ __   __ _  __ _(_)_ __   __ _ 
+ |_  /____| '_ \ / _` |/ _` | | '_ \ / _` |
+  / /_____| |_) | (_| | (_| | | | | | (_| |
+ /___|    | .__/ \__,_|\__, |_|_| |_|\__, |
+          |_|          |___/         |___/ 
+v2.7.11 (2024-06-28)
+by ZXLee
+-->
+<!-- 文档地址：https://z-paging.zxlee.cn -->
+<!-- github地址：https://github.com/SmileZXLee/uni-z-paging -->
+<!-- dcloud地址：https://ext.dcloud.net.cn/plugin?id=3935 -->
+<!-- 反馈QQ群：790460711(已满)、371624008 -->
+
+<template name="z-paging">
+	<!-- #ifndef APP-NVUE -->
+	<view :class="{'z-paging-content':true,'z-paging-content-full':!usePageScroll,'z-paging-content-fixed':!usePageScroll&&fixed,'z-paging-content-page':usePageScroll,'z-paging-reached-top':renderPropScrollTop<1,'z-paging-use-chat-record-mode':useChatRecordMode}" :style="[finalPagingStyle]">
+		<!-- #ifndef APP-PLUS -->
+		<view v-if="cssSafeAreaInsetBottom===-1" class="zp-safe-area-inset-bottom"></view>
+		<!-- #endif -->
+		<!-- 二楼view -->
+		<view v-if="showF2 && showRefresherF2" @touchmove.stop.prevent class="zp-f2-content" :style="[{'transform': f2Transform, 'transition': `transform .2s linear`, 'height': superContentHeight + 'px', 'z-index': f2ZIndex}]">
+			<slot name="f2"/>
+		</view>
+		<!-- 顶部固定的slot -->
+		<slot v-if="!usePageScroll&&zSlots.top" name="top" />
+		<view class="zp-page-top" @touchmove.stop.prevent v-else-if="usePageScroll&&zSlots.top" :style="[{'top':`${windowTop}px`,'z-index':topZIndex}]">
+			<slot name="top" />
+		</view>
+		<view :class="{'zp-view-super':true,'zp-scroll-view-super':!usePageScroll}" :style="[finalScrollViewStyle]">
+			<view v-if="zSlots.left" :class="{'zp-page-left':true,'zp-absoulte':finalIsOldWebView}">
+				<slot name="left" />
+			</view>
+			<view :class="{'zp-scroll-view-container':true,'zp-absoulte':finalIsOldWebView}" :style="[scrollViewContainerStyle]">
+				<scroll-view
+					ref="zp-scroll-view" :class="{'zp-scroll-view':true,'zp-scroll-view-absolute':!usePageScroll,'zp-scroll-view-hide-scrollbar':!showScrollbar}" :style="[chatRecordRotateStyle]"
+					:scroll-top="scrollTop" :scroll-x="scrollX"
+					:scroll-y="finalScrollable" :enable-back-to-top="finalEnableBackToTop"
+					:show-scrollbar="showScrollbar" :scroll-with-animation="finalScrollWithAnimation"
+					:scroll-into-view="scrollIntoView" :lower-threshold="finalLowerThreshold" :upper-threshold="5"
+					:refresher-enabled="finalRefresherEnabled&&!useCustomRefresher" :refresher-threshold="finalRefresherThreshold"
+					:refresher-default-style="finalRefresherDefaultStyle" :refresher-background="refresherBackground"
+					:refresher-triggered="finalRefresherTriggered" @scroll="_scroll" @scrolltolower="_onScrollToLower"
+					@scrolltoupper="_onScrollToUpper" @refresherrestore="_onRestore" @refresherrefresh="_onRefresh(true)"
+					>	
+					<view class="zp-paging-touch-view"
+					<!-- #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5 -->
+					@touchstart="_refresherTouchstart" @touchmove="_refresherTouchmove" @touchend="_refresherTouchend" @touchcancel="_refresherTouchend"
+					<!-- #endif -->
+					<!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5 -->
+					@touchstart="pagingWxs.touchstart" @touchmove="pagingWxs.touchmove" @touchend="pagingWxs.touchend" @touchcancel="pagingWxs.touchend"
+					@mousedown="pagingWxs.mousedown" @mousemove="pagingWxs.mousemove" @mouseup="pagingWxs.mouseup" @mouseleave="pagingWxs.mouseleave"
+					<!-- #endif -->
+					>	
+						<view v-if="finalRefresherFixedBacHeight>0" class="zp-fixed-bac-view" :style="[{'background': refresherFixedBackground,'height': `${finalRefresherFixedBacHeight}px`}]"></view>
+						<view class="zp-paging-main" :style="[scrollViewInStyle,{'transform': finalRefresherTransform,'transition': refresherTransition}]"
+						<!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5 -->
+						:change:prop="pagingWxs.propObserver" :prop="wxsPropType"
+						:data-refresherThreshold="finalRefresherThreshold" :data-refresherF2Enabled="refresherF2Enabled" :data-refresherF2Threshold="finalRefresherF2Threshold" :data-isIos="isIos"
+						:data-loading="loading||isRefresherInComplete" :data-useChatRecordMode="useChatRecordMode" 
+						:data-refresherEnabled="refresherEnabled" :data-useCustomRefresher="useCustomRefresher" :data-pageScrollTop="wxsPageScrollTop"
+						:data-scrollTop="wxsScrollTop" :data-refresherMaxAngle="refresherMaxAngle" :data-refresherNoTransform="refresherNoTransform"
+						:data-refresherAecc="refresherAngleEnableChangeContinued" :data-usePageScroll="usePageScroll" :data-watchTouchDirectionChange="watchTouchDirectionChange"
+						:data-oldIsTouchmoving="isTouchmoving" :data-refresherOutRate="finalRefresherOutRate" :data-refresherPullRate="finalRefresherPullRate" :data-hasTouchmove="hasTouchmove"
+						<!-- #endif -->
+						<!-- #ifdef APP-VUE || H5 -->
+						:change:renderPropIsIosAndH5="pagingRenderjs.renderPropIsIosAndH5Change" :renderPropIsIosAndH5="isIosAndH5"
+						<!-- #endif -->
+						>	
+							<view v-if="showRefresher" class="zp-custom-refresher-view" :style="[{'margin-top': `-${finalRefresherThreshold+refresherThresholdUpdateTag}px`,'background': refresherBackground,'opacity': isTouchmoving ? 1 : 0}]">
+								<view class="zp-custom-refresher-container" :style="[{'height': `${finalRefresherThreshold}px`,'background': refresherBackground}]">
+									<view v-if="useRefresherStatusBarPlaceholder" class="zp-custom-refresher-status-bar-placeholder" :style="[{'height': `${statusBarHeight}px`}]" />
+									<!-- 下拉刷新view -->
+									<view class="zp-custom-refresher-slot-view">
+										<slot v-if="!(zSlots.refresherComplete&&refresherStatus===R.Complete)&&!(zSlots.refresherF2&&refresherStatus===R.GoF2)" :refresherStatus="refresherStatus" name="refresher" />
+									</view>
+									<slot v-if="zSlots.refresherComplete&&refresherStatus===R.Complete" name="refresherComplete" />
+									<slot v-else-if="zSlots.refresherF2&&refresherStatus===R.GoF2" name="refresherF2" />
+									<z-paging-refresh ref="refresh" v-else-if="!showCustomRefresher" class="zp-custom-refresher-refresh" :style="[{'height': `${finalRefresherThreshold - finalRefresherThresholdPlaceholder}px`}]" :status="refresherStatus"
+										:defaultThemeStyle="finalRefresherThemeStyle" :defaultText="finalRefresherDefaultText"
+										:pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText" :goF2Text="finalRefresherGoF2Text"
+										:defaultImg="refresherDefaultImg" :pullingImg="refresherPullingImg" :refreshingImg="refresherRefreshingImg" :completeImg="refresherCompleteImg" :refreshingAnimated="refresherRefreshingAnimated"
+										:showUpdateTime="showRefresherUpdateTime" :updateTimeKey="refresherUpdateTimeKey" :updateTimeTextMap="finalRefresherUpdateTimeTextMap"
+										:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle" :unit="unit" />
+								</view>
+							</view>
+							<view class="zp-paging-container" :style="[{justifyContent:useChatRecordMode?'flex-end':'flex-start'}]">
+								<!-- 全屏Loading -->
+								<slot v-if="showLoading&&zSlots.loading&&!loadingFullFixed" name="loading" />
+								<!-- 主体内容 -->
+								<view class="zp-paging-container-content" :style="[{transform:virtualPlaceholderTopHeight>0?`translateY(${virtualPlaceholderTopHeight}px)`:'none'},finalPagingContentStyle]">
+									<slot />
+									<!-- 内置列表&虚拟列表 -->
+									<template v-if="finalUseInnerList">
+										<slot name="header"/>
+										<view class="zp-list-container" :style="[innerListStyle]">
+											<template v-if="finalUseVirtualList">
+												<view class="zp-list-cell" :style="[innerCellStyle]" :id="`zp-id-${item[virtualCellIndexKey]}`" v-for="(item,index) in virtualList" :key="item['zp_unique_index']" @click="_innerCellClick(item,virtualTopRangeIndex+index)">
+													<view v-if="useCompatibilityMode">使用兼容模式请在组件源码z-paging.vue第99行中注释这一行，并打开下面一行注释</view>
+													<!-- <zp-public-virtual-cell v-if="useCompatibilityMode" :extraData="extraData" :item="item" :index="virtualTopRangeIndex+index" /> -->
+													<slot v-else name="cell" :item="item" :index="virtualTopRangeIndex+index"/>
+												</view>
+											</template>
+											<template v-else>
+												<view class="zp-list-cell" v-for="(item,index) in realTotalData" :key="index" @click="_innerCellClick(item,index)">
+													<slot name="cell" :item="item" :index="index"/>
+												</view>
+											</template>
+										</view>
+										<slot name="footer"/>
+									</template>
+									<!-- 聊天记录模式加载更多loading -->
+									<template v-if="useChatRecordMode&&realTotalData.length>=defaultPageSize&&(loadingStatus!==M.NoMore||zSlots.chatNoMore)&&(realTotalData.length||(showChatLoadingWhenReload&&showLoading))&&!isFirstPageAndNoMore">
+										<view :style="[chatRecordRotateStyle]">
+											<slot v-if="loadingStatus===M.NoMore&&zSlots.chatNoMore" name="chatNoMore" />
+											<template v-else>
+												<slot v-if="zSlots.chatLoading" :loadingMoreStatus="loadingStatus" name="chatLoading" />
+												<z-paging-load-more v-else @doClick="_onLoadingMore('click')" :zConfig="zLoadMoreConfig" />
+											</template>
+										</view>
+									</template>
+									<!-- 虚拟列表底部占位view -->
+									<view v-if="useVirtualList" class="zp-virtual-placeholder" :style="[{height:virtualPlaceholderBottomHeight+'px'}]"/>
+									<!-- 上拉加载更多view -->
+									<!-- #ifndef MP-ALIPAY -->
+									<slot v-if="showLoadingMoreDefault" name="loadingMoreDefault" />
+									<slot v-else-if="showLoadingMoreLoading" name="loadingMoreLoading" />
+									<slot v-else-if="showLoadingMoreNoMore" name="loadingMoreNoMore" />
+									<slot v-else-if="showLoadingMoreFail" name="loadingMoreFail" />
+									<z-paging-load-more @doClick="_onLoadingMore('click')" v-else-if="showLoadingMoreCustom" :zConfig="zLoadMoreConfig" />
+									<!-- #endif -->
+									<!-- #ifdef MP-ALIPAY -->
+									<slot v-if="loadingStatus===M.Default&&zSlots.loadingMoreDefault&&showLoadingMore&&loadingMoreEnabled&&!useChatRecordMode" name="loadingMoreDefault" />
+									<slot v-else-if="loadingStatus===M.Loading&&zSlots.loadingMoreLoading&&showLoadingMore&&loadingMoreEnabled" name="loadingMoreLoading" />
+									<slot v-else-if="loadingStatus===M.NoMore&&zSlots.loadingMoreNoMore&&showLoadingMore&&showLoadingMoreNoMoreView&&loadingMoreEnabled&&!useChatRecordMode" name="loadingMoreNoMore" />
+									<slot v-else-if="loadingStatus===M.Fail&&zSlots.loadingMoreFail&&showLoadingMore&&loadingMoreEnabled&&!useChatRecordMode" name="loadingMoreFail" />
+									<z-paging-load-more @doClick="_onLoadingMore('click')" v-else-if="showLoadingMore&&showDefaultLoadingMoreText&&!(loadingStatus===M.NoMore&&!showLoadingMoreNoMoreView)&&loadingMoreEnabled&&!useChatRecordMode" :zConfig="zLoadMoreConfig" />
+									<!-- #endif -->
+									<view v-if="safeAreaInsetBottom&&useSafeAreaPlaceholder&&!useChatRecordMode" class="zp-safe-area-placeholder" :style="[{height:safeAreaBottom+'px'}]" />
+								</view>
+								<!-- 空数据图 -->
+								<view v-if="showEmpty" :class="{'zp-empty-view':true,'zp-empty-view-center':emptyViewCenter}" :style="[emptyViewSuperStyle,chatRecordRotateStyle]">
+									<slot v-if="zSlots.empty" name="empty" :isLoadFailed="isLoadFailed"/>
+									<z-paging-empty-view v-else :emptyViewImg="finalEmptyViewImg" :emptyViewText="finalEmptyViewText" :showEmptyViewReload="finalShowEmptyViewReload" 
+									:emptyViewReloadText="finalEmptyViewReloadText" :isLoadFailed="isLoadFailed" :emptyViewStyle="emptyViewStyle" :emptyViewTitleStyle="emptyViewTitleStyle" 
+									:emptyViewImgStyle="emptyViewImgStyle" :emptyViewReloadStyle="emptyViewReloadStyle" :emptyViewZIndex="emptyViewZIndex" :emptyViewFixed="emptyViewFixed" :unit="unit" 
+									@reload="_emptyViewReload" @viewClick="_emptyViewClick" />
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<view v-if="zSlots.right" :class="{'zp-page-right':true,'zp-absoulte zp-right':finalIsOldWebView}">
+				<slot name="right" />
+			</view>
+		</view>
+		<!-- 底部固定的slot -->
+		<view class="zp-page-bottom-container" :style="{'background': bottomBgColor}">
+			<slot v-if="!usePageScroll&&zSlots.bottom" name="bottom" />
+			<view class="zp-page-bottom" @touchmove.stop.prevent v-else-if="usePageScroll&&zSlots.bottom" :style="[{'bottom': `${windowBottom}px`}]">
+				<slot name="bottom" />
+			</view>
+			<!-- 聊天记录模式底部占位 -->
+			<template v-if="useChatRecordMode&&autoAdjustPositionWhenChat">
+				<view :style="[{height:chatRecordModeSafeAreaBottom+'px'}]" />
+				<view class="zp-page-bottom-keyboard-placeholder-animate" :style="[{height:keyboardHeight+'px'}]" />
+			</template>
+		</view>
+		<!-- 点击返回顶部view -->
+		<view v-if="showBackToTopClass" :class="finalBackToTopClass" :style="[finalBackToTopStyle]" @click.stop="_backToTopClick">
+			<slot v-if="zSlots.backToTop" name="backToTop" />
+			<image v-else class="zp-back-to-top-img" :src="backToTopImg.length?backToTopImg:base64BackToTop" />
+		</view>
+		<!-- 全屏Loading(铺满z-paging并固定) -->
+		<view v-if="showLoading&&zSlots.loading&&loadingFullFixed" class="zp-loading-fixed">
+			<slot name="loading" />
+		</view>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<component ref="z-paging-content" :is="finalNvueSuperListIs" :style="[finalPagingStyle]" :class="{'z-paging-content-fixed':fixed&&!usePageScroll}" :scrollable="false">
+		<!-- 二楼view -->
+		<view v-if="showF2 && showRefresherF2" ref="zp-n-f2" class="zp-f2-content" @touchmove.stop.prevent :style="[{'height': superContentHeight + 'px', 'width': nRefresherWidth + 'px', 'opacity': nF2Opacity}]">
+			<slot name="f2"/>
+		</view>
+		<!-- 顶部固定的slot -->
+		<view ref="zp-page-top" v-if="zSlots.top" :class="{'zp-page-top':usePageScroll}" :style="[usePageScroll?{'top':`${windowTop}px`,'z-index':topZIndex}:{}]">
+			<slot name="top" />
+		</view>
+		<!-- 聊天记录模式加载更多loading（loading时候显示） -->
+		<view v-if="useChatRecordMode&&loadingStatus!==M.NoMore&&showChatLoadingWhenReload&&showLoading">
+			<slot v-if="zSlots.chatLoading" :loadingMoreStatus="loadingStatus" name="chatLoading" />
+			<z-paging-load-more v-else @doClick="_onLoadingMore('click')" :zConfig="zLoadMoreConfig" />
+		</view>
+		<component :is="finalNvueSuperListIs" class="zp-n-list-container" :scrollable="false">
+			<view v-if="zSlots.left" class="zp-page-left">
+				<slot name="left" />
+			</view>
+			<component :is="finalNvueListIs" ref="zp-n-list" :id="nvueListId" :style="[{'flex': 1,'top':isIos?'0px':'-1px'},usePageScroll?scrollViewStyle:{},chatRecordRotateStyle]" :alwaysScrollableVertical="true"
+				:fixFreezing="nFixFreezing" :show-scrollbar="showScrollbar" :loadmoreoffset="finalLowerThreshold" :enable-back-to-top="enableBackToTop"
+				:scrollable="finalScrollable" :bounce="nvueBounce" :column-count="nWaterfallColumnCount" :column-width="nWaterfallColumnWidth"
+				:column-gap="nWaterfallColumnGap" :left-gap="nWaterfallLeftGap" :right-gap="nWaterfallRightGap" :pagingEnabled="nvuePagingEnabled" :offset-accuracy="offsetAccuracy"
+				@loadmore="_nOnLoadmore" @scroll="_nOnScroll" @scrollend="_nOnScrollend">
+				<refresh v-if="(zSlots.top?cacheTopHeight!==-1:true)&&finalNvueRefresherEnabled" class="zp-n-refresh" :style="[nvueRefresherStyle]" :display="nRefresherLoading?'show':'hide'" @refresh="_nOnRrefresh" @pullingdown="_nOnPullingdown">
+					<view ref="zp-n-refresh-container" class="zp-n-refresh-container" :style="[{background:refresherBackground,width:nRefresherWidth}]" id="zp-n-refresh-container">
+						<view v-if="useRefresherStatusBarPlaceholder" class="zp-custom-refresher-status-bar-placeholder" :style="[{'height': `${statusBarHeight}px`}]" />
+						<!-- 下拉刷新view -->
+						<slot v-if="zSlots.refresherComplete&&refresherStatus===R.Complete" name="refresherComplete" />
+						<slot v-else-if="zSlots.refresherF2&&refresherStatus===R.GoF2" name="refresherF2" />
+						<slot v-else-if="(nScopedSlots?nScopedSlots:zSlots).refresher" :refresherStatus="refresherStatus" name="refresher" />
+						<z-paging-refresh ref="refresh" v-else :status="refresherStatus" :defaultThemeStyle="finalRefresherThemeStyle"
+							:defaultText="finalRefresherDefaultText" :pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText" :goF2Text="finalRefresherGoF2Text"
+							:defaultImg="refresherDefaultImg" :pullingImg="refresherPullingImg" :refreshingImg="refresherRefreshingImg" :completeImg="refresherCompleteImg" :refreshingAnimated="refresherRefreshingAnimated"
+							:showUpdateTime="showRefresherUpdateTime" :updateTimeKey="refresherUpdateTimeKey" :updateTimeTextMap="finalRefresherUpdateTimeTextMap"
+							:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle" :unit="unit" />
+					</view>
+				</refresh>
+				<component :is="nViewIs" v-if="isIos&&!useChatRecordMode?oldScrollTop>10:true" ref="zp-n-list-top-tag" class="zp-n-list-top-tag" style="margin-top: -1rpx;" :style="[{height:finalNvueRefresherEnabled?'0px':'1px'}]"></component>
+				<component :is="nViewIs" v-if="nShowRefresherReveal" ref="zp-n-list-refresher-reveal" :style="[{transform:`translateY(-${nShowRefresherRevealHeight}px)`},{background:refresherBackground}]">
+					<view v-if="useRefresherStatusBarPlaceholder" class="zp-custom-refresher-status-bar-placeholder" :style="[{'height': `${statusBarHeight}px`}]" />
+					<!-- 下拉刷新view -->
+					<slot v-if="zSlots.refresherComplete&&refresherStatus===R.Complete" name="refresherComplete" />
+					<slot v-else-if="zSlots.refresherF2&&refresherStatus===R.GoF2" name="refresherF2" />
+					<slot v-else-if="(nScopedSlots?nScopedSlots:$slots).refresher" :refresherStatus="R.Loading" name="refresher" />
+					<z-paging-refresh ref="refresh" v-else :status="R.Loading" :defaultThemeStyle="finalRefresherThemeStyle"
+						:defaultText="finalRefresherDefaultText" :pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText" :goF2Text="finalRefresherGoF2Text"
+						:defaultImg="refresherDefaultImg" :pullingImg="refresherPullingImg" :refreshingImg="refresherRefreshingImg" :completeImg="refresherCompleteImg" :refreshingAnimated="refresherRefreshingAnimated"
+						:showUpdateTime="showRefresherUpdateTime" :updateTimeKey="refresherUpdateTimeKey" :updateTimeTextMap="finalRefresherUpdateTimeTextMap"
+						:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle" :unit="unit" />
+				</component>
+				<!-- 内置列表 -->
+				<template v-if="finalUseInnerList">
+					<component :is="nViewIs">
+						<slot name="header"/>
+					</component>	
+					<component :is="nViewIs" class="zp-list-cell" v-for="(item,index) in realTotalData" :key="finalCellKeyName.length?item[finalCellKeyName]:index">
+						<slot name="cell" :item="item" :index="index"/>
+					</component>
+					<component :is="nViewIs">
+						<slot name="footer"/>
+					</component>	
+				</template>
+				<template v-else>
+					<slot />
+				</template>
+				<!-- 全屏Loading -->
+				<component :is="nViewIs" v-if="showLoading&&zSlots.loading&&!loadingFullFixed" :class="{'z-paging-content-fixed':usePageScroll}" style="flex:1" :style="[chatRecordRotateStyle]">
+					<slot name="loading" />
+				</component>
+				<!-- 上拉加载更多view -->
+				<component :is="nViewIs" v-if="!refresherOnly&&loadingMoreEnabled&&!showEmpty">
+					<!-- 聊天记录模式加载更多loading（滚动到顶部加载更多或无更多数据时显示） -->
+					<template v-if="useChatRecordMode&&realTotalData.length>=defaultPageSize&&(loadingStatus!==M.NoMore||zSlots.chatNoMore)&&realTotalData.length&&isChatRecordModeAndInversion">
+						<view :style="[chatRecordRotateStyle]">
+							<slot v-if="loadingStatus===M.NoMore&&zSlots.chatNoMore" name="chatNoMore" />
+							<template v-else>
+								<slot v-if="zSlots.chatLoading" :loadingMoreStatus="loadingStatus" name="chatLoading" />
+								<z-paging-load-more v-else @doClick="_onLoadingMore('click')" :zConfig="zLoadMoreConfig" />
+							</template>
+						</view>
+					</template>
+					
+					<view :style="nLoadingMoreFixedHeight?{height:loadingMoreCustomStyle&&loadingMoreCustomStyle.height?loadingMoreCustomStyle.height:'80rpx'}:{}">
+						<slot v-if="showLoadingMoreDefault" name="loadingMoreDefault" />
+						<slot v-else-if="showLoadingMoreLoading" name="loadingMoreLoading" />
+						<slot v-else-if="showLoadingMoreNoMore" name="loadingMoreNoMore" />
+						<slot v-else-if="showLoadingMoreFail" name="loadingMoreFail" />
+						<z-paging-load-more @doClick="_onLoadingMore('click')" v-else-if="showLoadingMoreCustom" :zConfig="zLoadMoreConfig" />
+						<view v-if="safeAreaInsetBottom&&useSafeAreaPlaceholder&&!useChatRecordMode" class="zp-safe-area-placeholder" :style="[{height:safeAreaBottom+'px'}]" />
+					</view>
+				</component>
+				<!-- 空数据图 -->
+				<component :is="nViewIs" v-if="showEmpty" :class="{'z-paging-content-fixed':usePageScroll}" :style="[{flex:emptyViewCenter?1:0},emptyViewSuperStyle,chatRecordRotateStyle]">
+					<view :class="{'zp-empty-view':true,'zp-empty-view-center':emptyViewCenter}">
+						<slot v-if="zSlots.empty" name="empty" :isLoadFailed="isLoadFailed" />
+						<z-paging-empty-view v-else :emptyViewImg="finalEmptyViewImg" :emptyViewText="finalEmptyViewText" :showEmptyViewReload="finalShowEmptyViewReload" 
+						:emptyViewReloadText="finalEmptyViewReloadText" :isLoadFailed="isLoadFailed" :emptyViewStyle="emptyViewStyle" :emptyViewTitleStyle="emptyViewTitleStyle" 
+						:emptyViewImgStyle="emptyViewImgStyle" :emptyViewReloadStyle="emptyViewReloadStyle" :emptyViewZIndex="emptyViewZIndex" :emptyViewFixed="emptyViewFixed" :unit="unit"
+						@reload="_emptyViewReload" @viewClick="_emptyViewClick" />
+					</view>
+				</component>
+				<component is="header" v-if="!hideNvueBottomTag" ref="zp-n-list-bottom-tag" class="zp-n-list-bottom-tag"></component>
+			</component>
+			<view v-if="zSlots.right" class="zp-page-right">
+				<slot name="right" />
+			</view>
+		</component>
+		<!-- 底部固定的slot -->
+		<view class="zp-page-bottom-container" :style="{'background': bottomBgColor}">
+			<slot name="bottom" />
+			<!-- 聊天记录模式底部占位 -->
+			<template v-if="useChatRecordMode&&autoAdjustPositionWhenChat">
+				<view :style="[{height:chatRecordModeSafeAreaBottom+'px'}]" />
+				<view class="zp-page-bottom-keyboard-placeholder-animate" :style="[{height:keyboardHeight+'px'}]" />
+			</template>
+		</view>
+		<!-- 点击返回顶部view -->
+		<view v-if="showBackToTopClass" :class="finalBackToTopClass" :style="[finalBackToTopStyle]" @click.stop="_backToTopClick">
+			<slot v-if="zSlots.backToTop" name="backToTop" />
+			<image v-else class="zp-back-to-top-img" :src="backToTopImg.length?backToTopImg:base64BackToTop" />
+		</view>
+		<!-- 全屏Loading(铺满z-paging并固定) -->
+		<view v-if="showLoading&&zSlots.loading&&loadingFullFixed" class="zp-loading-fixed">
+			<slot name="loading" />
+		</view>
+	</component>
+	<!-- #endif -->
+</template>
+<!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5 -->
+<script src="./wxs/z-paging-wxs.wxs" module="pagingWxs" lang="wxs"></script>
+<!-- #endif -->
+<script module="pagingRenderjs" lang="renderjs">
+	import pagingRenderjs from './wxs/z-paging-renderjs.js';
+	/**
+	 * z-paging 分页组件
+	 * @description 高性能，全平台兼容。支持虚拟列表，支持nvue、vue3
+	 * @tutorial https://z-paging.zxlee.cn
+	 * @notice 以下仅为部分常用属性、方法和事件，完整文档请查阅z-paging官网
+	 * @property {Number|String} default-page-no 自定义初始的pageNo，默认为1
+	 * @property {Number|String} default-page-size 自定义pageSize，默认为10
+	 * @property {Object} paging-style 设置z-paging的style，部分平台(如微信小程序)无法直接修改组件的style，可使用此属性代替
+	 * @property {String} height z-paging的高度，优先级低于pagingStyle中设置的height，传字符串，如100px、100rpx、100%
+	 * @property {String} width z-paging的宽度，优先级低于pagingStyle中设置的width，传字符串，如100px、100rpx、100%
+	 * @property {Boolean} use-page-scroll 使用页面滚动，默认为否
+	 * @property {Boolean} use-virtual-list 是否使用虚拟列表，默认为否
+	 * @property {Boolean} fixed z-paging是否使用fixed布局，若使用fixed布局，则z-paging的父view无需固定高度，z-paging高度默认为100%，默认为是(当使用内置scroll-view滚动时有效)
+	 * @property {Boolean} auto [z-paging]mounted后是否自动调用reload方法(mounted后自动调用接口)，默认为是
+	 * @property {Boolean} use-chat-record-mode 使用聊天记录模式，默认为否
+	 * @event {Function} query 下拉刷新或滚动到底部时会自动触发此方法。z-paging加载时也会触发(若要禁止，请设置:auto="false")。pageNo和pageSize会自动计算好，直接传给服务器即可。
+	 * @example <z-paging ref="paging" v-model="dataList" @query="queryList"></z-paging>
+	 */
+	export default {
+		name:"z-paging",
+		// #ifdef APP-VUE || H5
+		mixins: [pagingRenderjs],
+		// #endif
+	}
+</script>
+<script src="./js/z-paging-main.js" />
+	
+<style scoped>
+	@import "./css/z-paging-main.css";
+	@import "./css/z-paging-static.css";
+</style>
diff --git a/uni_modules/z-paging/global.d.ts b/uni_modules/z-paging/global.d.ts
new file mode 100644
index 0000000..40f6237
--- /dev/null
+++ b/uni_modules/z-paging/global.d.ts
@@ -0,0 +1,723 @@
+type _Arrayable<T> = T | T[];
+
+declare global {
+    /**
+     * z-paging返回数据
+     *
+     * @since 2.5.3
+     */
+    interface ZPagingReturnData<T> {
+        /**
+         * 总列表
+         */
+        totalList: T[];
+        /**
+         * 是否没有更多数据
+         */
+        noMore: boolean;
+    }
+
+    /**
+     * 嵌套父容器信息 [list组件](https://uniapp.dcloud.net.cn/component/list.html)
+     *
+     * @since 2.0.4
+     */
+    interface ZPagingSetSpecialEffectsArgs {
+        /**
+         * 和list同时滚动的组件id，应为外层的scroller
+         */
+        id?: string;
+        /**
+         * 要吸顶的header顶部距离scroller顶部的距离
+         * - Android暂不支持
+         *
+         * @default 0
+         */
+        headerHeight?: number;
+    }
+
+    /**
+     * z-paging组件实例
+     */
+    interface ZPagingInstance<T = any> {
+        /**
+         * 重新加载分页数据，pageNo恢复为默认值，相当于下拉刷新的效果
+         *
+         * @param [animate=false] 是否展示下拉刷新动画
+         */
+        reload: (animate?: boolean) => Promise<ZPagingReturnData<T>>;
+
+        /**
+         * 刷新列表数据，pageNo和pageSize不会重置，列表数据会重新从服务端获取
+         *
+         * @since 2.0.4
+         */
+        refresh: () => Promise<ZPagingReturnData<T>>;
+
+        /**
+         * 刷新列表数据至指定页
+         *
+         * @since 2.5.9
+         * @param page 目标页数
+         */
+        refreshToPage: (page: number) => Promise<ZPagingReturnData<T>>;
+
+        /**
+         * 请求结束
+         * - 当通过complete传进去的数组长度小于pageSize时，则判定为没有更多了
+         *
+         * @param [data] 请求结果数组
+         * @param [success=true] 是否请求成功
+         */
+        complete: (data?: T[] | false, success?: boolean) => Promise<ZPagingReturnData<T>>;
+
+        /**
+         * 请求结束
+         * - 通过total判断是否有更多数据
+         *
+         * @since 2.0.6
+         * @param data 请求结果数组
+         * @param total 列表总长度
+         * @param [success=true] 是否请求成功
+         */
+        completeByTotal: (data: T[], total: number, success?: boolean) => Promise<ZPagingReturnData<T>>;
+
+        /**
+         * 请求结束
+         * - 自行判断是否有更多数据
+         *
+         * @since 1.9.2
+         * @param data 请求结果数组
+         * @param noMore 是否没有更多数据
+         * @param [success=true] 是否请求成功
+         */
+        completeByNoMore: (data: T[], noMore: boolean, success?: boolean) => Promise<ZPagingReturnData<T>>;
+
+        /**
+         * 请求失败
+         * - 通过方法传入请求失败原因，将请求失败原因传递给z-paging展示
+         *
+         * @since 2.6.3
+         * @param cause 请求失败原因
+         */
+        completeByError: (cause: string) => Promise<ZPagingReturnData<T>>;
+
+        /**
+         * 请求结束
+         * - 保证数据一致
+         *
+         * @since 1.6.4
+         * @param data 请求结果数组
+         * @param key dataKey，需与:data-key绑定的一致
+         * @param [success=true] 是否请求成功
+         */
+        completeByKey: (data: T[], key: string, success?: boolean) => Promise<ZPagingReturnData<T>>;
+
+        /**
+         * 清空分页数据，pageNo恢复为默认值
+         *
+         * @since 2.1.0
+         */
+        clear: () => void;
+
+        /**
+         * 从顶部添加数据，不会影响分页的pageNo和pageSize
+         *
+         * @param data 需要添加的数据，可以是一条数据或一组数据
+         * @param [scrollToTop=true] 是否滚动到顶部，不填默认为true
+         * @param [animate=true] 是否使用动画滚动到顶部
+         */
+        addDataFromTop: (data: _Arrayable<T>, scrollToTop?: boolean, animate?: boolean) => void;
+
+        /**
+         * 【不推荐】重新设置列表数据，调用此方法不会影响pageNo和pageSize，也不会触发请求
+         * - 适用场景：当需要删除列表中某一项时，将删除对应项后的数组通过此方法传递给z-paging
+         *
+         * @param data 修改后的列表数组
+         */
+        resetTotalData: (data: T[]) => void;
+
+        /**
+         * 终止下拉刷新状态
+         *
+         * @since 2.1.0
+         */
+        endRefresh: () => void;
+
+        /**
+         * 手动更新自定义下拉刷新view高度
+         * - 常用于某些情况下使用slot="refresher"插入的view高度未能正确计算导致异常时手动更新其高度
+         *
+         * @since 2.6.1
+         */
+        updateCustomRefresherHeight: () => void;
+
+        /**
+         * 手动关闭二楼
+         *
+         * @since 2.7.7
+         */
+        closeF2: () => void;
+
+        /**
+         * 手动触发上拉加载更多
+         * - 非必须，可依据具体需求使用，例如当z-paging未确定高度时，内部的scroll-view会无限增高，此时z-paging无法得知是否滚动到底部，您可以在页面的onReachBottom中手动调用此方法触发上拉加载更多
+         *
+         * @param [source] 触发加载更多的来源类型
+         */
+        doLoadMore: (source?: "click" | "toBottom") => void;
+
+        /**
+         * 当使用页面滚动并且自定义下拉刷新时，请在页面的onPageScroll中调用此方法，告知z-paging当前的pageScrollTop，否则会导致在任意位置都可以下拉刷新
+         * - 若引入了mixins，则不需要调用此方法
+         *
+         * @param scrollTop 从page的onPageScroll中获取的scrollTop
+         */
+        updatePageScrollTop: (scrollTop: number) => void;
+
+        /**
+         * 在使用页面滚动并且设置了slot="top"时，默认初次加载会自动获取其高度，并使内部容器下移，当slot="top"的view高度动态改变时，在其高度需要更新时调用此方法
+         */
+        updatePageScrollTopHeight: () => void;
+
+        /**
+         * 在使用页面滚动并且设置了slot="bottom"时，默认初次加载会自动获取其高度，并使内部容器下移，当slot="bottom"的view高度动态改变时，在其高度需要更新时调用此方法
+         */
+        updatePageScrollBottomHeight: () => void;
+
+        /**
+         * 更新slot="left"和slot="right"宽度，当slot="left"或slot="right"宽度动态改变后调用
+         *
+         * @since 2.3.5
+         */
+        updateLeftAndRightWidth: () => void;
+
+        /**
+         * 更新fixed模式下z-paging的布局，在onShow时候调用，以修复在iOS+h5+tabbar+fixed+底部有安全区域的设备中从tabbar页面跳转到无tabbar页面后返回，底部有一段空白区域的问题
+         *
+         * @since 2.6.5
+         */
+        updateFixedLayout: () => void;
+
+        /**
+         * 在使用动态高度虚拟列表时，若在列表数组中需要插入某个item，需要调用此方法
+         *
+         * @since 2.5.9
+         * @param item 插入的数据项
+         * @param index 插入的cell位置，若为2，则插入的item在原list的index=1之后，从0开始
+         */
+        doInsertVirtualListItem: (item: T, index: number) => void;
+
+        /**
+         * 在使用动态高度虚拟列表时，手动更新指定cell的缓存高度
+         * - 当cell高度在初始化之后再次改变时调用
+         *
+         * @since 2.4.0
+         * @param index 需要更新的cell在列表中的位置，从0开始
+         */
+        didUpdateVirtualListCell: (index: number) => void;
+
+        /**
+         * 在使用动态高度虚拟列表时，若删除了列表数组中的某个item，需要调用此方法以更新高度缓存数组
+         *
+         * @since 2.4.0
+         * @param index 需要更新的cell在列表中的位置，从0开始
+         */
+        didDeleteVirtualListCell: (index: number) => void;
+
+        /**
+         * 手动触发虚拟列表渲染更新，可用于解决例如修改了虚拟列表数组中元素，但展示未更新的情况
+         *
+         * @since 2.7.10
+         */
+        updateVirtualListRender: () => void;
+		
+        /**
+         * 设置本地分页，请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging作分页处理
+         * - 若调用了此方法，则上拉加载更多时内部会自动分页，不会触发@query所绑定的事件
+         *
+         * @param data 请求结果数组
+         * @param [success=true] 是否请求成功
+         */
+        setLocalPaging: (data: T[], success?: boolean) => Promise<ZPagingReturnData<T>>;
+
+        /**
+         * 手动触发滚动到顶部加载更多，聊天记录模式时有效
+         */
+        doChatRecordLoadMore: () => void;
+
+        /**
+         * 添加聊天记录，use-chat-record-mode为true时有效
+         *
+         * @param data 需要添加的聊天数据，可以是一条数据或一组数据
+         * @param [scrollToBottom=true] 是否滚动到底部
+         * @param [animate=true] 是否使用动画滚动到底部
+         */
+        addChatRecordData: (data: _Arrayable<T>, scrollToBottom?: boolean, animate?: boolean) => void;
+
+        /**
+         * 滚动到顶部
+         *
+         * @param [animate=true] 是否有动画效果
+         */
+        scrollToTop: (animate?: boolean) => void;
+
+        /**
+         * 滚动到底部
+         *
+         * @param [animate=true] 是否有动画效果
+         */
+        scrollToBottom: (animate?: boolean) => void;
+
+        /**
+         * 滚动到指定view
+         * - vue中有效，若此方法无效，请使用scrollIntoViewByNodeTop
+         *
+         * @param id 需要滚动到的view的id值，不包含"#"
+         * @param [offset=0] 偏移量，单位为px
+         * @param [animate=false] 是否有动画效果
+         */
+        scrollIntoViewById: (id: string, offset?: number, animate?: boolean) => void;
+
+        /**
+         * 滚动到指定view
+         * - vue中有效
+         *
+         * @since 1.7.4
+         * @param top 需要滚动的view的top值(通过uni.createSelectorQuery()获取)
+         * @param [offset=0] 偏移量，单位为px
+         * @param [animate=false] 是否有动画效果
+         */
+        scrollIntoViewByNodeTop: (top: number, offset?: number, animate?: boolean) => void;
+
+        /**
+         * 滚动到指定view
+         * - vue中有效
+         * - 与scrollIntoViewByNodeTop的不同之处在于，scrollToY传入的是view相对于屏幕的top值，而scrollIntoViewByNodeTop传入的top值并非是固定的，通过uni.createSelectorQuery()获取到的top会因列表滚动而改变
+         *
+         * @param top 需要滚动到的view的top值，单位为px
+         * @param [offset=0] 偏移量，单位为px
+         * @param [animate=false] 是否有动画效果
+         */
+        scrollToY: (top: number, offset?: number, animate?: boolean) => void;
+
+        /**
+         * 滚动到指定view
+         * - nvue或虚拟列表中有效
+         * - 在nvue中的cell必须设置 :ref="`z-paging-${index}`"
+         *
+         * @param index 需要滚动到的view的index(第几个)
+         * @param [offset=0] 偏移量，单位为px
+         * @param [animate=false] 是否有动画效果
+         */
+        scrollIntoViewByIndex: (index: number, offset?: number, animate?: boolean) => void;
+
+        /**
+         * 滚动到指定view
+         * - nvue中有效
+         *
+         * @param view 需要滚动到的view(通过this.$refs.xxx获取)
+         * @param [offset=0] 偏移量，单位为px
+         * @param [animate=false] 是否有动画效果
+         */
+        scrollIntoViewByView: (view: any, offset?: number, animate?: boolean) => void;
+
+        /**
+         * 设置nvue List的specialEffects
+         *
+         * @since 2.0.4
+         * @param args 参见https://uniapp.dcloud.io/component/list?id=listsetspecialeffects
+         */
+        setSpecialEffects: (args: ZPagingSetSpecialEffectsArgs) => void;
+
+        /**
+         * 与{@link setSpecialEffects}相同
+         *
+         * @since 2.0.4
+         */
+        setListSpecialEffects: (args: ZPagingSetSpecialEffectsArgs) => void;
+
+        /**
+         * 手动更新列表缓存数据，将自动截取v-model绑定的list中的前pageSize条覆盖缓存，请确保在list数据更新到预期结果后再调用此方法
+         *
+         * @since 2.3.9
+         */
+        updateCache: () => void;
+
+        /**
+         * 获取当前版本号
+         */
+        getVersion: () => string;
+    }
+
+    /**
+     * z-paging全局数据
+     * - uni.$zp
+     *
+     * @since 2.6.5
+     */
+    interface ZPagingGlobal {
+        /**
+         * 配置
+         */
+        config: Record<string, any>;
+    }
+
+    /**
+     * 虚拟列表数据项
+     *
+     * @since 2.7.7
+     */
+    type ZPagingVirtualItem<T> = T & {
+        /**
+         * 元素真实索引
+         */
+        zp_index: number;
+    };
+    
+    namespace ZPagingEvent {
+        /**
+         * query的触发来源：0.用户主动下拉刷新 1.通过reload触发 2.通过refresh触发 3.通过滚动到底部加载更多或点击底部加载更多触发
+         */
+        type _QueryFrom = 0 | 1 | 2 | 3;
+        /**
+         * 下拉刷新或滚动到底部时会自动触发此方法
+         * 
+         * @param pageNo 当前第几页
+         * @param pageSize 每页多少条
+         * @param from query的触发来源：0.用户主动下拉刷新 1.通过reload触发 2.通过refresh触发 3.通过滚动到底部加载更多或点击底部加载更多触发
+         */
+        interface Query {
+            (pageNo: number, pageSize: number, from: _QueryFrom): void;
+        }
+
+        /**
+         * 分页渲染的数组改变时触发
+         * 
+         * @param list 最终的分页数据数组
+         */
+        interface ListChange {
+            (list: []): void;
+        }
+
+        /**
+         * 下拉刷新状态：0-默认状态 1.松手立即刷新 2.刷新中 3.刷新成功(默认情况下看不到此状态，如果需要展示刷新成功状态，请设置刷新结束以后延时收回的时间，如:refresher-complete-delay="200")
+         */
+        type _RefresherStatus = 0 | 1 | 2 | 3;
+        /**
+         * 自定义下拉刷新状态改变
+         * - use-custom-refresher为false时无效
+         * 
+         * @param status 下拉刷新状态：0-默认状态 1.松手立即刷新 2.刷新中 3.刷新成功(默认情况下看不到此状态，如果需要展示刷新成功状态，请设置刷新结束以后延时收回的时间，如:refresher-complete-delay="200")
+         */
+        interface RefresherStatusChange {
+            (status: _RefresherStatus): void;
+        }
+
+        /**
+         * 自定义下拉刷新下拉开始
+         * - use-custom-refresher为false时无效，nvue无效
+         * 
+         * @param y 当前触摸开始的屏幕点的y值(单位px)
+         */
+        interface RefresherTouchstart {
+            (y: number): void;
+        }
+
+        /**
+         * touchmove信息
+         */
+        interface _RefresherTouchmoveInfo {
+            /** 下拉的距离 */
+            pullingDistance: number;
+            /** 前后两次回调滑动距离的差值 */
+            dy: number;
+            /** refresh组件高度 */
+            viewHeight: number;
+            /** pullingDistance/viewHeight的比值 */
+            rate: number;
+        }
+        /**
+         * 自定义下拉刷新下拉拖动中
+         * - use-custom-refresher为false时无效
+         * - 在使用wxs的平台上，为减少wxs与js通信折损，只有在z-paging添加@refresherTouchmove时，wxs才会实时将下拉拖动事件传给js，在微信小程序和QQ小程序中，因$listeners无效，所以必须设置:watch-refresher-touchmove="true"方可使此事件被触发
+         * 
+         * @param info touchmove信息
+         */
+        interface RefresherTouchmove {
+            (info: _RefresherTouchmoveInfo): void;
+        }
+
+        /**
+         * 自定义下拉刷新下拉结束
+         * - use-custom-refresher为false时无效，nvue无效
+         * 
+         * @param y 当前触摸开始的屏幕点的y值(单位px)
+         */
+        interface RefresherTouchend {
+            (y: number): void;
+        }
+
+        /**
+         * 下拉进入二楼状态：go-二楼开启 close-二楼关闭
+         */
+        type _RefresherF2ChangeStatus = 'go' | 'close';
+        /**
+         * 下拉进入二楼状态改变
+         * 
+         * @since 2.7.7
+         * @param status 下拉进入二楼状态：go-二楼开启 close-二楼关闭
+         */
+        interface RefresherF2Change {
+            (status: _RefresherF2ChangeStatus): void;
+        }
+
+        /**
+         * 自定义下拉刷新被触发
+         */
+        interface OnRefresh {
+            (): void;
+        }
+
+        /**
+         * 自定义下拉刷新被复位
+         */
+        interface OnRestore {
+            (): void;
+        }
+
+        /**
+         * 底部加载更多状态：0-默认状态 1.加载中 2.没有更多数据 3.加载失败
+         */
+        type _LoadingStatus = 0 | 1 | 2 | 3;
+        /**
+         * 下拉进入二楼状态改变
+         * 
+         * @param status 底部加载更多状态：0-默认状态 1.加载中 2.没有更多数据 3.加载失败
+         */
+        interface LoadingStatusChange {
+            (status: _LoadingStatus): void;
+        }
+
+        /**
+         * 点击空数据图中重新加载后是否进行reload操作，默认为是。如果需要禁止reload事件，则调用handler(false)
+         */
+        type _EmptyViewReloadHandler = (value: boolean) => void;
+        /**
+         * 点击了空数据图中的重新加载按钮
+         * 
+         * @since 1.8.0
+         * @param handler 点击空数据图中重新加载后是否进行reload操作，默认为是。如果需要禁止reload事件，则调用handler(false)
+         */
+        interface EmptyViewReload {
+            (handler: _EmptyViewReloadHandler): void;
+        }
+
+        /**
+         * 点击了空数据图view
+         * 
+         * @since 2.3.3
+         */
+        interface EmptyViewClick {
+            (): void;
+        }
+
+        /**
+         * 请求失败状态改变
+         * 
+         * @since 2.5.0
+         * @param isLoadFailed 当前是否是请求失败状态，为true代表是，反之为否；默认状态为否
+         */
+        interface IsLoadFailedChange {
+            (isLoadFailed: boolean): void;
+        }
+
+        /**
+         * 点击返回顶部按钮后是否滚动到顶部，默认为是。如果需要禁止滚动到顶部事件，则调用handler(false)
+         */
+        type _BackToTopClickHandler = (value: boolean) => void;
+        /**
+         * 点击了返回顶部按钮
+         * 
+         * @since 2.6.1
+         * @param handler 点击返回顶部按钮后是否滚动到顶部，默认为是。如果需要禁止滚动到顶部事件，则调用handler(false)
+         */
+        interface BackToTopClick {
+            (handler: _BackToTopClickHandler): void;
+        }
+
+        /**
+         * 虚拟列表当前渲染的数组改变时触发，在虚拟列表中只会渲染可见区域内+预加载页面的数据
+         * -nvue无效
+         * 
+         * @since 2.2.7
+         * @param list 虚拟列表当前渲染的数组
+         */
+        interface VirtualListChange {
+            (list: []): void;
+        }
+
+        /**
+         * 使用虚拟列表或内置列表时点击了cell的信息
+         */
+        interface _InnerCellClickInfo<T> {
+            /** 当前点击的item */
+            item: T;
+            /** 当前点击的index */
+            index: number;
+        }
+        /**
+         * 使用虚拟列表或内置列表时点击了cell
+         * -nvue无效
+         * 
+         * @since 2.4.0
+         * @param info 点击cell的信息
+         */
+        interface InnerCellClick {
+            (info: _InnerCellClickInfo<any>): void;
+        }
+
+        /**
+         * 在聊天记录模式下，触摸列表隐藏了键盘
+         * 
+         * @since 2.3.6
+         */
+        interface HidedKeyboard {
+            (): void;
+        }
+
+        /**
+         * 键盘的高度信息
+         */
+        interface _KeyboardHeightInfo {
+            /** 键盘的高度 */
+            height: number;
+        }
+        /**
+         * 键盘高度改变
+         * -聊天记录模式启用时才有效，如果在聊天记录模式页面需要监听键盘高度改变，请不要直接通过uni.onKeyboardHeightChange监听，否则可能导致z-paging内置的键盘高度改变监听失效。ps:H5、百度小程序、抖音小程序、飞书小程序不支持
+         * 
+         * @since 2.7.1
+         * @param info 键盘高度信息
+         */
+        interface KeyboardHeightChange {
+            (info: _KeyboardHeightInfo): void;
+        }
+
+        /**
+         * 列表滚动信息(vue)
+         */
+        interface _ScrollInfo {
+            detail: {
+                scrollLeft: number;
+                scrollTop: number;
+                scrollHeight: number;
+                scrollWidth: number;
+                deltaX: number;
+                deltaY: number;
+            }
+        }
+        /**
+         * 列表滚动信息(nvue)
+         */
+        interface _ScrollInfoN {
+            contentSize: {
+                width: number;
+                height: number;
+            };
+            contentOffset: {
+                x: number;
+                y: number;
+            };
+            isDragging: boolean;
+        }
+        /**
+         * 列表滚动时触发
+         * 
+         * @param event 滚动事件信息，vue使用_ScrollInfo，nvue使用_ScrollInfoN
+         */
+        interface Scroll {
+            (event: _ScrollInfo | _ScrollInfoN): void;
+        }
+
+        /**
+         * scrollTop改变时触发，使用点击返回顶部时需要获取scrollTop时可使用此事件
+         * 
+         * @param scrollTop
+         */
+        interface ScrollTopChange {
+            (scrollTop: number): void;
+        }
+
+        /**
+         * 内置的scroll-view滚动底部时的来源(toBottom滚动到底部；click点击了加载更多view)
+         */
+        type _ScrolltolowerFrom = 'toBottom' | 'click';
+        /**
+         * 内置的scroll-view滚动底部时触发
+         * 
+         * @param from 来源(toBottom滚动到底部；click点击了加载更多view)
+         */
+        interface Scrolltolower {
+            (from: _ScrolltolowerFrom): void;
+        }
+
+        /**
+         * 内置的scroll-view滚动顶部时触发
+         */
+        interface Scrolltoupper {
+            (): void;
+        }
+
+        /**
+         * 滚动结束时触发事件信息
+         */
+        interface _ScrollendEvent {
+            contentSize: {
+                width: number;
+                height: number;
+            };
+            contentOffset: {
+                x: number;
+                y: number;
+            };
+            isDragging: boolean;
+        }
+        /**
+         * 内置的list滚动结束时触发
+         * -仅nvue有效
+         * 
+         * @since 2.7.3
+         * @param event 滚动结束时触发事件信息
+         */
+        interface Scrollend {
+            (event: _ScrollendEvent): void;
+        }
+
+        /**
+         * z-paging中内容高度改变时触发
+         * 
+         * @since 2.1.3
+         * @param height 改变后的高度
+         */
+        interface ContentHeightChanged {
+            (height: number): void;
+        }
+
+        /**
+         * 列表触摸的方向，top代表用户将列表向上移动(scrollTop不断减小)，bottom代表用户将列表向下移动(scrollTop不断增大)
+         */
+        type _TouchDirection = 'top' | 'bottom';
+        /**
+         * 监听列表触摸方向改变
+         * 
+         * @since 2.3.0
+         * @param direction 列表触摸的方向，top代表用户将列表向上移动(scrollTop不断减小)，bottom代表用户将列表向下移动(scrollTop不断增大)
+         */
+        interface TouchDirectionChange {
+            (direction: _TouchDirection): void;
+        }
+    }
+}
+
+export {};
diff --git a/uni_modules/z-paging/package.json b/uni_modules/z-paging/package.json
new file mode 100644
index 0000000..9f8f92f
--- /dev/null
+++ b/uni_modules/z-paging/package.json
@@ -0,0 +1,88 @@
+{
+  "id": "z-paging",
+  "name": "z-paging",
+  "displayName": "【z-paging下拉刷新、上拉加载】高性能，全平台兼容。支持虚拟列表，分页全自动处理",
+  "version": "2.7.11",
+  "description": "超简单、低耦合！使用wxs+renderjs实现。支持自定义下拉刷新、上拉加载更多、虚拟列表、下拉进入二楼、自动管理空数据图、无闪动聊天分页、本地分页、国际化等100+项配置",
+  "keywords": [
+    "下拉刷新",
+    "上拉加载",
+    "分页器",
+    "nvue",
+    "虚拟列表"
+],
+  "repository": "https://github.com/SmileZXLee/uni-z-paging",
+  "types": "global.d.ts",
+  "engines": {
+    "HBuilderX": "^3.0.7"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "393727164"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/z-paging",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "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",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        },
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
new file mode 100644
index 0000000..40016f4
--- /dev/null
+++ b/vite.config.js
@@ -0,0 +1,34 @@
+import { loadEnv } from 'vite';
+import uni from '@dcloudio/vite-plugin-uni';
+import path from 'path';
+// import viteCompression from 'vite-plugin-compression';
+import uniReadPagesV3Plugin from './sheep/router/utils/uni-read-pages-v3';
+import mpliveMainfestPlugin from './sheep/libs/mplive-manifest-plugin';
+
+
+// https://vitejs.dev/config/
+export default (command, mode) => {
+	const env = loadEnv(mode, __dirname, 'SHOPRO_');
+	return {
+		envPrefix: "SHOPRO_",
+		plugins: [
+			uni(),
+			// viteCompression({
+			// 	verbose: false
+			// }),
+			uniReadPagesV3Plugin({
+				pagesJsonDir: path.resolve(__dirname, './pages.json'),
+				includes: ['path', 'aliasPath', 'name', 'meta'],
+			}),
+			mpliveMainfestPlugin(env.SHOPRO_MPLIVE_ON)
+		],
+		server: {
+			host: true,
+			// open: true,
+			port: env.SHOPRO_DEV_PORT,
+			hmr: {
+				overlay: true,
+			},
+		},
+	};
+};