commit bb32d46a65ffe7772a211fdab66385c2e7b17e4d
Author: 榆钱落尽槿花稀 <2675540038@qq.com>
Date:   Wed Jul 9 09:13:08 2025 +0800

    创建仓库

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bcd0c91
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+.DS_Store
+node_modules/
+unpackage/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+**/*.log
+.eslintignore
+tests/**/coverage/
+tests/e2e/reports
+selenium-debug.log
+.hbuilderx
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.local
+
+package-lock.json
+yarn.lock
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..56062f3
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,168 @@
+<script>
+	import Vue from 'vue'
+	import store from './store/index.js'
+	import updateCustomBarInfo from './tuniao-ui/libs/function/updateCustomBarInfo.js'
+	import {
+		UserLogin
+	} from '@/util/api.js';
+
+	export default {
+		onLaunch: function() {
+			var Gid = uni.getStorageSync('Gid');
+			if (Gid) {
+				store.commit('$tStore', {
+					name: 'Gid',
+					value: Gid
+				})
+			} else {
+				uni.setStorageSync('Gid', 1);
+			}
+			uni.getSystemInfo({
+				success: function(e) {
+					// #ifndef H5
+					// 获取手机系统版本
+					const system = e.system.toLowerCase()
+					const platform = e.platform.toLowerCase()
+					// 判断是否为ios设备
+					if (platform.indexOf('ios') != -1 && (system.indexOf('ios') != -1 || system.indexOf(
+							'macos') != -1)) {
+						Vue.prototype.SystemPlatform = 'apple'
+					} else if (platform.indexOf('android') != -1 && (system.indexOf('android') != -1)) {
+						Vue.prototype.SystemPlatform = 'android'
+					} else {
+						Vue.prototype.SystemPlatform = 'devtools'
+					}
+					// #endif
+				}
+			})
+
+			// 获取设备的状态栏信息和自定义顶栏信息
+			// store.dispatch('updateCustomBarInfo')
+			updateCustomBarInfo().then((res) => {
+				console.log(res);
+				store.commit('$tStore', {
+					name: 'vuex_status_bar_height',
+					value: res.statusBarHeight
+				})
+				store.commit('$tStore', {
+					name: 'vuex_custom_bar_height',
+					value: res.customBarHeight
+				})
+			})
+
+			// #ifdef MP-WEIXIN
+			//更新检测
+			if (wx.canIUse('getUpdateManager')) {
+				const updateManager = wx.getUpdateManager();
+				updateManager && updateManager.onCheckForUpdate((res) => {
+					if (res.hasUpdate) {
+						updateManager.onUpdateReady(() => {
+							uni.showModal({
+								title: '更新提示',
+								content: '新版本已经准备就绪，是否需要重新启动应用？',
+								success: (res) => {
+									if (res.confirm) {
+										uni.clearStorageSync() // 更新完成后刷新storage的数据
+										updateManager.applyUpdate()
+									}
+								}
+							})
+						})
+
+						updateManager.onUpdateFailed(() => {
+							uni.showModal({
+								title: '已有新版本上线',
+								content: '小程序自动更新失败，请删除该小程序后重新搜索打开哟~~~',
+								showCancel: false
+							})
+						})
+					} else {
+						//没有更新
+					}
+				})
+			} else {
+				uni.showModal({
+					title: '提示',
+					content: '当前微信版本过低，无法使用该功能，请更新到最新的微信后再重试。',
+					showCancel: false
+				})
+			}
+			// #endif
+		},
+		onShow: function() {
+
+		},
+		onHide: function() {
+			// console.log('App Hide')
+		},
+		methods: {
+			getUserLogin(returnA) {
+				uni.getProvider({
+					service: 'oauth',
+					success: function(res) {
+						console.log(res)
+						if (~res.provider.indexOf('weixin')) {
+							uni.login({
+								provider: "weixin",
+								success: function(loginRes) {
+									UserLogin({
+											code: loginRes.code
+										})
+										.then(response => {
+											console.log('Login', response);
+											if (response.code == 1) {
+												uni.setStorageSync('openid', response.data
+													.openid);
+												uni.setStorageSync('uid', response.data
+													.id);
+												uni.setStorageSync('userInfo', response.data);
+											} else {
+												uni.showToast({
+													icon: 'none',
+													title: response.msg,
+													duration: 2000
+												});
+											}
+											returnA(response);
+										})
+										.catch(error => {
+											uni.showToast({
+												icon: 'none',
+												title: error,
+												duration: 2000
+											});
+										});
+								}
+							});
+						} else {
+							console.log(123);
+						}
+					}
+				});
+			},
+			addWidthToImages(html) {
+				// 匹配并更新已有 style 属性的 img 标签
+				html = html.replace(/(<img\b[^>]*\bstyle\s*=\s*['"])([^'"]*)(['"][^>]*>)/g,
+					function(match, p1, p2, p3) {
+						return p1 + ';width: 100%;display: block;margin:0 auto;' + p3;
+					});
+
+				// 匹配并添加 style 属性到没有 style 属性的 img 标签
+				html = html.replace(/(<img\b(?![^>]*\bstyle\s*=)[^>]*>)/g,
+					function(match, p1) {
+						return p1.replace(/\/?>$/, ' style="width: 100%;display: block;margin:0 auto;" />');
+					});
+
+				return html;
+			},
+		},
+
+	}
+</script>
+
+<style lang="scss">
+	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
+	@import './tuniao-ui/index.scss';
+	@import './tuniao-ui/iconfont.css';
+	@import './static/css/my.scss';
+</style>
\ No newline at end of file
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..dbde560
--- /dev/null
+++ b/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="zh-en">
+	<head>
+		<meta charset="UTF-8" />
+		<script>
+			var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+				CSS.supports('top: constant(a)'))
+			document.write(
+				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+				(coverSupport ? ', viewport-fit=cover' : '') + '" />')
+		</script>
+		<title></title>
+		<!--preload-links-->
+		<!--app-context-->
+	</head>
+	<body>
+		<div id="app"><!--app-html--></div>
+		<script src="http://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
+		<script type="module" src="/main.js"></script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/libs/components/demo-title.vue b/libs/components/demo-title.vue
new file mode 100644
index 0000000..1386ff8
--- /dev/null
+++ b/libs/components/demo-title.vue
@@ -0,0 +1,94 @@
+<template>
+  <view class="demo-title">
+    <view>
+      <view v-if="type === 'first'" class="main_title">
+        <view v-if="leftIcon" class="main_title__icon main_title__icon--left" :class="[`tn-icon-${leftIcon}`]"></view>
+        <view class="main_title__content">{{ title }}</view>
+        <view v-if="rightIcon" class="main_title__icon main_title__icon--right" :class="[`tn-icon-${rightIcon}`]"></view>
+      </view>
+      <view v-if="type === 'second'" class="second_title">
+        <view class="second_title__content">{{ title }}</view>
+      </view>
+    </view>
+    <view class="content" :class="[{
+      'content--padding': contentPadding
+    }]">
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'demo-title',
+    options: {
+    	// 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现(不会出现shadow节点下再去创建元素)
+    	virtualHost: true
+    },
+    props: {
+      // 标题类型
+      type: {
+        type: String,
+        default: 'first'
+      },
+      // 标题
+      title: {
+        type: String,
+        default: ''
+      },
+      // 左图标
+      leftIcon: {
+        type: String,
+        default: 'star'
+      },
+      // 右图标
+      rightIcon: {
+        type: String,
+        default: 'star'
+      },
+      // 内容容器是否有两边边距
+      contentPadding: {
+        type: Boolean,
+        default: true
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .main_title {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 50rpx;
+    font-size: 36rpx;
+    font-weight: bold;
+    
+    &__content {
+      padding: 0 18rpx;
+    }
+    
+    &__icon {
+      font-size: 34rpx;
+    }
+  }
+  
+  .second_title {
+    margin: 24rpx 0;
+    margin-left: 30rpx;
+    
+    &__content {
+      font-size: 32rpx;
+      font-weight: bold;
+    }
+  }
+  
+  .content {
+    margin-top: 30rpx;
+    
+    &--padding {
+      margin-left: 30rpx;
+      margin-right: 30rpx;
+    }
+  }
+</style>
diff --git a/libs/components/dynamic-demo-template.vue b/libs/components/dynamic-demo-template.vue
new file mode 100644
index 0000000..525e316
--- /dev/null
+++ b/libs/components/dynamic-demo-template.vue
@@ -0,0 +1,689 @@
+<template>
+  <view class="dynamic-demo">
+
+    <!-- 效果预览窗口 -->
+    <view v-if="!noDemo" class="demo-container" :class="{'demo-container--full': full}">
+      <view class="demo">
+        <slot></slot>
+      </view>
+      <!-- 提示信息 -->
+      <view v-if="haveTips">
+        <view class="demo__tips__icon" @click="demoTipsClick">
+          <view class="icon tn-icon-help"></view>
+        </view>
+        <view class="demo__tips__content"
+          :class="[showContentTips ? 'demo__tips__content--show' : 'demo__tips__content--hide']">
+          <view v-for="(item,index) in tipsData" :key="index" class="demo__tips__content--item">{{ item }}</view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 模式切换 -->
+    <view v-if="multiMode" class="mode-switch">
+      <view class="mode-switch__container">
+        <view v-for="(item, index) in sectionModeListInfos" :key="index" class="mode-switch__item"
+          :class="[`mode-switch-item-${index}`,{'mode-switch__item--active': modeIndex === index}]"
+          @click="switchMode(index)">{{ item.name }}</view>
+
+        <!-- 滑块样式 -->
+        <view class="mode-switch__slider" :style="[modeSwitchSliderStyle]"></view>
+      </view>
+    </view>
+
+    <!-- 组件对应可选项容器 -->
+    <view class="section-container">
+      <scroll-view
+        class="section__scroll-view"
+        :class="{'section__scroll-view--auto': sectionScrollViewStyle.height === 'auto'}"
+        :style="[sectionScrollViewStyle]"
+        :scroll-y="sectionScrollViewStyle.height !== 'auto'"
+      >
+        <block v-for="(item,index) in btnsList" :key="index">
+          <view class="section__content" :class="{'section__content--visible': item.show}">
+            <view class="section__content__title">
+              <view class="section__content__title__left-line" :class="[`tn-main-gradient-${tuniaoColorList[index]}`]"></view>
+              <view class="section__content__title--text tn-text-ellipsis" :class="[`tn-main-gradient-${tuniaoColorList[index]}`]">{{ item.title }}</view>
+              <view class="section__content__title__right-line" :class="[`tn-main-gradient-${tuniaoColorList[index]}`]"></view>
+            </view>
+            <view class="section__content__btns">
+              <view v-for="(section_btn,section_index) in item.optional" :key="section_index"
+                class="section__content__btns__item" :class="[`tn-main-gradient-${tuniaoColorList[index]}--light`]" @click="sectionBtnClick(index, section_index)">
+                <view class="section__content__btns__item__bg"
+                  :class="[`tn-main-gradient-${tuniaoColorList[index]}`, {'section__content__btns__item__bg--active':sectionIndex[modeIndex][index]['value'] === section_index}]"></view>
+                <view class="section__content__btns__item--text tn-text-ellipsis"
+                  :class="[sectionIndex[modeIndex][index]['value'] === section_index ? 'section__content__btns__item--text--active' : `tn-color-${tuniaoColorList[index]}`]">{{ section_btn }}</view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'dynamic-demo-template',
+    props: {
+      // 可选项列表数据
+      sectionList: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 提示信息
+      tips: {
+        type: [String, Array],
+        default: ''
+      },
+      // 演示框的内容是否为铺满
+      full: {
+        type: Boolean,
+        default: false
+      },
+      // 是否使用了自定义顶部导航栏
+      customBar: {
+        type: Boolean,
+        default: true
+      },
+      // 是否全屏滚动
+      fullWindowsScroll: {
+        type: Boolean,
+        default: false
+      },
+      // 没有演示内容
+      noDemo: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      tipsData() {
+        if (typeof this.tips === 'string') {
+          return [this.tips]
+        }
+        return this.tips
+      },
+      haveTips() {
+        return this.tips && this.tips.length > 0
+      },
+      multiMode() {
+        return this.sectionList.length > 1
+      },
+      sectionModeList() {
+        return this.sectionList.map((item) => {
+          return item.name
+        })
+      }
+    },
+    data() {
+      return {
+        // 图鸟颜色列表
+        tuniaoColorList: this.$tn.color.getTuniaoColorList(),
+        // 保存选项列表信息（由于prop中的数据时不能被修改的）
+        _sectionList: [],
+        // 模式列表信息
+        sectionModeListInfos: [],
+        // 所选模式的序号
+        modeIndex: 0,
+        // 模式选择滑块样式
+        modeSwitchSliderStyle: {
+          width: 0,
+          left: 0
+        },
+        // 显示组件相关提示信息
+        showContentTips: false,
+        // 可选项滚动容器样式
+        sectionScrollViewStyle: {
+          height: 0
+        },
+        // 按钮列表信息
+        btnsList: [],
+        // 标记当前所选按钮
+        sectionIndex: [],
+        // 标记选项按钮是否可以滑动（使用scroll-view进行包裹）
+        sectionScrollFlag: true
+      }
+    },
+    watch: {
+      sectionList: {
+        handler(value) {
+          // 如果sectionList发生改变，重新初始化选项列表信息
+          this.initSectionBtns()
+        },
+        deep: true
+      },
+      sectionScrollFlag(value) {
+        if (!value) {
+          this.sectionScrollViewStyle.height = 'auto'
+        }
+      },
+      fullWindowsScroll: {
+        handler(value) {
+          if (value) {
+            this.sectionScrollViewStyle.height = 'auto'
+          }
+        },
+        immediate: true
+      }
+    },
+    created() {
+      // 初始化可选项模式列表
+      this.sectionModeListInfos = this.sectionModeList.map((item) => {
+        return {
+          name: item
+        }
+      })
+      // 初始化选项按钮默认信息
+      this.initSectionBtns()
+    },
+    mounted() {
+      // 等待加载组件完成
+      // setTimeout(() => {
+      //   // 计算出底部scroll-view的高度
+      //   this.initSectionScrollView()
+
+      //   if (this.multiMode) {
+      //     // 获取模式切换标签的信息
+      //     this.getModeTabsInfo()
+      //   }
+      // }, 10)
+      this.$nextTick(() => {
+        // 计算出底部scroll-view的高度
+        this.initSectionScrollView()
+        
+        if (this.multiMode) {
+          // 获取模式切换标签的信息
+          this.getModeTabsInfo()
+        }
+      })
+    },
+    methods: {
+      // 初始化选项滑动窗口的高度
+      initSectionScrollView() {
+        // 全屏滚动时不进行任何的操作
+        if (this.fullWindowsScroll) {
+          return
+        }
+        // 获取屏幕的高度
+        uni.getSystemInfo({
+          success: (systemInfo) => {
+            // 通过当前屏幕的安全高度减去上一个元素的底部和距离上一个元素的外边距，然后减获取到的值减去标题栏的高度即可
+            const navBarHeight = this.customBar ? 0 : this.vuex_custom_bar_height
+            if (this.multiMode) {
+              uni.createSelectorQuery().in(this).select('.mode-switch').boundingClientRect(data => {
+                if (data.bottom >= systemInfo.safeArea.height) {
+                  this.sectionScrollFlag = false
+                } else {
+                  this.sectionScrollFlag = true
+                  const containerBaseHeight = systemInfo.safeArea.height - data.bottom
+                  this.sectionScrollViewStyle.height = (containerBaseHeight - navBarHeight) + systemInfo.statusBarHeight - uni.upx2px(75) + 'px'
+                }
+              }).exec()
+            } else {
+              if (!this.noDemo) {
+                uni.createSelectorQuery().in(this).select('.demo-container').boundingClientRect(data => {
+                  if (data.bottom >= systemInfo.safeArea.height) {
+                    this.sectionScrollFlag = false
+                  } else {
+                    this.sectionScrollFlag = true
+                    const containerBaseHeight = systemInfo.safeArea.height - data.bottom
+                    this.sectionScrollViewStyle.height = (containerBaseHeight - navBarHeight) + systemInfo.statusBarHeight - uni.upx2px(75) + 'px'
+                  }
+                }).exec()
+              } else {
+                this.sectionScrollFlag = false
+              }
+            }
+            
+          }
+        })
+      },
+      // 更新选项滑动容器的高度
+      updateSectionScrollView() {
+        this.$nextTick(() => {
+          this.initSectionScrollView()
+        })
+      },
+      // 获取各个模式tab的节点信息
+      getModeTabsInfo() {
+        let view = uni.createSelectorQuery().in(this)
+        for (let i = 0; i < this.sectionModeListInfos.length; i++) {
+          view.select('.mode-switch-item-' + i).boundingClientRect()
+        }
+        view.exec(res => {
+          // 如果没有获取到，则重新获取
+          if (!res.length) {
+            setTimeout(() => {
+              this.getModeTabsInfo()
+            }, 10)
+            return
+          }
+          // 将每个模式的宽度放入list中
+          res.map((item, index) => {
+            this.sectionModeListInfos[index].width = item.width
+          })
+          // 初始化滑块的宽度
+          this.modeSwitchSliderStyle.width = this.sectionModeListInfos[0].width + 'px'
+
+          // 初始化滑块的位置
+          this.modeSliderPosition()
+        })
+      },
+      // 设置模式滑块的位置
+      modeSliderPosition() {
+        let left = 0
+        // 计算当前所选模式选项到组件左边的距离
+        this.sectionModeListInfos.map((item, index) => {
+          if (index < this.modeIndex) left += item.width
+        })
+
+        this.modeSwitchSliderStyle.left = left + 'px'
+      },
+      // 切换模式
+      switchMode(index) {
+        // 不允许点击当前激活的选项
+        if (index === this.modeIndex) return
+        this.modeIndex = index
+        this.modeSliderPosition()
+        this.updateSectionBtns()
+        this.$emit('modeClick', {
+          index: index
+        })
+      },
+      // 点击内容提示信息
+      demoTipsClick() {
+        this.showContentTips = !this.showContentTips
+      },
+      // 初始化被选中选项按钮
+      initSectionBtns() {
+        this.sectionIndex = []
+        this.sectionIndex = this.sectionList.map((item) => {
+          if (item.hasOwnProperty('section') && item.section.length > 0) {
+            return Array(item.section.length).fill({
+              value: 0,
+              change: false
+            })
+          } else {
+            return []
+          }
+        })
+        
+        this._sectionList = this.$tn.deepClone(this.sectionList)
+        // 给本地选项按钮列表给默认show属性
+        this._sectionList.map((item) => {
+          const section = item.section.map((section_item) => {
+            if (!section_item.hasOwnProperty('show')) {
+              section_item.show = true
+            }
+            return section_item
+          })
+          item.section = section
+          return item
+        })
+        
+        // 更新按钮信息
+        this.updateSectionBtns()
+      },
+      // 跟新选项按钮信息
+      updateSectionBtns(sectionIndex = -1, showState = true) {
+        let sectionOptional = this._sectionList[this.modeIndex]['section']
+        this.btnsList = sectionOptional.map((item, index) => {
+          // 判断是否已经修改了对应的值
+          let changeValue = this.sectionIndex[this.modeIndex][index]['change'] || false
+          let currentSectionIndexValue = this.sectionIndex[this.modeIndex][index]['value'] || 0
+          // 取出默认值(如果是已经修改过的选项，则使用之前的选项信息)
+          let indexValue = changeValue ? currentSectionIndexValue : item.hasOwnProperty('current') ? item.current : 0
+          // 取出是否显示当前选项
+          let show = (sectionIndex !== -1 && sectionIndex === index) ? showState : item.hasOwnProperty('show') ? item.show : true
+          // 处理最大最小值
+          if (indexValue < 0) {
+            indexValue = 0
+          }
+          if (indexValue >= item.optional.length) {
+            indexValue = item.optional.length
+          }
+          // this.sectionIndex[this.modeIndex][index]['value'] = indexValue
+          this.$set(this.sectionIndex[this.modeIndex], index, {value: indexValue, change: changeValue})
+          item.show = show
+          return item
+        })
+      },
+      // 更新选项按钮状态信息
+      updateSectionBtnsState(sectionIndex = -1, showState = true) {
+        // 判断sectionIndex是否为数组
+        if (this.$tn.array.isArray(sectionIndex)) {
+          if (sectionIndex.length === 0) {
+            return
+          }
+          sectionIndex = sectionIndex.filter((item) => item >= 0 && item < this.sectionList[this.modeIndex]['section'].length)
+          sectionIndex.map((item) => {
+            this.btnsList[item]['show'] = showState
+            this._sectionList[this.modeIndex]['section'][item]['show'] = showState
+          })
+        } else {
+          if (sectionIndex < 0 || sectionIndex >= this.sectionList[this.modeIndex]['section'].length) {
+            return
+          }
+          // 将按键的对应显示状态设置为对应的状态
+          this.btnsList[sectionIndex]['show'] = showState
+          this._sectionList[this.modeIndex]['section'][sectionIndex]['show'] = showState
+        }
+        
+      },
+      // 更新选项按钮选中信息
+      updateSectionBtnsValue(modeIndex = 0, sectionIndex = -1, value = 0) {
+        if (sectionIndex < 0 || sectionIndex >= this.sectionList[modeIndex]['section'].length) {
+          return
+        }
+        // 如果showState为false则移除对应的选项按钮，否则往对应的位置添加上对应的选项按钮
+        this.sectionIndex[modeIndex][sectionIndex] = {
+          value,
+          change: true
+        }
+      },
+      // 选项按钮点击事件
+      sectionBtnClick(index, sectionIndex) {
+        // if (this.sectionIndex[this.modeIndex][index] === sectionIndex) {
+        //   return
+        // }
+        this.$set(this.sectionIndex[this.modeIndex], index, {value: sectionIndex, change: true})
+        this.$emit('click', {
+          methods: this.btnsList[index]['methods'],
+          index: sectionIndex,
+          name: this.btnsList[index]['optional'][sectionIndex]
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .dynamic-demo {
+    padding-top: 78rpx;
+
+    /* 顶部模式切换start */
+    .mode-switch {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 75rpx;
+      padding: 0 30rpx;
+
+      &__container {
+        position: relative;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        width: 476rpx;
+        height: 62rpx;
+        background-color: #FFFFFF;
+        box-shadow: 0rpx 10rpx 50rpx 0rpx rgba(0, 3, 72, 0.1);
+        border-radius: 31rpx;
+      }
+
+      &__item {
+        flex: 1;
+        height: 62rpx;
+        width: 100%;
+        line-height: 62rpx;
+        text-align: center;
+        font-size: 28rpx;
+        color: $tn-font-sub-color;
+        z-index: 2;
+        transition: all 0.3s;
+
+        &--active {
+          color: #FFFFFF;
+          font-weight: bold;
+        }
+      }
+
+      &__slider {
+        position: absolute;
+        height: 62rpx;
+        border-radius: 31rpx;
+        // background-image: linear-gradient(-86deg, #FF8359 0%, #FFDF40 100%);
+        background-image: linear-gradient(-86deg, #00C3FF 0%, #58FFF5 100%);
+        box-shadow: 1rpx 10rpx 24rpx 0rpx #00C3FF77;
+        z-index: 1;
+        transition: all 0.3s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+      }
+    }
+
+    /* 顶部模式切换end */
+
+    /* 演示内容展示start */
+    .demo-container {
+      min-height: 327rpx;
+      width: calc(100% - 60rpx);
+      background-color: #FFFFFF;
+      box-shadow: 0rpx 10rpx 50rpx 0rpx rgba(0, 3, 72, 0.1);
+      margin: 0 30rpx 5rpx 30rpx;
+      border-radius: 20rpx;
+      position: relative;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      &--full {
+        display: inline-block;
+        padding-bottom: 20rpx;
+        min-height: 0rpx;
+        padding: 10rpx 20rpx 30rpx;
+      }
+
+      .demo {
+        padding-top: 70rpx;
+
+        &__tips {
+          &__icon {
+            position: absolute;
+            top: 20rpx;
+            right: 16rpx;
+            width: 39rpx;
+            height: 39rpx;
+            line-height: 39rpx;
+            font-size: 39rpx;
+
+            .icon {
+              background: linear-gradient(-45deg, #FF8359 0%, #FFDF40 100%);
+              -webkit-background-clip: text;
+              color: transparent;
+              text-shadow: 0rpx 10rpx 10rpx rgba(255, 156, 82, 0.2);
+            }
+          }
+
+          &__content {
+            position: absolute;
+            top: 65rpx;
+            right: 16rpx;
+            font-size: 20rpx;
+            margin-left: 20rpx;
+            word-wrap: normal;
+            display: flex;
+            flex-direction: column;
+            background-color: #E6E6E6;
+            padding: 20rpx;
+            border-radius: 10rpx;
+            transition: transform 0.3s cubic-bezier(0.68, -0.55, 0.265, 1);
+            transform-origin: 0 0;
+            z-index: 999999;
+
+            &--hide {
+              transform: scaleY(0);
+            }
+
+            &--show {
+              transform: scaleY(100%);
+
+              &::after {
+                content: "";
+                width: 0px;
+                height: 0px;
+                border-width: 4px;
+                border-style: solid;
+                border-color: transparent transparent rgba(149, 149, 149, 0.1) transparent;
+                position: absolute;
+                top: -8px;
+                right: 6px;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    /* 演示内容展示end */
+
+    /* 可选项start */
+    .section-container {
+      width: 100%;
+      height: auto;
+      margin-top: 70rpx;
+
+      .section {
+        &__content {
+          margin-top: 70rpx;
+          display: none;
+          
+          &--visible {
+            display: block;
+            
+            &:last-child {
+              padding-bottom: calc(70rpx + env(safe-area-inset-bottom));
+            }
+          }
+
+          &:nth-child(1) {
+            margin-top: 0rpx;
+          }
+
+          &__title {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin: 0 30rpx;
+            text-align: center;
+
+            &__left-line,
+            &__right-line {
+
+              width: 100rpx;
+              height: 2rpx;
+              position: relative;
+            }
+
+            &__left-line {
+              &::after {
+                content: '';
+                background: inherit;
+                width: 12rpx;
+                height: 12rpx;
+                position: absolute;
+                top: -12rpx;
+                right: 0rpx;
+                border-radius: 50%;
+                transform: translateY(50%);
+              }
+            }
+
+            &__right-line {
+              &::after {
+                content: '';
+                background: inherit;
+                width: 12rpx;
+                height: 12rpx;
+                position: absolute;
+                top: -12rpx;
+                left: 0rpx;
+                border-radius: 50%;
+                transform: translateY(50%);
+              }
+            }
+
+            &--text {
+              -webkit-background-clip: text;
+              color: transparent;
+              min-width: 124rpx;
+              height: 30rpx;
+              font-size: 32rpx;
+              line-height: 1;
+              margin: 0 35rpx;
+            }
+          }
+
+          &__btns {
+            width: calc(100% - 60rpx);
+            margin: 0 30rpx;
+            margin-top: 29rpx;
+            padding: 50rpx 30rpx 0rpx 0rpx;
+            background-color: #FFFFFF;
+            box-shadow: 0rpx 10rpx 50rpx 0rpx rgba(0, 3, 72, 0.1);
+            border-radius: 20rpx;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: flex-start;
+            flex-wrap: wrap;
+
+            &__item {
+              max-width: 30%;
+              padding: 17rpx 36rpx;
+              border-radius: 10rpx;
+              margin-bottom: 40rpx;
+              margin-left: 40rpx;
+              position: relative;
+              z-index: 1;
+
+              // &::before {
+              //   content: " ";
+              //   position: absolute;
+              //   top: 10rpx;
+              //   left: 1rpx;
+              //   width: 100%;
+              //   height: 100%;
+              //   background: inherit;
+              //   filter: blur(24rpx);
+              //   opacity: 1;
+              //   z-index: -1;
+              // }
+
+              &__bg {
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+                border-radius: inherit;
+                z-index: -1;
+                opacity: 0;
+                transform: scale(0);
+                transition: all 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+
+                &--active {
+                  opacity: 1;
+                  transform: scale(1);
+                }
+              }
+
+              &--text {
+                font-size: 24rpx;
+                line-height: 1.2em;
+                transition: all 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+                
+                &--active {
+                  color: #FFFFFF;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    /* 可选项end */
+  }
+</style>
diff --git a/libs/components/multiple-options-demo.vue b/libs/components/multiple-options-demo.vue
new file mode 100644
index 0000000..f3644b6
--- /dev/null
+++ b/libs/components/multiple-options-demo.vue
@@ -0,0 +1,147 @@
+<template>
+  <view class="multiple-options">
+    <view class="list">
+      <block v-for="(item, index) in listData" :key="index">
+        <view
+          class="list__item"
+          :class="[`tn-main-gradient-${tuniaoColorList[item.bgColorIndex]}--light`]"
+          @tap="navOptionsPage(item.url)"
+        >
+          <view class="list__content">
+            <view class="list__content__title">{{ item.title }}</view>
+            <view class="list__content__desc">{{ item.desc }}</view>
+          </view>
+          <view class="list__icon">
+            <view class="list__icon__main" :class="[`tn-icon-${item.mainIcon}`, `tn-main-gradient-${tuniaoColorList[item.bgColorIndex]}`]"></view>
+            <view class="list__icon__sub" :class="[`tn-icon-${item.subIcon}`, `tn-main-gradient-${tuniaoColorList[item.bgColorIndex]}`]"></view>
+          </view>
+        </view>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'multiple-options-demo',
+    props: {
+      // 显示的列表数据
+      list: {
+        type: Array,
+        default() {
+          return []
+        }
+      }
+    },
+    data() {
+      return {
+        // 图鸟颜色列表
+        tuniaoColorList: [
+          'red',
+          'purplered',
+          'purple',
+          'bluepurple',
+          'aquablue',
+          'blue',
+          'indigo',
+          'cyan',
+          'teal',
+          'green',
+          'orange',
+          'orangered'
+        ],
+        listData: []
+      }
+    },
+    watch: {
+      list(val) {
+        this.initList()
+      }
+    },
+    created() {
+      this.initList()
+    },
+    methods: {
+      // 初始化列表数据
+      initList() {
+        // 给列表添加背景颜色数据
+        this.listData = this.list.map((item, index) => {
+          item.bgColorIndex = this.getBgNum()
+          item.mainIcon = item?.mainIcon || 'computer-fill'
+          item.subIcon = item?.subIcon || 'share'
+          return item
+        })
+      },
+      // 跳转到对应的选项页面
+      navOptionsPage(url) {
+        uni.navigateTo({
+          url: url
+        })
+      },
+      // 获取酷炫背景随机数
+      getBgNum() {
+        return Math.floor((Math.random() * this.tuniaoColorList.length))
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .list {
+    
+    &__item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+      width: calc(100% - 60rpx);
+      margin: 108rpx 30rpx 0rpx 30rpx;
+      box-shadow: 0rpx 10rpx 50rpx 0rpx rgba(0, 3, 72, 0.1);
+      border-radius: 20rpx;
+    }
+    
+    &__content {
+      flex: 1;
+      // color: $tn-font-color;
+      margin: 34rpx 0rpx 27rpx 37rpx;
+      
+      &__title {
+        font-size: 36rpx;
+        font-weight: bold;
+        margin-bottom: 12rpx;
+      }
+      &__desc {
+        font-size: 28rpx;
+      }
+    }
+    
+    &__icon {
+      flex: 1;
+      margin-right: 26rpx;
+      position: relative;
+      
+      &__main, &__sub {
+        -webkit-background-clip: text;
+        color: transparent;
+        position: absolute;
+        transition: transform 0.25s ease;
+      }
+      
+      &__main {
+        font-size: 200rpx;
+        width: 190rpx;
+        line-height: 200rpx;
+        top: 0;
+        right: 0rpx;
+        transform: translateY(-60%);
+      }
+      &__sub {
+        font-size: 70rpx;
+        top: 0;
+        right: 175rpx;
+        transform: translateY(-5rpx);
+      }
+    }
+  }
+</style>
diff --git a/libs/components/nav-index-button.vue b/libs/components/nav-index-button.vue
new file mode 100644
index 0000000..d626df0
--- /dev/null
+++ b/libs/components/nav-index-button.vue
@@ -0,0 +1,169 @@
+<template>
+  <view class="nav-index-button" :style="{bottom: `${bottom}rpx`, right: `${right}rpx`}" @tap.stop="navIndex">
+    <view class="nav-index-button__content">
+        <view class="nav-index-button__content--icon tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur tn-cool-bg-color-7">
+          <view class="tn-icon-home-vertical-fill"></view>
+        </view>  
+    </view>
+  
+    <view class="nav-index-button__meteor">
+      <view class="nav-index-button__meteor__wrapper">
+        <view v-for="(item,index) in 6" :key="index" class="nav-index-button__meteor__item" :style="{transform: `rotateX(${-60 + (30 * index)}deg) rotateZ(${-60 + (30 * index)}deg)`}">
+          <view class="nav-index-button__meteor__item--pic"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'nav-index-button',
+    props: {
+      // 距离底部的距离
+      bottom: {
+        type: [Number, String],
+        default: 300
+      },
+      // 距离右边的距离
+      right: {
+        type: [Number, String],
+        default: 75
+      },
+      // 首页地址
+      indexPath: {
+        type: String,
+        default: '/pages/index/index'
+      }
+    },
+    methods: {
+      // 跳转回首页
+      navIndex() {
+        // 通过判断当前页面的页面栈信息，是否有上一页进行返回，如果没有则跳转到首页
+        const pages = getCurrentPages()
+        if (pages && pages.length > 0) {
+          const indexPath = this.indexPath || '/pages/index/index'
+          const firstPage = pages[0]
+          if (pages.length == 1 && (!firstPage.route || firstPage.route != indexPath.substring(1, indexPath.length))) {
+            uni.reLaunch({
+              url: indexPath
+            })
+          } else {
+            uni.navigateBack({
+              delta: 1
+            })
+          }
+        } else {
+          uni.reLaunch({
+            url: indexPath
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .nav-index-button {
+    position: fixed;
+    animation: suspension 3s ease-in-out infinite;
+    z-index: 999999;
+    
+    &__content {
+      position: absolute;
+      width: 100rpx;
+      height: 100rpx;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      
+      &--icon {
+        width: 100rpx;
+        height: 100rpx;
+        font-size: 60rpx;
+        border-radius: 50%;
+        margin-bottom: 18rpx;
+        position: relative;
+        z-index: 1;
+        transform: scale(0.85);
+        
+        &::after {
+          content: " ";
+          position: absolute;
+          z-index: -1;
+          width: 100%;
+          height: 100%;
+          left: 0;
+          bottom: 0;
+          border-radius: inherit;
+          opacity: 1;
+          transform: scale(1, 1);
+          background-size: 100% 100%;
+          background-image: url(https://resource.tuniaokj.com/images/cool_bg_image/icon_bg6.png);
+        }
+      }
+    }
+    
+    &__meteor {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      width: 100rpx;
+      height: 100rpx;
+      transform-style: preserve-3d;
+      transform: translate(-50%, -50%) rotateY(75deg) rotateZ(10deg);
+      
+      &__wrapper {
+        width: 100rpx;
+        height: 100rpx;
+        transform-style: preserve-3d;
+        animation: spin 20s linear infinite;
+      }
+      
+      &__item {
+        position: absolute;
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 1000rpx;
+        left: 0;
+        top: 0;
+        
+        &--pic {
+          display: block;
+          width: 100%;
+          height: 100%;
+          background: url(https://resource.tuniaokj.com/images/cool_bg_image/arc3.png) no-repeat center center;
+          background-size: 100% 100%;
+          animation: arc 4s linear infinite;
+        }
+      }
+    }
+  }
+  
+  
+  @keyframes suspension {
+    0%, 100% {
+      transform: translateY(0);
+    }
+    50% {
+      transform: translateY(-0.8rem);
+    }
+  }
+  
+  @keyframes spin {
+    0% {
+      transform: rotateX(0deg);
+    }
+  
+    100% {
+      transform: rotateX(-360deg);
+    }
+  }
+  
+  @keyframes arc {
+    to {
+      transform: rotate(360deg);
+    }
+  }
+</style>
diff --git a/libs/mixin/dynamic_demo_mixin.js b/libs/mixin/dynamic_demo_mixin.js
new file mode 100644
index 0000000..66ff992
--- /dev/null
+++ b/libs/mixin/dynamic_demo_mixin.js
@@ -0,0 +1,52 @@
+/**
+ * 动态参数演示mixin
+ */
+module.exports = {
+  data() {
+    return {
+      // 效果显示框top的值
+      contentContainerTop: '0px',
+      contentContainerIsTop: false,
+      
+      // 参数显示框top的值
+      sectionContainerTop: '0px'
+    }
+  },
+  onReady() {
+    this.updateSectionContainerTop()
+  },
+  methods: {
+    // 处理演示效果框的位置
+    async _handleContentConatinerPosition() {
+      // 获取效果演示框的节点信息
+      const contentContainer = await this._tGetRect('#content_container')
+      // 获取参数框的节点信息
+      this._tGetRect('#section_container').then((res) => {
+        // 判断参数框是否在移动，如果是则更新效果框的位置
+        // 如果效果框的顶部已经触控到顶部导航栏就停止跟随
+        if (res.top - contentContainer.bottom != 15) {
+          const newTop = res.top - (contentContainer.height + uni.upx2px(20))
+          const minTop = this.vuex_custom_bar_height + 1
+          if (newTop < minTop) {
+            this.contentContainerTop = minTop + 'px'
+            this.contentContainerIsTop = true
+          } else {
+            this.contentContainerTop = newTop + 'px'
+            this.contentContainerIsTop = false
+          }
+        }
+      })
+    },
+    // 更新状态切换栏位置信息
+    updateSectionContainerTop() {
+      this._tGetRect('#content_container').then((res) => {
+        this.contentContainerTop = (this.vuex_custom_bar_height + 148) + 'px'
+        this.sectionContainerTop = (res.height + 20) + 'px'
+      })
+    }
+  },
+  // 监听页面滚动
+  onPageScroll() {
+    this._handleContentConatinerPosition()
+  }
+}
diff --git a/libs/mixin/template_page_mixin.js b/libs/mixin/template_page_mixin.js
new file mode 100644
index 0000000..2314549
--- /dev/null
+++ b/libs/mixin/template_page_mixin.js
@@ -0,0 +1,60 @@
+/**
+ * 演示页面mixin
+ */
+module.exports = {
+  data() {
+    return {
+      
+    }
+  },
+  onLoad() {
+    // 更新顶部导航栏信息
+    this.updateCustomBarInfo()
+  },
+  methods: {
+    // 点击左上角返回按钮时触发事件
+    goBack() {
+      // 通过判断当前页面的页面栈信息，是否有上一页进行返回，如果没有则跳转到首页
+      const pages = getCurrentPages()
+      if (pages && pages.length > 0) {
+        const firstPage = pages[0]
+        if (pages.length == 1 && (!firstPage.route || firstPage.route != 'pages/index/index')) {
+          uni.reLaunch({
+            url: '/pages/index/index'
+          })
+        } else {
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+      } else {
+        uni.reLaunch({
+          url: '/pages/index/index'
+        })
+      }
+    },
+    // 更新顶部导航栏信息
+    async updateCustomBarInfo() {
+      // 获取vuex中的自定义顶栏的高度
+      let customBarHeight = this.vuex_custom_bar_height
+      let statusBarHeight = this.vuex_status_bar_height
+      // 如果获取失败则重新获取
+      if (!customBarHeight) {
+        try {
+          const navBarInfo = await this.$tn.updateCustomBar()
+          customBarHeight = navBarInfo.customBarHeight
+          statusBarHeight = navBarInfo.statusBarHeight
+        } catch(e) {
+          setTimeout(() => {
+            this.updateCustomBarInfo()
+          }, 10)
+          return
+        }
+      }
+      
+      // 更新vuex中的导航栏信息
+      this.$tn.vuex('vuex_status_bar_height', statusBarHeight)
+      this.$tn.vuex('vuex_custom_bar_height', customBarHeight)
+    }
+  }
+}
\ No newline at end of file
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..56802cb
--- /dev/null
+++ b/main.js
@@ -0,0 +1,30 @@
+import App from './App'
+import store from './store'
+
+import Vue from 'vue'
+Vue.config.productionTip = false
+App.mpType = 'app'
+
+// 引入全局TuniaoUI
+import TuniaoUI from 'tuniao-ui'
+Vue.use(TuniaoUI)
+
+// 引入TuniaoUI提供的vuex简写方法
+let vuexStore = require('@/store/$tn.mixin.js')
+Vue.mixin(vuexStore)
+
+// 引入TuniaoUI对小程序分享的mixin封装
+let mpShare = require('tuniao-ui/libs/mixin/mpShare.js')
+Vue.mixin(mpShare)
+
+import {
+	wxshare
+} from "util/jwexin.js"
+Vue.prototype.$wxshare = wxshare;
+
+const app = new Vue({
+	store,
+	...App
+})
+
+app.$mount()
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..3d82a88
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,105 @@
+{
+    "name" : "洛阳市青年户外协会掌上云册",
+    "appid" : "__UNI__9541BC8",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "share" : {}
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx51c40ff1c6337652",
+        "setting" : {
+            "urlCheck" : true,
+            "minified" : true,
+            "postcss" : true
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2",
+    // "h5" : {
+    //     "router" : {
+    //         "base" : ""
+    //     },
+    //     "template" : ""
+    // }
+    "h5" : {
+        "router" : {
+            "mode" : "hash", // 或 "history"（需要服务器支持）
+            "base" : "/h5/"
+        },
+        "publicPath" : "./", // 静态资源路径
+        "template" : "template.h5.html" // 自定义模板
+    }
+	
+	// "h5" : {
+	//     "devServer" : {
+	//         "proxy" : {
+	//             "/api" : {
+	//                 "target" : "https://ysx.0rui.cn",
+	//                 "changeOrigin" : true,
+	//                 "secure" : false,
+	//                 "pathRewrite" : {
+	//                     "^/api" : ""
+	//                 }
+	//             }
+	//         }
+	//     }
+	// }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..e35ba5b
--- /dev/null
+++ b/package.json
@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "browserslist": "^4.25.0",
+    "caniuse-lite": "^1.0.30001723",
+    "jweixin-module": "^1.6.0"
+  }
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..b8f5712
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,278 @@
+{
+	"easycom": {
+		"^tn-(.*)": "@/tuniao-ui/components/tn-$1/tn-$1.vue"
+	},
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+			}
+		},
+		{
+			"path": "pages/webview",
+			"style": {
+				"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+			}
+		},
+		{
+			"path": "pages/index/home",
+			"style": {
+				"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+			}
+		},
+		{
+			"path": "pages/index/service",
+			"style": {
+				"navigationBarTitleText": "洛阳市青年户外协会掌上云册",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/index/news",
+			"style": {
+				"navigationBarTitleText": "洛阳市青年户外协会掌上云册",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/index/pizz",
+			"style": {
+				"navigationBarTitleText": "洛阳市青年户外协会掌上云册",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/index/pizz_info",
+			"style": {
+				"navigationBarTitleText": "洛阳市青年户外协会掌上云册",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/index/user",
+			"style": {
+				"navigationBarTitleText": "洛阳市青年户外协会掌上云册",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/index/directory",
+			"style": {
+				"navigationBarTitleText": "洛阳市青年户外协会掌上云册",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/index/web",
+			"style": {
+				"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+			}
+		},
+		{
+			"path": "pages/index/search",
+			"style": {
+				"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+			}
+		}
+	],
+	"subPackages": [{
+		"root": "pages/packageA",
+		"pages": [{
+				"path": "info/discovery",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "info/joinUs",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "info/policy",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "info/policy_info",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "info/policy_list",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/apply_in",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/events_my",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_apply",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_card",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_card_holder",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_desc",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_edit",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_idea",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_invite",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_msg",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_sign",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/user_activity",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/user_auditing",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/user_auditing_info",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_vip",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_vip_info",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_vip_clerk",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "user/my_vip_off",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			}
+		]
+	}, {
+		"root": "pages/packageB",
+		"pages": [{
+				"path": "event/event_info",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			}, {
+				"path": "news/new_info",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path": "news/notice_info",
+				"style": {
+					"navigationBarTitleText": "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path" : "ask/index",
+				"style" : 
+				{
+					"navigationBarTitleText" : "洛阳市青年户外协会掌上云册",
+					"backgroundColor": "#F5F5F5"
+				}
+			},
+			{
+				"path" : "ask/add",
+				"style" : 
+				{
+					"navigationBarTitleText" : "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path" : "ask/info",
+				"style" : 
+				{
+					"navigationBarTitleText" : "洛阳市青年户外协会掌上云册"
+				}
+			},
+			{
+				"path" : "ask/user_list",
+				"style" : 
+				{
+					"navigationBarTitleText" : "洛阳市青年户外协会掌上云册"
+				}
+			}
+		]
+	}],
+	"globalStyle": {
+		"navigationStyle": "custom",
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
+	},
+	"uniIdRouter": {}
+}
\ No newline at end of file
diff --git a/pages/index/directory.vue b/pages/index/directory.vue
new file mode 100644
index 0000000..800e05a
--- /dev/null
+++ b/pages/index/directory.vue
@@ -0,0 +1,489 @@
+<template>
+	<!-- 通讯录页面 -->
+	<view style="background-color: #EBF4F7;letter-spacing: 1rpx;" @touchmove="preventTouchMove">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:HomeTitle+'通讯录'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="30"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+
+			<!-- <view class="tn-flex tn-flex-col-center tn-flex-row-between" @click="selectShow= true"
+				style="padding: 30rpx;">
+				<view>
+					<text>{{HomeTitle}}</text>
+					<text class="tn-icon-down-triangle"></text>
+				</view>
+				<view>
+					<text>筛选</text>
+				</view>
+			</view> -->
+		</view>
+		<view>
+			<!-- <view class="tn-flex tn-flex-row-between tn-flex-col-center" style="padding: 0px 30rpx;height: 140rpx;"> -->
+			<view class="tn-flex tn-flex-row-between tn-flex-col-center" style="padding: 0px 30rpx;height: 40rpx;">
+				<!--<view class="justify-content-item align-content-item" style="width: 100%;">
+					<view class="tn-flex tn-flex-col-center"
+						style="border-radius: 100rpx;padding: 10rpx 20rpx 10rpx 20rpx;width: 95%;background-color: #ffffff;">
+						<text
+							class="tn-icon-search justify-content-item tn-padding-right-xs tn-color-gray tn-text-lg"></text>
+						<input v-model="serach_content" class="justify-content-item" placeholder="会员姓名/手机号" name="input"
+							placeholder-style="color:#AAAAAA" style="width: 90%;"></input>
+					</view>
+				</view>
+				 <view class="align-content-item">
+					<view class="justify-content-item tn-text-center">
+						<tn-button @click="serach_do" backgroundColor="#3668fc" shape="round" padding="20rpx 20rpx"
+							width="150rpx">
+							<text class="tn-color-white">搜 索</text>
+						</tn-button>
+
+					</view>
+				</view> -->
+			</view>
+		</view>
+		<view class="tn-classify__container">
+
+			<view class="tn-classify__container__wrap tn-flex tn-flex-nowrap tn-flex-row-around"
+				:style="{backgroundColor:'#EBF4F7',height:my_page+'px'}">
+				<!-- 左边容器 -->
+				<scroll-view scroll-y class="tn-classify__left-box left-width">
+					<view v-for="(item, index) in industry_list" :key="index" :id="`tabbar_item_${index}`"
+						style="padding-left: 20rpx;" class="tn-classify__tabbar__item tn-flex tn-flex-col-center"
+						:class="[tabbarItemClass(index)]" @tap.stop="clickClassifyNav(index)">
+						<view class="tn-classify__tabbar__item__title">{{ item.industry_name }}</view>
+					</view>
+				</scroll-view>
+
+				<!-- 右边容器 -->
+				<scroll-view class="tn-classify__right-box" @scroll="getScroll" :scroll-top="top" scroll-y
+					style="width: 72%">
+					<block>
+						<view class="tn-classify__content">
+							<!-- 分类内容子栏目 -->
+							<view class="tn-classify__content__sub-classify__content " style="padding-bottom: 120rpx;">
+								<view v-for="(item,index) in list" :key="index">
+									<view v-if="item.neirong"
+										style="font-weight: 300;;background-color: #EBF4F7;color:#4AA2EF;width: 100%;height: 60rpx;line-height: 60rpx;text-align: center;">
+										{{item.position_name}}
+									</view>
+									<view v-if="item.neirong" v-for="(v,k) in item.neirong"
+										@click="tn('/pages/packageA/user/my_card?id='+v.member_id)"
+										class="tn-classify__content__sub-classify__content__item tn-flex tn-flex-center  tn-flex-col-center">
+										<!-- 标题，有需要可以显示出来 -->
+										<view style="width: 100rpx;height: 100rpx">
+											<image v-if="v.gender == 1" src="https://ysx.0rui.cn/h5/static/man.png"
+												style="width: 100rpx;height: 100rpx;border-radius:50%;">
+											</image>
+											<image v-else src="https://ysx.0rui.cn/h5/static/weman.png"
+												style="width: 100rpx;height: 100rpx;border-radius:50%;">
+											</image>
+											<!-- <image v-if="v.gender == 1" src="@/static/man.png"
+												style="width: 100rpx;height: 100rpx;border-radius:50%;">
+											</image>2
+											<image v-else src="@/static/weman.png"
+												style="width: 100rpx;height: 100rpx;border-radius:50%;">
+											</image> -->
+											 <!-- <image v-else :src="apiImgUrl+v.photo_image"
+												style="width: 100rpx;height: 100rpx;border-radius:50%;">
+											</image> -->
+										</view>
+										<view style="margin-left: 20rpx;">
+											<view style="font-size: 28rpx;">
+												<text>{{v.nikename}}</text>
+												<text
+													style="margin-left: 50rpx;">{{v.nation==null||v.nation==''?'':v.nation}}</text>
+											</view>
+											<view class="tn-text-ellipsis-2"
+												style="font-size: 24rpx;margin-top: 10rpx;">
+												<text>{{v.enterprise_name==null?'':v.enterprise_name}}</text>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view v-if="list.length==0" style="text-align: center;padding: 20rpx">
+									暂无
+								</view>
+							</view>
+						</view>
+					</block>
+				</scroll-view>
+			</view>
+		</view>
+		<!--		<view @click="tn('/pages/index/apply_in')" style="line-height: 40rpx;text-align: center;position: fixed;bottom:15%;right: 20rpx;width: 120rpx;height: 120rpx;border-radius: 50%;background: linear-gradient(270deg, #EE7E45, #EE9657);-->
+		<!--box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.2);">-->
+		<!--			<view style="color: #fff;letter-spacing: 2rpx;padding: 20rpx;font-size: 32rpx;">申请入会-->
+		<!--			</view>-->
+		<!--		</view>-->
+		<!-- <tn-select :safeAreaInsetBottom="true" v-model="selectShow" mode="single" :list="selectList"
+			@confirm="confirm"></tn-select> -->
+	</view>
+</template>
+
+<script>
+	import {
+		addressList,
+		associationIndex,
+		newIndustryIndex
+	} from '@/util/api.js';
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				serach_content: '',
+				list: [],
+				topCurrent: 0,
+				tabbarIndex: 0,
+				// 分类菜单item的信息
+				tabbarItemInfo: [],
+				// scrollView的top值
+				scrollViewBasicTop: 0,
+				// scrollView的高度
+				scrollViewHeight: 0,
+				// 左边scrollView的滚动高度
+				leftScrollViewTop: 0,
+				// 右边scrollView的滚动高度
+				rightScrollViewTop: 0,
+				// 当前选中的tabbar序号
+				currentTabbarIndex: 0,
+				apiImgUrl: this.$store.state.imgUrl,
+				industry_list: [],
+				leftId: 0,
+				selectShow: false,
+				HomeTitle: '',
+				selectList: [],
+				gid: store.state.Gid,
+				gname: '',
+				top: 0,
+				my_page: 0
+			}
+		},
+		computed: {
+			tabbarItemClass() {
+				return index => {
+					if (index === this.currentTabbarIndex) {
+						return 'tn-classify__tabbar__item--active tn-bg-white'
+					} else {
+						let clazz = ''
+						if (this.currentTabbarIndex > 0 && index === this.currentTabbarIndex - 1) {
+							clazz += ' tn-classify__tabbar__item--active--prev'
+						}
+						if (this.currentTabbarIndex < this.industry_list.length && index === this.currentTabbarIndex +
+							1) {
+							clazz += ' tn-classify__tabbar__item--active--next'
+						}
+						return clazz
+					}
+				}
+			}
+		},
+		onLoad(d) {
+			console.log(d.id);
+			if (typeof(d.id) != 'undefined') {
+				this.gid = d.id;
+			}
+			this.getIndustryList();
+			this.getAssociationIndex();
+
+		},
+		methods: {
+			preventTouchMove() {
+
+			},
+			serach_do() {
+				this.list = [];
+				this.leftId = 0;
+				this.currentTabbarIndex = 0;
+				console.log(this.leftId);
+				this.getAddressList();
+			},
+			getScroll(d) {
+				this.top = d.scrollTop;
+			},
+			onload() {
+				console.log(this.gid);
+				console.log(store.state.Gid);
+				if (this.gid == store.state.Gid && this.list.length > 0) {
+					return;
+				}
+				this.currentTabbarIndex = 0;
+				this.gid = store.state.Gid;
+				this.gname = store.state.Gname;
+				this.getIndustryList();
+				this.getAssociationIndex();
+				const key = uni.getSystemInfoSync();
+				const kk = uni.getWindowInfo();
+				console.log(kk);
+				var c = this.sizeDeal(120);
+				var s = this.sizeDeal(140);
+				this.my_page = parseInt(key.windowHeight) - parseInt(store.state.vuex_custom_bar_height) - parseInt(s) -
+					parseInt(c) - parseInt(key.safeAreaInsets.bottom);
+				console.log(parseInt(key.windowHeight));
+					console.log(parseInt(store.state.vuex_custom_bar_height));
+					console.log(parseInt(s));
+					console.log(parseInt(c));
+					console.log(parseInt(c));
+					
+			},
+			confirm(d) {
+				var info = d[0];
+				this.list = [];
+				this.gid = info.value;
+				this.getAssociationIndex();
+				this.getIndustryList();
+			},
+			getAssociationIndex() {
+				associationIndex()
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							const transformedSelectList = key.map(item => ({
+								value: item.id,
+								label: item.association_name
+							}));
+							const foundNumber = transformedSelectList.find((element) => element.value == this.gid);
+							this.HomeTitle = foundNumber.label;
+							this.selectList = transformedSelectList;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getIndustryList() {
+				newIndustryIndex({
+						association_id: this.gid
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.industry_list = res.data;
+							// this.industry_list.push({
+							// 	id: -1,
+							// 	industry_name: '其他行业'
+							// });
+							// this.industry_list.unshift({
+							// 	id: 0,
+							// 	industry_name: '组织架构'
+							// });
+							this.leftId = res.data[0].id;
+							uni.showLoading({
+								title: '加载中...'
+							});
+							this.getAddressList();
+						} else {
+							this.industry_list = [];
+							this.list = [];
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getAddressList() {
+				addressList({
+						position_id: 0,
+						association_id: this.gid,
+						industry_id: this.leftId,
+						// industry_id: 1,
+						nikename: this.serach_content
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.list = res.data.ret;
+						}
+						setTimeout(function() {
+							uni.hideLoading();
+						}, 2000);
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			clickClassifyNav(index) {
+				uni.showLoading({
+					title: '加载中...'
+				});
+				this.currentTabbarIndex = index;
+				this.leftId = this.industry_list[index].id;
+				this.list = [];
+				this.top = this.randomBetween();
+				this.getAddressList();
+				//this.handleLeftScrollView(index)
+				//this.switchClassifyContent();
+			},
+			randomBetween() {
+				let baseRandom = Math.random() * (0.99999 - 0.00001) + 0.00001;
+				return baseRandom.toFixed(5); //
+			},
+			// 点击分类后，处理scrollView滚动到居中位置
+			handleLeftScrollView(index) {
+				const tabbarItemTop = this.tabbarItemInfo[index].top - this.scrollViewBasicTop
+				if (tabbarItemTop > this.scrollViewHeight / 2) {
+					this.leftScrollViewTop = tabbarItemTop - (this.scrollViewHeight / 2) + this.tabbarItemInfo[index]
+						.height
+				} else {
+					this.leftScrollViewTop = 0
+				}
+			},
+			// 切换对应分类的数据
+			switchClassifyContent() {
+				this.rightScrollViewTop = 1
+				this.$nextTick(() => {
+					this.rightScrollViewTop = 0
+				})
+				//this.classifyContent.subClassify[0].title = this.tabbar[this.currentTabbarIndex]
+			},
+			tn(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			sizeDeal(size) {
+
+				// 使用uni.upx2px进行转换
+				const pxValue = uni.upx2px(size);
+
+				return pxValue;
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss" scoped>
+	/* 自定义导航栏内容 start */
+	.custom-nav {
+		height: 100%;
+
+		&__back {
+			margin: auto 30rpx;
+			margin-right: 10rpx;
+			flex-basis: 5%;
+			width: 100rpx;
+			position: absolute;
+		}
+	}
+
+
+	.left-width {
+		flex-basis: 28%;
+	}
+
+	/* 自定义导航栏内容 end */
+	.tn-classify {
+
+		/* 搜索栏 start */
+
+
+		/* 搜索栏 end */
+
+		/* 分类列表和内容 strat */
+		&__container {}
+
+		&__left-box {}
+
+		&__right-box {
+			background-color: #FFFFFF;
+		}
+
+		/* 分类列表和内容 end */
+
+		/* 侧边导航 start */
+		&__tabbar {
+			&__item {
+				height: 90rpx;
+
+				&:first-child {
+					border-top-right-radius: 0rpx;
+				}
+
+				&:last-child {
+					border-bottom-right-radius: 0rpx;
+				}
+
+				&--active {
+					background-color: #FFFFFF;
+					position: relative;
+					// font-weight: bold;
+					color: #4AA2EF;
+
+					&--prev {
+						border-bottom-right-radius: 26rpx;
+					}
+
+					&--next {
+						border-top-right-radius: 26rpx;
+					}
+				}
+			}
+		}
+
+		/* 侧边导航 end */
+
+		/* 分类内容 start */
+		&__content {
+			margin: 18rpx;
+
+			/* 推荐商品 start */
+			&__recomm {
+				margin-bottom: 40rpx;
+
+				&__swiper {}
+			}
+
+			/* 推荐商品 end */
+
+			/* 子栏目 start */
+			&__sub-classify {
+				margin-bottom: 20rpx;
+				padding-bottom: 40rpx;
+
+				&--title {
+					font-weight: bold;
+					margin-bottom: 18rpx;
+
+				}
+
+				&__content {
+
+					&__item {
+						padding: 20rpx;
+					}
+				}
+			}
+
+			/* 子栏目 end */
+		}
+
+		/* 分类内容 end */
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/home.vue b/pages/index/home.vue
new file mode 100644
index 0000000..d2e4da6
--- /dev/null
+++ b/pages/index/home.vue
@@ -0,0 +1,808 @@
+<template>
+	<view style="background-color: rgb(235, 244, 247);">
+		<tn-nav-bar :isBack="false" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;width: 100%;">
+					<!-- <tn-tabs :list="[{name:'智慧云商协'}]" :current="topCurrent" activeColor="#000" :bold="false"
+            :fontSize="36"></tn-tabs> -->
+					<view style="text-align: center;font-size: 32rpx;" @click="selectShow = true">
+						<text>{{ HomeTitle }}</text>
+						<!--						<image src="/static/c1455.png" style="width: 25rpx;height: 25rpx;margin-left: 10rpx;"></image>-->
+					</view>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-between" style="padding-top: 30rpx;">
+				<view class="tn-color-gray--dark"
+					style="width: 100%;margin: 0rpx 30rpx 0 30rpx;border-radius: 100rpx;padding-left: 6rpx;background-color: #ffffff;"
+					@click="openUrl('/pages/index/search')">
+					<tn-notice-bar :list="searlist" mode="vertical" leftIconName="search"
+						:duration="6000"></tn-notice-bar>
+				</view>
+				<view class="tn-flex" style="margin:0px 30rpx 0rpx 0rpx;">
+					<tn-button @click="openUrl('/pages/index/search')" backgroundColor="#ffffff" fontColor="#666666"
+						shape="round" width="140rpx" height="70rpx">搜索
+					</tn-button>
+
+					<!--					<image @click="openUrl('/pages/index/my_assist')" src="/static/t1.png"-->
+					<!--						style="width: 35rpx;height: 35rpx;"></image>-->
+					<!--					<view style="position: relative;">-->
+					<!--						<image @click="openUrl('/pages/index/my_msg')" src="/static/t2.png"-->
+					<!--							style="width: 35rpx;height: 35rpx;margin-left: 40rpx;"></image>-->
+					<!--						<tn-badge v-if="msg()>0" style="position: absolute;top: -20rpx;right: -20rpx;"-->
+					<!--							backgroundColor="#E83A30" fontColor="#ffffff">{{msg()}}</tn-badge>-->
+					<!--					</view>-->
+				</view>
+			</view>
+
+			<view style="margin-top: 20rpx;">
+				<swiper class="card-swiper" style="height: 365rpx" current="0" mode="dot" :circular="true"
+					duration="500" interval="5000" @change="cardSwiper" :autoplay="true">
+					<swiper-item style="padding: 0px 28rpx;height: 365rpx;border-radius: 15rpx;"
+						v-for="(item,index) in carousel_list" :key="index" :class="cardCur==index?'cur':''">
+						<video :muted="true" v-if="item.type==2" id="myVideo" :src="apiImgUrl+item.image"
+							:controls="false" loop autoplay object-fit="contain"
+							style="width: 100%;border-radius: 15rpx;height: 100%;" @error="videoErrorCallback"></video>
+						<image v-if="item.type==1" :src="apiImgUrl+item.image" mode="aspectFit"
+							style="width: 100%;height: 365rpx;border-radius: 15rpx;">
+						</image>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="indication">
+				<block v-for="(item,index) in carousel_list" :key="index">
+					<view class="spot" :class="cardCur==index?'active':''"></view>
+				</block>
+			</view>
+		</view>
+		<view style="padding: 0px 30rpx;margin-bottom: 20rpx;">
+			<view style="background-color: #FFF;border-radius: 16rpx;">
+				<cc-noticeBar :noticeList="noticeList" colors="#000000" @click="itemClick"></cc-noticeBar>
+			</view>
+		</view>
+		<view style="background-color: #FFF;border-radius: 18rpx;margin: 25rpx;">
+			<tn-grid align="center" :col="4">
+				<tn-grid-item style="width: 25%" @click="openUrl('/pages/index/pizz_info?id='+association_id)">
+					<view style="padding: 30rpx;text-align: center;">
+						<image src="/static/h1.png" style="width: 100rpx;height: 100rpx;"></image>
+						<view style="font-size: 28rpx;font-weight: normal;margin-top: 10rpx;">协会简介</view>
+					</view>
+				</tn-grid-item>
+				<tn-grid-item style="width: 25%" @click="openUrl('/pages/index/news')">
+					<view style="padding: 30rpx;text-align: center;">
+						<image src="/static/h2.png" style="width: 100rpx;height: 100rpx;"></image>
+						<!-- <view style="font-size: 28rpx;font-weight: normal;margin-top: 10rpx;">协会活动</view> -->
+						<view style="font-size: 28rpx;font-weight: normal;margin-top: 10rpx;">协会新闻</view>
+					</view>
+				</tn-grid-item>
+				<tn-grid-item style="width: 25%" @click="openUrl('/pages/packageA/info/joinUs')">
+					<view style="padding: 32rpx 30rpx;text-align: center;">
+						<image src="/static/joinus.png" style="width: 100rpx;height: 100rpx;"></image>
+						<view style="font-size: 28rpx;font-weight: normal;margin-top: 10rpx;">加入我们</view>
+					</view>
+				</tn-grid-item>
+				<tn-grid-item style="width: 25%" @click="openMiniProgramLink()">
+					<view style="padding: 32rpx 30rpx;text-align: center;">
+						<image src="/static/diverseYouth.png" style="width: 100rpx;height: 100rpx;"></image>
+						<view style="font-size: 28rpx;font-weight: normal;margin-top: 12rpx;">多样青春</view>
+					</view>
+				</tn-grid-item>
+				<!-- <button style="width: 25%;background-color: #ffffff;" @click="openMiniProgramLink">
+					<view style="padding: 32rpx 30rpx;text-align: center;">
+						<image src="/static/diverseYouth.png" style="width: 100rpx;height: 100rpx;position: relative;top: 34rpx;"></image>
+						<view style="font-size: 28rpx;font-weight: normal;margin-top: 8rpx;">多样青春</view>
+					</view>
+				</button> -->
+				
+				<web-view 
+				      v-if="showWebView" 
+				      :src="miniProgramUrl" 
+				      @message="handleWebViewMessage()"
+				    ></web-view>
+			</tn-grid>
+		</view>
+		<!-- <view class="tn-flex tn-flex-row-between tn-flex-col-center tn-flex-row-center" style="padding: 0px 28rpx;">
+			<view @click="openUrl('/pages/index/pizz_info?id='+association_id)"
+				style="position:relative;padding: 20rpx;border-radius: 16rpx;height: 270rpx;width: 100%;background: linear-gradient(275.57deg, rgba(193, 237, 217, 1) 1.39%, rgba(188, 237, 216, 1) 112.49%);">
+				<view style="font-size: 32rpx">协会简介</view>
+				<view style="font-size: 22rpx;margin-top: 10rpx">Association introduction</view>
+				<image src="/static/48098165.png"
+					style="width: 150rpx;height: 150rpx;position: absolute; right: 10rpx;bottom: 0;"></image>
+			</view>
+			<view style="width: 100%;margin-left: 20rpx">
+				<view @click="openUrl('/pages/index/service?type='+1)"
+					style=" position:relative;padding: 20rpx;border-radius: 16rpx;height: 130rpx;background: linear-gradient(96.63deg, rgba(189, 224, 249, 1) 11.78%, rgba(205, 233, 251, 1) 103.76%);">
+					<view style="font-size: 32rpx">协会活动</view>
+					<view style="font-size: 22rpx;margin-top: 10rpx">Offline events</view>
+					<image src="/static/48098164.png"
+						style="width: 90rpx;height: 90rpx;position: absolute; right: 10rpx;bottom: 0;"></image>
+				</view>
+				<view @click="openUrl('/pages/index/service?type='+3)"
+					style="position:relative;margin-top: 10rpx;padding: 20rpx;border-radius: 16rpx;height: 130rpx;background: linear-gradient(279.38deg, rgba(246, 217, 197, 1) -5.05%, rgba(245, 209, 189, 1) 121.63%);">
+					<view style="font-size: 32rpx">公益捐赠</view>
+					<view style="font-size: 22rpx;margin-top: 10rpx">Public donations</view>
+					<image src="/static/48098162.png"
+						style="width: 90rpx;height: 90rpx;position: absolute; right: 10rpx;bottom: 0;"></image>
+				</view>
+			</view>
+		</view> -->
+		<!-- <view class="tn-flex tn-flex-row-between tn-flex-col-center tn-flex-row-center"
+			style="padding: 0px 28rpx;margin-top: 10rpx">
+			<view @click="openUrl('/pages/index/service?type='+2)"
+				style="position:relative;padding: 20rpx;border-radius: 16rpx;height: 130rpx;width: 100%;background: linear-gradient(280.64deg, rgba(251, 236, 198, 1) 0%, rgba(248, 225, 183, 1) 117.05%);">
+				<view style="font-size: 32rpx">调查问卷</view>
+				<view style="font-size: 22rpx;margin-top: 10rpx">Questionnaires</view>
+				<image src="/static/48098160.png"
+					style="width: 90rpx;height: 90rpx;position: absolute; right: 10rpx;bottom: 0;"></image>
+			</view>
+			<view style="width: 100%;margin-left: 20rpx">
+				<view @click="openUrl('/pages/index/service?type='+4)"
+					style="position:relative;padding: 20rpx;border-radius: 16rpx;height: 130rpx;background: linear-gradient(96.63deg, rgba(226, 228, 245, 1) 11.78%, rgba(234, 236, 255, 1) 103.76%);">
+					<view style="font-size: 32rpx">学习培训</view>
+					<view style="font-size: 22rpx;margin-top: 10rpx">Learn and train</view>
+					<image src="/static/48098163.png"
+						style="width: 90rpx;height: 90rpx;position: absolute; right: 10rpx;bottom: 0;"></image>
+				</view>
+			</view>
+		</view> -->
+		<!-- <view class="tn-flex tn-flex-row-between tn-flex-col-center tn-flex-row-center"
+			style="padding: 0px 28rpx;margin-top: 10rpx">
+			<view @click="openUrl('/pages/packageA/info/policy')"
+				style="position:relative;padding: 20rpx;border-radius: 16rpx;height: 130rpx;width: 100%;background: linear-gradient(90deg, #d6eafa 0%, #d4eafe 100%);">
+				<view style="font-size: 32rpx">惠企政策</view>
+				<view style="font-size: 22rpx;margin-top: 10rpx">Corporate policies</view>
+				<image src="/static/3162033.png"
+					style="width: 90rpx;height: 90rpx;position: absolute; right: 10rpx;bottom: 0;"></image>
+			</view>
+			<view style="width: 100%;margin-left: 20rpx">
+				<view @click="openApply()"
+					style="position:relative;padding: 20rpx;border-radius: 16rpx;height: 130rpx;background: #FFEDD2;">
+					<view style="font-size: 32rpx">申请入会</view>
+					<view style="font-size: 22rpx;margin-top: 10rpx">Apply for membership</view>
+					<image src="/static/1000006795.png"
+						style="width: 90rpx;height: 90rpx;position: absolute; right: 10rpx;bottom: 0;"></image>
+				</view>
+			</view>
+		</view> -->
+
+
+		<!-- <view style="width: 92%;background-color: #ffffff;border-radius: 16rpx;margin: 20rpx auto;overflow: hidden;"> -->
+		<!-- <tn-list-cell>
+				<view class="list-icon-text">
+					<view class="list__left">
+						<view class="list__left__icon">
+							<image src="/static/hqzc.png" style="width: 56rpx;height: 50rpx;"></image>
+						</view>
+						<view class="list__left__icon"
+							style="width: 4rpx;height: 42rpx;border-radius: 56rpx;background: #d1d4d180;"></view>
+						<view class="list__left__text">惠企政策推送平台</view>
+					</view>
+					<view class="list__right">
+						<text class="tn-icon-right tn-margin-right-xs"></text>
+					</view>
+				</view>
+			</tn-list-cell> -->
+		<!-- <tn-notice-bar :list="list" @click="openInfo" leftIconType="img" mode="vertical" :rightIcon="true"
+				backgroundColor="#ffffff" :radius="16" @clickRight="openRight" @clickLeft="openRight"></tn-notice-bar> -->
+		<!-- </view> -->
+
+		<!--    <view class="tn-flex tn-flex-row-between tn-flex-col-center tn-flex-row-center"-->
+		<!--          style="padding:0px 30rpx 0rpx 30rpx;text-align: center;font-size: 28rpx;">-->
+		<!--      <view @click="openUrl('/pages/index/tissue')"-->
+		<!--            style="width: 33%;background: linear-gradient(270deg, #3CBAEA, #6BC7F0);;border-radius: 16rpx;padding:25rpx 20rpx;">-->
+		<!--        <view>-->
+		<!--          <image src="/static/c3.png" style="width: 35rpx;height: 35rpx;vertical-align: middle;">-->
+		<!--          </image>-->
+		<!--        </view>-->
+		<!--        <view style="margin-top: 10rpx;">-->
+		<!--          <text style="color: #FFF;">组织架构</text>-->
+		<!--        </view>-->
+		<!--      </view>-->
+		<!--      <view @click="openUrl('/pages/index/service')"-->
+		<!--            style="width: 33%;background: linear-gradient(270deg, #EE7E45, #EE9657);border-radius: 16rpx;padding:25rpx 20rpx;margin-left:10rpx;">-->
+		<!--        <view>-->
+		<!--          <image src="/static/c2.png" style="width: 35rpx;height: 35rpx;vertical-align: middle;">-->
+		<!--          </image>-->
+		<!--        </view>-->
+		<!--        <view style="margin-top: 10rpx;">-->
+		<!--          <text style="color: #FFF;">协会活动</text>-->
+		<!--        </view>-->
+		<!--      </view>-->
+		<!--      <view @click="openUrl('/pages/index/directory')"-->
+		<!--            style="width: 33%;background: linear-gradient(270deg, #45B335, #89C33D);border-radius: 16rpx;padding:25rpx 20rpx;margin-left:10rpx;">-->
+		<!--        <view>-->
+		<!--          <image src="/static/c1.png" style="width: 35rpx;height: 35rpx;vertical-align: middle;">-->
+		<!--          </image>-->
+		<!--        </view>-->
+		<!--        <view style="margin-top: 10rpx;">-->
+		<!--          <text style="color: #FFF;">通讯录</text>-->
+		<!--        </view>-->
+
+		<!--      </view>-->
+		<!--    </view>-->
+
+		<view style="padding: 0rpx 28rpx 0rpx 28rpx;">
+			<view style="background-color: #ffffff;border-radius:24rpx;width: 100%;padding-bottom: 15rpx;">
+				<view @click.stop="openUrl('/pages/index/service')"
+					class="tn-flex tn-flex-row-between tn-flex-col-center tn-flex-row-center"
+					style="padding: 30rpx;width: 97%;">
+					<!-- <view style="font-size: 32rpx;">协会活动</view> -->
+					<view style="font-size: 32rpx;">协会动态</view>
+					<!-- <view style="color: #808080;">
+						<text>更多</text>
+						<text class="tn-icon-right"></text>
+					</view> -->
+				</view>
+				<scroll-view :scroll-x="true" style="padding:0rpx 30rpx;white-space: nowrap;width: 100%"
+					v-if="actList.length>0">
+					<!-- @click="openUrl('/pages/packageB/event/event_info?id='+item.id)" -->
+					<view v-for="(item,index) in actList"
+						
+						@click="openNewUrl(item)"
+						style="position: relative;;display: inline-block;width: 300rpx;text-align: center;background-color: #FFF;border-radius: 20rpx;overflow: hidden;margin-right: 20rpx;">
+						<view>
+							<image :src="apiImgUrl+item.news_image
+" mode="aspectFill"
+								style="width: 350rpx;height: 170rpx;">
+							</image>
+						</view>
+						<view style="padding:10rpx;font-weight: 400;min-height: 100rpx;">
+							<view class="tn-text-ellipsis-2" style="text-align: left;font-size: 28rpx">
+								<text>{{ item.news_title }}</text>
+							</view>
+						</view>
+						<!-- <view style="position: absolute;top: 0rpx;left: 0rpx;">
+							<view v-if="item.type=='进行中'" class="my_tag" style="background-color: rgb(75, 130, 235)">
+								进行中
+							</view>
+							<view v-if="item.type=='未开始'" class="my_tag" style="background-color: rgb(248, 155, 59)">
+								预告
+							</view>
+							<view v-if="item.type=='已结束'" class="my_tag" style="background-color: rgb(225, 43, 51)">
+								已结束
+							</view>
+						</view> -->
+					</view>
+				</scroll-view>
+				<view style="background-color: #ffffff;padding: 20rpx;text-align: center" v-if="actList.length==0">
+					暂无动态
+				</view>
+			</view>
+
+		</view>
+		<view style="padding:0rpx 28rpx;margin-top: 20rpx;">
+			<view style="background-color: #ffffff;border-radius: 15rpx 15rpx 0px 0px;padding:20rpx;">
+				<tn-tabs :list="goryList" :isScroll="true" :activeItemStyle="{fontSize:'30rpx',fontWeight:'600'}"
+					activeColor="#3377FF" :current="current" name="name" @change="change" :fontSize="28"></tn-tabs>
+			</view>
+		</view>
+		<view style="padding:0px 28rpx;padding-bottom: 20rpx;min-height:1000rpx">
+			<view v-for="(item,index) in news_list" :class="{ 'rounded_corner': index === 0 }"
+				style="background-color: #ffffff;">
+				<view class="tn-flex" @click="openNewUrl(item)" style="padding: 20rpx;min-height: 200rpx;">
+					<view v-if="item.news_image">
+						<image :src="apiImgUrl+item.news_image" mode="aspectFill"
+							style="width: 230rpx;height: 180rpx;border-radius: 8rpx;"></image>
+					</view>
+					<view style="position:relative;padding:0rpx 10rpx 10rpx 15rpx;margin-left: 10rpx;">
+						<view class="tn-text-ellipsis-3" style="font-size: 28rpx;">{{ item.news_title }}</view>
+						<view class="tn-flex tn-flex-row-between"
+							style="font-size:24rpx;width: 95%;color: rgb(171, 171, 171);position: absolute; bottom: 0rpx; min-width: 380rpx;overflow: hidden">
+							<view>{{ item.name }}</view>
+							<view>{{ formatTime(item.showtime) }}</view>
+							<view>
+								<text class="tn-icon-eye" style="vertical-align: middle;"></text>
+								<text style="vertical-align: middle;">{{ item.news_hits }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="news_list.length-1>index"
+					style="background: rgba(217, 217, 217, 0.5);width: 90%;margin: 0 auto;height: 2rpx;"></view>
+			</view>
+		</view>
+		<view>
+			<tn-select :safeAreaInsetBottom="true" v-model="selectShow" mode="single" :list="selectList"
+				@confirm="confirm"></tn-select>
+		</view>
+		<!-- <view style="height: 1rpx;background-color: #E6E6E6;width: 90%;margin: 0 auto;margin-top: 30rpx;"></view> -->
+		<view @click="callPhone"
+			style="padding-top:70rpx ;text-align: center;padding-bottom: 160rpx;font-size: 24rpx;color: rgba(153,153,153,0.5);letter-spacing: 2rpx;">
+			<view>v{{vuex_version}}</view>
+			<view>技术支持：洛商协工作小组</view>
+			<view>电话：15503791530</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import {
+		newsGoryList,
+		activityList,
+		newsList,
+		associationIndex,
+		carouselIndex,
+		Mailcoent,
+		getArticlePolicyList,
+		getNoticeList
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+
+	export default {
+		data() {
+			return {
+				list: [],
+				selectShow: false,
+				selectList: [],
+				topCurrent: 0,
+				searlist: [{
+					article_title: '会员名称/协会名称/活动/新闻'
+				}],
+				noticeList: [],
+				cardCur: 0,
+				isAndroid: true,
+				goryList: [],
+				news_list: [],
+				actList: [],
+				carousel_list: [],
+				current: 0,
+				page: 1,
+				size: 10,
+				gory_id: 0,
+				type: 1,
+				HomeTitle: '',
+				apiImgUrl: this.$store.state.imgUrl,
+				association_id: this.$store.state.Gid,
+				miniProgramUrl: 'https://wxaurl.cn/P5rAY9EBpPs', // 替换为你的短链
+				showWebView: false,
+			}
+		},
+		mounted() {
+			getApp().getUserLogin((r) => {
+				console.log('---Login---', r);
+			})
+			this.registerGetGidListener();
+			this.getNewsGoryList();
+			// this.getActivityList();
+			this.getAssociationIndex();
+			this.getCarouselIndex();
+			this.getMsg();
+			this.getNotice();
+			this.getTopicList();
+			//this.getArticlePolicyListAll();
+		},
+		beforeDestroy() {
+			// 移除事件监听器
+			this.unregisterGetGidListener();
+		},
+		methods: {
+			openMiniProgramLink() {
+				// this.showWebView = true; // 显示web-view，触发加载
+				// console.log(':', this.showWebView);
+				// setTimeout(() => {
+				// 	this.showWebView = false; // 2秒后隐藏（避免页面残留）
+				// 	}, 2000);
+				console.log(':', this.showWebView);
+				uni.navigateTo({
+				        // url: '/pages/webview?url=https://your-h5-page.com/redirect?target=https://wxaurl.cn/P5rAY9EBpPs',
+						 url: '/pages/webview',
+				});
+			},
+			handleWebViewMessage(e) {
+			      console.log('web-view消息:', e.detail);
+			},
+			// jumpToMiniProgram() {
+			// 	// 判断运行环境（App或H5）
+			// 	if (uni.getSystemInfoSync().platform === 'ios' || uni.getSystemInfoSync().platform === 'android') {
+			// 		uni.navigateToMiniProgram({
+			// 			appId: '目标小程序的appid', // 替换为你要跳转的小程序appid
+			// 			path: 'pages/index/index',  // 目标小程序的页面路径（可选）
+			// 	          success(res) {
+			// 	            console.log('跳转成功', res);
+			// 	          },
+			// 	          fail(err) {
+			// 	            console.log('跳转失败', err);
+			// 	          }
+			// 	        });
+			// 	      } else {
+			// 	        uni.showToast({
+			// 	          title: '当前环境不支持跳转小程序',
+			// 	          icon: 'none'
+			// 	        });
+			// 	      }
+			// },
+			getNotice() {
+				getNoticeList({
+						page: 1,
+						size: 10
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.noticeList = res.data.ret;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			itemClick(item) {
+				console.log(item);
+				uni.navigateTo({
+					url: "/pages/packageB/news/notice_info?id=" + item.id
+				})
+			},
+			registerGetGidListener() {
+				const that = this;
+				uni.$on('getGid', function(data) {
+					console.log('-----', data);
+					that.page = 1;
+					that.goryList = [];
+					that.news_list = [];
+					that.actList = [];
+					that.carousel_list = [];
+					that.association_id = data.gid;
+					that.getNewsGoryList();
+					// that.getActivityList();
+					that.getAssociationIndex();
+					that.getCarouselIndex();
+				});
+			},
+			unregisterGetGidListener() {
+				uni.$off('getGid');
+			},
+			openNewUrl(item) {
+				//'/pages/packageB/news/new_info?id='+item.news_id
+				console.log('item',item);
+				if (item.wx_url == '') {
+					uni.navigateTo({
+						url: '/pages/packageB/news/new_info?id=' + item.news_id
+					})
+				} else {
+					// uni.navigateTo({
+					// 	url: '/pages/index/web?url=' + encodeURIComponent(item.wx_url),
+					// })
+					window.location.href = item.wx_url
+				}
+			},
+			callPhone() {
+				uni.makePhoneCall({
+					phoneNumber: '15503791530', // 电话号码
+					success: function() {
+						console.log('拨打电话成功');
+					},
+					fail: function() {
+						console.log('拨打电话失败');
+					}
+				});
+			},
+			msg() {
+				return this.$store.state.msgCount;
+			},
+			getArticlePolicyListAll() {
+				getArticlePolicyList({
+						cid: 22
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.list = res.data.ret;
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			openInfo(d) {
+				uni.navigateTo({
+					url: '/pages/packageA/info/policy_info?id=' + d.id,
+				})
+			},
+			openRight() {
+				uni.navigateTo({
+					url: '/pages/packageA/info/policy',
+				})
+			},
+			async getMsg() {
+				var uid = uni.getStorageSync('uid');
+
+				const res = await Mailcoent({
+					member_id: uid
+				});
+				console.log(res);
+				if (res.code == 1) {
+					this.$store.commit('$tStore', {
+						name: 'msgCount',
+						value: res.data
+					})
+				} else {
+					this.$store.commit('$tStore', {
+						name: 'msgCount',
+						value: 0
+					})
+				}
+				console.log(store.state.msgCount);
+			},
+			confirm(d) {
+				var info = d[0];
+				console.log(info);
+				store.commit('$tStore', {
+					name: 'Gid',
+					value: info.value
+				})
+				uni.setStorageSync('Gid', info.value);
+				this.association_id = info.value;
+				this.page = 1;
+				this.goryList = [];
+				this.news_list = [];
+				this.actList = [];
+				this.carousel_list = [];
+				this.getNewsGoryList();
+				// this.getActivityList();
+				this.getAssociationIndex();
+				this.getCarouselIndex();
+				//this.$emit('childEvent', '修改后的数据');
+			},
+			getAssociationIndex() {
+				associationIndex({
+						page: 1,
+						size: 200
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							key.push({
+								id: 61,
+								association_name: '洛阳市总商会'
+							});
+							const transformedSelectList = key.map(item => ({
+								value: item.id,
+								label: item.association_name,
+								icon: item.association_image
+							}));
+							const foundNumber = transformedSelectList.find((element) => element.value == store.state
+								.Gid);
+							this.HomeTitle = foundNumber.label;
+							this.selectList = transformedSelectList;
+							//#ifdef MP-WEIXIN
+							this.$parent.childEvent(foundNumber);
+							//#endif
+							// #ifdef  H5
+							console.log('H5');
+							this.$parent.$parent.$parent.$parent.childEvent(foundNumber);
+							// #endif
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getCarouselIndex() {
+				carouselIndex({
+						association_id: store.state.Gid,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.carousel_list = res.data;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getActivityList() {
+				activityList({
+						association_id: store.state.Gid,
+						page: 1,
+						size: 10
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.actList = res.data.ret;
+						} else {
+							this.actList = [];
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getNewsGoryList() {
+				newsGoryList({
+						association_id: this.association_id
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							key.unshift({
+								id: 0,
+								name: '最新'
+							});
+							this.goryList = key;
+							this.type = 1;
+							this.gory_id = 0;
+							this.getNewsList();
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getNewsList() {
+				newsList({
+						association_id: store.state.Gid,
+						type: this.type,
+						gory_id: this.gory_id,
+						page: this.page,
+						size: this.size
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.news_list.push(...res.data.ret);
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getTopicList() {
+				newsList({
+						association_id: 1,
+						type: 0,
+						gory_id: 60,
+						page: 1,
+						size: 10
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.actList.push(...res.data.ret);
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			cardSwiper(d) {
+				this.cardCur = d.detail.current;
+			},
+			ReachBottom() {
+				console.log('home');
+				//this.page = this.page + 1;
+				//this.getNewsList();
+				//this.getIndex();
+			},
+			change(e) {
+				this.current = e;
+				var info = this.goryList[e];
+				this.gory_id = info.id;
+				this.type = e === 0 ? 1 : 0;
+				this.page = 1;
+				this.news_list = [];
+				this.getNewsList();
+			},
+			openUrl(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			openApply() {
+				var uid = uni.getStorageSync('uid');
+				var userInfo = uni.getStorageSync('userInfo');
+				if (!uid || !userInfo) {
+					uni.showToast({
+						title: '请登陆后查看',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				uni.navigateTo({
+					url: '/pages/packageA/user/apply_in?association_id=' + this.association_id
+				})
+
+			},
+			opentab() {
+				uni.$emit('depId', {
+					index: 1
+				})
+			},
+			videoErrorCallback(e) {
+				uni.showModal({
+					content: e.target.errMsg,
+					showCancel: false
+				})
+			},
+			formatTime(time) {
+				const [year, month, day] = time.split(' ')[0].split('-');
+				return `${year}-${month}-${day}`;
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss" scoped>
+	.my_tag {
+		padding: 8rpx 15rpx;
+		font-size: 20rpx;
+		color: rgba(255, 255, 255, 1);
+		border-radius: 0rpx 0rpx 22rpx 0rpx;
+	}
+
+	.rounded_corner {
+		//border-radius: 16rpx 16rpx 0rpx 0rpx;
+		padding-top: 20rpx;
+	}
+
+	.list {
+		&__left {
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+
+			&__icon,
+			&__image {
+				margin-right: 18rpx;
+			}
+		}
+
+		&__right {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+		}
+	}
+
+	.list-icon-text,
+	.list-image-text {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
new file mode 100644
index 0000000..645bbe9
--- /dev/null
+++ b/pages/index/index.vue
@@ -0,0 +1,270 @@
+<template>
+	<view class="index">
+		<view v-if="tabberPageLoadFlag[0]" :style="{display: currentIndex === 0 ? '' : 'none'}">
+			<scroll-view class="custom-tabbar-page" scroll-y enable-back-to-top @scrolltolower="tabbarPageScrollLower">
+				<Home ref="home"></Home>
+			</scroll-view>
+		</view>
+		<!-- <view v-if="tabberPageLoadFlag[1]" :style="{display: currentIndex === 1 ? '' : 'none'}">
+			<scroll-view class="custom-tabbar-page" scroll-y enable-back-to-top @scrolltolower="tabbarPageScrollLower">
+				<Service ref="service"></Service>
+			</scroll-view>
+		</view> -->
+		<view @touchmove="preventTouchMove" v-if=" tabberPageLoadFlag[1]"
+			:style="{display: currentIndex === 1 ? '' : 'none'}">
+			<view :class="tabShow?'custom-tabbar-page':''">
+				<Directory ref="directory"></Directory>
+			</view>
+		</view>
+		<!-- <view v-if="tabberPageLoadFlag[2]" :style="{display: currentIndex === 2 ? '' : 'none'}">
+			<scroll-view class="custom-tabbar-page" scroll-y enable-back-to-top @scrolltolower="tabbarPageScrollLower">
+				<Discovery ref="discovery"></Discovery>
+			</scroll-view>
+		</view> -->
+		<view @touchmove="preventTouchMove" v-if="tabberPageLoadFlag[2]"
+			:style="{display: currentIndex === 2 ? '' : 'none'}">
+			<scroll-view scroll-y class="custom-tabbar-page" style="height: 100vh;" scroll-y enable-back-to-top
+				@scrolltolower="tabbarPageScrollLower">
+				<Pizz ref="pizz"></Pizz>
+			</scroll-view>
+		</view>
+		<view v-if="tabberPageLoadFlag[3]" :style="{display: currentIndex === 3 ? '' : 'none'}">
+			<scroll-view class="custom-tabbar-page" scroll-y enable-back-to-top @scrolltolower="tabbarPageScrollLower">
+				<User ref="user"></User>
+			</scroll-view>
+		</view>
+
+		<tn-tabbar :show="tabShow" :outHeight="140" :height="120" v-model="currentIndex" :list="tabbarList"
+			activeColor="#000000" inactiveColor="#AAAAAA" activeIconColor="#3377FF" inactiveIconColor="#888888"
+			:animation="true" :safeAreaInsetBottom="true" :thisIndex="thisIndex" @change="switchTabbar"></tn-tabbar>
+	</view>
+</template>
+
+<script>
+	import Home from './home.vue'
+	import Service from './service.vue'
+	import Pizz from './pizz.vue'
+	import User from './user.vue'
+	import Directory from './directory.vue'
+	import {
+		Mailcoent
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+
+	export default {
+		components: {
+			Home,
+			Service,
+			Pizz,
+			User,
+			Directory
+		},
+		data() {
+			return {
+				// 底部tabbar菜单数据
+				tabbarList: [{
+						title: '首页',
+						activeIcon: '/static/01_1.png',
+						inactiveIcon: '/static/01.png',
+						id: 0,
+					},
+					{
+						title: '通讯录',
+						activeIcon: '/static/02_2.png',
+						inactiveIcon: '/static/02.png',
+						id: 1,
+					},
+					// {
+					// 	// 服务、案例、品牌、合作、发现、探索
+					// 	activeIcon: '',
+					// 	inactiveIcon: '',
+					// 	iconSize: 110,
+					// 	out: true
+					// },
+					{
+						title: '发现',
+						activeIcon: '/static/03_3.png',
+						inactiveIcon: '/static/03.png',
+						id: 2,
+					},
+					{
+						title: '个人中心',
+						activeIcon: '/static/04_4.png',
+						inactiveIcon: '/static/04.png',
+						id: 3,
+					}
+				],
+				thisIndex: 0,
+				// tabbar当前被选中的序号
+				currentIndex: 0,
+				// 自定义底栏对应页面的加载情况
+				tabberPageLoadFlag: [],
+				apiImgUrl: this.$store.state.imgUrl,
+				icon: '',
+				name: '',
+				tabShow: true,
+			}
+		},
+		onResize(res) {
+			console.log('onResizeonResizeonResize', res);
+			let hdWidth = uni.getStorageSync('windowWidth')
+			if (hdWidth != res.size.framesetWidth) {
+				uni.setStorageSync('windowWidth', res.size.framesetWidth);
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			}
+		},
+		onLoad(options) {
+			console.log(options);
+			const index = Number(options.index || 0)
+			// 根据底部tabbar菜单列表设置对应页面的加载情况
+			this.tabberPageLoadFlag = this.tabbarList.map((item, tabbar_index) => {
+				return index === tabbar_index
+			})
+			this.switchTabbar(index)
+			var that = this;
+			uni.$on('depId', function(data) {
+				that.switchTabbar(data.index);
+			})
+			uni.$on('showTab', function(data) {
+				var index = data.index;
+				that.tabShow = index;
+			})
+			if (typeof(options.scene) != 'undefined') {
+				let decodedParams = decodeURIComponent(options.scene);
+				var searchParams = this.parseQuery(decodedParams);
+				store.commit('$tStore', {
+					name: 'Gid',
+					value: searchParams.gid
+				})
+				uni.setStorageSync('Gid', searchParams.gid);
+			}
+			if (typeof(options.gid) != 'undefined') {
+				store.commit('$tStore', {
+					name: 'Gid',
+					value: options.gid
+				})
+				uni.setStorageSync('Gid', options.gid);
+			}
+
+		},
+		mounted() {
+			//this.wxshare();
+		},
+		onShareAppMessage() {
+			console.log(store.state.Gid);
+			return {
+				title: this.name,
+				path: '/pages/index/index?gid=' + store.state.Gid,
+				imageUrl: this.icon,
+			}
+		},
+		onShareTimeline() {
+			console.log(store.state.Gid);
+			return {
+				title: this.name,
+				path: '/pages/index/index?gid=' + store.state.Gid,
+				imageUrl: this.icon,
+			}
+		},
+		methods: {
+			preventTouchMove() {},
+			parseQuery(queryStr) {
+				let params = {};
+				queryStr.split('&').forEach(param => {
+					let [key, value] = param.split('=');
+					params[key] = decodeURIComponent(value);
+				});
+				return params;
+			},
+			childEvent(data) {
+				console.log('childEvent');
+				console.log(data);
+				this.icon = this.apiImgUrl + data.icon;
+				this.name = data.label;
+			},
+			// wxshare() {
+			// 	this.$wxshare({
+			// 		url: 'http://ysh.0rui.cn/#/pages/index/index',
+			// 		data: {
+			// 			url: window.location.href.split("#")[0],
+			// 		},
+			// 		share_data: {
+			// 			title: '智慧云商协',
+			// 			desc: '智慧云商协',
+			// 			imgUrl: 'http://ysh.0rui.cn/static/ser.png',
+			// 			link: window.location.href, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
+			// 		}
+			// 	})
+			// },
+			// 切换导航
+			switchTabbar(index) {
+				this._switchTabbarPage(index)
+			},
+
+
+			// 瀑布流导航页面滚动到底部
+			tabbarPageScrollLower(e) {
+				console.log(123);
+				if (this.currentIndex === 0) {
+					this.$refs.home.ReachBottom();
+				}
+				if (this.currentIndex === 2) {
+					this.$refs.pizz.ReachBottom();
+				}
+				// if (this.currentIndex === 1) {
+				// 	this.$refs.service.ReachBottom();
+				// }
+			},
+
+			// 切换导航页面
+			_switchTabbarPage(index) {
+
+				const selectPageFlag = this.tabberPageLoadFlag[index]
+				this.thisIndex = this.tabbarList[index].id;
+				if (selectPageFlag === undefined) {
+					return
+				}
+				if (selectPageFlag === false) {
+					this.tabberPageLoadFlag[index] = true
+				}
+				this.currentIndex = index
+				if (index === 1) {
+					setTimeout(() => {
+						this.$refs.directory.onload();
+					}, 100)
+				}
+				if (index === 3) {
+					setTimeout(() => {
+						this.$refs.user.onload();
+					}, 100)
+				}
+				// if (index === 2) {
+				// 	setTimeout(() => {
+				// 		this.$refs.discovery.getNewInfo();
+				// 	}, 100)
+				// }
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.index {
+		width: 100%;
+		height: 100vh;
+		position: relative;
+
+		.custom-tabbar-page {
+			width: 100%;
+			// height: calc(100vh - 110rpx);
+			height: 100%;
+			box-sizing: border-box;
+			padding-bottom: 0rpx;
+			padding-bottom: calc(0rpx + constant(safe-area-inset-bottom));
+			padding-bottom: calc(0rpx + env(safe-area-inset-bottom));
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/news.vue b/pages/index/news.vue
new file mode 100644
index 0000000..7c31f4f
--- /dev/null
+++ b/pages/index/news.vue
@@ -0,0 +1,356 @@
+<template>
+	<view style="background-color: rgb(235, 244, 247);">
+		<view style="padding:0rpx 28rpx;margin-top: 20rpx;">
+			<view style="background-color: #ffffff;border-radius: 15rpx 15rpx 0px 0px;padding:20rpx;">
+				<tn-tabs :list="goryList" :isScroll="true" :activeItemStyle="{fontSize:'30rpx',fontWeight:'600'}"
+					activeColor="#3377FF" :current="current" name="name" @change="change" :fontSize="28"></tn-tabs>
+			</view>
+		</view>
+		<view style="padding:0px 28rpx;padding-bottom: 20rpx;min-height:1000rpx">
+			<view v-for="(item,index) in news_list" :class="{ 'rounded_corner': index === 0 }"
+				style="background-color: #ffffff;">
+				<view class="tn-flex" @click="openNewUrl(item)" style="padding: 20rpx;min-height: 200rpx;">
+					<view v-if="item.news_image">
+						<image :src="apiImgUrl+item.news_image" mode="aspectFill"
+							style="width: 230rpx;height: 180rpx;border-radius: 8rpx;"></image>
+					</view>
+					<view style="position:relative;padding:0rpx 10rpx 10rpx 15rpx;margin-left: 10rpx;">
+						<view class="tn-text-ellipsis-3" style="font-size: 28rpx;">{{ item.news_title }}</view>
+						<view class="tn-flex tn-flex-row-between"
+							style="font-size:24rpx;width: 95%;color: rgb(171, 171, 171);position: absolute; bottom: 0rpx; min-width: 380rpx;overflow: hidden">
+							<view>{{ item.name }}</view>
+							<view>{{ formatTime(item.showtime) }}</view>
+							<view>
+								<text class="tn-icon-eye" style="vertical-align: middle;"></text>
+								<text style="vertical-align: middle;">{{ item.news_hits }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="news_list.length-1>index"
+					style="background: rgba(217, 217, 217, 0.5);width: 90%;margin: 0 auto;height: 2rpx;"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		newsGoryList,
+		newsList,
+		associationIndex,
+		Mailcoent,
+		getArticlePolicyList,
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+
+	export default {
+		data() {
+			return {
+				list: [],
+				selectShow: false,
+				selectList: [],
+				topCurrent: 0,
+				searlist: [{
+					article_title: '会员名称/协会名称/活动/新闻'
+				}],
+				cardCur: 0,
+				isAndroid: true,
+				goryList: [],
+				news_list: [],
+				current: 0,
+				page: 1,
+				size: 10,
+				gory_id: 0,
+				type: 1,
+				HomeTitle: '',
+				apiImgUrl: this.$store.state.imgUrl,
+				association_id: this.$store.state.Gid,
+			}
+		},
+		mounted() {
+			getApp().getUserLogin((r) => {
+				console.log('---Login---', r);
+			})
+			this.registerGetGidListener();
+			this.getNewsGoryList();
+			this.getAssociationIndex();
+			this.getMsg();
+			//this.getArticlePolicyListAll();
+		},
+		beforeDestroy() {
+			// 移除事件监听器
+			this.unregisterGetGidListener();
+		},
+		methods: {
+			itemClick(item) {
+				console.log(item);
+				uni.navigateTo({
+					url: "/pages/packageB/news/notice_info?id=" + item.id
+				})
+			},
+			registerGetGidListener() {
+				const that = this;
+				uni.$on('getGid', function(data) {
+					console.log('-----', data);
+					that.page = 1;
+					that.goryList = [];
+					that.news_list = [];
+					that.association_id = data.gid;
+					that.getNewsGoryList();
+					that.getAssociationIndex();
+				});
+			},
+			unregisterGetGidListener() {
+				uni.$off('getGid');
+			},
+			openNewUrl(item) {
+				//'/pages/packageB/news/new_info?id='+item.news_id
+				console.log(item);
+				if (item.wx_url == '') {
+					uni.navigateTo({
+						url: '/pages/packageB/news/new_info?id=' + item.news_id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/index/web?url=' + encodeURIComponent(item.wx_url),
+					})
+				}
+			},
+			callPhone() {
+				uni.makePhoneCall({
+					phoneNumber: '15503791530', // 电话号码
+					success: function() {
+						console.log('拨打电话成功');
+					},
+					fail: function() {
+						console.log('拨打电话失败');
+					}
+				});
+			},
+			msg() {
+				return this.$store.state.msgCount;
+			},
+			getArticlePolicyListAll() {
+				getArticlePolicyList({
+						cid: 22
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.list = res.data.ret;
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			openInfo(d) {
+				uni.navigateTo({
+					url: '/pages/packageA/info/policy_info?id=' + d.id,
+				})
+			},
+			openRight() {
+				uni.navigateTo({
+					url: '/pages/packageA/info/policy',
+				})
+			},
+			async getMsg() {
+				var uid = uni.getStorageSync('uid');
+
+				const res = await Mailcoent({
+					member_id: uid
+				});
+				console.log(res);
+				if (res.code == 1) {
+					this.$store.commit('$tStore', {
+						name: 'msgCount',
+						value: res.data
+					})
+				} else {
+					this.$store.commit('$tStore', {
+						name: 'msgCount',
+						value: 0
+					})
+				}
+				console.log(store.state.msgCount);
+			},
+			confirm(d) {
+				var info = d[0];
+				console.log(info);
+				store.commit('$tStore', {
+					name: 'Gid',
+					value: info.value
+				})
+				uni.setStorageSync('Gid', info.value);
+				this.association_id = info.value;
+				this.page = 1;
+				this.goryList = [];
+				this.news_list = [];
+				this.getNewsGoryList();
+				this.getAssociationIndex();
+				//this.$emit('childEvent', '修改后的数据');
+			},
+			getAssociationIndex() {
+				associationIndex({
+						page: 1,
+						size: 200
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							key.push({
+								id: 61,
+								association_name: '洛阳市总商会'
+							});
+							const transformedSelectList = key.map(item => ({
+								value: item.id,
+								label: item.association_name,
+								icon: item.association_image
+							}));
+							const foundNumber = transformedSelectList.find((element) => element.value == store.state
+								.Gid);
+							this.HomeTitle = foundNumber.label;
+							this.selectList = transformedSelectList;
+							//#ifdef MP-WEIXIN
+							this.$parent.childEvent(foundNumber);
+							//#endif
+							// #ifdef  H5
+							console.log('H5');
+							this.$parent.$parent.$parent.$parent.childEvent(foundNumber);
+							// #endif
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getNewsGoryList() {
+				newsGoryList({
+						association_id: this.association_id
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							key.unshift({
+								id: 0,
+								name: '最新'
+							});
+							this.goryList = key;
+							this.type = 1;
+							this.gory_id = 0;
+							this.getNewsList();
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getNewsList() {
+				newsList({
+						association_id: store.state.Gid,
+						type: this.type,
+						gory_id: this.gory_id,
+						page: this.page,
+						size: this.size
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.news_list.push(...res.data.ret);
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			cardSwiper(d) {
+				this.cardCur = d.detail.current;
+			},
+			ReachBottom() {
+				console.log('home');
+				//this.page = this.page + 1;
+				//this.getNewsList();
+				//this.getIndex();
+			},
+			change(e) {
+				this.current = e;
+				var info = this.goryList[e];
+				this.gory_id = info.id;
+				this.type = e === 0 ? 1 : 0;
+				this.page = 1;
+				this.news_list = [];
+				this.getNewsList();
+			},
+			openUrl(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			openApply() {
+				var uid = uni.getStorageSync('uid');
+				var userInfo = uni.getStorageSync('userInfo');
+				if (!uid || !userInfo) {
+					uni.showToast({
+						title: '请登陆后查看',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				uni.navigateTo({
+					url: '/pages/packageA/user/apply_in?association_id=' + this.association_id
+				})
+
+			},
+			opentab() {
+				uni.$emit('depId', {
+					index: 1
+				})
+			},
+			videoErrorCallback(e) {
+				uni.showModal({
+					content: e.target.errMsg,
+					showCancel: false
+				})
+			},
+			formatTime(time) {
+				const [year, month, day] = time.split(' ')[0].split('-');
+				return `${year}-${month}-${day}`;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.my_tag {
+		padding: 8rpx 15rpx;
+		font-size: 20rpx;
+		color: rgba(255, 255, 255, 1);
+		border-radius: 0rpx 0rpx 22rpx 0rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/pizz.vue b/pages/index/pizz.vue
new file mode 100644
index 0000000..64fa6b4
--- /dev/null
+++ b/pages/index/pizz.vue
@@ -0,0 +1,317 @@
+<template>
+	<!-- 发现 -->
+	<view style="background-color: #EBF4F7;letter-spacing: 1rpx;min-height: 100vh;">
+		<tn-nav-bar :isBack="false" :bottomShadow="false" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-center">
+				<view class="tn-margin-top" style="text-align: center;">
+					<text>发现</text>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}"
+			style="background-color: #ffffff;padding-bottom: 10rpx;">
+			<view style="padding:0rpx 20rpx">
+				<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin"
+					style="background-color: #ffffff;">
+					<view class="justify-content-item align-content-item" style="width: 100%;">
+						<view class="tn-flex tn-flex-col-center"
+							style="border-radius: 100rpx;padding: 15rpx 20rpx;width: 100%;background-color:#F1F2F8;">
+							<text
+								class="tn-icon-search justify-content-item tn-padding-right-xs tn-color-gray tn-text-lg"></text>
+							<input @confirm="onsubmit()" confirm-type="search" v-model="content"
+								class="justify-content-item" placeholder="请输入协会名称进行搜索" name="input"
+								placeholder-style="color:#AAAAAA" style="width: 90%;"></input>
+						</view>
+					</view>
+
+					<!-- <view>
+						<view class="justify-content-item tn-text-center">
+							<tn-button backgroundColor="#3668fc" shape="round" padding="20rpx 20rpx" width="150rpx"
+								@click="onsubmit()">
+								<text class="tn-color-white">搜 索</text>
+							</tn-button>
+						</view>
+					</view> -->
+				</view>
+			</view>
+
+			<!--			<view class="tn-flex tn-flex-row-around tn-flex-center tn-flex-col-center" style="padding: 30rpx;">-->
+			<!--				<view style="color: #E15033;">-->
+			<!--					<text class="tn-icon-sequence-vertical" style="vertical-align: middle;"></text>-->
+			<!--					<text style="margin-left: 15rpx;vertical-align: middle;">全部排序</text>-->
+			<!--				</view>-->
+			<!--				<view style="height: 25rpx;width: 2rpx;background-color: #808080;"></view>-->
+			<!--				<view>-->
+			<!--					<text class="tn-icon-first" style="vertical-align: middle;"></text>-->
+			<!--					<text style="margin-left: 15rpx;vertical-align: middle;">人气榜</text>-->
+			<!--				</view>-->
+			<!--				<view style="height: 25rpx;width: 2rpx;background-color: #808080;"></view>-->
+			<!--				<view>-->
+			<!--					<text class="tn-icon-light" style="vertical-align: middle;"></text>-->
+			<!--					<text style="margin-left: 15rpx;vertical-align: middle;">最新入驻</text>-->
+			<!--				</view>-->
+			<!--			</view>-->
+		</view>
+		<!--		<view class="tn-flex tn-flex-row-between tn-flex-center tn-flex-col-center" style="padding: 30rpx;">-->
+		<!--			<view style="text-align: center;background-color: #FFF;padding:10rpx 30rpx;width: 48%;border-radius: 5rpx;">-->
+		<!--				<text>省协会</text>-->
+		<!--				<text class="tn-icon-down-triangle"></text>-->
+		<!--			</view>-->
+		<!--			<view style="text-align: center;background-color: #FFF;padding:10rpx 30rpx;width: 48%;border-radius: 5rpx;">-->
+		<!--				<text>市协会</text>-->
+		<!--				<text class="tn-icon-down-triangle"></text>-->
+		<!--			</view>-->
+		<!--		</view>-->
+		<view style="padding:30rpx 30rpx 180rpx 30rpx;">
+			<view style="position: relative;" @click="switchTabbar(1)">
+				<view class="tn-flex tn-flex-center tn-flex-col-center"
+					style="box-shadow: 0rpx 4rpx 25rpx 0rpx rgba(5,171,129,0.25);background: linear-gradient(to bottom,rgba(19,194,150,0.7) 0%, #13C296 100%);padding:40rpx 30rpx;border-radius: 30rpx;margin-bottom: 20rpx;">
+					<view>
+						<image :src="apiImgUrl+'/uploads/1/20240628/a78696e22b3cecbf678afbbcca617fca.png'"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+					</view>
+					<view style="margin-left: 30rpx;">
+						<view style="color:#ffffff;font-size: 32rpx;font-weight: 600;">洛阳市青年户外协会
+						</view>
+						<view style="font-size: 28rpx;color: rgba(255,255,255,0.6);margin-top: 15rpx;">成立时间：2024-8-13
+						</view>
+					</view>
+				</view>
+
+				<view
+					style="font-size: 20rpx;color: #09AE85;background-color: #B8EDE0;position: absolute;top: 0;right: 0;border-radius: 0px 15rpx 0px 15rpx;padding:10rpx 15rpx;">
+					<text style="vertical-align: middle;margin-left: 5rpx;">已认证</text>
+				</view>
+				<view class="triangle"></view>
+			</view>
+			
+			<view class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-between"
+				style="color: #CCCCCC;margin: 50rpx 0rpx 40rpx 0rpx;">
+				<view style="border: 1rpx dashed #CCCCCC;width: 100%;"></view>
+				<!-- <view style="width: 500rpx;text-align: center;font-size: 24rpx;">分协会展示</view> -->
+				<view style="border: 1rpx dashed #CCCCCC;width: 100%;"></view>
+			</view>
+			
+			
+			
+			<view style="position: relative;" @click="handleRemind()">
+				<view class="tn-flex tn-flex-center tn-flex-col-center"
+					style="background-color: #ffffff;padding:40rpx 30rpx;border-radius: 30rpx;margin-bottom: 30rpx;">
+					<view>
+						<image :lazy-load="true" src="https://ysx.0rui.cn/h5/static/lunhua.jpg" mode="aspectFill"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+					</view>
+					<view style="margin-left: 30rpx;">
+						<view style="font-size: 32rpx;font-weight: 600;">洛阳市轮滑协会
+						</view>
+						<view style="font-size: 28rpx;color: #888888;margin-top: 15rpx;">成立时间：2014年12月5日</view>
+					</view>
+				</view>
+				<view
+					style="font-size: 20rpx;color: #09AE85;background-color: #B8EDE0;position: absolute;top: 0;right: 0;border-radius: 0px 15rpx 0px 15rpx;padding:10rpx 15rpx;">
+					<text style="vertical-align: middle;margin-left: 5rpx;">已认证</text>
+				</view>
+			</view>
+			<view style="position: relative;" @click="handleRemind()">
+				<view class="tn-flex tn-flex-center tn-flex-col-center"
+					style="background-color: #ffffff;padding:40rpx 30rpx;border-radius: 30rpx;margin-bottom: 30rpx;">
+					<view>
+						<image :lazy-load="true" src="https://ysx.0rui.cn/h5/static/zixingche.jpg" mode="aspectFill"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+					</view>
+					<view style="margin-left: 30rpx;">
+						<view style="font-size: 32rpx;font-weight: 600;">洛阳市自行车协会
+						</view>
+						<view style="font-size: 28rpx;color: #888888;margin-top: 15rpx;">成立时间：2012年12月14日</view>
+					</view>
+				</view>
+				<view
+					style="font-size: 20rpx;color: #09AE85;background-color: #B8EDE0;position: absolute;top: 0;right: 0;border-radius: 0px 15rpx 0px 15rpx;padding:10rpx 15rpx;">
+					<text style="vertical-align: middle;margin-left: 5rpx;">已认证</text>
+				</view>
+			</view>
+			<view style="position: relative;" @click="handleRemind()">
+				<view class="tn-flex tn-flex-center tn-flex-col-center"
+					style="background-color: #ffffff;padding:40rpx 30rpx;border-radius: 30rpx;margin-bottom: 30rpx;">
+					<view>
+						<image :lazy-load="true" src="@/static/lunhua.jpg" mode="aspectFill"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+					</view>
+					<view style="margin-left: 30rpx;">
+						<view style="font-size: 32rpx;font-weight: 600;">洛阳市滑板协会
+						</view>
+						<view style="font-size: 28rpx;color: #888888;margin-top: 15rpx;">成立时间：2014年12月5日</view>
+					</view>
+				</view>
+				<view
+					style="font-size: 20rpx;color: #09AE85;background-color: #B8EDE0;position: absolute;top: 0;right: 0;border-radius: 0px 15rpx 0px 15rpx;padding:10rpx 15rpx;">
+					<text style="vertical-align: middle;margin-left: 5rpx;">已认证</text>
+				</view>
+			</view>
+			<view style="position: relative;" @click="handleRemind()">
+				<view class="tn-flex tn-flex-center tn-flex-col-center"
+					style="background-color: #ffffff;padding:40rpx 30rpx;border-radius: 30rpx;margin-bottom: 30rpx;">
+					<view>
+						<image :lazy-load="true" src="@/static/lunhua.jpg" mode="aspectFill"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+					</view>
+					<view style="margin-left: 30rpx;">
+						<view style="font-size: 32rpx;font-weight: 600;">洛阳市摩托车协会
+						</view>
+						<view style="font-size: 28rpx;color: #888888;margin-top: 15rpx;">成立时间：2024年12月5日</view>
+					</view>
+				</view>
+				<view
+					style="font-size: 20rpx;color: #09AE85;background-color: #B8EDE0;position: absolute;top: 0;right: 0;border-radius: 0px 15rpx 0px 15rpx;padding:10rpx 15rpx;">
+					<text style="vertical-align: middle;margin-left: 5rpx;">已认证</text>
+				</view>
+			</view>
+			<view style="position: relative;" @click="handleRemind()">
+				<view class="tn-flex tn-flex-center tn-flex-col-center"
+					style="background-color: #ffffff;padding:40rpx 30rpx;border-radius: 30rpx;margin-bottom: 30rpx;">
+					<view>
+						<image :lazy-load="true" src="@/static/lunhua.jpg" mode="aspectFill"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+					</view>
+					<view style="margin-left: 30rpx;">
+						<view style="font-size: 32rpx;font-weight: 600;">洛阳市高尔夫协会
+						</view>
+						<view style="font-size: 28rpx;color: #888888;margin-top: 15rpx;">成立时间：2018年12月5日</view>
+					</view>
+				</view>
+				<view
+					style="font-size: 20rpx;color: #09AE85;background-color: #B8EDE0;position: absolute;top: 0;right: 0;border-radius: 0px 15rpx 0px 15rpx;padding:10rpx 15rpx;">
+					<text style="vertical-align: middle;margin-left: 5rpx;">已认证</text>
+				</view>
+			</view>
+			
+			
+			<!-- <view v-for="(item,index) in list" style="position: relative;" @click="switchTabbar(item.id)">
+				<view class="tn-flex tn-flex-center tn-flex-col-center"
+					style="background-color: #ffffff;padding:40rpx 30rpx;border-radius: 30rpx;margin-bottom: 30rpx;">
+					<view>
+						<image :lazy-load="true" :src="apiImgUrl+item.association_image"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+					</view>
+					<view style="margin-left: 30rpx;">
+						<view style="font-size: 32rpx;font-weight: 600;">{{item.association_name}}
+						</view>
+						<view style="font-size: 28rpx;color: #888888;margin-top: 15rpx;">成立时间：{{item.createtime}}</view>
+					</view>
+				</view>
+				<view
+					style="font-size: 20rpx;color: #09AE85;background-color: #B8EDE0;position: absolute;top: 0;right: 0;border-radius: 0px 15rpx 0px 15rpx;padding:10rpx 15rpx;">
+					<text style="vertical-align: middle;margin-left: 5rpx;">已认证</text>
+				</view>
+			</view> -->
+			
+			
+		</view>
+		<!--		<view style="position: fixed;bottom: 13%;width: 100%;">-->
+		<!--			<view @click="tn('/pages/index/enter_in')"-->
+		<!--				style="margin: 0 auto;color: #fff;letter-spacing: 10rpx;line-height: 70rpx;;text-align: center;width: 70%;height: 70rpx;background: linear-gradient(270deg, #EE7E45, #EE9657);border-radius: 50rpx;">-->
+		<!--				快速入驻</view>-->
+		<!--		</view>-->
+	</view>
+</template>
+
+<script>
+	import {
+		associationIndex
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+	export default {
+		data() {
+			return {
+				topCurrent: 0,
+				list: [],
+				apiImgUrl: this.$store.state.imgUrl,
+				content: '',
+				page: 1,
+			}
+		},
+		mounted() {
+			this.getAssociationIndex();
+		},
+		onReachBottom() {
+			console.log(1);
+		},
+		methods: {
+			handleRemind() {
+				uni.showToast({
+					title: '请敬请期待',
+					icon:'none',
+					duration: 2000 // 设置显示时长为2000毫秒
+				})
+			},
+			switchTabbar(d) {
+				console.log(d);
+				if (d == 0) {
+					return;
+				}
+				store.commit('$tStore', {
+					name: 'Gid',
+					value: d
+				})
+				uni.setStorageSync('Gid', d);
+				uni.$emit('getGid', {
+					gid: d
+				})
+				uni.$emit('depId', {
+					index: 0
+				})
+			},
+			onsubmit() {
+				this.page = 1;
+				this.list = [];
+				this.getAssociationIndex();
+			},
+			ReachBottom() {
+				this.page = this.page + 1;
+				//this.getNewsList();
+				this.getAssociationIndex();
+			},
+			getAssociationIndex() {
+				associationIndex({
+						association_name: this.content,
+						page: this.page,
+						size: 10,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.list.push(...res.data);
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			tn(e) {
+				uni.navigateTo({
+					url: e
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.triangle {
+		width: 0;
+		height: 0;
+		border-top: 20rpx solid #13C296;
+		border-right: 20rpx solid transparent;
+		border-left: 20rpx solid transparent;
+		position: absolute;
+		left: 0;
+		right: 0;
+		margin: 0 auto;
+		bottom: -12rpx;
+		z-index: 100;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/pizz_info.vue b/pages/index/pizz_info.vue
new file mode 100644
index 0000000..5b61d6b
--- /dev/null
+++ b/pages/index/pizz_info.vue
@@ -0,0 +1,377 @@
+<template>
+	<view style="letter-spacing: 1rpx;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:info.association_name}]" :current="topCurrent" activeColor="#000"
+						:bold="false" :fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="position: relative;">
+				<swiper class="card-swiper" :circular="true" :autoplay="true" duration="500" interval="8000"
+					@change="cardSwiper" style="height: 370rpx;">
+					<swiper-item style="padding: 0px;border-radius: 0;">
+						<view class="swiper-item image-banner"
+							:style="'background-image:url('+ apiImgUrl+info.association_image + ');background-size: contain;  background-position:center;  background-repeat: no-repeat;border-radius: 0;'">
+						</view>
+					</swiper-item>
+				</swiper>
+				<view style="position: absolute;top: 10px;right: 10px;" @click="openQrcode">
+					<view
+						style="position: relative;;background-color: rgba(255, 255, 255, 0.9);box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.2);">
+						<text class="tn-icon-qr-code" style="font-size: 40rpx;"></text>
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<view style="padding:20rpx 30rpx;">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-between" style="font-size: 30rpx;">
+				<view style="min-width: 200rpx;">协会地址</view>
+				<view>{{info.association_dizhi}}</view>
+			</view>
+			<view style="margin: 20rpx 0rpx;font-size: 30rpx;"
+				class="custom-nav tn-flex tn-flex-col-center tn-flex-row-between">
+				<view style="min-width: 200rpx;">协会邮箱</view>
+				<view>{{info.association_emal}}</view>
+			</view>
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-between" style="font-size: 30rpx;">
+				<view style="min-width: 200rpx;">联系方式</view>
+				<view>{{info.association_phone}}</view>
+			</view>
+		</view>
+		<view style="height: 10rpx;background-color: #EBF4F7;"></view>
+		<view style="padding:10rpx 30rpx 200rpx 30rpx;">
+			<tn-tabs :list="list" :isScroll="false" :activeItemStyle="{'fontWeight':'600','fontSize':'30rpx'}"
+				style="font-weight: ;" activeColor="#000" :barWidth="50" :barHeight="6"
+				:barStyle="{'background': 'linear-gradient(-45deg, #4AA2EF, #3A7FF4)','borderRadius': '4rpx'}"
+				:current="current" name="name" @change="change"></tn-tabs>
+			<!--			<view style="margin-top: 20rpx;position: relative;">-->
+			<!--				<image src="/static/b1.png"-->
+			<!--					style="width: 100rpx;height: 100rpx;position: absolute;left: 0;right: 0;top: 38%;z-index: 10;margin: 0 auto;">-->
+			<!--				</image>-->
+			<!--				<image src="/static/t7.jpg" style="width: 100%;border-radius: 20rpx;" mode="widthFix"></image>-->
+			<!--			</view>-->
+			<view style="line-height: 50rpx; text-indent: 2em;margin-top: 20rpx;" v-if="current==0">
+				<div v-html="info.association_desc"></div>
+			</view>
+			<view style="line-height: 50rpx; text-indent: 2em;margin-top: 20rpx;" v-if="current==2">
+				<div v-html="info.association_guizhang"></div>
+			</view>
+			<view style="line-height: 50rpx; text-indent: 2em;margin-top: 20rpx;" v-if="current==3">
+				<div v-html="info.ruhuixizhu"></div>
+			</view>
+			<view style="padding: 30rpx;text-align: center; " v-if="current==1">
+				<view style="width: 100%;background-color: #ffffff;z-index: 1;">
+					<tn-tabs :list="tab_list" :isScroll="false" :current="tab_current" name="name" activeColor="#000000"
+						:activeItemStyle="{backgroundColor:'#F2F2F2'}" :showBar='false' @change="tab_change"></tn-tabs>
+				</view>
+				<view style="padding: 30rpx 0rpx;text-align: center;padding-top: 30rpx;">
+					<template v-for="(item, index) in architecture" v-if="item.neirong.length>0">
+						<tn-button backgroundColor="#82B2FF" height="50rpx"
+							fontColor="#ffffff">{{item.position_name}}</tn-button>
+						<tn-grid align="center" col="5" hoverClass="none">
+							<tn-grid-item v-if="item.neirong" style="width:20%" v-for="(v,i) in item.neirong"
+								@click="openUrl('/pages/packageA/user/my_card?id='+v.member_id)">
+								<view style="padding: 30rpx;">
+									<image :src="apiImgUrl+v.photo_image"
+										style="width: 100rpx;height: 100rpx;border-radius: 50%;">
+									</image>
+									<view>{{v.nikename}}</view>
+								</view>
+							</tn-grid-item>
+							<view style="height: 30rpx;width: 100%;"></view>
+							<tn-grid-item v-if="!item.neirong" style="width:20%">
+								<view style="padding: 30rpx;">
+									<view>暂无</view>
+								</view>
+							</tn-grid-item>
+						</tn-grid>
+					</template>
+				</view>
+				<!-- <template v-for="(item, index) in architecture">
+					<tn-button backgroundColor="#E83A30" height="50rpx" width="250rpx"
+						fontColor="#ffffff">{{item.position_name}}</tn-button>
+					<tn-grid align="center" col="5">
+						<tn-grid-item v-if="item.neirong" style="width:20%" v-for="(v,i) in item.neirong">
+							<view style="padding: 30rpx;">
+								<image :src="apiImgUrl+v.photo_image"
+									style="width: 100rpx;height: 100rpx;border-radius: 50%;">
+								</image>
+								<view>{{v.nikename}}</view>
+							</view>
+						</tn-grid-item>
+						<tn-grid-item v-if="!item.neirong" style="width:20%">
+							<view style="padding: 30rpx;">
+								<view>暂无</view>
+							</view>
+						</tn-grid-item>
+					</tn-grid>
+				</template> -->
+			</view>
+		</view>
+		<!-- <view style="position: fixed;bottom: 50rpx;width: 100%;">
+      <view class="tn-flex tn-flex-row-around"> -->
+		<!-- <view @click="openUrl('/pages/index/directory?id='+info.id)"
+              style="color: #fff;;letter-spacing: 10rpx;line-height: 70rpx;;text-align: center;;width: 300rpx;height: 70rpx;background: linear-gradient(-45deg, #4AA2EF, #3A7FF4);border-radius: 50rpx;">
+          会员名录</view> -->
+
+		<!--   <view v-if="userInfo.association_id!=association_id" @click="openUrl('/pages/index/apply_in')"
+              style="color: #fff;;letter-spacing: 10rpx;line-height: 70rpx;;text-align: center;;width: 300rpx;height: 70rpx;background: linear-gradient(270deg, #EE7E45, #EE9657);border-radius: 50rpx;">
+          申请入会</view> -->
+		<!-- <view v-if="userInfo.association_id!=association_id"
+			@click="openUrl('/pages/index/apply_in?association_id='+association_id)"
+			style="position: fixed;bottom: 260rpx;right: 20rpx;line-height: 35rpx;color: #fff;;text-align: center;width: 100rpx;height: 100rpx;background: linear-gradient(270deg, #EE7E45, #EE9657);border-radius: 50%;">
+			<view style="padding-top: 16rpx;">申请</view>
+			<view>入会</view>
+		</view>
+		<view style="position: fixed;bottom: 250rpx; width: 100%;">
+			<view class="tn-flex tn-flex-row-around">
+				<view @click="openUrl('/pages/index/directory_back?id='+info.id)"
+					style="position: absolute; right:20rpx;color: #fff;  line-height:35rpx;text-align: center;width: 100rpx;height: 100rpx;background: linear-gradient(-45deg, #4AA2EF, #3A7FF4);border-radius: 50%;">
+					<view style="padding-top: 16rpx;">会员</view>
+					<view>名录</view>
+				</view>
+			</view>
+		</view> -->
+		<!-- </view> -->
+		<tn-popup :closeBtn="true" v-model="show" mode="center" width="500rpx" height="600rpx">
+			<!-- 	<div style="text-align: center;padding: 30rpx;font-size: 32rpx;font-weight: 600;">使用二维码邀请入会</div> -->
+			<view style="text-align: center;margin-top: 40rpx;">
+				<image :src="qrcode_url" style="width: 400rpx;height: 400rpx;"></image>
+			</view>
+			<view style="text-align: center;margin-top: 40rpx;">
+				<tn-button shape="round" backgroundColor="#82B2FF" fontColor="#ffffff"
+					@click="saveBase64">保存图片</tn-button>
+			</view>
+		</tn-popup>
+		<tn-tabbar :outHeight="140" :height="120" v-model="currentIndex" :list="tabbarList" activeColor="#3377FF"
+			inactiveColor="#AAAAAA" activeIconColor="#3377FF" inactiveIconColor="#8A8E99" :animation="true"
+			:safeAreaInsetBottom="true" @change="switchTabbar"></tn-tabbar>
+	</view>
+
+</template>
+
+<script>
+	import {
+		associationInfo,
+		architectureList,
+		getUserIndex,
+	} from '@/util/api.js';
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				show: false,
+				currentIndex: -1,
+				// 底部tabbar菜单数据
+				tabbarList: [{
+						title: '首页',
+						activeIcon: '/static/01_1.png',
+						inactiveIcon: '/static/01.png'
+					},
+					{
+						title: '通讯录',
+						activeIcon: '/static/02_2.png',
+						inactiveIcon: '/static/02.png'
+					},
+					{
+						title: '发现',
+						activeIcon: '/static/03_3.png',
+						inactiveIcon: '/static/03.png'
+					},
+					{
+						title: '个人中心',
+						activeIcon: '/static/04_4.png',
+						inactiveIcon: '/static/04.png'
+					}
+				],
+				topCurrent: 0,
+				swiperList: [{
+					url: '/static/banner1.jpg',
+				}],
+				tab_list: [{
+					name: '理事会'
+				}, {
+					name: '监事会'
+				}],
+				list: [{
+					name: '协会简介'
+				}, {
+					name: '组织架构'
+				}, {
+					name: '规章制度',
+				}, {
+					name: '入会须知',
+				}],
+				current: 0,
+				cardCur: 0,
+				info: {},
+				apiImgUrl: this.$store.state.imgUrl,
+				qrcode_url: '',
+				architecture: [],
+				association_id: 0,
+				userInfo: {},
+				type: 1,
+				tab_current: 0
+			}
+		},
+		onLoad(d) {
+			console.log(d);
+			this.association_id = d.id;
+			this.getAssociationInfo();
+			this.getArchitectureList();
+		},
+		methods: {
+			openQrcode() {
+				uni.showLoading({
+					title: '生成中',
+					mask: true,
+				});
+				var that = this;
+				uni.request({
+					url: store.state.apiUrl + '/move/login/getUnlimitedQRCode',
+					method: 'POST',
+					data: {
+						path: 'pages/index/index',
+						scene: "gid=" + this.association_id
+					},
+					responseType: 'arraybuffer',
+					arraybuffer: true,
+					success: (result) => {
+						const url = 'data:image/png;base64,' + uni.arrayBufferToBase64(result.data);
+						that.base64ToImage(url);
+					}
+				})
+			},
+			base64ToImage(base64Data) {
+				var that = this;
+				const fs = uni.getFileSystemManager();
+				var filePath = wx.env.USER_DATA_PATH + '/qrcode.jpg';
+				const base64 = base64Data.split(',')[1]; // 获取base64字符串部分
+				fs.writeFile({
+					filePath: filePath,
+					data: base64,
+					encoding: 'base64',
+					success: (res) => {
+						that.qrcode_url = filePath;
+						console.log('图片保存成功', filePath);
+						// 成功回调
+						that.show = true;
+						uni.hideLoading()
+					},
+					fail: (err) => {
+						console.error('图片保存失败', err);
+						uni.hideLoading()
+						// 失败回调
+					}
+				});
+			},
+			saveBase64() {
+				wx.saveImageToPhotosAlbum({
+					filePath: this.qrcode_url,
+					success: function(res) {
+						wx.showToast({
+							title: '保存成功',
+						})
+					},
+					fail: function(err) {
+						console.log(err, '失败')
+					}
+				})
+			},
+			tab_change(d) {
+				this.tab_current = d;
+				this.type = d + 1;
+				this.architecture = [];
+				this.getArchitectureList();
+			},
+			getArchitectureList() {
+				architectureList({
+						association_id: this.association_id,
+						type: this.type,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.architecture = res.data;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getAssociationInfo() {
+				console.log('discovery');
+				associationInfo({
+						association_id: this.association_id
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							if (key.association_desc.indexOf("<img") != -1) {
+								key.association_desc = getApp().addWidthToImages(key.association_desc);
+							}
+							this.info = key;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			openUrl(url) {
+				// var uid = uni.getStorageSync('uid');
+				// if (!uid) {
+				// 	uni.showToast({
+				// 		title: '请登录！',
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
+				uni.navigateTo({
+					url: url
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+			switchTabbar(d) {
+				console.log(d);
+				uni.$emit('depId', {
+					index: d
+				})
+				uni.navigateBack()
+			},
+			change(e) {
+				this.current = e;
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/index/search.vue b/pages/index/search.vue
new file mode 100644
index 0000000..5271c89
--- /dev/null
+++ b/pages/index/search.vue
@@ -0,0 +1,355 @@
+<template>
+	<view style="letter-spacing: 1rpx;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'搜索'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view>
+			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin"
+				:style="{marginTop: vuex_custom_bar_height + 20+'px'}">
+				<view class="justify-content-item align-content-item" style="width: 100%;">
+					<view class="tn-flex tn-flex-col-center"
+						style="border-radius: 100rpx;padding: 10rpx 20rpx 10rpx 20rpx;width: 95%;background-color: rgba(248, 247, 248, 0.9);">
+						<text
+							class="tn-icon-search justify-content-item tn-padding-right-xs tn-color-gray tn-text-lg"></text>
+						<input v-model="content" class="justify-content-item" placeholder="请填写搜索内容" name="input"
+							placeholder-style="color:#AAAAAA" style="width: 90%;"></input>
+					</view>
+				</view>
+
+				<view class="align-content-item">
+					<view class="justify-content-item tn-text-center">
+						<tn-button backgroundColor="#3668fc" shape="round" padding="20rpx 20rpx" width="150rpx"
+							@tap="getSerach">
+							<text class="tn-color-white">搜 索</text>
+						</tn-button>
+
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="is_serach">
+			<!-- <block>
+				<view>
+					<view class="tn-flex tn-flex-row-between tn-margin">
+						<view class="justify-content-item tn-text-bold">
+							<text class="tn-text-df tn-color-black">最近搜索</text>
+						</view>
+						<view class="justify-content-item tn-text-df tn-color-gray">
+							<text class="tn-padding-xs">删除</text>
+							<text class="tn-icon-delete"></text>
+						</view>
+					</view>
+				</view>
+				<view class="">
+					<view class="tn-tag-search  tn-text-justify" style="padding: 0rpx 30rpx;">
+						<view v-for="(item, index) in tagList" :key="index"
+							class="tn-tag-search__item tn-margin-right tn-round tn-text-sm tn-bg-gray--light tn-color-gray">
+							{{ item.name }}
+						</view>
+					</view>
+				</view>
+			</block> -->
+			<view v-if="list.member.length>0" class="tn-flex tn-flex-row-between tn-padding-bottom"
+				style="padding-top: 20rpx;margin: 30rpx 30rpx 0rpx 30rpx;">
+				<view class="justify-content-item tn-text-bold">
+					<text class="tn-text-df tn-color-black">会员搜索结果</text>
+				</view>
+			</view>
+			<view style="padding:0rpx 30rpx;">
+				<view v-for="(item,index) in list.member" class="tn-flex tn-flex-center tn-flex-col-center"
+					@click="tn('/pages/packageA/user/my_card?id='+item.id)"
+					style="background-color: #ffffff;padding:30rpx;border-radius: 15rpx;margin-bottom: 20rpx;box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.1);">
+					<view>
+						<image v-if="item.photo_image!=null&&item.photo_image!=''" :src="apiImgUrl+item.photo_image"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+						<image v-if="item.photo_image==null||item.photo_image==''" src="/static/def.png"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+					</view>
+					<view style="margin-left: 20rpx;">
+						<view style="font-size: 31rpx;font-weight: 600;letter-spacing: 5rpx;">{{item.nikename}}</view>
+						<view style="font-size: 24rpx;colo r: #808080;margin-top: 15rpx;">{{item.enterprise_name}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-if="list.association.length>0" class="tn-flex tn-flex-row-between tn-padding-bottom"
+				style="padding-top: 20rpx;margin: 30rpx 30rpx 0rpx 30rpx;">
+				<view class="justify-content-item tn-text-bold">
+					<text class="tn-text-df tn-color-black">协会搜索结果</text>
+				</view>
+			</view>
+			<view style="padding:0rpx 30rpx;">
+				<view @click="tn('/pages/index/pizz_info?id='+item.id)" v-for="(item,index) in list.association"
+					class="tn-flex tn-flex-center tn-flex-col-center"
+					style="background-color: #ffffff;padding:30rpx;border-radius: 15rpx;margin-bottom: 20rpx;box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.1);">
+					<view>
+						<image :src="apiImgUrl+item.association_image"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+					</view>
+					<view style="margin-left: 20rpx;">
+						<view style="font-size: 31rpx;font-weight: 600;letter-spacing: 5rpx;">{{item.association_name}}
+						</view>
+						<view style="font-size: 24rpx;color: #808080;margin-top: 15rpx;">成立时间：{{item.createtime}}</view>
+					</view>
+				</view>
+			</view>
+			<view v-if="list.activity.length>0" class="tn-flex tn-flex-row-between tn-padding-bottom"
+				style="padding-top: 20rpx;margin: 30rpx 30rpx 0rpx 30rpx;">
+				<view class="justify-content-item tn-text-bold">
+					<text class="tn-text-df tn-color-black">活动搜索结果</text>
+				</view>
+			</view>
+			<view>
+				<view v-for="(item,index) in list.activity" style="background-color: #ffffff;">
+					<view class="tn-flex tn-flex-row-between"
+						@click="tn('/pages/packageB/event/event_info?id='+item.id)" style="padding: 20rpx;">
+						<view style="margin-left: 20rpx;" v-if="item.activity_image">
+							<image :src="apiImgUrl+item.activity_image" mode="aspectFill"
+								style="width: 230rpx;height: 180rpx;border-radius: 8rpx;"></image>
+						</view>
+						<view style="position:relative;min-height: 200rpx;width: 100%;">
+							<view class="tn-text-ellipsis-3" style="font-size: 28rpx;padding-left: 20rpx;">
+								{{ item.activity_name }}
+							</view>
+							<view class="tn-flex tn-flex-row-between"
+								style="width: 100%;padding: 20rpx;font-size:24rpx;color: rgb(171, 171, 171);position: absolute; bottom: 0rpx;overflow: hidden">
+								<view>{{formatTime(item.createtime) }}</view>
+								<view>
+									<text v-if="item.activity_type==1" style="vertical-align: middle;">协会活动</text>
+									<text v-if="item.activity_type==2" style="vertical-align: middle;">调查问卷</text>
+									<text v-if="item.activity_type==3" style="vertical-align: middle;">公益捐赠</text>
+									<text v-if="item.activity_type==4" style="vertical-align: middle;">学习培训</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view v-if="list.news.length-1>index"
+						style="background: rgba(217, 217, 217, 0.5);width: 90%;margin: 0 auto;height: 2rpx;"></view>
+				</view>
+			</view>
+			<view v-if="list.news.length>0" class="tn-flex tn-flex-row-between tn-padding-bottom"
+				style="padding-top: 20rpx;margin: 30rpx 30rpx 0rpx 30rpx;">
+				<view class="justify-content-item tn-text-bold">
+					<text class="tn-text-df tn-color-black">新闻搜索结果</text>
+				</view>
+			</view>
+			<view style="padding:0px 30rpx;">
+				<view v-for="(item,index) in list.news" style="background-color: #ffffff;">
+					<view class="tn-flex tn-flex-row-between" @click="tn('/pages/packageB/news/new_info?id='+item.id)"
+						style="padding: 20rpx;">
+						<view style="margin-left: 20rpx;" v-if="item.news_image">
+							<image :src="apiImgUrl+item.news_image" mode="aspectFill"
+								style="width: 230rpx;height: 180rpx;border-radius: 8rpx;"></image>
+						</view>
+						<view style="position:relative;min-height: 200rpx;width: 100%;">
+							<view class="tn-text-ellipsis-3" style="font-size: 28rpx;padding-left: 20rpx;">
+								{{ item.news_title }}
+							</view>
+							<view class="tn-flex tn-flex-row-between"
+								style="width: 100%;padding: 20rpx;font-size:24rpx;color: rgb(171, 171, 171);position: absolute; bottom: 0rpx;overflow: hidden">
+								<view>{{ formatTime(item.showtime)}}</view>
+								<view>
+									<text class="tn-icon-eye" style="vertical-align: middle;"></text>
+									<text style="vertical-align: middle;">{{ item.news_hits }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view v-if="list.news.length-1>index"
+						style="background: rgba(217, 217, 217, 0.5);width: 90%;margin: 0 auto;height: 2rpx;"></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getSerachIndex
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+	export default {
+		data() {
+			return {
+				content: '',
+				topCurrent: 0,
+				// tagList: [{
+				// 	name: '李小兵'
+				// }, {
+				// 	name: '李小兵'
+				// }],
+				list: {
+					activity: [],
+					association: [],
+					member: [],
+					news: [],
+				},
+				is_serach: false,
+				apiImgUrl: this.$store.state.imgUrl,
+				association_id: this.$store.state.Gid,
+			}
+		},
+		methods: {
+			formatTime(time) {
+				const [year, month, day] = time.split(' ')[0].split('-');
+				return `${year}-${month}-${day}`;
+			},
+			getSerach() {
+
+				getSerachIndex({
+						name: this.content
+					})
+					.then(res => {
+						console.log(res);
+						this.list = res.data;
+						this.is_serach = true;
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			tn(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tn-search-fixed {
+		position: fixed;
+		top: 50rpx;
+		width: 100%;
+		transition: all 0.25s ease-out;
+		z-index: 1;
+	}
+
+
+	/* 搜索标签 start*/
+	.tn-tag-search {
+		&__item {
+			display: inline-block;
+			line-height: 45rpx;
+			padding: 10rpx 30rpx;
+			margin: 20rpx 20rpx 5rpx 0rpx;
+
+			&--prefix {
+				padding-right: 10rpx;
+			}
+		}
+	}
+
+	/* 标签内容 end*/
+
+	/* 标题 start */
+	.nav_title {
+		-webkit-background-clip: text;
+		color: transparent;
+
+		&--wrap {
+			position: relative;
+			display: flex;
+			height: 120rpx;
+			font-size: 42rpx;
+			align-items: center;
+			justify-content: center;
+			font-weight: bold;
+			background-image: url(https://resource.tuniaokj.com/images/title_bg/title00.png);
+			background-size: cover;
+		}
+	}
+
+	/* 标题 end */
+
+	/* 富文本图示意 start */
+	.news-img {
+		z-index: -1;
+		padding-bottom: 40rpx;
+
+		image {
+			width: 100%;
+			margin: 20rpx 0;
+			// height: 3373rpx;
+			// z-index: -1;
+		}
+	}
+
+	/* 资讯主图 start*/
+	.image-article {
+		border-radius: 8rpx;
+		border: 1rpx solid #F8F7F8;
+		width: 200rpx;
+		height: 200rpx;
+		position: relative;
+	}
+
+	.image-pic {
+		background-size: cover;
+		background-repeat: no-repeat;
+		// background-attachment:fixed;
+		background-position: top;
+		border-radius: 10rpx;
+	}
+
+	.article-shadow {
+		border-radius: 15rpx;
+		box-shadow: 0rpx 0rpx 50rpx 0rpx rgba(0, 0, 0, 0.07);
+	}
+
+	/* 文字截取*/
+	.clamp-text-1 {
+		-webkit-line-clamp: 1;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.clamp-text-2 {
+		-webkit-line-clamp: 2;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	/* 标签内容 start*/
+	.tn-tag-content {
+		&__item {
+			display: inline-block;
+			line-height: 35rpx;
+			padding: 7rpx 25rpx 5rpx 25rpx;
+
+			&--prefix {
+				padding-right: 10rpx;
+			}
+		}
+	}
+
+	/* 标签内容 end*/
+</style>
\ No newline at end of file
diff --git a/pages/index/service.vue b/pages/index/service.vue
new file mode 100644
index 0000000..d287cfa
--- /dev/null
+++ b/pages/index/service.vue
@@ -0,0 +1,228 @@
+<template>
+	<view style="background-color: #EBF4F7;letter-spacing: 1rpx;min-height: 100vh;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+
+					<tn-tabs :list="[{name:'协会活动'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-margin">
+				<view class="justify-content-item align-content-item" style="width: 100%;">
+					<view class="tn-flex tn-flex-col-center"
+						style="border-radius: 100rpx;padding: 10rpx 20rpx 10rpx 20rpx;width: 95%;background-color: rgba(255, 255, 255, 0.9);">
+						<text
+							class="tn-icon-search justify-content-item tn-padding-right-xs tn-color-gray tn-text-lg"></text>
+						<input v-model="content" class="justify-content-item" placeholder="请填写活动标题" name="input"
+							placeholder-style="color:#AAAAAA" style="width: 90%;"></input>
+					</view>
+				</view>
+
+				<view>
+					<view class="justify-content-item tn-text-center">
+						<tn-button backgroundColor="#3668fc" shape="round" padding="20rpx 20rpx" width="150rpx"
+							@click="onsubmit()">
+							<text class="tn-color-white">搜 索</text>
+						</tn-button>
+
+					</view>
+				</view>
+			</view>
+			<tn-tabs :list="tabList" :isScroll="false" :current="current" name="name" @change="tabChange"
+				activeColor="#3668FC"></tn-tabs>
+
+		</view>
+
+		<view style="padding-bottom: 30rpx;">
+
+			<view style="padding: 30rpx 0rpx;">
+				<tn-grid align="left" :col="2">
+					<block v-for="(item,index) in actList">
+						<tn-grid-item style="width:50%">
+							<view @click="openUrl('/pages/packageB/event/event_info?id='+item.id)"
+								style="margin-bottom: 30rpx;background-color: #FFF;box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.1);position: relative;display: inline-block;width: 350rpx;text-align: center;border-radius: 20rpx;overflow: hidden;">
+								<view>
+									<image :src="apiImgUrl+item.activity_image" mode="aspectFill"
+										style="width: 350rpx;height: 170rpx;">
+									</image>
+								</view>
+								<view style="padding:10rpx 20rpx;font-weight: 400;">
+									<view class="tn-text-ellipsis " style="text-align: left;">{{ item.activity_name }}
+									</view>
+									<view class="tn-flex tn-flex-row-between"
+										style="font-size: 24rpx;color:#808080;padding: 15rpx 0rpx;">
+										<view>
+											<text v-if="item.activity_type==1">协会活动</text>
+											<text v-if="item.activity_type==2">调查问卷</text>
+											<text v-if="item.activity_type==3">公益捐赠</text>
+											<text v-if="item.activity_type==4">学习培训</text>
+										</view>
+
+									</view>
+								</view>
+
+							</view>
+						</tn-grid-item>
+					</block>
+				</tn-grid>
+			</view>
+		</view>
+		<view style="padding-bottom: 120rpx;">
+			<tn-load-more class="tn-margin-top" :status="load_status"></tn-load-more>
+		</view>
+		<tn-tabbar :outHeight="140" :height="120" v-model="currentIndex" :list="tabbarList" activeColor="#3377FF"
+			inactiveColor="#AAAAAA" activeIconColor="#3377FF" inactiveIconColor="#8A8E99" :animation="true"
+			:safeAreaInsetBottom="true" @change="switchTabbar"></tn-tabbar>
+	</view>
+</template>
+
+<script>
+	import {
+		activityIndex,
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+
+	export default {
+		data() {
+			//1.线下活动2.调查问卷3.公益捐赠4.学习培训
+			return {
+				currentIndex: -1,
+				// 底部tabbar菜单数据
+				tabbarList: [{
+						title: '首页',
+						activeIcon: '/static/01_1.png',
+						inactiveIcon: '/static/01.png'
+					},
+					{
+						title: '通讯录',
+						activeIcon: '/static/02_2.png',
+						inactiveIcon: '/static/02.png'
+					},
+					{
+						title: '发现',
+						activeIcon: '/static/03_3.png',
+						inactiveIcon: '/static/03.png'
+					},
+					{
+						title: '个人中心',
+						activeIcon: '/static/04_4.png',
+						inactiveIcon: '/static/04.png'
+					}
+				],
+				current: 0,
+				load_status: 'loading ',
+				tabList: [{
+					name: '全部',
+					id: 0
+				}, {
+					name: '协会活动',
+					id: 1
+				}, {
+					name: '调查问卷',
+					id: 2
+				}, {
+					name: '公益捐赠',
+					id: 3
+				}, {
+					name: '学习培训',
+					id: 4
+				}],
+				apiImgUrl: this.$store.state.imgUrl,
+				content: '',
+				topCurrent: 0,
+				actList: [],
+				page: 1,
+			}
+		},
+		onLoad(d) {
+			console.log(d);
+			if (typeof(d.type) != 'undefined') {
+				this.current = d.type;
+			}
+			this.getActivityIndex();
+		},
+		methods: {
+			switchTabbar(d) {
+				console.log(d);
+				uni.$emit('depId', {
+					index: d
+				})
+				uni.navigateBack()
+			},
+			onsubmit() {
+				this.page = 1;
+				this.actList = [];
+				this.getActivityIndex();
+			},
+			tabChange(d) {
+				console.log(d);
+				this.current = d;
+				this.page = 1;
+				this.actList = [];
+				this.getActivityIndex();
+			},
+			ReachBottom() {
+				console.log('service');
+				this.page = this.page + 1;
+				this.getActivityIndex();
+				//this.getIndex();
+			},
+			getNewInfo() {
+				this.current = 0;
+				this.page = 1;
+				this.actList = [];
+				this.getActivityIndex();
+			},
+			getActivityIndex() {
+				var type = this.tabList[this.current].id;
+				activityIndex({
+						association_id: store.state.Gid,
+						page: this.page,
+						size: 10,
+						activity_name: this.content,
+						activity_type: type
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.actList.push(...res.data.ret);
+						} else {
+							this.load_status = 'nomore';
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							duration: 2000
+						});
+					})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+			openUrl(e) {
+				uni.navigateTo({
+					url: e
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/pages/index/tissue.vue b/pages/index/tissue.vue
new file mode 100644
index 0000000..33eb2ed
--- /dev/null
+++ b/pages/index/tissue.vue
@@ -0,0 +1,118 @@
+<template>
+	<view style="letter-spacing: 1rpx;background-color: #F2F2F2;min-height: 100vh;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'组织架构'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height+ 'px',}">
+			<view style="position: fixed;width: 100%;background-color: #F2F2F2;z-index: 1;">
+				<tn-tabs :list="list" :isScroll="false" :current="current" name="name" activeColor="#000000"
+					:activeItemStyle="{backgroundColor:'#ffffff'}" :showBar='false' @change="change"></tn-tabs>
+			</view>
+			<view style="padding: 30rpx;text-align: center;padding-top: 94rpx;">
+				<template v-for="(item, index) in architecture">
+					<tn-button backgroundColor="#ffffff" height="50rpx"
+						fontColor="#000000">{{item.position_name}}</tn-button>
+					<tn-grid align="center" col="5" hoverClass="none">
+						<tn-grid-item v-if="item.neirong" style="width:20%" v-for="(v,i) in item.neirong"
+							@click="openInfo('/pages/packageA/user/my_card?id='+v.member_id)">
+							<view style="padding: 30rpx;">
+								<image :src="apiImgUrl+v.photo_image"
+									style="width: 100rpx;height: 100rpx;border-radius: 50%;">
+								</image>
+								<view>{{v.nikename}}</view>
+							</view>
+						</tn-grid-item>
+						<tn-grid-item v-if="!item.neirong" style="width:20%">
+							<view style="padding: 30rpx;">
+								<view>暂无</view>
+							</view>
+						</tn-grid-item>
+					</tn-grid>
+				</template>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		architectureList
+	} from "@/util/api";
+	import store from "@/store";
+
+	export default {
+		data() {
+			return {
+				topCurrent: 0,
+				architecture: [],
+				apiImgUrl: this.$store.state.imgUrl,
+				current: 0,
+				list: [{
+					name: '理事会'
+				}, {
+					name: '监事会'
+				}],
+				type: 1
+			}
+		},
+		onLoad(d) {
+			this.getArchitectureList();
+		},
+		methods: {
+			openInfo(u) {
+				uni.navigateTo({
+					url: u
+				})
+			},
+			getArchitectureList() {
+				architectureList({
+						association_id: store.state.Gid,
+						type: this.type,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.architecture = res.data;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+			change(index) {
+				this.current = index;
+				this.type = index + 1;
+				this.architecture = [];
+				this.getArchitectureList();
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/index/user.vue b/pages/index/user.vue
new file mode 100644
index 0000000..7678a55
--- /dev/null
+++ b/pages/index/user.vue
@@ -0,0 +1,559 @@
+<template>
+	<view style="background-color: #EBF4F7;letter-spacing: 1rpx;">
+		<view :style="{paddingTop: vuex_custom_bar_height +40+ 'rpx'}"
+			style="background: linear-gradient(50deg, #034EF9 0%, #05ACFF 99%);height: 400rpx;">
+
+			<view class="tn-flex tn-flex-center tn-flex-col-center" style="padding: 30rpx;width: 100%;">
+				<view v-if="login && userInfo.photo_image">
+					<image :src="apiImgUrl+userInfo.photo_image"
+						@click="tn_ru('/pages/packageA/user/my_card?id='+userInfo.member_id)"
+						style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+						<<!-- image :src="apiImgUrl+userInfo.photo_image"
+							@click="handleRemind"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image> -->
+				</view>
+				<view v-if="!login || !userInfo.photo_image">
+					<image src="/static/def.png" style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
+				</view>
+				<view style="width: 100%;">
+					<view v-if="login" class="tn-flex tn-flex-col-center tn-flex-row-between">
+						<view style="margin-left: 20rpx;color: #fff"
+							@click="tn_ru('/pages/packageA/user/my_card?id='+userInfo.member_id)">
+							<!-- <view style="margin-left: 20rpx;color: #fff" @click="handleRemind"> -->
+							<view style="font-size: 35rpx;">{{ userInfo.nikename }}</view>
+							<view v-if="userInfo.position_name!=null&&userInfo.if_member!=2"
+								style="font-size: 24rpx;margin-top: 10rpx;">
+								{{userInfo.position_name}}
+							</view>
+							<view
+								v-if="userInfo.if_member==2&&userInfo.association_id!=null&&userInfo.association_id!=0&&userInfo.if_xianshi==0"
+								style="font-size: 24rpx;margin-top: 10rpx;">
+								入会审核中
+							</view>
+							<view
+								v-if="userInfo.association_id==null||userInfo.association_id==0&&userInfo.if_member==2"
+								style="font-size: 24rpx;margin-top: 10rpx;">
+								游客
+							</view>
+						</view>
+						<view @click="tn('/pages/packageA/user/my_edit')">
+						<!-- <view @click="handleRemind"> -->
+							<image src="/static/ico13.png" style="width: 40rpx ;" mode="widthFix"></image>
+						</view>
+					</view>
+					<view v-if="!login" class="tn-flex tn-flex-col-center tn-flex-row-between">
+						<view style="margin-left: 20rpx;color: #fff">
+							<!-- <tn-button @click="loginMod = true">点击登陆</tn-button> -->
+							<!-- <tn-button open-type="getPhoneNumber" @getphonenumber="PhoneLogin">点击登陆</tn-button> -->
+							<tn-button open-type="getPhoneNumber" @getphonenumber="PhoneLogin" @click="handleRemind()">点击登陆</tn-button>
+						</view>
+						<!--            <view @click="tn('/pages/index/my_edit')">-->
+						<!--              <image src="/static/ico13.png" style="width: 40rpx ;" mode="widthFix"></image>-->
+						<!--            </view>-->
+					</view>
+				</view>
+			</view>
+		</view>
+		<view>
+			<view style="padding: 30rpx;margin-top:-115rpx;background-color: transparent;">
+				<view class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-between"
+					style="text-align: center;padding: 30rpx;background-color: #FFF;border-radius: 20rpx;box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.1);">
+					<!-- <view @click="tn('/pages/index/pizz_info?id='+userInfo.association_id)"> -->
+					<view @click="handleRemind()">
+						<view>
+							<image src="/static/ico5.png" style="width: 50rpx;height: 50rpx;"></image>
+						</view>
+						<view style="margin-top: 10rpx;">
+							<text>所在商/协会</text>
+						</view>
+					</view>
+					<!-- <view @click="tn('/pages/packageA/user/events_my')"> -->
+					<view @click="handleRemind()">
+						<view>
+							<image src="/static/ico1.png" style="width: 50rpx;height: 50rpx;"></image>
+						</view>
+						<view style="margin-top: 10rpx;">
+							<text>参与活动</text>
+						</view>
+					</view>
+					<!-- <view @click="tn('/pages/packageA/user/my_desc')"> -->
+					<view @click="handleRemind()">
+						<view>
+							<image src="/static/02_2.png" style="width: 50rpx;height: 50rpx;"></image>
+						</view>
+						<view style="margin-top: 10rpx;">
+							<text>协会服务</text>
+						</view>
+					</view>
+					<!-- <view @click="tn('/pages/packageA/user/my_card?id='+userInfo.member_id)"> -->
+					<view @click="handleRemind()">
+						<view>
+							<image src="/static/ico6.png" style="width: 50rpx;height: 50rpx;"></image>
+						</view>
+						<view style="margin-top: 10rpx;">
+							<text>我的名片</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view style="background-color: #fff;padding-bottom: 0rpx;">
+				<view style="padding:0px 20rpx;">
+					<!-- <tn-list-cell v-if="login" :arrow="true" @click="tn('/pages/packageB/ask/user_list')"> -->
+					<tn-list-cell v-if="login" :arrow="true" @click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/icon100.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">我的提问</view>
+						</view>
+					</tn-list-cell>
+					<!-- <tn-list-cell v-if="login" :arrow="true" @click="tn('/pages/packageA/user/my_card_holder')"> -->
+					<tn-list-cell v-if="login" :arrow="true" @click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/icon13.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">名片夹</view>
+						</view>
+					</tn-list-cell>
+					<tn-list-cell v-if="login" :arrow="true" @click="tn('/pages/packageA/user/my_edit')">
+					<!-- <tn-list-cell v-if="login" :arrow="true" @click="handleRemind()"> -->
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/icon14.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">信息修改</view>
+						</view>
+					</tn-list-cell>
+					<!--					<tn-list-cell :arrow="true" @click="tn('/pages/index/my_pizz')">-->
+					<!--						<view class="tn-flex tn-flex-center tn-flex-col-center">-->
+					<!--							<image src="/static/ico7.png" style="width: 50rpx;height: 50rpx"></image>-->
+					<!--							<view style="margin-left: 20rpx;">所在商/协会</view>-->
+					<!--						</view>-->
+					<!--					</tn-list-cell>-->
+					<!-- <tn-list-cell :arrow="true" v-if="login && userInfo.if_xianshi!=1"
+						@click="tn_ru('/pages/packageA/user/apply_in?association_id='+loginData.association_id)"> -->
+						<tn-list-cell :arrow="true" v-if="login && userInfo.if_xianshi!=1" @click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/ico8.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">入会申请</view>
+						</view>
+					</tn-list-cell>
+					<!-- <tn-list-cell :arrow="true" @click="tn('/pages/packageA/user/my_msg')"> -->
+					<tn-list-cell :arrow="true" @click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center" style="position: relative;">
+							<image src="/static/ico9.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">我的消息</view>
+							<tn-badge v-if="msg()>0" style="position: absolute;right: 40rpx;width: 30rpx;height: 30rpx"
+								backgroundColor="#E83A30" fontColor="#ffffff">{{msg()}}</tn-badge>
+						</view>
+					</tn-list-cell>
+					<tn-list-cell :arrow="true" @click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center" style="position: relative;">
+							<image src="/static/allianceMall.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">联盟商城</view>
+							<tn-badge v-if="msg()>0" style="position: absolute;right: 40rpx;width: 30rpx;height: 30rpx"
+								backgroundColor="#E83A30" fontColor="#ffffff">{{msg()}}</tn-badge>
+						</view>
+					</tn-list-cell>
+					<tn-list-cell :arrow="true" @click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center" style="position: relative;">
+							<image src="/static/allianceCoupon.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">联盟优惠券</view>
+							<tn-badge v-if="msg()>0" style="position: absolute;right: 40rpx;width: 30rpx;height: 30rpx"
+								backgroundColor="#E83A30" fontColor="#ffffff">{{msg()}}</tn-badge>
+						</view>
+					</tn-list-cell>
+					<tn-list-cell :arrow="true" @click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center" style="position: relative;">
+							<image src="/static/messageSupply.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">信息供应</view>
+							<tn-badge v-if="msg()>0" style="position: absolute;right: 40rpx;width: 30rpx;height: 30rpx"
+								backgroundColor="#E83A30" fontColor="#ffffff">{{msg()}}</tn-badge>
+						</view>
+					</tn-list-cell>
+					<!-- <tn-list-cell v-if="login" :arrow="true" @click="tn('/pages/packageA/user/my_invite')"> -->
+					<tn-list-cell v-if="login" :arrow="true" @click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/ico10.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">邀请入会</view>
+						</view>
+					</tn-list-cell>
+					<!--					<tn-list-cell :arrow="true" @click="tn('/pages/index/my_assist')">-->
+					<!--						<view class="tn-flex tn-flex-center tn-flex-col-center">-->
+					<!--							<image src="/static/ico10.png" style="width: 50rpx;height: 50rpx"></image>-->
+					<!--							<view style="margin-left: 20rpx;">常见问题</view>-->
+					<!--						</view>-->
+					<!--					</tn-list-cell>-->
+					<!-- <tn-list-cell v-if="userInfo.shenhe==1&&login" :arrow="true"
+						@click="tn('/pages/packageA/user/user_auditing')"> -->
+						<tn-list-cell v-if="userInfo.shenhe==1&&login" :arrow="true"
+							@click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/icon15.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">内容审核</view>
+						</view>
+					</tn-list-cell>
+					<!-- <tn-list-cell v-if="userInfo.shenhe==1&&login" :arrow="true"
+						@click="tn('/pages/packageA/user/user_activity')"> -->
+						<tn-list-cell v-if="userInfo.shenhe==1&&login" :arrow="true"
+							@click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/ico16.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">发布活动</view>
+						</view>
+					</tn-list-cell>
+					<!-- <tn-list-cell :arrow="true" @click="tn('/pages/packageA/user/my_idea')"> -->
+					<tn-list-cell :arrow="true" @click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/ico12.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">意见反馈</view>
+						</view>
+					</tn-list-cell>
+					<!-- <tn-list-cell v-if="userInfo.if_business==1" :arrow="true"
+						@click="tn('/pages/packageA/user/my_vip')">
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/vip.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">会员卡</view>
+						</view>
+					</tn-list-cell> -->
+					<!-- <tn-list-cell v-if="userInfo.business==1" :arrow="true"
+						@click="tn('/pages/packageA/user/my_vip_clerk')"> -->
+						<tn-list-cell v-if="userInfo.business==1" :arrow="true"
+							@click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/ico12.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">店员管理</view>
+						</view>
+					</tn-list-cell>
+					<!-- <tn-list-cell :arrow="true" @click="loginAut"> -->
+					<tn-list-cell :arrow="true" @click="handleRemind()">
+						<view class="tn-flex tn-flex-center tn-flex-col-center">
+							<image src="/static/ico11.png" style="width: 50rpx;height: 50rpx"></image>
+							<view style="margin-left: 20rpx;">退出帐号</view>
+						</view>
+					</tn-list-cell>
+				</view>
+			</view>
+		</view>
+		<tn-popup v-model="loginMod" mode="bottom" :safeAreaInsetBottom="true">
+			<view class="custom-modal-content">
+				<view style="font-size: 30rpx;padding: 30rpx 30rpx 0rpx 30rpx;font-weight: 600;letter-spacing: 2rpx">
+					会员登陆</view>
+				<view class="text" style="padding: 40rpx;">
+					<tn-form ref="form" :labelWidth="120">
+						<tn-form-item prop="phone">
+							<tn-input placeholder="手机号" :customStyle="{width: '660rpx'}" v-model="loginData.phone" />
+						</tn-form-item>
+						<view style="height: 20rpx;"></view>
+						<tn-form-item prop="password">
+							<tn-input placeholder="密码" :customStyle="{width: '660rpx'}" :passwordIcon="false"
+								v-model="loginData.password" type="password" />
+						</tn-form-item>
+						<tn-form-item prop="code">
+							<tn-input v-model="code" :customStyle="{width: '400rpx'}" type="text"
+								placeholder="请输入验证码"></tn-input>
+
+							<view slot="right">
+								<view @click="getcheckCode"
+									style="letter-spacing: 2px; font-size: 42rpx; background-color: antiquewhite; padding: 5rpx 15rpx;">
+									<text v-for="(item,index) in identifyCode" :style="{color:colors[index]}">
+										{{ item }}
+									</text>
+								</view>
+							</view>
+						</tn-form-item>
+					</tn-form>
+					<view style="text-align: center;margin-top: 50rpx;">
+						<!-- <tn-button backgroundColor="#E6E6E6" fontColor="#ffffff"
+							@click="loginMod = false">取消</tn-button> -->
+						<tn-button style="border-radius: 0px;" height="80rpx" backgroundColor="#EEF0F2" width="100%"
+							fontColor="#000000" @click="submitLogin">确定</tn-button>
+					</view>
+				</view>
+			</view>
+			<view style="height: 120rpx;"></view>
+		</tn-popup>
+		<view @click="callPhone"
+			style="text-align: center;padding-bottom: 100rpx;font-size: 24rpx;color: rgba(153,153,153,0.5);letter-spacing: 2rpx;padding-top: 60rpx;">
+			<view>v{{vuex_version}}</view>
+			<view>技术支持：洛商协工作小组</view>
+			<view>电话：15503791530</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getUserIndex,
+		loginDo,
+		wxphoneLogin
+	} from "@/util/api";
+	import store from "@/store";
+
+	export default {
+		data() {
+			return {
+				topCurrent: 0,
+				login: false,
+				loginMod: false,
+				userInfo: {},
+				apiImgUrl: this.$store.state.imgUrl,
+				loginData: {
+					openid: '',
+					phone: '',
+					password: '',
+					association_id: store.state.Gid
+				},
+				code: '',
+				identifyCode: '',
+				identifyCodeName: '',
+				colors: ['#00CCFF', '#FF0000', '#FF9933', '#33CC99'], // 可以根据需要增加颜色
+			}
+		},
+		mounted() {
+
+			//this.getcheckCode();
+		},
+		methods: {
+			onload() {
+				var uid = uni.getStorageSync('uid');
+				this.uid = uid;
+				if (uid) {
+					this.getUserInfo();
+				}
+			},
+			handleRemind() {
+				uni.showToast({
+					title: '请敬请期待',
+					icon:'none',
+					duration: 2000 // 设置显示时长为2000毫秒
+				})
+			},
+			PhoneLogin(d) {
+				console.log(d);
+				var openid = uni.getStorageSync('openid');
+				wxphoneLogin({
+						code: d.code,
+						openid: openid
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							uni.showToast({
+								title: '登陆成功！',
+								icon: 'none',
+								duration: 2000
+							});
+							uni.setStorageSync('uid', res.data.id);
+							uni.setStorageSync('userInfo', res.data);
+							this.userInfo = res.data;
+							this.login = true;
+							this.loginMod = false;
+						} else {
+							uni.showToast({
+								title: '登陆失败！',
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getcheckCode() {
+				let code = [];
+				const codeLength = 4;
+				var codeName = '';
+				const random = [
+					1, 2, 3, 4, 5, 6, 7, 8, 9, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+					'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+					'X', 'Y', 'Z',
+				];
+				for (let i = 0; i < codeLength; i++) {
+					let index = Math.floor(Math.random() * 34);
+					code.push(random[index]);
+					codeName += random[index];
+				}
+				this.identifyCodeName = codeName;
+				this.identifyCode = code;
+			},
+			msg() {
+				return this.$store.state.msgCount;
+			},
+			getUserInfo() {
+				getUserIndex({
+						member_b_id: this.uid,
+						member_id: this.uid
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.userInfo = res.data;
+							this.login = true;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			submitLogin() {
+				console.log(this.code);
+				console.log(this.identifyCodeName);
+				if (this.code.toLowerCase() !== this.identifyCodeName.toLowerCase()) {
+					uni.showToast({
+						title: '验证码错误！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.loginData.phone == '') {
+					uni.showToast({
+						title: '请填写手机号！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.loginData.password == '') {
+					uni.showToast({
+						title: '请填写密码！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				this.loginData.openid = uni.getStorageSync('openid');
+				loginDo(this.loginData)
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							uni.showToast({
+								title: '登陆成功！',
+								icon: 'none',
+								duration: 2000
+							});
+							uni.setStorageSync('uid', res.data.id);
+							uni.setStorageSync('userInfo', res.data);
+							this.userInfo = res.data;
+							this.login = true;
+							this.loginMod = false;
+						} else {
+							uni.showToast({
+								title: '帐号或密码错误！',
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			loginAut() {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定要退出吗？',
+					success: function(res) {
+						if (res.confirm) {
+							uni.removeStorageSync('uid');
+							that.login = false;
+							that.loginData.openid = '';
+							that.loginData.phone = '';
+							that.loginData.password = '';
+							that.code = '';
+							that.getcheckCode();
+						}
+					}
+				});
+			},
+			tn_ru(e) {
+				var url = "/pages/packageA/user/apply_in?association_id=" + store.state.Gid;
+				uni.navigateTo({
+					url: e
+				})
+			},
+			tn(e) {
+				var uid = uni.getStorageSync('uid');
+				console.log(this.userInfo);
+				console.log(this.login);
+				if (!this.login) {
+					uni.showToast({
+						title: '请登陆后查看',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.userInfo.if_member == 2) {
+					if (e == '/pages/packageA/user/my_edit') {
+						uni.showToast({
+							title: '请入会后查看',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+					if (e.includes("/pages/packageA/user/my_invite")) {
+						uni.showToast({
+							title: '请入会后查看',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+					if (e.includes("/pages/index/pizz_info")) {
+						uni.showToast({
+							title: '请入会后查看',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+					if (e.includes("/pages/packageA/user/my_card")) {
+						uni.showToast({
+							title: '请入会后查看',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+					if (e.includes("/pages/packageA/user/my_desc")) {
+						uni.showToast({
+							title: '请入会后查看',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+				}
+				uni.navigateTo({
+					url: e
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.my_input view {
+		width: 100% !important;
+	}
+
+	.my_input input {
+		width: 100% !important;
+	}
+
+	page {
+		background-color: rgb(235, 244, 247);
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/web.vue b/pages/index/web.vue
new file mode 100644
index 0000000..9321b74
--- /dev/null
+++ b/pages/index/web.vue
@@ -0,0 +1,27 @@
+<template>
+	<view>
+		<web-view bindmessage="bindmessage" :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url: ''
+			}
+		},
+		onLoad(options) {
+			console.log(options);
+			var kkk = decodeURIComponent(options.url);
+			this.url = kkk;
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/packageA/info/discovery.vue b/pages/packageA/info/discovery.vue
new file mode 100644
index 0000000..01586fb
--- /dev/null
+++ b/pages/packageA/info/discovery.vue
@@ -0,0 +1,240 @@
+<template>
+	<view style="letter-spacing: 1rpx;">
+		<tn-nav-bar :isBack="false" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view class="tn-margin-top"
+					style="text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:info.association_name}]" :current="topCurrent" activeColor="#000"
+						:bold="false" :fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="position: relative;">
+				<swiper class="card-swiper" :circular="true" :autoplay="true" duration="500" interval="8000"
+					@change="cardSwiper" style="height: 370rpx;">
+					<swiper-item style="padding: 0px;border-radius: 0;">
+						<view class="swiper-item image-banner"
+							:style="'background-image:url('+ apiImgUrl+info.association_image + ');background-size:auto 100% ; background-position:center;  background-repeat: no-repeat;border-radius: 0;'">
+						</view>
+					</swiper-item>
+				</swiper>
+				<!--        <view style="position: absolute;top: 10px;right: 10px;">-->
+				<!--          <view-->
+				<!--              style="position: relative;;width: 70rpx;height: 60rpx;background-color: rgba(255, 255, 255, 0.9);border-radius: 8rpx;box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(12,0,5,0.2);">-->
+				<!--            <image src="/static/c1455.png" mode="widthFix"-->
+				<!--                   style="width: 40rpx;position: absolute;left: 0;right: 0;margin: 0 auto;top: 15rpx;"></image>-->
+				<!--          </view>-->
+				<!--        </view>-->
+			</view>
+		</view>
+		<view style="padding:20rpx 30rpx;">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-between" style="font-size: 30rpx;">
+				<view>协会地址</view>
+				<view>{{info.association_dizhi}}</view>
+			</view>
+			<view style="margin: 20rpx 0rpx;font-size: 30rpx;"
+				class="custom-nav tn-flex tn-flex-col-center tn-flex-row-between">
+				<view>协会邮箱</view>
+				<view>{{info.association_emal}}</view>
+			</view>
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-between" style="font-size: 30rpx;">
+				<view>联系方式</view>
+				<view>{{info.association_phone}}</view>
+			</view>
+		</view>
+		<view style="height: 10rpx;background-color: #EBF4F7;"></view>
+		<view style="padding:10rpx 30rpx 200rpx 30rpx;">
+			<tn-tabs :list="list" :isScroll="false" :activeItemStyle="{'fontWeight':'600','fontSize':'30rpx'}"
+				style="font-weight: ;" activeColor="#000" :barWidth="50" :barHeight="6"
+				:barStyle="{'background': 'linear-gradient(-45deg, #4AA2EF, #3A7FF4)','borderRadius': '4rpx'}"
+				:current="current" name="name" @change="change"></tn-tabs>
+			<!--			<view style="margin-top: 20rpx;position: relative;">-->
+			<!--				<image src="/static/b1.png"-->
+			<!--					style="width: 100rpx;height: 100rpx;position: absolute;left: 0;right: 0;top: 38%;z-index: 10;margin: 0 auto;">-->
+			<!--				</image>-->
+			<!--				<image src="/static/t7.jpg" style="width: 100%;border-radius: 20rpx;" mode="widthFix"></image>-->
+			<!--			</view>-->
+			<view style="line-height: 50rpx; text-indent: 2em;margin-top: 20rpx;" v-if="current==0">
+				<div v-html="info.association_desc"></div>
+			</view>
+			<view style="line-height: 50rpx; text-indent: 2em;margin-top: 20rpx;" v-if="current==2">
+				<div v-html="info.association_guizhang"></div>
+			</view>
+			<view style="line-height: 50rpx; text-indent: 2em;margin-top: 20rpx;" v-if="current==3">
+				<div v-html="info.ruhuixizhu"></div>
+			</view>
+			<view style="padding: 30rpx;text-align: center; " v-if="current==1">
+				<template v-for="(item, index) in architecture">
+					<tn-button backgroundColor="#E83A30" height="50rpx" width="250rpx" fontColor="#ffffff">
+						{{item.position_name}}
+					</tn-button>
+					<tn-grid align="center" col="5">
+						<tn-grid-item v-if="item.neirong" style="width:20%" v-for="(v,i) in item.neirong">
+							<view style="padding: 30rpx;">
+								<image :src="apiImgUrl+v.photo_image"
+									style="width: 100rpx;height: 100rpx;border-radius: 50%;">
+								</image>
+								<view>{{v.nikename}}</view>
+							</view>
+						</tn-grid-item>
+						<tn-grid-item v-if="!item.neirong" style="width:20%">
+							<view style="padding: 30rpx;">
+								<view>暂无</view>
+							</view>
+						</tn-grid-item>
+					</tn-grid>
+				</template>
+			</view>
+		</view>
+		<view v-if="userInfo.association_id!=info.id" @click="openUrl('/pages/packageA/user/apply_in')"
+			style="position: fixed;bottom: 330rpx;right: 20rpx;line-height: 35rpx;color: #fff;;text-align: center;width: 100rpx;height: 100rpx;background: linear-gradient(270deg, #EE7E45, #EE9657);border-radius: 50%;">
+			<view style="padding-top: 16rpx;">申请</view>
+			<view>入会</view>
+		</view>
+		<view style="position: fixed;bottom: 310rpx; width: 100%;">
+			<view class="tn-flex tn-flex-row-around">
+				<view @click="openUrl('/pages/packageA/info/directory?id='+info.id)"
+					style="position: absolute; right:20rpx;color: #fff;  line-height:35rpx;text-align: center;width: 100rpx;height: 100rpx;background: linear-gradient(-45deg, #4AA2EF, #3A7FF4);border-radius: 50%;">
+					<view style="padding-top: 16rpx;">会员</view>
+					<view>名录</view>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		associationInfo,
+		architectureList,
+		getUserIndex,
+	} from '@/util/api.js';
+	import store from "@/store";
+
+	export default {
+		data() {
+			return {
+				topCurrent: 0,
+				swiperList: [{
+					url: '/static/banner1.jpg',
+				}],
+				list: [{
+					name: '协会简介'
+				}, {
+					name: '组织架构'
+				}, {
+					name: '规章制度',
+				}, {
+					name: '入会须知',
+				}],
+				current: 0,
+				cardCur: 0,
+				info: {},
+				apiImgUrl: this.$store.state.imgUrl,
+				architecture: [],
+				userInfo: {}
+			}
+		},
+		methods: {
+			getUserInfo() {
+				var uid = uni.getStorageSync('uid');
+				if (uid) {
+					getUserIndex({
+							member_id: uid
+						})
+						.then(res => {
+							console.log(res);
+							if (res.code == 1) {
+								this.userInfo = res.data;
+							}
+						})
+						.catch(error => {
+							uni.showToast({
+								title: error,
+								icon: 'none',
+								duration: 2000
+							});
+						})
+				}
+
+			},
+			getArchitectureList() {
+				architectureList({
+						association_id: store.state.Gid,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.architecture = res.data;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getAssociationInfo() {
+				console.log('discovery');
+				associationInfo({
+						association_id: store.state.Gid,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							if (key.association_desc.indexOf("<img") != -1) {
+								key.association_desc = getApp().addWidthToImages(key.association_desc);
+							}
+							this.info = key;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getNewInfo() {
+				this.getAssociationInfo();
+				this.getArchitectureList();
+				this.getUserInfo();
+			},
+			openUrl(url) {
+				var uid = uni.getStorageSync('uid');
+				if (!uid) {
+					uni.showToast({
+						title: '请登录！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				uni.navigateTo({
+					url: url
+				})
+			},
+			openPages(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			change(e) {
+				this.current = e;
+			},
+		}
+	}
+</script>
+
+<style>
+	.tn-flex-row-around {
+		position: relative;
+
+	}
+</style>
diff --git a/pages/packageA/info/joinUs.vue b/pages/packageA/info/joinUs.vue
new file mode 100644
index 0000000..e2f48d3
--- /dev/null
+++ b/pages/packageA/info/joinUs.vue
@@ -0,0 +1,291 @@
+<template>
+	<!-- <view>212213</view> -->
+	<view class="page-body">
+		<!-- <tn-nav-bar :isBack="false" backTitle="" :alpha="true" :bottomShadow="false">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;color: #000000"></text>
+				</view>
+			</view>
+		</tn-nav-bar> -->
+		<!-- <view style="width: 100%;height: 450rpx;margin-top: 30rpx;"> -->
+		<view style="width: 100%;height: 450rpx;">
+			<image src="https://ysx.0rui.cn/h5/static/personLogoBg.png" style="width: 100%;height: 450rpx;" mode="">
+			</image>
+		</view>
+		<view class="joinUs-text">
+			<view class="class-bg"></view>
+			<text>入会申请</text>
+		</view>
+
+		<!-- <form bind:submitToGroup="onSubmitToGroup">
+	    <view class="weui-cells__title">姓名</view>
+		  <textarea value="{{userInfo.realname}}" />
+	  </form> -->
+
+		<view class="tn-form-class">
+			<view class="page-section">
+				<view class="weui-cells__title" style="margin-bottom: 16rpx;margin-left: 4rpx;">姓名</view>
+				<view class="weui-cells weui-cells_after-title nameBox">
+					<view class="weui-cell weui-cell_input">
+						<textarea class="textarea" v-model="info.name"
+							style="padding: 15rpx;height: 90rpx;width: 100%;background-color: #fff;"
+							bindinput="onBioInput" placeholder="请输入姓名(必填项)"></textarea>
+						<!-- <view class="weui-cell weui-cell_input">
+		    {{userInfo.realname}}
+		    </view> -->
+					</view>
+				</view>
+			</view>
+			<view class="page-section">
+				<view class="weui-cells__title" style="margin-bottom: 16rpx;margin-left: 4rpx;">手机号</view>
+				<view class="weui-cells weui-cells_after-title">
+					<view class="weui-cell weui-cell_input">
+						<textarea class="textarea" v-model="info.phone"
+							style="padding: 15rpx;height: 90rpx;width: 100%;background-color: #fff;"
+							bindinput="onBioInput" placeholder="请输入手机号(必填项)"></textarea>
+						<!-- {{userInfo.phone}} -->
+					</view>
+				</view>
+			</view>
+			<view class="page-section">
+				<view class="weui-cells__title" style="margin-bottom: 16rpx;margin-left: 4rpx;">性别</view>
+				<view class="weui-cells weui-cells_after-title">
+					<view class="weui-cell weui-cell_input">
+						<textarea class="textarea" v-model="info.gender"
+							style="padding: 15rpx;height: 90rpx;width: 100%;background-color: #fff;"
+							bindinput="onBioInput" placeholder="请输入性别"></textarea>
+						<!-- {{userInfo.phone}} -->
+					</view>
+				</view>
+			</view>
+			<view class="page-section">
+				<view class="weui-cells__title" style="margin-bottom: 16rpx;margin-left: 4rpx;">年龄</view>
+				<view class="weui-cells weui-cells_after-title">
+					<view class="weui-cell weui-cell_input">
+						<textarea class="textarea" v-model="info.age"
+							style="padding: 15rpx;height: 90rpx;width: 100%;background-color: #fff;"
+							bindinput="onBioInput" placeholder="请输入年龄(必填项)"></textarea>
+						<!-- {{userInfo.idcard}} -->
+					</view>
+				</view>
+			</view>
+			<view class="page-section">
+				<view class="weui-cells__title" style="margin-bottom: 16rpx;margin-left: 4rpx;">邮箱</view>
+				<view class="weui-cells weui-cells_after-title">
+					<view class="weui-cell weui-cell_input">
+						<textarea class="textarea" v-model="info.email"
+							style="padding: 15rpx;height: 90rpx;width: 100%;background-color: #fff;"
+							bindinput="onBioInput" placeholder="请输入手机号"></textarea>
+						<!-- {{userInfo.phone}} -->
+					</view>
+				</view>
+			</view>
+			<view class="page-section">
+				<view class="weui-cells__title" style="margin-bottom: 16rpx;margin-left: 4rpx;">工作</view>
+				<view class="weui-cells weui-cells_after-title">
+					<view class="weui-cell weui-cell_input">
+						<textarea class="textarea" v-model="info.work"
+							style="padding: 15rpx;height: 90rpx;width: 100%;background-color: #fff;"
+							bindinput="onBioInput" placeholder="请输入你的工作"></textarea>
+						<!-- {{userInfo.idcard}} -->
+					</view>
+				</view>
+			</view>
+			<view class="page-section">
+				<view class="weui-cells__title" style="margin-bottom: 16rpx;margin-left: 4rpx;">工作地点</view>
+				<view class="weui-cells weui-cells_after-title">
+					<view class="weui-cell weui-cell_input">
+						<textarea class="textarea" v-model="info.workLocation"
+							style="padding: 10rpx;height: 90rpx;background-color: #fff;width: 100%;"
+							bindinput="onBioInput" placeholder="请输入你的工作地点"></textarea>
+						<!-- {{userInfo.idcard}} -->
+					</view>
+				</view>
+			</view>
+			<view style="height: 80rpx;width: 100%;background-color: #fff;"></view>
+
+			<view style="width: 100%;padding: 20rpx 40rpx;position: fixed;bottom: 0;left: 0;z-index: 99;
+				border-bottom: 0rpx;height: 120rpx;background-color: #fff;align-items: center;" @click="handleRemind()">
+				<tn-button backgroundColor="#2368f2" fontColor="#fff" shape="round" width="100%" height="80rpx"
+					class="saveEdit">提交信息</tn-button>
+			</view>
+		</view>
+
+
+
+
+
+
+	</view>
+
+</template>
+
+<script>
+	import {
+
+		getNoticeList
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+
+	export default {
+		data() {
+			return {
+				info: {
+					name: null,
+					phone: null,
+					idcard: null,
+					workLocation: null,
+					work: null,
+					age: null,
+					gender: null,
+					email: null,
+				}
+			}
+		},
+		mounted() {
+			getApp().getUserLogin((r) => {
+				console.log('---Login---', r);
+			})
+			this.getNotice();
+			//this.getArticlePolicyListAll();
+		},
+		beforeDestroy() {
+			// 移除事件监听器
+			this.unregisterGetGidListener();
+		},
+		methods: {
+			handleRemind() {
+				uni.showToast({
+					title: '请敬请期待',
+					icon:'none',
+					duration: 2000 // 设置显示时长为2000毫秒
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+			
+				}
+			},
+			getNotice() {
+				getNoticeList({
+						page: 1,
+						size: 10
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.noticeList = res.data.ret;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+	/* 底部安全边距 start*/
+	.tn-tabbar-height {
+		min-height: 120rpx;
+		height: calc(140rpx + env(safe-area-inset-bottom) / 2);
+		height: calc(140rpx + constant(safe-area-inset-bottom));
+	}
+	
+	.tn-footerfixed {
+		position: fixed;
+		width: 100%;
+		bottom: calc(180rpx + env(safe-area-inset-bottom));
+		z-index: 1024;
+		box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
+	
+	}
+	
+	.page-body {
+		padding: 40rpx 20rpx;
+		background-color: #ffffff1;
+		width: 100%;
+		height: 100%;
+
+		.joinUs-text {
+			display: flex;
+			align-items: center;
+			// padding: 10rpx;
+			font-size: 36rpx;
+			font-weight: 400;
+			color: #323232;
+
+			.class-bg {
+				width: 12rpx;
+				height: 50rpx;
+				background-color: #0063BC;
+				border-radius: 26rpx;
+				margin-bottom: 20rpx;
+				margin-top: 26rpx;
+				margin-right: 20rpx;
+			}
+		}
+
+		.tn-form-class {
+			margin-bottom: 20rpx;
+			background-color: #ffffff;
+
+			.page-section {
+				width: 100%;
+				display: flex;
+				margin-top: 40rpx;
+				align-items: center;
+				padding-left: 20rpx;
+				align-items: center;
+				justify-content: space-between;
+				border-bottom: 2rpx solid #eeeeee;
+
+				.weui-cells__title {
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #000;
+					margin-bottom: 10rpx;
+				}
+
+				.weui-cells_after-title {
+					width: 50%;
+				}
+
+				//   .page-section .nameBox{
+				//     display: block;
+				// 	font-size: 28rpx;
+				// 	font-weight: 400;
+				// 	color: #000;
+				// 	margin-bottom: 10rpx;
+				// 	background-color: #ffffff;
+				//     /* justify-content: center; 水平居中 */
+				//   }
+
+				//   .page-section .nameBox .textarea {
+				//     width: 50%; /* 设置宽度，避免占满整行 */
+				//     height: 60rpx;
+				//     display: flex;
+				//   }
+			}
+
+			.saveEdit {
+				width: 90%;
+				height: 100rpx;
+			}
+		}
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/packageA/info/policy.vue b/pages/packageA/info/policy.vue
new file mode 100644
index 0000000..0c98ac6
--- /dev/null
+++ b/pages/packageA/info/policy.vue
@@ -0,0 +1,108 @@
+<template>
+	<view>
+		<!-- <tn-nav-bar customBack :bottomShadow="false" backgroundColor="#ffffff">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-center">
+				<view style="color: #000000;;text-align: left;font-size: 36rpx;font-weight: 600;">
+					<text>惠企政策</text>
+				</view>
+			</view>
+			<view slot="back" class='tn-custom-nav-bar__back' style="padding-left: 20rpx;" @click="goBack">
+				<image src="/static/h_back.png" style="width: 60rpx;height: 60rpx;"></image>
+			</view>
+		</tn-nav-bar> -->
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="false" backgroundColor="#ffffff">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top">
+				<tn-tabs :list="[{name:'惠企政策'}]" :current="topCurrent" activeColor="#000" :bold="false"
+					:fontSize="36"></tn-tabs>
+				</view>
+			</view> 
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}" style="padding-bottom: 60rpx;">
+			<tn-list-view :card="true" unlined="all">
+				<block v-for="(item, index) in list" :key="index">
+					<tn-list-cell padding="36rpx" :arrow="true"
+						@click="openUrl('/pages/packageA/info/policy_list?id='+item.id)">
+						<image :src="apiImgUrl+item.image"
+							style="width: 50rpx;height: 50rpx;vertical-align: middle;margin-right: 20rpx;"></image>
+						{{item.name}}
+						<view class="list__right">
+							<view class="tn-text-sm tn-color-gray">{{item.category_count}}</view>
+						</view>
+					</tn-list-cell>
+				</block>
+			</tn-list-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getArticlePolicy
+	} from "@/util/api";
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				apiImgUrl: store.state.imgUrl,
+				list: []
+			}
+		},
+		onLoad() {
+			this.getArticlePolicyList();
+		},
+		methods: {
+			getArticlePolicyList() {
+				getArticlePolicy()
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.list = res.data;
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			openUrl(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+  .list {
+    &__right {
+     position: absolute;
+	 right: 68rpx;
+	 top: 48rpx;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages/packageA/info/policy_info.vue b/pages/packageA/info/policy_info.vue
new file mode 100644
index 0000000..3aca720
--- /dev/null
+++ b/pages/packageA/info/policy_info.vue
@@ -0,0 +1,91 @@
+<template>
+	<view>
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="false" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-between">
+				<view class="tn-flex tn-flex-col-center tn-flex-row-left">
+					<view style="padding-left: 15rpx;" @click="goBack()">
+						<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+					</view>
+					<view class="tn-margin-top"
+						style="text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+						<tn-tabs :list="[{name:'惠企政策详情'}]" :current="topCurrent" activeColor="#000" :bold="false"
+							:fontSize="36"></tn-tabs>
+					</view>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}" style="padding-bottom: 60rpx;">
+			<view style="padding: 30rpx;">
+				<view style="font-size: 34rpx;font-weight: 600;text-align: center;">{{info.title}}</view>
+				<view style="margin-top: 20rpx;">
+					<view style="color: #999999;font-size: 28rpx;text-align: center;">
+						<text>业务科室：{{info.source}}</text>
+						<text style="margin-left: 60rpx;">联系方式：{{info.phone}}</text>
+					</view>
+				</view>
+				<view v-html="info.content" style="margin-top: 30rpx;"></view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getArticlePolicyInfo
+	} from "@/util/api";
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				info: {},
+				id: 0
+			}
+		},
+		onLoad(d) {
+			console.log(d);
+			this.id = d.id;
+			this.articlePolicyInfo();
+		},
+		methods: {
+			articlePolicyInfo() {
+				getArticlePolicyInfo({
+						id: this.id
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.info = res.data;
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/packageA/info/policy_list.vue b/pages/packageA/info/policy_list.vue
new file mode 100644
index 0000000..a383d7c
--- /dev/null
+++ b/pages/packageA/info/policy_list.vue
@@ -0,0 +1,109 @@
+<template>
+	<view style="background: #F7F7F7;min-height: 100vh;">
+		<tn-nav-bar customBack :bottomShadow="false" backgroundColor="#ffffff">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-center">
+				<view style="color: #000000;;text-align: left;font-size: 36rpx;font-weight: 600;">
+					<text>惠企政策</text>
+				</view>
+			</view>
+			<view slot="back" class='tn-custom-nav-bar__back' style="padding-left: 20rpx;" @click="goBack">
+				<image src="/static/h_back.png" style="width: 60rpx;height: 60rpx;"></image>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}" style="padding-bottom: 60rpx;">
+			<!-- <tn-list-view :card="true" unlined="all">
+				<block v-for="(item, index) in list" :key="index">
+					<tn-list-cell padding="36rpx" :arrow="true"
+						@click="openUrl('/pages/packageA/info/policy_info?id='+item.id)">{{item.article_title}}</tn-list-cell>
+				</block>
+			</tn-list-view> -->
+			<view style="padding: 30rpx;">
+				<view v-for="(item, index) in list" :key="index" style="padding: 30rpx;background-color: #FFF;border-radius: 18rpx;margin-bottom: 30rpx;">
+					<view class="tn-flex" @click="openUrl('/pages/packageA/info/policy_info?id='+item.id)">
+						<view>
+							<image src="/static/hqzc_f.png" style="width: 230rpx;height: 140rpx;border-radius: 10rpx;">
+							</image>
+						</view>
+						<view style="padding-left: 20rpx;position: relative;">
+							<view class="tn-text-ellipsis-2">{{item.article_title}}</view>
+							<view style="position: absolute;bottom: 10rpx;width: 100%;">
+								<view style="color: #9B9B9B;font-size: 24rpx;white-space: nowrap;">发布时间：{{formatTimestamp(item.create_time)}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getArticlePolicyList
+	} from "@/util/api";
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				list: []
+			}
+		},
+		onLoad(d) {
+			console.log(d);
+			this.cid = d.id;
+			this.getArticlePolicyListAll();
+		},
+		methods: {
+			formatTimestamp(timestamp) {
+			  const date = new Date(timestamp*1000);
+			  const year = date.getFullYear(); 
+			  const month = String(date.getMonth()  + 1).padStart(2, "0"); // 补零
+			  const day = String(date.getDate()).padStart(2,  "0");
+			  return `${year}.${month}.${day}`;
+			},
+			getArticlePolicyListAll() {
+				getArticlePolicyList({
+						cid: this.cid
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.list = res.data.ret;
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			openUrl(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/packageA/user/apply_in.vue b/pages/packageA/user/apply_in.vue
new file mode 100644
index 0000000..bddde59
--- /dev/null
+++ b/pages/packageA/user/apply_in.vue
@@ -0,0 +1,798 @@
+<template>
+	<view class="template-edit tn-safe-area-inset-bottom">
+		<!-- 顶部自定义导航 -->
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:info.association_name+'入会申请'}]" :current="topCurrent" activeColor="#000"
+						:bold="false" :fontSize="30"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+
+		<view class="tn-safe-area-inset-bottom" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="margin-top: 40rpx">
+				<tn-steps :list="tab_list" :current="current"></tn-steps>
+			</view>
+			<view v-if="current==1" style="padding: 30rpx">
+				<view v-html="info.ruhuixizhu"></view>
+				<view style="text-align: center;margin-top: 60rpx">
+					<tn-checkbox :size="40" v-model="checked1">同意入会协议</tn-checkbox>
+					<view style="margin-top: 30rpx">
+						<tn-button backgroundColor="#01BEFF" fontColor="#ffffff" @click="one_next()">下一步</tn-button>
+					</view>
+				</view>
+			</view>
+			<view v-if="current==2">
+				<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
+					<view class="tn-flex justify-content-item">
+						<view class="tn-padding-right-xs tn-text-bold">推荐人</view>
+					</view>
+				</view>
+				<view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
+					<input v-model="new_info.recommendation_name" placeholder="选填" :showRightIcon="false"
+						:disabled="true" @click="tuijian_show = true" />
+					<tn-select v-model="tuijian_show" mode="single" :list="member_list"
+						@confirm="getTuiJianId"></tn-select>
+				</view>
+				<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
+					<view class="tn-flex justify-content-item">
+						<view class="tn-padding-right-xs tn-text-bold">手机号</view>
+					</view>
+				</view>
+				<view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
+					<input placeholder="手机号" disabled v-model="userInfo.phone"
+						placeholder-style="color:#AAAAAA"></input>
+				</view>
+				<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
+					<view class="tn-flex justify-content-item">
+						<view class="tn-padding-right-xs tn-text-bold">真实姓名</view>
+					</view>
+				</view>
+				<view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
+					<input placeholder="请输入真实姓名" v-model="new_info.nikename" placeholder-style="color:#AAAAAA"></input>
+				</view>
+				<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
+					<view class="tn-flex justify-content-item">
+						<view class="tn-padding-right-xs tn-text-bold">性别</view>
+					</view>
+				</view>
+				<view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
+					<input v-model="new_info.gender_name" :showRightIcon="false" :disabled="true"
+						@click="gender_show = true" />
+					<tn-select v-model="gender_show" mode="single" :list="genderList"
+						@confirm="getGenderId"></tn-select>
+				</view>
+				<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
+					<view class="tn-flex justify-content-item">
+						<view class="tn-padding-right-xs tn-text-bold">企业名称</view>
+					</view>
+				</view>
+				<view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
+					<input placeholder="请输入企业名称" v-model="new_info.enterprise_name"
+						placeholder-style="color:#AAAAAA"></input>
+				</view>
+				<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
+					<view class="tn-flex justify-content-item">
+						<view class="tn-padding-right-xs tn-text-bold">所属行业</view>
+					</view>
+				</view>
+				<view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
+					<view class="tn-flex  tn-flex-center tn-flex-col-center" @click="industry_id_show = true">
+						<view style="font-size: 28rpx; color: rgba(102, 102, 102, 1);">
+							{{formData.industrynew_id_name}}
+						</view>
+					</view>
+					<tn-select v-model="industry_id_show" mode="single" :list="industry_list"
+						@confirm="getindustryId"></tn-select>
+				</view>
+				<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
+					<view class="tn-flex justify-content-item">
+						<view class="tn-padding-right-xs tn-text-bold">申请理由</view>
+					</view>
+				</view>
+				<view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
+					<tn-input v-model="new_info.reason" :maxLength="1000" placeholder="申请入会理由" :clearable="false"
+						:height="300" type="textarea" :customStyle="{lineHeight:'42rpx',color:'#777777'}" />
+				</view>
+				<div style="text-align: center;margin-top: 40px">
+					<tn-button @click="current=1" backgroundColor="#E6E6E6" fontColor="#000000">上一步</tn-button>
+					<tn-button backgroundColor="#01BEFF" fontColor="#ffffff" style="margin-left: 40rpx"
+						@click="newSubmit">提交申请
+					</tn-button>
+				</div>
+			</view>
+		</view>
+		<view class='tn-tabbar-height'></view>
+	</view>
+</template>
+
+<script>
+	import {
+		associationInfo,
+		IndustryNewList,
+		loginAdd,
+		positionList,
+		MemberList
+	} from '@/util/api.js';
+	import store from "@/store";
+	import string from "@/tuniao-ui/libs/function/string";
+
+	export default {
+		data() {
+			return {
+				positionList: [],
+				industry_list: [],
+				jiantuan_time_show: false,
+				position_show: false,
+				gender_show: false,
+				industry_id_show: false,
+				genderList: [{
+					label: '男',
+					value: 1
+				}, {
+					label: '女',
+					value: 0
+				}],
+				birth_time_show: false,
+				checked1: false,
+				topCurrent: 0,
+				current: 1,
+				info: {},
+				tab_list: [{
+					name: '入会须知'
+				}, {
+					name: '人员信息'
+				}],
+				new_info: {
+					recommendation_id: 0,
+					recommendation_name: '',
+					phone: '',
+					nikename: '',
+					enterprise_name: '',
+					gender_name: '请选择',
+					gender: 0,
+					industry_id: 0,
+					reason: '',
+					industrynew_id: 0,
+				},
+				formData: {
+					position_name: '请选择',
+					position_id: 0,
+					industry_id: '',
+					industry_id_name: '请选择',
+					industrynew_id_name: '请选择',
+					phone: '',
+					password: '',
+					nikename: '',
+					gender_name: '请选择',
+					gender: 0,
+					birth_time_name: '请选择',
+					birth_time: '',
+					nation: '',
+					political: '',
+					jiguan: '',
+					institution: '',
+					education: '',
+					academic_degree: '',
+					card_number: '',
+					work_unit: '',
+					unit_position: '',
+					wx_number: '',
+					mailbox: '',
+					fixed_telephone: '',
+					achievement_award: '',
+					other_contacts: '',
+					other_social_positions: '',
+					position: '',
+					cardf_image_show: [],
+					cardz_image_show: [],
+					photo_image_show: [],
+					cardf_image: '',
+					cardz_image: '',
+					photo_image: '',
+					business_license_image_show: [],
+					business_license_image: '',
+					unified_code: '',
+					enterprise_nature: '',
+					enterprise_website: '',
+					if_list: '',
+					employee: '',
+					previous_revenue: '',
+					previous_tax: '',
+					previous_profit: '',
+					previous_donation: '',
+					qitaqiyerenzhiqingkuang: '',
+					enterprise_Introduction: '',
+					introdiction: '',
+					enterprise_honor: '',
+					if_organization: null,
+					nature: '',
+					jiantuan_time: '',
+					jiantuan_time_name: '请选择',
+					jiantuan_number: '',
+					youth_number: '',
+					superior_nature: '',
+					tuanweifuzerenxinxi: '',
+					documents_file: '',
+					documents_file_show: [],
+					enterprise_location: '',
+					apiUrl: this.$store.state.apiUrl,
+
+				},
+				tuijian_show: false,
+				member_list: [],
+				Gid: 0,
+				userInfo: {}
+			}
+		},
+		onLoad(d) {
+			console.log('123456', d);
+			if (typeof(d.scene) != 'undefined') {
+				let decodedParams = decodeURIComponent(d.scene);
+				var searchParams = this.parseQuery(decodedParams);
+				console.log('searchParams', searchParams);
+				d = searchParams;
+			}
+			if (typeof(d.id) != 'undefined') {
+				uni.setStorageSync('apply_id', d.id);
+				this.new_info.recommendation_id = d.id;
+			}
+
+			this.userInfo = uni.getStorageSync('userInfo');
+			if (typeof(d.association_id) != 'undefined') {
+				store.commit('$tStore', {
+					name: 'Gid',
+					value: d.association_id
+				})
+				uni.setStorageSync('Gid', d.association_id);
+				this.Gid = d.association_id;
+			} else {
+				var gid = uni.getStorageSync('Gid');
+				this.Gid = gid;
+			}
+			getApp().getUserLogin((r) => {
+				console.log('---Login---', r);
+			})
+			this.getAssociationInfo();
+			this.getPlan();
+			this.getIndustry();
+			this.getMemberList();
+		},
+		methods: {
+			parseQuery(queryStr) {
+				let params = {};
+				queryStr.split('&').forEach(param => {
+					let [key, value] = param.split('=');
+					params[key] = decodeURIComponent(value);
+				});
+				return params;
+			},
+			getMemberList() {
+				MemberList({
+						association_id: this.Gid,
+					})
+					.then(res => {
+						if (res.code == 1) {
+							var key = res.data;
+							var transformedSelectList = key.map(item => ({
+								value: item.id,
+								label: item.nikename
+							}));
+							if (this.new_info.recommendation_id != 0) {
+								var index = transformedSelectList.findIndex(item => item.value == this.new_info
+									.recommendation_id);
+								this.new_info.recommendation_name = transformedSelectList[index].label;
+							}
+							this.member_list = transformedSelectList;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getIndustry() {
+				IndustryNewList()
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							const transformedSelectList = key.map(item => ({
+								value: item.id,
+								label: item.industry_name
+							}));
+							this.industry_list = transformedSelectList;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			formatResponse(res, type) {
+				console.log(res);
+				if (res.code == 1) {
+					uni.showToast({
+						title: '上传成功',
+						icon: 'none',
+						duration: 2000
+					});
+				}
+				if (type == 0) {
+					this.formData.photo_image = res.data.url;
+				} else if (type == 1) {
+					this.formData.cardz_image = res.data.url;
+				} else if (type == 2) {
+					this.formData.cardf_image = res.data.url;
+				} else if (type == 3) {
+					this.formData.business_license_image = res.data.url;
+				} else {
+					this.formData.documents_file = res.data.url;
+				}
+				//return {url: res.data.fullurl};
+			},
+			radioGroupChange(d) {
+				console.log(d);
+			},
+			getTuiJianId(d) {
+				var info = d[0];
+				this.new_info.recommendation_id = info.value;
+				this.new_info.recommendation_name = info.label;
+			},
+			getPositionId(d) {
+				var info = d[0];
+				this.formData.position_name = info.label;
+				this.formData.position_id = info.value;
+			},
+			getGenderId(d) {
+				var info = d[0];
+				this.new_info.gender_name = info.label;
+				this.new_info.gender = info.value;
+			},
+			getindustryId(d) {
+				console.log(d);
+				var info = d[0];
+				this.formData.industrynew_id_name = info.label;
+				this.new_info.industrynew_id = info.value;
+			},
+			birth_time_chick(d) {
+				console.log(d);
+				this.formData.birth_time = d.date;
+				this.formData.birth_time_name = d.date;
+			},
+			jiantuan_time_chick(d) {
+				this.formData.jiantuan_time_name = d.date;
+				this.formData.jiantuan_time = d.date;
+			},
+			one_next() {
+				if (!this.checked1) {
+					uni.showToast({
+						title: '请同意入会协议',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				this.current = 2;
+			},
+			getPlan() {
+				positionList({
+						association_id: this.Gid,
+					})
+					.then(res => {
+						if (res.code == 1) {
+							var key = res.data;
+							const transformedSelectList = key.map(item => ({
+								value: item.id,
+								label: item.position_name
+							}));
+							this.positionList = transformedSelectList;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getAssociationInfo() {
+				associationInfo({
+						association_id: this.Gid,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							if (key.association_desc.indexOf("<img") != -1) {
+								key.association_desc = getApp().addWidthToImages(key.association_desc);
+							}
+							this.info = key;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			newSubmit() {
+				this.new_info.phone = this.userInfo.phone;
+				if (this.new_info.phone == '') {
+					uni.showToast({
+						title: '请填写手机号码！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				const phoneNumberRegex = /^1[3-9]\d{9}$/;
+				if (!phoneNumberRegex.test(this.new_info.phone)) {
+					uni.showToast({
+						title: '手机号码输入有误！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.new_info.nikename == '') {
+					uni.showToast({
+						title: '请填写真实姓名！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.new_info.gender == '' || this.new_info.gender == 0) {
+					uni.showToast({
+						title: '请选择性别！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.new_info.enterprise_name == '') {
+					uni.showToast({
+						title: '请填写企业名称！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.new_info.industrynew_id == '' || this.new_info.industrynew_id == 0) {
+					uni.showToast({
+						title: '请选择行业！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.new_info.reason == '' || this.new_info.reason == 0) {
+					uni.showToast({
+						title: '请填写申请理由！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				this.new_info.association_id = this.Gid;
+				this.new_info.openid = uni.getStorageSync('openid');
+				loginAdd(this.new_info)
+					.then(res => {
+						if (res.code == 1) {
+							uni.showModal({
+								title: '提示',
+								content: '申请成功，请关注站内信通知！',
+								success: function(res) {
+									uni.navigateTo({
+										url: '/pages/index/index'
+									});
+								}
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'error',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			submit() {
+				if (this.formData.business_license_image == '') {
+					uni.showToast({
+						title: '请上传营业执照！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.unified_code == '') {
+					uni.showToast({
+						title: '请输入统一社会信用代码！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.enterprise_nature == '') {
+					uni.showToast({
+						title: '请输入企业性质！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.industry_id == null) {
+					uni.showToast({
+						title: '请选择行业！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.enterprise_website == '') {
+					uni.showToast({
+						title: '请输入企业网址！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.if_list == null) {
+					uni.showToast({
+						title: '请选择是否上市！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.employee == '') {
+					uni.showToast({
+						title: '请输入员工人数！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.enterprise_location == '') {
+					uni.showToast({
+						title: '请输入企业注册地！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.previous_revenue == '') {
+					uni.showToast({
+						title: '请输入上年度营业额！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.previous_tax == '') {
+					uni.showToast({
+						title: '请输入上年度纳税额！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.previous_profit == '') {
+					uni.showToast({
+						title: '请输入上年度净利润！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.previous_donation == '') {
+					uni.showToast({
+						title: '请输入上年度公益性捐赠支出！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.qitaqiyerenzhiqingkuang == '') {
+					uni.showToast({
+						title: '请输入其他企业任职情况！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.enterprise_Introduction == '') {
+					uni.showToast({
+						title: '请输入企业介绍！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.introdiction == '') {
+					uni.showToast({
+						title: '请输入业务介绍！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.enterprise_honor == '') {
+					uni.showToast({
+						title: '请输入企业所获荣誉以及专利！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.if_organization == null) {
+					uni.showToast({
+						title: '是否建立团组织！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.formData.if_organization == 0) {
+					if (this.formData.nature == '') {
+						uni.showToast({
+							title: '请输主团组织性质！',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+					if (this.formData.jiantuan_time == '') {
+						uni.showToast({
+							title: '请输入建团时间！',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+					if (this.formData.jiantuan_number == '') {
+						uni.showToast({
+							title: '请输入建团人数！',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+					if (this.formData.youth_number == '') {
+						uni.showToast({
+							title: '请输入青年人数！',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+					if (this.formData.superior_nature == '') {
+						uni.showToast({
+							title: '请输入上级团组织！',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+					if (this.formData.tuanweifuzerenxinxi == '') {
+						uni.showToast({
+							title: '请输入团委负责人信息！',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+					if (this.formData.documents_file == '') {
+						uni.showToast({
+							title: '请上传批复文件！',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+				}
+				this.formData.association_id = this.id;
+				loginAdd(this.formData)
+					.then(res => {
+						if (res.code == 1) {
+							uni.showToast({
+								title: '申请成功，请关注站内信通知！',
+								icon: 'success',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'error',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			// 跳转
+			tn(e) {
+				uni.navigateTo({
+					url: e,
+				});
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					// uni.$emit('depId', {
+					// 	index: 3
+					// })
+					uni.navigateBack();
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/* 底部悬浮按钮 start*/
+	.tn-tabbar-height {
+		min-height: 100rpx;
+		height: calc(120rpx + env(safe-area-inset-bottom) / 2);
+	}
+
+	.tn-footerfixed {
+		position: fixed;
+		width: 100%;
+		bottom: calc(30rpx + env(safe-area-inset-bottom));
+		z-index: 1024;
+		box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
+
+	}
+
+	/* 底部悬浮按钮 end*/
+
+	/* 标签内容 start*/
+	.tn-tag-content {
+		&__item {
+			display: inline-block;
+			line-height: 45rpx;
+			padding: 10rpx 30rpx;
+			margin: 20rpx 20rpx 5rpx 0rpx;
+
+			&--prefix {
+				padding-right: 10rpx;
+			}
+		}
+	}
+
+	/* 标签内容 end*/
+</style>
\ No newline at end of file
diff --git a/pages/packageA/user/events_my.vue b/pages/packageA/user/events_my.vue
new file mode 100644
index 0000000..fb2f3d1
--- /dev/null
+++ b/pages/packageA/user/events_my.vue
@@ -0,0 +1,104 @@
+<template>
+	<view style="letter-spacing: 1rpx;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'我参与的活动'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="padding:10px 30rpx;">
+				<view v-for="(item,index) in list" class="tn-flex tn-flex-row-between"
+					@click="openUrl('/pages/index/event_info?id='+item.activity_id)"
+					style="background-color: #ffffff;padding: 20rpx;border-radius: 10rpx;margin-bottom: 30rpx;box-shadow: rgba(12, 0, 5, 0.1) 0px 0px 5px 0px;">
+					<view style="position:relative;">
+						<view class="tn-text-ellipsis-2" style="font-size: 28rpx;">{{item.activity_name}}</view>
+						<view class="tn-flex tn-flex-row-between"
+							style="position: absolute;bottom: 0rpx;width:420rpx;color: #808080;">
+							<view style="font-size: 24rpx;padding-top: 8rpx;">{{item.application_time}}</view>
+							<view style="margin-left: 10rpx">
+								<tn-button v-if="item.type=='未开始'" padding="0px" width="100rpx" height="40rpx" size="sm"
+									backgroundColor="#6BC7F0 " fontColor="tn-color-white">未开始</tn-button>
+								<tn-button v-if="item.type=='进行中'" padding="0px" width="100rpx" height="40rpx" size="sm"
+									backgroundColor="#EE9556 " fontColor="tn-color-white">进行中</tn-button>
+								<tn-button v-if="item.type=='已结束'" padding="0px" width="100rpx" height="40rpx" size="sm"
+									backgroundColor="#E12B33 " fontColor="tn-color-white">已结束</tn-button>
+							</view>
+						</view>
+					</view>
+					<view style="margin-left: 20rpx;">
+						<image :src="apiImgUrl+item.activity_image"
+							style="width: 200rpx;height: 135rpx;border-radius: 10rpx;">
+						</image>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		UserApplication
+	} from "@/util/api";
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				topCurrent: 0,
+				list: [],
+				apiImgUrl: this.$store.state.imgUrl,
+			}
+		},
+		onLoad() {
+			var uid = uni.getStorageSync('uid');
+			this.uid = uid;
+			this.getUserApplication();
+		},
+		methods: {
+			getUserApplication() {
+				UserApplication({
+						member_id: this.uid
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.list = res.data;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			openUrl(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/packageA/user/my_apply.vue b/pages/packageA/user/my_apply.vue
new file mode 100644
index 0000000..f2cbc46
--- /dev/null
+++ b/pages/packageA/user/my_apply.vue
@@ -0,0 +1,108 @@
+<template>
+	<view style="letter-spacing: 1rpx;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'入会申请记录'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 20+'px'}">
+			<view style="padding:0rpx 30rpx 180rpx 30rpx;">
+				<view
+					style="position: relative;box-shadow: rgba(12, 0, 5, 0.1) 0px 0px 5px 0px;background-color: #ffffff;"
+					@click="openUrl('/pages/index/pizz_info?id='+userInfo.association_id)">
+					<view class="tn-flex tn-flex-center tn-flex-col-center"
+						style="background-color: #ffffff;padding:60rpx 30rpx;border-radius: 15rpx;margin-bottom: 20rpx;">
+						<view>
+							<image :src="apiImgUrl+userInfo.association_image" style="width: 100rpx;height: 100rpx;border-radius: 50%;">
+							</image>
+						</view>
+						<view style="margin-left: 20rpx;">
+							<view style="font-size: 31rpx;font-weight: 600;letter-spacing: 5rpx;">{{userInfo.association_name}}</view>
+							<view style="font-size: 24rpx;color: #808080;margin-top: 15rpx;">成立时间：{{userInfo.association_createtime}}</view>
+						</view>
+					</view>
+					<view v-if="userInfo.status==0"
+						style="font-size: 20rpx;color: #ffffff;background-color: #FBBD12;position: absolute;top: 0;right: 0;border-radius: 0px 15rpx 0px 15rpx;padding:10rpx 10rpx;">
+						<text class="tn-icon-success-circle-fill" style="vertical-align: middle;"></text>
+						<text style="vertical-align: middle;margin-left: 5rpx;">审核中</text>
+					</view>
+          <view v-if="userInfo.status==1"
+                style="font-size: 20rpx;color: #ffffff;background-color: #31C9E8;position: absolute;top: 0;right: 0;border-radius: 0px 15rpx 0px 15rpx;padding:10rpx 10rpx;">
+            <text class="tn-icon-success-circle-fill" style="vertical-align: middle;"></text>
+            <text style="vertical-align: middle;margin-left: 5rpx;">正式会员</text>
+          </view>
+          <view v-if="userInfo.status==2"
+                style="font-size: 20rpx;color: #ffffff;background-color: #FF7043;position: absolute;top: 0;right: 0;border-radius: 0px 15rpx 0px 15rpx;padding:10rpx 10rpx;">
+            <text class="tn-icon-success-circle-fill" style="vertical-align: middle;"></text>
+            <text style="vertical-align: middle;margin-left: 5rpx;">被拒绝</text>
+          </view>
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+import {getUserIndex, loginDo} from "@/util/api";
+import store from "@/store";
+	export default {
+		data() {
+			return {
+				topCurrent: 0,
+        userInfo:{},
+        uid:0,
+        apiImgUrl:this.$store.state.imgUrl,
+			}
+		},
+    onLoad() {
+      var uid = uni.getStorageSync('uid');
+      this.uid=uid;
+      this.getUserInfo();
+    },
+		methods: {
+      getUserInfo(){
+        getUserIndex({member_id:this.uid})
+            .then(res => {
+              console.log(res);
+              if(res.code==1){
+                this.userInfo = res.data;
+              }
+            })
+            .catch(error => {
+              uni.showToast({
+                title: error,
+                icon: 'none',
+                duration: 2000
+              });
+            })
+      },
+			openUrl(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/packageA/user/my_card.vue b/pages/packageA/user/my_card.vue
new file mode 100644
index 0000000..68bd7a9
--- /dev/null
+++ b/pages/packageA/user/my_card.vue
@@ -0,0 +1,604 @@
+<template>
+	<view class="page-c">
+		<tn-nav-bar :isBack="false" backTitle="" :alpha="true" :bottomShadow="false">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;color: #ffffff"></text>
+				</view>
+				<view class="tn-margin-top" @click="goBack()">
+					<tn-tabs :list="[{name:'会员名片'}]" :current="topCurrent" activeColor="#ffffff" :bold="false"
+						:fontSize="24"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view style="height: 550rpx;">
+			<view style="width: 100%;height: 450rpx;position: absolute;top: 0;">
+				<image
+						src="https://ysx.0rui.cn/h5/static/personLogoBg.png" style="width: 100%;height: 450rpx;opacity: 0.8;" mode="">
+				</image>
+				<!-- <image v-if="userThisInfo.background_image==''||userThisInfo.background_image==null"
+					src="https://ysx.hschool.com.cn/uploads/bj.png" style="width: 100%;height: 450rpx;opacity: 0.8;"> -->
+				<!-- <image v-if="userThisInfo.background_image==''||userThisInfo.background_image==null"
+						src="https://ysx.0rui.cn/uploads/bj.png" style="width: 100%;height: 450rpx;opacity: 0.8;">
+				</image>
+				<image v-if="userThisInfo.background_image!=''&&userThisInfo.background_image!=null"
+					:src="apiImgUrl+userThisInfo.background_image" style="width: 100%;height: 450rpx;opacity: 0.8;">
+				</image> -->
+				<view style="bottom:-105rpx;position: absolute;left: 28rpx;">
+					<view class="tn-flex tn-flex-center tn-flex-col-center">
+						<view style="width: 170rpx;height: 170rpx;position: relative;">
+							<image v-if="userThisInfo.gender === 1" src="https://ysx.0rui.cn/h5/static/man.png"
+								style="width: 100rpx;height: 100rpx;border-radius:50%;">
+							</image>
+							<image v-else src="https://ysx.0rui.cn/h5/static/weman.png"
+								style="width: 100rpx;height: 100rpx;border-radius:50%;">
+							</image>
+							<!-- <image v-if="userThisInfo.photo_image!=null" :src="apiImgUrl+userThisInfo.photo_image"
+								mode="aspectFill" style="width: 170rpx;height: 170rpx;border-radius: 50%;"></image>
+							<image v-if="userThisInfo.photo_image==null" src="/static/def.png" mode="aspectFill"
+								style="width: 170rpx;height: 170rpx;border-radius: 50%;"></image> -->
+						</view>
+						<view style="margin-left: 10rpx;margin-top: 30rpx;">
+							<view style="font-size: 35rpx;color: #000000;font-weight: 600">{{userThisInfo.nikename}}
+							</view>
+							<view style="font-size: 28rpx;margin-top: 10rpx;">
+								<text>协会职务：{{userThisInfo.position_name==null||userThisInfo.position_name==''?'无':userThisInfo.position_name}}</text>
+								<text style="margin-left: 40rpx">性别：{{userThisInfo.gender==0?'女':'男'}}</text>
+							</view>
+							<!-- <view style="margin-top: 10rpx" v-if="userThisInfo.if_tongyi==0">
+								联系方式：{{userThisInfo.phone}}</view>
+							<view style="margin-top: 10rpx" v-if="userThisInfo.if_tongyi!=0">联系方式：***********</view> -->
+							<view style="margin-top: 10rpx">联系方式：***********</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view style="padding: 30rpx 30rpx 240rpx 30rpx;">
+			<view style="font-size: 30rpx;font-weight: 600;margin-bottom: 20rpx">个人经历</view>
+			<view style="background-color: #ffffff;border-radius: 15rpx;width: 100%;margin: 0 auto;">
+				<view style="padding: 20rpx;line-height: 50rpx;">
+					<view class="tn-text-ellipsis-5" @click="editInfo=true;editType=1">
+						<!-- {{userThisInfo.introduction}} -->
+						{{userThisInfo.introduction==''||userThisInfo.introduction==null?'无':userThisInfo.introduction}}
+					</view>
+				</view>
+			</view>
+			<view style="font-size: 30rpx;font-weight: 600;margin-bottom: 20rpx;margin-top: 30rpx">企业介绍</view>
+			<view style="background-color: #ffffff;border-radius: 15rpx;width: 100%;margin: 0 auto;">
+				<view class="tn-flex tn-flex-center tn-flex-col-center" style="padding: 20rpx;">
+					<view style="padding-left: 20rpx">
+						<image v-if="userThisInfo.company_image!=''" :src="apiImgUrl+userThisInfo.company_image"
+							mode="aspectFill" style="width: 160rpx;height: 160rpx;"></image>
+						<view v-if="userThisInfo.company_image==''"
+							style="width: 160rpx;height: 160rpx;background: #d9d9d9;"></view>
+					</view>
+					<view style="font-size: 24rpx;color: #666666;margin-left: 30rpx;">
+						<view style="font-size: 36rpx;font-weight: 600;color: #000000">
+							{{userThisInfo.enterprise_name==null||userThisInfo.enterprise_name==''?'未填写':userThisInfo.enterprise_name}}
+						</view>
+						<view style="margin: 15rpx 0rpx">
+							所属行业：{{userThisInfo.industry_id==-1?'其他行业':userThisInfo.industry_name}}</view>
+						<view>
+							企业地址：{{userThisInfo.enterprise_location==null||userThisInfo.enterprise_location==''?'无':userThisInfo.enterprise_location}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view style="background-color: #ffffff;border-radius: 15rpx;width: 100%;margin: 0 auto;margin-top: 30rpx;">
+				<view style="padding: 20rpx;line-height: 50rpx;" @click="editInfo=true;editType=2">
+					<view class="tn-text-ellipsis-10">
+						{{userThisInfo.enterprise_Introduction==null||userThisInfo.enterprise_Introduction==''?'无':userThisInfo.enterprise_Introduction}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="tn-flex" style="width: 100%;position: fixed;bottom: 0;">
+			<view style="background: #418ef2;height: 100rpx;text-align: center;line-height: 100rpx;color: #ffffff;"
+				class="tn-flex-8" @click="addModeShow">
+				{{userThisInfo.if_tongyi!=0?'申请查看联系方式':'立刻联系'}}
+			</view>
+			<view style="background: #ffffff;height: 100rpx;text-align: center;line-height: 100rpx;" class="tn-flex-4">
+				<tn-button openType="share" backgroundColor="#ffffff">
+					<text class="tn-icon-send-fill" style="color: #418ef2;font-size: 40rpx;"></text>
+				</tn-button>
+			</view>
+		</view>
+		<view class="bg-tabbar-shadow"></view>
+		<tn-modal v-model="addMod" :custom="true">
+			<view class="custom-modal-content">
+				<view style="text-align: center;font-size: 34rpx;">申请查看</view>
+				<view class="text">
+					<tn-form ref="form" :labelWidth="180">
+						<tn-form-item label="自我介绍" prop="content">
+							<tn-input type="text" placeholder="填写自我介绍" v-model="addData.content" />
+						</tn-form-item>
+					</tn-form>
+					<view style="text-align: center;margin-top: 30rpx;">
+						<tn-button backgroundColor="#E6E6E6" fontColor="#ffffff" @click="addMod = false">取消</tn-button>
+						<tn-button backgroundColor="tn-bg-blue" fontColor="tn-color-white" style="margin-left: 30rpx"
+							@click="add_log">确定
+						</tn-button>
+					</view>
+				</view>
+			</view>
+		</tn-modal>
+		<tn-popup v-model="editInfo" mode="right" width="100%">
+			<tn-nav-bar :isBack="false" backTitle="" :alpha="true" :bottomShadow="false">
+				<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+					<view style="padding-left: 15rpx;" @click="editInfo = false">
+						<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+					</view>
+					<view class="tn-margin-top"
+						style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+						<tn-tabs :list="[{name:editType==1?'个人经历':'公司介绍'}]" :current="topCurrent" activeColor="#000"
+							:bold="false" :fontSize="24"></tn-tabs>
+					</view>
+				</view>
+			</tn-nav-bar>
+			<view style="background: rgba(242, 241, 246, 1);height: 100%;">
+				<view :style="{paddingTop: vuex_custom_bar_height +'px'}"></view>
+				<view style="margin:30rpx;background-color: #ffffff;border-radius: 40rpx;">
+					<scroll-view scroll-y="true" style="height: 600rpx;padding: 30rpx;">
+						<view style="line-height: 45rpx;">
+							<view v-if="editType==1">
+								{{userThisInfo.introduction==''||userThisInfo.introduction==null?'无':userThisInfo.introduction}}
+							</view>
+							<view v-if="editType==2">
+								{{userThisInfo.enterprise_Introduction==''||userThisInfo.enterprise_Introduction==null?'无':userThisInfo.enterprise_Introduction}}
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<view class="tn-flex tn-flex-center tn-flex-row-center" style="color: #ffffff;">
+					<view @click="editInfo = false"
+						style="width: 300rpx;height: 80rpx;background: #d9d9d9;text-align: center;line-height: 80rpx;">
+						关闭</view>
+				</view>
+			</view>
+		</tn-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getUserIndex,
+		setMaillogAdd
+	} from "@/util/api";
+	import store from "@/store";
+
+	export default {
+		data() {
+			return {
+				addMod: false,
+				topCurrent: 0,
+				uid: 0,
+				this_uid: 0,
+				userInfo: {},
+				userThisInfo: {},
+				apiImgUrl: this.$store.state.imgUrl,
+				is: false,
+				editInfo: false,
+				editType: 1,
+				addData: {
+					content: '',
+					association_id: store.state.Gid,
+					member_q_id: 0,
+					member_b_id: 0,
+					type: 1
+				}
+			}
+		},
+		onLoad(d) {
+			this.this_uid = d.id;
+			var uid = uni.getStorageSync('uid');
+			console.log(uid);
+			if (!uid) {
+				getApp().getUserLogin((r) => {
+					console.log('---Login---', r);
+					this.uid = r.id;
+				})
+			} else {
+				this.uid = uid;
+			}
+			if (typeof(d.gid) != 'undefined') {
+				store.commit('$tStore', {
+					name: 'Gid',
+					value: d.gid
+				})
+				uni.setStorageSync('Gid', d.gid);
+			}
+			this.getUserInfo();
+		},
+		onShareAppMessage(res) {
+			var info = this.info;
+			console.log(info);
+			return {
+				title: this.userThisInfo.nikename,
+				path: '/pages/packageA/user/my_card?id=' + this.userThisInfo.member_id + '&gid=' + this.userThisInfo
+					.association_id,
+				imageUrl: this.apiImgUrl + this.userThisInfo.photo_image
+			}
+		},
+		onShareTimeline() { // 分享到朋友圈
+			return {
+				title: this.userThisInfo.nikename,
+				path: '/pages/packageA/user/my_card?id=' + this.userThisInfo.member_id + '&gid=' + this.userThisInfo
+					.association_id,
+				imageUrl: this.apiImgUrl + this.userThisInfo.photo_image
+			}
+		},
+		methods: {
+			addModeShow() {
+				var uid = uni.getStorageSync('uid');
+				if (!uid) {
+					uni.showToast({
+						title: '请登录！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				if (this.userThisInfo.if_tongyi == 0) {
+					this.callPhone();
+					return;
+				}
+				this.addMod = true;
+			},
+			add_log() {
+				var uid = uni.getStorageSync('uid');
+				if (!uid) {
+					uni.showToast({
+						title: '请登录！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				this.addData.member_q_id = this.uid;
+				this.addData.member_b_id = this.this_uid;
+				setMaillogAdd(this.addData)
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							uni.showToast({
+								title: '申请成功！',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+						this.addMod = false;
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			callPhone() {
+				// 电话号码为示例，请替换为实际需要拨打的号码
+				const phoneNumber = this.userThisInfo.phone;
+				uni.makePhoneCall({
+					phoneNumber: phoneNumber, // 电话号码
+					success: function() {
+						console.log('拨打电话成功');
+					},
+					fail: function() {
+						console.log('拨打电话失败');
+					}
+				});
+			},
+			getUserInfo() {
+				getUserIndex({
+						member_b_id: this.this_uid,
+						member_id: this.uid ? this.uid : 0,
+					})
+					.then(res => {
+						console.log(res)
+						if (res.code == 1) {
+							this.userThisInfo = res.data;
+							// if (this.this_uid != this.uid) {
+							// 	this.getThisUserInfo();
+							// } else {
+							// 	this.is = true;
+							// 	this.userThisInfo = res.data;
+							// }
+
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			openUrl(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page-c {
+		background-color: #EBF4F7;
+		min-height: 100vh;
+		// background-image: url('../../../static/characterIntroductionGg.png');
+		// background-size: 100% 100%;
+	}
+
+	/* 底部安全边距 start*/
+	.tn-tabbar-height {
+		min-height: 120rpx;
+		height: calc(140rpx + env(safe-area-inset-bottom) / 2);
+		height: calc(140rpx + constant(safe-area-inset-bottom));
+	}
+
+	.tn-footerfixed {
+		position: fixed;
+		width: 100%;
+		bottom: calc(180rpx + env(safe-area-inset-bottom));
+		z-index: 1024;
+		box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
+
+	}
+
+	/* 按钮 */
+	.button-1 {
+		background-color: rgba(0, 0, 0, 0.15);
+		position: fixed;
+		/* bottom:200rpx;
+    right: 20rpx; */
+		bottom: 27%;
+		right: 30rpx;
+		z-index: 1001;
+		border-radius: 100px;
+	}
+
+	.button-2 {
+		background-color: rgba(0, 0, 0, 0.15);
+		position: fixed;
+		/* bottom:200rpx;
+    right: 20rpx; */
+		bottom: 18%;
+		right: 30rpx;
+		z-index: 1001;
+		border-radius: 100px;
+	}
+
+	/* 图标容器15 start */
+	.icon15 {
+		&__item {
+			width: 30%;
+
+			border-radius: 10rpx;
+			padding: 30rpx;
+			margin: 20rpx 10rpx;
+			transform: scale(1);
+			transition: transform 0.3s linear;
+			transform-origin: center center;
+
+			&--icon {
+				width: 100rpx;
+				height: 100rpx;
+				font-size: 50rpx;
+				border-radius: 50%;
+				margin-bottom: 18rpx;
+				z-index: 1;
+
+				&::after {
+					content: " ";
+					position: absolute;
+					z-index: -1;
+					width: 100%;
+					height: 100%;
+					left: 0;
+					bottom: 0;
+					border-radius: inherit;
+					opacity: 1;
+					transform: scale(1, 1);
+					background-size: 100% 100%;
+
+
+				}
+			}
+		}
+	}
+
+
+	/* 相册 */
+	.slideshow {
+		overflow: hidden;
+		text-align: center;
+	}
+
+
+	/* 简历内容 */
+	.king-list {
+		display: block;
+		// background-color: #ffffff;
+	}
+
+	.king-list .king-icon {
+		width: 100%;
+		text-align: left;
+		padding: 20rpx 0 20rpx 37rpx;
+		font-size: 26rpx;
+		color: #888;
+		display: block;
+	}
+
+	.king-list>.king-item {
+		padding: 30rpx 30rpx 30rpx 120rpx;
+		position: relative;
+		display: block;
+		z-index: 0;
+	}
+
+	.king-list>.king-item::after {
+		content: "";
+		display: block;
+		position: absolute;
+		width: 1rpx;
+		background-color: #E6E6E6;
+		left: 60rpx;
+		height: 100%;
+		top: 0;
+		z-index: 8;
+	}
+
+	.king-list>.king-item::before {
+		display: block;
+		position: absolute;
+		top: 36rpx;
+		z-index: 9;
+		background-color: #ffffff;
+		width: 50rpx;
+		height: 50rpx;
+		text-align: center;
+		border: none;
+		line-height: 50rpx;
+		left: 36rpx;
+	}
+
+
+	/* 名片微调 */
+	.img-solid {
+		border: 1rpx solid #eee;
+	}
+
+	.share-img {
+		position: fixed;
+		/* padding: 10rpx; */
+		width: 100rpx;
+		height: 100rpx;
+		/* top: 680rpx; */
+		bottom: 200rpx;
+		right: 20rpx;
+		z-index: 1024;
+		opacity: 0.8;
+		box-shadow: 0rpx 8rpx 30rpx 0rpx rgba(0, 0, 0, 0.3);
+		border: none;
+		border: 6rpx solid rgba(255, 255, 255, 0);
+	}
+
+	.resume {
+		display: flex;
+		justify-content: space-between;
+		padding-top: 10rpx;
+		border-radius: 6rpx;
+		color: #666;
+		line-height: 1.6;
+	}
+
+	.resume+.resume {
+		margin-top: 20rpx;
+	}
+
+	.resume2 {
+		padding-top: 10rpx;
+		border-radius: 6rpx;
+		display: block;
+		color: #666;
+		line-height: 1.6;
+		text-align: justify;
+	}
+
+	/* 间隔线 start*/
+	.tn-strip-bottom {
+		width: 100%;
+		border-bottom: 5rpx solid #ffffff;
+	}
+
+	/* 间隔线 end*/
+
+
+	.bg-img-cont {
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		height: 350rpx;
+		margin: 20rpx 0;
+		border-radius: 8rpx;
+	}
+
+
+	// .button-no {
+	//   border: none;
+	//   width: 100%;
+	//   height: 100%;
+	//   background-color: rgba(0, 0, 0, 0);
+	// }
+
+
+	/* 标签内容 start*/
+	.tn-tag-content {
+		&__item {
+			display: inline-block;
+			line-height: 45rpx;
+			padding: 10rpx 30rpx;
+			margin: 0rpx 20rpx 25rpx 0rpx;
+
+			&--prefix {
+				padding-right: 10rpx;
+			}
+		}
+	}
+
+	/* 标签内容 end*/
+
+	.see {
+		display: flex;
+		justify-content: space-between;
+		padding-top: 10rpx;
+		border-radius: 6rpx;
+		color: #666;
+		line-height: 1.6;
+	}
+
+	/* 显示5行 */
+	.tn-text-ellipsis-5 {
+		display: -webkit-box;
+		overflow: hidden;
+		white-space: normal !important;
+		text-overflow: ellipsis;
+		word-wrap: break-word;
+		-webkit-line-clamp: 5;
+		-webkit-box-orient: vertical;
+	}
+
+	/* 显示5行 */
+	.tn-text-ellipsis-10 {
+		display: -webkit-box;
+		overflow: hidden;
+		white-space: normal !important;
+		text-overflow: ellipsis;
+		word-wrap: break-word;
+		-webkit-line-clamp: 10;
+		-webkit-box-orient: vertical;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/packageA/user/my_card_holder.vue b/pages/packageA/user/my_card_holder.vue
new file mode 100644
index 0000000..b801a98
--- /dev/null
+++ b/pages/packageA/user/my_card_holder.vue
@@ -0,0 +1,98 @@
+<template>
+	<view class="template-edit tn-safe-area-inset-bottom">
+		<!-- 顶部自定义导航 -->
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'名片夹'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view v-for="(item,index) in list" :key="index" class="wallpaper-shadow tn-margin tn-padding">
+				<view @click="tn('/pages/packageA/user/my_card?id='+item.id)"
+					class="tn-classify__content__sub-classify__content__item tn-flex tn-flex-center  tn-flex-col-center">
+					<!-- 标题，有需要可以显示出来 -->
+					<view style="width: 100rpx;height: 100rpx">
+						<image :src="apiImgUrl+item.photo_image"
+							style="width: 100rpx;height: 100rpx;border-radius:50%;">
+						</image>
+					</view>
+					<view style="margin-left: 20rpx;">
+						<view style="font-size: 28rpx;">
+							<text>{{item.nikename}}</text>
+							<text style="margin-left: 50rpx;">{{item.phone}}</text>
+						</view>
+						<view class="tn-text-ellipsis-2" style="font-size: 24rpx;margin-top: 10rpx;">
+							<text>{{item.enterprise_name}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		businessCard
+	} from "@/util/api";
+	import store from "@/store";
+
+	export default {
+		data() {
+			return {
+				uid: 0,
+				apiImgUrl: this.$store.state.imgUrl,
+				list: []
+			}
+		},
+		onLoad() {
+			var uid = uni.getStorageSync('uid');
+			this.uid = uid;
+			this.getBusinessCard();
+		},
+		methods: {
+			tn(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+			getBusinessCard() {
+				businessCard({
+						member_id: this.uid
+					})
+					.then(res => {
+						console.log(res);
+						this.list = res.data;
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/packageA/user/my_desc.vue b/pages/packageA/user/my_desc.vue
new file mode 100644
index 0000000..0d3e37a
--- /dev/null
+++ b/pages/packageA/user/my_desc.vue
@@ -0,0 +1,82 @@
+<template>
+	<view style="letter-spacing: 1rpx;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:info.association_name}]" :current="topCurrent" activeColor="#000"
+						:bold="false" :fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="padding: 30rpx;line-height: 50rpx;">
+				<view style="text-align: center;font-size: 35rpx;font-weight: 600;">协会服务</view>
+				<view v-html="info.association_guizhang"></view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		associationInfo,
+		UserApplication
+	} from "@/util/api";
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				topCurrent: 0,
+				info: {}
+			}
+		},
+		onLoad() {
+			this.getAssociationInfo();
+		},
+		methods: {
+			getAssociationInfo() {
+				console.log('discovery');
+				var u = uni.getStorageSync('userInfo');
+				associationInfo({
+						association_id: u.association_id,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							if (key.association_guizhang.indexOf("<img") != -1) {
+								key.association_guizhang = getApp().addWidthToImages(key.association_guizhang);
+							}
+							this.info = key;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/packageA/user/my_edit.vue b/pages/packageA/user/my_edit.vue
new file mode 100644
index 0000000..9a69edd
--- /dev/null
+++ b/pages/packageA/user/my_edit.vue
@@ -0,0 +1,674 @@
+<template>
+	<view class="tn-safe-area-inset-bottom" style="background: rgba(242, 241, 246, 1);">
+		<!-- 顶部自定义导航 -->
+		<tn-nav-bar :isBack="false" backTitle="" :alpha="true" :bottomShadow="false">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top" @click="goBack()"
+					style="text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'信息修改'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="24"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view style="width: 100%;height: 450rpx;position: absolute;top: 0;">
+			<image v-if="addMod.background_image==''" src="/static/my.png" style="width: 100%;height: 450rpx;"></image>
+			<image v-if="addMod.background_image!=''" :src="apiImgUrl+addMod.background_image"
+				style="width: 100%;height: 450rpx;"></image>
+			<view style="bottom: 28rpx;position: absolute;left: 28rpx;">
+				<view @click="d_img(1)" style="width: 150rpx;height: 150rpx;position: relative;">
+					<image :src="apiImgUrl+addMod.photo_image" mode="aspectFill"
+						style="width: 150rpx;height: 150rpx;border-radius: 50%;"></image>
+					<image src="/static/pic.png"
+						style="height: 50rpx;width: 50rpx;position: absolute;right: 0;bottom: 0;">
+					</image>
+				</view>
+			</view>
+			<view style="bottom: 50rpx;right: 28rpx;position: absolute;">
+				<tn-button @click="d_img(3)" shape="round" padding="10rpx 40rpx" backgroundColor="#ffffff"
+					fontColor="rgba(65, 142, 242, 1);">更改背景</tn-button>
+			</view>
+		</view>
+		<view class="tn-margin-top" style="padding-top: 450rpx;z-index:1;">
+			<view style="font-size: 32rpx;color: rgba(119, 119, 119, 1);padding:25rpx 0rpx 30rpx 50rpx;">个人资料</view>
+			<view style="padding: 0px 30rpx;;">
+				<tn-list-view :customTitle="true" backgroundColor="transparent">
+					<view slot="title" class="tn-flex tn-flex-row-between" style="padding: 30rpx" @click="openMode(0)">
+						<view style="font-size: 32rpx;color: #000000;font-weight: 500;">姓名</view>
+						<view class="tn-flex tn-flex-row-right tn-flex-center tn-flex-col-center">
+							<view style="font-size: 28rpx; color: rgba(102, 102, 102, 1);">{{addMod.nikename}}</view>
+							<view class="tn-icon-right" style="margin-left: 20rpx;"></view>
+						</view>
+					</view>
+				</tn-list-view>
+				<tn-list-view :customTitle="true" backgroundColor="transparent">
+					<view slot="title" class="tn-flex tn-flex-row-between" style="padding: 30rpx"
+						@click="position_id_show = true">
+						<view style="font-size: 32rpx;color: #000000;font-weight: 500;">协会职务</view>
+						<view class="tn-flex tn-flex-row-right tn-flex-center tn-flex-col-center">
+							<view style="font-size: 28rpx; color: rgba(102, 102, 102, 1);">{{position_id_name}}</view>
+							<view class="tn-icon-right" style="margin-left: 20rpx;"></view>
+						</view>
+					</view>
+					<tn-select v-model="position_id_show" mode="single" :list="position_list"
+						@confirm="getpositionId"></tn-select>
+				</tn-list-view>
+				<!-- <tn-list-view :customTitle="true" backgroundColor="transparent">
+					<view slot="title" class="tn-flex tn-flex-row-between" style="padding: 30rpx"
+						@click="region_id_show = true">
+						<view style="font-size: 32rpx;color: #000000;font-weight: 500;">所属区域</view>
+						<view class="tn-flex tn-flex-row-right tn-flex-center tn-flex-col-center">
+							<view style="font-size: 28rpx; color: rgba(102, 102, 102, 1);">{{region_id_name}}</view>
+							<view class="tn-icon-right" style="margin-left: 20rpx;"></view>
+						</view>
+					</view>
+					<tn-select v-model="region_id_show" mode="single" :list="region_list"
+						@confirm="getregionId"></tn-select>
+				</tn-list-view> -->
+				<tn-list-view :customTitle="true" backgroundColor="transparent">
+					<view slot="title" class="tn-flex tn-flex-row-between" style="padding: 30rpx">
+						<view style="font-size: 32rpx;color: #000000;font-weight: 500;">性别</view>
+						<view class="tn-flex tn-flex-row-right tn-flex-center tn-flex-col-center"
+							@click="sex_id_show = true">
+							<view style="font-size: 28rpx; color: rgba(102, 102, 102, 1);">{{addMod.gender==0?'女':'男'}}
+							</view>
+							<view class="tn-icon-right" style="margin-left: 20rpx;"></view>
+						</view>
+					</view>
+					<tn-select v-model="sex_id_show" mode="single" :list="sex_list" @confirm="getsexId"></tn-select>
+				</tn-list-view>
+				<tn-list-view :customTitle="true" backgroundColor="transparent">
+					<view slot="title" class="tn-flex tn-flex-row-between" style="padding: 30rpx" @click="openMode(1)">
+						<view style="font-size: 32rpx;color: #000000;font-weight: 500;">联系方式</view>
+						<view class="tn-flex tn-flex-row-right tn-flex-center tn-flex-col-center">
+							<view style="font-size: 28rpx; color: rgba(102, 102, 102, 1);">{{addMod.phone}}</view>
+							<view class="tn-icon-right" style="margin-left: 20rpx;"></view>
+						</view>
+					</view>
+				</tn-list-view>
+				<tn-list-view :customTitle="true" backgroundColor="transparent">
+					<view slot="title" class="tn-flex tn-flex-row-between" style="padding: 30rpx" @click="openMode(4)">
+						<view style="font-size: 32rpx;color: #000000;font-weight: 500;">个人经历</view>
+						<view class="tn-flex tn-flex-row-right tn-flex-center tn-flex-col-center">
+							<view
+								style="font-size: 28rpx; color: rgba(102, 102, 102, 1);width: 400rpx;text-align: right;"
+								class="tn-text-ellipsis">{{addMod.introduction}}
+							</view>
+							<view class="tn-icon-right" style="margin-left: 20rpx;"></view>
+						</view>
+					</view>
+				</tn-list-view>
+				<view style="font-size: 32rpx;color: rgba(119, 119, 119, 1);padding:25rpx 0rpx 30rpx 30rpx;">公司资料</view>
+				<tn-list-view :customTitle="true" backgroundColor="transparent">
+					<view slot="title" class="tn-flex tn-flex-row-between" style="padding: 30rpx" @click="openMode(2)">
+						<view style="font-size: 32rpx;color: #000000;font-weight: 500;">公司名称</view>
+						<view class="tn-flex tn-flex-row-right tn-flex-center tn-flex-col-center">
+							<view style="font-size: 28rpx; color: rgba(102, 102, 102, 1);">{{addMod.enterprise_name}}
+							</view>
+							<view class="tn-icon-right" style="margin-left: 20rpx;"></view>
+						</view>
+					</view>
+				</tn-list-view>
+				<tn-list-view :customTitle="true" backgroundColor="transparent">
+					<view slot="title" class="tn-flex tn-flex-row-between" style="padding: 30rpx">
+						<view style="font-size: 32rpx;color: #000000;font-weight: 500;">公司行业</view>
+						<view class="tn-flex tn-flex-row-right tn-flex-center tn-flex-col-center"
+							@click="industry_id_show = true">
+							<view style="font-size: 28rpx; color: rgba(102, 102, 102, 1);">{{industry_id_name}}</view>
+							<view class="tn-icon-right" style="margin-left: 20rpx;"></view>
+						</view>
+					</view>
+					<tn-select v-model="industry_id_show" mode="single" :list="industry_list"
+						@confirm="getindustryId"></tn-select>
+				</tn-list-view>
+				<tn-list-view :customTitle="true" backgroundColor="transparent">
+					<view slot="title" class="tn-flex tn-flex-row-between tn-flex-center tn-flex-col-center"
+						style="padding: 30rpx">
+						<view style="font-size: 32rpx;color: #000000;font-weight: 500;">公司Logo</view>
+						<view class="tn-flex tn-flex-row-right tn-flex-center tn-flex-col-center" @click="d_img(2)">
+							<view>
+								<view v-if="addMod.company_image==''">暂无</view>
+								<image v-if="addMod.company_image!=''" :src="apiImgUrl+addMod.company_image"
+									style="width: 95rpx;" mode="widthFix"></image>
+							</view>
+							<view class="tn-icon-right" style="margin-left: 20rpx;"></view>
+						</view>
+					</view>
+				</tn-list-view>
+				<tn-list-view :customTitle="true" backgroundColor="transparent">
+					<view slot="title" class="tn-flex tn-flex-row-between" style="padding: 30rpx" @click="openMode(3)">
+						<view style="font-size: 32rpx;color: #000000;font-weight: 500;">公司地址</view>
+						<view class="tn-flex tn-flex-row-right tn-flex-center tn-flex-col-center">
+							<view
+								style="font-size: 28rpx; color: rgba(102, 102, 102, 1);width: 400rpx;text-align: right;"
+								class="tn-text-ellipsis">
+								{{addMod.enterprise_location}}
+							</view>
+							<view class="tn-icon-right" style="margin-left: 20rpx;"></view>
+						</view>
+					</view>
+				</tn-list-view>
+				<tn-list-view :customTitle="true" backgroundColor="transparent">
+					<view slot="title" class="tn-flex tn-flex-row-between" style="padding: 30rpx" @click="openMode(5)">
+						<view style="font-size: 32rpx;color: #000000;font-weight: 500;">公司介绍</view>
+						<view class="tn-flex tn-flex-row-right tn-flex-center tn-flex-col-center">
+							<view
+								style="font-size: 28rpx; color: rgba(102, 102, 102, 1);width: 400rpx;text-align: right;"
+								class="tn-text-ellipsis">
+								{{addMod.enterprise_Introduction}}
+							</view>
+							<view class="tn-icon-right" style="margin-left: 20rpx;"></view>
+						</view>
+					</view>
+				</tn-list-view>
+			</view>
+			<view class="tn-flex">
+				<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
+					<tn-button backgroundColor="rgb(65, 142, 242)" shape="round" fontColor="#ffffff" padding="40rpx 0"
+						width="90%" fontBold @click="setUserEditDo">
+						<!-- <text class="tn-icon-light tn-padding-right-xs tn-color-black"></text> -->
+						<text>提交审核</text>
+					</tn-button>
+				</view>
+			</view>
+		</view>
+
+		<tn-modal v-model="editInput" :custom="true">
+			<view style="text-align: center;margin-top: 30rpx;">
+				<block v-if="editType==0">
+					<view style="text-align: center;font-size: 30rpx;margin-bottom: 20rpx;">姓名修改</view>
+					<tn-input :border="true" v-model="addMod.nikename" placeholder="请填写姓名"
+						:customStyle="{width:'400rpx'}" />
+				</block>
+				<block v-if="editType==1">
+					<view style="text-align: center;font-size: 30rpx;margin-bottom: 20rpx;">联系方式</view>
+					<tn-input :border="true" v-model="addMod.phone" placeholder="请填写联系方式"
+						:customStyle="{width:'400rpx'}" />
+				</block>
+				<block v-if="editType==2">
+					<view style="text-align: center;font-size: 30rpx;margin-bottom: 20rpx;">公司名称</view>
+					<tn-input :border="true" v-model="addMod.enterprise_name" placeholder="请填写公司名称"
+						:customStyle="{width:'400rpx'}" />
+				</block>
+				<block v-if="editType==3">
+					<view style="text-align: center;font-size: 30rpx;margin-bottom: 20rpx;">公司地址</view>
+					<tn-input :border="true" v-model="addMod.enterprise_location" placeholder="请填写公司地址"
+						:customStyle="{width:'400rpx'}" />
+				</block>
+			</view>
+			<view class="tn-flex tn-flex-row-center" style="margin-top: 50rpx;">
+				<tn-button @click="editInput = false" width="250rpx" backgroundColor="#82B2FF"
+					fontColor="#ffffff">确定</tn-button>
+			</view>
+		</tn-modal>
+		<tn-popup v-model="editText" mode="right" width="100%">
+			<tn-nav-bar :isBack="false" backTitle="" :alpha="true" :bottomShadow="false">
+				<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+					<view style="padding-left: 15rpx;" @click="editText = false">
+						<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+					</view>
+					<view class="tn-margin-top"
+						style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+						<tn-tabs :list="[{name:editType==4?'编辑个人经历':'编辑公司介绍'}]" :current="topCurrent" activeColor="#000"
+							:bold="false" :fontSize="24"></tn-tabs>
+					</view>
+				</view>
+			</tn-nav-bar>
+			<view style="background: rgba(242, 241, 246, 1);height: 100%;">
+				<view :style="{paddingTop: vuex_custom_bar_height + 20+'px'}"></view>
+				<view style="margin:30rpx;background-color: #ffffff;border-radius: 40rpx;">
+					<view style="padding: 30rpx;">
+						<tn-input v-if="editType==4" :maxLength="1000" v-model="introduction" :clearable="false"
+							:height="400" type="textarea" :customStyle="{lineHeight:'42rpx',color:'#777777'}" />
+						<tn-input v-if="editType==5" :maxLength="1000" v-model="enterprise_Introduction"
+							:clearable="false" :height="400" type="textarea"
+							:customStyle="{lineHeight:'42rpx',color:'#777777'}" />
+					</view>
+				</view>
+				<view class="tn-flex tn-flex-center tn-flex-row-center" style="color: #ffffff;">
+					<view @click="editText = false"
+						style="width: 300rpx;height: 80rpx;background: #d9d9d9;text-align: center;line-height: 80rpx;">
+						取消</view>
+					<view @click="editTextDo()"
+						style="width: 300rpx;height: 80rpx;background: #418EF2;margin-left: 48rpx;text-align: center;line-height: 80rpx;">
+						确定</view>
+				</view>
+			</view>
+		</tn-popup>
+		<l-clipper v-if="show" :image-url="imageUrl" @success="caiDo($event,1)" @cancel="show = false" />
+		<l-clipper v-if="enterprise_show" :image-url="enterpriseImageUrl" @success="caiDo($event,2)"
+			@cancel="enterprise_show = false" />
+		<l-clipper v-if="back_show" width="750" height="422" max-width="750" max-height="422" :image-url="backImageUrl"
+			@success="caiDo($event,3)" @cancel="back_show = false" />
+	</view>
+</template>
+
+<script>
+	import {
+		getUserIndex,
+		setUserEdit,
+		IndustryList,
+		getPosition,
+		getRegion
+	} from "@/util/api";
+	import store from "@/store";
+
+	export default {
+		data() {
+			return {
+				editInput: false,
+				editText: false,
+				show: false,
+				enterprise_show: false,
+				back_show: false,
+				imageUrl: '',
+				enterpriseImageUrl: '',
+				backImageUrl: '',
+				topCurrent: 0,
+				showAuthorizationModal: false,
+				index: 0,
+				date: '2000-01-29',
+				userInfo: {},
+				editType: '',
+				introduction: '',
+				enterprise_Introduction: '',
+				addMod: {
+					photo_image: '',
+					member_id: '',
+					nikename: '',
+					phone: '',
+					wx_number: '',
+					introduction: '',
+					enterprise_name: '',
+					enterprise_location: '',
+					enterprise_Introduction: '',
+					association_id: '',
+					industry_id: '',
+					company_image: '',
+					background_image: '',
+					background_type: 3,
+					position_id: '',
+					gender: 0,
+					region_id: '',
+				},
+				apiImgUrl: this.$store.state.imgUrl,
+				apiUpUrl: this.$store.state.apiUrl,
+				industry_id_show: false,
+				industry_id_name: '',
+				industry_list: [],
+				position_id_show: false,
+				position_id_name: '',
+				position_list: [],
+
+				region_id_show: false,
+				region_id_name: '',
+				region_list: [],
+
+				sex_id_show: false,
+				sex_list: [{
+					label: '女',
+					value: 0
+				}, {
+					label: '男',
+					value: 1
+				}],
+			}
+		},
+		onLoad() {
+			var uid = uni.getStorageSync('uid');
+			this.uid = uid;
+			this.getUserInfo();
+
+		},
+		methods: {
+			openMode(type) {
+				this.editType = type;
+
+				if (type < 4) {
+					this.editInput = true;
+				} else {
+					if (type == 4) {
+						this.introduction = this.addMod.introduction;
+					}
+					if (type == 5) {
+						this.enterprise_Introduction = this.addMod.enterprise_Introduction;
+					}
+					this.editText = true;
+				}
+
+			},
+			editTextDo() {
+				if (this.editType == 4) {
+					this.addMod.introduction = this.introduction;
+				}
+				if (this.editType == 5) {
+					this.addMod.enterprise_Introduction = this.enterprise_Introduction;
+				}
+				this.editText = false;
+			},
+			getindustryId(d) {
+				console.log(d);
+				var info = d[0];
+				this.industry_id_name = info.label;
+				this.addMod.industry_id = info.value;
+			},
+			getpositionId(d) {
+				console.log(d);
+				var info = d[0];
+				this.position_id_name = info.label;
+				this.addMod.position_id = info.value;
+			},
+			getregionId(d) {
+				console.log(d);
+				var info = d[0];
+				this.region_id_name = info.label;
+				this.addMod.region_id = info.value;
+			},
+			getsexId(d) {
+				var info = d[0];
+				this.addMod.gender = info.value;
+			},
+			getRegionList() {
+				getRegion({
+						association_id: this.addMod.association_id,
+					})
+					.then(res => {
+						if (res.code == 1) {
+							var key = res.data;
+							const transformedSelectList = key.map(item => ({
+								value: item.id,
+								label: item.region_name
+							}));
+							this.region_list = transformedSelectList;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getIndustry() {
+				IndustryList({
+						association_id: this.addMod.association_id,
+					})
+					.then(res => {
+						if (res.code == 1) {
+							var key = res.data;
+							var transformedSelectList = key.map(item => ({
+								value: item.id,
+								label: item.industry_name
+							}));
+							transformedSelectList.push({
+								value: -1,
+								label: '其他行业'
+							});
+							this.industry_list = transformedSelectList;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getPositionList() {
+				getPosition({
+						association_id: this.addMod.association_id,
+					})
+					.then(res => {
+						if (res.code == 1) {
+							var key = res.data;
+							const transformedSelectList = key.map(item => ({
+								value: item.id,
+								label: item.position_name
+							}));
+							this.position_list = transformedSelectList;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			caiDo(d, type) {
+				var that = this;
+				var url = d.url;
+				uni.uploadFile({
+					url: that.apiUpUrl + '/common/upload', //仅为示例，非真实的接口地址
+					filePath: url,
+					name: 'file',
+					success: (uploadFileRes) => {
+						var data = JSON.parse(uploadFileRes.data);
+						console.log(data);
+						if (type == 1) {
+							that.addMod.photo_image = data.data.url;
+							that.show = false;
+							that.imageUrl = '';
+						}
+						if (type == 2) {
+							that.addMod.company_image = data.data.url;
+							that.enterprise_show = false;
+							that.enterpriseImageUrl = '';
+						}
+						if (type == 3) {
+							that.addMod.background_image = data.data.url;
+							that.back_show = false;
+							that.backImageUrl = '';
+						}
+					}
+				});
+			},
+			d_img(type) {
+				var that = this;
+				uni.chooseMedia({
+					count: 1, //默认9
+					mediaType: ['image', 'video'],
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: function(res) {
+						console.log(res);
+						var url = res.tempFiles[0].tempFilePath;;
+						if (res.type == 'video') {
+							uni.showToast({
+								title: '暂不支持视频',
+								icon: 'none',
+								duration: 2000
+							});
+							return;
+						} else {
+							that.addMod.background_type = 2;
+							if (type == 1) {
+								that.imageUrl = url;
+								that.show = true;
+							}
+							if (type == 2) {
+								that.enterprise_show = true;
+								that.enterpriseImageUrl = url;
+							}
+							if (type == 3) {
+								that.back_show = true;
+								that.backImageUrl = url;
+							}
+						}
+					}
+				});
+			},
+			setUserEditDo() {
+				setUserEdit(this.addMod)
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							uni.showToast({
+								title: '信息已提交审核',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: res.msg,
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getUserInfo() {
+				getUserIndex({
+						member_b_id: this.uid,
+						member_id: this.uid
+					})
+					.then(res => {
+						console.log(res);
+						this.addMod = {
+							photo_image: res.data.photo_image,
+							member_id: res.data.member_id,
+							nikename: res.data.nikename,
+							phone: res.data.phone,
+							wx_number: res.data.wx_number,
+							introduction: res.data.introduction == null || res.data.introduction == '' ? '无' : res
+								.data.introduction,
+							enterprise_name: res.data.enterprise_name == null || res.data.enterprise_name == '' ?
+								'无' : res.data.enterprise_name,
+							enterprise_location: res.data.enterprise_location == null || res.data
+								.enterprise_location == '' ? '无' : res.data
+								.enterprise_location,
+							enterprise_Introduction: res.data.enterprise_Introduction == null || res.data
+								.enterprise_Introduction == '' ? '无' : res.data
+								.enterprise_Introduction,
+							association_id: res.data.association_id,
+							industry_id: res.data.industry_id,
+							company_image: res.data.company_image,
+							background_image: res.data.background_image,
+							background_type: res.data.background_type,
+							position_id: res.data.position_id,
+							gender: res.data.gender,
+							region_id: res.data.region_id,
+						};
+						this.region_id_name = res.data.region_name == null ? '无' : res.data.region_name;
+						this.industry_id_name = res.data.industry_name == null ? '无' : res.data.industry_name;
+						this.position_id_name = res.data.position_name == null ? '无' : res.data.position_name;
+						this.getIndustry();
+						this.getPositionList();
+						this.getRegionList();
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			// 跳转
+			tn(e) {
+				uni.navigateTo({
+					url: e,
+				});
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/* 授权 */
+	.login-page {
+		width: 100vw;
+		height: 100vh;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	/* 授权按钮 */
+	.submit-btn {
+		width: 100%;
+		background-color: #05C160;
+		color: #FFFFFF;
+		margin-top: 60rpx;
+		border-radius: 10rpx;
+		padding: 25rpx;
+		font-size: 32rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin: 30rpx;
+	}
+
+	/* 间隔线 start*/
+	.tn-strip-bottom-min {
+		width: 100%;
+		border-bottom: 1rpx solid #F8F9FB;
+	}
+
+	.tn-strip-bottom {
+		width: 100%;
+		border-bottom: 20rpx solid rgba(241, 241, 241, 0.8);
+	}
+
+	/* 间隔线 end*/
+
+
+	/* 用户头像 start */
+	.logo-image {
+		width: 80rpx;
+		height: 80rpx;
+		position: relative;
+	}
+
+	.logo-pic {
+		background-size: cover;
+		background-repeat: no-repeat;
+		// background-attachment:fixed;
+		background-position: top;
+		border: 2rpx solid rgba(255, 255, 255, 0.05);
+		box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.15);
+		border-radius: 50%;
+		overflow: hidden;
+		// background-color: #FFFFFF;
+	}
+
+
+	/* 底部悬浮按钮 start*/
+	.tn-tabbar-height {
+		min-height: 100rpx;
+		height: calc(120rpx + env(safe-area-inset-bottom) / 2);
+	}
+
+	.tn-footerfixed {
+		position: fixed;
+		width: 100%;
+		bottom: calc(30rpx + env(safe-area-inset-bottom));
+		z-index: 1024;
+		box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
+
+	}
+
+	/* 底部悬浮按钮 end*/
+</style>
\ No newline at end of file
diff --git a/pages/packageA/user/my_idea.vue b/pages/packageA/user/my_idea.vue
new file mode 100644
index 0000000..1d5e251
--- /dev/null
+++ b/pages/packageA/user/my_idea.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="template-edit tn-safe-area-inset-bottom">
+		<!-- 顶部自定义导航 -->
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'意见反馈'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+
+		<view class="tn-safe-area-inset-bottom" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
+				<view class="tn-flex justify-content-item">
+					<view class="tn-text-lg tn-padding-right-xs tn-text-bold">反馈人</view>
+				</view>
+			</view>
+			<view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
+				<input placeholder="填写姓名" name="input" v-model="formData.name" placeholder-style="color:#AAAAAA"></input>
+			</view>
+			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
+				<view class="tn-flex justify-content-item">
+					<view class="tn-text-lg tn-padding-right-xs tn-text-bold">联系方式</view>
+				</view>
+			</view>
+			<view class="tn-margin tn-bg-gray--light" style="border-radius: 10rpx;padding: 20rpx 30rpx;">
+				<input placeholder="填写联系方式"  v-model="formData.phone" name="input" placeholder-style="color:#AAAAAA"></input>
+			</view>
+			<view class="tn-flex tn-flex-row-between tn-flex-col-center tn-padding-top tn-margin">
+				<view class="tn-flex justify-content-item">
+					<view class="tn-text-lg tn-padding-right-xs tn-text-bold">反馈内容</view>
+				</view>
+			</view>
+			<view class="tn-margin tn-bg-gray--light tn-padding" style="border-radius: 10rpx;">
+				<textarea maxlength="500" v-model="formData.content" placeholder="填写反馈内容" placeholder-style="color:#AAAAAA"></textarea>
+			</view>
+			<!-- 悬浮按钮-->
+			<view class="tn-flex tn-footerfixed">
+				<view class="tn-flex-1 justify-content-item tn-margin-sm tn-text-center">
+					<tn-button backgroundColor="#FBBD12" fontColor="#ffffff" padding="40rpx 0" width="60%" shadow
+						fontBold @tap="submit">
+						<!-- <text class="tn-icon-light tn-padding-right-xs tn-color-black"></text> -->
+						<text>提 交</text>
+					</tn-button>
+				</view>
+			</view>
+
+		</view>
+
+		<view class='tn-tabbar-height'></view>
+
+	</view>
+</template>
+
+<script>
+import { messageAdd} from "@/util/api";
+import store from "@/store";
+	export default {
+		data() {
+			return {
+				topCurrent: 0,
+        formData:{
+          name:'',
+          phone:'',
+          content:'',
+          association_id:store.state.Gid,
+          member_id:uni.getStorageSync('uid'),
+          createtime:new Date().toISOString().slice(0, 19).replace('T', ' ')
+        }
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+      submit(){
+        messageAdd(this.formData)
+            .then(res => {
+              console.log(res);
+              if(res.code==1){
+                uni.showToast({
+                  title: '提交成功！',
+                  icon: 'none',
+                  duration: 2000
+                });
+                this.formData.name='';
+                this.formData.phone='';
+                this.formData.content='';
+              }else{
+                uni.showToast({
+                  title: res.msg,
+                  icon: 'none',
+                  duration: 2000
+                });
+              }
+            })
+            .catch(error => {
+              uni.showToast({
+                title: error,
+                icon: 'none',
+                duration: 2000
+              });
+            })
+      },
+			// 跳转
+			tn(e) {
+				uni.navigateTo({
+					url: e,
+				});
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/* 底部悬浮按钮 start*/
+	.tn-tabbar-height {
+		min-height: 100rpx;
+		height: calc(120rpx + env(safe-area-inset-bottom) / 2);
+	}
+
+	.tn-footerfixed {
+		position: fixed;
+		width: 100%;
+		bottom: calc(30rpx + env(safe-area-inset-bottom));
+		z-index: 1024;
+		box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
+
+	}
+
+	/* 底部悬浮按钮 end*/
+
+	/* 标签内容 start*/
+	.tn-tag-content {
+		&__item {
+			display: inline-block;
+			line-height: 45rpx;
+			padding: 10rpx 30rpx;
+			margin: 20rpx 20rpx 5rpx 0rpx;
+
+			&--prefix {
+				padding-right: 10rpx;
+			}
+		}
+	}
+
+	/* 标签内容 end*/
+</style>
diff --git a/pages/packageA/user/my_invite.vue b/pages/packageA/user/my_invite.vue
new file mode 100644
index 0000000..27298e5
--- /dev/null
+++ b/pages/packageA/user/my_invite.vue
@@ -0,0 +1,227 @@
+<template>
+	<view class="template-edit tn-safe-area-inset-bottom">
+		<!-- 顶部自定义导航 -->
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'邀请入会'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+
+		<view class="tn-safe-area-inset-bottom" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="padding: 50rpx">
+				<view>
+					<tn-button @click="openQrcode" backgroundColor="#82B2FF" height="80rpx" :shadow="true"
+						fontColor="#ffffff" width="100%">生成二维码</tn-button>
+				</view>
+				<view style="margin-top: 40rpx">
+					<tn-button open-type="share" backgroundColor="#82B2FF" height="80rpx" :shadow="true"
+						fontColor="#ffffff" width="100%">转发到微信好友</tn-button>
+				</view>
+			</view>
+			<!--			<view style="padding:20rpx 40rpx">-->
+			<!--				<view style="font-size: 32rpx">我邀请的会员：30位</view>-->
+			<!--				<view>-->
+			<!--					<view class="tn-flex tn-flex-center tn-flex-col-center" style="padding: 30rpx;width: 100%;">-->
+			<!--						<view>-->
+			<!--							<image src="/static/def.png" style="width: 100rpx;height: 100rpx;border-radius: 50%;">-->
+			<!--							</image>-->
+			<!--						</view>-->
+			<!--						<view style="width: 100%;">-->
+			<!--							<view class="tn-flex tn-flex-col-center tn-flex-row-between">-->
+			<!--								<view style="margin-left: 20rpx;color: #000000">-->
+			<!--									<view style="font-size: 35rpx;">王小明</view>-->
+			<!--								</view>-->
+			<!--							</view>-->
+			<!--						</view>-->
+			<!--					</view>-->
+			<!--				</view>-->
+			<!--			</view>-->
+		</view>
+		<tn-popup :closeBtn="true" v-model="show" mode="center" width="500rpx" height="700rpx">
+			<div style="text-align: center;padding: 30rpx;font-size: 32rpx;font-weight: 600;">使用二维码邀请入会</div>
+			<view style="text-align: center;margin-top: 40rpx;">
+				<image :src="qrcode_url" style="width: 400rpx;height: 400rpx;"></image>
+			</view>
+			<view style="text-align: center;margin-top: 40rpx;">
+				<tn-button shape="round" backgroundColor="#82B2FF" fontColor="#ffffff"
+					@click="saveBase64">保存图片</tn-button>
+			</view>
+		</tn-popup>
+		<view class='tn-tabbar-height'></view>
+	</view>
+</template>
+
+<script>
+	import {
+		getUserIndex,
+		getQrcode
+	} from "@/util/api";
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				show: false,
+				topCurrent: 0,
+				uid: 0,
+				userInfo: {},
+				apiImgUrl: this.$store.state.imgUrl,
+				qrcode_url: ''
+			}
+		},
+		onShareAppMessage() {
+			return {
+				title: this.userInfo.nikename + '邀请你加入【' + this.userInfo.association_name + '】',
+				path: '/pages/packageA/user/apply_in?id=' + this.uid + "&association_id=" + this.userInfo.association_id,
+				imageUrl: this.apiImgUrl + this.userInfo.association_image,
+			}
+		},
+		onShareTimeline() { // 分享到朋友圈
+			return {
+				title: this.userInfo.nikename + '邀请你加入【' + this.userInfo.association_name + '】',
+				path: '/pages/packageA/user/apply_in?id=' + this.uid + "&association_id=" + this.userInfo.association_id,
+				imageUrl: this.apiImgUrl + this.userInfo.association_image,
+			}
+		},
+		onLoad() {
+			var u = uni.getStorageSync('uid');
+			this.uid = u;
+			this.getUserInfo();
+		},
+		methods: {
+			saveBase64() {
+				wx.saveImageToPhotosAlbum({
+					filePath: this.qrcode_url,
+					success: function(res) {
+						wx.showToast({
+							title: '保存成功',
+						})
+					},
+					fail: function(err) {
+						console.log(err, '失败')
+					}
+				})
+			},
+			openQrcode() {
+				uni.showLoading({
+					title: '生成中',
+					mask: true,
+				});
+				var that = this;
+				uni.request({
+					url: store.state.apiUrl + '/move/login/getUnlimitedQRCode',
+					method: 'POST',
+					data: {
+						path: 'pages/packageA/user/apply_in',
+						scene: "id=" + this.uid + "&association_id=" + this.userInfo.association_id
+					},
+					responseType: 'arraybuffer',
+					arraybuffer: true,
+					success: (result) => {
+						const url = 'data:image/png;base64,' + uni.arrayBufferToBase64(result.data);
+						that.base64ToImage(url);
+					}
+				})
+			},
+			base64ToImage(base64Data) {
+				var that = this;
+				const fs = uni.getFileSystemManager();
+				var filePath = wx.env.USER_DATA_PATH + '/qrcode.jpg';
+				const base64 = base64Data.split(',')[1]; // 获取base64字符串部分
+				fs.writeFile({
+					filePath: filePath,
+					data: base64,
+					encoding: 'base64',
+					success: (res) => {
+						that.qrcode_url = filePath;
+						console.log('图片保存成功', filePath);
+						// 成功回调
+						that.show = true;
+						uni.hideLoading()
+					},
+					fail: (err) => {
+						console.error('图片保存失败', err);
+						uni.hideLoading()
+						// 失败回调
+					}
+				});
+			},
+			getUserInfo() {
+				getUserIndex({
+						member_b_id: this.uid,
+						member_id: this.uid
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.userInfo = res.data;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			// 跳转
+			tn(e) {
+				uni.navigateTo({
+					url: e,
+				});
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/* 底部悬浮按钮 start*/
+	.tn-tabbar-height {
+		min-height: 100rpx;
+		height: calc(120rpx + env(safe-area-inset-bottom) / 2);
+	}
+
+	.tn-footerfixed {
+		position: fixed;
+		width: 100%;
+		bottom: calc(30rpx + env(safe-area-inset-bottom));
+		z-index: 1024;
+		box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0);
+
+	}
+
+	/* 底部悬浮按钮 end*/
+
+	/* 标签内容 start*/
+	.tn-tag-content {
+		&__item {
+			display: inline-block;
+			line-height: 45rpx;
+			padding: 10rpx 30rpx;
+			margin: 20rpx 20rpx 5rpx 0rpx;
+
+			&--prefix {
+				padding-right: 10rpx;
+			}
+		}
+	}
+
+	/* 标签内容 end*/
+</style>
\ No newline at end of file
diff --git a/pages/packageA/user/my_msg.vue b/pages/packageA/user/my_msg.vue
new file mode 100644
index 0000000..74cc3a1
--- /dev/null
+++ b/pages/packageA/user/my_msg.vue
@@ -0,0 +1,359 @@
+<template>
+	<view class="message tn-safe-area-inset-bottom">
+
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'我的消息'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view class="" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="text-align: right;padding: 30rpx 30rpx 0rpx 0;">
+				<tn-button @click="all_upadte" backgroundColor="tn-bg-blue" size="sm" fontColor="tn-color-white"
+					shape="round">全部已读</tn-button>
+			</view>
+			<view v-for="item in list" class="tn-margin tn-padding" @click="tn('/pageB/chat/chatGPT')">
+				<view class="tn-flex tn-flex-col-top">
+					<!-- 这个是图标形式 -->
+					<view class="">
+						<view class="icon15__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur"
+							style="background-color: #F3F2F7;color: #7C8191;">
+							<view class="tn-icon-notice-fill"></view>
+						</view>
+					</view>
+					<view class="tn-padding-left-sm" style="width: 100%;">
+						<view class="tn-flex tn-flex-col-center ">
+							<view class="justify-content-item">
+								<text class="tn-color-wallpaper tn-text-lg tn-text-bold">系统消息</text>
+							</view>
+							<view style="margin-left: 10rpx;">
+								<tn-tag padding="0rpx 0rpx" width="80rpx" v-if="item.state==0" size="sm" shape="circle"
+									backgroundColor="#E83A30" fontColor="#ffffff">未读</tn-tag>
+								<tn-tag padding="0rpx 0rpx" width="80rpx" v-if="item.state==1" size="sm" shape="circle"
+									backgroundColor="#28B93D" fontColor="#ffffff">已读</tn-tag>
+							</view>
+						</view>
+						<view v-if="item.type==1" class="tn-padding-top-xs  tn-text-ellipsis-2 tn-color-gray">
+							<view>【{{item.member_q_id_name}}】申请查看您的联系方式！</view>
+							<view v-if="item.content!=''" style="margin-top: 10rpx;">申请信息：{{item.content}}</view>
+						</view>
+						<view v-if="item.type==0" class="tn-padding-top-xs  tn-text-ellipsis-2 tn-color-gray">
+							<view style="margin-top: 10rpx;">{{item.content}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="tn-flex tn-flex-row-between tn-flex-col-between tn-margin-top-sm tn-flex-col-center">
+					<view class="justify-content-item tn-color-gray tn-text-center tn-color-gray">
+						<text class="tn-icon-time tn-padding-right-xs tn-padding-left-xs tn-text-df"></text>
+						<text class="tn-text-sm">{{item.mail_time}}</text>
+					</view>
+					<block v-if="item.type==1 && item.if_tongyi==2">
+						<view @click="updateType(0,item.mail_id)"
+							class="justify-content-item tn-round tn-text tn-bg-blue--light tn-color-blue"
+							style="padding: 5rpx 15rpx;">
+							<text class="tn-padding-xs">通过申请</text>
+						</view>
+						<view @click="updateType(1,item.mail_id)"
+							class="justify-content-item tn-round tn-text tn-bg-orangered--light tn-color-orangered"
+							style="padding: 5rpx 15rpx;">
+							<text class="tn-padding-xs">拒绝申请</text>
+						</view>
+					</block>
+					<block v-if="item.type==1 && item.if_tongyi==1">
+						<view>
+							<tn-tag padding="0rpx 0rpx" width="80rpx" size="sm" shape="circle" backgroundColor="#E83A30"
+								fontColor="#ffffff">已拒绝</tn-tag>
+						</view>
+					</block>
+					<block v-if="item.type==1 && item.if_tongyi==0">
+						<view>
+							<tn-tag padding="0rpx 0rpx" width="80rpx" size="sm" shape="circle" backgroundColor="#28B93D"
+								fontColor="#ffffff">已同意</tn-tag>
+						</view>
+					</block>
+				</view>
+			</view>
+		</view>
+		<view style="margin-top: 40rpx;">
+			<tn-load-more :status="loadingIn" :loadText="{nomore:'没有消息'}"></tn-load-more>
+		</view>
+		<view class="tn-tabbar-height"></view>
+		<tn-modal v-model="showMode.show" :title="showMode.title" :content="showMode.content" :button="showMode.button"
+			@click="modeClick"></tn-modal>
+	</view>
+</template>
+
+<script>
+	import {
+		MaillogIndex,
+		MaillogUpdate,
+		MaillogUpdateState
+	} from "@/util/api";
+	import store from "@/store";
+	export default {
+		name: 'Message',
+		data() {
+			return {
+				loadingIn: 'loading',
+				uid: 0,
+				page: 1,
+				size: 10,
+				list: [],
+				id: 0,
+				if_tongyi: 0,
+				showMode: {
+					content: '',
+					title: '',
+					show: false,
+					key: 1,
+					button: [{
+							text: '取消',
+							backgroundColor: '#E6E6E6',
+							fontColor: '#FFFFFF',
+						},
+						{
+							text: '确定',
+							backgroundColor: 'tn-bg-indigo',
+							fontColor: '#FFFFFF'
+						}
+					]
+				}
+
+			}
+		},
+		onLoad() {
+			var uid = uni.getStorageSync('uid');
+			this.uid = uid;
+			this.getMaillogIndex();
+		},
+		onReachBottom() {
+			this.page = this.page + 1;
+			this.getMaillogIndex();
+		},
+		methods: {
+			all_upadte_do() {
+				MaillogUpdateState({
+						member_b_id: this.uid
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							store.state.msgCount = 0;
+							uni.showToast({
+								title: '操作成功！',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+						this.showMode.show = false;
+						this.page = 1;
+						this.list = [];
+						this.getMaillogIndex();
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			all_upadte() {
+				this.showMode.show = true;
+				this.showMode.content = '确定修改为全部已读吗？';
+				this.showMode.title = '操作提示';
+				this.showMode.key = 2;
+			},
+			updateType(type, id) {
+				this.showMode.show = true;
+				this.showMode.content = type == 0 ? '确定要通过申请吗？' : '确定要拒绝申请吗？';
+				this.showMode.title = '操作提示';
+				this.showMode.key = 1;
+				this.id = id;
+				this.if_tongyi = type;
+			},
+			setMaillogUpdate() {
+				MaillogUpdate({
+						id: this.id,
+						if_tongyi: this.if_tongyi,
+						state: 1,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							uni.showToast({
+								title: '操作成功！',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+						this.showMode.show = false;
+						this.page = 1;
+						this.list = [];
+						this.getMaillogIndex();
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getMaillogIndex() {
+				MaillogIndex({
+						member_b_id: this.uid,
+						page: this.page,
+						size: this.size,
+
+					})
+					.then(res => {
+						console.log(res.data.length);
+						this.list.push(...res.data);
+						if (res.data.length == 0 || this.list.length < 5) {
+							this.loadingIn = 'nomore';
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			modeClick(i) {
+				if (i.index == 0) {
+					this.showMode.show = false;
+				}
+				if (this.showMode.key == 1 && i.index == 1) {
+					this.setMaillogUpdate();
+				}
+				if (this.showMode.key == 2 && i.index == 1) {
+					this.all_upadte_do();
+				}
+			},
+			// 跳转
+			tn(e) {
+				uni.navigateTo({
+					url: e,
+				});
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.message {
+		max-height: 100vh;
+	}
+
+	/* 自定义导航栏内容 end */
+
+	/* 底部安全边距 start*/
+	.tn-tabbar-height {
+		min-height: 20rpx;
+		height: calc(40rpx + env(safe-area-inset-bottom) / 2);
+		height: calc(40rpx + constant(safe-area-inset-bottom));
+	}
+
+
+	.tn-color-wallpaper {
+		color: #1D2541;
+	}
+
+	/* 页面阴影 start*/
+	.wallpaper-shadow {
+		border-radius: 15rpx;
+		box-shadow: 0rpx 0rpx 50rpx 0rpx rgba(0, 0, 0, 0.07);
+	}
+
+
+
+	/* 图标容器15 start */
+	.icon15 {
+		&__item {
+			width: 30%;
+			background-color: #FFFFFF;
+			border-radius: 10rpx;
+			padding: 30rpx;
+			margin: 20rpx 10rpx;
+			transform: scale(1);
+			transition: transform 0.3s linear;
+			transform-origin: center center;
+
+			&--icon {
+				width: 105rpx;
+				height: 105rpx;
+				font-size: 60rpx;
+				border-radius: 50%;
+				margin-bottom: 18rpx;
+				position: relative;
+				z-index: 1;
+
+				&::after {
+					content: " ";
+					position: absolute;
+					z-index: -1;
+					width: 100%;
+					height: 100%;
+					left: 0;
+					bottom: 0;
+					border-radius: inherit;
+					opacity: 1;
+					transform: scale(1, 1);
+					background-size: 100% 100%;
+
+
+				}
+			}
+		}
+	}
+
+	/* 用户头像 start */
+	.logo-image {
+		width: 100rpx;
+		height: 100rpx;
+		position: relative;
+	}
+
+	.logo-pic {
+		background-size: cover;
+		background-repeat: no-repeat;
+		// background-attachment:fixed;
+		background-position: top;
+		border: 1rpx solid rgba(255, 255, 255, 0.05);
+		box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.05);
+		border-radius: 50%;
+		overflow: hidden;
+		// background-color: #FFFFFF;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/packageA/user/my_sign.vue b/pages/packageA/user/my_sign.vue
new file mode 100644
index 0000000..ddd7b60
--- /dev/null
+++ b/pages/packageA/user/my_sign.vue
@@ -0,0 +1,134 @@
+<template>
+	<view>
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'活动签到'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 20+'px'}" v-if="info!=''">
+			<view style="padding:0rpx 30rpx;text-align: center;">
+				<view style="">
+					<text class="tn-icon-trust-fill" style="font-size: 250rpx;color: #01BEFF;"></text>
+				</view>
+				<view style="font-size: 38rpx;font-weight: 600;margin-top: 40rpx;">{{info.activity_name}}</view>
+				<view style="margin-top: 100rpx;font-size: 32rpx;font-weight: 600;">
+					<view>开始时间：{{info.activity_start_time}}</view>
+					<view style="margin: 20rpx 0rpx;">-</view>
+					<view>结束时间：{{info.activity_end_time}}</view>
+				</view>
+				<view style="margin-top: 100rpx;">
+					<tn-button @click="sign()" backgroundColor="#01BEFF" :shadow="true" fontColor="#ffffff"
+						width="200rpx" height="200rpx" :fontSize="40" shape="icon" margin="10rpx 10rpx">签到</tn-button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		activitySign,
+		eventInfo
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+	export default {
+		data() {
+			return {
+				topCurrent: 1,
+				activity_id: '',
+				member_id: '',
+				association_id: '',
+				info: ''
+			}
+		},
+		onLoad(query) {
+			const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容
+			var data = this.getUrlParams(q);
+			this.activity_id = data.id;
+			this.association_id = data.association_id;
+			var that = this;
+			console.log('---1---');
+			getApp().getUserLogin((r) => {
+				console.log('---2---');
+				that.member_id = r.data.id;
+				that.getEventInfo();
+			})
+		},
+		methods: {
+			getEventInfo() {
+				console.log('---3---');
+				eventInfo({
+						association_id: this.association_id,
+						id: this.activity_id
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.info = res.data;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			sign() {
+				activitySign({
+						activity_id: this.activity_id,
+						member_id: this.member_id,
+						association_id: this.association_id,
+					})
+					.then(res => {
+						console.log(res);
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+			getUrlParams(url) {
+				// \w+ 表示匹配至少一个(数字、字母及下划线), [\u4e00-\u9fa5]+ 表示匹配至少一个中文字符
+				let pattern = /(\w+|[\u4e00-\u9fa5]+)=(\w+|[\u4e00-\u9fa5]+)/ig;
+				let result = {};
+				url.replace(pattern, ($, $1, $2) => {
+					result[$1] = $2;
+				})
+				return result
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #ffffff;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/packageA/user/my_vip.vue b/pages/packageA/user/my_vip.vue
new file mode 100644
index 0000000..e295eea
--- /dev/null
+++ b/pages/packageA/user/my_vip.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="message tn-safe-area-inset-bottom">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'会员卡'}]" activeColor="#000" :bold="false" :fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view class="" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="text-align: center;padding: 30rpx;">
+				<tn-button backgroundColor="#01BEFF" @click="openQrcode" fontColor="#ffffff">出示二维码</tn-button>
+				<view style="margin-top: 20rpx;">会员卡号：{{ code }}</view>
+			</view>
+		</view>
+		<tn-tabs :list="list" :isScroll="true" :activeItemStyle="{fontSize:'30rpx',fontWeight:'600'}"
+			activeColor="#3377FF" :current="current" name="type_name" @change="change" :fontSize="28"></tn-tabs>
+		<view style="padding: 30rpx;">
+			<view v-for="(item,index) in sp_list" style="position: relative;"
+				@click="tn('/pages/packageA/user/my_vip_info?id='+item.id)">
+				<view class="tn-flex tn-flex-col-center tn-flex-row-between"
+					style="background-color: #ffffff;padding:50rpx 30rpx;border-radius: 15rpx;margin-bottom: 20rpx;">
+					<view class="tn-flex tn-flex-col-center">
+						<view>
+							<image :src="item.business_image==''?'/static/def.png':apiImgUrl+item.business_image"
+								style="width: 100rpx;height: 100rpx;border-radius: 50%;">
+							</image>
+						</view>
+						<view style="margin-left: 20rpx;">
+							<view style="font-size: 31rpx;font-weight: 600;letter-spacing: 5rpx;">
+								{{ item.business_name }}
+							</view>
+							<view style="font-size: 24rpx;color: #808080;margin-top: 15rpx;">地址：{{ item.address }}
+							</view>
+							<view style="font-size: 24rpx;color: #808080;margin-top: 15rpx;">电话：{{ item.telephone }}
+							</view>
+						</view>
+					</view>
+					<view style="width: 200rpx;text-align: right;">
+						<tn-button backgroundColor="#3377FF" size="sm" shape="round" fontColor="#ffffff">查看</tn-button>
+					</view>
+				</view>
+
+				<!-- <view
+          style="font-size: 20rpx;color: #43A9F8;background-color: #CAE5FF;position: absolute;top: 0;right: 0;border-radius: 0px 15rpx 0px 15rpx;padding:10rpx 10rpx;">
+          <text class="tn-icon-success-circle-fill" style="vertical-align: middle;"></text>
+          <text style="vertical-align: middle;margin-left: 5rpx;">已认证</text>
+        </view> -->
+			</view>
+		</view>
+		<tn-popup v-if="show" :closeBtn="true" v-model="show" mode="center" width="500rpx" height="600rpx">
+			<view style="text-align: center;padding: 30rpx 0rpx;font-size: 32rpx;font-weight: 600;">核销二维码</view>
+			<view style="text-align: center;width: 300rpx;margin:0rpx auto;">
+				<l-painter ref="painter" css="background: #fff;width: 300rpx;text-align: center;">
+					<l-painter-qrcode :text="qrcode_url" css="width: 300rpx; height: 300rpx" />
+				</l-painter>
+			</view>
+			<view style="text-align: center;margin-top: 50rpx;">
+				<tn-button @click="show= false" shape="round" width="80%" backgroundColor="#3F8BF2"
+					fontColor="#ffffff">关闭
+				</tn-button>
+			</view>
+		</tn-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		businesstypeList,
+		businessList,
+		handleMembercode
+	} from "@/util/api";
+	import store from "@/store";
+
+	export default {
+		data() {
+			return {
+				current: 0,
+				show: false,
+				qrcode_url: '',
+				list: [],
+				page: 1,
+				type: 0,
+				apiImgUrl: this.$store.state.imgUrl,
+				sp_list: [],
+				code: 0,
+			}
+		},
+		onLoad() {
+			this.getbusinesstypeList();
+			this.getbusinessList();
+			this.setHandleMembercode();
+		},
+		methods: {
+			change(d) {
+				this.current = d;
+				var info = this.list[d];
+				this.type = info.id;
+				this.page = 1;
+				this.sp_list = [];
+				this.getbusinessList();
+			},
+			setHandleMembercode() {
+				var u = uni.getStorageSync('userInfo');
+				handleMembercode({
+						member_id: u.id,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.code = res.data.member_code
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: res.msg,
+								showCancel: false,
+								success: function(res) {
+									that.goBack();
+								}
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getbusinessList() {
+				var u = uni.getStorageSync('userInfo');
+				businessList({
+						business_type: this.type,
+						association_id: u.association_id,
+						page: this.page,
+						size: 10,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.sp_list.push(...res.data.list);
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getbusinesstypeList() {
+				businesstypeList()
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							key.unshift({
+								id: 0,
+								type_name: '全部'
+							});
+							this.list = res.data;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			generateUUIDv4() {
+				const charts = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+					'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
+				];
+				var res = '';
+				for (var i = 0; i < 18; i++) {
+					var id = Math.ceil(Math.random() * 35);
+					res += charts[id];
+				}
+				return res;
+			},
+			openQrcode() {
+				var u = uni.getStorageSync('userInfo');
+				this.qrcode_url = store.state.imgUrl + "?type=2&key=" + this.code + "&association_id=" + u.association_id +
+					"&random_number=" + this.generateUUIDv4();
+				setTimeout(() => {
+					this.show = true;
+				}, 500)
+			},
+			tn(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: aliceblue;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/packageA/user/my_vip_clerk.vue b/pages/packageA/user/my_vip_clerk.vue
new file mode 100644
index 0000000..d96ed60
--- /dev/null
+++ b/pages/packageA/user/my_vip_clerk.vue
@@ -0,0 +1,268 @@
+<template>
+  <view class="message tn-safe-area-inset-bottom">
+    <tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+      <view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+        <view style="padding-left: 15rpx;" @click="goBack()">
+          <text class="tn-icon-left" style="font-size: 40rpx;"></text>
+        </view>
+        <view class="tn-margin-top"
+              style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+          <tn-tabs :list="[{name:'店员管理'}]" activeColor="#000" :bold="false" :fontSize="36"></tn-tabs>
+        </view>
+      </view>
+    </tn-nav-bar>
+    <view class="" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+      <view class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-between" style="padding: 30rpx;">
+        <view>当前店铺：</view>
+        <view @click="select_show = true">
+          <text>{{ select_name }}</text>
+          <text class="tn-icon-down-triangle"></text>
+        </view>
+      </view>
+      <tn-select v-model="select_show" mode="single" :list="select_list" @confirm="add_confirm"></tn-select>
+      <view style="text-align: center;padding: 30rpx;">
+        <tn-button backgroundColor="#01BEFF" @click="addClerkShow = true" fontColor="#ffffff">添加店员</tn-button>
+      </view>
+      <view style="margin: 20rpx;font-size: 35rpx;font-weight: 600;">在职店员</view>
+      <view v-for="(item,index) in list" class="tn-flex tn-flex-center tn-flex-row-between" style="padding: 30rpx;">
+        <view class="tn-flex tn-flex-center tn-flex-col-center">
+          <view style="font-size: 30rpx;font-weight: 600;">{{ item.clerk_name }}</view>
+          <view style="margin-left: 20rpx;" @click="open_phoen(item.phone)">{{ item.phone }}</view>
+          <view style="margin-left: 20rpx;">
+            <tn-tag v-if="item.if_bangding==2" size="sm" backgroundColor="#FF7043" width="80rpx" shape="circle"
+                    fontColor="#ffffff">未绑定
+            </tn-tag>
+            <tn-tag v-if="item.if_bangding==1" size="sm" backgroundColor="#28B93D" width="80rpx" shape="circle"
+                    fontColor="#ffffff">已绑定
+            </tn-tag>
+          </view>
+        </view>
+        <view>
+          <tn-button @click="del(item.id)" backgroundColor="#E83A30" size="sm" shape="round" fontColor="#ffffff">删除
+          </tn-button>
+        </view>
+      </view>
+    </view>
+    <tn-popup v-if="addClerkShow" :closeBtn="true" v-model="addClerkShow" mode="center" width="500rpx">
+      <view style="text-align: center;padding: 30rpx 0rpx;font-size: 32rpx;font-weight: 600;">添加店员</view>
+      <view style="text-align: center;width: 400rpx;margin:0rpx auto;">
+        <tn-form :model="formAdd" ref="form" labelWidth="120">
+          <tn-form-item label="姓名" prop="name">
+            <tn-input v-model="formAdd.clerk_name" :clearable="false"/>
+          </tn-form-item>
+          <tn-form-item label="手机号" prop="intro">
+            <tn-input v-model="formAdd.phone" :clearable="false"/>
+          </tn-form-item>
+        </tn-form>
+      </view>
+      <view style="text-align: center;margin-top: 50rpx;padding-bottom: 50rpx;">
+        <tn-button @click="add()" shape="round" width="80%" backgroundColor="#3F8BF2" fontColor="#ffffff">确定
+        </tn-button>
+      </view>
+    </tn-popup>
+    <tn-modal v-model="show" :title="title" :content="content" :button="button" @click="dian"></tn-modal>
+  </view>
+</template>
+
+<script>
+import {
+  clerkListByBusiness,
+  addClerk,
+  businessListByMember, deleteClerk
+} from "@/util/api";
+import store from "@/store";
+
+export default {
+  data() {
+    return {
+      show: false,
+      title: '提示信息',
+      content: '确定要删除店员吗？',
+      button: [{
+        text: '取消',
+        backgroundColor: '#F4F4F4',
+        fontColor: '#000000',
+        plain: true,
+        shape: 'round'
+      },
+        {
+          text: '确定',
+          backgroundColor: '#548ceb',
+          fontColor: '#FFFFFF'
+        }
+      ],
+      addClerkShow: false,
+      formAdd: {
+        phone: '',
+        clerk_name: '',
+      },
+      id:'',
+      select_id: 0,
+      select_name: '',
+      select_show: false,
+      select_list: [],
+      list: []
+    }
+  },
+  onLoad() {
+    this.getClark();
+  },
+  methods: {
+    getClark() {
+      var userInfo = uni.getStorageSync('userInfo');
+      businessListByMember({
+        member_id: userInfo.id,
+      })
+          .then(res => {
+            console.log(res);
+            if (res.code == 1) {
+              var key = res.data;
+              const transformedSelectList = key.map(item => ({
+                value: item.id,
+                label: item.business_name
+              }));
+              this.select_name = transformedSelectList[0].label;
+              this.select_id = transformedSelectList[0].value;
+              this.select_list = transformedSelectList;
+              this.getList();
+            }
+          })
+          .catch(error => {
+            uni.showToast({
+              title: error,
+              icon: 'none',
+              duration: 2000
+            });
+          })
+    },
+    add_confirm(d) {
+      console.log(d);
+      var info = d[0];
+      this.select_name = info.label;
+      this.select_id = info.value;
+    },
+    add() {
+      if (this.formAdd.phone == '' || this.formAdd.clerk_name == '') {
+        uni.showToast({
+          title: '请填写店员信息',
+          icon: 'none',
+          duration: 2000
+        });
+        return;
+      }
+      addClerk({
+        business_id: this.select_id,
+        ...this.formAdd
+      })
+          .then(res => {
+            console.log(res);
+            if (res.code == 1) {
+              uni.showToast({
+                title: '添加成功！',
+                icon: 'none',
+                duration: 2000
+              });
+              this.addClerkShow = false;
+              this.getList();
+            } else {
+              uni.showToast({
+                title: res.msg,
+                icon: 'none',
+                duration: 2000
+              });
+            }
+          })
+          .catch(error => {
+            uni.showToast({
+              title: error,
+              icon: 'none',
+              duration: 2000
+            });
+          })
+    },
+    del(id) {
+      this.id=id;
+      this.show = true;
+    },
+    dian(d) {
+      console.log(d);
+      this.show = false;
+      if (d.index == 1) {
+          this.delDo();
+      }
+    },
+    delDo(){
+      deleteClerk({
+        id: this.id
+      })
+          .then(res => {
+            console.log(res);
+            if (res.code == 1) {
+              uni.showToast({
+                title: '删除成功！',
+                icon: 'none',
+                duration: 2000
+              });
+              this.getList();
+            }else{
+              uni.showToast({
+                title: res.msg,
+                icon: 'none',
+                duration: 2000
+              });
+            }
+          })
+          .catch(error => {
+            uni.showToast({
+              title: error,
+              icon: 'none',
+              duration: 2000
+            });
+          })
+    },
+    getList() {
+      clerkListByBusiness({
+        business_id: this.select_id
+      })
+          .then(res => {
+            console.log(res);
+            if (res.code == 1) {
+              this.list = res.data;
+            }
+          })
+          .catch(error => {
+            uni.showToast({
+              title: error,
+              icon: 'none',
+              duration: 2000
+            });
+          })
+    },
+    open_phoen(telephone) {
+      uni.makePhoneCall({
+        phoneNumber: telephone, // 电话号码
+        success: function () {
+          console.log('拨打电话成功');
+        },
+        fail: function () {
+          console.log('拨打电话失败');
+        }
+      });
+    },
+    goBack() {
+      if (getCurrentPages().length > 1) {
+        uni.navigateBack()
+      } else {
+        uni.redirectTo({
+          url: '/pages/index/index'
+        })
+
+      }
+    },
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/packageA/user/my_vip_info.vue b/pages/packageA/user/my_vip_info.vue
new file mode 100644
index 0000000..2e4dd0e
--- /dev/null
+++ b/pages/packageA/user/my_vip_info.vue
@@ -0,0 +1,127 @@
+<template>
+	<view class="message tn-safe-area-inset-bottom">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'商家详情'}]" activeColor="#000" :bold="false" :fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="padding: 30rpx;">
+				<view class="tn-flex tn-flex-col-center tn-flex-row-between"
+					style="background-color: #ffffff;padding:50rpx 30rpx;border-radius: 15rpx;margin-bottom: 20rpx;">
+					<view class="tn-flex tn-flex-col-center">
+						<view>
+							<image :src="info.business_image==''?'/static/def.png':apiImgUrl+info.business_image"
+								style="width: 100rpx;height: 100rpx;border-radius: 50%;">
+							</image>
+						</view>
+						<view style="margin-left: 20rpx;">
+							<view style="font-size: 31rpx;font-weight: 600;letter-spacing: 5rpx;">{{info.business_name}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view style="font-size: 24rpx;color: #808080;margin-top: 15rpx;" @click="openLoca()">
+					<text>地址：{{info.address}}</text>
+					<text class="tn-icon-location" style="margin-left: 10rpx;color:#3377FF"></text>
+				</view>
+				<view style="font-size: 24rpx;color: #808080;margin-top: 15rpx;" @click="openTel()">
+					<text>电话：{{info.telephone}}</text>
+					<text class="tn-icon-tel-circle" style="margin-left: 10rpx;color:#3377FF"></text>
+				</view>
+				<view style="margin-top: 30rpx;font-size: 30rpx;font-weight: 600;">商家介绍</view>
+				<view style="margin-top: 20rpx;" v-html="info.introduction"></view>
+				<view style="margin-top: 30rpx;font-size: 30rpx;font-weight: 600;">活动介绍</view>
+				<view style="margin-top: 20rpx;" v-html="info.activity_content"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		businessFind
+	} from "@/util/api";
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				info: {},
+				apiImgUrl: this.$store.state.imgUrl,
+				id: 0,
+			}
+		},
+		onLoad(data) {
+			this.id = data.id;
+			this.getbusinessFind();
+		},
+		methods: {
+			openLoca() {
+				uni.openLocation({
+					latitude: parseFloat(this.info.address_latitude),
+					longitude: parseFloat(this.info.address_longitude),
+					name: this.info.business_name,
+					success: function() {
+						console.log('success');
+					},
+					fail: function(res) {
+						console.log(res);
+					}
+				});
+			},
+			openTel() {
+				uni.makePhoneCall({
+					phoneNumber: this.info.telephone, // 电话号码
+					success: function() {
+						console.log('拨打电话成功');
+					},
+					fail: function() {
+						console.log('拨打电话失败');
+					}
+				});
+			},
+			getbusinessFind() {
+				businessFind({
+						id: this.id,
+					})
+					.then(res => {
+						console.log(res);
+						var key = res.data;
+						if (res.code == 1) {
+							if (key.activity_content.indexOf("<img") != -1) {
+								key.activity_content = getApp().addWidthToImages(key.activity_content);
+							}
+							this.info = key;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/packageA/user/my_vip_off.vue b/pages/packageA/user/my_vip_off.vue
new file mode 100644
index 0000000..56e239f
--- /dev/null
+++ b/pages/packageA/user/my_vip_off.vue
@@ -0,0 +1,168 @@
+<template>
+	<view class="message tn-safe-area-inset-bottom">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'会员卡核销'}]" activeColor="#000" :bold="false" :fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view class="" :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view v-if="show">
+				<view style="text-align: center;padding: 30rpx;font-size: 50rpx;font-weight: 600">会员卡核销</view>
+				<view style="font-size: 30rpx;font-weight: 600;padding:20rpx 30rpx 20rpx 30rpx">持卡人信息：</view>
+				<view style="padding:20rpx 30rpx 0rpx 30rpx">会员卡号：{{code}}</view>
+				<view class="tn-flex tn-flex-col-center tn-flex-row-between"
+					style="background-color: #ffffff;padding:50rpx 30rpx;border-radius: 15rpx;margin-bottom: 20rpx;">
+					<view class="tn-flex tn-flex-col-center">
+						<view>
+							<image :src="apiImgUrl+info.photo_image"
+								style="width: 100rpx;height: 100rpx;border-radius: 50%;">
+							</image>
+						</view>
+						<view style="margin-left: 20rpx;">
+							<view style="font-size: 30rpx;font-weight: 600;">{{info.member_nikename}}</view>
+							<view style="font-size: 28rpx;margin-top: 10rpx">{{info.member_phone}}</view>
+						</view>
+					</view>
+				</view>
+				<view style="font-size: 30rpx;font-weight: 600;padding:20rpx 30rpx 20rpx 30rpx">核销人：{{info.clerk_name}}
+				</view>
+				<view style="margin-top: 100rpx;text-align: center">
+					<tn-button @click="submitDo" width="400rpx" height="80rpx" backgroundColor="#28B93D"
+						fontColor="#ffffff" shape="round">确认核销</tn-button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		ifRightToExamine,
+		addWriteoff
+	} from "@/util/api";
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				show: false,
+				code: '',
+				apiImgUrl: this.$store.state.imgUrl,
+				info: {},
+        key:'',
+			}
+		},
+		onLoad(query) {
+			const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容
+			var data = this.getUrlParams(q);
+			this.code = data.key;
+      this.key = data.random_number;
+			this.association_id = data.association_id;
+			getApp().getUserLogin((r) => {
+				console.log('111', r);
+				this.phone = r.data.phone;
+				this.checkUser();
+			})
+		},
+		methods: {
+			submitDo() {
+				addWriteoff({
+						association_id: this.association_id,
+						phone: this.phone,
+						code_number: this.code,
+          random_number:this.key
+					})
+					.then(res => {
+						console.log(res);
+            if(res.code==1){
+              uni.showToast({
+                title: '核销成功！',
+                icon: 'none',
+                duration: 2000
+              });
+            }else{
+              uni.showModal({
+                title: '提示',
+                content: res.msg,
+                showCancel: false,
+                success: function(res) {
+                  that.goBack();
+                }
+              });
+            }
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			checkUser() {
+				var that = this;
+				console.log(this.association_id);
+				console.log(this.phone);
+				console.log(this.code);
+				ifRightToExamine({
+						association_id: this.association_id,
+						phone: this.phone,
+						code_number: this.code,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.show = true;
+							this.info = res.data;
+						} else {
+							this.show = false;
+							uni.showModal({
+								title: '提示',
+								content: res.msg,
+								showCancel: false,
+								success: function(res) {
+									that.goBack();
+								}
+							});
+
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getUrlParams(url) {
+				// \w+ 表示匹配至少一个(数字、字母及下划线), [\u4e00-\u9fa5]+ 表示匹配至少一个中文字符
+				let pattern = /(\w+|[\u4e00-\u9fa5]+)=(\w+|[\u4e00-\u9fa5]+)/ig;
+				let result = {};
+				url.replace(pattern, ($, $1, $2) => {
+					result[$1] = $2;
+				})
+				return result
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/packageA/user/user_activity.vue b/pages/packageA/user/user_activity.vue
new file mode 100644
index 0000000..a28b78d
--- /dev/null
+++ b/pages/packageA/user/user_activity.vue
@@ -0,0 +1,511 @@
+<template>
+	<view style="letter-spacing: 1rpx;background: #ebf4f7;min-height: 100vh;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="false" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view style="text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;width: 85%;">
+					<view>添加活动</view>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="padding: 30rpx;">
+				<view style="background-color: #FFF;border-radius: 15rpx;padding: 20rpx;">
+					<tn-form :labelWidth="140">
+						<tn-form-item prop="activity_name">
+							<tn-input v-model="formData.activity_name" :customStyle="{width: '600rpx'}"
+								placeholder="请填写活动标题" />
+						</tn-form-item>
+						<tn-form-item label="活动主图">
+							<tn-input :disabled="true" :clearable="false" @click="upload_img" />
+							<view slot="right" @click="upload_img">
+								<view>
+									<text v-if="formData.activity_image==''">请上传活动主图</text>
+									<image class="no-img" v-if="formData.activity_image!=''"
+										:src="apiImgUrl+formData.activity_image"
+										style="width: 100rpx;vertical-align: middle;" mode="widthFix"></image>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</tn-form-item>
+						<tn-form-item label="活动类型">
+							<tn-input :disabled="true" :clearable="false" />
+							<view slot="right">
+								<view>
+									<text>协会活动</text>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</tn-form-item>
+						<tn-form-item label="报名开始时间" :labelWidth="200">
+							<tn-input :disabled="true" :clearable="false" />
+							<view slot="right" @click="start_sign_time_show = true">
+								<view>
+									<text>{{ formData.signup_start_time == '' ? '请选择报名开始时间' : formData.signup_start_time }}
+									</text>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</tn-form-item>
+						<tn-picker mode="time" @confirm="start_sign_time_do" v-model="start_sign_time_show"
+							:params="{year: true,month: true,day: true,hour: true,minute: true,second: false}"></tn-picker>
+						<tn-form-item label="报名结束时间" :labelWidth="200">
+							<tn-input :disabled="true" :clearable="false" />
+							<view slot="right" @click="end_sign_time_show = true">
+								<view>
+									<text>{{ formData.signup_end_time == '' ? '请选择报名结束时间' : formData.signup_end_time }}</text>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</tn-form-item>
+						<tn-picker mode="time" @confirm="end_sign_time_do" v-model="end_sign_time_show"
+							:params="{year: true,month: true,day: true,hour: true,minute: true,second: false}"></tn-picker>
+
+						<tn-form-item label="活动开始时间" :labelWidth="200">
+							<tn-input :disabled="true" :clearable="false" />
+							<view slot="right" @click="start_time_show = true">
+								<view>
+									<text>{{ formData.activity_start_time == '' ? '请选择活动开始时间' : formData.activity_start_time }}
+									</text>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</tn-form-item>
+						<tn-picker mode="time" @confirm="start_time_do" v-model="start_time_show"
+							:params="{year: true,month: true,day: true,hour: true,minute: true,second: false}"></tn-picker>
+						<tn-form-item label="活动结束时间" :labelWidth="200">
+							<tn-input :disabled="true" :clearable="false" />
+							<view slot="right" @click="end_time_show = true">
+								<view>
+									<text>{{ formData.activity_end_time == '' ? '请选择活动结束时间' : formData.activity_end_time }}</text>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</tn-form-item>
+						<tn-picker mode="time" @confirm="end_time_do" v-model="end_time_show"
+							:params="{year: true,month: true,day: true,hour: true,minute: true,second: false}"></tn-picker>
+						<tn-form-item label="活动地址">
+							<tn-input :disabled="true" :clearable="false" />
+							<view slot="right" @click="open_mode(0)">
+								<view>
+									<text>{{ formData.activity_location == '' ? '请输入活动地址' : formData.activity_location }}</text>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</tn-form-item>
+						<tn-form-item label="显示报名人数" :labelWidth="200">
+							<tn-input :disabled="true" :clearable="false" />
+							<view slot="right" @click="display_show = true">
+								<view>
+									<text>{{ check_display(formData.if_display_registrants,1) }}</text>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</tn-form-item>
+						<tn-select v-model="display_show" mode="single" :list="list" @confirm="display_do"
+							:searchShow="true"></tn-select>
+
+						<tn-form-item label="报名范围" :labelWidth="200">
+							<tn-input :disabled="true" :clearable="false" />
+							<view slot="right" @click="display_range_show = true">
+								<view>
+									<text>{{ check_display(formData.range,2) }}</text>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</tn-form-item>
+						<tn-select v-model="display_range_show" mode="single" :list="range_list"
+							@confirm="display_range_do" :searchShow="true"></tn-select>
+
+
+						<tn-form-item label="报名审核" :labelWidth="200">
+							<tn-input :disabled="true" :clearable="false" />
+							<view slot="right" @click="display_if_auditing_show = true">
+								<view>
+									<text>{{ check_display(formData.if_auditing,3) }}</text>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</tn-form-item>
+						<tn-select v-model="display_if_auditing_show" mode="single" :list="if_auditing_list"
+							@confirm="display_if_auditing_do" :searchShow="true"></tn-select>
+						<tn-form-item label="报名人数">
+							<tn-input v-model="formData.number" :clearable="false" :customStyle="{width: '500rpx'}"
+								placeholder="请填写报名人数(0为不限制)" />
+						</tn-form-item>
+						<tn-form-item label="签到" :labelWidth="200">
+							<tn-input :disabled="true" :clearable="false" />
+							<view slot="right" @click="display_if_sign_show = true">
+								<view>
+									<text>{{ check_display(formData.if_sign,4) }}</text>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</tn-form-item>
+						<tn-select v-model="display_if_sign_show" mode="single" :list="if_sign_list"
+							@confirm="display_if_sign_do" :searchShow="true"></tn-select>
+					</tn-form>
+				</view>
+				<view style="background-color: #FFF;border-radius: 15rpx;padding: 20rpx;margin-top: 25rpx;">
+					<tn-input v-model="activity_content" :disabled="true" placeholder="请输入活动内容" type="textarea"
+						:maxLength="-1" :height="300" @click="editText= true" :clearable="false" />
+				</view>
+				<view style="margin: 0 auto;margin-top: 40rpx;text-align: center;">
+					<tn-button @click="submitDo" backgroundColor="#3F8BF2" height="90rpx" width="90%" shape="round"
+						fontColor="#ffffff">发布
+					</tn-button>
+				</view>
+			</view>
+		</view>
+		<tn-modal v-model="addMod" :custom="true">
+			<view class="custom-modal-content">
+				<view style="text-align: center;font-size: 34rpx;">活动地址</view>
+				<view class="text">
+					<tn-form ref="form" :labelWidth="180">
+						<tn-form-item label="活动地址" prop="content">
+							<tn-input type="text" placeholder="填写活动地址" v-model="formData.activity_location" />
+						</tn-form-item>
+					</tn-form>
+					<view style="text-align: center;margin-top: 30rpx;">
+						<tn-button backgroundColor="#E6E6E6" fontColor="#ffffff" @click="addMod = false">取消</tn-button>
+						<tn-button backgroundColor="tn-bg-blue" fontColor="tn-color-white" style="margin-left: 30rpx"
+							@click="addMod = false">确定
+						</tn-button>
+					</view>
+				</view>
+			</view>
+		</tn-modal>
+		<tn-popup v-model="editText" mode="right" width="100%">
+			<tn-nav-bar :isBack="false" backTitle="" :alpha="true" :bottomShadow="false">
+				<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+					<view style="padding-left: 15rpx;" @click="editText = false">
+						<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+					</view>
+					<view class="tn-margin-top"
+						style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+						<tn-tabs :list="[{name:'活动内容'}]" :current="0" activeColor="#000" :bold="false"
+							:fontSize="24"></tn-tabs>
+					</view>
+				</view>
+			</tn-nav-bar>
+			<view style="background-color: #FFFFFF;">
+				<view :style="{paddingTop: vuex_custom_bar_height+'px'}"></view>
+				<view style="margin:0rpx 30rpx;background-color: #ffffff;border-radius: 40rpx;">
+					<scroll-view scroll-y class="home" style="height: 1200rpx;">
+						<view class="editor-box">
+							<sp-editor placeholder="活动内容" :toolbarConfig="{
+          excludeKeys: ['direction', 'date', 'listCheck','link','export'],
+          iconSize: '18px',
+        }" @input="inputOver" @init="initEditor" @upinImage="upinImage"></sp-editor>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+			<view style="margin: 0 auto;margin-top: 40rpx;text-align: center;">
+				<tn-button @click="editTextRes" backgroundColor="#3F8BF2" height="90rpx" width="90%" shape="round"
+					fontColor="#ffffff">确定
+				</tn-button>
+			</view>
+		</tn-popup>
+		<tn-modal v-if="qrcode_show" v-model="qrcode_show" :custom="true" :maskCloseable="false">
+			<view style="text-align: center;margin: 30rpx 0rpx;font-size: 32rpx;font-weight: 600;">请保存签到二维码</view>
+			<view style="text-align: center;width: 250rpx;margin:0rpx auto;">
+				<l-painter ref="painter" css="background: #fff;width: 250rpx;text-align: center;">
+					<l-painter-qrcode :text="qrcode_url" css="width: 250rpx; height: 250rpx" />
+				</l-painter>
+			</view>
+			<view style="text-align: center;margin-top: 50rpx;">
+				<tn-button @click="insQrcode" shape="round" width="80%" backgroundColor="#3F8BF2"
+					fontColor="#ffffff">保存</tn-button>
+			</view>
+		</tn-modal>
+	</view>
+</template>
+
+<script>
+	import {
+		activityAdd
+	} from "@/util/api";
+	import store from "@/store";
+
+	export default {
+		data() {
+			return {
+				qrcode_show: false,
+				qrcode_url: '',
+				editorIns: null,
+				editText: false,
+				addMod: false,
+				end_time_show: false,
+				start_time_show: false,
+				start_sign_time_show: false,
+				end_sign_time_show: false,
+				display_if_auditing_show: false,
+				display_range_show: false,
+				display_show: false,
+				display_if_sign_show: false,
+				formData: {
+					activity_name: '',
+					activity_image: '',
+					activity_content: '',
+					activity_start_time: '',
+					activity_end_time: '',
+					signup_start_time: '',
+					signup_end_time: '',
+					activity_location: '',
+					activity_type: 1,
+					if_display_registrants: 1,
+					range: 3,
+					if_auditing: 1,
+					number: '',
+					if_sign: 1,
+				},
+				activity_content: '',
+				apiImgUrl: this.$store.state.imgUrl,
+				apiUpUrl: this.$store.state.apiUrl,
+				list: [{
+					value: 1,
+					label: '显示'
+				}, {
+					value: 2,
+					label: '不显示'
+				}],
+				range_list: [{
+					value: 1,
+					label: '会员'
+				}, {
+					value: 3,
+					label: '不限制'
+				}],
+				if_auditing_list: [{
+					value: 1,
+					label: '否'
+				}, {
+					value: 2,
+					label: '是'
+				}],
+				if_sign_list: [{
+					value: 1,
+					label: '否'
+				}, {
+					value: 2,
+					label: '是'
+				}],
+				addID: 0,
+			}
+		},
+		methods: {
+			submitDo() {
+				var user_info = uni.getStorageSync('userInfo');
+				if (user_info.association_id == 0 || user_info.if_member == 2 || user_info.if_xianshi != 1) {
+					uni.showToast({
+						title: '暂无权限！',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				activityAdd({
+						association_id: user_info.association_id,
+						...this.formData
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.addID = res.data;
+							uni.showToast({
+								title: '发布成功！',
+								icon: 'none',
+								duration: 2000
+							});
+							if (this.formData.if_sign == 2) {
+								this.qrcode_url = store.state.apiUrl + '?id=' + res.data + '&association_id=' +
+									user_info.association_id,
+									setTimeout(() => {
+										this.qrcode_show = true;
+									}, 500)
+							} else {
+								setTimeout(() => {
+									uni.redirectTo({
+										url: '/pages/packageB/event/event_info?id=' + res.data
+									})
+								}, 1000)
+							}
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: res.msg
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			inputOver(e) {
+				// 可以在此处获取到编辑器已编辑的内容
+				this.formData.activity_content = e.html;
+			},
+			editTextRes() {
+				// 使用正则表达式找到所有的<img>标签，并替换为[图片]
+				let replacedContent = this.formData.activity_content.replace(/<img[^>]*>/g, '[图片]');
+				// 继续使用正则表达式移除所有剩余的HTML标签，但不包括刚刚替换的[图片]
+				let textWithImagesOnly = replacedContent.replace(/<[^>]+>/g, '');
+				this.activity_content = textWithImagesOnly;
+				this.editText = false;
+			},
+			initEditor(editor) {
+				this.editorIns = editor; // 保存编辑器实例
+			},
+			upinImage(tempFiles, editorCtx) {
+				var that = this;
+				uni.uploadFile({
+					url: that.apiUpUrl + '/common/upload', //仅为示例，非真实的接口地址
+					filePath: tempFiles[0].tempFilePath,
+					name: 'file',
+					success: (uploadFileRes) => {
+						var data = JSON.parse(uploadFileRes.data);
+						console.log(data);
+						editorCtx.insertImage({
+							src: data.data.fullurl,
+							width: "80%", // 默认不建议铺满宽度100%，预留一点空隙以便用户编辑
+							success: function() {},
+						});
+					}
+				});
+			},
+			upload_img() {
+				var user_info = uni.getStorageSync('userInfo');
+				var that = this;
+				uni.chooseMedia({
+					count: 1, //默认9
+					mediaType: ['image'],
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: function(res) {
+						console.log(res);
+						var url = res.tempFiles[0].tempFilePath;
+						uni.uploadFile({
+							url: that.apiUpUrl + '/common/upload', //仅为示例，非真实的接口地址
+							filePath: url,
+							name: 'file',
+							formData: {
+								association_id: user_info.association_id,
+							},
+							success: (uploadFileRes) => {
+								var data = JSON.parse(uploadFileRes.data);
+								console.log(data);
+								that.formData.activity_image = data.data.url;
+							}
+						});
+					}
+				});
+			},
+			insQrcode() {
+				var that = this;
+				this.$refs.painter.canvasToTempFilePathSync({
+					// 在nvue里是jpeg
+					fileType: "png",
+					quality: 1,
+					pathType: 'url',
+					success: (res) => {
+						console.log(res.tempFilePath);
+						// 非H5 保存到相册
+						// H5 提示用户长按图另存
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: function() {
+								uni.showToast({
+									title: '保存成功！',
+									icon: 'none',
+									duration: 2000
+								});
+								setTimeout(() => {
+									uni.redirectTo({
+										url: '/pages/packageB/event/event_info?id=' + that
+											.addID
+									})
+								}, 500)
+							},
+							fail: function(err) {
+								console.log(err, '失败')
+							}
+						});
+					},
+				});
+			},
+			check_display(d, type) {
+				if (type == 1) {
+					const info = this.list.find(item => item.value === d);
+					return info.label;
+				}
+				if (type == 2) {
+					const info = this.range_list.find(item => item.value === d);
+					return info.label;
+				}
+				if (type == 3) {
+					const info = this.if_auditing_list.find(item => item.value === d);
+					return info.label;
+				}
+				if (type == 4) {
+					const info = this.if_sign_list.find(item => item.value === d);
+					return info.label;
+				}
+			},
+			display_do(d) {
+				var info = d[0];
+				this.formData.if_display_registrants = info.value;
+			},
+			display_range_do(d) {
+				var info = d[0];
+				this.formData.range = info.value;
+			},
+			display_if_auditing_do(d) {
+				var info = d[0];
+				this.formData.if_auditing = info.value;
+			},
+			display_if_sign_do(d) {
+				var info = d[0];
+				this.formData.if_sign = info.value;
+			},
+			open_mode(d) {
+				this.addMod = true;
+			},
+			end_time_do(d) {
+				this.formData.activity_end_time = d.year + '-' + d.month + '-' + d.day + ' ' + d.hour + ':' + d.minute;
+			},
+			start_time_do(d) {
+				this.formData.activity_start_time = d.year + '-' + d.month + '-' + d.day + ' ' + d.hour + ':' + d.minute;
+			},
+			start_sign_time_do(d) {
+				this.formData.signup_start_time = d.year + '-' + d.month + '-' + d.day + ' ' + d.hour + ':' + d.minute;
+			},
+			end_sign_time_do(d) {
+				this.formData.signup_end_time = d.year + '-' + d.month + '-' + d.day + ' ' + d.hour + ':' + d.minute;
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+	.no-img {
+		width: 0;
+		height: 0;
+	}
+</style>
diff --git a/pages/packageA/user/user_auditing.vue b/pages/packageA/user/user_auditing.vue
new file mode 100644
index 0000000..43e210c
--- /dev/null
+++ b/pages/packageA/user/user_auditing.vue
@@ -0,0 +1,259 @@
+<template>
+	<view style="letter-spacing: 1rpx;background: #ebf4f7;min-height: 100vh;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="false" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view style="text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;width: 85%;">
+					<!-- <view>智慧云商协</view> -->
+					<view>洛阳市青年户外协会掌上云册</view>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view
+				style="z-index: 100;;position: fixed;;width: 100%;margin: 0 auto;background-color: #ffffff;padding: 0rpx 50rpx;">
+				<tn-tabs :list="list" activeColor="#3f8bf2" backgroundColor="#FFFFFF" :isScroll="false"
+					:current="current" name="name" @change="change"></tn-tabs>
+			</view>
+			<view style="padding: 30rpx;margin-top: 90rpx;">
+				<view class="tn-flex tn-flex-col-center" style="margin-bottom: 40rpx;">
+					<view @click="changeXs(0)"
+						:style="{'color': if_xianshi==0?'#ffffff':'#000000','background-color': if_xianshi==0?'#3f8bf2':'#FFF','border-radius': '50rpx','padding': '10rpx 30rpx'}">
+						待审核
+					</view>
+					<view @click="changeXs(1)"
+						:style="{'color': if_xianshi==1?'#ffffff':'#000000','background-color': if_xianshi==1?'#3f8bf2':'#FFF','border-radius': '50rpx','padding': '10rpx 30rpx','margin':'0rpx 20rpx'}">
+						已通过
+					</view>
+					<view @click="changeXs(2)"
+						:style="{'color': if_xianshi==2?'#ffffff':'#000000','background-color': if_xianshi==2?'#3f8bf2':'#FFF','border-radius': '50rpx','padding': '10rpx 30rpx'}">
+						已拒绝
+					</view>
+				</view>
+				<view v-for="item in all_list"
+					@click="openUrl('/pages/packageA/user/user_auditing_info?id='+item.id+'&type='+item.type)"
+					style="margin-bottom: 30rpx;box-shadow: 0rpx 10rpx 10rpx #d2e0f2;background: #ffffff;border-radius: 20rpx;padding: 30rpx 20rpx;position: relative;">
+					<view class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-between">
+						<view>
+							<text class="tn-icon-my-fill" style="color: #3f8bf2;"></text>
+							<text style="margin-left: 10rpx;">申请人</text>
+							<text style="margin-left: 50rpx;">{{item.nikename}}</text>
+						</view>
+						<view>
+							<text style="color: #3f8bf2;">查看</text>
+						</view>
+					</view>
+					<view style="width: 100%;margin: 20rpx auto;border: 1rpx solid #d9d9d961;"></view>
+					<view>
+						<text>申请事项</text>
+						<text style="margin-left: 50rpx;">{{item.type==1?'修改申请':'入会申请'}}</text>
+					</view>
+					<view style="margin: 25rpx 0rpx;">
+						<text>审核状态</text>
+						<text style="margin-left: 50rpx;" v-if="item.if_xianshi==0">待审核</text>
+						<text style="margin-left: 50rpx;" v-if="item.if_xianshi==1">已通过</text>
+						<text style="margin-left: 50rpx;" v-if="item.if_xianshi==2">已拒绝</text>
+					</view>
+					<view>
+						<text>申请时间</text>
+						<text style="margin-left: 50rpx;">{{item.createtime}}</text>
+					</view>
+					<image v-if="item.if_xianshi==0" src="/static/sh.png"
+						style="width: 140rpx;height: 140rpx;position: absolute;top: 140rpx;right: 30rpx;">
+					</image>
+					<image v-if="item.if_xianshi==1" src="/static/tg.png"
+						style="width: 140rpx;height: 140rpx;position: absolute;top: 140rpx;right: 30rpx;">
+					</image>
+					<image v-if="item.if_xianshi==2" src="/static/jj.png"
+						style="width: 140rpx;height: 140rpx;position: absolute;top: 140rpx;right: 30rpx;">
+					</image>
+					<view v-if="item.if_xianshi==0" class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-around"
+						style="color: #FFF;text-align: center;margin-top: 40rpx;">
+						<view @click.stop="openModal(item,2)"
+							style="color: #ffffff;line-height: 76rpx;width: 240rpx;height: 76rpx;background: #d54941;border-radius: 76rpx;">
+							拒绝</view>
+						<view @click.stop="openModal(item,1)"
+							style="color: #ffffff;line-height: 76rpx;width: 240rpx;height: 76rpx;background: #3464ec;border-radius: 76rpx;">
+							通过</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<tn-modal v-model="show" :title="title" :content="content" :button="button" @click="dian"></tn-modal>
+	</view>
+</template>
+
+<script>
+	import {
+		getAuditing,
+		auditingUpadte
+	} from '@/util/api.js';
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '全部申请'
+				}, {
+					name: '信息修改'
+				}, {
+					name: '入会申请',
+				}],
+				page: 1,
+				all_list: [],
+				current: 0,
+				if_xianshi: 0,
+				show: false,
+				title: '提示信息',
+				content: '提示信息的内容',
+				button: [{
+						text: '取消',
+						backgroundColor: '#F4F4F4',
+						fontColor: '#000000',
+						plain: true,
+						shape: 'round'
+					},
+					{
+						text: '确定',
+						backgroundColor: '#548ceb',
+						fontColor: '#FFFFFF'
+					}
+				],
+				key: 0,
+				key_info: {}
+			}
+		},
+		onLoad() {
+			var that = this;
+			this.getAuditingList();
+			uni.$on('onload', function(data) {
+				that.page = 1;
+				that.all_list = [];
+				that.getAuditingList();
+			})
+		},
+		onReachBottom() {
+			this.page += 1;
+			this.getAuditingList();
+		},
+		methods: {
+			setAuditing() {
+				var user_info = uni.getStorageSync('userInfo');
+				var member_id = this.key_info.type == 1 ? this.key_info.member_id : this.key_info.id;
+				var content = '';
+				if (this.key == 1) {
+					content = this.key_info.type == 1 ? '您提交的资料修改申请已通过审核！' : '您提交的入会申请已通过审核！';
+				} else {
+					content = this.key_info.type == 2 ? '您提交的资料修改申请已被拒绝！' : '您提交的入会申请已被拒绝！';
+				}
+				auditingUpadte({
+						association_id: user_info.association_id,
+						member_id: member_id,
+						if_xianshi: this.key,
+						type: this.key_info.type,
+						content: content,
+						id: this.key_info.id
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+							this.page = 1;
+							this.all_list = [];
+							this.getAuditingList();
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+						this.show = false;
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			dian(d) {
+				if (d.index == 1) {
+					this.setAuditing();
+				} else {
+					this.show = false;
+				}
+			},
+			openModal(info, key) {
+				console.log(key);
+				this.key_info = info;
+				this.key = key;
+				this.show = true;
+				this.title = key == 1 ? '通过申请' : '拒绝申请';
+				this.content = key == 1 ? '确认要通过申请吗？' : '确认要拒绝申请吗？';
+			},
+			change(d) {
+				this.current = d;
+				this.page = 1;
+				this.if_xianshi = 0;
+				this.all_list = [];
+				this.getAuditingList();
+			},
+			changeXs(d) {
+				this.page = 1;
+				this.all_list = [];
+				this.if_xianshi = d;
+				this.getAuditingList();
+			},
+			getAuditingList() {
+				var user_info = uni.getStorageSync('userInfo');
+				getAuditing({
+						association_id: user_info.association_id,
+						page: this.page,
+						size: 10,
+						if: this.current,
+						if_xianshi: this.if_xianshi,
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.all_list.push(...res.data);
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			openUrl(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/packageA/user/user_auditing_info.vue b/pages/packageA/user/user_auditing_info.vue
new file mode 100644
index 0000000..5659243
--- /dev/null
+++ b/pages/packageA/user/user_auditing_info.vue
@@ -0,0 +1,330 @@
+<template>
+	<view style="letter-spacing: 1rpx;background: #ebf4f7;min-height: 100vh;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="false" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view style="text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;width: 85%;">
+					<view>审请详情</view>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="padding:20rpx 20rpx 300rpx 20rpx;">
+				<view
+					style="margin-bottom: 30rpx;box-shadow: 0rpx 10rpx 10rpx #d2e0f2;background: #ffffff;border-radius: 20rpx;padding: 30rpx 20rpx;position: relative;">
+					<view class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-between">
+						<view>
+							<text
+								style="font-size: 35rpx;font-weight: 600;">{{onloadData.type==1?'申请人信息':'推荐人信息'}}</text>
+						</view>
+					</view>
+					<view style="width: 100%;margin: 20rpx auto;border: 1rpx solid #d9d9d961;"></view>
+					<view v-if="info.find!=''" class="tn-flex tn-flex-center tn-flex-col-center"
+						style="padding: 10rpx 0rpx;">
+						<view>
+							<image :src="apiImgUrl+info.find.photo_image"
+								style="border-radius: 50%;width: 100rpx;height: 100rpx"></image>
+						</view>
+						<view style="margin-left: 20rpx;">
+							<view>
+								<text style="font-size: 32rpx;font-weight: 600;">{{info.find.nikename}}</text>
+								<text
+									style="font-size: 28rpx;color: #666666;margin-left: 20rpx;">{{info.find.position_name}}</text>
+
+							</view>
+							<view style="margin-top: 10rpx;">
+								<text style="color: #4a5c72;">{{info.find.enterprise_name}}</text>
+							</view>
+						</view>
+					</view>
+					<view v-if="info.find==''">
+						暂无推荐人
+					</view>
+				</view>
+				<view
+					style="margin-bottom: 30rpx;box-shadow: 0rpx 10rpx 10rpx #d2e0f2;background: #ffffff;border-radius: 20rpx;padding: 30rpx 20rpx;position: relative;">
+					<view class="tn-flex tn-flex-center tn-flex-col-center">
+						<view>
+							<text style="font-size: 35rpx;font-weight: 600;">申请详情</text>
+						</view>
+						<view v-if="onloadData.type==2">
+							<view v-if="info.member.if_xianshi==0"
+								style="margin-left: 30rpx;text-align: center;line-height: 50rpx;width: 120rpx;height: 50rpx;color: #FFF;background-color: #FFBE77;border-radius: 10rpx;">
+								审核中</view>
+							<view v-if="info.member.if_xianshi==1"
+								style="margin-left: 30rpx;text-align: center;line-height: 50rpx;width: 120rpx;height: 50rpx;color: #FFF;background-color: #3F8BF2;border-radius: 10rpx;">
+								已通过</view>
+							<view v-if="info.member.if_xianshi==2"
+								style="margin-left: 30rpx;text-align: center;line-height: 50rpx;width: 120rpx;height: 50rpx;color: #FFF;background-color: #E60000;border-radius: 10rpx;">
+								已拒绝</view>
+						</view>
+						<view v-if="onloadData.type==1">
+							<view v-if="info.find.if_xianshi==0"
+								style="margin-left: 30rpx;text-align: center;line-height: 50rpx;width: 120rpx;height: 50rpx;color: #FFF;background-color: #FFBE77;border-radius: 10rpx;">
+								审核中</view>
+							<view v-if="info.find.if_xianshi==1"
+								style="margin-left: 30rpx;text-align: center;line-height: 50rpx;width: 120rpx;height: 50rpx;color: #FFF;background-color: #3F8BF2;border-radius: 10rpx;">
+								已通过</view>
+							<view v-if="info.find.if_xianshi==2"
+								style="margin-left: 30rpx;text-align: center;line-height: 50rpx;width: 120rpx;height: 50rpx;color: #FFF;background-color: #E60000;border-radius: 10rpx;">
+								已拒绝</view>
+						</view>
+					</view>
+					<view style="width: 100%;margin: 20rpx auto;border: 1rpx solid #d9d9d961;"></view>
+					<view style="padding: 10rpx 0rpx;">
+						<view v-if="onloadData.type==2" style="margin-left: 20rpx;color: #5b5b5b;">
+							<view style="margin-top: 15rpx;">
+								<text style="">手机号：</text>
+								<text>{{info.member.phone}}</text>
+							</view>
+							<view style="margin-top: 15rpx;">
+								<text style="">真实姓名：</text>
+								<text style="">{{info.member.nikename}}</text>
+							</view>
+							<view style="margin-top: 15rpx;">
+								<text style="">性别：</text>
+								<text style="">{{info.member.gender==0?'女':'男'}}</text>
+							</view>
+							<view style="margin-top: 15rpx;">
+								<text style="">企业名称：</text>
+								<text style="">{{info.member.enterprise_name}}</text>
+							</view>
+						</view>
+						<view v-if="onloadData.type==1" style="margin-left: 20rpx;color: #5b5b5b;">
+							<view v-if="info.member_log.background_image" class="tn-flex" style="margin-top: 10rpx;">
+								<view style="width: 200rpx;">更改背景：</view>
+								<image :src="apiImgUrl+info.member_log.background_image" style="height: 200rpx;"
+									mode="heightFix"></image>
+							</view>
+							<view v-if="info.member_log.photo_image" class="tn-flex" style="margin-top: 30rpx;">
+								<view style="width: 200rpx;">形象照：</view>
+								<image :src="apiImgUrl+info.member_log.photo_image"
+									style="height: 100rpx;width: 100rpx;"></image>
+							</view>
+							<view v-if="info.member_log.nikename" class="tn-flex" style="margin-top: 30rpx;">
+								<view style="width: 200rpx;">姓名：</view>
+								<view>{{info.member_log.nikename}}</view>
+							</view>
+							<view v-if="info.member_log.gender_name" class="tn-flex" style="margin-top: 30rpx;">
+								<view style="width: 200rpx;">性别：</view>
+								<view>{{info.member_log.gender_name}}</view>
+							</view>
+							<view v-if="info.member_log.phone" class="tn-flex" style="margin-top: 30rpx;">
+								<view style="width: 200rpx;">联系方式：</view>
+								<view>{{info.member_log.phone}}</view>
+							</view>
+							<view v-if="info.member_log.introduction" class="tn-flex" style="margin-top: 30rpx;">
+								<view style="width: 200rpx;">个人经历：</view>
+								<view @click="infoShow = true;infoType=1;"
+									style="padding: 10rpx;width: 500rpx;background-color: #F5F5F5;border-radius: 5rpx;">
+									<view class="tn-text-ellipsis-3">{{info.member_log.introduction}}</view>
+								</view>
+							</view>
+							<view v-if="info.member_log.enterprise_name" class="tn-flex" style="margin-top: 30rpx;">
+								<view style="width: 200rpx;">公司名称：</view>
+								<view>{{info.member_log.enterprise_name}}</view>
+							</view>
+							<view v-if="info.member_log.industry_id" class="tn-flex" style="margin-top: 30rpx;">
+								<view style="width: 200rpx;">公司行业：</view>
+								<view>{{info.member_log.industry_id==-1?'其他行业':info.member_log.industry_name}}</view>
+							</view>
+							<view v-if="info.member_log.company_image" class="tn-flex" style="margin-top: 30rpx;">
+								<view style="width: 200rpx;">公司Logo：</view>
+								<image :src="apiImgUrl+info.member_log.company_image"
+									style="height: 100rpx;width: 100rpx;"></image>
+							</view>
+							<view v-if="info.member_log.enterprise_location" class="tn-flex" style="margin-top: 30rpx;">
+								<view style="width: 200rpx;">公司地址：</view>
+								<view>{{info.member_log.enterprise_location}}</view>
+							</view>
+							<view v-if="info.member_log.enterprise_Introduction" class="tn-flex"
+								style="margin-top: 30rpx;">
+								<view style="width: 200rpx;">公司介绍：</view>
+								<view @click="infoShow = true;infoType=2;"
+									style="padding: 10rpx;width: 500rpx;background-color: #F5F5F5;border-radius: 5rpx;">
+									<view class="tn-text-ellipsis-3">{{info.member_log.enterprise_Introduction}}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-if="info.find.if_xianshi==0 || info.member.if_xianshi==0"
+				style="position: fixed;background-color: #FFF;width: 100%;bottom: 0;padding-bottom: 100rpx;padding-top: 40rpx;">
+				<view class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-around"
+					style="color: #FFF;text-align: center;">
+					<view @click="openModal(2)"
+						style="color: #ffffff;line-height: 88rpx;width: 138px;height: 88rpx;background: #d54941;border-radius: 8px;">
+						拒绝申请</view>
+					<view @click="openModal(1)"
+						style="line-height: 88rpx;width: 138px;height: 88rpx;background: #3464ec;border-radius: 8px;">
+						申请通过
+					</view>
+				</view>
+			</view>
+		</view>
+		<tn-modal v-model="show" :title="title" :content="content" :button="button" @click="dian"></tn-modal>
+		<tn-popup v-model="infoShow" mode="right" width="100%">
+			<tn-nav-bar :isBack="false" backTitle="" :alpha="true" :bottomShadow="false">
+				<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+					<view style="padding-left: 15rpx;" @click="infoShow = false">
+						<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+					</view>
+					<view class="tn-margin-top"
+						style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+						<tn-tabs :list="[{name:infoType==1?'个人经历':'公司介绍'}]" :current="topCurrent" activeColor="#000"
+							:bold="false" :fontSize="24"></tn-tabs>
+					</view>
+				</view>
+			</tn-nav-bar>
+			<view style="background: rgba(242, 241, 246, 1);height: 100%;padding-bottom: 100rpx;">
+				<view :style="{paddingTop: vuex_custom_bar_height + 20+'px'}"></view>
+				<view style="margin:30rpx;background-color: #ffffff;border-radius: 20rpx;">
+					<view style="padding: 30rpx;">
+						<view>
+							{{infoType==1?info.member_log.introduction:info.member_log.enterprise_Introduction}}
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</tn-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getAuditingFind,
+		auditingUpadte
+	} from '@/util/api.js';
+	import store from "@/store";
+	export default {
+		data() {
+			return {
+				info: {
+					find: []
+				},
+				apiImgUrl: this.$store.state.imgUrl,
+				onloadData: {},
+				show: false,
+				infoShow: false,
+				infoType: 1,
+				title: '提示信息',
+				content: '提示信息的内容',
+				button: [{
+						text: '取消',
+						backgroundColor: '#F4F4F4',
+						fontColor: '#000000',
+						plain: true,
+						shape: 'round'
+					},
+					{
+						text: '确定',
+						backgroundColor: '#548ceb',
+						fontColor: '#FFFFFF'
+					}
+				],
+				key: 0
+			}
+		},
+
+		onLoad(d) {
+			this.onloadData = d;
+			this.getAuditingList();
+		},
+		methods: {
+			dian(d) {
+				if (d.index == 1) {
+					this.setAuditing();
+				} else {
+					this.show = false;
+				}
+			},
+			openModal(key) {
+				this.key = key;
+				this.show = true;
+				this.title = key == 1 ? '通过申请' : '拒绝申请';
+				this.content = key == 1 ? '确认要通过申请吗？' : '确认要拒绝申请吗？';
+			},
+			setAuditing() {
+				var user_info = uni.getStorageSync('userInfo');
+				var member_id = this.onloadData.type == 1 ? this.info.find.id : this.info.member.id;
+				var content = '';
+				if (this.key == 1) {
+					content = this.onloadData.type == 1 ? '您提交的资料修改申请已通过审核！' : '您提交的入会申请已通过审核！';
+				} else {
+					content = this.onloadData.type == 2 ? '您提交的资料修改申请已被拒绝！' : '您提交的入会申请已被拒绝！';
+				}
+				auditingUpadte({
+						...this.onloadData,
+						association_id: user_info.association_id,
+						member_id: member_id,
+						if_xianshi: this.key,
+						content: content
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+							uni.$emit('onload', 1)
+							this.getAuditingList();
+						}
+						this.show = false;
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getAuditingList() {
+				var user_info = uni.getStorageSync('userInfo');
+				getAuditingFind({
+						...this.onloadData,
+						association_id: user_info.association_id
+					})
+					.then(res => {
+						this.info = res.data;
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+	/* 显示两行 */
+	.tn-text-ellipsis-3 {
+		display: -webkit-box;
+		overflow: hidden;
+		white-space: normal !important;
+		text-overflow: ellipsis;
+		word-wrap: break-word;
+		-webkit-line-clamp: 3;
+		-webkit-box-orient: vertical;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/packageB/ask/add.vue b/pages/packageB/ask/add.vue
new file mode 100644
index 0000000..16719f9
--- /dev/null
+++ b/pages/packageB/ask/add.vue
@@ -0,0 +1,133 @@
+<template>
+	<view style="background-color: #F5F5F5;height: 100vh;">
+		<view class="ask_add_bg">
+			<tn-nav-bar customBack :bottomShadow="false" backgroundColor="transparent">
+				<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-center">
+					<view style="color: #000000;;text-align: left;font-size: 36rpx;font-weight: 600;">
+						<text></text>
+					</view>
+				</view>
+				<view slot="back" class='tn-custom-nav-bar__back' style="padding-left: 20rpx;" @click="goBack">
+					<image src="/static/w_back.png" style="width: 60rpx;height: 60rpx;"></image>
+				</view>
+			</tn-nav-bar>
+			<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+				<view style="padding: 30rpx;margin-top: 200rpx;">
+					<view style="background-color: #ffffff;border-radius: 18rpx;padding: 30rpx;">
+						<tn-input placeholder="请输入您的疑问" v-model="issue_names" type="textarea" :clearable="false"
+							:border="false" :height="400" :autoHeight="false"></tn-input>
+						<view style="min-height: 200rpx;">
+							<tn-image-upload-drag ref="imageUpload" :action="action" :width="200" :height="200"
+								:formData="formData" :fileList="fileList" :autoUpload="true" :maxCount="3"
+								:showUploadList="true" :showProgress="false" name="file" :deleteable="true"
+								:customBtn="false" @sort-list="onSortList" @on-list-change="onListChange"
+								:beforeUpload="beforeUpload" uploadText="添加图片" />
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</view>
+		<view style="position: fixed;bottom: 100rpx;width: 100%;">
+			<view @click="onSubmit"
+				style="text-align: center;font-size: 32rpx;color: #ffffff;width: 90%;margin: 0 auto;background-color:#2368F2;line-height: 85rpx;height: 85rpx;border-radius: 85rpx;">
+				提交问题</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getNwwbAdd
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+	export default {
+		data() {
+			return {
+				action: store.state.apiUrl+'/common/upload',
+				//action: 'http://192.168.10.176/api/common/upload',
+				issue_names: '',
+				fileList: '',
+				formData: {},
+				submitLoging: false,
+			}
+		},
+		methods: {
+			onSubmit() {
+				if (this.submitLoging) {
+					return;
+				}
+				this.submitLoging = true;
+				var user = uni.getStorageSync('userInfo');
+				let problem_images = [];
+				this.fileList.forEach(function(item, index) {
+					problem_images.push(item.response.data.url);
+				});
+				var form = {};
+				form.association_id = user.association_id;
+				form.issue_names = this.issue_names;
+				form.problem_images = problem_images.join(",");
+				getNwwbAdd(form)
+					.then(res => {
+						console.log(res);
+						if(res.code==1){
+							uni.showToast({
+								title: '添加成功！',
+								icon: 'none',
+								duration: 2000
+							});
+							setTimeout(()=>{
+								uni.redirectTo({
+									url:'/pages/packageB/ask/user_list'
+								})
+							},1500)
+						}else{
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			onListChange(list) {
+				console.log(list);
+				this.fileList = list;
+			},
+			beforeUpload(e, list) {
+				console.log(e);
+			},
+			// 图片拖拽重新排序
+			onSortList(list) {
+				console.log(list);
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.ask_add_bg {
+		/* background: url('https://ysx.hschool.com.cn/uploads/1/20250509/94f9329dab451d4fc9f6b409d96c2a13.png') no-repeat; */
+		background: url('https://ysx.0rui.cn/uploads/1/20250509/94f9329dab451d4fc9f6b409d96c2a13.png') no-repeat;
+		
+		background-size: 100%;
+		height: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/packageB/ask/index.vue b/pages/packageB/ask/index.vue
new file mode 100644
index 0000000..ae8f37b
--- /dev/null
+++ b/pages/packageB/ask/index.vue
@@ -0,0 +1,169 @@
+<template>
+	<view>
+		<view class="ask_index_bg">
+			<!-- <tn-nav-bar customBack :bottomShadow="false" :backgroundColor="top">
+				<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-center">
+					<view style="color: #000000;;text-align: left;font-size: 36rpx;font-weight: 600;">
+						<text>你问我帮</text>
+					</view>
+				</view>
+				<view slot="back" class='tn-custom-nav-bar__back' style="padding-left: 20rpx;" @click="goBack">
+					<image v-if="top == 'none'" src="/static/w_back.png" style="width: 60rpx;height: 60rpx;"></image>
+					<image v-if="top != 'none'" src="/static/h_back.png" style="width: 60rpx;height: 60rpx;"></image>
+				</view>
+			</tn-nav-bar> -->
+			<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="false" :backgroundColor="top">
+				<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+					<view style="padding-left: 15rpx;" @click="goBack()">
+						<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+					</view>
+					<view class="tn-margin-top">
+					<tn-tabs :list="[{name:'你问我帮'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+					</view>
+				</view> 
+			</tn-nav-bar>
+			<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+				<view style="padding: 30rpx;">
+					<view v-for="item in list" @click="openUrl('/pages/packageB/ask/info?id='+item.id)"
+						style="background-color: #fff;border-radius: 18rpx;padding: 30rpx;margin-bottom: 30rpx;">
+						<view>
+							<image v-if="item.photo_image !='' && item.photo_image!=null"
+								:src="apiImgUrl+item.photo_image"
+								style="border-radius: 50%;width: 50rpx;height: 50rpx;vertical-align: middle;"
+								mode="aspectFill"></image>
+							<image v-if="item.photo_image =='' || item.photo_image==null" src="/static/def.png"
+								style="border-radius: 50%;width: 50rpx;height: 50rpx;vertical-align: middle;"
+								mode="aspectFill"></image>
+							<text
+								style="color: #9B9B9B;vertical-align: middle;margin-left: 10rpx;font-size: 28rpx;font-weight: 400;">{{item.member_name}}</text>
+						</view>
+						<view class="tn-flex" style="margin-top: 30rpx;">
+							<view>
+								<image src="/static/wen.png" style="width: 38rpx;" class="no-img" mode="widthFix">
+								</image>
+							</view>
+							<view style="margin-left: 20rpx;font-size: 28rpx;font-weight: 400;">
+								{{item.issue_names}}
+							</view>
+						</view>
+						<view v-if="item.problem_images!=null && item.problem_images!=''"
+							style="text-align: center;margin-top: 20rpx;">
+							<image :src="apiImgUrl+item.problem_images[0]"
+								style="width: 200rpx;height: 200rpx;border-radius:18rpx 0rpx 0rpx 18rpx;"></image>
+							<image :src="apiImgUrl+item.problem_images[1]"
+								style="width: 200rpx;height: 200rpx;margin: 0rpx 10rpx;">
+							</image>
+							<image :src="apiImgUrl+item.problem_images[2]"
+								style="width: 200rpx;height: 200rpx;border-radius:0rpx 18rpx 18rpx 0rpx;"></image>
+						</view>
+						<view v-if="item.answer_content !=''&&item.answer_content!=null" class="tn-flex"
+							style="background-color: #F7F7F7;padding: 20rpx;border-radius: 18rpx;margin-top: 20rpx;">
+							<view>
+								<image src="/static/da.png" style="width: 35rpx;" class="no-img" mode="widthFix">
+								</image>
+							</view>
+							<view class="tn-text-ellipsis-2"
+								style="margin-left: 20rpx;font-size: 28rpx;font-weight: 400;color: #9B9B9B;">
+								<view v-html="item.answer_content"></view>
+							</view>
+						</view>
+						<view class="tn-flex tn-flex-col-center tn-flex-row-between"
+							style="margin-top: 30rpx;font-size: 26rpx;font-weight: 400;color: #9B9B9B;">
+							<view>{{item.question_time}}</view>
+							<view>
+								<text class="tn-icon-eye"></text>
+								<text style="margin-left: 5rpx;">{{item.click_count}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<image @click="openUrl('/pages/packageB/ask/add')" src="/static/tiwen.png"
+			style="width: 106rpx;position: fixed;right:30rpx;bottom: 150rpx;" mode="widthFix" class="no-img"></image>
+	</view>
+</template>
+
+<script>
+	import {
+		getNwwbList
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+
+	export default {
+		
+		data() {
+			return {
+				top:'none',
+				apiImgUrl: store.state.imgUrl,
+				list: [],
+				page: 1
+			}
+		},
+		onPageScroll(res) {
+			console.log(res);
+			if (res.scrollTop > 50) {
+				this.top = "#ffffff";
+			} else {
+				this.top = "none";
+			}
+		},
+		onLoad() {
+			this.getList();
+		},
+		onReachBottom() {
+			this.page += 1;
+			this.getList();
+		},
+		methods: {
+			getList() {
+				var user = uni.getStorageSync('userInfo');
+				getNwwbList({
+						association_id: user.association_id,
+						page: this.page,
+						size: 10
+					})
+					.then(res => {
+						this.list.push(...res.data)
+						console.log(res);
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			openUrl(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+	.ask_index_bg {
+		/* background: url('https://ysx.hschool.com.cn/uploads/1/20250509/4247d991a9a95810641fb3b533602978.png') no-repeat; */
+		background: url('https://ysx.0rui.cn/uploads/1/20250509/4247d991a9a95810641fb3b533602978.png') no-repeat;
+		background-size: 100%;
+		height: 50vh;
+	}
+
+	page {
+		background-color: #F5F5F5!important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/packageB/ask/info.vue b/pages/packageB/ask/info.vue
new file mode 100644
index 0000000..f1b1dc1
--- /dev/null
+++ b/pages/packageB/ask/info.vue
@@ -0,0 +1,127 @@
+<template>
+	<view style="background-color: #F7F7F7;min-height: 100vh;">
+		<tn-nav-bar customBack :bottomShadow="false" backgroundColor="#ffffff">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-center">
+				<view style="color: #000000;;text-align: left;font-size: 36rpx;font-weight: 600;">
+					<text>详情</text>
+				</view>
+			</view>
+			<view slot="back" class='tn-custom-nav-bar__back' style="padding-left: 20rpx;" @click="goBack">
+				<image src="/static/h_back.png" style="width: 60rpx;height: 60rpx;"></image>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="padding: 30rpx;">
+				<view style="background-color: #fff;border-radius: 18rpx;padding: 30rpx;margin-bottom: 30rpx;">
+					<view>
+						<image v-if="info.photo_image !='' && info.photo_image!=null" :src="apiImgUrl+info.photo_image" style="border-radius: 50%;width: 50rpx;height: 50rpx;vertical-align: middle;"
+							mode="aspectFill"></image>
+							<image v-if="info.photo_image =='' || info.photo_image==null" src="/static/def.png" style="border-radius: 50%;width: 50rpx;height: 50rpx;vertical-align: middle;"
+								mode="aspectFill"></image>
+						<text
+							style="color: #9B9B9B;vertical-align: middle;margin-left: 10rpx;font-size: 28rpx;font-weight: 400;">{{info.member_name}}</text>
+					</view>
+					<view class="tn-flex" style="margin-top: 30rpx;">
+						<view>
+							<image src="/static/wen.png" style="width: 38rpx;" class="no-img" mode="widthFix">
+							</image>
+						</view>
+						<view style="margin-left: 20rpx;font-size: 28rpx;font-weight: 400;">
+							{{info.issue_names}}
+						</view>
+					</view>
+					<view v-if="info.problem_images!=null && info.problem_images!=''"
+						style="text-align: center;margin-top: 20rpx;">
+						<image @click="previewImage(0)" :src="apiImgUrl+info.problem_images[0]"
+							style="width: 200rpx;height: 200rpx;border-radius:18rpx 0rpx 0rpx 18rpx;"></image>
+						<image @click="previewImage(1)" :src="apiImgUrl+info.problem_images[1]"
+							style="width: 200rpx;height: 200rpx;margin: 0rpx 10rpx;">
+						</image>
+						<image @click="previewImage(2)" :src="apiImgUrl+info.problem_images[2]"
+							style="width: 200rpx;height: 200rpx;border-radius:0rpx 18rpx 18rpx 0rpx;"></image>
+					</view>
+
+					<view class="tn-flex tn-flex-col-center tn-flex-row-between"
+						style="margin-top: 30rpx;font-size: 26rpx;font-weight: 400;color: #9B9B9B;">
+						<view>{{info.question_time}}</view>
+						<view>
+							<text class="tn-icon-eye"></text>
+							<text style="margin-left: 5rpx;">{{info.click_count}}</text>
+						</view>
+					</view>
+				</view>
+				<view v-if="info.answer_content!=null && info.answer_content!=''"
+					style="background-color: #fff;border-radius: 18rpx;padding:30rpx;">
+					<view class="tn-flex">
+						<view>
+							<image src="/static/da.png" style="width: 35rpx;" class="no-img" mode="widthFix">
+							</image>
+						</view>
+						<view 
+							style="margin-left: 20rpx;font-size: 28rpx;font-weight: 400;color: #9B9B9B;">
+							<view v-html="info.answer_content"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getNwwbInfo
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+	export default {
+		data() {
+			return {
+				apiImgUrl: store.state.imgUrl,
+				id: 0,
+				info: {}
+			}
+		},
+		onLoad(item) {
+			this.id = item.id;
+			this.getInfo();
+		},
+		methods: {
+			previewImage(index) {
+				uni.previewImage({
+					current: index,
+					urls: this.info.problem_images
+				});
+			},
+			getInfo() {
+				getNwwbInfo({
+						id: this.id
+					})
+					.then(res => {
+						console.log(res);
+						this.info = res.data;
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/packageB/ask/user_list.vue b/pages/packageB/ask/user_list.vue
new file mode 100644
index 0000000..d53568a
--- /dev/null
+++ b/pages/packageB/ask/user_list.vue
@@ -0,0 +1,153 @@
+<template>
+	<view style="background-color: #F5F5F5;height: 100vh;">
+		<tn-nav-bar customBack :bottomShadow="false" backgroundColor="#ffffff">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-center">
+				<view style="color: #000000;;text-align: left;font-size: 36rpx;font-weight: 600;">
+					<text>信息审核</text>
+				</view>
+			</view>
+			<view slot="back" class='tn-custom-nav-bar__back' style="padding-left: 20rpx;" @click="goBack">
+				<image src="/static/h_back.png" style="width: 60rpx;height: 60rpx;"></image>
+			</view>
+
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="background-color: #fff;">
+				<tn-tabs :list="List" :isScroll="false" :activeItemStyle="{fontSize:'30rpx',fontWeight:'600'}"
+					activeColor="#000000" inactiveColor="#9B9B9B"
+					:barStyle="{color:'#2368F2',backgroundColor:'#2368F2'}" :current="current" name="name"
+					@change="change" :fontSize="28"></tn-tabs>
+			</view>
+			<view style="padding: 30rpx;">
+				<view v-for="item in userList"
+					style="background-color: #fff;border-radius: 18rpx;padding: 30rpx;margin-bottom: 30rpx;position: relative;">
+					<image v-if="current==0" src="/static/ask_dai.png"
+						style="width: 100rpx;position: absolute;right: 0;top: 0;" mode="widthFix" class="no-img">
+					</image>
+					<image v-if="current==1" src="/static/ask_ok.png"
+						style="width: 100rpx;position: absolute;right: 0;top: 0;" mode="widthFix" class="no-img">
+					</image>
+					<image v-if="current==2" src="/static/ask_no.png"
+						style="width: 100rpx;position: absolute;right: 0;top: 0;" mode="widthFix" class="no-img">
+					</image>
+					<view>
+						<image v-if="item.photo_image !='' && item.photo_image!=null" :src="apiImgUrl+item.photo_image"
+							style="border-radius: 50%;width: 50rpx;height: 50rpx;vertical-align: middle;"
+							mode="aspectFill"></image>
+						<image v-if="item.photo_image =='' || item.photo_image==null" src="/static/def.png"
+							style="border-radius: 50%;width: 50rpx;height: 50rpx;vertical-align: middle;"
+							mode="aspectFill"></image>
+						<text
+							style="color: #9B9B9B;vertical-align: middle;margin-left: 10rpx;font-size: 28rpx;font-weight: 400;">{{item.member_name}}</text>
+					</view>
+					<view class="tn-flex" style="margin-top: 30rpx;">
+						<view>
+							<image src="/static/wen.png" style="width: 38rpx;" class="no-img" mode="widthFix">
+							</image>
+						</view>
+						<view style="margin-left: 20rpx;font-size: 28rpx;font-weight: 400;">
+							{{item.issue_names}}
+						</view>
+					</view>
+					<view v-if="item.problem_images!=null && item.problem_images!=''"
+						style="text-align: center;margin-top: 20rpx;">
+						<image @click="previewImage(0)" :src="apiImgUrl+item.problem_images[0]"
+							style="width: 200rpx;height: 200rpx;border-radius:18rpx 0rpx 0rpx 18rpx;"></image>
+						<image @click="previewImage(1)" :src="apiImgUrl+item.problem_images[1]"
+							style="width: 200rpx;height: 200rpx;margin: 0rpx 10rpx;">
+						</image>
+						<image @click="previewImage(2)" :src="apiImgUrl+item.problem_images[2]"
+							style="width: 200rpx;height: 200rpx;border-radius:0rpx 18rpx 18rpx 0rpx;"></image>
+					</view>
+
+					<view class="tn-flex tn-flex-col-center tn-flex-row-between"
+						style="margin-top: 30rpx;font-size: 26rpx;font-weight: 400;color: #9B9B9B;">
+						<view>{{info.question_time}}</view>
+						<!-- <view>
+							<text class="tn-icon-eye"></text>
+							<text>133</text>
+						</view> -->
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getNwwbUser
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+	export default {
+		data() {
+			return {
+				apiImgUrl: store.state.imgUrl,
+				current: 0,
+				List: [{
+					'name': '待审核',
+					type: 1,
+				}, {
+					'name': '已通过',
+					type: 2
+				}, {
+					'name': '未通过',
+					type: 3
+				}],
+				status: 1,
+				userList: [],
+				page: 1
+			}
+		},
+		onLoad() {
+			this.getUserList();
+		},
+		onReachBottom() {
+			this.page += 1;
+			this.getUserList();
+		},
+		methods: {
+			change(e) {
+				this.userList = [];
+				this.page = 1;
+				this.current = e;
+				this.status = this.List[e].type;
+				this.getUserList();
+			},
+			getUserList() {
+				getNwwbUser({
+						status: this.status,
+						page: this.page,
+						size: 10
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.userList.push(...res.data);
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/pages/packageB/event/event_info.vue b/pages/packageB/event/event_info.vue
new file mode 100644
index 0000000..72a0418
--- /dev/null
+++ b/pages/packageB/event/event_info.vue
@@ -0,0 +1,617 @@
+<template>
+	<view style="letter-spacing: 1rpx;" v-cloak>
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-between">
+				<view class="tn-flex tn-flex-col-center tn-flex-row-left">
+					<view style="padding-left: 15rpx;" @click="goBack()">
+						<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+					</view>
+					<view class="tn-margin-top"
+						style="text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+						<tn-tabs :list="[{name:'活动详情'}]" :current="topCurrent" activeColor="#000" :bold="false"
+							:fontSize="36"></tn-tabs>
+					</view>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<image :src="apiImgUrl+info.activity_image" style="width: 100%;" mode="widthFix"></image>
+			<view>
+				<view style="padding:20rpx 30rpx;">
+					<view style="font-size: 34rpx;font-weight: 600;">{{ info.activity_name }}</view>
+					<view style="margin-top: 40rpx;">
+						<view>
+							<text style="color: #26BB71;">●</text>
+							<text style="margin-left: 10rpx;font-weight: 600;">活动开始时间：</text>
+							<text style="color: #979797;">{{ info.activity_start_time }}</text>
+						</view>
+						<view style="margin: 15rpx 0rpx;">
+							<text style="color: #BE7E28;">●</text>
+							<text style="margin-left: 10rpx;font-weight: 600;">活动结束时间：</text>
+							<text style="color: #979797;">{{ info.activity_end_time }}</text>
+						</view>
+						<view>
+							<text style="color: #DB5022;">●</text>
+							<text style="margin-left: 10rpx;font-weight: 600;">活动地点：</text>
+							<text style="color: #979797;">{{ info.activity_location }}</text>
+						</view>
+						<view style="margin: 15rpx 0rpx;">
+							<text style="color: #0000FF;">●</text>
+							<text style="margin-left: 10rpx;font-weight: 600;">活动规模：</text>
+							<text style="color: #979797;">{{info.number==0?'不限制':info.number+'人'}}</text>
+						</view>
+						<view v-if="info.activity_type!=1&&info.activity_type!=4">
+							<view style="margin: 15rpx 0rpx;" v-if="info.if_display_registrants==2">
+								<text style="color: #0000FF;">●</text>
+								<text v-if="info.activity_type==3"
+									style="margin-left: 10rpx;font-weight: 600;">捐赠人数：</text>
+								<text v-if="info.activity_type==2"
+									style="margin-left: 10rpx;font-weight: 600;">填写人数：</text>
+								<text v-if="info.activity_type==1||info.activity_type==4"
+									style="margin-left: 10rpx;font-weight: 600;">报名人数：</text>
+								<text style="color: #979797;">{{ info.list.length}}人</text>
+							</view>
+							<view style="margin: 15rpx 0rpx;" v-if="info.if_display_registrants==1"
+								class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-between"
+								@click="rightMod = true">
+								<view class="tn-flex tn-flex-center tn-flex-col-center">
+									<view style="color: #0000FF;">●</view>
+									<view v-if="info.activity_type==3" style="margin-left: 10rpx;font-weight: 600;">
+										捐赠详情：</view>
+									<view v-if="info.activity_type==2" style="margin-left: 10rpx;font-weight: 600;">
+										填写详情：</view>
+									<view v-if="info.activity_type==1||info.activity_type==4"
+										style="margin-left: 10rpx;font-weight: 600;">报名详情：</view>
+									<tn-avatar-group :border="false" :lists="info.list.slice(0, 8)"></tn-avatar-group>
+								</view>
+								<view>
+									<text style="margin-right: 10rpx">{{info.list.length}}人</text>
+									<text class="tn-icon-right"></text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="info.activity_type==1||info.activity_type==4">
+					<view style="width: 100%;height: 10rpx;background-color: #EBF4F7"></view>
+					<view style="padding:20rpx 30rpx;">
+						<view style="margin: 15rpx 0rpx;">
+							<text style="color: #26BB71;">●</text>
+							<text style="margin-left: 10rpx;font-weight: 600;">报名开始时间：</text>
+							<text style="color: #979797;">{{ info.signup_start_time }}</text>
+						</view>
+						<view style="margin: 15rpx 0rpx;">
+							<text style="color: #BE7E28;">●</text>
+							<text style="margin-left: 10rpx;font-weight: 600;">报名结束时间：</text>
+							<text style="color: #979797;">{{ info.signup_end_time }}</text>
+						</view>
+						<view style="margin: 15rpx 0rpx;" v-if="info.if_display_registrants==1">
+							<text style="color: #0000FF;">●</text>
+							<text style="margin-left: 10rpx;font-weight: 600;">报名人数：</text>
+							<text style="color: #979797;">{{ info.list.length}}人</text>
+						</view>
+						<view style="margin: 15rpx 0rpx;" v-if="info.if_display_registrants==1"
+							class="tn-flex tn-flex-center tn-flex-col-center tn-flex-row-between"
+							@click="rightMod = true">
+							<view class="tn-flex tn-flex-center tn-flex-col-center">
+								<view style="color: #0000FF;">●</view>
+								<view style="margin-left: 10rpx;font-weight: 600;">报名详情：</view>
+								<tn-avatar-group :border="false" :lists="info.list.slice(0, 8)"></tn-avatar-group>
+							</view>
+							<view>
+								<text style="margin-right: 10rpx">{{info.list.length}}人</text>
+								<text class="tn-icon-right"></text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view style="width: 100%;height: 10rpx;background-color: #EBF4F7"></view>
+				<view style="padding:20rpx 30rpx;">
+					<view style="margin-top: 20rpx;font-size: 32rpx;font-weight: 600;">活动介绍</view>
+					<view>
+						<view class="ks_html" style="line-height: 50rpx;margin-top: 20rpx;">
+							<view v-if="info.video!=null&&info.video!=''">
+								<video :src="apiImgUrl+info.video" style="width: 100%;border-radius: 5rpx;"></video>
+							</view>
+							<view v-html="info.activity_content"></view>
+						</view>
+					</view>
+					<view v-if="info.activity_type==1||info.activity_type==3" style="height: 180rpx;"></view>
+					<view v-if="info.activity_type==2" style="padding-bottom: 180rpx;">
+						<view style="margin-top: 60rpx;font-size: 32rpx;font-weight: 600;">问卷问题</view>
+						<tn-form labelPosition="top" :model="form" ref="form">
+							<template v-for="(item,index) in questionnaireList">
+								<tn-form-item v-if="item.type==2" :label="(index+1)+'、'+item.title+'（多选题）'"
+									prop="hobby">
+									<tn-checkbox-group v-model="questionnaireList[index].topic" size="40"
+										activeColor="#82B2FF" wrap>
+										<tn-checkbox :name="op.name" v-for="(op,opi) in item.option">
+											{{ op.name }}、{{ op.val }}
+										</tn-checkbox>
+									</tn-checkbox-group>
+								</tn-form-item>
+								<tn-form-item v-if="item.type==1" :label="(index+1)+'、'+item.title+'（单选题）'"
+									prop="danxuan">
+									<tn-radio-group v-model="questionnaireList[index].topic" size="40"
+										activeColor="#82B2FF" wrap>
+										<tn-radio :name="op.name" v-for="(op,opi) in item.option">
+											{{ op.name }}、{{ op.val }}
+										</tn-radio>
+									</tn-radio-group>
+								</tn-form-item>
+								<tn-form-item v-if="item.type==3" :label="(index+1)+'、'+item.title+'（问答题）'"
+									prop="wenda">
+									<tn-input placeholder="请填写答案" v-model="questionnaireList[index].topic"
+										type="textarea" />
+								</tn-form-item>
+							</template>
+						</tn-form>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view style="position: fixed;bottom: 30rpx; width: 100%;">
+			<!--			<view class="tn-flex tn-flex-center tn-flex-row-center tn-flex-col-center"-->
+			<!--				style="background-color: #FDF2EC;text-align: center;padding: 30rpx;">-->
+			<!--				<view style="font-weight: 600;">-->
+			<!--					<text style="margin-right: 10rpx;">距报名结束剩<text style="color: #F73909;">119</text>天</text>-->
+			<!--					<tn-count-down fontColor="#F73909" backgroundColor="#FDF2EC" :fontSize="30" :timestamp="86400"-->
+			<!--						:showDays="true" :showHours="true" :showSeconds="true" :showMinutes="true"></tn-count-down>-->
+			<!--				</view>-->
+			<!--			</view>-->
+			<view style="text-align: center;padding:0 30rpx;" v-if="info.activity_type==1">
+				<button class="mmy" hover-class="none" @click="application_add" v-if="info.type=='进行中'">确认报名</button>
+				<button class="mmy" hover-class="none" :disabled="true" v-if="info.type=='已结束'">报名已结束</button>
+				<button class="mmy" hover-class="none" :disabled="true" v-if="info.type=='未开始'">报名未开始</button>
+			</view>
+			<view style="text-align: center;padding:0 30rpx;" v-if="info.activity_type==2">
+				<button class="mmy" hover-class="none" :disabled="true" v-if="info.type=='未开始'">问卷未开始</button>
+				<button class="mmy" hover-class="none" @click="option_add" v-if="info.type=='进行中'">确认提交</button>
+				<button class="mmy" hover-class="none" :disabled="true" v-if="info.type=='已结束'">问卷已结束</button>
+			</view>
+			<view style="text-align: center;padding:0 30rpx;" v-if="info.activity_type==3">
+				<button class="mmy" hover-class="none" :disabled="true" v-if="info.type=='未开始'">捐助未开始</button>
+				<button class="mmy" hover-class="none" @click="juanMod=true" v-if="info.type=='进行中'">我要捐助</button>
+				<button class="mmy" hover-class="none" :disabled="true" v-if="info.type=='已结束'">捐助已结束</button>
+			</view>
+			<view style="text-align: center;padding:0 30rpx;" v-if="info.activity_type==4">
+				<button class="mmy" hover-class="none" @click="peiMod=true" v-if="info.type=='进行中'">我要参加</button>
+				<button class="mmy" hover-class="none" :disabled="true" v-if="info.type=='已结束'">报名已结束</button>
+				<button class="mmy" hover-class="none" :disabled="true" v-if="info.type=='未开始'">报名未开始</button>
+			</view>
+		</view>
+		<tn-modal v-model="juanMod" :custom="true">
+			<view style="padding: 20rpx;text-align: center;font-size: 40rpx;">感谢您的捐助</view>
+			<tn-form :labelWidth="180">
+				<tn-form-item label="捐助金额">
+					<tn-input v-model="money" type="decimal" placeholder="请填写捐助金额" />
+				</tn-form-item>
+			</tn-form>
+			<view class="tn-flex tn-flex-row-center" style="margin-top: 50rpx;">
+				<tn-button @click="juanMod=false" backgroundColor="#E6E6E6" fontColor="#838383">我再想想</tn-button>
+				<tn-button @click="juanzhuDo" backgroundColor="#28B93D" fontColor="#ffffff"
+					style="margin-left: 70rpx;">确定捐助
+				</tn-button>
+			</view>
+		</tn-modal>
+		<tn-modal v-model="peiMod" :custom="true">
+			<view style="padding: 20rpx;text-align: center;font-size: 40rpx;">需要缴纳费用</view>
+			<view style="text-align: center;margin-top: 30rpx;">
+				<text style="font-size: 40rpx;">¥</text>
+				<text style="font-size: 70rpx;color: #26BB71;margin-left: 5rpx;font-weight: 600;">{{info.money}}</text>
+			</view>
+			<view class="tn-flex tn-flex-row-center" style="margin-top: 50rpx;">
+				<tn-button @click="peiMod=false" backgroundColor="#E6E6E6" fontColor="#838383">我再想想</tn-button>
+				<tn-button @click="zhifuDo" backgroundColor="#28B93D" fontColor="#ffffff"
+					style="margin-left: 70rpx;">支付费用
+				</tn-button>
+			</view>
+		</tn-modal>
+		<tn-popup v-model="rightMod" mode="right" width="70%">
+			<tn-nav-bar :isBack="false" backTitle="" :alpha="true" :bottomShadow="false">
+				<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+					<view style="padding-left: 15rpx;" @click="rightMod = false">
+						<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+					</view>
+					<view class="tn-margin-top"
+						style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+						<tn-tabs :list="[{name:'报名详情'}]" :current="topCurrent" activeColor="#000" :bold="false"
+							:fontSize="24"></tn-tabs>
+					</view>
+				</view>
+			</tn-nav-bar>
+			<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+				<view v-if="info.list.length!=0" class="tn-flex tn-flex-center tn-flex-col-center"
+					v-for="(item,index) in info.list" @click="openUrl('/pages/packageA/user/my_card?id='+item.id)"
+					style="margin-top: 20rpx;padding: 20rpx;">
+					<view>
+						<image :src="apiImgUrl+item.photo_image"
+							style="width: 100rpx;height: 100rpx;border-radius: 50%"></image>
+					</view>
+					<view style="margin-left: 20rpx;">
+						<view style="font-size: 30rpx;font-weight: 600">{{item.nikename}}</view>
+						<view style="font-size: 24rpx;color: #999999;margin-top: 10rpx">{{item.position_name}}</view>
+					</view>
+				</view>
+				<view v-if="info.list.length==0" style="text-align: center;padding-top: 40rpx">暂无</view>
+			</view>
+		</tn-popup>
+		<tn-modal v-model="showLogin" :custom="true">
+			<view style="text-align: center;">
+				<view style="font-size: 32rpx;font-weight: 600;">登陆提示</view>
+				<view style="margin-top: 40rpx;">请登录后参与活动！</view>
+			</view>
+			<view style="text-align: center;margin-top: 40rpx;">
+				<tn-button open-type="getPhoneNumber" @getphonenumber="PhoneLogin" backgroundColor="#3377FF"
+					height="75rpx" width="500rpx" shape="round" fontColor="#ffffff">点击登陆</tn-button>
+			</view>
+		</tn-modal>
+	</view>
+</template>
+
+<script>
+	import {
+		eventInfo,
+		questionnaireFind,
+		applicationAdd,
+		questionnaireAdd,
+		moneyLogAdd,
+		wxphoneLogin
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+
+	export default {
+		data() {
+			return {
+				showLogin: false,
+				money: '',
+				juanMod: false,
+				rightMod: false,
+				peiMod: false, //培训付费
+				questionnaireList: [], //问卷列表
+				button: [{
+						text: '取消',
+						backgroundColor: '#E6E6E6',
+						fontColor: '#FFFFFF',
+						shape: 'round'
+					},
+					{
+						text: '确定',
+						backgroundColor: 'tn-bg-indigo',
+						fontColor: '#FFFFFF'
+					}
+				],
+				form: {
+					wenda: '',
+					danxuan: '',
+					hobby: [],
+				},
+				topCurrent: 0,
+				id: 0,
+				info: {
+					list: []
+				},
+				apiImgUrl: this.$store.state.imgUrl
+			}
+		},
+		mounted() {
+			// this.$wxshare({
+			// 	url: 'http://ysh.0rui.cn/#/pages/index/event_info',
+			// 	data: {
+			// 		url: window.location.href.split("#")[0],
+			// 	},
+			// 	share_data: {
+			// 		title: '河南省青年企业家协会开展走进开封市龙亭区暨产业考察交流活动',
+			// 		desc: '河南省青年企业家协会开展走进开封市龙亭区暨产业考察交流活动',
+			// 		imgUrl: 'http://ysh.0rui.cn/static/ser.png',
+			// 		link: "http://ysh.0rui.cn/#/pages/index/event_info", // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
+			// 	}
+			// })
+			// var id =  this.$route.query.id;
+			// this.id = id;
+			// this.getEventInfo();
+		},
+		onShareAppMessage() { // 分享到微信好友
+			// 更多参数配置，参考文档
+			return {
+				title: this.info.activity_name,
+				path: '/pages/packageB/event/event_info?id=' + this.info.id + "&gid=" + store.state.Gid,
+				imageUrl: this.apiImgUrl + this.info.activity_image,
+			}
+		},
+		onShareTimeline() { // 分享到朋友圈
+			return {
+				title: this.info.activity_name,
+				path: '/pages/packageB/event/event_info?id=' + this.info.id + "&gid=" + store.state.Gid,
+				imageUrl: this.apiImgUrl + this.info.activity_image,
+			}
+		},
+
+		onLoad(d) {
+			var uid = uni.getStorageSync('uid');
+			console.log(d);
+			this.id = d.id;
+			if (typeof(d.gid) != 'undefined') {
+				console.log(11111111);
+				store.commit('$tStore', {
+					name: 'Gid',
+					value: d.gid
+				})
+				uni.setStorageSync('Gid', d.gid);
+			}
+			if (!uid) {
+				getApp().getUserLogin((r) => {
+					console.log('---Login---', r);
+				})
+			}
+			this.getEventInfo();
+		},
+		methods: {
+			PhoneLogin(d) {
+				console.log(d);
+				var openid = uni.getStorageSync('openid');
+				wxphoneLogin({
+						code: d.code,
+						openid: openid
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							uni.showToast({
+								title: '登陆成功！',
+								icon: 'none',
+								duration: 2000
+							});
+							uni.setStorageSync('uid', res.data.id);
+							uni.setStorageSync('userInfo', res.data);
+							this.userInfo = res.data;
+							this.showLogin = false;
+						} else {
+							uni.showToast({
+								title: '登陆失败！',
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			zhifuDo() {
+				this.peiMod = false;
+				var uid = uni.getStorageSync('uid');
+				if (!uid) {
+					this.showLogin = true;
+					return;
+				}
+				applicationAdd({
+						association_id: store.state.Gid,
+						member_id: uid,
+						activity_id: this.id,
+					})
+					.then(res => {
+						if (res.code == 1) {
+							uni.showToast({
+								title: '报名成功！',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+
+			},
+			juanzhuDo() {
+				this.juanMod = false;
+				var uid = uni.getStorageSync('uid');
+				if (!uid) {
+					this.showLogin = true;
+					return;
+				}
+				moneyLogAdd({
+						association_id: store.state.Gid,
+						member_id: uid,
+						activity_id: this.id,
+						money: this.money
+					})
+					.then(res => {
+						if (res.code == 1) {
+							uni.showToast({
+								title: '捐助成功！',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			option_add() {
+				var uid = uni.getStorageSync('uid');
+				if (!uid) {
+					this.showLogin = true;
+					return;
+				}
+				var that = this;
+				var uid = uni.getStorageSync('uid');
+				var key = this.questionnaireList.map((item, index) => {
+					if (!('topic' in item)) {
+						return '';
+					} else {
+						return {
+							activity_id: that.id,
+							topic_id: item.id,
+							member_id: uid,
+							option: Array.isArray(item.topic) ? item.topic.join(',') : item.topic,
+						}
+					}
+				});
+				for (var i = 0; i < key.length; i++) {
+					if (key[i] == '') {
+						uni.showToast({
+							title: '请填写第[' + (i + 1) + ']个问题',
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+				}
+				questionnaireAdd({
+						option: JSON.stringify(key),
+						activity_id: this.id,
+						member_id: uid,
+						association_id: store.state.Gid,
+					})
+					.then(res => {
+						console.log(res);
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			application_add() {
+				var uid = uni.getStorageSync('uid');
+				if (!uid) {
+					this.showLogin = true;
+					return;
+				}
+				applicationAdd({
+						association_id: store.state.Gid,
+						member_id: uid,
+						activity_id: this.id,
+						//application_time: new Date().toISOString().slice(0, 19).replace('T', ' ')
+					})
+					.then(res => {
+						if (res.code == 1) {
+							uni.showToast({
+								title: '报名成功！',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getEventInfo() {
+				eventInfo({
+						association_id: store.state.Gid,
+						id: this.id
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							if (key.activity_content.indexOf("<img") != -1) {
+								key.activity_content = getApp().addWidthToImages(key.activity_content);
+							}
+							this.info = key;
+							if (this.info.activity_type == 2) {
+								this.getEventOption()
+							}
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			getEventOption() {
+				questionnaireFind({
+						activity_id: this.id
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							this.questionnaireList = res.data;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							icon: 'none',
+							duration: 2000
+						});
+					})
+			},
+			openUrl(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			}
+		},
+	}
+</script>
+
+<style>
+	.mmy {
+		background-color: #F73909;
+		border-radius: 30px;
+		height: 80rpx;
+		width: 100%;
+		color: #FFF;
+		line-height: 80rpx;
+		font-size: 28rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/packageB/news/new_info.vue b/pages/packageB/news/new_info.vue
new file mode 100644
index 0000000..252a01a
--- /dev/null
+++ b/pages/packageB/news/new_info.vue
@@ -0,0 +1,127 @@
+<template>
+	<view style="letter-spacing: 1rpx;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'详情'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="padding: 30rpx;">
+				<view style="text-align: center;font-size:40rpx;font-weight: 600">{{info.news_title}}</view>
+				<view style="margin-top: 30rpx;color: #999;">
+					<text>时间：{{info.showtime}}</text>
+					<text style="margin-left: 20rpx;">来源：{{info.news_source}}</text>
+				</view>
+				<view style="width: 100%;height: 2rpx;background-color: #eee;margin-top: 30rpx;"></view>
+				<view>
+					<!--					<view style="margin-top: 20rpx;position: relative;">-->
+					<!--						<image src="/static/b1.png"-->
+					<!--							style="width: 100rpx;height: 100rpx;position: absolute;left: 0;right: 0;top: 38%;z-index: 10;margin: 0 auto;">-->
+					<!--						</image>-->
+					<!--						<image src="/static/t7.jpg" style="width: 100%;border-radius: 20rpx;" mode="widthFix">-->
+					<!--						</image>-->
+					<!--					</view>-->
+					<view class="ks_html" style="line-height: 50rpx;margin-top: 20rpx;">
+						<div v-html="info.news_content"></div>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		newsInfo,
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+	export default {
+		data() {
+			return {
+				topCurrent: 0,
+				id: 0,
+				info: {},
+				apiImgUrl: this.$store.state.imgUrl,
+			}
+		},
+		// mounted() {
+		// 	var id = window.location.href.split("=")[1];
+		// 	this.id = id;
+		// 	this.getNewsInfo();
+		// },
+		onLoad(d) {
+			console.log(d);
+			this.id = d.id;
+			if (typeof(d.gid) != 'undefined') {
+				store.commit('$tStore', {
+					name: 'Gid',
+					value: d.gid
+				})
+				uni.setStorageSync('Gid', d.gid);
+			}
+			this.getNewsInfo();
+		},
+		onShareAppMessage() { // 分享到微信好友
+			// 更多参数配置，参考文档
+			return {
+				title: this.info.news_title,
+				path: '/pages/packageB/news/new_info?id=' + this.info.news_id + '&gid=' + this.info.association_id,
+				imageUrl: this.apiImgUrl + this.info.news_image,
+			}
+		},
+		onShareTimeline() { // 分享到朋友圈
+			return {
+				title: this.info.news_title,
+				path: '/pages/packageB/news/new_info?id=' + this.info.news_id + '&gid=' + this.info.association_id,
+				imageUrl: this.apiImgUrl + this.info.news_image,
+			}
+		},
+		methods: {
+			getNewsInfo() {
+				newsInfo({
+						association_id: store.state.Gid,
+						news_id: this.id
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							if (key.news_content.indexOf("<img") != -1) {
+								key.news_content = getApp().addWidthToImages(key.news_content);
+							}
+							this.info = key;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							duration: 2000
+						});
+					})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+	.ks_html img {
+		width: 100% !important;
+	}
+</style>
diff --git a/pages/packageB/news/notice_info.vue b/pages/packageB/news/notice_info.vue
new file mode 100644
index 0000000..c7b9307
--- /dev/null
+++ b/pages/packageB/news/notice_info.vue
@@ -0,0 +1,116 @@
+<template>
+	<view style="letter-spacing: 1rpx;">
+		<tn-nav-bar :isBack="false" backTitle="" :bottomShadow="true" backgroundColor="#FFFFFF">
+			<view class="custom-nav tn-flex tn-flex-col-center tn-flex-row-left">
+				<view style="padding-left: 15rpx;" @click="goBack()">
+					<text class="tn-icon-left" style="font-size: 40rpx;"></text>
+				</view>
+				<view class="tn-margin-top"
+					style=";text-shadow:  1rpx 0 0 #FFF, 0 1rpx 0 #FFF, -1rpx 0 0 #FFF , 0 -1rpx 0 #FFF;">
+					<tn-tabs :list="[{name:'公告详情'}]" :current="topCurrent" activeColor="#000" :bold="false"
+						:fontSize="36"></tn-tabs>
+				</view>
+			</view>
+		</tn-nav-bar>
+		<view :style="{paddingTop: vuex_custom_bar_height + 'px'}">
+			<view style="padding: 30rpx;">
+				<view style="text-align: center;font-size:40rpx;font-weight: 600">{{info.notice_title}}</view>
+				<view style="margin-top: 30rpx;color: #999;">
+					<text>时间：{{info.createtime}}</text>
+				</view>
+				<view style="width: 100%;height: 2rpx;background-color: #eee;margin-top: 30rpx;"></view>
+				<view>
+					<!--					<view style="margin-top: 20rpx;position: relative;">-->
+					<!--						<image src="/static/b1.png"-->
+					<!--							style="width: 100rpx;height: 100rpx;position: absolute;left: 0;right: 0;top: 38%;z-index: 10;margin: 0 auto;">-->
+					<!--						</image>-->
+					<!--						<image src="/static/t7.jpg" style="width: 100%;border-radius: 20rpx;" mode="widthFix">-->
+					<!--						</image>-->
+					<!--					</view>-->
+					<view class="ks_html" style="line-height: 50rpx;margin-top: 20rpx;">
+						<div v-html="info.notice_content"></div>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getNoticeInfo,
+	} from '@/util/api.js';
+	import store from '@/store/index.js'
+	export default {
+		data() {
+			return {
+				topCurrent: 0,
+				id: 0,
+				info: {},
+				apiImgUrl: this.$store.state.imgUrl,
+			}
+		},
+		// mounted() {
+		// 	var id = window.location.href.split("=")[1];
+		// 	this.id = id;
+		// 	this.getNewsInfo();
+		// },
+		onLoad(d) {
+			console.log(d);
+			this.id = d.id;
+			this.getNewsInfo();
+		},
+		onShareAppMessage() { // 分享到微信好友
+			// 更多参数配置，参考文档
+			return {
+				title: this.info.notice_title,
+				path: '/pages/packageB/news/notice_info?id=' + this.info.id,
+			}
+		},
+		onShareTimeline() { // 分享到朋友圈
+			return {
+				title: this.info.notice_title,
+				path: '/pages/packageB/news/notice_info?id=' + this.info.id,
+			}
+		},
+		methods: {
+			getNewsInfo() {
+				getNoticeInfo({
+						id: this.id
+					})
+					.then(res => {
+						console.log(res);
+						if (res.code == 1) {
+							var key = res.data;
+							if (key.notice_content.indexOf("<img") != -1) {
+								key.notice_content = getApp().addWidthToImages(key.notice_content);
+							}
+							this.info = key;
+						}
+					})
+					.catch(error => {
+						uni.showToast({
+							title: error,
+							duration: 2000
+						});
+					})
+			},
+			goBack() {
+				if (getCurrentPages().length > 1) {
+					uni.navigateBack()
+				} else {
+					uni.redirectTo({
+						url: '/pages/index/index'
+					})
+
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+	.ks_html img {
+		width: 100% !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/webview.vue b/pages/webview.vue
new file mode 100644
index 0000000..a2c876c
--- /dev/null
+++ b/pages/webview.vue
@@ -0,0 +1,64 @@
+ <template>
+	 <view class="contain">
+	 	 <web-view src='https://wxaurl.cn/P5rAY9EBpPs'></web-view>
+	 </view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				data: '',
+				miniProgramUrl: 'https://wxaurl.cn/P5rAY9EBpPs', // 替换为你的短链
+				showWebView: false,
+			}
+		},
+		mounted() {
+			// openMiniProgramLink() 
+		},
+		methods: {
+			openMiniProgramLink() {
+				this.data = 'https://wxaurl.cn/P5rAY9EBpPs'
+				// setTimeout(()=>{
+				// 	uni.setNavigationBarTitle({
+				// 		title:'协议'
+				// 	})
+				// },1000)
+			},
+		}
+	}
+</script>
+// <script setup>
+// 	import {
+// 		ref
+// 	} from 'vue';
+// 	import { onLoad,onShow } from "@dcloudio/uni-app"
+// 	const data = ref('')
+// 	onLoad((option) => {
+// 		data.value = 'https://wxaurl.cn/P5rAY9EBpPs '
+// 		// setTimeout(()=>{
+// 		// 	uni.setNavigationBarTitle({
+// 		// 		title:'协议'
+// 		// 	})
+// 		// },1000)
+// 	})
+// </script>
+
+
+<style>
+</style>
+<!-- <html>
+<head>
+  <meta charset="UTF-8">
+  <title>跳转中...</title>
+  <script>
+    const targetUrl = new URLSearchParams(window.location.search).get('target');
+    if (targetUrl) {
+      window.location.href = 'https://wxaurl.cn/P5rAY9EBpPs ' ; // 自动跳转短链
+    }
+  </script>
+</head>
+<body>
+  <p>正在跳转...</p>
+</body>
+</html> -->
\ No newline at end of file
diff --git a/static/01.png b/static/01.png
new file mode 100644
index 0000000..8cb8d15
Binary files /dev/null and b/static/01.png differ
diff --git a/static/01_1.png b/static/01_1.png
new file mode 100644
index 0000000..b4ed032
Binary files /dev/null and b/static/01_1.png differ
diff --git a/static/02.png b/static/02.png
new file mode 100644
index 0000000..1726d78
Binary files /dev/null and b/static/02.png differ
diff --git a/static/02_2.png b/static/02_2.png
new file mode 100644
index 0000000..ee4fc96
Binary files /dev/null and b/static/02_2.png differ
diff --git a/static/03.png b/static/03.png
new file mode 100644
index 0000000..57ee4e7
Binary files /dev/null and b/static/03.png differ
diff --git a/static/03_3.png b/static/03_3.png
new file mode 100644
index 0000000..3faa3fa
Binary files /dev/null and b/static/03_3.png differ
diff --git a/static/04.png b/static/04.png
new file mode 100644
index 0000000..e945425
Binary files /dev/null and b/static/04.png differ
diff --git a/static/04_4.png b/static/04_4.png
new file mode 100644
index 0000000..6baf3c5
Binary files /dev/null and b/static/04_4.png differ
diff --git a/static/allianceCoupon.png b/static/allianceCoupon.png
new file mode 100644
index 0000000..4f3186b
Binary files /dev/null and b/static/allianceCoupon.png differ
diff --git a/static/allianceMall.png b/static/allianceMall.png
new file mode 100644
index 0000000..807af87
Binary files /dev/null and b/static/allianceMall.png differ
diff --git a/static/ask_dai.png b/static/ask_dai.png
new file mode 100644
index 0000000..8f795a6
Binary files /dev/null and b/static/ask_dai.png differ
diff --git a/static/ask_no.png b/static/ask_no.png
new file mode 100644
index 0000000..8218fb0
Binary files /dev/null and b/static/ask_no.png differ
diff --git a/static/ask_ok.png b/static/ask_ok.png
new file mode 100644
index 0000000..708c15e
Binary files /dev/null and b/static/ask_ok.png differ
diff --git a/static/b1.png b/static/b1.png
new file mode 100644
index 0000000..ea9c6b5
Binary files /dev/null and b/static/b1.png differ
diff --git a/static/book.png b/static/book.png
new file mode 100644
index 0000000..2dffccd
Binary files /dev/null and b/static/book.png differ
diff --git a/static/c1.png b/static/c1.png
new file mode 100644
index 0000000..2fdd620
Binary files /dev/null and b/static/c1.png differ
diff --git a/static/c1455.png b/static/c1455.png
new file mode 100644
index 0000000..a40e24c
Binary files /dev/null and b/static/c1455.png differ
diff --git a/static/c2.png b/static/c2.png
new file mode 100644
index 0000000..af3700d
Binary files /dev/null and b/static/c2.png differ
diff --git a/static/c3.png b/static/c3.png
new file mode 100644
index 0000000..e19103f
Binary files /dev/null and b/static/c3.png differ
diff --git a/static/characterIntroductionGg.png b/static/characterIntroductionGg.png
new file mode 100644
index 0000000..b525dd5
Binary files /dev/null and b/static/characterIntroductionGg.png differ
diff --git a/static/css/components/demo_page_common.scss b/static/css/components/demo_page_common.scss
new file mode 100644
index 0000000..f40b136
--- /dev/null
+++ b/static/css/components/demo_page_common.scss
@@ -0,0 +1,193 @@
+/* 顶部 start */
+.header {
+  padding: 80rpx 60rpx 40rpx 60rpx;
+  
+  .title {
+    font-size: 36rpx;
+    color: $tn-font-color;
+    font-weight: bold;
+  }
+  
+  .sub-title {
+    font-size: 28rpx;
+    color: $tn-content-color;
+    padding-top: 18rpx;
+  }
+  
+  .tips-title {
+    font-size: 24rpx;
+    color: $tn-font-sub-color;
+    padding-top: 5rpx;
+  }
+}
+/* 顶部 end */
+
+/* 展示内容容器 start */
+.show-content-container {
+  
+  /* 标题容器 start */
+  .title-container {
+    display: flex;
+    position: relative;
+    align-items: center;
+    justify-content: space-between;
+    min-height: 100rpx;
+    
+    // 标题样式
+    .title {
+      height: 100%;
+      max-width: 100%;
+      margin: 0 20rpx;
+      font-size: 30rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      
+      // 标题前面小点
+      &:before {
+        content: " ";
+        background-color: $tn-main-color;
+        width: 15rpx;
+        height: 15rpx;
+        border-radius: 10rpx;
+        margin-right: 18rpx;
+      }
+    }
+  }
+  /* 标题容器 end */
+  
+  /* 内容 start */
+  .content {
+    padding: 20rpx;
+  }
+  /* 内容 end */
+  
+}
+/* 展示内容容器 end */
+
+/* 内容容器 start */
+.demo-content-container {
+  border: 1rpx dashed $tn-main-color;
+  margin: 20rpx;
+  margin-top: 0rpx;
+  
+  position: fixed;
+  width: 95%;
+  z-index: 10;
+  
+  transition: all 0.15s ease-out;
+  
+  &.top {
+    width: 100%;
+    margin: 0;
+  }
+  
+  &.no-fixed {
+    position: relative !important;
+  }
+  
+  /* 标题容器 start */
+  .title-container {
+    display: flex;
+    position: relative;
+    align-items: center;
+    justify-content: center;
+    min-height: 100rpx;
+    
+    // 标题样式
+    .title {
+      height: 100%;
+      max-width: 100%;
+      margin: 0 30rpx;
+      font-size: 30rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+  /* 标题容器 end */
+  
+  /* 内容 start */
+  .content {
+    padding: 30rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  /* 内容 end */
+  
+}
+/* 内容容器 end */
+
+/* 可选项内容容器 start */
+.demo-section-container {
+  margin: 20rpx;
+  height: 100%;
+  
+  /* 标题容器 start */
+  .title-container {
+    display: flex;
+    position: relative;
+    align-items: center;
+    justify-content: center;
+    min-height: 100rpx;
+    margin-bottom: 10rpx;
+    
+    // 标题样式
+    .title {
+      height: 100%;
+      max-width: 100%;
+      margin: 0 30rpx;
+      font-size: 30rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    
+    &::after {
+      content: " ";
+      box-sizing: border-box;
+      width: 90%;
+      height: 100%;
+      position: absolute;
+      top: 0;
+      left: 50%;
+      transform: translateX(-50%);
+      border-bottom: 1rpx solid $tn-border-solid-color;
+    }
+  }
+  /* 标题容器 end */
+  
+  /* 参数内容 start*/
+  .content {
+    padding: 0 20rpx 10rpx 20rpx;
+    
+    // 标题样式
+    .title {
+      padding-left: 20rpx;
+      height: 100%;
+      position: relative;
+      
+      &::before {
+        content: " ";
+        position: absolute;
+        top: 50%;
+        left: 0;
+        width: 4rpx;
+        height: 90%;
+        background-color: $tn-main-color;
+        border-radius: 6rpx;
+        transform: translateY(-50%);
+      }
+    }
+    
+    // 参数样式
+    .section {
+      margin-top: 15rpx;
+      margin-bottom: 20rpx;
+    }
+  }
+  /* 参数内容 end*/
+  
+}
+/* 可选项内容容器 end */
\ No newline at end of file
diff --git a/static/css/my.scss b/static/css/my.scss
new file mode 100644
index 0000000..1e46364
--- /dev/null
+++ b/static/css/my.scss
@@ -0,0 +1,241 @@
+.pages-a {
+	max-height: 100vh;
+}
+
+/* 自定义导航栏内容 start */
+.custom-nav {
+	height: 100%;
+
+	&__back {
+		margin: auto 5rpx;
+		font-size: 50rpx;
+		margin-right: 10rpx;
+		margin-left: 30rpx;
+		flex-basis: 5%;
+	}
+}
+
+/* 底部安全边距 start*/
+.tn-tabbar-height {
+	min-height: 120rpx;
+	height: calc(140rpx + env(safe-area-inset-bottom) / 2);
+	height: calc(140rpx + constant(safe-area-inset-bottom));
+}
+
+/* 图标容器5 start */
+.icon5 {
+	&__item {
+		// width: 30%;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		padding: 0rpx;
+		margin: 0rpx;
+		transform: scale(1);
+		transition: transform 0.3s linear;
+		transform-origin: center center;
+
+		&--icon {
+			width: 96rpx;
+			height: 96rpx;
+			border-radius: 50%;
+			margin-bottom: 18rpx;
+			position: relative;
+			z-index: 1;
+		}
+	}
+}
+
+/* 轮播视觉差 start */
+.card-swiper {
+	height: 450rpx;
+}
+
+.card-swiper swiper-item {
+	width: 750rpx;
+	left: 0rpx;
+	box-sizing: border-box;
+	padding: 40rpx 30rpx 30rpx 30rpx;
+	overflow: initial;
+}
+
+.card-swiper swiper-item .swiper-item {
+	width: 100%;
+	display: block;
+	height: 100%;
+	border-radius: 15rpx;
+	transform: scale(1);
+	transition: all 0.2s ease-in 0s;
+	will-change: transform;
+	// overflow: hidden;
+}
+
+.card-swiper swiper-item.cur .swiper-item {
+	transform: none;
+	transition: all 0.2s ease-in 0s;
+	will-change: transform;
+}
+
+.card-swiper swiper-item .swiper-item-text {
+	margin-top: -220rpx;
+	text-align: center;
+	width: 100%;
+	display: block;
+	border-radius: 10rpx;
+	transform: translate(100rpx, 0rpx) scale(0.9, 0.9);
+	transition: all 0.6s ease 0s;
+	will-change: transform;
+	overflow: hidden;
+}
+
+.card-swiper swiper-item.cur .swiper-item-text {
+	margin-top: -220rpx;
+	width: 100%;
+	transform: translate(0rpx, 0rpx) scale(0.9, 0.9);
+	transition: all 0.6s ease 0s;
+	will-change: transform;
+}
+
+.image-banner {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.image-banner image {
+	width: 100%;
+	height: 100%;
+}
+
+/* 轮播指示点 start*/
+.indication {
+	z-index: 9999;
+	width: 100%;
+	height: 36rpx;
+	position: absolute;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+}
+
+.spot {
+	background-color: #FFFFFF;
+	opacity: 0.6;
+	width: 10rpx;
+	height: 10rpx;
+	border-radius: 20rpx;
+	top: -70rpx;
+	margin: 0 8rpx !important;
+	position: relative;
+}
+
+.spot.active {
+	opacity: 1;
+	width: 10rpx;
+	height: 10rpx;
+	background-color: rgb(217, 217, 217);
+}
+
+
+/* 胶囊banner*/
+.image-capsule {
+	padding: 100rpx 0rpx;
+	font-size: 40rpx;
+	font-weight: 300;
+	position: relative;
+}
+
+.image-piccapsule {
+	background-size: cover;
+	background-repeat: no-repeat;
+	// background-attachment:fixed;
+	background-position: top;
+	border-radius: 20rpx 20rpx 0 0;
+}
+
+/* 用户头像 start */
+.logo-image {
+	width: 40rpx;
+	height: 40rpx;
+	position: relative;
+}
+
+.logo-pic {
+	background-size: cover;
+	background-repeat: no-repeat;
+	// background-attachment:fixed;
+	background-position: top;
+	border: 1rpx solid rgba(255, 255, 255, 0.05);
+	// box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.15);
+	border-radius: 50%;
+	overflow: hidden;
+	// background-color: #FFFFFF;
+}
+
+/* 瀑布流*/
+.wallpaper__item {
+	background-color: #FFFFFF;
+	overflow: hidden;
+	margin: 0 10rpx;
+	margin-bottom: 40rpx;
+	// box-shadow: 0rpx 0rpx 30rpx 0rpx rgba(0, 0, 0, 0.07);
+
+	.item {
+
+		/* 图片 start */
+		&__image {
+			width: 100%;
+			height: auto;
+			background-color: #FFFFFF;
+			border: 1rpx solid #F8F7F8;
+			border-radius: 10rpx;
+			overflow: hidden;
+		}
+
+		/* 图片 end */
+
+		/* 内容 start */
+		&__data {
+			padding: 14rpx 0rpx;
+		}
+
+		/* 标题 start */
+		&__title-container {
+			text-align: justify;
+			line-height: 38rpx;
+			vertical-align: middle;
+		}
+
+		&__title {
+			font-size: 30rpx;
+		}
+
+		/* 标题 end */
+
+		/* 标签 start */
+		&__tags-container {
+			display: flex;
+			flex-direction: row;
+			flex-wrap: nowrap;
+			align-items: center;
+			justify-content: flex-start;
+		}
+
+		&__tag {
+			margin: 10rpx;
+			color: #7C8191;
+			background-color: #F3F2F7;
+			padding: 4rpx 14rpx 6rpx;
+			border-radius: 10rpx;
+			font-size: 20rpx;
+
+			&:first-child {
+				margin-left: 0rpx !important;
+			}
+		}
+
+		/* 标签 end */
+
+		/* 内容 end */
+	}
+}
diff --git a/static/css/templatePage/custom_nav_bar.scss b/static/css/templatePage/custom_nav_bar.scss
new file mode 100644
index 0000000..7cc0960
--- /dev/null
+++ b/static/css/templatePage/custom_nav_bar.scss
@@ -0,0 +1,38 @@
+.tn-custom-nav-bar__back {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  justify-content: space-evenly;
+  align-items: center;
+  box-sizing: border-box;
+  background-color: rgba(0, 0, 0, 0.15);
+  border-radius: 1000rpx;
+  border: 1rpx solid rgba(255, 255, 255, 0.5);
+  color: #FFFFFF;
+  font-size: 18px;
+  
+  .icon {
+    display: block;
+    flex: 1;
+    margin: auto;
+    text-align: center;
+  }
+  
+  &:before {
+    content: " ";
+    width: 1rpx;
+    height: 110%;
+    position: absolute;
+    top: 22.5%;
+    left: 0;
+    right: 0;
+    margin: auto;
+    transform: scale(0.5);
+    transform-origin: 0 0;
+    pointer-events: none;
+    box-sizing: border-box;
+    opacity: 0.7;
+    background-color: #FFFFFF;
+  }
+}
\ No newline at end of file
diff --git a/static/da.png b/static/da.png
new file mode 100644
index 0000000..3ebcf63
Binary files /dev/null and b/static/da.png differ
diff --git a/static/def.png b/static/def.png
new file mode 100644
index 0000000..b8cbf66
Binary files /dev/null and b/static/def.png differ
diff --git a/static/diverseYouth.png b/static/diverseYouth.png
new file mode 100644
index 0000000..e3db2eb
Binary files /dev/null and b/static/diverseYouth.png differ
diff --git a/static/h1.png b/static/h1.png
new file mode 100644
index 0000000..9b30522
Binary files /dev/null and b/static/h1.png differ
diff --git a/static/h2.png b/static/h2.png
new file mode 100644
index 0000000..74b201d
Binary files /dev/null and b/static/h2.png differ
diff --git a/static/h3.png b/static/h3.png
new file mode 100644
index 0000000..6eff984
Binary files /dev/null and b/static/h3.png differ
diff --git a/static/h4.png b/static/h4.png
new file mode 100644
index 0000000..76a5581
Binary files /dev/null and b/static/h4.png differ
diff --git a/static/h_back.png b/static/h_back.png
new file mode 100644
index 0000000..a39feb2
Binary files /dev/null and b/static/h_back.png differ
diff --git a/static/hqzc.png b/static/hqzc.png
new file mode 100644
index 0000000..4074ff7
Binary files /dev/null and b/static/hqzc.png differ
diff --git a/static/hqzc_f.png b/static/hqzc_f.png
new file mode 100644
index 0000000..50948c1
Binary files /dev/null and b/static/hqzc_f.png differ
diff --git a/static/ico1.png b/static/ico1.png
new file mode 100644
index 0000000..be9f34a
Binary files /dev/null and b/static/ico1.png differ
diff --git a/static/ico10.png b/static/ico10.png
new file mode 100644
index 0000000..377b9db
Binary files /dev/null and b/static/ico10.png differ
diff --git a/static/ico11.png b/static/ico11.png
new file mode 100644
index 0000000..e050613
Binary files /dev/null and b/static/ico11.png differ
diff --git a/static/ico12.png b/static/ico12.png
new file mode 100644
index 0000000..50c1750
Binary files /dev/null and b/static/ico12.png differ
diff --git a/static/ico13.png b/static/ico13.png
new file mode 100644
index 0000000..5b6e737
Binary files /dev/null and b/static/ico13.png differ
diff --git a/static/ico16.png b/static/ico16.png
new file mode 100644
index 0000000..8210212
Binary files /dev/null and b/static/ico16.png differ
diff --git a/static/ico2.png b/static/ico2.png
new file mode 100644
index 0000000..b140322
Binary files /dev/null and b/static/ico2.png differ
diff --git a/static/ico3.png b/static/ico3.png
new file mode 100644
index 0000000..c31de61
Binary files /dev/null and b/static/ico3.png differ
diff --git a/static/ico4.png b/static/ico4.png
new file mode 100644
index 0000000..09c2819
Binary files /dev/null and b/static/ico4.png differ
diff --git a/static/ico5.png b/static/ico5.png
new file mode 100644
index 0000000..dd89264
Binary files /dev/null and b/static/ico5.png differ
diff --git a/static/ico6.png b/static/ico6.png
new file mode 100644
index 0000000..67e6912
Binary files /dev/null and b/static/ico6.png differ
diff --git a/static/ico8.png b/static/ico8.png
new file mode 100644
index 0000000..ee91af4
Binary files /dev/null and b/static/ico8.png differ
diff --git a/static/ico9.png b/static/ico9.png
new file mode 100644
index 0000000..233318c
Binary files /dev/null and b/static/ico9.png differ
diff --git a/static/icon100.png b/static/icon100.png
new file mode 100644
index 0000000..aea5278
Binary files /dev/null and b/static/icon100.png differ
diff --git a/static/icon13.png b/static/icon13.png
new file mode 100644
index 0000000..fbcc002
Binary files /dev/null and b/static/icon13.png differ
diff --git a/static/icon14.png b/static/icon14.png
new file mode 100644
index 0000000..b44aa57
Binary files /dev/null and b/static/icon14.png differ
diff --git a/static/icon15.png b/static/icon15.png
new file mode 100644
index 0000000..736f670
Binary files /dev/null and b/static/icon15.png differ
diff --git a/static/jj.png b/static/jj.png
new file mode 100644
index 0000000..7b93efd
Binary files /dev/null and b/static/jj.png differ
diff --git a/static/joinus.png b/static/joinus.png
new file mode 100644
index 0000000..45fa50d
Binary files /dev/null and b/static/joinus.png differ
diff --git a/static/lunhua.jpg b/static/lunhua.jpg
new file mode 100644
index 0000000..d40d3fc
Binary files /dev/null and b/static/lunhua.jpg differ
diff --git a/static/man.png b/static/man.png
new file mode 100644
index 0000000..3bde33b
Binary files /dev/null and b/static/man.png differ
diff --git a/static/messageSupply.png b/static/messageSupply.png
new file mode 100644
index 0000000..4bf3c0f
Binary files /dev/null and b/static/messageSupply.png differ
diff --git a/static/notice_icon.png b/static/notice_icon.png
new file mode 100644
index 0000000..e9d5284
Binary files /dev/null and b/static/notice_icon.png differ
diff --git a/static/personLogoBg.png b/static/personLogoBg.png
new file mode 100644
index 0000000..88ab999
Binary files /dev/null and b/static/personLogoBg.png differ
diff --git a/static/pic.png b/static/pic.png
new file mode 100644
index 0000000..0e19beb
Binary files /dev/null and b/static/pic.png differ
diff --git a/static/right.png b/static/right.png
new file mode 100644
index 0000000..d8669b4
Binary files /dev/null and b/static/right.png differ
diff --git a/static/sh.png b/static/sh.png
new file mode 100644
index 0000000..9207b65
Binary files /dev/null and b/static/sh.png differ
diff --git a/static/t1.png b/static/t1.png
new file mode 100644
index 0000000..d2f328d
Binary files /dev/null and b/static/t1.png differ
diff --git a/static/t2.png b/static/t2.png
new file mode 100644
index 0000000..2948144
Binary files /dev/null and b/static/t2.png differ
diff --git a/static/tg.png b/static/tg.png
new file mode 100644
index 0000000..aac7098
Binary files /dev/null and b/static/tg.png differ
diff --git a/static/tiwen.png b/static/tiwen.png
new file mode 100644
index 0000000..6f332d1
Binary files /dev/null and b/static/tiwen.png differ
diff --git a/static/vip.png b/static/vip.png
new file mode 100644
index 0000000..fdaa0a3
Binary files /dev/null and b/static/vip.png differ
diff --git a/static/w_back.png b/static/w_back.png
new file mode 100644
index 0000000..f88eb2e
Binary files /dev/null and b/static/w_back.png differ
diff --git a/static/weman.png b/static/weman.png
new file mode 100644
index 0000000..1814122
Binary files /dev/null and b/static/weman.png differ
diff --git a/static/wen.png b/static/wen.png
new file mode 100644
index 0000000..b4e1bf3
Binary files /dev/null and b/static/wen.png differ
diff --git a/static/zixingche.jpg b/static/zixingche.jpg
new file mode 100644
index 0000000..3467908
Binary files /dev/null and b/static/zixingche.jpg differ
diff --git a/store/$tn.mixin.js b/store/$tn.mixin.js
new file mode 100644
index 0000000..ab7689b
--- /dev/null
+++ b/store/$tn.mixin.js
@@ -0,0 +1,28 @@
+import { mapState } from 'vuex'
+import store from '@/store'
+
+// 尝试将用户在根目录中的store/index.js的vuex的state变量加载到全局变量中
+let $tStoreKey = []
+try {
+  $tStoreKey = store.state ? Object.keys(store.state) : []
+} catch(e) {
+  
+}
+
+module.exports = {
+  beforeCreate() {
+    // 将vuex方法挂在在$t中
+    // 使用方法: 
+    // 修改vuex的state中的user.name变量为图鸟小菜 => this.$tn.vuex('user.name', '图鸟小菜')
+    // 修改vuexde state中的version变量为1.0.1 => this.$tn.vuex('version', 1.0.1)
+    this.$tn.vuex = (name, value) => {
+      this.$store.commit('$tStore', {
+        name, value
+      })
+    }
+  },
+  computed: {
+    // 将vuex的state中的变量结构到全局混入mixin中
+    ...mapState($tStoreKey)
+  }
+}
\ No newline at end of file
diff --git a/store/index.js b/store/index.js
new file mode 100644
index 0000000..bcbb589
--- /dev/null
+++ b/store/index.js
@@ -0,0 +1,85 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+let lifeData = {}
+
+// 尝试获取本地是否存在lifeData变量，第一次启动时不存在
+try {
+	lifeData = uni.getStorageSync('lifeData')
+} catch (e) {
+
+}
+
+// 标记需要永久存储的变量，在每次启动时取出，在state中的变量名
+let saveStateKeys = ['vuex_user']
+
+// 保存变量到本地存储
+const saveLifeData = function(key, value) {
+	// 判断变量是否在存储数组中
+	if (saveStateKeys.indexOf(key) != -1) {
+		// 获取本地存储的lifeData对象，将变量添加到对象中
+		let tmpLifeData = uni.getStorageSync('lifeData')
+		// 第一次启动时不存在，则放一个空对象
+		tmpLifeData = tmpLifeData ? tmpLifeData : {},
+			tmpLifeData[key] = value
+		// 将变量再次放回本地存储中
+		uni.setStorageSync('lifeData', tmpLifeData)
+	}
+}
+
+const store = new Vuex.Store({
+	state: {
+		// 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量
+		// 加上vuex_前缀，是防止变量名冲突，也让人一目了然
+		vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {
+			name: '灵睿'
+		},
+
+		// 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
+		// app版本
+		vuex_version: "1.0.53",
+		// 是否使用自定义导航栏
+		vuex_custom_nav_bar: true,
+		// 状态栏高度
+		vuex_status_bar_height: 0,
+		// 自定义导航栏的高度
+		vuex_custom_bar_height: 0,
+		Gid: 1,
+		Gname: '洛阳市青年企业家协会',
+		msgCount: 0,
+		// imgUrl: "http://192.168.3.130",
+		// apiUrl: "http://192.168.3.130/api"
+		// imgUrl: "https://ysx.hschool.com.cn",
+		// apiUrl: "https://ysx.hschool.com.cn/api"
+		imgUrl: "https://ysx.0rui.cn",
+		apiUrl: "https://ysx.0rui.cn/api"
+	},
+	mutations: {
+		$tStore(state, payload) {
+			// 判断是否多层调用，state中为对象存在的情况，例如user.info.score = 1
+			let nameArr = payload.name.split('.')
+			let saveKey = ''
+			let len = nameArr.length
+			if (len >= 2) {
+				let obj = state[nameArr[0]]
+				for (let i = 1; i < len - 1; i++) {
+					obj = obj[nameArr[i]]
+				}
+				obj[nameArr[len - 1]] = payload.value
+				saveKey = nameArr[0]
+			} else {
+				// 单层级变量
+				state[payload.name] = payload.value
+				saveKey = payload.name
+			}
+
+			// 保存变量到本地中
+			saveLifeData(saveKey, state[saveKey])
+		}
+	},
+	actions: {}
+})
+
+export default store
\ No newline at end of file
diff --git a/template.h5.html b/template.h5.html
new file mode 100644
index 0000000..96ba3f8
--- /dev/null
+++ b/template.h5.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<title>
+			<%= htmlWebpackPlugin.options.title %>
+		</title>
+		<!-- Open Graph data -->
+		<!-- <meta property="og:title" content="Title Here" /> -->
+		<!-- <meta property="og:url" content="http://www.example.com/" /> -->
+		<!-- <meta property="og:image" content="http://example.com/image.jpg" /> -->
+		<!-- <meta property="og:description" content="Description Here" /> -->
+		<script>
+			var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS
+				.supports('top: constant(a)'))
+			document.write(
+				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+				(coverSupport ? ', viewport-fit=cover' : '') + '" />')
+		</script>
+		<link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
+	</head>
+	<body>
+		<noscript>
+			<strong>Please enable JavaScript to continue.</strong>
+		</noscript>
+		<div id="app"></div>
+		<!-- built files will be auto injected -->
+	</body>
+</html>
\ No newline at end of file
diff --git a/tuniao-ui/README.md b/tuniao-ui/README.md
new file mode 100644
index 0000000..ccb9fcb
--- /dev/null
+++ b/tuniao-ui/README.md
@@ -0,0 +1,4 @@
+TuniaoUi for uniApp v1.0.0 | by 图鸟 2021-09-01
+仅供开发，如作它用所承受的法律责任一概与作者无关
+
+*使用TuniaoUi开发扩展与插件时，请注明基于tuniao字眼
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-action-sheet/tn-action-sheet.vue b/tuniao-ui/components/tn-action-sheet/tn-action-sheet.vue
new file mode 100644
index 0000000..85ffe40
--- /dev/null
+++ b/tuniao-ui/components/tn-action-sheet/tn-action-sheet.vue
@@ -0,0 +1,206 @@
+<template>
+  <view v-if="value" class="tn-action-sheet-class tn-action-sheet">
+    <tn-popup
+      v-model="value"
+      mode="bottom"
+      length="auto"
+      :popup="false"
+      :borderRadius="borderRadius"
+      :maskCloseable="maskCloseable"
+      :safeAreaInsetBottom="safeAreaInsetBottom"
+      :zIndex="elZIndex"
+      @close="close"
+    >
+      <!-- 提示信息 -->
+      <view
+        v-if="tips.text"
+        class="tn-action-sheet__tips border-solid-bottom"
+        :style="[tipsStyle]"
+      >
+        {{tips.text}}
+      </view>
+      <!-- 按钮列表 -->
+      <block v-for="(item, index) in list" :key="index">
+        <view
+          class="tn-action-sheet__item tn-text-ellipsis"
+          :class="[ index < list.length - 1 ? 'border-solid-bottom' : '']"
+          :style="[itemStyle(index)]"
+          hover-class="tn-hover-class"
+          :hover-stay-time="150"
+          @tap="itemClick(index)"
+          @touchmove.stop.prevent
+        >
+          <text>{{item.text}}</text>
+          <text v-if="item.subText" class="tn-action-sheet__item__subtext tn-text-ellipsis">{{item.subText}}</text>
+        </view>
+      </block>
+      
+      <!-- 取消按钮 -->
+      <block v-if="cancelBtn">
+        <view class="tn-action-sheet__cancel--gab"></view>
+        <view
+          class="tn-action-sheet__cancel tn-action-sheet__item"
+          hover-class="tn-hover-class"
+          :hover-stay-time="150"
+          @tap="close"
+        >{{cancelText}}</view>
+      </block>
+      
+    </tn-popup>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-action-sheet',
+    props: {
+      // 通过v-model控制弹出和收起
+      value: {
+        type: Boolean,
+        default: false
+      },
+      // 按钮文字数组，可以自定义颜色和字体大小
+      // return [{
+      // 	text: '确定',
+      //  subText: '这是一个确定按钮',
+      // 	color: '',
+      // 	fontSize: '',
+      //  disabled: true
+      // }]
+      list: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 顶部提示文字
+      tips: {
+        type: Object,
+        default() {
+          return {
+            text: '',
+            color: '',
+            fontSize: 26
+          }
+        }
+      },
+      // 弹出的顶部圆角值
+      borderRadius: {
+        type: Number,
+        default: 0
+      },
+      // 点击遮罩可以关闭
+      maskCloseable: {
+        type: Boolean,
+        default: true
+      },
+      // 底部取消按钮
+      cancelBtn: {
+        type: Boolean,
+        default: true
+      },
+      // 底部取消按钮的文字
+      cancelText: {
+        type: String,
+        default: '取消'
+      },
+      // 开启底部安全区域
+      // 在iPhoneX机型底部添加一定的内边距
+      safeAreaInsetBottom: {
+        type: Boolean,
+        default: false
+      },
+      // z-index值
+      zIndex: {
+        type: Number,
+        default: 0
+      }
+    },
+    computed: {
+      // 顶部提示样式
+      tipsStyle() {
+        let style = {}
+        if (this.tips.color) style.color = this.tips.color
+        if (this.tips.fontSize) style.fontSize = this.tips.fontSize + 'rpx'
+        
+        return style
+      },
+      // 操作项目的样式
+      itemStyle() {
+        return (index) => {
+          let style = {}
+          if (this.list[index].color) style.color = this.list[index].color
+          if (this.list[index].fontSize) style.fontSize = this.list[index].fontSize + 'rpx'
+          
+          // 选项被禁用的样式
+          if (this.list[index].disabled) style.color = '#AAAAAA'
+          
+          return style
+        }
+      },
+      elZIndex() {
+        return this.zIndex ? this.zIndex : this.$tn.zIndex.popup
+      }
+    },
+    methods: {
+      // 点击取消按钮
+      close() {
+        // 发送input事件，并不会作用于父组件，而是要设置组件内部通过props传递的value参数
+        this.popupClose();
+        this.$emit('close');
+      },
+      // 关闭弹窗
+      popupClose() {
+        this.$emit('input', false)
+      },
+      // 点击对应的item
+      itemClick(index) {
+        // 如果是禁用项则不进行操作
+        if (this.list[index].disabled) return
+        this.$emit('click', index)
+        this.popupClose()
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .border-solid-bottom{
+    border-bottom: 1rpx solid #F8F7F8;
+  }
+  
+  .tn-action-sheet {
+    &__tips {
+      font-size: 26rpx;
+      text-align: center;
+      padding: 34rpx 0;
+      line-height: 1;
+      color: $tn-content-color;
+    }
+    
+    &__item {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      font-size: 32rpx;
+      padding: 34rpx 0;
+      
+      &__subtext {
+        font-size: 24rpx;
+        color: $tn-content-color;
+        margin-top: 20rpx;
+      }
+    }
+    
+    &__cancel {
+      color: $tn-font-color;
+      
+      &--gab {
+        height: 12rpx;
+        background-color: #F8F7F8;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-avatar-group/tn-avatar-group.vue b/tuniao-ui/components/tn-avatar-group/tn-avatar-group.vue
new file mode 100644
index 0000000..3b7bb21
--- /dev/null
+++ b/tuniao-ui/components/tn-avatar-group/tn-avatar-group.vue
@@ -0,0 +1,95 @@
+<template>
+	<view class="tn-avatar-group-class tn-avatar-group">
+		<view v-for="(item, index) in lists" :key="index" class="tn-avatar-group__item" :style="[itemStyle(index)]">
+			<tn-avatar :src="apiImgUrl+item.photo_image || ''" :text="item.text || ''" :icon="item.icon || ''"
+				:size="size" :shape="shape" :imgMode="imgMode" :border="false" :borderSize="4"></tn-avatar>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tn-avatar-group',
+		props: {
+			// 头像列表
+			lists: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// 头像类型
+			// square 带圆角正方形 circle 圆形
+			shape: {
+				type: String,
+				default: 'circle'
+			},
+			// 大小
+			// sm 小头像 lg 大头像 xl 加大头像
+			// 如果为其他则认为是直接设置大小
+			size: {
+				type: [Number, String],
+				default: ''
+			},
+			// 当设置为显示头像信息时，
+			// 图片的裁剪模式
+			imgMode: {
+				type: String,
+				default: 'aspectFill'
+			},
+			// 头像之间的遮挡比例
+			// 0.4 代表 40%
+			gap: {
+				type: Number,
+				default: 0.4
+			}
+		},
+		computed: {
+			itemStyle() {
+				return (index) => {
+					let style = {}
+					if (this._checkSizeIsInline()) {
+						switch (this.size) {
+							case 'sm':
+								style.marginLeft = index != 0 ? `${-48 * this.gap}rpx` : ''
+								break
+							case 'lg':
+								style.marginLeft = index != 0 ? `${-96 * this.gap}rpx` : ''
+								break
+							case 'xl':
+								style.marginLeft = index != 0 ? `${-128 * this.gap}rpx` : ''
+								break
+						}
+					} else {
+						const size = Number(this.size.replace(/(px|rpx)/g, '')) || 64
+						style.marginLeft = index != 0 ? `-${size * this.gap}rpx` : ''
+					}
+					return style
+				}
+			}
+		},
+		data() {
+			return {
+				apiImgUrl: this.$store.state.imgUrl,
+			}
+		},
+		methods: {
+			// 检查是否使用内置的大小进行设置
+			_checkSizeIsInline() {
+				if (/(xs|sm|md|lg|xl|xxl)/.test(this.size)) return true
+				else return false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tn-avatar-group {
+		display: flex;
+		flex-direction: row;
+
+		&__item {
+			position: relative;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-avatar/tn-avatar.vue b/tuniao-ui/components/tn-avatar/tn-avatar.vue
new file mode 100644
index 0000000..96e7100
--- /dev/null
+++ b/tuniao-ui/components/tn-avatar/tn-avatar.vue
@@ -0,0 +1,298 @@
+<template>
+  <view
+    class="tn-avatar-class tn-avatar"
+    :class="[backgroundColorClass,avatarClass]"
+    :style="[avatarStyle]"
+    @tap="click"
+  >
+    <image
+      v-if="showImg"
+      class="tn-avatar__img"
+      :class="[imgClass]"
+      :src="src"
+      :mode="imgMode || 'aspectFill'"
+      @error="loadImageError"
+    ></image>
+    <view v-else class="tn-avatar__text" >
+      <view v-if="text">{{ text }}</view>
+      <view v-else :class="[`tn-icon-${icon}`]"></view>
+    </view>
+    
+    <!-- 角标 -->
+    <tn-badge
+      v-if="badge && (badgeIcon || badgeText)"
+      :radius="badgeSize"
+      :backgroundColor="badgeBgColor"
+      :fontColor="badgeColor"
+      :fontSize="badgeSize - 8"
+      :absolute="true"
+      :top="badgePosition[0]"
+      :right="badgePosition[1]"
+    >
+      <view v-if="badgeIcon && badgeText === ''">
+        <view :class="[`tn-icon-${badgeIcon}`]"></view>
+      </view>
+      <view v-else>
+        {{ badgeText }}
+      </view>
+    </tn-badge>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    mixins: [componentsColorMixin],
+    name: 'tn-avatar',
+    props: {
+      // 序号
+      index: {
+        type: [Number, String],
+        default: 0
+      },
+      // 头像类型
+      // square 带圆角正方形 circle 圆形
+      shape: {
+        type: String,
+        default: 'circle'
+      },
+      // 大小 
+      // sm 小头像 lg 大头像 xl 加大头像
+      // 如果为其他则认为是直接设置大小
+      size: {
+        type: [Number, String],
+        default: ''
+      },
+      // 是否显示阴影
+      shadow: {
+        type: Boolean,
+        default: false
+      },
+      // 是否显示边框
+      border: {
+        type: Boolean,
+        default: false
+      },
+      // 边框颜色
+      borderColor: {
+        type: String,
+        default: 'rgba(0, 0, 0, 0.1)'
+      },
+      // 边框大小, rpx
+      borderSize: {
+        type: Number,
+        default: 2
+      },
+      // 头像路径
+      src: {
+        type: String,
+        default: ''
+      },
+      // 文字
+      text: {
+        type: String,
+        default: ''
+      },
+      // 图标
+      icon: {
+        type: String,
+        default: ''
+      },
+      // 当设置为显示头像信息时，
+      // 图片的裁剪模式
+      imgMode: {
+        type: String,
+        default: 'aspectFill'
+      },
+      // 是否显示角标
+      badge: {
+        type: Boolean,
+        default: false
+      },
+      // 设置显示角标后，角标大小
+      badgeSize: {
+        type: Number,
+        default: 0
+      },
+      // 角标背景颜色
+      badgeBgColor: {
+        type: String,
+        default: '#AAAAAA'
+      },
+      // 角标字体颜色
+      badgeColor: {
+        type: String,
+        default: '#FFFFFF'
+      },
+      // 角标图标
+      badgeIcon: {
+        type: String,
+        default: ''
+      },
+      // 角标文字，优先级比icon高
+      badgeText: {
+        type: String,
+        default: ''
+      },
+      // 角标坐标
+      // [top, right]
+      badgePosition: {
+        type: Array,
+        default() {
+          return [0, 0]
+        }
+      }
+    },
+    data() {
+      return {
+        // 图片显示是否发生错误
+        imgLoadError: false
+      }
+    },
+    computed: {
+      showImg() {
+        // 如果设置了图片地址，则为显示图片，否则为显示文本
+        return this.text === '' && this.icon === ''
+      },
+      avatarClass() {
+        let clazz = ''
+        clazz += ` tn-avatar--${this.shape}`
+        
+        if (this._checkSizeIsInline()) {
+          clazz += ` tn-avatar--${this.size}`
+        }
+        
+        if (this.shadow) {
+          clazz += ' tn-avatar--shadow'
+        }
+        
+        return clazz
+      },
+      avatarStyle() {
+        let style = {}
+        
+        if (this.backgroundColorStyle) {
+          style.background = this.backgroundColorStyle
+        } else if (this.shadow && this.showImg) {
+          style.backgroundImage = `url(${this.src})`
+        }
+        
+        if (this.border) {
+          style.border = `${this.borderSize}rpx solid ${this.borderColor}`
+        }
+        
+        if (!this._checkSizeIsInline()) {
+          style.width = this.size
+          style.height = this.size
+        }
+        
+        return style
+      },
+      imgClass() {
+        let clazz = ''
+        clazz += ` tn-avatar__img--${this.shape}`
+        
+        return clazz
+      }
+    },
+    methods: {
+      // 加载图片失败
+      loadImageError() {
+        this.imgLoadError = true
+      },
+      // 点击事件
+      click() {
+        this.$emit("click", this.index)
+      },
+      
+      // 检查是否使用内置的大小进行设置
+      _checkSizeIsInline() {
+        if (/^(xs|sm|md|lg|xl|xxl)$/.test(this.size)) return true
+        else return false
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-avatar {
+    /* #ifndef APP-NVUE */
+    display: inline-flex;
+    /* #endif */
+    margin: 0;
+    padding: 0;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+    background-color: $tn-font-holder-color;
+    // color: #FFFFFF;
+    white-space: nowrap;
+    position: relative;
+    width: 64rpx;
+    height: 64rpx;
+    z-index: 1;
+    
+    &--sm {
+      width: 48rpx;
+      height: 48rpx;
+    }
+    &--lg {
+      width: 96rpx;
+      height: 96rpx;
+    }
+    &--xl {
+      width: 128rpx;
+      height: 128rpx;
+    }
+    
+    &--square {
+      border-radius: 10rpx;
+    }
+    
+    &--circle {
+      border-radius: 5000rpx;
+    }
+    
+    &--shadow {
+      position: relative;
+      
+      &::after {
+        content: " ";
+        display: block;
+        background: inherit;
+        filter: blur(10rpx);
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        top: 10rpx;
+        left: 10rpx;
+        z-index: -1;
+        opacity: 0.4;
+        transform-origin: 0 0;
+        border-radius: inherit;
+        transform: scale(1, 1);
+      }
+    }
+    
+    &__img {
+      width: 100%;
+      height: 100%;
+      
+      &--square {
+        border-radius: 10rpx;
+      }
+      
+      &--circle {
+        border-radius: 5000rpx;
+      }
+    }
+    
+    &__text {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-badge/tn-badge.vue b/tuniao-ui/components/tn-badge/tn-badge.vue
new file mode 100644
index 0000000..d92f5f6
--- /dev/null
+++ b/tuniao-ui/components/tn-badge/tn-badge.vue
@@ -0,0 +1,173 @@
+<template>
+  <view
+    class="tn-badge-class tn-badge"
+    :class="[
+      backgroundColorClass,
+      fontColorClass,
+      badgeClass
+    ]"
+    :style="[badgeStyle]"
+    @click="handleClick"
+  >
+    <slot v-if="!dot"></slot>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    mixins: [componentsColorMixin],
+    name: 'tn-badge',
+    props: {
+      // 序号
+      index: {
+        type: [Number, String],
+        default: '0'
+      },
+      // 徽章的大小 rpx
+      radius: {
+        type: Number,
+        default: 0
+      },
+      // 内边距
+      padding: {
+        type: String,
+        default: ''
+      },
+      // 外边距
+      margin: {
+        type: String,
+        default: ''
+      },
+      // 是否为一个点
+      dot: {
+        type: Boolean,
+        default: false
+      },
+      // 是否使用绝对定位
+      absolute: {
+        type: Boolean,
+        default: false
+      },
+      // top
+      top: {
+        type: [String, Number],
+        default: ''
+      },
+      // right
+      right: {
+        type: [String, Number],
+        default: ''
+      },
+      // 居中 对齐右上角
+      translateCenter: {
+        type: Boolean,
+        default: true
+      }
+    },
+    computed: {
+      badgeClass() {
+        let clazz = ''
+        if (this.dot) {
+          clazz += ' tn-badge--dot'
+        }
+        if (this.absolute) {
+          clazz += ' tn-badge--absolute'
+          
+          if (this.translateCenter) {
+            clazz += ' tn-badge--center-position'
+          }
+        }
+        
+        return clazz
+      },
+      badgeStyle() {
+        let style = {}
+        
+        if (this.radius !== 0) {
+          style.width = this.radius + 'rpx'
+          style.height = this.radius + 'rpx'
+          style.lineHeight = this.radius + 'rpx'
+          
+          // style.borderRadius = (this.radius * 8) + 'rpx'
+        }
+        
+        if (this.padding) {
+          style.padding = this.padding
+        }
+        if (this.margin) {
+          style.margin = this.margin
+        }
+        if (this.fontColorStyle) {
+          style.color = this.fontColorStyle
+        }
+        if (this.fontSize) {
+          style.fontSize = this.fontSize + this.fontUnit
+        }
+        
+        if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        
+        if (this.top) {
+          style.top = this.$tn.string.getLengthUnitValue(this.top)
+        }
+        if (this.right) {
+          style.right = this.$tn.string.getLengthUnitValue(this.right)
+        }
+        
+        return style
+      },
+      
+    },
+    data() {
+      return {
+        
+      }
+    },
+    methods: {
+      // 处理点击事件
+      handleClick() {
+        this.$emit('click', {
+          index: Number(this.index)
+        })
+        this.$emit('tap', {
+          index: Number(this.index)
+        })
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-badge {
+    width: auto;
+    height: auto;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10;
+    font-size: 20rpx;
+    background-color: #FFFFFF;
+    // color: #FFFFFF;
+    border-radius: 100rpx;
+    padding: 4rpx 8rpx;
+    line-height: initial;
+    
+    &--dot {
+      width: 8rpx;
+      height: 8rpx;
+      border-radius: 50%;
+      padding: 0;
+    }
+    &--absolute {
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
+    &--center-position {
+      transform: translate(50%, -50%);
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-button/tn-button.vue b/tuniao-ui/components/tn-button/tn-button.vue
new file mode 100644
index 0000000..793f343
--- /dev/null
+++ b/tuniao-ui/components/tn-button/tn-button.vue
@@ -0,0 +1,348 @@
+<template>
+	<button class="tn-btn-class tn-btn" :class="[
+      buttonClass,
+      backgroundColorClass,
+      fontColorClass
+    ]" :style="[buttonStyle]" hover-class="tn-hover" :loading="loading" :disabled="disabled" :form-type="formType"
+		:open-type="openType" @getuserinfo="handleGetUserInfo" @getphonenumber="handleGetPhoneNumber"
+		@contact="handleContact" @error="handleError" @tap="handleClick">
+		<slot></slot>
+	</button>
+</template>
+
+<script>
+	import componentsColorMixin from '../../libs/mixin/components_color.js'
+	import {
+		debounceFun,
+		throttleFun
+	} from '../../libs/function/applyEven.js'
+	let spanTime = 200;
+	export default {
+		mixins: [componentsColorMixin],
+		name: "tn-button",
+		// 解决再微信小程序种，自定义按钮无法触发bindsubmit
+		behaviors: ['wx://form-field-button'],
+		props: {
+			// 按钮索引，用于区分多个按钮
+			index: {
+				type: [Number, String],
+				default: 0
+			},
+			// 按钮形状 default 默认 round 圆角 icon 图标按钮
+			shape: {
+				type: String,
+				default: 'default'
+			},
+			// 是否加阴影
+			shadow: {
+				type: Boolean,
+				default: false
+			},
+			// 宽度 rpx或%
+			width: {
+				type: String,
+				default: 'auto'
+			},
+			// 高度 rpx或%
+			height: {
+				type: String,
+				default: ''
+			},
+			// 按钮的尺寸 sm lg
+			size: {
+				type: String,
+				default: ''
+			},
+			// 字体是否加粗
+			fontBold: {
+				type: Boolean,
+				default: false
+			},
+			padding: {
+				type: String,
+				default: '0 30rpx'
+			},
+			// 外边距 与css的margin参数用法相同
+			margin: {
+				type: String,
+				default: ''
+			},
+			// 是否镂空
+			plain: {
+				type: Boolean,
+				default: false
+			},
+			// 当plain=true时，是否显示边框
+			border: {
+				type: Boolean,
+				default: true
+			},
+			// 当plain=true时，是否加粗显示边框
+			borderBold: {
+				type: Boolean,
+				default: false
+			},
+			// 是否禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示加载图标
+			loading: {
+				type: Boolean,
+				default: false
+			},
+			// 触发form表单的事件类型
+			formType: {
+				type: String,
+				default: ''
+			},
+			// 开放能力
+			openType: {
+				type: String,
+				default: ''
+			},
+			// 是否阻止重复点击(默认间隔是200ms)
+			blockRepeatClick: {
+				type: Boolean,
+				default: false
+			},
+			//场景：（如果开启blockRepeatClick，这里无效）none ： 不开启防抖节流模式，debounce ：防抖模式 throttle：节流模式
+			scene:{
+				type: String,
+				default: 'none'
+			},
+			// 防抖节流间隔时间（毫秒）
+			blockTime:{
+				type: Number,
+				default: 200
+			}
+		},
+		computed: {
+			// 根据不同的参数动态生成class
+			buttonClass() {
+				let clazz = ''
+				// 按钮形状
+				switch (this.shape) {
+					case 'icon':
+					case 'round':
+						clazz += ' tn-round'
+						break
+				}
+
+				// 阴影
+				if (this.shadow) {
+					if (this.backgroundColorClass !== '' && this.backgroundColorClass.indexOf('tn-bg') != -1) {
+						const color = this.backgroundColor.slice(this.backgroundColor.lastIndexOf('-') + 1)
+						clazz += ` tn-shadow-${color}`
+					} else {
+						clazz += ' tn-shadow-blur'
+					}
+				}
+
+				// 字体加粗
+				if (this.fontBold) {
+					clazz += ' tn-text-bold'
+				}
+
+				// 设置为镂空并且设置镂空便可才进行设置
+				if (this.plain) {
+					clazz += ' tn-btn--plain'
+					if (this.border) {
+						clazz += ' tn-border-solid'
+						if (this.borderBold) {
+							clazz += ' tn-bold-border'
+						}
+						if (this.backgroundColor !== '' && this.backgroundColor.includes('tn-bg')) {
+							const color = this.backgroundColor.slice(this.backgroundColor.lastIndexOf('-') + 1)
+							clazz += ` tn-border-${color}`
+						}
+					}
+				}
+
+				return clazz
+			},
+			// 按钮的样式
+			buttonStyle() {
+				let style = {}
+				switch (this.size) {
+					case 'sm':
+						style.padding = '0 20rpx'
+						style.fontSize = '22rpx'
+						style.height = this.height || '48rpx'
+						break
+					case 'lg':
+						style.padding = '0 40rpx'
+						style.fontSize = '32rpx'
+						style.height = this.height || '80rpx'
+						break
+					default:
+						style.padding = '0 30rpx'
+						style.fontSize = '28rpx'
+						style.height = this.height || '64rpx'
+				}
+
+				// 是否手动设置了内边距
+				if (this.padding) {
+					style.padding = this.padding
+				}
+
+				// 是否手动设置外边距
+				if (this.margin) {
+					style.margin = this.margin
+				}
+
+				// 是否手动设置了字体大小
+				if (this.fontSize) {
+					style.fontSize = this.fontSize + this.fontUnit
+				}
+				style.width = this.shape === 'icon' ? style.height : this.width
+				style.padding = this.shape === 'icon' ? '0' : style.padding
+
+				if (this.fontColorStyle) {
+					style.color = this.fontColorStyle
+				}
+
+				if (!this.backgroundColorClass) {
+					if (this.plain) {
+						style.borderColor = this.backgroundColorStyle || '#080808'
+					} else {
+						style.backgroundColor = this.backgroundColorStyle || '#FFFFFF'
+					}
+				}
+
+				// 设置阴影
+				if (this.shadow && !this.backgroundColorClass) {
+					if (this.backgroundColorStyle.indexOf('#') != -1) {
+						style.boxShadow = `6rpx 6rpx 8rpx ${(this.backgroundColorStyle || '#000000')}10`
+					} else if (this.backgroundColorStyle.indexOf('rgb') != -1 || this.backgroundColorStyle.indexOf(
+						'rgba') != -1 || !this.backgroundColorStyle) {
+						style.boxShadow = `6rpx 6rpx 8rpx ${(this.backgroundColorStyle || 'rgba(0, 0, 0, 0.1)')}`
+					}
+
+				}
+
+				return style
+			},
+		},
+		data() {
+			return {
+
+			}
+		},
+		watch:{
+			//支持动态修改时间，但是这里是没有做撤销上一次的方法，毕竟这种场景非常少
+			//这里只是防止用户使用时复用了组件，有场景时长要求二次变动，而做的优化
+			blockTime:{
+				handler(newVal,oldVal){
+				    this.initScene();
+				}
+			},
+		},
+		mounted() {
+			this.initScene()
+		},
+		methods: {
+			initScene(){
+				// 动态传入blockTime，需要重新初始化,参数
+				//防抖模式
+				this.debounceClick=debounceFun(function() {
+					this.emitClick();
+				}, this.blockTime);
+				//节流模式
+				this.throttleClick=throttleFun(function() {
+					this.emitClick();
+				}, this.blockTime);	
+			},
+			//防抖模式
+			debounceClick:debounceFun(function() {
+				this.emitClick();
+			}, spanTime),
+			//节流模式
+			throttleClick:throttleFun(function() {
+				this.emitClick();
+			}, spanTime),
+			emitClick() {
+				//触发事件
+				this.$emit('click', {
+					index: Number(this.index)
+				})
+				// 兼容tap事件
+				this.$emit('tap', {
+					index: Number(this.index)
+				})
+			},
+			// 按钮点击事件
+			handleClick() {
+				if (this.disabled) {
+					return
+				}
+				//兼容旧的
+				if (this.blockRepeatClick) {
+					this.throttleClick();
+					return;
+				}
+				//普通模式，触发多少次就回调多少次
+				if(this.scene === 'none'){
+					this.emitClick();
+				}else if(this.scene == 'debounce'){
+					//防抖模式
+					this.debounceClick();
+				}else{
+					//节流模式
+					this.throttleClick();
+				}
+			},
+			handleGetUserInfo({
+				detail = {}
+			} = {}) {
+				this.$emit('getuserinfo', detail);
+			},
+			handleContact({
+				detail = {}
+			} = {}) {
+				this.$emit('contact', detail);
+			},
+			handleGetPhoneNumber({
+				detail = {}
+			} = {}) {
+				this.$emit('getphonenumber', detail);
+			},
+			handleError({
+				detail = {}
+			} = {}) {
+				this.$emit('error', detail);
+			},
+
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tn-btn {
+		position: relative;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		line-height: 1;
+		text-align: center;
+		text-decoration: none;
+		overflow: visible;
+		transform: translate(0rpx, 0rpx);
+		// background-color: $tn-mai
+		border-radius: 12rpx;
+		// color: $tn-font-color;
+		margin: 0;
+
+		&--plain {
+			background-color: transparent !important;
+			background-image: none;
+
+			&.tn-round {
+				border-radius: 1000rpx !important;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-calendar/tn-calendar.vue b/tuniao-ui/components/tn-calendar/tn-calendar.vue
new file mode 100644
index 0000000..289b67b
--- /dev/null
+++ b/tuniao-ui/components/tn-calendar/tn-calendar.vue
@@ -0,0 +1,707 @@
+<template>
+  <tn-popup
+    v-model="value"
+    mode="bottom"
+    :popup="false"
+    length="auto"
+    :borderRadius="borderRadius"
+    :safeAreaInsetBottom="safeAreaInsetBottom"
+    :maskCloseable="maskCloseable"
+    :closeBtn="closeBtn"
+    :zIndex="elIndex"
+    @close="close"
+  >
+    <view class="tn-calendar-class tn-calendar">
+      <!-- 头部 -->
+      <view class="tn-calendar__header">
+        <view v-if="!$slots.tooltip || !$slots.$tooltip" class="tn-calendar__header__text">
+          {{ toolTips }}
+        </view>
+        <view v-else>
+          <slot name="tooltip"></slot>
+        </view>
+      </view>
+      
+      <!-- 操作提示信息 -->
+      <view class="tn-calendar__action">
+        <view v-if="changeYear" class="tn-calendar__action__icon" :style="{backgroundColor: yearArrowColor}" @tap.stop="changeYearHandler(false)">
+          <view><text class="tn-icon-left"></text></view>
+        </view>
+        <view v-if="changeMonth" class="tn-calendar__action__icon" :style="{backgroundColor: monthArrowColor}" @tap.stop="changeMonthHandler(false)">
+          <view><text class="tn-icon-left"></text></view>
+        </view>
+        <view class="tn-calendar__action__text">{{ dateTitle }}</view>
+        <view v-if="changeMonth" class="tn-calendar__action__icon" :style="{backgroundColor: monthArrowColor}" @tap.stop="changeMonthHandler(true)">
+          <view><text class="tn-icon-right"></text></view>
+        </view>
+        <view v-if="changeYear" class="tn-calendar__action__icon" :style="{backgroundColor: yearArrowColor}" @tap.stop="changeYearHandler(true)">
+          <view><text class="tn-icon-right"></text></view>
+        </view>
+      </view>
+      
+      <!-- 星期中文标识 -->
+      <view class="tn-calendar__week-day-zh">
+        <view v-for="(item,index) in weekDayZh" :key="index" class="tn-calendar__week-day-zh__text">{{ item }}</view>
+      </view>
+      
+      <!-- 日历主体 -->
+      <view class="tn-calendar__content">
+        <!-- 前置空白部分 -->
+        <block v-for="(item, index) in weekdayArr" :key="index">
+          <view class="tn-calendar__content__item"></view>
+        </block>
+        <view
+          v-for="(item, index) in daysArr"
+          :key="index"
+          class="tn-calendar__content__item"
+          :class="{
+            'tn-hover': disabledChoose(year, month, index + 1),
+            'tn-calendar__content--start-date': (mode === 'range' && startDate == `${year}-${month}-${index+1}`) || mode === 'date',
+            'tn-calendar__content--end-date': (mode === 'range' && endDate == `${year}-${month}-${index+1}`) || mode === 'date'
+          }"
+          :style="{
+            backgroundColor: colorValue(index, 'bg')
+          }"
+          @tap.stop="dateClick(index)"
+        >
+          <view class="tn-calendar__content__item__text" :style="{color: colorValue(index, 'text')}">
+            <view>{{ item.day }}</view>
+          </view>
+          <view class="tn-calendar__content__item__tips" :style="{color: item.color}">
+            {{ item.bottomInfo }}
+          </view>
+        </view>
+        
+        <view class="tn-calendar__content__month--bg">{{ month }}</view>
+      </view>
+      
+      <!-- 底部 -->
+      <view class="tn-calendar__bottom">
+        <view class="tn-calendar__bottom__choose">
+          <text>{{ mode === 'date' ? activeDate : startDate }}</text>
+          <text v-if="endDate">至{{ endDate }}</text>
+        </view>
+        <view class="tn-calendar__bottom__btn" :style="{backgroundColor: btnColor}" @click="handleBtnClick(false)">
+          <view class="tn-calendar__bottom__btn--text">确定</view>
+        </view>
+      </view>
+    </view>
+  </tn-popup>
+</template>
+
+<script>
+  import Calendar from '../../libs/utils/calendar.js'
+  
+  export default {
+    name: 'tn-calendar',
+    props: {
+      // 双向绑定控制组件弹出与收起
+      value: {
+        type: Boolean,
+        default: false
+      },
+      // 模式
+      // date -> 单日期 range -> 日期范围
+      mode: {
+        type: String,
+        default: 'date'
+      },
+      // 是否允许切换年份
+      changeYear: {
+        type: Boolean,
+        default: true
+      },
+      // 是否允许切换月份
+      changeMonth: {
+        type: Boolean,
+        default: true
+      },
+      // 可切换的最大年份
+      maxYear: {
+        type: [Number, String],
+        default: 2100
+      },
+      // 可切换的最小年份
+      minYear: {
+        type: [Number, String],
+        default: 1970
+      },
+      // 最小日期(不在范围被不允许选择)
+      minDate: {
+        type: String,
+        default: '1970-01-01'
+      },
+      // 最大日期，如果为空则默认为今天
+      maxDate: {
+        type: String,
+        default: ''
+      },
+      // 切换月份按钮的颜色
+      monthArrowColor: {
+        type: String,
+        default: '#AAAAAA'
+      },
+      // 切换年份按钮的颜色
+      yearArrowColor: {
+        type: String,
+        default: '#C8C8C8'
+      },
+      // 默认字体颜色
+      color: {
+        type: String,
+        default: '#080808'
+      },
+      // 选中|起始结束日期背景颜色
+      activeBgColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 选中|起始结束日期文字颜色
+      activeColor: {
+        type: String,
+        default: '#FFFFFF'
+      },
+      // 范围日期内的背景颜色
+      rangeBgColor: {
+        type: String,
+        default: '#E6E6E655'
+      },
+      // 范围日期内的文字颜色
+      rangeColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 起始日期显示的文字，mode=range时生效
+      startText: {
+        type: String,
+        default: '开始'
+      },
+      // 结束日期显示的文字，mode=range时生效
+      endText: {
+        type: String,
+        default: '结束'
+      },
+      // 按钮背景颜色
+      btnColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 农历文字的颜色
+      lunarColor: {
+        type: String,
+        default: '#AAAAAA'
+      },
+      // 选中日期是否有选中效果
+      isActiveCurrent: {
+        type: Boolean,
+        default: true
+      },
+      // 切换年月是否触发事件，mode=date时生效
+      isChange: {
+        type: Boolean,
+        default: false
+      },
+      // 是否显示农历
+      showLunar: {
+        type: Boolean,
+        default: true
+      },
+      // 顶部提示文字
+      toolTips: {
+        type: String,
+        default: '请选择日期'
+      },
+      // 显示圆角的大小
+      borderRadius: {
+        type: Number,
+        default: 8
+      },
+      // 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+      safeAreaInsetBottom: {
+      	type: Boolean,
+      	default: false
+      },
+      // 是否可以通过点击遮罩进行关闭
+      maskCloseable: {
+      	type: Boolean,
+      	default: true
+      },
+      // zIndex
+      zIndex: {
+        type: Number,
+        default: 0
+      },
+      // 是否显示关闭按钮
+      closeBtn: {
+        type: Boolean,
+        default: false
+      },
+    },
+    computed: {
+      dateChange() {
+        return `${this.mode}-${this.minDate}-${this.maxDate}`
+      },
+      elIndex() {
+        return this.zIndex ? this.zIndex : this.$tn.zIndex.popup
+      },
+      colorValue() {
+        return (index, type) => {
+          let color = type === 'bg' ? '' : this.color
+          let day = index + 1
+          let date = `${this.year}-${this.month}-${day}`
+          let timestamp = new Date(date.replace(/\-/g,'/')).getTime()
+          let start = this.startDate.replace(/\-/g,'/')
+          let end = this.endDate.replace(/\-/g,'/')
+          if ((this.mode === 'date' && this.isActiveCurrent && this.activeDate == date) || this.startDate == date || this.endDate == date) {
+            color = type === 'bg' ? this.activeBgColor : this.activeColor
+          } else if (this.endDate && timestamp > new Date(start).getTime() && timestamp < new Date(end).getTime()) {
+            color = type === 'bg' ? this.rangeBgColor : this.rangeColor
+          }
+          return color
+        }
+      }
+    },
+    data() {
+      return {
+        // 星期几，1-7
+        weekday: 1,
+        weekdayArr: [],
+        // 星期对应的中文
+        weekDayZh: ['日','一','二','三','四','五','六'],
+        // 当前月有多少天
+        days: 0,
+        daysArr: [],
+        year: 2021,
+        month: 0,
+        day: 0,
+        startYear: 0,
+        startMonth: 0,
+        startDay: 0,
+        endYear: 0,
+        endMonth: 0,
+        endDay: 0,
+        today: '',
+        activeDate: '',
+        startDate: '',
+        endDate: '',
+        min: null,
+        max: null,
+        // 日期标题
+        dateTitle: '',
+        // 标记是否已经选择了开始日期
+        chooseStart: false
+      }
+    },
+    watch: {
+      dateChange() {
+        this.init()
+      }
+    },
+    created() {
+      this.init()
+    },
+    methods: {
+      // 初始化
+      init() {
+        let now = new Date()
+        this.year = now.getFullYear()
+        this.month = now.getMonth() + 1
+        this.day = now.getDate()
+        this.today = `${this.year}-${this.month}-${this.day}`
+        this.activeDate = this.today
+        this.min = this.initDate(this.minDate)
+        this.max = this.initDate(this.maxDate || this.today)
+        this.startDate = ''
+        this.startYear = 0
+        this.startMonth = 0
+        this.startDay = 0
+        this.endDate = ''
+        this.endYear = 0
+        this.endMonth = 0
+        this.endDay = 0
+        this.chooseStart = false
+        this.changeData()
+      },
+      // 切换月份
+      changeMonthHandler(add) {
+        if (add) {
+          let month = this.month + 1
+          let year = month > 12 ? this.year + 1 : this.year
+          if (!this.checkRange(year)) {
+            this.month = month > 12 ? 1 : month
+            this.year = year
+            this.changeData()
+          }
+        } else {
+          let month = this.month - 1
+          let year = month < 1 ? this.year - 1 : this.year
+          if (!this.checkRange(year)) {
+            this.month = month < 1 ? 12 : month
+            this.year = year
+            this.changeData()
+          }
+        }
+      },
+      // 切换年份
+      changeYearHandler(add) {
+        let year = add ? this.year + 1 : this.year - 1
+        if (!this.checkRange(year)) {
+          this.year = year
+          this.changeData()
+        }
+      },
+      // 日期点击事件
+      dateClick(day) {
+        day += 1
+        if (!this.disabledChoose(this.year, this.month, day)) {
+          this.day = day
+          let date = `${this.year}-${this.month}-${day}`
+          if (this.mode === 'date') {
+            this.activeDate = date
+          } else {
+            let startTimeCompare = new Date(date.replace(/\-/g,'/')).getTime() < new Date(this.startDate.replace(/\-/g,'/')).getTime()
+            if (!this.chooseStart || startTimeCompare) {
+              this.startDate = date
+              this.startYear = this.year
+              this.startMonth = this.month
+              this.startDay = this.day
+              this.endYear = 0
+              this.endMonth = 0
+              this.endDay = 0
+              this.endDate = ''
+              this.activeDate = ''
+              this.chooseStart = true
+            } else {
+              this.endDate = date
+              this.endYear = this.year
+              this.endMonth = this.month
+              this.endDay = this.day
+              this.chooseStart = false
+            }
+          }
+          this.daysArr = this.handleDaysArr()
+        }
+      },
+      // 修改日期数据
+      changeData() {
+        this.days = this.getMonthDay(this.year, this.month)
+        this.daysArr = this.handleDaysArr()
+        this.weekday = this.getMonthFirstWeekDay(this.year, this.month)
+        this.weekdayArr = this.generateArray(1, this.weekday)
+        this.dateTitle = `${this.year}年${this.month}月`
+        if (this.isChange && this.mode === 'date') {
+          this.handleBtnClick(true)
+        }
+      },
+      // 处理按钮点击
+      handleBtnClick(show) {
+        if (!show) {
+          this.close()
+        }
+        if (this.mode === 'date') {
+          let arr = this.activeDate.split('-')
+          let year = this.isChange ? this.year : Number(arr[0])
+          let month = this.isChange ? this.month : Number(arr[1])
+          let day = this.isChange ? this.day : Number(arr[2])
+          let days = this.getMonthDay(year, month)
+          let result = `${year}-${this.formatNumber(month)}-${this.formatNumber(day)}`
+          let weekText = this.getWeekText(result)
+          let isToday = false
+          if (`${year}-${month}-${day}` === this.today) {
+            isToday = true
+          }
+          this.$emit('change', {
+            year,
+            month,
+            day,
+            days,
+            week: weekText,
+            isToday,
+            date: result,
+            // 是否为切换年月操作
+            switch: show
+          })
+        } else {
+          if (!this.startDate || !this.endDate) return
+          
+          let startMonth = this.formatNumber(this.startMonth)
+          let startDay = this.formatNumber(this.startDay)
+          let startDate = `${this.startYear}-${startMonth}-${startDay}`
+          let startWeek = this.getWeekText(startDate)
+          
+          let endMonth = this.formatNumber(this.endMonth)
+          let endDay = this.formatNumber(this.endDay)
+          let endDate = `${this.endYear}-${endMonth}-${endDay}`
+          let endWeek = this.getWeekText(endDate)
+          
+          this.$emit('change', {
+            startYear: this.startYear,
+            startMonth: this.startMonth,
+            startDay: this.startDay,
+            startDate,
+            startWeek,
+            endYear: this.endYear,
+            endMonth: this.endMonth,
+            endDay: this.endDay,
+            endDate,
+            endWeek
+          })
+        }
+      },
+      // 判断是否允许选择
+      disabledChoose(year, month, day) {
+        let flag = true
+        let date = `${year}/${month}/${day}`
+        let min = `${this.min.year}/${this.min.month}/${this.min.day}`
+        let max = `${this.max.year}/${this.max.month}/${this.max.day}`
+        let timestamp = new Date(date).getTime()
+        if (timestamp >= new Date(min).getTime() && timestamp <= new Date(max).getTime()) {
+          flag = false
+        }
+        return flag
+      },
+      // 检查是否在日期范围内
+      checkRange(year) {
+        let overstep = false
+        if (year < this.minYear || year > this.maxYear) {
+          uni.showToast({
+            title: '所选日期超出范围',
+            icon: 'none'
+          })
+          overstep = true
+        }
+        return overstep
+      },
+      // 处理日期
+      initDate(date) {
+        let fdate = date.split('-')
+        return {
+          year: Number(fdate[0] || 1970),
+          month: Number(fdate[1] || 1),
+          day: Number(fdate[2] || 1)
+        }
+      },
+      // 处理日期数组
+      handleDaysArr() {
+        let days = this.generateArray(1, this.days)
+        let daysArr = days.map((item) => {
+          let bottomInfo = this.showLunar ? Calendar.solar2lunar(this.year, this.month, item).IDayCn : ''
+          let color = this.showLunar ? this.lunarColor : this.activeColor
+          if (
+            (this.mode === 'date' && this.day == item) || 
+            (this.mode === 'range' && (this.startDay == item || this.endDay == item))
+          ) {
+            color = this.activeColor
+          }
+          if (this.mode === 'range') {
+            if (this.startDay == item && this.startDay != this.endDay) {
+              bottomInfo = this.startText
+            }
+            if (this.endDay == item) {
+              bottomInfo = this.endText
+            }
+          }
+          
+          return {
+            day: item,
+            color: color,
+            bottomInfo: bottomInfo
+          }
+        })
+        return daysArr
+      },
+      // 获取对应月有多少天
+      getMonthDay(year, month) {
+        return new Date(year, month, 0).getDate()
+      },
+      // 获取对应月的第一天时星期几
+      getMonthFirstWeekDay(year, month) {
+        return new Date(`${year}/${month}/01 00:00:00`).getDay()
+      },
+      // 获取对应星期的文本
+      getWeekText(date) {
+        date = new Date(`${date.replace(/\-/g, '/')} 00:00:00`)
+        let week = date.getDay()
+        return '星期' + this.weekDayZh[week]
+      },
+      // 生成日期天数数组
+      generateArray(start, end) {
+        return Array.from(new Array(end + 1).keys()).slice(start)
+      },
+      // 格式化数字
+      formatNumber(num) {
+        return num < 10 ? '0' + num : num + ''
+      },
+      // 关闭窗口
+      close() {
+        this.$emit('input', false)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-calendar {
+    color: $tn-font-color;
+    
+    &__header {
+      width: 100%;
+      box-sizing: border-box;
+      font-size: 30rpx;
+      background-color: #FFFFFF;
+      color: $tn-main-color;
+      
+      &__text {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        margin-top: 30rpx;
+        padding: 0 60rpx;
+      }
+    }
+    
+    &__action {
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: center;
+      padding: 40rpx 0 40rpx 0;
+      
+      &__icon {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin: 0 16rpx;
+        width: 32rpx;
+        height: 32rpx;
+        font-size: 20rpx;
+        // line-height: 32rpx;
+        border-radius: 50%;
+        color: #FFFFFF;
+      }
+      
+      &__text {
+        padding: 0 16rpx;
+        color: $tn-font-color;
+        font-size: 32rpx;
+        font-weight: bold;
+      }
+    }
+    
+    &__week-day-zh {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      padding: 12rpx 0;
+      overflow: hidden;
+      box-shadow: 16rpx 6rpx 8rpx 0 #E6E6E6;
+      margin-bottom: 2rpx;
+      
+      &__text {
+        flex: 1;
+        text-align: center;
+      }
+    }
+    
+    &__content {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      width: 100%;
+      padding: 12rpx 0;
+      box-sizing: border-box;
+      background-color: #F7F7F7;
+      position: relative;
+      
+      &__item {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        width: 14.2857%;
+        padding: 12rpx 0;
+        margin: 6rpx 0;
+        overflow: hidden;
+        position: relative;
+        z-index: 2;
+        // box-shadow: inset 0rpx 0rpx 22rpx 4rpx rgba(255,255,255, 0.52);
+        
+        &__text {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          height: 80rpx;
+          font-size: 32rpx;
+          position: relative;
+        }
+        
+        &__tips {
+          position: absolute;
+          width: 100%;
+          line-height: 24rpx;
+          left: 0;
+          bottom: 8rpx;
+          text-align: center;
+          z-index: 2;
+          transform-origin: center center;
+          transform: scale(0.8);
+        }
+      }
+      
+      &--start-date {
+        border-top-left-radius: 8rpx;
+        border-bottom-left-radius: 8rpx;
+      }
+      
+      &--end-date {
+        border-top-right-radius: 8rpx;
+        border-bottom-right-radius: 8rpx;
+      }
+      
+      &__month {
+        &--bg {
+          position: absolute;
+          font-size: 200rpx;
+          line-height: 200rpx;
+          left: 50%;
+          top: 50%;
+          transform: translate(-50%, -50%);
+          color: $tn-font-holder-color;
+          z-index: 1;
+        }
+      }
+    }
+    
+    &__bottom {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      width: 100%;
+      background-color: #F7F7F7;
+      padding: 0 40rpx 30rpx;
+      box-sizing: border-box;
+      font-size: 24rpx;
+      color: $tn-font-sub-color;
+      
+      &__choose {
+        height: 50rpx;
+      }
+      
+      &__btn {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 60rpx;
+        border-radius: 40rpx;
+        color: #FFFFFF;
+        font-size: 28rpx;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-car-keyboard/tn-car-keyboard.vue b/tuniao-ui/components/tn-car-keyboard/tn-car-keyboard.vue
new file mode 100644
index 0000000..2e4c6cc
--- /dev/null
+++ b/tuniao-ui/components/tn-car-keyboard/tn-car-keyboard.vue
@@ -0,0 +1,320 @@
+<template>
+  <view class="tn-car-keyboard-class tn-car-keyboard" @touchmove.stop.prevent="() => {}">
+    <view class="tn-car-keyboard__grids">
+      
+      <view
+        v-for="(data, index) in inputCarNumber ? endKeyBoardList : areaList"
+        :key="index"
+        class="tn-car-keyboard__grids__item"
+      >
+        <view
+          v-for="(sub_data, sub_index) in data"
+          :key="sub_index"
+          class="tn-car-keyboard__grids__btn"
+          :class="{'tn-car-keyboard__grids__btn--disabled': sub_data === 'I'}"
+          :hover-class="sub_data !== 'I' ? 'tn-car-keyboard--hover' : ''"
+          :hover-stay-time="100"
+          @tap="click(index, sub_index)"
+        >
+          {{ sub_data }}
+        </view>
+      </view>
+      
+      <view
+        class="tn-car-keyboard__back"
+        hover-class="tn-hover-class"
+        :hover-stay-time="150"
+        @touchstart.stop="backspaceClick"
+        @touchend="clearTimer"
+      >
+        <view class="tn-icon-left-arrow tn-car-keyboard__back__icon"></view>
+      </view>
+      
+      <view
+        class="tn-car-keyboard__change"
+        hover-class="tn-car-keyboard--hover"
+        :hover-stay-time="150"
+        @tap="changeMode"
+      >
+        <text class="tn-car-keyboard__mode--zh" :class="[`tn-car-keyboard__mode--${!inputCarNumber ? 'active' : 'inactive'}`]">中</text>
+        /
+        <text class="tn-car-keyboard__mode--en" :class="[`tn-car-keyboard__mode--${inputCarNumber ? 'active' : 'inactive'}`]">英</text>
+      </view>
+      
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-car-keyboard',
+    props: {
+      // 是否打乱键盘顺序
+      randomEnabled: {
+        type: Boolean,
+        default: false
+      },
+      // 切换中英文输入
+      switchEnMode: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      areaList() {
+        let data = [
+          '京',
+          '沪',
+          '粤',
+          '津',
+          '冀',
+          '豫',
+          '云',
+          '辽',
+          '黑',
+          '湘',
+          '皖',
+          '鲁',
+          '苏',
+          '浙',
+          '赣',
+          '鄂',
+          '桂',
+          '甘',
+          '晋',
+          '陕',
+          '蒙',
+          '吉',
+          '闽',
+          '贵',
+          '渝',
+          '川',
+          '青',
+          '琼',
+          '宁',
+          '藏',
+          '港',
+          '澳',
+          '新',
+          '使',
+          '学',
+          '临',
+          '警'
+        ]
+        // 打乱顺序
+        if (this.randomEnabled) data = this.$tn.array.random(data)
+        // 切割二维数组
+        let showData = []
+        showData[0] = data.slice(0, 10)
+        showData[1] = data.slice(10, 20)
+        showData[2] = data.slice(20, 30)
+        showData[3] = data.slice(30, 37)
+        return showData
+      },
+      endKeyBoardList() {
+        let data = [
+          1,
+          2,
+          3,
+          4,
+          5,
+          6,
+          7,
+          8,
+          9,
+          0,
+          'Q',
+          'W',
+          'E',
+          'R',
+          'T',
+          'Y',
+          'U',
+          'I',
+          'O',
+          'P',
+          'A',
+          'S',
+          'D',
+          'F',
+          'G',
+          'H',
+          'J',
+          'K',
+          'L',
+          'Z',
+          'X',
+          'C',
+          'V',
+          'B',
+          'N',
+          'M'
+        ]
+        // 打乱顺序
+        if (this.randomEnabled) data = this.$tn.array.random(data)
+        // 切割二维数组
+        let showData = []
+        showData[0] = data.slice(0, 10)
+        showData[1] = data.slice(10, 20)
+        showData[2] = data.slice(20, 29)
+        showData[3] = data.slice(29, 36)
+        return showData
+      }
+    },
+    data() {
+      return {
+        // 标记是否输入车牌号码
+        inputCarNumber: false,
+        // 长按多次删除事件监听
+        longPressDeleteTimer: null
+      }
+    },
+    watch:{
+      switchEnMode: {
+        handler(value) {
+          if (value) {
+            this.inputCarNumber = true
+          } else {
+            this.inputCarNumber = false
+          }
+        },
+        immediate: true
+      }
+    },
+    methods: {
+      // 点击键盘按钮
+      click(i, j) {
+        let value = ''
+        // 根据不同模式获取不同数组的值
+        if (this.inputCarNumber) value = this.endKeyBoardList[i][j]
+        else value = this.areaList[i][j]
+        
+        // 车牌里不包含I
+        if (value === 'I') return
+        
+        this.$emit('change', value)
+      },
+      // 修改输入模式
+      // 中文/英文
+      changeMode() {
+        this.inputCarNumber = !this.inputCarNumber
+      },
+      // 点击退格
+      backspaceClick() {
+        this.$emit('backspace')
+        this.clearTimer()
+        this.longPressDeleteTimer = setInterval(() => {
+          this.$emit('backspace')
+        }, 250)
+      },
+      // 清空定时器
+      clearTimer() {
+        if (this.longPressDeleteTimer) {
+          clearInterval(this.longPressDeleteTimer)
+          this.longPressDeleteTimer = null
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-car-keyboard {
+    position: relative;
+    padding: 24rpx 0;
+    background-color: #E6E6E6;
+    
+    &__grids {
+      
+      &__item {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+      }
+      
+      &__btn {
+        display: inline-flex;
+        justify-content: center;
+        flex: 0 0 64rpx;
+        width: 62rpx;
+        height: 80rpx;
+        font-size: 38rpx;
+        line-height: 80rpx;
+        font-weight: 500;
+        text-decoration: none;
+        text-align: center;
+        background-color: #FFFFFF;
+        margin: 8rpx 5rpx;
+        border-radius: 8rpx;
+        box-shadow: 0 2rpx 0rpx $tn-box-shadow-color;
+        
+        &--disabled {
+          opacity: 0.6;
+        }
+      }
+    }
+    
+    &__back {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      position: absolute;
+      width: 96rpx;
+      height: 80rpx;
+      right: 22rpx;
+      bottom: 32rpx;
+      background-color: #E6E6E6;
+      border-radius: 8rpx;
+      box-shadow: 0 2rpx 0rpx $tn-box-shadow-color;
+    }
+    
+    &__change {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      position: absolute;
+      width: 96rpx;
+      height: 80rpx;
+      left: 22rpx;
+      bottom: 32rpx;
+      line-height: 1;
+      background-color: #FFFFFF;
+      border-radius: 8rpx;
+      box-shadow: 0 2rpx 0rpx $tn-box-shadow-color;
+    }
+    
+    &__mode {
+      &--zh {
+        transform: translateY(-10rpx);
+      }
+      &--en {
+        transform: translateY(10rpx);
+      }
+      
+      &--active {
+        color: $tn-main-color;
+        font-size: 30rpx;
+      }
+      
+      &--inactive {
+        &.tn-car-keyboard__mode--zh {
+          transform: scale(0.85) translateY(-10rpx);
+        }
+      }
+      
+      &--inactive {
+        &.tn-car-keyboard__mode--en {
+          transform: scale(0.85) translateY(10rpx);
+        }
+      }
+    }
+    
+    &--hover {
+      background-color: #E6E6E6 !important;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-cascade-selection/tn-cascade-selection.vue b/tuniao-ui/components/tn-cascade-selection/tn-cascade-selection.vue
new file mode 100644
index 0000000..02ac406
--- /dev/null
+++ b/tuniao-ui/components/tn-cascade-selection/tn-cascade-selection.vue
@@ -0,0 +1,654 @@
+<template>
+  <view class="tn-cascade-selection tn-cascade-selection-class">
+    <scroll-view
+      class="selection__scroll-view"
+      :class="[{'tn-border-solid-bottom': headerLine}]"
+      :style="[scrollViewStyle]"
+      scroll-x
+      scroll-with-animation
+      :scroll-into-view="scrollViewId"
+    >
+      <view class="selection__header" :class="[backgroundColorClass]" :style="[headerStyle]">
+        <view
+          v-for="(item, index) in selectedArr"
+          :key="index"
+          :id="`select__${index}`"
+          class="selection__header__item"
+          :class="[headerItemClass(index)]"
+          :style="[headerItemStyle(index)]"
+          @tap.stop="clickNav(index)"
+        >
+          {{ item.text }}
+          <view
+            v-if="index===currentTab && showActiveLine"
+            class="selection__header__line"
+            :style="{backgroundColor: activeLineColor}"
+          ></view>
+        </view>
+      </view>
+    </scroll-view>
+    
+    <swiper
+      class="selection__list"
+      :class="[backgroundColorClass]"
+      :style="[listStyle]"
+      :current="currentTab"
+      :duration="300"
+      @change="switchTab"
+    >
+      <swiper-item
+        v-for="(item, index) in selectedArr"
+        :key="index"
+      >
+        <scroll-view
+          class="selection__list__item"
+          :style="{height: selectionContainerHeight + 'rpx'}"
+          scroll-y
+          :scroll-into-view="item.scrollViewId"
+        >
+          <view class="selection__list__item--first"></view>
+          <view
+            v-for="(subItem, subIndex) in item.list"
+            :key="subIndex"
+            :id="`select__${subIndex}`"
+            class="selection__list__item__cell"
+            :style="[itemStyle]"
+            @tap="change(index, subIndex, subItem)"
+          >
+            <view
+              v-if="item.index === subIndex"
+              class="selection__list__item__icon tn-icon-success"
+              :style="[itemIconStyle]"
+            ></view>
+            <image
+              v-if="subItem.src"
+              class="selection__list__item__image"
+              :style="[itemImageStyle]"
+              :src="subItem.src"
+            ></image>
+            <view
+              class="selection__list__item__title"
+              :class="[{'tn-text-bold': item.index === subIndex && itemActiveBold}]"
+              :style="[itemTitleStyle(index, subIndex)]"
+            >
+              {{ subItem.text }}
+            </view>
+            <view
+              v-if="subItem.subText"
+              class="selection__list__item__title--sub"
+              :style="[itemSubTitleStyle]"
+            >
+              {{ subItem.subText }}
+            </view>
+          </view>
+        </scroll-view>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-cascade-selection',
+    mixins: [ componentsColorMixin ],
+    props: {
+      // 如果下一级是请求返回，则为第一级数据，否则为所有数据
+      /* {
+        text: '', // 标题
+        subText: '', // 子标题
+        src: '', // 图片地址
+        value: 0, // 选中的值
+        children: [
+          {
+            text: '',
+            subText: '',
+            value: 0,
+            children: []
+          }
+        ]
+      } */
+      list: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 默认选中值
+      // ['value1','value2','value3']
+      defaultValue: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 子集数据通过请求来获取
+      request: {
+        type: Boolean,
+        default: false
+      },
+      // request为true时生效, 获取到的子集数据
+      receiveData: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 显示header底部细线
+      headerLine: {
+        type: Boolean,
+        default: true
+      },
+      // header背景颜色
+      headerBgColor: {
+        type: String,
+        default: ''
+      },
+      // 顶部标签栏高度,单位rpx
+      tabsHeight: {
+        type: Number,
+        default: 88
+      },
+      // 默认显示文字
+      text: {
+        type: String,
+        default: '请选择'
+      },
+      // 选中的颜色
+      activeColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 选中后加粗
+      activeBold: {
+        type: Boolean,
+        default: true
+      },
+      // 选中显示底部线条
+      showActiveLine: {
+        type: Boolean,
+        default: true
+      },
+      // 线条颜色
+      activeLineColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // icon大小,单位rpx
+      activeIconSize: {
+        type: Number,
+        default: 0
+      },
+      // icon颜色
+      activeIconColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // item图片宽度, 单位rpx
+      itemImgWidth: {
+        type: Number,
+        default: 0
+      },
+      // item图片高度, 单位rpx
+      itemImgHeight: {
+        type: Number,
+        default: 0
+      },
+      // item图片圆角
+      itemImgRadius: {
+        type: String,
+        default: '50%'
+      },
+      // item text颜色
+      itemTextColor: {
+        type: String,
+        default: ''
+      },
+      // item text选中颜色
+      itemActiveTextColor: {
+        type: String,
+        default: ''
+      },
+      // item text选中加粗
+      itemActiveBold: {
+        type: Boolean,
+        default: true
+      },
+      // item text文字大小, 单位rpx
+      itemTextSize: {
+        type: Number,
+        default: 0
+      },
+      // item subText颜色
+      itemSubTextColor: {
+        type: String,
+        default: ''
+      },
+      // item subText字体大小, 单位rpx
+      itemSubTextSize: {
+        type: Number,
+        default: 0
+      },
+      // item样式
+      itemStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // selection选项容器高度, 单位rpx
+      selectionContainerHeight: {
+        type: Number,
+        default: 300
+      }
+    },
+    computed: {
+      scrollViewStyle() {
+        let style = {}
+        if (this.headerBgColor) {
+          style.backgroundColor = this.headerBgColor
+        }
+        return style
+      },
+      headerStyle() {
+        let style = {}
+        style.height = `${this.tabsHeight}rpx`
+        if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        return style
+      },
+      headerItemClass() {
+        return (index) => {
+          let clazz = ''
+          if (index !== this.currentTab) {
+            clazz += ` ${this.fontColorClass}`
+          } else {
+            if (this.activeBold) {
+              clazz += ' tn-text-bold'
+            }
+          }
+          return clazz
+        }
+      },
+      headerItemStyle() {
+        return (index) => {
+          let style = {}
+          style.color = index === this.currentTab ? this.activeColor : (this.fontColorStyle ? this.fontColorStyle : '')
+          if (this.fontSizeStyle) {
+            style.fontSize = this.fontSizeStyle
+          }
+          return style
+        }
+      },
+      listStyle() {
+        let style = {}
+        style.height = `${this.selectionContainerHeight}rpx`
+        if (this.backgroundColorStyle) {
+          style.color = this.backgroundColorStyle
+        }
+        return style
+      },
+      itemIconStyle() {
+        let style = {}
+        if (this.activeIconColor) {
+          style.color = this.activeIconColor
+        }
+        if (this.activeIconSize) {
+          style.fontSize = this.activeIconSize + 'rpx'
+        }
+        return style
+      },
+      itemImageStyle() {
+        let style = {}
+        if (this.itemImgWidth) {
+          style.width = this.itemImgWidth + 'rpx'
+        }
+        if (this.itemImgHeight) {
+          style.height = this.itemImgHeight + 'rpx'
+        }
+        if (this.itemImgRadius) {
+          style.borderRadius = this.itemImgRadius
+        }
+        return style
+      },
+      itemTitleStyle() {
+        return (index, subIndex) => {
+          let style = {}
+          if (index === subIndex) {
+            if (this.itemActiveTextColor) {
+              style.color = this.itemActiveTextColor
+            }
+          } else {
+            if (this.itemTextColor) {
+              style.color = this.itemTextColor
+            }
+          }
+          if (this.itemTextSize) {
+            style.fontSize = this.itemTextSize + 'rpx'
+          }
+          return style
+        }
+      },
+      itemSubTitleStyle() {
+        let style = {}
+        if (this.itemSubTextColor) {
+          style.color = this.itemSubTextColor
+        }
+        if (this.itemSubTextSize) {
+          style.fontSize = this.itemSubTextSize + 'rpx'
+        }
+        return {}
+      }
+    },
+    watch: {
+      list(val) {
+        this.initData(val, -1)
+      },
+      defaultValue(val) {
+        this.setDefaultValue(val)
+      },
+      receiveData(val) {
+        this.addSubData(val, this.currentTab)
+      },
+    },
+    data() {
+      return {
+        // 当前选中的子集
+        currentTab: 0,
+        // tabs栏scrollView滚动的位置
+        scrollViewId: 'select__0',
+        // 选项数组
+        selectedArr: []
+      }
+    },
+    created() {
+      this.setDefaultValue(this.defaultValue)
+    },
+    methods: {
+      // 初始化数据
+      initData(data, index) {
+        if (!data || data.length === 0) return
+        if (this.request) {
+          // 第一级数据
+          this.addSubData(data, index)
+        } else {
+          this.addSubData(this.getItemList(index, -1), index)
+        }
+      },
+      // 重置数据
+      reset() {
+        this.initData(this.list, -1)
+      },
+      // 滚动切换
+      switchTab(e) {
+        this.currentTab = e.detail.current
+        this.checkSelectPosition()
+      },
+      // 点击标题切换
+      clickNav(index) {
+        if (this.currentTab !== index) {
+          this.currentTab = index
+        }
+      },
+      // 列表数据发生改变
+      change(index, subIndex, subItem) {
+        let item = this.selectedArr[index]
+        if (item.index === subIndex) return
+        item.index = subIndex
+        item.text = subItem.text
+        item.subText = subItem.subText || ''
+        item.value = subItem.value
+        item.src = subItem.src || ''
+        this.$emit('change', {
+          index: index,
+          subIndex: subIndex,
+          ...subItem
+        })
+        
+        // 如果不是异步加载，则取出对应的数据
+        if (!this.request) {
+          let data = this.getItemList(index, subIndex)
+          this.addSubData(data, index)
+        }
+      },
+      // 设置默认的数据
+      setDefaultValue(val) {
+        let defaultValues = val || []
+        if (defaultValues.length > 0) {
+          this.selectedArr = this.getItemListWithValues(JSON.parse(JSON.stringify(this.list)), defaultValues)
+          if (!this.selectedArr) return
+          this.currentTab = this.selectedArr.length - 1
+          this.$nextTick(() => {
+            this.checkSelectPosition()
+          })
+          // defaultItemList.map((item) => {
+          //   item.scrollViewId = `select__${item.index}`
+          // })
+          // this.selectedArr = defaultItemList
+          // this.currentTab = defaultItemList.length - 1
+          // this.$nextTick(() => {
+          //   this.checkSelectPosition()
+          // })
+        } else {
+          this.initData(this.list, -1)
+        }
+      },
+      // 获取对应选项的item数据
+      getItemList(index, subIndex) {
+        let list = []
+        let arr = JSON.parse(JSON.stringify(this.list))
+        // 初始化数据
+        if (index === -1) {
+          list = this.removeChildren(arr)
+        } else {
+          // 判断第一项是否已经选择
+          let value = this.selectedArr[0].index
+          value = value === -1 ? subIndex : value
+          list = arr[value].children || []
+          if (index > 0) {
+            for (let i = 1; i < index + 1; i++) {
+              // 获取当前数据选中的序号
+              let val = index === i ? subIndex : this.selectedArr[i].index
+              list = list[val].children || []
+              if (list.length === 0) break
+            }
+          }
+          list = this.removeChildren(list)
+        }
+        return list
+      },
+      // 根据数组中的值获取对应的item数据
+      getItemListWithValues(data, values) {
+        const defaultValues = JSON.parse(JSON.stringify(values))
+        if (!defaultValues || defaultValues.length === 0) return
+        // 取出第一个值所对应的item
+        const itemIndex = data.findIndex((item) => {
+          return item.value === defaultValues[0]
+        })
+        if (itemIndex === -1) return
+        const item = data[itemIndex]
+        item.index = itemIndex
+        item.scrollViewId = `select__${itemIndex}`
+        item.list = this.removeChildren(JSON.parse(JSON.stringify(data)))
+        // 判断是否只有1个值
+        if (defaultValues.length === 1 || (!item.hasOwnProperty('children') || item.children.length === 0)) {
+          return this.removeChildren([item])
+        } else {
+          let selectItemList = []
+          const children = item.children
+          selectItemList.push(item)
+          // 移除已经获取的值
+          defaultValues.splice(0, 1)
+          const childrenValue = this.getItemListWithValues(children, defaultValues)
+          selectItemList = selectItemList.concat(childrenValue)
+          
+          return this.removeChildren(selectItemList)
+        }
+      },
+      // 删除子元素
+      removeChildren(data) {
+        let list = data.map((item) => {
+          if (item.hasOwnProperty('children')) {
+            delete item['children']
+          }
+          return item
+        })
+        return list
+      },
+      // 新增子集数据时处理
+      addSubData(data, index) {
+        // 判断是否已经完成选择数据或者为初始化数据
+        if (!data || data.length === 0) {
+          if (index == -1) return
+          // 完成选择
+          let arr = this.selectedArr
+          // 如果当前选中项的序号比已选数据的长度小，则表示当前重新选择了数据
+          if (index < arr.length - 1) {
+            let newArr = arr.slice(0, index + 1)
+            this.selectedArr = newArr
+          }
+          let result = JSON.parse(JSON.stringify(this.selectedArr))
+          let lastItem = result[result.length - 1] || {}
+          let text = ''
+          result.map(item => {
+            text += item.text
+            delete item['list']
+            delete item['scrollViewId']
+            return item
+          })
+          this.$emit('complete', {
+            result: result,
+            value: lastItem.value,
+            text: text,
+            subText: lastItem.subText,
+            src: lastItem.src
+          })
+        } else {
+          // 重置数据
+          let item = [{
+            text: this.text,
+            subText: '',
+            value: '',
+            src: '',
+            index: -1,
+            scrollViewId: 'select__0',
+            list: data
+          }]
+          // 初始化数据
+          if (index === -1) {
+            this.selectedArr = item
+          } else {
+            // 拼接新旧数据并且判断是否为重新选择了数据（如果为重新选择了数据则重置之后的选项数据）
+            let retainArr = this.selectedArr.slice(0, index + 1)
+            this.selectedArr = retainArr.concat(item)
+          }
+          this.$nextTick(() => {
+            this.currentTab = this.selectedArr.length - 1
+          })
+        }
+      },
+      // 检查当前选中项，并将选项设置位置信息
+      checkSelectPosition() {
+        let item = this.selectedArr[this.currentTab]
+        item.scrollViewId = 'select__0'
+        this.$nextTick(() => {
+          setTimeout(() => {
+            // 设置当前数据滚动到的位置
+            let val = item.index < 2 ? 0 : Number(item.index - 2)
+            item.scrollViewId = `select__${val}`
+          }, 10)
+        })
+        
+        // 设置选项滚动到所在的位置
+        if (this.currentTab > 1) {
+          this.scrollViewId = `select__${this.currentTab - 1}`
+        } else {
+          this.scrollViewId = `select__0`
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-cascade-selection {
+    width: 100%;
+  }
+  
+  .selection {
+    &__scroll-view {
+      background-color: #FFFFFF;
+    }
+    
+    &__header {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      position: relative;
+      
+      &__item {
+        max-width: 240rpx;
+        padding: 15rpx 30rpx;
+        flex-shrink: 0;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        position: relative;
+      }
+      
+      &__line {
+        width: 60rpx;
+        height: 6rpx;
+        border-radius: 4rpx;
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+    
+    &__list {
+      background-color: #FFFFFF;
+      &__item {
+        &--first {
+          width: 100%;
+          height: 20rpx;
+        }
+        
+        &__cell {
+          width: 100%;
+          display: flex;
+          align-items: center;
+          padding: 20rpx 30rpx;
+        }
+        
+        &__icon {
+          margin-right: 12rpx;
+          font-size: 24rpx;
+        }
+        
+        &__image {
+          width: 40rpx;
+          height: 40rpx;
+          margin-right: 12rpx;
+          flex-shrink: 0;
+        }
+        
+        &__title {
+          word-break: break-all;
+          color: #333333;
+          font-size: 28rpx;
+          
+          &--sub {
+            margin-left: 20rpx;
+            word-break: break-all;
+            color: $tn-font-sub-color;
+            font-size: 24rpx;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-checkbox-group/tn-checkbox-group.vue b/tuniao-ui/components/tn-checkbox-group/tn-checkbox-group.vue
new file mode 100644
index 0000000..5472ad5
--- /dev/null
+++ b/tuniao-ui/components/tn-checkbox-group/tn-checkbox-group.vue
@@ -0,0 +1,134 @@
+<template>
+  <view class="tn-checkbox-group-class tn-checkbox-group">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  import Emitter from '../../libs/utils/emitter.js'
+  
+  export default {
+    mixins: [ Emitter ],
+    name: 'tn-checkbox-group',
+    props: {
+      value: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 可以选中多少个checkbox
+      max: {
+        type: Number,
+        default: 999
+      },
+      // 表单提交时的标识符
+      name: {
+        type: String,
+        default: ''
+      },
+      // 禁用选择
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 禁用点击标签进行选择
+      disabledLabel: {
+        type: Boolean,
+        default: false
+      },
+      // 选择框的形状 square 方形 circle 圆形
+      shape: {
+        type: String,
+        default: 'square'
+      },
+      // 选中时的颜色
+      activeColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 组件大小
+      size: {
+        type: Number,
+        default: 34
+      },
+      // 每个checkbox占的宽度
+      width: {
+        type: String,
+        default: 'auto'
+      },
+      // 是否换行
+      wrap: {
+        type: Boolean,
+        default: false
+      },
+      // 图标大小
+      iconSize: {
+        type: Number,
+        default: 20
+      }
+    },
+    computed: {
+      // 这里computed的变量，都是子组件tn-checkbox需要用到的，由于头条小程序的兼容性差异，子组件无法实时监听父组件参数的变化
+      // 所以需要手动通知子组件，这里返回一个parentData变量，供watch监听，在其中去通知每一个子组件重新从父组件(tn-checkbox-group)
+      // 拉取父组件新的变化后的参数
+      parentData() {
+        return [this.value, this.disabled, this.disabledLabel, this.shape, this.activeColor, this.size, this.width, this.wrap, this.iconSize]
+      }
+    },
+    data() {
+      return {
+        
+      }
+    },
+    watch: {
+      // 当父组件中的子组件需要共享的参数发生了变化，手动通知子组件
+      parentData() {
+        if (this.children.length) {
+          this.children.map(child => {
+            // 判断子组件(tn-checkbox)如果有updateParentData方法的话，子组件重新从父组件拉取了最新的值
+            typeof(child.updateParentData) === 'function' && child.updateParentData()
+          })
+        }
+      }
+    },
+    created() {
+      this.children = []
+    },
+    methods: {
+      initValue(values) {
+        this.$emit('input', values)
+      },
+      // 触发事件
+      emitEvent() {
+        let values = []
+        this.children.map(child => {
+          if (child.checkValue) values.push(child.name)
+        })
+        this.$emit('change', values)
+        this.$emit('input', values)
+        // 发出事件，用于在表单组件中嵌入checkbox的情况，进行验证
+        // 由于头条小程序执行迟钝，故需要用几十毫秒的延时
+        setTimeout(() => {
+        	// 将当前的值发送到 tn-form-item 进行校验
+        	this.dispatch('tn-form-item', 'on-form-change', values)
+        }, 60)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-checkbox-group {
+    /* #ifndef MP || APP-NVUE */
+    display: inline-flex;
+    flex-wrap: wrap;
+    /* #endif */
+    &::after {
+      content: " ";
+      display: table;
+      clear: both;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-checkbox/tn-checkbox.vue b/tuniao-ui/components/tn-checkbox/tn-checkbox.vue
new file mode 100644
index 0000000..0ad3a3f
--- /dev/null
+++ b/tuniao-ui/components/tn-checkbox/tn-checkbox.vue
@@ -0,0 +1,328 @@
+<template>
+  <view class="tn-checkbox-class tn-checkbox" :style="[checkboxStyle]">
+    <view
+      class="tn-checkbox__icon-wrap"
+      :class="[iconClass]"
+      :style="[iconStyle]"
+      @tap="toggle"
+    >
+      <view class="tn-checkbox__icon-wrap__icon" :class="[`tn-icon-${iconName}`]"></view>
+    </view>
+    
+    <view
+      class="tn-checkbox__label"
+      :class="[labelClass]"
+      :style="{
+        fontSize: labelSize ? labelSize + 'rpx' : ''
+      }"
+      @tap="onClickLabel"
+    >
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-checkbox',
+    props: {
+      // checkbox名称
+      name: {
+        type: [String, Number],
+        default: ''
+      },
+      // 是否为选中状态
+      value: {
+        type: Boolean,
+        default: false
+      },
+      // 禁用选择
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 禁用点击标签进行选择
+      disabledLabel: {
+        type: Boolean,
+        default: false
+      },
+      // 选择框的形状 square 方形 circle 圆形
+      shape: {
+        type: String,
+        default: ''
+      },
+      // 选中时的颜色
+      activeColor: {
+        type: String,
+        default: ''
+      },
+      // 组件大小
+      size: {
+        type: Number,
+        default: 0
+      },
+      // 图标名称
+      iconName: {
+        type: String,
+        default: 'success'
+      },
+      // 图标大小
+      iconSize: {
+        type: Number,
+        default: 0
+      },
+      // label的字体大小
+      labelSize: {
+        type: Number,
+        default: 0
+      }
+    },
+    computed: {
+      // 是否禁用选中，父组件的禁用会覆盖当前的禁用状态
+      isDisabled() {
+        return this.disabled ? this.disabled : (this.parent ? this.parentData.disabled : false)
+      },
+      // 是否禁用点击label选中，父组件的禁用会覆盖当前的禁用状态
+      isDisabledLabel() {
+        return this.disabledLabel ? this.disabledLabel : (this.parent ? this.parentData.disabledLabel : false)
+      },
+      // 尺寸
+      checkboxSize() {
+        return this.size ? this.size : (this.parent ? this.parentData.size : 34)
+      },
+      // 激活时的颜色
+      elAvtiveColor() {
+        return this.activeColor ? this.activeColor : (this.parent ? this.parentData.activeColor : '#01BEFF')
+      },
+      // 形状
+      elShape() {
+        return this.shape ? this.shape : (this.parent ? this.parentData.shape : 'square')
+      },
+      iconClass() {
+        let clazz = ''
+        clazz += (' tn-checkbox__icon-wrap--' + this.elShape)
+        
+        if (this.checkValue) clazz += ' tn-checkbox__icon-wrap--checked'
+        if (this.isDisabled) clazz += ' tn-checkbox__icon-wrap--disabled'
+        if (this.value && this.isDisabled) clazz += ' tn-checkbox__icon-wrap--disabled--checked'
+        
+        return clazz
+      },
+      iconStyle() {
+        let style = {}
+        // 判断是否用户手动禁用和传递的值
+        if (this.elAvtiveColor && this.checkValue && !this.isDisabled) {
+          style.borderColor = this.elAvtiveColor
+          style.backgroundColor = this.elAvtiveColor
+        }
+        
+        // checkbox内部的勾选图标，如果选中状态，为白色，否则为透明色即可
+        style.color = this.checkValue ? '#FFFFFF' : 'transparent'
+        
+        style.width = this.checkboxSize + 'rpx'
+        style.height = style.width
+        
+        style.fontSize = (this.iconSize ? this.iconSize : (this.parent ? this.parentData.iconSize : 20)) + 'rpx'
+        
+        return style
+      },
+      checkboxStyle() {
+        let style = {}
+        if (this.parent && this.parentData.width) {
+          // #ifdef MP
+          // 各家小程序因为它们特殊的编译结构，使用float布局
+          style.float = 'left';
+          // #endif
+          // #ifndef MP
+          // H5和APP使用flex布局
+          style.flex = `0 0 ${this.parentData.width}`;
+          // #endif
+        }
+        if(this.parent && this.parentData.wrap) {
+        	style.width = '100%';
+        	// #ifndef MP
+        	// H5和APP使用flex布局，将宽度设置100%，即可自动换行
+        	style.flex = '0 0 100%';
+        	// #endif
+        }
+        
+        return style
+      },
+      labelClass() {
+        let clazz = ''
+        if (this.isDisabled) {
+          clazz += ' tn-checkbox__label--disabled'
+        }
+        return clazz
+      }
+    },
+    data() {
+      return {
+        // 当前checkbox的value值
+        checkValue: false,
+        parentData: {
+          value: null,
+          max: null,
+          disabled: null,
+          disabledLabel: null,
+          shape: null,
+          activeColor: null,
+          size: null,
+          width: null,
+          wrap: null,
+          iconSize: null
+        }
+      }
+    },
+    watch: {
+      value(val) {
+        this.checkValue = val
+      }
+    },
+    created() {
+      // 支付宝小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环应用
+      // this.parent = this.$tn.$parent.call(this, 'tn-checkbox-group')
+      // // 如果存在u-checkbox-group，将本组件的this塞进父组件的children中
+      // this.parent && this.parent.children.push(this)
+      // // 初始化父组件的value值
+      // this.parent && this.parent.emitEvent()
+      this.updateParentData()
+      this.parent && this.parent.children.push(this)
+    },
+    methods: {
+      updateCheckValue() {
+        // 更新当前checkbox的选中状态
+        this.checkValue = (this.parent && this.parentData.value.includes(this.name)) || this.value === true
+        if (this.parent) {
+          if (this.value && !this.parentData.value.includes(this.name)) {
+            this.parentData.value.push(this.name)
+            this.parent.initValue(this.parentData.value)
+          }
+        }
+      },
+      updateParentData() {
+        this.getParentData('tn-checkbox-group')
+        this.updateCheckValue()
+      },
+      onClickLabel() {
+        if (!this.isDisabled && !this.isDisabledLabel) {
+          this.setValue()
+        }
+      },
+      toggle() {
+        if (!this.isDisabled) {
+          this.setValue()
+        }
+      },
+      emitEvent() {
+        this.$emit('change', {
+          name: this.name,
+          value: !this.checkValue
+        })
+        if (this.parent) {
+          this.checkValue = !this.checkValue
+          // 执行父组件tn-checkbox-group的事件方法
+          // 等待下一个周期再执行，因为this.$emit('input')作用于父组件，再反馈到子组件内部，需要时间
+          setTimeout(() => {
+            if(this.parent.emitEvent) this.parent.emitEvent();
+          }, 80)
+        }
+      },
+      // 设置input的值，通过v-modal绑定组件的值
+      setValue() {
+        // 判断是否为可选项组
+        if (this.parent) {
+          // 反转状态
+          if (this.checkValue === true) {
+            this.emitEvent()
+            // this.$emit('input', !this.checkValue)
+          } else {
+            // 超出最大可选项，弹出提示
+            if (this.parentData.value.length >= this.parentData.max) {
+              return this.$tn.message.toast(`最多可选${this.parent.max}项`)
+            }
+            // 如果原来为未选中状态，需要选中的数量少于父组件中设置的max值，才可以选中
+            this.emitEvent();
+            // this.$emit('input', !this.checkValue);
+          }
+        } else {
+          // 只有一个可选项
+          this.emitEvent()
+          this.$emit('input', !this.checkValue)
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-checkbox {
+    /* #ifndef APP-NVUE */
+    display: inline-flex;
+    /* #endif */
+    align-items: center;
+    overflow: hidden;
+    user-select: none;
+    line-height: 1.8;
+    
+    &__icon-wrap {
+      color: $tn-font-color;
+      flex: none;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      box-sizing: border-box;
+      width: 42rpx;
+      height: 42rpx;
+      color: transparent;
+      text-align: center;
+      transition-property: color, border-color, background-color;
+      border: 1px solid $tn-font-sub-color;
+      transition-duration: 0.2s;
+      
+      /* #ifdef MP-TOUTIAO */
+      // 头条小程序兼容性问题，需要设置行高为0，否则图标偏下
+      &__icon {
+      	line-height: 0;
+      }
+      /* #endif */
+      
+      &--circle {
+        border-radius: 100%;
+      }
+      
+      &--square {
+        border-radius: 6rpx;
+      }
+      
+      &--checked {
+        color: #FFFFFF;
+        background-color: $tn-main-color;
+        border-color: $tn-main-color;
+      }
+      
+      &--disabled {
+        background-color: $tn-font-holder-color;
+        border-color: $tn-font-sub-color;
+      }
+      
+      &--disabled--checked {
+        color: $tn-font-sub-color !important;
+      }
+    }
+    
+    &__label {
+      word-wrap: break-word;
+      margin-left: 10rpx;
+      margin-right: 24rpx;
+      color: $tn-font-color;
+      font-size: 30rpx;
+      
+      &--disabled {
+        color: $tn-font-sub-color;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-circle-progress/tn-circle-progress.vue b/tuniao-ui/components/tn-circle-progress/tn-circle-progress.vue
new file mode 100644
index 0000000..31c1a38
--- /dev/null
+++ b/tuniao-ui/components/tn-circle-progress/tn-circle-progress.vue
@@ -0,0 +1,223 @@
+<template>
+  <view
+    class="tn-circle-progress-class tn-circle-progress"
+    :style="{
+      width: widthPx + 'px',
+      height: widthPx + 'px'
+    }"
+  >
+    <!-- 支付宝小程序不支持canvas-id属性，必须用id属性 -->
+    <!-- 默认圆环 -->
+    <canvas
+      class="tn-circle-progress__canvas-bg"
+      :canvas-id="elBgId"
+      :id="elBgId"
+      :style="{
+        width: widthPx + 'px',
+        height: widthPx + 'px'
+      }"
+    ></canvas>
+    <!-- 进度圆环 -->
+    <canvas
+      class="tn-circle-progress__canvas"
+      :canvas-id="elId"
+      :id="elId"
+      :style="{
+        width: widthPx + 'px',
+        height: widthPx + 'px'
+      }"
+    ></canvas>
+    <view class="tn-circle-progress__content">
+      <slot v-if="$slots.default || $slots.$default"></slot>
+      <view v-else-if="showPercent" class="tn-circle-progress__content__percent">{{ percent + '%' }}</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-circle-progress',
+    props: {
+      // 进度（百分比）
+      percent: {
+        type: Number,
+        default: 0,
+        validator: val => {
+          return val >= 0 && val <= 100
+        }
+      },
+      // 圆环线宽
+      borderWidth: {
+        type: Number,
+        default: 14
+      },
+      // 整体圆的宽度
+      width: {
+        type: Number,
+        default: 200
+      },
+      // 是否显示条纹
+      striped: {
+        type: Boolean,
+        default: false
+      },
+      // 条纹是否运动
+      stripedActive: {
+        type: Boolean,
+        default: true
+      },
+      // 激活部分颜色
+      activeColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 非激活部分颜色
+      inactiveColor: {
+        type: String,
+        default: '#f0f0f0'
+      },
+      // 是否显示进度条内部百分比值
+      showPercent: {
+        type: Boolean,
+        default: false
+      },
+      // 圆环执行动画的时间，ms
+      duration: {
+        type: Number,
+        default: 1500
+      }
+    },
+    data() {
+      return {
+        // 微信小程序中不能使用this.$tn.uuid()形式动态生成id值，否则会报错
+        // #ifdef MP-WEIXIN
+        elBgId: 'tCircleProgressBgId',
+        elId: 'tCircleProgressElId',
+        // #endif
+        // #ifndef MP-WEIXIN
+        elBgId: this.$tn.uuid(),
+        elId: this.$tn.uuid(),
+        // #endif
+        // 活动圆上下文
+        progressContext: null,
+        // 转换成px为单位的背景宽度
+        widthPx: uni.upx2px(this.width || 200),
+        // 转换成px为单位的圆环宽度
+        borderWidthPx: uni.upx2px(this.borderWidth || 14),
+        // canvas画圆的起始角度，默认为-90度，顺时针
+        startAngle: -90 * Math.PI / 180,
+        // 动态修改进度值的时候，保存进度值的变化前后值
+        newPercent: 0,
+        oldPercent: 0
+      }
+    },
+    watch: {
+      percent(newVal, oldVal = 0) {
+        if (newVal > 100) newVal = 100
+        if (oldVal < 0) oldVal = 0
+        
+        this.newPercent = newVal
+        this.oldPercent = oldVal
+        setTimeout(() => {
+        	// 无论是百分比值增加还是减少，需要操作还是原来的旧的百分比值
+        	// 将此值减少或者新增到新的百分比值
+        	this.drawCircleByProgress(oldVal)
+        }, 50)
+      }
+    },
+    created() {
+      // 赋值，用于加载后第一个画圆使用
+      this.newPercent = this.percent;
+      this.oldPercent = 0;
+    },
+    mounted() {
+      setTimeout(() => {
+      	this.drawProgressBg()
+      	this.drawCircleByProgress(this.oldPercent)
+      }, 50)
+    },
+    methods: {
+      // 绘制进度条背景
+      drawProgressBg() {
+        let ctx = uni.createCanvasContext(this.elBgId, this)
+        // 设置线宽
+        ctx.setLineWidth(this.borderWidthPx)
+        // 设置颜色
+        ctx.setStrokeStyle(this.inactiveColor)
+        ctx.beginPath()
+        let radius = this.widthPx / 2
+        ctx.arc(radius, radius, radius - this.borderWidthPx, 0, 360 * Math.PI / 180, false)
+        ctx.stroke()
+        ctx.draw()
+      },
+      // 绘制圆弧的进度
+      drawCircleByProgress(progress) {
+        // 如果已经存在则拿来使用
+        let ctx = this.progressContext
+        if (!ctx) {
+          ctx =uni.createCanvasContext(this.elId, this)
+          this.progressContext = ctx
+        }
+        ctx.setLineCap('round')
+        // 设置线条宽度和颜色
+        ctx.setLineWidth(this.borderWidthPx)
+        ctx.setStrokeStyle(this.activeColor)
+        // 将总过渡时间除以100，得出每修改百分之一进度所需的时间
+        let preSecondTime = Math.floor(this.duration / 100)
+        // 结束角的计算依据为：将2π分为100份，乘以当前的进度值，得出终止点的弧度值，加起始角，为整个圆从默认的
+        let endAngle = ((360 * Math.PI / 180) / 100) * progress + this.startAngle
+        let radius = this.widthPx / 2
+        ctx.beginPath()
+        ctx.arc(radius, radius, radius - this.borderWidthPx, this.startAngle, endAngle, false)
+        ctx.stroke()
+        ctx.draw()
+        
+        // 如果变更后新值大于旧值，意味着增大了百分比
+        if (this.newPercent > this.oldPercent) {
+          // 每次递增百分之一
+          progress++
+          // 如果新增后的值，大于需要设置的值百分比值，停止继续增加
+          if (progress > this.newPercent) return
+        } else {
+          progress--
+          if (progress < this.newPercent) return
+        }
+        setTimeout(() => {
+          // 定时器，每次操作间隔为time值，为了让进度条有动画效果
+          this.drawCircleByProgress(progress)
+        }, preSecondTime)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-circle-progress {
+    position: relative;
+    /* #ifndef APP-NVUE */
+    display: inline-flex;		
+    /* #endif */
+    align-items: center;
+    justify-content: center;
+    background-color: transparent;
+    
+    &__canvas {
+      position: absolute;
+      
+      &-bg {
+        position: absolute;
+      }
+    }
+    
+    &__content {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      
+      &__percent {
+        font-size: 28rpx;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-collapse-item/tn-collapse-item.vue b/tuniao-ui/components/tn-collapse-item/tn-collapse-item.vue
new file mode 100644
index 0000000..998879f
--- /dev/null
+++ b/tuniao-ui/components/tn-collapse-item/tn-collapse-item.vue
@@ -0,0 +1,236 @@
+<template>
+  <view class="tn-collapse-item-class tn-collapse-item" :style="[itemStyle]">
+    <!-- 头部 -->
+    <view
+      class="tn-collapse-item__head"
+      :style="[headStyle]"
+      :hover-stay-time="200"
+      :hover-class="hoverClass"
+      @tap.stop="headClick"
+    >
+      <block v-if="!$slots['title-all'] || !$slots['$title-all']">
+        <view
+          v-if="!$slots.title || !$slots.$title"
+          class="tn-collapse-item__head__title tn-text-ellipsis"
+          :style="[
+            { textAlign: align ? align : 'left'},
+            isShow && activeStyle && !arrow ? activeStyle : ''
+          ]"
+        >{{ title }}</view>
+        <view v-else>
+          <slot name="title"></slot>
+        </view>
+        <view class="tn-collapse-item__head__icon__wrap">
+          <view
+            v-if="arrow"
+            class="tn-icon-down tn-collapse-item__head__icon__arrow"
+            :class="{'tn-collapse-item__head__icon__arrow--active': isShow}"
+            :style="[arrowIconStyle]"
+          ></view>
+        </view>
+      </block>
+      <view v-else>
+        <slot name="title-all"></slot>
+      </view>
+    </view>
+    <!-- 内容 -->
+    <view
+      class="tn-collapse-item__body"
+      :style="[{
+        height: isShow ? height + 'px' : '0'
+      }]"
+    >
+      <view class="tn-collapse-item__body__content" :id="elId" :style="[bodyStyle]">
+        <slot></slot>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-collapse-item',
+    props: {
+      // 展开
+      open: {
+        type: Boolean,
+        default: false
+      },
+      // 唯一标识
+      name: {
+        type: String,
+        default: ''
+      },
+      // 标题
+      title: {
+        type: String,
+        default: ''
+      },
+      // 标题对齐方式
+      align: {
+        type: String,
+        default: 'left'
+      },
+      // 点击不收起
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 活动时样式
+      activeStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 标识
+      index: {
+        type: [Number, String],
+        default: ''
+      }
+    },
+    computed: {
+      arrowIconStyle() {
+        let style = {}
+        if (this.arrowColor) {
+          style.color = this.arrowColor
+        }
+        return style
+      }
+    },
+    data() {
+      return {
+        isShow: false,
+        elId: this.$tn.uuid(),
+        // body高度
+        height: 0,
+        // 头部样式
+        headStyle: {},
+        // 主体样式
+        bodyStyle: {},
+        // item样式
+        itemStyle: {},
+        // 显示右边箭头
+        arrow: true,
+        // 箭头颜色
+        arrowColor: '',
+        // 点击头部时的效果样式
+        hoverClass: ''
+      }
+    },
+    watch: {
+      open(value) {
+        this.isShow = value
+      }
+    },
+    created() {
+      this.parent = false
+      this.isShow = this.open
+    },
+    mounted() {
+      this.init()
+    },
+    methods: {
+      // 异步获取内容或者修改了内容时重新获取内容的信息
+      init() {
+        this.parent = this.$tn.$parent.call(this, 'tn-collapse')
+        if (this.parent) {
+          this.nameSync = this.name ? this.name : this.parent.childrens.length
+          // 不存在才添加对应实例
+          !this.parent.childrens.includes(this) && this.parent.childrens.push(this)
+          this.headStyle = this.parent.headStyle
+          this.bodyStyle = this.parent.bodyStyle
+          this.itemStyle = this.parent.itemStyle
+          this.arrow = this.parent.arrow
+          this.arrowColor = this.parent.arrowColor
+          this.hoverClass = this.parent.hoverClass
+        }
+        this.$nextTick(() => {
+          this.queryRect()
+        })
+      },
+      // 点击头部
+      headClick() {
+        if (this.disabled) return
+        if (this.parent && this.parent.accordion) {
+          this.parent.childrens.map(child => {
+            // 如果是手风琴模式，将其他的item关闭
+            if (this !== child) {
+              child.isShow = false
+            }
+          })
+        }
+        
+        this.isShow = !this.isShow
+        // 触发修改事件
+        this.$emit('change', {
+          index: this.index,
+          show: this.isShow
+        })
+        // 只有在打开时才触发父元素的change
+        if (this.isShow) this.parent && this.parent.onChange()
+        this.$forceUpdate()
+      },
+      // 查询内容高度
+      queryRect() {
+        this._tGetRect('#'+this.elId).then(res => {
+          this.height = res.height
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-collapse-item {
+    
+    &__head {
+      position: relative;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-around;
+      align-items: center;
+      color: $tn-font-color;
+      font-size: 30rpx;
+      line-height: 1;
+      padding: 24rpx 0;
+      padding-left: 24rpx;
+      text-align: left;
+      background-color: #FFFFFF;
+      
+      &__title {
+        flex: 1;
+        overflow: hidden;
+      }
+      
+      &__icon {
+        &__arrow {
+          transition: all 0.3s;
+          margin-right: 20rpx;
+          margin-left: 14rpx;
+          font-size: inherit;
+          
+          &--active {
+            transform: rotate(180deg);
+            transform-origin: center center;
+          }
+        }
+      }
+    }
+    
+    &__body {
+      transition: all 0.3s;
+      overflow: hidden;
+      
+      &__content {
+        overflow: hidden;
+        font-size: 28rpx;
+        color: $tn-font-color;
+        text-align: left;
+        background-color: #FFFFFF;
+        padding-left: 24rpx;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-collapse/tn-collapse.vue b/tuniao-ui/components/tn-collapse/tn-collapse.vue
new file mode 100644
index 0000000..00ec9a2
--- /dev/null
+++ b/tuniao-ui/components/tn-collapse/tn-collapse.vue
@@ -0,0 +1,98 @@
+<template>
+  <view class="tn-collapse-class tn-collapse">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-collapse',
+    props: {
+      // 是否为手风琴
+      accordion: {
+        type: Boolean,
+        default: true
+      },
+      // 头部样式
+      headStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 主题样式
+      bodyStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 每一个item的样式
+      itemStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 显示箭头
+      arrow: {
+        type: Boolean,
+        default: true
+      },
+      // 箭头颜色
+      arrowColor: {
+        type: String,
+        default: '#AAAAAA'
+      },
+      // 点击标题栏时的按压样式
+      hoverClass: {
+        type: String,
+        default: 'tn-hover'
+      }
+    },
+    computed: {
+      parentData() {
+        return [this.headStyle, this.bodyStyle, this.itemStyle, this.arrow, this.arrowColor, this.hoverClass]
+      }
+    },
+    data() {
+      return {
+        
+      }
+    },
+    watch: {
+      parentData() {
+        // 如果父组件的参数发生变化重新初始化子组件的信息
+        if (this.childrens.length > 0) {
+          this.init()
+        }
+      }
+    },
+    created() {
+      this.childrens = []
+    },
+    methods: {
+      // 重新初始化内部所有子元素计算高度，异步获取数据时重新渲染
+      init() {
+        this.childrens.forEach((child, index) => {
+          child.init()
+        })
+      },
+      // collapseItem被点击时由collapseItem调用父组件
+      onChange() {
+        let activeItem = []
+        this.childrens.forEach((child, index) => {
+          if (child.isShow) {
+            activeItem.push(child.nameSync)
+          }
+        })
+        // 如果时手风琴模式，只有一个匹配结果，即activeItem长度为1
+        if (this.accordion) activeItem = activeItem.join(',')
+        this.$emit('change', activeItem)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/tuniao-ui/components/tn-color-icon/tn-color-icon.vue b/tuniao-ui/components/tn-color-icon/tn-color-icon.vue
new file mode 100644
index 0000000..c7ad83b
--- /dev/null
+++ b/tuniao-ui/components/tn-color-icon/tn-color-icon.vue
@@ -0,0 +1,318 @@
+<template>
+  <text
+    class="tn-color-icon-class tn-color-icon"
+    :class="[
+      'tn-color-icon-' + name
+    ]"
+    :style="{
+      fontSize: size + unit,
+      margin: margin
+    }"
+    @tap="handleClick"
+  ></text>
+</template>
+
+<script>
+  export default {
+    name: 'tn-color-icon',
+    props: {
+      // 索引
+      index: {
+        type: [Number, String],
+        default: '0'
+      },
+      // 图标名称
+      name: {
+        type: String,
+        default: ''
+      },
+      // 图标大小
+      size: {
+        type: Number,
+        default:32
+      },
+      // 大小单位
+      unit: {
+        type: String,
+        default: 'px'
+      },
+      // 外边距
+      margin: {
+        type: String,
+        default: '0'
+      }
+    },
+    computed: {
+      
+    },
+    data() {
+      return {
+        
+      }
+    },
+    methods: {
+      // 处理点击事件
+      handleClick() {
+        this.$emit("click", {
+          index: Number(this.index)
+        })
+        this.$emit("tap", {
+          index: Number(this.index)
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @charset "UTF-8";
+  
+  @font-face {
+    font-family: "tuniaoColorFont"; /* Project id 2445412 */
+    /* Color fonts */
+    src: url('iconfont.woff2?t=1632654518618') format('woff2');
+  }
+  
+  .tn-color-icon {
+    font-family: "tuniaoColorFont" !important;
+    font-size: 16px;
+    font-style: normal;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    text-align: center;
+    text-decoration: none;
+  }
+  
+  .tn-color-icon-logo-github:before {
+    content: "\e601";
+  }
+  
+  .tn-color-icon-logo-qq:before {
+    content: "\e602";
+  }
+  
+  .tn-color-icon-logo-weixin:before {
+    content: "\e603";
+  }
+  
+  .tn-color-icon-logo-alipay:before {
+    content: "\e604";
+  }
+  
+  .tn-color-icon-logo-weibo:before {
+    content: "\e605";
+  }
+  
+  .tn-color-icon-logo-dingtalk:before {
+    content: "\e606";
+  }
+  
+  .tn-color-icon-safe:before {
+    content: "\e607";
+  }
+  
+  .tn-color-icon-wifi:before {
+    content: "\e608";
+  }
+  
+  .tn-color-icon-help:before {
+    content: "\e609";
+  }
+  
+  .tn-color-icon-tag:before {
+    content: "\e60a";
+  }
+  
+  .tn-color-icon-play:before {
+    content: "\e60b";
+  }
+  
+  .tn-color-icon-stopwatch:before {
+    content: "\e60c";
+  }
+  
+  .tn-color-icon-home:before {
+    content: "\e60d";
+  }
+  
+  .tn-color-icon-map:before {
+    content: "\e60e";
+  }
+  
+  .tn-color-icon-book:before {
+    content: "\e60f";
+  }
+  
+  .tn-color-icon-qrcode:before {
+    content: "\e610";
+  }
+  
+  .tn-color-icon-discover:before {
+    content: "\e611";
+  }
+  
+  .tn-color-icon-visitor:before {
+    content: "\e612";
+  }
+  
+  .tn-color-icon-menu:before {
+    content: "\e613";
+  }
+  
+  .tn-color-icon-renew:before {
+    content: "\e614";
+  }
+  
+  .tn-color-icon-business:before {
+    content: "\e615";
+  }
+  
+  .tn-color-icon-telephone:before {
+    content: "\e616";
+  }
+  
+  .tn-color-icon-medicine:before {
+    content: "\e617";
+  }
+  
+  .tn-color-icon-chicken:before {
+    content: "\e618";
+  }
+  
+  .tn-color-icon-clock:before {
+    content: "\e619";
+  }
+  
+  .tn-color-icon-download:before {
+    content: "\e61a";
+  }
+  
+  .tn-color-icon-lamp:before {
+    content: "\e61b";
+  }
+  
+  .tn-color-icon-hourglass:before {
+    content: "\e61c";
+  }
+  
+  .tn-color-icon-calendar:before {
+    content: "\e61d";
+  }
+  
+  .tn-color-icon-bluetooth:before {
+    content: "\e61e";
+  }
+  
+  .tn-color-icon-fish:before {
+    content: "\e61f";
+  }
+  
+  .tn-color-icon-seal:before {
+    content: "\e620";
+  }
+  
+  .tn-color-icon-remind:before {
+    content: "\e621";
+  }
+  
+  .tn-color-icon-music:before {
+    content: "\e622";
+  }
+  
+  .tn-color-icon-email:before {
+    content: "\e623";
+  }
+  
+  .tn-color-icon-medal:before {
+    content: "\e624";
+  }
+  
+  .tn-color-icon-image:before {
+    content: "\e625";
+  }
+  
+  .tn-color-icon-network:before {
+    content: "\e626";
+  }
+  
+  .tn-color-icon-wallet:before {
+    content: "\e627";
+  }
+  
+  .tn-color-icon-program:before {
+    content: "\e628";
+  }
+  
+  .tn-color-icon-shrimp:before {
+    content: "\e629";
+  }
+  
+  .tn-color-icon-collect:before {
+    content: "\e62a";
+  }
+  
+  .tn-color-icon-screw:before {
+    content: "\e62b";
+  }
+  
+  .tn-color-icon-set:before {
+    content: "\e62c";
+  }
+  
+  .tn-color-icon-userfavorite:before {
+    content: "\e62d";
+  }
+  
+  .tn-color-icon-useradd:before {
+    content: "\e62e";
+  }
+  
+  .tn-color-icon-honor:before {
+    content: "\e62f";
+  }
+  
+  .tn-color-icon-shop:before {
+    content: "\e630";
+  }
+  
+  .tn-color-icon-usercard:before {
+    content: "\e631";
+  }
+  
+  .tn-color-icon-school:before {
+    content: "\e632";
+  }
+  
+  .tn-color-icon-user:before {
+    content: "\e633";
+  }
+  
+  .tn-color-icon-internet:before {
+    content: "\e634";
+  }
+  
+  .tn-color-icon-time:before {
+    content: "\e635";
+  }
+  
+  .tn-color-icon-topic:before {
+    content: "\e636";
+  }
+  
+  .tn-color-icon-phone:before {
+    content: "\e637";
+  }
+  
+  .tn-color-icon-usertable:before {
+    content: "\e638";
+  }
+  
+  .tn-color-icon-userset:before {
+    content: "\e639";
+  }
+  
+  .tn-color-icon-game:before {
+    content: "\e63a";
+  }
+  
+</style>
diff --git a/tuniao-ui/components/tn-column-notice/tn-column-notice.vue b/tuniao-ui/components/tn-column-notice/tn-column-notice.vue
new file mode 100644
index 0000000..f56775c
--- /dev/null
+++ b/tuniao-ui/components/tn-column-notice/tn-column-notice.vue
@@ -0,0 +1,241 @@
+<template>
+	<view class="tn-column-notice-class tn-column-notice" :class="[backgroundColorClass]" :style="[noticeStyle]">
+		<!-- 左图标 -->
+		<view class="tn-column-notice__icon">
+			<view v-if="leftIcon && leftIconType=='icon'" class="tn-column-notice__icon--left"
+				:class="[`tn-icon-${leftIconName}`,fontColorClass]" :style="[fontStyle('leftIcon')]"
+				@tap="clickLeftIcon"></view>
+			<view v-if="leftIcon && leftIconType=='img'" class="tn-column-notice__icon--left" @tap="clickLeftIcon">
+				<image src="/static/hqzc.png" style="width: 56rpx;height: 50rpx;"></image>
+			</view>
+		</view>
+
+		<!-- 滚动显示内容 -->
+		<swiper class="tn-column-notice__swiper" :style="[swiperStyle]" :vertical="vertical" circular
+			:autoplay="autoplay && playStatus === 'play'" :interval="duration" @change="change">
+			<swiper-item v-for="(item, index) in list" :key="index" class="tn-column-notice__swiper--item">
+				<view class="tn-column-notice__swiper--content tn-text-ellipsis" :class="[fontColorClass]"
+					:style="[fontStyle()]" @tap="click(item)">{{ item.article_title }}</view>
+			</swiper-item>
+		</swiper>
+
+		<!-- 右图标 -->
+		<view class="tn-column-notice__icon">
+			<view v-if="rightIcon" class="tn-column-notice__icon--right"
+				:class="[`tn-icon-${rightIconName}`,fontColorClass]" :style="[fontStyle('rightIcon')]"
+				@tap="clickRightIcon"></view>
+			<view v-if="closeBtn" class="tn-column-notice__icon--right" :class="[`tn-icon-close`,fontColorClass]"
+				:style="[fontStyle('close')]" @tap="close"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import componentsColorMixin from '../../libs/mixin/components_color.js'
+	export default {
+		name: 'tn-column-notice',
+		mixins: [componentsColorMixin],
+		props: {
+			// 显示的内容
+			list: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// 是否显示
+			show: {
+				type: Boolean,
+				default: true
+			},
+			// 播放状态
+			// play -> 播放 paused -> 暂停
+			playStatus: {
+				type: String,
+				default: 'play'
+			},
+			// 滚动方向
+			// horizontal -> 水平滚动 vertical -> 垂直滚动
+			mode: {
+				type: String,
+				default: 'horizontal'
+			},
+			// 是否显示左边图标
+			leftIcon: {
+				type: Boolean,
+				default: true
+			},
+			// 是否显示左边图标
+			leftIconType: {
+				type: String,
+				default: 'icon'
+			},
+			// 左边图标的名称
+			leftIconName: {
+				type: String,
+				default: 'sound'
+			},
+			// 左边图标的大小
+			leftIconSize: {
+				type: Number,
+				default: 34
+			},
+			// 是否显示右边的图标
+			rightIcon: {
+				type: Boolean,
+				default: false
+			},
+			// 右边图标的名称
+			rightIconName: {
+				type: String,
+				default: 'right'
+			},
+			// 右边图标的大小
+			rightIconSize: {
+				type: Number,
+				default: 26
+			},
+			// 是否显示关闭按钮
+			closeBtn: {
+				type: Boolean,
+				default: false
+			},
+			// 圆角
+			radius: {
+				type: Number,
+				default: 0
+			},
+			// 内边距
+			padding: {
+				type: String,
+				default: '18rpx 24rpx'
+			},
+			// 自动播放
+			autoplay: {
+				type: Boolean,
+				default: true
+			},
+			// 滚动周期
+			duration: {
+				type: Number,
+				default: 2000
+			}
+		},
+		computed: {
+			fontStyle() {
+				return (type) => {
+					let style = {}
+					style.color = this.fontColorStyle ? this.fontColorStyle : ''
+					style.fontSize = this.fontSizeStyle ? this.fontSizeStyle : ''
+					if (type === 'leftIcon' && this.leftIconSize) {
+						style.fontSize = this.leftIconSize + 'rpx'
+					}
+					if (type === 'rightIcon' && this.rightIconSize) {
+						style.fontSize = this.rightIconSize + 'rpx'
+					}
+					if (type === 'close') {
+						style.fontSize = '24rpx'
+					}
+
+					return style
+				}
+			},
+			noticeStyle() {
+				let style = {}
+				style.backgroundColor = this.backgroundColorStyle ? this.backgroundColorStyle : 'transparent'
+				if (this.padding) style.padding = this.padding
+				return style
+			},
+			swiperStyle() {
+				let style = {}
+				style.height = this.fontSize ? this.fontSize + 6 + this.fontUnit : '32rpx'
+				style.lineHeight = style.height
+
+				return style
+			},
+			// 标记是否为垂直
+			vertical() {
+				if (this.mode === 'horizontal') return false
+				else return true
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		watch: {
+
+		},
+		methods: {
+			// 点击了通知栏
+			click(index) {
+				this.$emit('click', index)
+			},
+			// 点击了关闭按钮
+			close() {
+				this.$emit('close')
+			},
+			// 点击了左边图标
+			clickLeftIcon() {
+				this.$emit('clickLeft')
+			},
+			// 点击了右边图标
+			clickRightIcon() {
+				this.$emit('clickRight')
+			},
+			// 切换消息时间
+			change(event) {
+				let index = event.detail.current
+				if (index === this.list.length - 1) {
+					this.$emit('end')
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tn-column-notice {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		flex-wrap: nowrap;
+		overflow: hidden;
+
+		&__swiper {
+			height: auto;
+			flex: 1;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-left: 12rpx;
+
+			&--item {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				overflow: hidden;
+			}
+
+			&--content {
+				overflow: hidden;
+			}
+		}
+
+		&__icon {
+			&--left {
+				display: inline-flex;
+				align-items: center;
+			}
+
+			&--right {
+				margin-left: 12rpx;
+				display: inline-flex;
+				align-items: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-count-down/tn-count-down.vue b/tuniao-ui/components/tn-count-down/tn-count-down.vue
new file mode 100644
index 0000000..cd31e69
--- /dev/null
+++ b/tuniao-ui/components/tn-count-down/tn-count-down.vue
@@ -0,0 +1,314 @@
+<template>
+  <view class="tn-countdown-class tn-countdown">
+    <view
+      v-if="showDays && (hideZeroDay || (!hideZeroDay && d != '00'))"
+      class="tn-countdown__item"
+      :class="[backgroundColorClass]"
+      :style="[itemStyle]"
+    >
+      <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
+        {{ d }}
+      </view>
+    </view>
+    <view 
+      v-if="showHours && (hideZeroDay || (!hideZeroDay && d != '00'))"
+      class="tn-countdown__separator"
+      :style="{
+        fontSize: separatorSize + 'rpx',
+        color: separatorColor,
+        paddingBottom: separator === 'en' ? '4rpx' : 0
+      }"
+    >
+      {{ separator === 'en' ? ':' : '天'}}
+    </view>
+    
+    <view
+      v-if="showHours"
+      class="tn-countdown__item"
+      :class="[backgroundColorClass]"
+      :style="[itemStyle]"
+    >
+      <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
+        {{ h }}
+      </view>
+    </view>
+    <view 
+      v-if="showMinutes"
+      class="tn-countdown__separator"
+      :style="{
+        fontSize: separatorSize + 'rpx',
+        color: separatorColor,
+        paddingBottom: separator === 'en' ? '4rpx' : 0
+      }"
+    >
+      {{ separator === 'en' ? ':' : '时'}}
+    </view>
+    
+    <view
+      v-if="showMinutes"
+      class="tn-countdown__item"
+      :class="[backgroundColorClass]"
+      :style="[itemStyle]"
+    >
+      <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
+        {{ m }}
+      </view>
+    </view>
+    <view 
+      v-if="showSeconds"
+      class="tn-countdown__separator"
+      :style="{
+        fontSize: separatorSize + 'rpx',
+        color: separatorColor,
+        paddingBottom: separator === 'en' ? '4rpx' : 0
+      }"
+    >
+      {{ separator === 'en' ? ':' : '分'}}
+    </view>
+    
+    <view
+      v-if="showSeconds"
+      class="tn-countdown__item"
+      :class="[backgroundColorClass]"
+      :style="[itemStyle]"
+    >
+      <view class="tn-countdown__item__time" :class="[fontColorClass]" :style="[letterStyle]">
+        {{ s }}
+      </view>
+    </view>
+    <view 
+      v-if="showSeconds && separator === 'cn'"
+      class="tn-countdown__separator"
+      :style="{
+        fontSize: separatorSize + 'rpx',
+        color: separatorColor,
+        paddingBottom: separator === 'en' ? '4rpx' : 0
+      }"
+    >
+      秒
+    </view>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-count-down',
+    mixins: [componentsColorMixin],
+    props: {
+      // 倒计时时间，秒作为单位
+      timestamp: {
+        type: Number,
+        default: 0
+      },
+      // 是否自动开始
+      autoplay: {
+        type: Boolean,
+        default: true
+      },
+      // 数字框高度
+      height: {
+        type: [String, Number],
+        default: 'auto'
+      },
+      // 分隔符类型
+      // en -> 使用英文的冒号 cn -> 使用中文进行分割
+      separator: {
+        type: String,
+        default: 'en'
+      },
+      // 分割符大小
+      separatorSize: {
+        type: Number,
+        default: 30
+      },
+      // 分隔符颜色
+      separatorColor: {
+        type: String,
+        default: '#080808'
+      },
+      // 是否显示边框
+      showBorder: {
+        type: Boolean,
+        default: false
+      },
+      // 边框颜色
+      borderColor: {
+        type: String,
+        default: '#080808'
+      },
+      // 是否显示秒
+      showSeconds: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示分
+      showMinutes: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示时
+      showHours: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示天
+      showDays: {
+        type: Boolean,
+        default: true
+      },
+      // 如果当天的部分为0时，是否隐藏不显示
+      hideZeroDay: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      // 倒计时item的样式
+      itemStyle() {
+        let style = {}
+        if (this.height) {
+          style.height = this.$tn.string.getLengthUnitValue(this.height)
+          style.width = style.height
+        }
+        if (this.showBorder) {
+          style.borderStyle = 'solid'
+          style.borderColor = this.borderColor
+          style.borderWidth = '1rpx'
+        }
+        style.backgroundColor = this.backgroundColorStyle || '#FFFFFF'
+        return style
+      },
+      // 倒计时数字样式
+      letterStyle() {
+        let style = {}
+        style.fontSize = this.fontSizeStyle || '30rpx'
+        style.color = this.fontColorStyle || '#080808'
+        return style
+      }
+    },
+    data() {
+      return {
+        d: '00',
+        h: '00',
+        m: '00',
+        s: '00',
+        // 定时器
+        timer: null,
+        // 记录倒计过程中变化的秒数
+        seconds: 0
+      }
+    },
+    watch: {
+      // 监听时间戳变化
+      timestamp(value) {
+        this.clearTimer()
+        this.start()
+      }
+    },
+    mounted() {
+      // 如果时自动倒计时，加载完成开始计时
+      this.autoplay && this.timestamp && this.start()
+    },
+    beforeDestroy() {
+      this.clearTimer()
+    },
+    methods: {
+      // 开始倒计时
+      start() {
+        // 避免可能出现的倒计时重叠情况
+        this.clearTimer()
+        if (this.timestamp <= 0) return
+        this.seconds = Number(this.timestamp)
+        this.formatTime(this.seconds)
+        this.timer = setInterval(() => {
+          this.seconds--
+          // 发出change事件
+          this.$emit('change', this.seconds)
+          if (this.seconds < 0) {
+            return this.end()
+          }
+          this.formatTime(this.seconds)
+        }, 1000)
+      },
+      // 格式化时间
+      formatTime(seconds) {
+        // 小于等于0的话，结束倒计时
+        seconds <= 0 && this.end()
+        let [day, hour, minute, second] = [0, 0, 0, 0]
+        day = Math.floor(seconds / (60 * 60 * 24))
+        // 如果不显示天，则将天对应的小时计入到小时中
+        // 先把当前的hour计算出来供分和秒使用
+        hour = Math.floor(seconds / (60 * 60)) - (day * 24)
+        let showHour = null
+        if (this.showDays) {
+          showHour = hour
+        } else {
+          // 将天数对应的小时加入到时中进行显示
+          showHour = Math.floor(seconds / (60 * 60))
+        }
+        minute = Math.floor(seconds / 60) - (hour * 60) - (day * 24 * 60)
+        second = Math.floor(seconds) - (minute * 60) - (hour * 60 * 60) - (day * 24 * 60 * 60)
+        // 如果小于0在前面进行补0操作
+        showHour = this.$tn.number.formatNumberAddZero(showHour)
+        minute = this.$tn.number.formatNumberAddZero(minute)
+        second = this.$tn.number.formatNumberAddZero(second)
+        day = this.$tn.number.formatNumberAddZero(day)
+        
+        this.d = day
+        this.h = showHour
+        this.m = minute
+        this.s = second
+      },
+      // 倒计时结束
+      end() {
+        this.clearTimer()
+        this.$emit('end')
+      },
+      // 清除倒计时
+      clearTimer() {
+        if (this.timer !== null) {
+          clearInterval(this.timer)
+          this.timer = null
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-countdown {
+    /* #ifndef APP-NVUE */
+    display: inline-flex;
+    /* #endif */
+    align-items: center;
+    
+    &__item {
+      box-sizing: content-box;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      padding: 2rpx;
+      border-radius: 6rpx;
+      white-space: nowrap;
+      transform: translateZ(0);
+      
+      &__time {
+        margin: 0;
+        padding: 0;
+        line-height: 1;
+      }
+    }
+    
+    &__separator {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      padding: 0 5rpx;
+      line-height: 1;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-count-scroll/tn-count-scroll.vue b/tuniao-ui/components/tn-count-scroll/tn-count-scroll.vue
new file mode 100644
index 0000000..b9c2eef
--- /dev/null
+++ b/tuniao-ui/components/tn-count-scroll/tn-count-scroll.vue
@@ -0,0 +1,171 @@
+<template>
+  <view class="tn-count-scroll-class tn-count-scroll">
+    <view
+      v-for="(item, index) in columns"
+      :key="index"
+      class="tn-count-scroll__box"
+      :style="{
+        width: $tn.string.getLengthUnitValue(width),
+        height: heightPxValue + 'px'
+      }"
+    >
+      <view
+        class="tn-count-scroll__column"
+        :style="{
+          transform: `translate3d(0, -${keys[index] * heightPxValue}px, 0)`,
+          transitionDuration: `${duration}s`
+        }"
+      >
+        <view
+          v-for="(value, value_index) in item"
+          :key="value_index"
+          class="tn-count-scroll__column__item"
+          :class="[fontColorClass]"
+          :style="{
+            height: heightPxValue + 'px',
+            lineHeight: heightPxValue + 'px',
+            fontSize: fontSizeStyle || '32rpx',
+            fontWeight: bold ? 'bold': 'normal',
+            color: fontColorStyle || '#080808'
+          }"
+        >
+          {{ value }}
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-count-scroll',
+    mixins: [componentsColorMixin],
+    props: {
+      value: {
+        type: Number,
+        default: 0
+      },
+      // 行高
+      height: {
+        type: Number,
+        default: 32
+      },
+      // 单个字的宽度
+      width: {
+        type: [String, Number],
+        default: 'auto'
+      },
+      // 是否加粗
+      bold: {
+        type: Boolean,
+        default: false
+      },
+      // 持续时间
+      duration: {
+        type: Number,
+        default: 1.2
+      },
+      // 十分位分割符
+      decimalSeparator: {
+        type: String,
+        default: '.'
+      },
+      // 千分位分割符
+      thousandthsSeparator: {
+        type: String,
+        default: ''
+      }
+    },
+    computed: {
+      heightPxValue() {
+        return uni.upx2px(this.height || 0)
+      }
+    },
+    data() {
+      return {
+        // 每列的数据
+        columns: [],
+        // 每列对应值所在的滚动位置
+        keys: []
+      }
+    },
+    watch: {
+      value(val) {
+        this.initColumn(val)
+      }
+    },
+    created() {
+      // 为了达到一进入就有滚动效果，延迟执行初始化
+      this.initColumn()
+      setTimeout(() => {
+        this.initColumn(this.value)
+      }, 20)
+    },
+    methods: {
+      // 初始化每一列的数据
+      initColumn(val) {
+        val = val + ''
+        let digit = val.length,
+            columnArray = [],
+            rows = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+        for (let i = 0; i < digit; i++) {
+          if (val[i] === this.decimalSeparator || val[i] === this.thousandthsSeparator) {
+            columnArray.push(val[i])
+          } else {
+            columnArray.push(rows)
+          }
+        }
+        this.columns = columnArray
+        this.roll(val)
+      },
+      // 滚动处理
+      roll(value) {
+        let valueArray = value.toString().split(''),
+            lengths = this.columns.length,
+            indexs = [];
+        
+        while (valueArray.length) {
+          let figure = valueArray.pop()
+          if (figure === this.decimalSeparator || figure === this.thousandthsSeparator) {
+            indexs.unshift(0)
+          } else {
+            indexs.unshift(Number(figure))
+          }
+        }
+        while(indexs.length < lengths) {
+          indexs.unshift(0)
+        }
+        this.keys = indexs
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-count-scroll {
+    display: inline-flex;
+    align-items: center;
+    justify-content: space-between;
+    
+    &__box {
+      overflow: hidden;
+    }
+    
+    &__column {
+      transform: translate3d(0, 0, 0);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      transition-timing-function: cubic-bezier(0, 1, 0, 1);
+      
+      &__item {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-count-to/tn-count-to.vue b/tuniao-ui/components/tn-count-to/tn-count-to.vue
new file mode 100644
index 0000000..c3d8854
--- /dev/null
+++ b/tuniao-ui/components/tn-count-to/tn-count-to.vue
@@ -0,0 +1,231 @@
+<template>
+  <view
+    class="tn-count-num-class tn-count-num"
+    :class="[fontColorClass]"
+    :style="{
+      fontSize: fontSizeStyle || '50rpx',
+      fontWeight: bold ? 'bold' : 'normal',
+      color: fontColorStyle || '#080808'
+    }"
+  >
+    {{ displayValue }}
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-count-to',
+    mixins: [componentsColorMixin],
+    props: {
+      // 开始的数值，默认为0
+      startVal: {
+        type: Number,
+        default: 0
+      },
+      // 结束目标数值
+      endVal: {
+        type: Number,
+        default: 0,
+        required: true
+      },
+      // 是否自动开始
+      autoplay: {
+        type: Boolean,
+        default: true
+      },
+      // 滚动到目标值的持续时间，单位为毫秒
+      duration: {
+        type: Number,
+        default: 2000
+      },
+      // 是否在即将结束的时候使用缓慢滚动的效果
+      useEasing: {
+        type: Boolean,
+        default: true
+      },
+      // 显示的小数位数
+      decimals: {
+        type: Number,
+        default: 0
+      },
+      // 十进制的分割符
+      decimalSeparator: {
+        type: String,
+        default: '.'
+      },
+      // 千分位的分隔符
+      // 类似金额的分割(￥23,321.05中的",")
+      thousandthsSeparator: {
+        type: String,
+        default: ''
+      },
+      // 是否显示加粗字体
+      bold: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      countDown() {
+        return this.startVal > this.endVal
+      }
+    },
+    data() {
+      return {
+        localStartVal: this.startVal,
+        localDuration: this.duration,
+        // 显示的数值
+        displayValue: this.formatNumber(this.startVal),
+        // 打印的数值
+        printValue: null,
+        // 是否暂停
+        paused: false,
+        // 开始时间戳
+        startTime: null,
+        // 停留时间戳
+        remainingTime: null,
+        // 当前时间戳
+        timestamp: null,
+        // 上一次的时间戳
+        lastTime: 0,
+        rAF: null
+      }
+    },
+    watch: {
+      startVal() {
+        this.autoplay && this.start()
+      },
+      endVal() {
+        this.autoplay && this.start()
+      }
+    },
+    mounted() {
+      this.autoplay && this.start()
+    },
+    methods: {
+      // 开始滚动
+      start() {
+        this.localStartVal = this.startVal
+        this.startTime = null
+        this.localDuration = this.duration
+        this.paused = false
+        this.rAF = this.requestAnimationFrame(this.count)
+      },
+      // 重新开始
+      reStart() {
+        if (this.paused) {
+          this.resume()
+          this.paused = false
+        } else {
+          this.stop()
+          this.paused = true
+        }
+      },
+      // 停止
+      stop() {
+        this.cancelAnimationFrame(this.rAF)
+      },
+      // 恢复
+      resume() {
+        this.startTime = null
+        this.localDuration = this.remainingTime
+        this.localStartVal = this.printValue
+        this.requestAnimationFrame(this.count)
+      },
+      // 重置
+      reset() {
+        this.startTime = null
+        this.cnacelAnimationFrame(this.rAF)
+        this.displayValue = this.formatNumber(this.startVal)
+      },
+      // 销毁组件
+      destroyed() {
+        this.cancelAnimationFrame(this.rAF)
+      },
+      // 累加时间
+      count(timestamp) {
+        if (!this.startTime) this.startTime = timestamp
+        this.timestamp = timestamp
+        const progress = timestamp - this.startTime
+        this.remainingTime = this.localDuration - progress
+        if (this.useEasing) {
+          if (this.countDown) {
+            this.printValue = this.localStartVal - this.easingFn(progress, 0, this.localStartVal - this.endVal, this.localDuration)
+          } {
+            this.printValue = this.easingFn(progress, this.localStartVal, this.endVal - this.localStartVal, this.localDuration)
+          }
+        } else {
+          if (this.countDown) {
+            this.printValue = this.localStartVal - (this.localStartVal - this.endVal) * (progress / this.localDuration)
+          } else {
+            this.printValue = this.localStartVal + (this.endVal - this.localStartVal) * (progress / this.localDuration)
+          }
+        }
+        if (this.countDown) {
+          this.printValue = this.printValue < this.endVal ? this.endVal : this.printValue
+        } else {
+          this.printValue = this.printValue > this.endVal ? this.endVal : this.printValue
+        }
+        
+        this.displayValue = this.formatNumber(this.printValue)
+        if (progress < this.localDuration) {
+          this.rAF = this.requestAnimationFrame(this.count)
+        } else {
+          this.$emit('end')
+        }
+      },
+      // 缓动时间计算
+      easingFn(t, b, c, d) {
+        return (c * (-Math.pow(2, (-10 * t) / d) + 1) * 1024) / 1023 + b
+      },
+      // 请求帧动画
+      requestAnimationFrame(cb) {
+        const currentTime = new Date().getTime()
+        // 为了使setTimteout的尽可能的接近每秒60帧的效果
+        const timeToCall = Math.max(0, 16 - (currentTime - this.lastTime))
+        const timerId = setTimeout(() => {
+          cb && cb(currentTime + timeToCall)
+        }, timeToCall)
+        this.lastTime = currentTime + timeToCall
+        return timerId
+      },
+      // 清除帧动画
+      clearAnimationFrame(timerId) {
+        clearTimeout(timerId)
+      },
+      // 格式化数值
+      formatNumber(number) {
+        const reg = /(\d+)(\d{3})/
+        number = Number(number)
+        number = number.toFixed(Number(this.decimals))
+        number += ''
+        const numberArray = number.split('.')
+        let num1 = numberArray[0]
+        const num2 = numberArray.length > 1 ? this.decimalSeparator + numberArray[1] : ''
+        
+        if (this.thousandthsSeparator && !this.isNumber(this.thousandthsSeparator)) {
+          while(reg.test(num1)) {
+            num1 = num1.replace(reg, '$1' + this.thousandthsSeparator + '$2')
+          }
+        }
+        return num1 + num2
+      },
+      // 判断是否为数字
+      isNumber(val) {
+        return !isNaN(parseFloat(val))
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-count-num {
+    /* #ifndef APP-NVUE */
+    display: inline-flex;
+    /* #endif */
+    text-align: center;
+    line-height: 1;
+  }
+</style>
diff --git a/tuniao-ui/components/tn-cropper/index.wxs b/tuniao-ui/components/tn-cropper/index.wxs
new file mode 100644
index 0000000..0181a93
--- /dev/null
+++ b/tuniao-ui/components/tn-cropper/index.wxs
@@ -0,0 +1,332 @@
+var cropper = {
+  // 画布x轴起点
+  cutX: 0,
+  // 画布y轴起点
+  cutY: 0,
+  // 触摸点信息(手指与图片中心点的相对位置)
+  touchRelactive: [{
+    x: 0,
+    y: 0
+  }],
+  // 双指触摸时斜边的长度
+  hypotenuseLength:0,
+  // 是否结束触摸
+  touchEndFlag: false,
+  // 画布宽高
+  canvasWidth: 0,
+  canvasHeight: 0,
+  // 图片宽高
+  imgWidth: 0,
+  imgHeight: 0,
+  // 图片缩放比例
+  scale: 1,
+  // 图片旋转角度
+  angle: 0,
+  // 图片上边距
+  imgTop: 0,
+  // 图片左边距
+  imgLeft: 0,
+  // 窗口宽高
+  windowWidth: 0,
+  windowHeight: 0,
+  init: true
+}
+
+function bool(str) {
+  return str === 'true' || str === true
+}
+
+function propChange(prop, oldProp, ownerInstance, instance) {
+  if (prop && prop !== 'null') {
+    var params = prop.split(',')
+    var type = +params[0]
+    var dataset = instance.getDataset()
+    if (cropper.init || type == 4) {
+      cropper.canvasWidth = +dataset.width
+      cropper.canvasHeight = +dataset.height
+      cropper.imgTop = +dataset.windowheight / 2
+      cropper.imgLeft = +dataset.windowwidth / 2
+      cropper.imgWidth = +dataset.imgwidth
+      cropper.imgHeight = +dataset.imgheight
+      cropper.windowHeight = +dataset.windowheight
+      cropper.windowWidth = +dataset.windowwidth
+      cropper.init = false
+    } else if (type == 2 || type == 3) {
+      cropper.imgWidth = +dataset.imgwidth
+      cropper.imgHeight = +dataset.imgheight
+    }
+    cropper.angle = +dataset.angle
+    if (type == 3) {
+      imgTransform(ownerInstance)
+    }
+    switch(type) {
+      case 1:
+        setCutCenter(ownerInstance)
+        // // 设置裁剪框大小
+        computeCutSize(ownerInstance)
+        // // 检查裁剪框是否在范围内
+        cutDetectionPosition(ownerInstance)
+        break
+      case 2:
+        setCutCenter(ownerInstance)
+        break
+      case 3:
+        imgMarginDetectionScale(ownerInstance)
+        break
+      case 4:
+        imageReset(ownerInstance)
+        break
+      case 5:
+        setCutCenter(ownerInstance)
+        break
+      default:
+        break
+    }
+  }
+}
+
+function touchStart(event, ownerInstance) {
+  var touch = event.touches || event.changedTouches
+  cropper.touchEndFlag = false
+  if (touch.length === 1) {
+    cropper.touchRelactive[0] = {
+      x: touch[0].pageX - cropper.imgLeft,
+      y: touch[0].pageY - cropper.imgTop
+    }
+  } else {
+    var width = Math.abs(touch[0].pageX - touch[1].pageX)
+    var height = Math.abs(touch[0].pageY - touch[1].pageY)
+    cropper.touchRelactive = [{
+      x: touch[0].pageX - cropper.imgLeft,
+      y: touch[0].pageY - cropper.imgTop
+    },{
+      x: touch[1].pageX - cropper.imgLeft,
+      y: touch[1].pageY - cropper.imgTop
+    }]
+    cropper.hypotenuseLength = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2))
+  }
+}
+
+function touchMove(event, ownerInstance) {
+  var touch = event.touches || event.changedTouches
+  if (cropper.touchEndFlag) return
+  moveDuring(ownerInstance)
+  if (event.touches.length === 1) {
+    var left = touch[0].pageX - cropper.touchRelactive[0].x,
+      top = touch[0].pageY - cropper.touchRelactive[0].y;
+    cropper.imgLeft = left
+    cropper.imgTop = top
+    imgTransform(ownerInstance)
+    imgMarginDetectionPosition(ownerInstance)
+  } else {
+    var dataset = event.instance.getDataset()
+    var minScale = +dataset.minscale
+    var maxScale = +dataset.maxscale
+    var width = Math.abs(touch[0].pageX - touch[1].pageX),
+      height = Math.abs(touch[0].pageY - touch[1].pageY),
+      hypotenuse = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2)),
+      scale = cropper.scale * (hypotenuse / cropper.hypotenuseLength),
+      current_deg = 0;
+    scale = scale <= minScale ? minScale : scale
+    scale = scale >= maxScale ? maxScale : scale
+    cropper.scale = scale
+    imgMarginDetectionScale(ownerInstance, true)
+    var touchRelative = [{
+      x: touch[0].pageX - cropper.imgLeft,
+      y: touch[0].pageY - cropper.imgTop
+    }, {
+      x: touch[1].pageX - cropper.imgLeft,
+      y: touch[1].pageY - cropper.imgTop
+    }]
+    cropper.touchRelactive = touchRelative
+    cropper.hypotenuseLength = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2))
+    // 更新视图
+    cropper.angle = cropper.angle + current_deg
+    imgTransform(ownerInstance)
+  }
+}
+
+function touchEnd(event, ownerInstance) {
+  cropper.touchEndFlag = true
+  moveStop(ownerInstance)
+  updateData(ownerInstance)
+}
+
+function moveDuring(ownerInstance) {
+  if (!ownerInstance) return
+  ownerInstance.callMethod('moveDuring')
+}
+
+function moveStop(ownerInstance) {
+  if (!ownerInstance) return
+  ownerInstance.callMethod('moveStop')
+}
+
+function setCutCenter(ownerInstance) {
+  var cutX = (cropper.windowWidth - cropper.canvasWidth) * 0.5
+  var cutY = (cropper.windowHeight - cropper.canvasHeight) * 0.5
+  
+  cropper.imgTop = cropper.imgTop - cropper.cutY + cutY
+  cropper.cutY = cutY
+  cropper.imgLeft = cropper.imgLeft - cropper.cutX + cutX
+  cropper.cutX = cutX
+  cutDetectionPosition(ownerInstance)
+  imgTransform(ownerInstance)
+  updateData(ownerInstance)
+}
+
+// 检测剪裁框位置是否在允许的范围内（屏幕内）
+function cutDetectionPosition(ownerInstance) {
+  var windowHeight = cropper.windowHeight,
+    windowWidth = cropper.windowWidth;
+  
+  // 检测上边距是否在范围内
+  var cutDetectionPositionTop = function() {
+    if (cropper.cutY < 0) {
+      cropper.cutY = 0
+    }
+    if (cropper.cutY > windowHeight - cropper.canvasHeight) {
+      cropper.cutY = windowHeight - cropper.canvasHeight
+    }
+  }
+  
+  // 检测左边距是否在范围内
+  var cutDetectionPositionLeft = function() {
+    if (cropper.cutX < 0) {
+      cropper.cutX = 0
+    }
+    if (cropper.cutX > windowWidth - cropper.canvasWidth) {
+      cropper.cutX = windowWidth - cropper.canvasWidth
+    }
+  }
+  
+  // 裁剪框坐标处理（如果只写一个参数则另一个默认为0，都不写默认为居中）
+  if (cropper.cutX === null && cropper.cutY === null) {
+    var cutX = (windowWidth - cropper.canvasWidth) * 0.5,
+      cutY = (windowHeight - cropper.canvasHeight) * 0.5;
+    cropper.cutX = cutX
+    cropper.cutY = cutY
+  } else if (cropper.cutX !== null && cropper.cutX !== null) {
+    cutDetectionPositionTop()
+    cutDetectionPositionLeft()
+  } else if (cropper.cutX !== null && cropper.cutY === null) {
+    cutDetectionPositionLeft()
+    cropper.cutY = (windowHeight - cropper.canvasHeight) / 2
+  } else if (cropper.cutX === null && cropper.cutY !== null) {
+    cutDetectionPositionTop()
+    cropper.cutX = (windowWidth - cropper.canvasWidth) / 2
+  }
+}
+
+// 图片边缘检测-缩放
+function imgMarginDetectionScale(ownerInstance, delay) {
+  var scale = cropper.scale,
+    imgWidth = cropper.imgWidth,
+    imgHeight = cropper.imgHeight;
+  if ((cropper.angle / 90) % 2) {
+    imgWidth = cropper.imgHeight
+    imgHeight = cropper.imgWidth
+  }
+  if (imgWidth * scale < cropper.canvasWidth) {
+    scale = cropper.canvasWidth / imgWidth
+  }
+  if (imgHeight * scale < cropper.canvasHeight) {
+    scale = Math.max(scale, cropper.canvasHeight / imgHeight)
+  }
+  imgMarginDetectionPosition(ownerInstance, scale, delay)
+}
+
+// 图片边缘检测-位置
+function imgMarginDetectionPosition(ownerInstance, scale, delay) {
+  var left = cropper.imgLeft,
+    top = cropper.imgTop,
+    imgWidth = cropper.imgWidth,
+    imgHeight = cropper.imgHeight;
+  scale = scale || cropper.scale
+  if ((cropper.angle / 90) % 2) {
+    imgWidth = cropper.imgHeight
+    imgHeight = cropper.imgWidth
+  }
+  
+  left = cropper.cutX + (imgWidth * scale) / 2 >= left ? left : cropper.cutX + (imgWidth * scale) / 2
+  left = cropper.cutX + cropper.canvasWidth - (imgWidth * scale) / 2 <= left ? left : cropper.cutX + cropper.canvasWidth - (imgWidth * scale) / 2
+  top = cropper.cutY + (imgHeight * scale) / 2 >= top ? top : cropper.cutY + (imgHeight * scale) / 2
+  top = cropper.cutY + cropper.canvasHeight - (imgHeight * scale) / 2 <= top ? top : cropper.cutY + cropper.canvasHeight - (imgHeight * scale) / 2
+  
+  cropper.imgLeft = left
+  cropper.imgTop = top
+  cropper.scale = scale
+  if (!delay || delay === 'null') {
+    imgTransform(ownerInstance)
+  }
+}
+
+// 改变截取值大小
+function computeCutSize(ownerInstance) {
+  if (cropper.canvasWidth > cropper.windowWidth) {
+    cropper.canvasWidth = cropper.windowWidth
+  } else if (cropper.canvasWidth + cropper.cutX > cropper.windowWidth) {
+    cropper.cutX = cropper.windowWidth - cropper.cutX
+  }
+  if (cropper.canvasHeight > cropper.windowHeight) {
+    cropper.canvasHeight = cropper.windowHeight
+  } else if (cropper.canvasHeight + cropper.cutY > cropper.windowHeight) {
+    cropper.cutY = cropper.windowHeight - cropper.cutY
+  }
+}
+
+// 图片动画
+function imgTransform(ownerInstance) {
+  try {
+    var image = ownerInstance.selectComponent('.tn-cropper__image')
+    if (!image) return
+    var x = cropper.imgLeft - cropper.imgWidth / 2,
+      y = cropper.imgTop - cropper.imgHeight / 2;
+    image.setStyle({
+      'transform': 'translate3d('+ x + 'px,' + y + 'px,0) scale(' + cropper.scale +') rotate(' + cropper.angle + 'deg)'
+    })
+  } catch(e) {
+    
+  }
+}
+
+// 图片重置
+function imageReset(ownerInstance) {
+  cropper.scale = 1
+  cropper.angle = 0
+  imgTransform(ownerInstance)
+}
+
+// 高度变化
+function canvasHeight(ownerInstance) {
+  if (!ownerInstance) return
+  computeCutSize(ownerInstance)
+}
+
+// 宽度变化
+function canvasWidth(ownerInstance) {
+  if (!ownerInstance) return
+  computeCutSize(ownerInstance)
+}
+
+// 更新数据
+function updateData(ownerInstance) {
+  if (!ownerInstance) return
+  ownerInstance.callMethod('change', {
+    cutX: cropper.cutX,
+    cutY: cropper.cutY,
+    imgWidth: cropper.imgWidth,
+    imgHeight: cropper.imgHeight,
+    scale: cropper.scale,
+    angle: cropper.angle,
+    imgTop: cropper.imgTop,
+    imgLeft: cropper.imgLeft
+  })
+}
+
+module.exports = {
+  touchStart: touchStart,
+  touchMove: touchMove,
+  touchEnd: touchEnd,
+  propChange: propChange
+}
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-cropper/tn-cropper.vue b/tuniao-ui/components/tn-cropper/tn-cropper.vue
new file mode 100644
index 0000000..6d22d6f
--- /dev/null
+++ b/tuniao-ui/components/tn-cropper/tn-cropper.vue
@@ -0,0 +1,574 @@
+<template>
+  <view class="tn-cropper-class tn-cropper" @touchmove.stop.prevent="stop">
+    <image
+      v-if="imageUrl"
+      :src="imageUrl"
+      class="tn-cropper__image"
+      :style="{
+        width: (imgWidth ? imgWidth : width) + 'px',
+        height: (imgHeight ? imgHeight : height) + 'px',
+        transitionDuration: (animation ? 0.3 : 0) + 's'
+      }"
+      mode="widthFix"
+      :data-minScale="minScale"
+      :data-maxScale="maxScale"
+      @load="imageLoad"
+      @error="imageLoad"
+      @touchstart="wxs.touchStart"
+      @touchmove="wxs.touchMove"
+      @touchend="wxs.touchEnd"
+    ></image>
+    
+    <view
+      class="tn-cropper__wrapper"
+      :style="{
+        width: width + 'px',
+        height: height + 'px',
+        borderRadius: isRound ? '50%' : '0'
+      }"
+    >
+      <view
+        class="tn-cropper__border"
+        :style="{
+          border: borderStyle,
+          borderRadius: isRound ? '50%' : '0',
+        }"
+        :prop="prop"
+        :change:prop="wxs.propChange"
+        :data-width="width"
+        :data-height="height"
+        :data-windowHeight="systemInfo.windowHeight || 600"
+        :data-windowWidth="systemInfo.windowWidth || 400"
+        :data-imgTop="imgTop"
+        :data-imgWidth="imgWidth"
+        :data-imgHeight="imgHeight"
+        :data-angle="angle"
+      ></view>
+    </view>
+    
+    <canvas
+      class="tn-cropper__canvas"
+      :style="{
+        width: width * scaleRatio + 'px',
+        height: height * scaleRatio + 'px'
+      }"
+      :canvas-id="CANVAS_ID"
+      :id="CANVAS_ID"
+      :disable-scroll="true"
+    ></canvas>
+    
+    <view
+      v-if="!custom"
+      class="tn-cropper__tabbar"
+    >
+      <view class="tn-cropper__tabbar__btn tn-cropper__tabber__cancel" @tap.stop="back">取消</view>
+      <view class="tn-cropper__tabbar__rotate" :class="[`tn-icon-${rotateIcon}`]" @tap.stop="setAngle"></view>
+      <view class="tn-cropper__tabbar__btn tn-cropper__tabber__confirm" @tap.stop="getCutImage">完成</view>
+    </view>
+  </view>
+</template>
+
+<script src="./index.wxs" lang="wxs" module="wxs"></script>
+<script>
+  export default {
+    name: 'tn-cropper',
+    props: {
+      // 图片路径
+      imageUrl: {
+        type: String,
+        default: ''
+      },
+      // 裁剪框高度 px
+      height: {
+        type: Number,
+        default: 280
+      },
+      // 裁剪框的宽度 px
+      width: {
+        type: Number,
+        default: 280
+      },
+      // 是否为圆形裁剪框
+      isRound: {
+        type: Boolean,
+        default: false
+      },
+      // 裁剪框边框样式
+      borderStyle: {
+        type: String,
+        default: '1rpx solid #FFF'
+      },
+      // 生成的图片尺寸相对于裁剪框的比例
+      scaleRatio: {
+        type: Number,
+        default: 1
+      },
+      // 裁剪后的图片质量
+      // 取值范围为：(0, 1]
+      quality: {
+        type: Number,
+        default: 0.8
+      },
+      // 是否返回base64(H5默认为base64)
+      returnBase64: {
+        type: Boolean,
+        default: false
+      },
+      // 图片旋转角度
+      rotateAngle: {
+        type: Number,
+        default: 0
+      },
+      // 图片最小缩放比
+      minScale: {
+        type: Number,
+        default: 0.5
+      },
+      // 图片最大缩放比
+      maxScale: {
+        type: Number,
+        default: 2
+      },
+      // 自定义操作栏(设置后会隐藏默认的底部操作栏)
+      custom: {
+        type: Boolean,
+        default: false
+      },
+      // 是否在值发生改变的时候开始裁剪
+      // custom为true时生效
+      startCutting: {
+        type: Boolean,
+        default: false
+      },
+      // 裁剪时是否显示loading
+      loading: {
+        type: Boolean,
+        default: true
+      },
+      // 旋转图片图标
+      rotateIcon: {
+        type: String,
+        default: 'circle-arrow'
+      }
+    },
+    data() {
+      return {
+        // canvas容器id
+        CANVAS_ID: 'tn-cropper-canvas',
+        // 移动裁剪超时时间定时器
+        TIME_CUT_CENTER: null,
+        // canvas容器
+        ctx: null,
+        // 画布x轴起点
+        cutX: 0,
+        // 画布y轴起点
+        cutY: 0,
+        // 图片宽度
+        imgWidth: 0,
+        // 图片高度
+        imgHeight: 0,
+        // 图片底部位置
+        imgTop: 0,
+        // 图片左边位置
+        imgLeft: 0,
+        // 图片缩放比
+        scale: 1,
+        // 图片旋转角度
+        angle: 0,
+        // 开启动画过渡效果
+        animation: false,
+        // 动画定时器
+        animationTime: null,
+        // 系统信息
+        systemInfo: {},
+        // 传递的参数
+        prop: '',
+        // 标记是否发生改变
+        sizeChange: 0,
+        angleChange: 0,
+        resetChange: 0,
+        centerChange: 0
+      }
+    },
+    watch: {
+      imageUrl(val) {
+        this.imageReset()
+        this.showLoading()
+        uni.getImageInfo({
+          src: val,
+          success: (res) => {
+            // 计算图片尺寸
+            this.imgComputeSize(res.width, res.height)
+            this.angleChange++
+            this.prop = `3,${this.angleChange}`
+          },
+          fail: (err) => {
+            console.log(err);
+            this.imgComputeSize()
+            this.angleChange++
+            this.prop = `3,${this.angleChange}`
+          }
+        })
+      },
+      isRound(val) {
+        if (val) {
+          this.$nextTick(() => {
+            this.imageReset()
+          })
+        }
+      },
+      rotateAngle(val) {
+        this.animation = true
+        this.angle = val
+        this.angleChanged(val)
+      },
+      animation(val) {
+        clearTimeout(this.animationTime)
+        if (val) {
+          this.animationTime = setTimeout(() => {
+            this.animation = false
+          }, 200)
+        }
+      },
+      startCutting(val) {
+        if (this.custom && val) {
+          this.getCutImage()
+        }
+      }
+    },
+    mounted() {
+      this.systemInfo = uni.getSystemInfoSync()
+      this.imgTop = this.systemInfo.windowHeight / 2
+      this.imgLeft = this.systemInfo.windowWidth / 2
+      this.ctx = uni.createCanvasContext(this.CANVAS_ID, this)
+      // 初始化
+      this.$nextTick(() => {
+        this.prop = '1,1'
+      })
+      setTimeout(() => {
+        this.$emit('ready', {})
+      }, 200)
+    },
+    methods: {
+      // 将网络图片转换为本地图片【同步执行】
+      async getLocalImage(url) {
+        return await new Promise((resolve, reject) => {
+          uni.downloadFile({
+            url: url,
+            success: (res) => {
+              resolve(res.tempFilePath)
+            },
+            fail: (err) => {
+              reject(false)
+            }
+          })
+        })
+      },
+      // 返回裁剪后的图片信息
+      getCutImage() {
+        if (!this.imageUrl) {
+          uni.showToast({
+            title: '请选择图片',
+            icon: 'none'
+          })
+          return
+        }
+        this.loading && this.showLoading()
+        const draw = async () => {
+          // 图片实际大小
+          let imgWidth = this.imgWidth * this.scale * this.scaleRatio
+          let imgHeight = this.imgHeight * this.scale * this.scaleRatio
+          // canvas和图片的相对距离
+          let xpos = this.imgLeft - this.cutX
+          let ypos = this.imgTop - this.cutY
+          
+          
+          let imgUrl = this.imageUrl
+          // #ifdef APP-PLUS || MP-WEIXIN
+          if (~this.imageUrl.indexOf('https:')) {
+            imgUrl = await this.getLocalImage(this.imageUrl)
+          }
+          // #endif
+          // 旋转画布
+          this.ctx.translate(xpos * this.scaleRatio, ypos * this.scaleRatio)
+          // 如果时圆形则截取圆形
+          if (this.isRound) {
+            const r = this.width > this.height ? Math.floor(this.height / 2) : Math.floor(this.width / 2)
+            let translateX = Math.floor(this.width / 2)
+            let translateY = Math.floor(this.height / 2)
+            this.ctx.beginPath()
+            this.ctx.arc(translateX - (xpos * this.scaleRatio), translateY - (ypos * this.scaleRatio), r, 0, (360 * Math.PI) / 180)
+            this.ctx.closePath()
+            this.ctx.stroke()
+            this.ctx.clip()
+          }
+          
+          this.ctx.rotate((this.angle * Math.PI) / 180)
+          this.ctx.drawImage(imgUrl, -imgWidth / 2, -imgHeight / 2, imgWidth, imgHeight)
+          
+          // 清空后再继续绘制
+          this.ctx.draw(false, () => {
+            let params = {
+              width: this.width * this.scaleRatio,
+              height: Math.round(this.height * this.scaleRatio),
+              destWidth: this.width * this.scaleRatio,
+              destHeight: Math.round(this.height) * this.scaleRatio,
+              fileType: 'png',
+              quality: this.quality
+            }
+            let data = {
+              url: '',
+              base64: '',
+              width: this.width * this.scaleRatio,
+              height: this.height * this.scaleRatio
+            }
+            
+            // #ifdef MP-ALIPAY
+            if (this.returnBase64) {
+              this.ctx.toDataURL(params).then((urlData) => {
+                data.base64 = urlData
+                this.loading && uni.hideLoading()
+                this.$emit('cropper', data)
+              })
+            } else {
+              this.ctx.toTempFilePath({
+                ...params,
+                success: (res) => {
+                  data.url = res.apFilePath
+                  this.loading && uni.hideLoading()
+                  this.$emit('cropper', data)
+                }
+              })
+            }
+            // #endif
+            
+            let base64Flag = this.returnBase64
+            // #ifndef MP-ALIPAY
+            // #ifdef MP-BAIDU || MP-TOUTIAO || H5
+            base64Flag = false
+            // #endif
+            
+            if (base64Flag) {
+              uni.canvasGetImageData({
+                canvasId: this.CANVAS_ID,
+                x: 0,
+                y: 0,
+                width: this.width * this.scaleRatio,
+                height: Math.round(this.height * this.scaleRatio),
+                success: (res) => {
+                  const arrayBuffer = new Uint8Array(res.data)
+                  const base64 = uni.arrayBufferToBase64(arrayBuffer)
+                  data.base64 = base64
+                  this.loading && uni.hideLoading()
+                  this.$emit('cropper', data)
+                }
+              }, this)
+            } else {
+              uni.canvasToTempFilePath({
+                ...params,
+                canvasId: this.CANVAS_ID,
+                success: (res) => {
+                  data.url = res.tempFilePath
+                  // #ifdef H5
+                  data.base64 = res.tempFilePath
+                  // #endif
+                  this.loading && uni.hideLoading()
+                  this.$emit('cropper', data)
+                }
+              }, this)
+            }
+            // #endif
+          })
+        }
+        draw()
+      },
+      // 修改图片后触发的函数
+      change(e) {
+        this.cutX = e.cutX || 0
+        this.cutY = e.cutY || 0
+        this.imgWidth = e.imgWidth || this.imgWidth
+        this.imgHeight = e.imgHeight || this.imgHeight
+        this.scale = e.scale || 1
+        this.angle = e.angle || 0
+        this.imgTop = e.imgTop || 0
+        this.imgLeft = e.imgLeft || 0
+      },
+      // 重置图片
+      imageReset() {
+        this.scale = 1
+        this.angle = 0
+        let systemInfo = this.systemInfo.windowHeight ? this.systemInfo : uni.getSystemInfoSync()
+        this.imgTop = systemInfo.windowHeight / 2
+        this.imgLeft = systemInfo.windowWidth / 2
+        this.resetChange++
+        this.prop = `4,${this.resetChange}`
+        // 初始旋转角度
+        this.$emit('initAngle', {})
+      },
+      // 图片的生成的尺寸
+      imgComputeSize(width, height) {
+        // 默认按图片的最小边 = 对应的裁剪框尺寸
+        let imgWidth = width,
+          imgHeight = height;
+        if (imgWidth && imgHeight) {
+          if (imgWidth / imgHeight > this.width / this.height) {
+            imgHeight = this.height
+            imgWidth = (width / height) * imgHeight
+          } else {
+            imgWidth = this.width
+            imgHeight = (height / width) * imgWidth
+          }
+        } else {
+          let systemInfo = this.systemInfo.windowHeight ? this.systemInfo : uni.getSystemInfoSync()
+          imgWidth = systemInfo.windowWidth
+          imgHeight = 0
+        }
+        this.imgWidth = imgWidth
+        this.imgHeight = imgHeight
+        this.sizeChange++
+        this.prop = `2,${this.sizeChange}`
+      },
+      // 图片加载完毕
+      imageLoad(e) {
+        this.imageReset()
+        uni.hideLoading()
+        this.$emit('imageLoad', {})
+      },
+      // 移动结束
+      moveStop() {
+        clearTimeout(this.TIME_CUT_CENTER)
+        this.TIME_CUT_CENTER = setTimeout(() => {
+          this.centerChange++
+          this.prop = `5,${this.centerChange}`
+        }, 688)
+      },
+      // 移动中
+      moveDuring() {
+        clearTimeout(this.TIME_CUT_CENTER)
+      },
+      // 显示加载框
+      showLoading() {
+        uni.showLoading({
+          title: '请稍等......',
+          mask: true
+        })
+      },
+      // 停止
+      stop() {},
+      // 取消/返回
+      back() {
+        uni.navigateBack()
+      },
+      // 角度改变
+      angleChanged(val) {
+        this.moveStop()
+        if (val % 90) {
+          this.angle = Math.round(val / 90) * 90
+        }
+        this.angleChange++
+        this.prop = `3,${this.angleChange}`
+      },
+      // 设置角度
+      setAngle() {
+        this.animation = true
+        this.angle = this.angle + 90
+        this.angleChanged(this.angle)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-cropper {
+    width: 100vw;
+    height: 100vh;
+    background-color: rgba(0, 0, 0, 0.7);
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 1;
+    
+    &__image {
+      width: 100%;
+      border-style: none;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 2;
+      -webkit-backface-visibility: hidden;
+      backface-visibility: hidden;
+      transform-origin: center;
+    }
+    
+    &__canvas {
+      position: fixed;
+      z-index: 10;
+      left: -2000px;
+      top: -2000px;
+      pointer-events: none;
+    }
+    
+    &__wrapper {
+      position: fixed;
+      z-index: 4;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+      border: 3000px solid rgba(0, 0, 0, 0.55);
+      pointer-events: none;
+      box-sizing: content-box;
+    }
+    
+    &__border {
+      position: absolute;
+      left: 0;
+      top: 0;
+      width: 100%;
+      height: 100%;
+      box-sizing: border-box;
+      pointer-events: none;
+    }
+    
+    &__tabbar {
+      width: 100%;
+      height: 120rpx;
+      padding: 0 40rpx;
+      box-sizing: border-box;
+      position: fixed;
+      left: 0;
+      bottom: 0;
+      z-index: 99;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      color: #FFFFFF;
+      font-size: 32rpx;
+      
+      &::after {
+        content: '';
+        position: absolute;
+        top: 0;
+        right: 0;
+        left: 0;
+        border-top: 1rpx solid rgba(255, 255, 255, 0.2);
+        -webkit-transform: scaleY(0.5) translateZ(0);
+        transform: scaleY(0.5) translateZ(0);
+        transform-origin: 0 100%;
+      }
+      
+      &__btn {
+        height: 80rpx;
+        display: flex;
+        align-items: center;
+      }
+      
+      &__rotate {
+        width: 44rpx;
+        height: 44rpx;
+        font-size: 40rpx;
+        text-align: center;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-custom-swiper-item/index.wxs b/tuniao-ui/components/tn-custom-swiper-item/index.wxs
new file mode 100644
index 0000000..a6c12b7
--- /dev/null
+++ b/tuniao-ui/components/tn-custom-swiper-item/index.wxs
@@ -0,0 +1,288 @@
+
+function setTimeout(instance, cb, time) {
+  if (time > 0) {
+    var s = getDate().getTime()
+    var fn = function () {
+        if (getDate().getTime() - s > time) {
+            cb && cb()
+        } else
+            instance.requestAnimationFrame(fn)
+    }
+    fn()
+  }
+  else
+    cb && cb()
+}
+
+// 判断触摸的移动方向
+function decideSwiperDirection(startTouches, currentTouches, vertical) {
+  // 震动偏移容差
+  var toleranceShake = 150
+  // 移动容差
+  var toleranceTranslate = 10
+  
+  if (!vertical) {
+    // 水平方向移动
+    if (Math.abs(currentTouches.y - startTouches.y) <= toleranceShake) {
+      // console.log(currentTouches.x, startTouches.x);
+      if (Math.abs(currentTouches.x - startTouches.x) > toleranceTranslate) {
+        if (currentTouches.x - startTouches.x > 0) {
+          return 'right'
+        } else if (currentTouches.x - startTouches.x < 0) {
+          return 'left'
+        }
+      }
+    }
+  } else {
+    // 垂直方向移动
+    if (Math.abs(currentTouches.x - startTouches.x) <= toleranceShake) {
+      // console.log(currentTouches.x, startTouches.x);
+      if (Math.abs(currentTouches.y - startTouches.y) > toleranceTranslate) {
+        if (currentTouches.y - startTouches.y > 0) {
+          return 'down'
+        } else if (currentTouches.y - startTouches.y < 0) {
+          return 'up'
+        }
+      }
+    }
+  }
+  return ''
+}
+
+// swiperItem参数数据更新
+var itemDataObserver = function(newVal, oldVal, ownerInstance, instance) {
+  if (!newVal || newVal === 'undefined') return
+  var state = ownerInstance.getState()
+  state.itemData = newVal
+}
+
+// swiperIndex数据更新
+var currentIndexObserver = function(newVal, oldVal, ownerInstance, instance) {
+  if ((!newVal && newVal != 0) || newVal === 'undefined') return
+  var state = ownerInstance.getState()
+  state.currentIndex = newVal
+}
+
+// containerData数据更新
+var containerDataObserver = function(newVal, oldVal, ownerInstance, instance) {
+  if (!newVal || newVal === 'undefined') return
+  var state = ownerInstance.getState()
+  state.containerData = newVal
+}
+
+// 开始触摸
+var touchStart = function(event, ownerInstance) {
+  console.log('touchStart');
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  var itemData = state.itemData
+  var containerData = state.containerData
+  
+  // 由于当前SwiperIndex初始为0，可能会导致swiperIndex数据没有更新
+  if (!state.currentIndex || state.currentIndex === 'undefined') {
+    state.currentIndex = 0
+  }
+  
+  if (!containerData || containerData.circular === 'undefined') {
+    containerData.circular = false
+  }
+  state.containerData = containerData
+  
+  // 如果当前切换动画还没执行结束，再次触摸会重新加载对应的swiperContainer的信息
+  // console.log(containerData.animationFinish);
+  if (!containerData.animationFinish) {
+    ownerInstance.callMethod('changeParentSwiperContainerStyleStatus',{
+      status: 'reload'
+    })
+  }
+
+  // 判断是否为为当前显示的SwiperItem
+  if (itemData.index != state.currentIndex) return
+  
+  var touches = event.changedTouches[0]
+  if (!touches) return
+  
+  // 标记滑动开始时间
+  state.touchStartTime = getDate().getTime()
+  
+  // 记录当前滑动开始的x，y坐标
+  state.touchRelactive = {
+    x: touches.pageX,
+    y: touches.pageY
+  }
+  // 记录触摸id，用于处理多指的情况
+  state.touchId = touches.identifier
+  
+  // 标记开始触摸
+  state.touching = true
+  ownerInstance.callMethod('updateTouchingStatus', {
+    status: true
+  })
+}
+
+// 正在移动
+var touchMove = function(event, ownerInstance) {
+  console.log('touchMove');
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  var itemData = state.itemData
+  var containerData = state.containerData
+  
+  // 判断是否为为当前显示的SwiperItem
+  if (itemData.index != state.currentIndex) return
+  
+  // 判断是否开始触摸
+  if (!state.touching) return
+  
+  var touches = event.changedTouches[0]
+  if (!touches) return
+  // 判断是否为同一个触摸点
+  if (state.touchId != touches.identifier) return
+  
+  var currentTouchRelactive = {
+    x: touches.pageX,
+    y: touches.pageY
+  }
+  
+  // 计算相对位移比例
+  if (containerData.vertical) {
+    var touchDistance = currentTouchRelactive.y - state.touchRelactive.y
+    var itemHeight = itemData.itemHeight
+    var distanceRate = touchDistance / itemHeight
+    // console.log(currentTouchRelactive.y, touchDistance, itemHeight, distanceRate);
+    
+    // 判断是否为衔接轮播，如果不是衔接轮播，如果当前为第一个swiperItem并且向下滑、当前为最后一个swiperItem并且向上滑时不进行操作
+    if (!containerData.circular &&
+      ((state.currentIndex === 0 && touchDistance > 0) || (state.currentIndex === containerData.swiperItemLength - 1 && touchDistance < 0))
+    ) {
+      return
+    }
+    
+    // 如果超出了距离则不进行操作
+    if((Math.abs(touchDistance) > (itemData.itemTop + itemData.itemHeight))) {
+      ownerInstance.callMethod('updateParentSwiperContainerStyle', {
+        value: distanceRate < 0 ? -1 : 1
+      })
+      return
+    }
+  } else {
+    var touchDistance = currentTouchRelactive.x - state.touchRelactive.x
+    var itemWidth = itemData.itemWidth
+    var distanceRate = touchDistance / itemWidth
+    // console.log(currentTouchRelactive.x, touchDistance, itemWidth, distanceRate);
+    
+    // 判断是否为衔接轮播，如果不是衔接轮播，如果当前为第一个swiperItem并且向右滑、当前为最后一个swiperItem并且向左滑时不进行操作
+    if (!containerData.circular &&
+      ((state.currentIndex === 0 && touchDistance > 0) || (state.currentIndex === containerData.swiperItemLength - 1 && touchDistance < 0))
+    ) {
+      return
+    }
+    
+    // 如果超出了距离则不进行操作
+    if((Math.abs(touchDistance) > (itemData.itemLeft + itemData.itemWidth))) {
+      ownerInstance.callMethod('updateParentSwiperContainerStyle', {
+        value: distanceRate < 0 ? -1 : 1
+      })
+      return
+    }
+  }
+  
+  ownerInstance.callMethod('updateParentSwiperContainerStyle', {
+    value: distanceRate
+  })
+}
+
+// 移动结束
+var touchEnd = function(event, ownerInstance) {
+  console.log('touchEnd');
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  var itemData = state.itemData
+  var containerData = state.containerData
+  
+  // 判断是否为为当前显示的SwiperItem
+  if (itemData.index != state.currentIndex) return
+  
+  // 判断是否开始触摸
+  if (!state.touching) return
+  
+  var touches = event.changedTouches[0]
+  if (!touches) return
+  // 判断是否为同一个触摸点
+  if (state.touchId != touches.identifier) return
+  
+  
+  var currentTime = getDate().getTime()
+  var currentTouchRelactive = {
+    x: touches.pageX,
+    y: touches.pageY
+  }
+  
+  if (containerData.vertical) {
+    // 判断触摸移动方向
+    var direction = decideSwiperDirection(state.touchRelactive, currentTouchRelactive, true)
+    // 判断是否为衔接轮播，如果不是衔接轮播，如果当前为第一个swiperItem并且向下滑、当前为最后一个swiperItem并且向上滑时不进行操作
+    if (containerData.circular ||
+      !((state.currentIndex === 0 && direction === 'down') || (state.currentIndex === containerData.swiperItemLength - 1 && direction === 'up'))
+    ) {
+      // 判断触摸的时间和移动的距离是否超过了当前itemHeight的一半，如果是则执行切换操作
+      // console.log(currentTime - state.touchStartTime, Math.abs(currentTouchRelactive.y - state.touchRelactive.y));
+      if ((currentTime - state.touchStartTime) > 200 && Math.abs(currentTouchRelactive.y - state.touchRelactive.y) < itemData.itemHeight / 2) {
+        ownerInstance.callMethod('changeParentSwiperContainerStyleStatus',{
+          status: 'reset'
+        })
+      } else {
+        // console.log(direction, state.touchRelactive.y, currentTouchRelactive.y);
+        
+        ownerInstance.callMethod('updateParentSwiperContainerStyleWithDirection', {
+          direction: direction
+        })
+      }
+    }
+  } else {
+    // 判断触摸移动方向
+    var direction = decideSwiperDirection(state.touchRelactive, currentTouchRelactive, false)
+    // 判断是否为衔接轮播，如果不是衔接轮播，如果当前为第一个swiperItem并且向右滑、当前为最后一个swiperItem并且向左滑时不进行操作
+    if (containerData.circular ||
+      !((state.currentIndex === 0 && direction === 'right') || (state.currentIndex === containerData.swiperItemLength - 1 && direction === 'left'))
+    ) {
+      // 判断触摸的时间和移动的距离是否超过了当前itemWidth的一半，如果是则执行切换操作
+      // console.log(currentTime - state.touchStartTime, Math.abs(currentTouchRelactive.x - state.touchRelactive.x));
+      if ((currentTime - state.touchStartTime) > 200 && Math.abs(currentTouchRelactive.x - state.touchRelactive.x) < itemData.itemWidth / 2) {
+        ownerInstance.callMethod('changeParentSwiperContainerStyleStatus',{
+          status: 'reset'
+        })
+      } else {
+        // console.log(direction, state.touchRelactive.x, currentTouchRelactive.x);
+        
+        ownerInstance.callMethod('updateParentSwiperContainerStyleWithDirection', {
+          direction: direction
+        })
+      }
+    }
+  }
+  
+  // 清除标记
+  state.touchId = null
+  state.touchRelactive = null
+  state.touchStartTime = 0
+  
+  
+  // 标记停止触摸
+  state.touching = true
+  ownerInstance.callMethod('updateTouchingStatus', {
+    status: false
+  })
+}
+
+module.exports = {
+  itemDataObserver: itemDataObserver,
+  currentIndexObserver: currentIndexObserver,
+  containerDataObserver: containerDataObserver,
+  touchStart: touchStart,
+  touchMove: touchMove,
+  touchEnd: touchEnd
+}
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-custom-swiper-item/tn-custom-swiper-item.vue b/tuniao-ui/components/tn-custom-swiper-item/tn-custom-swiper-item.vue
new file mode 100644
index 0000000..5fd3c5b
--- /dev/null
+++ b/tuniao-ui/components/tn-custom-swiper-item/tn-custom-swiper-item.vue
@@ -0,0 +1,277 @@
+<template>
+  <!-- #ifdef MP-WEIXIN -->
+  <view
+    class="tn-c-swiper-item"
+    :style="[swiperStyle]"
+    :itemData="itemData"
+    :currentIndex="currentIndex"
+    :containerData="containerData"
+    :change:itemData="wxs.itemDataObserver"
+    :change:currentIndex="wxs.currentIndexObserver"
+    :change:containerData="wxs.containerDataObserver"
+    @touchstart="wxs.touchStart"
+    :catch:touchmove="touching?wxs.touchMove:''"
+    :catch:touchend="touching?wxs.touchEnd:''"
+  >
+    <view class="item__container tn-c-swiper-item__container" :style="[containerStyle]">
+      <slot></slot>
+    </view>
+  </view>
+  <!-- #endif -->
+  <!-- #ifndef MP-WEIXIN -->
+  <view
+    class="tn-c-swiper-item"
+    :style="[swiperStyle]"
+    :itemData="itemData"
+    :currentIndex="currentIndex"
+    :containerData="containerData"
+    :change:itemData="wxs.itemDataObserver"
+    :change:currentIndex="wxs.currentIndexObserver"
+    :change:containerData="wxs.containerDataObserver"
+    @touchstart="wxs.touchStart"
+    @touchmove="wxs.touchMove"
+    @touchend="wxs.touchEnd"
+  >
+    <view class="item__container tn-c-swiper-item__container" :style="[containerStyle]">
+      <slot></slot>
+    </view>
+  </view>
+  <!-- #endif -->
+</template>
+
+<script src="./index.wxs" lang="wxs" module="wxs"></script>
+<script>
+  export default {
+    name: 'tn-custom-swiper-item',
+    props: {
+      
+    },
+    computed: {
+      // swiperItem公共数据
+      itemData() {
+        return {
+          index: this.index,
+          itemWidth: this.itemWidth,
+          itemHeight: this.itemHeight,
+          itemTop: this.itemTop,
+          itemLeft: this.itemLeft
+        }
+      },
+      currentIndex() {
+        return this.parentData.currentIndex
+      },
+      containerData() {
+        return {
+          duration: this.parentData.duration,
+          animationFinish: this.parentData.swiperContainerAnimationFinish,
+          circular: this.parentData.circular,
+          swiperItemLength: this.swiperItemLength,
+          vertical: this.parentData.vertical
+        }
+      },
+      swiperStyle() {
+        let style = {}
+        style.transform = `translate3d(${this.translateX}%, ${this.translateY}%, 0px)`
+        return style
+      },
+      containerStyle() {
+        let style = {}
+        if (this.parentData.customSwiperStyle && Object.keys(this.parentData.customSwiperStyle).length > 0) {
+          style = this.parentData.customSwiperStyle
+        }
+        if ((this.currentIndex === 0 && this.index === this.swiperItemLength - 1) || (this.index === this.currentIndex - 1) && 
+          (this.parentData.prevSwiperStyle && Object.keys(this.parentData.prevSwiperStyle).length > 0)
+        ) {
+          // 前一个swiperItem
+          const copyStyle = JSON.parse(JSON.stringify(style))
+          style = Object.assign(copyStyle, this.parentData.prevSwiperStyle)
+        } 
+        if ((this.currentIndex === this.swiperItemLength - 1 && this.index === 0) || (this.index === this.currentIndex + 1) &&
+          (this.parentData.nextSwiperStyle && Object.keys(this.parentData.nextSwiperStyle).length > 0)
+        ) {
+          // 后一个swiperItem
+          const copyStyle = JSON.parse(JSON.stringify(style))
+          style = Object.assign(copyStyle, this.parentData.nextSwiperStyle)
+        }
+        return style
+      }
+    },
+    data() {
+      return {
+        // 父组件参数
+        parentData: {
+          duration: 500,
+          currentIndex: 0,
+          swiperContainerAnimationFinish: false,
+          circular: false,
+          vertical: false,
+          prevSwiperStyle: {},
+          customSwiperStyle: {},
+          nextSwiperStyle: {}
+        },
+        // 标记当前是否正在触摸
+        touching: true,
+        // 当前swiperItem的偏移位置
+        translateX: 0,
+        translateY: 0,
+        // 当前swiperItem的宽高
+        itemWidth: 0,
+        itemHeight: 0,
+        // 当前swiperItem的位置信息
+        itemTop: 0,
+        itemLeft: 0,
+        // 当前swiperItem的状态 prev current next
+        status: 'current',
+        // 当前swiperItem的index序号
+        index: 0,
+        // swiperItem的的数量
+        swiperItemLength: 0
+      }
+    },
+    created() {
+      this.parent = false
+      this.updateParentData()
+      // 获取当前父组件children的数量作为当前swiperItem的序号
+      this.index = this.parent.children.length
+      this.parent && this.parent.children.push(this)
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.initSwiperItem()
+      })
+    },
+    methods: {
+      // 初始化swiperItem
+      initSwiperItem() {
+        this.getSwiperItemRect(() => {
+          this.parent.updateAllSwiperItemStyle()
+          this.parentData.swiperContainerAnimationFinish = true
+        })
+      },
+      // 获取swiperItem的信息
+      async getSwiperItemRect(callback) {
+        const swiperItemRes = await this._tGetRect('.tn-c-swiper-item')
+        if (!swiperItemRes.height || !swiperItemRes.width) {
+          setTimeout(() => {
+            this.getSwiperItemRect()
+          }, 30)
+          return
+        }
+        
+        this.itemWidth = swiperItemRes.width
+        this.itemHeight = swiperItemRes.height
+        this.itemTop = swiperItemRes.top
+        this.itemLeft = swiperItemRes.left
+        callback && callback()
+      },
+      // 更新swiperItem样式
+      updateSwiperItemStyle(swiperItemLength, currentIndex = undefined) {
+        currentIndex = currentIndex != undefined ? currentIndex : this.parentData.currentIndex
+        this.swiperItemLength = swiperItemLength
+        // 根据当前swiperItem的序号设置偏移位置
+        // 判断当前swiperItem是否为第一个，如果是则将最后的swiperItem移动到当前的前一个位置（即最前面）
+        if (currentIndex === 0 && this.index === swiperItemLength - 1) {
+          if (this.parentData.vertical) {
+            this.translateX = 0
+            this.translateY = -100
+          } else {
+            this.translateX = -100
+            this.translateY = 0
+          }
+        } 
+        // 判断当前swiperItem是否为最后一个，如果是则将最前的swiperItem移动到当前的后一个位置（即最后面）
+        else if (currentIndex === swiperItemLength - 1 && this.index === 0) {
+          if (this.parentData.vertical) {
+            this.translateX = 0
+            this.translateY = swiperItemLength * 100
+          } else {
+            this.translateX = swiperItemLength * 100
+            this.translateY = 0
+          }
+        }
+        // 正常情况
+        else {
+          if (this.parentData.vertical) {
+            this.translateX = 0
+            this.translateY = this.index * 100
+          } else {
+            this.translateX = this.index * 100
+            this.translateY = 0
+          }
+        }
+      },
+      // 更新父组件的偏移位置信息
+      updateParentSwiperContainerStyle(e) {
+        this.parent.updateSwiperContainerStyleWithValue(e.value)
+      },
+      // 根据方向更新父组件的偏移位置信息
+      updateParentSwiperContainerStyleWithDirection(e) {
+        this.parent.updateSwiperContainerStyleWithDirection(e.direction)
+      },
+      // 修改父组件的偏移位置的状态
+      changeParentSwiperContainerStyleStatus(e) {
+        // reset -> 重置 reload -> 重载
+        this.parent.updateSwiperContainerStyleWithDirection(e.status)
+      },
+      // 更新父组件信息
+      updateParentData() {
+        this.getParentData('tn-custom-swiper')
+      },
+      // 更新触摸状态
+      updateTouchingStatus(e) {
+        this.touching = e.status
+        if (e.status) {
+          this.parent.stopAutoPlay()
+        } else {
+          this.parent.startAutoPlay()
+        }
+      },
+      // 提取对应用户自定义样式
+      extractCustomStyle(customStyle) {
+        let data = {
+          transform: {},
+          style: {}
+        }
+        if (!customStyle) return data
+        // 允许设置的transform参数
+        const allowTransformProps = ['scale','scaleX','scaleY','scaleZ','rotate','rotateX','rotateY','rotateZ']
+        for (let prop in customStyle) {
+          if (prop.startsWith('transformProp')) {
+            // transform里面的样式
+            let transformProp = prop.substring('transformProp'.length)
+            const index = allowTransformProps.findIndex((item) => {
+              return item.toLowerCase() === transformProp.toLowerCase()
+            })
+            if (index !== -1) {
+              transformProp = allowTransformProps[index]
+              data.transform[transformProp] = customStyle[prop]
+            }
+          } else {
+            // 普通样式
+            data.style[prop] = customStyle[prop]
+          }
+        }
+        return data
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-c-swiper-item {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    display: block;
+    will-change: transform;
+    cursor: none;
+    transform: translate3d(0px, 0px, 0px);
+    
+    .item__container {
+      width: 100%;
+      height: 100%;
+      display: block;
+      position: absolute;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-custom-swiper/tn-custom-swiper.vue b/tuniao-ui/components/tn-custom-swiper/tn-custom-swiper.vue
new file mode 100644
index 0000000..2094fe6
--- /dev/null
+++ b/tuniao-ui/components/tn-custom-swiper/tn-custom-swiper.vue
@@ -0,0 +1,535 @@
+<template>
+  <view
+    class="tn-c-swiper-class tn-c-swiper"
+  >
+    <!-- 轮播item容器-->
+    <view class="tn-swiper__container" :style="[swiperContainerStyle]" :animation="containerAnimation">
+      <slot></slot>
+    </view>
+    
+    <!-- 轮播指示器-->
+    <view v-if="indicator" class="tn-swiper__indicator" :class="[`tn-swiper__indicator--${vertical ? 'vertical' : 'horizontal'}`]" :style="[indicatorStyle]">
+      <!-- 方形 -->
+      <block v-if="indicatorType === 'rect'">
+        <view
+          v-for="(item, index) in children.length"
+          :key="index"
+          class="tn-swiper__indicator__rect"
+          :class="[
+            `tn-swiper__indicator__rect--${vertical ? 'vertical' : 'horizontal'}`, 
+            currentIndex === index ? `tn-swiper__indicator__rect--active tn-swiper__indicator__rect--active--${vertical ? 'vertical' : 'horizontal'}` : ''
+          ]"
+          :style="[indicatorPointStyle(index)]"
+        ></view>
+      </block>
+      <!-- 点 -->
+      <block v-if="indicatorType === 'dot'">
+        <view
+          v-for="(item, index) in children.length"
+          :key="index"
+          class="tn-swiper__indicator__dot"
+          :class="[
+            `tn-swiper__indicator__dot--${vertical ? 'vertical' : 'horizontal'}`,
+            currentIndex === index ? `tn-swiper__indicator__dot--active tn-swiper__indicator__dot--active--${vertical ? 'vertical' : 'horizontal'}` : ''
+          ]"
+          :style="[indicatorPointStyle(index)]"
+        ></view>
+      </block>
+      <!-- 圆角方形 -->
+      <block v-if="indicatorType === 'round'">
+        <view
+          v-for="(item, index) in children.length"
+          :key="index"
+          class="tn-swiper__indicator__round"
+          :class="[
+            `tn-swiper__indicator__round--${vertical ? 'vertical' : 'horizontal'}`,
+            currentIndex === index ? `tn-swiper__indicator__round--active tn-swiper__indicator__round--active--${vertical ? 'vertical' : 'horizontal'}` : ''
+          ]"
+          :style="[indicatorPointStyle(index)]"
+        ></view>
+      </block>
+      <!-- 序号 -->
+      <block v-if="indicatorType === 'number' && !vertical">
+        <view class="tn-swiper__indicator__number">{{ currentIndex + 1 }}/{{ children.length }}</view>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-custom-swiper',
+    props: {
+      // 当前所在的轮播位置
+      current: {
+        type: Number,
+        default: 0
+      },
+      // 自动切换
+      autoplay: {
+        type: Boolean,
+        default: false
+      },
+      // 自动切换时间间隔
+      interval: {
+        type: Number,
+        default: 5000
+      },
+      // 滑动动画时长
+      duration: {
+        type: Number,
+        default: 500
+      },
+      // 是否采用衔接滑动
+      circular: {
+        type: Boolean,
+        default: false
+      },
+      // 滑动方向为纵向
+      vertical: {
+        type: Boolean,
+        default: false
+      },
+      // 显示指示点
+      indicator: {
+        type: Boolean,
+        default: false
+      },
+      // 指示点类型
+      // rect -> 方形 round -> 圆角方形 dot -> 点 number -> 轮播图下标
+      indicatorType: {
+        type: String,
+        default: 'dot'
+      },
+      // 指示点的位置
+      // topLeft \ topCenter \ topRight \ bottomLeft \ bottomCenter \ bottomRight
+      indicatorPosition: {
+        type: String,
+        default: 'bottomCenter'
+      },
+      // 指示点激活时颜色
+      indicatorActiveColor: {
+        type: String,
+        default: ''
+      },
+      // 指示点未激活时颜色
+      indicatorInactiveColor: {
+        type: String,
+        default: ''
+      },
+      // 前一个轮播的自定义样式
+      prevSwiperStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 当前轮播的自定义样式
+      customSwiperStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 后一个轮播的自定义样式
+      nextSwiperStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      }
+    },
+    computed: {
+      parentData() {
+        return [
+          this.duration,
+          this.currentIndex,
+          this.swiperContainerAnimationFinish,
+          this.circular,
+          this.vertical,
+          this.prevSwiperStyle,
+          this.customSwiperStyle,
+          this.nextSwiperStyle
+        ]
+      },
+      indicatorStyle() {
+        let style = {}
+        if (this.vertical) {
+          if (this.indicatorPosition === 'topLeft' || this.indicatorPosition === 'bottomLeft') style.justifyContent = 'flex-start'
+          if (this.indicatorPosition === 'topCenter' || this.indicatorPosition === 'bottomCenter') style.justifyContent =  'center'
+          if (this.indicatorPosition === 'topRight' || this.indicatorPosition === 'bottomRight') style.justifyContent =  'flex-end'
+          if (['topLeft','topCenter','topRight'].indexOf(this.indicatorPosition) >= 0) {
+            if (this.vertical) {
+              style.right = '12rpx'
+              style.left = 'auto'
+            } else {
+              style.top = '12rpx'
+              style.bottom = 'auto'
+            }
+          } else {
+            if (this.vertical) {
+              style.right = 'auto'
+              style.left = '12rpx'
+            } else {
+              style.top = 'auto'
+              style.bottom = '12rpx'
+            }
+          }
+        } else {
+          if (this.indicatorPosition === 'topLeft' || this.indicatorPosition === 'bottomLeft') style.justifyContent = 'flex-start'
+          if (this.indicatorPosition === 'topCenter' || this.indicatorPosition === 'bottomCenter') style.justifyContent =  'center'
+          if (this.indicatorPosition === 'topRight' || this.indicatorPosition === 'bottomRight') style.justifyContent =  'flex-end'
+          if (['topLeft','topCenter','topRight'].indexOf(this.indicatorPosition) >= 0) {
+            style.top = '12rpx'
+            style.bottom = 'auto'
+          } else {
+            style.top = 'auto'
+            style.bottom = '12rpx'
+          }
+        }
+        return style
+      },
+      indicatorPointStyle() {
+        return (index) => {
+          let style = {}
+          if (index === this.currentIndex && this.indicatorActiveColor !== '') {
+            style.backgroundColor = this.indicatorActiveColor
+          } else if (this.indicatorInactiveColor !== '') {
+            style.backgroundColor = this.indicatorInactiveColor
+          }
+          return style
+        }
+      }
+    },
+    watch: {
+      parentData() {
+        if (this.children.length) {
+          this.children.forEach((item) => {
+            // 判断子组件如果有updateParentData方法的话，就就执行(执行的结果是子组件重新从父组件拉取了最新的值)
+            typeof(item.updateParentData) === 'function' && item.updateParentData()
+          })
+        }
+      },
+      current(nVal, oVal) {
+        if (this.currentIndex === nVal) return
+        this.currentIndex = nVal > this.children.length ? this.children.length - 1 : nVal
+        this.swiperContainerAnimationFinish = false
+        // 设置动画过渡时间
+        this.swiperContainerStyle.transitionDuration = `${this.duration + 90}ms`
+        this.updateSwiperContainerItem(oVal)
+      }
+    },
+    data() {
+      return {
+        // 清除动画定时器
+        clearAnimationTimer: null,
+        // 前后衔接执行定时器
+        convergeTimer: null,
+        // 自动轮播Timer
+        autoPlayTimer: null,
+        // 当前选中的轮播
+        currentIndex: this.current,
+        // swiperContainer样式
+        swiperContainerStyle: {
+          transform: 'translate3d(0px, 0px, 0px)',
+          transitionDuration: '0ms'
+        },
+        // swiperContainer动画
+        containerAnimation: {},
+        // 滑动动画结束标记
+        swiperContainerAnimationFinish: false
+      }
+    },
+    created() {
+      this.children = []
+    },
+    mounted() {
+      this.$nextTick(() => {
+        const index = this.currentIndex > this.children.length ? this.children.length - 1 : this.currentIndex
+        this.updateSwiperContainerStyle(index)
+        this.startAutoPlay()
+      })
+    },
+    methods: {
+      // 更新全部swiperItem的样式
+      updateAllSwiperItemStyle() {
+        this.children.forEach((item, index) => {
+          typeof(item.updateSwiperItemStyle) === 'function' && item.updateSwiperItemStyle(this.children.length)
+        })
+        
+      },
+      // 根据swiperIndex更新swiperItemContainer的样式
+      updateSwiperContainerStyle(index) {
+        if (this.vertical) {
+          this.swiperContainerStyle.transform = `translate3d(0px, ${-index * 100}%, 0px)`
+        } else {
+          this.swiperContainerStyle.transform = `translate3d(${-index * 100}%, 0px, 0px)`
+        }
+      },
+      // 根据传递的值更新swiperItemContainer的位置
+      updateSwiperContainerStyleWithValue(value) {
+        if (this.vertical) {
+          this.swiperContainerStyle.transform = `translate3d(0px, ${(-this.currentIndex * 100) + value * 100}%, 0px)`
+        } else {
+          this.swiperContainerStyle.transform = `translate3d(${(-this.currentIndex * 100) + value * 100}%, 0px, 0px)`
+        }
+      },
+      // 根据传递的方向更新swiperItemContainer的位置
+      updateSwiperContainerStyleWithDirection(direction) {
+        const oldCurrent = this.currentIndex
+        const childrenLength = this.children.length
+        const lastSwiperItemIndex = childrenLength - 1
+        this.swiperContainerAnimationFinish = false
+        
+        
+        // 向后切换一个SwiperItem
+        if (direction === 'reset') {
+          // 设置动画过渡时间
+          this.swiperContainerStyle.transitionDuration = `${this.duration}ms`
+          this.updateSwiperContainerStyle(this.currentIndex)
+          this.clearAnimationTimer = setTimeout(() => {
+            this.clearSwiperContainerAnimation()
+          }, this.duration)
+        } else if (direction === 'reload') {
+          this.clearConvergeSwiperItemTimer()
+          this.clearSwiperContainerAnimation()
+          this.updateSwiperItemStyle(0)
+          this.updateSwiperItemStyle(lastSwiperItemIndex)
+        } else {
+          if (direction === 'left' || direction === 'up') {
+            if (oldCurrent === childrenLength - 1 && !this.circular) {
+              this.clearSwiperContainerAnimation()
+              this.clearConvergeSwiperItemTimer()
+              return
+            } 
+            this.currentIndex = oldCurrent + 1 >= childrenLength ? 0 : oldCurrent + 1
+          } else if (direction === 'right' || direction === 'down') {
+            if (oldCurrent === 0 && !this.circular) {
+              this.clearSwiperContainerAnimation()
+              this.clearConvergeSwiperItemTimer()
+              return
+            } 
+            this.currentIndex = oldCurrent - 1 < 0 ? childrenLength - 1 : oldCurrent - 1
+          }
+          // 设置动画过渡时间
+          this.swiperContainerStyle.transitionDuration = `${this.duration + 90}ms`
+          // this.updateSwiperItemContainerRect(this.currentIndex)
+        }
+        
+        // console.log(direction, oldCurrent, this.currentIndex);
+        this.updateSwiperContainerItem(oldCurrent)
+        
+        // 切换轮播时触发事件
+        this.$emit('change', {
+          current: this.currentIndex
+        })
+      },
+      // 设置自动轮播
+      startAutoPlay() {
+        if (this.autoplay && !this.autoPlayTimer && this.circular) {
+          this.autoPlayTimer = setInterval(() => {
+            this.updateSwiperContainerStyleWithDirection('left')
+          }, this.interval)
+        }
+      },
+      // 停止自动轮播
+      stopAutoPlay() {
+        if (this.autoPlayTimer) {
+          clearInterval(this.autoPlayTimer)
+          this.autoPlayTimer = null
+        }
+      },
+      // 更新swiperContainer和swiperItem相关联信息
+      updateSwiperContainerItem(oldCurrent) {
+        const childrenLength = this.children.length
+        const lastSwiperItemIndex = childrenLength - 1
+        // 判断当前是否为头尾，如果是更新对应的头尾SwiperItem样式
+        // 更新swiperItemContainer的样式
+        if (oldCurrent === 0 && this.currentIndex === lastSwiperItemIndex) {
+          // 先移动到最左边然后再去除动画偏移到正常的位置
+          // this.swiperContainerStyle.transform = `translate3d(100%, 0px, 0px)`
+          this.updateSwiperContainerStyle(-1)
+          this.clearSwiperContainerAnimationTimer()
+          this.clearAnimationTimer = setTimeout(() => {
+            this.convergeSwiperItem()
+          }, this.duration)
+        } else if (oldCurrent === lastSwiperItemIndex && this.currentIndex === 0) {
+          // 先移动到最右边然后再去除动画偏移到正常的位置
+          // this.swiperContainerStyle.transform = `translate3d(${-childrenLength * 100}%, 0px, 0px)`
+          this.updateSwiperContainerStyle(childrenLength)
+          this.clearSwiperContainerAnimationTimer()
+          this.clearAnimationTimer = setTimeout(() => {
+            this.convergeSwiperItem()
+          }, this.duration)
+        } else {
+          this.updateSwiperContainerStyle(this.currentIndex)
+          this.updateSwiperItemStyle(0)
+          this.updateSwiperItemStyle(lastSwiperItemIndex)
+          this.clearAnimationTimer = setTimeout(() => {
+            this.clearSwiperContainerAnimation()
+          }, this.duration)
+        }
+      },
+      // 更新对应swiperItem的信息
+      updateSwiperItemStyle(index) {
+        const childrenLength = this.children.length
+        if (index < 0) index = 0
+        if (index > childrenLength - 1) index = childrenLength - 1
+        
+        typeof(this.children[index].updateSwiperItemStyle) === 'function' && this.children[index].updateSwiperItemStyle(childrenLength, this.currentIndex)
+      },
+      // 更新对应swiperItem的容器信息
+      updateSwiperItemContainerRect(index) {
+        const childrenLength = this.children.length
+        if (index < 0) index = 0
+        if (index > childrenLength - 1) index = childrenLength - 1
+        
+        typeof(this.children[index].getSwiperItemRect) === 'function' && this.children[index].getSwiperItemRect()
+      },
+      // 执行前后衔接
+      convergeSwiperItem() {
+        const lastSwiperItemIndex = this.children.length - 1
+        this.clearSwiperContainerAnimation()
+        this.clearConvergeSwiperItemTimer()
+        this.convergeTimer = setTimeout(() => {
+          this.updateSwiperItemStyle(0)
+          this.updateSwiperItemStyle(lastSwiperItemIndex)
+          this.updateSwiperContainerStyle(this.currentIndex)
+          this.clearConvergeSwiperItemTimer()
+        }, 30)
+      },
+      // 停止/清除切换动画
+      clearSwiperContainerAnimation() {
+        this.swiperContainerStyle.transitionDuration = `0ms`
+        this.swiperContainerAnimationFinish = true
+        this.clearSwiperContainerAnimationTimer()
+      },
+      // 停止/清除执行前后衔接定时器
+      clearConvergeSwiperItemTimer() {
+        if (this.convergeTimer) {
+          clearTimeout(this.convergeTimer)
+          this.convergeTimer = null
+        }
+      },
+      // 停止/清除切换动画定时器
+      clearSwiperContainerAnimationTimer() {
+        if (this.clearAnimationTimer) {
+          clearTimeout(this.clearAnimationTimer)
+          this.clearAnimationTimer = null
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-c-swiper {
+    position: relative;
+    overflow: hidden;
+    width: 100%;
+    height: 100%;
+    
+    .tn-swiper {
+      &__container {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        top: 0;
+        left: 0;
+        
+        will-change: transform;
+        transition-property: all;
+        transition-timing-function: ease-out;
+      }
+      
+      &__indicator {
+        position: absolute;
+        display: flex;
+        z-index: 1;
+        
+        &--horizontal {
+          padding: 0 24rpx;
+          flex-direction: row;
+          width: 100%;
+        }
+        &--vertical {
+          padding: 24rpx 0;
+          flex-direction: column;
+          height: 100%;
+        }
+        
+        &__rect {
+          background-color: rgba(0, 0, 0, 0.3);
+          transition: all 0.5s;
+          
+          &--horizontal {
+            width: 26rpx;
+            height: 8rpx;
+          }
+          &--vertical {
+            width: 8rpx;
+            height: 26rpx;
+          }
+          
+          &--active {
+            background-color: rgba(255, 255, 255, 0.8);
+          }
+        }
+        
+        &__dot {
+          width: 14rpx;
+          height: 14rpx;
+          border-radius: 20rpx;
+          background-color: rgba(0, 0, 0, 0.3);
+          transition: all 0.5s;
+          
+          &--horizontal {
+            margin: 0 6rpx;
+          }
+          &--vertical {
+            margin: 6rpx 0;
+          }
+          
+          &--active {
+            background-color: rgba(255, 255, 255, 0.8);
+          }
+        }
+        
+        &__round {
+          width: 14rpx;
+          height: 14rpx;
+          border-radius: 20rpx;
+          background-color: rgba(0, 0, 0, 0.3);
+          transition: all 0.5s;
+          
+          &--horizontal {
+            margin: 0 6rpx;
+          }
+          &--vertical {
+            margin: 6rpx 0;
+          }
+          
+          &--active {
+            background-color: rgba(255, 255, 255, 0.8);
+            
+            &--horizontal {
+              width: 34rpx;
+            }
+            &--vertical {
+              height: 34rpx;
+            }
+          }
+        }
+        
+        &__number {
+          padding: 6rpx 16rpx;
+          line-height: 1;
+          background-color: rgba(0, 0, 0, 0.3);
+          color: rgba(255, 255, 255, 0.8);
+          border-radius: 100rpx;
+          font-size: 26rpx;
+        }
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-drag/index.wxs b/tuniao-ui/components/tn-drag/index.wxs
new file mode 100644
index 0000000..6df1e84
--- /dev/null
+++ b/tuniao-ui/components/tn-drag/index.wxs
@@ -0,0 +1,265 @@
+// 判断是否出界
+var isOutRange = function(x1, y1, x2, y2, x3, y3) {
+  return x1 < 0 || x1 >= y1 || x2 < 0 || x2 >= y2 || x3 < 0 || x3 >= y3
+}
+var edit = false
+
+function bool(str) {
+  return str === 'true' || str === true
+}
+/**
+ * 排序核心
+ * @param {Object} startKey 开始时位置
+ * @param {Object} endKey 结束时位置
+ * @param {Object} instance wxs内的局部变量快照
+ */
+var sortCore = function(startKey, endKey, state) {
+  var basedata = state.basedata
+  var excludeFix = function(sortKey, type) {
+    // fixed 元素位置不会变化, 这里直接用 sortKey 获取，更加便捷
+    if (state.list[sortKey].fixed) {
+      var _sortKey = type ? --sortKey : ++sortKey
+      return excludeFix(sortKey, type)
+    }
+    return sortKey
+  }
+  
+  // 先获取到 endKey 对应的 realKey, 防止下面排序过程中该 realKey 被修改
+  var endRealKey = -1
+  state.list.forEach(function(item) {
+    if (item.sortKey === endKey) endRealKey = item.realKey
+  })
+  
+  return state.list.map(function(item) {
+    if (item.fixed) return item
+    var sortKey = item.sortKey
+    var realKey = item.realKey
+    
+    if (startKey < endKey) {
+      // 正序拖动
+      if (sortKey > startKey && sortKey <= endKey) {
+        --realKey
+        sortKey =  excludeFix(--sortKey, true)
+      } else if (sortKey === startKey) {
+        realKey = endRealKey
+        sortKey = endKey
+      }
+    } else if (startKey > endKey) {
+      // 倒序拖动
+      if (sortKey >= endKey && sortKey < startKey) {
+        ++realKey
+        sortKey = excludeFix(++sortKey, false)
+      } else if (sortKey === startKey) {
+        realKey = endRealKey
+        sortKey = endKey
+      }
+    }
+    
+    if (item.sortKey != sortKey) {
+      item.translateX = (sortKey % basedata.columns) * 100 + '%'
+      item.translateY = Math.floor(sortKey / basedata.columns) * 100 + '%'
+      item.sortKey = sortKey
+      item.realKey = realKey
+    }
+    return item
+  })
+}
+
+var triggerCustomEvent = function(list, type, instance) {
+  if (!instance) return
+  var _list = [],
+    listData = [];
+    
+  list.forEach(function(item) {
+    _list[item.sortKey] = item
+  })
+  _list.forEach(function(item) {
+    listData.push(item.data)
+  })
+  
+  // 编译到小程序 funcName作为参数传递导致事件不执行
+  switch(type) {
+    case 'change':
+      instance.callMethod('change', {data: listData})
+      break
+    case 'sortEnd':
+      instance.callMethod('sortEnd', {data: listData})
+      break
+  }
+}
+
+var listObserver = function(newVal, oldVal, ownerInstance, instance) {
+  var state = ownerInstance.getState()
+  state.itemsInstance = ownerInstance.selectAllComponents('.tn-drag__item')
+  
+  state.list = newVal || []
+  
+  state.list.forEach(function(item, index) {
+    var itemInstance = state.itemsInstance[index]
+    if (item && itemInstance) {
+      itemInstance.setStyle({
+        'transform': 'translate3d('+ item.translateX + ',' + item.translateY +', 0)'
+      })
+      if (item.fixed) itemInstance.addClass('tn-drag__fixed')
+    }
+  })
+}
+
+var baseDataObserver = function(newVal, oldVal, ownerInstance, instance) {
+  var state = ownerInstance.getState()
+  state.basedata = newVal
+}
+
+var longPress = function(event, ownerInstance) {
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  
+  edit = bool(dataset.edit)
+  if (!edit) return
+  if (!state.basedata || state.basedata === 'undefined') {
+    state.basedata = JSON.parse(dataset.basedata)
+  }
+  var basedata = state.basedata
+  var touches = event.changedTouches[0]
+  if (!touches) return
+  
+  state.current = +dataset.index
+  
+  // 初始项是固定项则返回
+  var item = state.list[state.current]
+  if (item && item.fixed) return
+  
+  // 如果已经在 drag 中则返回, 防止多指触发 drag 动作, touchstart 事件中有效果
+  if (state.dragging) return
+  
+  ownerInstance.callMethod("drag", {
+    dragging: true
+  })
+  
+  // 计算X, Y轴初始位移，使item中心移动到点击处，单列的时候X轴初始不做位移
+  state.translateX = basedata.columns === 1 ? 0 : touches.pageX - (basedata.itemWidth / 2 + basedata.left)
+  state.translateY = touches.pageY - (basedata.itemHeight / 2 + basedata.top)
+  state.touchId = touches.identifier
+  
+  instance.setStyle({
+    'transform': 'translate3d(' + state.translateX + 'px,' + state.translateY +'px, 0)'
+  })
+  state.itemsInstance.forEach(function(item, index) {
+    item.removeClass("tn-drag__transition").removeClass("tn-drag__current")
+    item.addClass(index === state.current ? "tn-drag__current" : "tn-drag__transition")
+  })
+  
+  ownerInstance.callMethod("vibrate")
+  state.dragging = true
+}
+
+var touchStart = function(event, ownerInstance) {
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  edit = bool(dataset.edit)
+}
+
+var touchMove = function(event, ownerInstance) {
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  var basedata = state.basedata
+  
+  if (!state.dragging || !edit) return
+  var touches = event.changedTouches[0]
+  if (!touches) return
+  
+  // 如果不是同一个触发点则返回
+  if (state.touchId !== touches.identifier) return
+  
+  // 计算X,Y轴位移, 单列时候X轴初始不做位移
+  var translateX = basedata.columns === 1 ? 0 : touches.pageX - (basedata.itemWidth / 2 + basedata.left)
+  var translateY = touches.pageY - (basedata.itemHeight / 2 + basedata.top)
+  
+  // 到顶到低自动滑动
+  if (touches.clientY > basedata.windowHeight - basedata.itemHeight - basedata.realBottomSize) {
+    // 当前触摸点pageY + item高度 - (屏幕高度 - 底部固定区域高度)
+    ownerInstance.callMethod('pageScroll', {
+      scrollTop: touches.pageY + basedata.itemHeight - (basedata.windowHeight - basedata.realBottomSize)
+    })
+  } else if (touches.clientY < basedata.itemHeight + basedata.realTopSize) {
+    // 当前触摸点pageY - item高度 - 顶部固定区域高
+    ownerInstance.callMethod('pageScroll', {
+      scrollTop: touches.pageY - basedata.itemHeight - basedata.realTopSize
+    })
+  }
+  
+  // 设置当前激活元素的偏移量
+  instance.setStyle({
+    'transform': 'translate3d('+ translateX + 'px,' + translateY + 'px, 0)'
+  })
+  
+  var startKey = state.list[state.current].sortKey
+  var currentX = Math.round(translateX / basedata.itemWidth)
+  var currentY = Math.round(translateY / basedata.itemHeight)
+  var endKey = currentX + basedata.columns * currentY
+  
+  // 目标项时固定项则返回
+  var item = state.list[endKey]
+  if (item && item.fixed) return
+  
+  // X轴或者Y轴超出范围则返回
+  if (isOutRange(currentX, basedata.columns, currentY, basedata.rows, endKey, state.list.length)) return
+  
+  // 防止拖拽过程中发生乱序问题
+  if (startKey === endKey || startKey === state.preStartKey) return
+  state.preStartKey = startKey
+  
+  var list = sortCore(startKey, endKey, state)
+  state.itemsInstance.forEach(function(itemInstance, index) {
+    var item = list[index]
+    if (index !== state.current) {
+      itemInstance.setStyle({
+        'transform': 'translate3d('+ item.translateX + ',' + item.translateY +', 0)'
+      })
+    }
+  })
+  
+  // ownerInstance.callMethod('vibrate')
+  ownerInstance.callMethod('listDataChange', {
+    data: list
+  })
+  triggerCustomEvent(list, "change", ownerInstance)
+}
+
+var touchEnd = function(event, ownerInstance) {
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  var basedata = state.basedata
+  
+  if (!state.dragging || !edit) return
+  triggerCustomEvent(state.list, "sortEnd", ownerInstance)
+  
+  instance.addClass('tn-drag__transition')
+  instance.setStyle({
+    'transform': 'translate3d('+ state.list[state.current].translateX + ',' + state.list[state.current].translateY + ', 0)'
+  })
+  state.itemsInstance.forEach(function(item, index) {
+    item.removeClass('tn-drag__transition')
+  })
+  
+  state.preStartKey = -1
+  state.dragging = false
+  ownerInstance.callMethod('drag', {
+    dragging: false
+  })
+  state.current = -1
+  state.translateX = 0
+  state.translateY = 0
+}
+
+module.exports = {
+	longPress: longPress,
+	touchStart: touchStart,
+	touchMove: touchMove,
+	touchEnd: touchEnd,
+	baseDataObserver: baseDataObserver,
+	listObserver: listObserver
+}
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-drag/tn-drag.vue b/tuniao-ui/components/tn-drag/tn-drag.vue
new file mode 100644
index 0000000..17d269d
--- /dev/null
+++ b/tuniao-ui/components/tn-drag/tn-drag.vue
@@ -0,0 +1,278 @@
+<template>
+  <view
+    class="tn-drag-class tn-drag"
+    :style="{
+      height: wrapHeight + 'rpx'
+    }"
+    :list="listData"
+    :basedata="baseData"
+    :change:list="wxs.listObserver"
+    :change:basedata="wxs.baseDataObserver"
+  >
+    <!-- #ifdef MP-WEIXIN -->
+    <view
+      v-for="(item, index) in listData"
+      :key="item.id"
+      class="tn-drag__item"
+      :style="{
+        width: 100 / columns + '%',
+        height: itemHeight + 'rpx'
+      }"
+      :data-index="index"
+      :data-basedata="baseData"
+      :data-edit="edit"
+      @longpress="wxs.longPress"
+      @touchstart="wxs.touchStart"
+      :catch:touchmove="dragging?wxs.touchMove:''"
+      :catch:touchend="dragging?wxs.touchEnd:''"
+    >
+      <slot :entity="item.data" :fixed="item.fixed" :index="index" :height="itemHeight" :isEdit="edit"></slot>
+    </view>
+    <!-- #endif -->
+
+    <!-- #ifndef MP-WEIXIN -->
+    <view
+      v-for="(item, index) in listData"
+      :key="item.id"
+      class="tn-drag__item"
+      :style="{
+        width: 100 / columns + '%',
+        height: itemHeight + 'rpx' 
+      }"
+      @longpress="wxs.longPress"
+      :data-index="index"
+      :data-basedata="baseData"
+      :data-edit="edit"
+      @touchstart="wxs.touchStart"
+      @touchmove="wxs.touchMove"
+      @touchend="wxs.touchEnd"
+    >
+      <slot :entity="item.data" :fixed="item.fixed" :index="index" :height="itemHeight" :isEdit="edit"></slot>
+    </view>
+    <!-- #endif -->
+  </view>
+</template>
+<script src="./index.wxs" lang="wxs" module="wxs"></script>
+<script>
+  export default {
+    name: 'tn-drag',
+    props: {
+      // 数据源
+      // 如果属性中包含fixed，则标识当前数据不允许拖动
+      list: {
+        type: Array,
+        default () {
+          return []
+        }
+      },
+      // 是否允许拖动编辑
+      edit: {
+        type: Boolean,
+        default: true
+      },
+      // 列数
+      columns: {
+        type: Number,
+        default: 3
+      },
+      // item元素高度, 单位rpx
+      itemHeight: {
+        type: Number,
+        default: 0
+      },
+      // 当前父元素滚动的高度
+      scrollTop: {
+        type: Number,
+        default: 0
+      }
+    },
+    computed: {
+      wrapHeight() {
+        return this.rows * this.itemHeight
+      }
+    },
+    data() {
+      return {
+        // 未渲染前节点数据
+        baseData: {},
+        // 拖动后的数据
+        dragData: [],
+        // 行数
+        rows: 0,
+        // 渲染数据
+        listData: [],
+        // 标记是否正在拖动
+        dragging: false
+      }
+    },
+    watch: {
+      list(val) {
+        this.listData = []
+        this.$nextTick(() => {
+          this.init()
+        })
+      },
+      columns(val) {
+        this.listData = []
+        this.$nextTick(() => {
+          this.init()
+        })
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.init()
+      })
+    },
+    methods: {
+      // 初始化
+      init() {
+        this.dragging = true
+        const initDragItem = item => {
+          const obj = {
+            ...item
+          }
+          const fixed = obj?.fixed || false
+          delete obj["fixed"]
+          return {
+            id: this.unique(),
+            fixed,
+            data: {
+              ...obj
+            }
+          }
+        }
+        
+        let i = 0
+        const listData = (this.list || []).map((item, index) => {
+          let listItem = initDragItem(item)
+          // 真实排序
+          listItem.realKey = i++
+          // 整体排序
+          listItem.sortKey = index
+          listItem.translateX = `${(listItem.sortKey % this.columns) * 100}%`
+          listItem.translateY = `${Math.floor(listItem.sortKey / this.columns) * 100}%`
+          return listItem
+        })
+        this.rows = Math.ceil(listData.length / this.columns)
+        this.listData = listData
+        this.dragData = listData
+        
+        if (listData.length === 0) return
+        // console.log(listData);
+        
+        // 初始化dom元素
+        this.$nextTick(() => {
+          this.initRect()
+        })
+      },
+      // 初始化dom元素
+      initRect() {
+        const {
+          windowWidth,
+          windowHeight
+        } = uni.getSystemInfoSync()
+        
+        let baseData = {}
+        baseData.windowHeight = windowHeight
+        baseData.realTopSize = 0
+        baseData.realBottomSize = 0
+        baseData.columns = this.columns
+        baseData.rows = this.rows
+        
+        const query = uni.createSelectorQuery().in(this)
+        query.select('.tn-drag').boundingClientRect()
+        query.select('.tn-drag__item').boundingClientRect()
+        query.exec(res => {
+          if (!res) {
+            setTimeout(() => {
+              this.initRect()
+            }, 10)
+            return
+          }
+          
+          baseData.itemWidth = res[1].width
+          baseData.itemHeight = res[1].height
+          baseData.left = res[0].left
+          baseData.top = res[0].top + this.scrollTop
+          this.dragging = false
+          this.baseData = baseData
+        })
+        
+      },
+      
+      // 触发震动
+      vibrate() {
+        uni.vibrateShort()
+      },
+      // 滚动到指定的位置
+      pageScroll(e) {
+        uni.pageScrollTo({
+          scrollTop: e.scrollTop,
+          duration: 0
+        })
+      },
+      // 修改拖动状态
+      drag(e) {
+        this.dragging = e.dragging
+      },
+      // 拖拽数据发生改变
+      listDataChange(e) {
+        this.dragData = e.data
+      },
+      // item被点击
+      itemClick(index) {
+        const item = this.dragData[index]
+        this.$emit('click', {
+          key: item.realKey,
+          data: item.data
+        })
+      },
+      
+      // 拖拽结束事件
+      sortEnd(e) {
+        this.$emit('end', {
+          data: e.data
+        })
+      },
+      // 排序发生改变事件
+      change(e) {
+        this.$emit('change', {
+          data: e.data
+        })
+      },
+      
+      // 生成元素唯一id
+      unique(n = 6) {
+        let id = ''
+        for (let i = 0; i < n; i++) id += Math.floor(Math.random() * 10)
+        return 'tn_' + new Date().getTime() + id
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-drag {
+    position: relative;
+    
+    &__item {
+      position: absolute;
+      z-index: 2;
+      top: 0;
+      left: 0;
+    }
+    
+    &__transition {
+      transition: transform 0.25s !important;
+    }
+    
+    &__current {
+      z-index: 10 !important;
+    }
+    
+    &__fixed {
+      z-index: 1 !important;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-empty/tn-empty.vue b/tuniao-ui/components/tn-empty/tn-empty.vue
new file mode 100644
index 0000000..3a85b15
--- /dev/null
+++ b/tuniao-ui/components/tn-empty/tn-empty.vue
@@ -0,0 +1,190 @@
+<template>
+  <view v-if="show" class="tn-empty-class tn-empty" :style="[emptyStyle]">
+    <view
+      v-if="!isImage"
+      class="tn-empty__icon"
+      :class="[icon ? `tn-icon-${icon}` : `tn-icon-empty-${mode}`]"
+      :style="[iconStyle]"
+    ></view>
+    <image
+      v-else
+      class="tn-empty__image"
+      :style="[imageStyle]"
+      :src="icon"
+      mode="widthFix"
+    ></image>
+    
+    <view
+      class="tn-empty__text"
+      :style="[textStyle]"
+    >{{ text ? text : icons[mode]}}</view>
+    <view v-if="$slots.default || $slots.$default" class="tn-empty__slot">
+      <slot/>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-empty',
+    props: {
+      // 显示空白页
+      show: {
+        type: Boolean,
+        default: true
+      },
+      // 内置icon的名称
+      // 图片路径，建议使用绝对路径
+      icon: {
+        type: String,
+        default: ''
+      },
+      // 预置图标类型
+      mode: {
+        type: String,
+        default: 'data'
+      },
+      // 提示文字
+      text: {
+        type: String,
+        default: ''
+      },
+      // 文字颜色
+      textColor: {
+        type: String,
+        default: ''
+      },
+      // 文字大小，单位rpx
+      textSize: {
+        type: Number,
+        default: 0
+      },
+      // 图标颜色
+      iconColor: {
+        type: String,
+        default: ''
+      },
+      // 图标大小，单位rpx
+      iconSize: {
+        type: Number,
+        default: 0
+      },
+      // 图片宽度（当图标为图片时生效），单位rpx
+      imgWidth: {
+        type: Number,
+        default: 0
+      },
+      // 图片高度（当图标为图片时生效），单位rpx
+      imgHeight: {
+        type: Number,
+        default: 0
+      },
+      // 自定义组件样式
+      customStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      }
+    },
+    computed: {
+      emptyStyle() {
+        let style = {}
+        Object.assign(style, this.customStyle)
+        return style
+      },
+      iconStyle() {
+        let style = {}
+        if (this.iconSize) {
+          style.fontSize = this.iconSize + 'rpx'
+        }
+        if (this.iconColor) {
+          style.color = this.iconColor
+        }
+        return style
+      },
+      imageStyle() {
+        let style = {}
+        if (this.imgWidth) {
+          style.width = this.imgWidth + 'rpx'
+        }
+        if (this.imgHeight) {
+          style.height = this.imgHeight + 'rpx'
+        }
+        return style
+      },
+      textStyle() {
+        let style = {}
+        if (this.textColor) {
+          style.color = this.textColor
+        }
+        if (this.textSize) {
+          style.fontSize = this.textSize + 'rpx'
+        }
+        return style
+      },
+      // 判断传递的icon是否为图片
+      isImage() {
+        return this.icon.indexOf('/') >= 0
+      }
+    },
+    data() {
+      return {
+        icons: {
+          cart: '购物车为空',
+          page: '页面不存在',
+          search: '搜索结果为空',
+          address: '地址为空',
+          network: '网络不通',
+          order: '订单为空',
+          coupon: '优惠券为空',
+          favor: '暂无收藏',
+          permission: '无权限',
+          history: '历史记录为空',
+          message: '暂无消息',
+          list: '列表为空',
+          data: '暂无数据',
+          comment: '暂无评论'
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    
+    &__icon {
+      margin-top: 14rpx;
+      color: #AAAAAA;
+      font-size: 90rpx;
+    }
+    
+    &__image {
+      width: 160rpx;
+      height: 160rpx;
+    }
+    
+    &__text {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      margin-top: 20rpx;
+      color: #AAAAAA;
+      font-size: 30rpx;
+    }
+    
+    &__slot {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      margin-top: 20rpx;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-fab/tn-fab.vue b/tuniao-ui/components/tn-fab/tn-fab.vue
new file mode 100644
index 0000000..9ce0cde
--- /dev/null
+++ b/tuniao-ui/components/tn-fab/tn-fab.vue
@@ -0,0 +1,523 @@
+<template>
+  <view class="tn-fab-class tn-fab" @touchmove.stop.prevent>
+    <view
+      class="tn-fab__box"
+      :class="{'tn-fab--right': left === 'auto'}"
+      :style="{
+        left: $tn.string.getLengthUnitValue(fabLeft || left),
+        right: $tn.string.getLengthUnitValue(fabRight || right),
+        bottom: $tn.string.getLengthUnitValue(fabBottom || bottom),
+        zIndex: elZIndex
+      }"
+    >
+      <view
+        v-if="visibleSync"
+        class="tn-fab__btns"
+        :class="[`tn-fab__btns__animation--${animationType}`, 
+          showFab ? `tn-fab__btns--visible--${animationType}` : ''
+        ]"
+      >
+        <view
+          v-for="(item, index) in btnList"
+          :key="index"
+          class="tn-fab__item"
+          :class="[
+            `tn-fab__item__animation--${animationType}`, 
+            {'tn-fab__item--left': right === 'auto'}
+          ]"
+          :style="[fabItemStyle(index)]"
+          @tap.stop="handleClick(index)"
+        >
+          <!-- 带图标或者图片时显示的文字信息 -->
+          <view
+            v-if="animationType !== 'around' && (item.imgUrl || item.icon)"
+            :class="[left === 'auto' ? 'tn-fab__item__text--right' : 'tn-fab__item__text--left']"
+            :style="{
+              color: item.textColor || '#FFF',
+              fontSize: $tn.string.getLengthUnitValue(item.textSize || 28)
+            }"
+          >{{ item.text || '' }}</view>
+          
+          <!-- 带图片或者图标时的图片、图标信息 -->
+          <view
+            class="tn-fab__item__btn"
+            :class="[!item.bgColor ? backgroundColorClass : '']"
+            :style="{
+              width: $tn.string.getLengthUnitValue(width),
+              height: $tn.string.getLengthUnitValue(height),
+              lineHeight: $tn.string.getLengthUnitValue(height),
+              backgroundColor: item.bgColor || backgroundColorStyle || '#01BEFF',
+              borderRadius: $tn.string.getLengthUnitValue(radius)
+            }"
+          >
+            <!-- 无图片和无图标时只显示文字 -->
+            <view
+              v-if="!item.imgUrl && !item.icon"
+              class="tn-fab__item__btn__title"
+              :style="{
+                color: item.textColor || '#fff',
+                fontSize: $tn.string.getLengthUnitValue(item.textSize || 28)
+              }"
+            >{{ item.text || '' }}</view>
+            <!-- 图标 -->
+            <view
+              v-if="item.icon"
+              class="tn-fab__item__btn__icon"
+              :class="[`tn-icon-${item.icon}`]"
+              :style="{
+                color: item.iconColor || '#fff',
+                fontSize: $tn.string.getLengthUnitValue(item.iconSize || iconSize || 64)
+              }"
+            ></view>
+            <!-- 图片 -->
+            <image
+              v-else-if="!item.icon && item.imgUrl"
+              class="tn-fab__item__btn__image"
+              :style="{
+                width: $tn.string.getLengthUnitValue(item.imgWidth || 64),
+                height: $tn.string.getLengthUnitValue(item.imgHeight || 64),
+              }"
+              :src="item.imgUrl"
+            ></image>
+          </view>
+        </view>
+      </view>
+      
+      <view
+        class="tn-fab__item__btn tn-fab__item__btn--fab"
+        :class="[backgroundColorClass, fontColorClass, {'tn-fab__item__btn--active': showFab}]"
+        :style="{
+          width: $tn.string.getLengthUnitValue(width),
+          height: $tn.string.getLengthUnitValue(height),
+          backgroundColor: backgroundColorStyle || !backgroundColorClass ? '#01BEFF' : '',
+          color: fontColorStyle || '#fff',
+          borderRadius: $tn.string.getLengthUnitValue(radius),
+          zIndex: elZIndex - 1
+        }"
+        @tap.stop="fabClick"
+      >
+        <slot>
+          <view class="tn-fab__item__btn__icon" :class="[`tn-icon-${icon}`]" :style="{fontSize: $tn.string.getLengthUnitValue(iconSize || 64)}"></view>
+        </slot>
+      </view>
+    </view>
+    <view v-if="visibleSync && showMask" class="tn-fab__mask" :class="{'tn-fab__mask--visible': showFab}" :style="{zIndex: elZIndex - 3}" @tap="clickMask()"></view>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-fab',
+    mixins: [componentsColorMixin],
+    props: {
+      // 按钮列表
+      // {
+      //   // 背景颜色
+      //   bgColor: '#fff',
+      //   // 图片地址
+      //   imgUrl: '',
+      //   // 图片宽度
+      //   imgWidth: 60,
+      //   // 图片高度
+      //   imgHeight: 60,
+      //   // 图标名称
+      //   icon: '',
+      //   // 图标尺寸
+      //   iconSize: 60,
+      //   // 图标颜色
+      //   iconColor: '#fff',
+      //   // 提示文字
+      //   text: '',
+      //   // 文字大小
+      //   textSize: 30,
+      //   // 字体颜色
+      //   textColor: '#fff'
+      // }
+      btnList: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 自定义悬浮按钮内容
+      customBtn: {
+        type: Boolean,
+        default: false
+      },
+      // 悬浮按钮的宽度
+      width: {
+        type: [String, Number],
+        default: 88
+      },
+      // 悬浮按钮的高度
+      height: {
+        type: [String, Number],
+        default: 88
+      },
+      // 图标大小
+      iconSize: {
+        type: [String, Number],
+        default: 64
+      },
+      // 图标名称
+      icon: {
+        type: String,
+        default: 'open'
+      },
+      // 按钮圆角
+      radius: {
+        type: [String, Number],
+        default: '50%'
+      },
+      // 按钮距离左边的位置
+      left: {
+        type: [String, Number],
+        default: 'auto'
+      },
+      // 按钮距离右边的位置
+      right: {
+        type: [String, Number],
+        default: 'auto'
+      },
+      // 按钮距离底部的位置
+      bottom: {
+        type: [String, Number],
+        default: 100
+      },
+      // 展示动画类型 up 往上展示 around 环绕
+      animationType: {
+        type: String,
+        default: 'up'
+      },
+      // 当动画为圆环时，每个弹出按钮之间的距离, 单位px
+      aroundBtnDistance: {
+        type: Number,
+        default: 10
+      },
+      zIndex: {
+        type: Number,
+        default: 0
+      },
+      // 显示遮罩
+      showMask: {
+        type: Boolean,
+        default: true
+      },
+      // 点击遮罩是否可以关闭
+      maskCloseable: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+        showFab: false,
+        visibleSync: false,
+        timer: null,
+        fabLeft: 0,
+        fabRight: 0,
+        fabBottom: 0,
+        fabBtnInfo: {
+          width: 0,
+          height: 0,
+          left: 0,
+          right: 0,
+          bottom: 0
+        },
+        systemInfo: {
+          width: 0,
+          height: 0
+        },
+        updateProps: false
+      }
+    },
+    computed: {
+      elZIndex() {
+        return this.zIndex || this.$tn.zIndex.fab
+      },
+      propsData() {
+        return [this.width, this.height, this.left, this.right, this.bottom]
+      },
+      fabItemStyle() {
+        return (index) => {
+          let style = {
+            zIndex: this.elZIndex - 2
+          }
+          if (this.animationType === 'up' || !this.showFab) {
+            return style
+          }
+          let base = 1 
+          if (this.left === 'auto') {
+            base = 1
+          } else if (this.right === 'auto') {
+            base = -1
+          }
+          style.transform = `rotate(${base * index * 60}deg) translateX(${(this.aroundBtnDistance + this.fabBtnInfo.width) * (-(base))}px)`
+          return style
+        }
+      }
+    },
+    watch: {
+      propsData() {
+        // 更新按钮信息
+        this.updateProps = true
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.getFabBtnRectInfo()
+      })
+    },
+    beforeDestroy() {
+      if (this.timer) {
+        clearTimeout(this.timer)
+      }
+    },
+    methods: {
+      // 按钮点击事件
+      handleClick(index) {
+        this.close()
+        this.$emit('click', {index: index})
+      },
+      // 点击悬浮按钮
+      fabClick() {
+        if (this.showFab) {
+          this.close()
+        } else {
+          // console.log(this.visibleSync);
+          if (this.visibleSync) {
+            this.visibleSync = false
+            return
+          }
+          this.open()
+        }
+      },
+      // 点击遮罩
+      clickMask() {
+        if (!this.showMask || !this.maskCloseable) return
+        this.close()
+      },
+      
+      open() {
+        this.change('visibleSync', 'showFab', true)
+        this.translateFabPosition()
+      },
+      close() {
+        this.change('showFab', 'visibleSync', false)
+        this.fabLeft = 0
+        this.fabRight = 0
+        this.fabBottom = 0
+      },
+      // 关闭时先通过动画隐藏弹窗和遮罩，再移除整个组件
+      // 打开时，先渲染组件，延时一定时间再让遮罩和弹窗的动画起作用
+      change(param1, param2, status) {
+        this[param1] = status
+        if (status) {
+          // #ifdef H5 || MP
+          this.timer = setTimeout(() => {
+            this[param2] = status
+            this.$emit(status ? 'open' : 'close')
+            clearTimeout(this.timer)
+          }, 10)
+          // #endif
+          // #ifndef H5 || MP
+          this.$nextTick(() => {
+            this[param2] = status
+            this.$emit(status ? 'open' : 'close')
+          })
+          // #endif
+        } else {
+          this.timer = setTimeout(() => {
+            this[param2] = status
+            this.$emit(status ? 'open' : 'close')
+            clearTimeout(this.timer)
+          }, 250)
+        }
+      },
+      
+      /******************** 旋转动画相关函数 ********************/
+      // 获取按钮的信息
+      async getFabBtnRectInfo() {
+        const systemInfo = uni.getSystemInfoSync()
+        const btnRectInfo = await this._tGetRect('.tn-fab__item__btn--fab')
+        if (!btnRectInfo) {
+          setTimeout(() => {
+            this.getFabBtnRectInfo()
+          }, 10)
+          return
+        }
+        console.log(btnRectInfo);
+        this.systemInfo = {
+          width: systemInfo.windowWidth,
+          height: systemInfo.windowHeight
+        }
+        this.fabBtnInfo.width = btnRectInfo.width
+        this.fabBtnInfo.height = btnRectInfo.height
+        this.fabBtnInfo.left = btnRectInfo.left
+        this.fabBtnInfo.right = btnRectInfo.right
+        this.fabBtnInfo.bottom = btnRectInfo.bottom
+      },
+      // 更新悬浮按钮的位置
+      translateFabPosition() {
+        if (this.updateProps) {
+          this.getFabBtnRectInfo()
+          this.updateProps = false
+        }
+        if (this.animationType === 'up') return 
+        // 按钮组的宽度
+        const btnGroupWidth = this.fabBtnInfo.width + this.aroundBtnDistance + 10
+        // 判断当前按钮是在左边还是右边
+        if (this.left === 'auto' && btnGroupWidth > this.systemInfo.width - this.fabBtnInfo.right) {
+          // 距离不够需要移动
+          this.fabRight = btnGroupWidth + 'px'
+        } else if (this.right === 'auto' && btnGroupWidth > this.fabBtnInfo.left) {
+          this.fabLeft = btnGroupWidth + 'px'
+        }
+        
+        if (btnGroupWidth > this.systemInfo.height - this.fabBtnInfo.bottom) {
+          this.fabBottom = btnGroupWidth + 'px'
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-fab {
+    &__box {
+      display: flex;
+      justify-content: center;
+      align-items: flex-start;
+      flex-direction: column;
+      position: fixed;
+      transition: all 0.25s ease-in-out;
+    }
+    
+    &--right {
+      align-items: flex-end;
+    }
+    
+    &__btns {
+      transition: all 0.25s cubic-bezier(0,.13,0,1.43);
+      transform-origin: 80% bottom;
+      
+      &__animation--up {
+        opacity: 0;
+        transform: translateY(100%);
+      }
+      &__animation--around {
+        position: absolute;
+        top: 0;
+        left: 0;
+      }
+      
+      &--visible--up {
+        // visibility: visible;
+        opacity: 1;
+        transform: translateY(0);
+      }
+      &--visible--around {
+        // visibility: visible;
+        // opacity: 1;
+      }
+    }
+    
+    &__item {
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      padding-bottom: 20rpx;
+      
+      &__animation--around {
+        position: absolute;
+        top: 0;
+        left: 0;
+        transition: transform 0.25s ease-in-out;
+        transform-origin: 50% 50%;
+        padding-bottom: 0 !important;
+      }
+      
+      &--left {
+        flex-flow: row-reverse;
+      }
+      
+      &__text {
+        &--left {
+          padding-left: 14rpx;
+        }
+        &--right {
+          padding-right: 14rpx;
+        }
+      }
+      
+      &__btn {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        box-shadow: 0 0 5rpx 2rpx rgba(0, 0, 0, 0.07);
+        transition: all 0.2s linear;
+        
+        &--active {
+          animation-name: fab-button-animation;
+          animation-duration: 0.2s;
+          animation-timing-function: cubic-bezier(0,.13,0,1.43);
+        }
+        
+        &__title {
+          width: 90%;
+          text-align: center;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+        
+        &__icon {
+          text-align: center;
+          font-size: 64rpx;
+        }
+        
+        &__image {
+          display: block;
+        }
+      }
+    }
+    
+    &__mask {
+      position: fixed;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      background-color: $tn-mask-bg-color;
+      transition: all 0.2s ease-in-out;
+      opacity: 0;
+      
+      &--visible {
+        opacity: 1;
+      }
+    }
+  }
+  
+  @keyframes fab-button-animation {
+    0% {
+      transform: scale(0.6);
+    }
+    // 20% {
+    //   transform: scale(1.8);
+    // }
+    // 40% {
+    //   transform: scale(0.4);
+    // }
+    // 50% {
+    //   transform: scale(1.4);
+    // }
+    // 80% {
+    //   transform: scale(0.8);
+    // }
+    100% {
+      transform: scale(1);
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-form-item/tn-form-item.vue b/tuniao-ui/components/tn-form-item/tn-form-item.vue
new file mode 100644
index 0000000..f60dbec
--- /dev/null
+++ b/tuniao-ui/components/tn-form-item/tn-form-item.vue
@@ -0,0 +1,457 @@
+<template>
+  <view
+    class="tn-form-item-class tn-form-item"
+    :class="{
+      'tn-border-solid-bottom': elBorderBottom,
+      'tn-form-item__border-bottom--error': validateState === 'error' && showError('border-bottom')
+    }"
+  >
+    <view
+      class="tn-form-item__body"
+      :style="{
+        flexDirection: elLabelPosition == 'left' ? 'row' : 'column'
+      }"
+    >
+      <!-- 处理微信小程序中设置属性的问题，不设置值的时候会变成true -->
+      <view
+        class="tn-form-item--left"
+        :style="{
+          width: wLabelWidth,
+          flex: `0 0 ${wLabelWidth}`,
+          marginBottom: elLabelPosition == 'left' ? 0 : '10rpx'
+        }"
+      >
+        <!-- 块对齐 -->
+        <view v-if="required || leftIcon || label" class="tn-form-item--left__content"
+          :style="[leftContentStyle]"
+        >
+          <!-- nvue不支持伪元素before -->
+          <view v-if="leftIcon" class="tn-form-item--left__content__icon">
+            <view :class="[`tn-icon-${leftIcon}`]" :style="leftIconStyle"></view>
+          </view>
+          <!-- <view
+            class="tn-form-item--left__content__label"
+            :style="[elLabelStyle, {
+              'justify-content': elLabelAlign === 'left' ? 'flex-satrt' : elLabelAlign === 'center' ? 'center' : 'flex-end'
+            }]"
+          >
+            {{label}}
+          </view> -->
+          <view
+            class="tn-form-item--left__content__label"
+            :style="[elLabelStyle]"
+          >
+            {{label}}
+          </view>
+          <text v-if="required" class="tn-form-item--left__content--required">*</text>
+        </view>
+      </view>
+      
+      <view class="tn-form-item--right tn-flex">
+        <view class="tn-form-item--right__content">
+          <view class="tn-form-item--right__content__slot">
+            <slot></slot>
+          </view>
+          <view v-if="$slots.right || rightIcon" class="tn-form-item--right__content__icon tn-flex">
+            <view v-if="rightIcon" :class="[`tn-icon-${rightIcon}`]" :style="rightIconStyle"></view>
+            <slot name="right"></slot>
+          </view>
+        </view>
+      </view>
+    </view>
+    
+    <view
+      v-if="validateState === 'error' && showError('message')"
+      class="tn-form-item__message"
+      :style="{
+        paddingLeft: elLabelPosition === 'left' ? elLabelWidth + 'rpx' : '0'
+      }"
+    >
+      {{validateMessage}}
+    </view>
+  </view>
+</template>
+
+<script>
+  import Emitter from '../../libs/utils/emitter.js'
+  import schema from '../../libs/utils/async-validator.js'
+  // 去除警告信息
+  schema.warning = function() {}
+  
+  export default {
+    mixins: [Emitter],
+    name: 'tn-form-item',
+    inject: {
+      tnForm: {
+        default() {
+          return null
+        }
+      }
+    },
+    props: {
+      // label提示语
+      label: {
+        type: String,
+        default: ''
+      },
+      // 绑定的值
+      prop: {
+        type: String,
+        default: ''
+      },
+      // 是否显示表单域的下划线边框
+      borderBottom: {
+        type:Boolean,
+        default: true
+      },
+      // label(标签名称)的位置
+      // left - 左边
+      // top - 上边
+      labelPosition: {
+        type: String,
+        default: ''
+      },
+      // label的宽度
+      labelWidth: {
+        type: Number,
+        default: 0
+      },
+      // label的对齐方式
+      // left - 左对齐
+      // top - 上对齐
+      // right - 右对齐
+      // bottom - 下对齐
+      labelAlign: {
+        type: String,
+        default: ''
+      },
+      // label 的样式
+      labelStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 左侧图标
+      leftIcon: {
+        type: String,
+        default: ''
+      },
+      // 右侧图标
+      rightIcon: {
+        type: String,
+        default: ''
+      },
+      // 左侧图标样式
+      leftIconStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 右侧图标样式
+      rightIconStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 是否显示必填项的*，不做校验用途
+      required: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      // 处理微信小程序label的宽度
+      wLabelWidth() {
+        // 如果用户设置label为空字符串(微信小程序空字符串最终会变成字符串的'true')，意味着要将label的位置宽度设置为auto
+        return this.elLabelPosition === 'left' ? (this.label === 'true' || this.label === '' ? 'auto' : this.elLabelWidth + 'rpx') : '100%'
+      },
+      // 是否显示错误提示
+      showError() {
+        return type => {
+          if (this.errorType.indexOf('none') >= 0) return false
+          else if (this.errorType.indexOf(type) >= 0) return true
+          else return false
+        }
+      },
+      // label的宽度(默认值为90)
+      elLabelWidth() {
+        return this.labelWidth != 0 ? this.labelWidth : (this.parentData.labelWidth != 0 ? this.parentData.labelWidth : 90)
+      },
+      // label的样式
+      elLabelStyle() {
+        return Object.keys(this.labelStyle).length ? this.labelStyle : (Object.keys(this.parentData.labelStyle).length ? this.parentData.labelStyle : {})
+      },
+      // label显示位置
+      elLabelPosition() {
+        return this.labelPosition ? this.labelPosition : (this.parentData.labelPosition ? this.parentData.labelPosition : 'left')
+      },
+      // label对齐方式
+      elLabelAlign() {
+        return this.labelAlign ? this.labelAlign : (this.parentData.labelAlign ? this.parentData.labelAlign : 'left')
+      },
+      // label下划线
+      elBorderBottom() {
+        return this.borderBottom !== '' ? this.borderBottom : (this.parentData.borderBottom !== '' ? this.parentData.borderBottom : true)
+      },
+      leftContentStyle() {
+        let style = {}
+        if (this.elLabelPosition === 'left') {
+          switch(this.elLabelAlign) {
+            case 'left':
+              style.justifyContent = 'flex-start'
+              break
+            case 'center':
+              style.justifyContent = 'center'
+              break
+            default:
+              style.justifyContent = 'flex-end'
+              break
+          }
+        }
+        
+        return style
+      }
+    },
+    data() {
+      return {
+        // 默认值
+        initialValue: '',
+        // 是否校验成功
+        validateState: '',
+        // 校验失败提示信息
+        validateMessage: '',
+        // 错误的提示方式（参考form组件）
+        errorType: ['message'],
+        // 当前子组件输入的值
+        fieldValue: '',
+        // 父组件的参数
+        // 由于再computed中无法得知this.parent的变化，所以放在data中
+        parentData: {
+          borderBottom: true,
+          labelWidth: 90,
+          labelPosition: 'left',
+          labelAlign: 'left',
+          labelStyle: {},
+        }
+      }
+    },
+    watch: {
+      validateState(val) {
+        this.broadcastInputError()
+      },
+      "tnForm.errorType"(val) {
+        this.errorType = val
+        this.broadcastInputError()
+      }
+    },
+    mounted() {
+      // 组件创建完成后，保存当前实例到form组件中
+      // 支付宝、头条小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环应用\
+      this.parent = this.$tn.$parent.call(this, 'tn-form')
+      if (this.parent) {
+        // 遍历parentData属性，将parent中同名的属性赋值给parentData
+        Object.keys(this.parentData).map(key => {
+          this.parentData[key] = this.parent[key]
+        })
+        // 如果没有传入prop或者tnForm为空（单独使用form-item组件的时候），就不进行校验
+        if (this.prop) {
+          // 将本实例添加到父组件中
+          this.parent.fields.push(this)
+          this.errorType = this.parent.errorType
+          // 设置初始值
+          this.initialValue = this.fieldValue
+          // 添加表单校验，这里必须要写在$nextTick中，因为tn-form的rules是通过ref手动传入的
+          // 不在$nextTick中的话，可能会造成执行此处代码时，父组件还没通过ref把规则给tn-form，导致规则为空
+          this.$nextTick(() => {
+            this.setRules()
+          })
+        }
+      }
+    },
+    beforeDestroy() {
+      // 组件销毁前，将实例从tn-form的缓存中移除
+      // 如果当前没有prop的话表示当前不进行删除
+      if (this.parent && this.prop) {
+        this.parent.fields.map((item, index) => {
+          if (item === this) this.parent.fields.splice(index, 1)
+        })
+      }
+    },
+    methods: {
+      // 向input组件发出错误事件
+      broadcastInputError() {
+        this.broadcast('tn-input', 'on-form-item-error', this.validateState === 'error' && this.showError('border'))
+      },
+      // 设置校验规则
+      setRules() {
+        let that = this
+        // 从父组件tn-form拿到当前tn-form-item需要验证 的规则
+        // let rules = this.getRules()
+        // if (rules.length) {
+        // 	this.isRequired = rules.some(rule => {
+        // 		// 如果有必填项，就返回，没有的话，就是undefined
+        // 		return rule.required
+        // 	})
+        // }
+        
+        // blur事件
+        this.$on('on-form-blur', that.onFieldBlur)
+        // change事件
+        this.$on('on-form-change', that.onFieldChange)
+      },
+      // 从form的rules属性中取出当前form-item的校验规则
+      getRules() {
+        let rules = this.parent.rules
+        rules = rules ? rules[this.prop] : []
+        
+        // 返回数值形式的值
+        return [].concat(rules || [])
+      },
+      // blur事件时进行表单认证
+      onFieldBlur() {
+        this.validation('blur')
+      },
+      // change事件时进行表单认证
+      onFieldChange() {
+        this.validation('change')
+      },
+      // 过滤出符合要求的rule规则
+      getFilterRule(triggerType = '') {
+        let rules = this.getRules()
+        // 整体验证表单时，triggerType为空字符串，此时返回所有规则进行验证
+        if (!triggerType) return rules
+        // 某些场景可能的判断规则，可能不存在trigger属性，故先判断是否存在此属性
+        // 历遍判断规则是否有对应的事件，比如blur，change触发等的事件
+        // 使用indexOf判断，是因为某些时候设置的验证规则的trigger属性可能为多个，比如['blur','change']
+        return rules.filter(rule => rule.trigger && rule.trigger.indexOf(triggerType) !== -1)
+      },
+      // 校验数据
+      validation(trigger, callback = ()=>{}) {
+        // 校验之前先获取需要校验的值
+        this.fieldValue = this.parent.model[this.prop]
+        // blur和change是否有当前方式的校验规则
+        let rules = this.getFilterRule(trigger)
+        // 判断是否有验证规则，如果没有规则，也调用回调方法，否则父组件tn-form会因为
+        // 对count变量的统计错误而无法进入上一层的回调 
+        if (!rules || rules.length === 0) {
+          return callback('')
+        }
+        // 设置当前为校验中
+        this.validateState = 'validating'
+        // 调用async-validator的方法
+        let validator = new schema({
+          [this.prop]: rules
+        })
+        validator.validate({
+          [this.prop]: this.fieldValue
+        }, {
+          firstFields: true
+        }, (errors, fields) => {
+          // 记录状态和报错信息
+          this.validateState = !errors ? 'success' : 'error'
+          this.validateMessage = errors ? errors[0].message : ''
+          
+          callback(this.validateMessage)
+        })
+      },
+      
+      // 清空当前item信息
+      resetField() {
+        this.parent.model[this.prop] = this.initialValue
+        // 清空错误标记
+        this.validateState = 'success'
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-form-item {
+    display: flex;
+    flex-direction: column;
+    padding: 20rpx 0;
+    font-size: 28rpx;
+    color: $tn-font-color;
+    box-sizing: border-box;
+    line-height: $tn-form-item-height;
+    
+    &__border-bottom--error:after {
+      border-color: $tn-color-red;
+    }
+    
+    &__body {
+      display: flex;
+      flex-direction: row;
+    }
+    
+    &--left {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      
+      &__content {
+        display: flex;
+        flex-direction: row;
+        position: relative;
+        align-items: center;
+        padding-right: 18rpx;
+        flex: 1;
+        
+        &--required {
+          position: relative;
+          right: 0;
+          vertical-align: middle;
+          color: $tn-color-red;
+        }
+        
+        &__icon {
+          color: $tn-font-sub-color;
+          margin-right: 8rpx;
+        }
+        
+        &__label {
+          // display: flex;
+          // flex-direction: row;
+          // align-items: center;
+          // flex: 1;
+        }
+      }
+    }
+    
+    &--right {
+      flex: 1;
+      
+      &__content {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        flex: 1;
+        
+        &__slot {
+          flex: 1;
+          /* #ifndef MP */
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          /* #endif */
+        }
+        
+        &__icon {
+          margin-left: 10rpx;
+          color: $tn-font-sub-color;
+          font-size: 30rpx;
+        }
+      }
+    }
+    
+    &__message {
+      font-size: 24rpx;
+      line-height: 24rpx;
+      color: $tn-color-red;
+      margin-top: 12rpx;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-form/tn-form.vue b/tuniao-ui/components/tn-form/tn-form.vue
new file mode 100644
index 0000000..6a2524f
--- /dev/null
+++ b/tuniao-ui/components/tn-form/tn-form.vue
@@ -0,0 +1,139 @@
+<template>
+  <view class="tn-form-class tn-form">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-form',
+    props: {
+      // 表单数据对象（需要验证的表单数据）
+      model: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 发生错误时的提示方式
+      // toast - 弹出toast框
+      // message - 提示信息
+      // border - 如果设置了边框，边框会变成红色
+      // border-bottom - 下边框会呈现红色
+      // none - 无提示
+      errorType: {
+        type: Array,
+        default() {
+          return ['message', 'toast']
+        }
+      },
+      // 是否显示表单域的下划线边框
+      borderBottom: {
+        type:Boolean,
+        default: true
+      },
+      // label(标签名称)的位置
+      // left - 左边
+      // top - 上边
+      labelPosition: {
+        type: String,
+        default: 'left'
+      },
+      // label的宽度
+      labelWidth: {
+        type: Number,
+        default: 90
+      },
+      // label的对齐方式
+      // left - 左对齐
+      // center - 居中对齐
+      // right - 右对齐
+      labelAlign: {
+        type: String,
+        default: 'left'
+      },
+      // label 的样式
+      labelStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      }
+    },
+    // 向子孙传递数据
+    provide() {
+      return {
+        tnForm: this
+      }
+    },
+    data() {
+      return {
+        rules: {}
+      }
+    },
+    created() {
+      // 存储当前form下的所有form-item的实例
+      // 不能定义再data中，否则小程序会循环引用而报错
+      this.fields = []
+    },
+    methods: {
+      /**
+       * 设置规则
+       * 
+       * @param {Object} rules
+       */
+      setRules(rules) {
+        this.rules = rules
+      },
+      /**
+       * 清空form-item组件
+       */
+      resetFields() {
+        this.fields.map(field => {
+          field.resetField()
+        })
+      },
+      /**
+       * 校验数据
+       * @param {Object} callback 校验回调方法
+       */
+      validate(callback) {
+        return new Promise(resolve => {
+          // 标记校验是否通过
+          let valid = true
+          // 标记是否检查完毕
+          let count = 0
+          // 存放错误信息
+          let errors = []
+          
+          // 对所有form-item进行校验
+          this.fields.map(field => {
+            // 调用对应form-item实例的validation校验方法
+            field.validation('', error => {
+              // 如果有一个form-item校验不通过，则整个表单校验不通过
+              if (error) {
+                valid = false
+                errors.push(error)
+              }
+              // 当遍历完所有的form-item的校验规则，返回信息
+              if (++count === this.fields.length) {
+                resolve(valid)
+                // 判断是否设置了toast的提示方式，只提示表单域中最前面的一条错误信息
+                if (this.errorType.indexOf('none') === -1 && 
+                    this.errorType.indexOf('toast') >= 0 &&
+                    errors.length > 0) {
+                  this.$tn.message.toast(errors[0])
+                }
+                // 调用回调方法
+                if (typeof callback == 'function') callback(valid)
+              }
+            })
+          })
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+</style>
diff --git a/tuniao-ui/components/tn-goods-nav/tn-goods-nav.vue b/tuniao-ui/components/tn-goods-nav/tn-goods-nav.vue
new file mode 100644
index 0000000..b3d3a60
--- /dev/null
+++ b/tuniao-ui/components/tn-goods-nav/tn-goods-nav.vue
@@ -0,0 +1,382 @@
+<template>
+  <view
+    class="tn-goods-nav-class tn-goods-nav"
+    :class="[
+      backgroundColorClass,
+      {
+        'tn-goods-nav--fixed': fixed,
+        'tn-safe-area-inset-bottom': safeAreaInsetBottom,
+        'tn-goods-nav--shadow': shadow
+      }
+    ]"
+    :style="[backgroundColorStyle, navStyle]"
+  >
+    <view class="options">
+      <view
+        v-for="(item, index) in optionsData"
+        :key="index"
+        class="options__item"
+        :class="[{'options__item--avatar': item.showAvatar}]"
+        @tap="handleOptionClick(index)"
+      >
+        <block v-if="item.showAvatar">
+          <tn-avatar
+            :src="item.avatar"
+            size="sm"
+            :badge="item.showBadge"
+            :badgeText="item.count"
+            :badgeBgColor="item.countBackgroundColor"
+            :badgeColor="item.countFontColor"
+            :badgeSize="26"
+          ></tn-avatar>
+        </block>
+        <block v-else>
+          <view class="options__item__icon" :class="[`tn-icon-${item.icon}`]" :style="[optionStyle(index, 'icon')]">
+            <tn-badge v-if="item.showBadge" :absolute="true" :backgroundColor="item.countBackgroundColor" :fontColor="item.countFontColor" :fontSize="16" padding="2rpx 5rpx">{{ item.count }}</tn-badge>
+          </view>
+          <view class="options__item__text" :style="[optionStyle(index, 'text')]">{{ item.text }}</view>
+        </block>
+      </view>
+    </view>
+    <view class="buttons">
+      <view
+        v-for="(item, index) in buttonGroupsData"
+        :key="index"
+        class="buttons__item"
+        :class="[buttonClass(index)]"
+        :style="[buttonStyle(index)]"
+        @tap="handleButtonClick(index)"
+      >
+        <view class="buttons__item__text">{{ item.text }}</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-goods-nav',
+    props: {
+      // 选项信息
+      // 建议不超过3个
+      // {
+      //   icon: '', // 图标名称
+      //   text: '', // 显示的文本
+      //   count: '', // 角标的值
+      //   countBackgroundColor: '', // 角标背景颜色
+      //   countFontColor: '', // 角标字体颜色
+      //   iconColor: '', // 图标颜色
+      //   textColor: '', // 文本颜色
+      //   avatar: '', // 显示头像（此时将不显示图标和文本）
+      // }
+      options: {
+        type: Array,
+        default() {
+          return [{
+            icon: 'shop',
+            text: '店铺'
+          },{
+            icon: 'service',
+            text: '客服'
+          },{
+            icon: 'star',
+            text: '收藏'
+          }]
+        }
+      },
+      // 按钮组
+      // 建议不超过2个
+      // {
+      //   text: '', // 显示的文本
+      //   backgroundColor: '', // 按钮背景颜色
+      //   color: '' // 文本颜色
+      // }
+      buttonGroups: {
+        type: Array,
+        default() {
+          return [{
+            text: '加入购物车',
+            backgroundColor: '#FFA726',
+            color: '#FFFFFF'
+          },{
+            text: '结算',
+            backgroundColor: '#FF7043',
+            color: '#FFFFFF'
+          }]
+        }
+      },
+      // 背景颜色
+      backgroundColor: {
+        type: String,
+        default: ''
+      },
+      // 导航的高度，单位rpx
+      height: {
+        type: Number,
+        default: 0
+      },
+      // 显示阴影
+      shadow: {
+        type: Boolean,
+        default: false
+      },
+      // 导航的层级
+      zIndex: {
+        type: Number,
+        default: 0
+      },
+      // 按钮类型
+      // rect -> 方形 paddingRect -> 上下带边距方形 round -> 圆角
+      buttonType: {
+        type: String,
+        default: 'rect'
+      },
+      // 是否固定在底部
+      fixed: {
+        type: Boolean,
+        default: false
+      },
+      // 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+      safeAreaInsetBottom: {
+      	type: Boolean,
+      	default: false
+      }
+    },
+    computed: {
+      backgroundColorStyle() {
+        return this.$tn.color.getBackgroundColorStyle(this.backgroundColor)
+      },
+      backgroundColorClass() {
+        return this.$tn.color.getBackgroundColorInternalClass(this.backgroundColor)
+      },
+      navStyle() {
+        let style = {}
+        if (this.height) {
+          style.height = this.height + 'rpx'
+        }
+        style.zIndex = this.zIndex ? this.zIndex : this.$tn.zIndex.goodsNav
+        return style
+      },
+      // 选项style
+      optionStyle() {
+        return (index, type) => {
+          let style = {}
+          const item = this.optionsData[index]
+          if (type === 'icon' && item.iconColor) {
+            style.color = item.iconColor
+          } else if (type === 'text' && item.fontColor) {
+            style.color = item.fontColor
+          }
+          return style
+        }
+      },
+      // 按钮class
+      buttonClass() {
+        return (index) => {
+          let clazz = ''
+          const item = this.buttonGroupsData[index]
+          if (item.backgroundColorClass) {
+            clazz += ` ${item.backgroundColorClass}`
+          }
+          if (item.colorClass) {
+            clazz += ` ${item.colorClass}`
+          }
+          
+          clazz += ` buttons__item--${this.$tn.string.humpConvertChar(this.buttonType, '-')}`
+          
+          return clazz
+        }
+      },
+      // 按钮style
+      buttonStyle() {
+        return (index) => {
+          let style = {}
+          const item = this.buttonGroupsData[index]
+          if (item.backgroundColorStyle) {
+            style.backgroundColor = item.backgroundColorStyle
+          }
+          if (item.colorStyle) {
+            style.color = item.colorStyle
+          }
+          return style
+        }
+      }
+    },
+    watch: {
+      options(val) {
+        this.initData()
+      },
+      buttonGroups(val) {
+        this.initData()
+      }
+    },
+    data() {
+      return {
+        // 保存选项数据
+        optionsData: [],
+        // 保存按钮组数据
+        buttonGroupsData: []
+      }
+    },
+    created() {
+      this.initData()
+    },
+    methods: {
+      // 初始化选项和按钮数据
+      initData() {
+        this.handleOptionsData()
+        this.handleButtonGroupsData()
+      },
+      // 选项点击事件
+      handleOptionClick(index) {
+        this.$emit('optionClick', {
+          index: index
+        })
+      },
+      // 按钮点击事件
+      handleButtonClick(index) {
+        this.$emit('buttonClick', {
+          index: index
+        })
+      },
+      // 处理选项组数据
+      handleOptionsData() {
+        this.optionsData = this.options.map((item) => {
+          let option = {...item}
+          option.showAvatar = item.hasOwnProperty('avatar')
+          if (item.hasOwnProperty('count')) {
+            const count = this.$tn.number.formatNumberString(item.count, 2)
+            option.showBadge = true
+            option.count = typeof count === 'number' ? String(count) : count
+            option.countBackgroundColor = item.countBackgroundColor ? item.countBackgroundColor : '#01BEFF'
+            option.countFontColor = item.countFontColor ? item.countFontColor : '#FFFFFF'
+          }
+          
+          return option
+        })
+      },
+      // 处理按钮组数据
+      handleButtonGroupsData() {
+        this.buttonGroupsData = this.buttonGroups.map((item) => {
+          let button = {...item}
+          if (item.hasOwnProperty('backgroundColor')) {
+            button.backgroundColorClass = this.$tn.color.getBackgroundColorInternalClass(item.backgroundColor)
+            button.backgroundColorStyle = this.$tn.color.getBackgroundColorStyle(item.backgroundColor)
+          }
+          if (item.hasOwnProperty('color')) {
+            button.colorClass = this.$tn.color.getBackgroundColorInternalClass(item.color)
+            button.colorStyle = this.$tn.color.getBackgroundColorStyle(item.color)
+          }
+          return button
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-goods-nav {
+    background-color: #FFFFFF;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    height: 88rpx;
+    width: 100%;
+    box-sizing: content-box;
+    
+    &--shadow {
+      box-shadow: 0rpx -10rpx 30rpx 0rpx rgba(0, 0, 0, 0.05);
+      
+      &::before {
+        content: " ";
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        margin: auto;
+        background-color: transparent;
+        z-index: -1;
+      }
+    }
+    
+    &--fixed {
+      position: fixed;
+      bottom: 0;
+      left: 0;
+      right: 0;
+    }
+    
+    .options {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      height: 100%;
+      color: #AAAAAA;
+      
+      &__item {
+        padding: 0 26rpx;
+        
+        &--avatar {
+          padding: 0rpx 0rpx 0rpx 26rpx !important;
+        }
+        
+        &__icon {
+          position: relative;
+          font-size: 36rpx;
+          margin-bottom: 6rpx;
+        }
+        
+        &__text {
+          font-size: 22rpx;
+        }
+      }
+    }
+    
+    .buttons {
+      flex: 1;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      height: 100%;
+      
+      &__item {
+        flex: 1;
+        padding: 0 10rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        
+        &--rect {
+          height: 100%;
+        }
+        
+        &--padding-rect {
+          height: 80%;
+        }
+        
+        &--round {
+          height: 75%;
+          &:first-child {
+            border-top-left-radius: 100rpx;
+            border-bottom-left-radius: 100rpx;
+          }
+          &:last-child {
+            border-top-right-radius: 100rpx;
+            border-bottom-right-radius: 100rpx;
+          }
+        }
+        
+        &__text {
+          display: inline-block;
+          font-weight: bold;
+          font-size: 30rpx;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          overflow: hidden;
+        }
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-grid-item/tn-grid-item.vue b/tuniao-ui/components/tn-grid-item/tn-grid-item.vue
new file mode 100644
index 0000000..312f60e
--- /dev/null
+++ b/tuniao-ui/components/tn-grid-item/tn-grid-item.vue
@@ -0,0 +1,104 @@
+<template>
+	<view class="tn-grid-item-class tn-grid-item" :class="[
+      backgroundColorClass
+    ]" :hover-class="hoverClass" :hover-stay-time="150" :style="{
+      backgroundColor: backgroundColorStyle,
+      width: gridWidth
+    }" @tap="click">
+		<view class="tn-grid-item__box">
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import componentsColorMixin from '../../libs/mixin/components_color.js'
+	export default {
+		mixins: [componentsColorMixin],
+		name: 'tn-grid-item',
+		props: {
+			// 序号
+			index: {
+				type: [Number, String],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				// 父组件数据
+				parentData: {
+					// 按下去的样式
+					hoverClass: '',
+					col: 3
+				}
+			}
+		},
+		created() {
+			// 父组件实例
+			this.updateParentData()
+			this.parent.children.push(this)
+		},
+		computed: {
+			// 计算每个宫格的宽度
+			gridWidth() {
+				// #ifdef MP-WEIXIN
+				return '100%'
+				// #endif
+				// #ifndef MP-WEIXIN
+				return 100 / Number(this.parentData.col) + '%'
+				// #endif
+			},
+			// 点击效果
+			hoverClass() {
+				return this.parentData.hoverClass !== 'none' ?
+					this.parentData.hoverClass + ' tn-grid-item--hover' :
+					this.parentData.hoverClass
+			}
+		},
+		methods: {
+			// 获取父组件参数
+			updateParentData() {
+				this.getParentData('tn-grid')
+			},
+			click() {
+				this.$emit('click', this.index)
+				this.parent && this.parent.click(this.index)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tn-grid-item {
+		box-sizing: border-box;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: row;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		flex-direction: column;
+
+		/* #ifdef MP */
+		// float: left;
+		/* #endif */
+
+		&__box {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			flex-direction: row;
+			/* #endif */
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			flex: 1;
+			width: 100%;
+			height: 100%;
+		}
+
+		&--hover {
+			background: $tn-space-color !important;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-grid/tn-grid.vue b/tuniao-ui/components/tn-grid/tn-grid.vue
new file mode 100644
index 0000000..f5487c6
--- /dev/null
+++ b/tuniao-ui/components/tn-grid/tn-grid.vue
@@ -0,0 +1,111 @@
+<template>
+  <view
+    class="tn-grid-class tn-grid"
+    :style="{
+      justifyContent: gridAlignStyle
+    }"
+  >
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-grid',
+    props: {
+      // 分成几列
+      col: {
+        type: [Number, String],
+        default: 3
+      },
+      // 宫格对齐方式 
+      // left 左对齐 center 居中对齐 right 右对齐
+      align: {
+        type: String,
+        default: 'left'
+      },
+      // 点击时的效果，none没有效果
+      hoverClass: {
+        type: String,
+        default: 'tn-hover'
+      }
+    },
+    data() {
+      return {
+        
+      }
+    },
+    watch: {
+      // 当父组件和子组件需要共享参数变化，通知子组件
+      parentData() {
+        if (this.children.length) {
+          this.children.map(child => {
+            // 判断子组件是否有updateParentData方式，有才执行
+            typeof(child.updateParentData) === 'function' && child.updateParentData()
+          })
+        }
+      }
+    },
+    created() {
+      // 如果将children定义在data中，在微信小程序会造成循环引用而报错
+      this.children = []
+    },
+    computed: {
+      // 计算父组件的值是否发生变化
+      parentData() {
+        return [this.hoverClass, this.col, this.border]
+      },
+      // 宫格对齐方式
+      gridAlignStyle() {
+        switch(this.align) {
+          case 'left':
+            return 'flex-start'
+          case 'center':
+            return 'center'
+          case 'right':
+            return 'flex-end'
+          default:
+            return 'flex-start'
+        }
+      }
+    },
+    methods: {
+      click(index) {
+        this.$emit('click', index)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  // 组件中兼容小程序的方式，不过不能使用对齐方式
+  // .tn-grid {
+  //   width: 100%;
+  //   /* #ifdef MP */
+  //   position: relative;
+  //   box-sizing: border-box;
+  //   overflow: hidden;
+  //   /* #endif */
+    
+  //   /* #ifndef MP */
+  //   /* #ifndef APP-NVUE */
+  //   display: flex;
+  //   flex-direction: row;
+  //   /* #endif */
+  //   flex-wrap: wrap;
+  //   align-items: center;
+  //   /* #endif */
+  // }
+  
+  // 在使用组件时兼容小程序
+  .tn-grid {
+    width: 100%;
+    
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: center;
+  }
+  
+</style>
diff --git a/tuniao-ui/components/tn-image-upload-drag/tn-image-upload-drag.vue b/tuniao-ui/components/tn-image-upload-drag/tn-image-upload-drag.vue
new file mode 100644
index 0000000..a72c6d8
--- /dev/null
+++ b/tuniao-ui/components/tn-image-upload-drag/tn-image-upload-drag.vue
@@ -0,0 +1,996 @@
+<template>
+  <view v-if="!disabled" class="tn-image-upload-class tn-image-upload">
+    <movable-area
+      class="tn-image-upload__movable-area"
+      :style="{
+        height: movableAreaHeight
+      }"
+      @mouseenter="mouseEnterArea"
+      @mouseleave="mouseLeaveArea"
+    >
+      <block
+        v-for="(item, index) in lists"
+        :key="item.id"
+      >
+        <movable-view
+          class="tn-image-upload__movable-view"
+          :style="{
+            width: $tn.string.getLengthUnitValue(width),
+            height: $tn.string.getLengthUnitValue(height),
+            zIndex: item.zIndex,
+            opacity: item.opacity,
+            
+          }"
+          :x="item.x"
+          :y="item.y"
+          direction="all"
+          :damping="40"
+          :disabled="item.disabled"
+          @change="movableChange($event, item)"
+          @touchstart="movableStart(item)"
+          @mousedown="movableStart(item)"
+          @touchend="movableEnd(item)"
+          @mouseup="movableEnd(item)"
+          @longpress="movableLongPress(item)"
+        >
+          <view
+            class="tn-image-upload__item tn-image-upload__item-preview"
+            :style="{
+              width: $tn.string.getLengthUnitValue(itemWidth, 'px'),
+              height: $tn.string.getLengthUnitValue(itemHeight, 'px'),
+              transform: `scale(${item.scale})`
+            }"
+          >
+            <!-- 删除按钮 -->
+            <view
+              v-if="deleteable"
+              class="tn-image-upload__item-preview__delete"
+              @tap.stop="deleteItem(index)"
+              :style="{
+                borderTopColor: deleteBackgroundColor
+              }"
+            >
+              <view
+                class="tn-image-upload__item-preview__delete--icon"
+                :class="[`tn-icon-${deleteIcon}`]"
+                :style="{
+                  color: deleteColor
+                }"
+              ></view>
+            </view>
+            <!-- 进度条 -->
+            <tn-line-progress
+              v-if="showProgress && item.data.progress > 0 && !item.data.error"
+              class="tn-image-upload__item-preview__progress"
+              :percent="item.data.progress"
+              :showPercent="false"
+              :round="false"
+              :height="8"
+            ></tn-line-progress>
+            <!-- 重试按钮 -->
+            <view v-if="item.data.error" class="tn-image-upload__item-preview__error-btn" @tap.stop="retry(index)">点击重试</view>
+            <!-- 图片信息 -->
+            <image
+              class="tn-image-upload__item-preview__image"
+              :src="item.data.url || item.data.path"
+              :mode="imageMode"
+              @tap.stop="doPreviewImage(item.data.url || item.data.path, index)"
+            ></image>
+          </view>
+        </movable-view>
+      </block>
+      
+      <!-- 添加按钮 -->
+      <view
+        v-if="maxCount > lists.length"
+        class="tn-image-upload__add"
+        :style="{
+          top: addBtn.y + 'px',
+          left: addBtn.x + 'px',
+          width: $tn.string.getLengthUnitValue(itemWidth, 'px'),
+          height: $tn.string.getLengthUnitValue(itemHeight, 'px')
+        }"
+        @tap="selectFile"
+      >
+        <!-- 添加按钮 -->
+        <view
+          class="tn-image-upload__item tn-image-upload__item-add"
+          hover-class="tn-hover-class"
+          hover-stay-time="150"
+          :style="{
+            width: $tn.string.getLengthUnitValue(itemWidth, 'px'),
+            height: $tn.string.getLengthUnitValue(itemHeight, 'px')
+          }"
+        >
+          <view class="tn-image-upload__item-add--icon tn-icon-add"></view>
+          <view class="tn-image-upload__item-add__tips">{{ uploadText }}</view>
+        </view>
+      </view>
+    </movable-area>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-image-upload-drag',
+    props: {
+      // 已上传的文件列表
+      fileList: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 上传图片地址
+      action: {
+        type: String,
+        default: ''
+      },
+      // 上传文件的字段名称
+      name: {
+        type: String,
+        default: 'file'
+      },
+      // 头部信息
+      header: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 携带的参数
+      formData: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 是否禁用
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 是否自动上传
+      autoUpload: {
+        type: Boolean,
+        default: true
+      },
+      // 最大上传数量
+      maxCount: {
+        type: Number,
+        default: 9
+      },
+      // 预览上传图片的裁剪模式
+      imageMode: {
+        type: String,
+        default: 'aspectFill'
+      },
+      // 点击图片是否全屏预览
+      previewFullImage: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示进度条
+      showProgress: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示删除按钮
+      deleteable: {
+        type: Boolean,
+        default: true
+      },
+      // 删除按钮图标
+      deleteIcon: {
+        type: String,
+        default: 'close'
+      },
+      // 删除按钮的背景颜色
+      deleteBackgroundColor: {
+        type: String,
+        default: ''
+      },
+      // 删除按钮的颜色
+      deleteColor: {
+        type: String,
+        default: ''
+      },
+      // 上传区域提示文字
+      uploadText: {
+        type: String,
+        default: '选择图片'
+      },
+      // 显示toast提示
+      showTips: {
+        type: Boolean,
+        default: true
+      },
+      // 预览图片和选择图片区域的宽度
+      width: {
+        type: Number,
+        default: 200
+      },
+      // 预览图片和选择图片区域的高度
+      height: {
+        type: Number,
+        default: 200
+      },
+      // 选择图片的尺寸
+      // 参考上传文档 https://uniapp.dcloud.io/api/media/image
+      sizeType: {
+        type: Array,
+        default() {
+          return ['original', 'compressed']
+        }
+      },
+      // 图片来源
+      sourceType: {
+        type: Array,
+        default() {
+          return ['album', 'camera']
+        }
+      },
+      // 是否可以多选
+      multiple: {
+        type: Boolean,
+        default: true
+      },
+      // 文件大小(byte)
+      maxSize: {
+        type: Number,
+        default: 10 * 1024 * 1024
+      },
+      // 允许上传的类型
+      limitType: {
+        type: Array,
+        default() {
+          return ['png','jpg','jpeg','webp','gif','image']
+        }
+      },
+      // 是否自定转换为json
+      toJson: {
+        type: Boolean,
+        default: true
+      },
+      // 上传前钩子函数，每个文件上传前都会执行
+      beforeUpload: {
+        type: Function,
+        default: null
+      },
+      // 删除文件前钩子函数
+      beforeRemove: {
+        type: Function,
+        default: null
+      },
+      index: {
+        type: [Number, String],
+        default: ''
+      }
+    },
+    computed: {
+      movableAreaHeight() {
+        if (this.lists.length < this.maxCount) {
+          return Math.ceil((this.lists.length + 1) / this.baseData.columns) * uni.upx2px(this.height) + 'px'
+        } else {
+          return Math.ceil(this.lists.length / this.baseData.columns) * uni.upx2px(this.height) + 'px'
+        }
+      },
+      itemWidth() {
+        return uni.upx2px(this.width) - (uni.upx2px(10) * 2)
+      },
+      itemHeight() {
+        return uni.upx2px(this.height) - (uni.upx2px(10) * 2)
+      }
+    },
+    data() {
+      return {
+        lists: [],
+        uploading: false,
+        baseData: {
+          windowWidth: 0,
+          columns: 0,
+          dragItem: null,
+          widthPx: 0,
+          heightPx: 0
+        },
+        addBtn: {
+          x: 0,
+          y: 0
+        },
+        timer: null,
+        dragging: false
+      }
+    },
+    watch: {
+      // fileList: {
+      //   handler(val) {
+      //     val.map(value => {
+      //       // 首先检查内部是否已经添加过这张图片，因为外部绑定了一个对象给fileList的话(对象引用)，进行修改外部fileList时，
+      //       // 会触发watch，导致重新把原来的图片再次添加到this.lists
+      //       // 数组的some方法意思是，只要数组元素有任意一个元素条件符合，就返回true，而另一个数组的every方法的意思是数组所有元素都符合条件才返回true
+      //       let tmp = this.lists.some(listVal => {
+      //         return listVal.url === value.url
+      //       })
+      //       // 如果内部没有这张图片，则添加到内部
+      //       !tmp && this.lists.push({ url: value.url, error: false, progress: 100 })
+      //     })
+      //   },
+      //   immediate: true
+      // },
+      lists(val) {
+        this.$emit('on-list-change', this.sortList(), this.index)
+      }
+    },
+    created() {
+      this.baseData.windowWidth = uni.getSystemInfoSync().windowWidth
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.updateDragInfo()
+      })
+    },
+    methods: {
+      // 清除列表
+      clear() {
+        this.lists = []
+        this.updateAddBtnPositioin()
+      },
+      // 重新上传队列中上传失败所有文件
+      reUpload() {
+        this.uploadFile()
+      },
+      // 选择图片
+      selectFile() {
+        if (this.disabled) return
+        const {
+          name = '',
+          maxCount,
+          multiple,
+          maxSize,
+          sizeType,
+          lists,
+          camera,
+          compressed,
+          sourceType
+        } = this
+        let chooseFile = null
+        const newMaxCount = maxCount - lists.length
+        // 只选择图片的时候使用 chooseImage 来实现
+        chooseFile = new Promise((resolve, reject) => {
+          uni.chooseImage({
+            count: multiple ? (newMaxCount > 9 ? 9 : newMaxCount) : 1,
+            sourceType,
+            sizeType,
+            success: resolve,
+            fail: reject
+          })
+        })
+        chooseFile.then(res => {
+          let file = null
+          let listOldLength = lists.length
+          res.tempFiles.map((val, index) => {
+            if (!this.checkFileExt(val)) return
+            
+            // 是否超出最大限制数量
+            if (!multiple && index >= 1) return
+            if (val.size > maxSize) {
+              this.$emit('on-oversize', val, this.sortList(), this.index)
+              this.showToast('超出可允许文件大小')
+            } else {
+              if (maxCount <= lists.length) {
+                this.$emit('on-exceed', val, this.sortList(), this.index)
+                this.showToast('超出最大允许的文件数')
+                return
+              }
+              lists.push(this.handleDragListItem({
+                url: val.path,
+                progress: 0,
+                error: false,
+                file: val
+              }))
+              this.updateAddBtnPositioin()
+            }
+          })
+          this.$emit('on-choose-complete', this.sortList(), this.index)
+          if (this.autoUpload) this.uploadFile(listOldLength)
+        }).catch(err => {
+          this.$emit('on-choose-fail', err)
+        })
+      },
+      // 提示用户信息
+      showToast(message, force = false) {
+        if (this.showTips || force) {
+          this.$tn.message.toast(message)
+        }
+      },
+      // 手动上传，通过ref进行调用
+      upload() {
+        this.uploadFile()
+      },
+      // 对失败图片进行再次上传
+      retry(index) {
+        this.lists[index].data.progress = 0
+        this.lists[index].data.error = false
+        this.lists[index].data.response = null
+        this.$tn.message.loading('重新上传')
+        this.uploadFile(index)
+      },
+      // 上传文件
+      async uploadFile(index = 0) {
+        if (this.disabled) return
+        if (this.uploading) return
+        // 全部上传完成
+        if (index >= this.lists.length) {
+          this.$emit('on-uploaded', this.sortList(), this.index)
+          return
+        }
+        // 检查是否已经全部上传或者上传中
+        if (this.lists[index].data.progress === 100) {
+          this.lists[index].data.uploadTask = null
+          if (this.autoUpload) this.uploadFile(index + 1)
+          return
+        }
+        // 执行before-upload钩子
+        if (this.beforeUpload && typeof(this.beforeUpload) === 'function') {
+          // 在微信，支付宝等环境(H5正常)，会导致父组件定义的函数体中的this变成子组件的this
+          // 通过bind()方法，绑定父组件的this，让this的this为父组件的上下文
+          // 因为upload组件可能会被嵌套在其他组件内，比如tn-form，这时this.$parent其实为tn-form的this，
+          // 非页面的this，所以这里需要往上历遍，一直寻找到最顶端的$parent，这里用了this.$u.$parent.call(this)
+          let beforeResponse = this.beforeUpload.bind(this.$tn.$parent.call(this))(index, this.lists)
+          // 判断是否返回了Promise
+          if (!!beforeResponse && typeof beforeResponse.then === 'function') {
+            await beforeResponse.then(res => {
+              // promise返回成功，不进行操作继续
+            }).catch(err => {
+              // 进入catch回调的话，继续下一张
+              return this.uploadFile(index + 1)
+            })
+          } else if (beforeResponse === false) {
+            // 如果返回flase，继续下一张图片上传
+            return this.uploadFile(index + 1)
+          } else {
+            // 为true的情况，不进行操作
+          }
+        }
+        // 检查上传地址
+        if (!this.action) {
+          this.showToast('请配置上传地址', true)
+          return
+        }
+        this.lists[index].data.error = false
+        this.uploading = true
+        // 创建上传对象
+        const task = uni.uploadFile({
+          url: this.action,
+          filePath: this.lists[index].data.url,
+          name: this.name,
+          formData: this.formData,
+          header: this.header,
+          success: res => {
+            // 判断啊是否为json字符串，将其转换为json格式
+            let data = this.toJson && this.$tn.test.jsonString(res.data) ? JSON.parse(res.data) : res.data
+            if (![200, 201, 204].includes(res.statusCode)) {
+              this.uploadError(index, data)
+            } else {
+              this.lists[index].data.response = data
+              this.lists[index].data.progress = 100
+              this.lists[index].data.error = false
+              this.$emit('on-success', data, index, this.sortList(), this.index)
+            }
+          },
+          fail: err => {
+            this.uploadError(index, err)
+          },
+          complete: res => {
+            this.$tn.message.closeLoading()
+            this.uploading = false
+            this.uploadFile(index + 1)
+            this.$emit('on-change', res, index, this.sortList(), this.index)
+          }
+        })
+        this.lists[index].uploadTask = task
+        task.onProgressUpdate(res => {
+          if (res.progress > 0) {
+            this.lists[index].data.progress = res.progress
+            this.$emit('on-progress', res, index, this.sortList(), this.index)
+          }
+        })
+      },
+      // 上传失败
+      uploadError(index, err) {
+        this.lists[index].data.progress = 0
+        this.lists[index].data.error = true
+        this.lists[index].data.response = null
+        this.showToast('上传失败，请重试')
+        this.$emit('on-error', err, index, this.sortList(), this.index)
+      },
+      // 删除一个图片
+      deleteItem(index) {
+        if (!this.deleteable) return
+        this.$tn.message.modal(
+          '提示',
+          '您确定要删除吗？',
+          async () => {
+            // 先检查是否有定义before-remove移除前钩子
+            // 执行before-remove钩子
+            if (this.beforeRemove && typeof(this.beforeRemove) === 'function') {
+              let beforeResponse = this.beforeRemove.bind(this.$tn.$parent.call(this))(index, this.lists)
+              // 判断是否返回promise 
+              if (!!beforeResponse && typeof beforeResponse.then === 'function') {
+                await beforeResponse.then(res => {
+                  // promise返回成功不进行操作
+                  this.handlerDeleteItem(index)
+                }).catch(err => {
+                  this.showToast('删除操作被中断')
+                })
+              } else if (beforeResponse === false) {
+                this.showToast('删除操作被中断')
+              } else {
+                this.handlerDeleteItem(index)
+              }
+            } else {
+              this.handlerDeleteItem(index)
+            }
+          }, true)
+      },
+      // 移除文件操作
+      handlerDeleteItem(index) {
+        // 如果文件正在上传中，终止上传任务
+        if (this.lists[index].data.progress < 100 && this.lists[index].data.progress > 0) {
+          typeof this.lists[index].data.uploadTask !== 'undefined' && this.lists[index].data.uploadTask.abort()
+        }
+        this.remove(index)
+        this.$forceUpdate()
+        this.$emit('on-remove', index, this.sortList(), this.index)
+        this.showToast('删除成功')
+      },
+      // 移除文件，通过ref手动形式进行调用
+      remove(index) {
+        if (!this.deleteable) return
+        // 判断索引合法
+        if (index >= 0 && index < this.lists.length) {
+          let currentItemIndex = this.lists[index].index
+          this.lists.splice(index, 1)
+          // 重新排列列表信息
+          for (let item of this.lists) {
+            if (item.index > currentItemIndex) {
+              item.index -= 1
+              item.x = item.positionX * this.baseData.widthPx
+              item.y = item.positionY * this.baseData.heightPx
+              item.positionX = item.index % this.baseData.columns
+              item.positionY = Math.floor(item.index / this.baseData.columns)
+              this.$nextTick(() => {
+                item.x = item.positionX * this.baseData.widthPx
+                item.y = item.positionY * this.baseData.heightPx
+              })
+            }
+          }
+          
+          this.updateAddBtnPositioin()
+        }
+      },
+      // 预览图片
+      doPreviewImage(url, index) {
+        if (!this.previewFullImage) return
+        const images = this.lists.sort((l1, l2) => { return l1.index - l2.index}).map(item => item.data.url || item.data.path)
+        uni.previewImage({
+          urls: images,
+          current: url,
+          success: () => {
+            this.$emit('on-preview', url, this.sortList(), this.index)
+          },
+          fail: () => {
+            this.showToast('预览图片失败')
+          }
+        })
+      },
+      // 检查文件后缀是否合法
+      checkFileExt(file) {
+        // 是否为合法后缀
+        let noArrowExt = false
+        // 后缀名
+        let fileExt = ''
+        const reg = /.+\./
+        
+        // #ifdef H5
+        fileExt = file.name.replace(reg, '').toLowerCase()
+        // #endif
+        // #ifndef H5
+        fileExt = file.path.replace(reg, '').toLowerCase()
+        // #endif
+        noArrowExt = this.limitType.some(ext => {
+          return ext.toLowerCase() === fileExt
+        })
+        if (!noArrowExt) this.showToast(`不支持${fileExt}格式的文件`)
+        return noArrowExt
+      },
+      
+      /********************* 拖拽处理 ********************/
+      
+      // 更新拖拽信息
+      updateDragInfo() {
+        this.baseData.widthPx = uni.upx2px(this.width)
+        this.baseData.heightPx = uni.upx2px(this.height)
+        
+        // 获取可移动区域的信息，用于判断当前有多少列
+        const query = uni.createSelectorQuery().in(this)
+        query.select('.tn-image-upload__movable-area').boundingClientRect()
+        query.exec((res) => {
+          if (!res) {
+            setTimeout(() => {
+              this.updateDragInfo()
+            }, 10)
+            return
+          }
+          this.baseData.columns = Math.floor(res[0].width / this.baseData.widthPx)
+          
+          // 初始化可拖拽列表信息
+          this.lists = []
+          this.fileList.forEach((item) => {
+            // 首先检查内部是否已经添加过这张图片，因为外部绑定了一个对象给fileList的话(对象引用)，进行修改外部fileList时，
+            // 会触发watch，导致重新把原来的图片再次添加到this.lists
+            // 数组的some方法意思是，只要数组元素有任意一个元素条件符合，就返回true，而另一个数组的every方法的意思是数组所有元素都符合条件才返回true
+            let tmp = this.lists.map(value => {
+              return value.data
+            }).some(listVal => {
+              return listVal.url === item.url
+            })
+            // 如果内部没有这张图片，则添加到内部
+            !tmp && this.lists.push(this.handleDragListItem({
+              url: item.url,
+              error: false,
+              progress: 100
+            }))
+          })
+          
+          // 更新添加按钮位置
+          this.updateAddBtnPositioin()
+        })
+      },
+      // 处理拖拽列表信息
+      handleDragListItem(item) {
+        const positionX = this.lists.length % this.baseData.columns
+        const positionY = Math.floor(this.lists.length / this.baseData.columns)
+        const x = positionX * this.baseData.widthPx
+        const y = positionY * this.baseData.heightPx
+        return {
+          id: this.unique(),
+          x,
+          y,
+          preX: x,
+          preY: y,
+          positionX,
+          positionY,
+          zIndex:1,
+          disabled: true,
+          opacity: 1,
+          scale: 1,
+          index: this.lists.length,
+          offset: 0,
+          moveEnd: false,
+          moving: false,
+          data: {
+            ...item
+          }
+        }
+      },
+      // 生成元素唯一id
+      unique(n = 6) {
+        let id = ''
+        for (let i = 0; i < n; i++) id += Math.floor(Math.random() * 10)
+        return 'tn_' + new Date().getTime() + id
+      },
+      // 更新添加按钮位置
+      updateAddBtnPositioin() {
+        if (this.lists.length >= this.maxCount) return
+        
+        this.addBtn.x = (this.lists.length % this.baseData.columns) * this.baseData.widthPx
+        this.addBtn.y = Math.floor(this.lists.length / this.baseData.columns) * this.baseData.heightPx
+      },
+      // 获取排序后数据
+      sortList() {
+        const list = this.lists.slice()
+        list.sort((l1, l2) => {
+          return l1.index - l2.index
+        })
+        return list.map(item => {
+          return item.data
+        })
+      },
+      mouseEnterArea () {
+        // #ifdef H5
+        this.lists.forEach(item => {
+          item.disabled = false
+        })
+        // #endif
+      },
+      mouseLeaveArea () {
+        // #ifdef H5
+        if (this.baseData.dragItem) {
+          this.lists.forEach(item => {
+            item.disabled = true
+            item.zIndex = 1
+            item.offset = 0
+            item.moveEnd = true
+            if (item.id === this.baseData.dragItem.id) {
+              if (this.timer) {
+                clearTimeout(this.timer)
+                this.timer = null
+              }
+              item.x = item.preX
+              item.y = item.preY
+              this.$nextTick(() => {
+                item.x = item.positionX * this.baseData.widthPx
+                item.y = item.positionY * this.baseData.heightPx
+                this.baseData.dragItem = null
+              })
+            }
+          })
+          this.dragging = false
+        }
+        // #endif
+      },
+      movableLongPress(item) {
+        // #ifndef H5
+          uni.vibrateShort()
+          // console.log("LongPress--------------------------------------------------------------");
+          this.lists.forEach(value => {
+            value.moving = false
+          })
+          this.dragging = true
+          // 设置对应的元素允许拖动
+          const index = this.lists.findIndex(obj => {
+            return obj.id === item.id
+          })
+          item.disabled = false
+          item.opacity = 0.7
+          item.scale = 1.1
+          this.$set(this.lists, index, item)
+        // #endif
+      },
+      movableChange (e, item) {
+        if (!item || !this.dragging) return
+        // console.log("movableChange");
+        item.moving = true
+        item.preX = e.detail.x
+        item.preY = e.detail.y
+        // console.log(item.preX, item.preY);
+        
+        if (e.detail.source === 'touch') {
+          if (!item.moveEnd) {
+            item.offset = Math.sqrt(
+              Math.pow(item.preX - item.positionX * this.baseData.widthPx, 2) + 
+              Math.pow(item.preY - item.positionY * this.baseData.heightPx, 2))
+          }
+          let x = Math.floor((e.detail.x + this.baseData.widthPx / 2) / this.baseData.widthPx)
+          if (x > this.baseData.columns) return
+          let y = Math.floor((e.detail.y + this.baseData.heightPx / 2) / this.baseData.heightPx)
+          let index = this.baseData.columns * y + x
+          if (item.index !== index && index < this.lists.length) {
+            for (let obj of this.lists) {
+              if (item.index > index && obj.index >= index && obj.index < item.index) {
+                this.updateItemPosition(obj, 1)
+              } else if (item.index < index && obj.index <= index && obj.index > item.index) {
+                this.updateItemPosition(obj, -1)
+              } else if (item.id != obj.id) {
+                // obj.offset = 0
+                // console.log(obj.moving);
+                // if (!obj.moving) {
+                //   obj.preX = obj.positionX * this.baseData.widthPx
+                //   obj.preY = obj.positionY * this.baseData.heightPx
+                //   console.log("moving", obj.id, obj.preX, obj.preY);
+                // }
+                // obj.x = obj.preX
+                // obj.y = obj.preY
+                // // console.log(obj.id, obj.preX, obj.preY);
+                // this.$nextTick(() => {
+                //   obj.x = obj.positionX * this.baseData.widthPx
+                //   obj.y = obj.positionY * this.baseData.heightPx
+                // })
+              }
+            }
+            item.index = index
+            item.positionX = x
+            item.positionY = y
+            // TODO 发送事件
+          }
+        }
+      },
+      movableStart (item) {
+        // console.log("movableStart");
+        this.lists.forEach(item => {
+          item.zIndex = 1
+          // #ifdef H5
+          item.disabled = false
+          // #endif
+        })
+        item.zIndex = 10
+        item.moveEnd = false
+        this.baseData.dragItem = item
+        // #ifdef H5
+        this.dragging =true
+        this.timer = setTimeout(() => {
+          item.opacity = 0.7
+          item.scale = 1.1
+          clearTimeout(this.timer)
+          this.timer = null
+        }, 200)
+        // #endif
+      },
+      movableEnd (item) {
+        if (!this.dragging) return
+        // console.log("movableEnd");
+        const index = this.lists.findIndex(obj => {
+          return obj.id === item.id
+        })
+        if (!item.moving) {
+          item.preX = item.positionX * this.baseData.widthPx
+          item.preY = item.positionY * this.baseData.heightPx
+        }
+        item.x = item.preX
+        item.y = item.preY
+        item.offset = 0
+        item.moveEnd = true
+        item.moving = false
+        item.disabled = true
+        // console.log(item.x, item.y);
+        // console.log(item.id, item.moving);
+        // this.$set(this.lists, index, item)
+        // this.lists[index] = item
+        // console.log(this.lists[index]);
+        this.lists.forEach(listValue => {
+          listValue.moving = false
+          listValue.disabled = true
+        })
+        this.$nextTick(() => {
+          item.x = item.positionX * this.baseData.widthPx
+          item.y = item.positionY * this.baseData.heightPx
+          item.opacity = 1
+          item.scale = 1
+          this.baseData.dragItem = null
+          this.dragging = false
+          // console.log(item.x, item.y);
+          this.$set(this.lists, index, item)
+        })
+        this.$emit('sort-list', this.sortList())
+      },
+      // 更新图片位置信息
+      updateItemPosition(item, offset) {
+        const index = this.lists.findIndex(obj => {
+          return obj.id === item.id
+        })
+        item.index += offset
+        item.offset = 0
+        item.positionX = item.index % this.baseData.columns
+        item.positionY = Math.floor(item.index / this.baseData.columns)
+        if (!item.moving) {
+          item.preX = item.positionX * this.baseData.widthPx
+          item.preY = item.positionY * this.baseData.heightPx
+        }
+        item.x = item.preX
+        item.y = item.preY
+        // console.log("updateItemPosition", item.id, item.preX, item.preY);
+        // this.$set(this.lists, index, item)
+        this.$nextTick(() => {
+          item.x = item.positionX * this.baseData.widthPx
+          item.y = item.positionY * this.baseData.heightPx
+          this.$set(this.lists, index, item)
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-image-upload {
+    position: relative;
+    
+    &__movable-area {
+      width: 100%;
+    }
+    
+    &__movable-view {
+      border-radius: 10rpx;
+      overflow: hidden;
+    }
+    
+    &__item {
+      /* #ifndef APP-NVUE */
+      display: flex;
+      /* #endif */
+      align-items: center;
+      justify-content: center;
+      width: 200rpx;
+      height: 200rpx;
+      background-color: transparent;
+      position: relative;
+      border-radius: 10rpx;
+      overflow: hidden;
+      
+      &-preview {
+        border: 1rpx solid $tn-border-solid-color;
+        
+        &__delete {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: absolute;
+          top: 0;
+          right: 0;
+          z-index: 10;
+          border-top: 60rpx solid;
+          border-left: 60rpx solid transparent;
+          border-top-color: $tn-color-red;
+          width: 0rpx;
+          height: 0rpx;
+          
+          &--icon {
+            position: absolute;
+            top: -50rpx;
+            right: 6rpx;
+            color: #FFFFFF;
+            font-size: 24rpx;
+            line-height: 1;
+          }
+        }
+        
+        &__progress {
+          position: absolute;
+          width: auto;
+          bottom: 0rpx;
+          left: 0rpx;
+          right: 0rpx;
+          z-index: 9;
+          /* #ifdef MP-WEIXIN */
+          display: inline-flex;
+          /* #endif */
+        }
+        
+        &__error-btn {
+          position: absolute;
+          bottom: 0;
+          left: 0;
+          right: 0;
+          background-color: $tn-color-red;
+          color: #FFFFFF;
+          font-size: 20rpx;
+          padding: 8rpx 0;
+          text-align: center;
+          z-index: 9;
+          line-height: 1;
+        }
+        
+        &__image {
+          display: block;
+          width: 100%;
+          height: 100%;
+          border-radius: 10rpx;
+        }
+      }
+      
+      &-add {
+        flex-direction: column;
+        color: $tn-content-color;
+        font-size: 26rpx;
+        
+        &--icon {
+          font-size: 40rpx;
+        }
+        
+        &__tips {
+          margin-top: 20rpx;
+          line-height: 40rpx;
+        }
+      }
+    }
+    
+    &__add {
+      background-color: #F7F7F7;
+      position: absolute;
+	  border-radius: 10rpx;
+      // margin: 10rpx;
+      // margin-left: 0;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-image-upload/tn-image-upload.vue b/tuniao-ui/components/tn-image-upload/tn-image-upload.vue
new file mode 100644
index 0000000..e7e9418
--- /dev/null
+++ b/tuniao-ui/components/tn-image-upload/tn-image-upload.vue
@@ -0,0 +1,695 @@
+<template>
+  <view class="tn-image-upload-class tn-image-upload">
+    <block v-if="showUploadList">
+      <view
+        v-for="(item, index) in lists"
+        :key="index"
+        class="tn-image-upload__item tn-image-upload__item-preview"
+        :style="{
+          width: $tn.string.getLengthUnitValue(width),
+          height: $tn.string.getLengthUnitValue(height)
+        }"
+      >
+        <!-- 删除按钮 -->
+        <view
+          v-if="deleteable"
+          class="tn-image-upload__item-preview__delete"
+          @tap.stop="deleteItem(index)"
+          :style="{
+            borderTopColor: deleteBackgroundColor
+          }"
+        >
+          <view
+            class="tn-image-upload__item-preview__delete--icon"
+            :class="[`tn-icon-${deleteIcon}`]"
+            :style="{
+              color: deleteColor
+            }"
+          ></view>
+        </view>
+        <!-- 进度条 -->
+        <tn-line-progress
+          v-if="showProgress && item.progress > 0 && !item.error"
+          class="tn-image-upload__item-preview__progress"
+          :percent="item.progress"
+          :showPercent="false"
+          :round="false"
+          :height="8"
+        ></tn-line-progress>
+        <!-- 重试按钮 -->
+        <view v-if="item.error" class="tn-image-upload__item-preview__error-btn" @tap.stop="retry(index)">点击重试</view>
+        <!-- 图片信息 -->
+        <image
+          class="tn-image-upload__item-preview__image"
+          :src="item.url || item.path"
+          :mode="imageMode"
+          @tap.stop="doPreviewImage(item.url || item.path, index)"
+        ></image>
+      </view>
+    </block>
+    <!-- <view v-if="$slots.file || $slots.$file" style="width: 100%;">
+      
+    </view> -->
+    <!-- 自定义图片展示列表 -->
+    <slot name="file" :file="lists"></slot>
+    
+    <!-- 添加按钮 -->
+    <view v-if="maxCount > lists.length" class="tn-image-upload__add" :class="{'tn-image-upload__add--custom': customBtn}" @tap="selectFile">
+      <!-- 添加按钮 -->
+      <view
+        v-if="!customBtn"
+        class="tn-image-upload__item tn-image-upload__item-add"
+        hover-class="tn-hover-class"
+        hover-stay-time="150"
+        :style="{
+          width: $tn.string.getLengthUnitValue(width),
+          height: $tn.string.getLengthUnitValue(height)
+        }"
+      >
+        <view class="tn-image-upload__item-add--icon tn-icon-add"></view>
+        <view class="tn-image-upload__item-add__tips">{{ uploadText }}</view>
+      </view>
+      <!-- 自定义添加按钮 -->
+      <view>
+        <slot name="addBtn"></slot>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-image-upload',
+    props: {
+      // 已上传的文件列表
+      fileList: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+	  isUniCloud:{
+		type: Boolean,
+		default: false
+	  },
+      // 上传图片地址
+      action: {
+        type: String,
+        default: ''
+      },
+      // 上传文件的字段名称
+      name: {
+        type: String,
+        default: 'file'
+      },
+      // 头部信息
+      header: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 携带的参数
+      formData: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 是否禁用
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 是否自动上传
+      autoUpload: {
+        type: Boolean,
+        default: true
+      },
+      // 最大上传数量
+      maxCount: {
+        type: Number,
+        default: 9
+      },
+      // 是否显示组件自带的图片预览
+      showUploadList: {
+        type: Boolean,
+        default: true
+      },
+      // 预览上传图片的裁剪模式
+      imageMode: {
+        type: String,
+        default: 'aspectFill'
+      },
+      // 点击图片是否全屏预览
+      previewFullImage: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示进度条
+      showProgress: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示删除按钮
+      deleteable: {
+        type: Boolean,
+        default: true
+      },
+      // 删除按钮图标
+      deleteIcon: {
+        type: String,
+        default: 'close'
+      },
+      // 删除按钮的背景颜色
+      deleteBackgroundColor: {
+        type: String,
+        default: ''
+      },
+      // 删除按钮的颜色
+      deleteColor: {
+        type: String,
+        default: ''
+      },
+      // 上传区域提示文字
+      uploadText: {
+        type: String,
+        default: '选择图片'
+      },
+      // 显示toast提示
+      showTips: {
+        type: Boolean,
+        default: true
+      },
+      // 自定义选择图标按钮
+      customBtn: {
+        type: Boolean,
+        default: false
+      },
+      // 预览图片和选择图片区域的宽度
+      width: {
+        type: Number,
+        default: 200
+      },
+      // 预览图片和选择图片区域的高度
+      height: {
+        type: Number,
+        default: 200
+      },
+      // 选择图片的尺寸
+      // 参考上传文档 https://uniapp.dcloud.io/api/media/image
+      sizeType: {
+        type: Array,
+        default() {
+          return ['original', 'compressed']
+        }
+      },
+      // 图片来源
+      sourceType: {
+        type: Array,
+        default() {
+          return ['album', 'camera']
+        }
+      },
+      // 是否可以多选
+      multiple: {
+        type: Boolean,
+        default: true
+      },
+      // 文件大小(byte)
+      maxSize: {
+        type: Number,
+        default: 10 * 1024 * 1024
+      },
+      // 允许上传的类型
+      limitType: {
+        type: Array,
+        default() {
+          return ['png','jpg','jpeg','webp','gif','image']
+        }
+      },
+      // 是否自定转换为json
+      toJson: {
+        type: Boolean,
+        default: true
+      },
+      // 上传前钩子函数，每个文件上传前都会执行
+      beforeUpload: {
+        type: Function,
+        default: null
+      },
+      // 删除文件前钩子函数
+      beforeRemove: {
+        type: Function,
+        default: null
+      },
+      index: {
+        type: [Number, String],
+        default: ''
+      }
+    },
+    computed: {
+      
+    },
+    data() {
+      return {
+        lists: [],
+        uploading: false
+      }
+    },
+    watch: {
+      fileList: {
+        handler(val) {
+          val.map(value => {
+            // 首先检查内部是否已经添加过这张图片，因为外部绑定了一个对象给fileList的话(对象引用)，进行修改外部fileList时，
+            // 会触发watch，导致重新把原来的图片再次添加到this.lists
+            // 数组的some方法意思是，只要数组元素有任意一个元素条件符合，就返回true，而另一个数组的every方法的意思是数组所有元素都符合条件才返回true
+            let tmp = this.lists.some(listVal => {
+              return listVal.url === value.url
+            })
+            // 如果内部没有这张图片，则添加到内部
+            !tmp && this.lists.push({ url: value.url, error: false, progress: 100 })
+          })
+        },
+        immediate: true
+      },
+      lists(val) {
+        this.$emit('on-list-change', val, this.index)
+      }
+    },
+    methods: {
+      // 清除列表
+      clear() {
+        this.lists = []
+      },
+      // 重新上传队列中上传失败所有文件
+      reUpload() {
+        this.uploadFile()
+      },
+      // 选择图片
+      selectFile() {
+        if (this.disabled) return
+        const {
+          name = '',
+          maxCount,
+          multiple,
+          maxSize,
+          sizeType,
+          lists,
+          camera,
+          compressed,
+          sourceType
+        } = this
+        let chooseFile = null
+        const newMaxCount = maxCount - lists.length
+        // 只选择图片的时候使用 chooseImage 来实现
+        chooseFile = new Promise((resolve, reject) => {
+          uni.chooseImage({
+            count: multiple ? (newMaxCount > 9 ? 9 : newMaxCount) : 1,
+            sourceType,
+            sizeType,
+            success: resolve,
+            fail: reject
+          })
+        })
+        chooseFile.then(res => {
+          let file = null
+          let listOldLength = lists.length
+          res.tempFiles.map((val, index) => {
+			 if (!this.checkFileExt(val)) return
+            
+            // 是否超出最大限制数量
+            if (!multiple && index >= 1) return
+            if (val.size > maxSize) {
+              this.$emit('on-oversize', val, lists, this.index)
+              this.showToast('超出可允许文件大小')
+            } else {
+              if (maxCount <= lists.length) {
+                this.$emit('on-exceed', val, lists, this.index)
+                this.showToast('超出最大允许的文件数')
+                return
+              }
+              lists.push({
+                url: val.path,
+                progress: 0,
+                error: false,
+                file: val,
+				//#ifdef H5
+				extension: val.name.substring(val.name.lastIndexOf("."))  //图片文件后缀名
+				//#endif
+				//#ifndef H5
+				extension: val.path.substring(val.path.lastIndexOf(".")) //图片文件后缀名
+				//#endif
+              })
+            }
+          })
+          this.$emit('on-choose-complete', this.lists, this.index)
+          if (this.autoUpload) this.uploadFile(listOldLength)
+        }).catch(err => {
+          this.$emit('on-choose-fail', err)
+        })
+      },
+      // 提示用户信息
+      showToast(message, force = false) {
+        if (this.showTips || force) {
+          this.$tn.message.toast(message)
+        }
+      },
+      // 手动上传，通过ref进行调用
+      upload() {
+        this.uploadFile()
+      },
+      // 对失败图片进行再次上传
+      retry(index) {
+        this.lists[index].progress = 0
+        this.lists[index].error = false
+        this.lists[index].response = null
+        this.$tn.message.loading('重新上传')
+        this.uploadFile(index)
+      },
+      // 上传文件
+      async uploadFile(index = 0) {
+		var that=this;
+        if (this.disabled) return
+        if (this.uploading) return
+        // 全部上传完成
+        if (index >= this.lists.length) {
+          this.$emit('on-uploaded', this.lists, this.index)
+          return
+        }
+        // 检查是否已经全部上传或者上传中
+        if (this.lists[index].progress === 100) {
+          this.lists[index].uploadTask = null
+          if (this.autoUpload) this.uploadFile(index + 1)
+          return
+        }
+        // 执行before-upload钩子
+        if (this.beforeUpload && typeof(this.beforeUpload) === 'function') {
+          // 在微信，支付宝等环境(H5正常)，会导致父组件定义的函数体中的this变成子组件的this
+          // 通过bind()方法，绑定父组件的this，让this的this为父组件的上下文
+          // 因为upload组件可能会被嵌套在其他组件内，比如tn-form，这时this.$parent其实为tn-form的this，
+          // 非页面的this，所以这里需要往上历遍，一直寻找到最顶端的$parent，这里用了this.$u.$parent.call(this)
+          let beforeResponse = this.beforeUpload.bind(this.$tn.$parent.call(this))(index, this.lists)
+          // 判断是否返回了Promise
+          if (!!beforeResponse && typeof beforeResponse.then === 'function') {
+            await beforeResponse.then(res => {
+              // promise返回成功，不进行操作继续
+            }).catch(err => {
+              // 进入catch回调的话，继续下一张
+              return this.uploadFile(index + 1)
+            })
+          } else if (beforeResponse === false) {
+            // 如果返回flase，继续下一张图片上传
+            return this.uploadFile(index + 1)
+          } else {
+            // 为true的情况，不进行操作
+          }
+        }
+        // 检查上传地址
+		if(this.isUniCloud){
+			//如果是uinCloud
+			this.lists[index].error = false
+			this.uploading = true
+			// 创建上传对象
+			const task = uniCloud.uploadFile({
+				filePath: that.lists[index].url,
+				cloudPath: that.$tn.uuid() + that.lists[index].extension, //随机文件名+文件后缀
+				onUploadProgress(progressEvent) {
+					if (progressEvent.loaded > 0) {
+						that.lists[index].progress = Math.round(
+							(progressEvent.loaded * 100) / progressEvent.total
+						);
+						that.$emit('on-progress', progressEvent, index, that.lists, that.index)
+					}
+				},
+				success(res) {
+					if (res.success) {
+						that.lists[index].response = res
+						that.lists[index].progress = 100
+						that.lists[index].error = false
+						that.$emit('success', res, index, that.lists, that.index)
+					} else {
+						that.uploadError(index, res)
+					}
+				},
+				fail: (err) => {
+					that.uploadError(index, err)
+				},
+				complete: (res) => {
+					// this.$t.message.closeLoading()
+					that.uploading = false
+					that.uploadFile(index + 1)
+					that.$emit('on-change', res, index, that.lists, that.index)
+				}
+			});
+			that.lists[index].uploadTask = task
+		}else{
+			if (!this.action) {
+			  this.showToast('请配置上传地址', true)
+			  return
+			}
+			this.lists[index].error = false
+			this.uploading = true
+			// 创建上传对象
+			const task = uni.uploadFile({
+			  url: this.action,
+			  filePath: this.lists[index].url,
+			  name: this.name,
+			  formData: this.formData,
+			  header: this.header,
+			  success: res => {
+			    // 判断啊是否为json字符串，将其转换为json格式
+			    let data = this.toJson && this.$tn.test.jsonString(res.data) ? JSON.parse(res.data) : res.data
+			    if (![200, 201, 204].includes(res.statusCode)) {
+			      this.uploadError(index, data)
+			    } else {
+			      this.lists[index].response = data
+			      this.lists[index].progress = 100
+			      this.lists[index].error = false
+			      this.$emit('on-success', data, index, this.lists, this.index)
+			    }
+			  },
+			  fail: err => {
+			    this.uploadError(index, err)
+			  },
+			  complete: res => {
+			    this.$tn.message.closeLoading()
+			    this.uploading = false
+			    this.uploadFile(index + 1)
+			    this.$emit('on-change', res, index, this.lists, this.index)
+			  }
+			})
+			this.lists[index].uploadTask = task
+			task.onProgressUpdate(res => {
+			  if (res.progress > 0) {
+			    this.lists[index].progress = res.progress
+			    this.$emit('on-progress', res, index, this.lists, this.index)
+			  }
+			})
+		}
+      },
+      // 上传失败
+      uploadError(index, err) {
+        this.lists[index].progress = 0
+        this.lists[index].error = true
+        this.lists[index].response = null
+        this.showToast('上传失败，请重试')
+        this.$emit('on-error', err, index, this.lists, this.index)
+      },
+      // 删除一个图片
+      deleteItem(index) {
+        if (!this.deleteable) return
+        this.$tn.message.modal(
+          '提示',
+          '您确定要删除吗？',
+          async () => {
+            // 先检查是否有定义before-remove移除前钩子
+            // 执行before-remove钩子
+            if (this.beforeRemove && typeof(this.beforeRemove) === 'function') {
+              let beforeResponse = this.beforeRemove.bind(this.$tn.$parent.call(this))(index, this.lists)
+              // 判断是否返回promise 
+              if (!!beforeResponse && typeof beforeResponse.then === 'function') {
+                await beforeResponse.then(res => {
+                  // promise返回成功不进行操作
+                  this.handlerDeleteItem(index)
+                }).catch(err => {
+                  this.showToast('删除操作被中断')
+                })
+              } else if (beforeResponse === false) {
+                this.showToast('删除操作被中断')
+              } else {
+                this.handlerDeleteItem(index)
+              }
+            } else {
+              this.handlerDeleteItem(index)
+            }
+          }, true)
+      },
+      // 移除文件操作
+      handlerDeleteItem(index) {
+        // 如果文件正在上传中，终止上传任务
+        if (this.lists[index].progress < 100 && this.lists[index].progress > 0) {
+          typeof this.lists[index].uploadTask !== 'undefined' && this.lists[index].uploadTask.abort()
+        }
+        this.lists.splice(index, 1)
+        this.$forceUpdate()
+        this.$emit('on-remove', index, this.lists, this.index)
+        this.showToast('删除成功')
+      },
+      // 移除文件，通过ref手动形式进行调用
+      remove(index) {
+        if (!this.deleteable) return
+        // 判断索引合法
+        if (index >= 0 && index < this.lists.length) {
+          this.lists.splice(index, 1)
+        }
+      },
+      // 预览图片
+      doPreviewImage(url, index) {
+        if (!this.previewFullImage) return
+        const images = this.lists.map(item => item.url || item.path)
+        uni.previewImage({
+          urls: images,
+          current: url,
+          success: () => {
+            this.$emit('on-preview', url, this.lists, this.index)
+          },
+          fail: () => {
+            this.showToast('预览图片失败')
+          }
+        })
+      },
+      // 检查文件后缀是否合法
+      checkFileExt(file) {
+        // 是否为合法后缀
+        let noArrowExt = false
+        // 后缀名
+        let fileExt = ''
+        const reg = /.+\./
+        
+        // #ifdef H5
+        fileExt = file.name.replace(reg, '').toLowerCase()
+        // #endif
+        // #ifndef H5
+        fileExt = file.path.replace(reg, '').toLowerCase()
+        // #endif
+        noArrowExt = this.limitType.some(ext => {
+          return ext.toLowerCase() === fileExt
+        })
+        if (!noArrowExt) this.showToast(`不支持${fileExt}格式的文件`)
+        return noArrowExt
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-image-upload {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: center;
+    
+    &__item {
+      /* #ifndef APP-NVUE */
+      display: flex;
+      /* #endif */
+      align-items: center;
+      justify-content: center;
+      width: 200rpx;
+      height: 200rpx;
+      overflow: hidden;
+      margin: 12rpx;
+      margin-left: 0;
+      background-color: $tn-font-holder-color;
+      position: relative;
+      border-radius: 10rpx;
+      
+      &-preview {
+        border: 1rpx solid $tn-border-solid-color;
+        
+        &__delete {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: absolute;
+          top: 0;
+          right: 0;
+          z-index: 10;
+          border-top: 60rpx solid;
+          border-left: 60rpx solid transparent;
+          border-top-color: $tn-color-red;
+          width: 0rpx;
+          height: 0rpx;
+          
+          &--icon {
+            position: absolute;
+            top: -50rpx;
+            right: 6rpx;
+            color: #FFFFFF;
+            font-size: 24rpx;
+            line-height: 1;
+          }
+        }
+        
+        &__progress {
+          position: absolute;
+          width: auto;
+          bottom: 0rpx;
+          left: 0rpx;
+          right: 0rpx;
+          z-index: 9;
+          /* #ifdef MP-WEIXIN */
+          display: inline-flex;
+          /* #endif */
+        }
+        
+        &__error-btn {
+          position: absolute;
+          bottom: 0;
+          left: 0;
+          right: 0;
+          background-color: $tn-color-red;
+          color: #FFFFFF;
+          font-size: 20rpx;
+          padding: 8rpx 0;
+          text-align: center;
+          z-index: 9;
+          line-height: 1;
+        }
+        
+        &__image {
+          display: block;
+          width: 100%;
+          height: 100%;
+          border-radius: 10rpx;
+        }
+      }
+      
+      &-add {
+        flex-direction: column;
+        color: $tn-content-color;
+        font-size: 26rpx;
+        
+        &--icon {
+          font-size: 40rpx;
+        }
+        
+        &__tips {
+          margin-top: 20rpx;
+          line-height: 40rpx;
+        }
+      }
+    }
+    
+    &__add {
+      width: auto;
+      display: inline-block;
+      
+      &--custom {
+        width: 100%;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-index-anchor/tn-index-anchor.vue b/tuniao-ui/components/tn-index-anchor/tn-index-anchor.vue
new file mode 100644
index 0000000..435597d
--- /dev/null
+++ b/tuniao-ui/components/tn-index-anchor/tn-index-anchor.vue
@@ -0,0 +1,90 @@
+<template>
+  <!-- 支付宝小程序使用_tGetRect()获取组件的根元素尺寸，所以在外面套一个"壳" -->
+  <view>
+    <view :id="elId" class="tn-index-anchor__wrap" :style="[wrapperStyle]">
+      <view class="tn-index-anchor" :class="[active ? 'tn-index-anchor--active' : '']" :style="[customAnchorStyle]">
+        <view v-if="useSlot">
+          <slot></slot>
+        </view>
+        <block v-else>
+          <text>{{ index }}</text>
+        </block>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-index-anchor',
+    props: {
+      // 使用自定义内容
+      useSlot: {
+        type: Boolean,
+        default: false
+      },
+      // 索引字符
+      index: {
+        type: String,
+        default: ''
+      },
+      // 自定义样式
+      customStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      }
+    },
+    computed: {
+      customAnchorStyle() {
+        return Object.assign(this.anchorStyle, this.customStyle)
+      }
+    },
+    data() {
+      return {
+        elId: this.$tn.uuid(),
+        // 内容的高度
+        height: 0,
+        // 内容的top
+        top: 0,
+        // 是否被激活
+        active: false,
+        // 样式（父组件外部提供）
+        wrapperStyle: {},
+        anchorStyle: {}
+      }
+    },
+    created() {
+      this.parent = false
+    },
+    mounted() {
+      this.parent = this.$tn.$parent.call(this, 'tn-index-list')
+      if (this.parent) {
+        this.parent.childrens.push(this)
+        this.parent.updateData()
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-index-anchor {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 8rpx 24rpx;
+    color: $tn-font-color;
+    font-size: 28rpx;
+    font-weight: 500;
+    line-height: 1.2;
+    background-color: rgb(245, 245, 245);
+    
+    &--active {
+      right: 0;
+      left: 0;
+      color: $tn-main-color;
+      background-color: #FFFFFF;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-index-list/tn-index-list.vue b/tuniao-ui/components/tn-index-list/tn-index-list.vue
new file mode 100644
index 0000000..5187896
--- /dev/null
+++ b/tuniao-ui/components/tn-index-list/tn-index-list.vue
@@ -0,0 +1,361 @@
+<template>
+  <!-- 支付宝小程序使用_tGetRect()获取组件的根元素尺寸，所以在外面套一个"壳" -->
+  <view>
+    <view class="tn-index-list-class tn-index-list">
+      <slot></slot>
+      
+      <!-- 侧边栏 -->
+      <view
+        v-if="showSidebar"
+        class="tn-index-list__sidebar"
+        @touchstart.stop.prevent="onTouchMove"
+        @touchmove.stop.prevent="onTouchMove"
+        @touchend.stop.prevent="onTouchStop"
+        @touchcancel.stop.prevent="onTouchStop"
+      >
+        <view
+          v-for="(item, index) in indexList"
+          :key="index"
+          class="tn-index-list__sidebar__item"
+          :style="{
+            zIndex: zIndex + 1,
+            color: activeAnchorIndex === index ? activeColor : ''
+          }"
+        >
+          {{ item }}
+        </view>
+      </view>
+      
+      <!-- 选中弹出框 -->
+      <view
+        v-if="touchMove && indexList[touchMoveIndex]"
+        class="tn-index-list__alert"
+        :style="{
+          zIndex: selectAlertZIndex
+        }"
+      >
+        <text>{{ indexList[touchMoveIndex] }}</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  // 生成 A-Z的字母列表
+  let indexList = function() {
+    let indexList = []
+    let charCodeOfA = 'A'.charCodeAt(0)
+    for (var i = 0; i < 26; i++) {
+      indexList.push(String.fromCharCode(charCodeOfA + i))
+    }
+    return indexList
+  }
+  
+  export default {
+    name: 'tn-index-list',
+    props: {
+      // 索引列表
+      indexList: {
+        type: Array,
+        default() {
+          return indexList()
+        }
+      },
+      // 是否自动吸顶
+      sticky: {
+        type: Boolean,
+        default: true
+      },
+      // 自动吸顶时距离顶部的距离，单位px
+      stickyTop: {
+        type: Number,
+        default: 0
+      },
+      // 自定义顶栏的高度，单位px
+      customBarHeight: {
+        type: Number,
+        default: 0
+      },
+      // 当前滚动的高度
+      // 由于自定义组件无法获取滚动高度，所以依赖传入
+      scrollTop: {
+        type: Number,
+        default: 0
+      },
+      // 选中索引时的颜色
+      activeColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 吸顶时的z-index
+      zIndex: {
+        type: Number,
+        default: 0
+      }
+    },
+    computed: {
+      // 选中索引列表弹出提示框的z-index
+      selectAlertZIndex() {
+        return this.$tn.zIndex.toast
+      },
+      // 吸顶的偏移高度
+      stickyOffsetTop() {
+        // #ifdef H5
+        return this.stickyTop !== '' ? this.stickyTop : 44
+        // #endif
+        // #ifndef H5
+        return this.stickyTop !== '' ? this.stickyTop : 0
+        // #endif
+      }
+    },
+    data() {
+      return {
+        // 当前激活的列表锚点的序号
+        activeAnchorIndex: 0,
+        // 显示侧边索引栏
+        showSidebar: true,
+        // 标记是否开始触摸移动
+        touchMove: false,
+        // 当前触摸移动到对应索引的序号
+        touchMoveIndex: 0,
+        // 滚动到对应锚点的序号
+        scrollToAnchorIndex: 0,
+        // 侧边栏的信息
+        sidebar: {
+          height: 0,
+          top: 0
+        },
+        // 内容区域高度
+        height: 0,
+        // 内容区域top
+        top: 0
+      }
+    },
+    watch: {
+      scrollTop() {
+        this.updateData()
+      }
+    },
+    created() {
+      // 只能在created生命周期定义childrens，如果在data定义，会因为循环引用而报错
+      this.childrens = []
+    },
+    methods: {
+      // 更新数据
+      updateData() {
+        this.timer && clearTimeout(this.timer)
+        this.timer = setTimeout(() => {
+          this.showSidebar = !!this.childrens.length
+          this.getRect().then(() => {
+            this.onScroll()
+          })
+        }, 0)
+      },
+      // 获取对应的信息
+      getRect() {
+        return Promise.all([
+          this.getAnchorRect(),
+          this.getListRect(),
+          this.getSidebarRect()
+        ])
+      },
+      // 获取列表内容子元素信息
+      getAnchorRect() {
+        return Promise.all(this.childrens.map((child, index) => {
+          child._tGetRect('.tn-index-anchor__wrap').then((rect) => {
+            Object.assign(child, {
+              height: rect.height,
+              top: rect.top - this.customBarHeight
+            })
+          })
+        }))
+      },
+      // 获取列表信息
+      getListRect() {
+        return this._tGetRect('.tn-index-list').then(rect => {
+          Object.assign(this, {
+            height: rect.height,
+            top: rect.top + this.scrollTop
+          })
+        })
+      },
+      // 获取侧边滚动栏信息
+      getSidebarRect() {
+        return this._tGetRect('.tn-index-list__sidebar').then(rect => {
+          this.sidebar = {
+            height: rect.height,
+            top: rect.top
+          }
+        })
+      },
+      // 滚动事件
+      onScroll() {
+        const {
+          childrens = []
+        } = this
+        if (!childrens.length) {
+          return
+        }
+        const {
+          sticky,
+          stickyOffsetTop,
+          zIndex,
+          scrollTop,
+          activeColor
+        } = this
+        const active = this.getActiveAnchorIndex()
+        this.activeAnchorIndex = active
+        if (sticky) {
+          let isActiveAnchorSticky = false
+          if (active !== -1) {
+            isActiveAnchorSticky = childrens[active].top <= 0
+          }
+          childrens.forEach((item, index) => {
+            if (index === active) {
+              let wrapperStyle = ''
+              let anchorStyle = {
+                color: `${activeColor}`
+              }
+              if (isActiveAnchorSticky) {
+                wrapperStyle = {
+                  height: `${childrens[index].height}px`
+                }
+                anchorStyle = {
+                  position: 'fixed',
+                  top: `${stickyOffsetTop}px`,
+                  zIndex: `${zIndex ? zIndex : this.$tn.zIndex.indexListSticky}`,
+                  color: `${activeColor}`
+                }
+              }
+              item.active = true
+              item.wrapperStyle = wrapperStyle
+              item.anchorStyle = anchorStyle
+            } else if (index === active - 1) {
+              const currentAnchor = childrens[index]
+              const currentOffsetTop = currentAnchor.top
+              const targetOffsetTop = index === childrens.length - 1 ? this.top : childrens[index + 1].top
+              const parentOffsetHeight = targetOffsetTop - currentOffsetTop
+              const translateY = parentOffsetHeight - currentAnchor.height
+              const anchorStyle = {
+                position: 'relative',
+                transform: `translate3d(0, ${translateY}px, 0)`,
+                zIndex: `${zIndex ? zIndex : this.$tn.zIndex.indexListSticky}`,
+                color: `${activeColor}`
+              }
+              item.active = false
+              item.anchorStyle = anchorStyle
+            } else {
+              item.active = false
+              item.wrapperStyle = ''
+              item.anchorStyle = ''
+            }
+          })
+        }
+      },
+      // 触摸移动
+      onTouchMove(event) {
+        this.touchMove = true
+        const sidebarLength = this.childrens.length
+        const touch = event.touches[0]
+        const itemHeight = this.sidebar.height / sidebarLength
+        let clientY = touch.clientY
+        let index = Math.floor((clientY - this.sidebar.top) / itemHeight)
+        if (index < 0) {
+          index = 0
+        } else if (index > sidebarLength - 1) {
+          index = sidebarLength - 1
+        }
+        this.touchMoveIndex = index
+        this.scrollToAnchor(index)
+      },
+      // 触摸停止
+      onTouchStop() {
+        this.touchMove = false
+        this.scrollToAnchorIndex = null
+      },
+      // 获取当前的锚点序号
+      getActiveAnchorIndex() {
+        const {
+          childrens,
+          sticky
+        } = this
+        for (let i = this.childrens.length - 1; i >= 0; i--) {
+          const preAnchorHeight = i > 0 ? childrens[i - 1].height : 0
+          const reachTop = sticky ? preAnchorHeight : 0
+          if (reachTop >= childrens[i].top) {
+            return i
+          }
+        }
+        return -1
+      },
+      // 滚动到对应的锚点
+      scrollToAnchor(index) {
+        if (this.scrollToAnchorIndex === index) {
+          return
+        }
+        this.scrollToAnchorIndex = index
+        const anchor = this.childrens.find(item => item.index === this.indexList[index])
+        if (anchor) {
+          const scrollTop = anchor.top + this.scrollTop
+          this.$emit('select', {
+            index: anchor.index,
+            scrollTop: scrollTop
+          })
+          uni.pageScrollTo({
+            duration:0,
+            scrollTop: scrollTop
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-index-list {
+    position: relative;
+    
+    &__sidebar {
+      display: flex;
+      flex-direction: column;
+      position: fixed;
+      top: 50%;
+      right: 0;
+      text-align: center;
+      transform: translateY(-50%);
+      user-select: none;
+      z-index: 99;
+      
+      &__item {
+        font-weight: 500;
+        padding: 8rpx 18rpx;
+        font-size: 22rpx;
+        line-height: 1;
+      }
+    }
+    
+    &__alert {
+      display: flex;
+      flex-direction: row;
+      position: fixed;
+      width: 120rpx;
+      height: 120rpx;
+      top: 50%;
+      right: 90rpx;
+      align-items: center;
+      justify-content: center;
+      margin-top: -60rpx;
+      border-radius: 24rpx;
+      font-size: 50rpx;
+      color: #FFFFFF;
+      background-color: $tn-font-sub-color;
+      padding: 0;
+      z-index: 9999999;
+      
+      text {
+        line-height: 50rpx;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-input/tn-input.vue b/tuniao-ui/components/tn-input/tn-input.vue
new file mode 100644
index 0000000..e16a1ad
--- /dev/null
+++ b/tuniao-ui/components/tn-input/tn-input.vue
@@ -0,0 +1,447 @@
+<template>
+  <view
+    class="tn-input-class tn-input"
+    :class="{
+      'tn-input--border': border,
+      'tn-input--error': validateState
+    }"
+    :style="{
+      padding: `0 ${border ? 20 : 0}rpx`,
+      borderColor: borderColor,
+      textAlign: inputAlign
+    }"
+    @tap.stop="inputClick"
+  >
+    <textarea
+      v-if="type === 'textarea'"
+      class="tn-input__input tn-input__textarea"
+      :style="[inputStyle]"
+      :value="defaultValue"
+      :placeholder="placeholder"
+      :placeholderStyle="placeholderStyle"
+      :disabled="disabled || type === 'select'"
+      :maxlength="maxLength"
+      :fixed="fixed"
+      :focus="focus"
+      :autoHeight="autoHeight"
+      :selectionStart="elSelectionStart"
+      :selectionEnd="elSelectionEnd"
+      :cursorSpacing="cursorSpacing"
+      :showConfirmBar="showConfirmBar"
+      @input="handleInput"
+      @blur="handleBlur"
+      @focus="onFocus"
+      @confirm="onConfirm"
+    />
+	<view v-else>
+		
+		<view
+		 v-if="type === 'select'"
+		 class="tn-input__text"
+		 > 
+		 {{defaultValue}}
+		 </view>
+		 
+		 <input
+		   v-else
+		   class="tn-input__input"
+		   :type="type === 'password' ? 'text' : type"
+		   :style="[inputStyle]"
+		   :value="defaultValue"
+		   :password="type === 'password' && !showPassword"
+		   :placeholder="placeholder"
+		   :placeholderStyle="placeholderStyle"
+		   :disabled="disabled || type === 'select'"
+		   :maxlength="maxLength"
+		   :focus="focus"
+		   :confirmType="confirmType"
+		   :selectionStart="elSelectionStart"
+		   :selectionEnd="elSelectionEnd"
+		   :cursorSpacing="cursorSpacing"
+		   :showConfirmBar="showConfirmBar"
+		   @input="handleInput"
+		   @blur="handleBlur"
+		   @focus="onFocus"
+		   @confirm="onConfirm"
+		 />
+	</view>
+    
+    
+    <!-- 右边的icon -->
+    <view class="tn-input__right-icon tn-flex tn-flex-col-center">
+      <!-- 清除按钮 -->
+      <view
+        v-if="clearable && value !== '' && focused"
+        class="tn-input__right-icon__item tn-input__right-icon__clear"
+        @tap="onClear"
+      >
+        <view class="icon tn-icon-close"></view>
+      </view>
+      <view
+        v-else-if="type === 'text' && !focused && showRightIcon && rightIcon !== ''"
+        class="tn-input__right-icon__item tn-input__right-icon__clear"
+      >
+        <view class="icon" :class="[`tn-icon-${rightIcon}`]"></view>
+      </view>
+      <!-- 显示密码按钮 -->
+      <view
+        v-if="passwordIcon && type === 'password'"
+        class="tn-input__right-icon__item tn-input__right-icon__clear"
+        @tap="showPassword = !showPassword"
+      >
+        <view v-if="!showPassword" class="tn-icon-eye-hide"></view>
+        <view v-else class="icon tn-icon-eye"></view>
+      </view>
+      <!-- 可选项箭头 -->
+      <view
+        v-if="type === 'select'"
+        class="tn-input__right-icon__item tn-input__right-icon__select"
+        :class="{
+          'tn-input__right-icon__select--reverse': selectOpen
+        }"
+      >
+        <view class="icon tn-icon-up-triangle"></view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import Emitter from '../../libs/utils/emitter.js'
+  
+  export default {
+    mixins: [Emitter],
+    name: 'tn-input',
+    props: {
+      value: {
+        type: [String, Number],
+        default: ''
+      },
+      // 输入框的类型
+      type: {
+        type: String,
+        default: 'text'
+      },
+      // 输入框文字对齐方式
+      inputAlign: {
+        type: String,
+        default: 'left'
+      },
+      // 文本框为空时显示的信息
+      placeholder: {
+        type: String,
+        default: ''
+      },
+      placeholderStyle: {
+        type: String,
+        default: 'color: #AAAAAA'
+      },
+      // 是否禁用输入框
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 可输入文字的最大长度
+      maxLength: {
+        type: Number,
+        default: 255
+      },
+      // 输入框高度
+      height: {
+        type: Number,
+        default: 0
+      },
+      // 根据内容自动调整高度
+      autoHeight: {
+        type: Boolean,
+        default: true
+      },
+      // 键盘右下角显示的文字，仅在text时生效
+      confirmType: {
+        type: String,
+        default: 'done'
+      },
+      // 输入框自定义样式
+      customStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 是否固定输入框
+      fixed: {
+        type: Boolean,
+        default: false
+      },
+      // 是否自动获取焦点
+      focus: {
+        type: Boolean,
+        default: false
+      },
+      // 当type为password时，是否显示右侧密码图标
+      passwordIcon: {
+        type: Boolean,
+        default: true
+      },
+      // 当type为 input或者textarea时是否显示边框
+      border: {
+        type: Boolean,
+        default: false
+      },
+      // 边框的颜色
+      borderColor: {
+        type: String,
+        default: '#dcdfe6'
+      },
+      // 当type为select时，旋转右侧图标，标记当时select是打开还是关闭
+      selectOpen: {
+        type: Boolean,
+        default: false
+      },
+      // 是否可清空
+      clearable: {
+        type: Boolean,
+        default: true
+      },
+      // 光标与键盘的距离
+      cursorSpacing: {
+        type: Number,
+        default: 0
+      },
+      // selectionStart和selectionEnd需要搭配使用，自动聚焦时生效
+      // 光标起始位置
+      selectionStart: {
+        type: Number,
+        default: -1
+      },
+      // 光标结束位置
+      selectionEnd: {
+        type: Number,
+        default: -1
+      },
+      // 自动去除两端空格
+      trim: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示键盘上方的完成按钮
+      showConfirmBar: {
+        type: Boolean,
+        default: true
+      },
+      // 是否在输入框内最右边显示图标
+      showRightIcon: {
+        type: Boolean,
+        default: false
+      },
+      // 最右边图标的名称
+      rightIcon: {
+        type: String,
+        default: ''
+      }
+    },
+    computed: {
+      // 输入框样式
+      inputStyle() {
+        let style = {}
+        // 如果没有设置高度，根据不同的类型设置一个默认值
+        style.minHeight = this.height ? this.height + 'rpx' : 
+          this.type === 'textarea' ? this.textareaHeight + 'rpx' : this.inputHeight + 'rpx'
+        
+        style = Object.assign(style, this.customStyle)
+        
+        return style
+      },
+      // 光标起始位置
+      elSelectionStart() {
+        return String(this.selectionStart)
+      },
+      // 光标结束位置
+      elSelectionEnd() {
+        return String(this.selectionEnd)
+      }
+    },
+    data() {
+      return {
+        // 默认值
+        defaultValue: this.value,
+        // 输入框高度
+        inputHeight: 70,
+        // textarea的高度
+        textareaHeight: 100,
+        // 标记验证的状态
+        validateState: false,
+        // 标记是否获取到焦点
+        focused: false,
+        // 是否预览密码
+        showPassword: false,
+        // 用于头条小程序，判断@input中，前后的值是否发生了变化，因为头条中文下，按下键没有输入内容，也会触发@input事件
+        lastValue: '',
+      }
+    },
+    watch: {
+      value(newVal, oldVal) {
+        this.defaultValue = newVal
+        // 当值发生变化时，并且type为select时，不会触发input事件
+        // 模拟input事件
+        if (newVal !== oldVal && this.type === 'select') {
+          this.handleInput({
+            detail: {
+              value: newVal
+            }
+          })
+        }
+      }
+    },
+    created() {
+      // 监听form-item发出的错误事件，将输入框变成红色
+      this.$on("on-form-item-error", this.onFormItemError)
+    },
+    methods: {
+      /**
+       * input事件
+       */
+      handleInput(event) {
+        let value = event.detail.value
+        // 是否需要去掉空格
+        if (this.trim) value = this.$tn.string.trim(value)
+        // 原生事件
+        this.$emit('input', value)
+        // model赋值
+        this.defaultValue = value
+        // 过一个生命周期再发送事件给tn-form-item，否则this.$emit('input')更新了父组件的值，但是微信小程序上
+        // 尚未更新到tn-form-item，导致获取的值为空，从而校验混论
+        // 这里不能延时时间太短，或者使用this.$nextTick，否则在头条上，会造成混乱
+        setTimeout(() => {
+          // 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理
+          // #ifdef MP-TOUTIAO
+          if (this.$tn.string.trim(value) === this.lastValue) return
+          this.lastValue = value
+          // #endif
+          
+          // 发送当前的值到form-item进行校验
+          this.dispatch('tn-form-item','on-form-change', value)
+        }, 40)
+      },
+      /**
+       * blur事件
+       */
+      handleBlur(event) {
+        let value = event.detail.value
+        
+        // 由于点击清除图标也会触发blur事件，导致图标消失从而无法点击
+        setTimeout(() => {
+          this.focused = false
+        }, 100)
+        
+        // 原生事件
+        this.$emit('blur', value)
+        // 过一个生命周期再发送事件给tn-form-item，否则this.$emit('blur')更新了父组件的值，但是微信小程序上
+        // 尚未更新到tn-form-item，导致获取的值为空，从而校验混论
+        // 这里不能延时时间太短，或者使用this.$nextTick，否则在头条上，会造成混乱
+        setTimeout(() => {
+          // 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理
+          // #ifdef MP-TOUTIAO
+          if (this.$tn.string.trim(value) === this.lastValue) return
+          this.lastValue = value
+          // #endif
+          
+          // 发送当前的值到form-item进行校验
+          this.dispatch('tn-form-item','on-form-blur', value)
+        }, 40)
+      },
+      // 处理校验错误
+      onFormItemError(status) {
+        this.validateState = status
+      },
+      // 聚焦事件
+      onFocus(event) {
+        this.focused = true
+        this.$emit('focus')
+      },
+      // 点击确认按钮事件
+      onConfirm(event) {
+        this.$emit('confirm', event.detail.value)
+      },
+      // 清除事件
+      onClear(event) {
+        this.$emit('input', '')
+      },
+      // 点击事件
+      inputClick() {
+        this.$emit('click')
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-input {
+    display: flex;
+    flex-direction: row;
+    position: relative;
+    flex: 1;
+    
+    &__input {
+      font-size: 28rpx;
+      color: $tn-font-color;
+      flex: 1;
+    }
+	
+    &__text {
+      font-size: 28rpx;
+      color: $tn-font-color;
+      flex: 1;
+	    min-width: 296rpx;
+	    max-width: 100%;
+	    text-overflow:clip;
+    }
+    
+    &__textarea {
+      width: auto;
+      font-size: 28rpx;
+      color: $tn-font-color;
+      padding: 10rpx 0;
+      line-height: normal;
+      flex: 1;
+    }
+    
+    &--border {
+      border-radius: 6rpx;
+      border: 2rpx solid $tn-border-solid-color;
+    }
+    
+    &--error {
+      border-color: $tn-color-red !important;
+    }
+    
+    &__right-icon {
+      line-height: 1;
+      .icon {
+        color: $tn-font-sub-color;
+      }
+      
+      &__item {
+        margin-left: 10rpx;
+      }
+      
+      &__clear {
+        .icon {
+          font-size: 32rpx;
+        }
+      }
+      
+      &__select {
+        transition: transform .4s;
+        
+        .icon {
+          font-size: 26rpx;
+        }
+        
+        &--reverse {
+          transform: rotate(-180deg);
+        }
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-keyboard/tn-keyboard.vue b/tuniao-ui/components/tn-keyboard/tn-keyboard.vue
new file mode 100644
index 0000000..8844421
--- /dev/null
+++ b/tuniao-ui/components/tn-keyboard/tn-keyboard.vue
@@ -0,0 +1,220 @@
+<template>
+  <view v-if="value" class="tn-keyboard-class tn-keyboard">
+    <tn-popup
+      v-model="value"
+      mode="bottom"
+      :popup="false"
+      length="auto"
+      :mask="mask"
+      :maskCloseable="maskCloseable"
+      :safeAreaInsetBottom="safeAreaInsetBottom"
+      :zIndex="elZIndex"
+      @close="popupClose"
+    >
+      <view>
+        <slot></slot>
+      </view>
+      
+      <!-- 提示信息 -->
+      <view v-if="tooltip" class="tn-keyboard__tooltip">
+        <view
+          v-if="cancelBtn"
+          class="tn-keyboard__tooltip__item tn-keyboard__tooltip__cancel"
+          hover-class="tn-keyboard__tooltip__cancel--hover"
+          :hover-stay-time="150"
+          @tap="onCancel"
+        >
+          {{ cancelBtn ? cancelText : ''}}
+        </view>
+        <view v-if="showTips" class="tn-keyboard__tooltip__item tn-keyboard__tooltip__tips">
+          {{ tips ? tips : mode === 'number' ? '数字键盘' : mode === 'card' ? '身份证键盘' : '车牌号码键盘'}}
+        </view>
+        <view
+          v-if="confirmBtn"
+          class="tn-keyboard__tooltip__item tn-keyboard__tooltip__confirm"
+          hover-class="tn-keybord__tooltip__confirm--hover"
+          :hover-stay-time="150"
+          @tap="onConfirm"
+        >
+          {{ confirmBtn ? confirmText : ''}}
+        </view>
+      </view>
+      
+      <!-- 键盘内容 -->
+      <block v-if="mode === 'number' || mode === 'card'">
+        <tn-number-keyboard :mode="mode" :dotEnabled="dotEnabled" :randomEnabled="randomEnabled" @change="change" @backspace="backspaceClick"></tn-number-keyboard>
+      </block>
+      <block v-if="mode === 'car'">
+        <tn-car-keyboard :randomEnabled="randomEnabled" :switchEnMode="switchEnMode" @change="change" @backspace="backspaceClick"></tn-car-keyboard>
+      </block>
+    </tn-popup>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-keyboard',
+    props: {
+      // 控制键盘弹出收回
+      value: {
+        type: Boolean,
+        default: false
+      },
+      // 键盘类型
+      // number - 数字键盘 card - 身份证键盘 car - 车牌号码
+      mode: {
+        type: String,
+        default: 'number'
+      },
+      // 当mode = number时，是否显示'.'符号
+      dotEnabled: {
+        type: Boolean,
+        default: true
+      },
+      // 是否打乱顺序
+      randomEnabled: {
+        type: Boolean,
+        default: false
+      },
+      // 当mode = car，设置键盘中英文状态
+      switchEnMode: {
+        type: Boolean,
+        default: false
+      },
+      // 显示顶部工具条
+      tooltip: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示提示信息
+      showTips: {
+        type: Boolean,
+        default: true
+      },
+      // 提示文字
+      tips: {
+        type: String,
+        default: ''
+      },
+      // 是否显示取消按钮
+      cancelBtn: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示确认按钮
+      confirmBtn: {
+        type: Boolean,
+        default: true
+      },
+      // 取消按钮文字
+      cancelText: {
+        type: String,
+        default: '取消'
+      },
+      // 确认按钮文字
+      confirmText: {
+        type: String,
+        default: '确认'
+      },
+      // 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+      safeAreaInsetBottom: {
+      	type: Boolean,
+      	default: false
+      },
+      // 是否可以通过点击遮罩进行关闭
+      maskCloseable: {
+      	type: Boolean,
+      	default: true
+      },
+      // 是否显示遮罩
+      mask: {
+        type: Boolean,
+        default: true
+      },
+      // z-index
+      zIndex: {
+        type: Number,
+        default: 0
+      }
+    },
+    computed: {
+      elZIndex() {
+        return this.zIndex ? this.zIndex : this.$tn.zIndex.popup
+      }
+    },
+    data() {
+      return {
+        
+      }
+    },
+    methods: {
+      change(e) {
+        this.$emit('change', e)
+      },
+      // 关闭键盘
+      popupClose() {
+        // 修改value的值
+        this.$emit('input', false)
+      },
+      // 输入完成
+      onConfirm() {
+        this.popupClose()
+        this.$emit('confirm')
+      },
+      // 输入取消
+      onCancel() {
+        this.popupClose()
+        this.$emit('cancel')
+      },
+      // 点击退格
+      backspaceClick() {
+        this.$emit('backspace')
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-keyboard {
+    position: relative;
+    
+    &__tooltip {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      
+      &__item {
+        color: $tn-font-color;
+        flex: 0 0 33.3333333333%;
+        text-align: center;
+        font-size: 28rpx;
+        padding: 20rpx 10rpx;
+      }
+      
+      &__cancel {
+        text-align: left;
+        flex-grow: 1;
+        flex-wrap: 0;
+        padding-left: 40rpx;
+        color: $tn-content-color;
+        
+        &--hover {
+          color: $tn-font-color;
+        }
+      }
+      
+      &__confirm {
+        text-align: right;
+        flex-grow: 1;
+        flex-wrap: 0;
+        padding-right: 40rpx;
+        color: $tn-main-color;
+        
+        &--hover {
+          color: $tn-color-blue;
+        }
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-landscape/tn-landscape.vue b/tuniao-ui/components/tn-landscape/tn-landscape.vue
new file mode 100644
index 0000000..114c1f7
--- /dev/null
+++ b/tuniao-ui/components/tn-landscape/tn-landscape.vue
@@ -0,0 +1,225 @@
+<template>
+  <view class="tn-landscape-class tn-landscape">
+    <view v-if="showValue" class="tn-landscape__container" :style="[containerStyle]">
+      <slot></slot>
+      <view
+        v-if="closeBtn"
+        class="tn-landscape__icon tn-icon-close-fill"
+        :class="[{
+          'tn-landscape__icon--left-top': closePosition === 'leftTop',
+          'tn-landscape__icon--right-top': closePosition === 'rightTop',
+          'tn-landscape__icon--bottom': closePosition === 'bottom'
+        }]"
+        :style="[closeBtnStyle]"
+        @tap="close"
+      ></view>
+    </view>
+    <view
+      v-if="mask"
+      class="tn-landscape__mask"
+      :class="[{'tn-landscape__mask--show': showValue}]"
+      :style="[maskStyle]"
+      @tap="closeMask"
+    ></view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-landscape',
+    props: {
+      // 显示
+      show: {
+        type: Boolean,
+        default: false
+      },
+      // 显示关闭图标
+      closeBtn: {
+        type: Boolean,
+        default: true
+      },
+      // 关闭图标颜色
+      closeColor: {
+        type: String,
+        default: ''
+      },
+      // 关闭图标大小，单位rpx
+      closeSize: {
+        type: Number,
+        default: 0
+      },
+      // 关闭图标位置
+      // leftTop -> 左上角 rightTop -> 右上角 bottom -> 底部
+      closePosition: {
+        type: String,
+        default: 'rightTop'
+      },
+      // 关闭图标top值，单位rpx
+      // 当关闭图标在leftTop或者rightTop时生效
+      closeTop: {
+        type: Number,
+        default: 0
+      },
+      // 关闭图标right值，单位rpx
+      // 当关闭图标在RightTop时生效
+      closeRight: {
+        type: Number,
+        default: 0
+      },
+      // 关闭图标bottom值，单位rpx
+      // 当关闭图标在bottom时生效
+      closeBottom: {
+        type: Number,
+        default: 0
+      },
+      // 关闭图标left值，单位rpx
+      // 当关闭图标在leftTop时生效
+      closeLeft: {
+        type: Number,
+        default: 0
+      },
+      // 显示遮罩
+      mask: {
+        type: Boolean,
+        default: true
+      },
+      // 点击遮罩可以关闭
+      maskCloseable: {
+        type: Boolean,
+        default: true
+      },
+      // zIndex
+      zIndex: {
+        type: Number,
+        default: 0
+      }
+    },
+    computed: {
+      containerStyle() {
+        let style = {}
+        style.zIndex = this.zIndex ? this.zIndex : this.$tn.zIndex.landsacpe
+        return style
+      },
+      closeBtnStyle() {
+        let style = {}
+        if (this.closePosition === 'leftTop') {
+          if (this.closeTop) {
+            style.top = this.closeTop + 'rpx'
+          }
+          if (this.closeLeft) {
+            style.left = this.closeLeft + 'rpx'
+          }
+        } else if (this.closePosition === 'rightTop') {
+          if (this.closeTop) {
+            style.top = this.closeTop + 'rpx'
+          }
+          if (this.closeRight) {
+            style.right = this.closeRight + 'rpx'
+          }
+        } else if (this.closePosition === 'bottom') {
+          if (this.closeBottom) {
+            style.bottom = this.closeBottom + 'rpx'
+          }
+        }
+        if (this.closeSize) {
+          style.fontSize = this.closeSize + 'rpx'
+        }
+        if (this.closeColor) {
+          style.color = this.closeColor
+        }
+        return style
+      },
+      maskStyle() {
+        let style = {}
+        style.zIndex = this.zIndex ? this.zIndex - 1 : this.$tn.zIndex.landsacpe - 1
+        return style
+      }
+    },
+    watch: {
+      show: {
+        handler(val) {
+          this.showValue = val
+        },
+        immediate: true
+      }
+    },
+    data() {
+      return {
+        showValue: false
+      }
+    },
+    methods: {
+      // 关闭压屏窗
+      close() {
+        this.showValue = false
+        this.$emit('close')
+      },
+      // 点击遮罩关闭
+      closeMask() {
+        if (!this.maskCloseable) return
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-landscape {
+    width: 100%;
+    overflow: hidden;
+    
+    &__container {
+      max-width: 100%;
+      position: fixed;
+      display: inline-flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+    }
+    
+    &__icon {
+      position: absolute;
+      text-align: center;
+      font-size: 50rpx;
+      color: #FFFFFF;
+      
+      &--left-top {
+        top: -40rpx;
+        left: 20rpx;
+      }
+      
+      &--right-top {
+        top: -40rpx;
+        right: 40rpx;
+      }
+      
+      &--bottom {
+        left: 50%;
+        bottom: -40rpx;
+        transform: translateX(-50%);
+      }
+    }
+    
+    &__mask {
+      position: fixed;
+      width: 100%;
+      height: 100%;
+      background-color: $tn-mask-bg-color;
+      top: 0;
+      right: 0;
+      bottom: 0;
+      left: 0;
+      opacity: 0;
+      transform: scale3d(1, 1, 0);
+      transition: all 0.25s ease-in;
+      
+      &--show {
+        opacity: 1 !important;
+        transform: scale3d(1, 1, 1);
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-lazy-load/tn-lazy-load.vue b/tuniao-ui/components/tn-lazy-load/tn-lazy-load.vue
new file mode 100644
index 0000000..90fb876
--- /dev/null
+++ b/tuniao-ui/components/tn-lazy-load/tn-lazy-load.vue
@@ -0,0 +1,254 @@
+<template>
+  <view class="tn-lazy-load-class tn-lazy-load">
+    <view
+      class="tn-lazy-load__item"
+      :class="[`tn-lazy-load__item--${elIndex}`]"
+      :style="[lazyLoadItemStyle]"
+    >
+      <view class="tn-lazy-load__item__content">
+        <image
+          v-if="!error"
+          class="tn-lazy-load__item__image"
+          :style="[imageStyle]"
+          :src="show ? image : loadingImg"
+          :mode="imgMode"
+          @load="handleImgLoaded"
+          @error="handleImgError"
+          @tap="handleImgClick"
+        ></image>
+        <image
+          v-else
+          class="tn-lazy-load__item__image tn-lazy-load__item__image--error"
+          :style="[imageStyle]"
+          :src="errorImg"
+          :mode="imgMode"
+          @load="handleErrorImgLoaded"
+          @tap="handleImgClick"
+        ></image>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-lazy-load',
+    props: {
+      // 组件标识
+      index: {
+        type: [String, Number],
+        default: ''
+      },
+      // 待显示的图片地址
+      image: {
+        type: String,
+        default: ''
+      },
+      // 图片裁剪模式
+      imgMode: {
+        type: String,
+        default: 'scaleToFill'
+      },
+      // 占位图片路径
+      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/jpeg;base64,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bWxEYm9vbAAAAAAASW50cmJvb2wAAAAAAEJja2dPYmpjAAAAAQAAAAAAAFJHQkMAAAADAAAAAFJkICBkb3ViQG/gAAAAAAAAAAAAR3JuIGRvdWJAb+AAAAAAAAAAAABCbCAgZG91YkBv4AAAAAAAAAAAAEJyZFRVbnRGI1JsdAAAAAAAAAAAAAAAAEJsZCBVbnRGI1JsdAAAAAAAAAAAAAAAAFJzbHRVbnRGI1B4bEBywAAAAAAAAAAACnZlY3RvckRhdGFib29sAQAAAABQZ1BzZW51bQAAAABQZ1BzAAAAAFBnUEMAAAAATGVmdFVudEYjUmx0AAAAAAAAAAAAAAAAVG9wIFVudEYjUmx0AAAAAAAAAAAAAAAAU2NsIFVudEYjUHJjQFkAAAAAAAAAAAAQY3JvcFdoZW5QcmludGluZ2Jvb2wAAAAADmNyb3BSZWN0Qm90dG9tbG9uZwAAAAAAAAAMY3JvcFJlY3RMZWZ0bG9uZwAAAAAAAAANY3JvcFJlY3RSaWdodGxvbmcAAAAAAAAAC2Nyb3BSZWN0VG9wbG9uZwAAAAAAOEJJTQPtAAAAAAAQASwAAAABAAEBLAAAAAEAAThCSU0EJgAAAAAADgAAAAAAAAAAAAA/gAAAOEJJTQQNAAAAAAAEAAAAWjhCSU0EGQAAAAAABAAAAB44QklNA/MAAAAAAAkAAAAAAAAAAAEAOEJJTScQAAAAAAAKAAEAAAAAAAAAAThCSU0D9QAAAAAASAAvZmYAAQBsZmYABgAAAAAAAQAvZmYAAQChmZoABgAAAAAAAQAyAAAAAQBaAAAABgAAAAAAAQA1AAAAAQAtAAAABgAAAAAAAThCSU0D+AAAAAAAcAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAA4QklNBAAAAAAAAAIACjhCSU0EAgAAAAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4QklNBDAAAAAAAAsBAQEBAQEBAQEBAQA4QklNBC0AAAAAAAIAADhCSU0ECAAAAAAAEAAAAAEAAAJAAAACQAAAAAA4QklNBB4AAAAAAAQAAAAAOEJJTQQa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eG1wOkNyZWF0ZURhdGU9IjIwMjItMDItMjJUMjE6MTk6MzQrMDg6MDAiIHhtcDpNZXRhZGF0YURhdGU9IjIwMjItMDItMjJUMjE6MTk6MzQrMDg6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDIyLTAyLTIyVDIxOjE5OjM0KzA4OjAwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjk1NDQ1YTI0LWM2NzAtYTk0OS05MWFkLWM3OGJlZTM4N2VlYiIgeG1wTU06RG9jdW1lbnRJRD0iYWRvYmU6ZG9jaWQ6cGhvdG9zaG9wOjQwMWFkNGViLWZkYWYtYjQ0NS05MzViLTJjNzIwZjE2OGI3MiIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOmEwNzM2YmYwLTJkNWQtZWU0Yi1iYWM1LWJmNzVmODQ3OGQyMyIgZGM6Zm9ybWF0PSJpbWFnZS9qcGVnIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiBwaG90b3Nob3A6SUNDUHJvZmlsZT0ic1JHQiBJRUM2MTk2Ni0yLjEiPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjcmVhdGVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmEwNzM2YmYwLTJkNWQtZWU0Yi1iYWM1LWJmNzVmODQ3OGQyMyIgc3RFdnQ6d2hlbj0iMjAyMi0wMi0yMlQyMToxOTozNCswODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo5NTQ0NWEyNC1jNjcwLWE5NDktOTFhZC1jNzhiZWUzODdlZWIiIHN0RXZ0OndoZW49IjIwMjItMDItMjJUMjE6MTk6MzQrMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/iDFhJQ0NfUFJPRklMRQABAQAADEhMaW5vAhAAAG1udHJSR0IgWFlaIAfOAAIACQAGADEAAGFjc3BNU0ZUAAAAAElFQyBzUkdCAAAAAAAAAAAAAAAAAAD21gABAAAAANMtSFAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEWNwcnQAAAFQAAAAM2Rlc2MAAAGEAAAAbHd0cHQAAAHwAAAAFGJrcHQAAAIEAAAAFHJYWVoAAAIYAAAAFGdYWVoAAAIsAAAAFGJYWVoAAAJAAAAAFGRtbmQAAAJUAAAAcGRtZGQAAALEAAAAiHZ1ZWQAAANMAAAAhnZpZXcAAAPUAAAAJGx1bWkAAAP4AAAAFG1lYXMAAAQMAAAAJHRlY2gAAAQwAAAADHJUUkMAAAQ8AAAIDGdUUkMAAAQ8AAAIDGJUUkMAAAQ8AAAIDHRleHQAAAAAQ29weXJpZ2h0IChjKSAxOTk4IEhld2xldHQtUGFja2FyZCBDb21wYW55AABkZXNjAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA81EAAQAAAAEWzFhZWiAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAG+iAAA49QAAA5BYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAkoAAAD4QAALbPZGVzYwAAAAAAAAAWSUVDIGh0dHA6Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAWSUVDIGh0dHA6Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRlc2MAAAAAAAAALklFQyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAAAAAAAAAALklFQyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcgQ29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdmlldwAAAAAAE6T+ABRfLgAQzxQAA+3MAAQTCwADXJ4AAAABWFlaIAAAAAAATAlWAFAAAABXH+dtZWFzAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAACjwAAAAJzaWcgAAAAAENSVCBjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23////uACFBZG9iZQBkQAAAAAEDABADAgMGAAAAAAAAAAAAAAAA/9sAhAABAQEBAQEBAQEBAgEBAQICAQEBAQICAgICAgICAwIDAwMDAgMDBAQEBAQDBQUFBQUFBwcHBwcICAgICAgICAgIAQEBAQICAgQDAwQHBQQFBwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAj/wgARCAEsASwDAREAAhEBAxEB/8QAuwABAAEEAwEBAAAAAAAAAAAAAAcEBQYIAQIDCQoBAQAAAAAAAAAAAAAAAAAAAAAQAAECBwABAwMEAgMAAAAAAAABBAIDExQFBgcIERIVMEAJECAxFoCgITI1EQABAwICBgcEAwwHBQkAAAABAAIDEQQxBSGRoRIyBkFRYXGBsRPwIhQH8UIjEDBAweFSYnKSojMVIIDRssLSQ1Njc7PTg0R0hJS0lSYIEgEAAAAAAAAAAAAAAAAAAACg/9oADAMBAQIRAxEAAAD9/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5kbmAluLySIXE+MJrWb5H1oPUAAAAAAAAAAAAFtIAMZNYiOivJPPgwaYgH3AP0YAAAAAAAAAAAAHUgUx44PkiRiW8pzATW0gswUup+7IykAAAAAAAAAAAGJkUgEQHypMkM8LCWAhQ09IBP3AmfAAAAAAAAAAAFAYGWEAELmmhhxdCkKAs5oqbJH6BjPQAAAAAAAAAeBhRZgACzEElpI0IOLGXgqDyPlCVh+q0lwAAAAAAAAHBhZRAAFMQ0WQoiiKEjwhgjEgI0BMSPrgfojAAAAAALWa6GJkoE8lvMfAAOpGpjRSFGUZRFCURbDxI6LYb8EzgAAAAAEImBgE1GVlAAAYkYuUpRFGURSFEUJQk0koF1K8AAAAAHgRsWI4AO5kxlYALUYuU5RlKUxSFCURRlCTeepRErHIAAAABYjHAAAcGUlUCmMANWyJj6AlOUhSFKUZRFGZKasHQ2CNogAAAACjLaAAAW81VNRzUM1uKQrj9ORkZSlMUhSlKYwUxRHc9iWSUTkAAAAHicAA4LAfmBIwJfJaK8uBcyUi/FaSsbMlWV5j5IZ3ABJBdQAAAADGyNyPTAzDChPnsahk3kvlxLiXQuZdyoJCJyODoeByZgZySCZ6ZIeoAAALKRIROYmAACCT5Ck0kvEimdkak7mxxpYScbGnB0PEt4AKwkslwkQ7AAoSGCLjzAAAB5nwnM9JNPqQSOfOIw82RMIL8bTHU6nieYAABkBN5nYLOQSWwAAAAAt5pUZsbsAxMhY2VI5NaTb06HB5HAAAABJhKpD5ZAAAAAADWc2UPcAAETEsg6HByAAAADNy0nUAAAAAA4OhyADk7HY5OoOAAAAAD0MtLQAAAAAAAAAcg5AB1AAAAB2MpLqWMogAAAAAAAAAAcg4AAAAO5eytAKYozyAAAAAAAAAAOTgAAA5KkrjsAADoeR0OAAAAAAAAAAAAdz0PQ5AAAAAB1ODgAAAAAAAAHJ2OQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/aAAgBAgABBQD/AFpP/9oACAEDAAEFAP8AWk//2gAIAQEAAQUA/wAG5s2VIl5jp2IYxO+nbPPVOhbkkTLqWwyIsJ0TBZWLd9803m2r9k/NRqGHfs/zWeQ8D3x8/Lvw/qORkT5DqR91lcq0w7PYc/k9inWim5eSOva/kJvlq8lRMPMLB+/A+S/G84vmZ5Rbx5Bb5+v4o/NXNYLa/uY44JcGyZadnH9FSJv7oegao/0rZ3f8y8W6yA40vLxw7LoT9zI2TjOtu1z3O9lwKmCzeU1rOaNs0rddJ+43B5FIxtBCghQQ69x3FdRwu66lsGlZrQsPHDJd4Fm6J2KdszJ6pr2wy9o4K7WDdubyEeZnScxi5vKdZc6Xy77dxlMe2XYHkrJOqKlFSipRU7Lrmo7Xh9j0bJYNJTyKUsEUM2GdjJE4s5zeLP6pr+3sOt8OzWiw+MP5H+i8Ync16fonX9S+0cuZLWU/yzp4tJCkhSQpIUkM3kpGHZvknvHExmqmx80xOYXN6bsmtxyc2sCyHzFykTWBSY1lzJXetMxui9D8ePJro/jFvHDu1aR5Ac3+yiiSGF+4jezqRSKRSKQ7nSGLfLOJ+UdTGpG1iJjZUJjb/jPc31rNmb45nWkT9jsevxd06Ftmva5mXz3JO3n8fhx3TamvYPq5jLscGw2Dom05abLzu3S49U6dkZM2COCbBk41SRSKRSKRSIoYYIc49mZKdG1UjbKRt1JjZSY3iJjcmNoVHDKCOHEeNvG+ttM/+LfxrzMeI/EV44xR8W8fORePeC+rv7iPJZb42A+NgPjYDnr2ZMxj9PdNplMplMpmaeLPWNuhG3RSNuTG5HIUmSFJkj1JjcmN4VOWM6eJpjBPSX9Ry4ltZGTyeQyMasEVfj4T4+E+PhIGcUqLHZVzBH7IT2QnshPZCZJxThikoRyEI25E39SNshHIRCZII5JMkExuhoDaGTruxb5pmqR4PsXM8lPhihjh+nnIYpkuzLMsyzLMsxWnoMkjia+yI9kQ5mrIg2PZNa1ZpuPm348ammk+f+rbp0aOQhFI9SOQpHIVSNsRt0Jjf0JkhDY9kd6ro87BTXE3+tIcb2jI4h79N5JqQUFKClBSgpQUoKW6qbBtepaQw3Xz68bNPNz/ACi5icbr5neRu8LkMllMy8GLhywd6PsTbdtKikoRyUVY5JHJI5HqRyEMs/Rmr2F7mJcODhU+DQb4qY1cYPd36TUVIk+ksmEooUUKKFFCKXBBC62zUcYvb4M3K67DCc2w+MfNZeu6+pK1rXFWVrOtkGrawphNx27BY+X0ToCkvoG+Kcq6bsbDZJfU9dmEvoOpzll7LrLhVlSH0yHEpDD8Wh8Wh8Wh8WhhEjhxf08tuGsYMync9aamS7rtLgyHRugZIeTcnkYrFTy60tcVtX8nLk9MdKJP8yiWSEVY5jR2zjlGgwVM9ZqWkRaRExpFLRlnNmx4w6juzNcd2iExnSNKyY1haPpciUkiV9DL7DhcFLzXYojMbXtecLEsULFCxQsULFDyR0P+3clSFEOYf+fKOeaNlug7F03kGY5pOlnAosJD0Hvq4b+kSjmcHv2dWorWEtYSczRYLFCxQsULFBlE+xs7DdT2vHGE6freVWCOCZB+zIZJjim2wdFyb1Zsqc4mWilopaKWilopaKWilopNx8ufK6fpLjQOhaJhMxh8Yybz3jjjnNW/ONXzmExmx4ronPslzzPSP+3O+N5XcpG+6S50XYOTQJM220QVmnorSIjaL6WilopaKWilopaKWimEzub1+PXN7x+Z/XNZlvhWmVfP8y6tlLZS2UtlLZS2UtlLZS2UtlLZSbgcXPfeVsuns/jHyr1T9N007E7xgtA8fW2ByaJ6HTtLg3PW+OSY03i2RRWcIrP0ImvoWylspbKWylspbKWylspbKaptc6TEbBOjyeSs0LNCzQs0LNCzQs0LNCzQs0LNCzQs0OscnedE6g1at2Tb90OjfHdRthWgrT0EaqpZoWaFmhZoWaFmhZoWaFmhZofMz/63G1WGO2LYti2LYti2LYti2LYti2ImkMSWMospaFlLLKWWctCzloWktSFtDCK2RS2Qt0LYti2LYti2LYti2LYtizjpZbH+ydQQoIUEKCFBCghQQoIUEKCFBCghQQoIUEKCFBCghQQST6FEoiSRZJRKHqUEKCFBCghQQoIUEKCFBCFqscXxUv46KGGOFxjqa0UKKFFCihRQooUUKKFFCihRQooUUKKFFCihRQooUUKKFFBJRSQpFFCihRQooUUKKFFCihRQgarMiaMpbb9k1rLmEbWOApFIpFIpFIpFIpFIpFIpFIpFIpFIpFIpFL1KRSKRSKRSKQklYlgZEEEEtP3RS4IhZAspUKZTKZTKZTKZTKZTKZTKZTKZTKZTKZTKZTKZT9ShEJJhQRERPp+iKeyE9iFMplMplMplMplMplMplMplMplMpnsQ9sP+Cf8A/9oACAECAgY/ADSf/9oACAEDAgY/ADSf/9oACAEBAQY/AP6jb5ppGwxRjekllIa1oHSScE+HLIH5rM3R6o+zhr+sQSfAU7UfhxBYs+qIYi93iZS4bFX+bVH5ptran/LQF5bQX0f1vcdE/wAC0kfupkNwXZVdP0Bl5T0yeyQaNdFmnOvPvMtpypyrksfxGZZ5nUzYYI2k0aATpc5xIDGNBc4kAAk0V3lPyN+V83OUMDjFHzfzzcPy21kLTTeisoGPmex3QZJIndbUH5h8sOS7nLq1da2cGeQTEdXqvzKZte301Y8tfNXJJvkpzBfObbW2bZhdNzDIJJHe6A+8bHC+33j0yxbg6ZFDdWszLm2uWNnt7iBweyRjxvNc1zaggg1BH4XJe3j91jfdYxvE9xwa0dZRNw/0bJhrBYxn3G9RP5zu0+Cw8lc5bkOSv5jfaPdBPfPnbbW5e0kH0z6cjngEY0APRUaVp5Fhc3qF+8HH/wAOU0Z1yPdWcfTJld3DdO/Zljt/NNZLzE7ILh+kW/MNvJBTvkjEkQ/bU2V3N3fZX8ruUJ5YOQeT78TQNDBWI3s0Mgb9vMKkVHuNO4PrF33cp/8AzB8ys4ff8p8yF1t8qM0zGQuflmYgF4y7ef8A6FwAfSbX3JKNAo/3fwl8kjgxkYL3vdgABUlPl0i0grHZxHobXiPa7E6lw7EWluhw3TSvSs25dzBjg+ykPwszhQTW7qmORvY5uo1HQvbrVYQ1rB7u/KaCvgCUXRvgkOO617gf3mhPjzjlwZlaDSfUiZcsA0Cvu71O9SSZU+XI7mhd6bCZYa16WSHeHg4dyfI61GY2jKn4rLqyADrc2gcO3RTt+5k3MeSXbrDOuX7u3zvKL6HQ+G6tJmzxSN7WvaCFydzlBGIYObcqy/maGJtaNZf2kd0Bp6g/8JFrGaSXzvTNP9m3S78QXD5Lh8lw+SEZc3LuY8va45Lm9BQE6fSloKmNx8QdI6QbrIeZMufl2Y2xruSCrJGE6JI3jQ9hpoI802/v2brHnfy6N+J63Ef3dfUnPYz4aZ2nfiwPe3BEuZ6kQr9rHpGPT1ItzXK4rh7hu/EtG5MNHQ9lHbVJc8qZgLsULhlmZlrJD2MlADTjg4DvVxaZ9k8mS5wzS6Xc9KU/pGo3Xg9emvQVSCI5nA925HJaNJfUmgBYKmp7Kr5bcnXmi75TyDJ+WboAg/aWGXQ2rtI7WfhBE100OGLG+84eDaqJ9uS6GJm4N4U94uJOPgunYunYunYunYosk5gyiLNL4H17Gd3uzWmkVe17KEb1KbuB6QQE6WCP4zLWYXFu3TG0fnsGFOsaEGS+8zDeGI/tQfG4Pacd3oW+1oikOnej0axghvDeaPrN707LeYMtjv7c19J7xSWJxHFG9tHNPce9SZ3lT351ytvVfdhv29pU0Ana0U3egPGjrA0Vy7lL5ovufmX8tIyy2jluJPUzvK4sAbeeZw9aNo/0pXYUDXtAocu54+XXMdvzNy3mYpFeWTiHxSAAuhmjfR8UrKjeY8Bw6vwV00zt1o0AdJPUO1OYx5ggOgRsxPeV+RfkX5F+RfkTp3UfPJVltCfrO7ewdKmubl5lmmJe956/yLCvWpJ7Zv8ALL11T6tu0em4/pM0DxFE6aW1dJat0/HWO8+On6WirfEUW7cx74H149B1FAR3Dd4/Uk912pyq3QeghS29zE2e3na6GaKZocx7XCha5pqCCMQVm+TZO8DLJmw5pZ2oO8bdtw3eMRONGkHdrp3aKHmzkm9N1lF25kXNvJl7I4WGbWzHcEgFdyVoJ9OVo3mHraXNdkXzM5CvTcZRm7TDeWNxui6y+9iAE1rcNaTuyRk6ehwIc0lrgT+BFzjRrRvOJ6AEXmojb7sTOodfeVgVgVgVgVgVJc3DiyOMV7SegDtKfczmlfdijB0MaMAEQjoR0I1bXrKfI+y+BunVPxWXUicT1ltC095FU+TKLqLNIhhBIfRm7veJaf2gvTvbe6yyho0yh7Yz3HhPgsrGTZ7Nlt1e3fpST22415ibA8loNKjSQahXF/mN3Lf31071bm8vJHSyyOPS5zyST3o9x818zPl9AZbjkvOeXzzZmUOkxW+Y2F/bWsEgJ0NMkd1I0gaXUH5uj77NmF/JuQxaGtbpe95wa0dJKkZYXBySxqRHDZ09UjrdIdNf1aJsjeZ78uaagSXc7m+Ic8gqKz5npd27yGDM4mBkkddFXtZQOHaAD3pkkbxJHIA+N7CCHNIqCCOgoRjGU0NOoaVgVgVgVgVgU57zutaN5znaAAFusqLWE/YsPT+ke0rBaPELSFgq7upGrew6FpanMe0PY73XNdQgjqIKzaDn/kW2zmCzMJsH20lzYyRSSCTfcH2EkLq0AxKe+xvOZuWw7S2HJ80tpGN/+QtLl37yjusy5y5wzJjT79k6/wAohjdQ4OMeWh9KdTgrrl/5T8nQctW+YuZPnGYF8tzfX0kYIa64ublz5Hhu8d1td1tTugVP34WVSbbLmhjWNwMjwHOPkPBcJ2LhOxcJ2KbLZnFxy9w9Avx9OSpA8CCmCtKNrrJWKxWKxWKNpC77Jp+1cPrEdHcFhqWHiFpGpHRVYa1gsFh2FYUKzKfAzXPp169yJp/xLFPFa+9XZ99kuJTRkYqaYnqA7SnAzOt7f6tvCS0U/SI0lVOknEmqw2LDYsNiD43GNwwcwkHYmQ30huIuBsz+Jveekd6wWCwWCMEX8Rw99wOA/tRWCJxRNMVWiII7ijoqjo1rQNaoW+CiO7T15ZZdu5/hQhz/AD6GxuDQ/CN9SaYA4ExwNe8A9ZCFna81RRzykBnx0V1asJOjjuo427U1zXBzXAOa5pqCDpqKffIIhwkue7TTSAAPNYbVhtWG1YbVhtWG37kJOkgbte40/EsFgqD+I7gH40cx5p5iseXbI1Jvc+u4LSLRj79w5g2qWO35rm5uvYa1s+ULSW5Bp1TT+jAa9ki5c5LHy/usmyXmW7hyO15jvr+F0sVxcyCGEyWzId0ML3AOIlNK100VcQsPELRrCw8FwoilFhVYeCyqzys+nm2bNkbbzAAmGMvL3yAHp94Bte/oUk9wXTzzOMs001XPe5xqSS4kknrWmE+AUHKmZSvmym8rHlZnJJtpqVDGk/UfhToNKYn741wFSw4dhXD5rh81w+a4fNcPmuHzVN3HvTbzm3mfL+V7FoJ+M5gvLezjNNJo64ewFTRWvNVzzrew1DrPk2ylnBPZPdfDwO72yFTQfLv5XW9iBUQZpzneSXJd2m2shCBT/jFTsu/mJPkFnNUCx5PjiywMB6GzWzRPTvkKkzHOcxnzW/m0zXuZTSTzPOPvPlLnHxP3LW+tJTBeWcjLu1mj4mSRuD2uHaCKrlPnC0AEHM+XWeesY36hurdkpb3tLiD2hadC0aesLBYLSsNKMMEfqznS4nhYD19asX39JfhIWW1u0Na0NYNNNHacSv4QHbRfwwoLqAenPbPbPDIAPdexwcDp6iEyDO4mvied342Bu65telzQSCO6iDmkOa4Va4aQQfvejUvpX0r6V9KLnkNa3S5zjQDWj8dzLYWr24xzXcAd+yXV2L5iw8wZ3JzHmUWb3zTnlzI6U3ULrhz4ZWlxNGvjc1zR0A0VTqWY3F9YxXkjJGwRi6jbIGtDd7QHgjTVCuRWZ09NrB/lWnILL/0sHV+qm/8A16x6f+6W/wDkRry5YH/ydv8A5Fa5PknNOZZPlFg30bHKsqvrq3toWVLt2OKF7WtFSTQBaees4OnpzO9/6qFeds3OnpzK8/6iH88zm+z3LJ4JWTWd9cyT0cKOa5vruNCCOhe/ZXcXWTHE4bJK7F718+3r0Twyn+41y+zzm3aTh6zxF/zN1PlhmZculJfvQva7E/okprd3hAbgOhcA1LgGpcA1LgGpWrHmpjDoxXqa4gbPvjm5pnlvbSM4rcP9SUf9nHvO2JzMssLnNXjhe4Nt4j4vJd+6nNyzK7TLWHB03qXEg8SWN/dThNzNPA06AzL/AE7ag74GsO1b+YZhNfvx37yV8p1vJX0LI+b4IqW/MVucvvXtGj4qzoAXHrdG5oH6pVAsyH++b/cCHevH8Sb4oqgFSdAATY7y1ktZHUe1lyxzCWnpAcBoQ71CytKxS49y0Eal0FYe2tOcKggFwI6CO5NFnnt3A1uETZ5Cz9lziNib611DmTG6Ny+t2Yd8BjO1Nbm/Lp/Sny6XyZKP8Sa05gculd/pZnG6Kne8bzP3k2aynju4ncMts9sjT4tqEyIYN8ya/efUzXMI7UkbzISd6V36rG1cdSfFy/lgPQ28zQmnhHGfN3gnC/zqUwu0G1tnGGKnUWxboPjVdG1fV2r6u1fV2r6u1fV2rmNsEPq5jy61vNGXboqa2gJlA6STCXgDrovxrMv+MP7gQ71bZBlVId4OuL+/laXR20DaBz3AUrpIAHSSB2qzmfdfzrI737KHN4ojDuTUJMcjN5+6SNLfe0juKKtjnJjEht5Rkxuabvxu8zdpvaN7c393tpTTRObf+n/NTcQnIg6nq7/qN9Xd6d3096vRh2Id6t20rWGbQf1VwjwP9i4aDxWjQnaa6F0bV9Xavq7V9XahcZfeyWM4wltJHxu1sITI798WdW7dBF03clp2PjA1uBTIrqR2T3TtG5fU9InskGj9qibJG8SRvAcx7CCCD0gj+i66v7htvC3RV+Lj1NA0k9gT7fJGnLbXS34p4BneOzEN8KntT5p5XTTSHekllLnOcesk1JX0r6V9K+lfSvpX0r6VJDNGJYZmmKWKQVa5rhQgg4ghc1coSxObFlN5JHlxkB3pLSQ+rbu0470bmnvUr81ym5ytl+/4iwdmEEsImjDQ0uj9Ro3hXRUK3tLWF1xdXUjLe3t4QXPfI9wa1rQMSSaAKK3nY1/MOahl5n902ho+nuwtP5sYNO01PSr3Jc4tW3mXX7DDcQv1gg9DmnSCMCpctut64y25rPk2Z0o2eIHA00B7a0cPHAj7jM85tvLmwyqVo/l7N6t3O3ocDMHhkfVUaejRpUmVve65sJwLrK714AMkR0UNNG806Dr6VbNP+wnP7qxp2BGh8F0FcPivpX0r6V9K+lfSvpQOXXjmwV3n2c1Xwu6/dOFesUKZbXjRl2Yu90RyH7OQ/oONNPYdv3TcTD1JX1ZbW7cXu/EB0lOur55kdpEcY0Mjb1NHQFwHYuA7FwHYuA7FwHYuA7FwHYuA7FwHYuA7FwHYoczmyqCbMrdvpQZhLDE6dja1o2Qt3gOwFcqilK2Ev/uCmfMfPrbQC6LlW1mHTpY+5IPi1nieo/ducjzZlGyfa2d4wAyW84B3ZGV6q6R0ioTs05su4M7dbP3sty+1a8wGmD5fUA3j+hSnWSqDQBoACmt4WD+b5dW9yiTRUvA96OvVIBTvoehW8MjCx7ILlkkbwQQQ2hBB6QqbmxcNOuq0NB7lweAXAdi4DsXAdi4DsXAdi4DsXAdi4DsXAdiiy3Nnl8BpHbXkmksOAa89I6j0d2CmkJrDCTBbt00DWmlfE6VhsKw2FYbCsNhWGwrDYVhsKw2FYbCsNhWGwrDYVhsK5IhuInQ8sWNjNcZ5esq2rI7kH0WH89+8B2Cp6Fb2dnA22tLRjLa2t4QGsjjY0Na1oGAAFB/TtOZsuhpYZrb3TsxjZSkVzuAF1OqSte+vWFw+2pYalhSvSPyrSNGtYbCsNhWGwrDYVhsKw2FYbCsNhWGwrDYV8Nvn4ze+A9TTX092u9300JzXD3mktdXrB71h7a1h7a1h7a1h7a1h7a1h7a1h7a1h7a1h7a1h7a1h7a1h7a1h7a1RzQ4Y0dpX8JuoLRG3UF/DbqC/ht1BfwmnwC0RgeAXABqR9wd4FF1LDasNqw9taw9taw9taw9taw9taw9taw9taw9taw9taw9taw9ta9Sh9Pe3OytK9aNyxtY5jV9Oh35Vw+S4fJcPkuHyXD5Lh8lw+S4fJcPkuHyXD5Lh8lw+S4fJcPkuHyXD5Lh8lw+Sw8lgursWGv8AIv7F1LSPJcPkuHyXD5Lh8lw+S4fJcPkuHyXD5JrGM3nO0NAovg9G/wDxd/o9T20IseN5rtBBRfGN+PGnSFwnUuE6lwnUuE6lwnUuE6lwnUuE6lwnUuE6lwnUuE6lwnUuE6lwnUuE6lwnUuE6lwnUuE6lwnUjoPgFpaT3rQCFw7FwnUuE6lwnUuE6lwnUuE6lwnUuE6kGsYSSt6m9KdBd1d39CoG47rb0rAkdbVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVQAkoGQ0H5oW6xu6Oz+npGnrC0O1/cxWKxWKxWKxWKxWKxWKxWKxWKxWKxWKxWKxWg7FjRadPeqAUHZ980iqwWgrFYrFYrFYrFYrFYrFYrFYrFYrFY/cw/qJ//9k='
+      },
+      // 图片进入可见区域前多少像素前，单位rpx，开始加载图片
+      // 负数为图片超出屏幕底部多少像素后触发懒加载，正数为图片顶部距离屏幕底部多少距离时触发（图片还没出现在屏幕上）
+      threshold: {
+        type: [Number, String],
+        default: 100
+      },
+      // 是否开启过渡效果
+      isEffect: {
+        type: Boolean,
+        default: true
+      },
+      // 动画过渡时间
+      duration: {
+        type: [String, Number],
+        default: 500
+      },
+      // 渡效果的速度曲线，各个之间差别不大，因为这是淡入淡出，且时间很短，不是那些变形或者移动的情况，会明显
+      // linear|ease|ease-in|ease-out|ease-in-out|cubic-bezier(n,n,n,n);
+      effect: {
+      	type: String,
+      	default: 'ease-in-out'
+      },
+      // 图片高度，单位rpx
+      height: {
+        type: [String, Number],
+        default: 450
+      },
+      // 图片圆角
+      borderRadius: {
+        type: String,
+        default: ''
+      }
+    },
+    computed: {
+      thresholdValue() {
+        // 先取绝对值，因为threshold可能是负数，最后根据this.threshold是正数或者负数，重新还原
+        let threshold = uni.upx2px(Math.abs(this.threshold))
+        return this.threshold < 0 ? -threshold : threshold
+      },
+      lazyLoadItemStyle() {
+        let style = {}
+        style.opacity = Number(this.opacity)
+        if (this.borderRadius) {
+          style.borderRadius = this.borderRadius
+        }
+        // 因为time值需要改变,所以不直接用duration值(不能改变父组件prop传过来的值)
+        style.transition = `opacity ${this.time / 1000}s ${this.effect}`
+        style.height = this.$tn.string.getLengthUnitValue(this.height)
+        return style
+      },
+      imageStyle() {
+        let style = {}
+        if (typeof this.height === 'string' && this.height.indexOf('%') === -1) {
+          style.height = this.$tn.string.getLengthUnitValue(this.height)
+        }
+        return style
+      }
+    },
+    watch: {
+      show(val) {
+        // 如果不开启过渡效果直接返回
+        if (!this.effect) return
+        this.time = 0
+        // 原来opacity为1(不透明，是为了显示占位图)，改成0(透明，意味着该元素显示的是背景颜色，默认的白色)，再改成1，是为了获得过渡效果
+        this.opacity = 0
+        setTimeout(() => {
+          this.time = this.duration
+          this.opacity = 1
+        }, 30)
+      },
+      image(val) {
+        // 修改图片后重置部分变量
+        if (!val) {
+          // 如果传入null或者''，或者undefined，标记为错误状态
+          this.error = true
+        } else {
+          this.init()
+          this.error = false
+        }
+      }
+    },
+    data() {
+      return {
+        elIndex: this.$tn.uuid(),
+        // 显示图片
+        show: false,
+        // 图片透明度
+        opacity: 1,
+        // 动画时间
+        time: this.duration,
+        // 懒加载状态
+        // loadlazy-懒加载中状态，loading-图片正在加载，loaded-图片加加载完成
+        loadStatus: '',
+        // 图片加载失败
+        error: false
+      }
+    },
+    created() {
+      // 由于一些特殊原因，不能将此变量放到data中定义
+      this.observer = {}
+      this.observerName = 'lazyLoadContentObserver'
+    },
+    mounted() {
+      // 在需要用到懒加载的页面，在触发底部的时候触发tOnLazyLoadReachBottom事件，保证所有图片进行加载
+      this.$nextTick(() => {
+        uni.$once('tOnLazyLoadReachBottom', () => {
+          if (!this.show) this.show = true
+        })
+      })
+      // mounted的时候，不一定挂载了这个元素，延时30ms，否则会报错或者不报错，但是也没有效果
+      setTimeout(() => {
+        this.disconnectObserver(this.observerName)
+        const contentObserver = uni.createIntersectionObserver(this)
+        contentObserver.relativeToViewport({
+          bottom: this.thresholdValue
+        }).observe(`.tn-lazy-load__item--${this.elIndex}`, (res) => {
+          if (res.intersectionRatio > 0) {
+            // 懒加载状态改变
+            this.show = true
+            // 如果图片已经加载，去掉监听，减少性能消耗
+            this.disconnectObserver(this.observerName)
+          }
+        })
+        this[this.observerName] = contentObserver
+      }, 50)
+    },
+    methods: {
+      // 初始化
+      init() {
+        this.error = false
+        this.loadStatus = ''
+      },
+      // 处理图片点击事件
+      handleImgClick() {
+        let whichImg = ''
+        // 如果show为false，则表示图片还没有开始加载，点击的是最开始占位图
+        if (this.show === false) whichImg = 'lazyImg'
+        // 如果error为true，则表示图片加载失败，点击的是错误占位图
+        else if (this.error === true) whichImg = 'errorImg'
+        // 点击了正常的图片
+        else whichImg = 'realImg'
+        
+        this.$emit('click', {
+          index: this.index,
+          whichImg: whichImg
+        })
+      },
+      // 处理图片加载完成事件，通过show来区分是占位图触发还是加载真正的图片触发
+      handleImgLoaded() {
+        if (this.loadStatus = '') {
+          // 占位图加载完成
+          this.loadStatus = 'lazyed'
+        }
+        else if (this.loadStatus == 'lazyed') {
+          // 真正的图片加载完成
+          this.loadStatus = 'loaded'
+          this.$emit('loaded', this.index)
+        }
+      },
+      // 处理错误图片加载完成
+      handleErrorImgLoaded() {
+        this.$emit('error', this.index)
+      },
+      // 处理图片加载失败
+      handleImgError() {
+        this.error = true
+      },
+      disconnectObserver(observerName) {
+        const observer = this[observerName]
+        observer && observer.disconnect()
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-lazy-load {
+    &__item {
+      background-color: $tn-bg-gray-color;
+      overflow: hidden;
+      
+      &__image {
+        // 解决父容器会多出3px的问题
+        display: block;
+        width: 100%;
+        // 骗系统开启硬件加速
+        transform: transition3d(0, 0, 0);
+        // 防止图片加载“闪一下”
+        will-change: transform;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-line-progress/tn-line-progress.vue b/tuniao-ui/components/tn-line-progress/tn-line-progress.vue
new file mode 100644
index 0000000..7e4af3e
--- /dev/null
+++ b/tuniao-ui/components/tn-line-progress/tn-line-progress.vue
@@ -0,0 +1,143 @@
+<template>
+  <view
+    class="tn-line-progress-class tn-line-progress"
+    :style="[progressStyle]"
+  >
+    <view
+      class="tn-line-progress--active"
+      :class="[
+        $tn.color.getBackgroundColorInternalClass(activeColor),
+        striped ? stripedAnimation ? 'tn-line-progress__striped tn-line-progress__striped--active' : 'tn-line-progress__striped' : '',
+      ]"
+      :style="[progressActiveStyle]"
+    >
+      <slot v-if="$slots.default || $slots.$default"></slot>
+      <block v-else-if="showPercent">{{ percent + '%' }}</block>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-line-progress',
+    props: {
+      // 进度（百分比）
+      percent: {
+        type: Number,
+        default: 0,
+        validator: val => {
+          return val >= 0 && val <= 100
+        }
+      },
+      // 高度
+      height: {
+        type: Number,
+        default: 0
+      },
+      // 是否显示为圆角
+      round: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示条纹
+      striped: {
+        type: Boolean,
+        default: false
+      },
+      // 条纹是否运动
+      stripedAnimation: {
+        type: Boolean,
+        default: true
+      },
+      // 激活部分颜色
+      activeColor: {
+        type: String,
+        default: ''
+      },
+      // 非激活部分颜色
+      inactiveColor: {
+        type: String,
+        default: ''
+      },
+      // 是否显示进度条内部百分比值
+      showPercent: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      progressStyle() {
+        let style = {}
+        style.borderRadius = this.round ? '100rpx' : 0
+        if (this.height) {
+          style.height = this.$tn.string.getLengthUnitValue(this.height)
+        }
+        if (this.inactiveColor) {
+          style.backgroundColor = this.inactiveColor
+        }
+        return style
+      },
+      progressActiveStyle() {
+        let style = {}
+        style.width = this.percent + '%'
+        if (this.$tn.color.getBackgroundColorStyle(this.activeColor)) {
+          style.backgroundColor = this.$tn.color.getBackgroundColorStyle(this.activeColor)
+        }
+        return style
+      }
+    },
+    data() {
+      return {
+        
+      }
+    },
+    
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-line-progress {
+    /* #ifndef APP-NVUE */
+    display: inline-flex;
+    /* #endif */
+    align-items: center;
+    width: 100%;
+    height: 28rpx;
+    overflow: hidden;
+    border-radius: 100rpx;
+    background-color: $tn-progress-bg-color;
+    
+    &--active {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-items: flex-end;
+      justify-content: space-around;
+      width: 0;
+      height: 100%;
+      font-size: 20rpx;
+      color: #FFFFFF;
+      background-color: $tn-main-color;
+      transition: all 0.3s ease;
+    }
+    
+    &__striped {
+      background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+      background-size: 80rpx 80rpx;
+      
+      &--active {
+        animation: progress-striped 2s linear infinite;
+      }
+    }
+  }
+  
+  @keyframes progress-striped {
+    0% {
+      background-position: 0 0;
+    }
+    100% {
+      background-position: 80rpx 0;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-list-cell/tn-list-cell.vue b/tuniao-ui/components/tn-list-cell/tn-list-cell.vue
new file mode 100644
index 0000000..5e2fc19
--- /dev/null
+++ b/tuniao-ui/components/tn-list-cell/tn-list-cell.vue
@@ -0,0 +1,209 @@
+<template>
+  <view
+    class="tn-list-cell-class tn-list-cell"
+    :class="[
+      backgroundColorClass,
+      fontColorClass,
+      cellClass
+    ]"
+    :hover-class="hover ? 'tn-hover' : ''"
+    :hover-stay-time="150"
+    :style="[cellStyle]"
+    @tap="handleClick"
+  >
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    mixins: [ componentsColorMixin ],
+    name: 'tn-list-cell',
+    props: {
+      // 列表序号
+      index: {
+        type: [Number, String],
+        default: '0'
+      },
+      // 内边距
+      padding: {
+        type: String,
+        default: ''
+      },
+      // 是否有箭头
+      arrow: {
+        type: Boolean,
+        default: false
+      },
+      //箭头是否有偏移距离
+      arrowRight: {
+      	type: Boolean,
+      	default: true
+      },
+      // 是否有点击效果
+      hover: {
+        type: Boolean,
+        default: false
+      },
+      // 隐藏线条
+      unlined: {
+        type: Boolean,
+        default: false
+      },
+      //线条是否有左偏移距离
+      lineLeft: {
+      	type: Boolean,
+      	default: true
+      },
+      //线条是否有右偏移距离
+      lineRight: {
+      	type: Boolean,
+      	default: true
+      },
+      //是否加圆角
+      radius: {
+      	type: Boolean,
+      	default: false
+      }
+    },
+    computed: {
+      cellClass() {
+        let clazz = ''
+        
+        if (this.arrow) {
+          clazz += ' tn-list-cell--arrow'
+          if (!this.arrowRight) {
+            clazz += ' tn-list-cell--arrow--none-right'
+          }
+        }
+        
+        if (this.unlined) {
+          clazz += ' tn-list-cell--unlined'
+        } else {
+          if (this.lineLeft) {
+            clazz += ' tn-list-cell--line-left'
+          }
+          if (this.lineRight) {
+            clazz += ' tn-list-cell--line-right'
+          }
+        }
+        
+        if (this.radius) {
+          clazz += ' tn-list-cell--radius'
+        }
+        
+        return clazz
+      },
+      cellStyle() {
+        let style = {}
+        
+        if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        
+        if (this.fontColorStyle) {
+          style.color = this.fontColorStyle
+        }
+        
+        if (this.fontSize) {
+          style.fontSize = this.fontSize + this.fontUnit
+        }
+        
+        if (this.padding) {
+          style.padding = this.padding
+        }
+        
+        return style
+      },
+      
+    },
+    data() {
+      return {
+        
+      }
+    },
+    methods: {
+      // 处理点击事件
+      handleClick() {
+        this.$emit("click", {
+          index: Number(this.index)
+        })
+        this.$emit("tap", {
+          index: Number(this.index)
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-list-cell {
+    position: relative;
+    width: 100%;
+    box-sizing: border-box;
+    background-color: #FFFFFF;
+    color: $tn-font-color;
+    font-size: 28rpx;
+    padding: 26rpx 30rpx;
+    
+    &--radius {
+      border-radius: 12rpx;
+      overflow: hidden;
+    }
+    
+    &--arrow {
+      &::before {
+        content: " ";
+        position: absolute;
+        top: 50%;
+        right: 30rpx;
+        width: 20rpx;
+        height: 20rpx;
+        margin-top: -12rpx;
+        border-width: 4rpx 4rpx 0 0;
+        border-color: #000000;
+        border-style: solid;
+        transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+      }
+      
+      &--none-right {
+        &::before {
+          right: 0 !important;
+        }
+      }
+    }
+    
+    &::after {
+      content: " ";
+      position: absolute;
+      bottom: 0;
+      right: 0;
+      left: 0;
+      pointer-events: none;
+      border-bottom: 1px solid $tn-border-solid-color;
+      transform: scaleY(0.5) translateZ(0);
+      transform-origin: 0 100%;
+    }
+    
+    &--line-left {
+      &::after {
+        left: 30rpx !important;
+      }
+    }
+    
+    &--line-right {
+      &::after {
+        right: 30rpx !important;
+      }
+    }
+    
+    &--unlined {
+      &::after {
+        border-bottom: 0 !important;
+      }
+    }
+  }
+  
+</style>
diff --git a/tuniao-ui/components/tn-list-view/tn-list-view.vue b/tuniao-ui/components/tn-list-view/tn-list-view.vue
new file mode 100644
index 0000000..810e335
--- /dev/null
+++ b/tuniao-ui/components/tn-list-view/tn-list-view.vue
@@ -0,0 +1,184 @@
+<template>
+  <view
+    class="tn-list-view-class tn-list-view"
+    :class="[
+      backgroundColorClass,
+      viewClass
+    ]"
+    :style="[viewStyle]"
+  >
+    <view
+      v-if="showTitle"
+      class="tn-list-view__title"
+      :class="[
+        fontColorClass
+      ]"
+      :style="[titleStyle]"
+      @tap="handleClickTitle"
+    >{{ title }}</view>
+    
+    <view
+      v-else
+      :class="[{'tn-list-view__title--card': card}]"
+      @tap="handleClickTitle"
+    >
+      <slot name="title"></slot>
+    </view>
+    
+    <view
+      class="tn-list-view__content tn-border-solid-top tn-border-solid-bottom"
+      :class="[contentClass]"
+    >
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    mixins: [ componentsColorMixin ],
+    name: 'tn-list-view',
+    props: {
+      // 标题
+      title: {
+        type: String,
+        default: ''
+      },
+      // 去掉边框 上边框 top, 下边框 bottom, 所有边框 all
+      unlined: {
+        type: String,
+        default: 'all'
+      },
+      // 上外边距
+      marginTop: {
+        type: String,
+        default: ''
+      },
+      // 内容是否显示为卡片模式
+      card: {
+        type: Boolean,
+        default: false
+      },
+      // 是否自定义标题
+      customTitle: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      showTitle() {
+        return !this.customTitle && this.title
+      },
+      viewClass() {
+        let clazz = ''
+        
+        if (this.card) {
+          clazz += ' tn-list-view--card'
+        }
+        
+        return clazz
+      },
+      viewStyle() {
+        let style = {}
+        
+        if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        
+        if (this.marginTop) {
+          style.marginTop = this.marginTop
+        }
+        
+        return style
+      },
+      titleStyle() {
+        let style = {}
+        
+        if (this.fontColorStyle) {
+          style.color = this.fontColorStyle
+        }
+        if (this.fontSize) {
+          style.fontSize = this.fontSize + this.fontUnit
+        }
+        
+        return style
+      },
+      contentClass() {
+        let clazz = ''
+        
+        if (this.card) {
+          clazz += ' tn-list-view__content--card'
+        }
+        
+        switch(this.unlined) {
+          case 'top':
+            clazz += ' tn-none-border-top'
+            break
+          case 'bottom':
+            clazz += ' tn-none-border-bottom'
+            break
+          case 'all':
+            clazz += ' tn-none-border'
+            break
+        }
+        
+        return clazz
+      }
+    },
+    data () {
+      return {
+        kindShowFlag: this.showKind
+      }
+    },
+    methods: {
+      // 处理标题点击事件
+      handleClickTitle() {
+        if (!this.kindList) return
+        this.kindShowFlag = !this.kindShowFlag
+        this.$emit("clickTitle", {})
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-list-view {
+    background-color: #FFFFFF;
+    
+    &__title {
+      width: 100%;
+      padding: 30rpx;
+      font-size: 30rpx;
+      line-height: 30rpx;
+      box-sizing: border-box;
+      
+      &--card {
+        // margin: 0rpx 30rpx;
+      }
+    }
+    
+    &__content {
+      width: 100%;
+      position: relative;
+      border-radius: 0;
+      
+      &--card {
+        // width: auto;
+        // overflow: hidden;
+        // margin-right: 30rpx;
+        // margin-left: 30rpx;
+        // border-radius: 20rpx
+      }
+    }
+    
+    &--card {
+      // padding-bottom: 30rpx;
+      border-radius: 20rpx;
+      overflow: hidden;
+    }
+    
+  }
+  
+</style>
diff --git a/tuniao-ui/components/tn-load-more/tn-load-more.vue b/tuniao-ui/components/tn-load-more/tn-load-more.vue
new file mode 100644
index 0000000..22b6fd2
--- /dev/null
+++ b/tuniao-ui/components/tn-load-more/tn-load-more.vue
@@ -0,0 +1,188 @@
+<template>
+  <view class="tn-load-more-class tn-load-more">
+    <view
+      class="tn-load-more__wrap"
+      :class="[backgroundColorClass]"
+      :style="[loadStyle]"
+    >
+      <view class="tn-load-more__line"></view>
+      <view
+        class="tn-load-more__content"
+        :class="[{'tn-load-more__content--more': (status === 'loadmore' || status === 'nomore')}]"
+      >
+        <view class="tn-load-more__loading">
+          <tn-loading
+            class="tn-load-more__loading__icon"
+            :mode="loadingIconType"
+            :show="status === 'loading' && loadingIcon"
+            :color="loadingIconColor"
+          ></tn-loading>
+        </view>
+        <view
+          class="tn-load-more__text"
+          :class="[fontColorClass, {'tn-load-more__text--dot': (status === 'nomore' && dot)}]"
+          :style="[loadTextStyle]"
+        >{{ showText }}</view>
+      </view>
+      <view class="tn-load-more__line"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-load-more',
+    mixins: [componentsColorMixin],
+    props: {
+      // 加载状态
+      // loadmore -> 加载更多
+      // loading -> 加载中
+      // nomore -> 没有更多
+      status: {
+        type: String,
+        default: 'loadmore'
+      },
+      // 显示加载图标
+      loadingIcon: {
+        type: Boolean,
+        default: true
+      },
+      // 加载图标样式，参考tn-loading组件的加载类型
+      loadingIconType: {
+        type: String,
+        default: 'circle'
+      },
+      // 在圆圈加载状态下，圆圈的颜色
+      loadingIconColor: {
+        type: String,
+        default: ''
+      },
+      // 显示的文字
+      loadText: {
+        type: Object,
+        default() {
+          return {
+            loadmore: '加载更多',
+            loading: '正在加载...',
+            nomore: '没有更多了'
+          }
+        }
+      },
+      // 是否显示粗点，在nomore状态下生效
+      dot: {
+        type: Boolean,
+        default: false
+      },
+      // 自定义组件样式
+      customStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      }
+    },
+    computed: {
+      loadStyle() {
+        let style = {}
+        if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        // 合并用户自定义样式
+        if (Object.keys(this.customStyle).length > 0) {
+          Object.assign(style, this.customStyle)
+        }
+        return style
+      },
+      loadTextStyle() {
+        let style = {}
+        if (this.fontColorStyle) {
+          style.color = this.fontColorStyle
+        }
+        if (this.fontSizeStyle) {
+          style.fontSize = this.fontSizeStyle
+          style.lineHeight = this.$tn.string.getLengthUnitValue(this.fontSize + 2, this.fontUnit)
+        }
+        return style
+      },
+      // 显示的提示文字
+      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.dot) text = this.dotText
+        else text = this.loadText.nomore || '没有更多了'
+        
+        return text
+      }
+    },
+    data() {
+      return {
+        // 粗点
+        dotText: '●'
+      }
+    },
+    methods: {
+      // 处理加载更多事件
+      loadMore() {
+        // 只有在 loadmore 状态下点击才会发送点击事件，内容不满一屏时无法触发底部上拉事件，所以需要点击来触发
+        if (this.status === 'loadmore') this.$emit('loadmore')
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-load-more {
+    
+    &__wrap {
+      background-color: transparent;
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: center;
+      color: $tn-content-color;
+    }
+    
+    &__line {
+      vertical-align: middle;
+      border: 1px solid $tn-content-color;
+      width: 50rpx;
+      transform: scaleY(0.5);
+    }
+    
+    &__content {
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: center;
+      padding: 0 12rpx;
+      
+      &--more {
+        position: relative;
+      }
+    }
+    
+    &__loading {
+      margin-right: 8rpx;
+      
+      &__icon {
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+    
+    &__text {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      line-height: 30rpx;
+      
+      &--dot {
+        font-size: 28rpx;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-loading/tn-loading.vue b/tuniao-ui/components/tn-loading/tn-loading.vue
new file mode 100644
index 0000000..f623c93
--- /dev/null
+++ b/tuniao-ui/components/tn-loading/tn-loading.vue
@@ -0,0 +1,114 @@
+<template>
+  <view
+    v-if="show"
+    class="tn-loading-class tn-loading"
+    :class="[
+      `tn-loading-${mode}`,
+      animation ? `tn-loading-${mode}--animation` : ''
+    ]"
+    :style="[loadStyle]"
+  ></view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-loading',
+    props: {
+      // 动画类型
+      // circle 圆圈 flower 花朵形状
+      mode: {
+        type: String,
+        default: 'circle'
+      },
+      // 是否显示
+      show: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示加载动画
+      animation: {
+        type: Boolean,
+        default: true
+      },
+      // 圆圈颜色
+      color: {
+        type: String,
+        default: ''
+      },
+      // 图标大小
+      size: {
+        type: Number,
+        default: 34
+      }
+    },
+    computed: {
+      // 加载动画圆圈的样式
+      loadStyle() {
+        let style = {}
+        style.width = this.size + 'rpx'
+        style.height = style.width
+        if (this.mode === 'circle') style.borderColor = `#E6E6E6 #E6E6E6 #E6E6E6 ${this.color ? this.color : '#AAAAAA'}`
+        
+        return style
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-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: #E6E6E6 #E6E6E6 #E6E6E6 #AAAAAA;
+    
+    &--animation {
+      animation: tn-circle 1s linear infinite;
+      -webkit-animation: tn-circle 1s linear infinite;
+    }
+  }
+  
+  .tn-loading-flower {
+    display: inline-block;
+    vertical-align: middle;
+    width: 28rpx;
+    height: 28rpx;
+    background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;;
+    background-size: 100%;
+    
+    &--animation {
+      animation: tn-flower 1s steps(12) infinite;
+      -webkit-animation: tn-flower 1s steps(12) infinite;
+    }
+  }
+  
+  @keyframes tn-flower {
+  	0% {
+  		transform: rotate(0deg);
+  		-webkit-transform: rotate(0deg);
+  	}
+  
+  	to {
+  		transform: rotate(360deg);
+  		-webkit-transform: rotate(360deg);
+  	}
+  }
+  
+  @keyframes tn-circle {
+  	0% {
+  		transform: rotate(0);
+  		-webkit-transform: rotate(0);
+  	}
+  
+  	100% {
+  		transform: rotate(360deg);
+  		-webkit-transform: rotate(360deg);
+  	}
+  }
+</style>
diff --git a/tuniao-ui/components/tn-modal/tn-modal.vue b/tuniao-ui/components/tn-modal/tn-modal.vue
new file mode 100644
index 0000000..ddcf234
--- /dev/null
+++ b/tuniao-ui/components/tn-modal/tn-modal.vue
@@ -0,0 +1,246 @@
+<template>
+  <view v-if="value" class="tn-modal-class tn-modal">
+    <tn-popup
+      v-model="value"
+      mode="center"
+      :popup="false"
+      :borderRadius="radius"
+      :width="width"
+      :zoom="zoom"
+      :safeAreaInsetBottom="safeAreaInsetBottom"
+      :maskCloseable="maskCloseable"
+      :zIndex="zIndex"
+      :closeBtn="showCloseBtn"
+      @close="close"
+    >
+      <!-- 内容 -->
+      <view
+        class="tn-modal__box"
+        :class="[
+          backgroundColorClass
+        ]"
+        :style="[boxStyle]"
+      >
+        <!-- 不是自定义弹框内容 -->
+        <view v-if="!custom">
+          <view class="tn-modal__box__title" v-if="title && title !== ''">{{ title }}</view>
+          <view
+            class="tn-modal__box__content"
+            :class="[
+              fontColorClass,
+              contentClass
+            ]"
+            :style="contentStyle"
+          >{{ content }}</view>
+          <view v-if="button && button.length" class="tn-modal__box__btn-box" :class="[button.length != 2 ? 'tn-flex-direction-column' : '']">
+            <block v-for="(item, index) in button" :key="index">
+              <tn-button
+                width="100%"
+                height="68rpx"
+                :fontSize="26"
+                :backgroundColor="item.backgroundColor || ''"
+                :fontColor="item.fontColor || ''"
+                :plain="item.plain || false"
+                :shape="item.shape || 'round'"
+                :class="[
+                  button.length > 2 ? 'tn-margin-bottom' : ''
+                ]"
+                @click="handleClick(index)"
+                :style="{
+                  width: button.length != 2 ? '80%' : '46%'
+                }"
+              >
+                {{ item.text }}
+              </tn-button>
+            </block>
+          </view>
+        </view>
+        <view v-else>
+          <slot></slot>
+        </view>
+      </view>
+    </tn-popup>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    mixins: [componentsColorMixin],
+    name: 'tn-modal',
+    props: {
+      // 显示控制
+      value: {
+        type: Boolean,
+        default: false
+      },
+      // 弹框宽度
+      width: {
+        type: String,
+        default: '84%'
+      },
+      // 内边距
+      padding: {
+        type: String,
+        default: ''
+      },
+      // 圆角
+      radius: {
+        type: Number,
+        default: 12
+      },
+      // 标题
+      title: {
+        type: String,
+        default: ''
+      },
+      // 内容
+      content: {
+        type: String,
+        default: ''
+      },
+      // 按钮内容 设置参数与button组件的参数一致
+      // {
+      //   text: '确定',
+      //   backgroundColor: 'red',
+      //   fontColor: 'white',
+      //   plain: true,
+      //   shape: ''
+      // }
+      button: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      safeAreaInsetBottom: {
+      	type: Boolean,
+      	default: false
+      },
+      // 点击遮罩是否可以关闭
+      maskCloseable: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示右上角关闭按钮
+      showCloseBtn: {
+        type: Boolean,
+        default: false
+      },
+      // 放大动画
+      zoom: {
+        type: Boolean,
+        default: true
+      },
+      // 自定义弹框内容
+      custom: {
+        type: Boolean,
+        default: false
+      },
+      // 弹框的z-index
+      zIndex: {
+        type: Number,
+        default: 0
+      }
+    },
+    computed: {
+      boxStyle() {
+        let style = {}
+        
+        if (this.padding) {
+          style.padding = this.padding
+        }
+        if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        
+        return style
+      },
+      contentClass() {
+        let clazz = ''
+        if (this.title) {
+          clazz += ' tn-margin-top'
+        } else {
+          clazz += ' tn-modal__box__content--no-title'
+        }
+        
+        return clazz
+      },
+      contentStyle() {
+        let style = {}
+        
+        if (this.fontSize) {
+          style.fontSize = this.fontSize + this.fontUnit
+        }
+        if (this.fontColorStyle) {
+          style.color = this.fontColorStyle
+        }
+        
+        return style
+      },
+    },
+    data() {
+      return {
+        
+      }
+    },
+    methods: {
+      // 处理按钮点击事件
+      handleClick(index) {
+        if (!this.value) return
+        this.$emit("click", {
+          index: Number(index)
+        })
+      },
+      // 处理关闭事件
+      close() {
+        this.$emit("cancel")
+        this.$emit('input', false)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-modal {
+    
+    &__box {
+      position: relative;
+      box-sizing: border-box;
+      background-color: #FFFFFF;
+      padding: 40rpx 64rpx;
+      
+      &__title {
+        text-align: center;
+        font-size: 34rpx;
+        color: #333;
+        padding-top: 20rpx;
+        font-weight: bold;
+      }
+      
+      &__content {
+        text-align: center;
+        padding-bottom: 30rpx;
+        color: $tn-font-color;
+        font-size: 28rpx;
+        
+        &--no-title {
+          padding-bottom: 0rpx !important;
+        }
+      }
+      
+      &__btn-box {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      }
+      
+      &__content ~ &__btn-box {
+        margin-top: 30rpx;
+      }
+    }
+  }
+  
+</style>
diff --git a/tuniao-ui/components/tn-nav-bar/tn-nav-bar.vue b/tuniao-ui/components/tn-nav-bar/tn-nav-bar.vue
new file mode 100644
index 0000000..48f7173
--- /dev/null
+++ b/tuniao-ui/components/tn-nav-bar/tn-nav-bar.vue
@@ -0,0 +1,355 @@
+<template>
+  <view
+    class="tn-custom-nav-bar-class tn-custom-nav-bar"
+    :style="[navBarStyle]"
+  >
+  	<view
+      class="tn-custom-nav-bar__bar"
+      :class="[barClass]"
+      :style="[barStyle]"
+    >
+      <view v-if="isBack">
+        <view v-if="customBack">
+          <view 
+            :style="{
+              width: customBackStyleInfo.width + 'px',
+              height: customBackStyleInfo.height + 'px',
+              marginLeft: customBackStyleInfo.left + 'px'
+            }"
+          >
+            <slot name="back"></slot>
+          </view>
+        </view>
+        <view v-else class="tn-custom-nav-bar__bar__action" @tap="handlerBack">
+        	<text class="tn-custom-nav-bar__bar__action--nav-back" :class="[`tn-icon-${backIcon}`]"></text>
+        	<text class="tn-custom-nav-bar__bar__action--nav-back-text" v-if="backTitle">{{ backTitle }}</text>
+        </view>
+      </view>
+  		<view class="tn-custom-nav-bar__bar__content" :style="[contentStyle]">
+  			<slot></slot>
+  		</view>
+  		<view>
+        <slot name="right"></slot>
+      </view>
+  	</view>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-nav-bar',
+    mixins: [componentsColorMixin],
+    props: {
+      // 层级
+      zIndex: {
+        type: Number,
+        default: 0
+      },
+      // 导航栏的高度
+      height: {
+        type: Number,
+        default: 0
+      },
+      // 高度单位
+      unit: {
+        type: String,
+        default: 'px'
+      },
+      // 是否显示返回按钮
+      isBack: {
+        type: Boolean,
+        default: true
+      },
+      // 返回按钮的图标
+      backIcon: {
+        type: String,
+        default: 'left'
+      },
+      // 返回按钮旁显示的文字
+      backTitle: {
+        type: String,
+        default: '返回'
+      },
+      // 透明状态栏
+      alpha: {
+        type: Boolean,
+        default: false
+      },
+      // 是否固定在顶部
+      fixed: {
+        type: Boolean,
+        default: true
+      },
+      // 是否显示底部阴影
+      bottomShadow: {
+        type: Boolean,
+        default: true
+      },
+      // 是否自定义返回按钮
+      customBack: {
+        type: Boolean,
+        default: false
+      },
+      // 返回前回调
+      beforeBack: {
+        type: Function,
+        default: null
+      }
+    },
+    computed: {
+      navBarStyle() {
+        let style = {}
+        style.height = this.height === 0 ? this.customBarHeight + this.unit : this.height + this.unit
+        if (this.fixed) {
+          style.position = 'fixed'
+        }
+        style.zIndex = this.elZIndex
+        
+        return style
+      },
+      barClass() {
+        let clazz = ''
+        if (this.backgroundColorClass) {
+          clazz += ` ${this.backgroundColorClass}`
+        }
+        if (this.fontColorClass) {
+          clazz += `${this.fontColorClass}`
+        }
+        if (this.fixed) {
+          clazz += ' tn-custom-nav-bar__bar--fixed'
+        }
+        if (this.alpha) {
+          clazz += ' tn-custom-nav-bar__bar--alpha'
+        }
+        if (this.bottomShadow) {
+          clazz += ' tn-custom-nav-bar__bar--bottom-shadow'
+        }
+        
+        return clazz
+      },
+      barStyle() {
+        let style = {}
+        style.height = this.height === 0 ? this.customBarHeight + this.unit : this.height + this.unit
+        
+        if (this.fixed) {
+          style.paddingTop = this.statusBarHeight + 'px'
+        }
+        
+        if(!this.backgroundColorClass) {
+          style.backgroundColor = this.backgroundColor !== '' ? this.backgroundColor : '#FFFFFF'
+        }
+        if (!this.fontColorClass && this.fontColor) {
+          style.color= this.fontColor
+        }
+        
+        style.zIndex = this.elZIndex
+        
+        return style
+      },
+      contentStyle() {
+        let style = {}
+        style.top = this.fixed ? this.statusBarHeight + 'px' : '0px'
+        style.height = this.height === 0 ? (this.customBarHeight - this.statusBarHeight) + this.unit : this.height + this.unit
+        style.lineHeight = style.height
+        
+        if (this.isBack) {
+          if (this.customBack) {
+            const width = (this.customBackStyleInfo.width + this.customBackStyleInfo.left) * 2
+            style.width = `calc(100% - ${width}px)`
+          } else {
+            style.width = 'calc(100% - 340rpx)'
+          }
+        } else {
+          style.width = '100%'
+        }
+        
+        return style
+      },
+      elZIndex() {
+        return this.zIndex ? this.zIndex : this.$tn.zIndex.navbar
+      }
+    },
+    data() {
+      return {
+        // 状态栏的高度
+        statusBarHeight: 0,
+        // 自定义导航栏的高度
+        customBarHeight: 0,
+        // 自定义返回按钮时，返回容器的宽高边距信息
+        customBackStyleInfo: {
+          width: 86,
+          height: 32,
+          left: 15
+        }
+      }
+    },
+    mounted() {
+      // 获取vuex中的自定义顶栏的高度
+      this.updateNavBarInfo()
+    },
+    created() {
+      // 获取胶囊信息
+      // #ifdef MP-WEIXIN
+      let custom = wx.getMenuButtonBoundingClientRect()
+      this.customBackStyleInfo.width = custom.width
+      this.customBackStyleInfo.height = custom.height
+      this.customBackStyleInfo.left = uni.upx2px(750) - custom.right
+      // #endif
+    },
+    methods: {
+      // 更新导航栏的高度
+      async updateNavBarInfo() {
+        // 获取vuex中的自定义顶栏的高度
+        let customBarHeight = this.vuex_custom_bar_height
+        let statusBarHeight = this.vuex_status_bar_height
+        // 如果获取失败则重新获取
+        if (!customBarHeight) {
+          try {
+            const navBarInfo = await this.$tn.updateCustomBar()
+            customBarHeight = navBarInfo.customBarHeight
+            statusBarHeight = navBarInfo.statusBarHeight
+          } catch(e) {
+            setTimeout(() => {
+              this.updateNavBarInfo()
+            }, 10)
+            return
+          }
+        }
+        
+        // 更新vuex中的导航栏信息
+        this && this.$tn.vuex('vuex_status_bar_height', statusBarHeight)
+        this && this.$tn.vuex('vuex_custom_bar_height', customBarHeight)
+        
+        this.customBarHeight = customBarHeight
+        this.statusBarHeight = statusBarHeight
+      },
+      // 处理返回事件
+      async handlerBack() {
+        if (this.beforeBack && typeof(this.beforeBack) === 'function') {
+          // 执行回调，同时传入索引当作参数
+          // 在微信，支付宝等环境(H5正常)，会导致父组件定义的函数体中的this变成子组件的this
+          // 通过bind()方法，绑定父组件的this，让this的this为父组件的上下文
+          let beforeBack = this.beforeBack.bind(this.$tn.$parent.call(this))()
+          // 判断是否返回了Promise
+          if (!!beforeBack && typeof beforeBack.then === 'function') {
+            await beforeBack.then(res => {
+              // Promise返回成功
+              this.navBack()
+            }).catch(err => {})
+          } else if (beforeBack === true) {
+            this.navBack()
+          }
+        } else {
+          this.navBack()
+        }
+      },
+      // 返回上一页
+      navBack() {
+        
+        // 通过判断当前页面的页面栈信息，是否有上一页进行返回，如果没有则跳转到首页
+        const pages = getCurrentPages()
+        if (pages && pages.length > 0) {
+          const firstPage = pages[0]
+          if (pages.length == 1 && (!firstPage.route || firstPage.route != 'pages/index/index')) {
+            uni.reLaunch({
+              url: '/pages/index/index'
+            })
+          } else {
+            uni.navigateBack({
+              delta: 1
+            })
+          }
+        } else {
+          uni.reLaunch({
+            url: '/pages/index/index'
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-custom-nav-bar {
+    display: block;
+    position: relative;
+    
+    &__bar {
+      display: flex;
+      position: relative;
+      align-items: center;
+      min-height: 100rpx;
+      justify-content: space-between;
+      min-height: 0px;
+      /* #ifdef MP-WEIXIN */
+      padding-right: 220rpx;
+      /* #endif */
+      /* #ifdef MP-ALIPAY */
+      padding-right: 150rpx;
+      /* #endif */
+      box-shadow: 0rpx 0rpx 0rpx;
+      z-index: 9999;
+      
+      &--fixed {
+        position: fixed;
+        width: 100%;
+        top: 0;
+      }
+      
+      &--alpha {
+        background: transparent !important;
+        box-shadow: none !important;
+      }
+      
+      &--bottom-shadow {
+        box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.05);
+      }
+      
+      &__action {
+        display: flex;
+        align-items: center;
+        height: 100%;
+        justify-content: center;
+        max-width: 100%;
+        
+        &--nav-back {
+          /* position: absolute; */
+          /* top: 50%; */
+          /* left: 20rpx; */
+          /* margin-top: -15rpx; */
+          // width: 25rpx;
+          // height: 25rpx;
+          margin-left: 20rpx;
+          font-size: 38rpx;
+          line-height: 100%;
+          // border-width: 0 0 4rpx 4rpx;
+          // border-color: #000000;
+          // border-style: solid;
+          // transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+        }
+        
+        &--nav-back-text {
+          margin-left: 10rpx;
+        }
+      }
+      
+      &__content {
+        position: absolute;
+        text-align: center;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        margin: auto;
+        font-size: 32rpx;
+        cursor: none;
+        // pointer-events: none;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+      }
+    }
+  }
+  
+</style>
diff --git a/tuniao-ui/components/tn-notice-bar/tn-notice-bar.vue b/tuniao-ui/components/tn-notice-bar/tn-notice-bar.vue
new file mode 100644
index 0000000..cbca5bb
--- /dev/null
+++ b/tuniao-ui/components/tn-notice-bar/tn-notice-bar.vue
@@ -0,0 +1,171 @@
+<template>
+	<view v-if="showNotice" class="tn-notice-bar-class tn-notice-bar" :style="{
+      borderRadius: radius + 'rpx'
+    }">
+		<block v-if="mode === 'horizontal' && circular">
+			<tn-row-notice :backgroundColor="backgroundColor" :fontColor="fontColor" :fontSize="fontSize"
+				:fontUnit="fontUnit" :list="list" :show="show" :playStatus="playStatus" :leftIcon="leftIcon"
+				:leftIconName="leftIconName" :leftIconSize="leftIconSize" :rightIcon="rightIcon"
+				:rightIconName="rightIconName" :rightIconSize="rightIconSize" :leftIconType="leftIconType"
+				:closeBtn="closeBtn" :autoplay="autoplay" :radius="radius" :padding="padding" :speed="speed"
+				@click="click" @close="close" @clickLeft="clickLeftIcon" @clickRight="clickRightIcon"></tn-row-notice>
+		</block>
+		<block v-if="mode === 'vertical' || (mode === 'horizontal' && !circular)">
+			<tn-column-notice :backgroundColor="backgroundColor" :fontColor="fontColor" :fontSize="fontSize"
+				:fontUnit="fontUnit" :list="list" :show="show" :mode="mode" :playStatus="playStatus"
+				:leftIcon="leftIcon" :leftIconName="leftIconName" :leftIconSize="leftIconSize" :rightIcon="rightIcon"
+				:rightIconName="rightIconName" :rightIconSize="rightIconSize" :closeBtn="closeBtn" :autoplay="autoplay"
+				:radius="radius" :padding="padding" :duration="duration" :leftIconType="leftIconType" @click="click"
+				@close="close" @clickLeft="clickLeftIcon" @clickRight="clickRightIcon" @end="end"></tn-column-notice>
+		</block>
+	</view>
+</template>
+
+<script>
+	import componentsColorMixin from '../../libs/mixin/components_color.js'
+	export default {
+		name: 'tn-notice-bar',
+		mixins: [componentsColorMixin],
+		props: {
+			// 显示的内容
+			list: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// 是否显示
+			show: {
+				type: Boolean,
+				default: true
+			},
+			// 播放状态
+			// play -> 播放 paused -> 暂停
+			playStatus: {
+				type: String,
+				default: 'play'
+			},
+			// 滚动方向
+			// horizontal -> 水平滚动 vertical -> 垂直滚动
+			mode: {
+				type: String,
+				default: 'horizontal'
+			},
+			// 是否显示左边图标
+			leftIcon: {
+				type: Boolean,
+				default: true
+			},
+			// 是否显示左边图标
+			leftIconType: {
+				type: String,
+				default: 'icon'
+			},
+			// 左边图标的名称
+			leftIconName: {
+				type: String,
+				default: 'sound'
+			},
+			// 左边图标的大小
+			leftIconSize: {
+				type: Number,
+				default: 34
+			},
+			// 是否显示右边的图标
+			rightIcon: {
+				type: Boolean,
+				default: false
+			},
+			// 右边图标的名称
+			rightIconName: {
+				type: String,
+				default: 'right'
+			},
+			// 右边图标的大小
+			rightIconSize: {
+				type: Number,
+				default: 26
+			},
+			// 是否显示关闭按钮
+			closeBtn: {
+				type: Boolean,
+				default: false
+			},
+			// 圆角
+			radius: {
+				type: Number,
+				default: 0
+			},
+			// 内边距
+			padding: {
+				type: String,
+				default: '18rpx 24rpx'
+			},
+			// 自动播放
+			autoplay: {
+				type: Boolean,
+				default: true
+			},
+			// 滚动周期
+			duration: {
+				type: Number,
+				default: 2000
+			},
+			// 水平滚动时的速度，即每秒滚动多少rpx
+			speed: {
+				type: Number,
+				default: 160
+			},
+			// 水平滚动的时候是否采用衔接的模式
+			circular: {
+				type: Boolean,
+				default: true
+			},
+			// 没有数据时是否显示通知
+			autoHidden: {
+				type: Boolean,
+				default: true
+			}
+		},
+		computed: {
+			// 当设置了show为false，或者autoHidden为true且list为空时，不显示通知
+			showNotice() {
+				if (this.show === false || (this.autoHidden && this.list.length === 0)) return false
+				else return true
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			// 点击了通知栏
+			click(index) {
+				this.$emit('click', index)
+			},
+			// 点击了关闭按钮
+			close() {
+				this.$emit('close')
+			},
+			// 点击了左边图标
+			clickLeftIcon() {
+				this.$emit('clickLeft')
+			},
+			// 点击了右边图标
+			clickRightIcon() {
+				this.$emit('clickRight')
+			},
+			// 一个周期滚动结束
+			end() {
+				this.$emit('end')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tn-notice-bar {
+		overflow: hidden;
+	}
+</style>
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-number-box/tn-number-box.vue b/tuniao-ui/components/tn-number-box/tn-number-box.vue
new file mode 100644
index 0000000..63b2a52
--- /dev/null
+++ b/tuniao-ui/components/tn-number-box/tn-number-box.vue
@@ -0,0 +1,401 @@
+<template>
+  <view class="tn-number-box-class tn-number-box">
+    <!-- 减 -->
+    <view
+      class="tn-number-box__btn__minus"
+      :class="[
+        backgroundColorClass,
+        fontColorClass,
+        {'tn-number-box__btn--disabled': disabled || inputValue <= min}
+      ]"
+      :style="{
+        backgroundColor: backgroundColorStyle,
+        height: $tn.string.getLengthUnitValue(inputHeight),
+        color: fontColorStyle,
+        fontSize: fontSizeStyle
+      }"
+      @touchstart.stop.prevent="touchStart('minus')"
+      @touchend.stop.prevent="clearTimer"
+    >
+      <view class="tn-icon-reduce"></view>
+    </view>
+    
+    <!-- 输入框 -->
+    <input
+      v-model="inputValue"
+      :disabled="disabledInput || disabled"
+      :cursor-spacing="getCursorSpacing"
+      class="tn-number-box__input"
+      :class="[
+        fontColorClass,
+        {'tn-number-box__input--disabled': disabledInput || disabled}
+      ]"
+      :style="{
+        width: $tn.string.getLengthUnitValue(inputWidth),
+        height: $tn.string.getLengthUnitValue(inputHeight),
+        color: fontColorStyle,
+        fontSize: fontSizeStyle,
+        backgroundColor: backgroundColorStyle
+      }"
+      @blur="blurInput"
+      @focus="focusInput"
+    />
+    
+    <!-- 加 -->
+    <view
+      class="tn-number-box__btn__plus"
+      :class="[
+        backgroundColorClass,
+        fontColorClass,
+        {'tn-number-box__btn--disabled': disabled || inputValue >= max}
+      ]"
+      :style="{
+        backgroundColor: backgroundColorStyle,
+        height: $tn.string.getLengthUnitValue(inputHeight),
+        color: fontColorStyle,
+        fontSize: fontSizeStyle
+      }"
+      @touchstart.stop.prevent="touchStart('plus')"
+      @touchend.stop.prevent="clearTimer"
+    >
+      <view class="tn-icon-add"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import componentsColor from '../../libs/mixin/components_color.js'
+  
+  export default {
+    mixins: [componentsColor],
+    name: 'tn-number-box',
+    props: {
+      value: {
+        type: Number,
+        default: 1
+      },
+      // 索引
+      index: {
+        type: [Number, String],
+        default: ''
+      },
+      // 最小值
+      min: {
+        type: Number,
+        default: 0
+      },
+      // 最大值
+      max: {
+        type: Number,
+        default: 99999
+      },
+      // 步进值
+      step: {
+        type: Number,
+        default: 1
+      },
+      // 禁用
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 是否禁用输入
+      disabledInput: {
+        type: Boolean,
+        default: false
+      },
+      // 输入框的宽度
+      inputWidth: {
+        type: Number,
+        default: 88
+      },
+      // 输入框的高度
+      inputHeight: {
+        type: Number,
+        default: 50
+      },
+      // 输入框和键盘之间的距离
+      cursorSpacing: {
+        type: Number,
+        default: 100
+      },
+      // 是否开启长按进行连续递增减
+      longPress: {
+        type: Boolean,
+        default: true
+      },
+      // 长按触发间隔
+      longPressTime: {
+        type: Number,
+        default: 250
+      },
+      // 是否只能输入正整数
+      positiveInteger: {
+        type: Boolean,
+        default: true
+      }
+    },
+    computed: {
+      getCursorSpacing() {
+        return Number(uni.upx2px(this.cursorSpacing))
+      }
+    },
+    data() {
+      return {
+        // 输入框的值
+        inputValue: 1,
+        // 长按定时器
+        longPressTimer: null,
+        // 标记值的改变是来自外部还是内部
+        changeFromInner: false,
+        // 内部定时器
+        innerChangeTimer: null
+      }
+    },
+    watch: {
+      value(val) {
+        // 只有value的改变是来自外部的时候，才去同步inputValue的值，否则会造成循环错误
+        if (!this.changeFromInner) {
+          this.updateInputValue()
+          // 因为inputValue变化后，会触发this.handleChange()，在其中changeFromInner会再次被设置为true，
+          // 造成外面修改值，也导致被认为是内部修改的混乱，这里进行this.$nextTick延时，保证在运行周期的最后处
+          // 将changeFromInner设置为false
+          this.$nextTick(() => {
+          	this.changeFromInner = false
+          })
+        }
+      },
+      inputValue(newVal, oldVal) {
+        // 为了让用户能够删除所有输入值，重新输入内容，删除所有值后，内容为空字符串
+        if (newVal === '') return
+        let value = 0
+        // 首先判断是否数值，并且在min和max之间，如果不是，使用原来值
+        let isNumber = this.$tn.test.number(newVal)
+        if (isNumber && newVal >= this.min && newVal <= this.max) value = newVal
+        else value = oldVal
+        
+        // 判断是否只能输入大于等于0的整数
+        if (this.positiveInteger) {
+          // 小于0或者带有小数点
+          if (newVal < 0 || String(newVal).indexOf('.') !== -1) {
+            value = Math.floor(newVal)
+            // 双向绑定input的值，必须要使用$nextTick修改显示的值
+            this.$nextTick(() => {
+            	this.inputValue = value
+            })
+          }
+        }
+        this.handleChange(value, 'change')
+      },
+      min() {
+        this.updateInputValue()
+      },
+      max() {
+        this.updateInputValue()
+      }
+    },
+    created() {
+      this.updateInputValue()
+    },
+    methods: {
+      // 开始点击按钮
+      touchStart(func) {
+        // 先执行一遍方法，否则会造成松开手时，就执行了clearTimer，导致无法实现功能
+        this[func]()
+        // 如果没有开启长按功能，直接返回
+        if (!this.longPress) return
+        // 清空长按定时器，防止重复注册
+        if (this.longPressTimer) {
+          clearInterval(this.longPressTimer)
+          this.longPressTimer = null
+        }
+        this.longPressTimer = setInterval(() => {
+          // 执行加减操作
+          this[func]()
+        }, this.longPressTime)
+      },
+      // 清除定时器
+      clearTimer() {
+        this.$nextTick(() => {
+          if (this.longPressTimer) {
+            clearInterval(this.longPressTimer)
+            this.longPressTimer = null
+          }
+        })
+      },
+      // 减
+      minus() {
+        this.computeValue('minus')
+      },
+      // 加
+      plus() {
+        this.computeValue('plus')
+      },
+      // 处理小数相加减出现溢出问题
+      calcPlus(num1, num2) {
+        let baseNum = 0, baseNum1 = 0, baseNum2 = 0
+        try {
+          baseNum1 = num1.toString().split('.')[1].length
+        } catch(e) {
+          baseNum1 = 0
+        }
+        try {
+          baseNum2 = num2.toString().split('.')[1].length
+        } catch(e) {
+          baseNum2 = 0
+        }
+        
+        baseNum = Math.pow(10, Math.max(baseNum1, baseNum2))
+        // 精度
+        let precision = baseNum1 >= baseNum2 ? baseNum1 : baseNum2
+        return ((num1 * baseNum + num2 * baseNum) / baseNum).toFixed(precision)
+      },
+      calcMinus(num1, num2) {
+        let baseNum = 0, baseNum1 = 0, baseNum2 = 0
+        try {
+          baseNum1 = num1.toString().split('.')[1].length
+        } catch(e) {
+          baseNum1 = 0
+        }
+        try {
+          baseNum2 = num2.toString().split('.')[1].length
+        } catch(e) {
+          baseNum2 = 0
+        }
+        
+        baseNum = Math.pow(10, Math.max(baseNum1, baseNum2))
+        // 精度
+        let precision = baseNum1 >= baseNum2 ? baseNum1 : baseNum2
+        return ((num1 * baseNum - num2 * baseNum) / baseNum).toFixed(precision)
+      },
+      // 处理操作后的值
+      computeValue(type) {
+        uni.hideKeyboard()
+        if (this.disabled) return
+        let value = 0
+        
+        if (type === 'minus') {
+          // 减
+          value = this.calcMinus(this.inputValue, this.step)
+        } else if (type === 'plus') {
+          // 加
+          value = this.calcPlus(this.inputValue, this.step)
+        }
+        // 判断是否比最小值小和操作最大值
+        if (value < this.min || value > this.max) return
+        
+        this.inputValue = value
+        this.handleChange(value, type)
+      },
+      // 处理用户手动输入
+      blurInput(event) {
+        let val = 0,
+            value = event.detail.value
+        // 如果为非0-9数字组成，或者其第一位数值为0，直接让其等于min值
+        // 这里不直接判断是否正整数，是因为用户传递的props min值可能为0
+        if (!/(^\d+$)/.test(value) || value[0] == 0) {
+          val = this.min
+        } else {
+          val = +value
+        }
+        
+        if (val > this.max) {
+          val = this.max
+        } else if (val < this.min) {
+          val = this.min
+        }
+        this.$nextTick(() => {
+          this.inputValue = val
+        })
+        this.handleChange(val, 'blur')
+      },
+      // 获取焦点
+      focusInput() {
+        this.$emit('focus')
+      },
+      // 初始化inputValue
+      updateInputValue() {
+        let value = this.value
+        if (value <= this.min) {
+          value = this.min
+        } else if (value >= this.max) {
+          value = this.max
+        }
+        
+        this.inputValue = Number(value)
+      },
+      // 处理值改变状态
+      handleChange(value, type) {
+        if (this.disabled) return
+        // 清除定时器，防止混乱
+        if (this.innerChangeTimer) {
+          clearTimeout(this.innerChangeTimer)
+          this.innerChangeTimer = null
+        }
+        
+        // 内部修改值
+        this.changeFromInner = true
+        // 一定时间内，清除changeFromInner标记，否则内部值改变后
+        // 外部通过程序修改value值，将会无效
+        this.innerChangeTimer = setTimeout(() => {
+          this.changeFromInner = false
+        }, 150)
+        this.$emit('input', Number(value))
+        this.$emit(type, {
+          value: Number(value),
+          index: this.index
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-number-box {
+    display: inline-flex;
+    align-items: center;
+    
+    &__btn {
+      &__plus,&__minus {
+        width: 60rpx;
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+        align-items: center;
+        background-color: $tn-font-holder-color;
+      }
+      
+      &__plus {
+        border-radius: 0 8rpx 8rpx 0;
+      }
+      
+      &__minus {
+        border-radius: 8rpx 0 0 8rpx;
+      }
+      
+      &--disabled {
+        color: $tn-font-sub-color !important;
+        background: $tn-font-holder-color !important;
+      }
+    }
+    
+    &__input {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      position: relative;
+      text-align: center;
+      box-sizing: border-box;
+      padding: 0 4rpx;
+      margin: 0 6rpx;
+      background-color: $tn-font-holder-color;
+      
+      &--disabled {
+        color: $tn-font-sub-color !important;
+        background: $tn-font-holder-color !important;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-number-keyboard/tn-number-keyboard.vue b/tuniao-ui/components/tn-number-keyboard/tn-number-keyboard.vue
new file mode 100644
index 0000000..9d3201a
--- /dev/null
+++ b/tuniao-ui/components/tn-number-keyboard/tn-number-keyboard.vue
@@ -0,0 +1,182 @@
+<template>
+  <view class="tn-number-keyboard-class tn-number-keyboard" @touchmove.stop.prevent="() => {}">
+    <view class="tn-number-keyboard__grids">
+      <view
+        v-for="(item, index) in dataList"
+        :key="index"
+        class="tn-number-keyboard__grids__item"
+        :class="{
+          'tn-bg-gray--light': showGaryBg(index),
+          'tn-border-solid-top': index <= 2,
+          'tn-border-solid-bottom': index < 9,
+          'tn-border-solid-right': (index + 1) % 3 != 0
+        }"
+        :hover-class="hoverClass(index)"
+        :hover-stay-time="150"
+        @tap="keyboardClick(item)"
+      >
+        <view class="tn-number-keyboard__grids__btn">{{ item }}</view>
+      </view>
+      
+      <view
+        class="tn-number-keyboard__grids__item tn-bg-gray--light"
+        hover-class="tn-hover"
+        :hover-stay-time="150"
+        @touchstart.stop="backspaceClick"
+        @touchend="clearTimer"
+      >
+        <view class="tn-number-keyboard__grids__btn tn-number-keyboard__back">
+          <view class="tn-icon-left-arrow tn-number-keyboard__back__icon"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-number-keyboard',
+    props: {
+      // 键盘类型
+      // number -> 数字键盘 card -> 身份证键盘
+      mode: {
+        type: String,
+        default: 'number'
+      },
+      // 是否显示键盘的'.'符号
+      dotEnabled: {
+        type: Boolean,
+        default: true
+      },
+      // 是否为乱序键盘
+      randomEnabled: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      // 键盘显示的内容
+      dataList() {
+        let tmp = []
+        if (!this.dotEnabled && this.mode === 'number') {
+          if (!this.randomEnabled) {
+            return [1, 2, 3, 4, 5, 6, 7, 8, 9, '', 0]
+          } else {
+            let data = this.$tn.array.random([1, 2, 3, 4, 5, 6, 7, 8, 9, 0])
+            data.splice(-1, 0, '')
+            return data
+          }
+        } else if (this.dotEnabled && this.mode === 'number') {
+          if (!this.randomEnabled) {
+            return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0]
+          } else {
+            let data = this.$tn.array.random([1, 2, 3, 4, 5, 6, 7, 8, 9, 0])
+            data.splice(-1, 0, this.dot)
+            return data
+          }
+        } else if (this.mode === 'card') {
+          if (!this.randomEnabled) {
+            return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0]
+          } else {
+            let data = this.$tn.array.random([1, 2, 3, 4, 5, 6, 7, 8, 9, 0])
+            data.splice(-1, 0, this.cardX)
+            return data
+          }
+        }
+      },
+      // 按键的样式
+      keyStyle() {
+        return index => {
+          let style = {}
+          if (this.mode === 'number' && !this.dotEnabled && index === 9) style.flex = '0 0 66.6666666666%'
+          return style
+        }
+      },
+      // 是否让按键显示灰色，只在数字键盘和非乱序且在点击时
+      showGaryBg() {
+        return index => {
+          if (!this.randomEnabled && index === 9 && (this.mode !== 'number' || (this.mode === 'number' && this.dotEnabled))) return true
+          else return false
+        }
+      },
+      // 手指停留的class
+      hoverClass() {
+        return index => {
+          if (this.mode === 'number' && !this.dotEnabled && index === 9) return ''
+          if (!this.randomEnabled && index === 9 && (this.mode === 'number' && this.dotEnabled || this.mode === 'card')) return 'tn-hover'
+          else return 'tn-number-keyboard--hover'
+        }
+      }
+    },
+    data() {
+      return {
+        // 退格键内容
+        backspace: 'backspace',
+        // 点内容
+        dot: '.',
+        // 长按多次删除事件监听
+        longPressDeleteTimer: null,
+        // 身份证的X符号
+        cardX: 'X'
+      }
+    },
+    methods: {
+      // 点击退格键
+      backspaceClick() {
+        this.$emit('backspace')
+        this.clearTimer()
+        this.longPressDeleteTimer = setInterval(() => {
+          this.$emit('backspace')
+        }, 250)
+      },
+      // 获取键盘显示的内容
+      keyboardClick(value) {
+        if (this.mode === 'number' && !this.dotEnabled && value === '') return
+        // 允许键盘显示点模式和触发非点按键时，将内容转换为数字类型
+        if (this.dotEnabled && value != this.dot && value != this.cardX) value = Number(value)
+        this.$emit('change', value)
+      },
+      // 清除定时器
+      clearTimer() {
+        if (this.longPressDeleteTimer) {
+          clearInterval(this.longPressDeleteTimer)
+          this.longPressDeleteTimer = null
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-number-keyboard {
+    position: relative;
+    
+    &__grids {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      justify-content: flex-end;
+      
+      &__item {
+        display: flex;
+        flex-direction: row;
+        flex: 0 0 33.3333333333%;
+        align-items: center;
+        justify-content: center;
+        height: 110rpx;
+        text-align: center;
+        font-size: 50rpx;
+        color: $tn-font-color;
+        font-weight: 500;
+      }
+    }
+    
+    &__back {
+      font-size: 38rpx;
+    }
+    
+    &--hover {
+      background-color: $tn-font-holder-color;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-picker/tn-picker.vue b/tuniao-ui/components/tn-picker/tn-picker.vue
new file mode 100644
index 0000000..26308de
--- /dev/null
+++ b/tuniao-ui/components/tn-picker/tn-picker.vue
@@ -0,0 +1,727 @@
+<template>
+  <view v-if="value" class="tn-picker-class tn-picker">
+    <tn-popup
+      v-model="value"
+      mode="bottom"
+      :popup="false"
+      length="auto"
+      :safeAreaInsetBottom="safeAreaInsetBottom"
+      :maskCloseable="maskCloseable"
+      :zIndex="elZIndex"
+      @close="close"
+    >
+      <view class="tn-picker__content" :style="{ zIndex: elZIndex }">
+        <!-- 顶部 -->
+        <view class="tn-picker__content__header" @touchmove.stop.prevent>
+          <!-- 取消按钮 -->
+          <view
+            class="tn-picker__content__header__btn tn-picker__content__header--cancel"
+            :style="{ color: cancelColor }"
+            hover-class="tn-hover-class"
+            :hover-stay-time="150"
+            @tap="getResult('cancel')"
+          >{{cancelText}}</view>
+          <!-- 标题 -->
+          <view class="tn-picker__content__header__title">{{ title }}</view>
+          <!-- 确认按钮 -->
+          <view
+            class="tn-picker__content__header__btn tn-picker__content__header--confirm"
+            :style="{ color: moving ? cancelColor : confirmColor}"
+            hover-class="tn-hover-class"
+            :hover-stay-time="150"
+            @touchmove.stop
+            @tap.stop="getResult('confirm')"
+          >{{confirmText}}</view>
+        </view>
+        <!-- 主体 -->
+        <view class="tn-picker__content__body">
+          <!-- 地区选择 -->
+          <picker-view
+            v-if="mode === 'region'"
+            class="tn-picker__content__body__view"
+            :value="valueArr"
+            @change="change"
+            @pickstart="pickStart"
+            @pickend="pickEnd"
+          >
+            <picker-view-column v-if="!reset && params.province">
+              <view class="tn-picker__content__body__item" v-for="(item, index) in provinces" :key="index">
+                <view class="tn-text-ellipsis">{{ item.label }}</view>
+              </view>
+            </picker-view-column>
+            <picker-view-column v-if="!reset && params.city">
+              <view class="tn-picker__content__body__item" v-for="(item, index) in citys" :key="index">
+                <view class="tn-text-ellipsis">{{ item.label }}</view>
+              </view>
+            </picker-view-column>
+            <picker-view-column v-if="!reset && params.area">
+              <view class="tn-picker__content__body__item" v-for="(item, index) in areas" :key="index">
+                <view class="tn-text-ellipsis">{{ item.label }}</view>
+              </view>
+            </picker-view-column>
+          </picker-view>
+          <!-- 时间选择 -->
+          <picker-view
+            v-else-if="mode === 'time'"
+            class="tn-picker__content__body__view"
+            :value="valueArr"
+            @change="change"
+            @pickstart="pickStart"
+            @pickend="pickEnd"
+          >
+            <picker-view-column v-if="!reset && params.year">
+              <view class="tn-picker__content__body__item" v-for="(item, index) in years" :key="index">
+                {{ item }}
+                <text v-if="showTimeTag" class="tn-picker__content__body__item__text">年</text>
+              </view>
+            </picker-view-column>
+            <picker-view-column v-if="!reset && params.month">
+              <view class="tn-picker__content__body__item" v-for="(item, index) in months" :key="index">
+                {{ formatNumber(item) }}
+                <text v-if="showTimeTag" class="tn-picker__content__body__item--text">月</text>
+              </view>
+            </picker-view-column>
+            <picker-view-column v-if="!reset && params.day">
+              <view class="tn-picker__content__body__item" v-for="(item, index) in days" :key="index">
+                {{ formatNumber(item) }}
+                <text v-if="showTimeTag" class="tn-picker__content__body__item--text">日</text>
+              </view>
+            </picker-view-column>
+            <picker-view-column v-if="!reset && params.hour">
+              <view class="tn-picker__content__body__item" v-for="(item, index) in hours" :key="index">
+                {{ formatNumber(item) }}
+                <text v-if="showTimeTag" class="tn-picker__content__body__item--text">时</text>
+              </view>
+            </picker-view-column>
+            <picker-view-column v-if="!reset && params.minute">
+              <view class="tn-picker__content__body__item" v-for="(item, index) in minutes" :key="index">
+                {{ formatNumber(item) }}
+                <text v-if="showTimeTag" class="tn-picker__content__body__item--text">分</text>
+              </view>
+            </picker-view-column>
+            <picker-view-column v-if="!reset && params.second">
+              <view class="tn-picker__content__body__item" v-for="(item, index) in seconds" :key="index">
+                {{ formatNumber(item) }}
+                <text v-if="showTimeTag" class="tn-picker__content__body__item--text">秒</text>
+              </view>
+            </picker-view-column>
+          </picker-view>
+          <!-- 单列选择 -->
+          <picker-view
+            v-else-if="mode === 'selector'"
+            class="tn-picker__content__body__view"
+            :value="valueArr"
+            @change="change"
+            @pickstart="pickStart"
+            @pickend="pickEnd"
+          >
+            <picker-view-column v-if="!reset">
+              <view class="tn-picker__content__body__item" v-for="(item, index) in range" :key="index">
+                <view class="tn-text-ellipsis">{{ getItemValue(item, 'selector') }}</view>
+              </view>
+            </picker-view-column>
+          </picker-view>
+          <!-- 多列选择 -->
+          <picker-view
+            v-else-if="mode === 'multiSelector'"
+            class="tn-picker__content__body__view"
+            :value="valueArr"
+            @change="change"
+            @pickstart="pickStart"
+            @pickend="pickEnd"
+          >
+            <picker-view-column v-if="!reset" v-for="(item, index) in range" :key="index">
+              <view class="tn-picker__content__body__item" v-for="(sub_item, sub_index) in item" :key="sub_index">
+                <view class="tn-text-ellipsis">{{ getItemValue(sub_item, 'multiSelector') }}</view>
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+      </view>
+    </tn-popup>
+  </view>
+</template>
+
+<script>
+  import provinces from '../../libs/utils/province.js'
+  import citys from '../../libs/utils/city.js'
+  import areas from '../../libs/utils/area.js'
+  
+  export default {
+    name: 'tn-picker',
+    props: {
+      value: {
+        type: Boolean,
+        default: false,
+      },
+      // 顶部标题
+      title: {
+        type: String,
+        default: ''
+      },
+      // picker中显示的参数
+      params: {
+        type: Object,
+        default() {
+          return {
+            year: true,
+            month: true,
+            day: true,
+            hour: false,
+            minute: false,
+            second: false,
+            province: true,
+            city: true,
+            area: true,
+            timestamp: true
+          }
+        }
+      },
+      // 模式选择，region-地区类型，time-时间类型，selector-单列模式，multiSelector-多列模式
+      mode: {
+        type: String,
+        default: 'time'
+      },
+      // 当mode=selector或者mode=multiSelector时，提供的数组
+      range: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 当mode=selector或者mode=multiSelector时，提供的默认项下标
+      defaultSelector: {
+        type: Array,
+        default() {
+          return [0]
+        }
+      },
+      // 当range是一个Array<Object>时，通过rangeKey来指定Object中key的值作为显示的内容
+      rangeKey: {
+        type: String,
+        default: ''
+      },
+      // 时间模式 ，是否显示时间后的单位
+      showTimeTag: {
+        type: Boolean,
+        default: true
+      },
+      // 开始年份
+      startYear: {
+        type: [String, Number],
+        default: 1950
+      },
+      // 结束年份
+      endYear: {
+        type: [String, Number],
+        default: 2050
+      },
+      // 默认显示的时间
+      // 2021-09-01 || 2021-09-01 13:00:23 || 2021/09/01
+      defaultTime: {
+        type: String,
+         default: ''
+      },
+      // 默认显示的地区
+      // 可传类似["广东省", "广州市", "天河区"]
+      defaultRegin: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 默认显示的地区编码
+      // 可传类似["11", "1101", "110101"]
+      // 如果defaultRegin和areaCode同时存在，优先使用areaCode的值
+      areaCode: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 取消按钮的文字
+      cancelText: {
+        type: String,
+        default: '取 消'
+      },
+      // 取消按钮的颜色
+      cancelColor: {
+        type: String,
+        default: ''
+      },
+      // 确认按钮的文字
+      confirmText: {
+        type: String,
+        default: '确 认'
+      },
+      // 确认按钮的演示
+      confirmColor: {
+        type: String,
+        default: ''
+      },
+      safeAreaInsetBottom: {
+        type: Boolean,
+        default: false
+      },
+      // 是否允许通过点击遮罩关闭
+      maskCloseable: {
+        type: Boolean,
+        default: true
+      },
+      zIndex: {
+        type: Number,
+        default: 0
+      }
+    },
+    computed: {
+      // 监听参数变化
+      propsChange() {
+        return [this.mode, this.defaultTime, this.startYear, this.endYear, this.defaultRegin, this.areaCode]
+      },
+      // 监听地区发生变化
+      regionChange() {
+        return [this.province, this.city]
+      },
+      // 监听年月发生变化
+      yearAndMonth() {
+        return [this.year, this.month]
+      },
+      elZIndex() {
+        return this.zIndex ? this.zIndex : this.$tn.zIndex.popup
+      }
+    },
+    data() {
+      return {
+        years: [],
+        months: [],
+        days: [],
+        hours: [],
+        minutes: [],
+        seconds: [],
+        year: 0,
+        month: 0,
+        day: 0,
+        hour: 0,
+        minute: 0,
+        second: 0,
+        reset: false,
+        startDate: '',
+        endDate: '',
+        valueArr: [],
+        provinces: provinces,
+        citys: citys[0],
+        areas: areas[0][0],
+        province: 0,
+        city: 0,
+        area: 0,
+        // 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
+        moving: false
+      }
+    },
+    watch: {
+      propsChange() {
+        this.reset = true
+        setTimeout(() => this.init(), 10)
+      },
+      regionChange() {
+        // 如果地区发生变化，为了让picker联动起来，必须重置this.citys和this.areas
+        this.citys = citys[this.province]
+        this.areas = areas[this.province][this.city]
+      },
+      yearAndMonth() {
+        // 月份的变化，实时变更日的天数，因为不同月份，天数不一样
+        // 一个月可能有30，31天，甚至闰年2月的29天，平年2月28天
+        if (this.params.year) this.setDays()
+      },
+      value(val) {
+        // 微信和QQ小程序由于一些奇怪的原因(故同时对所有平台均初始化一遍)，需要重新初始化才能显示正确的值
+        if (val) {
+          this.reset = true
+          setTimeout(() => this.init(), 10)
+        }
+      }
+    },
+    mounted() {
+      this.init()
+    },
+    methods: {
+      // 记录开始滑动
+      pickStart() {
+        // #ifdef MP-WEIXIN
+        this.moving = true
+        // #endif
+      },
+      // 记录滚动结束
+      pickEnd() {
+        // #ifdef MP-WEIXIN
+        this.moving = false
+        // #endif
+      },
+      // 根据传递的列表的数据获取显示的数据
+      getItemValue(item, mode) {
+        // 单列模式或者多列模式中的getItemValue同时被执行，故在这里再加一层判断
+        if (this.mode === mode) {
+          return typeof item === 'object' ? item[this.rangeKey] : item
+        }
+      },
+      // 往数字前面补0
+      formatNumber(num) {
+        return this.$tn.number.formatNumberAddZero(num)
+      },
+      // 生成递进的数组
+      generateArray(start, end) {
+        // 转为数值格式，否则用户给end-year等传递字符串值时，下面的end+1会导致字符串拼接，而不是相加
+        start = Number(start)
+        end = Number(end)
+        end = end > start ? end : start
+        // 生成数组并获取其中索引然后提取出来(获取开始和结束之间的数据)
+        return [...Array(end+1).keys()].slice(start)
+      },
+      getIndex(arr, val) {
+        let index = arr.indexOf(val)
+        // 如果index为-1着找不到元素
+        // ~(-1)=(-1)-1=0
+        return ~index ? index : 0
+      },
+      // 日期时间处理
+      initTimeValue() {
+        // 格式化时间，在IE浏览器(uni不存在此情况)，无法识别日期间的"-"间隔符号
+        let fdate = this.defaultTime.replace(/\-/g, '/')
+        fdate = fdate && fdate.indexOf('/') == -1 ? `2021/01/01 ${fdate}` : fdate
+        let time = null
+        if (fdate) time = new Date(fdate)
+        else time = new Date()
+        // 获取年月日时分秒
+        this.year = time.getFullYear()
+        this.month = time.getMonth() + 1
+        this.day = time.getDate()
+        this.hour = time.getHours()
+        this.minute = time.getMinutes()
+        this.second = time.getSeconds()
+      },
+      // 初始化数据
+      init() {
+        this.valueArr = []
+        this.reset = false
+        if (this.mode === 'time') {
+          this.initTimeValue()
+          if (this.params.year) {
+            this.valueArr.push(0)
+            this.setYears()
+          }
+          if (this.params.month) {
+            this.valueArr.push(0)
+            this.setMonths()
+          }
+          if (this.params.day) {
+            this.valueArr.push(0)
+            this.setDays()
+          }
+          if (this.params.hour) {
+            this.valueArr.push(0)
+            this.setHours()
+          }
+          if (this.params.minute) {
+            this.valueArr.push(0)
+            this.setMinutes()
+          }
+          if (this.params.second) {
+            this.valueArr.push(0)
+            this.setSeconds()
+          }
+        } else if (this.mode === 'region') {
+          if (this.params.province) {
+            this.valueArr.push(0)
+            this.setProvinces()
+          }
+          if (this.params.city) {
+            this.valueArr.push(0)
+            this.setCitys()
+          }
+          if (this.params.area) {
+            this.valueArr.push(0)
+            this.setAreas()
+          }
+        } else if (this.mode === 'selector') {
+          this.valueArr = this.defaultSelector
+        } else if (this.mode === 'multiSelector') {
+          this.valueArr = this.defaultSelector
+          this.multiSelectorValue = this.defaultSelector
+        }
+        this.$forceUpdate()
+      },
+      // 设置picker某一列的值
+      setYears() {
+        this.years = this.generateArray(this.startYear, this.endYear)
+        // 设置this.valueArr某一项的值，是为了让picker预选中某一个值
+        this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.years, this.year))
+      },
+      setMonths() {
+        this.months = this.generateArray(1, 12)
+        this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.months, this.month))
+      },
+      setDays() {
+        let totalDays = new Date(this.year, this.month, 0).getDate()
+        this.days = this.generateArray(1, totalDays)
+        let index = 0
+        // 避免多次触发导致值数组计算错误
+        if (this.params.year && this.params.month) index = 2
+        else if (this.params.month) index = 1
+        else if (this.params.year) index = 1
+        else index = 0
+        
+        // 当月份变化时，会导致日期的天数也会变化，如果原来选的天数大于变化后的天数，则重置为变化后的最大值
+        // 比如原来选中3月31日，调整为2月后，日期变为最大29，这时如果day值继续为31显然不合理，于是将其置为29(picker-column从1开始)
+        if (this.day > this.days.length) this.day = this.days.length
+        this.valueArr.splice(index, 1, this.getIndex(this.days, this.day))
+      },
+      setHours() {
+        this.hours = this.generateArray(0, 23)
+        this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.hours, this.hour))
+      },
+      setMinutes() {
+        this.minutes = this.generateArray(0, 59)
+        this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.minutes, this.minute))
+      },
+      setSeconds() {
+        this.seconds = this.generateArray(0, 59)
+        this.valueArr.splice(this.valueArr.length - 1, 1, this.getIndex(this.seconds, this.second))
+      },
+      setProvinces() {
+        if (!this.params.province) return
+        let tmp = ''
+        let useCode = false
+        // 如果同时配置了defaultRegion和areaCode，优先使用areaCode参数
+        if (this.areaCode.length) {
+          tmp = this.areaCode[0]
+          useCode = true
+        } else if (this.defaultRegin.length) {
+          tmp = this.defaultRegin[0]
+        } else {
+          tmp = 0
+        }
+        // 遍历省份数组
+        provinces.map((v, k) => {
+          if (useCode ? v.value == tmp : v.label == tmp) {
+            this.province = k
+            return
+          }
+        })
+        this.provinces = provinces
+        this.valueArr.splice(0, 1, this.province)
+      },
+      setCitys() {
+        if (!this.params.city) return
+        let tmp = ''
+        let useCode = false
+        // 如果同时配置了defaultRegion和areaCode，优先使用areaCode参数
+        if (this.areaCode.length) {
+          tmp = this.areaCode[1]
+          useCode = true
+        } else if (this.defaultRegin.length) {
+          tmp = this.defaultRegin[1]
+        } else {
+          tmp = 0
+        }
+        // 遍历省份数组
+        citys[this.province].map((v, k) => {
+          if (useCode ? v.value == tmp : v.label == tmp) {
+            this.city = k
+            return
+          }
+        })
+        this.citys = citys[this.province]
+        this.valueArr.splice(1, 1, this.city)
+      },
+      setAreas() {
+        if (!this.params.area) return
+        let tmp = ''
+        let useCode = false
+        // 如果同时配置了defaultRegion和areaCode，优先使用areaCode参数
+        if (this.areaCode.length) {
+          tmp = this.areaCode[2]
+          useCode = true
+        } else if (this.defaultRegin.length) {
+          tmp = this.defaultRegin[2]
+        } else {
+          tmp = 0
+        }
+        // 遍历省份数组
+        areas[this.province][this.city].map((v, k) => {
+          if (useCode ? v.value == tmp : v.label == tmp) {
+            this.area = k
+            return
+          }
+        })
+        this.areas = areas[this.province][this.city]
+        this.valueArr.splice(2, 1, this.area)
+      },
+      close() {
+        this.$emit('input', false)
+      },
+      // 监听用户修改了picker列选项
+      change(event) {
+        this.valueArr = event.detail.value
+        let i = 0
+        if (this.mode === 'time') {
+          // 使用i++是因为不知道数组的长度
+          if (this.params.year) this.year = this.years[this.valueArr[i++]]
+          if (this.params.month) this.month = this.months[this.valueArr[i++]]
+          if (this.params.day) this.day = this.days[this.valueArr[i++]]
+          if (this.params.hour) this.hour = this.hours[this.valueArr[i++]]
+          if (this.params.minute) this.minute = this.minutes[this.valueArr[i++]]
+          if (this.params.second) this.second = this.seconds[this.valueArr[i++]]
+        } else if (this.mode === 'region') {
+          // 标记省市是否发生了变化
+          let provinceChange = false,
+              cityChange = false
+          if (this.params.province) {
+            let value = this.valueArr[i++]
+            if (this.province != value) {
+              // 如果省份发生了变化，则重置市区的索引为0
+              this.city = 0
+              this.area = 0
+              provinceChange = true
+            }
+            this.province = value
+          }
+          if (this.params.city && !provinceChange) {
+            let value = this.valueArr[i++]
+            if (this.city != value) {
+              // 如果市发生了变化，则重置区的索引为0
+              this.area = 0
+              cityChange = true
+            }
+            this.city = value
+          }
+          if (this.params.area && !provinceChange && !cityChange) this.area = this.valueArr[i++]
+          
+          // 如果有省市进行了改变，重新设置列表的值
+          if (provinceChange || cityChange) {
+            this.valueArr = [this.province, this.city, this.area]
+          }
+        } else if (this.mode === 'multiSelector') {
+          let index = null
+          // 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化
+          this.defaultSelector.map((v, idx) => {
+            if (v != event.detail.value[idx]) index = idx
+          })
+          // 为了让用户对多列变化时，动态设置其他列
+          if (index != null) {
+            this.$emit('columnchange', {
+              column: index,
+              index: event.detail.value[index]
+            })
+          }
+        }
+      },
+      // 用户点击确定按钮
+      getResult(event = null) {
+        // #ifdef MP-WEIXIN
+        if (this.moving) return
+        // #endif
+        let result = {}
+        // 只返回用户需要的数据
+        if (this.mode === 'time') {
+          if (this.params.year) result.year = this.formatNumber(this.year || 0)
+          if (this.params.month) result.month = this.formatNumber(this.month || 0)
+          if (this.params.day) result.day = this.formatNumber(this.day || 0)
+          if (this.params.hour) result.hour = this.formatNumber(this.hour || 0)
+          if (this.params.minute) result.minute = this.formatNumber(this.minute || 0)
+          if (this.params.second) result.second = this.formatNumber(this.second || 0)
+          if (this.params.timestamp) result.timestamp = this.getTimestamp()
+        } else if (this.mode === 'region') {
+          if (this.params.province) result.province = provinces[this.province]
+          if (this.params.city) result.city = citys[this.province][this.city]
+          if (this.params.area) result.area = areas[this.province][this.city][this.area]
+        } else if (this.mode === 'multiSelector') {
+          result = this.valueArr
+        } else if (this.mode === 'selector') {
+          result = this.valueArr
+        }
+        
+        if (event) this.$emit(event, result)
+        this.close()
+      },
+      // 获取时间戳
+      getTimestamp() {
+      	// yyyy-mm-dd为安卓写法，不支持iOS，需要使用"/"分隔，才能二者兼容
+      	let time = this.year + '/' + this.month + '/' + this.day + ' ' + this.hour + ':' + this.minute + ':' + this.second;
+      	return new Date(time).getTime() / 1000;
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-picker {
+    &__content {
+      position: relative;
+      
+      &__header {
+        position: relative;
+        display: flex;
+        flex-direction: row;
+        width: 100%;
+        height: 90rpx;
+        margin-top: 10rpx;
+        padding: 0 30rpx;
+        align-items: center;
+        justify-content: space-between;
+        box-sizing: border-box;
+        font-size: 30rpx;
+        background-color: #FFFFFF;
+        
+        &__btn {
+          padding: 16rpx;
+          box-sizing: border-box;
+          text-align: center;
+          text-decoration: none;
+        }
+        
+        &__title {
+          color: $tn-font-color;
+        }
+        
+        &--cancel {
+          color: $tn-font-sub-color;
+        }
+        
+        &--confirm {
+          background-color: #07C160;
+          color: #FFFFFF;
+          padding: 10rpx 25rpx;
+          border-radius: 10rpx;
+        }
+      }
+      
+      &__body {
+        width: 100%;
+        height: 500rpx;
+        overflow: hidden;
+        background-color: #FFFFFF;
+        
+        &__view {
+          height: 100%;
+          box-sizing: border-box;
+        }
+        
+        &__item {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          font-size: 32rpx;
+          color: $tn-font-color;
+          padding: 0 8rpx;
+          
+          &--text {
+            font-size: 24rpx;
+            padding-left: 8rpx;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-popup/tn-popup.vue b/tuniao-ui/components/tn-popup/tn-popup.vue
new file mode 100644
index 0000000..ddbb83e
--- /dev/null
+++ b/tuniao-ui/components/tn-popup/tn-popup.vue
@@ -0,0 +1,492 @@
+<template>
+  <view
+    v-if="visibleSync"
+    class="tn-popup-class tn-popup"
+    :style="[customStyle, popupStyle, { zIndex: elZIndex - 1}]"
+    hover-stop-propagation
+  >
+    <!-- mask -->
+    <view
+      class="tn-popup__mask"
+      :class="[{'tn-popup__mask--show': showPopup && mask}]"
+      :style="{zIndex: elZIndex - 2}"
+      @tap="maskClick"
+      @touchmove.stop.prevent = "() => {}"
+      hover-stop-propagation
+    ></view>
+    <!-- 弹框内容 -->
+    <view
+      class="tn-popup__content"
+      :class="[
+        mode !== 'center' ? backgroundColorClass : '',
+        safeAreaInsetBottom ? 'tn-safe-area-inset-bottom' : '',
+        'tn-popup--' + mode,
+        showPopup ? 'tn-popup__content--visible' : '',
+        zoom && mode === 'center' ? 'tn-popup__content__center--animation-zoom' : ''
+      ]"
+      :style="[contentStyle]"
+      @tap="modeCenterClose"
+      @touchmove.stop.prevent
+      @tap.stop.prevent
+    >
+      <!-- 居中时候的内容 -->
+      <view
+        v-if="mode === 'center'"
+        class="tn-popup__content__center_box"
+        :class="[backgroundColorClass]"
+        :style="[centerStyle]"
+        @touchmove.stop.prevent
+        @tap.stop.prevent
+      >
+        <!-- 关闭按钮 -->
+        <view
+          v-if="closeBtn"
+          class="tn-popup__close"
+          :class="[`tn-icon-${closeBtnIcon}`, `tn-popup__close--${closeBtnPosition}`]"
+          :style="[closeBtnStyle, {zIndex: elZIndex}]"
+          @tap="close"
+        ></view>
+        <scroll-view scroll-y class="tn-popup__content__scroll-view">
+          <slot></slot>
+        </scroll-view>
+      </view>
+      
+      <!-- 除居中外的其他情况 -->
+      <scroll-view scroll-y v-else class="tn-popup__content__scroll-view">
+        <slot></slot>
+      </scroll-view>
+      <!-- 关闭按钮 -->
+      <view
+        v-if="mode !== 'center' && closeBtn"
+        class="tn-popup__close"
+        :class="[`tn-popup__close--${closeBtnPosition}`]"
+        :style="{zIndex: elZIndex}"
+        @tap="close"
+      >
+        <view :class="[`tn-icon-${closeBtnIcon}`]" :style="[closeBtnStyle]"></view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    mixins: [componentsColorMixin],
+    name: 'tn-popup',
+    props: {
+      value: {
+      	type: Boolean,
+      	default: false
+      },
+      // 弹出方向
+      // left/right/top/bottom/center
+      mode: {
+        type: String,
+        default: 'left'
+      },
+      // 是否显示遮罩
+      mask: {
+        type: Boolean,
+        default: true
+      },
+      // 抽屉的宽度（mode=left/right）,高度（mode=top/bottom）
+      length: {
+        type: [Number, String],
+        default: 'auto'
+      },
+      // 宽度，只对左，右，中部弹出时起作用，单位rpx，或者"auto"
+      // 或者百分比"50%"，表示由内容撑开高度或者宽度，优先级高于length参数
+      width: {
+      	type: String,
+      	default: ''
+      },
+      // 高度，只对上，下，中部弹出时起作用，单位rpx，或者"auto"
+      // 或者百分比"50%"，表示由内容撑开高度或者宽度，优先级高于length参数
+      height: {
+      	type: String,
+      	default: ''
+      },
+      // 是否开启动画，只在mode=center有效
+      zoom: {
+        type: Boolean,
+        default: true
+      },
+      // 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+      safeAreaInsetBottom: {
+      	type: Boolean,
+      	default: false
+      },
+      // 是否可以通过点击遮罩进行关闭
+      maskCloseable: {
+      	type: Boolean,
+      	default: true
+      },
+      // 用户自定义样式
+      customStyle: {
+      	type: Object,
+      	default() {
+      		return {}
+      	}
+      },
+      // 显示圆角的大小
+      borderRadius: {
+        type: Number,
+        default: 0
+      },
+      // zIndex
+      zIndex: {
+        type: Number,
+        default: 0
+      },
+      // 是否显示关闭按钮
+      closeBtn: {
+        type: Boolean,
+        default: false
+      },
+      // 关闭按钮的图标
+      closeBtnIcon: {
+        type: String,
+        default: 'close'
+      },
+      // 关闭按钮显示的位置
+      // top-left/top-right/bottom-left/bottom-right
+      closeBtnPosition: {
+        type: String,
+        default: 'top-right'
+      },
+      // 关闭按钮图标颜色
+      closeIconColor: {
+        type: String,
+        default: '#AAAAAA'
+      },
+      // 关闭按钮图标的大小
+      closeIconSize: {
+        type: Number,
+        default: 30
+      },
+      // 给一个负的margin-top，往上偏移，避免和键盘重合的情况，仅在mode=center时有效
+      negativeTop: {
+      	type: Number,
+      	default: 0
+      },
+      // marginTop，在mode = top,left,right时生效，避免用户使用了自定义导航栏，组件把导航栏遮挡了
+      marginTop: {
+        type: Number,
+        default: 0
+      },
+      // 此为内部参数，不在文档对外使用，为了解决Picker和keyboard等融合了弹窗的组件
+      // 对v-model双向绑定多层调用造成报错不能修改props值的问题
+      popup: {
+      	type: Boolean,
+      	default: true
+      },
+    },
+    computed: {
+      // 处理使用了自定义导航栏时被遮挡的问题
+      popupStyle() {
+        let style = {}
+        if ((this.mode === 'top' || this.mode === 'left' || this.mode === 'right') && this.marginTop) {
+          style.marginTop = this.$tn.string.getLengthUnitValue(this.marginTop, 'px')
+        }
+        
+        return style
+      },
+      // 根据mode的位置，设定其弹窗的宽度(mode = left|right)，或者高度(mode = top|bottom)
+      contentStyle() {
+        let style = {}
+        // 如果是左边或者上边弹出时，需要给translate设置为负值，用于隐藏
+        if (this.mode === 'left' || this.mode === 'right') {
+          style = {
+            width: this.width ? this.$tn.string.getLengthUnitValue(this.width) : this.$tn.string.getLengthUnitValue(this.length),
+            height: '100%',
+            transform: `translate3D(${this.mode === 'left' ? '-100%' : '100%'}, 0px, 0px)`
+          }
+        } else if (this.mode === 'top' || this.mode === 'bottom') {
+          style = {
+            width: '100%',
+            height: this.height ? this.$tn.string.getLengthUnitValue(this.height) : this.$tn.string.getLengthUnitValue(this.length),
+            transform: `translate3D(0px, ${this.mode === 'top' ? '-100%': '100%'}, 0px)`
+          }
+        }
+        style.zIndex = this.elZIndex
+        // 如果设置了圆角的值，添加弹窗的圆角
+        if (this.borderRadius) {
+          switch(this.mode) {
+            case 'left':
+              style.borderRadius = `0 ${this.borderRadius}rpx ${this.borderRadius}rpx 0`
+              break
+            case 'top':
+              style.borderRadius = `0 0 ${this.borderRadius}rpx ${this.borderRadius}rpx`
+              break
+            case 'right':
+              style.borderRadius = `${this.borderRadius}rpx 0 0 ${this.borderRadius}rpx`
+              break
+            case 'bottom':
+              style.borderRadius = `${this.borderRadius}rpx ${this.borderRadius}rpx 0 0`
+              break
+          }
+          style.overflow = 'hidden'
+        }
+        
+        if (this.backgroundColorStyle && this.mode !== 'center') {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        
+        return style
+      },
+      // 中部弹窗的样式
+      centerStyle() {
+        let style = {}
+        style.width = this.width ? this.$tn.string.getLengthUnitValue(this.width) : this.$tn.string.getLengthUnitValue(this.length)
+        // 中部弹出的模式，如果没有设置高度，就用auto值，由内容撑开
+        style.height = this.height ? this.$tn.string.getLengthUnitValue(this.height) : 'auto'
+        style.zIndex = this.elZIndex
+        if (this.negativeTop) {
+          style.marginTop = `-${this.$tn.string.getLengthUnitValue(this.negativeTop)}`
+        }
+        if (this.borderRadius) {
+          style.borderRadius = `${this.borderRadius}rpx`
+          style.overflow='hidden'
+        }
+        if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        return style
+      },
+      // 关闭按钮样式
+      closeBtnStyle() {
+        let style = {}
+        if (this.closeIconColor) {
+          style.color = this.closeIconColor
+        }
+        if (this.closeIconSize) {
+          style.fontSize = this.closeIconSize + 'rpx'
+        }
+        
+        return style
+      },
+      elZIndex() {
+        return this.zIndex ? this.zIndex : this.$tn.zIndex.popup
+      }
+    },
+    data() {
+      return {
+        timer: null,
+        visibleSync: false,
+        showPopup: false,
+        closeFromInner: false
+      }
+    },
+    watch: {
+      value(val) {
+        if (val) {
+          // console.log(this.visibleSync);
+          if (this.visibleSync) {
+            this.visibleSync = false
+            return
+          }
+          this.open()
+        } else if (!this.closeFromInner) {
+          this.close()
+        }
+        this.closeFromInner = false
+      }
+    },
+    mounted() {
+      // 组件渲染完成时，检查value是否为true，如果是，弹出popup
+      this.value && this.open()
+    },
+    methods: {
+      // 点击遮罩
+      maskClick() {
+        if (!this.maskCloseable) return
+        this.close()
+      },
+      open() {
+        this.change('visibleSync', 'showPopup', true)
+      },
+      // 关闭弹框
+      close() {
+        // 标记关闭是内部发生的，否则修改了value值，导致watch中对value检测，导致再执行一遍close
+        // 造成@close事件触发两次
+        this.closeFromInner = true
+        this.change('showPopup', 'visibleSync', false)
+      },
+      // 中部弹出时，需要.tn-drawer-content将内容居中，此元素会铺满屏幕，点击需要关闭弹窗
+      // 让其只在mode=center时起作用 
+      modeCenterClose() {
+        if (this.mode != 'center' || !this.maskCloseable) return
+        this.close()
+      },
+      // 关闭时先通过动画隐藏弹窗和遮罩，再移除整个组件
+      // 打开时，先渲染组件，延时一定时间再让遮罩和弹窗的动画起作用
+      change(param1, param2, status) {
+        // 如果this.popup为false，意味着为picker，actionsheet等组件调用了popup组件
+        if (this.popup === true) {
+          this.$emit('input', status)
+        }
+        this[param1] = status
+        if (status) {
+          // #ifdef H5 || MP
+          this.timer = setTimeout(() => {
+            this[param2] = status
+            this.$emit(status ? 'open' : 'close')
+            clearTimeout(this.timer)
+          }, 10)
+          // #endif
+          // #ifndef H5 || MP
+          this.$nextTick(() => {
+            this[param2] = status
+            this.$emit(status ? 'open' : 'close')
+          })
+          // #endif
+        } else {
+          this.timer = setTimeout(() => {
+            this[param2] = status
+            this.$emit(status ? 'open' : 'close')
+            clearTimeout(this.timer)
+          }, 250)
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-popup {
+    /* #ifndef APP-NVUE */
+    display: block;
+    /* #endif */
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    overflow: hidden;
+    z-index: 29091 !important;
+    
+    &__content {
+      /* #ifndef APP-NVUE */
+      display: block;
+      /* #endif */
+      position: absolute;
+      transition: all 0.25s linear;
+      
+      &--visible {
+        transform: translate3D(0px, 0px, 0px) !important;
+        &.tn-popup--center {
+          transform: scale(1);
+          opacity: 1;
+        }
+      }
+      
+      &__center_box {
+        min-width: 100rpx;
+        min-height: 100rpx;
+        /* #ifndef APP-NVUE */
+        display: block;
+        /* #endif */
+        position: relative;
+        background-color: #FFFFFF;
+      }
+      
+      &__scroll-view {
+        width: 100%;
+        height: 100%;
+      }
+      
+      &__center--animation-zoom {
+        transform: scale(1.15);
+      }
+    }
+    
+    &__scroll_view {
+      width: 100%;
+      height: 100%;
+    }
+    
+    &--left {
+      top: 0;
+      bottom: 0;
+      left: 0;
+      background-color: #FFFFFF;
+    }
+    
+    &--right {
+      top: 0;
+      bottom: 0;
+      right: 0;
+      background-color: #FFFFFF;
+    }
+    
+    &--top {
+      left: 0;
+      right: 0;
+      top: 0;
+      background-color: #FFFFFF;
+    }
+    
+    &--bottom {
+      left: 0;
+      right: 0;
+      bottom: 0;
+      background-color: #FFFFFF;
+    }
+    
+    &--center {
+      display: flex;
+      flex-direction: column;
+      bottom: 0;
+      top: 0;
+      left: 0;
+      right: 0;
+      justify-content: center;
+      align-items: center;
+      opacity: 0;
+    }
+    
+    &__close {
+      position: absolute;
+      
+      &--top-left {
+        top: 30rpx;
+        left: 30rpx;
+      }
+      
+      &--top-right {
+        top: 30rpx;
+        right: 30rpx;
+      }
+      
+      &--bottom-left {
+        bottom: 30rpx;
+        left: 30rpx;
+      }
+      
+      &--bottom-right {
+        bottom: 30rpx;
+        right: 30rpx;
+      }
+    }
+    
+    &__mask {
+      width: 100%;
+      height: 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      right: 0;
+      border: 0;
+      background-color: $tn-mask-bg-color;
+      transition: 0.25s linear;
+      transition-property: opacity;
+      opacity: 0;
+      
+      &--show {
+        opacity: 1;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-radio-group/tn-radio-group.vue b/tuniao-ui/components/tn-radio-group/tn-radio-group.vue
new file mode 100644
index 0000000..8d4f135
--- /dev/null
+++ b/tuniao-ui/components/tn-radio-group/tn-radio-group.vue
@@ -0,0 +1,124 @@
+<template>
+  <view class="tn-radio-group-class tn-radio-group">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  import Emitter from '../../libs/utils/emitter.js'
+  
+  export default {
+    mixins: [ Emitter ],
+    name: 'tn-radio-group',
+    props: {
+      // 单选组的值，会选中值相同的选项
+      value: {
+        type: String,
+        default: ''
+      },
+      // 是否禁用
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 禁用点击标签进行选择
+      disabledLabel: {
+        type: Boolean,
+        default: false
+      },
+      // 选择框的形状 square 方形 circle 圆形
+      shape: {
+        type: String,
+        default: 'circle'
+      },
+      // 选中时的颜色
+      activeColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 组件大小
+      size: {
+        type: Number,
+        default: 34
+      },
+      // 每个radio占的宽度
+      width: {
+        type: String,
+        default: 'auto'
+      },
+      // 是否换行
+      wrap: {
+        type: Boolean,
+        default: false
+      },
+      // 图标大小
+      iconSize: {
+        type: Number,
+        default: 20
+      }
+    },
+    computed: {
+      // 这里computed的变量，都是子组件tn-radio需要用到的，由于头条小程序的兼容性差异，子组件无法实时监听父组件参数的变化
+      // 所以需要手动通知子组件，这里返回一个parentData变量，供watch监听，在其中去通知每一个子组件重新从父组件(tn-radio-group)
+      // 拉取父组件新的变化后的参数
+      parentData() {
+        return [this.value, this.disabled, this.activeColor, this.size, this.disabledLabel, this.shape, this.iconSize, this.width, this.wrap]
+      }
+    },
+    data() {
+      return {
+        
+      }
+    },
+    watch: {
+      // 当父组件中的子组件需要共享的参数发生了变化，手动通知子组件
+      parentData() {
+        if (this.children.length) {
+          this.children.map(child => {
+            // 判断子组件(tn-radio)如果有updateParentData方法的话，子组件重新从父组件拉取了最新的值
+            typeof(child.updateParentData) === 'function' && child.updateParentData()
+          })
+        }
+      }
+    },
+    created() {
+      // 如果将children定义在data中，在微信小程序会造成循环引用而报错
+      this.children = []
+    },
+    methods: {
+      // 改方法由子组件tn-radio调用，当一个tn-radio被选中的时候，给父组件设置value值（通知其他tn-radio组件）
+      setValue(value) {
+        // 通过子组件传递过来的value值(此被选中的子组件内部已将parentValue设置等于value的值)，将其他tn-radio设置未选中的状态
+        this.children.map(child => {
+          if (child.parentData.value !== value) child.parentData.value = ''
+        })
+        // 通过emit事件，设置父组件通过v-model双向绑定的值
+        this.$emit('input', value)
+        this.$emit('change', value)
+        // 等待下一个周期再执行，因为this.$emit('input')作用于父组件，再反馈到子组件内部，需要时间
+        // 由于头条小程序执行迟钝，故需要用几十毫秒的延时
+        setTimeout(() => {
+        	// 将当前的值发送到 tn-form-item 进行校验
+        	this.dispatch('tn-form-item', 'on-form-change', value);
+        }, 60)
+        
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-radio-group {
+    /* #ifndef MP || APP-NVUE */
+    display: inline-flex;
+    flex-wrap: wrap;
+    /* #endif */
+    &::after {
+      content: " ";
+      display: table;
+      clear: both;
+    }
+  }
+  
+</style>
diff --git a/tuniao-ui/components/tn-radio/tn-radio.vue b/tuniao-ui/components/tn-radio/tn-radio.vue
new file mode 100644
index 0000000..dd2fc43
--- /dev/null
+++ b/tuniao-ui/components/tn-radio/tn-radio.vue
@@ -0,0 +1,276 @@
+<template>
+  <view class="tn-radio-class tn-radio" :style="[radioStyle]">
+    <view
+      class="tn-radio__icon-wrap"
+      :class="[iconClass]"
+      :style=[iconStyle]
+      @tap="toggle"
+    >
+      <view class="tn-icon-success tn-radio__icon-wrap__icon"></view>
+    </view>
+    
+    <view
+      class="tn-radio__label"
+      :style="{
+        fontSize: labelSize ? labelSize + 'rpx' : '',
+        color: labelColor ? labelColor : '#080808'
+      }"
+      @tap="onClickLabel"
+    >
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-radio',
+    props: {
+      // radio名称
+      name: {
+        type: [String, Number],
+        default: ''
+      },
+      // 是否禁用
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 禁用点击标签进行选择
+      disabledLabel: {
+        type: Boolean,
+        default: false
+      },
+      // 选择框的形状 square 方形 circle 圆形
+      shape: {
+        type: String,
+        default: ''
+      },
+      // 选中时的颜色
+      activeColor: {
+        type: String,
+        default: ''
+      },
+      // 组件尺寸
+      size: {
+        type: Number,
+        default: 0
+      },
+      // 图标大小
+      iconSize: {
+        type: Number,
+        default: 0
+      },
+      // label字体大小
+      labelSize: {
+        type: Number,
+        default: 0
+      },
+      //labelColor 字体颜色
+      labelColor: {
+        type: String,
+        default: '#080808'
+      },
+      //边框颜色
+      borderColor: {
+        type: String,
+        default: '#080808'
+      }
+    },
+    computed: {
+      // 禁用，父组件会覆盖子组件的状态
+      isDisabled() {
+        return this.disabled ? this.disabled : (this.parentData.disabled ? this.parentData.disabled : false)
+      },
+      // 禁用label点击，父组件会覆盖子组件的状态
+      isDisabledLabel() {
+        return this.disabledLabel ? this.disabledLabel : (this.parentData.disabledLabel ? this.parentData.disabledLabel : false)
+      },
+      // 组件尺寸
+      elSize() {
+        return this.size ? this.size : (this.parentData.size ? this.parentData.size : 34)
+      },
+      // 组件选中时的颜色
+      elActiveColor() {
+        return this.activeColor ? this.activeColor : (this.parentData.activeColor ? this.parentData.activeColor : '#01BEFF')
+      },
+      // 组件形状
+      elShape() {
+        return this.shape ? this.shape : (this.parentData.shape ? this.parentData.shape : 'circle')
+      },
+      iconClass() {
+        let clazz = ''
+        clazz += (' tn-radio__icon-wrap--' + this.elShape)
+        
+        if (this.parentData.value === this.name) clazz += ' tn-radio__icon-wrap--checked'
+        if (this.isDisabled) clazz += ' tn-radio__icon-wrap--disabled'
+        if (this.parentData.value === this.name && this.isDisabled) clazz += ' tn-radio__icon-wrap--disabled--checked'
+      
+        return clazz
+      },
+      iconStyle() {
+        // 当前radio的name等于parent的value才认为时选中
+        let style = {}
+        if (this.elActiveColor && this.parentData.value === this.name && !this.isDisabled) {
+          style.borderColor = this.elActiveColor
+          style.backgroundColor = this.elActiveColor
+        }
+        
+        style.color = this.parentData.value === this.name ? '#FFFFFF' : 'transparent'
+        
+        style.width = this.elSize + 'rpx'
+        style.height = style.width
+        
+        style.fontSize = (this.iconSize ? this.iconSize : (this.parentData.iconSize ? this.parentData.iconSize : 20)) + 'rpx'
+        style.borderColor = this.borderColor
+        return style
+      },
+      radioStyle() {
+        let style = {}
+        if (this.parent && this.parentData.width) {
+          // #ifdef MP
+          // 各家小程序因为它们特殊的编译结构，使用float布局
+          style.float = 'left';
+          // #endif
+          // #ifndef MP
+          // H5和APP使用flex布局
+          style.flex = `0 0 ${this.parentData.width}`;
+          // #endif
+        }
+        if(this.parent && this.parentData.wrap) {
+        	style.width = '100%';
+        	// #ifndef MP
+        	// H5和APP使用flex布局，将宽度设置100%，即可自动换行
+        	style.flex = '0 0 100%';
+        	// #endif
+        }
+        
+        return style
+      }
+    },
+    data() {
+      return {
+        // 父组件的默认值，因为头条小程序不支持在computed中使用this.parent.xxx的形式
+        // 故只能使用如此方法
+        parentData: {
+          value: null,
+          disabled: null,
+          disabledLabel: null,
+          shape: null,
+          activeColor: null,
+          size: null,
+          width: null,
+          wrap: null,
+          iconSize: null,
+        }
+      }
+    },
+    created() {
+      // 支付宝小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环引用
+      this.updateParentData()
+      this.parent.children.push(this)
+    },
+    methods: {
+      updateParentData() {
+        this.getParentData('tn-radio-group')
+      },
+      onClickLabel() {
+        if (!this.isDisabledLabel && !this.isDisabled) {
+          this.setRadioCheckedStatus()
+        }
+      },
+      toggle() {
+        if (!this.isDisabled) {
+          this.setRadioCheckedStatus()
+        }
+      },
+      emitEvent() {
+        // tn-radio的name不等于父组件的v-model的值时(意味着未选中)，才发出事件，避免多次点击触发事件
+        if (this.parentData.value !== this.name) this.$emit('change', this.name)
+      },
+      // 改变选中的状态
+      // 更改本组件的parentData.value的值为本组件的name值，同时通过父组件遍历所有的radio实例
+      // 将本组件外的其他radio的parentData.value都设置为空
+      setRadioCheckedStatus() {
+        this.emitEvent()
+        if (this.parent) {
+          this.parent.setValue(this.name)
+          this.parentData.value = this.name
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-radio {
+    /* #ifndef APP-NVUE */
+    display: inline-flex;
+    /* #endif */
+    align-items: center;
+    overflow: hidden;
+    user-select: none;
+    line-height: 1.8;
+    
+    &__icon-wrap {
+      color: $tn-font-color;
+      display: flex;
+      flex-direction: row;
+      flex: none;
+      align-items: center;
+      justify-content: center;
+      box-sizing: border-box;
+      width: 42rpx;
+      height: 42rpx;
+      color: transparent;
+      text-align: center;
+      transition-property: color, border-color, background-color;
+      font-size: 20rpx;
+      border: 1rpx solid $tn-font-sub-color;
+      transition-duration: 0.2s;
+      
+      /* #ifdef MP-TOUTIAO */
+      // 头条小程序兼容性问题，需要设置行高为0，否则图标偏下
+      &__icon {
+      	line-height: 0;
+      }
+      /* #endif */
+      
+      &--circle {
+        border-radius: 100%;
+      }
+      
+      &--square {
+        border-radius: 6rpx;
+      }
+      
+      &--checked {
+        color: #FFFFFF;
+        background-color: $tn-main-color;
+        border-color: $tn-main-color;
+      }
+      
+      &--disabled {
+        background-color: $tn-font-holder-color;
+        border-color: $tn-font-sub-color;
+      }
+      
+      &--disabled--checked {
+        color: $tn-font-sub-color !important;
+      }
+    }
+    
+    &__label {
+      word-wrap: break-word;
+      margin-left: 10rpx;
+      margin-right: 24rpx;
+      color: $tn-font-color;
+      font-size: 30rpx;
+      
+      &--disabled {
+        color: $tn-font-sub-color;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-rate/tn-rate.vue b/tuniao-ui/components/tn-rate/tn-rate.vue
new file mode 100644
index 0000000..77b4724
--- /dev/null
+++ b/tuniao-ui/components/tn-rate/tn-rate.vue
@@ -0,0 +1,325 @@
+<template>
+	<view :id="elId" class="tn-rate-class tn-rate" @touchmove.stop.prevent="touchMove">
+		<view class="tn-rate__wrap" :class="[elClass]" v-for="(item, index) in count" :key="index">
+			<view class="tn-rate__wrap__icon"
+				:class="[`tn-icon-${(allowHalf && halfIcon ? activeIndex > index + 1 : activeIndex > index) ? elActionIcon : elInactionIcon}`]"
+				:style="[iconStyle(index)]" @tap="click(index + 1, $event)">
+				<!-- 半图标 -->
+				<view v-if="showHalfIcon(index)" class="tn-rate__wrap__icon--half" :class="[`tn-icon-${elActionIcon}`]"
+					:style="[halfIconStyle]"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tn-rate',
+		props: {
+			// 选中星星的数量
+			value: {
+				type: Number,
+				default: 0
+			},
+			// 显示的星星数
+			count: {
+				type: Number,
+				default: 5
+			},
+			// 最小能选择的星星数
+			minCount: {
+				type: Number,
+				default: 0
+			},
+			// 禁用状态
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 是否可以选择半星
+			allowHalf: {
+				type: Boolean,
+				default: false
+			},
+			// 星星大小
+			size: {
+				type: Number,
+				default: 32
+			},
+			// 被选中的图标
+			activeIcon: {
+				type: String,
+				default: 'star-fill'
+			},
+			// 未被选中的图标
+			inactiveIcon: {
+				type: String,
+				default: 'star'
+			},
+			// 被选中的颜色
+			activeColor: {
+				type: String,
+				default: '#01BEFF'
+			},
+			// 默认颜色
+			inactiveColor: {
+				type: String,
+				default: '#AAAAAA'
+			},
+			// 星星之间的距离
+			gutter: {
+				type: Number,
+				default: 10
+			},
+			// 自定义颜色
+			colors: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// 自定义图标
+			icons: {
+				type: Array,
+				default () {
+					return []
+				}
+			}
+		},
+		computed: {
+			// 图标显示的比例
+			showHalfIcon(index) {
+				return index => {
+					return this.allowHalf && Math.ceil(this.activeIndex) === index + 1 && this.halfIcon
+				}
+			},
+			// 被激活的图标
+			elActionIcon() {
+				const len = this.icons.length
+				// icons参数传递了3个图标，当选中2个时，用第一个图标，4个时，用第二个图标
+				// 5个时，用第三个图标作为激活的图标
+				if (len && len <= this.count) {
+					const step = Math.round(Math.ceil(this.activeIndex) / Math.round(this.count / len))
+					if (step < 1) return this.icons[0]
+					if (step > len) return this.icons[len - 1]
+					return this.icons[step - 1]
+				}
+				return this.activeIcon
+			},
+			// 未被激活的图标
+			elInactionIcon() {
+				const len = this.icons.length
+				// icons参数传递了3个图标，当选中2个时，用第一个图标，4个时，用第二个图标
+				// 5个时，用第三个图标作为激活的图标
+				if (len && len <= this.count) {
+					const step = Math.round(Math.ceil(this.activeIndex) / Math.round(this.count / len))
+					if (step < 1) return this.icons[0]
+					if (step > len) return this.icons[len - 1]
+					return this.icons[step - 1]
+				}
+				return this.inactiveIcon
+			},
+			// 被激活的颜色
+			elActionColor() {
+				const len = this.colors.length
+				// 如果有设置colors参数(此参数用于将图标分段，比如一共5颗星，colors传3个颜色值，那么根据一定的规则，2颗星可能为第一个颜色
+				// 4颗星为第二个颜色值，5颗星为第三个颜色值)
+				if (len && len <= this.count) {
+					const step = Math.round(Math.ceil(this.activeIndex) / Math.round(this.count / len))
+					if (step < 1) return this.colors[0]
+					if (step > len) return this.colors[len - 1]
+					return this.colors[step - 1]
+				}
+				return this.activeColor
+			},
+			// 图标的样式
+			iconStyle() {
+				return index => {
+					let style = {}
+
+					style.fontSize = this.$tn.string.getLengthUnitValue(this.size)
+					style.padding = `0 ${this.$tn.string.getLengthUnitValue(this.gutter / 2)}`
+					// 当前图标的颜色
+					if (this.allowHalf && this.halfIcon) {
+						style.color = this.activeIndex > index + 1 ? this.elActionColor : this.inactiveColor
+					} else {
+						style.color = this.activeIndex > index ? this.elActionColor : this.inactiveColor
+					}
+					return style
+				}
+			},
+			// 半图标样式
+			halfIconStyle() {
+				let style = {}
+
+				style.fontSize = this.$tn.string.getLengthUnitValue(this.size)
+				style.padding = `0 ${this.$tn.string.getLengthUnitValue(this.gutter / 2)}`
+				style.color = this.elActionColor
+				return style
+			}
+		},
+		data() {
+			return {
+				// 保证控件的唯一性
+				elId: this.$tn.uuid(),
+				elClass: this.$tn.uuid(),
+				// 评分盒子左边到屏幕左边的距离，用于滑动选择时计算距离
+				starBoxLeft: 0,
+				// 当前激活的星星的序号
+				activeIndex: this.value,
+				// 每个星星的宽度
+				starWidth: 0,
+				// 每个星星最右边到盒子组件最左边的距离
+				starWidthArr: [],
+				// 标记是否为半图标
+				halfIcon: false,
+			}
+		},
+		watch: {
+			value: {
+				handler(newName, oldName) {
+					this.activeIndex = newName
+					if (this.allowHalf && (newName % 1 === 0.5)) {
+						this.halfIcon = true
+					} else {
+						this.halfIcon = false
+					}
+				},
+				immediate: true
+			},
+			size() {
+				// 当尺寸修改的时候重新获取布局尺寸信息
+				this.$nextTick(() => {
+					this.getElRectById()
+					this.getElRectByClass()
+				})
+			}
+		},
+		mounted() {
+			this.getElRectById()
+			this.getElRectByClass()
+		},
+		methods: {
+			// 获取评分组件盒子的布局信息
+			getElRectById() {
+				this._tGetRect('#' + this.elId).then(res => {
+					this.starBoxLeft = res.left
+				})
+			},
+			// 获取单个星星的尺寸
+			getElRectByClass() {
+				this._tGetRect('.' + this.elClass).then(res => {
+					this.starWidth = res.width
+					// 把每个星星最右边到盒子最左边的距离
+					for (let i = 0; i < this.count; i++) {
+						this.starWidthArr[i] = (i + 1) * this.starWidth
+					}
+				})
+			},
+			// 手指滑动
+			touchMove(e) {
+				if (this.disabled) return
+				if (!e.changedTouches[0]) return
+
+				const movePageX = e.changedTouches[0].pageX
+				// 滑动点相对于评分盒子左边的距离
+				const distance = movePageX - this.starBoxLeft
+
+				// 如果滑动到了评分盒子的左边界，设置为0星
+				if (distance <= 0) {
+					this.activeIndex = 0
+				}
+
+				// 计算滑动的距离相当于点击多少颗星星
+				let index = Math.ceil(distance / this.starWidth)
+				if (this.allowHalf) {
+					const iconHalfWidth = this.starWidthArr[index - 1] - (this.starWidth / 2)
+					if (distance < iconHalfWidth) {
+						this.halfIcon = true
+						index -= 0.5
+					} else {
+						this.halfIcon = false
+					}
+				}
+				this.activeIndex = index > this.count ? this.count : index
+
+				if (this.activeIndex < this.minCount) this.activeIndex = this.minCount
+
+				this.emitEvent()
+			},
+			// 通过点击直接选中
+			click(index, e) {
+				if (this.disabled) return
+				// 半星选择
+				if (this.allowHalf) {
+					if (!e.changedTouches[0]) return
+					const movePageX = e.changedTouches[0].pageX
+					// 点击点相对于当前图标左边的距离
+					const distance = movePageX - this.starBoxLeft
+					const iconHalfWidth = this.starWidthArr[index - 1] - (this.starWidth / 2)
+					if (distance < iconHalfWidth) {
+						this.halfIcon = true
+					} else {
+						this.halfIcon = false
+					}
+				}
+
+				// 对第一个星星特殊处理，只有一个的时候，点击可以取消，否则无法作0星评价
+				if (index == 1) {
+					if (this.allowHalf && this.allowHalf) {
+						if ((this.activeIndex === 0.5 && this.halfIcon) ||
+							(this.activeIndex === 1 && !this.halfIcon)) {
+							this.activeIndex = 0
+						} else {
+							this.activeIndex = this.halfIcon ? 0.5 : 1
+						}
+					} else {
+						if (this.activeIndex == 1) {
+							this.activeIndex = 0
+						} else {
+							this.activeIndex = 1
+						}
+					}
+				} else {
+					this.activeIndex = (this.allowHalf && this.halfIcon) ? index - 0.5 : index
+				}
+
+				if (this.activeIndex < this.minCount) this.activeIndex = this.minCount
+
+				this.emitEvent()
+			},
+			// 发送事件
+			emitEvent() {
+				this.$emit('change', this.activeIndex)
+				// 修改v-model的值
+				this.$emit('input', this.activeIndex)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tn-rate {
+		display: inline-flex;
+		align-items: center;
+		margin: 0;
+		padding: 0;
+
+		&__wrap {
+
+			&__icon {
+				position: relative;
+				box-sizing: border-box;
+
+				&--half {
+					position: absolute;
+					top: 0;
+					left: 0;
+					display: inline-block;
+					overflow: hidden;
+					width: 50%;
+				}
+			}
+		}
+	}
+</style>
diff --git a/tuniao-ui/components/tn-read-more/tn-read-more.vue b/tuniao-ui/components/tn-read-more/tn-read-more.vue
new file mode 100644
index 0000000..da012f1
--- /dev/null
+++ b/tuniao-ui/components/tn-read-more/tn-read-more.vue
@@ -0,0 +1,222 @@
+<template>
+  <view>
+    <view class="tn-read-more-class tn-read-more">
+      <!-- 内容 -->
+      <view
+        :id="elId"
+        class="tn-read-more__content"
+        :style="[contentStyle]"
+      >
+        <slot></slot>
+      </view>
+      
+      <!-- 展开收起按钮 -->
+      <view
+        v-if="isLongContent"
+        class="tn-read-more__show-more__wrap"
+        :class="{'tn-read-more__show-more': showMore}"
+        :style="[innerShadowStyle]"
+        @tap="toggleReadMore">
+        <text class="tn-read-more__show-more--text" :style="[fontStyle]">{{ showMore ? closeText : openText }}</text>
+        <view class="tn-read-more__show-more--icon">
+          <view :class="[tipIconClass]" :style="[fontStyle]"></view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-read-more',
+    mixins: [componentsColorMixin],
+    props: {
+      // 默认占位高度
+      showHeight: {
+        type: Number,
+        default: 400
+      },
+      // 显示收起按钮
+      closeBtn: {
+        type: Boolean,
+        default: false
+      },
+      // 展开提示文字
+      openText: {
+        type: String,
+        default: '展开阅读全文'
+      },
+      // 收起提示文字
+      closeText: {
+        type: String,
+        default: '收起'
+      },
+      // 展开提示图标
+      openIcon: {
+        type: String,
+        default: 'down'
+      },
+      // 收起提示图标
+      closeIcon: {
+        type: String,
+        default: 'up'
+      },
+      // 阴影样式
+      shadowStyle: {
+        type: Object,
+        default () {
+        	return {
+        		backgroundImage: "linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #fff 80%)",
+        		paddingTop: "300rpx",
+        		marginTop: "-300rpx"
+        	}
+        }
+      },
+      // 组件标识
+      index: {
+        type: [Number, String],
+        default: ''
+      }
+    },
+    computed: {
+      paramsChange() {
+        return `${this.open}-${this.showHeight}`
+      },
+      contentStyle() {
+        let style = {}
+        if (this.isLongContent && !this.showMore) {
+          style.height = `${this.showHeight}rpx`
+        } else {
+          if (!this.initHeight) {
+            style.height = 'auto'
+          } else {
+            style.height = `${this.contentHeight}px`
+          }
+        }
+        
+        return style
+      },
+      innerShadowStyle() {
+        let style = {}
+        // 折叠时才需要阴影样式
+        if (!this.showMore) {
+          style = Object.assign(style, this.shadowStyle)
+        }
+        
+        return style
+      },
+      fontStyle() {
+        let style = {}
+        style.color = this.fontColorStyle ? this.fontColorStyle : '#01BEFF'
+        style.fontSize = this.fontSizeStyle ? this.fontSizeStyle : '28rpx'
+        
+        return style
+      },
+      tipIconClass() {
+        if (this.showMore) {
+          if (this.closeIcon) {
+            return `tn-icon-${this.closeIcon}`
+          }
+        } else {
+          if (this.openIcon) {
+            return `tn-icon-${this.openIcon}`
+          }
+        }
+      }
+    },
+    data() {
+      return {
+        elId: this.$tn.uuid(),
+        // 标记是否已经初始化高度完成
+        initHeight: false,
+        // 是否需要隐藏一部分内容
+        isLongContent: false,
+        // 当前展开的打开、关闭状态
+        showMore: false,
+        // 内容的高度
+        contentHeight: 0
+      }
+    },
+    watch: {
+      paramsChange(value) {
+        this.initHeight = false
+        this.isLongContent = false
+        this.showMore = true
+        this.$nextTick(() => {
+          this.init()
+        })
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.init()
+      })
+    },
+    methods: {
+      // 初始化组件
+      init() {
+        // 判断高度，如果真实内容的高度大于占位高度，则显示展开与收起的控制按钮
+        this._tGetRect('#' + this.elId).then(res => {
+          this.contentHeight = res.height
+          this.initHeight = true
+          if (res.height > uni.upx2px(this.showHeight)) {
+            this.isLongContent = true
+            this.showMore = false
+          }
+        })
+      },
+      // 展开或者收起内容
+      toggleReadMore() {
+        this.showMore = !this.showMore
+        // 是否显示收起按钮
+        if (!this.closeBtn) this.isLongContent = false
+        
+        this.$emit(this.showMore ? 'open' : 'closed', this.index)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-read-more {
+    
+    &__content {
+      font-size: 28rpx;
+      color: $tn-font-color;
+      line-height: 1.8;
+      text-align: left;
+      overflow: hidden;
+      transition: all 0.3s linear;
+    }
+    
+    &__show-more {
+      padding-top: 0;
+      background: none;
+      margin-top: 20rpx;
+      
+      &__wrap {
+        position: relative;
+        width: 100%;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        padding-bottom: 26rpx;
+      }
+      
+      &--text {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        line-height: 1;
+      }
+      
+      &--icon {
+        margin-left: 14rpx;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-row-notice/tn-row-notice.vue b/tuniao-ui/components/tn-row-notice/tn-row-notice.vue
new file mode 100644
index 0000000..9cc965e
--- /dev/null
+++ b/tuniao-ui/components/tn-row-notice/tn-row-notice.vue
@@ -0,0 +1,301 @@
+<template>
+  <view
+    v-if="show"
+    class="tn-row-notice-class tn-row-notice"
+    :class="[backgroundColorClass]"
+    :style="[noticeStyle]"
+  >
+    <view class="tn-row-notice__wrap">
+      <!-- 左图标 -->
+      <view class="tn-row-notice__icon">
+        <view
+          v-if="leftIcon"
+          class="tn-row-notice__icon--left" 
+          :class="[`tn-icon-${leftIconName}`,fontColorClass]"
+          :style="[fontStyle('leftIcon')]"
+          @tap="clickLeftIcon"></view>
+      </view>
+      
+      <!-- 消息体 -->
+      <view class="tn-row-notice__content-box" id="tn-row-notice__content-box">
+        <view
+          class="tn-row-notice__content"
+          id="tn-row-notice__content"
+          :style="{
+            animationDuration: animationDuration,
+            animationPlayState: animationPlayState
+          }"
+        >
+          <text
+            class="tn-row-notice__content--text"
+            :class="[fontColorClass]"
+            :style="[fontStyle()]"
+            @tap="click"
+          >{{ showText }}</text>
+        </view>
+      </view>
+      
+      <!-- 右图标 -->
+      <view class="tn-row-notice__icon">
+        <view
+          v-if="rightIcon"
+          class="tn-row-notice__icon--right" 
+          :class="[`tn-icon-${rightIconName}`,fontColorClass]"
+          :style="[fontStyle('rightIcon')]"
+          @tap="clickRightIcon"></view>
+        <view
+          v-if="closeBtn"
+          class="tn-row-notice__icon--right" 
+          :class="[`tn-icon-close`,fontColorClass]"
+          :style="[fontStyle('close')]"
+          @tap="close"></view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-row-notice',
+    mixins: [componentsColorMixin],
+    props: {
+      // 显示的内容
+      list: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 是否显示
+      show: {
+        type: Boolean,
+        default: true
+      },
+      // 播放状态
+      // play -> 播放 paused -> 暂停
+      playStatus: {
+        type: String,
+        default: 'play'
+      },
+      // 是否显示左边图标
+      leftIcon: {
+        type: Boolean,
+        default: true
+      },
+      // 左边图标的名称
+      leftIconName: {
+        type: String,
+        default: 'sound'
+      },
+      // 左边图标的大小
+      leftIconSize: {
+        type: Number,
+        default: 34
+      },
+      // 是否显示右边的图标
+      rightIcon: {
+        type: Boolean,
+        default: false
+      },
+      // 右边图标的名称
+      rightIconName: {
+        type: String,
+        default: 'right'
+      },
+      // 右边图标的大小
+      rightIconSize: {
+        type: Number,
+        default: 26
+      },
+      // 是否显示关闭按钮
+      closeBtn: {
+        type: Boolean,
+        default: false
+      },
+      // 圆角
+      radius: {
+        type: Number,
+        default: 0
+      },
+      // 内边距
+      padding: {
+        type: String,
+        default: '18rpx 24rpx'
+      },
+      // 自动播放
+      autoplay: {
+        type: Boolean,
+        default: true
+      },
+      // 水平滚动时的速度，即每秒滚动多少rpx
+      speed: {
+        type: Number,
+        default: 160
+      }
+    },
+    computed: {
+      fontStyle() {
+        return (type) => {
+          let style = {}
+          style.color = this.fontColorStyle ? this.fontColorStyle : ''
+          style.fontSize = this.fontSizeStyle ? this.fontSizeStyle : ''
+          if (type === 'leftIcon' && this.leftIconSize) {
+            style.fontSize = this.leftIconSize + 'rpx'
+          }
+          if (type === 'rightIcon' && this.rightIconSize) {
+            style.fontSize = this.rightIconSize + 'rpx'
+          }
+          if (type === 'close') {
+            style.fontSize = '24rpx'
+          }
+          
+          return style
+        }
+      },
+      noticeStyle() {
+        let style = {}
+        style.backgroundColor = this.backgroundColorStyle ? this.backgroundColorStyle : 'transparent'
+        if (this.padding) style.padding = this.padding
+        return style
+      }
+    },
+    data() {
+      return {
+        // 滚动文字的宽度
+        textWidth: 0,
+        // 存放滚动文字的盒子的宽度
+        textBoxWidth: 0,
+        // 动画执行的时间
+        animationDuration: '10s',
+        // 动画执行状态
+        animationPlayState: 'paused',
+        // 当前显示的文本
+        showText: ''
+      }
+    },
+    watch: {
+      list: {
+        handler(value) {
+          this.showText = value.join('，')
+          this.$nextTick(() => {
+            this.initNotice()
+          })
+        },
+        immediate: true
+      },
+      playStatus(value) {
+        if (value === 'play') this.animationPlayState = 'running'
+        else this.animationPlayState = 'paused'
+      },
+      speed(value) {
+        this.initNotice()
+      }
+    },
+    methods: {
+      // 初始化通知栏
+      initNotice() {
+        let query = [],
+          textBoxWidth = 0,
+          textWidth = 0;
+        let textQuery = new Promise((resolve, reject) => {
+          uni.createSelectorQuery()
+            .in(this)
+            .select(`#tn-row-notice__content`)
+            .boundingClientRect()
+            .exec(ret => {
+              this.textWidth = ret[0].width
+              resolve()
+            })
+        })
+        query.push(textQuery)
+        
+        Promise.all(query).then(() => {
+          // 根据t=s/v(时间=路程/速度)，这里为何不需要加上#tn-row-notice__content-box的宽度，因为设置了.tn-row-notice__content样式中设置了padding-left: 100%
+          this.animationDuration = `${this.textWidth / uni.upx2px(this.speed)}s`
+          // 这里必须这样开始动画，否则在APP上动画速度不会改变(HX版本2.4.6，IOS13)
+          this.animationPlayState = 'paused'
+          setTimeout(() => {
+            if (this.autoplay && this.playStatus === 'play') this.animationPlayState = 'running'
+          }, 10)
+        })
+      },
+      // 点击了通知栏
+      click() {
+        this.$emit('click')
+      },
+      // 点击了关闭按钮
+      close() {
+        this.$emit('close')
+      },
+      // 点击了左边图标
+      clickLeftIcon() {
+        this.$emit('clickLeft')
+      },
+      // 点击了右边图标
+      clickRightIcon() {
+        this.$emit('clickRight')
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-row-notice {
+    width: 100%;
+    overflow: hidden;
+    
+    &__wrap {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+    }
+    
+    &__content {
+      &-box {
+        flex: 1;
+        display: flex;
+        flex-direction: row;
+        overflow: hidden;
+        margin-left: 12rpx;
+      }
+      
+      display: flex;
+      flex-direction: row;
+      flex-wrap: nowrap;
+      text-align: right;
+      // 为了能滚动起来
+      padding-left: 100%;
+      animation: tn-notice-loop-animation 10s linear infinite both;
+      
+      &--text {
+        word-break: keep-all;
+        white-space: nowrap;
+      }
+    }
+    
+    &__icon {
+      &--left {
+        display: inline-flex;
+        align-items: center;
+      }
+      
+      &--right {
+        margin-left: 12rpx;
+        display: inline-flex;
+        align-items: center;
+      }
+    }
+  }
+  
+  @keyframes tn-notice-loop-animation {
+    0% {
+      transform: translateX(0);
+    }
+    100% {
+      transform: translateX(-100%);
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-scroll-list/tn-scroll-list.vue b/tuniao-ui/components/tn-scroll-list/tn-scroll-list.vue
new file mode 100644
index 0000000..1dd86eb
--- /dev/null
+++ b/tuniao-ui/components/tn-scroll-list/tn-scroll-list.vue
@@ -0,0 +1,177 @@
+<template>
+  <view class="tn-scroll-list-class tn-scroll-list">
+    <scroll-view
+      class="tn-scroll-list__scroll-view"
+      scroll-x
+      :upper-threshold="0"
+      :lower-threshold="0"
+      @scroll="scrollHandler"
+      @scrolltoupper="scrollToUpperHandler"
+      @scrolltolower="scrollToLowerHandler"
+    >
+      <view class="tn-scroll-list__scroll-view__content">
+        <slot></slot>
+      </view>
+    </scroll-view>
+    
+    <!-- 指示器-->
+    <view
+      v-if="indicator"
+      class="tn-scroll-list__indicator"
+      :style="[indicatorStyle]"
+    >
+      <view class="tn-scroll-list__indicator__line" :style="[lineStyle]">
+        <view class="tn-scroll-list__indicator__line__bar" :style="[barStyle]"></view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-scroll-list',
+    props: {
+      // 是否显示指示器
+      indicator: {
+        type: Boolean,
+        default: true
+      },
+      // 指示器整体宽度
+      indicatorWidth: {
+        type: [String, Number],
+        default: 50
+      },
+      // 指示器滑块的宽度
+      indicatorBarWidth: {
+        type: [String, Number],
+        default: 20
+      },
+      // 指示器颜色
+      indicatorColor: {
+        type: String,
+        default: '#E6E6E6'
+      },
+      // 指示器激活时颜色
+      indicatorActiveColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 自定义指示器样式
+      indicatorStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      }
+    },
+    computed: {
+      // 指示器滑块样式
+      barStyle() {
+        let style = {}
+        // 获取滑动距离的比值
+        // 滑块当前移动距离与总需滑动距离(指示器的总宽度减去滑块宽度)的比值 = scroll-view的滚动距离与目标滚动距离(scroll-view的实际宽度减去包裹元素的宽度)之比
+        const scrollLeft = this.scrollInfo.scrollLeft,
+          scrollWidth = this.scrollInfo.scrollWidth,
+          barAllMoveWidth = uni.upx2px(this.indicatorWidth) - uni.upx2px(this.indicatorBarWidth);
+        const x = scrollLeft / (scrollWidth - this.scrollWidth) * barAllMoveWidth
+        style.transform = `translateX(${x}px)`
+        // 设置滑块的宽度和背景颜色
+        style.width = `${this.indicatorBarWidth}rpx`
+        style.backgroundColor = this.indicatorActiveColor
+        return style
+      },
+      // 指示器整体样式
+      lineStyle() {
+        let style = {}
+        style.width = `${this.indicatorWidth}rpx`
+        style.backgroundColor = this.indicatorColor
+        return style
+      }
+    },
+    data() {
+      return {
+        // 滑动时滑块信息
+        scrollInfo: {
+          scrollLeft: 0,
+          scrollWidth: 0
+        },
+        // 滑动区域的宽度
+        scrollWidth: 0
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.init()
+      })
+    },
+    methods: {
+      // 初始化
+      init() {
+        this.getComponentWidth()
+      },
+      // 处理滚动事件
+      scrollHandler(event) {
+        this.scrollInfo = event.detail
+      },
+      // 滚动到最左边触发事件
+      scrollToUpperHandler() {
+        this.$emit('left')
+        this.scrollInfo.scrollLeft = 0
+      },
+      // 滚动到最右边触发事件
+      scrollToLowerHandler() {
+        this.$emit('right')
+        // this.scrollInfo.scrollLeft = uni.upx2px(this.indicatorWidth) - uni.upx2px(this.indicatorBarWidth)
+      },
+      // 获取组件的宽度
+      getComponentWidth() {
+        this._tGetRect('.tn-scroll-list').then(res => {
+          if (!res) {
+            setTimeout(() => {
+              this.getComponentWidth()
+            }, 10)
+            return
+          }
+          this.scrollWidth = res.width
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-scroll-list {
+    padding-bottom: 20rpx;
+    
+    &__scroll-view {
+      display: flex;
+      flex-direction: row;
+      
+      &__content {
+        display: flex;
+        flex-direction: row;
+      }
+    }
+    
+    &__indicator {
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      margin-top: 30rpx;
+      
+      &__line {
+        width: 120rpx;
+        height: 8rpx;
+        border-radius: 200rpx;
+        overflow: hidden;
+        
+        &__bar {
+          width: 40rpx;
+          height: 8rpx;
+          border-radius: 200rpx;
+        }
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-scroll-view/tn-scroll-view.vue b/tuniao-ui/components/tn-scroll-view/tn-scroll-view.vue
new file mode 100644
index 0000000..5fef53e
--- /dev/null
+++ b/tuniao-ui/components/tn-scroll-view/tn-scroll-view.vue
@@ -0,0 +1,401 @@
+<template>
+  <view class="tn-scroll-view-class tn-scroll-view">
+    <scroll-view
+      class="scroll-view"
+      :style="[scrollViewStyle]"
+      scroll-y
+      scroll-anchoring
+      enable-back-to-top
+      :throttle="false"
+      :scroll-top="scrollTop"
+      :lower-threshold="lowerThreshold"
+      @scroll="handleScroll"
+      @touchend="handleTouchEnd"
+      @touchmove.prevent.stop="handleTouchMove"
+      @touchstart="handleTouchStart"
+      @scrolltolower="handleScrollTolower"
+    >
+      <view class="scroll__content" :style="[scrollContentStyle]">
+        <view class="scroll__pull-down">
+          <slot name="pulldown">
+            <view class="scroll__refresh" :style="[refreshStyle]">
+              <view><tn-loading :animation="refreshing"></tn-loading></view>
+              <view class="scroll__refresh--text" :style="[refreshTextStyle]">{{ refreshStateText }}</view>
+            </view>
+          </slot>
+        </view>
+        <view :id="elScrollDataId" class="scroll__data">
+          <slot></slot>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+  import componentsColor from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-scroll-view',
+    mixins: [ componentsColor ],
+    props: {
+      // H5顶部导航栏的高度
+      h5NavHeight: {
+        type: Number,
+        default: 45
+      },
+      // 自定义顶部导航栏高度
+      customNavHeight: {
+        type: Number,
+        default: 0
+      },
+      // 可滚动区域顶部偏移高度
+      offsetTop: {
+        type: Number,
+        default: 0
+      },
+      // 可滚动区域底部偏移高度
+      offsetBottom: {
+        type: Number,
+        default: 0
+      },
+      // 容器高度 (不设置则自动计算)
+      height: {
+        type: Number,
+        default: null
+      },
+      // 是否禁用
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 禁用下拉刷新
+      pullDownDisabled: {
+        type: Boolean,
+        default: false
+      },
+      // 下拉速率
+      pullDownSpeed: {
+        type: Number,
+        default: 0.5
+      },
+      // 刷新延迟
+      refreshDelayed: {
+        type: Number,
+        default: 800
+      },
+      // 刷新完成后延迟
+      refreshFinishDelayed: {
+        type: Number,
+        default: 800
+      },
+      // 下拉刷新距离
+      refresherThreshold: {
+        type: Number,
+        default: 70
+      },
+      // 上拉加载距离
+      lowerThreshold: {
+        type: Number,
+        default: 40
+      },
+      // 刷新状态
+      refreshState: {
+        type: Boolean,
+        default: false
+      },
+      // 正在刷新文字
+      refreshingText: {
+        type: String,
+        default: '正在刷新'
+      },
+      // 刷新成功文字
+      refreshSuccessText: {
+        type: String,
+        default: '刷新成功'
+      },
+      // 下拉中的文字
+      pulldownText: {
+        type: String,
+        default: '下拉刷新'
+      },
+      // 下拉完成的文字
+      pulldownFinishText: {
+        type: String,
+        default: '松开刷新'
+      }
+    },
+    data() {
+      return {
+        // 滚动容器内容id
+        elScrollDataId: '',
+        // 系统信息
+        systemInfo: {
+          height: 0,
+          statusBarHeight: 0
+        },
+        // 距离顶部滚动高度
+        scrollTop: 0,
+        // 滚动内容视图顶部位置
+        scrollDataTop: -1,
+        // 滚动内容视图顶部位置偏移
+        scrollDataOffsetTop: -1,
+        // 滚动区域的高度
+        scrollViewHeight: 0,
+        // 当前滚动高度
+        currentScrollTop: 0,
+        // 当前触摸点Y轴开始坐标
+        currentTouchStartY: 0,
+        // 刷新状态文字
+        refreshStateText: '下拉刷新',
+        // 是否刷新中
+        refreshing: false,
+        // 是否刷新完成
+        refreshFinish: false,
+        // 是否正在下拉
+        pulldowning: false,
+        // 下拉高度
+        pullDownHeight: 0,
+        // 是否显示下拉加载
+        showPullDown: false
+      }
+    },
+    computed: {
+      scrollViewStyle() {
+        let style = {}
+        style.height = this.scrollViewHeight + 'px'
+        if (!this.backgroundColorClass) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        return style
+      },
+      scrollContentStyle() {
+        let style = {}
+        style.transform = this.showPullDown ? `translateY(${this.pullDownHeight}px)` : `translateY(0px)`
+        style.transition = this.pulldowning ? `transform 100ms ease-out` : `transform 500ms cubic-bezier(0.19,1.64,0.42,0.72)`
+        return style
+      },
+      refreshStyle() {
+        let style = {}
+        style.opacity = this.showPullDown ? 1 : 0
+        return style
+      },
+      refreshTextStyle() {
+        let style = {}
+        if (!this.fontColorClass) {
+          style.color = this.fontColorStyle
+        }
+        return style
+      },
+      loadTextStyle() {
+        let style = {}
+        if (!this.fontColorClass) {
+          style.color = this.fontColorStyle
+        }
+        return style
+      }
+    },
+    watch: {
+      refreshState(nVal, oVal) {
+        if (!nVal) {
+          if (this.showPullDown) {
+            // 关闭正在下拉
+            this.pulldowning = false
+            // 隐藏下拉刷新
+            this.showPullDown = false
+            // 关闭正在刷新
+            this.refreshing = false
+          }
+        }
+      }
+    },
+    created() {
+      this.elScrollDataId = this.$tn.uuid()
+      this.getSystemInfo()
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.init()
+      })
+    },
+    methods: {
+      // 组件初始化
+      init() {
+        this.refreshStateText = this.pulldownText
+        // 初始化scrollView信息
+        this.updateScrollViewInfo()
+      },
+      // 获取系统信息
+      getSystemInfo() {
+        const systemInfo = uni.getSystemInfoSync()
+        this.systemInfo.height = systemInfo.safeArea.height
+        this.systemInfo.statusBarHeight = systemInfo.statusBarHeight
+      },
+      // 更新scrollView信息
+      updateScrollViewInfo() {
+        if (this.height) {
+          this.scrollViewHeight = this.height
+        } else {
+          // 设置scrollView的高度和组件顶部位置
+          // console.log(this.systemInfo, this.offsetTop, this.customNavHeight);
+          // #ifdef H5
+          this.scrollViewHeight = this.systemInfo.height - (
+            this.offsetTop + 
+            (this.customNavHeight ? this.customNavHeight : this.h5NavHeight) + 
+            this.offsetBottom)
+          this.scrollDataOffsetTop = this.offsetTop + (this.customNavHeight ? this.customNavHeight : this.h5NavHeight)
+          // #endif
+          // #ifndef H5
+          this.scrollViewHeight = this.systemInfo.height - (
+            this.offsetTop + 
+            this.systemInfo.statusBarHeight +
+            this.offsetBottom)
+          this.scrollDataOffsetTop = this.offsetTop + this.systemInfo.statusBarHeight
+          // #endif
+        }
+      },
+      // 获取scrollView内容信息
+      async getScrollDataInfo() {
+        const scrollInfo = await this._tGetRect(`#${this.elScrollDataId}`)
+        this.scrollDataTop = scrollInfo.top
+      },
+      // 上拉触底事件
+      handleScrollTolower(e) {
+        if (this.pullUpDisabled) return
+        this.$emit('scrolltolower', e)
+      },
+      // 滚动事件
+      handleScroll(e) {
+        this.currentScrollTop = e.detail.scrollTop
+        this.$emit('scroll', e.detail)
+      },
+      // 触摸按下事件
+      handleTouchStart(e) {
+        if (this.disabled) return
+        this.currentTouchStartY = e.touches[0].clientY
+        this.getScrollDataInfo()
+        this.$emit('touchStart', e)
+      },
+      // 触摸下滑事件
+      handleTouchMove(e) {
+        if (this.disabled) return
+        if (this.currentScrollTop == 0 && e.touches[0].clientY >= this.currentTouchStartY) {
+          // 容器滑动的偏移
+          const moveOffset = this.scrollDataTop > 0 ?
+            (this.scrollDataOffsetTop - this.scrollDataTop) :
+            (Math.abs(this.scrollDataTop) + this.scrollDataOffsetTop)
+          
+          this.pulldowning = true
+          this.showPullDown = true
+          let pullDownDistance = ((e.touches[0].clientY - this.currentTouchStartY)  - moveOffset) * this.pullDownSpeed
+          this.pullDownHeight = pullDownDistance
+          // this.pullDownHeight = pullDownDistance > this.refresherThreshold ? this.refresherThreshold : pullDownDistance
+          this.refreshStateText = this.pullDownHeight >= this.refresherThreshold ? this.pulldownFinishText : this.pulldownText
+          if (pullDownDistance > this.refresherThreshold) {
+            this.$emit('refreshReady')
+          }
+        }
+        this.$emit('touchMove', e)
+      },
+      // 触摸松开处理
+      handleTouchEnd(e) {
+        if (this.disabled) return
+        // 处理下拉刷新
+        if (this.showPullDown) {
+          // 当下拉高度小于下拉阈值
+          if (this.pullDownHeight < this.refresherThreshold) {
+            // 关闭正在下拉
+            this.pulldowning = false
+            // 重置下拉高度
+            this.pullDownHeight = 0
+            // 隐藏下拉刷新
+            this.showPullDown = false
+            // 触发下拉中断事件
+            this.$emit('refreshStop')
+          } else {
+            this.pullDownHeight = this.pullDownHeight > this.refresherThreshold ? this.refresherThreshold : this.pullDownHeight
+            this.refresh()
+          }
+        }
+        
+        // 触发下拉触摸松开事件
+        this.$emit('touchEnd', e)
+      },
+      
+      // 刷新数据
+      refresh() {
+        // 设置刷新未完成
+        this.refreshFinish = false
+        // 开启正在刷新
+        this.refreshing = true
+        // 设置正在刷新状态文字
+        this.refreshStateText = this.refreshingText
+        // 触发refresh事件
+        setTimeout(() => {
+          this.$emit('refresh')
+        }, this.refreshDelayed)
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-scroll-view {
+    
+    .scroll-view {
+      position: relative;
+      touch-action: none;
+      
+      .scroll__content {
+        display: flex;
+        will-change: transform;
+        flex-direction: column;
+        
+        .scroll {
+          &__pull-down {
+            position: absolute;
+            left: 0;
+            width: 100%;
+            display: flex;
+            padding: 30rpx 0;
+            align-items: center;
+            justify-content: center;
+            transform: translateY(-100%);
+          }
+          
+          &__refresh {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            &--text {
+              margin-left: 10rpx;
+            }
+          }
+          
+          &__data {
+            
+          }
+          
+          &__pull-up {
+            position: absolute;
+            left: 0;
+            bottom: 0;
+            width: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            transform: translateY(100%);
+          }
+          &__load {
+            padding: 20rpx 0;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            &--text {
+              margin-left: 10rpx;
+            }
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-select/tn-select.vue b/tuniao-ui/components/tn-select/tn-select.vue
new file mode 100644
index 0000000..ad298b3
--- /dev/null
+++ b/tuniao-ui/components/tn-select/tn-select.vue
@@ -0,0 +1,428 @@
+<template>
+	<view v-if="value" class="tn-select-class tn-select">
+		<tn-popup v-model="value" mode="bottom" :popup="false" length="auto" :safeAreaInsetBottom="safeAreaInsetBottom"
+			:maskCloseable="maskCloseable" :zIndex="elZIndex" @close="close">
+			<view class="tn-select__content" :style="{paddingBottom:safeAreaInsetBottom?'120rpx':'0'}">
+				<!-- 头部 -->
+				<view class="tn-select__content__header" @touchmove.stop.prevent>
+					<view class="tn-select__content__header__btn tn-select__content__header--cancel"
+						:style="{ color: cancelColor }" hover-class="tn-hover-class" hover-stay-time="150"
+						@tap="getResult('cancel')">{{ cancelText }}</view>
+					<view class="tn-select__content__header__title">{{ title }}</view>
+					<view class="tn-select__content__header__btn tn-select__content__header--confirm"
+						:style="{ color: confirmColor }" hover-class="tn-hover-class" hover-stay-time="150"
+						@tap="getResult('confirm')">{{ confirmText }}</view>
+				</view>
+				<!-- 列表内容 -->
+
+				<view class="tn-select__content__body">
+					<view v-if="searchShow && mode==='single'">
+						<view class="tn-flex tn-select__content__body__search">
+							<view class="tn-icon-search tn-padding-sm"></view>
+							<input class="tn-select__content__body__search__input" :placeholder="searchPlaceholder"
+								maxlength="255" confirm-type="search" @input="searchInput" @confirm="search">
+						</view>
+					</view>
+					<picker-view class="tn-select__content__body__view" :value="defaultSelector" @pickstart="pickStart"
+						@pickend="pickEnd" @change="columnChange">
+
+						<picker-view-column v-for="(item, index) in columnData" :key="index">
+							<view class="tn-select__content__body__item" v-for="(sub_item, sub_index) in item"
+								:key="sub_index">
+								<view class="tn-text-ellipsis">
+									{{ sub_item[labelName] }}
+								</view>
+							</view>
+						</picker-view-column>
+					</picker-view>
+				</view>
+			</view>
+		</tn-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tn-select',
+		props: {
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 列表模式
+			// single 单列 multi 多列 multi-auto 多列联动
+			mode: {
+				type: String,
+				default: 'single'
+			},
+			// 列数据
+			list: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// value属性名
+			valueName: {
+				type: String,
+				default: 'value'
+			},
+			// label属性名
+			labelName: {
+				type: String,
+				default: 'label'
+			},
+			// 当mode=multi-auto时，children的属性名
+			childName: {
+				type: String,
+				default: 'children'
+			},
+			// 默认值
+			defaultValue: {
+				type: Array,
+				default () {
+					return [0]
+				}
+			},
+			// 顶部标题
+			title: {
+				type: String,
+				default: ''
+			},
+			// 取消按钮文字
+			cancelText: {
+				type: String,
+				default: '取消'
+			},
+			// 取消按钮文字颜色
+			cancelColor: {
+				type: String,
+				default: ''
+			},
+			// 确认按钮文字
+			confirmText: {
+				type: String,
+				default: '确认'
+			},
+			// 确认按钮文字颜色
+			confirmColor: {
+				type: String,
+				default: ''
+			},
+			// 点击遮罩关闭
+			maskCloseable: {
+				type: Boolean,
+				default: true
+			},
+			// 预留安全区域
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			// zIndex
+			zIndex: {
+				type: Number,
+				default: 0
+			},
+			// 是否开启模糊搜索(只在单列模式生效)
+			searchShow: {
+				type: Boolean,
+				default: true
+			},
+			//搜索框placeholder
+			searchPlaceholder: {
+				type: String,
+				default: '搜索'
+			}
+		},
+		computed: {
+			elZIndex() {
+				return this.zIndex ? this.zIndex : this.$tn.zIndex.popup
+			}
+		},
+		data() {
+			return {
+				// 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
+				moving: false,
+				// 用户保存当前列的索引，用于判断下一次变化时改变的列
+				defaultSelector: [0],
+				// picker-view数据
+				columnData: [],
+				// 保存用户选择的结果
+				selectValue: [],
+				// 上一次改变时的index
+				lastSelectIndex: [],
+				// 列数
+				columnNum: 0,
+
+			}
+		},
+		watch: {
+			// 在select弹起的时候，重新初始化所有数据
+			value: {
+				handler(val) {
+					if (val) setTimeout(() => this.init(), 10)
+				},
+				immediate: true
+			}
+		},
+		methods: {
+			//搜索输入监听
+			searchInput(e) {
+				console.log(e.detail.value);
+				this.searchResult(e.detail.value)
+			},
+			//搜索完成监听
+			search(e) {
+				console.log(e.detail.value)
+				this.searchResult(e.detail.value)
+			},
+			//执行搜索方法
+			searchResult(value) {
+				let result = [];
+				// console.log(this.list)
+				let data = this.list.filter(item => item[this.labelName].indexOf(value) > -1);
+				if (data.length > 0) {
+					result.push(data);
+				}
+				// console.log(result)
+				this.columnData = result;
+				this.selectValue = []
+				if (this.columnData.length > 0) {
+					this.setSelectValue()
+				}
+			},
+
+			// 标识滑动开始，只有微信小程序才有这样的事件
+			pickStart() {
+				// #ifdef MP-WEIXIN
+				this.moving = true;
+				// #endif
+			},
+			// 标识滑动结束
+			pickEnd() {
+				// #ifdef MP-WEIXIN
+				this.moving = false;
+				// #endif
+			},
+			init() {
+				this.setColumnNum()
+				this.setDefaultSelector()
+				this.setColumnData()
+				this.setSelectValue()
+			},
+			// 获取默认选中列下标
+			setDefaultSelector() {
+				// 如果没有传入默认值，生成用0填充长度为columnNum的数组
+				this.defaultSelector = this.defaultValue.length === this.columnNum ? this.defaultValue : Array(this
+					.columnNum).fill(0)
+				this.lastSelectIndex = this.$tn.deepClone(this.defaultSelector)
+			},
+			// 计算列数
+			setColumnNum() {
+				// 单列的数量为1
+				if (this.mode === 'single') this.columnNum = 1
+				// 多列时取list的长度
+				else if (this.mode === 'multi') this.columnNum = this.list.length
+				// 多列联动时，通过遍历list的第一个元素，得出有多少列
+				else if (this.mode === 'multi-auto') {
+					let num = 1
+					let column = this.list
+					// 如果存在children属性，再次遍历
+					while (column[0][this.childName]) {
+						column = column[0] ? column[0][this.childName] : {},
+							num++
+					}
+					this.columnNum = num
+				}
+			},
+			// 获取需要展示在picker中的列数据
+			setColumnData() {
+				let data = []
+				this.selectValue = []
+				if (this.mode === 'multi-auto') {
+					// 获取所有数据中的第一个元素
+					let column = this.list[this.defaultSelector.length ? this.defaultSelector[0] : 0]
+					// 通过循环所有列数，再根据设定列的数组，得出当前需要渲染的整个列数组
+					for (let i = 0; i < this.columnNum; i++) {
+						// 第一列默认为整个list数组
+						if (i === 0) {
+							data[i] = this.list
+							column = column[this.childName]
+						} else {
+							// 大于第一列时，判断是否有默认选中的，如果没有就用该列的第一项
+							data[i] = column
+							column = column[this.defaultSelector[i]][this.childName]
+						}
+					}
+				} else if (this.mode === 'single') {
+					data[0] = this.list
+				} else {
+					data = this.list
+				}
+				this.columnData = data
+			},
+			// 获取默认选中的值，如果没有设置，则默认选中第一项
+			setSelectValue() {
+				let tmp = null
+				for (let i = 0; i < this.columnNum; i++) {
+					tmp = this.columnData[i][this.defaultSelector[i]]
+					let data = {
+						value: tmp ? tmp[this.valueName] : null,
+						label: tmp ? tmp[this.labelName] : null
+					}
+					// 判断是否存在额外的参数
+					if (tmp && tmp.extra) data.extra = tmp.extra
+					this.selectValue.push(data)
+				}
+				// console.log("默认",this.selectValue)
+			},
+			// 列选项
+			columnChange(event) {
+				let index = null
+				let columnIndex = event.detail.value
+
+				this.selectValue = []
+				if (this.mode === 'multi-auto') {
+					// 对比前后两个数组，判断变更的是那一列
+					this.lastSelectIndex.map((v, idx) => {
+						if (v != columnIndex[idx]) index = idx
+					})
+					this.defaultSelector = columnIndex
+					// 当前变化列的下一列的数据，需要获取上一列的数据，同时需要指定是上一列的第几个的children，再往后的
+					// 默认是队列的第一个为默认选项
+					for (let i = index + 1; i < this.columnNum; i++) {
+						this.columnData[i] = this.columnData[i - 1][i - 1 == index ? columnIndex[index] : 0][this
+							.childName
+						]
+						this.defaultSelector[i] = 0
+					}
+					// 在历遍的过程中，可能由于上一步修改this.columnData，导致产生连锁反应，程序触发columnChange，会有多次调用
+					// 只有在最后一次数据稳定后的结果是正确的，此前的历遍中，可能会产生undefined，故需要判断
+					columnIndex.map((item, index) => {
+						let data = this.columnData[index][columnIndex[index]]
+						let tmp = {
+							value: data ? data[this.valueName] : null,
+							label: data ? data[this.labelName] : null
+						}
+						if (data && data.extra !== undefined) tmp.extra = data.extra
+						this.selectValue.push(tmp)
+					})
+					this.lastSelectIndex = columnIndex
+				} else if (this.mode === 'single') {
+					let data = this.columnData[0][columnIndex[0]]
+					let tmp = {
+						value: data ? data[this.valueName] : null,
+						label: data ? data[this.labelName] : null
+					}
+					if (data && data.extra !== undefined) tmp.extra = data.extra
+					this.selectValue.push(tmp)
+				} else if (this.mode === 'multi') {
+					columnIndex.map((item, index) => {
+						let data = this.columnData[index][columnIndex[index]]
+						let tmp = {
+							value: data ? data[this.valueName] : null,
+							label: data ? data[this.labelName] : null
+						}
+						if (data && data.extra !== undefined) tmp.extra = data.extra
+						this.selectValue.push(tmp)
+					})
+				}
+			},
+			close() {
+				this.$emit('input', false)
+			},
+			getResult(event = null) {
+				// #ifdef MP-WEIXIN
+				if (this.moving) return;
+				// #endif
+				if (event) this.$emit(event, this.selectValue)
+				this.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tn-select {
+
+		&__content {
+			position: relative;
+
+			&__header {
+				position: relative;
+				display: flex;
+				flex-direction: row;
+				width: 100%;
+				height: 90rpx;
+				padding: 0 40rpx;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				font-size: 30rpx;
+				background-color: #FFFFFF;
+
+				&__btn {
+					padding: 16rpx;
+					box-sizing: border-box;
+					text-align: center;
+					text-decoration: none;
+				}
+
+				&__title {
+					color: $tn-font-color;
+				}
+
+				&--cancel {
+					color: $tn-font-sub-color;
+				}
+
+				&--confirm {
+					// color: $tn-main-color;
+					background-color: #07C160;
+					color: #FFFFFF;
+					padding: 10rpx 25rpx;
+					border-radius: 10rpx;
+				}
+			}
+
+			&__body {
+				width: 100%;
+				height: 500rpx;
+				overflow: hidden;
+				background-color: #FFFFFF;
+
+				&__search {
+					z-index: 5;
+					align-items: center;
+					border-radius: 19px;
+					background: #f8f8f8;
+					width: calc(100% - 60rpx);
+					margin: 0 auto;
+					position: relative;
+					top: 15px;
+
+					&__input {
+						width: 600rpx;
+					}
+				}
+
+				&__view {
+					height: 100%;
+					box-sizing: border-box;
+				}
+
+				&__item {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: center;
+					font-size: 32rpx;
+					color: $tn-font-color;
+					padding: 0 8rpx;
+				}
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-sign-board/tn-sign-board.vue b/tuniao-ui/components/tn-sign-board/tn-sign-board.vue
new file mode 100644
index 0000000..1b3929c
--- /dev/null
+++ b/tuniao-ui/components/tn-sign-board/tn-sign-board.vue
@@ -0,0 +1,690 @@
+<template>
+  <view v-if="show" class="tn-sign-board-class tn-sign-board" :style="{top: `${customBarHeight}px`, height: `calc(100% - ${customBarHeight}px)`}">
+    <!-- 签名canvas -->
+    <view class="tn-sign-board__content">
+      <view class="tn-sign-board__content__wrapper">
+        <canvas class="tn-sign-board__content__canvas" :canvas-id="canvasName" :disableScroll="true" @touchstart="onTouchStart" @touchmove="onTouchMove" @touchend="onTouchEnd"></canvas>
+      </view>
+    </view>
+    
+    <!-- 底部工具栏 -->
+    <view class="tn-sign-board__tools">
+      <!-- 可选颜色 -->
+      <view class="tn-sign-board__tools__color">
+        <view
+          v-for="(item, index) in signSelectColor"
+          :key="index"
+          class="tn-sign-board__tools__color__item"
+          :class="[{'tn-sign-board__tools__color__item--active': currentSelectColor === item}]"
+          :style="{backgroundColor: item}"
+          @tap="colorSwitch(item)"
+        ></view>
+      </view>
+      
+      <!-- 按钮 -->
+      <view class="tn-sign-board__tools__button">
+        <view class="tn-sign-board__tools__button__item tn-bg-red" @tap="reDraw">清除</view>
+        <view class="tn-sign-board__tools__button__item tn-bg-blue" @tap="save">保存</view>
+        <view class="tn-sign-board__tools__button__item tn-bg-indigo" @tap="previewImage">预览</view>
+        <view class="tn-sign-board__tools__button__item tn-bg-orange" @tap="closeBoard">关闭</view>
+      </view>
+    </view>
+    
+    <!-- 伪全屏生成旋转图片canvas容器，不在页面上展示 -->
+    <view style="position: fixed; left: -2000px;width: 0;height: 0;overflow: hidden;">
+      <canvas canvas-id="temp-tn-sign-canvas" :style="{width: `${canvasHeight}px`, height: `${canvasHeight}px`}"></canvas>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-sign-board',
+    props: {
+      // 是否显示
+      show: {
+        type: Boolean,
+        default: false
+      },
+      // 可选签名颜色
+      signSelectColor: {
+        type: Array,
+        default() {
+          return ['#080808', '#E83A30']
+        }
+      },
+      // 是否旋转输出图片
+      rotate: {
+        type: Boolean,
+        default: true
+      },
+      // 自定义顶栏的高度
+      customBarHeight: {
+        type: [String, Number],
+        default: 0
+      }
+    },
+    data() {
+      return {
+        canvasName: 'tn-sign-canvas',
+        ctx: null,
+        canvasWidth: 0,
+        canvasHeight: 0,
+        currentSelectColor: this.signSelectColor[0],
+        // 第一次触摸
+        firstTouch: false,
+        // 透明度
+        transparent: 1,
+        // 笔迹倍数
+        lineSize: 1.5,
+        // 最小画笔半径
+        minLine: 0.5,
+        // 最大画笔半径
+        maxLine: 4,
+        // 画笔压力
+        pressure: 1,
+        // 顺滑度，用60的距离来计算速度
+        smoothness: 60,
+        // 当前触摸的点
+        currentPoint: {},
+        // 当前线条
+        currentLine: [],
+        // 画笔圆半径
+        radius: 1,
+        // 裁剪区域
+        cutArea: {
+          top: 0,
+          right: 0,
+          bottom: 0,
+          left: 0
+        },
+        // 所有线条， 生成贝塞尔点
+        // bethelPoint: [],
+        // 上一个点
+        lastPoint: 0,
+        // 笔迹
+        chirography: [],
+        // 当前笔迹
+        // currentChirography: {},
+        // 画线轨迹，生成线条的实际点
+        linePrack: []
+      }
+    },
+    watch: {
+      show(value) {
+        if (value && this.canvasWidth === 0 && this.canvasHeight === 0) {
+          this.$nextTick(() => {
+            this.getCanvasInfo()
+          })
+        }
+      },
+      signSelectColor(value) {
+        if (value.length > 0) {
+          this.currentSelectColor = value[0]
+        }
+      }
+    },
+    created() {
+      // 创建canvas
+      this.ctx = uni.createCanvasContext(this.canvasName, this)
+    },
+    mounted() {
+      // 获取画板的相关信息
+      // this.$nextTick(() => {
+      //   this.getCanvasInfo()
+      // })
+    },
+    methods: {
+      // 获取画板的相关信息
+      getCanvasInfo() {
+        this._tGetRect('.tn-sign-board__content__canvas').then(res => {
+         this.canvasWidth = res.width
+         this.canvasHeight = res.height
+         
+         // 初始化Canvas
+         this.$nextTick(() => {
+           this.initCanvas('#FFFFFF')
+         })
+        })
+      },
+      // 初始化Canvas
+      initCanvas(color) {
+        /* 将canvas背景设置为 白底，不设置  导出的canvas的背景为透明 */
+        // rect() 参数说明  矩形路径左上角的横坐标，左上角的纵坐标, 矩形路径的宽度, 矩形路径的高度
+        // 矩形的宽高需要减去边框的宽度
+        this.ctx.rect(0, 0, this.canvasWidth - uni.upx2px(4), this.canvasHeight - uni.upx2px(4))
+        this.ctx.setFillStyle(color)
+        this.ctx.fill()
+        this.ctx.draw()
+      },
+      // 开始画
+      onTouchStart(e) {
+        if (e.type != 'touchstart') return false
+        
+        // 设置线条颜色
+        this.ctx.setFillStyle(this.currentSelectColor)
+        // 设置透明度
+        this.ctx.setGlobalAlpha(this.transparent)
+        let currentPoint = {
+          x: e.touches[0].x,
+          y: e.touches[0].y
+        }
+        let currentLine = this.currentLine
+        currentLine.unshift({
+          time: new Date().getTime(),
+          dis: 0,
+          x: currentPoint.x,
+          y: currentPoint.y
+        })
+        this.currentPoint = currentPoint
+        
+        if (this.firstTouch) {
+          this.cutArea = {
+            top: currentPoint.y,
+            right: currentPoint.x,
+            bottom: currentPoint.y,
+            left: currentPoint.x
+          }
+          this.firstTouch = false
+        }
+        
+        this.pointToLine(currentLine)
+      },
+      // 正在画
+      onTouchMove(e) {
+        if (e.type != 'touchmove') return false
+        if (e.cancelable) {
+          // 判断默认行为是否已经被禁用
+          if (!e.defaultPrevented) {
+            e.preventDefault()
+          }
+        }
+        let point = {
+          x: e.touches[0].x,
+          y: e.touches[0].y
+        }
+        
+        if (point.y < this.cutArea.top) {
+          this.cutArea.top = point.y
+        }
+        if (point.y < 0) this.cutArea.top = 0
+        
+        if (point.x < this.cutArea.right) {
+          this.cutArea.right = point.x
+        }
+        if (this.canvasWidth - point.x <= 0) {
+          this.cutArea.right = this.canvasWidth
+        }
+        if (point.y > this.cutArea.bottom) {
+          this.cutArea.bottom = this.canvasHeight
+        }
+        if (this.canvasHeight - point.y <= 0) {
+          this.cutArea.bottom = this.canvasHeight
+        }
+        if (point.x < this.cutArea.left) {
+          this.cutArea.left = point.x
+        }
+        if (point.x < 0) this.cutArea.left = 0
+        
+        this.lastPoint = this.currentPoint
+        this.currentPoint = point
+        
+        let currentLine = this.currentLine
+        currentLine.unshift({
+          time: new Date().getTime(),
+          dis: this.distance(this.currentPoint, this.lastPoint),
+          x: point.x,
+          y: point.y
+        })
+        
+        this.pointToLine(currentLine)
+      },
+      // 移动结束
+      onTouchEnd(e) {
+        if (e.type != 'touchend') return false
+        let point = {
+          x: e.changedTouches[0].x,
+          y: e.changedTouches[0].y
+        }
+        this.lastPoint = this.currentPoint
+        this.currentPoint = point
+        
+        let currentLine = this.currentLine
+        currentLine.unshift({
+          time: new Date().getTime(),
+          dis: this.distance(this.currentPoint, this.lastPoint),
+          x: point.x,
+          y: point.y
+        })
+        
+        //一笔结束，保存笔迹的坐标点，清空，当前笔迹
+        //增加判断是否在手写区域
+        this.pointToLine(currentLine)
+        let currentChirography = {
+          lineSize: this.lineSize,
+          lineColor: this.currentSelectColor
+        }
+        
+        let chirography = this.chirography
+        chirography.unshift(currentChirography)
+        this.chirography = chirography
+        
+        let linePrack = this.linePrack
+        linePrack.unshift(this.currentLine)
+        this.linePrack = linePrack
+        this.currentLine = []
+      },
+      // 重置绘画板
+      reDraw() {
+        this.initCanvas('#FFFFFF')
+      },
+      // 保存
+      save() {
+        // 在组件内使用需要第二个参数this
+        uni.canvasToTempFilePath({
+          canvasId: this.canvasName,
+          fileType: 'png',
+          quality: 1,
+          success: (res) => {
+            if (this.rotate) {
+              this.getRotateImage(res.tempFilePath).then((res) => {
+                this.$emit('save', res)
+              }).catch(err => {
+                this.$tn.message.toast('旋转图片失败')
+              })
+            } else {
+              this.$emit('save', res.tempFilePath)
+            }
+          },
+          fail: () => {
+            this.$tn.message.toast('保存失败')
+          }
+        }, this)
+      },
+      // 预览图片
+      previewImage() {
+        // 在组件内使用需要第二个参数this
+        uni.canvasToTempFilePath({
+          canvasId: this.canvasName,
+          fileType: 'png',
+          quality: 1,
+          success: (res) => {
+            if (this.rotate) {
+              this.getRotateImage(res.tempFilePath).then((res) => {
+                uni.previewImage({
+                  urls: [res]
+                })
+              }).catch(err => {
+                this.$tn.message.toast('旋转图片失败')
+              })
+            } else {
+              uni.previewImage({
+                urls: [res.tempFilePath]
+              })
+            }
+          },
+          fail: (e) => {
+            this.$tn.message.toast('预览失败')
+          }
+        }, this)
+      },
+      // 关闭签名板
+      closeBoard() {
+        this.$tn.message.modal('提示信息','关闭后内容将被清除，是否确认关闭',() => {
+          this.$emit('closed')
+        }, true)
+      },
+      // 切换画笔颜色
+      colorSwitch(color) {
+        this.currentSelectColor = color
+      },
+      // 绘制两点之间的线条
+      pointToLine(line) {
+        this.calcBethelLine(line)
+      },
+      // 计算插值，让线条更加圆滑
+      calcBethelLine(line) {
+        if (line.length <= 1) {
+          line[0].r = this.radius
+          return
+        }
+        let x0,
+          x1,
+          x2,
+          y0,
+          y1,
+          y2,
+          r0,
+          r1,
+          r2,
+          len,
+          lastRadius,
+          dis = 0,
+          time = 0,
+          curveValue = 0.5;
+        if (line.length <= 2) {
+          x0 = line[1].x
+          y0 = line[1].y
+          x2 = line[1].x + (line[0].x - line[1].x) * curveValue
+          y2 = line[1].y + (line[0].y - line[1].y) * curveValue
+          x1 = x0 + (x2 - x0) * curveValue
+          y1 = y0 + (y2 - y0) * curveValue
+        } else {
+          x0 = line[2].x + (line[1].x - line[2].x) * curveValue
+          y0 = line[2].y + (line[1].y - line[2].y) * curveValue
+          x1 = line[1].x
+          y1 = line[1].y
+          x2 = x1 + (line[0].x - x1) * curveValue
+          y2 = y1 + (line[0].y - y1) * curveValue
+        }
+        // 三个点分别是(x0,y0),(x1,y1),(x2,y2) ；(x1,y1)这个是控制点，控制点不会落在曲线上；实际上，这个点还会手写获取的实际点，却落在曲线上
+        len = this.distance({
+          x: x2,
+          y: y2
+        }, {
+          x: x0,
+          y: y0
+        })
+        lastRadius = this.radius
+        for (let i = 0; i < line.length - 1; i++) {
+          dis += line[i].dis
+          time += line[i].time - line[i + 1].time
+          if (dis > this.smoothness) break
+        }
+        
+        this.radius = Math.min((time / len) * this.pressure + this.minLine, this.maxLine) * this.lineSize
+        line[0].r = this.radius
+        // 计算笔迹半径
+        if (line.length <= 2) {
+          r0 = (lastRadius + this.radius) / 2
+          r1 = r0
+          r2 = r1
+        } else {
+          r0 = (line[2].r + line[1].r) / 2
+          r1 = line[1].r
+          r2 = (line[1].r + line[0].r) / 2
+        }
+        let n = 5
+        let point = []
+        for (let i = 0; i < n; i++) {
+          let t = i / (n - 1)
+          let x = (1 - t) * (1 - t) * x0 + 2 * t * (1 - t) * x1 + t * t * x2
+          let y = (1 - t) * (1 - t) * y0 + 2 * t * (1 - t) * y1 + t * t * y2
+          let r = lastRadius + ((this.radius - lastRadius) / n) * i
+          point.push({
+            x,
+            y,
+            r
+          })
+          if (point.length === 3) {
+            let a = this.ctaCalc(point[0].x, point[0].y, point[0].r, point[1].x, point[1].y, point[1].r, point[2].x, point[2].y, point[2].r)
+            a[0].color = this.currentSelectColor
+            
+            this.drawBethel(a, true)
+            point = [{
+              x,
+              y,
+              r
+            }]
+          }
+        }
+        this.currentLine = line
+      },
+      // 求两点之间的距离
+      distance(a, b) {
+        let x = b.x - a.x
+        let y = b.y - a.y
+        return Math.sqrt(x * x + y * y)
+      },
+      // 计算点信息
+      ctaCalc(x0, y0, r0, x1, y1, r1, x2, y2, r2) {
+        let a = [],
+          vx01,
+          vy01,
+          norm,
+          n_x0,
+          n_y0,
+          vx21,
+          vy21,
+          n_x2,
+          n_y2;
+        vx01 = x1 - x0
+        vy01 = y1 - y0
+        norm = Math.sqrt(vx01 * vx01 + vy01 * vy01 + 0.0001) * 2
+        vx01 = (vx01 / norm) * r0
+        vy01 = (vy01 / norm) * r0
+        n_x0 = vy01
+        n_y0 = -vx01
+        vx21 = x1 - x2
+        vy21 = y1 - y2
+        norm = Math.sqrt(vx21 * vx21 + vy21 * vy21 + 0.0001) * 2
+        vx21 = (vx21 / norm) * r2
+        vy21 = (vy21 / norm) * r2
+        n_x2 = -vy21
+        n_y2 = vx21
+        a.push({
+          mx: x0 + n_x0,
+          my: y0 + n_y0,
+          color: '#080808'
+        })
+        a.push({
+          c1x: x1 + n_x0,
+          c1y: y1 + n_y0,
+          c2x: x1 + n_x2,
+          c2y: y1 + n_y2,
+          ex: x2 + n_x2,
+          ey: y2 + n_y2
+        })
+        a.push({
+          c1x: x2 + n_x2 - vx21,
+          c1y: y2 + n_y2 - vy21,
+          c2x: x2 - n_x2 - vx21,
+          c2y: y2 - n_y2 - vy21,
+          ex: x2 - n_x2,
+          ey: y2 - n_y2
+        })
+        a.push({
+          c1x: x1 - n_x2,
+          c1y: y1 - n_y2,
+          c2x: x1 - n_x0,
+          c2y: y1 - n_y0,
+          ex: x0 - n_x0,
+          ey: y0 - n_y0
+        })
+        a.push({
+          c1x: x0 - n_x0 - vx01,
+          c1y: y0 - n_y0 - vy01,
+          c2x: x0 + n_x0 - vx01,
+          c2y: y0 + n_y0 - vy01,
+          ex: x0 + n_x0,
+          ey: y0 + n_y0
+        })
+        a[0].mx = a[0].mx.toFixed(1)
+        a[0].mx = parseFloat(a[0].mx)
+        a[0].my = a[0].my.toFixed(1)
+        a[0].my = parseFloat(a[0].my)
+        for (let i = 1; i < a.length; i++) {
+          a[i].c1x = a[i].c1x.toFixed(1)
+          a[i].c1x = parseFloat(a[i].c1x)
+          a[i].c1y = a[i].c1y.toFixed(1)
+          a[i].c1y = parseFloat(a[i].c1y)
+          a[i].c2x = a[i].c2x.toFixed(1)
+          a[i].c2x = parseFloat(a[i].c2x)
+          a[i].c2y = a[i].c2y.toFixed(1)
+          a[i].c2y = parseFloat(a[i].c2y)
+          a[i].ex = a[i].ex.toFixed(1)
+          a[i].ex = parseFloat(a[i].ex)
+          a[i].ey = a[i].ey.toFixed(1)
+          a[i].ey = parseFloat(a[i].ey)
+        }
+        return a
+      },
+      // 绘制贝塞尔曲线
+      drawBethel(point, is_fill, color) {
+        this.ctx.beginPath()
+        this.ctx.moveTo(point[0].mx, point[0].my)
+        if (color != undefined) {
+          this.ctx.setFillStyle(color)
+          this.ctx.setStrokeStyle(color)
+        } else {
+          this.ctx.setFillStyle(point[0].color)
+          this.ctx.setStrokeStyle(point[0].color)
+        }
+        for (let i = 1; i < point.length; i++) {
+          this.ctx.bezierCurveTo(point[i].c1x, point[i].c1y, point[i].c2x, point[i].c2y, point[i].ex, point[i].ey)
+        }
+        this.ctx.stroke()
+        if (is_fill != undefined) {
+          //填充图形 ( 后绘制的图形会覆盖前面的图形, 绘制时注意先后顺序 )
+          this.ctx.fill()
+        }
+        this.ctx.draw(true)
+      },
+      // 旋转图片
+      async getRotateImage(dataUrl) {
+        // const url = await this.base64ToPath(dataUrl)
+        const url = dataUrl
+        
+        // 创建新画布
+        const tempCtx = uni.createCanvasContext('temp-tn-sign-canvas', this)
+        const width = this.canvasWidth
+        const height = this.canvasHeight
+        tempCtx.restore()
+        tempCtx.save()
+        tempCtx.translate(0, height)
+        tempCtx.rotate(270 * Math.PI / 180)
+        tempCtx.drawImage(url, 0, 0, width, height)
+        tempCtx.draw()
+        return new Promise((resolve, reject) => {
+          setTimeout(() => {
+            uni.canvasToTempFilePath({
+              canvasId: 'temp-tn-sign-canvas',
+              fileType: 'png',
+              x: 0,
+              y: height - width,
+              width: height,
+              height: width,
+              success: res => resolve(res.tempFilePath),
+              fail: reject
+            }, this)
+          }, 50)
+        })
+      },
+      // 将base64转换为本地
+      base64ToPath(dataUrl) {
+        return new Promise((resolve, reject) => {
+          // 判断地址是否包含bas64字样，不包含直接返回
+          if (dataUrl.indexOf('base64') !== -1) {
+            const data = uni.base64ToArrayBuffer(dataUrl.replace(/^data:image\/\w+;base64,/, ''))
+            // #ifdef MP-WEIXIN
+            const filePath = `${wx.env.USER_DATA_PATH}/${new Date().getTime()}-${Math.random().toString(32).slice(2)}.png`
+            // #endif
+            // #ifndef MP-WEIXIN
+            const filePath = `${new Date().getTime()}-${Math.random().toString(32).slice(2)}.png`
+            // #endif
+            uni.getFileSystemManager().writeFile({
+              filePath,
+              data,
+              encoding: 'base64',
+              success: () => resolve(filePath),
+              fail: reject
+            })
+          } else {
+            resolve(dataUrl)
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-sign-board {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    height: 100%;
+    background-color: #E6E6E6;
+    z-index: 997;
+    display: flex;
+    flex-direction: row-reverse;
+    
+    &__content {
+      width: 84%;
+      height: 100%;
+      
+      &__wrapper {
+        width: calc(100% - 60rpx);
+        height: calc(100% - 60rpx);
+        margin: 30rpx;
+        border-radius: 20rpx;
+        border: 2rpx dotted #AAAAAA;
+        overflow: hidden;
+      }
+      
+      &__canvas {
+        width: 100%;
+        height: 100%;
+        background-color: #FFFFFF;
+      }
+    }
+    
+    &__tools {
+      width: 16%;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: space-between;
+      
+      &__color {
+        margin-top: 30rpx;
+        
+        &__item {
+          width: 70rpx;
+          height: 70rpx;
+          border-radius: 100rpx;
+          margin: 20rpx auto;
+          
+          &--active {
+            position: relative;
+            
+            &::after {
+              content: '';
+              position: absolute;
+              top: 50%;
+              left: 50%;
+              width: 40%;
+              height: 40%;
+              border-radius: 100rpx;
+              background-color: #FFFFFF;
+              transform: translate(-50%, -50%);
+            }
+          }
+        }
+      }
+      
+      &__button {
+        margin-bottom: 30rpx;
+        display: flex;
+        flex-direction: column;
+        
+        &__item {
+          width: 130rpx;
+          height: 60rpx;
+          line-height: 60rpx;
+          text-align: center;
+          margin: 60rpx auto;
+          border-radius: 10rpx;
+          color: #FFFFFF;
+          transform-origin: center center;
+          transform: rotateZ(90deg);
+        }
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-skeleton/tn-skeleton.vue b/tuniao-ui/components/tn-skeleton/tn-skeleton.vue
new file mode 100644
index 0000000..cb3fc7b
--- /dev/null
+++ b/tuniao-ui/components/tn-skeleton/tn-skeleton.vue
@@ -0,0 +1,254 @@
+<template>
+  <view
+    v-if="show"
+    class="tn-skeleton-class tn-skeleton"
+    :class="[backgroundColorClass]"
+    :style="[skeletonStyle]"
+    @touchmove.stop.prevent
+  >
+    <view
+      v-for="(item, index) in rectNodes"
+      :key="$tn.uuid()"
+      class="tn-skeleton__item tn-skeleton__item--rect"
+      :class="[elBackgroundColorClass, {'tn-skeleton__item--fade': animation}]"
+      :style="[itemStyle('rect', item)]"
+    ></view>
+    <view
+      v-for="(item, index) in circleNodes"
+      :key="$tn.uuid()"
+      class="tn-skeleton__item tn-skeleton__item--circle"
+      :class="[elBackgroundColorClass, {'tn-skeleton__item--fade': animation}]"
+      :style="[itemStyle('circle', item)]"
+    ></view>
+    <view
+      v-for="(item, index) in filletNodes"
+      :key="$tn.uuid()"
+      class="tn-skeleton__item tn-skeleton__item--fillet"
+      :class="[elBackgroundColorClass, {'tn-skeleton__item--fade': animation}]"
+      :style="[itemStyle('fillet', item)]"
+    ></view>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-skeleton',
+    mixins: [ componentsColorMixin ],
+    props: {
+      // 显示骨架屏
+      show: {
+        type: Boolean,
+        default: false
+      },
+      // 需要渲染的元素背景颜色
+      elBackgroundColor: {
+        type: String,
+        default: ''
+      },
+      // 开启加载动画
+      animation: {
+        type: Boolean,
+        default: true
+      },
+      // 矩形元素自定义样式
+      rectCustomStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 圆形元素自定义样式
+      circleCustomStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 圆角元素自定义样式
+      filletCustomStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      }
+    },
+    computed: {
+      elBackgroundColorStyle() {
+        return this.$tn.color.getBackgroundColorStyle(this.elBackgroundColor)
+      },
+      elBackgroundColorClass() {
+        return this.$tn.color.getBackgroundColorInternalClass(this.elBackgroundColor)
+      },
+      // 骨架屏样式
+      skeletonStyle() {
+        let style = {}
+        style.width = this.skeletonWidth + 'px'
+        style.height = this.skeletonHeight + 'px'
+        if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        style.left = this.left + 'px'
+        style.top = this.top + 'px'
+        return style
+      },
+      // 元素样式
+      itemStyle() {
+        return (type, item) => {
+          let style = {}
+          style.width = item.width + 'px'
+          style.height = item.height + 'px'
+          if (this.elBackgroundColorStyle) {
+            style.backgroundColor = this.elBackgroundColorStyle
+          }
+          style.left = (item.left - this.left) + 'px'
+          style.top = (item.top - this.top) + 'px'
+          if (type === 'rect') {
+            Object.assign(style, this.rectCustomStyle)
+          } else if (type === 'circle') {
+            style.borderRadius = (item.width / 2) + 'px'
+            Object.assign(style, this.circleCustomStyle)
+          } else if (type === 'fillet') {
+            Object.assign(style, this.filletCustomStyle)
+          }
+          return style
+        }
+      }
+    },
+    data() {
+      return {
+        // 骨架屏宽度
+        skeletonWidth: 750,
+        // 骨架屏高度
+        skeletonHeight: 1500,
+        // 圆角元素
+        filletNodes: [],
+        // 圆形元素
+        circleNodes: [],
+        // 矩形元素
+        rectNodes: [],
+        // 元素偏移位置
+        top: 0,
+        left: 0
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        // 获取系统信息
+        const systemInfo = uni.getSystemInfoSync()
+        this.skeletonWidth = systemInfo.safeArea.width
+        this.skeletonHeight = systemInfo.safeArea.height
+        this.selectQueryInfo()
+      })
+    },
+    methods: {
+      // 查询节点信息
+      selectQueryInfo() {
+        // 获取整个父容器的宽高作为骨架屏的宽高
+        // 在微信小程序中，如果把骨架屏放入组件使用，需要in(this)上下文为父组件才有效
+        let query = null
+        // 在微信小程序中，如果把骨架屏放入组件使用，需要in(this)上下文为父组件才有效
+        // #ifdef MP-WEIXIN
+        query = uni.createSelectorQuery().in(this.$parent)
+        // #endif
+        // #ifndef MP-WEIXIN
+        query = uni.createSelectorQuery()
+        // #endif
+        query.selectAll('.tn-skeleton').boundingClientRect().exec((res) => {
+          console.log(res);
+          this.skeletonWidth = res[0][0].width
+          this.skeletonHeight = res[0][0].height
+          this.top = res[0][0].bottom - res[0][0].height
+          this.left = res[0][0].left
+        })
+        
+        // 获取元素列表
+        this.getRectElements()
+        this.getCircleElements()
+        this.getFillteElements()
+      },
+      // 矩形元素列表
+      getRectElements() {
+        let query = null
+        // 在微信小程序中，如果把骨架屏放入组件使用，需要in(this)上下文为父组件才有效
+        // #ifdef MP-WEIXIN
+        query = uni.createSelectorQuery().in(this.$parent)
+        // #endif
+        // #ifndef MP-WEIXIN
+        query = uni.createSelectorQuery()
+        // #endif
+        query.selectAll('.tn-skeleton-rect').boundingClientRect().exec((res) => {
+          this.rectNodes = res[0]
+        })
+      },
+      // 圆形元素列表
+      getCircleElements() {
+        let query = null
+        // 在微信小程序中，如果把骨架屏放入组件使用，需要in(this)上下文为父组件才有效
+        // #ifdef MP-WEIXIN
+        query = uni.createSelectorQuery().in(this.$parent)
+        // #endif
+        // #ifndef MP-WEIXIN
+        query = uni.createSelectorQuery()
+        // #endif
+        query.selectAll('.tn-skeleton-circle').boundingClientRect().exec((res) => {
+          this.circleNodes = res[0]
+        })
+      },
+      // 圆角元素列表
+      getFillteElements() {
+        let query = null
+        // 在微信小程序中，如果把骨架屏放入组件使用，需要in(this)上下文为父组件才有效
+        // #ifdef MP-WEIXIN
+        query = uni.createSelectorQuery().in(this.$parent)
+        // #endif
+        // #ifndef MP-WEIXIN
+        query = uni.createSelectorQuery()
+        // #endif
+        query.selectAll('.tn-skeleton-fillet').boundingClientRect().exec((res) => {
+          this.filletNodes = res[0]
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-skeleton {
+    position: absolute;
+    z-index: 9998;
+    overflow: hidden;
+    background-color: #FFFFFF;
+    
+    &__item {
+      position: absolute;
+      background-color: #F0F0F0;
+      
+      &--fillet {
+        border-radius: 10rpx;
+      }
+      
+      &--fade {
+        width: 100%;
+        height: 100%;
+        background-color: #E6E6E6;
+        animation-duration: 1.5s;
+        animation-name: blink;
+        animation-timing-function: ease-in-out;
+        animation-iteration-count: infinite;
+      }
+    }
+  }
+  
+  @keyframes blink {
+    0% {
+      opacity: 1;
+    }
+    50% {
+      opacity: 0.4;
+    }
+    100% {
+      opacity: 1;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-slider/tn-slider.vue b/tuniao-ui/components/tn-slider/tn-slider.vue
new file mode 100644
index 0000000..d29d848
--- /dev/null
+++ b/tuniao-ui/components/tn-slider/tn-slider.vue
@@ -0,0 +1,255 @@
+<template>
+  <view
+    class="tn-slider-class tn-slider"
+    :class="{'tn-slider--disabled': disabled}"
+    :style="{
+      backgroundColor: inactiveColor
+    }"
+    @tap="click"
+  >
+    <!-- slider滑动线 -->
+    <view
+      class="tn-slider__gap"
+      :style="[
+        barStyle,
+        {
+          height: this.$tn.string.getLengthUnitValue(lineHeight),
+          backgroundColor: activeColor
+        }
+      ]"
+    >
+      <!-- slider滑块 -->
+      <view
+        class="tn-slider__button-wrap"
+        @touchstart="touchStart"
+        @touchmove="touchMove"
+        @touchend="touchEnd"
+        @touchcancel="touchEnd"
+      >
+        <view v-if="$slots.default || $slots.$default">
+          <slot></slot>
+        </view>
+        <view
+          v-else
+          class="tn-slider__button"
+          :style="[blockStyle, {
+            height: this.$tn.string.getLengthUnitValue(blockWidth),
+            width: this.$tn.string.getLengthUnitValue(blockWidth),
+            backgroundColor: blockColor
+          }]"
+        ></view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-slider',
+    props: {
+      // 进度值
+      value: {
+        type: [Number, String],
+        default: 0
+      },
+      // 最小值
+      min: {
+        type: Number,
+        default: 0
+      },
+      // 最大值
+      max: {
+        type: Number,
+        default: 100
+      },
+      // 步进值
+      step: {
+        type: Number,
+        default: 1
+      },
+      // 禁用
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 滑块宽度
+      blockWidth: {
+        type: Number,
+        default: 30
+      },
+      // 滑动条高度
+      lineHeight: {
+        type: Number,
+        default: 8
+      },
+      // 滑动条激活的颜色
+      activeColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 滑动条未被激活的颜色
+      inactiveColor: {
+        type: String,
+        default: '#E6E6E6'
+      },
+      // 滑块的颜色
+      blockColor: {
+        type: String,
+        default: '#FFFFFF'
+      },
+      // 自定义滑块的样式
+      blockStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      }
+    },
+    data() {
+      return {
+        startX: 0,
+        status: 'end',
+        newValue: 0,
+        distanceX: 0,
+        startValue: 0,
+        barStyle: {},
+        sliderRect: {
+          left: 0,
+          width: 0
+        }
+      }
+    },
+    watch: {
+      value(val) {
+        // 只有在非滑动状态时，才可以通过value更新滑块值，这里监听，是为了让用户触发
+        if (this.status === 'end') this.updateValue(val, false)
+      }
+    },
+    created() {
+      this.updateValue(this.value, false)
+    },
+    mounted() {
+      this._tGetRect('.tn-slider').then(res => {
+        this.sliderRect = res
+      })
+    },
+    methods: {
+      // 开始滑动
+      touchStart(event) {
+        if (this.disabled) return
+        if (!event.changedTouches[0]) return
+        
+        this.startX = 0
+        // 触摸点
+        this.startX = event.changedTouches[0].pageX
+        this.startValue = this.format(this.value)
+        
+        // 标识当前开始触摸
+        this.status = 'start'
+      },
+      // 滑动移动中
+      touchMove(event) {
+        if (this.disabled) return
+        if (!event.changedTouches[0]) return
+        
+        // 连续触摸的过程会一直触发本方法，但只有手指触发且移动了才被认为是拖动了，才发出事件
+        // 触摸后第一次移动已经将status设置为moving状态，故触摸第二次移动不会触发本事件
+        if (this.status === 'start') this.$emit('start')
+        let movePageX = event.changedTouches[0].pageX
+        // 滑块的左边不一定跟屏幕左边接壤，所以需要减去最外层父元素的左边值
+        this.distanceX = movePageX - this.sliderRect.left
+        // 获得移动距离对整个滑块的百分比值，此为带有多位小数的值，不能用此更新视图
+        // 否则造成通信阻塞，需要每改变一个step值时修改一次视图
+        this.newValue = ((this.distanceX / this.sliderRect.width) * (this.max - this.min)) + this.min
+        this.status = 'moving'
+        this.$emit('moving')
+        
+        this.updateValue(this.newValue, true)
+      },
+      // 滑动结束
+      touchEnd() {
+        if(this.disabled) return
+        if (this.status === 'moving') {
+          this.updateValue(this.newValue, false)
+          this.$emit('end')
+        }
+        this.status = 'end'
+      },
+      // 更新数值
+      updateValue(value, drag) {
+        // 去掉小数部分，对step进行步进处理
+        value = this.format(value)
+        const width = Math.round((value - this.min) / (this.max - this.min) * 100)
+        // 不允许滑动的距离小于0和超过100
+        if (width < 0 || width > 100) return
+        // 设置移动的百分比
+        let barStyle = {
+          width: width + '%'
+        }
+        // 移动期间取消动画
+        if (drag === true) {
+          barStyle.transition = 'none'
+        } else {
+          // 非移动期间，删掉对过渡为空的声明，让css中的声明起效
+          delete barStyle.transition
+        }
+        
+        // 修改value值
+        this.$emit('input', value)
+        this.barStyle = barStyle
+      },
+      // 点击事件
+      click(event) {
+        if (this.disabled) return
+        // 直接点击的情况，计算方式和touchMove方法一致
+        const value = (((event.detail.x - this.sliderRect.left) / this.sliderRect.width) * (this.max - this.min)) + this.min
+        this.updateValue(value, false)
+      },
+      // 格式化滑动的值
+      format(value) {
+        return Math.round(Math.max(this.min, Math.min(value, this.max)) / this.step) * this.step
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-slider {
+    width: 100%;
+    position: relative;
+    border-radius: 1000rpx;
+    // 增加点击的范围
+    border-width: 20rpx;
+    border-style: solid;
+    border-color: transparent;
+    background-color: $tn-font-holder-color;
+    background-clip: content-box;
+    
+    &__gap {
+      position: relative;
+      border-radius: inherit;
+      transition: width 0.2s;
+      background-color: #01BEFF;
+    }
+    
+    &__button {
+      width: 30rpx;
+      height: 30rpx;
+      border-radius: 50%;
+      box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.6);
+      background-color: #FFFFFF;
+      cursor: pointer;
+      
+      &-wrap {
+        position: absolute;
+        top: 50%;
+        right: 0;
+        transform: translate3d(50%, -50%, 0);
+      }
+    }
+    
+    &--disabled {
+      opacity: 0.6;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-stack-swiper/index-h5.wxs b/tuniao-ui/components/tn-stack-swiper/index-h5.wxs
new file mode 100644
index 0000000..92b8627
--- /dev/null
+++ b/tuniao-ui/components/tn-stack-swiper/index-h5.wxs
@@ -0,0 +1,657 @@
+
+function setTimeout(instance, cb, time) {
+  if (time > 0) {
+    var s = getDate().getTime()
+    var fn = function () {
+        if (getDate().getTime() - s > time) {
+            cb && cb()
+        } else
+            instance.requestAnimationFrame(fn)
+    }
+    fn()
+  }
+  else
+    cb && cb()
+}
+
+// 判断触摸的移动方向
+function decideSwiperDirection(startTouches, currentTouches, direction) {
+  // 震动偏移容差
+  var toleranceShake = 30
+  // 移动容差
+  var toleranceTranslate = 10
+  
+  if (direction === 'horizontal') {
+    // 水平方向移动
+    if (Math.abs(currentTouches.y - startTouches.y) <= toleranceShake) {
+      // console.log(currentTouches.x, startTouches.x);
+      if (Math.abs(currentTouches.x - startTouches.x) > toleranceTranslate) {
+        if (currentTouches.x - startTouches.x > 0) {
+          return 'right'
+        } else if (currentTouches.x - startTouches.x < 0) {
+          return 'left'
+        }
+      }
+    }
+  } else if (direction === 'vertical') {
+    // 垂直方向移动
+    if (Math.abs(currentTouches.x - startTouches.x) <= toleranceShake) {
+      // console.log(currentTouches.x, startTouches.x);
+      if (Math.abs(currentTouches.y - startTouches.y) > toleranceTranslate) {
+        if (currentTouches.y - startTouches.y > 0) {
+          return 'down'
+        } else if (currentTouches.y - startTouches.y < 0) {
+          return 'up'
+        }
+      }
+    }
+  }
+  return ''
+}
+
+// 更新轮播样式信息
+function updateSwiperStyle(currentTouches, instance, state) {
+  var itemData = state.itemData
+  var itemsInstance = state.itemsInstance
+  var list = state.list
+  var currentIndex = state.currentIndex
+  var touchRelactive = state.touchRelactive
+  // console.log(itemAnimationWidth);
+  
+  if (itemData.direction === 'horizontal') {
+    // 水平方向
+    var itemAnimationWidth = state.itemAnimationWidth
+    // 偏移的x轴距离
+    var translateX = currentTouches.x - touchRelactive.x
+    if (currentTouches.x > itemData.windowWidth || currentTouches.x < 0) return
+    // console.log(translateX);
+    // 更新其他轮播样式
+    if (state.direction == 'left') {
+      // 设置当前激活元素的偏移量
+      instance.setStyle({
+        'transform': 'translate3d('+ translateX + 'px, 0px, 0px)',
+        'z-index': list[currentIndex].zIndex + 1,
+        'opacity': list[currentIndex].opacity
+      })
+      // 移动距离是否超过了指定的容器宽度
+      if (Math.abs(translateX) > itemAnimationWidth) {
+        state.itemsInstance.forEach( function(itemInstance, index) {
+          if (index != currentIndex) {
+            var preIndex = (index == 0) ? list.length - 1 : index - 1
+            var distanceRate = (Math.abs(translateX) - itemAnimationWidth) / (itemData.itemWidth - itemAnimationWidth)
+            var itemTranslateX = list[index].translateX - (list[index].translateX - list[preIndex].translateX) * distanceRate
+            var itemScale = list[index].scale + (list[preIndex].scale - list[index].scale) * distanceRate
+            var itemOpacity = list[index].opacity + (list[preIndex].opacity - list[index].opacity) * distanceRate
+            // console.log(preIndex);
+            // console.log(list[index]);
+            // console.log(distanceRate);
+            // console.log(itemTranslateX);
+            // console.log(itemScale);
+            // console.log(itemOpacity);
+            // console.log('-----------------------------------------------------------');
+            itemInstance.setStyle({
+              'transform': 'translate3d(' + itemTranslateX + 'px, 0px, 0px) scale(' + itemScale + ')',
+              'z-index': list[index].zIndex,
+              'opacity': itemOpacity
+            })
+          }
+        })
+      }
+    } else if (state.direction == 'right') {
+      var preIndex = (currentIndex == 0) ? list.length - 1 : currentIndex - 1
+      // 右滑的时候把最底部的取出，并放到最高层级
+      state.itemsInstance[preIndex].setStyle({
+        'transform': 'translate3d(-' + (itemData.itemWidth - translateX) + 'px, 0px, 0px) scale(1)',
+        'z-index': list[currentIndex].zIndex + 1,
+        'opacity': list[currentIndex].opacity
+      })
+      // 当前轮播逐渐缩小
+      if (Math.abs(translateX) < itemAnimationWidth) {
+        state.itemsInstance.forEach( function(itemInstance, index) {
+          if (index != preIndex) {
+            var replaceIndex = index == list.length - 1 ? 0 : index + 1
+            var distanceRate = Math.abs(translateX) / itemAnimationWidth
+            var itemTranslateX = list[index].translateX + (list[replaceIndex].translateX - list[index].translateX) * distanceRate
+            var itemScale = list[index].scale - (list[index].scale - list[replaceIndex].scale) * distanceRate
+            var itemOpacity = list[index].opacity - (list[index].opacity - list[replaceIndex].opacity) * distanceRate
+            // console.log(preIndex);
+            // console.log(index);
+            // console.log(replaceIndex);
+            // console.log(list[index]);
+            // console.log(list[replaceIndex].translateX - list[index].translateX);
+            // console.log(distanceRate);
+            // console.log(itemTranslateX);
+            // console.log(itemScale);
+            // console.log('-----------------------------------------------------------');
+            itemInstance.setStyle({
+              'transform': 'translate3d(' + itemTranslateX + 'px, 0px, 0px) scale(' + itemScale + ')',
+              'z-index': list[index].zIndex,
+              'opacity': itemOpacity
+            })
+          }
+        })
+      }
+    }
+  } else if (itemData.direction === 'vertical') {
+    // 垂直方向
+    var itemAnimationHeight = state.itemAnimationHeight
+    // 偏移的y轴距离
+    var translateY = currentTouches.y - touchRelactive.y
+    if (currentTouches.y > itemData.windowHeight || currentTouches.y < 0) return
+    // console.log(translateX);
+    // 更新其他轮播样式
+    if (state.direction == 'up') {
+      // 设置当前激活元素的偏移量
+      instance.setStyle({
+        'transform': 'translate3d(0px, '+ translateY + 'px, 0px)',
+        'z-index': list[currentIndex].zIndex + 1,
+        'opacity': list[currentIndex].opacity
+      })
+      // 移动距离是否超过了指定的容器宽度
+      if (Math.abs(translateY) > itemAnimationHeight) {
+        state.itemsInstance.forEach( function(itemInstance, index) {
+          if (index != currentIndex) {
+            var preIndex = (index == 0) ? list.length - 1 : index - 1
+            var distanceRate = (Math.abs(translateY) - itemAnimationHeight) / (itemData.itemHeight - itemAnimationHeight)
+            var itemTranslateY = list[index].translateY - (list[index].translateY - list[preIndex].translateY) * distanceRate
+            var itemScale = list[index].scale + (list[preIndex].scale - list[index].scale) * distanceRate
+            var itemOpacity = list[index].opacity + (list[preIndex].opacity - list[index].opacity) * distanceRate
+            // console.log(preIndex);
+            // console.log(list[index]);
+            // console.log(distanceRate);
+            // console.log(itemTranslateX);
+            // console.log(itemScale);
+            // console.log('-----------------------------------------------------------');
+            itemInstance.setStyle({
+              'transform': 'translate3d(0px, ' + itemTranslateY + 'px, 0px) scale(' + itemScale + ')',
+              'z-index': list[index].zIndex,
+              'opacity': itemOpacity
+              
+            })
+          }
+        })
+      }
+    } else if (state.direction == 'down') {
+      var preIndex = (currentIndex == 0) ? list.length - 1 : currentIndex - 1
+      // 下滑的时候把最底部的取出，并放到最高层级
+      state.itemsInstance[preIndex].setStyle({
+        'transform': 'translate3d(0px, -' + (itemData.itemHeight - translateY) + 'px, 0px) scale(1)',
+        'z-index': list[currentIndex].zIndex + 1,
+        'opacity': list[currentIndex].opacity
+      })
+      // 当前轮播逐渐缩小
+      if (Math.abs(translateY) < itemAnimationHeight) {
+        state.itemsInstance.forEach( function(itemInstance, index) {
+          if (index != preIndex) {
+            var replaceIndex = index == list.length - 1 ? 0 : index + 1
+            var distanceRate = Math.abs(translateY) / itemAnimationHeight
+            var itemTranslateY = list[index].translateY + (list[replaceIndex].translateY - list[index].translateY) * distanceRate
+            var itemScale = list[index].scale - (list[index].scale - list[replaceIndex].scale) * distanceRate
+            var itemOpacity = list[index].opacity - (list[index].opacity - list[replaceIndex].opacity) * distanceRate
+            // console.log(preIndex);
+            // console.log(index);
+            // console.log(replaceIndex);
+            // console.log(list[index]);
+            // console.log(list[replaceIndex].translateX - list[index].translateX);
+            // console.log(distanceRate);
+            // console.log(itemTranslateX);
+            // console.log(itemScale);
+            // console.log('-----------------------------------------------------------');
+            itemInstance.setStyle({
+              'transform': 'translate3d(0px, ' + itemTranslateY + 'px, 0px) scale(' + itemScale + ')',
+              'z-index': list[index].zIndex,
+              'opacity': itemOpacity
+            })
+          }
+        })
+      }
+    }
+  }
+}
+
+// 更新当前轮播序号
+function updateCurrentSwiperIndex(index, ownerInstance, state) {
+  state.currentIndex = index
+  ownerInstance.callMethod('changeSwiperIndex', {
+    index: index
+  })
+}
+
+// 切换到下一个轮播
+function switchNextSwiper(newIndex, touches, instance, state) {
+  var currentIndex = state.currentIndex
+  var list = state.list
+  var direction = state.itemData.direction
+  var touchRelactive = state.touchRelactive || {x: 0, y: 0}
+  
+  // 已经完成轮播切换
+  var currentListItemData = JSON.parse(JSON.stringify(list))
+  
+  if (direction === 'horizontal') {
+    // 水平方向移动
+    var itemWidth = state.itemData.itemWidth
+    // 当前轮播移动到最左边
+    instance.setStyle({
+      'transform': 'translate3d(-'+ itemWidth + 'px, 0px, 0px) scale(1)',
+      'z-index': list[currentIndex].zIndex + 1,
+      'opacity': list[currentIndex].opacity
+    })
+    // 计算当前移动需要的剩余时间
+    var time = Math.floor((itemWidth - Math.abs(touches.pageX - touchRelactive.x)) / itemWidth * 250)
+    
+    setTimeout(instance, function() {
+      for (var i = list.length - 1; i >= 0; i--) {
+        var replaceIndex = i - 1 < 0 ? list.length - 1 : i - 1
+        // console.log(i);
+        // console.log(replaceIndex);
+        state.itemsInstance[i].setStyle({
+          'transform': 'translate3d('+ currentListItemData[replaceIndex].translateX + 'px, 0px, 0px) scale(' + currentListItemData[replaceIndex].scale + ')',
+          'z-index': currentListItemData[replaceIndex].zIndex,
+          'opacity': currentListItemData[replaceIndex].opacity
+        })
+        state.list[i] = currentListItemData[replaceIndex]
+      }
+    }, time)
+  } else if (direction === 'vertical') {
+    // 垂直方向移动
+    var itemHeight = state.itemData.itemHeight
+    // 当前轮播移动到最上边
+    instance.setStyle({
+      'transform': 'translate3d(0px, -'+ itemHeight + 'px, 0px) scale(1)',
+      'z-index': list[currentIndex].zIndex + 1,
+      'opacity': list[currentIndex].opacity
+    })
+    // 计算当前移动需要的剩余时间
+    var time = Math.floor((itemHeight - Math.abs(touches.pageY - touchRelactive.y)) / itemHeight * 250)
+    
+    setTimeout(instance, function() {
+      for (var i = list.length - 1; i >= 0; i--) {
+        var replaceIndex = i - 1 < 0 ? list.length - 1 : i - 1
+        // console.log(i);
+        // console.log(replaceIndex);
+        state.itemsInstance[i].setStyle({
+          'transform': 'translate3d(0px, '+ currentListItemData[replaceIndex].translateY + 'px, 0px) scale(' + currentListItemData[replaceIndex].scale + ')',
+          'z-index': currentListItemData[replaceIndex].zIndex,
+          'opacity': currentListItemData[replaceIndex].opacity
+        })
+        state.list[i] = currentListItemData[replaceIndex]
+      }
+    }, time)
+  }
+}
+
+// 切换到上一个轮播
+function switchPrevSwiper(newIndex, touches, instance, state) {
+  var currentIndex = state.currentIndex
+  var list = state.list
+  var direction = state.itemData.direction
+  var touchRelactive = state.touchRelactive || {x: 0, y: 0}
+  
+  var currentListItemData = JSON.parse(JSON.stringify(list))
+  
+  if (direction === 'horizontal') {
+    // 水平方向移动
+    var itemWidth = state.itemData.itemWidth
+    // 当前上一个轮播移动到正常位置
+    state.itemsInstance[newIndex].setStyle({
+      'transform': 'translate3d(0px, 0px, 0px) scale(1)',
+      'z-index': list[currentIndex].zIndex + 1,
+      'opacity': list[currentIndex].opacity
+    })
+    // 计算当前移动需要的剩余时间
+    var time = Math.floor((itemWidth - Math.abs(touches.pageX - touchRelactive.x)) / itemWidth * 250)
+    // 更新除当前上一个轮播外的其他轮播，向后移动一个层级
+    // 更新列表位置相关数据
+    setTimeout(instance, function() {
+      for (var i = 0; i < list.length; i++) {
+        var replaceIndex = (i + 1 > list.length - 1) ? 0 : i + 1
+        state.itemsInstance[i].setStyle({
+          'transform': 'translate3d('+ currentListItemData[replaceIndex].translateX + 'px, 0px, 0px) scale(' + currentListItemData[replaceIndex].scale + ')',
+          'z-index': currentListItemData[replaceIndex].zIndex,
+          'opacity': currentListItemData[replaceIndex].opacity
+        })
+        state.list[i] = currentListItemData[replaceIndex]
+      }
+    }, time)
+  } else if (direction === 'vertical') {
+    // 垂直方向移动
+    var itemHeight = state.itemData.itemHeight
+    // 当前上一个轮播移动到正常位置
+    state.itemsInstance[newIndex].setStyle({
+      'transform': 'translate3d(0px, 0px, 0px) scale(1)',
+      'z-index': list[currentIndex].zIndex + 1,
+      'opacity': list[currentIndex].opacity
+    })
+    // 计算当前移动需要的剩余时间
+    var time = Math.floor((itemHeight - Math.abs(touches.pageY - touchRelactive.y)) / itemHeight * 250)
+    // 更新除当前上一个轮播外的其他轮播，向后移动一个层级
+    // 更新列表位置相关数据
+    setTimeout(instance, function() {
+      for (var i = 0; i < list.length; i++) {
+        var replaceIndex = (i + 1 > list.length - 1) ? 0 : i + 1
+        state.itemsInstance[i].setStyle({
+          'transform': 'translate3d(0px, '+ currentListItemData[replaceIndex].translateY + 'px, 0px) scale(' + currentListItemData[replaceIndex].scale + ')',
+          'z-index': currentListItemData[replaceIndex].zIndex,
+          'opacity': currentListItemData[replaceIndex].opacity
+        })
+        state.list[i] = currentListItemData[replaceIndex]
+      }
+    }, time)
+  }
+}
+
+// 反转动画
+function toggleSwiperAnimation(state, add) {
+  if (!state.itemsInstance) return
+  if (add === true) {
+    state.itemsInstance.forEach(function(item, index) {
+      if (!item.hasClass('tn-stack-swiper__item__transition')) {
+        item.addClass('tn-stack-swiper__item__transition')
+      }
+    })
+  } else {
+    state.itemsInstance.forEach(function(item, index) {
+      if (item.hasClass('tn-stack-swiper__item__transition')) {
+        item.removeClass('tn-stack-swiper__item__transition')
+      }
+    })
+  }
+}
+
+// 更新数据
+var itemDataObserver = function (newVal, oldVal, ownerInstance, instance) {
+  var state = ownerInstance.getState()
+  state.itemData = newVal
+}
+
+// 列表初始化
+var listObserver = function(newVal, oldVal, ownerInstance, instance) {
+  var state = ownerInstance.getState()
+  var itemData = state.itemData
+  state.itemsInstance = ownerInstance.selectAllComponents('.tn-stack-swiper__item')
+  
+  state.list = newVal || []
+  
+  state.list.forEach(function(item, index) {
+    var itemInstance = state.itemsInstance[index]
+    if (item && itemInstance) {
+      if (itemData.direction === 'horizontal') {
+        itemInstance.setStyle({
+          'transform': 'translate3d('+ item.translateX + 'px, 0px, 0px) scale(' + item.scale + ')',
+          'z-index': item.zIndex,
+          'opacity': item.opacity
+        })
+      } else if (itemData.direction === 'vertical') {
+        itemInstance.setStyle({
+          'transform': 'translate3d(0px, '+ item.translateY + 'px, 0px) scale(' + item.scale + ')',
+          'z-index': item.zIndex,
+          'opacity': item.opacity
+        })
+      }
+    }
+  })
+}
+
+// 切换轮播位置
+var swiperIndexChange = function(newVal, oldVal, ownerInstance, instance) {
+  var state = ownerInstance.getState()  
+  // console.log(newVal);
+  // ownerInstance.callMethod('printLog', newVal)
+  // console.log(oldVal);
+  // ownerInstance.callMethod('printLog', oldVal)
+  // 排除第一次初始化和手动切换的情况
+  if (oldVal < 0 || typeof oldVal == 'undefined' || state.currentIndex == newVal) {
+    if (oldVal < 0 || typeof oldVal == 'undefined') {
+      state.currentIndex = 0
+    }
+    return
+  }
+  state.currentIndex = newVal
+  // console.log(state.currentIndex);
+  if (newVal > oldVal || (oldVal == state.list.length - 1 && newVal == 0)) {
+    // console.log("next");
+    // state.itemsInstance.forEach(function(item, index) {
+    //   item.addClass("tn-stack-swiper__item__transition")
+    // })
+    switchNextSwiper(newVal, {
+      pageX: 0
+    }, state.itemsInstance[oldVal], state)
+  } else if (newVal < oldVal || (oldVal == 0 && newVal == state.list.length - 1)) {
+    // console.log("prev");
+  }
+}
+
+// 自动轮播切换状态
+var autoplayFlagChange = function(newVal, oldVal, ownerInstance, instance) {
+  var state = ownerInstance.getState()
+  
+  if (newVal === true) {
+    toggleSwiperAnimation(state, true)
+  } else {
+    toggleSwiperAnimation(state, false)
+  }
+}
+
+// 开始触摸
+var touchStart = function (event, ownerInstance) {
+  // console.log('touchStart');
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  
+  var itemData = state.itemData
+  
+  // 判断是否为为当前显示的轮播
+  if (dataset.index != state.currentIndex) return
+  
+  var touches = event.changedTouches[0]
+  if (!touches) return
+  
+  // 记录当前滑动开始的x，y坐标
+  state.touchRelactive = {
+    x: touches.pageX,
+    y: touches.pageY
+  }
+  // 记录触摸id，用于处理多指的情况
+  state.touchId = touches.identifier
+  
+  if (itemData.direction === 'horizontal') {
+    // 水平方向移动
+    // 设置左右滑动时相对偏移距离
+    state.itemAnimationWidth = itemData.itemWidth * (dataset.switchrate / 100)
+  } else if (itemData.direction === 'vertical') {
+    // 垂直方向移动
+    // 设置上下滑动时相对偏移距离
+    state.itemAnimationHeight = itemData.itemHeight * (dataset.switchrate / 100)
+  }
+  
+  // 移除运动动画时间
+  toggleSwiperAnimation(state, false)
+  
+  // 标记开始触摸
+  state.touching = true
+  ownerInstance.callMethod('changeTouchState', {
+    touching: true
+  })
+  // 停止执行自动轮播
+  ownerInstance.callMethod('clearAutoPlayTimer')
+}
+
+// 开始移动
+var touchMove = function (event, ownerInstance) {
+  // console.log('touchMove');
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  var itemData = state.itemData
+  
+  // 判断是否为为当前显示的轮播
+  if (dataset.index != state.currentIndex) return
+  
+  // 还没开始触摸直接返回
+  if (!state.touching) return
+  
+  var touches = event.changedTouches[0]
+  if (!touches) return
+  
+  // 判断是否为同一个触摸点
+  if (state.touchId != touches.identifier) return
+  
+  var currentTouchRelactive = {
+    x: touches.pageX,
+    y: touches.pageY
+  }
+  // 是否已经确定了移动方向
+  if (!state.direction) {
+    state.direction = decideSwiperDirection(state.touchRelactive, currentTouchRelactive, itemData.direction)
+  }
+  // console.log(decideSwiperDirection(state.touchRelactive, currentTouchRelactive));
+  updateSwiperStyle(currentTouchRelactive, instance, state)
+}
+
+// 移动结束
+var touchEnd = function (event, ownerInstance) {
+  // console.log('touchEnd');
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  var itemData = state.itemData
+  var list = state.list
+  var touchRelactive = state.touchRelactive
+  
+  // 判断是否为为当前显示的轮播
+  if (dataset.index != state.currentIndex) return
+  
+  // 还没开始触摸直接返回
+  if (!state.touching) return
+  
+  var touches = event.changedTouches[0]
+  if (!touches) return
+  
+  // 判断是否为同一个触摸点
+  if (state.touchId != touches.identifier) return
+  
+  // 添加运动动画时间
+  toggleSwiperAnimation(state, true)
+  
+  if (itemData.direction === 'horizontal') {
+    // 水平方向移动
+    var itemAnimationWidth = state.itemAnimationWidth
+    // 判断时左滑还是右滑
+    // 判断是否超过自动滚动到下一页还是回滚
+    if (state.direction == 'left') {
+      if (Math.abs(touches.pageX - touchRelactive.x) < itemAnimationWidth) {
+        list.forEach(function(item, index) {
+          var itemInstance = state.itemsInstance[index]
+          if (item && itemInstance) {
+            itemInstance.setStyle({
+              'transform': 'translate3d('+ item.translateX + 'px, 0px, 0px) scale(' + item.scale + ')',
+              'z-index': item.zIndex
+            })
+          }
+        })
+      } else {
+        var newIndex = state.currentIndex + 1 > list.length - 1 ? 0 : state.currentIndex + 1
+        switchNextSwiper(newIndex, touches, instance, state)
+        
+        updateCurrentSwiperIndex(newIndex, ownerInstance, state)
+      }
+    } else if (state.direction == 'right') {
+      if (Math.abs(touches.pageX - touchRelactive.x) < itemAnimationWidth) {
+        // 滑动显示图片回滚
+        var preIndex = (state.currentIndex == 0) ? list.length - 1 : state.currentIndex - 1
+        state.itemsInstance[preIndex].setStyle({
+          'transform': 'translate3d(-' + itemData.itemWidth + 'px, 0px, 0px) scale(1)',
+          'z-index': list[state.currentIndex].zIndex + 1,
+          'opacity': list[state.currentIndex].opacity
+        })
+        list.forEach(function(item, index) {
+          var itemInstance = state.itemsInstance[index]
+          if (item && itemInstance) {
+            itemInstance.setStyle({
+              'transform': 'translate3d('+ item.translateX + 'px, 0px, 0px) scale(' + item.scale + ')',
+              'z-index': item.zIndex,
+              'opacity': item.opacity
+            })
+          }
+        })
+      } else {
+        var newIndex = (state.currentIndex - 1 < 0) ? list.length - 1 : state.currentIndex - 1
+        switchPrevSwiper(newIndex, touches, instance, state)
+        
+        updateCurrentSwiperIndex(newIndex, ownerInstance, state)
+      }
+    }
+  } else if (itemData.direction === 'vertical') {
+    // 垂直方向移动
+    var itemAnimationHeight = state.itemAnimationHeight
+    // 判断时上滑还是下滑
+    // 判断是否超过自动滚动到下一页还是回滚
+    if (state.direction == 'up') {
+      if (Math.abs(touches.pageY - touchRelactive.y) < itemAnimationHeight) {
+        list.forEach(function(item, index) {
+          var itemInstance = state.itemsInstance[index]
+          if (item && itemInstance) {
+            itemInstance.setStyle({
+              'transform': 'translate3d(0px, '+ item.translateY + 'px, 0px) scale(' + item.scale + ')',
+              'z-index': item.zIndex,
+              'opacity': item.opacity
+            })
+          }
+        })
+      } else {
+        var newIndex = state.currentIndex + 1 > list.length - 1 ? 0 : state.currentIndex + 1
+        switchNextSwiper(newIndex, touches, instance, state)
+        
+        updateCurrentSwiperIndex(newIndex, ownerInstance, state)
+      }
+    } else if (state.direction == 'down') {
+      if (Math.abs(touches.pageY - touchRelactive.y) < itemAnimationHeight) {
+        // 滑动显示图片回滚
+        var preIndex = (state.currentIndex == 0) ? list.length - 1 : state.currentIndex - 1
+        state.itemsInstance[preIndex].setStyle({
+          'transform': 'translate3d(0px, -' + itemData.itemHeight + 'px, 0px) scale(1)',
+          'z-index': list[state.currentIndex].zIndex + 1,
+          'opacity': list[state.currentIndex].opacity
+        })
+        list.forEach(function(item, index) {
+          var itemInstance = state.itemsInstance[index]
+          if (item && itemInstance) {
+            itemInstance.setStyle({
+              'transform': 'translate3d(0px, '+ item.translateY + 'px, 0px) scale(' + item.scale + ')',
+              'z-index': item.zIndex,
+              'opacity': item.opacity
+            })
+          }
+        })
+      } else {
+        var newIndex = (state.currentIndex - 1 < 0) ? list.length - 1 : state.currentIndex - 1
+        switchPrevSwiper(newIndex, touches, instance, state)
+        
+        updateCurrentSwiperIndex(newIndex, ownerInstance, state)
+      }
+    }
+  }
+  
+  // 清除对应的标志位
+  state.touchRelactive = null
+  state.touching = false
+  state.direction = null
+  state.touchId = null
+  
+  ownerInstance.callMethod('changeTouchState', {
+    touching: false
+  })
+  // 重新开始执行自动轮播
+  ownerInstance.callMethod('setAutoPlay')
+}
+
+module.exports = {
+  itemDataObserver: itemDataObserver,
+  listObserver: listObserver,
+  swiperIndexChange: swiperIndexChange,
+  autoplayFlagChange: autoplayFlagChange,
+  touchStart: touchStart,
+  touchMove: touchMove,
+  touchEnd: touchEnd
+}
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-stack-swiper/index.wxs b/tuniao-ui/components/tn-stack-swiper/index.wxs
new file mode 100644
index 0000000..92b8627
--- /dev/null
+++ b/tuniao-ui/components/tn-stack-swiper/index.wxs
@@ -0,0 +1,657 @@
+
+function setTimeout(instance, cb, time) {
+  if (time > 0) {
+    var s = getDate().getTime()
+    var fn = function () {
+        if (getDate().getTime() - s > time) {
+            cb && cb()
+        } else
+            instance.requestAnimationFrame(fn)
+    }
+    fn()
+  }
+  else
+    cb && cb()
+}
+
+// 判断触摸的移动方向
+function decideSwiperDirection(startTouches, currentTouches, direction) {
+  // 震动偏移容差
+  var toleranceShake = 30
+  // 移动容差
+  var toleranceTranslate = 10
+  
+  if (direction === 'horizontal') {
+    // 水平方向移动
+    if (Math.abs(currentTouches.y - startTouches.y) <= toleranceShake) {
+      // console.log(currentTouches.x, startTouches.x);
+      if (Math.abs(currentTouches.x - startTouches.x) > toleranceTranslate) {
+        if (currentTouches.x - startTouches.x > 0) {
+          return 'right'
+        } else if (currentTouches.x - startTouches.x < 0) {
+          return 'left'
+        }
+      }
+    }
+  } else if (direction === 'vertical') {
+    // 垂直方向移动
+    if (Math.abs(currentTouches.x - startTouches.x) <= toleranceShake) {
+      // console.log(currentTouches.x, startTouches.x);
+      if (Math.abs(currentTouches.y - startTouches.y) > toleranceTranslate) {
+        if (currentTouches.y - startTouches.y > 0) {
+          return 'down'
+        } else if (currentTouches.y - startTouches.y < 0) {
+          return 'up'
+        }
+      }
+    }
+  }
+  return ''
+}
+
+// 更新轮播样式信息
+function updateSwiperStyle(currentTouches, instance, state) {
+  var itemData = state.itemData
+  var itemsInstance = state.itemsInstance
+  var list = state.list
+  var currentIndex = state.currentIndex
+  var touchRelactive = state.touchRelactive
+  // console.log(itemAnimationWidth);
+  
+  if (itemData.direction === 'horizontal') {
+    // 水平方向
+    var itemAnimationWidth = state.itemAnimationWidth
+    // 偏移的x轴距离
+    var translateX = currentTouches.x - touchRelactive.x
+    if (currentTouches.x > itemData.windowWidth || currentTouches.x < 0) return
+    // console.log(translateX);
+    // 更新其他轮播样式
+    if (state.direction == 'left') {
+      // 设置当前激活元素的偏移量
+      instance.setStyle({
+        'transform': 'translate3d('+ translateX + 'px, 0px, 0px)',
+        'z-index': list[currentIndex].zIndex + 1,
+        'opacity': list[currentIndex].opacity
+      })
+      // 移动距离是否超过了指定的容器宽度
+      if (Math.abs(translateX) > itemAnimationWidth) {
+        state.itemsInstance.forEach( function(itemInstance, index) {
+          if (index != currentIndex) {
+            var preIndex = (index == 0) ? list.length - 1 : index - 1
+            var distanceRate = (Math.abs(translateX) - itemAnimationWidth) / (itemData.itemWidth - itemAnimationWidth)
+            var itemTranslateX = list[index].translateX - (list[index].translateX - list[preIndex].translateX) * distanceRate
+            var itemScale = list[index].scale + (list[preIndex].scale - list[index].scale) * distanceRate
+            var itemOpacity = list[index].opacity + (list[preIndex].opacity - list[index].opacity) * distanceRate
+            // console.log(preIndex);
+            // console.log(list[index]);
+            // console.log(distanceRate);
+            // console.log(itemTranslateX);
+            // console.log(itemScale);
+            // console.log(itemOpacity);
+            // console.log('-----------------------------------------------------------');
+            itemInstance.setStyle({
+              'transform': 'translate3d(' + itemTranslateX + 'px, 0px, 0px) scale(' + itemScale + ')',
+              'z-index': list[index].zIndex,
+              'opacity': itemOpacity
+            })
+          }
+        })
+      }
+    } else if (state.direction == 'right') {
+      var preIndex = (currentIndex == 0) ? list.length - 1 : currentIndex - 1
+      // 右滑的时候把最底部的取出，并放到最高层级
+      state.itemsInstance[preIndex].setStyle({
+        'transform': 'translate3d(-' + (itemData.itemWidth - translateX) + 'px, 0px, 0px) scale(1)',
+        'z-index': list[currentIndex].zIndex + 1,
+        'opacity': list[currentIndex].opacity
+      })
+      // 当前轮播逐渐缩小
+      if (Math.abs(translateX) < itemAnimationWidth) {
+        state.itemsInstance.forEach( function(itemInstance, index) {
+          if (index != preIndex) {
+            var replaceIndex = index == list.length - 1 ? 0 : index + 1
+            var distanceRate = Math.abs(translateX) / itemAnimationWidth
+            var itemTranslateX = list[index].translateX + (list[replaceIndex].translateX - list[index].translateX) * distanceRate
+            var itemScale = list[index].scale - (list[index].scale - list[replaceIndex].scale) * distanceRate
+            var itemOpacity = list[index].opacity - (list[index].opacity - list[replaceIndex].opacity) * distanceRate
+            // console.log(preIndex);
+            // console.log(index);
+            // console.log(replaceIndex);
+            // console.log(list[index]);
+            // console.log(list[replaceIndex].translateX - list[index].translateX);
+            // console.log(distanceRate);
+            // console.log(itemTranslateX);
+            // console.log(itemScale);
+            // console.log('-----------------------------------------------------------');
+            itemInstance.setStyle({
+              'transform': 'translate3d(' + itemTranslateX + 'px, 0px, 0px) scale(' + itemScale + ')',
+              'z-index': list[index].zIndex,
+              'opacity': itemOpacity
+            })
+          }
+        })
+      }
+    }
+  } else if (itemData.direction === 'vertical') {
+    // 垂直方向
+    var itemAnimationHeight = state.itemAnimationHeight
+    // 偏移的y轴距离
+    var translateY = currentTouches.y - touchRelactive.y
+    if (currentTouches.y > itemData.windowHeight || currentTouches.y < 0) return
+    // console.log(translateX);
+    // 更新其他轮播样式
+    if (state.direction == 'up') {
+      // 设置当前激活元素的偏移量
+      instance.setStyle({
+        'transform': 'translate3d(0px, '+ translateY + 'px, 0px)',
+        'z-index': list[currentIndex].zIndex + 1,
+        'opacity': list[currentIndex].opacity
+      })
+      // 移动距离是否超过了指定的容器宽度
+      if (Math.abs(translateY) > itemAnimationHeight) {
+        state.itemsInstance.forEach( function(itemInstance, index) {
+          if (index != currentIndex) {
+            var preIndex = (index == 0) ? list.length - 1 : index - 1
+            var distanceRate = (Math.abs(translateY) - itemAnimationHeight) / (itemData.itemHeight - itemAnimationHeight)
+            var itemTranslateY = list[index].translateY - (list[index].translateY - list[preIndex].translateY) * distanceRate
+            var itemScale = list[index].scale + (list[preIndex].scale - list[index].scale) * distanceRate
+            var itemOpacity = list[index].opacity + (list[preIndex].opacity - list[index].opacity) * distanceRate
+            // console.log(preIndex);
+            // console.log(list[index]);
+            // console.log(distanceRate);
+            // console.log(itemTranslateX);
+            // console.log(itemScale);
+            // console.log('-----------------------------------------------------------');
+            itemInstance.setStyle({
+              'transform': 'translate3d(0px, ' + itemTranslateY + 'px, 0px) scale(' + itemScale + ')',
+              'z-index': list[index].zIndex,
+              'opacity': itemOpacity
+              
+            })
+          }
+        })
+      }
+    } else if (state.direction == 'down') {
+      var preIndex = (currentIndex == 0) ? list.length - 1 : currentIndex - 1
+      // 下滑的时候把最底部的取出，并放到最高层级
+      state.itemsInstance[preIndex].setStyle({
+        'transform': 'translate3d(0px, -' + (itemData.itemHeight - translateY) + 'px, 0px) scale(1)',
+        'z-index': list[currentIndex].zIndex + 1,
+        'opacity': list[currentIndex].opacity
+      })
+      // 当前轮播逐渐缩小
+      if (Math.abs(translateY) < itemAnimationHeight) {
+        state.itemsInstance.forEach( function(itemInstance, index) {
+          if (index != preIndex) {
+            var replaceIndex = index == list.length - 1 ? 0 : index + 1
+            var distanceRate = Math.abs(translateY) / itemAnimationHeight
+            var itemTranslateY = list[index].translateY + (list[replaceIndex].translateY - list[index].translateY) * distanceRate
+            var itemScale = list[index].scale - (list[index].scale - list[replaceIndex].scale) * distanceRate
+            var itemOpacity = list[index].opacity - (list[index].opacity - list[replaceIndex].opacity) * distanceRate
+            // console.log(preIndex);
+            // console.log(index);
+            // console.log(replaceIndex);
+            // console.log(list[index]);
+            // console.log(list[replaceIndex].translateX - list[index].translateX);
+            // console.log(distanceRate);
+            // console.log(itemTranslateX);
+            // console.log(itemScale);
+            // console.log('-----------------------------------------------------------');
+            itemInstance.setStyle({
+              'transform': 'translate3d(0px, ' + itemTranslateY + 'px, 0px) scale(' + itemScale + ')',
+              'z-index': list[index].zIndex,
+              'opacity': itemOpacity
+            })
+          }
+        })
+      }
+    }
+  }
+}
+
+// 更新当前轮播序号
+function updateCurrentSwiperIndex(index, ownerInstance, state) {
+  state.currentIndex = index
+  ownerInstance.callMethod('changeSwiperIndex', {
+    index: index
+  })
+}
+
+// 切换到下一个轮播
+function switchNextSwiper(newIndex, touches, instance, state) {
+  var currentIndex = state.currentIndex
+  var list = state.list
+  var direction = state.itemData.direction
+  var touchRelactive = state.touchRelactive || {x: 0, y: 0}
+  
+  // 已经完成轮播切换
+  var currentListItemData = JSON.parse(JSON.stringify(list))
+  
+  if (direction === 'horizontal') {
+    // 水平方向移动
+    var itemWidth = state.itemData.itemWidth
+    // 当前轮播移动到最左边
+    instance.setStyle({
+      'transform': 'translate3d(-'+ itemWidth + 'px, 0px, 0px) scale(1)',
+      'z-index': list[currentIndex].zIndex + 1,
+      'opacity': list[currentIndex].opacity
+    })
+    // 计算当前移动需要的剩余时间
+    var time = Math.floor((itemWidth - Math.abs(touches.pageX - touchRelactive.x)) / itemWidth * 250)
+    
+    setTimeout(instance, function() {
+      for (var i = list.length - 1; i >= 0; i--) {
+        var replaceIndex = i - 1 < 0 ? list.length - 1 : i - 1
+        // console.log(i);
+        // console.log(replaceIndex);
+        state.itemsInstance[i].setStyle({
+          'transform': 'translate3d('+ currentListItemData[replaceIndex].translateX + 'px, 0px, 0px) scale(' + currentListItemData[replaceIndex].scale + ')',
+          'z-index': currentListItemData[replaceIndex].zIndex,
+          'opacity': currentListItemData[replaceIndex].opacity
+        })
+        state.list[i] = currentListItemData[replaceIndex]
+      }
+    }, time)
+  } else if (direction === 'vertical') {
+    // 垂直方向移动
+    var itemHeight = state.itemData.itemHeight
+    // 当前轮播移动到最上边
+    instance.setStyle({
+      'transform': 'translate3d(0px, -'+ itemHeight + 'px, 0px) scale(1)',
+      'z-index': list[currentIndex].zIndex + 1,
+      'opacity': list[currentIndex].opacity
+    })
+    // 计算当前移动需要的剩余时间
+    var time = Math.floor((itemHeight - Math.abs(touches.pageY - touchRelactive.y)) / itemHeight * 250)
+    
+    setTimeout(instance, function() {
+      for (var i = list.length - 1; i >= 0; i--) {
+        var replaceIndex = i - 1 < 0 ? list.length - 1 : i - 1
+        // console.log(i);
+        // console.log(replaceIndex);
+        state.itemsInstance[i].setStyle({
+          'transform': 'translate3d(0px, '+ currentListItemData[replaceIndex].translateY + 'px, 0px) scale(' + currentListItemData[replaceIndex].scale + ')',
+          'z-index': currentListItemData[replaceIndex].zIndex,
+          'opacity': currentListItemData[replaceIndex].opacity
+        })
+        state.list[i] = currentListItemData[replaceIndex]
+      }
+    }, time)
+  }
+}
+
+// 切换到上一个轮播
+function switchPrevSwiper(newIndex, touches, instance, state) {
+  var currentIndex = state.currentIndex
+  var list = state.list
+  var direction = state.itemData.direction
+  var touchRelactive = state.touchRelactive || {x: 0, y: 0}
+  
+  var currentListItemData = JSON.parse(JSON.stringify(list))
+  
+  if (direction === 'horizontal') {
+    // 水平方向移动
+    var itemWidth = state.itemData.itemWidth
+    // 当前上一个轮播移动到正常位置
+    state.itemsInstance[newIndex].setStyle({
+      'transform': 'translate3d(0px, 0px, 0px) scale(1)',
+      'z-index': list[currentIndex].zIndex + 1,
+      'opacity': list[currentIndex].opacity
+    })
+    // 计算当前移动需要的剩余时间
+    var time = Math.floor((itemWidth - Math.abs(touches.pageX - touchRelactive.x)) / itemWidth * 250)
+    // 更新除当前上一个轮播外的其他轮播，向后移动一个层级
+    // 更新列表位置相关数据
+    setTimeout(instance, function() {
+      for (var i = 0; i < list.length; i++) {
+        var replaceIndex = (i + 1 > list.length - 1) ? 0 : i + 1
+        state.itemsInstance[i].setStyle({
+          'transform': 'translate3d('+ currentListItemData[replaceIndex].translateX + 'px, 0px, 0px) scale(' + currentListItemData[replaceIndex].scale + ')',
+          'z-index': currentListItemData[replaceIndex].zIndex,
+          'opacity': currentListItemData[replaceIndex].opacity
+        })
+        state.list[i] = currentListItemData[replaceIndex]
+      }
+    }, time)
+  } else if (direction === 'vertical') {
+    // 垂直方向移动
+    var itemHeight = state.itemData.itemHeight
+    // 当前上一个轮播移动到正常位置
+    state.itemsInstance[newIndex].setStyle({
+      'transform': 'translate3d(0px, 0px, 0px) scale(1)',
+      'z-index': list[currentIndex].zIndex + 1,
+      'opacity': list[currentIndex].opacity
+    })
+    // 计算当前移动需要的剩余时间
+    var time = Math.floor((itemHeight - Math.abs(touches.pageY - touchRelactive.y)) / itemHeight * 250)
+    // 更新除当前上一个轮播外的其他轮播，向后移动一个层级
+    // 更新列表位置相关数据
+    setTimeout(instance, function() {
+      for (var i = 0; i < list.length; i++) {
+        var replaceIndex = (i + 1 > list.length - 1) ? 0 : i + 1
+        state.itemsInstance[i].setStyle({
+          'transform': 'translate3d(0px, '+ currentListItemData[replaceIndex].translateY + 'px, 0px) scale(' + currentListItemData[replaceIndex].scale + ')',
+          'z-index': currentListItemData[replaceIndex].zIndex,
+          'opacity': currentListItemData[replaceIndex].opacity
+        })
+        state.list[i] = currentListItemData[replaceIndex]
+      }
+    }, time)
+  }
+}
+
+// 反转动画
+function toggleSwiperAnimation(state, add) {
+  if (!state.itemsInstance) return
+  if (add === true) {
+    state.itemsInstance.forEach(function(item, index) {
+      if (!item.hasClass('tn-stack-swiper__item__transition')) {
+        item.addClass('tn-stack-swiper__item__transition')
+      }
+    })
+  } else {
+    state.itemsInstance.forEach(function(item, index) {
+      if (item.hasClass('tn-stack-swiper__item__transition')) {
+        item.removeClass('tn-stack-swiper__item__transition')
+      }
+    })
+  }
+}
+
+// 更新数据
+var itemDataObserver = function (newVal, oldVal, ownerInstance, instance) {
+  var state = ownerInstance.getState()
+  state.itemData = newVal
+}
+
+// 列表初始化
+var listObserver = function(newVal, oldVal, ownerInstance, instance) {
+  var state = ownerInstance.getState()
+  var itemData = state.itemData
+  state.itemsInstance = ownerInstance.selectAllComponents('.tn-stack-swiper__item')
+  
+  state.list = newVal || []
+  
+  state.list.forEach(function(item, index) {
+    var itemInstance = state.itemsInstance[index]
+    if (item && itemInstance) {
+      if (itemData.direction === 'horizontal') {
+        itemInstance.setStyle({
+          'transform': 'translate3d('+ item.translateX + 'px, 0px, 0px) scale(' + item.scale + ')',
+          'z-index': item.zIndex,
+          'opacity': item.opacity
+        })
+      } else if (itemData.direction === 'vertical') {
+        itemInstance.setStyle({
+          'transform': 'translate3d(0px, '+ item.translateY + 'px, 0px) scale(' + item.scale + ')',
+          'z-index': item.zIndex,
+          'opacity': item.opacity
+        })
+      }
+    }
+  })
+}
+
+// 切换轮播位置
+var swiperIndexChange = function(newVal, oldVal, ownerInstance, instance) {
+  var state = ownerInstance.getState()  
+  // console.log(newVal);
+  // ownerInstance.callMethod('printLog', newVal)
+  // console.log(oldVal);
+  // ownerInstance.callMethod('printLog', oldVal)
+  // 排除第一次初始化和手动切换的情况
+  if (oldVal < 0 || typeof oldVal == 'undefined' || state.currentIndex == newVal) {
+    if (oldVal < 0 || typeof oldVal == 'undefined') {
+      state.currentIndex = 0
+    }
+    return
+  }
+  state.currentIndex = newVal
+  // console.log(state.currentIndex);
+  if (newVal > oldVal || (oldVal == state.list.length - 1 && newVal == 0)) {
+    // console.log("next");
+    // state.itemsInstance.forEach(function(item, index) {
+    //   item.addClass("tn-stack-swiper__item__transition")
+    // })
+    switchNextSwiper(newVal, {
+      pageX: 0
+    }, state.itemsInstance[oldVal], state)
+  } else if (newVal < oldVal || (oldVal == 0 && newVal == state.list.length - 1)) {
+    // console.log("prev");
+  }
+}
+
+// 自动轮播切换状态
+var autoplayFlagChange = function(newVal, oldVal, ownerInstance, instance) {
+  var state = ownerInstance.getState()
+  
+  if (newVal === true) {
+    toggleSwiperAnimation(state, true)
+  } else {
+    toggleSwiperAnimation(state, false)
+  }
+}
+
+// 开始触摸
+var touchStart = function (event, ownerInstance) {
+  // console.log('touchStart');
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  
+  var itemData = state.itemData
+  
+  // 判断是否为为当前显示的轮播
+  if (dataset.index != state.currentIndex) return
+  
+  var touches = event.changedTouches[0]
+  if (!touches) return
+  
+  // 记录当前滑动开始的x，y坐标
+  state.touchRelactive = {
+    x: touches.pageX,
+    y: touches.pageY
+  }
+  // 记录触摸id，用于处理多指的情况
+  state.touchId = touches.identifier
+  
+  if (itemData.direction === 'horizontal') {
+    // 水平方向移动
+    // 设置左右滑动时相对偏移距离
+    state.itemAnimationWidth = itemData.itemWidth * (dataset.switchrate / 100)
+  } else if (itemData.direction === 'vertical') {
+    // 垂直方向移动
+    // 设置上下滑动时相对偏移距离
+    state.itemAnimationHeight = itemData.itemHeight * (dataset.switchrate / 100)
+  }
+  
+  // 移除运动动画时间
+  toggleSwiperAnimation(state, false)
+  
+  // 标记开始触摸
+  state.touching = true
+  ownerInstance.callMethod('changeTouchState', {
+    touching: true
+  })
+  // 停止执行自动轮播
+  ownerInstance.callMethod('clearAutoPlayTimer')
+}
+
+// 开始移动
+var touchMove = function (event, ownerInstance) {
+  // console.log('touchMove');
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  var itemData = state.itemData
+  
+  // 判断是否为为当前显示的轮播
+  if (dataset.index != state.currentIndex) return
+  
+  // 还没开始触摸直接返回
+  if (!state.touching) return
+  
+  var touches = event.changedTouches[0]
+  if (!touches) return
+  
+  // 判断是否为同一个触摸点
+  if (state.touchId != touches.identifier) return
+  
+  var currentTouchRelactive = {
+    x: touches.pageX,
+    y: touches.pageY
+  }
+  // 是否已经确定了移动方向
+  if (!state.direction) {
+    state.direction = decideSwiperDirection(state.touchRelactive, currentTouchRelactive, itemData.direction)
+  }
+  // console.log(decideSwiperDirection(state.touchRelactive, currentTouchRelactive));
+  updateSwiperStyle(currentTouchRelactive, instance, state)
+}
+
+// 移动结束
+var touchEnd = function (event, ownerInstance) {
+  // console.log('touchEnd');
+  var instance = event.instance
+  var dataset = instance.getDataset()
+  var state = ownerInstance.getState()
+  var itemData = state.itemData
+  var list = state.list
+  var touchRelactive = state.touchRelactive
+  
+  // 判断是否为为当前显示的轮播
+  if (dataset.index != state.currentIndex) return
+  
+  // 还没开始触摸直接返回
+  if (!state.touching) return
+  
+  var touches = event.changedTouches[0]
+  if (!touches) return
+  
+  // 判断是否为同一个触摸点
+  if (state.touchId != touches.identifier) return
+  
+  // 添加运动动画时间
+  toggleSwiperAnimation(state, true)
+  
+  if (itemData.direction === 'horizontal') {
+    // 水平方向移动
+    var itemAnimationWidth = state.itemAnimationWidth
+    // 判断时左滑还是右滑
+    // 判断是否超过自动滚动到下一页还是回滚
+    if (state.direction == 'left') {
+      if (Math.abs(touches.pageX - touchRelactive.x) < itemAnimationWidth) {
+        list.forEach(function(item, index) {
+          var itemInstance = state.itemsInstance[index]
+          if (item && itemInstance) {
+            itemInstance.setStyle({
+              'transform': 'translate3d('+ item.translateX + 'px, 0px, 0px) scale(' + item.scale + ')',
+              'z-index': item.zIndex
+            })
+          }
+        })
+      } else {
+        var newIndex = state.currentIndex + 1 > list.length - 1 ? 0 : state.currentIndex + 1
+        switchNextSwiper(newIndex, touches, instance, state)
+        
+        updateCurrentSwiperIndex(newIndex, ownerInstance, state)
+      }
+    } else if (state.direction == 'right') {
+      if (Math.abs(touches.pageX - touchRelactive.x) < itemAnimationWidth) {
+        // 滑动显示图片回滚
+        var preIndex = (state.currentIndex == 0) ? list.length - 1 : state.currentIndex - 1
+        state.itemsInstance[preIndex].setStyle({
+          'transform': 'translate3d(-' + itemData.itemWidth + 'px, 0px, 0px) scale(1)',
+          'z-index': list[state.currentIndex].zIndex + 1,
+          'opacity': list[state.currentIndex].opacity
+        })
+        list.forEach(function(item, index) {
+          var itemInstance = state.itemsInstance[index]
+          if (item && itemInstance) {
+            itemInstance.setStyle({
+              'transform': 'translate3d('+ item.translateX + 'px, 0px, 0px) scale(' + item.scale + ')',
+              'z-index': item.zIndex,
+              'opacity': item.opacity
+            })
+          }
+        })
+      } else {
+        var newIndex = (state.currentIndex - 1 < 0) ? list.length - 1 : state.currentIndex - 1
+        switchPrevSwiper(newIndex, touches, instance, state)
+        
+        updateCurrentSwiperIndex(newIndex, ownerInstance, state)
+      }
+    }
+  } else if (itemData.direction === 'vertical') {
+    // 垂直方向移动
+    var itemAnimationHeight = state.itemAnimationHeight
+    // 判断时上滑还是下滑
+    // 判断是否超过自动滚动到下一页还是回滚
+    if (state.direction == 'up') {
+      if (Math.abs(touches.pageY - touchRelactive.y) < itemAnimationHeight) {
+        list.forEach(function(item, index) {
+          var itemInstance = state.itemsInstance[index]
+          if (item && itemInstance) {
+            itemInstance.setStyle({
+              'transform': 'translate3d(0px, '+ item.translateY + 'px, 0px) scale(' + item.scale + ')',
+              'z-index': item.zIndex,
+              'opacity': item.opacity
+            })
+          }
+        })
+      } else {
+        var newIndex = state.currentIndex + 1 > list.length - 1 ? 0 : state.currentIndex + 1
+        switchNextSwiper(newIndex, touches, instance, state)
+        
+        updateCurrentSwiperIndex(newIndex, ownerInstance, state)
+      }
+    } else if (state.direction == 'down') {
+      if (Math.abs(touches.pageY - touchRelactive.y) < itemAnimationHeight) {
+        // 滑动显示图片回滚
+        var preIndex = (state.currentIndex == 0) ? list.length - 1 : state.currentIndex - 1
+        state.itemsInstance[preIndex].setStyle({
+          'transform': 'translate3d(0px, -' + itemData.itemHeight + 'px, 0px) scale(1)',
+          'z-index': list[state.currentIndex].zIndex + 1,
+          'opacity': list[state.currentIndex].opacity
+        })
+        list.forEach(function(item, index) {
+          var itemInstance = state.itemsInstance[index]
+          if (item && itemInstance) {
+            itemInstance.setStyle({
+              'transform': 'translate3d(0px, '+ item.translateY + 'px, 0px) scale(' + item.scale + ')',
+              'z-index': item.zIndex,
+              'opacity': item.opacity
+            })
+          }
+        })
+      } else {
+        var newIndex = (state.currentIndex - 1 < 0) ? list.length - 1 : state.currentIndex - 1
+        switchPrevSwiper(newIndex, touches, instance, state)
+        
+        updateCurrentSwiperIndex(newIndex, ownerInstance, state)
+      }
+    }
+  }
+  
+  // 清除对应的标志位
+  state.touchRelactive = null
+  state.touching = false
+  state.direction = null
+  state.touchId = null
+  
+  ownerInstance.callMethod('changeTouchState', {
+    touching: false
+  })
+  // 重新开始执行自动轮播
+  ownerInstance.callMethod('setAutoPlay')
+}
+
+module.exports = {
+  itemDataObserver: itemDataObserver,
+  listObserver: listObserver,
+  swiperIndexChange: swiperIndexChange,
+  autoplayFlagChange: autoplayFlagChange,
+  touchStart: touchStart,
+  touchMove: touchMove,
+  touchEnd: touchEnd
+}
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-stack-swiper/tn-stack-swiper.vue b/tuniao-ui/components/tn-stack-swiper/tn-stack-swiper.vue
new file mode 100644
index 0000000..3982da5
--- /dev/null
+++ b/tuniao-ui/components/tn-stack-swiper/tn-stack-swiper.vue
@@ -0,0 +1,284 @@
+<template>
+  <view
+    class="tn-stack-swiper-class tn-stack-swiper"
+    :style="{
+      width: $tn.string.getLengthUnitValue(width),
+      height: $tn.string.getLengthUnitValue(height)
+    }"
+    :list="swiperList"
+    :itemData="itemData"
+    :currentIndex="swiperIndex"
+    :autoplayFlag="autoplayFlag"
+    :change:list="wxs.listObserver"
+    :change:itemData="wxs.itemDataObserver"
+    :change:currentIndex="wxs.swiperIndexChange"
+    :change:autoplayFlag="wxs.autoplayFlagChange"
+  >
+    <block v-for="(item, index) in list" :key="index">
+      <!-- #ifdef MP-WEIXIN -->
+      <view
+        class="tn-stack-swiper__item tn-stack-swiper__item__transition"
+        :class="[`tn-stack-swiper__item--${direction}`]"
+        :data-index="index"
+        :data-switchRate="switchRate"
+        @touchstart="wxs.touchStart"
+        :catch:touchmove="touching?wxs.touchMove:''"
+        :catch:touchend="touching?wxs.touchEnd:''"
+      >
+        <image class="tn-stack-swiper__image" mode="aspectFill" :src="item.image"></image>
+      </view>
+      <!-- #endif -->
+      
+      <!-- #ifndef MP-WEIXIN -->
+      <view
+        class="tn-stack-swiper__item"
+        :class="[`tn-stack-swiper__item--${direction}`]"
+        :data-index="index"
+        :data-switchRate="switchRate"
+        @touchstart="wxs.touchStart"
+        @touchmove="wxs.touchMove"
+        @touchend="wxs.touchEnd"
+      >
+        <image class="tn-stack-swiper__image" mode="aspectFill" :src="item.image"></image>
+      </view>
+      <!-- #endif -->
+    </block>
+  </view>
+</template>
+
+<!-- #ifdef MP-WEIXIN -->
+<script src="./index.wxs" lang="wxs" module="wxs"></script>
+<!-- #endif -->
+<!-- #ifndef MP-WEIXIN -->
+<script src="./index-h5.wxs" lang="wxs" module="wxs"></script>
+<!-- #endif -->
+<script>
+  export default {
+    name: 'tn-stack-swiper',
+    props: {
+      // 显示图片的列表数据
+      // {
+      //   // 图片地址
+      //   image: 'xxx'
+      // }
+      list: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 轮播容器的宽度 rpx
+      width: {
+        type: [String, Number],
+        default: '100%'
+      },
+      // 轮播容器的高度 rpx
+      height: {
+        type: [String, Number],
+        default: 500
+      },
+      // 自动切换
+      autoplay: {
+        type: Boolean,
+        default: false
+      },
+      // 自动切换时长 ms
+      interval: {
+        type: Number,
+        default: 5000
+      },
+      // 滑动切换移动比例, [0 - 100]
+      // 比例相对于item的宽度
+      switchRate: {
+        type: Number,
+        default: 30
+      },
+      // 缩放比例 [0-1]
+      scaleRate: {
+        type: Number,
+        default: 0.1
+      },
+      // 下一轮播偏移比例
+      translateRate: {
+        type: Number,
+        default: 16
+      },
+      // 下一轮播透明比例
+      opacityRate: {
+        type: Number,
+        default:10
+      },
+      // 滑动方向
+      // horizontal -> 水平 vertical -> 垂直
+      direction: {
+        type: String,
+        default: 'horizontal'
+      }
+    },
+    data() {
+      return {
+        autoplayTimer: null,
+        // window窗口的宽度
+        windowWidth: 0,
+        // 轮播item的宽度
+        swiperItemWidth: 0,
+        // 轮播item的高度
+        swiperItemHeight: 0,
+        // 当前选中的轮播item
+        swiperIndex: -1,
+        // 标记是否开始触摸
+        touching: true,
+        // 轮播列表信息
+        swiperList: [],
+        // 标记当前是否为自动播放
+        autoplayFlag: false
+      }
+    },
+    computed: {
+      itemData() {
+        return {
+          windowWidth: this.windowWidth,
+          itemWidth: this.swiperItemWidth,
+          itemHeight: this.swiperItemHeight,
+          direction: this.direction,
+          autoplaying: this.autoplayFlag
+        }
+      }
+    },
+    watch: {
+      list(val) {
+        this.swiperList = []
+        this.$nextTick(() => {
+          this.initSwiperRectInfo()
+        })
+      },
+      autoplay(val) {
+        if (!val) {
+          this.clearAutoPlayTimer()
+        } else {
+          this.setAutoPlay()
+        }
+      }
+    },
+    created() {
+      this.autoplayFlag = this.autoplay
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.initSwiperRectInfo()
+      })
+    },
+    destroyed() {
+      this.clearAutoPlayTimer()
+    },
+    methods: {
+      // 初始化轮播容器信息
+      async initSwiperRectInfo() {
+        // 用于一开始绑定事件
+        // this.touching = true
+        // 获取轮播item的宽度
+        const swiperItemRect = await this._tGetRect('.tn-stack-swiper__item')
+        if (!swiperItemRect || !swiperItemRect.width || !swiperItemRect.height) {
+          setTimeout(() => {
+            this.initSwiperRectInfo()
+          }, 50)
+          return
+        }
+        this.swiperItemWidth = swiperItemRect.width
+        this.swiperItemHeight = swiperItemRect.height
+        // this.touching = false
+        
+        // 获取系统的窗口宽度信息
+        const systemInfo = uni.getSystemInfoSync()
+        this.windowWidth = systemInfo.windowWidth
+        this.swiperIndex = 0
+        
+        // 设置对应swiper元素的位置和层级信息
+        this.swiperList = this.list.map((item, index) => {
+          
+          const scale = 1 - (this.scaleRate * index)
+          
+          if (this.direction === 'horizontal') {
+            item.translateX = ((index * this.translateRate) * 0.01 * this.swiperItemWidth)
+          } else if (this.direction === 'vertical') {
+            item.translateY = ((index * this.translateRate) * 0.01 * this.swiperItemHeight)
+          }
+          item.opacity = (1 - ((index * this.opacityRate) * 0.01))
+          item.zIndex = this.list.length - index
+          item.scale = scale <= 0 ? 0 : scale
+          
+          return item
+        })
+        
+        this.setAutoPlay()
+      },
+      // 设置自动切换轮播
+      setAutoPlay() {
+        if (this.autoplay) {
+          this.clearAutoPlayTimer()
+          this.autoplayFlag = true
+          this.autoplayTimer = setInterval(() => {
+            this.swiperIndex = this.swiperIndex + 1 > this.swiperList.length - 1 ? 0 : this.swiperIndex + 1
+          }, this.interval)
+        }
+      },
+      // 清除自动切换定时器
+      clearAutoPlayTimer() {
+        if (this.autoplayTimer != null) {
+          this.autoplayFlag = false
+          clearInterval(this.autoplayTimer)
+        }
+      },
+      // 修改轮播选中index
+      changeSwiperIndex(e) {
+        // console.log(e.index);
+        this.swiperIndex = e.index
+        this.$emit('change', { index: e.index })
+      },
+      // 修改触摸状态
+      changeTouchState(e) {
+        this.touching = e.touching
+      },
+      // 打印日志
+      printLog(data) {
+        console.log("log", data);
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-stack-swiper {
+    position: relative;
+    
+    &__item {
+      position: absolute;
+      border-radius: 20rpx;
+      overflow: hidden;
+      
+      &--horizontal {
+        width: 88%;
+        height: 100%;
+        transform-origin: left center;
+      }
+      
+      &--vertical {
+        width: 100%;
+        height: 88%;
+        transform-origin: top center;
+      }
+      
+      &__transition {
+        transition-property: transform,opacity;
+        transition-duration: 0.25s;
+        transition-timing-function: ease-out;
+        // transition: transform, opacity 0.25s ease-in-out !important;
+      }
+    }
+    
+    &__image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-steps/tn-steps.vue b/tuniao-ui/components/tn-steps/tn-steps.vue
new file mode 100644
index 0000000..e43ba61
--- /dev/null
+++ b/tuniao-ui/components/tn-steps/tn-steps.vue
@@ -0,0 +1,346 @@
+<template>
+  <view
+    class="tn-steps-class tn-steps"
+    :style="{
+      flexDirection: direction
+    }"
+  >
+    <view
+      v-for="(item, index) in list"
+      :key="index"
+      class="tn-steps__item"
+      :class="[`tn-steps__item--${direction}`]"
+      @tap="clickStepItem(index)"
+    >
+      <!-- 数值模式 -->
+      <view
+        v-if="mode === 'number'"
+        class="tn-steps__item__number"
+        :style="{
+          backgroundColor: currentIndex <= index ? 'transparent' : activeColor,
+          borderColor: currentIndex <= index ? inActiveColor : activeColor
+        }"
+      >
+        <text
+          class="tn-steps__item__number__text"
+          :class="[{'tn-steps__item__number__text--visible': currentIndex <= index}]"
+          :style="{
+            color: currentIndex <= index ? inActiveColor : activeColor
+          }"
+        >
+          {{ index + 1}}
+        </text>
+        <view class="tn-steps__item__number__icon" :class="[`tn-icon-${item.icon || icon}`,{'tn-steps__item__number__icon--visible': currentIndex > index}]"></view>
+      </view>
+      
+      <!-- 点模式 -->
+      <view
+        v-if="mode === 'dot'"
+        class="tn-steps__item__dot"
+        :style="{
+          backgroundColor: currentIndex <= index ? inActiveColor : activeColor
+        }"
+      ></view>
+      
+      <!-- 图标模式 -->
+      <view
+        v-if="mode === 'icon'"
+        class="tn-steps__item__icon"
+        :class="[iconModeClass(index)]"
+        :style="{
+          color: currentIndex <= index ? inActiveColor : activeColor
+        }"
+      ></view>
+      
+      <!-- 点图标模式 -->
+      <view v-if="mode === 'dotIcon'" class="tn-steps__item__dot-icon">
+        <view v-if="currentIndex <= index" class="tn-steps__item__dot-icon--dot" :style="{backgroundColor: inActiveColor}"></view>
+        <view v-else class="tn-steps__item__dot-icon--icon" :class="[iconModeClass(index)]" :style="{color: activeColor}"></view>
+      </view>
+      
+      <!-- 步骤下的文字 -->
+      <text
+        v-if="showTitle"
+        class="tn-steps__item__text tn-text-ellipsis"
+        :class="[`tn-steps__item__text--${direction}`]"
+        :style="{
+          color: currentIndex <= index ? inActiveColor : activeColor
+        }"
+      >
+        {{ item.name }}
+      </text>
+      
+      <!-- 连接的横线 -->
+      <view
+        v-if="index < list.length - 1"
+        class="tn-steps__item__line"
+        :class="[`tn-steps__item__line--${mode}`]"
+        :style="{
+          borderColor: currentIndex <= index + 1 ? inActiveColor : activeColor
+        }"
+      ></view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-steps',
+    props: {
+      // 模式类型
+      // dot -> 点 number -> 数字 icon -> 图标 dotIcon -> 点图标
+      mode: {
+        type: String,
+        default: 'dot'
+      },
+      // 步骤条的方向
+      // row -> 横向 column -> 竖向
+      direction: {
+        type: String,
+        default: 'row'
+      },
+      // 步骤条数据
+      list: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 当前激活的步数
+      current: {
+        type: Number,
+        default: 0
+      },
+      // 激活步骤的颜色
+      activeColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 未激活步骤的颜色
+      inActiveColor: {
+        type: String,
+        default: '#AAAAAA'
+      },
+      // 激活后显示的图标，在数字模式下有效
+      icon: {
+        type: String,
+        default: 'success'
+      },
+      // 是否显示标题
+      showTitle: {
+        type: Boolean,
+        default: true
+      }
+    },
+    computed: {
+      // icon模式下图标的值
+      iconModeClass() {
+        return (index) => {
+          const item = this.list[index]
+          // 状态被选中并且对应数据下存在selectIcon属性
+          if (this.currentIndex > index && item.hasOwnProperty('selectIcon')) {
+            return `tn-icon-${item.selectIcon}`
+          } else {
+            // 未选中
+            return `tn-icon-${item.icon || this.icon}`
+          }
+        }
+      }
+    },
+    data() {
+      return {
+        currentIndex: 0
+      }
+    },
+    watch: {
+      current: {
+        handler(val) {
+          this.currentIndex = val
+        },
+        immediate: true
+      }
+    },
+    methods: {
+      // 点击了某一个选项
+      clickStepItem(index) {
+        const chooseIndex = index + 1
+        this.currentIndex = chooseIndex
+        this.$emit('click', { index: chooseIndex })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  $tn-steps-item-number-width: 44rpx;
+  $tn-steps-item-dot-width: 20rpx;
+  
+  .tn-steps {
+    display: flex;
+    flex-direction: row;
+    
+    &__item {
+      flex: 1;
+      position: relative;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      min-width: 100rpx;
+      font-size: 28rpx;
+      text-align: center;
+      
+      &__number {
+        // display: flex;
+        // flex-wrap: wrap;
+        // align-items: center;
+        // justify-content: center;
+        position: relative;
+        width: $tn-steps-item-number-width;
+        height: $tn-steps-item-number-width;
+        line-height: calc(#{$tn-steps-item-number-width} - 2rpx);
+        border: 1px solid #AAAAAA;
+        border-radius: 50%;
+        overflow: hidden;
+        transition: all 0.3s linear;
+        
+        &__text {
+          position: absolute;
+          top: 0;
+          right: 0;
+          bottom: 0;
+          left: 0;
+          margin: auto;
+          transition: inherit;
+          transform: translateY(-#{$tn-steps-item-number-width});
+          
+          &--visible {
+            transform: translateY(0);
+          }
+        }
+        
+        &__icon {
+          position: absolute;
+          top: 0;
+          right: 0;
+          bottom: 0;
+          left: 0;
+          margin: auto;
+          color: #FFFFFF;
+          transition: all 0.3s linear;
+          transform: translateY(#{$tn-steps-item-number-width});
+          
+          &--visible {
+            transform: translateY(0);
+          }
+        }
+      }
+      
+      &__dot {
+        width: $tn-steps-item-dot-width;
+        height: $tn-steps-item-dot-width;
+        display: flex;
+        flex-direction: row;
+        border-radius: 50%;
+        transition: all 0.3s linear;
+        
+        &--icon {
+          width: $tn-steps-item-number-width;
+          height: $tn-steps-item-number-width;
+        }
+      }
+      
+      &__icon {
+        width: $tn-steps-item-number-width;
+        height: $tn-steps-item-number-width;
+        font-size: $tn-steps-item-number-width;
+        transition: all 0.3s linear;
+      }
+      
+      &__dot-icon {
+        width: $tn-steps-item-number-width;
+        height: $tn-steps-item-number-width;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        transition: all 0.3s linear;
+        
+        &--dot {
+          width: $tn-steps-item-dot-width;
+          height: $tn-steps-item-dot-width;
+          border-radius: 50%;
+          transition: inherit;
+        }
+        
+        &--icon {
+          width: $tn-steps-item-number-width;
+          height: $tn-steps-item-number-width;
+          font-size: $tn-steps-item-number-width;
+          transition: inherit;
+        }
+      }
+      
+      &__text {
+        transition: all 0.3s linear;
+        &--row {
+          margin-top: 14rpx;
+        }
+        
+        &--column {
+          margin-left: 14rpx;
+        }
+      }
+      
+      &__line {
+        position: absolute;
+        z-index: 0;
+        vertical-align: middle;
+        transition: all 0.3s linear;
+      }
+      
+      &--row {
+        display: flex;
+        flex-direction: column;
+        
+        .tn-steps__item__line {
+          border-bottom-width: 1px;
+          border-bottom-style: solid;
+          width: 50%;
+          left: 75%;
+          
+          &--dot {
+            top: calc(#{$tn-steps-item-dot-width} / 2);
+          }
+          
+          &--number, &--icon, &--dotIcon {
+            top: calc(#{$tn-steps-item-number-width} / 2);
+          }
+        }
+      }
+      
+      &--column {
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        min-height: 120rpx;
+        
+        .tn-steps__item__line {
+          border-left-width: 1px;
+          border-left-style: solid;
+          height: 50%;
+          top: 75%;
+          
+          &--dot {
+            left: calc(#{$tn-steps-item-dot-width} / 2);
+          }
+          
+          &--number, &--icon, &--dotIcon {
+            left: calc(#{$tn-steps-item-number-width} / 2);
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-sticky/tn-sticky.vue b/tuniao-ui/components/tn-sticky/tn-sticky.vue
new file mode 100644
index 0000000..a3d04e8
--- /dev/null
+++ b/tuniao-ui/components/tn-sticky/tn-sticky.vue
@@ -0,0 +1,186 @@
+<template>
+  <view class="tn-sticky-class">
+    <view
+      class="tn-sticky__wrap"
+      :class="[stickyClass]"
+      :style="[stickyStyle]"
+    >
+      <view
+        class="tn-sticky__item"
+        :style="{
+          position: fixed ? 'fixed' : 'static',
+          top: stickyTop + 'px',
+          left: left + 'px',
+          width: width === 'auto' ? 'auto' : width + 'px',
+          zIndex: elZIndex
+        }"
+      >
+        <slot></slot>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-sticky',
+    props: {
+      // 吸顶容器到顶部某个距离的时候进行吸顶
+      // 在H5中，customNavBar的高度为45px
+      offsetTop: {
+        type: Number,
+        default: 0
+      },
+      // H5顶部导航栏的高度
+      h5NavHeight: {
+        type: Number,
+        default: 45
+      },
+      // 自定义顶部导航栏高度
+      customNavHeight: {
+        type: Number,
+        default: 0
+      },
+      // 是否开启吸顶
+      enabled: {
+        type: Boolean,
+        default: true
+      },
+      // 吸顶容器的背景颜色
+      backgroundColor: {
+        type: String,
+        default: '#FFFFFF'
+      },
+      // z-index
+      zIndex: {
+        type: Number,
+        default: 0
+      },
+      // 索引值，区分不同的吸顶组件
+      index: {
+        type: [String, Number],
+        default: ''
+      }
+    },
+    computed: {
+      elZIndex() {
+        return this.zIndex ? this.zIndex : this.$tn.zIndex.sticky
+      },
+      backgroundColorStyle() {
+        return this.$tn.color.getBackgroundColorStyle(this.backgroundColor)
+      },
+      backgroundColorClass() {
+        return this.$tn.color.getBackgroundColorInternalClass(this.backgroundColor)
+      },
+      stickyClass() {
+        let clazz = ''
+        clazz += this.elClass
+        if (this.backgroundColorClass) {
+          clazz += ` ${this.backgroundColorClass}`
+        }
+        return clazz
+      },
+      stickyStyle() {
+        let style = {}
+        style.height = this.fixed ? this.height + 'px' : 'auto'
+        if (this.backgroundColorStyle) {
+          style.color = this.backgroundColorStyle
+        }
+        if (this.elZIndex) {
+          style.zIndex = this.elZIndex
+        }
+        return style
+      }
+    },
+    data() {
+      return {
+        // 监听组件别名
+        stickyObserverName: 'tnStickyObserver',
+        // 组件的唯一编号
+        elClass: this.$tn.uuid(),
+        // 是否固定
+        fixed: false,
+        // 高度
+        height: 'auto',
+        // 宽度
+        width: 'auto',
+        // 距离顶部的距离
+        stickyTop: 0,
+        // 左边距离
+        left: 0
+      }
+    },
+    watch: {
+      offsetTop(val) {
+        this.initObserver()
+      },
+      enabled(val) {
+        if (val === false) {
+          this.fixed = false
+          this.disconnectObserver(this.stickyObserverName)
+        } else {
+          this.initObserver()
+        }
+      },
+      customNavHeight(val) {
+        this.initObserver()
+      }
+    },
+    mounted() {
+      this.initObserver()
+    },
+    methods: {
+      // 初始化监听组件的布局状态
+      initObserver() {
+        if (!this.enabled) return
+        // #ifdef H5
+        this.stickyTop = this.offsetTop != 0 ? uni.upx2px(this.offsetTop) + this.h5NavHeight : this.h5NavHeight
+        // #endif
+         // #ifndef H5
+         this.stickyTop = this.offsetTop != 0 ? uni.upx2px(this.offsetTop) + this.customNavHeight : this.customNavHeight
+         // #endif
+         
+         this.disconnectObserver(this.stickyObserverName)
+         this._tGetRect('.' + this.elClass).then((res) => {
+           this.height = res.height
+           this.left = res.left
+           this.width = res.width
+           this.$nextTick(() => {
+             this.connectObserver()
+           })
+         })
+      },
+      // 监听组件的布局状态
+      connectObserver() {
+        this.disconnectObserver(this.stickyObserverName)
+        // 组件内获取布局状态，不能用uni.createIntersectionObserver，而必须用this.createIntersectionObserver
+        const contentObserver = this.createIntersectionObserver({
+          thresholds: [0.95, 0.98, 1]
+        })
+        contentObserver.relativeToViewport({
+          top: -this.stickyTop
+        })
+        contentObserver.observe('.' + this.elClass, res => {
+          if (!this.enabled) return
+          this.setFixed(res.boundingClientRect.top)
+        })
+        this[this.stickyObserverName] = contentObserver
+      },
+      // 设置是否固定
+      setFixed(top) {
+        const fixed = top < this.stickyTop
+        if (fixed) this.$emit('fixed', this.index)
+        else if (this.fixed) this.$emit('unfixed', this.index)
+        this.fixed = fixed
+      },
+      // 停止监听组件的布局状态
+      disconnectObserver(observerName) {
+        const observer = this[observerName]
+        observer && observer.disconnect()
+      }
+    }
+  }
+</script>
+
+<style>
+</style>
diff --git a/tuniao-ui/components/tn-subsection/tn-subsection.vue b/tuniao-ui/components/tn-subsection/tn-subsection.vue
new file mode 100644
index 0000000..fef2dc6
--- /dev/null
+++ b/tuniao-ui/components/tn-subsection/tn-subsection.vue
@@ -0,0 +1,414 @@
+<template>
+	<view class="tn-subsection-class tn-subsection" :class="[subsectionBackgroundColorClass]"
+		:style="[subsectionStyle]">
+		<!-- 滑块 -->
+		<block v-for="(item, index) in listInfo" :key="index">
+			<view class="tn-subsection__item tn-text-ellipsis" :class="[
+          'section-item-' + index,
+          noBorderRight(index)
+        ]" :style="[itemStyle(index)]" @tap="click(index)">
+				<view class="tn-subsection__item--text tn-text-ellipsis" :style="[textStyle(index)]">
+					{{ item.name }}
+				</view>
+			</view>
+		</block>
+		<!-- 背景 -->
+		<view class="tn-subsection__bg" :class="[itemBarClass]" :style="[itemBarStyle]"></view>
+	</view>
+</template>
+
+<script>
+	import componentsColorMixin from '../../libs/mixin/components_color.js'
+	export default {
+		mixins: [componentsColorMixin],
+		name: 'tn-subsection',
+		props: {
+			// 模式选择
+			// button 按钮模式 subsection 分段模式
+			mode: {
+				type: String,
+				default: 'subsection'
+			},
+			// 组件高度
+			height: {
+				type: Number,
+				default: 60
+			},
+			// tab的数据
+			list: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// 当前活动tab的index
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			// 激活时的字体颜色
+			activeColor: {
+				type: String,
+				default: '#FFFFFF'
+			},
+			// 未激活时的字体颜色
+			inactiveColor: {
+				type: String,
+				default: '#AAAAAA'
+			},
+			// 激活tab的字体是否加粗
+			bold: {
+				type: Boolean,
+				default: false
+			},
+			backgroundColor: {
+				type: String,
+				default: '#F4F4F4'
+			},
+			// 滑块的颜色
+			buttonColor: {
+				type: String,
+				default: '#01BEFF'
+			},
+			// 当mode为button时生效，圆角的值，单位rpx
+			borderRadius: {
+				type: Number,
+				default: 10
+			},
+			// 是否开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 动画类型
+			// cubic-bezier -> 贝塞尔曲线
+			animationType: {
+				type: String,
+				default: ''
+			},
+			// 滑动滑块的是否，是否触发震动
+			vibrateShort: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				// 列表数据
+				listInfo: [],
+				// 子元素的背景样式
+				itemBgStyle: {
+					width: 0,
+					left: 0,
+					backgroundColor: '#ffffff',
+					height: '100%'
+				},
+				// 当前选中的滑块
+				currentIndex: this.current,
+				buttonPadding: 3,
+				// 组件初始化的是否current变换不应该震动
+				firstVibrateShort: true
+			}
+		},
+		watch: {
+			list: {
+				handler(val) {
+					this.listInfo = val.map((item, index) => {
+						if (typeof item !== 'object') {
+							let obj = {
+								width: 0,
+								name: item
+							}
+							return obj
+						} else {
+							item.width = 0
+							return obj
+						}
+					})
+				},
+				immediate: true,
+				deep: true
+			},
+			current: {
+				handler(val) {
+					this.currentIndex = val
+					this.changeSectionStatus(val)
+				},
+				immediate: true
+			}
+		},
+		created() {
+			// 将list的数据，传入listInfo数组
+			// 接受直接数组形式，或者数组元素为对象的形式，如：['开启', '关闭'],或者[{name: '开启'}, {name: '关闭'}]
+			this.listInfo = this.list.map((item, index) => {
+				if (typeof item !== 'object') {
+					let obj = {
+						width: 0,
+						name: item
+					}
+					return obj
+				} else {
+					item.width = 0
+					return obj
+				}
+			})
+		},
+		computed: {
+			// 设置mode=subsection时，滑块没有样式
+			noBorderRight() {
+				return index => {
+					if (this.mode !== 'subsection') return
+					let clazz = ''
+					// 不显示右边的边距
+					if (index < this.list.length - 1) clazz += ' tn-subsection__item--none-border-right'
+					// 显示整个组件的左右边圆角
+					if (index === 0) clazz += ' tn-subsection__item--first'
+					if (index === this.list.length - 1) clazz += ' tn-subsection__item--last'
+					return clazz
+				}
+			},
+			// 文字的样式
+			textStyle() {
+				return index => {
+					let style = {}
+					// 设置字体颜色
+					if (index === this.currentIndex) {
+						style.color = this.activeColor
+					} else {
+						style.color = this.inactiveColor
+					}
+					// 字体加粗
+					if (index === this.currentIndex && this.bold) style.fontWeight = 'bold'
+					// 文字大小
+					style.fontSize = (this.fontSize || 26) + this.fontUnit
+					return style
+				}
+			},
+			// 每个分段器item的样式
+			itemStyle() {
+				return index => {
+					let style = {}
+					if (this.fontSizeStyle) {
+						style.fontSize = this.fontSizeStyle
+					}
+					if (this.mode === 'subsection') {
+						// 设置border的样式
+						style.borderColor = this.buttonColor
+						style.borderWidth = '1rpx'
+						style.borderStyle = 'solid'
+					}
+					return style
+				}
+			},
+			// mode = button时，设置外层view的样式
+			subsectionStyle() {
+				let style = {}
+				style.height = this.height + 'rpx'
+				if (this.mode === 'button') {
+					style.backgroundColor = this.backgroundColorStyle
+					style.padding = `${this.buttonPadding}px`
+					style.borderRadius = `${this.borderRadius}rpx`
+				}
+				return style
+			},
+			// mode = button时，设置外层view的背景class
+			subsectionBackgroundColorClass() {
+				let clazz = ''
+				if (this.mode === 'button' && this.backgroundColorClass) {
+					clazz = this.backgroundColorClass
+				}
+				return clazz
+			},
+			itemBarClass() {
+				let clazz = ''
+				const buttonBgClass = this.$tn.color.getBackgroundColorInternalClass(this.buttonColor)
+				if (this.animation) {
+					clazz += ' tn-subsection__bg__animation'
+					if (this.animationType) {
+						clazz += ` tn-subsection__bg__animation--${this.animationType}`
+					}
+				}
+				if (buttonBgClass) {
+					clazz += ` ${buttonBgClass}`
+				}
+				return clazz
+			},
+			// 滑块样式
+			itemBarStyle() {
+				let style = {}
+				const buttonBgStyle = this.$tn.color.getBackgroundColorStyle(this.buttonColor)
+				if (buttonBgStyle) {
+					style.backgroundColor = this.buttonColor
+				}
+				style.zIndex = 1
+				if (this.mode === 'button') {
+					style.borderRadius = `${this.borderRadius}rpx`
+					style.bottom = `${this.buttonPadding}px`
+					style.height = (this.height - (this.buttonPadding * 4)) + 'rpx'
+					style.zIndex = 0
+				}
+				return Object.assign(this.itemBgStyle, style)
+			}
+		},
+		mounted() {
+			// 等待加载组件完成
+			setTimeout(() => {
+				this.getTabsInfo()
+			}, 10)
+		},
+		methods: {
+			// 改变滑块样式
+			changeSectionStatus(val) {
+				if (this.mode === 'subsection') {
+					// 根据滑块在最左和最右时，显示对应的圆角
+					if (val === this.list.length - 1) {
+						this.itemBgStyle.borderRadius = `0 ${this.buttonPadding}px ${this.buttonPadding}px 0`
+					}
+					if (val === 0) {
+						this.itemBgStyle.borderRadius = `${this.buttonPadding}px 0 0 ${this.buttonPadding}px`
+					}
+					if (val > 0 && val < this.list.length - 1) {
+						this.itemBgStyle.borderRadius = '0'
+					}
+				}
+				// 更新滑块的位置
+				setTimeout(() => {
+					this.itemBgLeft()
+				}, 10)
+				if (this.vibrateShort && !this.firstVibrateShort) {
+					// 使手机产生短促震动，微信小程序有效，APP(HX 2.6.8)和H5无效
+					// #ifndef H5
+					uni.vibrateShort();
+					// #endif
+				}
+				this.firstVibrateShort = false
+			},
+			// 获取各个tab的节点信息
+			getTabsInfo() {
+				let view = uni.createSelectorQuery().in(this)
+				for (let i = 0; i < this.list.length; i++) {
+					view.select('.section-item-' + i).boundingClientRect()
+				}
+				view.exec(res => {
+					// 如果没有获取到，则重新获取
+					if (!res.length) {
+						setTimeout(() => {
+							this.getTabsInfo()
+							return
+						}, 10)
+					}
+					// 将每个分段器的宽度放入listInfo中
+					res.map((item, index) => {
+						this.listInfo[index].width = item.width
+					})
+					// 初始化滑块的宽度
+					if (this.mode === 'subsection') {
+						this.itemBgStyle.width = this.listInfo[0].width + 'px'
+					} else if (this.mode === 'button') {
+						this.itemBgStyle.width = this.listInfo[0].width + 'px'
+					}
+
+					// 初始化滑块的位置
+					this.itemBgLeft()
+				})
+			},
+			// 设置滑块的位置
+			itemBgLeft() {
+				let left = 0
+				// 计算当前活跃item到组件左边的距离
+				this.listInfo.map((item, index) => {
+					if (index < this.currentIndex) left += item.width
+				})
+				// 根据不同的模式，计算滑块的位置
+				if (this.mode === 'subsection') {
+					this.itemBgStyle.left = left + 'px'
+				} else if (this.mode === 'button') {
+					this.itemBgStyle.left = left + this.buttonPadding + 'px'
+				}
+			},
+
+			// 点击事件
+			click(index) {
+				// 不允许点击当前激活的选项
+				if (index === this.currentIndex) return
+				this.currentIndex = index
+				this.changeSectionStatus(index)
+				this.$emit('change', {
+					index: Number(index),
+					name: this.listInfo[index]['name']
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tn-subsection {
+		/* #ifndef APP-PLUS */
+		display: flex;
+		flex-direction: row;
+		/* #endif */
+		align-items: center;
+		overflow: hidden;
+		position: relative;
+
+		&__item {
+			/* #ifndef APP-PLUS */
+			display: flex;
+			flex-direction: row;
+			/* #endif */
+			flex: 1;
+			text-align: center;
+			font-size: 26rpx;
+			height: 100%;
+			align-items: center;
+			justify-content: center;
+			color: #FFFFFF;
+			padding: 0 6rpx;
+
+
+			&--text {
+				transition: all 0.3s;
+				color: #FFFFFF;
+				/* #ifndef APP-PLUS */
+				display: flex;
+				flex-direction: row;
+				/* #endif */
+				align-items: center;
+				position: relative;
+				z-index: 3;
+			}
+
+			&--first {
+				border-top-left-radius: 8rpx;
+				border-bottom-left-radius: 8rpx;
+			}
+
+			&--last {
+				border-top-right-radius: 8rpx;
+				border-bottom-right-radius: 8rpx;
+			}
+
+			&--none-border-right {
+				border-right: none !important;
+			}
+		}
+
+		&__bg {
+			background-color: $tn-main-color;
+			position: absolute;
+			z-index: -1;
+			transition-property: all;
+			transition-duration: 0s;
+			transition-timing-function: linear;
+
+			&__animation {
+				transition-duration: 0.25s !important;
+
+				&--cubic-bezier {
+					transition-timing-function: cubic-bezier(0.68, -0.55, 0.265, 1.55) !important;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-swipe-action-item/index.wxs b/tuniao-ui/components/tn-swipe-action-item/index.wxs
new file mode 100644
index 0000000..977b970
--- /dev/null
+++ b/tuniao-ui/components/tn-swipe-action-item/index.wxs
@@ -0,0 +1,230 @@
+/**
+ * 此为wxs模块，只支持APP-VUE，微信和QQ小程序以及H5平台
+ * wxs内部不支持es6语法，变量只能使用var定义，无法使用解构，箭头函数等特性
+ */
+
+// 开始触摸
+function touchStart(event, ownerInstance) {
+  // 触发事件的组件的ComponentDescriptor实例
+  var instance = event.instance
+  // wxs内的局部变量快照，此快照是属于整个组件，在touchstart和touchmove事件中都能获取到相同的结果
+  var state = instance.getState()
+  if (state.disabled) return
+  var touches = event.touches
+  // 如果进行的是多指触控，不允许操作
+  if (touches && touches.length > 1) return
+  // 标识当前为滑动中状态
+  state.moving = true
+  // 记录触摸开始点的坐标点
+  state.startX = touches[0].pageX
+  state.startY = touches[0].pageY
+  // 记录开始触摸的时间
+  state.touchStartTime = getDate().getTime()
+  
+  ownerInstance.callMethod('closeOther')
+}
+
+// 触摸滑动
+function touchMove(event, ownerInstance) {
+  // 触发事件的组件的ComponentDescriptor实例
+  var instance = event.instance
+  // wxs内的局部变量快照，此快照是属于整个组件，在touchstart和touchmove事件中都能获取到相同的结果
+  var state = instance.getState()
+  if (state.disabled || !state.moving) return
+  var touches = event.touches
+  var pageX = touches[0].pageX
+  var pageY = touches[0].pageY
+  var moveX = pageX - state.startX
+  var moveY = pageY - state.startY
+  var buttonsWidth = state.buttonsWidth
+  
+  // 移动的X轴距离大于Y轴距离，也即终点与起点位置连线，与X轴夹角小于45度时，禁止页面滚动
+  if (Math.abs(moveX) > Math.abs(moveY) || Math.abs(moveX) > state.threshold) {
+    // event.preventDefault && event.preventDefault()
+    // event.stopPropagation && event.stopPropagation()
+  }
+  // 移动的Y轴距离大于X轴距离，也即终点与起点位置连线，与Y轴夹角小于45度时，认为页面时上下滑动而不是左右滑动单元格
+  if (Math.abs(moveX) < Math.abs(moveY)) return
+  
+  // 限制右滑的距离，不允许内容部分往右偏移，右滑会导致X轴偏移值大于0，以此做判断
+  // 此处不能直接return，因为滑动过程中会缺失某些关键点坐标，会导致错乱，所以处理的方法是在超出后设置为0
+  if (state.status === 'open') {
+    // 在开启状态下，忽略左滑动
+    if (moveX < 0) moveX = 0
+    // 要收起菜单，最大能移动的距离为按钮的总宽度
+    if (moveX > buttonsWidth) moveX = buttonsWidth
+    // 如果是已经打开的状态，向左滑动时，移动收起菜单
+    moveSwipeAction(-buttonsWidth + moveX, instance, ownerInstance)
+  } else {
+    // 关闭状态下，忽略右滑
+    if (moveX > 0) return
+    // 滑动的距离不允许超过所有按钮的总宽度，此时只能左滑
+    // 滑动距离设置为按钮的宽度（负数）
+    if (Math.abs(moveX) > buttonsWidth) moveX = -buttonsWidth
+    // 在滑动过程中不断移动单元格内容，使其不断显示出来
+    moveSwipeAction(moveX, instance, ownerInstance)
+  }
+}
+
+// 触摸结束
+function touchEnd(event, ownerInstance) {
+  // 触发事件的组件的ComponentDescriptor实例
+  var instance = event.instance
+  // wxs内的局部变量快照，此快照是属于整个组件，在touchstart和touchmove事件中都能获取到相同的结果
+  var state = instance.getState()
+  if (!state.moving || state.disabled) return
+  var touches = event.changedTouches ? event.changedTouches[0] : {}
+  var pageX = touches.pageX
+  var pageY = touches.pageY
+  var moveX = pageX - state.startX
+  if (state.status === 'open') {
+    // 在开启状态下，忽略左滑动
+    if (moveX < 0) moveX = 0
+    // 在开启状态下，点击一下内容区域，moveX为0，也即没有移动，这是执行收起操作
+    if (moveX === 0) {
+      return closeSwipeAction(instance, ownerInstance)
+    }
+    
+    // 在开启状态下，滑动距离小于阈值，则默认不关闭同时恢复原来的打开状态
+    if (Math.abs(moveX) < state.threshold) {
+      openSwipeAction(instance, ownerInstance)
+    } else {
+      // 如果滑动距离大于阈值则执行收起逻辑
+      closeSwipeAction(instance, ownerInstance)
+    }
+  } else {
+    
+    // 获取手指离开的时间
+    var touchEndTime = getDate().getTime()
+    // 判断是否点击了
+    if (Math.abs(pageX - state.startX) < 5 && Math.abs(pageY - state.startY) < 5 && touchEndTime - state.touchStartTime < 100) {
+      ownerInstance.callMethod('handlerItemClick')
+    }
+    
+    // 在关闭状态下，忽略右滑动
+    if (moveX > 0) return
+    if (Math.abs(moveX) < state.threshold) {
+      closeSwipeAction(instance, ownerInstance)
+    } else {
+      openSwipeAction(instance, ownerInstance)
+    }
+  }
+}
+
+// 获取过渡时间
+function getDuration(value) {
+  if (value.toString().indexOf('s') >= 0) return value
+  return value > 30 ? value + 'ms' : value + 's'
+}
+
+// 移动滑动选择器内容区域，同时显示出其隐藏的菜单
+function moveSwipeAction(moveX, instance, ownerInstance) {
+  var state = instance.getState()
+  // 获取所有按钮的实例，需要通过它去设置按钮的位移
+  var buttons = ownerInstance.selectAllComponents('.tn-swipe-action-item__right__button')
+  
+  // 设置菜单内容部分的偏移
+  instance.requestAnimationFrame(function () {
+    instance.setStyle({
+      // 设置translateX的值
+      'transition': 'none',
+      transform: 'translateX('+ moveX +'px)',
+      '-webkit-transform': 'translateX('+ moveX +'px)'
+    })
+  })
+}
+
+// 一次性展开滑动菜单
+function openSwipeAction(instance, ownerInstance) {
+  var state = instance.getState()
+  // 获取所有按钮的实例，需要通过它去设置按钮的位移
+  var buttons = ownerInstance.selectAllComponents('.tn-swipe-action-item__right__button')
+  // 处理duration单位问题
+  var duration = getDuration(state.duration)
+  // 展开过程中，是向左移动，所以x的偏移应该是负值
+  var buttonsWidth = -state.buttonsWidth
+  instance.requestAnimationFrame(function () {
+    // 设置菜单主体内容
+    instance.setStyle({
+      'transition': 'transform ' + duration,
+      'transform': 'translateX('+ buttonsWidth +'px)',
+      '-webkit-transform': 'translateX('+ buttonsWidth +'px)'
+    })
+  })
+  setStatus('open', instance, ownerInstance)
+}
+
+// 一次性收起滑动菜单
+function closeSwipeAction(instance, ownerInstance) {
+  var state = instance.getState()
+  // 获取所有按钮的实例，需要通过它去设置按钮的位移
+  var buttons = ownerInstance.selectAllComponents('.tn-swipe-action-item__right__button')
+  var len = buttons.length
+  // 处理duration单位问题
+  var duration = getDuration(state.duration)
+  instance.requestAnimationFrame(function () {
+    // 设置菜单主体内容
+    instance.setStyle({
+      'transition': 'transform ' + duration,
+      'transform': 'translateX(0px)',
+      '-webkit-transform': 'translateX(0px)'
+    })
+    // 设置各个隐藏按钮的收起状态
+    for (var i = len - 1; i >= 0; i--) {
+      buttons[i].setStyle({
+        'transition': 'transform ' + duration,
+        'transform': 'translateX(0px)',
+        '-webkit-transform': 'translateX(0px)'
+      })
+    }
+  })
+  setStatus('close', instance, ownerInstance)
+}
+
+// 标记菜单的当前状态，open - 打开 close - 关闭
+function setStatus(status, instance, ownerInstance) {
+  var state = instance.getState()
+  state.status = status
+  ownerInstance.callMethod('setStatus', status)
+}
+
+// status的状态发生变化
+function statusChange(newValue, oldValue, ownerInstance, instance) {
+  var state = instance.getState()
+  if (state.disabled) return
+  // 打开或关闭单元格
+  if (newValue === 'close' && state.status === 'open') {
+    closeSwipeAction(instance, ownerInstance)
+  } else if (newValue === 'open' && state.status === 'close') {
+    openSwipeAction(instance, ownerInstance)
+  }
+}
+
+// 菜单尺寸发生变化
+function sizeChange(newValue, oldValue, ownerInstance, instance) {
+  // wxs内的局部变量快照
+  var state = instance.getState()
+  state.disabled = newValue.disabled
+  state.duration = newValue.duration
+  state.show = newValue.show
+  state.threshold = newValue.threshold
+  state.buttons = newValue.buttons
+  
+  if (state.buttons) {
+    var len = state.buttons.length
+    var buttonsWidth = 0
+    var buttons = newValue.buttons
+    for (var i = 0; i < len; i++) {
+      buttonsWidth += buttons[i].width
+    }
+  }
+  state.buttonsWidth = buttonsWidth
+}
+
+module.exports = {
+  touchStart: touchStart,
+  touchMove: touchMove,
+  touchEnd: touchEnd,
+  sizeChange: sizeChange,
+  statusChange: statusChange
+}
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-swipe-action-item/tn-swipe-action-item.vue b/tuniao-ui/components/tn-swipe-action-item/tn-swipe-action-item.vue
new file mode 100644
index 0000000..905da40
--- /dev/null
+++ b/tuniao-ui/components/tn-swipe-action-item/tn-swipe-action-item.vue
@@ -0,0 +1,215 @@
+<template>
+	<view class="tn-swipe-action-item-class tn-swipe-action-item">
+		<view class="tn-swipe-action-item__right">
+			<slot name="button">
+				<view v-for="(item, index) in options" :key="index" class="tn-swipe-action-item__right__button" :style="[{
+            alignItems: item.style && item.style.borderRadius ? 'center' : 'stretch'
+          }]" @tap="buttonClickHandler(item, index)">
+					<view class="tn-swipe-action-item__right__button__wrapper" :style="[{
+              backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#AAAAAA',
+              borderRadius: item.style && item.style.borderRadius ? item.style.borderRadius : '0',
+              padding: item.style && item.style.borderRadius ? '0' : '0 30rpx'
+            }, item.style]">
+						<view v-if="item.icon" :class="[`tn-icon-${item.icon}`]" :style="[{
+                color: item.style && item.style.color ? item.style.color : '#FFFFFF',
+                fontSize: item.iconSize ? item.iconSize + 'rpx' : item.style && item.style.fontSize ? (item.style.fontsize * 1.2) + 'rpx' : '34rpx',
+                marginRight: item.text ? '4rpx' : 0
+              }]"></view>
+						<text v-if="item.text" class="tn-swipe-action-item__right__button__text tn-text-ellipsis"
+							:style="[{
+                color: item.style && item.style.color ? item.style.color : '#FFFFFF',
+                fontSize: item.style && item.style.fontSize ? item.style.fontSize + 'rpx' : '32rpx',
+                lineHeight: item.style && item.style.fontSize ? item.style.fontSize + 'rpx' : '32rpx'
+              }]">{{ item.text }}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+
+		<view class="tn-swipe-action-item__content" :status="status" :size="size" :change:status="wxs.statusChange"
+			:change:size="wxs.sizeChange" @touchstart="wxs.touchStart" @touchmove="wxs.touchMove"
+			@touchend="wxs.touchEnd">
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<!-- #ifdef APP-VUE || MP-WEIXIN || H5 || MP-QQ -->
+<script src="./index.wxs" module="wxs" lang="wxs"></script>
+<!-- #endif -->
+<script>
+	export default {
+		name: 'tn-swipe-action-item',
+		props: {
+			// 是否显示滑动菜单
+			show: {
+				type: Boolean,
+				default: false
+			},
+			// 标识符，如果是v-for可用index的索引值
+			name: {
+				type: [String, Number],
+				default: ''
+			},
+			// 右侧按钮内容
+			options: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// 是否禁用
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 是否自动关闭其他swipe按钮组
+			autoClose: {
+				type: Boolean,
+				default: true
+			},
+			// 滑动距离阈值，大于此值才会打开菜单
+			threshold: {
+				type: Number,
+				default: 20
+			},
+			// 动画过渡时间，单位ms
+			duration: {
+				type: Number,
+				default: 300
+			}
+		},
+		computed: {
+			// 由于wxs无法直接读取外部的值，需要在外部值变化时，重新执行赋值逻辑
+			itemData() {
+				return [this.disabled, this.autoClose, this.threshold, this.options, this.duration]
+			}
+		},
+		data() {
+			return {
+				// 按钮尺寸信息
+				size: {},
+				// 父组件参数
+				parentData: {
+					autoClose: true
+				},
+				// 当前状态
+				status: 'close'
+			}
+		},
+		watch: {
+			itemData() {
+				this.queryRect()
+			}
+		},
+		created() {
+			this.parent = false
+			this.updateParentData()
+			this.parent && this.parent.children.push(this)
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.init()
+			})
+		},
+		methods: {
+			init() {
+				this.queryRect()
+			},
+			// 更新父组件信息
+			updateParentData() {
+				this.getParentData('tn-swipe-action')
+			},
+			// 查询节点
+			queryRect() {
+				this._tGetRect('.tn-swipe-action-item__right__button', true).then(res => {
+					this.size = {
+						buttons: res,
+						show: this.show,
+						disabled: this.disabled,
+						threshold: this.threshold,
+						duration: this.duration
+					}
+				})
+			},
+			// 按钮点击
+			buttonClickHandler(item, index) {
+				this.$emit('click', {
+					type: 'button',
+					index,
+					name: this.name
+				})
+			},
+			// item点击
+			handlerItemClick() {
+				this.$emit('click', {
+					type: 'item',
+					name: this.name
+				})
+			},
+			// 关闭时执行
+			closeHandler() {
+				this.status = 'close'
+			},
+			// 设置状态
+			setStatus(status) {
+				this.status = status
+			},
+			// 关闭其他单元格
+			closeOther() {
+				this.parent && this.parent.closeOther(this)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tn-swipe-action-item {
+		position: relative;
+		overflow: hidden;
+		// touch-action: none;
+		margin: 30rpx;
+		border-radius: 15rpx;
+		box-shadow: 0rpx 0rpx 50rpx 0rpx rgba(0, 0, 0, 0.07);
+
+		&__right {
+			display: flex;
+			flex-direction: row;
+			position: absolute;
+			top: 0;
+			bottom: 0;
+			right: 0;
+
+			&__button {
+				display: flex;
+				flex-direction: row;
+				justify-content: center;
+				align-items: center;
+				overflow: hidden;
+
+				&__wrapper {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: center;
+					padding: 0 30rpx;
+				}
+
+				&__text {
+					display: flex;
+					flex-direction: row;
+					align-content: center;
+					justify-content: center;
+					text-align: center;
+					color: #FFFFFF;
+					font-size: 30rpx;
+				}
+			}
+		}
+
+		&__content {
+			background-color: #FFFFFF;
+			transform: translateX(0px);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-swipe-action/tn-swipe-action.vue b/tuniao-ui/components/tn-swipe-action/tn-swipe-action.vue
new file mode 100644
index 0000000..1b238b4
--- /dev/null
+++ b/tuniao-ui/components/tn-swipe-action/tn-swipe-action.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="tn-swipe-action-class tn-swipe-action">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-swipe-action',
+    props: {
+      // 是否自动关闭其他swipe按钮组
+      autoClose: {
+        type: Boolean,
+        default: true
+      }
+    },
+    provide() {
+      return {
+        swipeAction: this
+      }
+    },
+    computed: {
+      // 用于监听父组件参数变化
+      parentData() {
+        return [this.autoClose]
+      }
+    },
+    data() {
+      return {}
+    },
+    watch: {
+      parentData() {
+        if (this.children.length) {
+          this.children.map(child => {
+            // 判断子组件(tn-swipe-action-item)如果有updateParentData方法的话，就就执行(执行的结果是子组件重新从父组件拉取了最新的值)
+            typeof(child.updateParentData) === 'function' && child.updateParentData()
+          })
+        }
+      }
+    },
+    created() {
+      this.children = []
+    },
+    methods: {
+      // 关闭其他单元格
+      closeOther(child) {
+        if (this.autoClose) {
+          // 历遍所有的单元格，找出非当前操作中的单元格，进行关闭
+          this.children.map((item, index) => {
+            if (child !== item) {
+              item.closeHandler()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style>
+</style>
diff --git a/tuniao-ui/components/tn-swiper/tn-swiper.vue b/tuniao-ui/components/tn-swiper/tn-swiper.vue
new file mode 100644
index 0000000..9b854fe
--- /dev/null
+++ b/tuniao-ui/components/tn-swiper/tn-swiper.vue
@@ -0,0 +1,364 @@
+<template>
+  <view class="tn-swiper__wrap-class tn-swiper__wrap" :style="{borderRadius: `${radius}rpx`}">
+    <!-- 轮播图 -->
+    <swiper
+      class="tn-swiper"
+      :class="[backgroundColorClass]"
+      :style="[swiperStyle]"
+      :current="current"
+      :interval="interval"
+      :circular="circular"
+      :autoplay="autoplay"
+      :duration="duration"
+      :previous-margin="effect3d ? effect3dPreviousSpacing + 'rpx' : '0'"
+      :next-margin="effect3d ? effect3dPreviousSpacing + 'rpx' : '0'"
+      @change="change"
+    >
+      <swiper-item
+        v-for="(item, index) in list"
+        :key="index"
+        class="tn-swiper__item"
+      >
+        <view
+          class="tn-swiper__item__image__wrap"
+          :class="[swiperIndex !== index ? 'tn-swiper__item__image--scale' : '']"
+          :style="{
+            borderRadius: `${radius}rpx`,
+            transform: effect3d && swiperIndex !== index ? 'scaleY(0.9)' : 'scaleY(1)',
+            margin: effect3d && swiperIndex !== index ? '0 20rpx' : 0
+          }"
+          @click="click(index)"
+        >
+          <image class="tn-swiper__item__image" :src="item[name] || item" :mode="imageMode"></image>
+          <view
+            v-if="title && item[titleName]"
+            class="tn-swiper__item__title tn-text-ellipsis"
+            :style="[titleStyle]">
+            {{ item[titleName] }}
+          </view>
+        </view>
+      </swiper-item>
+    </swiper>
+    
+    <!-- 指示点 -->
+    <view class="tn-swiper__indicator" :style="[indicatorStyle]">
+      <block v-if="mode === 'rect'">
+        <view
+          v-for="(item, index) in list"
+          :key="index"
+          class="tn-swiper__indicator__rect"
+          :class="{'tn-swiper__indicator__rect--active': swiperIndex === index}"
+        ></view>
+      </block>
+      <block v-if="mode === 'dot'">
+        <view
+          v-for="(item, index) in list"
+          :key="index"
+          class="tn-swiper__indicator__dot"
+          :class="{'tn-swiper__indicator__dot--active': swiperIndex === index}"
+        ></view>
+      </block>
+      <block v-if="mode === 'round'">
+        <view
+          v-for="(item, index) in list"
+          :key="index"
+          class="tn-swiper__indicator__round"
+          :class="{'tn-swiper__indicator__round--active': swiperIndex === index}"
+        ></view>
+      </block>
+      <block v-if="mode === 'number'">
+        <view class="tn-swiper__indicator__number">{{ swiperIndex + 1 }}/{{ list.length }}</view>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-swiper',
+    props: {
+      // 轮播图列表数据
+      // [{image: xxx.jpg, title: 'xxxx'}]
+      list: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 初始化时，默认显示第几项
+      current: {
+        type: Number,
+        default: 0
+      },
+      // 高度
+      height: {
+        type: Number,
+        default: 250
+      },
+      // 背景颜色
+      backgroundColor: {
+        type: String,
+        default: 'transparent'
+      },
+      // 图片的属性名
+      name: {
+        type: String,
+        default: 'image'
+      },
+      // 是否显示标题
+      title: {
+        type: Boolean,
+        default: false
+      },
+      // 标题的属性名
+      titleName: {
+        type: String,
+        default: 'title'
+      },
+      // 用户自定义标题样式
+      titleStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 圆角的值
+      radius: {
+        type: Number,
+        default: 8
+      },
+      // 指示器模式
+      // rect -> 方形 round -> 圆角方形 dot -> 点 number -> 轮播图下标
+      mode: {
+        type: String,
+        default: 'round'
+      },
+      // 指示器位置
+      // topLeft \ topCenter \ topRight \ bottomLeft \ bottomCenter \ bottomRight
+      indicatorPosition: {
+        type: String,
+        default: 'bottomCenter'
+      },
+      // 开启3D缩放效果
+      effect3d: {
+        type: Boolean,
+        default: false
+      },
+      // 在3D缩放模式下，item之间的间隔
+      effect3dPreviousSpacing: {
+        type: Number,
+        default: 50
+      },
+      // 自定播放
+      autoplay: {
+        type: Boolean,
+        default: true
+      },
+      // 图片之间播放间隔多久
+      interval: {
+        type: Number,
+        default: 3000
+      },
+      // 轮播间隔时间
+      duration: {
+        type: Number,
+        default: 500
+      },
+      // 是否衔接滑动
+      circular: {
+        type: Boolean,
+        default: true
+      },
+      // 图片裁剪模式
+      imageMode: {
+        type: String,
+        default: 'aspectFill'
+      }
+    },
+    computed: {
+      backgroundColorStyle() {
+        return this.$tn.color.getBackgroundColorStyle(this.backgroundColor)
+      },
+      backgroundColorClass() {
+        return this.$tn.color.getBackgroundColorInternalClass(this.backgroundColor)
+      },
+      swiperStyle() {
+        let style = {}
+        if (this.backgroundColorStyle) {
+          style.backgroundColor = this.backgroundColorStyle
+        }
+        if (this.height) {
+          style.height = this.height + 'rpx'
+        }
+        return style
+      },
+      indicatorStyle() {
+        let style = {}
+        if (this.indicatorPosition === 'topLeft' || this.indicatorPosition === 'bottomLeft') style.justifyContent = 'flex-start'
+        if (this.indicatorPosition === 'topCenter' || this.indicatorPosition === 'bottomCenter') style.justifyContent =  'center'
+        if (this.indicatorPosition === 'topRight' || this.indicatorPosition === 'bottomRight') style.justifyContent =  'flex-end'
+        if (['topLeft','topCenter','topRight'].indexOf(this.indicatorPosition) >= 0) {
+          style.top = '12rpx'
+          style.bottom = 'auto'
+        } else {
+          style.top = 'auto'
+          style.bottom = '12rpx'
+        }
+        style.padding = `0 ${this.effect3d ? '74rpx' : '24rpx'}`
+        
+        return style
+      },
+      swiperTitleStyle() {
+        let style = {}
+        if (this.mode === 'none' || this.mode === '') style.paddingBottom = '12rpx'
+        if (['bottomLeft','bottomCenter','bottomRight'].indexOf(this.indicatorPosition) >= 0 && this.mode === 'number') {
+          style.paddingBottom = '60rpx'
+        } else if (['bottomLeft','bottomCenter','bottomRight'].indexOf(this.indicatorPosition) >= 0 && this.mode !== 'number') {
+          style.paddingBottom = '40rpx'
+        } else {
+          style.paddingBottom = '12rpx'
+        }
+        
+        style = Object.assign(style, this.titleStyle)
+        return style
+      }
+    },
+    data() {
+      return {
+        // 当前显示的item的index
+        swiperIndex: this.current
+      }
+    },
+    watch: {
+      list(newVal, oldVal) {
+        // 如果修改了list的数据，重置current的值
+        if (newVal.length !== oldVal.length) this.swiperIndex = 0
+      },
+      current(value) {
+        // 监听外部current的变化，实时修改内部依赖于此测swiperIndex值，如果更新了current，而不是更新swiperIndex，就会错乱，因为指示器是依赖于swiperIndex的
+        this.swiperIndex = value
+      }
+    },
+    methods: {
+      click(index) {
+        this.$emit('click', index)
+      },
+      // 图片自动切换时触发
+      change(event) {
+        const current = event.detail.current
+        this.swiperIndex = current
+        this.$emit('change', current)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-swiper {
+    
+    &__wrap {
+      position: relative;
+      overflow: hidden;
+      transform: translateY(0);
+    }
+    
+    &__item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      overflow: hidden;
+      
+      &__image {
+        width: 100%;
+        height: 100%;
+        will-change: transform;
+        display: block;
+        /* #ifdef H5 */
+        pointer-events: none;
+        /* #endif */
+        
+        &__wrap {
+          width: 100%;
+          height: 100%;
+          flex: 1;
+          transition: all 0.5s;
+          overflow: hidden;
+          box-sizing: content-box;
+          position: relative;
+        }
+        
+        &--scale {
+          transform-origin: center center;
+        }
+      }
+      
+      &__title {
+        width: 100%;
+        position: absolute;
+        background-color: rgba(0, 0, 0, 0.3);
+        bottom: 0;
+        left: 0;
+        font-size: 28rpx;
+        padding: 12rpx 24rpx;
+        color: rgba(255, 255, 255, 0.8);
+      }
+    }
+    
+    &__indicator {
+      padding: 0 24rpx;
+      position: absolute;
+      display: flex;
+      flex-direction: row;
+      width: 100%;
+      z-index: 1;
+      
+      &__rect {
+        width: 26rpx;
+        height: 8rpx;
+        background-color: rgba(0, 0, 0, 0.3);
+        transition: all 0.5s;
+        
+        &--active {
+          background-color: rgba(255, 255, 255, 0.8);
+        }
+      }
+      
+      &__dot {
+        width: 14rpx;
+        height: 14rpx;
+        margin: 0 6rpx;
+        border-radius: 20rpx;
+        background-color: rgba(0, 0, 0, 0.3);
+        transition: all 0.5s;
+        
+        &--active {
+          background-color: rgba(255, 255, 255, 0.8);
+        }
+      }
+      
+      &__round {
+        width: 14rpx;
+        height: 14rpx;
+        margin: 0 6rpx;
+        border-radius: 20rpx;
+        background-color: rgba(0, 0, 0, 0.3);
+        transition: all 0.5s;
+        
+        &--active {
+          width: 34rpx;
+          background-color: rgba(255, 255, 255, 0.8);
+        }
+      }
+      
+      &__number {
+        padding: 6rpx 16rpx;
+        line-height: 1;
+        background-color: rgba(0, 0, 0, 0.3);
+        color: rgba(255, 255, 255, 0.8);
+        border-radius: 100rpx;
+        font-size: 26rpx;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-switch/tn-switch.vue b/tuniao-ui/components/tn-switch/tn-switch.vue
new file mode 100644
index 0000000..ba9c419
--- /dev/null
+++ b/tuniao-ui/components/tn-switch/tn-switch.vue
@@ -0,0 +1,241 @@
+<template>
+  <view
+    class="tn-switch-class tn-switch"
+    :class="[
+      value ? 'tn-switch--on' : '',
+      disabled ? 'tn-switch--disabled' : '',
+      `tn-switch--${shape}`
+    ]"
+    :style="[switchStyle]"
+    @tap="click"
+  >
+    <view
+      class="tn-switch__node"
+      :class="[`tn-switch__node--${shape}`]"
+      :style="[switchNodeStyle]"
+    >
+      <tn-loading class="tn-switch__node__loading" :show="loading" mode="flower" :size="size * 0.6" :color="loadingColor"></tn-loading>
+    </view>
+    <!-- 左图标 -->
+    <view
+      v-if="leftIcon !== ''"
+      class="tn-switch__icon tn-switch__icon--left"
+      :class="[
+        `tn-icon-${leftIcon}`,
+        value ? 'tn-switch__icon--show' : ''
+      ]"
+      :style="[iconStyle]"></view>
+    <!-- 右图标 -->
+    <view 
+      v-if="rightIcon !== ''"
+      class="tn-switch__icon tn-switch__icon--right"
+      :class="[
+        `tn-icon-${rightIcon}`,
+        !value ? 'tn-switch__icon--show' : ''
+      ]"
+      :style="[iconStyle]"></view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-switch',
+    props: {
+      value: {
+        type: Boolean,
+        default: false
+      },
+      // 按钮的样式
+      // circle 圆角 square 方形
+      shape: {
+        type: String,
+        default: 'circle'
+      },
+      // 是否禁用
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 尺寸
+      size: {
+        type: Number,
+        default: 50
+      },
+      // 打开时的背景颜色
+      activeColor: {
+        type: String,
+        default: ''
+      },
+      // 关闭时的背景颜色
+      inactiveColor: {
+        type: String,
+        default: ''
+      },
+      // 激活时的值
+      activeValue: {
+        type: [Number, String, Boolean],
+        default: true
+      },
+      // 关闭时的值
+      inactiveValue: {
+        type: [Number, String, Boolean],
+        default: false
+      },
+      // 左图标
+      leftIcon: {
+        type: String,
+        default: ''
+      },
+      // 右图标
+      rightIcon: {
+        type: String,
+        default: ''
+      },
+      // 是否为加载状态
+      loading: {
+        type: Boolean,
+        default: false
+      },
+      // 点击手机是否震动
+      vibrateShort: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      switchStyle() {
+        let style = {}
+        style.fontSize = this.$tn.string.getLengthUnitValue(this.size)
+        style.backgroundColor = this.value ? 
+          this.activeColor ? this.activeColor : '#01BEFF' : 
+          this.inactiveColor ? this.inactiveColor : '#AAAAAA'
+        return style
+      },
+      switchNodeStyle() {
+        let style = {}
+        style.width = this.$tn.string.getLengthUnitValue(this.size)
+        style.height = style.width
+        return style
+      },
+      iconStyle() {
+        let style = {}
+        style.fontSize = this.$tn.string.getLengthUnitValue(this.size - 20)
+        style.lineHeight = this.$tn.string.getLengthUnitValue(this.size)
+        return style
+      },
+      loadingColor() {
+        return this.value ? this.activeColor : ''
+      }
+    },
+    data() {
+      return {
+        
+      }
+    },
+    methods: {
+      click() {
+        if (!this.disabled && !this.loading) {
+          if (this.vibrateShort) uni.vibrateShort()
+          this.$emit('input', !this.value)
+          // 放到下一个生命周期，因为双向绑定的value修改父组件状态需要时间，且是异步的
+          this.$nextTick(() => {
+          	this.$emit('change', this.value ? this.activeValue : this.inactiveValue);
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-switch {
+    /* #ifndef APP-NVUE */
+    display: inline-block;
+    /* #endif */
+    position: relative;
+    box-sizing: initial;
+    width: 2em;
+    height: 1em;
+    font-size: 50rpx;
+    background-color: #AAAAAA;
+    transition: background-color 0.3s;
+    
+    &__node {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      background-color: #FFFFFF;
+      transform: scale(0.9);
+      box-shadow: 0 6rpx 2rpx 0 rgba(0, 0, 0, 0.05), 0 4rpx 4rpx 0 rgba(0, 0, 0, 0.1), 0 6rpx 6rpx 0 rgba(0, 0, 0, 0.05);
+      transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+      -webkit-transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
+      
+      &__loading {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+      }
+      
+      &--circle {
+        border-radius: 100%;
+      }
+      
+      &--square {
+        border-radius: 15%;
+      }
+    }
+    
+    &__icon {
+      color: #FFFFFF;
+      font-size: 30rpx;
+      line-height: 50rpx;
+      height: 100%;
+      vertical-align: middle;
+      position: absolute;
+      transform: scale(0);
+      transform-origin: 50% 50%;
+      transition: transform 0.3s ease-in-out;
+      
+      &--left {
+        top: 0;
+        left: 10rpx;
+      }
+      
+      &--right {
+        top: 0;
+        right: 10rpx;
+      }
+      
+      &--show {
+        transform: scale(1);
+      }
+    }
+    
+    &--circle {
+      border-radius: 1em;
+    }
+    
+    &--square {
+      border-radius: 0.1em;
+    }
+    
+    &--on {
+      background-color: $tn-main-color;
+      
+      .tn-switch__node {
+        transform: translateX(100%) scale(0.9);
+      }
+    }
+    
+    &--disabled {
+      opacity: 0.4;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-tabbar/tn-tabbar.vue b/tuniao-ui/components/tn-tabbar/tn-tabbar.vue
new file mode 100644
index 0000000..6bc74d7
--- /dev/null
+++ b/tuniao-ui/components/tn-tabbar/tn-tabbar.vue
@@ -0,0 +1,554 @@
+<template>
+	<view v-if="show" class="tn-tabbar-class tn-tabbar" @touchmove.stop.prevent="() => {}">
+		<!-- tabbar 内容-->
+		<view class="tn-tabbar__content" :class="{
+        'tn-tabbar--fixed': fixed,
+        'tn-safe-area-inset-bottom': safeAreaInsetBottom,
+        'tn-tabbar--shadow': shadow
+      }" :style="{
+        height: height + 'rpx',
+        backgroundColor: bgColor
+      }">
+			<!-- tabbar item -->
+			<view v-for="(item, index) in list" :key="index" class="tn-tabbar__content__item"
+				:id="`tabbar_item_${index}`" :class="{'tn-tabbar__content__item--out': item.out}" :style="{
+          backgroundColor: bgColor
+        }" @tap.stop="clickItemHandler(index)">
+				<!-- tabbar item的图片或者icon-->
+				<view :class="[itemButtonClass(index)]" :style="[itemButtonStyle(index)]">
+					<image v-if="isImage(index)" :src="elIcon(index)" mode="scaleToFill"
+						class="tn-tabbar__content__item__image" :style="{
+              width: `${item.iconSize || iconSize}rpx`,
+              height: `${item.iconSize || iconSize}rpx`,
+            }"></image>
+					<view v-else class="tn-tabbar__content__item__icon"
+						:class="[`tn-icon-${elIcon(index)}`,elIconColor(index, false)]" :style="{
+              fontSize: `${item.iconSize || iconSize}rpx`,
+              color: elIconColor(index)
+            }"></view>
+
+					<!-- 角标-->
+					<tn-badge v-if="!item.out && (item.count || item.dot)" :dot="item.dot || false"
+						backgroundColor="tn-bg-red" fontColor="#FFFFFF" :radius="item.dot ? 14 : 0" :fontSize="14"
+						padding="2rpx 4rpx" :absolute="true" :top="2">
+						{{ $tn.number.formatNumberString(item.count) }}
+					</tn-badge>
+				</view>
+
+				<!-- tabbar item的文字-->
+				<view class="tn-tabbar__content__item__text" :class="[elColor(index, false)]" :style="{
+            color: elColor(index),
+            fontSize: `${fontSize}rpx`,
+			fontWeight:thisIndex==index?600:500
+          }">
+					<text class="tn-text-ellipsis">{{ item.title }}</text>
+				</view>
+			</view>
+
+			<!-- item 突起部分 -->
+			<view v-if="outItemIndex !== -1" class="tn-tabbar__content__out" :class="[{
+          'tn-tabbar__content__out--shadow': shadow
+        }, animation && value === outItemIndex ? `tn-tabbar__content__out--animation--${animationMode}` : '']" :style="{
+          backgroundColor: `transparent`,
+          left: outItemLeft,
+          width: `${outHeight}rpx`,
+          height: `${outHeight}rpx`,
+          top: `-${outHeight * 0.3}rpx`
+        }" @tap.stop="clickItemHandler(outItemIndex)"></view>
+		</view>
+
+		<!-- 防止tabbar塌陷 -->
+		<!-- <view class="tn-tabbar__placeholder" :class="{'tn-safe-area-inset-bottom': safeAreaInsetBottom}" :style="{
+      height: `calc(${height}rpx)`
+    }"></view> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tn-tabbar',
+		props: {
+			// 绑定当前被选中的current值
+			value: {
+				type: [String, Number],
+				default: 0
+			},
+			// 是否显示
+			show: {
+				type: Boolean,
+				default: true
+			},
+			// 图标列表
+			list: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// 高度，单位rpx
+			height: {
+				type: Number,
+				default: 100
+			},
+			thisIndex: {
+				type: Number,
+				default: 0
+			},
+			// 突起的高度
+			outHeight: {
+				type: Number,
+				default: 100
+			},
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: '#FFFFFF'
+			},
+			// 图标大小
+			iconSize: {
+				type: Number,
+				default: 40
+			},
+			// 字体大小
+			fontSize: {
+				type: Number,
+				default: 24
+			},
+			// 激活时的颜色
+			activeColor: {
+				type: String,
+				default: '#01BEFF'
+			},
+			// 非激活时的颜色
+			inactiveColor: {
+				type: String,
+				default: '#AAAAAA'
+			},
+			// 激活时图标的颜色
+			activeIconColor: {
+				type: String,
+				default: '#01BEFF'
+			},
+			// 非激活时图标的颜色
+			inactiveIconColor: {
+				type: String,
+				default: '#AAAAAA'
+			},
+			// 激活时的自定义样式
+			activeStyle: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			// 是否显示阴影
+			shadow: {
+				type: Boolean,
+				default: true
+			},
+			// 点击时是否有动画
+			animation: {
+				type: Boolean,
+				default: false
+			},
+			// 点击时的动画模式
+			animationMode: {
+				type: String,
+				default: 'scale'
+			},
+			// 是否固定在底部
+			fixed: {
+				type: Boolean,
+				default: true
+			},
+			// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 切换前回调
+			beforeSwitch: {
+				type: Function,
+				default: null
+			}
+		},
+		computed: {
+			// 当前字体的颜色
+			elColor() {
+				return (index, style = true) => {
+					let currentItem = this.list[index]
+					let color = ''
+					if (index === this.value) {
+						color = currentItem['activeColor'] || this.activeColor
+					} else {
+						color = currentItem['inactiveColor'] || this.inactiveColor
+					}
+					// 判断是否获取内部样式
+					if (style) {
+						if (this.$tn.color.getFontColorStyle(color) !== '') {
+							return color
+						} else {
+							return ''
+						}
+					} else {
+						if (this.$tn.color.getFontColorStyle(color) === '') {
+							return color
+						} else {
+							return ''
+						}
+					}
+				}
+			},
+			// 当前图标的颜色
+			elIconColor() {
+				return (index, style = true) => {
+					let currentItem = this.list[index]
+					let color = ''
+					if (index === this.value) {
+						color = currentItem['activeIconColor'] || this.activeIconColor
+					} else {
+						color = currentItem['inactiveIconColor'] || this.inactiveIconColor
+					}
+					// 判断是否获取内部样式
+					if (style) {
+						if (this.$tn.color.getFontColorStyle(color) !== '') {
+							return color
+						} else {
+							return ''
+						}
+					} else {
+						if (this.$tn.color.getFontColorStyle(color) === '') {
+							return color + ' tn-tabbar__content__item__icon--clip'
+						} else {
+							return ''
+						}
+					}
+				}
+			},
+			// 当前的图标
+			elIcon() {
+				return (index) => {
+					let currentItem = this.list[index]
+					if (index === this.value) {
+						return currentItem['activeIcon']
+					} else {
+						return currentItem['inactiveIcon']
+					}
+				}
+			},
+			// 突起部分item button对应的类
+			itemButtonClass() {
+				return (index) => {
+					let clazz = ''
+					if (this.list[index]['out']) {
+						clazz += 'tn-tabbar__content__item__button--out'
+						if (this.$tn.color.getFontColorStyle(this.activeIconColor) === '') {
+							clazz += ` ${this.activeIconColor}`
+						}
+						if (this.value === index) {
+							clazz += ` tn-tabbar__content__item__button--out--animation--${this.animationMode}`
+						}
+					} else {
+						clazz += 'tn-tabbar__content__item__button'
+						if (this.value === index) {
+							clazz += ` tn-tabbar__content__item__button--animation--${this.animationMode}`
+						}
+					}
+					return clazz
+				}
+			},
+			// 突起部分item button样式
+			itemButtonStyle() {
+				return (index) => {
+					let style = {}
+					console.log();
+					if (this.list[index]['out']) {
+						if (this.$tn.color.getFontColorStyle(this.activeIconColor) !== '') {
+							//style.backgroundColor = this.activeIconColor
+							if (this.value == 2) {
+								style.backgroundColor = '#ffffff'
+							} else {
+								style.backgroundColor = '#ffffff'
+							}
+						}
+						style.width = `${this.outHeight - 20}rpx`
+						style.height = `${this.outHeight - 20}rpx`
+						style.top = `-${this.outHeight * 0.3}rpx`
+
+						return style
+					}
+					return style
+				}
+			},
+			// 判断图标是否为图片
+			isImage() {
+				return (index) => {
+					const icon = this.list[index]['activeIcon']
+					// 只有包含了'/'就认为是图片
+					return icon.indexOf('/') !== -1
+				}
+			}
+		},
+		data() {
+			return {
+				// 当前突起的位置
+				outItemLeft: '50%',
+				// 当前设置了突起按钮的index
+				outItemIndex: -1,
+				// 每一个item的信息
+				tabbatItemInfo: []
+			}
+		},
+		watch: {
+
+		},
+		created() {
+			this.getOutItemIndex()
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.getTabbarItem()
+			})
+		},
+		methods: {
+			// 获取每一个item的信息
+			getTabbarItem() {
+				let query = uni.createSelectorQuery().in(this)
+				// 遍历获取信息
+				for (let i = 0; i < this.list.length; i++) {
+					query.select(`#tabbar_item_${i}`).fields({
+						size: true,
+						rect: true
+					})
+				}
+				query.exec(res => {
+					if (!res) {
+						setTimeout(() => {
+							this.getTabbarItem()
+						}, 10)
+						return
+					}
+					this.tabbatItemInfo = res.map((item) => {
+						return {
+							left: item.left,
+							width: item.width
+						}
+					})
+					this.updateOutItemLeft()
+				})
+			},
+			// 获取突起Item所在的index(如果存在)
+			getOutItemIndex() {
+				this.outItemIndex = this.list.findIndex((item) => {
+					return item.hasOwnProperty('out') && item.out
+				})
+			},
+			// 点击底部菜单时触发
+			async clickItemHandler(index) {
+				if (this.beforeSwitch && typeof(this.beforeSwitch) === 'function') {
+					// 执行回调，同时传入索引当作参数
+					// 在微信，支付宝等环境(H5正常)，会导致父组件定义的函数体中的this变成子组件的this
+					// 通过bind()方法，绑定父组件的this，让this的this为父组件的上下文
+					let beforeSwitch = this.beforeSwitch.bind(this.$tn.$parent.call(this))(index)
+					// 判断是否返回了Promise
+					if (!!beforeSwitch && typeof beforeSwitch.then === 'function') {
+						await beforeSwitch.then(res => {
+							// Promise返回成功
+							this.switchTab(index)
+						}).catch(err => {
+
+						})
+					} else if (beforeSwitch === true) {
+						this.switchTab(index)
+					}
+				} else {
+					this.switchTab(index)
+				}
+			},
+			// 切换tab
+			switchTab(index) {
+				// 发出事件和修改v-model绑定的值
+				this.$emit('change', index)
+				this.$emit('input', index)
+			},
+			// 设置突起的位置
+			updateOutItemLeft() {
+				// 查找出需要突起的元素
+				const index = this.list.findIndex((item) => {
+					return item.out
+				})
+				if (index !== -1) {
+					this.outItemLeft = this.tabbatItemInfo[index].left + (this.tabbatItemInfo[index].width / 2) + 'px'
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tn-tabbar {
+
+		&__content {
+			box-sizing: content-box;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			position: relative;
+			width: 100%;
+			z-index: 1024;
+
+			&__out {
+				position: absolute;
+				z-index: 4;
+				border-radius: 100%;
+				left: 50%;
+				transform: translateX(-50%);
+
+				&--shadow {
+					// box-shadow: 0rpx -10rpx 30rpx 0rpx rgba(0, 0, 0, 0.05);
+
+					&::before {
+						content: " ";
+						position: absolute;
+						width: 100%;
+						height: 50rpx;
+						bottom: 0;
+						left: 0;
+						right: 0;
+						margin: auto;
+						background-color: inherit;
+					}
+				}
+
+				&--animation {
+					&--scale {
+						transform-origin: 50% 100%;
+						animation: tabbar-content-out-click 0.2s forwards 1 ease-in-out;
+					}
+				}
+			}
+
+			&__item {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				height: 100%;
+				position: relative;
+				align-items: center;
+
+				&__button {
+					margin-bottom: 10rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					position: relative;
+
+					&--out {
+						margin-bottom: 10rpx;
+						border-radius: 50%;
+						position: absolute;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						z-index: 6;
+
+						&--animation {
+							&--scale {
+								transform-origin: 50% 100%;
+								animation: tabbar-item-button-out-click 0.2s forwards 1;
+							}
+						}
+					}
+
+					&--animation {
+						&--scale {
+
+							.tn-tabbar__content__item__icon,
+							.tn-tabbar__content__item__image {
+								transform-origin: 50% 100%;
+								animation: tabbar-item-button-click 0.2s forwards 1;
+							}
+						}
+					}
+				}
+
+				&__icon {
+
+					&--clip {
+						-webkit-background-clip: text;
+						color: transparent !important;
+					}
+				}
+
+				&__text {
+					width: 100%;
+					font-size: 26rpx;
+					line-height: 28rpx;
+					text-align: center;
+					margin-bottom: 10rpx;
+					z-index: 10;
+					transition: all 0.2s ease-in-out;
+				}
+
+				&--out {
+					height: calc(100% - 1px);
+				}
+			}
+		}
+
+		&--fixed {
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			right: 0;
+		}
+
+		&--shadow {
+			box-shadow: 0rpx 0rpx 30rpx 0rpx rgba(0, 0, 0, 0.07);
+		}
+	}
+
+	/* 点击动画 start */
+
+	@keyframes tabbar-item-button-click {
+		from {
+			transform: scale(0.8);
+		}
+
+		to {
+			transform: scale(1);
+		}
+	}
+
+	@keyframes tabbar-item-button-out-click {
+		0% {
+			transform: translateY(0) scale(1);
+		}
+
+		50% {
+			transform: translateY(-10rpx) scale(1.2);
+		}
+
+		100% {
+			transform: translateY(0) scale(1);
+		}
+	}
+
+	@keyframes tabbar-content-out-click {
+		0% {
+			transform: translateX(-50%) translateY(0) scale(1);
+		}
+
+		50% {
+			transform: translateX(-50%) translateY(-10rpx) scale(1.1);
+		}
+
+		100% {
+			transform: translateX(-50%) translateY(0) scale(1);
+		}
+	}
+
+	/* 点击动画 end */
+</style>
\ No newline at end of file
diff --git a/tuniao-ui/components/tn-table/tn-table.vue b/tuniao-ui/components/tn-table/tn-table.vue
new file mode 100644
index 0000000..519b178
--- /dev/null
+++ b/tuniao-ui/components/tn-table/tn-table.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: 'tn-table',
+    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.$tn.string.getLengthUnitValue(this.borderWidth)
+        }
+        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;
+    
+    border-width: 1rpx;
+    border-style: none;
+    border-color: #AAAAAA;
+  }
+</style>
diff --git a/tuniao-ui/components/tn-tabs-swiper/tn-tabs-swiper.vue b/tuniao-ui/components/tn-tabs-swiper/tn-tabs-swiper.vue
new file mode 100644
index 0000000..c5de9be
--- /dev/null
+++ b/tuniao-ui/components/tn-tabs-swiper/tn-tabs-swiper.vue
@@ -0,0 +1,444 @@
+<template>
+  <view class="tn-tabs-swiper-class tn-tabs-swiper" :class="[backgroundColorClass]" :style="{backgroundColor: backgroundColorStyle, marginTop: $tn.string.getLengthUnitValue(top, 'px'), zIndex: zIndex}">
+    
+    <scroll-view scroll-x class="tn-tabs-swiper__scroll-view" :scroll-left="scrollLeft" scroll-with-animation :style="{zIndex: zIndex + 1}">
+      <view class="tn-tabs-swiper__scroll-view__box" :class="{'tn-tabs-swiper__scroll-view--flex': !isScroll}">
+        
+        <!-- item -->
+        <view
+          v-for="(item, index) in list"
+          :key="index"
+          :id="'tn-tabs-swiper__scroll-view__item-' + index"
+          class="tn-tabs-swiper__scroll-view__item tn-text-ellipsis"
+          :style="[tabItemStyle(index)]"
+          @tap="emit(index)"
+        >
+          <tn-badge v-if="item[count] || item['count']" backgroundColor="tn-bg-red" fontColor="#FFFFFF" :absolute="true" :top="badgeOffset[0] || 0" :right="badgeOffset[1] || 0">{{ item[count] || item['count']}}</tn-badge>
+          {{ item[name] || item['name'] }}
+        </view>
+        
+        <!-- 底部滑块 -->
+        <view v-if="showBar" class="tn-tabs-swiper__bar" :style="[tabBarStyle]"></view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+  import componentsColor from '../../libs/mixin/components_color.js'
+  const { windowWidth } = uni.getSystemInfoSync()
+  
+  export default {
+    mixins: [componentsColor],
+    name: 'tn-tabs-swiper',
+    props: {
+      // 标签列表
+      list: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 列表数据tab名称的属性
+      name: {
+        type: String,
+        default: 'name'
+      },
+      // 列表数据微标数量的属性
+      count: {
+        type: String,
+        default: 'count'
+      },
+      // 当前活动的tab索引
+      current: {
+        type: Number,
+        default: 0
+      },
+      // 菜单是否可以滑动
+      isScroll: {
+        type: Boolean,
+        default: true
+      },
+      // 高度
+      height: {
+        type: Number,
+        default: 80
+      },
+      // 距离顶部的距离(px)
+      top: {
+        type: Number,
+        default: 0
+      },
+      // item的高度
+      itemWidth: {
+        type: [String, Number],
+        default: 'auto'
+      },
+      // swiper的宽度
+      swiperWidth: {
+        type: Number,
+        default: 750
+      },
+      // 选中时的颜色
+      activeColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 未被选中时的颜色
+      inactiveColor: {
+        type: String,
+        default: '#080808'
+      },
+      // 选中的item样式
+      activeItemStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 是否显示底部滑块
+      showBar: {
+        type: Boolean,
+        default: true
+      },
+      // 底部滑块的宽度
+      barWidth: {
+        type: Number,
+        default: 40
+      },
+      // 底部滑块的高度
+      barHeight: {
+        type: Number,
+        default: 6
+      },
+      // 自定义底部滑块的样式
+      barStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 单个tab的左右内边距
+      gutter: {
+        type: Number,
+        default: 30
+      },
+      // 微标的偏移数[top, right]
+      badgeOffset: {
+        type: Array,
+        default() {
+          return [20, 22]
+        }
+      },
+      // 是否加粗字体
+      bold: {
+        type: Boolean,
+        default: false
+      },
+      // 滚动至中心目标类型
+      autoCenterMode: {
+        type: String,
+        default: 'window'
+      },
+      zIndex: {
+        type: Number,
+        default: 1
+      }
+    },
+    computed: {
+      currentIndex() {
+        const current = Number(this.current)
+        // 判断是否超出
+        if (current > this.list.length - 1) {
+          return this.list.length - 1
+        }
+        if (current < 0) return 0
+        return current
+      },
+      // 滑块需要移动的距离
+      scrollBarLeft() {
+        return Number(this.tabLineDx) + Number(this.tabLineAddDx)
+      },
+      // 滑块宽度转换为px
+      barWidthPx() {
+        return uni.upx2px(this.barWidth)
+      },
+      // 将swiper宽度转换为px
+      swiperWidthPx() {
+        return uni.upx2px(this.swiperWidth)
+      },
+      // tab样式
+      tabItemStyle() {
+        return index => {
+          let style = {
+            height: this.$tn.string.getLengthUnitValue(this.height),
+            lineHeight: this.$tn.string.getLengthUnitValue(this.height),
+            fontSize: this.fontSizeStyle || '28rpx',
+            color: this.tabsInfo.length > 0 ? (this.tabsInfo[index] ? this.tabsInfo[index].color : this.activeColor) : this.inactiveColor,
+            padding: this.isScroll ? `0 ${this.gutter}rpx` : '',
+            flex: this.isScroll ? 'auto' : '1',
+            zIndex: this.zIndex + 2
+          }
+          if (index === this.currentIndex) {
+            if (this.bold) {
+              style.fontWeight = 'bold'
+            }
+            Object.assign(style, this.activeItemStyle)
+          }
+          return style
+        }
+      },
+      // 底部滑块样式
+      tabBarStyle() {
+        let style = {
+          width: this.$tn.string.getLengthUnitValue(this.barWidth),
+          height: this.$tn.string.getLengthUnitValue(this.barHeight),
+          borderRadius: `${this.barHeight / 2}rpx`,
+          backgroundColor: this.activeColor,
+          left: this.scrollBarLeft + 'px'
+        }
+        Object.assign(style, this.barStyle)
+        return style
+      },
+    },
+    data() {
+      return {
+        // 滚动scroll-view的左边滚动距离
+        scrollLeft: 0,
+        // 存放tab菜单节点信息
+        tabsInfo: [],
+        // 屏幕宽度
+        windowWidth: 0,
+        // 滑动动画结束后对应的标签Index
+        animationFinishCurrent: this.current,
+        // 组件的宽度
+        componentsWidth: 0,
+        // 移动距离
+        tabLineAddDx: 0,
+        tabLineDx: 0,
+        // 颜色渐变数组
+        colorGradientArr: [],
+        // 两个颜色之间的渐变等分
+        colorStep: 100,
+      }
+    },
+    watch: {
+      current(value) {
+        this.change(value)
+        this.setFinishCurrent(value)
+      },
+      list() {
+        this.$nextTick(() => {
+          this.init()
+        })
+      }
+    },
+    mounted() {
+      this.init()
+    },
+    methods: {
+      // 初始化
+      async init() {
+        await this.getTabsInfo()
+        this.countLine3Dx()
+        this.getQuery(() => {
+          this.setScrollViewToCenter()
+        })
+        // 获取渐变颜色数组
+        this.colorGradientArr = this.$tn.color.colorGradient(this.inactiveColor, this.activeColor, this.colorStep)
+      },
+      // 发送事件
+      emit(index) {
+        this.$emit('change', index)
+      },
+      // tabs发生变化
+      change() {
+        this.setScrollViewToCenter()
+      },
+      // 获取各个tab的节点信息
+      getTabsInfo() {
+        return new Promise((resolve, reject) => {
+          let view = uni.createSelectorQuery().in(this)
+          for (let i = 0; i < this.list.length; i++) {
+            view.select('#tn-tabs-swiper__scroll-view__item-'+i).boundingClientRect()
+          }
+          view.exec(res => {
+            const arr = []
+            for (let i = 0; i < res.length; i++) {
+              // 添加颜色属性
+              res[i].color = this.inactiveColor
+              if (i === this.currentIndex) res[i].color = this.activeColor
+              arr.push(res[i])
+            }
+            this.tabsInfo = arr
+            resolve()
+          })
+        })
+      },
+      // 查询components信息
+      getQuery(cb) {
+        try {
+          let view = uni.createSelectorQuery().in(this).select('.tn-tabs-swiper')
+          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
+        }
+      },
+      // 当swiper滑动结束的时候，计算滑块最终停留的位置
+      countLine3Dx() {
+        const tab = this.tabsInfo[this.animationFinishCurrent]
+        // 让滑块中心点和当前tab中心重合
+        if (tab) this.tabLineDx = tab.left + tab.width / 2 - this.barWidthPx / 2 - this.tabsInfo[0].left
+      },
+      // 把活动的tab移动到屏幕中心
+      setScrollViewToCenter() {
+        let tab = this.tabsInfo[this.animationFinishCurrent]
+        if (tab) {
+          let tabCenter = tab.left + tab.width / 2
+          let parentWidth
+          // 活动tab移动到中心时，以屏幕还是tab组件宽度为基准
+          if (this.autoCenterMode === 'window') {
+            parentWidth = windowWidth
+          } else {
+            parentWidth = this.componentsWidth
+          }
+          this.scrollLeft = tabCenter - parentWidth / 2
+        }
+      },
+      // 设置偏移位置
+      setDx(dx) {
+        
+        // 计算下一个标签的步进值
+        let nextIndexStep = Math.ceil(Math.abs(dx / this.swiperWidthPx))
+        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
+        
+        // 当前tab中心点x轴坐标
+        let currentTab = this.tabsInfo[this.animationFinishCurrent]
+        let currentTabX = currentTab.left + currentTab.width / 2
+        
+        // 下一个tab中心点x轴坐标
+        let nextTab = this.tabsInfo[nextTabIndex]
+        let nextTabX = nextTab.left + nextTab.width / 2
+        
+        // 两个tab之间的距离
+        let distanceX = Math.abs(nextTabX - currentTabX)
+        this.tabLineAddDx = (dx / this.swiperWidthPx) * distanceX
+        this.setTabColor(this.animationFinishCurrent, nextTabIndex, dx)
+      },
+      // 设置tab的颜色
+      setTabColor(currentTabIndex, nextTabIndex, dx) {
+        let nextIndexStep = Math.ceil(Math.abs(dx / this.swiperWidthPx))
+        if (Math.abs(dx) > this.swiperWidthPx) {
+          dx = dx > 0 ? dx - (this.swiperWidthPx * (nextIndexStep - 1)) : dx + (this.swiperWidthPx * (nextIndexStep - 1))
+        }
+        let colorIndex = Math.abs(Math.ceil((dx / this.swiperWidthPx) * 100))
+        let colorLength = this.colorGradientArr.length
+        // 处理超出索引边界
+        colorIndex = colorIndex >= colorLength ? colorLength - 1 : colorIndex <= 0 ? 0 : colorIndex
+        if (nextIndexStep > 1) {
+          // 设置下一个tab的颜色
+          // 设置之前tab的颜色为默认颜色
+          if (dx > 0) {
+            this.tabsInfo[nextTabIndex + (nextIndexStep - 1) > this.tabsInfo.length - 1 ? this.tabsInfo.length - 1 : nextTabIndex + (nextIndexStep - 1)].color = this.colorGradientArr[colorIndex]
+            this.tabsInfo[nextTabIndex + (nextIndexStep - 2) > this.tabsInfo.length - 1 ? this.tabsInfo.length - 1 : nextTabIndex + (nextIndexStep - 2)].color = this.colorGradientArr[colorLength - 1 - colorIndex]
+          } else {
+            this.tabsInfo[nextTabIndex - (nextIndexStep - 1) < 0 ? 0 : nextTabIndex - (nextIndexStep - 1)].color = this.colorGradientArr[colorIndex]
+            this.tabsInfo[nextTabIndex - (nextIndexStep - 2) < 0 ? 0 : nextTabIndex - (nextIndexStep - 2)].color = this.colorGradientArr[colorLength - 1 - colorIndex]
+          }
+        } else {
+          // 设置下一个tab的颜色
+          this.tabsInfo[nextTabIndex].color = this.colorGradientArr[colorIndex]
+          // 设置当前tab的颜色
+          this.tabsInfo[currentTabIndex].color = this.colorGradientArr[colorLength - 1 - colorIndex]
+        }
+        
+      },
+      // swiper滑动结束
+      setFinishCurrent(current) {
+        // 如果滑动的索引不一致，修改tab颜色变化，因为可能会有直接点击tab的情况
+        this.tabsInfo.map((item, index) => {
+          if (current == index) item.color = this.activeColor
+          else item.color = this.inactiveColor
+          return item
+        })
+        this.tabLineAddDx = 0
+        this.animationFinishCurrent = current
+        this.countLine3Dx()
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  /* #ifndef APP-NVUE */
+  ::-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 */
+  
+  .tn-tabs-swiper {
+    &__scroll-view {
+      position: relative;
+      width: 100%;
+      white-space: nowrap;
+      
+      &__box {
+        position: relative;
+        /* #ifdef MP-TOUTIAO */
+        white-space: nowrap;
+        /* #endif */
+      }
+      
+      &__item {
+        position: relative;
+        /* #ifndef APP-NVUE */
+        display: inline-block;
+        /* #endif */
+        text-align: center;
+        transition-property: background-color, color;
+      }
+      
+      &--flex {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+      }
+    }
+    
+    &__bar {
+      position: absolute;
+      bottom: 0;
+    }
+  }
+  
+</style>
diff --git a/tuniao-ui/components/tn-tabs/tn-tabs.vue b/tuniao-ui/components/tn-tabs/tn-tabs.vue
new file mode 100644
index 0000000..e449a4b
--- /dev/null
+++ b/tuniao-ui/components/tn-tabs/tn-tabs.vue
@@ -0,0 +1,348 @@
+<template>
+  <view class="tn-tabs-class tn-tabs" :class="[backgroundColorClass]" :style="{backgroundColor: backgroundColorStyle, marginTop: $tn.string.getLengthUnitValue(top, 'px')}">
+    
+    <!-- _tgetRect()对组件根节点无效，因为写了.in(this)，故这里获取内层接点尺寸 -->
+    <view :id="id">
+      <scroll-view scroll-x class="tn-tabs__scroll-view" :scroll-left="scrollLeft" scroll-with-animation>
+        <view class="tn-tabs__scroll-view__box" :class="{'tn-tabs__scroll-view--flex': !isScroll}">
+          <!-- item -->
+          <view
+            v-for="(item, index) in list"
+            :key="index"
+            :id="'tn-tabs__scroll-view__item-' + index"
+            class="tn-tabs__scroll-view__item tn-text-ellipsis"
+            :style="[tabItemStyle(index)]"
+            @tap="clickTab(index)"
+          >
+            <tn-badge v-if="item[count] || item['count']" backgroundColor="tn-bg-red" fontColor="#FFFFFF" :absolute="true" :top="badgeOffset[0] || 0" :right="badgeOffset[1] || 0">{{ item[count] || item['count']}}</tn-badge>
+            {{ item[name] || item['name'] }}
+          </view>
+          
+          <!-- 底部滑块 -->
+          <view v-if="showBar" class="tn-tabs__bar" :style="[tabBarStyle]"></view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import componentsColor from '../../libs/mixin/components_color.js'
+  export default {
+    mixins: [componentsColor],
+    name: 'tn-tabs',
+    props: {
+      // 标签列表
+      list: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 列表数据tab名称的属性
+      name: {
+        type: String,
+        default: 'name'
+      },
+      // 列表数据微标数量的属性
+      count: {
+        type: String,
+        default: 'count'
+      },
+      // 当前活动的tab索引
+      current: {
+        type: Number,
+        default: 0
+      },
+      // 菜单是否可以滑动
+      isScroll: {
+        type: Boolean,
+        default: true
+      },
+      // 高度
+      height: {
+        type: Number,
+        default: 80
+      },
+      // 距离顶部的距离(px)
+      top: {
+        type: Number,
+        default: 0
+      },
+      // item的宽度
+      itemWidth: {
+        type: [String, Number],
+        default: 'auto'
+      },
+      // 过渡动画时长
+      duration: {
+        type: Number,
+        default: 0.3
+      },
+      // 选中时的颜色
+      activeColor: {
+        type: String,
+        default: '#01BEFF'
+      },
+      // 未被选中时的颜色
+      inactiveColor: {
+        type: String,
+        default: '#080808'
+      },
+      // 选中的item样式
+      activeItemStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 未选中的item样式
+      inactiveItemStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 是否显示底部滑块
+      showBar: {
+        type: Boolean,
+        default: true
+      },
+      // 底部滑块的宽度
+      barWidth: {
+        type: Number,
+        default: 40
+      },
+      // 底部滑块的高度
+      barHeight: {
+        type: Number,
+        default: 6
+      },
+      // 自定义底部滑块的样式
+      barStyle: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 单个tab的左右内边距
+      gutter: {
+        type: Number,
+        default: 30
+      },
+      // 微标的偏移数[top, right]
+      badgeOffset: {
+        type: Array,
+        default() {
+          return [20, 22]
+        }
+      },
+      // 是否加粗字体
+      bold: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      // 底部滑块样式
+      tabBarStyle() {
+        let style = {
+          width: this.$tn.string.getLengthUnitValue(this.barWidth),
+          height: this.$tn.string.getLengthUnitValue(this.barHeight),
+          borderRadius: `${this.barHeight / 2}rpx`,
+          backgroundColor: this.activeColor,
+          opacity: this.barMoveFirst ? 0 : 1,
+          transform: `translate(${this.scrollBarLeft}px, -100%)`,
+          transitionDuration: this.barMoveFirst ? '0s' : `${this.duration}s`
+        }
+        Object.assign(style, this.barStyle)
+        return style
+      },
+      // tabItem样式
+      tabItemStyle() {
+        return index => {
+          let style = {
+            width: this.$tn.string.getLengthUnitValue(this.itemWidth),
+            height: this.$tn.string.getLengthUnitValue(this.height),
+            lineHeight: this.$tn.string.getLengthUnitValue(this.height),
+            fontSize: this.fontSizeStyle || '28rpx',
+            padding: this.isScroll ? `0 ${this.gutter}rpx` : '',
+            flex: this.isScroll ? 'auto' : '1',
+            transitionDuration: `${this.duration}s`
+          }
+          if (index === this.currentIndex) {
+            if (this.bold) {
+              style.fontWeight = 'bold'
+            }
+            style.color = this.activeColor
+            Object.assign(style, this.activeItemStyle)
+          } else {
+            style.color = this.inactiveColor
+            Object.assign(style, this.inactiveItemStyle)
+          }
+          return style
+        }
+      }
+    },
+    data() {
+      return {
+        // id值
+        id: this.$tn.uuid(),
+        // 滚动scroll-view的左边距离
+        scrollLeft: 0,
+        // 存放查询后tab菜单的节点信息
+        tabQueryInfo: [],
+        // 组件宽度
+        componentWidth: 0,
+        // 底部滑块的移动距离
+        scrollBarLeft: 0,
+        // 组件到屏幕左边的巨鹿
+        componentLeft: 0,
+        // 当前选中的itemIndex
+        currentIndex: this.current,
+        // 标记底部滑块是否第一次移动，第一次移动的时候不触发动画
+        barMoveFirst: true
+      }
+    },
+    watch: {
+      // 监听tab的变化，重新计算tab菜单信息
+      list(newValue, oldValue) {
+        // list变化时，重置内部索引，防止出现超过数据边界的问题
+        if (newValue.length !== oldValue.length) this.currentIndex = 0
+        this.$nextTick(() => {
+          this.init()
+        })
+      },
+      current: {
+        handler(val) {
+          this.$nextTick(() => {
+            this.currentIndex = val
+            this.scrollByIndex()
+          })
+        },
+        immediate: true
+      }
+    },
+    mounted() {
+      this.init()
+    },
+    methods: {
+      // 初始化变量
+      async init() {
+        // 获取tabs组件的信息
+        let tabRect = await this._tGetRect('#' + this.id)
+        // 计算组件的宽度
+        this.componentLeft = tabRect.left
+        this.componentWidth = tabRect.width
+        this.getTabRect()
+      },
+      // 点击tab菜单
+      clickTab(index) {
+        if (index === this.currentIndex) return
+        this.$emit('change', index)
+      },
+      // 查询tab的布局信息
+      getTabRect() {
+        let query = uni.createSelectorQuery().in(this)
+        // 遍历所有的tab
+        for (let i = 0; i < this.list.length; i++) {
+          query.select(`#tn-tabs__scroll-view__item-${i}`).fields({
+            size: true,
+            rect: true
+          })
+        }
+        query.exec((res) => {
+          this.tabQueryInfo = res
+          // 初始滚动条和底部滑块的位置
+          this.scrollByIndex()
+        })
+      },
+      // 滚动scrollView，让活动的tab处于屏幕中间
+      scrollByIndex() {
+        // 当前获取tab的布局信息
+        let tabInfo = this.tabQueryInfo[this.currentIndex]
+        if (!tabInfo) return
+        
+        // 活动tab的宽度
+        let tabWidth = tabInfo.width
+        // 活动item的左边到组件左边的距离
+        let offsetLeft = tabInfo.left - this.componentLeft
+        // 计算scroll-view移动的距离
+        let scrollLeft = offsetLeft - (this.componentWidth - tabWidth) / 2
+        this.scrollLeft = scrollLeft < 0 ? 0 : scrollLeft
+        
+        // 计算当前滑块需要移动的距离，当前活动item的中点到左边的距离减去滑块宽度的一半
+        let left = tabInfo.left + tabInfo.width / 2 - this.componentLeft
+        
+        // 计算当前活跃item到组件左边的距离
+        this.scrollBarLeft = left - uni.upx2px(this.barWidth) / 2
+        
+        // 防止在计算时出错，所以延迟执行标记不是第一次移动
+        if (this.barMoveFirst) {
+          setTimeout(() => {
+            this.barMoveFirst = false
+          }, 100)
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  /* #ifndef APP-NVUE */
+  ::-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 */
+  
+  .tn-tabs {
+    &__scroll-view {
+      position: relative;
+      width: 100%;
+      white-space: nowrap;
+      
+      &__box {
+        position: relative;
+        /* #ifdef MP-TOUTIAO */
+        white-space: nowrap;
+        /* #endif */
+      }
+      
+      &__item {
+        position: relative;
+        /* #ifndef APP-NVUE */
+        display: inline-block;
+        /* #endif */
+        text-align: center;
+        transition-property: background-color, color;
+      }
+      
+      &--flex {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+      }
+    }
+    
+    &__bar {
+      position: absolute;
+      bottom: 0;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-tag/tn-tag.vue b/tuniao-ui/components/tn-tag/tn-tag.vue
new file mode 100644
index 0000000..180ca59
--- /dev/null
+++ b/tuniao-ui/components/tn-tag/tn-tag.vue
@@ -0,0 +1,223 @@
+<template>
+  <view
+    class="tn-tag-class tn-tag"
+    :class="[
+      tagClass,
+      backgroundColorClass,
+      fontColorClass
+    ]"
+    :style="[tagStyle]"
+    @tap="handleClick"
+  >
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    mixins: [ componentsColorMixin ],
+    options: {
+    	// 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现(不会出现shadow节点下再去创建元素)
+    	virtualHost: true
+    },
+    name: 'tn-tag',
+    props: {
+      // 序号，用于区分多个标签
+      index: {
+        type: [Number, String],
+        default: '0'
+      },
+      // 形状 圆角 radius 椭圆  circle 左半圆 circleLeft 右半圆 circleRight
+      shape: {
+        type: String,
+        default: ''
+      },
+      // 标签大小 sm lg
+      size: {
+        type: String,
+        default: ''
+      },
+      // 宽度
+      width: {
+        type: String,
+        default: ''
+      },
+      // 高度
+      height: {
+        type: String,
+        default: ''
+      },
+      // 内边距
+      padding: {
+        type: String,
+        default: ''
+      },
+      // 外边距
+      margin: {
+        type: String,
+        default: '0'
+      },
+      // 是否镂空
+      plain: {
+        type: Boolean,
+        default: false
+      },
+      // 是否将元素基点设置在左边
+      originLeft: {
+        type: Boolean,
+        default: false
+      },
+      // 是否将元素基点设置在右边
+      originRight: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      tagClass() {
+        let clazz = ''
+        // 设置标签的形状
+        switch(this.shape) {
+          case 'radius':
+            clazz += ' tn-radius'
+            break
+          case 'circle':
+            clazz += ' tn-round'
+            break
+          case 'circleLeft':
+            clazz += ' tn-tag--fillet-left'
+            break
+          case 'circleRight':
+            clazz += ' tn-tag--fillet-right'
+            break
+        }
+        
+        // 设置为镂空并且设置镂空便可才进行设置
+        if (this.plain) {
+          clazz += ' tn-tag--plain tn-border-solid'
+          if (this.backgroundColor !== '' && this.backgroundColor.includes('tn-bg')) {
+            const color = this.backgroundColor.slice(this.backgroundColor.lastIndexOf('-') + 1)
+            clazz += ` tn-border-${color}`
+          }
+        }
+        
+        // 设置基准点
+        if (this.originLeft) {
+          clazz += ' tn-tag--origin-left'
+        }
+        if (this.originRight) {
+          clazz += ' tn-tag--origin-right'
+        }
+        
+        return clazz
+      },
+      tagStyle() {
+        let style = {}
+        switch(this.size) {
+          case 'sm':
+            style.padding = '0 12rpx'
+            style.fontSize = '20rpx'
+            style.height = '32rpx'
+            break
+          case 'lg':
+            style.padding = '0 20rpx'
+            style.fontSize = '28rpx'
+            style.height = '62rpx'
+            break
+          default:
+            style.padding = '0 16rpx'
+            style.fontSize = '24rpx'
+            style.height = '48rpx'
+            break
+        }
+        
+        style.width = this.width || '120rpx'
+        style.height = this.height || style.height
+        
+        style.padding = this.padding || style.padding
+        if (this.margin) {
+          style.margin = this.margin
+        }
+        
+        if (this.fontColorStyle) {
+          style.color = this.fontColorStyle
+        }
+        if (this.fontSize !== 0) {
+          style.fontSize = this.fontSize + this.fontUnit
+        }
+
+        if (!this.backgroundColorClass) {
+          style.backgroundColor = !this.plain ? (this.backgroundColorStyle || '#FFFFFF') : ''
+          if (this.plain) {
+            style.borderColor = (this.backgroundColorStyle || '#080808')
+          }
+        }
+        
+        
+        
+        return style
+      },
+    },
+    data() {
+      return {
+
+      }
+    },
+    methods: {
+      // 处理点击事件
+      handleClick() {
+        this.$emit('click', {
+          index: Number(this.index)
+        })
+        this.$emit('tap', {
+          index: Number(this.index)
+        })
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-tag {
+    vertical-align: middle;
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    font-family: Helvetica Neue, Helvetica, sans-serif;
+    white-space: nowrap;
+    // color: #FFFFFF;
+    
+    &--fillet-left {
+      border-radius: 50rpx 0 0 50rpx;
+    }
+    
+    &--fillet-right {
+      border-radius: 0 50rpx 50rpx 0;
+    }
+    
+    &--plain {
+      background-color: transparent !important;
+      background-image: none;
+      
+      &.tn-round {
+        border-radius: 1000rpx !important;
+      }
+      
+      &.tn-radius {
+        border-radius: 12rpx !important;
+      }
+    }
+    
+    &--origin-left {
+      transform-origin: 0 center;
+    }
+    
+    &--origin-right {
+      transform-origin: 100% center;
+    }
+  }
+  
+</style>
diff --git a/tuniao-ui/components/tn-td/tn-td.vue b/tuniao-ui/components/tn-td/tn-td.vue
new file mode 100644
index 0000000..00b230f
--- /dev/null
+++ b/tuniao-ui/components/tn-td/tn-td.vue
@@ -0,0 +1,307 @@
+<template>
+  <view class="tn-td-class tn-td" :class="[tdClass]" :style="[tdStyle]" @tap.stop="handleClick">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-td',
+    options: {
+    	// 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现(不会出现shadow节点下再去创建元素)
+    	virtualHost: true
+    },
+    mixins: [componentsColorMixin],
+    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.$tn.string.getLengthUnitValue(this.height)
+        }
+        style.fontWeight = this.bold ? 'bold' : 'normal'
+        if (this.padding) {
+          style.padding = this.padding
+        }
+        if (this.borderWidth !== '' || this.parentData.borderWidthValue !== '') {
+          style.borderWidth = this.borderWidth !== '' ? this.$tn.string.getLengthUnitValue(this.borderWidth) : this.$tn.string.getLengthUnitValue(this.parentData.borderWidthValue)
+        }
+        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 : this.$tn.zIndex.tableTd
+        }
+        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.$tn.string.getLengthUnitValue(this.width)
+        }
+        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: #AAAAAA;
+    
+    &--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/tuniao-ui/components/tn-time-line-item/tn-time-line-item.vue b/tuniao-ui/components/tn-time-line-item/tn-time-line-item.vue
new file mode 100644
index 0000000..5372a10
--- /dev/null
+++ b/tuniao-ui/components/tn-time-line-item/tn-time-line-item.vue
@@ -0,0 +1,71 @@
+<template>
+  <view class="tn-time-line-item-class tn-time-line-item">
+    <view>
+      <slot name="content"></slot>
+    </view>
+    <view class="tn-time-line-item__node" :style="[nodeStyle]">
+      <slot name="node">
+        <view class="tn-time-line-item__node--dot"></view>
+      </slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-time-line-item',
+    props: {
+      // 节点左边图标的绝对定位top值
+      top: {
+        type: [String, Number],
+        default: ''
+      }
+    },
+    computed: {
+      nodeStyle() {
+        let style = {}
+        if (this.top !== '') style.top = this.top + 'rpx'
+        
+        return style
+      }
+    },
+    data() {
+      return {
+        
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-time-line-item {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    position: relative;
+    margin-bottom: 32rpx;
+    
+    &__node {
+      display: flex;
+      flex-direction: row;
+      position: absolute;
+      top: 12rpx;
+      left: -40rpx;
+      align-items: center;
+      justify-content: center;
+      font-size: 24rpx;
+      transform-origin: 0;
+      transform: translateX(-50%);
+      z-index: 1;
+      background-color: transparent;
+      
+      &--dot {
+        width: 16rpx;
+        height: 16rpx;
+        border-radius: 100rpx;
+        background-color: #AAAAAA;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-time-line-item/tn-time-line-item.vue_bk b/tuniao-ui/components/tn-time-line-item/tn-time-line-item.vue_bk
new file mode 100644
index 0000000..5372a10
--- /dev/null
+++ b/tuniao-ui/components/tn-time-line-item/tn-time-line-item.vue_bk
@@ -0,0 +1,71 @@
+<template>
+  <view class="tn-time-line-item-class tn-time-line-item">
+    <view>
+      <slot name="content"></slot>
+    </view>
+    <view class="tn-time-line-item__node" :style="[nodeStyle]">
+      <slot name="node">
+        <view class="tn-time-line-item__node--dot"></view>
+      </slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-time-line-item',
+    props: {
+      // 节点左边图标的绝对定位top值
+      top: {
+        type: [String, Number],
+        default: ''
+      }
+    },
+    computed: {
+      nodeStyle() {
+        let style = {}
+        if (this.top !== '') style.top = this.top + 'rpx'
+        
+        return style
+      }
+    },
+    data() {
+      return {
+        
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-time-line-item {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    position: relative;
+    margin-bottom: 32rpx;
+    
+    &__node {
+      display: flex;
+      flex-direction: row;
+      position: absolute;
+      top: 12rpx;
+      left: -40rpx;
+      align-items: center;
+      justify-content: center;
+      font-size: 24rpx;
+      transform-origin: 0;
+      transform: translateX(-50%);
+      z-index: 1;
+      background-color: transparent;
+      
+      &--dot {
+        width: 16rpx;
+        height: 16rpx;
+        border-radius: 100rpx;
+        background-color: #AAAAAA;
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-time-line/tn-time-line.vue b/tuniao-ui/components/tn-time-line/tn-time-line.vue
new file mode 100644
index 0000000..951dd3f
--- /dev/null
+++ b/tuniao-ui/components/tn-time-line/tn-time-line.vue
@@ -0,0 +1,39 @@
+<template>
+  <view class="tn-time-line-class tn-time-line">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-time-line',
+    props: {
+      
+    },
+    data() {
+      return {
+        
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-time-line {
+    padding-left: 40rpx;
+    position: relative;
+    
+    &::before {
+      content: '';
+      position: absolute;
+      width: 1px;
+      left: 0;
+      top: 12rpx;
+      bottom: 0;
+      border-left: 1px solid #AAAAAA;
+      transform-origin: 0 0;
+      transform: scaleX(0.5);
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-time-line/tn-time-line.vue_bk b/tuniao-ui/components/tn-time-line/tn-time-line.vue_bk
new file mode 100644
index 0000000..951dd3f
--- /dev/null
+++ b/tuniao-ui/components/tn-time-line/tn-time-line.vue_bk
@@ -0,0 +1,39 @@
+<template>
+  <view class="tn-time-line-class tn-time-line">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-time-line',
+    props: {
+      
+    },
+    data() {
+      return {
+        
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-time-line {
+    padding-left: 40rpx;
+    position: relative;
+    
+    &::before {
+      content: '';
+      position: absolute;
+      width: 1px;
+      left: 0;
+      top: 12rpx;
+      bottom: 0;
+      border-left: 1px solid #AAAAAA;
+      transform-origin: 0 0;
+      transform: scaleX(0.5);
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-tips/tn-tips.vue b/tuniao-ui/components/tn-tips/tn-tips.vue
new file mode 100644
index 0000000..3c49cd6
--- /dev/null
+++ b/tuniao-ui/components/tn-tips/tn-tips.vue
@@ -0,0 +1,240 @@
+<template>
+  <view
+    v-if="visibleSync"
+    class="tn-tips-class tn-tips"
+    :class="[tipsClass]"
+    :style="[tipsStyle]"
+  >
+    <view
+      class="tn-tips__content"
+      :class="[
+        backgroundColorClass,
+        fontColorClass
+      ]"
+      :style="{
+        backgroundColor: backgroundColorStyle,
+        color: fontColorStyle
+      }"
+    >{{ msg }}</view>
+  </view>
+</template>
+
+<script>
+  
+  export default {
+    name: 'tn-tips',
+    props: {
+      // 层级
+      zIndex: {
+        type: Number,
+        default: 0
+      },
+      // 提示框显示位置 top center bottom
+      position: {
+        type: String,
+        default: 'top'
+      },
+      // 当位置设置为top的时候，设置距离顶部的距离
+      top: {
+        type: Number,
+        default: 0
+      }
+    },
+    computed: {
+      tipsClass() {
+        let clazz = ''
+        switch (this.position) {
+          case 'top':
+            clazz += ' tn-tips--top'
+            break
+          case 'center':
+            clazz += ' tn-tips--center'
+            break
+          case 'bottom':
+            clazz += ' tn-tips--bottom'
+            break
+          default:
+            clazz += ' tn-tips--top'
+        }
+        if (this.showTips) {
+          clazz += ' tn-tips--show'
+        }
+        
+        return clazz
+      },
+      tipsStyle() {
+        let style = {}
+        if ((this.position === 'top' || this.position === '') && this.top) {
+          style.top = this.top + 'px'
+        }
+        style.zIndex = (this.zIndex ? this.zIndex : this.$tn.zIndex.tips) + 1
+        
+        return style
+      },
+      backgroundColorStyle() {
+        return this.$tn.color.getBackgroundColorStyle(this.backgroundColor)
+      },
+      backgroundColorClass() {
+        return this.$tn.color.getBackgroundColorInternalClass(this.backgroundColor)
+      },
+      fontColorStyle() {
+        return this.$tn.color.getFontColorStyle(this.fontColor)
+      },
+      fontColorClass() {
+        return this.$tn.color.getFontColorInternalClass(this.fontColor)
+      },
+    },
+    data() {
+      return {
+        //关闭提示框定时器
+        timer: null,
+        // 是否渲染组件
+        visibleSync: false,
+        // 是否显示内容
+        showTips: false,
+        // 提示信息
+        msg: '',
+        // 背景颜色
+        backgroundColor: '',
+        // 字体颜色
+        fontColor: ''
+      }
+    },
+    methods: {
+      show(options = {}) {
+        const {
+          duration = 2000,
+          msg = '',
+          backgroundColor = '',
+          fontColor = ''
+        } = options
+        
+        if (this.timer !== null) clearTimeout(this.timer)
+        
+        // 如果没有设置内容则不弹出
+        if (!msg) {
+          this._clearOptions()
+          this.$emit('close')
+          return
+        }
+        
+        this.msg = msg
+        this.backgroundColor = backgroundColor || '#01BEFF'
+        this.fontColor = fontColor || '#FFFFFF'
+        
+        this.change('visibleSync', 'showTips', true)
+        
+        this.timer = setTimeout(() => {
+          clearTimeout(this.timer)
+          this.timer = null
+          this.change('showTips', 'visibleSync', false)
+        }, duration)
+      },
+      
+      // 关闭时先通过动画隐藏弹窗和遮罩，再移除整个组件
+      // 打开时，先渲染组件，延时一定时间再让遮罩和弹窗的动画起作用
+      change(param1, param2, status) {
+        this[param1] = status
+        if (status) {
+          // #ifdef H5 || MP
+          this.timer = setTimeout(() => {
+            this[param2] = status
+            this.$emit(status ? 'open' : 'close')
+          }, 50)
+          // #endif
+          // #ifndef H5 || MP
+          this.$nextTick(() => {
+            this[param2] = status
+            this.$emit(status ? 'open' : 'close')
+          })
+          // #endif
+        } else {
+          this.timer = setTimeout(() => {
+            this[param2] = status
+            this.$emit(status ? 'open' : 'close')
+            this._clearOptions()
+          }, 300)
+        }
+      },
+      
+      // 清除传递的参数
+      _clearOptions() {
+        this.msg = ''
+        this.backgroundColor = ''
+        this.fontColor = ''
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  /*注意问题：
+   1、fixed 元素宽度无法自适应，所以增加了子元素
+   2、fixed 和 display冲突导致动画效果消失，暂时使用visibility替代
+  */
+  .tn-tips {
+    height: auto;
+    position: fixed;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.3s ease-in-out;
+    opacity: 0;
+    
+    &__content {
+      word-wrap: break-word;
+      word-break: break-all;
+      width: 100%;
+      height: auto;
+      text-align: center;
+      background-color: rgba(0, 0, 0, 0.7);
+      color: #FFFFFF;
+    }
+    
+    &--top {
+      width: 100% !important;
+      /* padding: 18rpx 30rpx; */
+      top: 0;
+      left: 0;
+      transform: translateY(-100%) translateZ(0);
+      word-break: break-all;
+    }
+    
+    &--center {
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+    }
+    
+    &--bottom {
+      bottom: 120rpx;
+      left: 50%;
+      transform: translateX(-50%);
+    }
+    
+    &--center, &--bottom {
+      .content {
+        border-radius: 8rpx;
+        padding: 0;
+      }
+    }
+    
+    &--center, &--bottom {
+      .tn-tips__content {
+        padding: 18rpx 30rpx !important;
+      }
+    }
+    
+    &--show {
+      opacity: 1;
+      
+      &.tn-tips--top {
+        transform: translateY(0) translateZ(0) !important;
+      }
+    }
+    
+  }
+  
+</style>
diff --git a/tuniao-ui/components/tn-toast/tn-toast.vue b/tuniao-ui/components/tn-toast/tn-toast.vue
new file mode 100644
index 0000000..6e77b93
--- /dev/null
+++ b/tuniao-ui/components/tn-toast/tn-toast.vue
@@ -0,0 +1,227 @@
+<template>
+  <view v-if="visible">
+    <view
+      class="tn-toast-class tn-toast"
+      :class="[toastClass]"
+      :style="[toastStyle]"
+    >
+      <image v-if="image" :src="image" class="tn-toast__img" :class="{'tn-margin-bottom-sm': title || content}"></image>
+      <view v-if="icon" class="tn-toast__icon">
+        <view :class="['tn-icon-' + icon]"></view>
+      </view>
+      <view
+        v-if="title"
+        class="tn-toast__text"
+        :class="[haveIcon || haveContent ? '' : 'tn-toast--unicon']"
+      >{{ title }}</view>
+      <view
+        v-if="haveContent"
+        class="tn-toast__text tn-toast__content"
+      >{{ content }}</view>
+    </view>
+    
+    <view class="tn-toast__mask" :class="[visible ? 'tn-toast__mask--show' : '']" :style="[maskStyle]"></view>
+  </view>
+</template>
+
+<script>
+  
+  export default {
+    name: 'tn-toast',
+    props: {
+      // 层级
+      zIndex: {
+        type: Number,
+        default: 0
+      }
+    },
+    computed: {
+      toastClass() {
+        let clazz = ''
+        if (this.visible) {
+          clazz += ' tn-toast--show'
+        }
+        
+        if (this.content) {
+          clazz += ' tn-toast--padding'
+        }
+        if (this.icon || this.image) {
+          clazz += ' tn-toast--unicon'
+        }
+        
+        return clazz
+      },
+      toastStyle() {
+        let style = {}
+        style.width = 'auto'
+        if (this.icon || this.image) {
+          // style.width = this.content ? '420rpx' : '360rpx'
+        }
+
+        style.zIndex = this.zIndex ? this.zIndex : this.$tn.zIndex.toast
+        
+        return style
+      },
+      maskStyle() {
+        let style = {}
+        const zIndex = this.zIndex ? this.zIndex : this.$tn.zIndex.toast
+        style.zIndex = zIndex - 1
+        return style
+      },
+      haveIcon() {
+        return this.icon || this.image
+      },
+      haveContent() {
+        return this.content
+      }
+    },
+    data() {
+      return {
+        // 自动关闭定时器
+        timer: null,
+        // 是否显示
+        visible: false,
+        // 显示的标题
+        title: '操作成功',
+        // 显示的内容
+        content: "",
+        // 是否显示icon (icon库的图标)
+        icon: '',
+        // 是否显示图片 (图片地址)
+        image: ''
+      }
+    },
+    methods: {
+      // 显示弹框
+      show(options = {}) {
+        const {
+          duration = 2000,
+          title = '',
+          content = '',
+          icon = '',
+          image = ''
+        } = options
+        if (this.timer !== null ){
+          clearTimeout(this.timer)
+        }
+        // 如果没有设置任何内容就不弹出
+        if (!icon && !image && !title && !content) {
+          this._clearOptions()
+          this.$emit('closed')
+          return
+        }
+        
+        this.visible = true
+        this.title = title
+        this.content = content
+        this.icon = icon
+        if (!icon) {
+          this.image = image
+        }
+        
+        this.timer = setTimeout(() => {
+          this.visible = false
+          clearTimeout(this.timer)
+          this.timer = null
+          this._clearOptions()
+          this.$emit('closed')
+        }, duration)
+      },
+      
+      
+      // 清除传递的参数
+      _clearOptions() {
+        this.title = ''
+        this.content = ''
+        this.icon = ''
+        this.image = ''
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-toast {
+    height: auto;
+    background-color: rgba(0, 0, 0, 0.4);
+    border-radius: 10rpx;
+    opacity: 0;
+    position: fixed;
+    left: 50%;
+    top: 48%;
+    transform: translate(-50%, -50%);
+    transition: 0.3 ease-in-out;
+    transition-property: opacity, visibility;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    padding: 20rpx 20rpx 20rpx 20rpx;
+    box-sizing: border-box;
+    
+    &--show {
+      opacity: 1;
+      
+      &.tn-toast--padding {
+        padding-top: 50rpx !important;
+        padding-bottom: 50rpx !important;
+      }
+      
+      &.tn-toast--unicon {
+        padding: 20rpx 20rpx 20rpx 20rpx !important;
+      }
+    }
+    
+    &__img {
+      width: 120rpx;
+      height: 120rpx;
+      display: block;
+    }
+    
+    &__text {
+      font-size: 28rpx;
+      line-height: 28rpx;
+      color: #ffffff;
+      text-align: center;
+    }
+    
+    &__icon {
+      color: #FFFFFF;
+      font-size: 64rpx;
+    }
+    
+    &__content {
+      padding-top: 10rpx;
+      font-size: 24rpx !important;
+    }
+    
+    &--unicon {
+      padding: 0;
+      word-break: break-all;
+    }
+    
+    &--padding {
+      padding: 10rpx;
+    }
+    
+    &__mask {
+      width: 100%;
+      height: 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      right: 0;
+      border: 0;
+      background-color: rgba(0, 0, 0, 0);
+      transition: 0.3s ease-in-out;
+      transition-property: opacity;
+      opacity: 0;
+      
+      &--show {
+        height: 100%;
+        opacity: 1;
+      }
+    }
+  }
+  
+</style>
diff --git a/tuniao-ui/components/tn-tr/tn-tr.vue b/tuniao-ui/components/tn-tr/tn-tr.vue
new file mode 100644
index 0000000..0380511
--- /dev/null
+++ b/tuniao-ui/components/tn-tr/tn-tr.vue
@@ -0,0 +1,210 @@
+<template>
+  <view class="tn-tr-class tn-tr" :class="[trClass]" :style="[trStyle]">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+  import componentsColorMixin from '../../libs/mixin/components_color.js'
+  export default {
+    name: 'tn-tr',
+    options: {
+    	// 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现(不会出现shadow节点下再去创建元素)
+    	virtualHost: true
+    },
+    mixins: [componentsColorMixin],
+    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.$tn.string.getLengthUnitValue(this.width)
+        }
+        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.$tn.string.getLengthUnitValue(this.borderWidth) : this.$tn.string.getLengthUnitValue(this.parentData.borderWidth)
+        }
+        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.$tn.string.getLengthUnitValue(this.left) : 'auto'
+          style.right = this.right ? this.$tn.string.getLengthUnitValue(this.right) : 'auto'
+          style.top = this.top ? this.$tn.string.getLengthUnitValue(this.top) : 'auto'
+        }
+        if (this.margin) {
+          style.margin = this.margin
+        }
+        style.zIndex = this.zIndex ? this.zIndex : this.$tn.zIndex.tableTr
+        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: #AAAAAA;
+    
+    &--wrap {
+      flex-wrap: wrap;
+    }
+    
+    &--fixed {
+      position: fixed;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-tree-node/tn-tree-node.vue b/tuniao-ui/components/tn-tree-node/tn-tree-node.vue
new file mode 100644
index 0000000..10f3f4d
--- /dev/null
+++ b/tuniao-ui/components/tn-tree-node/tn-tree-node.vue
@@ -0,0 +1,143 @@
+<template>
+  <view class="tn-tree-node-class tn-tree-node">
+    <view class="tn-tree__label" @tap="handleClick">
+      <view
+        v-if="node.children && node.children.length > 0 && triangle"
+        class="tn-tree__triangle"
+        :class="[{'tn-tree__triangle--90deg': !collapsed}]"
+      ></view>
+      <view class="tn-tree__label__item">
+        <view v-if="collapsed && node.image" class="tn-tree__label__item__image">
+          <image :src="node.image" mode="widthFix"></image>
+        </view>
+        <view v-if="!collapsed && node.activeImage" class="tn-tree__label__item__image">
+          <image :src="node.activeImage" mode="widthFix"></image>
+        </view>
+        <view class="tn-tree__label__item__text">{{ node.text }}</view>
+      </view>
+    </view>
+    <view v-if="!collapsed && node.children && node.children.length > 0" class="tn-tree__children">
+      <tn-tree-node
+        v-for="(item, index) in node.children"
+        :key="index"
+        :node="item"
+        :collapsible="collapsible"
+        :triangle="triangle"
+        @click="nodeClick"
+      ></tn-tree-node>
+    </view>
+  </view>
+</template>
+
+<script>
+  //如果未开启easycom模式，请自行引入tn-tree-node组件
+  export default {
+    name: 'tn-tree-node',
+    props: {
+      // 节点信息
+      node: {
+        type: Object,
+        default() {
+          return {}
+        }
+      },
+      // 可以折叠
+      collapsible: {
+        type: Boolean,
+        default: true
+      },
+      // 显示三角形
+      triangle: {
+        type: Boolean,
+        default: true
+      }
+    },
+    watch: {
+      node(val) {
+        if (val.collapsed !== this.collapsed && this.node.children && this.node.children.length > 0) {
+          this.collapsed = val.collapsed
+        }
+      }
+    },
+    data() {
+      return {
+        // 标记是否折叠
+        collapsed: true
+      }
+    },
+    created() {
+      if (this.node.collapsed === false) {
+        this.collapsed = false
+      }
+    },
+    methods: {
+      // 处理点击
+      handleClick(e) {
+        if (this.collapsible && this.node.children && this.node.children.length > 0) {
+          this.collapsed = !this.collapsed
+        }
+        this.$emit('click', this.node)
+      },
+      nodeClick(e) {
+        this.$emit('click', e)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-tree-node {
+    
+    .tn-tree {
+      &__label {
+        position: relative;
+        display: inline-flex;
+        align-items: center;
+        padding: 20rpx 30rpx;
+        background-color: transparent;
+        /* #ifdef H5 */
+        cursor: pointer;
+        /* #endif */
+        // 字体抗锯齿
+        -webkit-font-smoothing: antialiased;
+        
+        &__item {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          
+          &__image {
+            width: 40rpx;
+            height: 40rpx;
+            margin-right: 16rpx;
+            
+            image {
+              width: 100%;
+              height: 100%;
+            }
+          }
+        }
+      }
+      
+      &__children {
+        padding-left: 60rpx;
+        position: relative;
+      }
+      
+      &__triangle {
+        width: 0;
+        height: 0;
+        border-top: 12rpx solid transparent;
+        border-bottom: 12rpx solid transparent;
+        border-left: 16rpx solid #080808;
+        margin-right: 20rpx;
+        transition:  transform 0.25s ease-out;
+        flex-shrink: 0;
+        
+        &--90deg {
+          transform:rotate(90deg) translate3d(0, 0, 0);
+        }
+      }
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-tree-view/tn-tree-view.vue b/tuniao-ui/components/tn-tree-view/tn-tree-view.vue
new file mode 100644
index 0000000..99e8c7f
--- /dev/null
+++ b/tuniao-ui/components/tn-tree-view/tn-tree-view.vue
@@ -0,0 +1,50 @@
+<template>
+  <view class="tn-tree-view-class tn-tree-view">
+    <tn-tree-node
+      v-for="(item, index) in treeData"
+      :key="index"
+      :node="item"
+      :collapsible="collapsible"
+      :triangle="triangle"
+      @click="handleClick"
+    ></tn-tree-node>
+  </view>
+</template>
+
+<script>
+  //如果未开启easycom模式，请自行引入tn-tree-node组件
+  export default {
+    name: 'tn-tree-view',
+    props: {
+      // 节点信息
+      treeData: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 可以折叠
+      collapsible: {
+        type: Boolean,
+        default: true
+      },
+      // 显示三角形
+      triangle: {
+        type: Boolean,
+        default: true
+      }
+    },
+    methods: {
+      handleClick(e) {
+        this.$emit('click', e)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-tree-view {
+    width: 100%;
+    position: relative;
+  }
+</style>
diff --git a/tuniao-ui/components/tn-verification-code-input/tn-verification-code-input.vue b/tuniao-ui/components/tn-verification-code-input/tn-verification-code-input.vue
new file mode 100644
index 0000000..1b7a587
--- /dev/null
+++ b/tuniao-ui/components/tn-verification-code-input/tn-verification-code-input.vue
@@ -0,0 +1,324 @@
+<template>
+  <view class="tn-verification-code-class tn-verification-code">
+    <view class="tn-code__container">
+      <input class="tn-code__input" :disabled="disabledKeyboard" :value="valueModel" type="number" :focus="focus" :maxlength="maxLength" @input="getValue" />
+      <view v-for="(item, index) in loopCharArr" :key="index">
+        <view
+          class="tn-code__item"
+          :class="[{
+            'tn-code__item--breathe': breathe && charArrLength === index,
+            'tn-code__item__box': mode === 'box',
+            'tn-code__item__box--active': mode === 'box' && charArrLength === index
+          }]"
+          :style="[itemStyle(index)]"
+        >
+          <view
+            v-if="mode !== 'middleLine'"
+            class="tn-code__item__line tn-code__item__line--placeholder"
+            :style="[placeholderLineStyle(index)]"
+          ></view>
+          <view
+            v-if="mode === 'middleLine' && charArrLength <= index"
+            class="tn-code__item__line tn-code__item__line--middle"
+            :class="[{
+              'tn-code__item__line--bold': bold,
+              'tn-code__item--breathe': breathe && charArrLength === index,
+              'tn-code__item__line--active': charArrLength === index
+            }]"
+            :style="[lineStyle(index)]"
+          ></view>
+          <view
+            v-if="mode === 'bottomLine'"
+            class="tn-code__item__line tn-code__item__line--bottom"
+            :class="[{
+              'tn-code__item__line--bold': bold,
+              'tn-code__item--breathe': breathe && charArrLength === index,
+              'tn-code__item__line--active': charArrLength === index
+            }]"
+            :style="[lineStyle(index)]"
+          ></view>
+          <block v-if="!dotFill">
+            <text>{{ charArr[index] ? charArr[index] : '' }}</text>
+          </block>
+          <block v-else>
+            <text class="tn-code__item__dot">{{ charArr[index] ? '●' : '' }}</text>
+          </block>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-verification-code',
+    props: {
+      // 验证码的值
+      value: {
+        type: [String, Number],
+        default: ''
+      },
+      // 最大输入长度
+      maxLength: {
+        type: Number,
+        default: 4
+      },
+      // 显示模式
+      // box -> 盒子 bottomLine -> 底部横线 middleLine -> 中间横线
+      mode: {
+        type: String,
+        default: 'box'
+      },
+      // 用圆点填充空白位置
+      dotFill: {
+        type: Boolean,
+        default: false
+      },
+      // 字体加粗
+      bold: {
+        type: Boolean,
+        default: false
+      },
+      // 字体大小
+      fontSize: {
+        type: [String, Number],
+        default: ''
+      },
+      // 激活时颜色
+      activeColor: {
+        type: String,
+        default: ''
+      },
+      // 未激活时颜色
+      inactiveColor: {
+        type: String,
+        default: ''
+      },
+      // 输入框宽度，单位rpx
+      inputWidth: {
+        type: Number,
+        default: 80
+      },
+      // 当前激活的item带呼吸效果
+      breathe: {
+        type: Boolean,
+        default: true
+      },
+      // 自动获取焦点
+      focus: {
+        type: Boolean,
+        default: false
+      },
+      // 隐藏原生键盘，当使用自定义键盘的时候设置该参数未true即可
+      disabledKeyboard: {
+        type: Boolean,
+        default: false
+      }
+    },
+    computed: {
+      // 拆分要显示的字符
+      charArr() {
+        return this.valueModel.split('')
+      },
+      // 当前输入字符的长度
+      charArrLength() {
+        return this.charArr.length
+      },
+      // 输入框的个数
+      loopCharArr() {
+        return new Array(this.maxLength)
+      },
+      itemStyle() {
+        return (index) => {
+          let style = {}
+          style.fontWeight = this.bold ? 'bold' : 'normal'
+          if (this.fontSize) {
+            style.fontSize = this.fontSize + 'rpx'
+          }
+          if (this.inputWidth) {
+            style.width = this.inputWidth + 'rpx'
+            style.height = this.inputWidth + 'rpx'
+            style.lineHeight = this.inputWidth + 'rpx'
+          }
+          if (this.inactiveColor) {
+            style.color = this.inactiveColor
+            style.borderColor = this.inactiveColor
+          }
+          if (this.mode === 'box' && this.charArrLength === index) {
+            style.borderColor = this.activeColor
+          }
+          return style
+        }
+      },
+      placeholderLineStyle() {
+        return (index) => {
+          let style = {}
+          style.display = this.charArrLength === index ? 'block' : 'none'
+          if (this.inputWidth) {
+            style.height = (this.inputWidth * 0.5) + 'rpx'
+          }
+          return style
+        }
+      },
+      lineStyle() {
+        return (index) => {
+          let style = {}
+          if (this.inactiveColor) {
+            style.backgroundColor = this.inactiveColor
+          }
+          if (this.charArrLength === index && this.activeColor) {
+            style.backgroundColor = this.activeColor
+          }
+          return style
+        }
+      }
+    },
+    watch: {
+      value: {
+        handler(val) {
+          // 转换为字符串
+          val = String(val)
+          // 截掉超出的部分
+          this.valueModel = val.substring(0, this.maxLength)
+        },
+        immediate: true
+      }
+    },
+    data() {
+      return {
+        valueModel: ''
+      }
+    },
+    methods: {
+      // 获取填写的值
+      getValue(e) {
+        const {
+          value
+        } = e.detail
+        this.valueModel = value
+        // 判断输入的长度是否超出了maxlength的值
+        if (String(value).length > this.maxLength) return
+        // 未达到maxlength之前，触发change事件，否则触发finish事件
+        this.$emit('change', value)
+        this.$emit('input', value)
+        if (String(value).length == this.maxLength) {
+          this.$emit('finish', value)
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  
+  .tn-verification-code {
+    text-align: center;
+    
+    .tn-code {
+      &__container {
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+        flex-wrap: wrap;
+        position: relative;
+      }
+      
+      &__input {
+        position: absolute;
+        top: 0;
+        left: -100%;
+        width: 200%;
+        height: 100%;
+        text-align: left;
+        z-index: 9;
+        opacity: 0;
+        background: none;
+      }
+      
+      &__item {
+        position: relative;
+        width: 80rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        margin: 10rpx 10rpx;
+        font-size: 60rpx;
+        font-weight: bold;
+        color: #838383;
+        
+        &--breathe {
+          animation: breathe 2s infinite ease;
+        }
+        
+        &__box {
+          border: 2rpx solid #AAAAAA;
+          border-radius: 6rpx;
+          
+          &--active {
+            animation-timing-function: ease-in-out;
+            animation-duration: 1500ms;
+            animation-iteration-count: infinite;
+            animation-direction: alternate;
+            overflow: hidden;
+            border: 2rpx solid #01BEFF;
+          }
+        }
+        
+        &__line {
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          transform: translate(-50%, -50%);
+          background-color: #AAAAAA;
+          
+          &--bold {
+            height: 4px !important;
+          }
+          
+          &--placeholder {
+            display: none;
+            width: 2rpx;
+            height: 40rpx;
+          }
+          
+          &--middle, &--bottom {
+            width: 80%;
+            height: 2px;
+            border-radius: 2px;
+          }
+          &--bottom {
+            top: auto !important;
+            bottom: 0;
+            transform: translateX(-50%) !important;
+          }
+          
+          &--active {
+            background-color: #01BEFF !important;
+          }
+        }
+        
+        &__dot {
+          font-size: 34rpx;
+          line-height: 34rpx;
+        }
+      }
+    }
+  }
+  
+  @keyframes breathe {
+    0% {
+      opacity: 0.3;
+    }
+    
+    50% {
+      opacity: 1;
+    }
+    
+    100% {
+      opacity: 0.3;
+    }
+  }
+</style>
diff --git a/tuniao-ui/components/tn-verification-code/tn-verification-code.vue b/tuniao-ui/components/tn-verification-code/tn-verification-code.vue
new file mode 100644
index 0000000..9076ce4
--- /dev/null
+++ b/tuniao-ui/components/tn-verification-code/tn-verification-code.vue
@@ -0,0 +1,149 @@
+<template>
+  <view class="tn-code-class tn-code">
+    
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-verification-code',
+    props: {
+      // 倒计时总秒数
+      seconds: {
+        type: Number,
+        default: 60
+      },
+      // 开始时提示文字
+      startText: {
+        type: String,
+        default: '获取验证码'
+      },
+      // 倒计时提示文字
+      countDownText: {
+        type: String,
+        default: 's秒后重新获取'
+      },
+      // 结束时提示文字
+      endText: {
+        type: String,
+        default: '重新获取'
+      },
+      // 是否在H5刷新或各端返回再进入时继续倒计时
+      keepRunning: {
+      	type: Boolean,
+      	default: false
+      },
+      // 为了区分多个页面，或者一个页面多个倒计时组件本地存储的继续倒计时变了
+      uniqueKey: {
+      	type: String,
+      	default: ''
+      }
+    },
+    data() {
+      return {
+        timer: null,
+        secNum: this.seconds,
+        // 是否可以执行验证码操作
+        canGetCode: true
+      }
+    },
+    watch: {
+      seconds: {
+        handler(n) {
+          this.secNum = n
+        },
+        immediate: true
+      }
+    },
+    mounted() {
+      this.checkKeepRunning()
+    },
+    beforeDestroy() {
+      this.setTimeToStorage()
+      if (this.timer) {
+        clearInterval(this.timer)
+        this.timer = null
+      }
+    },
+    methods: {
+      // 检查是否继续运行
+      checkKeepRunning() {
+        // 获取上一次退出页面时的时间戳，如果没有上次保存，该值为空
+        let lastTimestamp = Number(uni.getStorageSync(this.uniqueKey + '_$tCountDownTimestamp'))
+        if (!lastTimestamp) return this.changeEvent(this.startText)
+        // 当前秒的时间戳
+        // + new Date() 相当于 new Date().getTime()
+        let nowTimestamp = Math.floor((+ new Date()) / 1000)
+        // 判断当前的时间戳，是否小于上一次的设定结束的时间，提前于结束的时间戳
+        if (this.keepRunning && lastTimestamp && lastTimestamp > nowTimestamp) {
+          // 剩余尚未执行完倒计时秒数
+          this.secNum = lastTimestamp - nowTimestamp
+          // 清除本地保存的变量
+          uni.removeStorageSync(this.uniqueKey + '_$tCountDownTimestamp')
+          // 开始倒计时
+          this.start()
+        } else {
+          // 如果不存在需要继续上一次的倒计时，执行正常的逻辑
+          this.changeEvent(this.startText);
+        }
+      },
+      // 开始倒计时
+      start() {
+        // 防止快速点击获取验证码按钮导致产生多个定时器导致混乱
+        if (this.timer) {
+          clearInterval(this.timer)
+          this.timer = null
+        }
+        this.$emit('start')
+        this.canGetCode = false
+        
+        this.changeEvent(this.countDownText.replace(/s|S/, this.secNum))
+        this.setTimeToStorage()
+        this.timer = setInterval(() => {
+          if (--this.secNum) {
+            this.changeEvent(this.countDownText.replace(/s|S/, this.secNum))
+          } else {
+            // 倒计时结束，清空定时器、重置提示信息
+            this.reset()
+            this.$emit('end')
+          }
+        }, 1000)
+      },
+      // 重置倒计时
+      reset() {
+        this.canGetCode = true
+        if (this.timer) {
+          clearInterval(this.timer)
+          this.timer = null
+        }
+        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) {
+          let nowTimestamp = Math.floor((+ new Date()) / 1000)
+          // 保存本次倒计时结束时候的时间戳
+          uni.setStorageSync(this.uniqueKey + '_$tCountDownTimestamp', nowTimestamp + this.secNum)
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-code {
+    width: 0;
+    height: 0;
+    position: fixed;
+    z-index: -1;
+  }
+</style>
diff --git a/tuniao-ui/components/tn-waterfall/tn-waterfall.vue b/tuniao-ui/components/tn-waterfall/tn-waterfall.vue
new file mode 100644
index 0000000..827be0e
--- /dev/null
+++ b/tuniao-ui/components/tn-waterfall/tn-waterfall.vue
@@ -0,0 +1,165 @@
+<template>
+  <view class="tn-waterfall-class tn-waterfall">
+    <view id="tn-waterfall-left" class="tn-waterfall__column"><slot name="left" :leftList="leftList"></slot></view>
+    <view id="tn-waterfall-right" class="tn-waterfall__column"><slot name="right" :rightList="rightList"></slot></view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'tn-waterfall',
+    props: {
+      // 瀑布流数据
+      value: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 数据的id值，根据id值对数据执行删除操作
+      // 如数据为：{id: 1, name: 'tuniao'}，那么该值设置为id
+      idKey: {
+        type: String,
+        default: 'id'
+      },
+      // 每次插入数据的事件间隔，间隔越长能保证两列高度相近，但是用户体验不好
+      // 单位ms
+      addTime: {
+        type: Number,
+        default: 200
+      }
+    },
+    computed: {
+      // 破坏value变量引用，否则数据会保持不变
+      copyValue() {
+        return this.cloneData(this.value)
+      }
+    },
+    watch: {
+      copyValue(nVal, oVal) {
+        // 取出数组发生变化的部分
+        let startIndex = Array.isArray(oVal) && oVal.length > 0 ? oVal.length : 0
+        // 拼接原有数据
+        this.tempList = this.tempList.concat(this.cloneData(nVal.slice(startIndex)))
+        this.splitData()
+      }
+    },
+    data() {
+      return {
+        // 左列表
+        leftList: [],
+        // 右列表
+        rightList: [],
+        // 临时列表
+        tempList: []
+      }
+    },
+    mounted() {
+      this.tempList = this.cloneData(this.copyValue)
+      this.splitData()
+    },
+    methods: {
+      // 拆分数据
+      async splitData() {
+        if (!this.tempList.length) return
+        
+        let leftRect = await this._tGetRect('#tn-waterfall-left')
+        let rightRect = await this._tGetRect('#tn-waterfall-right')
+        
+        let item = this.tempList[0]
+        // 因为经过上面两个await节点查询和定时器，数组有可能会变成空[]，导致item的值为undefined
+        // 解决多次快速滚动会导致数据乱的问题
+        if (!item) return
+        
+        // 如果左边小于或者等于右边，就添加到左边，否则添加到右边
+        if (leftRect.height < rightRect.height) {
+          this.leftList.push(item)
+        } else if (leftRect.height > rightRect.height) {
+          this.rightList.push(item)
+        } else {
+          // 为了保证前两项添加时，左右两边都还没有内容，这时候根据队列长度判断下一项该放在哪一边
+          if (this.leftList.length <= this.rightList.length) {
+            this.leftList.push(item)
+          } else {
+            this.rightList.push(item)
+          }
+        }
+        
+        // 移除临时数组中已处理的数据
+        this.tempList.splice(0, 1)
+        // 如果还有数据则继续执行
+        if (this.tempList.length) {
+          setTimeout(() => {
+            this.splitData()
+          }, this.addTime)
+        } else {
+          this.$emit('finish')
+        }
+      },
+      // 复制对象和数组（深度复制不会影响原对象和数组）
+      cloneData(data) {
+        return JSON.parse(JSON.stringify(data))
+      },
+      // 清空数据列表
+      clear() {
+        this.leftList = []
+        this.rightList = []
+        this.$emit('input', [])
+        this.tempList = []
+      },
+      // 清除指定的某一条数据，根据id来实现
+      remove(id) {
+        // 如果查找不到就返回-1
+        let index = -1
+        index = this.leftList.findIndex(val => val[this.idKey] == id)
+        if (index != -1) {
+          // 如果index不等于-1，说明已经找到了指定的数据
+          this.leftList.splice(index, 1)
+        } else {
+          // 同理于上面的方法
+          index = this.rightList.findIndex(val => val[this.idKey] == id)
+          if (index != -1) this.rightList.splice(index, 1)
+        }
+        // 同时删除父组件对应的数据
+        index = this.value.findIndex(val => val[this.idKey] == id)
+        if (index != -1) this.$emit('input', this.value.splice(index, 1))
+      },
+      // 修改指定数据的属性
+      modify(id, key, value) {
+        // 如果查找不到就返回-1
+        let index = -1
+        index = this.leftList.findIndex(val => val[this.idKey] == id)
+        if (index != -1) {
+          // 如果index不等于-1，说明已经找到了指定的数据
+          this.leftList[index][key] = value
+        } else {
+          // 同理于上面的方法
+          index = this.rightList.findIndex(val => val[this.idKey] == id)
+          if (index != -1) this.rightList[index][key] = value
+        }
+        // 同时删除父组件对应的数据
+        index = this.value.findIndex(val => val[this.idKey] == id)
+        if(index != -1) {
+          let data = this.cloneData(this.value)
+          data[index][key] = value
+          this.$emit('input', data)
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .tn-waterfall {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    
+    &__column {
+      display: flex;
+      flex-direction: column;
+      flex: 1;
+      height: auto;
+    }
+  }
+</style>
diff --git a/tuniao-ui/iconfont.css b/tuniao-ui/iconfont.css
new file mode 100644
index 0000000..c6df848
--- /dev/null
+++ b/tuniao-ui/iconfont.css
@@ -0,0 +1,3061 @@
+@charset "UTF-8";
+
+@font-face {
+  font-family: "tuniaoFont"; /* Project id 3063751 */
+  src: 
+       url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3063751_pd5m6puw4p.woff?t=1701183381697') format('woff'),
+       url('//at.alicdn.com/t/c/font_3063751_pd5m6puw4p.ttf?t=1701183381697') format('truetype');
+}
+
+[class*='tn-icon-'] {
+  font-family: 'tuniaoFont' !important;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  text-align: center;
+  text-decoration: none;
+}
+
+.tn-icon-left-circle-simple:before {
+  content: "\ea38";
+}
+
+.tn-icon-left-circle-simple-fill:before {
+  content: "\ea39";
+}
+
+.tn-icon-down-circle-simple:before {
+  content: "\ea3a";
+}
+
+.tn-icon-down-circle-simple-fill:before {
+  content: "\ea3b";
+}
+
+.tn-icon-right-circle-simple-fill:before {
+  content: "\ea3c";
+}
+
+.tn-icon-right-circle-simple:before {
+  content: "\ea3d";
+}
+
+.tn-icon-up-circle-simple:before {
+  content: "\ea3e";
+}
+
+.tn-icon-up-circle-simple-fill:before {
+  content: "\ea3f";
+}
+
+.tn-icon-my-love:before {
+  content: "\ea35";
+}
+
+.tn-icon-address-fill:before {
+  content: "\ea36";
+}
+
+.tn-icon-address:before {
+  content: "\ea37";
+}
+
+.tn-icon-like-lack-fill:before {
+  content: "\ea32";
+}
+
+.tn-icon-oa:before {
+  content: "\ea33";
+}
+
+.tn-icon-like-break-fill:before {
+  content: "\ea34";
+}
+
+.tn-icon-signal:before {
+  content: "\ea2e";
+}
+
+.tn-icon-help-question:before {
+  content: "\ea2f";
+}
+
+.tn-icon-radioactivity:before {
+  content: "\ea30";
+}
+
+.tn-icon-signal-no:before {
+  content: "\ea31";
+}
+
+.tn-icon-dice-face:before {
+  content: "\ea2d";
+}
+
+.tn-icon-vip-diamond:before {
+  content: "\e9c9";
+}
+
+.tn-icon-video-square:before {
+  content: "\e9ca";
+}
+
+.tn-icon-vip-diamond-fill:before {
+  content: "\ea29";
+}
+
+.tn-icon-vr:before {
+  content: "\ea2a";
+}
+
+.tn-icon-vr-fill:before {
+  content: "\ea2b";
+}
+
+.tn-icon-video-square-fill:before {
+  content: "\ea2c";
+}
+
+.tn-icon-arrivals:before {
+  content: "\ea27";
+}
+
+.tn-icon-departures:before {
+  content: "\ea28";
+}
+
+.tn-icon-parking:before {
+  content: "\ea26";
+}
+
+.tn-icon-fireworks:before {
+  content: "\ea25";
+}
+
+.tn-icon-cloud-fill:before {
+  content: "\ea23";
+}
+
+.tn-icon-cloud:before {
+  content: "\ea24";
+}
+
+.tn-icon-snowflake:before {
+  content: "\e949";
+}
+
+.tn-icon-prohibit:before {
+  content: "\ea22";
+}
+
+.tn-icon-honeycomb-fill:before {
+  content: "\ea20";
+}
+
+.tn-icon-honeycomb:before {
+  content: "\ea21";
+}
+
+.tn-icon-starry:before {
+  content: "\ea1e";
+}
+
+.tn-icon-vscode:before {
+  content: "\ea1f";
+}
+
+.tn-icon-tips-fill:before {
+  content: "\ea1b";
+}
+
+.tn-icon-tip:before {
+  content: "\ea1c";
+}
+
+.tn-icon-tips:before {
+  content: "\ea1d";
+}
+
+.tn-icon-write-feather-fill:before {
+  content: "\ea19";
+}
+
+.tn-icon-write-feather:before {
+  content: "\ea1a";
+}
+
+.tn-icon-eat:before {
+  content: "\e98b";
+}
+
+.tn-icon-eat-fill:before {
+  content: "\e98c";
+}
+
+.tn-icon-eat-west:before {
+  content: "\ea0f";
+}
+
+.tn-icon-eat-west-fill:before {
+  content: "\ea10";
+}
+
+.tn-icon-eat-other:before {
+  content: "\ea11";
+}
+
+.tn-icon-eat-other-fill:before {
+  content: "\ea12";
+}
+
+.tn-icon-food-fill:before {
+  content: "\ea13";
+}
+
+.tn-icon-food:before {
+  content: "\ea14";
+}
+
+.tn-icon-folder-reduce:before {
+  content: "\ea15";
+}
+
+.tn-icon-folder-add-fill:before {
+  content: "\ea16";
+}
+
+.tn-icon-folder-reduce-fill:before {
+  content: "\ea17";
+}
+
+.tn-icon-folder-add:before {
+  content: "\ea18";
+}
+
+.tn-icon-fold:before {
+  content: "\ea0d";
+}
+
+.tn-icon-unfold:before {
+  content: "\ea0e";
+}
+
+.tn-icon-refresh-simple:before {
+  content: "\ea0c";
+}
+
+.tn-icon-assign-fill:before {
+  content: "\ea0a";
+}
+
+.tn-icon-assign:before {
+  content: "\ea0b";
+}
+
+.tn-icon-praise-simple:before {
+  content: "\ea06";
+}
+
+.tn-icon-praise-simple-fill:before {
+  content: "\ea07";
+}
+
+.tn-icon-tread-simple-fill:before {
+  content: "\ea08";
+}
+
+.tn-icon-tread-simple:before {
+  content: "\ea09";
+}
+
+.tn-icon-fish:before {
+  content: "\ea05";
+}
+
+.tn-icon-pushpin-fill:before {
+  content: "\ea03";
+}
+
+.tn-icon-pushpin:before {
+  content: "\ea04";
+}
+
+.tn-icon-equal:before {
+  content: "\ea00";
+}
+
+.tn-icon-equal-fill:before {
+  content: "\ea01";
+}
+
+.tn-icon-totop-simple:before {
+  content: "\ea02";
+}
+
+.tn-icon-floral-fill:before {
+  content: "\e9fe";
+}
+
+.tn-icon-floral:before {
+  content: "\e9ff";
+}
+
+.tn-icon-my-job:before {
+  content: "\e9f9";
+}
+
+.tn-icon-my-job-fill:before {
+  content: "\e9fa";
+}
+
+.tn-icon-my-formal:before {
+  content: "\e9fb";
+}
+
+.tn-icon-my-formal-fill:before {
+  content: "\e9fc";
+}
+
+.tn-icon-history:before {
+  content: "\e9fd";
+}
+
+.tn-icon-seafox:before {
+  content: "\e9f8";
+}
+
+.tn-icon-norm-fill:before {
+  content: "\e9f6";
+}
+
+.tn-icon-norm:before {
+  content: "\e9f7";
+}
+
+.tn-icon-cargoship:before {
+  content: "\e9f5";
+}
+
+.tn-icon-menu-grille-fill:before {
+  content: "\e9f3";
+}
+
+.tn-icon-menu-grille:before {
+  content: "\e9f4";
+}
+
+.tn-icon-piggy-bank:before {
+  content: "\e9ef";
+}
+
+.tn-icon-skull-fill:before {
+  content: "\e9f0";
+}
+
+.tn-icon-skull:before {
+  content: "\e9f1";
+}
+
+.tn-icon-piggy-bank-fill:before {
+  content: "\e9f2";
+}
+
+.tn-icon-next-song:before {
+  content: "\e9eb";
+}
+
+.tn-icon-previous-song:before {
+  content: "\e9ec";
+}
+
+.tn-icon-previous-song-fill:before {
+  content: "\e9ed";
+}
+
+.tn-icon-next-song-fill:before {
+  content: "\e9ee";
+}
+
+.tn-icon-ai:before {
+  content: "\e9e9";
+}
+
+.tn-icon-ai-fill:before {
+  content: "\e9ea";
+}
+
+.tn-icon-headset-fill:before {
+  content: "\e9e8";
+}
+
+.tn-icon-reduce-rhombus-fill:before {
+  content: "\e9e6";
+}
+
+.tn-icon-reduce-rhombus:before {
+  content: "\e9e7";
+}
+
+.tn-icon-umbrella-fill:before {
+  content: "\e9a1";
+}
+
+.tn-icon-footprint-fill:before {
+  content: "\e992";
+}
+
+.tn-icon-folder:before {
+  content: "\e9df";
+}
+
+.tn-icon-folder-fill:before {
+  content: "\e9e0";
+}
+
+.tn-icon-folder-download-fill:before {
+  content: "\e9e1";
+}
+
+.tn-icon-pyramid:before {
+  content: "\e9e2";
+}
+
+.tn-icon-folder-upload:before {
+  content: "\e9e3";
+}
+
+.tn-icon-folder-download:before {
+  content: "\e9e4";
+}
+
+.tn-icon-folder-upload-fill:before {
+  content: "\e9e5";
+}
+
+.tn-icon-hotspot:before {
+  content: "\e9dc";
+}
+
+.tn-icon-router:before {
+  content: "\e9dd";
+}
+
+.tn-icon-router-fill:before {
+  content: "\e9de";
+}
+
+.tn-icon-menu-rhombus:before {
+  content: "\e9da";
+}
+
+.tn-icon-menu-rhombus-fill:before {
+  content: "\e9db";
+}
+
+.tn-icon-plane-fill:before {
+  content: "\e9d8";
+}
+
+.tn-icon-plane:before {
+  content: "\e9d9";
+}
+
+.tn-icon-spiral:before {
+  content: "\e9d2";
+}
+
+.tn-icon-lotus:before {
+  content: "\e9d3";
+}
+
+.tn-icon-koi:before {
+  content: "\e9d4";
+}
+
+.tn-icon-koi-fill:before {
+  content: "\e9d5";
+}
+
+.tn-icon-add-rhombus-fill:before {
+  content: "\e9d6";
+}
+
+.tn-icon-add-rhombus:before {
+  content: "\e9d7";
+}
+
+.tn-icon-bookmark:before {
+  content: "\e9ce";
+}
+
+.tn-icon-bookmark-fill:before {
+  content: "\e9cf";
+}
+
+.tn-icon-refresh:before {
+  content: "\e9d0";
+}
+
+.tn-icon-refresh-square:before {
+  content: "\e9d1";
+}
+
+.tn-icon-tread-fill:before {
+  content: "\e9cb";
+}
+
+.tn-icon-audio:before {
+  content: "\e9cc";
+}
+
+.tn-icon-tread:before {
+  content: "\e9cd";
+}
+
+.tn-icon-play:before {
+  content: "\e9c8";
+}
+
+.tn-icon-inventory-fill:before {
+  content: "\e9c3";
+}
+
+.tn-icon-percent-fill:before {
+  content: "\e9c4";
+}
+
+.tn-icon-percent:before {
+  content: "\e9c5";
+}
+
+.tn-icon-inventory:before {
+  content: "\e9c6";
+}
+
+.tn-icon-activity:before {
+  content: "\e9c7";
+}
+
+.tn-icon-qr-code-circle:before {
+  content: "\e9c2";
+}
+
+.tn-icon-task-fill:before {
+  content: "\e9c0";
+}
+
+.tn-icon-task:before {
+  content: "\e9c1";
+}
+
+.tn-icon-text-best:before {
+  content: "\e9be";
+}
+
+.tn-icon-text-free:before {
+  content: "\e9bf";
+}
+
+.tn-icon-text-zgs:before {
+  content: "\e8ff";
+}
+
+.tn-icon-text-xzx:before {
+  content: "\e9ba";
+}
+
+.tn-icon-text-like:before {
+  content: "\e9bb";
+}
+
+.tn-icon-text-sale:before {
+  content: "\e9bc";
+}
+
+.tn-icon-text-hot:before {
+  content: "\e9bd";
+}
+
+.tn-icon-home-leaf:before {
+  content: "\e9b8";
+}
+
+.tn-icon-home-leaf-fill:before {
+  content: "\e9b9";
+}
+
+.tn-icon-service-simple-fill:before {
+  content: "\e9b6";
+}
+
+.tn-icon-service-simple:before {
+  content: "\e9b7";
+}
+
+.tn-icon-meteor-fill:before {
+  content: "\e9b4";
+}
+
+.tn-icon-meteor:before {
+  content: "\e9b5";
+}
+
+.tn-icon-dice-five:before {
+  content: "\e9ae";
+}
+
+.tn-icon-dice-one:before {
+  content: "\e9af";
+}
+
+.tn-icon-dice-three:before {
+  content: "\e9b0";
+}
+
+.tn-icon-dice-six:before {
+  content: "\e9b1";
+}
+
+.tn-icon-dice-four:before {
+  content: "\e9b2";
+}
+
+.tn-icon-dice-two:before {
+  content: "\e9b3";
+}
+
+.tn-icon-theme-fill:before {
+  content: "\e938";
+}
+
+.tn-icon-theme:before {
+  content: "\e9ad";
+}
+
+.tn-icon-download-simple:before {
+  content: "\e9ab";
+}
+
+.tn-icon-upload-simple:before {
+  content: "\e9ac";
+}
+
+.tn-icon-on:before {
+  content: "\e9a9";
+}
+
+.tn-icon-off:before {
+  content: "\e9aa";
+}
+
+.tn-icon-my-circle:before {
+  content: "\e9a7";
+}
+
+.tn-icon-my-circle-fill:before {
+  content: "\e9a8";
+}
+
+.tn-icon-temperature-f:before {
+  content: "\e9a5";
+}
+
+.tn-icon-temperature-c:before {
+  content: "\e9a6";
+}
+
+.tn-icon-sunrise:before {
+  content: "\e9a3";
+}
+
+.tn-icon-sunset:before {
+  content: "\e9a4";
+}
+
+.tn-icon-password:before {
+  content: "\e9a0";
+}
+
+.tn-icon-umbrella:before {
+  content: "\e9a2";
+}
+
+.tn-icon-unite:before {
+  content: "\e999";
+}
+
+.tn-icon-unite-fill:before {
+  content: "\e99a";
+}
+
+.tn-icon-global:before {
+  content: "\e99b";
+}
+
+.tn-icon-reload-home:before {
+  content: "\e99c";
+}
+
+.tn-icon-reload-planet:before {
+  content: "\e99d";
+}
+
+.tn-icon-reload-home-fill:before {
+  content: "\e99e";
+}
+
+.tn-icon-reload-planet-fill:before {
+  content: "\e99f";
+}
+
+.tn-icon-route:before {
+  content: "\e997";
+}
+
+.tn-icon-route-fill:before {
+  content: "\e998";
+}
+
+.tn-icon-my-simple-fill:before {
+  content: "\e98e";
+}
+
+.tn-icon-my-simple:before {
+  content: "\e98f";
+}
+
+.tn-icon-around-fill:before {
+  content: "\e990";
+}
+
+.tn-icon-around:before {
+  content: "\e991";
+}
+
+.tn-icon-footprint:before {
+  content: "\e993";
+}
+
+.tn-icon-my-lack-fill:before {
+  content: "\e994";
+}
+
+.tn-icon-my-lack:before {
+  content: "\e995";
+}
+
+.tn-icon-bigscreen:before {
+  content: "\e996";
+}
+
+.tn-icon-escalator:before {
+  content: "\e98d";
+}
+
+.tn-icon-suitcase:before {
+  content: "\e989";
+}
+
+.tn-icon-suitcase-fill:before {
+  content: "\e98a";
+}
+
+.tn-icon-add-square-fill:before {
+  content: "\e904";
+}
+
+.tn-icon-cute:before {
+  content: "\e988";
+}
+
+.tn-icon-compress:before {
+  content: "\e96e";
+}
+
+.tn-icon-expend:before {
+  content: "\e96f";
+}
+
+.tn-icon-windows:before {
+  content: "\e970";
+}
+
+.tn-icon-trademark:before {
+  content: "\e971";
+}
+
+.tn-icon-tailor:before {
+  content: "\e972";
+}
+
+.tn-icon-move:before {
+  content: "\e973";
+}
+
+.tn-icon-pillow:before {
+  content: "\e974";
+}
+
+.tn-icon-bathtub:before {
+  content: "\e975";
+}
+
+.tn-icon-buy:before {
+  content: "\e976";
+}
+
+.tn-icon-buy-fill:before {
+  content: "\e977";
+}
+
+.tn-icon-allday:before {
+  content: "\e978";
+}
+
+.tn-icon-home-love-fill:before {
+  content: "\e979";
+}
+
+.tn-icon-home-love:before {
+  content: "\e97a";
+}
+
+.tn-icon-gesture-two:before {
+  content: "\e97b";
+}
+
+.tn-icon-gesture-four:before {
+  content: "\e97c";
+}
+
+.tn-icon-gesture-five:before {
+  content: "\e97d";
+}
+
+.tn-icon-gesture-one:before {
+  content: "\e97e";
+}
+
+.tn-icon-gesture-three:before {
+  content: "\e97f";
+}
+
+.tn-icon-gesture-dropdown:before {
+  content: "\e980";
+}
+
+.tn-icon-plant-fill:before {
+  content: "\e981";
+}
+
+.tn-icon-plant:before {
+  content: "\e982";
+}
+
+.tn-icon-pillow-fill:before {
+  content: "\e983";
+}
+
+.tn-icon-bathtub-fill:before {
+  content: "\e984";
+}
+
+.tn-icon-wheelchair:before {
+  content: "\e985";
+}
+
+.tn-icon-narrow-all:before {
+  content: "\e986";
+}
+
+.tn-icon-fullscreen-all:before {
+  content: "\e987";
+}
+
+.tn-icon-close-square-fill:before {
+  content: "\e945";
+}
+
+.tn-icon-add-square:before {
+  content: "\e962";
+}
+
+.tn-icon-close-square:before {
+  content: "\e963";
+}
+
+.tn-icon-my-reduce:before {
+  content: "\e964";
+}
+
+.tn-icon-square-fill:before {
+  content: "\e965";
+}
+
+.tn-icon-pay-fill:before {
+  content: "\e966";
+}
+
+.tn-icon-commissary:before {
+  content: "\e967";
+}
+
+.tn-icon-commissary-fill:before {
+  content: "\e968";
+}
+
+.tn-icon-notice-no-fill:before {
+  content: "\e969";
+}
+
+.tn-icon-cross-fill:before {
+  content: "\e96a";
+}
+
+.tn-icon-nintendo-switch:before {
+  content: "\e96b";
+}
+
+.tn-icon-mammoth:before {
+  content: "\e96c";
+}
+
+.tn-icon-open:before {
+  content: "\e96d";
+}
+
+.tn-icon-bed-fill:before {
+  content: "\e916";
+}
+
+.tn-icon-bed:before {
+  content: "\e961";
+}
+
+.tn-icon-menu-flex-fill:before {
+  content: "\e956";
+}
+
+.tn-icon-menu-flex:before {
+  content: "\e957";
+}
+
+.tn-icon-logistics-fill:before {
+  content: "\e958";
+}
+
+.tn-icon-ghost-fill:before {
+  content: "\e959";
+}
+
+.tn-icon-keyboard-circle-fill:before {
+  content: "\e95a";
+}
+
+.tn-icon-brand-fill:before {
+  content: "\e95b";
+}
+
+.tn-icon-clear-fill:before {
+  content: "\e95c";
+}
+
+.tn-icon-mouse-fill:before {
+  content: "\e95d";
+}
+
+.tn-icon-brand:before {
+  content: "\e95e";
+}
+
+.tn-icon-monitor-fill:before {
+  content: "\e95f";
+}
+
+.tn-icon-covid-19-fill:before {
+  content: "\e960";
+}
+
+.tn-icon-install-fill:before {
+  content: "\e936";
+}
+
+.tn-icon-install:before {
+  content: "\e955";
+}
+
+.tn-icon-restroom-female:before {
+  content: "\e953";
+}
+
+.tn-icon-restroom-male:before {
+  content: "\e954";
+}
+
+.tn-icon-first:before {
+  content: "\e950";
+}
+
+.tn-icon-third:before {
+  content: "\e951";
+}
+
+.tn-icon-second:before {
+  content: "\e952";
+}
+
+.tn-icon-ninja:before {
+  content: "\e94b";
+}
+
+.tn-icon-program:before {
+  content: "\e94c";
+}
+
+.tn-icon-program-fill:before {
+  content: "\e94d";
+}
+
+.tn-icon-circle-more:before {
+  content: "\e94e";
+}
+
+.tn-icon-windmill:before {
+  content: "\e94f";
+}
+
+.tn-icon-alien:before {
+  content: "\e946";
+}
+
+.tn-icon-taichi:before {
+  content: "\e947";
+}
+
+.tn-icon-knot:before {
+  content: "\e948";
+}
+
+.tn-icon-whale:before {
+  content: "\e94a";
+}
+
+.tn-icon-dragon:before {
+  content: "\e944";
+}
+
+.tn-icon-home-in-fill:before {
+  content: "\e942";
+}
+
+.tn-icon-home-in:before {
+  content: "\e943";
+}
+
+.tn-icon-home-loading:before {
+  content: "\e940";
+}
+
+.tn-icon-home-loading-fill:before {
+  content: "\e941";
+}
+
+.tn-icon-cell:before {
+  content: "\e93b";
+}
+
+.tn-icon-loading:before {
+  content: "\e93c";
+}
+
+.tn-icon-orange:before {
+  content: "\e93d";
+}
+
+.tn-icon-bigbug:before {
+  content: "\e93e";
+}
+
+.tn-icon-dinosaur:before {
+  content: "\e93f";
+}
+
+.tn-icon-dna:before {
+  content: "\e931";
+}
+
+.tn-icon-chain:before {
+  content: "\e932";
+}
+
+.tn-icon-email:before {
+  content: "\e933";
+}
+
+.tn-icon-education:before {
+  content: "\e934";
+}
+
+.tn-icon-english:before {
+  content: "\e935";
+}
+
+.tn-icon-seal:before {
+  content: "\e937";
+}
+
+.tn-icon-book:before {
+  content: "\e939";
+}
+
+.tn-icon-email-fill:before {
+  content: "\e93a";
+}
+
+.tn-icon-maths:before {
+  content: "\e92f";
+}
+
+.tn-icon-molecule:before {
+  content: "\e930";
+}
+
+.tn-icon-ghost:before {
+  content: "\e92d";
+}
+
+.tn-icon-money-fill:before {
+  content: "\e92e";
+}
+
+.tn-icon-menu-alone:before {
+  content: "\e929";
+}
+
+.tn-icon-menu-alone-fill:before {
+  content: "\e92a";
+}
+
+.tn-icon-tree:before {
+  content: "\e92b";
+}
+
+.tn-icon-rabbit:before {
+  content: "\e92c";
+}
+
+.tn-icon-block-fill:before {
+  content: "\e925";
+}
+
+.tn-icon-block:before {
+  content: "\e926";
+}
+
+.tn-icon-menu-classify:before {
+  content: "\e927";
+}
+
+.tn-icon-menu-classify-fill:before {
+  content: "\e928";
+}
+
+.tn-icon-home-totop-fill:before {
+  content: "\e923";
+}
+
+.tn-icon-home-totop:before {
+  content: "\e924";
+}
+
+.tn-icon-petal:before {
+  content: "\e920";
+}
+
+.tn-icon-clover-fill:before {
+  content: "\e921";
+}
+
+.tn-icon-clover:before {
+  content: "\e922";
+}
+
+.tn-icon-heartbeat:before {
+  content: "\e917";
+}
+
+.tn-icon-paperbag:before {
+  content: "\e918";
+}
+
+.tn-icon-paperbag-fill:before {
+  content: "\e919";
+}
+
+.tn-icon-menu-match:before {
+  content: "\e91a";
+}
+
+.tn-icon-menu-match-fill:before {
+  content: "\e91b";
+}
+
+.tn-icon-sofa-fill:before {
+  content: "\e91c";
+}
+
+.tn-icon-fullscreen:before {
+  content: "\e91d";
+}
+
+.tn-icon-narrow:before {
+  content: "\e91e";
+}
+
+.tn-icon-smallscreen:before {
+  content: "\e91f";
+}
+
+.tn-icon-payment-wechat:before {
+  content: "\e90a";
+}
+
+.tn-icon-cursor:before {
+  content: "\e912";
+}
+
+.tn-icon-cursor-fill:before {
+  content: "\e913";
+}
+
+.tn-icon-check:before {
+  content: "\e914";
+}
+
+.tn-icon-payment-alipay:before {
+  content: "\e915";
+}
+
+.tn-icon-dashboard:before {
+  content: "\e90b";
+}
+
+.tn-icon-module:before {
+  content: "\e90c";
+}
+
+.tn-icon-at-sign:before {
+  content: "\e90d";
+}
+
+.tn-icon-copyright:before {
+  content: "\e90e";
+}
+
+.tn-icon-pin:before {
+  content: "\e90f";
+}
+
+.tn-icon-module-fill:before {
+  content: "\e910";
+}
+
+.tn-icon-dashboard-fill:before {
+  content: "\e911";
+}
+
+.tn-icon-birthday:before {
+  content: "\e905";
+}
+
+.tn-icon-sofa:before {
+  content: "\e906";
+}
+
+.tn-icon-iot:before {
+  content: "\e907";
+}
+
+.tn-icon-monitor:before {
+  content: "\e908";
+}
+
+.tn-icon-iot-fill:before {
+  content: "\e909";
+}
+
+.tn-icon-tabs-smile:before {
+  content: "\e900";
+}
+
+.tn-icon-huawei:before {
+  content: "\e901";
+}
+
+.tn-icon-iphone:before {
+  content: "\e902";
+}
+
+.tn-icon-tiktok:before {
+  content: "\e903";
+}
+
+.tn-icon-sword-fill:before {
+  content: "\e8fa";
+}
+
+.tn-icon-job-fill:before {
+  content: "\e8fb";
+}
+
+.tn-icon-rocket-fill:before {
+  content: "\e8fc";
+}
+
+.tn-icon-totop:before {
+  content: "\e8fd";
+}
+
+.tn-icon-totop-fill:before {
+  content: "\e8fe";
+}
+
+.tn-icon-logout:before {
+  content: "\e8f8";
+}
+
+.tn-icon-login:before {
+  content: "\e8f9";
+}
+
+.tn-icon-expand:before {
+  content: "\e8f7";
+}
+
+.tn-icon-bug:before {
+  content: "\e8e3";
+}
+
+.tn-icon-bug-fill:before {
+  content: "\e8e4";
+}
+
+.tn-icon-company-fill:before {
+  content: "\e8e5";
+}
+
+.tn-icon-edit-write-fill:before {
+  content: "\e8e6";
+}
+
+.tn-icon-menu-circle-fill:before {
+  content: "\e8e7";
+}
+
+.tn-icon-level-fill:before {
+  content: "\e8e8";
+}
+
+.tn-icon-menu-fill:before {
+  content: "\e8e9";
+}
+
+.tn-icon-science-fill:before {
+  content: "\e8ea";
+}
+
+.tn-icon-deploy-fill:before {
+  content: "\e8eb";
+}
+
+.tn-icon-menu-more-fill:before {
+  content: "\e8ec";
+}
+
+.tn-icon-search-menu-fill:before {
+  content: "\e8ed";
+}
+
+.tn-icon-organizatio-fill:before {
+  content: "\e8ee";
+}
+
+.tn-icon-platform-fill:before {
+  content: "\e8ef";
+}
+
+.tn-icon-platform:before {
+  content: "\e8f0";
+}
+
+.tn-icon-search-list-fill:before {
+  content: "\e8f1";
+}
+
+.tn-icon-menu-sort-fill:before {
+  content: "\e8f2";
+}
+
+.tn-icon-cube-fill:before {
+  content: "\e8f3";
+}
+
+.tn-icon-menu-sorts-fill:before {
+  content: "\e8f4";
+}
+
+.tn-icon-server-fill:before {
+  content: "\e8f5";
+}
+
+.tn-icon-menu-list-fill:before {
+  content: "\e8f6";
+}
+
+.tn-icon-errands:before {
+  content: "\e8df";
+}
+
+.tn-icon-errands-fill:before {
+  content: "\e8e0";
+}
+
+.tn-icon-delivery-fill:before {
+  content: "\e8e1";
+}
+
+.tn-icon-delivery:before {
+  content: "\e8e2";
+}
+
+.tn-icon-vip-text:before {
+  content: "\e8dc";
+}
+
+.tn-icon-panda:before {
+  content: "\e8dd";
+}
+
+.tn-icon-logo-shangpu:before {
+  content: "\e8de";
+}
+
+.tn-icon-mouse:before {
+  content: "\e8db";
+}
+
+.tn-icon-notebook-fill:before {
+  content: "\e8da";
+}
+
+.tn-icon-headset:before {
+  content: "\e8d8";
+}
+
+.tn-icon-shears:before {
+  content: "\e8d9";
+}
+
+.tn-icon-notebook:before {
+  content: "\e8d7";
+}
+
+.tn-icon-battery-empty:before {
+  content: "\e8d1";
+}
+
+.tn-icon-battery-low:before {
+  content: "\e8d2";
+}
+
+.tn-icon-battery-mid:before {
+  content: "\e8d3";
+}
+
+.tn-icon-battery-high:before {
+  content: "\e8d4";
+}
+
+.tn-icon-battery-full:before {
+  content: "\e8d5";
+}
+
+.tn-icon-bluetooth:before {
+  content: "\e8d6";
+}
+
+.tn-icon-science:before {
+  content: "\e8cf";
+}
+
+.tn-icon-clip:before {
+  content: "\e8d0";
+}
+
+.tn-icon-con-aquarius:before {
+  content: "\e8c2";
+}
+
+.tn-icon-con-pisces:before {
+  content: "\e8c3";
+}
+
+.tn-icon-con-aries:before {
+  content: "\e8c4";
+}
+
+.tn-icon-con-taurus:before {
+  content: "\e8c5";
+}
+
+.tn-icon-con-gemini:before {
+  content: "\e8c6";
+}
+
+.tn-icon-con-cancer:before {
+  content: "\e8c7";
+}
+
+.tn-icon-con-leo:before {
+  content: "\e8c8";
+}
+
+.tn-icon-con-virgo:before {
+  content: "\e8c9";
+}
+
+.tn-icon-con-libra:before {
+  content: "\e8ca";
+}
+
+.tn-icon-con-scorpio:before {
+  content: "\e8cb";
+}
+
+.tn-icon-con-sagittarius:before {
+  content: "\e8cc";
+}
+
+.tn-icon-con-apricorn:before {
+  content: "\e8cd";
+}
+
+.tn-icon-constellation:before {
+  content: "\e8ce";
+}
+
+.tn-icon-wea-cloud-more:before {
+  content: "\e8b9";
+}
+
+.tn-icon-wea-cloud:before {
+  content: "\e8ba";
+}
+
+.tn-icon-wea-cloud-sun:before {
+  content: "\e8bb";
+}
+
+.tn-icon-wea-rain:before {
+  content: "\e8bc";
+}
+
+.tn-icon-wea-rain-middle:before {
+  content: "\e8bd";
+}
+
+.tn-icon-wea-rain-heavy:before {
+  content: "\e8be";
+}
+
+.tn-icon-wea-snow:before {
+  content: "\e8bf";
+}
+
+.tn-icon-wea-wind:before {
+  content: "\e8c0";
+}
+
+.tn-icon-wea-sun:before {
+  content: "\e8c1";
+}
+
+.tn-icon-empty-data:before {
+  content: "\e8ab";
+}
+
+.tn-icon-empty-message:before {
+  content: "\e8ac";
+}
+
+.tn-icon-empty-cart:before {
+  content: "\e8ad";
+}
+
+.tn-icon-empty-history:before {
+  content: "\e8ae";
+}
+
+.tn-icon-empty-favor:before {
+  content: "\e8af";
+}
+
+.tn-icon-empty-list:before {
+  content: "\e8b0";
+}
+
+.tn-icon-empty-network:before {
+  content: "\e8b1";
+}
+
+.tn-icon-empty-search:before {
+  content: "\e8b2";
+}
+
+.tn-icon-empty-order:before {
+  content: "\e8b3";
+}
+
+.tn-icon-empty-comment:before {
+  content: "\e8b4";
+}
+
+.tn-icon-empty-coupon:before {
+  content: "\e8b5";
+}
+
+.tn-icon-empty-address:before {
+  content: "\e8b6";
+}
+
+.tn-icon-empty-permission:before {
+  content: "\e8b7";
+}
+
+.tn-icon-empty-page:before {
+  content: "\e8b8";
+}
+
+.tn-icon-job:before {
+  content: "\e8aa";
+}
+
+.tn-icon-rocket:before {
+  content: "\e8a5";
+}
+
+.tn-icon-sword:before {
+  content: "\e8a6";
+}
+
+.tn-icon-notice-no:before {
+  content: "\e8a7";
+}
+
+.tn-icon-notice-fill:before {
+  content: "\e8a8";
+}
+
+.tn-icon-notice:before {
+  content: "\e8a9";
+}
+
+.tn-icon-font:before {
+  content: "\e8a4";
+}
+
+.tn-icon-chemistry:before {
+  content: "\e8a3";
+}
+
+.tn-icon-biology:before {
+  content: "\e8a2";
+}
+
+.tn-icon-level:before {
+  content: "\e8a0";
+}
+
+.tn-icon-deploy:before {
+  content: "\e8a1";
+}
+
+.tn-icon-server:before {
+  content: "\e89f";
+}
+
+.tn-icon-cube:before {
+  content: "\e89e";
+}
+
+.tn-icon-organizatio:before {
+  content: "\e89d";
+}
+
+.tn-icon-company:before {
+  content: "\e89c";
+}
+
+.tn-icon-pharmacy:before {
+  content: "\e89b";
+}
+
+.tn-icon-medical:before {
+  content: "\e89a";
+}
+
+.tn-icon-my-add:before {
+  content: "\e898";
+}
+
+.tn-icon-my:before {
+  content: "\e897";
+}
+
+.tn-icon-my-fill:before {
+  content: "\e896";
+}
+
+.tn-icon-trust:before {
+  content: "\e895";
+}
+
+.tn-icon-trust-fill:before {
+  content: "\e894";
+}
+
+.tn-icon-moon:before {
+  content: "\e893";
+}
+
+.tn-icon-moon-fill:before {
+  content: "\e892";
+}
+
+.tn-icon-funds:before {
+  content: "\e891";
+}
+
+.tn-icon-funds-fill:before {
+  content: "\e890";
+}
+
+.tn-icon-signpost:before {
+  content: "\e88f";
+}
+
+.tn-icon-signpost-fill:before {
+  content: "\e88e";
+}
+
+.tn-icon-vip:before {
+  content: "\e88d";
+}
+
+.tn-icon-vip-fill:before {
+  content: "\e88c";
+}
+
+.tn-icon-hardware:before {
+  content: "\e88b";
+}
+
+.tn-icon-hardware-fill:before {
+  content: "\e88a";
+}
+
+.tn-icon-honor:before {
+  content: "\e889";
+}
+
+.tn-icon-honor-fill:before {
+  content: "\e888";
+}
+
+.tn-icon-count:before {
+  content: "\e887";
+}
+
+.tn-icon-count-fill:before {
+  content: "\e886";
+}
+
+.tn-icon-discover-planet:before {
+  content: "\e885";
+}
+
+.tn-icon-discover-planet-fill:before {
+  content: "\e884";
+}
+
+.tn-icon-discover:before {
+  content: "\e883";
+}
+
+.tn-icon-discover-fill:before {
+  content: "\e882";
+}
+
+.tn-icon-home:before {
+  content: "\e881";
+}
+
+.tn-icon-home-fill:before {
+  content: "\e880";
+}
+
+.tn-icon-home-vertical:before {
+  content: "\e87f";
+}
+
+.tn-icon-home-vertical-fill:before {
+  content: "\e87e";
+}
+
+.tn-icon-home-smile:before {
+  content: "\e87d";
+}
+
+.tn-icon-home-smile-fill:before {
+  content: "\e87c";
+}
+
+.tn-icon-home-capsule:before {
+  content: "\e87b";
+}
+
+.tn-icon-home-capsule-fill:before {
+  content: "\e87a";
+}
+
+.tn-icon-focus:before {
+  content: "\e878";
+}
+
+.tn-icon-all:before {
+  content: "\e877";
+}
+
+.tn-icon-assort-fill:before {
+  content: "\e876";
+}
+
+.tn-icon-assort:before {
+  content: "\e875";
+}
+
+.tn-icon-menu-list:before {
+  content: "\e874";
+}
+
+.tn-icon-menu-sorts:before {
+  content: "\e873";
+}
+
+.tn-icon-menu-sort:before {
+  content: "\e872";
+}
+
+.tn-icon-menu-more:before {
+  content: "\e871";
+}
+
+.tn-icon-menu:before {
+  content: "\e870";
+}
+
+.tn-icon-menu-circle:before {
+  content: "\e86f";
+}
+
+.tn-icon-search-menu:before {
+  content: "\e86e";
+}
+
+.tn-icon-search-list:before {
+  content: "\e86d";
+}
+
+.tn-icon-search:before {
+  content: "\e86c";
+}
+
+.tn-icon-link:before {
+  content: "\e86b";
+}
+
+.tn-icon-code:before {
+  content: "\e869";
+}
+
+.tn-icon-computer:before {
+  content: "\e868";
+}
+
+.tn-icon-computer-fill:before {
+  content: "\e867";
+}
+
+.tn-icon-ipad:before {
+  content: "\e866";
+}
+
+.tn-icon-ipad-fill:before {
+  content: "\e865";
+}
+
+.tn-icon-phone:before {
+  content: "\e864";
+}
+
+.tn-icon-phone-fill:before {
+  content: "\e863";
+}
+
+.tn-icon-tel:before {
+  content: "\e862";
+}
+
+.tn-icon-tel-circle-fill:before {
+  content: "\e860";
+}
+
+.tn-icon-tel-circle:before {
+  content: "\e861";
+}
+
+.tn-icon-watercup:before {
+  content: "\e85f";
+}
+
+.tn-icon-gloves-fill:before {
+  content: "\e85d";
+}
+
+.tn-icon-gloves:before {
+  content: "\e85e";
+}
+
+.tn-icon-covid-19:before {
+  content: "\e85c";
+}
+
+.tn-icon-sport-jog:before {
+  content: "\e858";
+}
+
+.tn-icon-sport-run:before {
+  content: "\e859";
+}
+
+.tn-icon-sport-swim:before {
+  content: "\e85a";
+}
+
+.tn-icon-sport-cycle:before {
+  content: "\e85b";
+}
+
+.tn-icon-airplane:before {
+  content: "\e857";
+}
+
+.tn-icon-train:before {
+  content: "\e855";
+}
+
+.tn-icon-steamship:before {
+  content: "\e856";
+}
+
+.tn-icon-bus:before {
+  content: "\e854";
+}
+
+.tn-icon-balancecar:before {
+  content: "\e853";
+}
+
+.tn-icon-electromobile:before {
+  content: "\e852";
+}
+
+.tn-icon-zodiac-zhu:before {
+  content: "\e851";
+}
+
+.tn-icon-zodiac-gou:before {
+  content: "\e850";
+}
+
+.tn-icon-zodiac-ji:before {
+  content: "\e84f";
+}
+
+.tn-icon-zodiac-hou:before {
+  content: "\e84e";
+}
+
+.tn-icon-zodiac-yang:before {
+  content: "\e84d";
+}
+
+.tn-icon-zodiac-ma:before {
+  content: "\e84c";
+}
+
+.tn-icon-zodiac-she:before {
+  content: "\e84b";
+}
+
+.tn-icon-zodiac-long:before {
+  content: "\e84a";
+}
+
+.tn-icon-zodiac-tu:before {
+  content: "\e849";
+}
+
+.tn-icon-zodiac-hu:before {
+  content: "\e848";
+}
+
+.tn-icon-zodiac-niu:before {
+  content: "\e847";
+}
+
+.tn-icon-zodiac-shu:before {
+  content: "\e846";
+}
+
+.tn-icon-lucky-money:before {
+  content: "\e844";
+}
+
+.tn-icon-lucky-money-fill:before {
+  content: "\e845";
+}
+
+.tn-icon-prize:before {
+  content: "\e842";
+}
+
+.tn-icon-gift:before {
+  content: "\e843";
+}
+
+.tn-icon-pay:before {
+  content: "\e841";
+}
+
+.tn-icon-refund:before {
+  content: "\e840";
+}
+
+.tn-icon-money:before {
+  content: "\e83f";
+}
+
+.tn-icon-power:before {
+  content: "\e83e";
+}
+
+.tn-icon-fingerprint:before {
+  content: "\e83d";
+}
+
+.tn-icon-qr-beibei:before {
+  content: "\e83c";
+}
+
+.tn-icon-qr-code:before {
+  content: "\e83b";
+}
+
+.tn-icon-qr-barcode:before {
+  content: "\e83a";
+}
+
+.tn-icon-scan:before {
+  content: "\e839";
+}
+
+.tn-icon-revoke:before {
+  content: "\e837";
+}
+
+.tn-icon-filter:before {
+  content: "\e838";
+}
+
+.tn-icon-upload:before {
+  content: "\e835";
+}
+
+.tn-icon-download:before {
+  content: "\e836";
+}
+
+.tn-icon-fork:before {
+  content: "\e832";
+}
+
+.tn-icon-relation:before {
+  content: "\e833";
+}
+
+.tn-icon-master:before {
+  content: "\e834";
+}
+
+.tn-icon-facebook:before {
+  content: "\e82e";
+}
+
+.tn-icon-google:before {
+  content: "\e82f";
+}
+
+.tn-icon-linkedin:before {
+  content: "\e830";
+}
+
+.tn-icon-twitter:before {
+  content: "\e831";
+}
+
+.tn-icon-logo-tuniao:before {
+  content: "\e82d";
+}
+
+.tn-icon-sina:before {
+  content: "\e82b";
+}
+
+.tn-icon-taobao:before {
+  content: "\e82c";
+}
+
+.tn-icon-gitee:before {
+  content: "\e82a";
+}
+
+.tn-icon-github:before {
+  content: "\e829";
+}
+
+.tn-icon-dingtalk:before {
+  content: "\e828";
+}
+
+.tn-icon-alipay:before {
+  content: "\e827";
+}
+
+.tn-icon-qq:before {
+  content: "\e826";
+}
+
+.tn-icon-moments:before {
+  content: "\e825";
+}
+
+.tn-icon-wechat:before {
+  content: "\e824";
+}
+
+.tn-icon-wechat-fill:before {
+  content: "\e823";
+}
+
+.tn-icon-service:before {
+  content: "\e821";
+}
+
+.tn-icon-service-fill:before {
+  content: "\e822";
+}
+
+.tn-icon-team:before {
+  content: "\e81f";
+}
+
+.tn-icon-team-fill:before {
+  content: "\e820";
+}
+
+.tn-icon-emoji-sad:before {
+  content: "\e81e";
+}
+
+.tn-icon-emoji-sad-fill:before {
+  content: "\e81d";
+}
+
+.tn-icon-emoji-general:before {
+  content: "\e81b";
+}
+
+.tn-icon-emoji-general-fill:before {
+  content: "\e818";
+}
+
+.tn-icon-emoji-good:before {
+  content: "\e817";
+}
+
+.tn-icon-emoji-good-fill:before {
+  content: "\e816";
+}
+
+.tn-icon-clock:before {
+  content: "\e812";
+}
+
+.tn-icon-clock-fill:before {
+  content: "\e813";
+}
+
+.tn-icon-time-fill:before {
+  content: "\e7d9";
+}
+
+.tn-icon-time:before {
+  content: "\e7dc";
+}
+
+.tn-icon-delete:before {
+  content: "\e7d6";
+}
+
+.tn-icon-delete-fill:before {
+  content: "\e7d7";
+}
+
+.tn-icon-clear:before {
+  content: "\e7d5";
+}
+
+.tn-icon-set:before {
+  content: "\e7d1";
+}
+
+.tn-icon-set-fill:before {
+  content: "\e7d2";
+}
+
+.tn-icon-keyboard-circle:before {
+  content: "\e810";
+}
+
+.tn-icon-keyboard:before {
+  content: "\e811";
+}
+
+.tn-icon-wifi-no:before {
+  content: "\e81c";
+}
+
+.tn-icon-wifi:before {
+  content: "\e7d0";
+}
+
+.tn-icon-creative-stop:before {
+  content: "\e819";
+}
+
+.tn-icon-creative-stop-fill:before {
+  content: "\e81a";
+}
+
+.tn-icon-creative-fill:before {
+  content: "\e80e";
+}
+
+.tn-icon-creative:before {
+  content: "\e80f";
+}
+
+.tn-icon-trophy-fill:before {
+  content: "\e80a";
+}
+
+.tn-icon-trophy:before {
+  content: "\e80b";
+}
+
+.tn-icon-game-fill:before {
+  content: "\e808";
+}
+
+.tn-icon-game:before {
+  content: "\e809";
+}
+
+.tn-icon-tag-fill:before {
+  content: "\e806";
+}
+
+.tn-icon-tag:before {
+  content: "\e807";
+}
+
+.tn-icon-logistics:before {
+  content: "\e7cf";
+}
+
+.tn-icon-taxi-fill:before {
+  content: "\e800";
+}
+
+.tn-icon-taxi:before {
+  content: "\e805";
+}
+
+.tn-icon-flag:before {
+  content: "\e7f5";
+}
+
+.tn-icon-flag-fill:before {
+  content: "\e7ff";
+}
+
+.tn-icon-baby:before {
+  content: "\e7f1";
+}
+
+.tn-icon-baby-fill:before {
+  content: "\e7f4";
+}
+
+.tn-icon-shop:before {
+  content: "\e7cd";
+}
+
+.tn-icon-shop-fill:before {
+  content: "\e7ce";
+}
+
+.tn-icon-coupon-fill:before {
+  content: "\e7c8";
+}
+
+.tn-icon-coupon:before {
+  content: "\e7c9";
+}
+
+.tn-icon-shopbag-fill:before {
+  content: "\e7c6";
+}
+
+.tn-icon-shopbag:before {
+  content: "\e7c7";
+}
+
+.tn-icon-basket-fill:before {
+  content: "\e7c4";
+}
+
+.tn-icon-basket:before {
+  content: "\e7c5";
+}
+
+.tn-icon-cart-fill:before {
+  content: "\e7c2";
+}
+
+.tn-icon-cart:before {
+  content: "\e7c3";
+}
+
+.tn-icon-ticket:before {
+  content: "\e7f8";
+}
+
+.tn-icon-ticket-fill:before {
+  content: "\e7fe";
+}
+
+.tn-icon-receipt:before {
+  content: "\e7f6";
+}
+
+.tn-icon-receipt-fill:before {
+  content: "\e7f7";
+}
+
+.tn-icon-cardbag:before {
+  content: "\e7fa";
+}
+
+.tn-icon-cardbag-fill:before {
+  content: "\e7fd";
+}
+
+.tn-icon-bankcard-fill:before {
+  content: "\e7d3";
+}
+
+.tn-icon-bankcard:before {
+  content: "\e7d4";
+}
+
+.tn-icon-identity:before {
+  content: "\e7cb";
+}
+
+.tn-icon-identity-fill:before {
+  content: "\e7cc";
+}
+
+.tn-icon-calendar:before {
+  content: "\e7c0";
+}
+
+.tn-icon-calendar-fill:before {
+  content: "\e7c1";
+}
+
+.tn-icon-order:before {
+  content: "\e7be";
+}
+
+.tn-icon-order-fill:before {
+  content: "\e7bf";
+}
+
+.tn-icon-image:before {
+  content: "\e7bc";
+}
+
+.tn-icon-image-fill:before {
+  content: "\e7bd";
+}
+
+.tn-icon-image-text:before {
+  content: "\e7bb";
+}
+
+.tn-icon-image-text-fill:before {
+  content: "\e7ba";
+}
+
+.tn-icon-data:before {
+  content: "\e7b9";
+}
+
+.tn-icon-data-fill:before {
+  content: "\e7b8";
+}
+
+.tn-icon-statistics:before {
+  content: "\e7b7";
+}
+
+.tn-icon-statistics-fill:before {
+  content: "\e7b6";
+}
+
+.tn-icon-trusty-fill:before {
+  content: "\e801";
+}
+
+.tn-icon-trusty:before {
+  content: "\e802";
+}
+
+.tn-icon-safe-fill:before {
+  content: "\e803";
+}
+
+.tn-icon-safe:before {
+  content: "\e804";
+}
+
+.tn-icon-edit:before {
+  content: "\e7b5";
+}
+
+.tn-icon-edit-form:before {
+  content: "\e7b4";
+}
+
+.tn-icon-edit-write:before {
+  content: "\e7b3";
+}
+
+.tn-icon-write-fill:before {
+  content: "\e7b1";
+}
+
+.tn-icon-write:before {
+  content: "\e7b2";
+}
+
+.tn-icon-eye-hide:before {
+  content: "\e7af";
+}
+
+.tn-icon-eye-close:before {
+  content: "\e7b0";
+}
+
+.tn-icon-eye:before {
+  content: "\e7ad";
+}
+
+.tn-icon-eye-fill:before {
+  content: "\e7ae";
+}
+
+.tn-icon-unlock:before {
+  content: "\e7da";
+}
+
+.tn-icon-lock:before {
+  content: "\e7db";
+}
+
+.tn-icon-sex:before {
+  content: "\e7ac";
+}
+
+.tn-icon-sex-female:before {
+  content: "\e7ab";
+}
+
+.tn-icon-sex-male:before {
+  content: "\e7aa";
+}
+
+.tn-icon-circle-lack:before {
+  content: "\e7a8";
+}
+
+.tn-icon-circle-arrow:before {
+  content: "\e7a9";
+}
+
+.tn-icon-circle-fill:before {
+  content: "\e7a4";
+}
+
+.tn-icon-circle:before {
+  content: "\e7a3";
+}
+
+.tn-icon-copy-fill:before {
+  content: "\e7a1";
+}
+
+.tn-icon-copy:before {
+  content: "\e7a2";
+}
+
+.tn-icon-square:before {
+  content: "\e7a0";
+}
+
+.tn-icon-group-double:before {
+  content: "\e79e";
+}
+
+.tn-icon-group-square:before {
+  content: "\e79f";
+}
+
+.tn-icon-group-triangle:before {
+  content: "\e795";
+}
+
+.tn-icon-group-circle:before {
+  content: "\e796";
+}
+
+.tn-icon-group-null:before {
+  content: "\e797";
+}
+
+.tn-icon-share-triangle:before {
+  content: "\e792";
+}
+
+.tn-icon-share-square:before {
+  content: "\e790";
+}
+
+.tn-icon-share-circle:before {
+  content: "\e791";
+}
+
+.tn-icon-share:before {
+  content: "\e78f";
+}
+
+.tn-icon-send-fill:before {
+  content: "\e793";
+}
+
+.tn-icon-send:before {
+  content: "\e794";
+}
+
+.tn-icon-light-fill:before {
+  content: "\e78d";
+}
+
+.tn-icon-light:before {
+  content: "\e78e";
+}
+
+.tn-icon-praise-fill:before {
+  content: "\e7eb";
+}
+
+.tn-icon-praise:before {
+  content: "\e7f0";
+}
+
+.tn-icon-star-fill:before {
+  content: "\e78b";
+}
+
+.tn-icon-star:before {
+  content: "\e78c";
+}
+
+.tn-icon-caring:before {
+  content: "\e789";
+}
+
+.tn-icon-caring-fill:before {
+  content: "\e78a";
+}
+
+.tn-icon-fire:before {
+  content: "\e787";
+}
+
+.tn-icon-fire-fill:before {
+  content: "\e788";
+}
+
+.tn-icon-topic:before {
+  content: "\e786";
+}
+
+.tn-icon-topics:before {
+  content: "\e784";
+}
+
+.tn-icon-topics-fill:before {
+  content: "\e785";
+}
+
+.tn-icon-like-break:before {
+  content: "\e782";
+}
+
+.tn-icon-like-lack:before {
+  content: "\e783";
+}
+
+.tn-icon-like:before {
+  content: "\e781";
+}
+
+.tn-icon-like-fill:before {
+  content: "\e780";
+}
+
+.tn-icon-reply:before {
+  content: "\e7a6";
+}
+
+.tn-icon-reply-fill:before {
+  content: "\e7a7";
+}
+
+.tn-icon-comment-fill:before {
+  content: "\e79c";
+}
+
+.tn-icon-comment:before {
+  content: "\e79d";
+}
+
+.tn-icon-message-fill:before {
+  content: "\e798";
+}
+
+.tn-icon-message:before {
+  content: "\e799";
+}
+
+.tn-icon-flower-fill:before {
+  content: "\e77e";
+}
+
+.tn-icon-flower:before {
+  content: "\e77f";
+}
+
+.tn-icon-location-fill:before {
+  content: "\e77c";
+}
+
+.tn-icon-location:before {
+  content: "\e77d";
+}
+
+.tn-icon-map-fill:before {
+  content: "\e77a";
+}
+
+.tn-icon-map:before {
+  content: "\e77b";
+}
+
+.tn-icon-camera:before {
+  content: "\e774";
+}
+
+.tn-icon-camera-fill:before {
+  content: "\e775";
+}
+
+.tn-icon-live-stream:before {
+  content: "\e7fb";
+}
+
+.tn-icon-live-stream-fill:before {
+  content: "\e7fc";
+}
+
+.tn-icon-sing:before {
+  content: "\e7f9";
+}
+
+.tn-icon-music-fill:before {
+  content: "\e7ec";
+}
+
+.tn-icon-music-stop:before {
+  content: "\e7ed";
+}
+
+.tn-icon-video-fill:before {
+  content: "\e7e9";
+}
+
+.tn-icon-video:before {
+  content: "\e7ea";
+}
+
+.tn-icon-voice-fill:before {
+  content: "\e7e7";
+}
+
+.tn-icon-voice:before {
+  content: "\e7e8";
+}
+
+.tn-icon-previous-fill:before {
+  content: "\e7f2";
+}
+
+.tn-icon-next-fill:before {
+  content: "\e7f3";
+}
+
+.tn-icon-play-fill:before {
+  content: "\e7ee";
+}
+
+.tn-icon-stop:before {
+  content: "\e7ef";
+}
+
+.tn-icon-backspace:before {
+  content: "\e814";
+}
+
+.tn-icon-backspace-fill:before {
+  content: "\e815";
+}
+
+.tn-icon-sound-close-fill:before {
+  content: "\e778";
+}
+
+.tn-icon-sound-close:before {
+  content: "\e779";
+}
+
+.tn-icon-sound-fill:before {
+  content: "\e776";
+}
+
+.tn-icon-sound:before {
+  content: "\e777";
+}
+
+.tn-icon-sound-reduce-fill:before {
+  content: "\e7e5";
+}
+
+.tn-icon-sound-reduce:before {
+  content: "\e7e6";
+}
+
+.tn-icon-sound-add:before {
+  content: "\e80c";
+}
+
+.tn-icon-sound-add-fill:before {
+  content: "\e80d";
+}
+
+.tn-icon-sequence-vertical:before {
+  content: "\e79a";
+}
+
+.tn-icon-sequence:before {
+  content: "\e79b";
+}
+
+.tn-icon-align-center:before {
+  content: "\e7e1";
+}
+
+.tn-icon-align-right:before {
+  content: "\e7e2";
+}
+
+.tn-icon-align-left:before {
+  content: "\e7e3";
+}
+
+.tn-icon-align:before {
+  content: "\e7e4";
+}
+
+.tn-icon-title:before {
+  content: "\e772";
+}
+
+.tn-icon-sort:before {
+  content: "\e773";
+}
+
+.tn-icon-more-vertical:before {
+  content: "\e770";
+}
+
+.tn-icon-more-horizontal:before {
+  content: "\e771";
+}
+
+.tn-icon-more-circle:before {
+  content: "\e76e";
+}
+
+.tn-icon-more-circle-fill:before {
+  content: "\e76f";
+}
+
+.tn-icon-warning:before {
+  content: "\e76c";
+}
+
+.tn-icon-warning-fill:before {
+  content: "\e76d";
+}
+
+.tn-icon-zoom-out:before {
+  content: "\e76a";
+}
+
+.tn-icon-zoom-out-fill:before {
+  content: "\e76b";
+}
+
+.tn-icon-zoom-in-fill:before {
+  content: "\e768";
+}
+
+.tn-icon-zoom-in:before {
+  content: "\e769";
+}
+
+.tn-icon-success-square:before {
+  content: "\e763";
+}
+
+.tn-icon-success-circle-fill:before {
+  content: "\e764";
+}
+
+.tn-icon-success-circle:before {
+  content: "\e765";
+}
+
+.tn-icon-success-square-fill:before {
+  content: "\e766";
+}
+
+.tn-icon-success:before {
+  content: "\e767";
+}
+
+.tn-icon-close-fill:before {
+  content: "\e760";
+}
+
+.tn-icon-close:before {
+  content: "\e761";
+}
+
+.tn-icon-close-circle:before {
+  content: "\e762";
+}
+
+.tn-icon-help:before {
+  content: "\e75e";
+}
+
+.tn-icon-help-fill:before {
+  content: "\e75f";
+}
+
+.tn-icon-tip-fill:before {
+  content: "\e75d";
+}
+
+.tn-icon-left:before {
+  content: "\e7e0";
+}
+
+.tn-icon-left-triangle:before {
+  content: "\e757";
+}
+
+.tn-icon-left-fill:before {
+  content: "\e758";
+}
+
+.tn-icon-left-double:before {
+  content: "\e759";
+}
+
+.tn-icon-left-circle:before {
+  content: "\e75a";
+}
+
+.tn-icon-left-arrow:before {
+  content: "\e75b";
+}
+
+.tn-icon-down:before {
+  content: "\e7df";
+}
+
+.tn-icon-down-arrow:before {
+  content: "\e752";
+}
+
+.tn-icon-down-circle:before {
+  content: "\e753";
+}
+
+.tn-icon-down-double:before {
+  content: "\e754";
+}
+
+.tn-icon-down-fill:before {
+  content: "\e755";
+}
+
+.tn-icon-down-triangle:before {
+  content: "\e756";
+}
+
+.tn-icon-right:before {
+  content: "\e7de";
+}
+
+.tn-icon-right-fill:before {
+  content: "\e74d";
+}
+
+.tn-icon-right-arrow:before {
+  content: "\e74e";
+}
+
+.tn-icon-right-double:before {
+  content: "\e74f";
+}
+
+.tn-icon-right-triangle:before {
+  content: "\e750";
+}
+
+.tn-icon-right-circle:before {
+  content: "\e751";
+}
+
+.tn-icon-up:before {
+  content: "\e7dd";
+}
+
+.tn-icon-up-arrow:before {
+  content: "\e748";
+}
+
+.tn-icon-up-circle:before {
+  content: "\e749";
+}
+
+.tn-icon-up-triangle:before {
+  content: "\e74a";
+}
+
+.tn-icon-up-double:before {
+  content: "\e74b";
+}
+
+.tn-icon-up-fill:before {
+  content: "\e74c";
+}
+
+.tn-icon-add-circle:before {
+  content: "\e740";
+}
+
+.tn-icon-add:before {
+  content: "\e741";
+}
+
+.tn-icon-add-fill:before {
+  content: "\e742";
+}
+
+.tn-icon-reduce:before {
+  content: "\e743";
+}
+
+.tn-icon-reduce-square-fill:before {
+  content: "\e744";
+}
+
+.tn-icon-reduce-square:before {
+  content: "\e745";
+}
+
+.tn-icon-reduce-circle:before {
+  content: "\e746";
+}
+
+.tn-icon-reduce-circle-fill:before {
+  content: "\e747";
+}
diff --git a/tuniao-ui/index.js b/tuniao-ui/index.js
new file mode 100644
index 0000000..140fc71
--- /dev/null
+++ b/tuniao-ui/index.js
@@ -0,0 +1,73 @@
+// 引入全局mixin
+import mixin from './libs/mixin/mixin.js'
+// 全局挂载引入http相关请求拦截插件
+import Request from './libs/luch-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)
+  }
+}
+
+// 更新自定义状态栏的信息
+import updateCustomBarInfo from './libs/function/updateCustomBarInfo.js'
+// 获取颜色工具
+import color from './libs/function/color.js'
+// 消息工具
+import message from './libs/function/message.js'
+// 获取唯一id
+import uuid from './libs/function/uuid.js'
+// 数组工具
+import array from './libs/function/array.js'
+
+// 规则检验
+import test from './libs/function/test.js'
+// 获取整个父组件
+import $parent from './libs/function/$parent.js'
+// 格式化字符串工具
+import string from './libs/function/string.js'
+// 格式化数值工具
+import number from './libs/function/number.js'
+// 深度复制
+import deepClone from './libs/function/deepClone.js'
+
+// z-index配置信息
+import zIndex from './libs/config/zIndex.js'
+// 主题颜色信息
+import colorInfo from './libs/config/color.js'
+
+const $tn = {
+  http: new Request(),
+  updateCustomBar: updateCustomBarInfo,
+  color,
+  message,
+  uuid,
+  array,
+  test,
+  $parent,
+  string,
+  number,
+  deepClone,
+  zIndex,
+  colorInfo,
+}
+
+// 挂载到uni对象上
+uni.$tn = $tn
+
+const install = Vue => {
+  // 全局混入
+  Vue.mixin(mixin)
+  
+  // Filter格式化
+  
+  Vue.prototype.$tn = $tn
+}
+
+export default {
+  install
+}
diff --git a/tuniao-ui/index.scss b/tuniao-ui/index.scss
new file mode 100644
index 0000000..b0493b3
--- /dev/null
+++ b/tuniao-ui/index.scss
@@ -0,0 +1,13 @@
+// 引入公共基础类
+@import './libs/css/main.scss';
+@import './libs/css/color.scss';
+
+// 小程序特有的样式
+/* #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/tuniao-ui/libs/config/color.js b/tuniao-ui/libs/config/color.js
new file mode 100644
index 0000000..eb71bf2
--- /dev/null
+++ b/tuniao-ui/libs/config/color.js
@@ -0,0 +1,15 @@
+// TuniaoUI颜色值
+export default {
+  mainColor: '#01BEFF',
+  reverseMainColor: '#FFF00D',
+  femaleColor: '#FF71D2',
+  maleColor: '#82B2FF',
+  mainOrange: '#FBBD12',
+  bgColor: '#FFFFFF',
+  spaceColor: '#F8F7F8',
+  fontColor: '#080808',
+  fontSubColor: '#AAAAAA',
+  contentColor: '#838383',
+  fontHolderColor: '#E6E6E6',
+  maskBgColor: 'rgba(0, 0, 0, 0.4)',
+}
\ No newline at end of file
diff --git a/tuniao-ui/libs/config/zIndex.js b/tuniao-ui/libs/config/zIndex.js
new file mode 100644
index 0000000..e3ba9a3
--- /dev/null
+++ b/tuniao-ui/libs/config/zIndex.js
@@ -0,0 +1,17 @@
+// 各组件的z-index值
+export default {
+  landsacpe: 29100,
+  navbar: 29090,
+  toast: 20090,
+  goodsNav: 20089,
+  alert: 20085,
+  modal: 20080,
+  popup: 20075,
+  tips: 19080,
+  sticky: 19075,
+  indexListSticky: 19070,
+  fab: 19060,
+  mask: 9999,
+  tableTr: 1001,
+  tableTd: 1000
+}
\ No newline at end of file
diff --git a/tuniao-ui/libs/css/color.scss b/tuniao-ui/libs/css/color.scss
new file mode 100644
index 0000000..51f98eb
--- /dev/null
+++ b/tuniao-ui/libs/css/color.scss
@@ -0,0 +1,563 @@
+
+@mixin getColor($color: #FFFFFF, $light-color: #FFFFFF, $dark-color: #FFFFFF, $disabled-color: #FFFFFF) {
+  color: $color !important;
+  @if $color != #FFFFFF and $color != #000000 {
+    &--light {
+      color: $light-color !important;
+    }
+    &--dark {
+      color: $dark-color !important;
+    }
+    &--disabled {
+      color: $disabled-color !important;
+    }
+  }
+}
+
+@mixin getBorderColor($color: #FFFFFF, $light-color: #FFFFFF, $dark-color: #FFFFFF, $disabled-color: #FFFFFF) {
+  @if $color != #FFFFFF and $color != #000000 {
+    &--light {
+        border-color: $light-color !important;
+    }
+    &--dark {
+        border-color: $dark-color !important;
+    }
+    &--disabled {
+        border-color: $disabled-color !important;
+    }
+  }
+    border-color: $color !important;
+}
+
+@mixin getBackgroundColor($color: #FFFFFF, $light-color: #FFFFFF, $dark-color: #FFFFFF, $disabled-color: #FFFFFF) {
+  background-color: $color !important;
+  @if $color != #FFFFFF and $color != #000000 {
+    color: $tn-font-color;
+    &--light {
+      background-color: $light-color !important;
+    }
+    &--dark {
+      background-color: $dark-color !important;
+    }
+    &--disabled {
+      background-color: $disabled-color !important;
+    }
+  }
+  @else {
+    color: $tn-font-color;
+  }
+}
+
+@mixin getShadowColor($type: box, $color: #FFFFFF) {
+  @if $type == box {
+    box-shadow: 12rpx 12rpx 16rpx #{$color};
+  } @else if $type == text {
+    text-shadow: 6rpx 6rpx 8rpx #{$color};
+  }
+}
+
+@mixin getGradientColor($start-color, $end-color, $font-color: #FFFFFF) {
+  background-image: repeating-linear-gradient(45deg, $start-color, $end-color);
+  color: $font-color;
+  
+  &--reverse {
+    background-image: repeating-linear-gradient(-45deg, $start-color, $end-color);
+    color: $font-color;
+  }
+}
+
+@mixin getMainColorGradient($start-color, $start-color-light, $start-color-disabled, $end-color, $end-color-light) {
+  @include getGradientColor($start-color, $end-color);
+  
+  &--light {
+    @include getGradientColor($start-color-light, $end-color-light, $start-color);
+  }
+  
+  &--single {
+    @include getGradientColor($start-color, $start-color-disabled);
+  }
+}
+
+/* 颜色 start */
+.tn-color-red {
+  @include getColor($tn-color-red, $tn-color-red-light, $tn-color-red-dark, $tn-color-red-disabled);
+}
+.tn-color-purplered {
+  @include getColor($tn-color-purplered, $tn-color-purplered-light, $tn-color-purplered-dark, $tn-color-purplered-disabled);
+}
+.tn-color-purple {
+  @include getColor($tn-color-purple, $tn-color-purple-light, $tn-color-purple-dark, $tn-color-purple-disabled);
+}
+.tn-color-bluepurple {
+  @include getColor($tn-color-bluepurple, $tn-color-bluepurple-light, $tn-color-bluepurple-dark, $tn-color-bluepurple-disabled);
+}
+.tn-color-aquablue {
+  @include getColor($tn-color-aquablue, $tn-color-aquablue-light, $tn-color-aquablue-dark, $tn-color-aquablue-disabled);
+}
+.tn-color-blue {
+  @include getColor($tn-color-blue, $tn-color-blue-light, $tn-color-blue-dark, $tn-color-blue-disabled);
+}
+.tn-color-indigo {
+  @include getColor($tn-color-indigo, $tn-color-indigo-light, $tn-color-indigo-dark, $tn-color-indigo-disabled);
+}
+.tn-color-cyan {
+  @include getColor($tn-color-cyan, $tn-color-cyan-light, $tn-color-cyan-dark, $tn-color-cyan-disabled);
+}
+.tn-color-teal {
+  @include getColor($tn-color-teal, $tn-color-teal-light, $tn-color-teal-dark, $tn-color-teal-disabled);
+}
+.tn-color-green {
+  @include getColor($tn-color-green, $tn-color-green-light, $tn-color-green-dark, $tn-color-green-disabled);
+}
+.tn-color-yellowgreen {
+  @include getColor($tn-color-yellowgreen, $tn-color-yellowgreen-light, $tn-color-yellowgreen-dark, $tn-color-yellowgreen-disabled);
+}
+.tn-color-lime {
+  @include getColor($tn-color-lime, $tn-color-lime-light, $tn-color-lime-dark, $tn-color-lime-disabled);
+}
+.tn-color-yellow {
+  @include getColor($tn-color-yellow, $tn-color-yellow-light, $tn-color-yellow-dark, $tn-color-yellow-disabled);
+}
+.tn-color-orangeyellow {
+  @include getColor($tn-color-orangeyellow, $tn-color-orangeyellow-light, $tn-color-orangeyellow-dark, $tn-color-orangeyellow-disabled);
+}
+.tn-color-orange {
+  @include getColor($tn-color-orange, $tn-color-orange-light, $tn-color-orange-dark, $tn-color-orange-disabled);
+}
+.tn-color-orangered {
+  @include getColor($tn-color-orangered, $tn-color-orangered-light, $tn-color-orangered-dark, $tn-color-orangered-disabled);
+}
+.tn-color-brown {
+  @include getColor($tn-color-brown, $tn-color-brown-light, $tn-color-brown-dark, $tn-color-brown-disabled);
+}
+.tn-color-grey {
+  @include getColor($tn-color-grey, $tn-color-grey-light, $tn-color-grey-dark, $tn-color-grey-disabled);
+}
+.tn-color-gray {
+  @include getColor($tn-color-gray, $tn-color-gray-light, $tn-color-gray-dark, $tn-color-gray-disabled);
+}
+.tn-color-white {
+  @include getColor();
+}
+.tn-color-black {
+  @include getColor(#000000);
+}
+/* 颜色 end */
+
+/* 边框颜色 start */
+.tn-border-red {
+  @include getBorderColor($tn-color-red, $tn-color-red-light, $tn-color-red-dark, $tn-color-red-disabled);
+}
+.tn-border-purplered {
+  @include getBorderColor($tn-color-purplered, $tn-color-purplered-light, $tn-color-purplered-dark, $tn-color-purplered-disabled);
+}
+.tn-border-purple {
+  @include getBorderColor($tn-color-purple, $tn-color-purple-light, $tn-color-purple-dark, $tn-color-purple-disabled);
+}
+.tn-border-bluepurple {
+  @include getBorderColor($tn-color-bluepurple, $tn-color-bluepurple-light, $tn-color-bluepurple-dark, $tn-color-bluepurple-disabled);
+}
+.tn-border-aquablue {
+  @include getBorderColor($tn-color-aquablue, $tn-color-aquablue-light, $tn-color-aquablue-dark, $tn-color-aquablue-disabled);
+}
+.tn-border-blue {
+  @include getBorderColor($tn-color-blue, $tn-color-blue-light, $tn-color-blue-dark, $tn-color-blue-disabled);
+}
+.tn-border-indigo {
+  @include getBorderColor($tn-color-indigo, $tn-color-indigo-light, $tn-color-indigo-dark, $tn-color-indigo-disabled);
+}
+.tn-border-cyan {
+  @include getBorderColor($tn-color-cyan, $tn-color-cyan-light, $tn-color-cyan-dark, $tn-color-cyan-disabled);
+}
+.tn-border-teal {
+  @include getBorderColor($tn-color-teal, $tn-color-teal-light, $tn-color-teal-dark, $tn-color-teal-disabled);
+}
+.tn-border-green {
+  @include getBorderColor($tn-color-green, $tn-color-green-light, $tn-color-green-dark, $tn-color-green-disabled);
+}
+.tn-border-yellowgreen {
+  @include getBorderColor($tn-color-yellowgreen, $tn-color-yellowgreen-light, $tn-color-yellowgreen-dark, $tn-color-yellowgreen-disabled);
+}
+.tn-border-lime {
+  @include getBorderColor($tn-color-lime, $tn-color-lime-light, $tn-color-lime-dark, $tn-color-lime-disabled);
+}
+.tn-border-yellow {
+  @include getBorderColor($tn-color-yellow, $tn-color-yellow-light, $tn-color-yellow-dark, $tn-color-yellow-disabled);
+}
+.tn-border-orangeyellow {
+  @include getBorderColor($tn-color-orangeyellow, $tn-color-orangeyellow-light, $tn-color-orangeyellow-dark, $tn-color-orangeyellow-disabled);
+}
+.tn-border-orange {
+  @include getBorderColor($tn-color-orange, $tn-color-orange-light, $tn-color-orange-dark, $tn-color-orange-disabled);
+}
+.tn-border-orangered {
+  @include getBorderColor($tn-color-orangered, $tn-color-orangered-light, $tn-color-orangered-dark, $tn-color-orangered-disabled);
+}
+.tn-border-brown {
+  @include getBorderColor($tn-color-brown, $tn-color-brown-light, $tn-color-brown-dark, $tn-color-brown-disabled);
+}
+.tn-border-grey {
+  @include getBorderColor($tn-color-grey, $tn-color-grey-light, $tn-color-grey-dark, $tn-color-grey-disabled);
+}
+.tn-border-gray {
+  @include getBorderColor($tn-color-gray, $tn-color-gray-light, $tn-color-gray-dark, $tn-color-gray-disabled);
+}
+.tn-border-white {
+  @include getBorderColor();
+}
+.tn-border-black {
+  @include getBorderColor(#000000);
+}
+/* 边框颜色 end */
+
+/* 背景颜色 start */
+.tn-bg-red {
+  @include getBackgroundColor($tn-color-red, $tn-color-red-light, $tn-color-red-dark, $tn-color-red-disabled);
+}
+.tn-bg-purplered {
+  @include getBackgroundColor($tn-color-purplered, $tn-color-purplered-light, $tn-color-purplered-dark, $tn-color-purplered-disabled);
+}
+.tn-bg-purple {
+  @include getBackgroundColor($tn-color-purple, $tn-color-purple-light, $tn-color-purple-dark, $tn-color-purple-disabled);
+}
+.tn-bg-bluepurple {
+  @include getBackgroundColor($tn-color-bluepurple, $tn-color-bluepurple-light, $tn-color-bluepurple-dark, $tn-color-bluepurple-disabled);
+}
+.tn-bg-aquablue {
+  @include getBackgroundColor($tn-color-aquablue, $tn-color-aquablue-light, $tn-color-aquablue-dark, $tn-color-aquablue-disabled);
+}
+.tn-bg-blue {
+  @include getBackgroundColor($tn-color-blue, $tn-color-blue-light, $tn-color-blue-dark, $tn-color-blue-disabled);
+}
+.tn-bg-indigo {
+  @include getBackgroundColor($tn-color-indigo, $tn-color-indigo-light, $tn-color-indigo-dark, $tn-color-indigo-disabled);
+}
+.tn-bg-cyan {
+  @include getBackgroundColor($tn-color-cyan, $tn-color-cyan-light, $tn-color-cyan-dark, $tn-color-cyan-disabled);
+}
+.tn-bg-teal {
+  @include getBackgroundColor($tn-color-teal, $tn-color-teal-light, $tn-color-teal-dark, $tn-color-teal-disabled);
+}
+.tn-bg-green {
+  @include getBackgroundColor($tn-color-green, $tn-color-green-light, $tn-color-green-dark, $tn-color-green-disabled);
+}
+.tn-bg-yellowgreen {
+  @include getBackgroundColor($tn-color-yellowgreen, $tn-color-yellowgreen-light, $tn-color-yellowgreen-dark, $tn-color-yellowgreen-disabled);
+}
+.tn-bg-lime {
+  @include getBackgroundColor($tn-color-lime, $tn-color-lime-light, $tn-color-lime-dark, $tn-color-lime-disabled);
+}
+.tn-bg-yellow {
+  @include getBackgroundColor($tn-color-yellow, $tn-color-yellow-light, $tn-color-yellow-dark, $tn-color-yellow-disabled);
+}
+.tn-bg-orangeyellow {
+  @include getBackgroundColor($tn-color-orangeyellow, $tn-color-orangeyellow-light, $tn-color-orangeyellow-dark, $tn-color-orangeyellow-disabled);
+}
+.tn-bg-orange {
+  @include getBackgroundColor($tn-color-orange, $tn-color-orange-light, $tn-color-orange-dark, $tn-color-orange-disabled);
+}
+.tn-bg-orangered {
+  @include getBackgroundColor($tn-color-orangered, $tn-color-orangered-light, $tn-color-orangered-dark, $tn-color-orangered-disabled);
+}
+.tn-bg-brown {
+  @include getBackgroundColor($tn-color-brown, $tn-color-brown-light, $tn-color-brown-dark, $tn-color-brown-disabled);
+}
+.tn-bg-grey {
+  @include getBackgroundColor($tn-color-grey, $tn-color-grey-light, $tn-color-grey-dark, $tn-color-grey-disabled);
+}
+.tn-bg-gray {
+  @include getBackgroundColor($tn-color-gray, $tn-color-gray-light, $tn-color-gray-dark, $tn-color-gray-disabled);
+}
+.tn-bg-white {
+  @include getBackgroundColor();
+}
+.tn-bg-black {
+  @include getBackgroundColor(#000000);
+}
+/* 背景颜色 end */
+
+/* 阴影颜色 start */
+.tn-shadow-red {
+  @include getShadowColor(box, $tn-color-red-light);
+}
+.tn-shadow-purplered {
+  @include getShadowColor(box, $tn-color-purplered-light);
+}
+.tn-shadow-purple {
+  @include getShadowColor(box, $tn-color-purple-light);
+}
+.tn-shadow-bluepurple {
+  @include getShadowColor(box, $tn-color-bluepurple-light);
+}
+.tn-shadow-aquablue {
+  @include getShadowColor(box, $tn-color-aquablue-light);
+}
+.tn-shadow-blue {
+  @include getShadowColor(box, $tn-color-blue-light);
+}
+.tn-shadow-indigo {
+  @include getShadowColor(box, $tn-color-indigo-light);
+}
+.tn-shadow-cyan {
+  @include getShadowColor(box, $tn-color-cyan-light);
+}
+.tn-shadow-teal {
+  @include getShadowColor(box, $tn-color-teal-light);
+}
+.tn-shadow-green {
+  @include getShadowColor(box, $tn-color-green-light);
+}
+.tn-shadow-yellowgreen {
+  @include getShadowColor(box, $tn-color-yellowgreen-light);
+}
+.tn-shadow-lime {
+  @include getShadowColor(box, $tn-color-lime-light);
+}
+.tn-shadow-yellow {
+  @include getShadowColor(box, $tn-color-yellow-light);
+}
+.tn-shadow-orangeyellow {
+  @include getShadowColor(box, $tn-color-orangeyellow-light);
+}
+.tn-shadow-orange {
+  @include getShadowColor(box, $tn-color-orange-light);
+}
+.tn-shadow-orangered {
+  @include getShadowColor(box, $tn-color-orangered-light);
+}
+.tn-shadow-brown {
+  @include getShadowColor(box, $tn-color-brown-light);
+}
+.tn-shadow-grey {
+  @include getShadowColor(box, $tn-color-grey-light);
+}
+.tn-shadow-gray {
+  @include getShadowColor(box, $tn-color-gray-light);
+}
+
+.tn-text-shadow-red {
+  @include getShadowColor(text, $tn-color-red-light);
+}
+.tn-text-shadow-purplered {
+  @include getShadowColor(text, $tn-color-purplered-light);
+}
+.tn-text-shadow-purple {
+  @include getShadowColor(text, $tn-color-purple-light);
+}
+.tn-text-shadow-bluepurple {
+  @include getShadowColor(text, $tn-color-bluepurple-light);
+}
+.tn-text-shadow-aquablue {
+  @include getShadowColor(text, $tn-color-aquablue-light);
+}
+.tn-text-shadow-blue {
+  @include getShadowColor(text, $tn-color-blue-light);
+}
+.tn-text-shadow-indigo {
+  @include getShadowColor(text, $tn-color-indigo-light);
+}
+.tn-text-shadow-cyan {
+  @include getShadowColor(text, $tn-color-cyan-light);
+}
+.tn-text-shadow-teal {
+  @include getShadowColor(text, $tn-color-teal-light);
+}
+.tn-text-shadow-green {
+  @include getShadowColor(text, $tn-color-green-light);
+}
+.tn-text-shadow-yellowgreen {
+  @include getShadowColor(text, $tn-color-yellowgreen-light);
+}
+.tn-text-shadow-lime {
+  @include getShadowColor(text, $tn-color-lime-light);
+}
+.tn-text-shadow-yellow {
+  @include getShadowColor(text, $tn-color-yellow-light);
+}
+.tn-text-shadow-orangeyellow {
+  @include getShadowColor(text, $tn-color-orangeyellow-light);
+}
+.tn-text-shadow-orange {
+  @include getShadowColor(text, $tn-color-orange-light);
+}
+.tn-text-shadow-orangered {
+  @include getShadowColor(text, $tn-color-orangered-light);
+}
+.tn-text-shadow-brown {
+  @include getShadowColor(text, $tn-color-brown-light);
+}
+.tn-text-shadow-grey {
+  @include getShadowColor(text, $tn-color-grey-light);
+}
+.tn-text-shadow-gray {
+  @include getShadowColor(text, $tn-color-gray-light);
+}
+/* 阴影颜色 end */
+
+/* 主色渐变色 start */
+.tn-main-gradient-red {
+  @include getMainColorGradient($tn-color-red, $tn-color-red-light, $tn-color-red-disabled, $tn-color-purplered, $tn-color-purplered-light);
+}
+.tn-main-gradient-purplered {
+  @include getMainColorGradient($tn-color-purplered, $tn-color-purplered-light, $tn-color-purplered-disabled, $tn-color-purple, $tn-color-purple-light);
+}
+.tn-main-gradient-purple {
+  @include getMainColorGradient($tn-color-purple, $tn-color-purple-light, $tn-color-purple-disabled, $tn-color-bluepurple, $tn-color-bluepurple-light);
+}
+.tn-main-gradient-bluepurple {
+  @include getMainColorGradient($tn-color-bluepurple, $tn-color-bluepurple-light, $tn-color-bluepurple-disabled, $tn-color-aquablue, $tn-color-aquablue-light);
+}
+.tn-main-gradient-aquablue {
+  @include getMainColorGradient($tn-color-aquablue, $tn-color-aquablue-light, $tn-color-aquablue-disabled, $tn-color-blue, $tn-color-blue-light);
+}
+.tn-main-gradient-blue {
+  @include getMainColorGradient($tn-color-blue, $tn-color-blue-light, $tn-color-blue-disabled, $tn-color-indigo, $tn-color-indigo-light);
+}
+.tn-main-gradient-indigo {
+  @include getMainColorGradient($tn-color-indigo, $tn-color-indigo-light, $tn-color-indigo-disabled, $tn-color-cyan, $tn-color-cyan-light);
+}
+.tn-main-gradient-cyan {
+  @include getMainColorGradient($tn-color-cyan, $tn-color-cyan-light, $tn-color-cyan-disabled, $tn-color-teal, $tn-color-teal-light);
+}
+.tn-main-gradient-teal {
+  @include getMainColorGradient($tn-color-teal, $tn-color-teal-light, $tn-color-teal-disabled, $tn-color-green, $tn-color-green-light);
+}
+.tn-main-gradient-green {
+  @include getMainColorGradient($tn-color-green, $tn-color-green-light, $tn-color-green-disabled, $tn-color-yellowgreen, $tn-color-yellowgreen-light);
+}
+.tn-main-gradient-yellowgreen {
+  @include getMainColorGradient($tn-color-yellowgreen, $tn-color-yellowgreen-light, $tn-color-yellowgreen-disabled, $tn-color-lime, $tn-color-lime-light);
+}
+.tn-main-gradient-lime {
+  @include getMainColorGradient($tn-color-lime, $tn-color-lime-light, $tn-color-lime-disabled, $tn-color-yellow, $tn-color-yellow-light);
+}
+.tn-main-gradient-yellow {
+  @include getMainColorGradient($tn-color-yellow, $tn-color-yellow-light, $tn-color-yellow-disabled, $tn-color-orangeyellow, $tn-color-orangeyellow-light);
+}
+.tn-main-gradient-orangeyellow {
+  @include getMainColorGradient($tn-color-orangeyellow, $tn-color-orangeyellow-light, $tn-color-orangeyellow-disabled, $tn-color-orange, $tn-color-orange-light);
+}
+.tn-main-gradient-orange {
+  @include getMainColorGradient($tn-color-orange, $tn-color-orange-light, $tn-color-orange-disabled, $tn-color-orangered, $tn-color-orangered-light);
+}
+.tn-main-gradient-orangered {
+  @include getMainColorGradient($tn-color-orangered, $tn-color-orangered-light, $tn-color-orangered-disabled, $tn-color-red, $tn-color-red-light);
+}
+/* 主色渐变色 end */
+
+/* 动态背景颜色 start */
+
+.tn-dynamic-bg-1 {
+  color: #fff;
+  background: linear-gradient(45deg, #F15BB5, #9A5CE5, #01BEFF, #00F5D4);
+  background-size: 500% 500%;
+  animation: dynamicBg 15s ease infinite;
+}
+
+@keyframes dynamicBg {
+  0% {
+    background-position: 0% 50%;
+  }
+
+  50% {
+    background-position: 100% 50%;
+  }
+
+  100% {
+    background-position: 0% 50%;
+  }
+}
+
+/* 动态背景颜色 end */
+
+/* 酷炫背景颜色图片 start */
+
+.tn-cool-bg-color-1 {
+  @include getGradientColor($tn-cool-bg-color-1-start, $tn-cool-bg-color-1-end);
+}
+.tn-cool-bg-color-2 {
+  @include getGradientColor($tn-cool-bg-color-2-start, $tn-cool-bg-color-2-end);
+}
+.tn-cool-bg-color-3 {
+  @include getGradientColor($tn-cool-bg-color-3-start, $tn-cool-bg-color-3-end);
+}
+.tn-cool-bg-color-4 {
+  @include getGradientColor($tn-cool-bg-color-4-start, $tn-cool-bg-color-4-end);
+}
+.tn-cool-bg-color-5 {
+  @include getGradientColor($tn-cool-bg-color-5-start, $tn-cool-bg-color-5-end);
+}
+.tn-cool-bg-color-6 {
+  @include getGradientColor($tn-cool-bg-color-6-start, $tn-cool-bg-color-6-end);
+}
+.tn-cool-bg-color-7 {
+  @include getGradientColor($tn-cool-bg-color-7-start, $tn-cool-bg-color-7-end);
+}
+.tn-cool-bg-color-8 {
+  @include getGradientColor($tn-cool-bg-color-8-start, $tn-cool-bg-color-8-end);
+}
+.tn-cool-bg-color-9 {
+  @include getGradientColor($tn-cool-bg-color-9-start, $tn-cool-bg-color-9-end);
+}
+.tn-cool-bg-color-10 {
+  @include getGradientColor($tn-cool-bg-color-10-start, $tn-cool-bg-color-10-end);
+}
+.tn-cool-bg-color-11 {
+  @include getGradientColor($tn-cool-bg-color-11-start, $tn-cool-bg-color-11-end);
+}
+.tn-cool-bg-color-12 {
+  @include getGradientColor($tn-cool-bg-color-12-start, $tn-cool-bg-color-12-end);
+}
+.tn-cool-bg-color-13 {
+  @include getGradientColor($tn-cool-bg-color-13-start, $tn-cool-bg-color-13-end);
+}
+.tn-cool-bg-color-14 {
+  @include getGradientColor($tn-cool-bg-color-14-start, $tn-cool-bg-color-14-end);
+}
+.tn-cool-bg-color-15 {
+  @include getGradientColor($tn-cool-bg-color-15-start, $tn-cool-bg-color-15-end);
+}
+.tn-cool-bg-color-16 {
+  @include getGradientColor($tn-cool-bg-color-16-start, $tn-cool-bg-color-16-end);
+}
+
+.tn-cool-bg-image::after {
+  content: " ";
+  position: absolute;
+  z-index: -1;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  bottom: 0;
+  border-radius: 10rpx;
+  opacity: 1;
+  transform: scale(1, 1);
+  background-size: 100% 100%;
+  background-image: inherit;
+}
+
+.tn-cool-bg-image:nth-of-type(1n)::after {
+  background-image: url(https://resource.tuniaokj.com/images/cool_bg_image/1.png);
+}
+
+.tn-cool-bg-image:nth-of-type(2n)::after {
+  background-image: url(https://resource.tuniaokj.com/images/cool_bg_image/2.png);
+}
+
+.tn-cool-bg-image:nth-of-type(3n)::after {
+  background-image: url(https://resource.tuniaokj.com/images/cool_bg_image/3.png);
+}
+
+.tn-cool-bg-image:nth-of-type(4n)::after {
+  background-image: url(https://resource.tuniaokj.com/images/cool_bg_image/4.png);
+}
+
+.tn-cool-bg-image:nth-of-type(5n)::after {
+  background-image: url(https://resource.tuniaokj.com/images/cool_bg_image/5.png);
+}
+
+.tn-cool-bg-image:nth-of-type(6n)::after {
+  background-image: url(https://resource.tuniaokj.com/images/cool_bg_image/6.png);
+}
+
+/* 酷炫背景颜色图片 end */
diff --git a/tuniao-ui/libs/css/main.scss b/tuniao-ui/libs/css/main.scss
new file mode 100644
index 0000000..79de66e
--- /dev/null
+++ b/tuniao-ui/libs/css/main.scss
@@ -0,0 +1,730 @@
+$direction: top, right, bottom, left;
+
+body {
+  // 全局灰白效果
+  /* filter: grayscale(100%);
+  -webkit-filter: grayscale(100%); */
+
+	background-color: $tn-bg-color;
+	/* background-color: #ffffff; */
+	font-size: 28rpx;
+	color: $tn-font-color;
+	font-family: Helvetica Neue, Helvetica, sans-serif;
+  // 修复点击view标签的时候会有蓝色遮罩
+  -webkit-tap-highlight-color: rgba(0,0,0,0);
+}
+
+view,
+scroll-view,
+swiper,
+button,
+input,
+textarea,
+label,
+navigator,
+image {
+	box-sizing: border-box;
+}
+
+button::after {
+	border: none;
+}
+
+.tn-round {
+	border-radius: 5000rpx !important;
+}
+
+.tn-radius {
+	border-radius: 6rpx;
+}
+
+/* 基本样式 start */
+
+.tn-width-full {
+  width: 100%;
+}
+
+.tn-height-full {
+  height: 100%;
+}
+
+/* 基本样式 end */
+
+
+/* 边框 start */
+
+.tn-border-solid,
+.tn-border-solid-top,
+.tn-border-solid-right,
+.tn-border-solid-bottom,
+.tn-border-solid-left,
+.tn-border-solids,
+.tn-border-solids-top,
+.tn-border-solids-right,
+.tn-border-solids-bottom,
+.tn-border-solids-left,
+.tn-border-dashed,
+.tn-border-dashed-top,
+.tn-border-dashed-right,
+.tn-border-dashed-bottom,
+.tn-border-dashed-left {
+  border-radius: inherit;
+  box-sizing: border-box;
+}
+
+@for $i from 0 to length($direction) + 1 {
+  @if $i == 0 {
+    .tn-border-solid {
+      border-width: 1rpx !important;
+      border-style: solid;
+      border-color: $tn-border-solid-color;
+
+      &.tn-bold-border {
+        border-width: 6rpx !important;
+      }
+    }
+    .tn-border-solids {
+      border-width: 1rpx !important;
+      border-style: solid;
+      border-color: $tn-border-solids-color;
+
+      &.tn-bold-border {
+        border-width: 6rpx !important;
+      }
+    }
+    .tn-border-dashed {
+      border-width: 1rpx !important;
+      border-style: dashed;
+      border-color: $tn-border-dashed-color;
+
+      &.tn-bold-border {
+        border-width: 6rpx !important;
+      }
+    }
+  } @else {
+    .tn-border-solid-#{nth($direction, $i)} {
+      border: 0rpx;
+      border-#{nth($direction, $i)}-width: 1rpx !important;
+      border-style: solid;
+      border-color: $tn-border-solid-color;
+
+      &.tn-bold-border {
+        border-#{nth($direction, $i)}-width: 6rpx !important;
+      }
+    }
+    .tn-border-solids-#{nth($direction, $i)} {
+      border: 0rpx;
+      border-#{nth($direction, $i)}-width: 1rpx !important;
+      border-style: solid;
+      border-color: $tn-border-solids-color;
+
+      &.tn-bold-border {
+        border-#{nth($direction, $i)}-width: 6rpx !important;
+      }
+    }
+    .tn-border-dashed-#{nth($direction, $i)} {
+      border: 0rpx;
+      border-#{nth($direction, $i)}-width: 1rpx !important;
+      border-style: dashed;
+      border-color: $tn-border-dashed-color;
+
+      &.tn-bold-border {
+        border-#{nth($direction, $i)}-width: 6rpx !important;
+      }
+    }
+  }
+}
+
+.tn-none-border.tn-border-solid,
+.tn-none-border.tn-border-solid-top,
+.tn-none-border.tn-border-solid-right,
+.tn-none-border.tn-border-solid-bottom,
+.tn-none-border.tn-border-solid-left,
+.tn-none-border.tn-border-solids,
+.tn-none-border.tn-border-solids-top,
+.tn-none-border.tn-border-solids-right,
+.tn-none-border.tn-border-solids-bottom,
+.tn-none-border.tn-border-solids-left,
+.tn-none-border.tn-border-dashed,
+.tn-none-border.tn-border-dashed-top,
+.tn-none-border.tn-border-dashed-right,
+.tn-none-border.tn-border-dashed-bottom,
+.tn-none-border.tn-border-dashed-left {
+  border: 0 !important;
+}
+
+.tn-none-border-top.tn-border-solid,
+.tn-none-border-top.tn-border-solid-top,
+.tn-none-border-top.tn-border-solid-right,
+.tn-none-border-top.tn-border-solid-bottom,
+.tn-none-border-top.tn-border-solid-left,
+.tn-none-border-top.tn-border-solids,
+.tn-none-border-top.tn-border-solids-top,
+.tn-none-border-top.tn-border-solids-right,
+.tn-none-border-top.tn-border-solids-bottom,
+.tn-none-border-top.tn-border-solids-left,
+.tn-none-border-top.tn-border-dashed,
+.tn-none-border-top.tn-border-dashed-top,
+.tn-none-border-top.tn-border-dashed-right,
+.tn-none-border-top.tn-border-dashed-bottom,
+.tn-none-border-top.tn-border-dashed-left {
+  /* height: 0 !important; */
+  border-top: 0 !important;
+}
+
+.tn-none-border-right.tn-border-solid,
+.tn-none-border-right.tn-border-solid-top,
+.tn-none-border-right.tn-border-solid-right,
+.tn-none-border-right.tn-border-solid-bottom,
+.tn-none-border-right.tn-border-solid-left,
+.tn-none-border-right.tn-border-solids,
+.tn-none-border-right.tn-border-solids-top,
+.tn-none-border-right.tn-border-solids-right,
+.tn-none-border-right.tn-border-solids-bottom,
+.tn-none-border-right.tn-border-solids-left,
+.tn-none-border-right.tn-border-dashed,
+.tn-none-border-right.tn-border-dashed-top,
+.tn-none-border-right.tn-border-dashed-right,
+.tn-none-border-right.tn-border-dashed-bottom,
+.tn-none-border-right.tn-border-dashed-left {
+  /* width: 0 !important; */
+  border-right: 0 !important;
+}
+
+.tn-none-border-bottom.tn-border-solid,
+.tn-none-border-bottom.tn-border-solid-top,
+.tn-none-border-bottom.tn-border-solid-right,
+.tn-none-border-bottom.tn-border-solid-bottom,
+.tn-none-border-bottom.tn-border-solid-left,
+.tn-none-border-bottom.tn-border-solids,
+.tn-none-border-bottom.tn-border-solids-top,
+.tn-none-border-bottom.tn-border-solids-right,
+.tn-none-border-bottom.tn-border-solids-bottom,
+.tn-none-border-bottom.tn-border-solids-left,
+.tn-none-border-bottom.tn-border-dashed,
+.tn-none-border-bottom.tn-border-dashed-top,
+.tn-none-border-bottom.tn-border-dashed-right,
+.tn-none-border-bottom.tn-border-dashed-bottom,
+.tn-none-border-bottom.tn-border-dashed-left {
+  /* height: 0 !important; */
+  border-bottom: 0 !important;
+}
+
+.tn-none-border-left.tn-border-solid,
+.tn-none-border-left.tn-border-solid-top,
+.tn-none-border-left.tn-border-solid-right,
+.tn-none-border-left.tn-border-solid-bottom,
+.tn-none-border-left.tn-border-solid-left,
+.tn-none-border-left.tn-border-solids,
+.tn-none-border-left.tn-border-solids-top,
+.tn-none-border-left.tn-border-solids-right,
+.tn-none-border-left.tn-border-solids-bottom,
+.tn-none-border-left.tn-border-solids-left,
+.tn-none-border-left.tn-border-dashed,
+.tn-none-border-left.tn-border-dashed-top,
+.tn-none-border-left.tn-border-dashed-right,
+.tn-none-border-left.tn-border-dashed-bottom,
+.tn-none-border-left.tn-border-dashed-left {
+  /* width: 0 !important; */
+  border-left: 0 !important;
+}
+
+/* 边框 end */
+
+
+/* 阴影 start */
+
+.tn-shadow {
+  box-shadow: 6rpx 6rpx 8rpx $tn-shadow-color;
+}
+
+.tn-shadow-warp {
+  position: relative;
+  box-shadow: 0 0 10rpx $tn-shadow-color;
+}
+
+.tn-shadow-warp::before,
+.tn-shadow-warp::after {
+  content: " ";
+  position: absolute;
+  top: 20rpx;
+  bottom: 30rpx;
+  left: 20rpx;
+  width: 50%;
+  box-shadow: 0 30rpx 20rpx $tn-box-shadow-color;
+  transform: rotate(-3deg);
+  z-index: -1;
+}
+
+.tn-shadow-warp::after {
+  right: 20rpx;
+  left: auto;
+  transform: rotate(3deg);
+}
+
+.tn-shadow-blur {
+  position: relative;
+}
+
+.tn-shadow-blur::before {
+  content: " ";
+  display: block;
+  background: inherit;
+  filter: blur(10rpx);
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 10rpx;
+  left: 10rpx;
+  z-index: -1;
+  opacity: 0.4;
+  transform-origin: 0 0;
+  border-radius: inherit;
+  transform: scale(1, 1);
+}
+
+/* 阴影 end */
+
+
+/* flex start */
+
+.tn-flex {
+  display: -webkit-flex;
+  display: flex;
+}
+
+/* flex伸缩基准值 */
+.tn-flex-basic-xs {
+  flex-basis: 20%;
+}
+
+.tn-flex-basic-sm {
+  flex-basis: 40%;
+}
+
+.tn-flex-basic-md {
+  flex-basis: 50%;
+}
+
+.tn-flex-basic-lg {
+  flex-basis: 60%;
+}
+
+.tn-flex-basic-xl {
+  flex-basis: 80%;
+}
+
+.tn-flex-basic-full {
+  flex-basis: 100%;
+}
+
+/* flex布局的方向 */
+.tn-flex-direction-column {
+  flex-direction: column;
+}
+
+.tn-flex-direction-row {
+  flex-direction: row;
+}
+
+.tn-flex-direction-column-reverse {
+  flex-direction: column-reverse;
+}
+
+.tn-flex-direction-row-reverse {
+  flex-direction: row-reverse;
+}
+
+/* flex容器设置换行 */
+.tn-flex-wrap {
+  flex-wrap: wrap;
+}
+
+.tn-flex-nowrap {
+  flex-wrap: nowrap;
+}
+
+/* flex容器自身垂直方向对齐方式 */
+.tn-flex-center {
+  align-self: center;
+}
+
+.tn-flex-top {
+  align-self: flex-start;
+}
+
+.tn-flex-end {
+  align-self: flex-end;
+}
+
+.tn-flex-stretch {
+  align-self: stretch;
+}
+
+/* flex子元素垂直方向对齐方式 */
+.tn-flex-col-center {
+  align-items: center;
+}
+
+.tn-flex-col-top {
+  align-items: flex-start;
+}
+
+.tn-flex-col-bottom {
+  align-items: flex-end;
+}
+
+/* flex子元素水平方向对齐方式 */
+.tn-flex-row-center {
+  justify-content: center;
+}
+
+.tn-flex-row-left {
+  justify-content: flex-start;
+}
+
+.tn-flex-row-right {
+  justify-content: flex-end;
+}
+
+.tn-flex-row-between {
+  justify-content: space-between;
+}
+
+.tn-flex-row-around {
+  justify-content: space-around;
+}
+
+/* flex子元素空间分配 */
+@for $i from 0 to 12 {
+  .tn-flex-#{$i} {
+    flex: $i;
+  }
+}
+
+.tn-col-12 {
+  width: 100%;
+}
+
+.tn-col-11 {
+  width: 91.66666667%;
+}
+
+.tn-col-10 {
+  width: 83.33333333%;
+}
+
+.tn-col-9 {
+  width: 75%;
+}
+
+.tn-col-8 {
+  width: 66.66666667%;
+}
+
+.tn-col-7 {
+  width: 58.33333333%;
+}
+
+.tn-col-6 {
+  width: 50%;
+}
+
+.tn-col-5 {
+  width: 41.66666667%;
+}
+
+.tn-col-4 {
+  width: 33.33333333%;
+}
+
+.tn-col-3 {
+  width: 25%;
+}
+
+.tn-col-2 {
+  width: 16.66666667%;
+}
+
+.tn-col-1 {
+  width: 8.33333333%;
+}
+
+/* flex end */
+
+/* 内边距 start */
+
+@for $i from 0 to length($direction) + 1 {
+  @if $i == 0 {
+    .tn-no-margin {
+      margin: 0;
+    }
+    .tn-margin-xs {
+    	margin: 10rpx;
+    }
+    .tn-margin-sm {
+    	margin: 20rpx;
+    }
+    .tn-margin {
+    	margin: 30rpx;
+    }
+    .tn-margin-lg {
+    	margin: 40rpx;
+    }
+    .tn-margin-xl {
+    	margin: 50rpx;
+    }
+  } @else {
+    .tn-no-margin-#{nth($direction, $i)} {
+      margin-#{nth($direction, $i)}: 0;
+    }
+    .tn-margin-#{nth($direction, $i)}-xs {
+    	margin-#{nth($direction, $i)}: 10rpx;
+    }
+    .tn-margin-#{nth($direction, $i)}-sm {
+    	margin-#{nth($direction, $i)}: 20rpx;
+    }
+    .tn-margin-#{nth($direction, $i)} {
+    	margin-#{nth($direction, $i)}: 30rpx;
+    }
+    .tn-margin-#{nth($direction, $i)}-lg {
+    	margin-#{nth($direction, $i)}: 40rpx;
+    }
+    .tn-margin-#{nth($direction, $i)}-xl {
+    	margin-#{nth($direction, $i)}: 50rpx;
+    }
+  }
+}
+
+/* 内边距 end */
+
+/* 外边距 start */
+
+@for $i from 0 to length($direction) + 1 {
+  @if $i == 0 {
+    .tn-no-padding {
+      padding: 0;
+    }
+    .tn-padding-xs {
+    	padding: 10rpx;
+    }
+    .tn-padding-sm {
+    	padding: 20rpx;
+    }
+    .tn-padding {
+    	padding: 30rpx;
+    }
+    .tn-padding-lg {
+    	padding: 40rpx;
+    }
+    .tn-padding-xl {
+    	padding: 50rpx;
+    }
+  } @else {
+    .tn-no-padding-#{nth($direction, $i)} {
+      padding-#{nth($direction, $i)}: 0;
+    }
+    .tn-padding-#{nth($direction, $i)}-xs {
+    	padding-#{nth($direction, $i)}: 10rpx;
+    }
+    .tn-padding-#{nth($direction, $i)}-sm {
+    	padding-#{nth($direction, $i)}: 20rpx;
+    }
+    .tn-padding-#{nth($direction, $i)} {
+    	padding-#{nth($direction, $i)}: 30rpx;
+    }
+    .tn-padding-#{nth($direction, $i)}-lg {
+    	padding-#{nth($direction, $i)}: 40rpx;
+    }
+    .tn-padding-#{nth($direction, $i)}-xl {
+    	padding-#{nth($direction, $i)}: 50rpx;
+    }
+  }
+}
+
+/* 外边距 end */
+
+/* float start */
+
+.tn-float-left {
+  float: left;
+}
+
+.tn-float-right {
+  float: right;
+}
+
+.tn-clear-float {
+  clear: both;
+}
+
+.tn-clear-float::after,
+.tn-clear-float::before {
+  content: " ";
+  display: table;
+  clear: both;
+}
+
+/* float end */
+
+/* 文本 start */
+
+.tn-text-xs {
+  font-size: 20rpx;
+}
+
+.tn-text-sm {
+  font-size: 24rpx;
+}
+
+.tn-text-md {
+  font-size: 28rpx;
+}
+
+.tn-text-lg {
+  font-size: 32rpx;
+}
+
+.tn-text-xl {
+  font-size: 36rpx;
+}
+
+.tn-text-xxl {
+  font-size: 40rpx;
+}
+
+.tn-text-xl-xxl {
+  font-size: 80rpx;
+}
+
+.tn-text-xxl-xxl {
+  font-size: 120rpx;
+}
+
+.tn-text-upper {
+  text-transform: uppercase;
+}
+
+.tn-text-cap {
+  text-transform: capitalize;
+}
+
+.tn-text-lower {
+  text-transform: lowercase;
+}
+
+.tn-text-bold {
+  font-weight: bold;
+}
+
+.tn-text-center {
+  text-align: center;
+}
+
+.tn-text-left {
+	text-align: left;
+}
+
+.tn-text-right {
+	text-align: right;
+}
+
+.tn-text-justify {
+	text-align: justify;
+}
+
+.tn-text-content {
+  line-height: 1.6;
+}
+
+.tn-text-ellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.tn-text-ellipsis-2 {
+	display: -webkit-box;
+	overflow: hidden;
+	white-space: normal !important;
+	text-overflow: ellipsis;
+	word-wrap: break-word;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+.tn-text-ellipsis-3 {
+  display: -webkit-box;
+  overflow: hidden;
+  white-space: normal !important;
+  text-overflow: ellipsis;
+  word-wrap: break-word;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+}
+.tn-text-clip {
+  -webkit-background-clip: text;
+  color: transparent !important;
+}
+
+.tn-text-break-word {
+  word-wrap: break-word;
+}
+
+/* 文本 end */
+
+/* hover 点击效果 start */
+.tn-hover {
+  opacity: 0.6;
+}
+/* hover 点击效果 end */
+
+/* 去除原生button样式 start */
+.tn-button--clear-style {
+  background-color: transparent;
+  padding: 0;
+  margin: 0;
+  font-size: inherit;
+  line-height: inherit;
+  border-radius: inherit;
+  color: inherit;
+}
+/* 去除原生button样式 end */
+
+/* 头像组 start */
+// .tn-avatar-group {
+//   direction: rtl;
+//   unicode-bidi: bidi-override;
+//   padding: 0 10rpx 0 40rpx;
+//   display: inline-block;
+
+//   .tn-avatar {
+//     margin-left: -30rpx !important;
+//     border: 4rpx solid $tn-border-solid-color;
+//     vertical-align: middle;
+
+//     &--sm {
+//       margin-left: -20rpx !important;
+//       border: 1rpx solid $tn-border-solid-color;
+//     }
+//   }
+// }
+/* 头像组 end */
+
+/* 提升H5端uni.toast()的层级，避免被tn-modal等遮盖 start */
+/* #ifdef H5 */
+uni-toast {
+    z-index: 10090;
+}
+uni-toast .uni-toast {
+   z-index: 10090;
+}
+/* #endif */
+/* 提升H5端uni.toast()的层级，避免被tn-modal等遮盖 end */
+
+/* iPhoneX底部安全区定义 start */
+.tn-safe-area-inset-bottom {
+  padding-bottom: 0;
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+}
+/* iPhoneX底部安全区定义 end */
diff --git a/tuniao-ui/libs/css/style.h5.scss b/tuniao-ui/libs/css/style.h5.scss
new file mode 100644
index 0000000..647c902
--- /dev/null
+++ b/tuniao-ui/libs/css/style.h5.scss
@@ -0,0 +1,35 @@
+/* H5的时候，隐藏滚动条 */
+::-webkit-scrollbar {
+	display: none;  
+	width: 0 !important;  
+	height: 0 !important;  
+	-webkit-appearance: none;  
+	background: transparent;  
+}
+
+/* 双标签 start*/
+.capsule {
+  display: inline-flex;
+  vertical-align: middle;
+  width: 20%;
+  min-width: 136rpx;
+  height: 45rpx;
+  
+  .capsule-tag {
+    margin: 0;
+    
+    &:first-child {
+      border-top-right-radius: 0rpx;
+      border-bottom-right-radius: 0rpx;
+    }
+    
+    &:last-child {
+      
+      &::after {
+        border-top-left-radius: 0rpx;
+        border-bottom-left-radius: 0rpx;
+      }
+    }
+  }
+}
+/* 双标签 end*/
\ No newline at end of file
diff --git a/tuniao-ui/libs/css/style.mp.scss b/tuniao-ui/libs/css/style.mp.scss
new file mode 100644
index 0000000..f5aed9e
--- /dev/null
+++ b/tuniao-ui/libs/css/style.mp.scss
@@ -0,0 +1,52 @@
+::-webkit-scrollbar {
+	display: none;  
+	width: 0 !important;  
+	height: 0 !important;  
+	-webkit-appearance: none;  
+	background: transparent;  
+}
+/* 微信小程序编译后页面有组件名的元素，特别处理 start */
+/* #ifdef MP-WEIXIN || MP-QQ */
+// 各家小程序宫格组件外层设置为100%，避免受到父元素display: flex;的影响
+
+/* 双标签 start*/
+.capsule {
+  display: inline-flex;
+  vertical-align: middle;
+  width: 20%;
+  min-width: 136rpx;
+  height: 45rpx;
+  
+  tn-tag {
+    margin: 0;
+    width: 100%;
+    
+    &:first-child {
+      .tn-tag {
+        border-top-right-radius: 0rpx;
+        border-bottom-right-radius: 0rpx;
+      }
+    }
+    
+    &:last-child {
+      .tn-tag {
+        &::after {
+          border-top-left-radius: 0rpx;
+          border-bottom-left-radius: 0rpx;
+        }
+      }
+      
+      
+    }
+  }
+}
+/* 双标签 end*/
+
+/* #endif */
+/* 微信小程序编译后页面有组件名的元素，特别处理 end */
+
+/* 头条小程序编译后页面有组件名的元素，特别处理 start */
+/* #ifdef MP-TOUTIAO */
+// 各家小程序宫格组件外层设置为100%，避免受到父元素display: flex;的影响
+/* #endif */
+/* 头条小程序编译后页面有组件名的元素，特别处理 end */
\ No newline at end of file
diff --git a/tuniao-ui/libs/function/$parent.js b/tuniao-ui/libs/function/$parent.js
new file mode 100644
index 0000000..49854cc
--- /dev/null
+++ b/tuniao-ui/libs/function/$parent.js
@@ -0,0 +1,18 @@
+// 获取父组件的参数，在支付宝小程序中不支持provide/inject的写法
+// 在非H5中this.$parent可以获取到父组件，但是在H5中需要多次调用this.$parent.$parent.xxx
+// 传递默认值undefined表示查找最顶层的$parent
+export default function $parent(name = undefined) {
+  let parent = this.$parent
+  // 通过whle遍历，这里主要是为了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/tuniao-ui/libs/function/applyEven.js b/tuniao-ui/libs/function/applyEven.js
new file mode 100644
index 0000000..0176857
--- /dev/null
+++ b/tuniao-ui/libs/function/applyEven.js
@@ -0,0 +1,28 @@
+//防抖
+export function debounceFun(func, delay=500) {
+	//定时器
+	let timer;
+	return function(...args) {
+		// 清除之前设置的定时器
+		clearTimeout(timer);
+		timer = setTimeout(() => {
+			func.apply(this, args);
+		}, delay);
+	};
+}
+
+//节流
+export function throttleFun(func, delay=500) {
+	//定时器
+	let timer = null;
+	return function(...args) {
+		if(!timer){
+			timer = setTimeout(() => {
+				//执行前清空
+				timer = null;
+				console.log("执行了")
+				func.apply(this, args);
+			}, delay);
+		}
+	};
+}
diff --git a/tuniao-ui/libs/function/array.js b/tuniao-ui/libs/function/array.js
new file mode 100644
index 0000000..fa947ea
--- /dev/null
+++ b/tuniao-ui/libs/function/array.js
@@ -0,0 +1,22 @@
+/**
+ * 打乱传入的数组
+ * 
+ * @param {Array} array 待打乱的数组 
+ */
+function random(array = []) {
+  return array.sort(() => Math.random() - 0.5)
+}
+
+/**
+ * 判断是否为数组
+ * 
+ * @param {Object} arr
+ */
+function isArray(arr) {
+  return Object.prototype.toString.call(arr) === '[object Array]'
+}
+
+export default {
+  random,
+  isArray
+}
\ No newline at end of file
diff --git a/tuniao-ui/libs/function/color.js b/tuniao-ui/libs/function/color.js
new file mode 100644
index 0000000..11f3365
--- /dev/null
+++ b/tuniao-ui/libs/function/color.js
@@ -0,0 +1,270 @@
+let color = [
+  'red',
+  'purplered',
+  'purple',
+  'bluepurple',
+  'aquablue',
+  'blue',
+  'indigo',
+  'cyan',
+  'teal',
+  'green',
+  'yellowgreen',
+  'lime',
+  'yellow',
+  'orangeyellow',
+  'orange',
+  'orangered',
+  'brown',
+  'grey',
+  'gray'
+]
+
+// 酷炫颜色的数量
+const COOL_BG_COLOR_COUNT = 16
+
+/**
+ * 获取图鸟配色颜色列表
+ */
+function getTuniaoColorList() {
+  return color
+}
+
+/**
+ * 获取指定类型的随机颜色对应的类
+ * @param {String} type 颜色类型
+ */
+function getRandomColorClass(type = 'bg') {
+  const index = Math.floor(Math.random() * color.length)
+  const colorValue = color[index]
+
+  return 'tn-' + type + '-' + colorValue
+}
+
+/**
+ * 随机获取酷炫背景对应的类
+ */
+function getRandomCoolBgClass() {
+  const index = (Math.random() * COOL_BG_COLOR_COUNT) + 1
+  return 'tn-cool-bg-color-' + Math.floor(index)
+}
+
+/**
+ * 根据传入的值获取内部背景颜色类
+ * 
+ * @param {String} backgroundColor 背景颜色信息
+ */
+function getBackgroundColorInternalClass(backgroundColor = '') {
+  if (!backgroundColor) return ''
+  
+  if (['tn-bg', 'tn-dynamic-bg', 'tn-main-gradient', 'tn-cool-bg'].some(item => {
+    return backgroundColor.includes(item)
+  })) {
+    return backgroundColor
+  }
+  return ''
+}
+
+/**
+ * 根据传入的值获取背景颜色样式
+ * 
+ * @param {String} backgroundColor 背景颜色信息
+ */
+function getBackgroundColorStyle(backgroundColor = '') {
+  if (!backgroundColor) return ''
+  
+  if (!backgroundColor.startsWith('tn-') || ['#', 'rgb', 'rgba'].some(item => {
+    return backgroundColor.includes(item)
+  })) {
+    return backgroundColor
+  }
+  return ''
+}
+
+/**
+ * 根据传入的值获取内部字体颜色类
+ * 
+ * @param {String} fontColor 背景颜色信息
+ */
+function getFontColorInternalClass(fontColor = '') {
+  if (!fontColor) return ''
+  
+  if (['tn-color'].some(item => {
+    return fontColor.includes(item)
+  })) {
+    return fontColor
+  }
+  return ''
+}
+
+/**
+ * 根据传入的值获取字体颜色样式
+ * 
+ * @param {String} fontColor 背景颜色信息
+ */
+function getFontColorStyle(fontColor = '') {
+  if (!fontColor) return ''
+  
+  if (!fontColor.startsWith('tn-') || ['#', 'rgb', 'rgba'].some(item => {
+    return fontColor.includes(item)
+  })) {
+    return fontColor
+  }
+  return ''
+}
+
+/**
+ * 求两个颜色之间的渐变值
+ * 
+ * @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)
+  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 R = (endR - startR) / step
+  let G = (endG - startG) / step
+  let B = (endB - startB) / step
+  
+  let colorArr = []
+  for (let i = 0; i < step; i++) {
+    // 计算每一步的hex值
+    let hex = rgbToHex(`rgb(${Math.round(R * i + startR)}, ${Math.round(G * i + startG)}, ${Math.round(B * i + startB)})`)
+    colorArr.push(hex)
+  }
+  return colorArr
+}
+
+/**
+ * 将hex的颜色表示方式转换为rgb表示方式
+ * 
+ * @param {String} color 颜色
+ * @param {Boolean} str 是否返回字符串
+ * @return {Array|String} rgb的值
+ */
+function hexToRGB(color, str = true) {
+  let reg = /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/
+  
+  color = color.toLowerCase()
+  if (color && reg.test(color)) {
+    // #000 => #000000
+    if (color.length === 4) {
+      let colorNew = '#'
+      for (let i = 1; i < 4; i++) {
+        colorNew += color.slice(i, i + 1).concat(color.slice(i, i + 1))
+      }
+      color = colorNew
+    }
+    // 处理六位的颜色值
+    let colorChange = []
+    for (let i = 1; i < 7; i += 2) {
+      colorChange.push(parseInt("0x" + color.slice(i, i + 2)))
+    }
+    if (!str) {
+      return colorChange
+    } else {
+      return `rgb(${colorChange[0]}, ${colorChange[1]}, ${colorChange[2]})`
+    }
+  } else if (/^(rgb|RGB)/.test(color)) {
+    let arr = color.replace(/(?:\(|\)|rgb|RGB)*/g, "").split(',')
+    return arr.map(item => Number(item))
+  } else {
+    return color
+  }
+}
+
+/**
+ * 将rgb的颜色表示方式转换成hex表示方式
+ * 
+ * @param {Object} rgb rgb颜色值
+ */
+function rgbToHex(rgb) {
+  let reg = /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/
+  if (/^(rgb|RGB)/.test(rgb)) {
+    let color = rgb.replace(/(?:\(|\)|rgb|GRB)*/g, "").split(',')
+    let strHex = '#'
+    for (let i = 0; i < color.length; i++) {
+      let hex = Number(color[i]).toString(16)
+      // 保证每个值否是两位数
+      hex = String(hex).length === 1 ? 0 + '' + hex: hex
+      if (hex === '0') {
+        hex += hex
+      }
+      strHex += hex
+    }
+    if (strHex.length !== 7) {
+      strHex = rgb
+    }
+    return strHex
+  } else if (reg.test(rgb)) {
+    let num = rgb.replace(/#/, '').split('')
+    if (num.length === 6) {
+      return rgb
+    } else if (num.length === 3) {
+      let numHex = '#'
+      for (let i = 0; i < num.length; i++) {
+        numHex += (num[i] + num[i])
+      }
+      return numHex
+    }
+  } else {
+    return rgb
+  }
+}
+
+/**
+ * 将传入的颜色值转换为rgba字符串
+ * 
+ * @param {String} color 颜色
+ * @param {Number} alpha 透明度
+ */
+function colorToRGBA(color, alpha = 0.3) {
+  color = rgbToHex(color)
+  // 十六进制颜色值的正则表达式
+  let reg = /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/
+  
+  color = color.toLowerCase()
+  if (color && reg.test(color)) {
+    // #000 => #000000
+    if (color.length === 4) {
+      let colorNew = '#'
+      for (let i = 1; i < 4; i++) {
+        colorNew += color.slice(i, i + 1).concat(color.slice(i, i + 1))
+      }
+      color = colorNew
+    }
+    // 处理六位的颜色值
+    let colorChange = []
+    for (let i = 1; i < 7; i += 2) {
+      colorChange.push(parseInt("0x" + color.slice(i, i + 2)))
+    }
+    return `rgba(${colorChange[0]}, ${colorChange[1]}, ${colorChange[2]}, ${alpha})`
+  } else {
+    return color
+  }
+}
+
+export default {
+  COOL_BG_COLOR_COUNT: COOL_BG_COLOR_COUNT,
+  getTuniaoColorList,
+  getRandomColorClass,
+  getRandomCoolBgClass,
+  getBackgroundColorInternalClass,
+  getBackgroundColorStyle,
+  getFontColorInternalClass,
+  getFontColorStyle,
+  colorGradient,
+  hexToRGB,
+  rgbToHex,
+  colorToRGBA
+}
diff --git a/tuniao-ui/libs/function/deepClone.js b/tuniao-ui/libs/function/deepClone.js
new file mode 100644
index 0000000..81f4e42
--- /dev/null
+++ b/tuniao-ui/libs/function/deepClone.js
@@ -0,0 +1,29 @@
+/**
+ * 判断是否为数组
+ * 
+ * @param {Object} arr
+ */
+function isArray(arr) {
+  return Object.prototype.toString.call(arr) === '[object Array]'
+}
+
+/**
+ * 深度复制数据
+ * 
+ * @param {Object} obj
+ */
+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
\ No newline at end of file
diff --git a/tuniao-ui/libs/function/message.js b/tuniao-ui/libs/function/message.js
new file mode 100644
index 0000000..113cc0f
--- /dev/null
+++ b/tuniao-ui/libs/function/message.js
@@ -0,0 +1,74 @@
+/**
+ * 弹出系统内置的toast
+ */
+function toast(title, mask = false, cb = null, icon = 'none', duration = 1500) {
+  uni.showToast({
+    title: title,
+    icon: icon,
+    mask: mask,
+    duration: duration,
+    success: () => {
+      setTimeout(() => {
+        cb && cb()
+      }, duration)
+    }
+  })
+}
+
+/**
+ * 弹出内置的加载框
+ */
+function loading(title) {
+  uni.showLoading({
+    title: title,
+    mask: true
+  })
+}
+
+/**
+ * 弹出系统内置的modal
+ */
+function modal(title,
+  content,
+  confirmCb,
+  showCancel = false,
+  cancelCb = null,
+  confirmText = "确定",
+  cancelText = "取消") {
+  uni.showModal({
+    title: title,
+    content: content,
+    showCancel: showCancel,
+    cancelText: cancelText,
+    confirmText: confirmText,
+    success: (res) => {
+      if (res.cancel) {
+        cancelCb && cancelCb()
+      } else if (res.confirm) {
+        confirmCb && confirmCb()
+      }
+    }
+  })
+}
+
+/**
+ * 关闭系统内置toast
+ */
+function closeToast() {
+  uni.hideToast()
+}
+
+/**
+ * 关闭系统内置的加载框
+ */
+function closeLoading() {
+  uni.hideLoading()
+}
+
+export default {
+  toast,
+  loading,
+  modal,
+  closeToast,
+  closeLoading
+}
diff --git a/tuniao-ui/libs/function/number.js b/tuniao-ui/libs/function/number.js
new file mode 100644
index 0000000..ec64ff0
--- /dev/null
+++ b/tuniao-ui/libs/function/number.js
@@ -0,0 +1,128 @@
+/**
+ * 格式化数字字符串
+ * @param {String, Number} value 待格式化的字符串
+ * @param {Number} digits 保留位数 
+ */
+function formatNumberString(value, digits = 2) {
+  let number = 0
+  // 判断是什么类型
+  if (typeof value === 'string') {
+    number = Number(value)
+  } else if (typeof value === 'number') {
+    number = value
+  }
+  if (isNaN(number) || number === 0) {
+    return 0
+  }
+  
+  let maxNumber = Math.pow(10, digits) - 1
+  if (number > maxNumber) {
+    return `${maxNumber}+`
+  }
+  
+  return number
+}
+
+/**
+ * 格式化数字字符串，往数字前添加0
+ * 
+ * @param {Object} num 待格式化的数值
+ */
+function formatNumberAddZero(value) {
+  let number = 0
+  // 判断是什么类型
+  if (typeof value === 'string') {
+    number = Number(value)
+  } else if (typeof value === 'number') {
+    number = value
+  }
+  if (isNaN(number) || +number < 10) {
+    return '0' + number
+  } else {
+    return String(number)
+  }
+  
+}
+
+/**
+ * 格式化数字，往数值后添加单位
+ *
+ * @param {Object} value 待格式化的数值
+ * @param {Object} digits 保留位数
+ */
+function formatNumberAddPriceUnit(value, digits = 2) {
+  // 数值分割点
+  const unitSplit = [
+    { value: 1, symbol: ''},
+    { value: 1E3, symbol: 'K'},
+    { value: 1E4, symbol: 'W'},
+  ]
+  
+  const reg = /\.0+$|(\.[0=9]*[1-9])0+$/
+  
+  let number = 0
+  // 判断是什么类型
+  if (typeof value === 'string') {
+    number = Number(value)
+  } else if (typeof value === 'number') {
+    number = value
+  }
+  
+  let i
+  for (i = unitSplit.length - 1; i > 0; i--) {
+    if (number >= unitSplit[i].value) break
+  }
+  return (number / unitSplit[i].value).toFixed(digits).replace(reg, "$1") + unitSplit[i].symbol
+}
+
+/**
+ * 获取数值的整数位数
+ *
+ * @param {Object} number 数值 
+ */
+function getDigit(number) {
+  let digit = -1
+  while (number >= 1) {
+    digit++
+    number = number / 10
+  }
+  return digit
+}
+
+/**
+ * 获取指定范围的随机数(返回整数)
+ 
+ * @param {Object} min 最小值
+ * @param {Object} max 最大值
+ */
+function random(min, max) {
+  if (min >= 0 && max > 0 && max >= min) {
+    let gab = max - min
+    return Math.random() * gab + min
+  } else {
+    return 0
+  }
+}
+
+/**
+ * 获取指定范围的随机数(返回整数)
+ 
+ * @param {Object} min 最小值
+ * @param {Object} max 最大值
+ */
+function randomInt(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 {
+  formatNumberString,
+  formatNumberAddZero,
+  formatNumberAddPriceUnit,
+  random,
+  randomInt
+}
\ No newline at end of file
diff --git a/tuniao-ui/libs/function/string.js b/tuniao-ui/libs/function/string.js
new file mode 100644
index 0000000..dadc24c
--- /dev/null
+++ b/tuniao-ui/libs/function/string.js
@@ -0,0 +1,69 @@
+/**
+ * 去掉字符串中空格
+ * 
+ * @param {String} str 待处理的字符串
+ * @param {String} type 处理类型
+ */
+function trim(str, type = 'both') {
+  if (type === 'both') {
+    return str.replace(/^\s+|\s+$/g, "")
+  } else if (type === 'left') {
+    return str.replace(/^\s*/g, "")
+  } else if (type === 'right') {
+    return str.replace(/(\s*$)/g, "")
+  } else if (type === 'all') {
+    return str.replace(/\s+/g, "")
+  } else {
+    return str
+  }
+}
+
+/**
+ * 获取带单位的长度值
+ * 
+ * @param {String} value 待处理的值
+ * @param {String} unit 单位
+ */
+function getLengthUnitValue(value, unit = 'rpx') {
+  if (!value) {
+    return ''
+  }
+  if (/(%|px|rpx|auto)$/.test(value)) return value
+  else return value + unit
+}
+
+/**
+ * 将驼峰命名的字符串转换为指定连接符来进行连接
+ * 
+ * @param {Object} string 待转换的字符串
+ * @param {Object} replace 进行连接的字符
+ */
+function humpConvertChar(string, replace = '_') {
+  if (!string || !replace) {
+    return ''
+  }
+  return string.replace(/([A-Z])/g, `${replace}$1`).toLowerCase()
+}
+
+/**
+ * 将用指定连接符来进行连接的字符串转为驼峰命名的字符串
+ * 
+ * @param {Object} string 待转换的字符串
+ * @param {Object} replace 进行连接的字符
+ */
+function charConvertHump(string, replace = '_') {
+  if (!string || !replace) {
+    return ''
+  }
+  let reg = RegExp(replace + "(\\w)", "g")
+  return string.replace(reg, function(all, letter) {
+    return letter.toUpperCase()
+  })
+}
+
+export default {
+  trim,
+  getLengthUnitValue,
+  humpConvertChar,
+  charConvertHump
+}
\ No newline at end of file
diff --git a/tuniao-ui/libs/function/test.js b/tuniao-ui/libs/function/test.js
new file mode 100644
index 0000000..94fddac
--- /dev/null
+++ b/tuniao-ui/libs/function/test.js
@@ -0,0 +1,232 @@
+/**
+ * 验证电子邮箱格式
+ */
+function email(value) {
+	return /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/.test(value);
+}
+
+/**
+ * 验证手机格式
+ */
+function mobile(value) {
+	return /^1[3-9]\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*|\.\d+|\d\.\d+e\+\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);
+}
+
+
+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
+}
\ No newline at end of file
diff --git a/tuniao-ui/libs/function/updateCustomBarInfo.js b/tuniao-ui/libs/function/updateCustomBarInfo.js
new file mode 100644
index 0000000..eae9f45
--- /dev/null
+++ b/tuniao-ui/libs/function/updateCustomBarInfo.js
@@ -0,0 +1,44 @@
+/**
+ * 更新自定义顶部导航栏的高度
+ */
+function updateCustomBarInfo () {
+  return new Promise((resolve, reject) => {
+    uni.getSystemInfo({
+      success: (e) => {
+        let statusBarHeight = 0
+        let customBarHeight = 0
+        // #ifndef MP
+        statusBarHeight = e.statusBarHeight
+        if (e.platform == 'android') {
+          customBarHeight = e.statusBarHeight + 50
+        } else {
+          customBarHeight = e.statusBarHeight + 45
+        };
+        // #endif
+
+        // #ifdef MP-WEIXIN
+        statusBarHeight = e.statusBarHeight
+        let custom = wx.getMenuButtonBoundingClientRect()
+        customBarHeight = custom.bottom + ((custom.top - e.statusBarHeight) <= 4 ? (custom.top - e
+          .statusBarHeight) + 4 : (custom.top - e.statusBarHeight))
+        // #endif		
+
+        // #ifdef MP-ALIPAY
+        statusBarHeight = e.statusBarHeight
+        customBarHeight = e.statusBarHeight + e.titleBarHeight
+        // #endif
+        resolve({
+          statusBarHeight,
+          customBarHeight
+        })
+      },
+      fail: (err) => {
+        console.log("获取设备信息失败", err);
+        reject()
+      }
+    })
+
+  })
+}
+
+export default updateCustomBarInfo
diff --git a/tuniao-ui/libs/function/uuid.js b/tuniao-ui/libs/function/uuid.js
new file mode 100644
index 0000000..e3cf39e
--- /dev/null
+++ b/tuniao-ui/libs/function/uuid.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} firstT 将返回的首字母置为"t"
+ * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
+ */
+function uuid(len = 32, firstT = 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]
+			}
+		}
+	}
+	// 移除第一个字符,并用t替代,因为第一个字符为数值时,该uuid不能用作id或者class
+	if (firstT) {
+		uuid.shift()
+		return 't' + uuid.join('')
+	} else {
+		return uuid.join('')
+	}
+}
+
+export default uuid
\ No newline at end of file
diff --git a/tuniao-ui/libs/luch-request/adapters/index.js b/tuniao-ui/libs/luch-request/adapters/index.js
new file mode 100644
index 0000000..5a478b5
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/adapters/index.js
@@ -0,0 +1,99 @@
+import buildURL from '../helpers/buildURL'
+import buildFullPath from '../core/buildFullPath'
+import settle from '../core/settle'
+import { isUndefined } from "../utils"
+
+/**
+ * 返回可选值存在的配置
+ * @param {Array} keys - 可选值数组
+ * @param {Object} config2 - 配置
+ * @return {{}} - 存在的配置项
+ */
+const mergeKeys = (keys, config2) => {
+  let config = {}
+  keys.forEach(prop => {
+    if (!isUndefined(config2[prop])) {
+      config[prop] = config2[prop]
+    }
+  })
+  return config
+}
+export default (config) => {
+  return new Promise((resolve, reject) => {
+    let fullPath = buildURL(buildFullPath(config.baseURL, config.url), config.params)
+    const _config = {
+      url: fullPath,
+      header: config.header,
+      complete: (response) => {
+        config.fullPath = fullPath
+        response.config = config
+        try {
+          // 对可能字符串不是json 的情况容错
+          if (typeof response.data === 'string') {
+            response.data = JSON.parse(response.data)
+          }
+          // eslint-disable-next-line no-empty
+        } catch (e) {
+        }
+        settle(resolve, reject, response)
+      }
+    }
+    let requestTask
+    if (config.method === 'UPLOAD') {
+      delete _config.header['content-type']
+      delete _config.header['Content-Type']
+      let otherConfig = {
+        // #ifdef MP-ALIPAY
+        fileType: config.fileType,
+        // #endif
+        filePath: config.filePath,
+        name: config.name
+      }
+      const optionalKeys = [
+        // #ifdef APP-PLUS || H5
+        'files',
+        // #endif
+        // #ifdef H5
+        'file',
+        // #endif
+        // #ifdef H5 || APP-PLUS
+        'timeout',
+        // #endif
+        'formData'
+      ]
+      requestTask = uni.uploadFile({..._config, ...otherConfig, ...mergeKeys(optionalKeys, config)})
+    } else if (config.method === 'DOWNLOAD') {
+      // #ifdef H5 || APP-PLUS
+      if (!isUndefined(config['timeout'])) {
+        _config['timeout'] = config['timeout']
+      }
+      // #endif
+      requestTask = uni.downloadFile(_config)
+    } else {
+      const optionalKeys = [
+        'data',
+        'method',
+        // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+        'timeout',
+        // #endif
+        'dataType',
+        // #ifndef MP-ALIPAY
+        'responseType',
+        // #endif
+        // #ifdef APP-PLUS
+        'sslVerify',
+        // #endif
+        // #ifdef H5
+        'withCredentials',
+        // #endif
+        // #ifdef APP-PLUS
+        'firstIpv4',
+        // #endif
+      ]
+      requestTask = uni.request({..._config,...mergeKeys(optionalKeys, config)})
+    }
+    if (config.getTask) {
+      config.getTask(requestTask, config)
+    }
+  })
+}
diff --git a/tuniao-ui/libs/luch-request/core/InterceptorManager.js b/tuniao-ui/libs/luch-request/core/InterceptorManager.js
new file mode 100644
index 0000000..3ea0d5e
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/core/InterceptorManager.js
@@ -0,0 +1,51 @@
+'use strict'
+
+
+function InterceptorManager() {
+  this.handlers = []
+}
+
+/**
+ * Add a new interceptor to the stack
+ *
+ * @param {Function} fulfilled The function to handle `then` for a `Promise`
+ * @param {Function} rejected The function to handle `reject` for a `Promise`
+ *
+ * @return {Number} An ID used to remove interceptor later
+ */
+InterceptorManager.prototype.use = function use(fulfilled, rejected) {
+  this.handlers.push({
+    fulfilled: fulfilled,
+    rejected: rejected
+  })
+  return this.handlers.length - 1
+}
+
+/**
+ * Remove an interceptor from the stack
+ *
+ * @param {Number} id The ID that was returned by `use`
+ */
+InterceptorManager.prototype.eject = function eject(id) {
+  if (this.handlers[id]) {
+    this.handlers[id] = null
+  }
+}
+
+/**
+ * Iterate over all the registered interceptors
+ *
+ * This method is particularly useful for skipping over any
+ * interceptors that may have become `null` calling `eject`.
+ *
+ * @param {Function} fn The function to call for each interceptor
+ */
+InterceptorManager.prototype.forEach = function forEach(fn) {
+  this.handlers.forEach(h => {
+    if (h !== null) {
+      fn(h)
+    }
+  })
+}
+
+export default InterceptorManager
diff --git a/tuniao-ui/libs/luch-request/core/Request.js b/tuniao-ui/libs/luch-request/core/Request.js
new file mode 100644
index 0000000..43bb14c
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/core/Request.js
@@ -0,0 +1,200 @@
+/**
+ * @Class Request
+ * @description luch-request http请求插件
+ * @version 3.0.7
+ * @Author lu-ch
+ * @Date 2021-09-04
+ * @Email webwork.s@qq.com
+ * 文档: https://www.quanzhan.co/luch-request/
+ * github: https://github.com/lei-mu/luch-request
+ * DCloud: http://ext.dcloud.net.cn/plugin?id=392
+ * HBuilderX: beat-3.0.4 alpha-3.0.4
+ */
+
+
+import dispatchRequest from './dispatchRequest'
+import InterceptorManager from './InterceptorManager'
+import mergeConfig from './mergeConfig'
+import defaults from './defaults'
+import { isPlainObject } from '../utils'
+import clone from '../utils/clone'
+
+export default class Request {
+  /**
+   * @param {Object} arg - 全局配置
+   * @param {String} arg.baseURL - 全局根路径
+   * @param {Object} arg.header - 全局header
+   * @param {String} arg.method = [GET|POST|PUT|DELETE|CONNECT|HEAD|OPTIONS|TRACE] - 全局默认请求方式
+   * @param {String} arg.dataType = [json] - 全局默认的dataType
+   * @param {String} arg.responseType = [text|arraybuffer] - 全局默认的responseType。支付宝小程序不支持
+   * @param {Object} arg.custom - 全局默认的自定义参数
+   * @param {Number} arg.timeout - 全局默认的超时时间，单位 ms。默认60000。H5(HBuilderX 2.9.9+)、APP(HBuilderX 2.9.9+)、微信小程序（2.10.0）、支付宝小程序
+   * @param {Boolean} arg.sslVerify - 全局默认的是否验证 ssl 证书。默认true.仅App安卓端支持（HBuilderX 2.3.3+）
+   * @param {Boolean} arg.withCredentials - 全局默认的跨域请求时是否携带凭证（cookies）。默认false。仅H5支持（HBuilderX 2.6.15+）
+   * @param {Boolean} arg.firstIpv4 - 全DNS解析时优先使用ipv4。默认false。仅 App-Android 支持 (HBuilderX 2.8.0+)
+   * @param {Function(statusCode):Boolean} arg.validateStatus - 全局默认的自定义验证器。默认statusCode >= 200 && statusCode < 300
+   */
+  constructor(arg = {}) {
+    if (!isPlainObject(arg)) {
+      arg = {}
+      console.warn('设置全局参数必须接收一个Object')
+    }
+    this.config = clone({...defaults, ...arg})
+    this.interceptors = {
+      request: new InterceptorManager(),
+      response: new InterceptorManager()
+    }
+  }
+
+  /**
+   * @Function
+   * @param {Request~setConfigCallback} f - 设置全局默认配置
+   */
+  setConfig(f) {
+    this.config = f(this.config)
+  }
+
+  middleware(config) {
+    config = mergeConfig(this.config, config)
+    let chain = [dispatchRequest, undefined]
+    let promise = Promise.resolve(config)
+
+    this.interceptors.request.forEach(function unshiftRequestInterceptors(interceptor) {
+      chain.unshift(interceptor.fulfilled, interceptor.rejected)
+    })
+
+    this.interceptors.response.forEach(function pushResponseInterceptors(interceptor) {
+      chain.push(interceptor.fulfilled, interceptor.rejected)
+    })
+
+    while (chain.length) {
+      promise = promise.then(chain.shift(), chain.shift())
+    }
+
+    return promise
+  }
+
+  /**
+   * @Function
+   * @param {Object} config - 请求配置项
+   * @prop {String} options.url - 请求路径
+   * @prop {Object} options.data - 请求参数
+   * @prop {Object} [options.responseType = config.responseType] [text|arraybuffer] - 响应的数据类型
+   * @prop {Object} [options.dataType = config.dataType] - 如果设为 json，会尝试对返回的数据做一次 JSON.parse
+   * @prop {Object} [options.header = config.header] - 请求header
+   * @prop {Object} [options.method = config.method] - 请求方法
+   * @returns {Promise<unknown>}
+   */
+  request(config = {}) {
+    return this.middleware(config)
+  }
+
+  get(url, options = {}) {
+    return this.middleware({
+      url,
+      method: 'GET',
+      ...options
+    })
+  }
+
+  post(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'POST',
+      ...options
+    })
+  }
+
+  // #ifndef MP-ALIPAY
+  put(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'PUT',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU
+  delete(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'DELETE',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef H5 || MP-WEIXIN
+  connect(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'CONNECT',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef  H5 || MP-WEIXIN || MP-BAIDU
+  head(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'HEAD',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU
+  options(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'OPTIONS',
+      ...options
+    })
+  }
+
+  // #endif
+
+  // #ifdef H5 || MP-WEIXIN
+  trace(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'TRACE',
+      ...options
+    })
+  }
+
+  // #endif
+
+  upload(url, config = {}) {
+    config.url = url
+    config.method = 'UPLOAD'
+    return this.middleware(config)
+  }
+
+  download(url, config = {}) {
+    config.url = url
+    config.method = 'DOWNLOAD'
+    return this.middleware(config)
+  }
+}
+
+
+/**
+ * setConfig回调
+ * @return {Object} - 返回操作后的config
+ * @callback Request~setConfigCallback
+ * @param {Object} config - 全局默认config
+ */
diff --git a/tuniao-ui/libs/luch-request/core/buildFullPath.js b/tuniao-ui/libs/luch-request/core/buildFullPath.js
new file mode 100644
index 0000000..f2852f4
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/core/buildFullPath.js
@@ -0,0 +1,20 @@
+'use strict'
+
+import isAbsoluteURL from '../helpers/isAbsoluteURL'
+import combineURLs from '../helpers/combineURLs'
+
+/**
+ * Creates a new URL by combining the baseURL with the requestedURL,
+ * only when the requestedURL is not already an absolute URL.
+ * If the requestURL is absolute, this function returns the requestedURL untouched.
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} requestedURL Absolute or relative URL to combine
+ * @returns {string} The combined full path
+ */
+export default function buildFullPath(baseURL, requestedURL) {
+  if (baseURL && !isAbsoluteURL(requestedURL)) {
+    return combineURLs(baseURL, requestedURL)
+  }
+  return requestedURL
+}
diff --git a/tuniao-ui/libs/luch-request/core/defaults.js b/tuniao-ui/libs/luch-request/core/defaults.js
new file mode 100644
index 0000000..38afc3a
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/core/defaults.js
@@ -0,0 +1,30 @@
+/**
+ * 默认的全局配置
+ */
+
+
+export default {
+  baseURL: '',
+  header: {},
+  method: 'GET',
+  dataType: 'json',
+  // #ifndef MP-ALIPAY
+  responseType: 'text',
+  // #endif
+  custom: {},
+  // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+  timeout: 60000,
+  // #endif
+  // #ifdef APP-PLUS
+  sslVerify: true,
+  // #endif
+  // #ifdef H5
+  withCredentials: false,
+  // #endif
+  // #ifdef APP-PLUS
+  firstIpv4: false,
+  // #endif
+  validateStatus: function validateStatus(status) {
+    return status >= 200 && status < 300
+  }
+}
diff --git a/tuniao-ui/libs/luch-request/core/dispatchRequest.js b/tuniao-ui/libs/luch-request/core/dispatchRequest.js
new file mode 100644
index 0000000..c5f2c85
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/core/dispatchRequest.js
@@ -0,0 +1,6 @@
+import adapter from '../adapters/index'
+
+
+export default (config) => {
+  return adapter(config)
+}
diff --git a/tuniao-ui/libs/luch-request/core/mergeConfig.js b/tuniao-ui/libs/luch-request/core/mergeConfig.js
new file mode 100644
index 0000000..a3ccbf7
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/core/mergeConfig.js
@@ -0,0 +1,103 @@
+import {deepMerge, isUndefined} from '../utils'
+
+/**
+ * 合并局部配置优先的配置，如果局部有该配置项则用局部，如果全局有该配置项则用全局
+ * @param {Array} keys - 配置项
+ * @param {Object} globalsConfig - 当前的全局配置
+ * @param {Object} config2 - 局部配置
+ * @return {{}}
+ */
+const mergeKeys = (keys, globalsConfig, config2) => {
+  let config = {}
+  keys.forEach(prop => {
+    if (!isUndefined(config2[prop])) {
+      config[prop] = config2[prop]
+    } else if (!isUndefined(globalsConfig[prop])) {
+      config[prop] = globalsConfig[prop]
+    }
+  })
+  return config
+}
+/**
+ *
+ * @param globalsConfig - 当前实例的全局配置
+ * @param config2 - 当前的局部配置
+ * @return - 合并后的配置
+ */
+export default (globalsConfig, config2 = {}) => {
+  const method = config2.method || globalsConfig.method || 'GET'
+  let config = {
+    baseURL: globalsConfig.baseURL || '',
+    method: method,
+    url: config2.url || '',
+    params: config2.params || {},
+    custom: {...(globalsConfig.custom || {}), ...(config2.custom || {})},
+    header: deepMerge(globalsConfig.header || {}, config2.header || {})
+  }
+  const defaultToConfig2Keys = ['getTask', 'validateStatus']
+  config = {...config, ...mergeKeys(defaultToConfig2Keys, globalsConfig, config2)}
+
+  // eslint-disable-next-line no-empty
+  if (method === 'DOWNLOAD') {
+    // #ifdef H5 || APP-PLUS
+    if (!isUndefined(config2.timeout)) {
+      config['timeout'] = config2['timeout']
+    } else if (!isUndefined(globalsConfig.timeout)) {
+      config['timeout'] = globalsConfig['timeout']
+    }
+    // #endif
+  } else if (method === 'UPLOAD') {
+    delete config.header['content-type']
+    delete config.header['Content-Type']
+    const uploadKeys = [
+      // #ifdef APP-PLUS || H5
+      'files',
+      // #endif
+      // #ifdef MP-ALIPAY
+      'fileType',
+      // #endif
+      // #ifdef H5
+      'file',
+      // #endif
+      'filePath',
+      'name',
+      // #ifdef H5 || APP-PLUS
+      'timeout',
+      // #endif
+      'formData',
+    ]
+    uploadKeys.forEach(prop => {
+      if (!isUndefined(config2[prop])) {
+        config[prop] = config2[prop]
+      }
+    })
+    // #ifdef H5 || APP-PLUS
+    if (isUndefined(config.timeout) && !isUndefined(globalsConfig.timeout)) {
+      config['timeout'] = globalsConfig['timeout']
+    }
+    // #endif
+  } else {
+    const defaultsKeys = [
+      'data',
+      // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+      'timeout',
+      // #endif
+      'dataType',
+      // #ifndef MP-ALIPAY
+      'responseType',
+      // #endif
+      // #ifdef APP-PLUS
+      'sslVerify',
+      // #endif
+      // #ifdef H5
+      'withCredentials',
+      // #endif
+      // #ifdef APP-PLUS
+      'firstIpv4',
+      // #endif
+    ]
+    config = {...config, ...mergeKeys(defaultsKeys, globalsConfig, config2)}
+  }
+
+  return config
+}
diff --git a/tuniao-ui/libs/luch-request/core/settle.js b/tuniao-ui/libs/luch-request/core/settle.js
new file mode 100644
index 0000000..b2f1659
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/core/settle.js
@@ -0,0 +1,16 @@
+/**
+ * Resolve or reject a Promise based on response status.
+ *
+ * @param {Function} resolve A function that resolves the promise.
+ * @param {Function} reject A function that rejects the promise.
+ * @param {object} response The response.
+ */
+export default function settle(resolve, reject, response) {
+  const validateStatus = response.config.validateStatus
+  const status = response.statusCode
+  if (status && (!validateStatus || validateStatus(status))) {
+    resolve(response)
+  } else {
+    reject(response)
+  }
+}
diff --git a/tuniao-ui/libs/luch-request/helpers/buildURL.js b/tuniao-ui/libs/luch-request/helpers/buildURL.js
new file mode 100644
index 0000000..d26dc30
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/helpers/buildURL.js
@@ -0,0 +1,69 @@
+'use strict'
+
+import * as utils from './../utils'
+
+function encode(val) {
+  return encodeURIComponent(val).
+    replace(/%40/gi, '@').
+    replace(/%3A/gi, ':').
+    replace(/%24/g, '$').
+    replace(/%2C/gi, ',').
+    replace(/%20/g, '+').
+    replace(/%5B/gi, '[').
+    replace(/%5D/gi, ']')
+}
+
+/**
+ * Build a URL by appending params to the end
+ *
+ * @param {string} url The base of the url (e.g., http://www.google.com)
+ * @param {object} [params] The params to be appended
+ * @returns {string} The formatted url
+ */
+export default function buildURL(url, params) {
+  /*eslint no-param-reassign:0*/
+  if (!params) {
+    return url
+  }
+
+  var serializedParams
+  if (utils.isURLSearchParams(params)) {
+    serializedParams = params.toString()
+  } else {
+    var parts = []
+
+    utils.forEach(params, function serialize(val, key) {
+      if (val === null || typeof val === 'undefined') {
+        return
+      }
+
+      if (utils.isArray(val)) {
+        key = key + '[]'
+      } else {
+        val = [val]
+      }
+
+      utils.forEach(val, function parseValue(v) {
+        if (utils.isDate(v)) {
+          v = v.toISOString()
+        } else if (utils.isObject(v)) {
+          v = JSON.stringify(v)
+        }
+        parts.push(encode(key) + '=' + encode(v))
+      })
+    })
+
+    serializedParams = parts.join('&')
+  }
+
+  if (serializedParams) {
+    var hashmarkIndex = url.indexOf('#')
+    if (hashmarkIndex !== -1) {
+      url = url.slice(0, hashmarkIndex)
+    }
+
+    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams
+  }
+
+  return url
+}
diff --git a/tuniao-ui/libs/luch-request/helpers/combineURLs.js b/tuniao-ui/libs/luch-request/helpers/combineURLs.js
new file mode 100644
index 0000000..7b9d1ef
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/helpers/combineURLs.js
@@ -0,0 +1,14 @@
+'use strict'
+
+/**
+ * Creates a new URL by combining the specified URLs
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} relativeURL The relative URL
+ * @returns {string} The combined URL
+ */
+export default function combineURLs(baseURL, relativeURL) {
+  return relativeURL
+    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
+    : baseURL
+}
diff --git a/tuniao-ui/libs/luch-request/helpers/isAbsoluteURL.js b/tuniao-ui/libs/luch-request/helpers/isAbsoluteURL.js
new file mode 100644
index 0000000..2a82517
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/helpers/isAbsoluteURL.js
@@ -0,0 +1,14 @@
+'use strict'
+
+/**
+ * Determines whether the specified URL is absolute
+ *
+ * @param {string} url The URL to test
+ * @returns {boolean} True if the specified URL is absolute, otherwise false
+ */
+export default function isAbsoluteURL(url) {
+  // A URL is considered absolute if it begins with "<scheme>://" or "//" (protocol-relative URL).
+  // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed
+  // by any combination of letters, digits, plus, period, or hyphen.
+  return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url)
+}
diff --git a/tuniao-ui/libs/luch-request/index.d.ts b/tuniao-ui/libs/luch-request/index.d.ts
new file mode 100644
index 0000000..e939ce1
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/index.d.ts
@@ -0,0 +1,116 @@
+type AnyObject = Record<string | number | symbol, any>
+type HttpPromise<T> = Promise<HttpResponse<T>>;
+type Tasks = UniApp.RequestTask | UniApp.UploadTask | UniApp.DownloadTask
+export interface RequestTask {
+  abort: () => void;
+  offHeadersReceived: () => void;
+  onHeadersReceived: () => void;
+}
+export interface HttpRequestConfig<T = Tasks> {
+  /** 请求基地址 */
+  baseURL?: string;
+  /** 请求服务器接口地址 */
+  url?: string;
+
+  /** 请求查询参数，自动拼接为查询字符串 */
+  params?: AnyObject;
+  /** 请求体参数 */
+  data?: AnyObject;
+
+  /** 文件对应的 key */
+  name?: string;
+  /** HTTP 请求中其他额外的 form data */
+  formData?: AnyObject;
+  /** 要上传文件资源的路径。 */
+  filePath?: string;
+  /** 需要上传的文件列表。使用 files 时，filePath 和 name 不生效，App、H5（ 2.6.15+） */
+  files?: Array<{
+    name?: string;
+    file?: File;
+    uri: string;
+  }>;
+  /** 要上传的文件对象，仅H5（2.6.15+）支持 */
+  file?: File;
+
+  /** 请求头信息 */
+  header?: AnyObject;
+  /** 请求方式 */
+  method?: "GET" | "POST" | "PUT" | "DELETE" | "CONNECT" | "HEAD" | "OPTIONS" | "TRACE" | "UPLOAD" | "DOWNLOAD";
+  /** 如果设为 json，会尝试对返回的数据做一次 JSON.parse */
+  dataType?: string;
+  /** 设置响应的数据类型，支付宝小程序不支持 */
+  responseType?: "text" | "arraybuffer";
+  /** 自定义参数 */
+  custom?: AnyObject;
+  /** 超时时间，仅微信小程序（2.10.0）、支付宝小程序支持 */
+  timeout?: number;
+  /** DNS解析时优先使用ipv4，仅 App-Android 支持 (HBuilderX 2.8.0+) */
+  firstIpv4?: boolean;
+  /** 验证 ssl 证书 仅5+App安卓端支持（HBuilderX 2.3.3+） */
+  sslVerify?: boolean;
+  /** 跨域请求时是否携带凭证（cookies）仅H5支持（HBuilderX 2.6.15+） */
+  withCredentials?: boolean;
+
+  /** 返回当前请求的task, options。请勿在此处修改options。 */
+  getTask?: (task: T, options: HttpRequestConfig<T>) => void;
+  /**  全局自定义验证器 */
+  validateStatus?: (statusCode: number) => boolean | void;
+}
+export interface HttpResponse<T = any> {
+  config: HttpRequestConfig;
+  statusCode: number;
+  cookies: Array<string>;
+  data: T;
+  errMsg: string;
+  header: AnyObject;
+}
+export interface HttpUploadResponse<T = any> {
+  config: HttpRequestConfig;
+  statusCode: number;
+  data: T;
+  errMsg: string;
+}
+export interface HttpDownloadResponse extends HttpResponse {
+  tempFilePath: string;
+}
+export interface HttpError {
+  config: HttpRequestConfig;
+  statusCode?: number;
+  cookies?: Array<string>;
+  data?: any;
+  errMsg: string;
+  header?: AnyObject;
+}
+export interface HttpInterceptorManager<V, E = V> {
+  use(
+    onFulfilled?: (config: V) => Promise<V> | V,
+    onRejected?: (config: E) => Promise<E> | E
+  ): void;
+  eject(id: number): void;
+}
+export abstract class HttpRequestAbstract {
+  constructor(config?: HttpRequestConfig);
+  config: HttpRequestConfig;
+  interceptors: {
+    request: HttpInterceptorManager<HttpRequestConfig, HttpRequestConfig>;
+    response: HttpInterceptorManager<HttpResponse, HttpError>;
+  }
+  middleware<T = any>(config: HttpRequestConfig): HttpPromise<T>;
+  request<T = any>(config: HttpRequestConfig<UniApp.RequestTask>): HttpPromise<T>;
+  get<T = any>(url: string, config?: HttpRequestConfig<UniApp.RequestTask>): HttpPromise<T>;
+  upload<T = any>(url: string, config?: HttpRequestConfig<UniApp.UploadTask>): HttpPromise<T>;
+  delete<T = any>(url: string, data?: AnyObject, config?: HttpRequestConfig<UniApp.RequestTask>): HttpPromise<T>;
+  head<T = any>(url: string, data?: AnyObject, config?: HttpRequestConfig<UniApp.RequestTask>): HttpPromise<T>;
+  post<T = any>(url: string, data?: AnyObject, config?: HttpRequestConfig<UniApp.RequestTask>): HttpPromise<T>;
+  put<T = any>(url: string, data?: AnyObject, config?: HttpRequestConfig<UniApp.RequestTask>): HttpPromise<T>;
+  connect<T = any>(url: string, data?: AnyObject, config?: HttpRequestConfig<UniApp.RequestTask>): HttpPromise<T>;
+  options<T = any>(url: string, data?: AnyObject, config?: HttpRequestConfig<UniApp.RequestTask>): HttpPromise<T>;
+  trace<T = any>(url: string, data?: AnyObject, config?: HttpRequestConfig<UniApp.RequestTask>): HttpPromise<T>;
+
+  download(url: string, config?: HttpRequestConfig<UniApp.DownloadTask>): Promise<HttpDownloadResponse>;
+
+  setConfig(onSend: (config: HttpRequestConfig) => HttpRequestConfig): void;
+}
+
+declare class HttpRequest extends HttpRequestAbstract { }
+export default HttpRequest;
diff --git a/tuniao-ui/libs/luch-request/index.js b/tuniao-ui/libs/luch-request/index.js
new file mode 100644
index 0000000..d8fe348
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/index.js
@@ -0,0 +1,2 @@
+import Request from './core/Request'
+export default Request
diff --git a/tuniao-ui/libs/luch-request/utils.js b/tuniao-ui/libs/luch-request/utils.js
new file mode 100644
index 0000000..0b5bf21
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/utils.js
@@ -0,0 +1,135 @@
+'use strict'
+
+// utils is a library of generic helper functions non-specific to axios
+
+var toString = Object.prototype.toString
+
+/**
+ * Determine if a value is an Array
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Array, otherwise false
+ */
+export function isArray (val) {
+  return toString.call(val) === '[object Array]'
+}
+
+
+/**
+ * Determine if a value is an Object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Object, otherwise false
+ */
+export function isObject (val) {
+  return val !== null && typeof val === 'object'
+}
+
+/**
+ * Determine if a value is a Date
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Date, otherwise false
+ */
+export function isDate (val) {
+  return toString.call(val) === '[object Date]'
+}
+
+/**
+ * Determine if a value is a URLSearchParams object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a URLSearchParams object, otherwise false
+ */
+export function isURLSearchParams (val) {
+  return typeof URLSearchParams !== 'undefined' && val instanceof URLSearchParams
+}
+
+
+/**
+ * Iterate over an Array or an Object invoking a function for each item.
+ *
+ * If `obj` is an Array callback will be called passing
+ * the value, index, and complete array for each item.
+ *
+ * If 'obj' is an Object callback will be called passing
+ * the value, key, and complete object for each property.
+ *
+ * @param {Object|Array} obj The object to iterate
+ * @param {Function} fn The callback to invoke for each item
+ */
+export function forEach (obj, fn) {
+  // Don't bother if no value provided
+  if (obj === null || typeof obj === 'undefined') {
+    return
+  }
+
+  // Force an array if not already something iterable
+  if (typeof obj !== 'object') {
+    /*eslint no-param-reassign:0*/
+    obj = [obj]
+  }
+
+  if (isArray(obj)) {
+    // Iterate over array values
+    for (var i = 0, l = obj.length; i < l; i++) {
+      fn.call(null, obj[i], i, obj)
+    }
+  } else {
+    // Iterate over object keys
+    for (var key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        fn.call(null, obj[key], key, obj)
+      }
+    }
+  }
+}
+
+/**
+ * 是否为boolean 值
+ * @param val
+ * @returns {boolean}
+ */
+export function isBoolean(val) {
+  return typeof val === 'boolean'
+}
+
+/**
+ * 是否为真正的对象{} new Object
+ * @param {any} obj - 检测的对象
+ * @returns {boolean}
+ */
+export function isPlainObject(obj) {
+  return Object.prototype.toString.call(obj) === '[object Object]'
+}
+
+
+
+/**
+ * Function equal to merge with the difference being that no reference
+ * to original objects is kept.
+ *
+ * @see merge
+ * @param {Object} obj1 Object to merge
+ * @returns {Object} Result of all merge properties
+ */
+export function deepMerge(/* obj1, obj2, obj3, ... */) {
+  let result = {}
+  function assignValue(val, key) {
+    if (typeof result[key] === 'object' && typeof val === 'object') {
+      result[key] = deepMerge(result[key], val)
+    } else if (typeof val === 'object') {
+      result[key] = deepMerge({}, val)
+    } else {
+      result[key] = val
+    }
+  }
+  for (let i = 0, l = arguments.length; i < l; i++) {
+    forEach(arguments[i], assignValue)
+  }
+  return result
+}
+
+export function isUndefined (val) {
+  return typeof val === 'undefined'
+}
diff --git a/tuniao-ui/libs/luch-request/utils/clone.js b/tuniao-ui/libs/luch-request/utils/clone.js
new file mode 100644
index 0000000..2fee704
--- /dev/null
+++ b/tuniao-ui/libs/luch-request/utils/clone.js
@@ -0,0 +1,264 @@
+/* eslint-disable */
+var clone = (function() {
+  'use strict';
+
+  function _instanceof(obj, type) {
+    return type != null && obj instanceof type;
+  }
+
+  var nativeMap;
+  try {
+    nativeMap = Map;
+  } catch(_) {
+    // maybe a reference error because no `Map`. Give it a dummy value that no
+    // value will ever be an instanceof.
+    nativeMap = function() {};
+  }
+
+  var nativeSet;
+  try {
+    nativeSet = Set;
+  } catch(_) {
+    nativeSet = function() {};
+  }
+
+  var nativePromise;
+  try {
+    nativePromise = Promise;
+  } catch(_) {
+    nativePromise = function() {};
+  }
+
+  /**
+   * Clones (copies) an Object using deep copying.
+   *
+   * This function supports circular references by default, but if you are certain
+   * there are no circular references in your object, you can save some CPU time
+   * by calling clone(obj, false).
+   *
+   * Caution: if `circular` is false and `parent` contains circular references,
+   * your program may enter an infinite loop and crash.
+   *
+   * @param `parent` - the object to be cloned
+   * @param `circular` - set to true if the object to be cloned may contain
+   *    circular references. (optional - true by default)
+   * @param `depth` - set to a number if the object is only to be cloned to
+   *    a particular depth. (optional - defaults to Infinity)
+   * @param `prototype` - sets the prototype to be used when cloning an object.
+   *    (optional - defaults to parent prototype).
+   * @param `includeNonEnumerable` - set to true if the non-enumerable properties
+   *    should be cloned as well. Non-enumerable properties on the prototype
+   *    chain will be ignored. (optional - false by default)
+   */
+  function clone(parent, circular, depth, prototype, includeNonEnumerable) {
+    if (typeof circular === 'object') {
+      depth = circular.depth;
+      prototype = circular.prototype;
+      includeNonEnumerable = circular.includeNonEnumerable;
+      circular = circular.circular;
+    }
+    // maintain two arrays for circular references, where corresponding parents
+    // and children have the same index
+    var allParents = [];
+    var allChildren = [];
+
+    var useBuffer = typeof Buffer != 'undefined';
+
+    if (typeof circular == 'undefined')
+      circular = true;
+
+    if (typeof depth == 'undefined')
+      depth = Infinity;
+
+    // recurse this function so we don't reset allParents and allChildren
+    function _clone(parent, depth) {
+      // cloning null always returns null
+      if (parent === null)
+        return null;
+
+      if (depth === 0)
+        return parent;
+
+      var child;
+      var proto;
+      if (typeof parent != 'object') {
+        return parent;
+      }
+
+      if (_instanceof(parent, nativeMap)) {
+        child = new nativeMap();
+      } else if (_instanceof(parent, nativeSet)) {
+        child = new nativeSet();
+      } else if (_instanceof(parent, nativePromise)) {
+        child = new nativePromise(function (resolve, reject) {
+          parent.then(function(value) {
+            resolve(_clone(value, depth - 1));
+          }, function(err) {
+            reject(_clone(err, depth - 1));
+          });
+        });
+      } else if (clone.__isArray(parent)) {
+        child = [];
+      } else if (clone.__isRegExp(parent)) {
+        child = new RegExp(parent.source, __getRegExpFlags(parent));
+        if (parent.lastIndex) child.lastIndex = parent.lastIndex;
+      } else if (clone.__isDate(parent)) {
+        child = new Date(parent.getTime());
+      } else if (useBuffer && Buffer.isBuffer(parent)) {
+        if (Buffer.from) {
+          // Node.js >= 5.10.0
+          child = Buffer.from(parent);
+        } else {
+          // Older Node.js versions
+          child = new Buffer(parent.length);
+          parent.copy(child);
+        }
+        return child;
+      } else if (_instanceof(parent, Error)) {
+        child = Object.create(parent);
+      } else {
+        if (typeof prototype == 'undefined') {
+          proto = Object.getPrototypeOf(parent);
+          child = Object.create(proto);
+        }
+        else {
+          child = Object.create(prototype);
+          proto = prototype;
+        }
+      }
+
+      if (circular) {
+        var index = allParents.indexOf(parent);
+
+        if (index != -1) {
+          return allChildren[index];
+        }
+        allParents.push(parent);
+        allChildren.push(child);
+      }
+
+      if (_instanceof(parent, nativeMap)) {
+        parent.forEach(function(value, key) {
+          var keyChild = _clone(key, depth - 1);
+          var valueChild = _clone(value, depth - 1);
+          child.set(keyChild, valueChild);
+        });
+      }
+      if (_instanceof(parent, nativeSet)) {
+        parent.forEach(function(value) {
+          var entryChild = _clone(value, depth - 1);
+          child.add(entryChild);
+        });
+      }
+
+      for (var i in parent) {
+        var attrs = Object.getOwnPropertyDescriptor(parent, i);
+        if (attrs) {
+          child[i] = _clone(parent[i], depth - 1);
+        }
+
+        try {
+          var objProperty = Object.getOwnPropertyDescriptor(parent, i);
+          if (objProperty.set === 'undefined') {
+            // no setter defined. Skip cloning this property
+            continue;
+          }
+          child[i] = _clone(parent[i], depth - 1);
+        } catch(e){
+          if (e instanceof TypeError) {
+            // when in strict mode, TypeError will be thrown if child[i] property only has a getter
+            // we can't do anything about this, other than inform the user that this property cannot be set.
+            continue
+          } else if (e instanceof ReferenceError) {
+            //this may happen in non strict mode
+            continue
+          }
+        }
+
+      }
+
+      if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(parent);
+        for (var i = 0; i < symbols.length; i++) {
+          // Don't need to worry about cloning a symbol because it is a primitive,
+          // like a number or string.
+          var symbol = symbols[i];
+          var descriptor = Object.getOwnPropertyDescriptor(parent, symbol);
+          if (descriptor && !descriptor.enumerable && !includeNonEnumerable) {
+            continue;
+          }
+          child[symbol] = _clone(parent[symbol], depth - 1);
+          Object.defineProperty(child, symbol, descriptor);
+        }
+      }
+
+      if (includeNonEnumerable) {
+        var allPropertyNames = Object.getOwnPropertyNames(parent);
+        for (var i = 0; i < allPropertyNames.length; i++) {
+          var propertyName = allPropertyNames[i];
+          var descriptor = Object.getOwnPropertyDescriptor(parent, propertyName);
+          if (descriptor && descriptor.enumerable) {
+            continue;
+          }
+          child[propertyName] = _clone(parent[propertyName], depth - 1);
+          Object.defineProperty(child, propertyName, descriptor);
+        }
+      }
+
+      return child;
+    }
+
+    return _clone(parent, depth);
+  }
+
+  /**
+   * Simple flat clone using prototype, accepts only objects, usefull for property
+   * override on FLAT configuration object (no nested props).
+   *
+   * USE WITH CAUTION! This may not behave as you wish if you do not know how this
+   * works.
+   */
+  clone.clonePrototype = function clonePrototype(parent) {
+    if (parent === null)
+      return null;
+
+    var c = function () {};
+    c.prototype = parent;
+    return new c();
+  };
+
+// private utility functions
+
+  function __objToStr(o) {
+    return Object.prototype.toString.call(o);
+  }
+  clone.__objToStr = __objToStr;
+
+  function __isDate(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object Date]';
+  }
+  clone.__isDate = __isDate;
+
+  function __isArray(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object Array]';
+  }
+  clone.__isArray = __isArray;
+
+  function __isRegExp(o) {
+    return typeof o === 'object' && __objToStr(o) === '[object RegExp]';
+  }
+  clone.__isRegExp = __isRegExp;
+
+  function __getRegExpFlags(re) {
+    var flags = '';
+    if (re.global) flags += 'g';
+    if (re.ignoreCase) flags += 'i';
+    if (re.multiline) flags += 'm';
+    return flags;
+  }
+  clone.__getRegExpFlags = __getRegExpFlags;
+
+  return clone;
+})();
+
+export default clone
diff --git a/tuniao-ui/libs/mixin/components_color.js b/tuniao-ui/libs/mixin/components_color.js
new file mode 100644
index 0000000..4cda18a
--- /dev/null
+++ b/tuniao-ui/libs/mixin/components_color.js
@@ -0,0 +1,47 @@
+module.exports = {
+  data() {
+    
+  },
+  props: {
+    // 背景颜色
+    backgroundColor: {
+      type: String,
+      default: ''
+    },
+    // 字体颜色
+    fontColor: {
+      type: String,
+      default: ''
+    },
+    // 字体大小
+    fontSize: {
+      type: Number,
+      default: 0
+    },
+    // 字体大小单位
+    fontUnit: {
+      type: String,
+      default: 'rpx'
+    }
+  },
+  computed: {
+    backgroundColorStyle() {
+      return this.$tn.color.getBackgroundColorStyle(this.backgroundColor)
+    },
+    backgroundColorClass() {
+      return this.$tn.color.getBackgroundColorInternalClass(this.backgroundColor)
+    },
+    fontColorStyle() {
+      return this.$tn.color.getFontColorStyle(this.fontColor)
+    },
+    fontColorClass() {
+      return this.$tn.color.getFontColorInternalClass(this.fontColor)
+    },
+    fontSizeStyle() {
+      return this.$tn.string.getLengthUnitValue(this.fontSize, this.fontUnit)
+    }
+  },
+  methods: {
+    
+  }
+}
\ No newline at end of file
diff --git a/tuniao-ui/libs/mixin/mixin.js b/tuniao-ui/libs/mixin/mixin.js
new file mode 100644
index 0000000..1110dde
--- /dev/null
+++ b/tuniao-ui/libs/mixin/mixin.js
@@ -0,0 +1,68 @@
+module.exports = {
+  data() {
+    return {}
+  },
+  onLoad() {
+    // getRect挂载再$t上，用为这个方法需要使用in（this），所以无法把它独立层一个单独的文件导出
+    this.$tn.getRect = this._tGetRect
+  },
+  beforeDestory() {
+    // 判断当前页面是否存在parent和children
+    // 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱
+    if (this.parent && uni.$tn.test.array(this.parent.children)) {
+      // 组件销毁时，移除子组件在父组件children数组中的实例
+      const childrenList = this.parent.children
+      childrenList.map((child, index) => {
+        // 如果相对，则移除
+        if (child === this) {
+          childrenList.splice(index, 1)
+        }
+      })
+    }
+  },
+  methods: {
+    /**
+     * 查询节点信息
+     * 当前方法在支付宝小程序中无法获取组件跟接点的尺寸
+     * 解决办法：为组件根部再套一个没有任何作用的view元素
+     */
+    _tGetRect(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
+      // 通过获取父组件实例
+      // 将父组件this中对应的参数，赋值给本组件的parentData对象中对应的属性
+      // 头条小程序不支持通过this.parent.xxx去监听父组件参数的变化，所以需要本方法进行实现
+      this.parent = this.$tn.$parent.call(this, parentName)
+      if (this.parent) {
+        // 遍历parentData中的属性，将parent中同名的属性赋值给parentData
+        Object.keys(this.parentData).map(key => {
+          this.parentData[key] = this.parent[key]
+        })
+      }
+    },
+    /**
+     * 阻止事件冒泡
+     */
+    preventEvent(e) {
+      e && e.stopPropagation && e.stopPropagation()
+    }
+  }
+}
\ No newline at end of file
diff --git a/tuniao-ui/libs/mixin/mpShare.js b/tuniao-ui/libs/mixin/mpShare.js
new file mode 100644
index 0000000..b1ae33f
--- /dev/null
+++ b/tuniao-ui/libs/mixin/mpShare.js
@@ -0,0 +1,30 @@
+module.exports = {
+  onLoad() {
+    // 设置默认的转发参数
+    this.$tn.mpShare = {
+      // 分享的标题，默认为小程序名称
+      title: '',
+      // 分享的路径，默认为当前页面
+      path: '',
+      // 分享时显示的图片，默认为当前页面截图
+      imageUrl: '',
+      // 当前页面是否可以分享
+      share: true
+    }
+    if (!this.$tn.mpShare.share) {
+      uni.hideShareMenu()
+    }
+  },
+  onShareAppMessage() {
+    return this.$tn.mpShare
+  },
+  // #ifdef MP-WEIXIN
+  onShareTimeline() {
+    return {
+      title: this.$tn.mpShare.title,
+      query: this.$tn.mpShare.path.substring(this.$tn.mpShare.path.indexOf('?') + 1, this.$tn.mpShare.path.length),
+      imageUrl: this.$tn.mpShare.imageUrl
+    }
+  }
+  // #endif
+}
\ No newline at end of file
diff --git a/tuniao-ui/libs/mixin/touch.js b/tuniao-ui/libs/mixin/touch.js
new file mode 100644
index 0000000..a77445f
--- /dev/null
+++ b/tuniao-ui/libs/mixin/touch.js
@@ -0,0 +1,61 @@
+const MIN_DISTANCE = 10
+
+function getDirection(x, y) {
+  if (x > y && x > MIN_DISTANCE) {
+    return 'horizontal'
+  }
+  if (y > x && y > MIN_DISTANCE) {
+    return 'vertical'
+  }
+  return ''
+}
+
+export default {
+  methods: {
+    touchStart(e) {
+      this.resetTouchStatus()
+      const touch = this.getTouchPoint(e)
+      this.startX = touch.x
+      this.startY = touch.y
+    },
+    touchMove(e) {
+      const touch = this.getTouchPoint(e)
+      this.deltaX = touch.x - this.startX
+      this.deltaY = touch.y - this.startY
+      this.offsetX = Math.abs(this.deltaX)
+      this.offsetY = Math.abs(this.deltaY)
+      this.direction = this.direction || getDirection(this.offsetX, this.offsetY)
+    },
+    getTouchPoint(e) {
+      if (!e) {
+        return {
+          x: 0,
+          y: 0
+        }
+      }
+      if (e.touches && e.touches[0]) {
+        return {
+          x: e.touches[0].pageX,
+          y: e.touches[0].pageY
+        }
+      }
+      if (e.changedTouches && e.changedTouches[0]) {
+        return {
+          x: e.changedTouches[0].pageX,
+          y: e.changedTouches[0].pageY
+        }
+      }
+      return {
+        x: e.clientX || 0,
+        y: e.clientY || 0
+      }
+    },
+    resetTouchStatus() {
+      this.direction = ''
+      this.deltaX = 0
+      this.deltaY = 0
+      this.offsetX = 0
+      this.offsetY = 0
+    }
+  }
+}
\ No newline at end of file
diff --git a/tuniao-ui/libs/utils/area.js b/tuniao-ui/libs/utils/area.js
new file mode 100644
index 0000000..0d602e9
--- /dev/null
+++ b/tuniao-ui/libs/utils/area.js
@@ -0,0 +1 @@
+var areaData=[[[{"label":"东城区","value":"110101"},{"label":"西城区","value":"110102"},{"label":"朝阳区","value":"110105"},{"label":"丰台区","value":"110106"},{"label":"石景山区","value":"110107"},{"label":"海淀区","value":"110108"},{"label":"门头沟区","value":"110109"},{"label":"房山区","value":"110111"},{"label":"通州区","value":"110112"},{"label":"顺义区","value":"110113"},{"label":"昌平区","value":"110114"},{"label":"大兴区","value":"110115"},{"label":"怀柔区","value":"110116"},{"label":"平谷区","value":"110117"},{"label":"密云区","value":"110118"},{"label":"延庆区","value":"110119"}]],[[{"label":"和平区","value":"120101"},{"label":"河东区","value":"120102"},{"label":"河西区","value":"120103"},{"label":"南开区","value":"120104"},{"label":"河北区","value":"120105"},{"label":"红桥区","value":"120106"},{"label":"东丽区","value":"120110"},{"label":"西青区","value":"120111"},{"label":"津南区","value":"120112"},{"label":"北辰区","value":"120113"},{"label":"武清区","value":"120114"},{"label":"宝坻区","value":"120115"},{"label":"滨海新区","value":"120116"},{"label":"宁河区","value":"120117"},{"label":"静海区","value":"120118"},{"label":"蓟州区","value":"120119"}]],[[{"label":"长安区","value":"130102"},{"label":"桥西区","value":"130104"},{"label":"新华区","value":"130105"},{"label":"井陉矿区","value":"130107"},{"label":"裕华区","value":"130108"},{"label":"藁城区","value":"130109"},{"label":"鹿泉区","value":"130110"},{"label":"栾城区","value":"130111"},{"label":"井陉县","value":"130121"},{"label":"正定县","value":"130123"},{"label":"行唐县","value":"130125"},{"label":"灵寿县","value":"130126"},{"label":"高邑县","value":"130127"},{"label":"深泽县","value":"130128"},{"label":"赞皇县","value":"130129"},{"label":"无极县","value":"130130"},{"label":"平山县","value":"130131"},{"label":"元氏县","value":"130132"},{"label":"赵县","value":"130133"},{"label":"石家庄高新技术产业开发区","value":"130171"},{"label":"石家庄循环化工园区","value":"130172"},{"label":"辛集市","value":"130181"},{"label":"晋州市","value":"130183"},{"label":"新乐市","value":"130184"}],[{"label":"路南区","value":"130202"},{"label":"路北区","value":"130203"},{"label":"古冶区","value":"130204"},{"label":"开平区","value":"130205"},{"label":"丰南区","value":"130207"},{"label":"丰润区","value":"130208"},{"label":"曹妃甸区","value":"130209"},{"label":"滦县","value":"130223"},{"label":"滦南县","value":"130224"},{"label":"乐亭县","value":"130225"},{"label":"迁西县","value":"130227"},{"label":"玉田县","value":"130229"},{"label":"唐山市芦台经济技术开发区","value":"130271"},{"label":"唐山市汉沽管理区","value":"130272"},{"label":"唐山高新技术产业开发区","value":"130273"},{"label":"河北唐山海港经济开发区","value":"130274"},{"label":"遵化市","value":"130281"},{"label":"迁安市","value":"130283"}],[{"label":"海港区","value":"130302"},{"label":"山海关区","value":"130303"},{"label":"北戴河区","value":"130304"},{"label":"抚宁区","value":"130306"},{"label":"青龙满族自治县","value":"130321"},{"label":"昌黎县","value":"130322"},{"label":"卢龙县","value":"130324"},{"label":"秦皇岛市经济技术开发区","value":"130371"},{"label":"北戴河新区","value":"130372"}],[{"label":"邯山区","value":"130402"},{"label":"丛台区","value":"130403"},{"label":"复兴区","value":"130404"},{"label":"峰峰矿区","value":"130406"},{"label":"肥乡区","value":"130407"},{"label":"永年区","value":"130408"},{"label":"临漳县","value":"130423"},{"label":"成安县","value":"130424"},{"label":"大名县","value":"130425"},{"label":"涉县","value":"130426"},{"label":"磁县","value":"130427"},{"label":"邱县","value":"130430"},{"label":"鸡泽县","value":"130431"},{"label":"广平县","value":"130432"},{"label":"馆陶县","value":"130433"},{"label":"魏县","value":"130434"},{"label":"曲周县","value":"130435"},{"label":"邯郸经济技术开发区","value":"130471"},{"label":"邯郸冀南新区","value":"130473"},{"label":"武安市","value":"130481"}],[{"label":"桥东区","value":"130502"},{"label":"桥西区","value":"130503"},{"label":"邢台县","value":"130521"},{"label":"临城县","value":"130522"},{"label":"内丘县","value":"130523"},{"label":"柏乡县","value":"130524"},{"label":"隆尧县","value":"130525"},{"label":"任县","value":"130526"},{"label":"南和县","value":"130527"},{"label":"宁晋县","value":"130528"},{"label":"巨鹿县","value":"130529"},{"label":"新河县","value":"130530"},{"label":"广宗县","value":"130531"},{"label":"平乡县","value":"130532"},{"label":"威县","value":"130533"},{"label":"清河县","value":"130534"},{"label":"临西县","value":"130535"},{"label":"河北邢台经济开发区","value":"130571"},{"label":"南宫市","value":"130581"},{"label":"沙河市","value":"130582"}],[{"label":"竞秀区","value":"130602"},{"label":"莲池区","value":"130606"},{"label":"满城区","value":"130607"},{"label":"清苑区","value":"130608"},{"label":"徐水区","value":"130609"},{"label":"涞水县","value":"130623"},{"label":"阜平县","value":"130624"},{"label":"定兴县","value":"130626"},{"label":"唐县","value":"130627"},{"label":"高阳县","value":"130628"},{"label":"容城县","value":"130629"},{"label":"涞源县","value":"130630"},{"label":"望都县","value":"130631"},{"label":"安新县","value":"130632"},{"label":"易县","value":"130633"},{"label":"曲阳县","value":"130634"},{"label":"蠡县","value":"130635"},{"label":"顺平县","value":"130636"},{"label":"博野县","value":"130637"},{"label":"雄县","value":"130638"},{"label":"保定高新技术产业开发区","value":"130671"},{"label":"保定白沟新城","value":"130672"},{"label":"涿州市","value":"130681"},{"label":"定州市","value":"130682"},{"label":"安国市","value":"130683"},{"label":"高碑店市","value":"130684"}],[{"label":"桥东区","value":"130702"},{"label":"桥西区","value":"130703"},{"label":"宣化区","value":"130705"},{"label":"下花园区","value":"130706"},{"label":"万全区","value":"130708"},{"label":"崇礼区","value":"130709"},{"label":"张北县","value":"130722"},{"label":"康保县","value":"130723"},{"label":"沽源县","value":"130724"},{"label":"尚义县","value":"130725"},{"label":"蔚县","value":"130726"},{"label":"阳原县","value":"130727"},{"label":"怀安县","value":"130728"},{"label":"怀来县","value":"130730"},{"label":"涿鹿县","value":"130731"},{"label":"赤城县","value":"130732"},{"label":"张家口市高新技术产业开发区","value":"130771"},{"label":"张家口市察北管理区","value":"130772"},{"label":"张家口市塞北管理区","value":"130773"}],[{"label":"双桥区","value":"130802"},{"label":"双滦区","value":"130803"},{"label":"鹰手营子矿区","value":"130804"},{"label":"承德县","value":"130821"},{"label":"兴隆县","value":"130822"},{"label":"滦平县","value":"130824"},{"label":"隆化县","value":"130825"},{"label":"丰宁满族自治县","value":"130826"},{"label":"宽城满族自治县","value":"130827"},{"label":"围场满族蒙古族自治县","value":"130828"},{"label":"承德高新技术产业开发区","value":"130871"},{"label":"平泉市","value":"130881"}],[{"label":"新华区","value":"130902"},{"label":"运河区","value":"130903"},{"label":"沧县","value":"130921"},{"label":"青县","value":"130922"},{"label":"东光县","value":"130923"},{"label":"海兴县","value":"130924"},{"label":"盐山县","value":"130925"},{"label":"肃宁县","value":"130926"},{"label":"南皮县","value":"130927"},{"label":"吴桥县","value":"130928"},{"label":"献县","value":"130929"},{"label":"孟村回族自治县","value":"130930"},{"label":"河北沧州经济开发区","value":"130971"},{"label":"沧州高新技术产业开发区","value":"130972"},{"label":"沧州渤海新区","value":"130973"},{"label":"泊头市","value":"130981"},{"label":"任丘市","value":"130982"},{"label":"黄骅市","value":"130983"},{"label":"河间市","value":"130984"}],[{"label":"安次区","value":"131002"},{"label":"广阳区","value":"131003"},{"label":"固安县","value":"131022"},{"label":"永清县","value":"131023"},{"label":"香河县","value":"131024"},{"label":"大城县","value":"131025"},{"label":"文安县","value":"131026"},{"label":"大厂回族自治县","value":"131028"},{"label":"廊坊经济技术开发区","value":"131071"},{"label":"霸州市","value":"131081"},{"label":"三河市","value":"131082"}],[{"label":"桃城区","value":"131102"},{"label":"冀州区","value":"131103"},{"label":"枣强县","value":"131121"},{"label":"武邑县","value":"131122"},{"label":"武强县","value":"131123"},{"label":"饶阳县","value":"131124"},{"label":"安平县","value":"131125"},{"label":"故城县","value":"131126"},{"label":"景县","value":"131127"},{"label":"阜城县","value":"131128"},{"label":"河北衡水经济开发区","value":"131171"},{"label":"衡水滨湖新区","value":"131172"},{"label":"深州市","value":"131182"}]],[[{"label":"小店区","value":"140105"},{"label":"迎泽区","value":"140106"},{"label":"杏花岭区","value":"140107"},{"label":"尖草坪区","value":"140108"},{"label":"万柏林区","value":"140109"},{"label":"晋源区","value":"140110"},{"label":"清徐县","value":"140121"},{"label":"阳曲县","value":"140122"},{"label":"娄烦县","value":"140123"},{"label":"山西转型综合改革示范区","value":"140171"},{"label":"古交市","value":"140181"}],[{"label":"城区","value":"140202"},{"label":"矿区","value":"140203"},{"label":"南郊区","value":"140211"},{"label":"新荣区","value":"140212"},{"label":"阳高县","value":"140221"},{"label":"天镇县","value":"140222"},{"label":"广灵县","value":"140223"},{"label":"灵丘县","value":"140224"},{"label":"浑源县","value":"140225"},{"label":"左云县","value":"140226"},{"label":"大同县","value":"140227"},{"label":"山西大同经济开发区","value":"140271"}],[{"label":"城区","value":"140302"},{"label":"矿区","value":"140303"},{"label":"郊区","value":"140311"},{"label":"平定县","value":"140321"},{"label":"盂县","value":"140322"},{"label":"山西阳泉经济开发区","value":"140371"}],[{"label":"城区","value":"140402"},{"label":"郊区","value":"140411"},{"label":"长治县","value":"140421"},{"label":"襄垣县","value":"140423"},{"label":"屯留县","value":"140424"},{"label":"平顺县","value":"140425"},{"label":"黎城县","value":"140426"},{"label":"壶关县","value":"140427"},{"label":"长子县","value":"140428"},{"label":"武乡县","value":"140429"},{"label":"沁县","value":"140430"},{"label":"沁源县","value":"140431"},{"label":"山西长治高新技术产业园区","value":"140471"},{"label":"潞城市","value":"140481"}],[{"label":"城区","value":"140502"},{"label":"沁水县","value":"140521"},{"label":"阳城县","value":"140522"},{"label":"陵川县","value":"140524"},{"label":"泽州县","value":"140525"},{"label":"高平市","value":"140581"}],[{"label":"朔城区","value":"140602"},{"label":"平鲁区","value":"140603"},{"label":"山阴县","value":"140621"},{"label":"应县","value":"140622"},{"label":"右玉县","value":"140623"},{"label":"怀仁县","value":"140624"},{"label":"山西朔州经济开发区","value":"140671"}],[{"label":"榆次区","value":"140702"},{"label":"榆社县","value":"140721"},{"label":"左权县","value":"140722"},{"label":"和顺县","value":"140723"},{"label":"昔阳县","value":"140724"},{"label":"寿阳县","value":"140725"},{"label":"太谷县","value":"140726"},{"label":"祁县","value":"140727"},{"label":"平遥县","value":"140728"},{"label":"灵石县","value":"140729"},{"label":"介休市","value":"140781"}],[{"label":"盐湖区","value":"140802"},{"label":"临猗县","value":"140821"},{"label":"万荣县","value":"140822"},{"label":"闻喜县","value":"140823"},{"label":"稷山县","value":"140824"},{"label":"新绛县","value":"140825"},{"label":"绛县","value":"140826"},{"label":"垣曲县","value":"140827"},{"label":"夏县","value":"140828"},{"label":"平陆县","value":"140829"},{"label":"芮城县","value":"140830"},{"label":"永济市","value":"140881"},{"label":"河津市","value":"140882"}],[{"label":"忻府区","value":"140902"},{"label":"定襄县","value":"140921"},{"label":"五台县","value":"140922"},{"label":"代县","value":"140923"},{"label":"繁峙县","value":"140924"},{"label":"宁武县","value":"140925"},{"label":"静乐县","value":"140926"},{"label":"神池县","value":"140927"},{"label":"五寨县","value":"140928"},{"label":"岢岚县","value":"140929"},{"label":"河曲县","value":"140930"},{"label":"保德县","value":"140931"},{"label":"偏关县","value":"140932"},{"label":"五台山风景名胜区","value":"140971"},{"label":"原平市","value":"140981"}],[{"label":"尧都区","value":"141002"},{"label":"曲沃县","value":"141021"},{"label":"翼城县","value":"141022"},{"label":"襄汾县","value":"141023"},{"label":"洪洞县","value":"141024"},{"label":"古县","value":"141025"},{"label":"安泽县","value":"141026"},{"label":"浮山县","value":"141027"},{"label":"吉县","value":"141028"},{"label":"乡宁县","value":"141029"},{"label":"大宁县","value":"141030"},{"label":"隰县","value":"141031"},{"label":"永和县","value":"141032"},{"label":"蒲县","value":"141033"},{"label":"汾西县","value":"141034"},{"label":"侯马市","value":"141081"},{"label":"霍州市","value":"141082"}],[{"label":"离石区","value":"141102"},{"label":"文水县","value":"141121"},{"label":"交城县","value":"141122"},{"label":"兴县","value":"141123"},{"label":"临县","value":"141124"},{"label":"柳林县","value":"141125"},{"label":"石楼县","value":"141126"},{"label":"岚县","value":"141127"},{"label":"方山县","value":"141128"},{"label":"中阳县","value":"141129"},{"label":"交口县","value":"141130"},{"label":"孝义市","value":"141181"},{"label":"汾阳市","value":"141182"}]],[[{"label":"新城区","value":"150102"},{"label":"回民区","value":"150103"},{"label":"玉泉区","value":"150104"},{"label":"赛罕区","value":"150105"},{"label":"土默特左旗","value":"150121"},{"label":"托克托县","value":"150122"},{"label":"和林格尔县","value":"150123"},{"label":"清水河县","value":"150124"},{"label":"武川县","value":"150125"},{"label":"呼和浩特金海工业园区","value":"150171"},{"label":"呼和浩特经济技术开发区","value":"150172"}],[{"label":"东河区","value":"150202"},{"label":"昆都仑区","value":"150203"},{"label":"青山区","value":"150204"},{"label":"石拐区","value":"150205"},{"label":"白云鄂博矿区","value":"150206"},{"label":"九原区","value":"150207"},{"label":"土默特右旗","value":"150221"},{"label":"固阳县","value":"150222"},{"label":"达尔罕茂明安联合旗","value":"150223"},{"label":"包头稀土高新技术产业开发区","value":"150271"}],[{"label":"海勃湾区","value":"150302"},{"label":"海南区","value":"150303"},{"label":"乌达区","value":"150304"}],[{"label":"红山区","value":"150402"},{"label":"元宝山区","value":"150403"},{"label":"松山区","value":"150404"},{"label":"阿鲁科尔沁旗","value":"150421"},{"label":"巴林左旗","value":"150422"},{"label":"巴林右旗","value":"150423"},{"label":"林西县","value":"150424"},{"label":"克什克腾旗","value":"150425"},{"label":"翁牛特旗","value":"150426"},{"label":"喀喇沁旗","value":"150428"},{"label":"宁城县","value":"150429"},{"label":"敖汉旗","value":"150430"}],[{"label":"科尔沁区","value":"150502"},{"label":"科尔沁左翼中旗","value":"150521"},{"label":"科尔沁左翼后旗","value":"150522"},{"label":"开鲁县","value":"150523"},{"label":"库伦旗","value":"150524"},{"label":"奈曼旗","value":"150525"},{"label":"扎鲁特旗","value":"150526"},{"label":"通辽经济技术开发区","value":"150571"},{"label":"霍林郭勒市","value":"150581"}],[{"label":"东胜区","value":"150602"},{"label":"康巴什区","value":"150603"},{"label":"达拉特旗","value":"150621"},{"label":"准格尔旗","value":"150622"},{"label":"鄂托克前旗","value":"150623"},{"label":"鄂托克旗","value":"150624"},{"label":"杭锦旗","value":"150625"},{"label":"乌审旗","value":"150626"},{"label":"伊金霍洛旗","value":"150627"}],[{"label":"海拉尔区","value":"150702"},{"label":"扎赉诺尔区","value":"150703"},{"label":"阿荣旗","value":"150721"},{"label":"莫力达瓦达斡尔族自治旗","value":"150722"},{"label":"鄂伦春自治旗","value":"150723"},{"label":"鄂温克族自治旗","value":"150724"},{"label":"陈巴尔虎旗","value":"150725"},{"label":"新巴尔虎左旗","value":"150726"},{"label":"新巴尔虎右旗","value":"150727"},{"label":"满洲里市","value":"150781"},{"label":"牙克石市","value":"150782"},{"label":"扎兰屯市","value":"150783"},{"label":"额尔古纳市","value":"150784"},{"label":"根河市","value":"150785"}],[{"label":"临河区","value":"150802"},{"label":"五原县","value":"150821"},{"label":"磴口县","value":"150822"},{"label":"乌拉特前旗","value":"150823"},{"label":"乌拉特中旗","value":"150824"},{"label":"乌拉特后旗","value":"150825"},{"label":"杭锦后旗","value":"150826"}],[{"label":"集宁区","value":"150902"},{"label":"卓资县","value":"150921"},{"label":"化德县","value":"150922"},{"label":"商都县","value":"150923"},{"label":"兴和县","value":"150924"},{"label":"凉城县","value":"150925"},{"label":"察哈尔右翼前旗","value":"150926"},{"label":"察哈尔右翼中旗","value":"150927"},{"label":"察哈尔右翼后旗","value":"150928"},{"label":"四子王旗","value":"150929"},{"label":"丰镇市","value":"150981"}],[{"label":"乌兰浩特市","value":"152201"},{"label":"阿尔山市","value":"152202"},{"label":"科尔沁右翼前旗","value":"152221"},{"label":"科尔沁右翼中旗","value":"152222"},{"label":"扎赉特旗","value":"152223"},{"label":"突泉县","value":"152224"}],[{"label":"二连浩特市","value":"152501"},{"label":"锡林浩特市","value":"152502"},{"label":"阿巴嘎旗","value":"152522"},{"label":"苏尼特左旗","value":"152523"},{"label":"苏尼特右旗","value":"152524"},{"label":"东乌珠穆沁旗","value":"152525"},{"label":"西乌珠穆沁旗","value":"152526"},{"label":"太仆寺旗","value":"152527"},{"label":"镶黄旗","value":"152528"},{"label":"正镶白旗","value":"152529"},{"label":"正蓝旗","value":"152530"},{"label":"多伦县","value":"152531"},{"label":"乌拉盖管委会","value":"152571"}],[{"label":"阿拉善左旗","value":"152921"},{"label":"阿拉善右旗","value":"152922"},{"label":"额济纳旗","value":"152923"},{"label":"内蒙古阿拉善经济开发区","value":"152971"}]],[[{"label":"和平区","value":"210102"},{"label":"沈河区","value":"210103"},{"label":"大东区","value":"210104"},{"label":"皇姑区","value":"210105"},{"label":"铁西区","value":"210106"},{"label":"苏家屯区","value":"210111"},{"label":"浑南区","value":"210112"},{"label":"沈北新区","value":"210113"},{"label":"于洪区","value":"210114"},{"label":"辽中区","value":"210115"},{"label":"康平县","value":"210123"},{"label":"法库县","value":"210124"},{"label":"新民市","value":"210181"}],[{"label":"中山区","value":"210202"},{"label":"西岗区","value":"210203"},{"label":"沙河口区","value":"210204"},{"label":"甘井子区","value":"210211"},{"label":"旅顺口区","value":"210212"},{"label":"金州区","value":"210213"},{"label":"普兰店区","value":"210214"},{"label":"长海县","value":"210224"},{"label":"瓦房店市","value":"210281"},{"label":"庄河市","value":"210283"}],[{"label":"铁东区","value":"210302"},{"label":"铁西区","value":"210303"},{"label":"立山区","value":"210304"},{"label":"千山区","value":"210311"},{"label":"台安县","value":"210321"},{"label":"岫岩满族自治县","value":"210323"},{"label":"海城市","value":"210381"}],[{"label":"新抚区","value":"210402"},{"label":"东洲区","value":"210403"},{"label":"望花区","value":"210404"},{"label":"顺城区","value":"210411"},{"label":"抚顺县","value":"210421"},{"label":"新宾满族自治县","value":"210422"},{"label":"清原满族自治县","value":"210423"}],[{"label":"平山区","value":"210502"},{"label":"溪湖区","value":"210503"},{"label":"明山区","value":"210504"},{"label":"南芬区","value":"210505"},{"label":"本溪满族自治县","value":"210521"},{"label":"桓仁满族自治县","value":"210522"}],[{"label":"元宝区","value":"210602"},{"label":"振兴区","value":"210603"},{"label":"振安区","value":"210604"},{"label":"宽甸满族自治县","value":"210624"},{"label":"东港市","value":"210681"},{"label":"凤城市","value":"210682"}],[{"label":"古塔区","value":"210702"},{"label":"凌河区","value":"210703"},{"label":"太和区","value":"210711"},{"label":"黑山县","value":"210726"},{"label":"义县","value":"210727"},{"label":"凌海市","value":"210781"},{"label":"北镇市","value":"210782"}],[{"label":"站前区","value":"210802"},{"label":"西市区","value":"210803"},{"label":"鲅鱼圈区","value":"210804"},{"label":"老边区","value":"210811"},{"label":"盖州市","value":"210881"},{"label":"大石桥市","value":"210882"}],[{"label":"海州区","value":"210902"},{"label":"新邱区","value":"210903"},{"label":"太平区","value":"210904"},{"label":"清河门区","value":"210905"},{"label":"细河区","value":"210911"},{"label":"阜新蒙古族自治县","value":"210921"},{"label":"彰武县","value":"210922"}],[{"label":"白塔区","value":"211002"},{"label":"文圣区","value":"211003"},{"label":"宏伟区","value":"211004"},{"label":"弓长岭区","value":"211005"},{"label":"太子河区","value":"211011"},{"label":"辽阳县","value":"211021"},{"label":"灯塔市","value":"211081"}],[{"label":"双台子区","value":"211102"},{"label":"兴隆台区","value":"211103"},{"label":"大洼区","value":"211104"},{"label":"盘山县","value":"211122"}],[{"label":"银州区","value":"211202"},{"label":"清河区","value":"211204"},{"label":"铁岭县","value":"211221"},{"label":"西丰县","value":"211223"},{"label":"昌图县","value":"211224"},{"label":"调兵山市","value":"211281"},{"label":"开原市","value":"211282"}],[{"label":"双塔区","value":"211302"},{"label":"龙城区","value":"211303"},{"label":"朝阳县","value":"211321"},{"label":"建平县","value":"211322"},{"label":"喀喇沁左翼蒙古族自治县","value":"211324"},{"label":"北票市","value":"211381"},{"label":"凌源市","value":"211382"}],[{"label":"连山区","value":"211402"},{"label":"龙港区","value":"211403"},{"label":"南票区","value":"211404"},{"label":"绥中县","value":"211421"},{"label":"建昌县","value":"211422"},{"label":"兴城市","value":"211481"}]],[[{"label":"南关区","value":"220102"},{"label":"宽城区","value":"220103"},{"label":"朝阳区","value":"220104"},{"label":"二道区","value":"220105"},{"label":"绿园区","value":"220106"},{"label":"双阳区","value":"220112"},{"label":"九台区","value":"220113"},{"label":"农安县","value":"220122"},{"label":"长春经济技术开发区","value":"220171"},{"label":"长春净月高新技术产业开发区","value":"220172"},{"label":"长春高新技术产业开发区","value":"220173"},{"label":"长春汽车经济技术开发区","value":"220174"},{"label":"榆树市","value":"220182"},{"label":"德惠市","value":"220183"}],[{"label":"昌邑区","value":"220202"},{"label":"龙潭区","value":"220203"},{"label":"船营区","value":"220204"},{"label":"丰满区","value":"220211"},{"label":"永吉县","value":"220221"},{"label":"吉林经济开发区","value":"220271"},{"label":"吉林高新技术产业开发区","value":"220272"},{"label":"吉林中国新加坡食品区","value":"220273"},{"label":"蛟河市","value":"220281"},{"label":"桦甸市","value":"220282"},{"label":"舒兰市","value":"220283"},{"label":"磐石市","value":"220284"}],[{"label":"铁西区","value":"220302"},{"label":"铁东区","value":"220303"},{"label":"梨树县","value":"220322"},{"label":"伊通满族自治县","value":"220323"},{"label":"公主岭市","value":"220381"},{"label":"双辽市","value":"220382"}],[{"label":"龙山区","value":"220402"},{"label":"西安区","value":"220403"},{"label":"东丰县","value":"220421"},{"label":"东辽县","value":"220422"}],[{"label":"东昌区","value":"220502"},{"label":"二道江区","value":"220503"},{"label":"通化县","value":"220521"},{"label":"辉南县","value":"220523"},{"label":"柳河县","value":"220524"},{"label":"梅河口市","value":"220581"},{"label":"集安市","value":"220582"}],[{"label":"浑江区","value":"220602"},{"label":"江源区","value":"220605"},{"label":"抚松县","value":"220621"},{"label":"靖宇县","value":"220622"},{"label":"长白朝鲜族自治县","value":"220623"},{"label":"临江市","value":"220681"}],[{"label":"宁江区","value":"220702"},{"label":"前郭尔罗斯蒙古族自治县","value":"220721"},{"label":"长岭县","value":"220722"},{"label":"乾安县","value":"220723"},{"label":"吉林松原经济开发区","value":"220771"},{"label":"扶余市","value":"220781"}],[{"label":"洮北区","value":"220802"},{"label":"镇赉县","value":"220821"},{"label":"通榆县","value":"220822"},{"label":"吉林白城经济开发区","value":"220871"},{"label":"洮南市","value":"220881"},{"label":"大安市","value":"220882"}],[{"label":"延吉市","value":"222401"},{"label":"图们市","value":"222402"},{"label":"敦化市","value":"222403"},{"label":"珲春市","value":"222404"},{"label":"龙井市","value":"222405"},{"label":"和龙市","value":"222406"},{"label":"汪清县","value":"222424"},{"label":"安图县","value":"222426"}]],[[{"label":"道里区","value":"230102"},{"label":"南岗区","value":"230103"},{"label":"道外区","value":"230104"},{"label":"平房区","value":"230108"},{"label":"松北区","value":"230109"},{"label":"香坊区","value":"230110"},{"label":"呼兰区","value":"230111"},{"label":"阿城区","value":"230112"},{"label":"双城区","value":"230113"},{"label":"依兰县","value":"230123"},{"label":"方正县","value":"230124"},{"label":"宾县","value":"230125"},{"label":"巴彦县","value":"230126"},{"label":"木兰县","value":"230127"},{"label":"通河县","value":"230128"},{"label":"延寿县","value":"230129"},{"label":"尚志市","value":"230183"},{"label":"五常市","value":"230184"}],[{"label":"龙沙区","value":"230202"},{"label":"建华区","value":"230203"},{"label":"铁锋区","value":"230204"},{"label":"昂昂溪区","value":"230205"},{"label":"富拉尔基区","value":"230206"},{"label":"碾子山区","value":"230207"},{"label":"梅里斯达斡尔族区","value":"230208"},{"label":"龙江县","value":"230221"},{"label":"依安县","value":"230223"},{"label":"泰来县","value":"230224"},{"label":"甘南县","value":"230225"},{"label":"富裕县","value":"230227"},{"label":"克山县","value":"230229"},{"label":"克东县","value":"230230"},{"label":"拜泉县","value":"230231"},{"label":"讷河市","value":"230281"}],[{"label":"鸡冠区","value":"230302"},{"label":"恒山区","value":"230303"},{"label":"滴道区","value":"230304"},{"label":"梨树区","value":"230305"},{"label":"城子河区","value":"230306"},{"label":"麻山区","value":"230307"},{"label":"鸡东县","value":"230321"},{"label":"虎林市","value":"230381"},{"label":"密山市","value":"230382"}],[{"label":"向阳区","value":"230402"},{"label":"工农区","value":"230403"},{"label":"南山区","value":"230404"},{"label":"兴安区","value":"230405"},{"label":"东山区","value":"230406"},{"label":"兴山区","value":"230407"},{"label":"萝北县","value":"230421"},{"label":"绥滨县","value":"230422"}],[{"label":"尖山区","value":"230502"},{"label":"岭东区","value":"230503"},{"label":"四方台区","value":"230505"},{"label":"宝山区","value":"230506"},{"label":"集贤县","value":"230521"},{"label":"友谊县","value":"230522"},{"label":"宝清县","value":"230523"},{"label":"饶河县","value":"230524"}],[{"label":"萨尔图区","value":"230602"},{"label":"龙凤区","value":"230603"},{"label":"让胡路区","value":"230604"},{"label":"红岗区","value":"230605"},{"label":"大同区","value":"230606"},{"label":"肇州县","value":"230621"},{"label":"肇源县","value":"230622"},{"label":"林甸县","value":"230623"},{"label":"杜尔伯特蒙古族自治县","value":"230624"},{"label":"大庆高新技术产业开发区","value":"230671"}],[{"label":"伊春区","value":"230702"},{"label":"南岔区","value":"230703"},{"label":"友好区","value":"230704"},{"label":"西林区","value":"230705"},{"label":"翠峦区","value":"230706"},{"label":"新青区","value":"230707"},{"label":"美溪区","value":"230708"},{"label":"金山屯区","value":"230709"},{"label":"五营区","value":"230710"},{"label":"乌马河区","value":"230711"},{"label":"汤旺河区","value":"230712"},{"label":"带岭区","value":"230713"},{"label":"乌伊岭区","value":"230714"},{"label":"红星区","value":"230715"},{"label":"上甘岭区","value":"230716"},{"label":"嘉荫县","value":"230722"},{"label":"铁力市","value":"230781"}],[{"label":"向阳区","value":"230803"},{"label":"前进区","value":"230804"},{"label":"东风区","value":"230805"},{"label":"郊区","value":"230811"},{"label":"桦南县","value":"230822"},{"label":"桦川县","value":"230826"},{"label":"汤原县","value":"230828"},{"label":"同江市","value":"230881"},{"label":"富锦市","value":"230882"},{"label":"抚远市","value":"230883"}],[{"label":"新兴区","value":"230902"},{"label":"桃山区","value":"230903"},{"label":"茄子河区","value":"230904"},{"label":"勃利县","value":"230921"}],[{"label":"东安区","value":"231002"},{"label":"阳明区","value":"231003"},{"label":"爱民区","value":"231004"},{"label":"西安区","value":"231005"},{"label":"林口县","value":"231025"},{"label":"牡丹江经济技术开发区","value":"231071"},{"label":"绥芬河市","value":"231081"},{"label":"海林市","value":"231083"},{"label":"宁安市","value":"231084"},{"label":"穆棱市","value":"231085"},{"label":"东宁市","value":"231086"}],[{"label":"爱辉区","value":"231102"},{"label":"嫩江县","value":"231121"},{"label":"逊克县","value":"231123"},{"label":"孙吴县","value":"231124"},{"label":"北安市","value":"231181"},{"label":"五大连池市","value":"231182"}],[{"label":"北林区","value":"231202"},{"label":"望奎县","value":"231221"},{"label":"兰西县","value":"231222"},{"label":"青冈县","value":"231223"},{"label":"庆安县","value":"231224"},{"label":"明水县","value":"231225"},{"label":"绥棱县","value":"231226"},{"label":"安达市","value":"231281"},{"label":"肇东市","value":"231282"},{"label":"海伦市","value":"231283"}],[{"label":"加格达奇区","value":"232701"},{"label":"松岭区","value":"232702"},{"label":"新林区","value":"232703"},{"label":"呼中区","value":"232704"},{"label":"呼玛县","value":"232721"},{"label":"塔河县","value":"232722"},{"label":"漠河县","value":"232723"}]],[[{"label":"黄浦区","value":"310101"},{"label":"徐汇区","value":"310104"},{"label":"长宁区","value":"310105"},{"label":"静安区","value":"310106"},{"label":"普陀区","value":"310107"},{"label":"虹口区","value":"310109"},{"label":"杨浦区","value":"310110"},{"label":"闵行区","value":"310112"},{"label":"宝山区","value":"310113"},{"label":"嘉定区","value":"310114"},{"label":"浦东新区","value":"310115"},{"label":"金山区","value":"310116"},{"label":"松江区","value":"310117"},{"label":"青浦区","value":"310118"},{"label":"奉贤区","value":"310120"},{"label":"崇明区","value":"310151"}]],[[{"label":"玄武区","value":"320102"},{"label":"秦淮区","value":"320104"},{"label":"建邺区","value":"320105"},{"label":"鼓楼区","value":"320106"},{"label":"浦口区","value":"320111"},{"label":"栖霞区","value":"320113"},{"label":"雨花台区","value":"320114"},{"label":"江宁区","value":"320115"},{"label":"六合区","value":"320116"},{"label":"溧水区","value":"320117"},{"label":"高淳区","value":"320118"}],[{"label":"锡山区","value":"320205"},{"label":"惠山区","value":"320206"},{"label":"滨湖区","value":"320211"},{"label":"梁溪区","value":"320213"},{"label":"新吴区","value":"320214"},{"label":"江阴市","value":"320281"},{"label":"宜兴市","value":"320282"}],[{"label":"鼓楼区","value":"320302"},{"label":"云龙区","value":"320303"},{"label":"贾汪区","value":"320305"},{"label":"泉山区","value":"320311"},{"label":"铜山区","value":"320312"},{"label":"丰县","value":"320321"},{"label":"沛县","value":"320322"},{"label":"睢宁县","value":"320324"},{"label":"徐州经济技术开发区","value":"320371"},{"label":"新沂市","value":"320381"},{"label":"邳州市","value":"320382"}],[{"label":"天宁区","value":"320402"},{"label":"钟楼区","value":"320404"},{"label":"新北区","value":"320411"},{"label":"武进区","value":"320412"},{"label":"金坛区","value":"320413"},{"label":"溧阳市","value":"320481"}],[{"label":"虎丘区","value":"320505"},{"label":"吴中区","value":"320506"},{"label":"相城区","value":"320507"},{"label":"姑苏区","value":"320508"},{"label":"吴江区","value":"320509"},{"label":"苏州工业园区","value":"320571"},{"label":"常熟市","value":"320581"},{"label":"张家港市","value":"320582"},{"label":"昆山市","value":"320583"},{"label":"太仓市","value":"320585"}],[{"label":"崇川区","value":"320602"},{"label":"港闸区","value":"320611"},{"label":"通州区","value":"320612"},{"label":"海安县","value":"320621"},{"label":"如东县","value":"320623"},{"label":"南通经济技术开发区","value":"320671"},{"label":"启东市","value":"320681"},{"label":"如皋市","value":"320682"},{"label":"海门市","value":"320684"}],[{"label":"连云区","value":"320703"},{"label":"海州区","value":"320706"},{"label":"赣榆区","value":"320707"},{"label":"东海县","value":"320722"},{"label":"灌云县","value":"320723"},{"label":"灌南县","value":"320724"},{"label":"连云港经济技术开发区","value":"320771"},{"label":"连云港高新技术产业开发区","value":"320772"}],[{"label":"淮安区","value":"320803"},{"label":"淮阴区","value":"320804"},{"label":"清江浦区","value":"320812"},{"label":"洪泽区","value":"320813"},{"label":"涟水县","value":"320826"},{"label":"盱眙县","value":"320830"},{"label":"金湖县","value":"320831"},{"label":"淮安经济技术开发区","value":"320871"}],[{"label":"亭湖区","value":"320902"},{"label":"盐都区","value":"320903"},{"label":"大丰区","value":"320904"},{"label":"响水县","value":"320921"},{"label":"滨海县","value":"320922"},{"label":"阜宁县","value":"320923"},{"label":"射阳县","value":"320924"},{"label":"建湖县","value":"320925"},{"label":"盐城经济技术开发区","value":"320971"},{"label":"东台市","value":"320981"}],[{"label":"广陵区","value":"321002"},{"label":"邗江区","value":"321003"},{"label":"江都区","value":"321012"},{"label":"宝应县","value":"321023"},{"label":"扬州经济技术开发区","value":"321071"},{"label":"仪征市","value":"321081"},{"label":"高邮市","value":"321084"}],[{"label":"京口区","value":"321102"},{"label":"润州区","value":"321111"},{"label":"丹徒区","value":"321112"},{"label":"镇江新区","value":"321171"},{"label":"丹阳市","value":"321181"},{"label":"扬中市","value":"321182"},{"label":"句容市","value":"321183"}],[{"label":"海陵区","value":"321202"},{"label":"高港区","value":"321203"},{"label":"姜堰区","value":"321204"},{"label":"泰州医药高新技术产业开发区","value":"321271"},{"label":"兴化市","value":"321281"},{"label":"靖江市","value":"321282"},{"label":"泰兴市","value":"321283"}],[{"label":"宿城区","value":"321302"},{"label":"宿豫区","value":"321311"},{"label":"沭阳县","value":"321322"},{"label":"泗阳县","value":"321323"},{"label":"泗洪县","value":"321324"},{"label":"宿迁经济技术开发区","value":"321371"}]],[[{"label":"上城区","value":"330102"},{"label":"下城区","value":"330103"},{"label":"江干区","value":"330104"},{"label":"拱墅区","value":"330105"},{"label":"西湖区","value":"330106"},{"label":"滨江区","value":"330108"},{"label":"萧山区","value":"330109"},{"label":"余杭区","value":"330110"},{"label":"富阳区","value":"330111"},{"label":"临安区","value":"330112"},{"label":"桐庐县","value":"330122"},{"label":"淳安县","value":"330127"},{"label":"建德市","value":"330182"}],[{"label":"海曙区","value":"330203"},{"label":"江北区","value":"330205"},{"label":"北仑区","value":"330206"},{"label":"镇海区","value":"330211"},{"label":"鄞州区","value":"330212"},{"label":"奉化区","value":"330213"},{"label":"象山县","value":"330225"},{"label":"宁海县","value":"330226"},{"label":"余姚市","value":"330281"},{"label":"慈溪市","value":"330282"}],[{"label":"鹿城区","value":"330302"},{"label":"龙湾区","value":"330303"},{"label":"瓯海区","value":"330304"},{"label":"洞头区","value":"330305"},{"label":"永嘉县","value":"330324"},{"label":"平阳县","value":"330326"},{"label":"苍南县","value":"330327"},{"label":"文成县","value":"330328"},{"label":"泰顺县","value":"330329"},{"label":"温州经济技术开发区","value":"330371"},{"label":"瑞安市","value":"330381"},{"label":"乐清市","value":"330382"}],[{"label":"南湖区","value":"330402"},{"label":"秀洲区","value":"330411"},{"label":"嘉善县","value":"330421"},{"label":"海盐县","value":"330424"},{"label":"海宁市","value":"330481"},{"label":"平湖市","value":"330482"},{"label":"桐乡市","value":"330483"}],[{"label":"吴兴区","value":"330502"},{"label":"南浔区","value":"330503"},{"label":"德清县","value":"330521"},{"label":"长兴县","value":"330522"},{"label":"安吉县","value":"330523"}],[{"label":"越城区","value":"330602"},{"label":"柯桥区","value":"330603"},{"label":"上虞区","value":"330604"},{"label":"新昌县","value":"330624"},{"label":"诸暨市","value":"330681"},{"label":"嵊州市","value":"330683"}],[{"label":"婺城区","value":"330702"},{"label":"金东区","value":"330703"},{"label":"武义县","value":"330723"},{"label":"浦江县","value":"330726"},{"label":"磐安县","value":"330727"},{"label":"兰溪市","value":"330781"},{"label":"义乌市","value":"330782"},{"label":"东阳市","value":"330783"},{"label":"永康市","value":"330784"}],[{"label":"柯城区","value":"330802"},{"label":"衢江区","value":"330803"},{"label":"常山县","value":"330822"},{"label":"开化县","value":"330824"},{"label":"龙游县","value":"330825"},{"label":"江山市","value":"330881"}],[{"label":"定海区","value":"330902"},{"label":"普陀区","value":"330903"},{"label":"岱山县","value":"330921"},{"label":"嵊泗县","value":"330922"}],[{"label":"椒江区","value":"331002"},{"label":"黄岩区","value":"331003"},{"label":"路桥区","value":"331004"},{"label":"三门县","value":"331022"},{"label":"天台县","value":"331023"},{"label":"仙居县","value":"331024"},{"label":"温岭市","value":"331081"},{"label":"临海市","value":"331082"},{"label":"玉环市","value":"331083"}],[{"label":"莲都区","value":"331102"},{"label":"青田县","value":"331121"},{"label":"缙云县","value":"331122"},{"label":"遂昌县","value":"331123"},{"label":"松阳县","value":"331124"},{"label":"云和县","value":"331125"},{"label":"庆元县","value":"331126"},{"label":"景宁畲族自治县","value":"331127"},{"label":"龙泉市","value":"331181"}]],[[{"label":"瑶海区","value":"340102"},{"label":"庐阳区","value":"340103"},{"label":"蜀山区","value":"340104"},{"label":"包河区","value":"340111"},{"label":"长丰县","value":"340121"},{"label":"肥东县","value":"340122"},{"label":"肥西县","value":"340123"},{"label":"庐江县","value":"340124"},{"label":"合肥高新技术产业开发区","value":"340171"},{"label":"合肥经济技术开发区","value":"340172"},{"label":"合肥新站高新技术产业开发区","value":"340173"},{"label":"巢湖市","value":"340181"}],[{"label":"镜湖区","value":"340202"},{"label":"弋江区","value":"340203"},{"label":"鸠江区","value":"340207"},{"label":"三山区","value":"340208"},{"label":"芜湖县","value":"340221"},{"label":"繁昌县","value":"340222"},{"label":"南陵县","value":"340223"},{"label":"无为县","value":"340225"},{"label":"芜湖经济技术开发区","value":"340271"},{"label":"安徽芜湖长江大桥经济开发区","value":"340272"}],[{"label":"龙子湖区","value":"340302"},{"label":"蚌山区","value":"340303"},{"label":"禹会区","value":"340304"},{"label":"淮上区","value":"340311"},{"label":"怀远县","value":"340321"},{"label":"五河县","value":"340322"},{"label":"固镇县","value":"340323"},{"label":"蚌埠市高新技术开发区","value":"340371"},{"label":"蚌埠市经济开发区","value":"340372"}],[{"label":"大通区","value":"340402"},{"label":"田家庵区","value":"340403"},{"label":"谢家集区","value":"340404"},{"label":"八公山区","value":"340405"},{"label":"潘集区","value":"340406"},{"label":"凤台县","value":"340421"},{"label":"寿县","value":"340422"}],[{"label":"花山区","value":"340503"},{"label":"雨山区","value":"340504"},{"label":"博望区","value":"340506"},{"label":"当涂县","value":"340521"},{"label":"含山县","value":"340522"},{"label":"和县","value":"340523"}],[{"label":"杜集区","value":"340602"},{"label":"相山区","value":"340603"},{"label":"烈山区","value":"340604"},{"label":"濉溪县","value":"340621"}],[{"label":"铜官区","value":"340705"},{"label":"义安区","value":"340706"},{"label":"郊区","value":"340711"},{"label":"枞阳县","value":"340722"}],[{"label":"迎江区","value":"340802"},{"label":"大观区","value":"340803"},{"label":"宜秀区","value":"340811"},{"label":"怀宁县","value":"340822"},{"label":"潜山县","value":"340824"},{"label":"太湖县","value":"340825"},{"label":"宿松县","value":"340826"},{"label":"望江县","value":"340827"},{"label":"岳西县","value":"340828"},{"label":"安徽安庆经济开发区","value":"340871"},{"label":"桐城市","value":"340881"}],[{"label":"屯溪区","value":"341002"},{"label":"黄山区","value":"341003"},{"label":"徽州区","value":"341004"},{"label":"歙县","value":"341021"},{"label":"休宁县","value":"341022"},{"label":"黟县","value":"341023"},{"label":"祁门县","value":"341024"}],[{"label":"琅琊区","value":"341102"},{"label":"南谯区","value":"341103"},{"label":"来安县","value":"341122"},{"label":"全椒县","value":"341124"},{"label":"定远县","value":"341125"},{"label":"凤阳县","value":"341126"},{"label":"苏滁现代产业园","value":"341171"},{"label":"滁州经济技术开发区","value":"341172"},{"label":"天长市","value":"341181"},{"label":"明光市","value":"341182"}],[{"label":"颍州区","value":"341202"},{"label":"颍东区","value":"341203"},{"label":"颍泉区","value":"341204"},{"label":"临泉县","value":"341221"},{"label":"太和县","value":"341222"},{"label":"阜南县","value":"341225"},{"label":"颍上县","value":"341226"},{"label":"阜阳合肥现代产业园区","value":"341271"},{"label":"阜阳经济技术开发区","value":"341272"},{"label":"界首市","value":"341282"}],[{"label":"埇桥区","value":"341302"},{"label":"砀山县","value":"341321"},{"label":"萧县","value":"341322"},{"label":"灵璧县","value":"341323"},{"label":"泗县","value":"341324"},{"label":"宿州马鞍山现代产业园区","value":"341371"},{"label":"宿州经济技术开发区","value":"341372"}],[{"label":"金安区","value":"341502"},{"label":"裕安区","value":"341503"},{"label":"叶集区","value":"341504"},{"label":"霍邱县","value":"341522"},{"label":"舒城县","value":"341523"},{"label":"金寨县","value":"341524"},{"label":"霍山县","value":"341525"}],[{"label":"谯城区","value":"341602"},{"label":"涡阳县","value":"341621"},{"label":"蒙城县","value":"341622"},{"label":"利辛县","value":"341623"}],[{"label":"贵池区","value":"341702"},{"label":"东至县","value":"341721"},{"label":"石台县","value":"341722"},{"label":"青阳县","value":"341723"}],[{"label":"宣州区","value":"341802"},{"label":"郎溪县","value":"341821"},{"label":"广德县","value":"341822"},{"label":"泾县","value":"341823"},{"label":"绩溪县","value":"341824"},{"label":"旌德县","value":"341825"},{"label":"宣城市经济开发区","value":"341871"},{"label":"宁国市","value":"341881"}]],[[{"label":"鼓楼区","value":"350102"},{"label":"台江区","value":"350103"},{"label":"仓山区","value":"350104"},{"label":"马尾区","value":"350105"},{"label":"晋安区","value":"350111"},{"label":"闽侯县","value":"350121"},{"label":"连江县","value":"350122"},{"label":"罗源县","value":"350123"},{"label":"闽清县","value":"350124"},{"label":"永泰县","value":"350125"},{"label":"平潭县","value":"350128"},{"label":"福清市","value":"350181"},{"label":"长乐市","value":"350182"}],[{"label":"思明区","value":"350203"},{"label":"海沧区","value":"350205"},{"label":"湖里区","value":"350206"},{"label":"集美区","value":"350211"},{"label":"同安区","value":"350212"},{"label":"翔安区","value":"350213"}],[{"label":"城厢区","value":"350302"},{"label":"涵江区","value":"350303"},{"label":"荔城区","value":"350304"},{"label":"秀屿区","value":"350305"},{"label":"仙游县","value":"350322"}],[{"label":"梅列区","value":"350402"},{"label":"三元区","value":"350403"},{"label":"明溪县","value":"350421"},{"label":"清流县","value":"350423"},{"label":"宁化县","value":"350424"},{"label":"大田县","value":"350425"},{"label":"尤溪县","value":"350426"},{"label":"沙县","value":"350427"},{"label":"将乐县","value":"350428"},{"label":"泰宁县","value":"350429"},{"label":"建宁县","value":"350430"},{"label":"永安市","value":"350481"}],[{"label":"鲤城区","value":"350502"},{"label":"丰泽区","value":"350503"},{"label":"洛江区","value":"350504"},{"label":"泉港区","value":"350505"},{"label":"惠安县","value":"350521"},{"label":"安溪县","value":"350524"},{"label":"永春县","value":"350525"},{"label":"德化县","value":"350526"},{"label":"金门县","value":"350527"},{"label":"石狮市","value":"350581"},{"label":"晋江市","value":"350582"},{"label":"南安市","value":"350583"}],[{"label":"芗城区","value":"350602"},{"label":"龙文区","value":"350603"},{"label":"云霄县","value":"350622"},{"label":"漳浦县","value":"350623"},{"label":"诏安县","value":"350624"},{"label":"长泰县","value":"350625"},{"label":"东山县","value":"350626"},{"label":"南靖县","value":"350627"},{"label":"平和县","value":"350628"},{"label":"华安县","value":"350629"},{"label":"龙海市","value":"350681"}],[{"label":"延平区","value":"350702"},{"label":"建阳区","value":"350703"},{"label":"顺昌县","value":"350721"},{"label":"浦城县","value":"350722"},{"label":"光泽县","value":"350723"},{"label":"松溪县","value":"350724"},{"label":"政和县","value":"350725"},{"label":"邵武市","value":"350781"},{"label":"武夷山市","value":"350782"},{"label":"建瓯市","value":"350783"}],[{"label":"新罗区","value":"350802"},{"label":"永定区","value":"350803"},{"label":"长汀县","value":"350821"},{"label":"上杭县","value":"350823"},{"label":"武平县","value":"350824"},{"label":"连城县","value":"350825"},{"label":"漳平市","value":"350881"}],[{"label":"蕉城区","value":"350902"},{"label":"霞浦县","value":"350921"},{"label":"古田县","value":"350922"},{"label":"屏南县","value":"350923"},{"label":"寿宁县","value":"350924"},{"label":"周宁县","value":"350925"},{"label":"柘荣县","value":"350926"},{"label":"福安市","value":"350981"},{"label":"福鼎市","value":"350982"}]],[[{"label":"东湖区","value":"360102"},{"label":"西湖区","value":"360103"},{"label":"青云谱区","value":"360104"},{"label":"湾里区","value":"360105"},{"label":"青山湖区","value":"360111"},{"label":"新建区","value":"360112"},{"label":"南昌县","value":"360121"},{"label":"安义县","value":"360123"},{"label":"进贤县","value":"360124"}],[{"label":"昌江区","value":"360202"},{"label":"珠山区","value":"360203"},{"label":"浮梁县","value":"360222"},{"label":"乐平市","value":"360281"}],[{"label":"安源区","value":"360302"},{"label":"湘东区","value":"360313"},{"label":"莲花县","value":"360321"},{"label":"上栗县","value":"360322"},{"label":"芦溪县","value":"360323"}],[{"label":"濂溪区","value":"360402"},{"label":"浔阳区","value":"360403"},{"label":"柴桑区","value":"360404"},{"label":"武宁县","value":"360423"},{"label":"修水县","value":"360424"},{"label":"永修县","value":"360425"},{"label":"德安县","value":"360426"},{"label":"都昌县","value":"360428"},{"label":"湖口县","value":"360429"},{"label":"彭泽县","value":"360430"},{"label":"瑞昌市","value":"360481"},{"label":"共青城市","value":"360482"},{"label":"庐山市","value":"360483"}],[{"label":"渝水区","value":"360502"},{"label":"分宜县","value":"360521"}],[{"label":"月湖区","value":"360602"},{"label":"余江县","value":"360622"},{"label":"贵溪市","value":"360681"}],[{"label":"章贡区","value":"360702"},{"label":"南康区","value":"360703"},{"label":"赣县区","value":"360704"},{"label":"信丰县","value":"360722"},{"label":"大余县","value":"360723"},{"label":"上犹县","value":"360724"},{"label":"崇义县","value":"360725"},{"label":"安远县","value":"360726"},{"label":"龙南县","value":"360727"},{"label":"定南县","value":"360728"},{"label":"全南县","value":"360729"},{"label":"宁都县","value":"360730"},{"label":"于都县","value":"360731"},{"label":"兴国县","value":"360732"},{"label":"会昌县","value":"360733"},{"label":"寻乌县","value":"360734"},{"label":"石城县","value":"360735"},{"label":"瑞金市","value":"360781"}],[{"label":"吉州区","value":"360802"},{"label":"青原区","value":"360803"},{"label":"吉安县","value":"360821"},{"label":"吉水县","value":"360822"},{"label":"峡江县","value":"360823"},{"label":"新干县","value":"360824"},{"label":"永丰县","value":"360825"},{"label":"泰和县","value":"360826"},{"label":"遂川县","value":"360827"},{"label":"万安县","value":"360828"},{"label":"安福县","value":"360829"},{"label":"永新县","value":"360830"},{"label":"井冈山市","value":"360881"}],[{"label":"袁州区","value":"360902"},{"label":"奉新县","value":"360921"},{"label":"万载县","value":"360922"},{"label":"上高县","value":"360923"},{"label":"宜丰县","value":"360924"},{"label":"靖安县","value":"360925"},{"label":"铜鼓县","value":"360926"},{"label":"丰城市","value":"360981"},{"label":"樟树市","value":"360982"},{"label":"高安市","value":"360983"}],[{"label":"临川区","value":"361002"},{"label":"东乡区","value":"361003"},{"label":"南城县","value":"361021"},{"label":"黎川县","value":"361022"},{"label":"南丰县","value":"361023"},{"label":"崇仁县","value":"361024"},{"label":"乐安县","value":"361025"},{"label":"宜黄县","value":"361026"},{"label":"金溪县","value":"361027"},{"label":"资溪县","value":"361028"},{"label":"广昌县","value":"361030"}],[{"label":"信州区","value":"361102"},{"label":"广丰区","value":"361103"},{"label":"上饶县","value":"361121"},{"label":"玉山县","value":"361123"},{"label":"铅山县","value":"361124"},{"label":"横峰县","value":"361125"},{"label":"弋阳县","value":"361126"},{"label":"余干县","value":"361127"},{"label":"鄱阳县","value":"361128"},{"label":"万年县","value":"361129"},{"label":"婺源县","value":"361130"},{"label":"德兴市","value":"361181"}]],[[{"label":"历下区","value":"370102"},{"label":"市中区","value":"370103"},{"label":"槐荫区","value":"370104"},{"label":"天桥区","value":"370105"},{"label":"历城区","value":"370112"},{"label":"长清区","value":"370113"},{"label":"章丘区","value":"370114"},{"label":"平阴县","value":"370124"},{"label":"济阳县","value":"370125"},{"label":"商河县","value":"370126"},{"label":"济南高新技术产业开发区","value":"370171"}],[{"label":"市南区","value":"370202"},{"label":"市北区","value":"370203"},{"label":"黄岛区","value":"370211"},{"label":"崂山区","value":"370212"},{"label":"李沧区","value":"370213"},{"label":"城阳区","value":"370214"},{"label":"即墨区","value":"370215"},{"label":"青岛高新技术产业开发区","value":"370271"},{"label":"胶州市","value":"370281"},{"label":"平度市","value":"370283"},{"label":"莱西市","value":"370285"}],[{"label":"淄川区","value":"370302"},{"label":"张店区","value":"370303"},{"label":"博山区","value":"370304"},{"label":"临淄区","value":"370305"},{"label":"周村区","value":"370306"},{"label":"桓台县","value":"370321"},{"label":"高青县","value":"370322"},{"label":"沂源县","value":"370323"}],[{"label":"市中区","value":"370402"},{"label":"薛城区","value":"370403"},{"label":"峄城区","value":"370404"},{"label":"台儿庄区","value":"370405"},{"label":"山亭区","value":"370406"},{"label":"滕州市","value":"370481"}],[{"label":"东营区","value":"370502"},{"label":"河口区","value":"370503"},{"label":"垦利区","value":"370505"},{"label":"利津县","value":"370522"},{"label":"广饶县","value":"370523"},{"label":"东营经济技术开发区","value":"370571"},{"label":"东营港经济开发区","value":"370572"}],[{"label":"芝罘区","value":"370602"},{"label":"福山区","value":"370611"},{"label":"牟平区","value":"370612"},{"label":"莱山区","value":"370613"},{"label":"长岛县","value":"370634"},{"label":"烟台高新技术产业开发区","value":"370671"},{"label":"烟台经济技术开发区","value":"370672"},{"label":"龙口市","value":"370681"},{"label":"莱阳市","value":"370682"},{"label":"莱州市","value":"370683"},{"label":"蓬莱市","value":"370684"},{"label":"招远市","value":"370685"},{"label":"栖霞市","value":"370686"},{"label":"海阳市","value":"370687"}],[{"label":"潍城区","value":"370702"},{"label":"寒亭区","value":"370703"},{"label":"坊子区","value":"370704"},{"label":"奎文区","value":"370705"},{"label":"临朐县","value":"370724"},{"label":"昌乐县","value":"370725"},{"label":"潍坊滨海经济技术开发区","value":"370772"},{"label":"青州市","value":"370781"},{"label":"诸城市","value":"370782"},{"label":"寿光市","value":"370783"},{"label":"安丘市","value":"370784"},{"label":"高密市","value":"370785"},{"label":"昌邑市","value":"370786"}],[{"label":"任城区","value":"370811"},{"label":"兖州区","value":"370812"},{"label":"微山县","value":"370826"},{"label":"鱼台县","value":"370827"},{"label":"金乡县","value":"370828"},{"label":"嘉祥县","value":"370829"},{"label":"汶上县","value":"370830"},{"label":"泗水县","value":"370831"},{"label":"梁山县","value":"370832"},{"label":"济宁高新技术产业开发区","value":"370871"},{"label":"曲阜市","value":"370881"},{"label":"邹城市","value":"370883"}],[{"label":"泰山区","value":"370902"},{"label":"岱岳区","value":"370911"},{"label":"宁阳县","value":"370921"},{"label":"东平县","value":"370923"},{"label":"新泰市","value":"370982"},{"label":"肥城市","value":"370983"}],[{"label":"环翠区","value":"371002"},{"label":"文登区","value":"371003"},{"label":"威海火炬高技术产业开发区","value":"371071"},{"label":"威海经济技术开发区","value":"371072"},{"label":"威海临港经济技术开发区","value":"371073"},{"label":"荣成市","value":"371082"},{"label":"乳山市","value":"371083"}],[{"label":"东港区","value":"371102"},{"label":"岚山区","value":"371103"},{"label":"五莲县","value":"371121"},{"label":"莒县","value":"371122"},{"label":"日照经济技术开发区","value":"371171"},{"label":"日照国际海洋城","value":"371172"}],[{"label":"莱城区","value":"371202"},{"label":"钢城区","value":"371203"}],[{"label":"兰山区","value":"371302"},{"label":"罗庄区","value":"371311"},{"label":"河东区","value":"371312"},{"label":"沂南县","value":"371321"},{"label":"郯城县","value":"371322"},{"label":"沂水县","value":"371323"},{"label":"兰陵县","value":"371324"},{"label":"费县","value":"371325"},{"label":"平邑县","value":"371326"},{"label":"莒南县","value":"371327"},{"label":"蒙阴县","value":"371328"},{"label":"临沭县","value":"371329"},{"label":"临沂高新技术产业开发区","value":"371371"},{"label":"临沂经济技术开发区","value":"371372"},{"label":"临沂临港经济开发区","value":"371373"}],[{"label":"德城区","value":"371402"},{"label":"陵城区","value":"371403"},{"label":"宁津县","value":"371422"},{"label":"庆云县","value":"371423"},{"label":"临邑县","value":"371424"},{"label":"齐河县","value":"371425"},{"label":"平原县","value":"371426"},{"label":"夏津县","value":"371427"},{"label":"武城县","value":"371428"},{"label":"德州经济技术开发区","value":"371471"},{"label":"德州运河经济开发区","value":"371472"},{"label":"乐陵市","value":"371481"},{"label":"禹城市","value":"371482"}],[{"label":"东昌府区","value":"371502"},{"label":"阳谷县","value":"371521"},{"label":"莘县","value":"371522"},{"label":"茌平县","value":"371523"},{"label":"东阿县","value":"371524"},{"label":"冠县","value":"371525"},{"label":"高唐县","value":"371526"},{"label":"临清市","value":"371581"}],[{"label":"滨城区","value":"371602"},{"label":"沾化区","value":"371603"},{"label":"惠民县","value":"371621"},{"label":"阳信县","value":"371622"},{"label":"无棣县","value":"371623"},{"label":"博兴县","value":"371625"},{"label":"邹平县","value":"371626"}],[{"label":"牡丹区","value":"371702"},{"label":"定陶区","value":"371703"},{"label":"曹县","value":"371721"},{"label":"单县","value":"371722"},{"label":"成武县","value":"371723"},{"label":"巨野县","value":"371724"},{"label":"郓城县","value":"371725"},{"label":"鄄城县","value":"371726"},{"label":"东明县","value":"371728"},{"label":"菏泽经济技术开发区","value":"371771"},{"label":"菏泽高新技术开发区","value":"371772"}]],[[{"label":"中原区","value":"410102"},{"label":"二七区","value":"410103"},{"label":"管城回族区","value":"410104"},{"label":"金水区","value":"410105"},{"label":"上街区","value":"410106"},{"label":"惠济区","value":"410108"},{"label":"中牟县","value":"410122"},{"label":"郑州经济技术开发区","value":"410171"},{"label":"郑州高新技术产业开发区","value":"410172"},{"label":"郑州航空港经济综合实验区","value":"410173"},{"label":"巩义市","value":"410181"},{"label":"荥阳市","value":"410182"},{"label":"新密市","value":"410183"},{"label":"新郑市","value":"410184"},{"label":"登封市","value":"410185"}],[{"label":"龙亭区","value":"410202"},{"label":"顺河回族区","value":"410203"},{"label":"鼓楼区","value":"410204"},{"label":"禹王台区","value":"410205"},{"label":"祥符区","value":"410212"},{"label":"杞县","value":"410221"},{"label":"通许县","value":"410222"},{"label":"尉氏县","value":"410223"},{"label":"兰考县","value":"410225"}],[{"label":"老城区","value":"410302"},{"label":"西工区","value":"410303"},{"label":"瀍河回族区","value":"410304"},{"label":"涧西区","value":"410305"},{"label":"吉利区","value":"410306"},{"label":"洛龙区","value":"410311"},{"label":"孟津县","value":"410322"},{"label":"新安县","value":"410323"},{"label":"栾川县","value":"410324"},{"label":"嵩县","value":"410325"},{"label":"汝阳县","value":"410326"},{"label":"宜阳县","value":"410327"},{"label":"洛宁县","value":"410328"},{"label":"伊川县","value":"410329"},{"label":"洛阳高新技术产业开发区","value":"410371"},{"label":"偃师市","value":"410381"}],[{"label":"新华区","value":"410402"},{"label":"卫东区","value":"410403"},{"label":"石龙区","value":"410404"},{"label":"湛河区","value":"410411"},{"label":"宝丰县","value":"410421"},{"label":"叶县","value":"410422"},{"label":"鲁山县","value":"410423"},{"label":"郏县","value":"410425"},{"label":"平顶山高新技术产业开发区","value":"410471"},{"label":"平顶山市新城区","value":"410472"},{"label":"舞钢市","value":"410481"},{"label":"汝州市","value":"410482"}],[{"label":"文峰区","value":"410502"},{"label":"北关区","value":"410503"},{"label":"殷都区","value":"410505"},{"label":"龙安区","value":"410506"},{"label":"安阳县","value":"410522"},{"label":"汤阴县","value":"410523"},{"label":"滑县","value":"410526"},{"label":"内黄县","value":"410527"},{"label":"安阳高新技术产业开发区","value":"410571"},{"label":"林州市","value":"410581"}],[{"label":"鹤山区","value":"410602"},{"label":"山城区","value":"410603"},{"label":"淇滨区","value":"410611"},{"label":"浚县","value":"410621"},{"label":"淇县","value":"410622"},{"label":"鹤壁经济技术开发区","value":"410671"}],[{"label":"红旗区","value":"410702"},{"label":"卫滨区","value":"410703"},{"label":"凤泉区","value":"410704"},{"label":"牧野区","value":"410711"},{"label":"新乡县","value":"410721"},{"label":"获嘉县","value":"410724"},{"label":"原阳县","value":"410725"},{"label":"延津县","value":"410726"},{"label":"封丘县","value":"410727"},{"label":"长垣县","value":"410728"},{"label":"新乡高新技术产业开发区","value":"410771"},{"label":"新乡经济技术开发区","value":"410772"},{"label":"新乡市平原城乡一体化示范区","value":"410773"},{"label":"卫辉市","value":"410781"},{"label":"辉县市","value":"410782"}],[{"label":"解放区","value":"410802"},{"label":"中站区","value":"410803"},{"label":"马村区","value":"410804"},{"label":"山阳区","value":"410811"},{"label":"修武县","value":"410821"},{"label":"博爱县","value":"410822"},{"label":"武陟县","value":"410823"},{"label":"温县","value":"410825"},{"label":"焦作城乡一体化示范区","value":"410871"},{"label":"沁阳市","value":"410882"},{"label":"孟州市","value":"410883"}],[{"label":"华龙区","value":"410902"},{"label":"清丰县","value":"410922"},{"label":"南乐县","value":"410923"},{"label":"范县","value":"410926"},{"label":"台前县","value":"410927"},{"label":"濮阳县","value":"410928"},{"label":"河南濮阳工业园区","value":"410971"},{"label":"濮阳经济技术开发区","value":"410972"}],[{"label":"魏都区","value":"411002"},{"label":"建安区","value":"411003"},{"label":"鄢陵县","value":"411024"},{"label":"襄城县","value":"411025"},{"label":"许昌经济技术开发区","value":"411071"},{"label":"禹州市","value":"411081"},{"label":"长葛市","value":"411082"}],[{"label":"源汇区","value":"411102"},{"label":"郾城区","value":"411103"},{"label":"召陵区","value":"411104"},{"label":"舞阳县","value":"411121"},{"label":"临颍县","value":"411122"},{"label":"漯河经济技术开发区","value":"411171"}],[{"label":"湖滨区","value":"411202"},{"label":"陕州区","value":"411203"},{"label":"渑池县","value":"411221"},{"label":"卢氏县","value":"411224"},{"label":"河南三门峡经济开发区","value":"411271"},{"label":"义马市","value":"411281"},{"label":"灵宝市","value":"411282"}],[{"label":"宛城区","value":"411302"},{"label":"卧龙区","value":"411303"},{"label":"南召县","value":"411321"},{"label":"方城县","value":"411322"},{"label":"西峡县","value":"411323"},{"label":"镇平县","value":"411324"},{"label":"内乡县","value":"411325"},{"label":"淅川县","value":"411326"},{"label":"社旗县","value":"411327"},{"label":"唐河县","value":"411328"},{"label":"新野县","value":"411329"},{"label":"桐柏县","value":"411330"},{"label":"南阳高新技术产业开发区","value":"411371"},{"label":"南阳市城乡一体化示范区","value":"411372"},{"label":"邓州市","value":"411381"}],[{"label":"梁园区","value":"411402"},{"label":"睢阳区","value":"411403"},{"label":"民权县","value":"411421"},{"label":"睢县","value":"411422"},{"label":"宁陵县","value":"411423"},{"label":"柘城县","value":"411424"},{"label":"虞城县","value":"411425"},{"label":"夏邑县","value":"411426"},{"label":"豫东综合物流产业聚集区","value":"411471"},{"label":"河南商丘经济开发区","value":"411472"},{"label":"永城市","value":"411481"}],[{"label":"浉河区","value":"411502"},{"label":"平桥区","value":"411503"},{"label":"罗山县","value":"411521"},{"label":"光山县","value":"411522"},{"label":"新县","value":"411523"},{"label":"商城县","value":"411524"},{"label":"固始县","value":"411525"},{"label":"潢川县","value":"411526"},{"label":"淮滨县","value":"411527"},{"label":"息县","value":"411528"},{"label":"信阳高新技术产业开发区","value":"411571"}],[{"label":"川汇区","value":"411602"},{"label":"扶沟县","value":"411621"},{"label":"西华县","value":"411622"},{"label":"商水县","value":"411623"},{"label":"沈丘县","value":"411624"},{"label":"郸城县","value":"411625"},{"label":"淮阳县","value":"411626"},{"label":"太康县","value":"411627"},{"label":"鹿邑县","value":"411628"},{"label":"河南周口经济开发区","value":"411671"},{"label":"项城市","value":"411681"}],[{"label":"驿城区","value":"411702"},{"label":"西平县","value":"411721"},{"label":"上蔡县","value":"411722"},{"label":"平舆县","value":"411723"},{"label":"正阳县","value":"411724"},{"label":"确山县","value":"411725"},{"label":"泌阳县","value":"411726"},{"label":"汝南县","value":"411727"},{"label":"遂平县","value":"411728"},{"label":"新蔡县","value":"411729"},{"label":"河南驻马店经济开发区","value":"411771"}],[{"label":"济源市","value":"419001"}]],[[{"label":"江岸区","value":"420102"},{"label":"江汉区","value":"420103"},{"label":"硚口区","value":"420104"},{"label":"汉阳区","value":"420105"},{"label":"武昌区","value":"420106"},{"label":"青山区","value":"420107"},{"label":"洪山区","value":"420111"},{"label":"东西湖区","value":"420112"},{"label":"汉南区","value":"420113"},{"label":"蔡甸区","value":"420114"},{"label":"江夏区","value":"420115"},{"label":"黄陂区","value":"420116"},{"label":"新洲区","value":"420117"}],[{"label":"黄石港区","value":"420202"},{"label":"西塞山区","value":"420203"},{"label":"下陆区","value":"420204"},{"label":"铁山区","value":"420205"},{"label":"阳新县","value":"420222"},{"label":"大冶市","value":"420281"}],[{"label":"茅箭区","value":"420302"},{"label":"张湾区","value":"420303"},{"label":"郧阳区","value":"420304"},{"label":"郧西县","value":"420322"},{"label":"竹山县","value":"420323"},{"label":"竹溪县","value":"420324"},{"label":"房县","value":"420325"},{"label":"丹江口市","value":"420381"}],[{"label":"西陵区","value":"420502"},{"label":"伍家岗区","value":"420503"},{"label":"点军区","value":"420504"},{"label":"猇亭区","value":"420505"},{"label":"夷陵区","value":"420506"},{"label":"远安县","value":"420525"},{"label":"兴山县","value":"420526"},{"label":"秭归县","value":"420527"},{"label":"长阳土家族自治县","value":"420528"},{"label":"五峰土家族自治县","value":"420529"},{"label":"宜都市","value":"420581"},{"label":"当阳市","value":"420582"},{"label":"枝江市","value":"420583"}],[{"label":"襄城区","value":"420602"},{"label":"樊城区","value":"420606"},{"label":"襄州区","value":"420607"},{"label":"南漳县","value":"420624"},{"label":"谷城县","value":"420625"},{"label":"保康县","value":"420626"},{"label":"老河口市","value":"420682"},{"label":"枣阳市","value":"420683"},{"label":"宜城市","value":"420684"}],[{"label":"梁子湖区","value":"420702"},{"label":"华容区","value":"420703"},{"label":"鄂城区","value":"420704"}],[{"label":"东宝区","value":"420802"},{"label":"掇刀区","value":"420804"},{"label":"京山县","value":"420821"},{"label":"沙洋县","value":"420822"},{"label":"钟祥市","value":"420881"}],[{"label":"孝南区","value":"420902"},{"label":"孝昌县","value":"420921"},{"label":"大悟县","value":"420922"},{"label":"云梦县","value":"420923"},{"label":"应城市","value":"420981"},{"label":"安陆市","value":"420982"},{"label":"汉川市","value":"420984"}],[{"label":"沙市区","value":"421002"},{"label":"荆州区","value":"421003"},{"label":"公安县","value":"421022"},{"label":"监利县","value":"421023"},{"label":"江陵县","value":"421024"},{"label":"荆州经济技术开发区","value":"421071"},{"label":"石首市","value":"421081"},{"label":"洪湖市","value":"421083"},{"label":"松滋市","value":"421087"}],[{"label":"黄州区","value":"421102"},{"label":"团风县","value":"421121"},{"label":"红安县","value":"421122"},{"label":"罗田县","value":"421123"},{"label":"英山县","value":"421124"},{"label":"浠水县","value":"421125"},{"label":"蕲春县","value":"421126"},{"label":"黄梅县","value":"421127"},{"label":"龙感湖管理区","value":"421171"},{"label":"麻城市","value":"421181"},{"label":"武穴市","value":"421182"}],[{"label":"咸安区","value":"421202"},{"label":"嘉鱼县","value":"421221"},{"label":"通城县","value":"421222"},{"label":"崇阳县","value":"421223"},{"label":"通山县","value":"421224"},{"label":"赤壁市","value":"421281"}],[{"label":"曾都区","value":"421303"},{"label":"随县","value":"421321"},{"label":"广水市","value":"421381"}],[{"label":"恩施市","value":"422801"},{"label":"利川市","value":"422802"},{"label":"建始县","value":"422822"},{"label":"巴东县","value":"422823"},{"label":"宣恩县","value":"422825"},{"label":"咸丰县","value":"422826"},{"label":"来凤县","value":"422827"},{"label":"鹤峰县","value":"422828"}],[{"label":"仙桃市","value":"429004"},{"label":"潜江市","value":"429005"},{"label":"天门市","value":"429006"},{"label":"神农架林区","value":"429021"}]],[[{"label":"芙蓉区","value":"430102"},{"label":"天心区","value":"430103"},{"label":"岳麓区","value":"430104"},{"label":"开福区","value":"430105"},{"label":"雨花区","value":"430111"},{"label":"望城区","value":"430112"},{"label":"长沙县","value":"430121"},{"label":"浏阳市","value":"430181"},{"label":"宁乡市","value":"430182"}],[{"label":"荷塘区","value":"430202"},{"label":"芦淞区","value":"430203"},{"label":"石峰区","value":"430204"},{"label":"天元区","value":"430211"},{"label":"株洲县","value":"430221"},{"label":"攸县","value":"430223"},{"label":"茶陵县","value":"430224"},{"label":"炎陵县","value":"430225"},{"label":"云龙示范区","value":"430271"},{"label":"醴陵市","value":"430281"}],[{"label":"雨湖区","value":"430302"},{"label":"岳塘区","value":"430304"},{"label":"湘潭县","value":"430321"},{"label":"湖南湘潭高新技术产业园区","value":"430371"},{"label":"湘潭昭山示范区","value":"430372"},{"label":"湘潭九华示范区","value":"430373"},{"label":"湘乡市","value":"430381"},{"label":"韶山市","value":"430382"}],[{"label":"珠晖区","value":"430405"},{"label":"雁峰区","value":"430406"},{"label":"石鼓区","value":"430407"},{"label":"蒸湘区","value":"430408"},{"label":"南岳区","value":"430412"},{"label":"衡阳县","value":"430421"},{"label":"衡南县","value":"430422"},{"label":"衡山县","value":"430423"},{"label":"衡东县","value":"430424"},{"label":"祁东县","value":"430426"},{"label":"衡阳综合保税区","value":"430471"},{"label":"湖南衡阳高新技术产业园区","value":"430472"},{"label":"湖南衡阳松木经济开发区","value":"430473"},{"label":"耒阳市","value":"430481"},{"label":"常宁市","value":"430482"}],[{"label":"双清区","value":"430502"},{"label":"大祥区","value":"430503"},{"label":"北塔区","value":"430511"},{"label":"邵东县","value":"430521"},{"label":"新邵县","value":"430522"},{"label":"邵阳县","value":"430523"},{"label":"隆回县","value":"430524"},{"label":"洞口县","value":"430525"},{"label":"绥宁县","value":"430527"},{"label":"新宁县","value":"430528"},{"label":"城步苗族自治县","value":"430529"},{"label":"武冈市","value":"430581"}],[{"label":"岳阳楼区","value":"430602"},{"label":"云溪区","value":"430603"},{"label":"君山区","value":"430611"},{"label":"岳阳县","value":"430621"},{"label":"华容县","value":"430623"},{"label":"湘阴县","value":"430624"},{"label":"平江县","value":"430626"},{"label":"岳阳市屈原管理区","value":"430671"},{"label":"汨罗市","value":"430681"},{"label":"临湘市","value":"430682"}],[{"label":"武陵区","value":"430702"},{"label":"鼎城区","value":"430703"},{"label":"安乡县","value":"430721"},{"label":"汉寿县","value":"430722"},{"label":"澧县","value":"430723"},{"label":"临澧县","value":"430724"},{"label":"桃源县","value":"430725"},{"label":"石门县","value":"430726"},{"label":"常德市西洞庭管理区","value":"430771"},{"label":"津市市","value":"430781"}],[{"label":"永定区","value":"430802"},{"label":"武陵源区","value":"430811"},{"label":"慈利县","value":"430821"},{"label":"桑植县","value":"430822"}],[{"label":"资阳区","value":"430902"},{"label":"赫山区","value":"430903"},{"label":"南县","value":"430921"},{"label":"桃江县","value":"430922"},{"label":"安化县","value":"430923"},{"label":"益阳市大通湖管理区","value":"430971"},{"label":"湖南益阳高新技术产业园区","value":"430972"},{"label":"沅江市","value":"430981"}],[{"label":"北湖区","value":"431002"},{"label":"苏仙区","value":"431003"},{"label":"桂阳县","value":"431021"},{"label":"宜章县","value":"431022"},{"label":"永兴县","value":"431023"},{"label":"嘉禾县","value":"431024"},{"label":"临武县","value":"431025"},{"label":"汝城县","value":"431026"},{"label":"桂东县","value":"431027"},{"label":"安仁县","value":"431028"},{"label":"资兴市","value":"431081"}],[{"label":"零陵区","value":"431102"},{"label":"冷水滩区","value":"431103"},{"label":"祁阳县","value":"431121"},{"label":"东安县","value":"431122"},{"label":"双牌县","value":"431123"},{"label":"道县","value":"431124"},{"label":"江永县","value":"431125"},{"label":"宁远县","value":"431126"},{"label":"蓝山县","value":"431127"},{"label":"新田县","value":"431128"},{"label":"江华瑶族自治县","value":"431129"},{"label":"永州经济技术开发区","value":"431171"},{"label":"永州市金洞管理区","value":"431172"},{"label":"永州市回龙圩管理区","value":"431173"}],[{"label":"鹤城区","value":"431202"},{"label":"中方县","value":"431221"},{"label":"沅陵县","value":"431222"},{"label":"辰溪县","value":"431223"},{"label":"溆浦县","value":"431224"},{"label":"会同县","value":"431225"},{"label":"麻阳苗族自治县","value":"431226"},{"label":"新晃侗族自治县","value":"431227"},{"label":"芷江侗族自治县","value":"431228"},{"label":"靖州苗族侗族自治县","value":"431229"},{"label":"通道侗族自治县","value":"431230"},{"label":"怀化市洪江管理区","value":"431271"},{"label":"洪江市","value":"431281"}],[{"label":"娄星区","value":"431302"},{"label":"双峰县","value":"431321"},{"label":"新化县","value":"431322"},{"label":"冷水江市","value":"431381"},{"label":"涟源市","value":"431382"}],[{"label":"吉首市","value":"433101"},{"label":"泸溪县","value":"433122"},{"label":"凤凰县","value":"433123"},{"label":"花垣县","value":"433124"},{"label":"保靖县","value":"433125"},{"label":"古丈县","value":"433126"},{"label":"永顺县","value":"433127"},{"label":"龙山县","value":"433130"},{"label":"湖南吉首经济开发区","value":"433172"},{"label":"湖南永顺经济开发区","value":"433173"}]],[[{"label":"荔湾区","value":"440103"},{"label":"越秀区","value":"440104"},{"label":"海珠区","value":"440105"},{"label":"天河区","value":"440106"},{"label":"白云区","value":"440111"},{"label":"黄埔区","value":"440112"},{"label":"番禺区","value":"440113"},{"label":"花都区","value":"440114"},{"label":"南沙区","value":"440115"},{"label":"从化区","value":"440117"},{"label":"增城区","value":"440118"}],[{"label":"武江区","value":"440203"},{"label":"浈江区","value":"440204"},{"label":"曲江区","value":"440205"},{"label":"始兴县","value":"440222"},{"label":"仁化县","value":"440224"},{"label":"翁源县","value":"440229"},{"label":"乳源瑶族自治县","value":"440232"},{"label":"新丰县","value":"440233"},{"label":"乐昌市","value":"440281"},{"label":"南雄市","value":"440282"}],[{"label":"罗湖区","value":"440303"},{"label":"福田区","value":"440304"},{"label":"南山区","value":"440305"},{"label":"宝安区","value":"440306"},{"label":"龙岗区","value":"440307"},{"label":"盐田区","value":"440308"},{"label":"龙华区","value":"440309"},{"label":"坪山区","value":"440310"}],[{"label":"香洲区","value":"440402"},{"label":"斗门区","value":"440403"},{"label":"金湾区","value":"440404"}],[{"label":"龙湖区","value":"440507"},{"label":"金平区","value":"440511"},{"label":"濠江区","value":"440512"},{"label":"潮阳区","value":"440513"},{"label":"潮南区","value":"440514"},{"label":"澄海区","value":"440515"},{"label":"南澳县","value":"440523"}],[{"label":"禅城区","value":"440604"},{"label":"南海区","value":"440605"},{"label":"顺德区","value":"440606"},{"label":"三水区","value":"440607"},{"label":"高明区","value":"440608"}],[{"label":"蓬江区","value":"440703"},{"label":"江海区","value":"440704"},{"label":"新会区","value":"440705"},{"label":"台山市","value":"440781"},{"label":"开平市","value":"440783"},{"label":"鹤山市","value":"440784"},{"label":"恩平市","value":"440785"}],[{"label":"赤坎区","value":"440802"},{"label":"霞山区","value":"440803"},{"label":"坡头区","value":"440804"},{"label":"麻章区","value":"440811"},{"label":"遂溪县","value":"440823"},{"label":"徐闻县","value":"440825"},{"label":"廉江市","value":"440881"},{"label":"雷州市","value":"440882"},{"label":"吴川市","value":"440883"}],[{"label":"茂南区","value":"440902"},{"label":"电白区","value":"440904"},{"label":"高州市","value":"440981"},{"label":"化州市","value":"440982"},{"label":"信宜市","value":"440983"}],[{"label":"端州区","value":"441202"},{"label":"鼎湖区","value":"441203"},{"label":"高要区","value":"441204"},{"label":"广宁县","value":"441223"},{"label":"怀集县","value":"441224"},{"label":"封开县","value":"441225"},{"label":"德庆县","value":"441226"},{"label":"四会市","value":"441284"}],[{"label":"惠城区","value":"441302"},{"label":"惠阳区","value":"441303"},{"label":"博罗县","value":"441322"},{"label":"惠东县","value":"441323"},{"label":"龙门县","value":"441324"}],[{"label":"梅江区","value":"441402"},{"label":"梅县区","value":"441403"},{"label":"大埔县","value":"441422"},{"label":"丰顺县","value":"441423"},{"label":"五华县","value":"441424"},{"label":"平远县","value":"441426"},{"label":"蕉岭县","value":"441427"},{"label":"兴宁市","value":"441481"}],[{"label":"城区","value":"441502"},{"label":"海丰县","value":"441521"},{"label":"陆河县","value":"441523"},{"label":"陆丰市","value":"441581"}],[{"label":"源城区","value":"441602"},{"label":"紫金县","value":"441621"},{"label":"龙川县","value":"441622"},{"label":"连平县","value":"441623"},{"label":"和平县","value":"441624"},{"label":"东源县","value":"441625"}],[{"label":"江城区","value":"441702"},{"label":"阳东区","value":"441704"},{"label":"阳西县","value":"441721"},{"label":"阳春市","value":"441781"}],[{"label":"清城区","value":"441802"},{"label":"清新区","value":"441803"},{"label":"佛冈县","value":"441821"},{"label":"阳山县","value":"441823"},{"label":"连山壮族瑶族自治县","value":"441825"},{"label":"连南瑶族自治县","value":"441826"},{"label":"英德市","value":"441881"},{"label":"连州市","value":"441882"}],[{"label":"东莞市","value":"441900"}],[{"label":"中山市","value":"442000"}],[{"label":"湘桥区","value":"445102"},{"label":"潮安区","value":"445103"},{"label":"饶平县","value":"445122"}],[{"label":"榕城区","value":"445202"},{"label":"揭东区","value":"445203"},{"label":"揭西县","value":"445222"},{"label":"惠来县","value":"445224"},{"label":"普宁市","value":"445281"}],[{"label":"云城区","value":"445302"},{"label":"云安区","value":"445303"},{"label":"新兴县","value":"445321"},{"label":"郁南县","value":"445322"},{"label":"罗定市","value":"445381"}]],[[{"label":"兴宁区","value":"450102"},{"label":"青秀区","value":"450103"},{"label":"江南区","value":"450105"},{"label":"西乡塘区","value":"450107"},{"label":"良庆区","value":"450108"},{"label":"邕宁区","value":"450109"},{"label":"武鸣区","value":"450110"},{"label":"隆安县","value":"450123"},{"label":"马山县","value":"450124"},{"label":"上林县","value":"450125"},{"label":"宾阳县","value":"450126"},{"label":"横县","value":"450127"}],[{"label":"城中区","value":"450202"},{"label":"鱼峰区","value":"450203"},{"label":"柳南区","value":"450204"},{"label":"柳北区","value":"450205"},{"label":"柳江区","value":"450206"},{"label":"柳城县","value":"450222"},{"label":"鹿寨县","value":"450223"},{"label":"融安县","value":"450224"},{"label":"融水苗族自治县","value":"450225"},{"label":"三江侗族自治县","value":"450226"}],[{"label":"秀峰区","value":"450302"},{"label":"叠彩区","value":"450303"},{"label":"象山区","value":"450304"},{"label":"七星区","value":"450305"},{"label":"雁山区","value":"450311"},{"label":"临桂区","value":"450312"},{"label":"阳朔县","value":"450321"},{"label":"灵川县","value":"450323"},{"label":"全州县","value":"450324"},{"label":"兴安县","value":"450325"},{"label":"永福县","value":"450326"},{"label":"灌阳县","value":"450327"},{"label":"龙胜各族自治县","value":"450328"},{"label":"资源县","value":"450329"},{"label":"平乐县","value":"450330"},{"label":"荔浦县","value":"450331"},{"label":"恭城瑶族自治县","value":"450332"}],[{"label":"万秀区","value":"450403"},{"label":"长洲区","value":"450405"},{"label":"龙圩区","value":"450406"},{"label":"苍梧县","value":"450421"},{"label":"藤县","value":"450422"},{"label":"蒙山县","value":"450423"},{"label":"岑溪市","value":"450481"}],[{"label":"海城区","value":"450502"},{"label":"银海区","value":"450503"},{"label":"铁山港区","value":"450512"},{"label":"合浦县","value":"450521"}],[{"label":"港口区","value":"450602"},{"label":"防城区","value":"450603"},{"label":"上思县","value":"450621"},{"label":"东兴市","value":"450681"}],[{"label":"钦南区","value":"450702"},{"label":"钦北区","value":"450703"},{"label":"灵山县","value":"450721"},{"label":"浦北县","value":"450722"}],[{"label":"港北区","value":"450802"},{"label":"港南区","value":"450803"},{"label":"覃塘区","value":"450804"},{"label":"平南县","value":"450821"},{"label":"桂平市","value":"450881"}],[{"label":"玉州区","value":"450902"},{"label":"福绵区","value":"450903"},{"label":"容县","value":"450921"},{"label":"陆川县","value":"450922"},{"label":"博白县","value":"450923"},{"label":"兴业县","value":"450924"},{"label":"北流市","value":"450981"}],[{"label":"右江区","value":"451002"},{"label":"田阳县","value":"451021"},{"label":"田东县","value":"451022"},{"label":"平果县","value":"451023"},{"label":"德保县","value":"451024"},{"label":"那坡县","value":"451026"},{"label":"凌云县","value":"451027"},{"label":"乐业县","value":"451028"},{"label":"田林县","value":"451029"},{"label":"西林县","value":"451030"},{"label":"隆林各族自治县","value":"451031"},{"label":"靖西市","value":"451081"}],[{"label":"八步区","value":"451102"},{"label":"平桂区","value":"451103"},{"label":"昭平县","value":"451121"},{"label":"钟山县","value":"451122"},{"label":"富川瑶族自治县","value":"451123"}],[{"label":"金城江区","value":"451202"},{"label":"宜州区","value":"451203"},{"label":"南丹县","value":"451221"},{"label":"天峨县","value":"451222"},{"label":"凤山县","value":"451223"},{"label":"东兰县","value":"451224"},{"label":"罗城仫佬族自治县","value":"451225"},{"label":"环江毛南族自治县","value":"451226"},{"label":"巴马瑶族自治县","value":"451227"},{"label":"都安瑶族自治县","value":"451228"},{"label":"大化瑶族自治县","value":"451229"}],[{"label":"兴宾区","value":"451302"},{"label":"忻城县","value":"451321"},{"label":"象州县","value":"451322"},{"label":"武宣县","value":"451323"},{"label":"金秀瑶族自治县","value":"451324"},{"label":"合山市","value":"451381"}],[{"label":"江州区","value":"451402"},{"label":"扶绥县","value":"451421"},{"label":"宁明县","value":"451422"},{"label":"龙州县","value":"451423"},{"label":"大新县","value":"451424"},{"label":"天等县","value":"451425"},{"label":"凭祥市","value":"451481"}]],[[{"label":"秀英区","value":"460105"},{"label":"龙华区","value":"460106"},{"label":"琼山区","value":"460107"},{"label":"美兰区","value":"460108"}],[{"label":"海棠区","value":"460202"},{"label":"吉阳区","value":"460203"},{"label":"天涯区","value":"460204"},{"label":"崖州区","value":"460205"}],[{"label":"西沙群岛","value":"460321"},{"label":"南沙群岛","value":"460322"},{"label":"中沙群岛的岛礁及其海域","value":"460323"}],[{"label":"儋州市","value":"460400"}],[{"label":"五指山市","value":"469001"},{"label":"琼海市","value":"469002"},{"label":"文昌市","value":"469005"},{"label":"万宁市","value":"469006"},{"label":"东方市","value":"469007"},{"label":"定安县","value":"469021"},{"label":"屯昌县","value":"469022"},{"label":"澄迈县","value":"469023"},{"label":"临高县","value":"469024"},{"label":"白沙黎族自治县","value":"469025"},{"label":"昌江黎族自治县","value":"469026"},{"label":"乐东黎族自治县","value":"469027"},{"label":"陵水黎族自治县","value":"469028"},{"label":"保亭黎族苗族自治县","value":"469029"},{"label":"琼中黎族苗族自治县","value":"469030"}]],[[{"label":"万州区","value":"500101"},{"label":"涪陵区","value":"500102"},{"label":"渝中区","value":"500103"},{"label":"大渡口区","value":"500104"},{"label":"江北区","value":"500105"},{"label":"沙坪坝区","value":"500106"},{"label":"九龙坡区","value":"500107"},{"label":"南岸区","value":"500108"},{"label":"北碚区","value":"500109"},{"label":"綦江区","value":"500110"},{"label":"大足区","value":"500111"},{"label":"渝北区","value":"500112"},{"label":"巴南区","value":"500113"},{"label":"黔江区","value":"500114"},{"label":"长寿区","value":"500115"},{"label":"江津区","value":"500116"},{"label":"合川区","value":"500117"},{"label":"永川区","value":"500118"},{"label":"南川区","value":"500119"},{"label":"璧山区","value":"500120"},{"label":"铜梁区","value":"500151"},{"label":"潼南区","value":"500152"},{"label":"荣昌区","value":"500153"},{"label":"开州区","value":"500154"},{"label":"梁平区","value":"500155"},{"label":"武隆区","value":"500156"}],[{"label":"城口县","value":"500229"},{"label":"丰都县","value":"500230"},{"label":"垫江县","value":"500231"},{"label":"忠县","value":"500233"},{"label":"云阳县","value":"500235"},{"label":"奉节县","value":"500236"},{"label":"巫山县","value":"500237"},{"label":"巫溪县","value":"500238"},{"label":"石柱土家族自治县","value":"500240"},{"label":"秀山土家族苗族自治县","value":"500241"},{"label":"酉阳土家族苗族自治县","value":"500242"},{"label":"彭水苗族土家族自治县","value":"500243"}]],[[{"label":"锦江区","value":"510104"},{"label":"青羊区","value":"510105"},{"label":"金牛区","value":"510106"},{"label":"武侯区","value":"510107"},{"label":"成华区","value":"510108"},{"label":"龙泉驿区","value":"510112"},{"label":"青白江区","value":"510113"},{"label":"新都区","value":"510114"},{"label":"温江区","value":"510115"},{"label":"双流区","value":"510116"},{"label":"郫都区","value":"510117"},{"label":"金堂县","value":"510121"},{"label":"大邑县","value":"510129"},{"label":"蒲江县","value":"510131"},{"label":"新津县","value":"510132"},{"label":"都江堰市","value":"510181"},{"label":"彭州市","value":"510182"},{"label":"邛崃市","value":"510183"},{"label":"崇州市","value":"510184"},{"label":"简阳市","value":"510185"}],[{"label":"自流井区","value":"510302"},{"label":"贡井区","value":"510303"},{"label":"大安区","value":"510304"},{"label":"沿滩区","value":"510311"},{"label":"荣县","value":"510321"},{"label":"富顺县","value":"510322"}],[{"label":"东区","value":"510402"},{"label":"西区","value":"510403"},{"label":"仁和区","value":"510411"},{"label":"米易县","value":"510421"},{"label":"盐边县","value":"510422"}],[{"label":"江阳区","value":"510502"},{"label":"纳溪区","value":"510503"},{"label":"龙马潭区","value":"510504"},{"label":"泸县","value":"510521"},{"label":"合江县","value":"510522"},{"label":"叙永县","value":"510524"},{"label":"古蔺县","value":"510525"}],[{"label":"旌阳区","value":"510603"},{"label":"罗江区","value":"510604"},{"label":"中江县","value":"510623"},{"label":"广汉市","value":"510681"},{"label":"什邡市","value":"510682"},{"label":"绵竹市","value":"510683"}],[{"label":"涪城区","value":"510703"},{"label":"游仙区","value":"510704"},{"label":"安州区","value":"510705"},{"label":"三台县","value":"510722"},{"label":"盐亭县","value":"510723"},{"label":"梓潼县","value":"510725"},{"label":"北川羌族自治县","value":"510726"},{"label":"平武县","value":"510727"},{"label":"江油市","value":"510781"}],[{"label":"利州区","value":"510802"},{"label":"昭化区","value":"510811"},{"label":"朝天区","value":"510812"},{"label":"旺苍县","value":"510821"},{"label":"青川县","value":"510822"},{"label":"剑阁县","value":"510823"},{"label":"苍溪县","value":"510824"}],[{"label":"船山区","value":"510903"},{"label":"安居区","value":"510904"},{"label":"蓬溪县","value":"510921"},{"label":"射洪县","value":"510922"},{"label":"大英县","value":"510923"}],[{"label":"市中区","value":"511002"},{"label":"东兴区","value":"511011"},{"label":"威远县","value":"511024"},{"label":"资中县","value":"511025"},{"label":"内江经济开发区","value":"511071"},{"label":"隆昌市","value":"511083"}],[{"label":"市中区","value":"511102"},{"label":"沙湾区","value":"511111"},{"label":"五通桥区","value":"511112"},{"label":"金口河区","value":"511113"},{"label":"犍为县","value":"511123"},{"label":"井研县","value":"511124"},{"label":"夹江县","value":"511126"},{"label":"沐川县","value":"511129"},{"label":"峨边彝族自治县","value":"511132"},{"label":"马边彝族自治县","value":"511133"},{"label":"峨眉山市","value":"511181"}],[{"label":"顺庆区","value":"511302"},{"label":"高坪区","value":"511303"},{"label":"嘉陵区","value":"511304"},{"label":"南部县","value":"511321"},{"label":"营山县","value":"511322"},{"label":"蓬安县","value":"511323"},{"label":"仪陇县","value":"511324"},{"label":"西充县","value":"511325"},{"label":"阆中市","value":"511381"}],[{"label":"东坡区","value":"511402"},{"label":"彭山区","value":"511403"},{"label":"仁寿县","value":"511421"},{"label":"洪雅县","value":"511423"},{"label":"丹棱县","value":"511424"},{"label":"青神县","value":"511425"}],[{"label":"翠屏区","value":"511502"},{"label":"南溪区","value":"511503"},{"label":"宜宾县","value":"511521"},{"label":"江安县","value":"511523"},{"label":"长宁县","value":"511524"},{"label":"高县","value":"511525"},{"label":"珙县","value":"511526"},{"label":"筠连县","value":"511527"},{"label":"兴文县","value":"511528"},{"label":"屏山县","value":"511529"}],[{"label":"广安区","value":"511602"},{"label":"前锋区","value":"511603"},{"label":"岳池县","value":"511621"},{"label":"武胜县","value":"511622"},{"label":"邻水县","value":"511623"},{"label":"华蓥市","value":"511681"}],[{"label":"通川区","value":"511702"},{"label":"达川区","value":"511703"},{"label":"宣汉县","value":"511722"},{"label":"开江县","value":"511723"},{"label":"大竹县","value":"511724"},{"label":"渠县","value":"511725"},{"label":"达州经济开发区","value":"511771"},{"label":"万源市","value":"511781"}],[{"label":"雨城区","value":"511802"},{"label":"名山区","value":"511803"},{"label":"荥经县","value":"511822"},{"label":"汉源县","value":"511823"},{"label":"石棉县","value":"511824"},{"label":"天全县","value":"511825"},{"label":"芦山县","value":"511826"},{"label":"宝兴县","value":"511827"}],[{"label":"巴州区","value":"511902"},{"label":"恩阳区","value":"511903"},{"label":"通江县","value":"511921"},{"label":"南江县","value":"511922"},{"label":"平昌县","value":"511923"},{"label":"巴中经济开发区","value":"511971"}],[{"label":"雁江区","value":"512002"},{"label":"安岳县","value":"512021"},{"label":"乐至县","value":"512022"}],[{"label":"马尔康市","value":"513201"},{"label":"汶川县","value":"513221"},{"label":"理县","value":"513222"},{"label":"茂县","value":"513223"},{"label":"松潘县","value":"513224"},{"label":"九寨沟县","value":"513225"},{"label":"金川县","value":"513226"},{"label":"小金县","value":"513227"},{"label":"黑水县","value":"513228"},{"label":"壤塘县","value":"513230"},{"label":"阿坝县","value":"513231"},{"label":"若尔盖县","value":"513232"},{"label":"红原县","value":"513233"}],[{"label":"康定市","value":"513301"},{"label":"泸定县","value":"513322"},{"label":"丹巴县","value":"513323"},{"label":"九龙县","value":"513324"},{"label":"雅江县","value":"513325"},{"label":"道孚县","value":"513326"},{"label":"炉霍县","value":"513327"},{"label":"甘孜县","value":"513328"},{"label":"新龙县","value":"513329"},{"label":"德格县","value":"513330"},{"label":"白玉县","value":"513331"},{"label":"石渠县","value":"513332"},{"label":"色达县","value":"513333"},{"label":"理塘县","value":"513334"},{"label":"巴塘县","value":"513335"},{"label":"乡城县","value":"513336"},{"label":"稻城县","value":"513337"},{"label":"得荣县","value":"513338"}],[{"label":"西昌市","value":"513401"},{"label":"木里藏族自治县","value":"513422"},{"label":"盐源县","value":"513423"},{"label":"德昌县","value":"513424"},{"label":"会理县","value":"513425"},{"label":"会东县","value":"513426"},{"label":"宁南县","value":"513427"},{"label":"普格县","value":"513428"},{"label":"布拖县","value":"513429"},{"label":"金阳县","value":"513430"},{"label":"昭觉县","value":"513431"},{"label":"喜德县","value":"513432"},{"label":"冕宁县","value":"513433"},{"label":"越西县","value":"513434"},{"label":"甘洛县","value":"513435"},{"label":"美姑县","value":"513436"},{"label":"雷波县","value":"513437"}]],[[{"label":"南明区","value":"520102"},{"label":"云岩区","value":"520103"},{"label":"花溪区","value":"520111"},{"label":"乌当区","value":"520112"},{"label":"白云区","value":"520113"},{"label":"观山湖区","value":"520115"},{"label":"开阳县","value":"520121"},{"label":"息烽县","value":"520122"},{"label":"修文县","value":"520123"},{"label":"清镇市","value":"520181"}],[{"label":"钟山区","value":"520201"},{"label":"六枝特区","value":"520203"},{"label":"水城县","value":"520221"},{"label":"盘州市","value":"520281"}],[{"label":"红花岗区","value":"520302"},{"label":"汇川区","value":"520303"},{"label":"播州区","value":"520304"},{"label":"桐梓县","value":"520322"},{"label":"绥阳县","value":"520323"},{"label":"正安县","value":"520324"},{"label":"道真仡佬族苗族自治县","value":"520325"},{"label":"务川仡佬族苗族自治县","value":"520326"},{"label":"凤冈县","value":"520327"},{"label":"湄潭县","value":"520328"},{"label":"余庆县","value":"520329"},{"label":"习水县","value":"520330"},{"label":"赤水市","value":"520381"},{"label":"仁怀市","value":"520382"}],[{"label":"西秀区","value":"520402"},{"label":"平坝区","value":"520403"},{"label":"普定县","value":"520422"},{"label":"镇宁布依族苗族自治县","value":"520423"},{"label":"关岭布依族苗族自治县","value":"520424"},{"label":"紫云苗族布依族自治县","value":"520425"}],[{"label":"七星关区","value":"520502"},{"label":"大方县","value":"520521"},{"label":"黔西县","value":"520522"},{"label":"金沙县","value":"520523"},{"label":"织金县","value":"520524"},{"label":"纳雍县","value":"520525"},{"label":"威宁彝族回族苗族自治县","value":"520526"},{"label":"赫章县","value":"520527"}],[{"label":"碧江区","value":"520602"},{"label":"万山区","value":"520603"},{"label":"江口县","value":"520621"},{"label":"玉屏侗族自治县","value":"520622"},{"label":"石阡县","value":"520623"},{"label":"思南县","value":"520624"},{"label":"印江土家族苗族自治县","value":"520625"},{"label":"德江县","value":"520626"},{"label":"沿河土家族自治县","value":"520627"},{"label":"松桃苗族自治县","value":"520628"}],[{"label":"兴义市","value":"522301"},{"label":"兴仁县","value":"522322"},{"label":"普安县","value":"522323"},{"label":"晴隆县","value":"522324"},{"label":"贞丰县","value":"522325"},{"label":"望谟县","value":"522326"},{"label":"册亨县","value":"522327"},{"label":"安龙县","value":"522328"}],[{"label":"凯里市","value":"522601"},{"label":"黄平县","value":"522622"},{"label":"施秉县","value":"522623"},{"label":"三穗县","value":"522624"},{"label":"镇远县","value":"522625"},{"label":"岑巩县","value":"522626"},{"label":"天柱县","value":"522627"},{"label":"锦屏县","value":"522628"},{"label":"剑河县","value":"522629"},{"label":"台江县","value":"522630"},{"label":"黎平县","value":"522631"},{"label":"榕江县","value":"522632"},{"label":"从江县","value":"522633"},{"label":"雷山县","value":"522634"},{"label":"麻江县","value":"522635"},{"label":"丹寨县","value":"522636"}],[{"label":"都匀市","value":"522701"},{"label":"福泉市","value":"522702"},{"label":"荔波县","value":"522722"},{"label":"贵定县","value":"522723"},{"label":"瓮安县","value":"522725"},{"label":"独山县","value":"522726"},{"label":"平塘县","value":"522727"},{"label":"罗甸县","value":"522728"},{"label":"长顺县","value":"522729"},{"label":"龙里县","value":"522730"},{"label":"惠水县","value":"522731"},{"label":"三都水族自治县","value":"522732"}]],[[{"label":"五华区","value":"530102"},{"label":"盘龙区","value":"530103"},{"label":"官渡区","value":"530111"},{"label":"西山区","value":"530112"},{"label":"东川区","value":"530113"},{"label":"呈贡区","value":"530114"},{"label":"晋宁区","value":"530115"},{"label":"富民县","value":"530124"},{"label":"宜良县","value":"530125"},{"label":"石林彝族自治县","value":"530126"},{"label":"嵩明县","value":"530127"},{"label":"禄劝彝族苗族自治县","value":"530128"},{"label":"寻甸回族彝族自治县","value":"530129"},{"label":"安宁市","value":"530181"}],[{"label":"麒麟区","value":"530302"},{"label":"沾益区","value":"530303"},{"label":"马龙县","value":"530321"},{"label":"陆良县","value":"530322"},{"label":"师宗县","value":"530323"},{"label":"罗平县","value":"530324"},{"label":"富源县","value":"530325"},{"label":"会泽县","value":"530326"},{"label":"宣威市","value":"530381"}],[{"label":"红塔区","value":"530402"},{"label":"江川区","value":"530403"},{"label":"澄江县","value":"530422"},{"label":"通海县","value":"530423"},{"label":"华宁县","value":"530424"},{"label":"易门县","value":"530425"},{"label":"峨山彝族自治县","value":"530426"},{"label":"新平彝族傣族自治县","value":"530427"},{"label":"元江哈尼族彝族傣族自治县","value":"530428"}],[{"label":"隆阳区","value":"530502"},{"label":"施甸县","value":"530521"},{"label":"龙陵县","value":"530523"},{"label":"昌宁县","value":"530524"},{"label":"腾冲市","value":"530581"}],[{"label":"昭阳区","value":"530602"},{"label":"鲁甸县","value":"530621"},{"label":"巧家县","value":"530622"},{"label":"盐津县","value":"530623"},{"label":"大关县","value":"530624"},{"label":"永善县","value":"530625"},{"label":"绥江县","value":"530626"},{"label":"镇雄县","value":"530627"},{"label":"彝良县","value":"530628"},{"label":"威信县","value":"530629"},{"label":"水富县","value":"530630"}],[{"label":"古城区","value":"530702"},{"label":"玉龙纳西族自治县","value":"530721"},{"label":"永胜县","value":"530722"},{"label":"华坪县","value":"530723"},{"label":"宁蒗彝族自治县","value":"530724"}],[{"label":"思茅区","value":"530802"},{"label":"宁洱哈尼族彝族自治县","value":"530821"},{"label":"墨江哈尼族自治县","value":"530822"},{"label":"景东彝族自治县","value":"530823"},{"label":"景谷傣族彝族自治县","value":"530824"},{"label":"镇沅彝族哈尼族拉祜族自治县","value":"530825"},{"label":"江城哈尼族彝族自治县","value":"530826"},{"label":"孟连傣族拉祜族佤族自治县","value":"530827"},{"label":"澜沧拉祜族自治县","value":"530828"},{"label":"西盟佤族自治县","value":"530829"}],[{"label":"临翔区","value":"530902"},{"label":"凤庆县","value":"530921"},{"label":"云县","value":"530922"},{"label":"永德县","value":"530923"},{"label":"镇康县","value":"530924"},{"label":"双江拉祜族佤族布朗族傣族自治县","value":"530925"},{"label":"耿马傣族佤族自治县","value":"530926"},{"label":"沧源佤族自治县","value":"530927"}],[{"label":"楚雄市","value":"532301"},{"label":"双柏县","value":"532322"},{"label":"牟定县","value":"532323"},{"label":"南华县","value":"532324"},{"label":"姚安县","value":"532325"},{"label":"大姚县","value":"532326"},{"label":"永仁县","value":"532327"},{"label":"元谋县","value":"532328"},{"label":"武定县","value":"532329"},{"label":"禄丰县","value":"532331"}],[{"label":"个旧市","value":"532501"},{"label":"开远市","value":"532502"},{"label":"蒙自市","value":"532503"},{"label":"弥勒市","value":"532504"},{"label":"屏边苗族自治县","value":"532523"},{"label":"建水县","value":"532524"},{"label":"石屏县","value":"532525"},{"label":"泸西县","value":"532527"},{"label":"元阳县","value":"532528"},{"label":"红河县","value":"532529"},{"label":"金平苗族瑶族傣族自治县","value":"532530"},{"label":"绿春县","value":"532531"},{"label":"河口瑶族自治县","value":"532532"}],[{"label":"文山市","value":"532601"},{"label":"砚山县","value":"532622"},{"label":"西畴县","value":"532623"},{"label":"麻栗坡县","value":"532624"},{"label":"马关县","value":"532625"},{"label":"丘北县","value":"532626"},{"label":"广南县","value":"532627"},{"label":"富宁县","value":"532628"}],[{"label":"景洪市","value":"532801"},{"label":"勐海县","value":"532822"},{"label":"勐腊县","value":"532823"}],[{"label":"大理市","value":"532901"},{"label":"漾濞彝族自治县","value":"532922"},{"label":"祥云县","value":"532923"},{"label":"宾川县","value":"532924"},{"label":"弥渡县","value":"532925"},{"label":"南涧彝族自治县","value":"532926"},{"label":"巍山彝族回族自治县","value":"532927"},{"label":"永平县","value":"532928"},{"label":"云龙县","value":"532929"},{"label":"洱源县","value":"532930"},{"label":"剑川县","value":"532931"},{"label":"鹤庆县","value":"532932"}],[{"label":"瑞丽市","value":"533102"},{"label":"芒市","value":"533103"},{"label":"梁河县","value":"533122"},{"label":"盈江县","value":"533123"},{"label":"陇川县","value":"533124"}],[{"label":"泸水市","value":"533301"},{"label":"福贡县","value":"533323"},{"label":"贡山独龙族怒族自治县","value":"533324"},{"label":"兰坪白族普米族自治县","value":"533325"}],[{"label":"香格里拉市","value":"533401"},{"label":"德钦县","value":"533422"},{"label":"维西傈僳族自治县","value":"533423"}]],[[{"label":"城关区","value":"540102"},{"label":"堆龙德庆区","value":"540103"},{"label":"林周县","value":"540121"},{"label":"当雄县","value":"540122"},{"label":"尼木县","value":"540123"},{"label":"曲水县","value":"540124"},{"label":"达孜县","value":"540126"},{"label":"墨竹工卡县","value":"540127"},{"label":"格尔木藏青工业园区","value":"540171"},{"label":"拉萨经济技术开发区","value":"540172"},{"label":"西藏文化旅游创意园区","value":"540173"},{"label":"达孜工业园区","value":"540174"}],[{"label":"桑珠孜区","value":"540202"},{"label":"南木林县","value":"540221"},{"label":"江孜县","value":"540222"},{"label":"定日县","value":"540223"},{"label":"萨迦县","value":"540224"},{"label":"拉孜县","value":"540225"},{"label":"昂仁县","value":"540226"},{"label":"谢通门县","value":"540227"},{"label":"白朗县","value":"540228"},{"label":"仁布县","value":"540229"},{"label":"康马县","value":"540230"},{"label":"定结县","value":"540231"},{"label":"仲巴县","value":"540232"},{"label":"亚东县","value":"540233"},{"label":"吉隆县","value":"540234"},{"label":"聂拉木县","value":"540235"},{"label":"萨嘎县","value":"540236"},{"label":"岗巴县","value":"540237"}],[{"label":"卡若区","value":"540302"},{"label":"江达县","value":"540321"},{"label":"贡觉县","value":"540322"},{"label":"类乌齐县","value":"540323"},{"label":"丁青县","value":"540324"},{"label":"察雅县","value":"540325"},{"label":"八宿县","value":"540326"},{"label":"左贡县","value":"540327"},{"label":"芒康县","value":"540328"},{"label":"洛隆县","value":"540329"},{"label":"边坝县","value":"540330"}],[{"label":"巴宜区","value":"540402"},{"label":"工布江达县","value":"540421"},{"label":"米林县","value":"540422"},{"label":"墨脱县","value":"540423"},{"label":"波密县","value":"540424"},{"label":"察隅县","value":"540425"},{"label":"朗县","value":"540426"}],[{"label":"乃东区","value":"540502"},{"label":"扎囊县","value":"540521"},{"label":"贡嘎县","value":"540522"},{"label":"桑日县","value":"540523"},{"label":"琼结县","value":"540524"},{"label":"曲松县","value":"540525"},{"label":"措美县","value":"540526"},{"label":"洛扎县","value":"540527"},{"label":"加查县","value":"540528"},{"label":"隆子县","value":"540529"},{"label":"错那县","value":"540530"},{"label":"浪卡子县","value":"540531"}],[{"label":"那曲县","value":"542421"},{"label":"嘉黎县","value":"542422"},{"label":"比如县","value":"542423"},{"label":"聂荣县","value":"542424"},{"label":"安多县","value":"542425"},{"label":"申扎县","value":"542426"},{"label":"索县","value":"542427"},{"label":"班戈县","value":"542428"},{"label":"巴青县","value":"542429"},{"label":"尼玛县","value":"542430"},{"label":"双湖县","value":"542431"}],[{"label":"普兰县","value":"542521"},{"label":"札达县","value":"542522"},{"label":"噶尔县","value":"542523"},{"label":"日土县","value":"542524"},{"label":"革吉县","value":"542525"},{"label":"改则县","value":"542526"},{"label":"措勤县","value":"542527"}]],[[{"label":"新城区","value":"610102"},{"label":"碑林区","value":"610103"},{"label":"莲湖区","value":"610104"},{"label":"灞桥区","value":"610111"},{"label":"未央区","value":"610112"},{"label":"雁塔区","value":"610113"},{"label":"阎良区","value":"610114"},{"label":"临潼区","value":"610115"},{"label":"长安区","value":"610116"},{"label":"高陵区","value":"610117"},{"label":"鄠邑区","value":"610118"},{"label":"蓝田县","value":"610122"},{"label":"周至县","value":"610124"}],[{"label":"王益区","value":"610202"},{"label":"印台区","value":"610203"},{"label":"耀州区","value":"610204"},{"label":"宜君县","value":"610222"}],[{"label":"渭滨区","value":"610302"},{"label":"金台区","value":"610303"},{"label":"陈仓区","value":"610304"},{"label":"凤翔县","value":"610322"},{"label":"岐山县","value":"610323"},{"label":"扶风县","value":"610324"},{"label":"眉县","value":"610326"},{"label":"陇县","value":"610327"},{"label":"千阳县","value":"610328"},{"label":"麟游县","value":"610329"},{"label":"凤县","value":"610330"},{"label":"太白县","value":"610331"}],[{"label":"秦都区","value":"610402"},{"label":"杨陵区","value":"610403"},{"label":"渭城区","value":"610404"},{"label":"三原县","value":"610422"},{"label":"泾阳县","value":"610423"},{"label":"乾县","value":"610424"},{"label":"礼泉县","value":"610425"},{"label":"永寿县","value":"610426"},{"label":"彬县","value":"610427"},{"label":"长武县","value":"610428"},{"label":"旬邑县","value":"610429"},{"label":"淳化县","value":"610430"},{"label":"武功县","value":"610431"},{"label":"兴平市","value":"610481"}],[{"label":"临渭区","value":"610502"},{"label":"华州区","value":"610503"},{"label":"潼关县","value":"610522"},{"label":"大荔县","value":"610523"},{"label":"合阳县","value":"610524"},{"label":"澄城县","value":"610525"},{"label":"蒲城县","value":"610526"},{"label":"白水县","value":"610527"},{"label":"富平县","value":"610528"},{"label":"韩城市","value":"610581"},{"label":"华阴市","value":"610582"}],[{"label":"宝塔区","value":"610602"},{"label":"安塞区","value":"610603"},{"label":"延长县","value":"610621"},{"label":"延川县","value":"610622"},{"label":"子长县","value":"610623"},{"label":"志丹县","value":"610625"},{"label":"吴起县","value":"610626"},{"label":"甘泉县","value":"610627"},{"label":"富县","value":"610628"},{"label":"洛川县","value":"610629"},{"label":"宜川县","value":"610630"},{"label":"黄龙县","value":"610631"},{"label":"黄陵县","value":"610632"}],[{"label":"汉台区","value":"610702"},{"label":"南郑区","value":"610703"},{"label":"城固县","value":"610722"},{"label":"洋县","value":"610723"},{"label":"西乡县","value":"610724"},{"label":"勉县","value":"610725"},{"label":"宁强县","value":"610726"},{"label":"略阳县","value":"610727"},{"label":"镇巴县","value":"610728"},{"label":"留坝县","value":"610729"},{"label":"佛坪县","value":"610730"}],[{"label":"榆阳区","value":"610802"},{"label":"横山区","value":"610803"},{"label":"府谷县","value":"610822"},{"label":"靖边县","value":"610824"},{"label":"定边县","value":"610825"},{"label":"绥德县","value":"610826"},{"label":"米脂县","value":"610827"},{"label":"佳县","value":"610828"},{"label":"吴堡县","value":"610829"},{"label":"清涧县","value":"610830"},{"label":"子洲县","value":"610831"},{"label":"神木市","value":"610881"}],[{"label":"汉滨区","value":"610902"},{"label":"汉阴县","value":"610921"},{"label":"石泉县","value":"610922"},{"label":"宁陕县","value":"610923"},{"label":"紫阳县","value":"610924"},{"label":"岚皋县","value":"610925"},{"label":"平利县","value":"610926"},{"label":"镇坪县","value":"610927"},{"label":"旬阳县","value":"610928"},{"label":"白河县","value":"610929"}],[{"label":"商州区","value":"611002"},{"label":"洛南县","value":"611021"},{"label":"丹凤县","value":"611022"},{"label":"商南县","value":"611023"},{"label":"山阳县","value":"611024"},{"label":"镇安县","value":"611025"},{"label":"柞水县","value":"611026"}]],[[{"label":"城关区","value":"620102"},{"label":"七里河区","value":"620103"},{"label":"西固区","value":"620104"},{"label":"安宁区","value":"620105"},{"label":"红古区","value":"620111"},{"label":"永登县","value":"620121"},{"label":"皋兰县","value":"620122"},{"label":"榆中县","value":"620123"},{"label":"兰州新区","value":"620171"}],[{"label":"嘉峪关市","value":"620201"}],[{"label":"金川区","value":"620302"},{"label":"永昌县","value":"620321"}],[{"label":"白银区","value":"620402"},{"label":"平川区","value":"620403"},{"label":"靖远县","value":"620421"},{"label":"会宁县","value":"620422"},{"label":"景泰县","value":"620423"}],[{"label":"秦州区","value":"620502"},{"label":"麦积区","value":"620503"},{"label":"清水县","value":"620521"},{"label":"秦安县","value":"620522"},{"label":"甘谷县","value":"620523"},{"label":"武山县","value":"620524"},{"label":"张家川回族自治县","value":"620525"}],[{"label":"凉州区","value":"620602"},{"label":"民勤县","value":"620621"},{"label":"古浪县","value":"620622"},{"label":"天祝藏族自治县","value":"620623"}],[{"label":"甘州区","value":"620702"},{"label":"肃南裕固族自治县","value":"620721"},{"label":"民乐县","value":"620722"},{"label":"临泽县","value":"620723"},{"label":"高台县","value":"620724"},{"label":"山丹县","value":"620725"}],[{"label":"崆峒区","value":"620802"},{"label":"泾川县","value":"620821"},{"label":"灵台县","value":"620822"},{"label":"崇信县","value":"620823"},{"label":"华亭县","value":"620824"},{"label":"庄浪县","value":"620825"},{"label":"静宁县","value":"620826"},{"label":"平凉工业园区","value":"620871"}],[{"label":"肃州区","value":"620902"},{"label":"金塔县","value":"620921"},{"label":"瓜州县","value":"620922"},{"label":"肃北蒙古族自治县","value":"620923"},{"label":"阿克塞哈萨克族自治县","value":"620924"},{"label":"玉门市","value":"620981"},{"label":"敦煌市","value":"620982"}],[{"label":"西峰区","value":"621002"},{"label":"庆城县","value":"621021"},{"label":"环县","value":"621022"},{"label":"华池县","value":"621023"},{"label":"合水县","value":"621024"},{"label":"正宁县","value":"621025"},{"label":"宁县","value":"621026"},{"label":"镇原县","value":"621027"}],[{"label":"安定区","value":"621102"},{"label":"通渭县","value":"621121"},{"label":"陇西县","value":"621122"},{"label":"渭源县","value":"621123"},{"label":"临洮县","value":"621124"},{"label":"漳县","value":"621125"},{"label":"岷县","value":"621126"}],[{"label":"武都区","value":"621202"},{"label":"成县","value":"621221"},{"label":"文县","value":"621222"},{"label":"宕昌县","value":"621223"},{"label":"康县","value":"621224"},{"label":"西和县","value":"621225"},{"label":"礼县","value":"621226"},{"label":"徽县","value":"621227"},{"label":"两当县","value":"621228"}],[{"label":"临夏市","value":"622901"},{"label":"临夏县","value":"622921"},{"label":"康乐县","value":"622922"},{"label":"永靖县","value":"622923"},{"label":"广河县","value":"622924"},{"label":"和政县","value":"622925"},{"label":"东乡族自治县","value":"622926"},{"label":"积石山保安族东乡族撒拉族自治县","value":"622927"}],[{"label":"合作市","value":"623001"},{"label":"临潭县","value":"623021"},{"label":"卓尼县","value":"623022"},{"label":"舟曲县","value":"623023"},{"label":"迭部县","value":"623024"},{"label":"玛曲县","value":"623025"},{"label":"碌曲县","value":"623026"},{"label":"夏河县","value":"623027"}]],[[{"label":"城东区","value":"630102"},{"label":"城中区","value":"630103"},{"label":"城西区","value":"630104"},{"label":"城北区","value":"630105"},{"label":"大通回族土族自治县","value":"630121"},{"label":"湟中县","value":"630122"},{"label":"湟源县","value":"630123"}],[{"label":"乐都区","value":"630202"},{"label":"平安区","value":"630203"},{"label":"民和回族土族自治县","value":"630222"},{"label":"互助土族自治县","value":"630223"},{"label":"化隆回族自治县","value":"630224"},{"label":"循化撒拉族自治县","value":"630225"}],[{"label":"门源回族自治县","value":"632221"},{"label":"祁连县","value":"632222"},{"label":"海晏县","value":"632223"},{"label":"刚察县","value":"632224"}],[{"label":"同仁县","value":"632321"},{"label":"尖扎县","value":"632322"},{"label":"泽库县","value":"632323"},{"label":"河南蒙古族自治县","value":"632324"}],[{"label":"共和县","value":"632521"},{"label":"同德县","value":"632522"},{"label":"贵德县","value":"632523"},{"label":"兴海县","value":"632524"},{"label":"贵南县","value":"632525"}],[{"label":"玛沁县","value":"632621"},{"label":"班玛县","value":"632622"},{"label":"甘德县","value":"632623"},{"label":"达日县","value":"632624"},{"label":"久治县","value":"632625"},{"label":"玛多县","value":"632626"}],[{"label":"玉树市","value":"632701"},{"label":"杂多县","value":"632722"},{"label":"称多县","value":"632723"},{"label":"治多县","value":"632724"},{"label":"囊谦县","value":"632725"},{"label":"曲麻莱县","value":"632726"}],[{"label":"格尔木市","value":"632801"},{"label":"德令哈市","value":"632802"},{"label":"乌兰县","value":"632821"},{"label":"都兰县","value":"632822"},{"label":"天峻县","value":"632823"},{"label":"大柴旦行政委员会","value":"632857"},{"label":"冷湖行政委员会","value":"632858"},{"label":"茫崖行政委员会","value":"632859"}]],[[{"label":"兴庆区","value":"640104"},{"label":"西夏区","value":"640105"},{"label":"金凤区","value":"640106"},{"label":"永宁县","value":"640121"},{"label":"贺兰县","value":"640122"},{"label":"灵武市","value":"640181"}],[{"label":"大武口区","value":"640202"},{"label":"惠农区","value":"640205"},{"label":"平罗县","value":"640221"}],[{"label":"利通区","value":"640302"},{"label":"红寺堡区","value":"640303"},{"label":"盐池县","value":"640323"},{"label":"同心县","value":"640324"},{"label":"青铜峡市","value":"640381"}],[{"label":"原州区","value":"640402"},{"label":"西吉县","value":"640422"},{"label":"隆德县","value":"640423"},{"label":"泾源县","value":"640424"},{"label":"彭阳县","value":"640425"}],[{"label":"沙坡头区","value":"640502"},{"label":"中宁县","value":"640521"},{"label":"海原县","value":"640522"}]],[[{"label":"天山区","value":"650102"},{"label":"沙依巴克区","value":"650103"},{"label":"新市区","value":"650104"},{"label":"水磨沟区","value":"650105"},{"label":"头屯河区","value":"650106"},{"label":"达坂城区","value":"650107"},{"label":"米东区","value":"650109"},{"label":"乌鲁木齐县","value":"650121"},{"label":"乌鲁木齐经济技术开发区","value":"650171"},{"label":"乌鲁木齐高新技术产业开发区","value":"650172"}],[{"label":"独山子区","value":"650202"},{"label":"克拉玛依区","value":"650203"},{"label":"白碱滩区","value":"650204"},{"label":"乌尔禾区","value":"650205"}],[{"label":"高昌区","value":"650402"},{"label":"鄯善县","value":"650421"},{"label":"托克逊县","value":"650422"}],[{"label":"伊州区","value":"650502"},{"label":"巴里坤哈萨克自治县","value":"650521"},{"label":"伊吾县","value":"650522"}],[{"label":"昌吉市","value":"652301"},{"label":"阜康市","value":"652302"},{"label":"呼图壁县","value":"652323"},{"label":"玛纳斯县","value":"652324"},{"label":"奇台县","value":"652325"},{"label":"吉木萨尔县","value":"652327"},{"label":"木垒哈萨克自治县","value":"652328"}],[{"label":"博乐市","value":"652701"},{"label":"阿拉山口市","value":"652702"},{"label":"精河县","value":"652722"},{"label":"温泉县","value":"652723"}],[{"label":"库尔勒市","value":"652801"},{"label":"轮台县","value":"652822"},{"label":"尉犁县","value":"652823"},{"label":"若羌县","value":"652824"},{"label":"且末县","value":"652825"},{"label":"焉耆回族自治县","value":"652826"},{"label":"和静县","value":"652827"},{"label":"和硕县","value":"652828"},{"label":"博湖县","value":"652829"},{"label":"库尔勒经济技术开发区","value":"652871"}],[{"label":"阿克苏市","value":"652901"},{"label":"温宿县","value":"652922"},{"label":"库车县","value":"652923"},{"label":"沙雅县","value":"652924"},{"label":"新和县","value":"652925"},{"label":"拜城县","value":"652926"},{"label":"乌什县","value":"652927"},{"label":"阿瓦提县","value":"652928"},{"label":"柯坪县","value":"652929"}],[{"label":"阿图什市","value":"653001"},{"label":"阿克陶县","value":"653022"},{"label":"阿合奇县","value":"653023"},{"label":"乌恰县","value":"653024"}],[{"label":"喀什市","value":"653101"},{"label":"疏附县","value":"653121"},{"label":"疏勒县","value":"653122"},{"label":"英吉沙县","value":"653123"},{"label":"泽普县","value":"653124"},{"label":"莎车县","value":"653125"},{"label":"叶城县","value":"653126"},{"label":"麦盖提县","value":"653127"},{"label":"岳普湖县","value":"653128"},{"label":"伽师县","value":"653129"},{"label":"巴楚县","value":"653130"},{"label":"塔什库尔干塔吉克自治县","value":"653131"}],[{"label":"和田市","value":"653201"},{"label":"和田县","value":"653221"},{"label":"墨玉县","value":"653222"},{"label":"皮山县","value":"653223"},{"label":"洛浦县","value":"653224"},{"label":"策勒县","value":"653225"},{"label":"于田县","value":"653226"},{"label":"民丰县","value":"653227"}],[{"label":"伊宁市","value":"654002"},{"label":"奎屯市","value":"654003"},{"label":"霍尔果斯市","value":"654004"},{"label":"伊宁县","value":"654021"},{"label":"察布查尔锡伯自治县","value":"654022"},{"label":"霍城县","value":"654023"},{"label":"巩留县","value":"654024"},{"label":"新源县","value":"654025"},{"label":"昭苏县","value":"654026"},{"label":"特克斯县","value":"654027"},{"label":"尼勒克县","value":"654028"}],[{"label":"塔城市","value":"654201"},{"label":"乌苏市","value":"654202"},{"label":"额敏县","value":"654221"},{"label":"沙湾县","value":"654223"},{"label":"托里县","value":"654224"},{"label":"裕民县","value":"654225"},{"label":"和布克赛尔蒙古自治县","value":"654226"}],[{"label":"阿勒泰市","value":"654301"},{"label":"布尔津县","value":"654321"},{"label":"富蕴县","value":"654322"},{"label":"福海县","value":"654323"},{"label":"哈巴河县","value":"654324"},{"label":"青河县","value":"654325"},{"label":"吉木乃县","value":"654326"}],[{"label":"石河子市","value":"659001"},{"label":"阿拉尔市","value":"659002"},{"label":"图木舒克市","value":"659003"},{"label":"五家渠市","value":"659004"},{"label":"铁门关市","value":"659006"}]],[[{"label":"台北","value":"660101"}],[{"label":"高雄","value":"660201"}],[{"label":"基隆","value":"660301"}],[{"label":"台中","value":"660401"}],[{"label":"台南","value":"660501"}],[{"label":"新竹","value":"660601"}],[{"label":"嘉义","value":"660701"}],[{"label":"宜兰","value":"660801"}],[{"label":"桃园","value":"660901"}],[{"label":"苗栗","value":"661001"}],[{"label":"彰化","value":"661101"}],[{"label":"南投","value":"661201"}],[{"label":"云林","value":"661301"}],[{"label":"屏东","value":"661401"}],[{"label":"台东","value":"661501"}],[{"label":"花莲","value":"661601"}],[{"label":"澎湖","value":"661701"}]],[[{"label":"香港岛","value":"670101"}],[{"label":"九龙","value":"670201"}],[{"label":"新界","value":"670301"}]],[[{"label":"澳门半岛","value":"680101"}],[{"label":"氹仔岛","value":"680201"}],[{"label":"路环岛","value":"680301"}],[{"label":"路氹城","value":"680401"}]]];export default areaData;
\ No newline at end of file
diff --git a/tuniao-ui/libs/utils/async-validator.js b/tuniao-ui/libs/utils/async-validator.js
new file mode 100644
index 0000000..d7215b9
--- /dev/null
+++ b/tuniao-ui/libs/utils/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/tuniao-ui/libs/utils/calendar.js b/tuniao-ui/libs/utils/calendar.js
new file mode 100644
index 0000000..da1456a
--- /dev/null
+++ b/tuniao-ui/libs/utils/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
\ No newline at end of file
diff --git a/tuniao-ui/libs/utils/city.js b/tuniao-ui/libs/utils/city.js
new file mode 100644
index 0000000..94169eb
--- /dev/null
+++ b/tuniao-ui/libs/utils/city.js
@@ -0,0 +1 @@
+var cityData=[[{"label":"市辖区","value":"1101"}],[{"label":"市辖区","value":"1201"}],[{"label":"石家庄市","value":"1301"},{"label":"唐山市","value":"1302"},{"label":"秦皇岛市","value":"1303"},{"label":"邯郸市","value":"1304"},{"label":"邢台市","value":"1305"},{"label":"保定市","value":"1306"},{"label":"张家口市","value":"1307"},{"label":"承德市","value":"1308"},{"label":"沧州市","value":"1309"},{"label":"廊坊市","value":"1310"},{"label":"衡水市","value":"1311"}],[{"label":"太原市","value":"1401"},{"label":"大同市","value":"1402"},{"label":"阳泉市","value":"1403"},{"label":"长治市","value":"1404"},{"label":"晋城市","value":"1405"},{"label":"朔州市","value":"1406"},{"label":"晋中市","value":"1407"},{"label":"运城市","value":"1408"},{"label":"忻州市","value":"1409"},{"label":"临汾市","value":"1410"},{"label":"吕梁市","value":"1411"}],[{"label":"呼和浩特市","value":"1501"},{"label":"包头市","value":"1502"},{"label":"乌海市","value":"1503"},{"label":"赤峰市","value":"1504"},{"label":"通辽市","value":"1505"},{"label":"鄂尔多斯市","value":"1506"},{"label":"呼伦贝尔市","value":"1507"},{"label":"巴彦淖尔市","value":"1508"},{"label":"乌兰察布市","value":"1509"},{"label":"兴安盟","value":"1522"},{"label":"锡林郭勒盟","value":"1525"},{"label":"阿拉善盟","value":"1529"}],[{"label":"沈阳市","value":"2101"},{"label":"大连市","value":"2102"},{"label":"鞍山市","value":"2103"},{"label":"抚顺市","value":"2104"},{"label":"本溪市","value":"2105"},{"label":"丹东市","value":"2106"},{"label":"锦州市","value":"2107"},{"label":"营口市","value":"2108"},{"label":"阜新市","value":"2109"},{"label":"辽阳市","value":"2110"},{"label":"盘锦市","value":"2111"},{"label":"铁岭市","value":"2112"},{"label":"朝阳市","value":"2113"},{"label":"葫芦岛市","value":"2114"}],[{"label":"长春市","value":"2201"},{"label":"吉林市","value":"2202"},{"label":"四平市","value":"2203"},{"label":"辽源市","value":"2204"},{"label":"通化市","value":"2205"},{"label":"白山市","value":"2206"},{"label":"松原市","value":"2207"},{"label":"白城市","value":"2208"},{"label":"延边朝鲜族自治州","value":"2224"}],[{"label":"哈尔滨市","value":"2301"},{"label":"齐齐哈尔市","value":"2302"},{"label":"鸡西市","value":"2303"},{"label":"鹤岗市","value":"2304"},{"label":"双鸭山市","value":"2305"},{"label":"大庆市","value":"2306"},{"label":"伊春市","value":"2307"},{"label":"佳木斯市","value":"2308"},{"label":"七台河市","value":"2309"},{"label":"牡丹江市","value":"2310"},{"label":"黑河市","value":"2311"},{"label":"绥化市","value":"2312"},{"label":"大兴安岭地区","value":"2327"}],[{"label":"市辖区","value":"3101"}],[{"label":"南京市","value":"3201"},{"label":"无锡市","value":"3202"},{"label":"徐州市","value":"3203"},{"label":"常州市","value":"3204"},{"label":"苏州市","value":"3205"},{"label":"南通市","value":"3206"},{"label":"连云港市","value":"3207"},{"label":"淮安市","value":"3208"},{"label":"盐城市","value":"3209"},{"label":"扬州市","value":"3210"},{"label":"镇江市","value":"3211"},{"label":"泰州市","value":"3212"},{"label":"宿迁市","value":"3213"}],[{"label":"杭州市","value":"3301"},{"label":"宁波市","value":"3302"},{"label":"温州市","value":"3303"},{"label":"嘉兴市","value":"3304"},{"label":"湖州市","value":"3305"},{"label":"绍兴市","value":"3306"},{"label":"金华市","value":"3307"},{"label":"衢州市","value":"3308"},{"label":"舟山市","value":"3309"},{"label":"台州市","value":"3310"},{"label":"丽水市","value":"3311"}],[{"label":"合肥市","value":"3401"},{"label":"芜湖市","value":"3402"},{"label":"蚌埠市","value":"3403"},{"label":"淮南市","value":"3404"},{"label":"马鞍山市","value":"3405"},{"label":"淮北市","value":"3406"},{"label":"铜陵市","value":"3407"},{"label":"安庆市","value":"3408"},{"label":"黄山市","value":"3410"},{"label":"滁州市","value":"3411"},{"label":"阜阳市","value":"3412"},{"label":"宿州市","value":"3413"},{"label":"六安市","value":"3415"},{"label":"亳州市","value":"3416"},{"label":"池州市","value":"3417"},{"label":"宣城市","value":"3418"}],[{"label":"福州市","value":"3501"},{"label":"厦门市","value":"3502"},{"label":"莆田市","value":"3503"},{"label":"三明市","value":"3504"},{"label":"泉州市","value":"3505"},{"label":"漳州市","value":"3506"},{"label":"南平市","value":"3507"},{"label":"龙岩市","value":"3508"},{"label":"宁德市","value":"3509"}],[{"label":"南昌市","value":"3601"},{"label":"景德镇市","value":"3602"},{"label":"萍乡市","value":"3603"},{"label":"九江市","value":"3604"},{"label":"新余市","value":"3605"},{"label":"鹰潭市","value":"3606"},{"label":"赣州市","value":"3607"},{"label":"吉安市","value":"3608"},{"label":"宜春市","value":"3609"},{"label":"抚州市","value":"3610"},{"label":"上饶市","value":"3611"}],[{"label":"济南市","value":"3701"},{"label":"青岛市","value":"3702"},{"label":"淄博市","value":"3703"},{"label":"枣庄市","value":"3704"},{"label":"东营市","value":"3705"},{"label":"烟台市","value":"3706"},{"label":"潍坊市","value":"3707"},{"label":"济宁市","value":"3708"},{"label":"泰安市","value":"3709"},{"label":"威海市","value":"3710"},{"label":"日照市","value":"3711"},{"label":"莱芜市","value":"3712"},{"label":"临沂市","value":"3713"},{"label":"德州市","value":"3714"},{"label":"聊城市","value":"3715"},{"label":"滨州市","value":"3716"},{"label":"菏泽市","value":"3717"}],[{"label":"郑州市","value":"4101"},{"label":"开封市","value":"4102"},{"label":"洛阳市","value":"4103"},{"label":"平顶山市","value":"4104"},{"label":"安阳市","value":"4105"},{"label":"鹤壁市","value":"4106"},{"label":"新乡市","value":"4107"},{"label":"焦作市","value":"4108"},{"label":"濮阳市","value":"4109"},{"label":"许昌市","value":"4110"},{"label":"漯河市","value":"4111"},{"label":"三门峡市","value":"4112"},{"label":"南阳市","value":"4113"},{"label":"商丘市","value":"4114"},{"label":"信阳市","value":"4115"},{"label":"周口市","value":"4116"},{"label":"驻马店市","value":"4117"},{"label":"省直辖县级行政区划","value":"4190"}],[{"label":"武汉市","value":"4201"},{"label":"黄石市","value":"4202"},{"label":"十堰市","value":"4203"},{"label":"宜昌市","value":"4205"},{"label":"襄阳市","value":"4206"},{"label":"鄂州市","value":"4207"},{"label":"荆门市","value":"4208"},{"label":"孝感市","value":"4209"},{"label":"荆州市","value":"4210"},{"label":"黄冈市","value":"4211"},{"label":"咸宁市","value":"4212"},{"label":"随州市","value":"4213"},{"label":"恩施土家族苗族自治州","value":"4228"},{"label":"省直辖县级行政区划","value":"4290"}],[{"label":"长沙市","value":"4301"},{"label":"株洲市","value":"4302"},{"label":"湘潭市","value":"4303"},{"label":"衡阳市","value":"4304"},{"label":"邵阳市","value":"4305"},{"label":"岳阳市","value":"4306"},{"label":"常德市","value":"4307"},{"label":"张家界市","value":"4308"},{"label":"益阳市","value":"4309"},{"label":"郴州市","value":"4310"},{"label":"永州市","value":"4311"},{"label":"怀化市","value":"4312"},{"label":"娄底市","value":"4313"},{"label":"湘西土家族苗族自治州","value":"4331"}],[{"label":"广州市","value":"4401"},{"label":"韶关市","value":"4402"},{"label":"深圳市","value":"4403"},{"label":"珠海市","value":"4404"},{"label":"汕头市","value":"4405"},{"label":"佛山市","value":"4406"},{"label":"江门市","value":"4407"},{"label":"湛江市","value":"4408"},{"label":"茂名市","value":"4409"},{"label":"肇庆市","value":"4412"},{"label":"惠州市","value":"4413"},{"label":"梅州市","value":"4414"},{"label":"汕尾市","value":"4415"},{"label":"河源市","value":"4416"},{"label":"阳江市","value":"4417"},{"label":"清远市","value":"4418"},{"label":"东莞市","value":"4419"},{"label":"中山市","value":"4420"},{"label":"潮州市","value":"4451"},{"label":"揭阳市","value":"4452"},{"label":"云浮市","value":"4453"}],[{"label":"南宁市","value":"4501"},{"label":"柳州市","value":"4502"},{"label":"桂林市","value":"4503"},{"label":"梧州市","value":"4504"},{"label":"北海市","value":"4505"},{"label":"防城港市","value":"4506"},{"label":"钦州市","value":"4507"},{"label":"贵港市","value":"4508"},{"label":"玉林市","value":"4509"},{"label":"百色市","value":"4510"},{"label":"贺州市","value":"4511"},{"label":"河池市","value":"4512"},{"label":"来宾市","value":"4513"},{"label":"崇左市","value":"4514"}],[{"label":"海口市","value":"4601"},{"label":"三亚市","value":"4602"},{"label":"三沙市","value":"4603"},{"label":"儋州市","value":"4604"},{"label":"省直辖县级行政区划","value":"4690"}],[{"label":"市辖区","value":"5001"},{"label":"县","value":"5002"}],[{"label":"成都市","value":"5101"},{"label":"自贡市","value":"5103"},{"label":"攀枝花市","value":"5104"},{"label":"泸州市","value":"5105"},{"label":"德阳市","value":"5106"},{"label":"绵阳市","value":"5107"},{"label":"广元市","value":"5108"},{"label":"遂宁市","value":"5109"},{"label":"内江市","value":"5110"},{"label":"乐山市","value":"5111"},{"label":"南充市","value":"5113"},{"label":"眉山市","value":"5114"},{"label":"宜宾市","value":"5115"},{"label":"广安市","value":"5116"},{"label":"达州市","value":"5117"},{"label":"雅安市","value":"5118"},{"label":"巴中市","value":"5119"},{"label":"资阳市","value":"5120"},{"label":"阿坝藏族羌族自治州","value":"5132"},{"label":"甘孜藏族自治州","value":"5133"},{"label":"凉山彝族自治州","value":"5134"}],[{"label":"贵阳市","value":"5201"},{"label":"六盘水市","value":"5202"},{"label":"遵义市","value":"5203"},{"label":"安顺市","value":"5204"},{"label":"毕节市","value":"5205"},{"label":"铜仁市","value":"5206"},{"label":"黔西南布依族苗族自治州","value":"5223"},{"label":"黔东南苗族侗族自治州","value":"5226"},{"label":"黔南布依族苗族自治州","value":"5227"}],[{"label":"昆明市","value":"5301"},{"label":"曲靖市","value":"5303"},{"label":"玉溪市","value":"5304"},{"label":"保山市","value":"5305"},{"label":"昭通市","value":"5306"},{"label":"丽江市","value":"5307"},{"label":"普洱市","value":"5308"},{"label":"临沧市","value":"5309"},{"label":"楚雄彝族自治州","value":"5323"},{"label":"红河哈尼族彝族自治州","value":"5325"},{"label":"文山壮族苗族自治州","value":"5326"},{"label":"西双版纳傣族自治州","value":"5328"},{"label":"大理白族自治州","value":"5329"},{"label":"德宏傣族景颇族自治州","value":"5331"},{"label":"怒江傈僳族自治州","value":"5333"},{"label":"迪庆藏族自治州","value":"5334"}],[{"label":"拉萨市","value":"5401"},{"label":"日喀则市","value":"5402"},{"label":"昌都市","value":"5403"},{"label":"林芝市","value":"5404"},{"label":"山南市","value":"5405"},{"label":"那曲地区","value":"5424"},{"label":"阿里地区","value":"5425"}],[{"label":"西安市","value":"6101"},{"label":"铜川市","value":"6102"},{"label":"宝鸡市","value":"6103"},{"label":"咸阳市","value":"6104"},{"label":"渭南市","value":"6105"},{"label":"延安市","value":"6106"},{"label":"汉中市","value":"6107"},{"label":"榆林市","value":"6108"},{"label":"安康市","value":"6109"},{"label":"商洛市","value":"6110"}],[{"label":"兰州市","value":"6201"},{"label":"嘉峪关市","value":"6202"},{"label":"金昌市","value":"6203"},{"label":"白银市","value":"6204"},{"label":"天水市","value":"6205"},{"label":"武威市","value":"6206"},{"label":"张掖市","value":"6207"},{"label":"平凉市","value":"6208"},{"label":"酒泉市","value":"6209"},{"label":"庆阳市","value":"6210"},{"label":"定西市","value":"6211"},{"label":"陇南市","value":"6212"},{"label":"临夏回族自治州","value":"6229"},{"label":"甘南藏族自治州","value":"6230"}],[{"label":"西宁市","value":"6301"},{"label":"海东市","value":"6302"},{"label":"海北藏族自治州","value":"6322"},{"label":"黄南藏族自治州","value":"6323"},{"label":"海南藏族自治州","value":"6325"},{"label":"果洛藏族自治州","value":"6326"},{"label":"玉树藏族自治州","value":"6327"},{"label":"海西蒙古族藏族自治州","value":"6328"}],[{"label":"银川市","value":"6401"},{"label":"石嘴山市","value":"6402"},{"label":"吴忠市","value":"6403"},{"label":"固原市","value":"6404"},{"label":"中卫市","value":"6405"}],[{"label":"乌鲁木齐市","value":"6501"},{"label":"克拉玛依市","value":"6502"},{"label":"吐鲁番市","value":"6504"},{"label":"哈密市","value":"6505"},{"label":"昌吉回族自治州","value":"6523"},{"label":"博尔塔拉蒙古自治州","value":"6527"},{"label":"巴音郭楞蒙古自治州","value":"6528"},{"label":"阿克苏地区","value":"6529"},{"label":"克孜勒苏柯尔克孜自治州","value":"6530"},{"label":"喀什地区","value":"6531"},{"label":"和田地区","value":"6532"},{"label":"伊犁哈萨克自治州","value":"6540"},{"label":"塔城地区","value":"6542"},{"label":"阿勒泰地区","value":"6543"},{"label":"自治区直辖县级行政区划","value":"6590"}],[{"label":"台北","value":"6601"},{"label":"高雄","value":"6602"},{"label":"基隆","value":"6603"},{"label":"台中","value":"6604"},{"label":"台南","value":"6605"},{"label":"新竹","value":"6606"},{"label":"嘉义","value":"6607"},{"label":"宜兰","value":"6608"},{"label":"桃园","value":"6609"},{"label":"苗栗","value":"6610"},{"label":"彰化","value":"6611"},{"label":"南投","value":"6612"},{"label":"云林","value":"6613"},{"label":"屏东","value":"6614"},{"label":"台东","value":"6615"},{"label":"花莲","value":"6616"},{"label":"澎湖","value":"6617"}],[{"label":"香港岛","value":"6701"},{"label":"九龙","value":"6702"},{"label":"新界","value":"6703"}],[{"label":"澳门半岛","value":"6801"},{"label":"氹仔岛","value":"6802"},{"label":"路环岛","value":"6803"},{"label":"路氹城","value":"6804"}]];export default cityData;
\ No newline at end of file
diff --git a/tuniao-ui/libs/utils/emitter.js b/tuniao-ui/libs/utils/emitter.js
new file mode 100644
index 0000000..7af43d2
--- /dev/null
+++ b/tuniao-ui/libs/utils/emitter.js
@@ -0,0 +1,55 @@
+/**
+ * 递归使用call方式 this指向
+ * 
+ * @param {String} componentName 需要查找的组件的名称
+ * @param {String} eventName 事件名称
+ * @param {Object} params 需要传递的参数
+ */
+function broadcast(componentName, eventName, params) {
+  // 循环子节点找到需要的节点，没有查找到就递归进行查找
+  this.$children.map(child => {
+    if (componentName === child.$options.name) {
+      child.$emit.apply(child, [eventName].concat(params))
+    } else {
+      broadcast.apply(child, [componentName, eventName].concat(params))
+    }
+  })
+}
+
+export default {
+  methods: {
+    /**
+     * 派发 向上查找一个
+     * @param {Object} componentName 需要查找的组件的名称
+     * @param {Object} eventName 事件名称
+     * @param {Object} params 需要传递的参数
+     */
+    dispatch(componentName, eventName, params) {
+      // 找到最近父节点 $root 根节点
+      let parent = this.$parent || this.$root
+      // 获取当前实例的名称
+      let name = parent.$options.name
+      
+      // 当前存在节点并且当前节点没有名称或者名称不等于我们要查找的节点名称，则继续遍历
+      while (parent && (!name || name !== componentName)) {
+        parent = parent.$parent
+        if (parent) {
+          name = parent.$options.name
+        }
+      }
+      // 如果有节点则表示找到
+      if (parent) {
+        parent.$emit.apply(parent, [eventName].concat(params))
+      }
+    },
+    /**
+     * 广播 向下查找多个
+     * @param {Object} componentName 需要查找的组件的名称
+     * @param {Object} eventName 事件名称
+     * @param {Object} params 需要传递的参数
+     */
+    broadcast(componentName, eventName, params) {
+      broadcast.call(this, componentName, eventName, params)
+    }
+  }
+}
\ No newline at end of file
diff --git a/tuniao-ui/libs/utils/province.js b/tuniao-ui/libs/utils/province.js
new file mode 100644
index 0000000..436b190
--- /dev/null
+++ b/tuniao-ui/libs/utils/province.js
@@ -0,0 +1 @@
+var provinceData=[{"label":"北京市","value":"11"},{"label":"天津市","value":"12"},{"label":"河北省","value":"13"},{"label":"山西省","value":"14"},{"label":"内蒙古自治区","value":"15"},{"label":"辽宁省","value":"21"},{"label":"吉林省","value":"22"},{"label":"黑龙江省","value":"23"},{"label":"上海市","value":"31"},{"label":"江苏省","value":"32"},{"label":"浙江省","value":"33"},{"label":"安徽省","value":"34"},{"label":"福建省","value":"35"},{"label":"江西省","value":"36"},{"label":"山东省","value":"37"},{"label":"河南省","value":"41"},{"label":"湖北省","value":"42"},{"label":"湖南省","value":"43"},{"label":"广东省","value":"44"},{"label":"广西壮族自治区","value":"45"},{"label":"海南省","value":"46"},{"label":"重庆市","value":"50"},{"label":"四川省","value":"51"},{"label":"贵州省","value":"52"},{"label":"云南省","value":"53"},{"label":"西藏自治区","value":"54"},{"label":"陕西省","value":"61"},{"label":"甘肃省","value":"62"},{"label":"青海省","value":"63"},{"label":"宁夏回族自治区","value":"64"},{"label":"新疆维吾尔自治区","value":"65"},{"label":"台湾","value":"66"},{"label":"香港","value":"67"},{"label":"澳门","value":"68"}];export default provinceData;
\ No newline at end of file
diff --git a/tuniao-ui/theme.scss b/tuniao-ui/theme.scss
new file mode 100644
index 0000000..136a6ec
--- /dev/null
+++ b/tuniao-ui/theme.scss
@@ -0,0 +1,183 @@
+// 此文件为TuniaoUI的主题变量，这些变量目前只能通过uni.scss引入才有效，另外由于
+// uni.scss中引入的样式会同时混入到全局样式文件和单独每一个页面的样式中，造成微信程序包太大，
+// 故uni.scss只建议放scss变量名相关样式，其他的样式可以通过main.js或者App.vue引入
+
+// 组件配置
+$tn-form-item-height: 70rpx;
+
+
+// 主颜色
+$tn-main-color: #01BEFF;
+$tn-main-orange: #FBBD12;
+$tn-embellished-green: #00FFC6;
+$tn-embellished-yellow: #FFF00D;
+$tn-auxiliary-powder: #FF71D2;
+$tn-auxiliary-blue: #82B2FF;
+$tn-bg-color: #FFFFFF;
+$tn-bg-gray-color: #F4F4F4;
+$tn-space-color: #F8F7F8;
+
+// 边框颜色
+$tn-border-solid-color: rgba(0, 0, 0, 0.1);
+$tn-border-solids-color: #eee;
+$tn-border-dashed-color: #ddd;
+
+// 阴影颜色
+$tn-shadow-color: rgba(0, 0, 0, 0.1);
+$tn-box-shadow-color: rgba(0, 0, 0, 0.2);
+
+// 字体颜色
+$tn-font-color: #080808;
+$tn-font-sub-color: #AAAAAA;
+$tn-content-color: #838383;
+$tn-font-holder-color: #E6E6E6;
+
+$tn-mask-bg-color: rgba(0, 0, 0, 0.4);
+
+$tn-progress-bg-color: #f0f0f0;
+
+
+$tn-color-red: #E83A30;
+$tn-color-red-dark: #BA2E26;
+$tn-color-red-disabled: #F39C97;
+$tn-color-red-light: #FAD8D6;
+
+$tn-color-purplered: #E72F8C;
+$tn-color-purplered-dark: #B9266F;
+$tn-color-purplered-disabled: #F397C5;
+$tn-color-purplered-light: #FAD5E8;
+
+$tn-color-purple: #892FE8;
+$tn-color-purple-dark: #6E26BA;
+$tn-color-purple-disabled: #C497F3;
+$tn-color-purple-light: #E7D5FA;
+
+$tn-color-bluepurple: #5F4FD9;
+$tn-color-bluepurple-dark: #4C3FAE;
+$tn-color-bluepurple-disabled: #AFA7EC;
+$tn-color-bluepurple-light: #DFDCF7;
+
+$tn-color-aquablue: #3646FF;
+$tn-color-aquablue-dark: #2B38CC;
+$tn-color-aquablue-disabled: #9AA2FF;
+$tn-color-aquablue-light: #D7DAFF;
+
+$tn-color-blue: #3D7EFF;
+$tn-color-blue-dark: #3165CC;
+$tn-color-blue-disabled: #9EBEFF;
+$tn-color-blue-light: #D8E5FF;
+
+$tn-color-indigo: #31C9E8;
+$tn-color-indigo-dark: #27A1BA;
+$tn-color-indigo-disabled: #98E4F3;
+$tn-color-indigo-light: #D6F4FA;
+
+$tn-color-cyan: #2DE8BD;
+$tn-color-cyan-dark: #24BA97;
+$tn-color-cyan-disabled: #96F3DE;
+$tn-color-cyan-light: #D5FAF2;
+
+$tn-color-teal: #24F083;
+$tn-color-teal-dark: #1DC069;
+$tn-color-teal-disabled: #91F7C1;
+$tn-color-teal-light: #D3FCE6;
+
+$tn-color-green: #31E749;
+$tn-color-green-dark: #27B93A;
+$tn-color-green-disabled: #98F3A4;
+$tn-color-green-light: #D6FADB;
+
+$tn-color-yellowgreen: #A4E82F;
+$tn-color-yellowgreen-dark: #82BA26;
+$tn-color-yellowgreen-disabled: #D1F397;
+$tn-color-yellowgreen-light: #EDFAD5;
+
+$tn-color-lime: #D5EB00;
+$tn-color-lime-dark: #AABC00;
+$tn-color-lime-disabled: #E9F57F;
+$tn-color-lime-light: #F7FBCC;
+
+$tn-color-yellow: #FFF420;
+$tn-color-yellow-dark: #CCC21A;
+$tn-color-yellow-disabled: #FFF88F;
+$tn-color-yellow-light: #FFFDD2;
+
+$tn-color-orangeyellow: #FFCA28;
+$tn-color-orangeyellow-dark: #CCA220;
+$tn-color-orangeyellow-disabled: #FFE493;
+$tn-color-orangeyellow-light: #FFF4D4;
+
+$tn-color-orange: #FFA726;
+$tn-color-orange-dark: #CC851E;
+$tn-color-orange-disabled: #FFD392;
+$tn-color-orange-light: #FFEDD4 ;
+
+$tn-color-orangered: #FF7043;
+$tn-color-orangered-dark: #CC5A36;
+$tn-color-orangered-disabled: #FFB7A1;
+$tn-color-orangered-light: #FFE2D9;
+
+$tn-color-brown: #914F2C;
+$tn-color-brown-dark: #743F23;
+$tn-color-brown-disabled: #C8A795;
+$tn-color-brown-light: #E9DCD5;
+
+$tn-color-grey: #78909C;
+$tn-color-grey-dark: #5F7E8B;
+$tn-color-grey-disabled: #C6D1D8;
+$tn-color-grey-light: #E4E9EC;
+
+$tn-color-gray: #AAAAAA;
+$tn-color-gray-dark: #838383;
+$tn-color-gray-disabled: #E6E6E6;
+$tn-color-gray-light: #F8F7F8;
+
+$tn-cool-bg-color-1-start: #F5317F;
+$tn-cool-bg-color-1-end: #FF7C6E;
+
+$tn-cool-bg-color-2-start: #CA26FF;
+$tn-cool-bg-color-2-end: #F360A7;
+
+$tn-cool-bg-color-3-start: #A26FFC;
+$tn-cool-bg-color-3-end: #9D12FF;
+
+$tn-cool-bg-color-4-start: #AA77F0;
+$tn-cool-bg-color-4-end: #E871E5;
+
+$tn-cool-bg-color-5-start: #40A0F7;
+$tn-cool-bg-color-5-end: #4866E6;
+
+$tn-cool-bg-color-6-start: #209CFF;
+$tn-cool-bg-color-6-end: #68E0CF;
+
+$tn-cool-bg-color-7-start: #00C3FF;
+$tn-cool-bg-color-7-end: #58FFF5;
+
+$tn-cool-bg-color-8-start: #00d1FF;
+$tn-cool-bg-color-8-end: #69FF97;
+
+$tn-cool-bg-color-9-start: #0FD893;
+$tn-cool-bg-color-9-end: #29ECBF;
+
+$tn-cool-bg-color-10-start: #0FD850;
+$tn-cool-bg-color-10-end: #F9F047;
+
+$tn-cool-bg-color-11-start: #24FE41;
+$tn-cool-bg-color-11-end: #F7FD47;
+
+$tn-cool-bg-color-12-start: #D6FF7F;
+$tn-cool-bg-color-12-end: #00F657;
+
+$tn-cool-bg-color-13-start: #FA709A;
+$tn-cool-bg-color-13-end: #FEE140;
+
+$tn-cool-bg-color-14-start: #FE5E9C;
+$tn-cool-bg-color-14-end: #F1AA76;
+
+$tn-cool-bg-color-15-start: #FF3181;
+$tn-cool-bg-color-15-end: #FF8331;
+
+$tn-cool-bg-color-16-start: #ED1C24;
+$tn-cool-bg-color-16-end: #FECE12;
+
+
diff --git a/uni.promisify.adaptor.js b/uni.promisify.adaptor.js
new file mode 100644
index 0000000..47fbce1
--- /dev/null
+++ b/uni.promisify.adaptor.js
@@ -0,0 +1,10 @@
+uni.addInterceptor({
+  returnValue (res) {
+    if (!(!!res && (typeof res === "object" || typeof res === "function") && typeof res.then === "function")) {
+      return res;
+    }
+    return new Promise((resolve, reject) => {
+      res.then((res) => res[0] ? reject(res[0]) : resolve(res[1]));
+    });
+  },
+});
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..d79e4e5
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,11 @@
+/**
+ * 下方引入的为Tuniao UI的集成样式文件，为scss预处理器，其中包含了一些"tn-"开头的自定义变量
+ * 使用的时候，请将下面的一行复制到您的uniapp项目根目录的uni.scss中即可
+ * Tuniao UI自定义的css类名和scss变量，均以"tn-"开头，不会造成冲突，请放心使用 
+ */
+
+@import 'tuniao-ui/theme.scss';
+.no-img{
+	width: 0;
+	height: 0;
+}
diff --git a/uni_modules/cc-noticeBar/changelog.md b/uni_modules/cc-noticeBar/changelog.md
new file mode 100644
index 0000000..8a5a154
--- /dev/null
+++ b/uni_modules/cc-noticeBar/changelog.md
@@ -0,0 +1,8 @@
+## 2.2.2（2024-10-03）
+组件优化
+## 2.2（2024-06-27）
+优化
+## 1.2（2024-05-16）
+组件优化
+## 1.0.0（2023-07-02）
+组件初始化
diff --git a/uni_modules/cc-noticeBar/components/cc-noticeBar/cc-noticeBar.vue b/uni_modules/cc-noticeBar/components/cc-noticeBar/cc-noticeBar.vue
new file mode 100644
index 0000000..2c3a19e
--- /dev/null
+++ b/uni_modules/cc-noticeBar/components/cc-noticeBar/cc-noticeBar.vue
@@ -0,0 +1,94 @@
+<template>
+	<view class="notice">
+
+		<image class="left_icon" mode="aspectFit" src="/static/notice_icon.png">
+
+		</image>
+		<view class="right_notice">
+			<swiper class="notice_swiper" vertical easing-function="easeInOutCubic" autoplay interval="6000">
+				<swiper-item v-for="(item,index) in noticeList" :key="index" class="sw_item" @click="itemClick(item)">
+					<text class="sw_text" :style="{color:colors}">{{item.notice_title}}</text>
+					<image class="sw_image" src="/static/right.png"></image>
+				</swiper-item>
+			</swiper>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+
+		components: {},
+		props: {
+			colors: {
+				type: String,
+				default: '#333'
+			},
+			noticeList: {
+				type: Array
+			}
+		},
+		methods: {
+			itemClick(item) {
+
+				this.$emit('click', item);
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	.notice {
+		height: 80upx;
+		line-height: 80upx;
+		margin: 0 3%;
+		margin-top: 15upx;
+		// padding: 0 10upx;
+		// box-shadow: 0upx 0upx 10upx #eee;
+		border-radius: 8upx;
+	}
+
+	.left_icon {
+
+		width: 10%;
+		height: 64rpx;
+		float: left;
+		padding-top: 18upx;
+	}
+
+	.left_icon .iconfont {
+		display: inline-block;
+		font-size: 44upx;
+	}
+
+	.right_notice {
+		float: left;
+		width: 90%;
+
+	}
+
+	.right_notice .notice_swiper {
+		height: 80upx;
+	}
+
+	.notice_swiper .sw_item {
+		height: 80upx;
+
+	}
+
+	.notice_swiper .sw_item .sw_text {
+		font-size: 24upx;
+		color: #333;
+		width: 540rpx;
+		display: inline-block;
+	}
+
+	.notice_swiper .sw_image {
+		width: 40upx;
+		height: 40upx;
+		float: right;
+		margin-top: 20upx;
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/cc-noticeBar/components/cc-noticeBar/notice_icon.png b/uni_modules/cc-noticeBar/components/cc-noticeBar/notice_icon.png
new file mode 100644
index 0000000..dc9b666
Binary files /dev/null and b/uni_modules/cc-noticeBar/components/cc-noticeBar/notice_icon.png differ
diff --git a/uni_modules/cc-noticeBar/package.json b/uni_modules/cc-noticeBar/package.json
new file mode 100644
index 0000000..39fb8eb
--- /dev/null
+++ b/uni_modules/cc-noticeBar/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "cc-noticeBar",
+  "displayName": "自定义精美上下滚动通告栏组件 常用于展示公告信息 上下滚动跑马灯 上下滚动广播",
+  "version": "2.2.2",
+  "description": "自定义精美上下滚动通告栏组件 常用于展示公告信息 上下滚动跑马灯 上下滚动广播",
+  "keywords": [
+    "notice",
+    "公告栏",
+    "跑马灯",
+    "滚动广播",
+    "广播"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.8.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",
+        "alipay": "n"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/cc-noticeBar/readme.md b/uni_modules/cc-noticeBar/readme.md
new file mode 100644
index 0000000..1e31d5f
--- /dev/null
+++ b/uni_modules/cc-noticeBar/readme.md
@@ -0,0 +1,145 @@
+# cc-noticeBar 
+
+
+##uniapp专属精品组件页面模板（由前端组件开发出品）精品组件页面模板
+
+###●组件模板规划：
+由前端组件开发出品的精品组件页面模板，将陆续发布，预计高达约几百种供您使用，是快速快发项目、创业的必备精品。
+
+合集地址： uni-app模板合集地址：(https://ext.dcloud.net.cn/publisher?id=274945) 如查看全部页面模板，请前往上述uniapp插件市场合集地址；
+
+###●组件模板效果图：
+可下载项目后预览，效果图见右侧图片；
+
+###●组件模板费用：
+学习：免费下载，进行学习，无费用；
+
+使用/商用：本页面地址赞赏10元后，可终身商用；
+
+###●组件模板使用版权/商用：
+本组件模板免费下载可供学习，如需使用及商用，请在本组件页面模板进行赞赏10元
+
+（仅需10元获取精品页面模板代码-物有所值，1个组件页面市场价100元 ）
+
+赞赏10后（当前项目产生赞赏订单可追溯）即可终身商用当前本地址下载的页面模版代码，不同下载地址需进行不同的赞赏。（不赞赏就进行商用使用者，面临侵权！保留追究知识产权法律责任！后果自负！）
+
+ 
+### 我的技术微信公众号
+
+![图片](https://i.postimg.cc/RZ0sjnYP/front-End-Component.jpg)
+
+
+#### 使用方法 
+```使用方法
+<!-- 默认颜色#333公告栏 -->
+<view class="header">默认颜色公告栏</view>
+<!-- noticeList：通知数组  @click:公告栏条目点击事件-->
+<cc-noticeBar :noticeList="noticeList" @click="itemClick"></cc-noticeBar>
+
+<!-- 橄榄色公告栏 -->
+<view class="header">橄榄色公告栏</view>
+<!-- noticeList：通知数组 colors：设置文字颜色  @click:公告栏条目点击事件 -->
+<cc-noticeBar :noticeList="noticeList" colors="olive" @click="itemClick"></cc-noticeBar>	
+
+```
+
+#### HTML代码实现部分
+```html
+<template>
+	<view class="content">
+
+
+		<!-- 默认颜色#333公告栏 -->
+		<view class="header">默认颜色公告栏</view>
+		<!-- noticeList：通知数组  @click:公告栏条目点击事件-->
+		<cc-noticeBar :noticeList="noticeList" @click="itemClick"></cc-noticeBar>
+
+		<!-- 橄榄色公告栏 -->
+		<view class="header">橄榄色公告栏</view>
+		<!-- noticeList：通知数组 colors：设置文字颜色  @click:公告栏条目点击事件 -->
+		<cc-noticeBar :noticeList="noticeList" colors="olive" @click="itemClick"></cc-noticeBar>
+
+		<!-- 橙色公告栏 -->
+		<view class="header">橙色背景公告栏</view>
+		<!-- noticeList：通知数组 colors：设置文字颜色  @click:公告栏条目点击事件 -->
+		<cc-noticeBar :noticeList="noticeList" colors="orange" @click="itemClick"></cc-noticeBar>
+
+		<!-- 粉色公告栏 -->
+		<view class="header">粉色背景公告栏</view>
+		<!-- noticeList：通知数组 colors：设置文字颜色  @click:公告栏条目点击事件 -->
+		<cc-noticeBar :noticeList="noticeList" colors="#e03997" @click="itemClick"></cc-noticeBar>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				colors: '#fa436a',
+				noticeList: [{
+						id: 1,
+						title: '征程这些伟大精神 串连起中国共产党人的精神谱系'
+					},
+					{
+						id: 2,
+						title: '增强水运发展新动能 前5月港口货物吞吐量增长7.9%'
+					},
+					{
+						id: 3,
+						title: '多地持续高温 各地采取措施积极应对'
+					},
+					{
+						id: 4,
+						title: '中非经贸博览会见证中非合作深度'
+					},
+					{
+						id: 5,
+						title: '国安家安得民心 保驾护航促治兴'
+					}
+				],
+
+
+
+			}
+		},
+
+		methods: {
+
+			itemClick: function(item) {
+
+				console.log("点击公告栏条目item = " + JSON.stringify(item));
+				uni.showModal({
+					title: '点击公告栏条目',
+					content: "点击公告栏条目item = " + JSON.stringify(item)
+				})
+			},
+
+		}
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: column;
+
+	}
+
+	.header {
+
+		margin-left: 3%;
+		width: 94%;
+		line-height: 30px;
+		font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
+		font-weight: 550;
+		height: 30px;
+		font-size: 14px;
+		margin-top: 10px;
+
+	}
+</style>
+
+
+
+```
\ No newline at end of file
diff --git a/uni_modules/jp-verification-literalness/changelog.md b/uni_modules/jp-verification-literalness/changelog.md
new file mode 100644
index 0000000..2255f80
--- /dev/null
+++ b/uni_modules/jp-verification-literalness/changelog.md
@@ -0,0 +1,4 @@
+## 1.1.0（2023-12-11）
+修复微信小程序报错问题
+## 1.0.0（2023-08-21）
+上线
diff --git a/uni_modules/jp-verification-literalness/components/jp-verification-literalness/jp-verification-literalness.vue b/uni_modules/jp-verification-literalness/components/jp-verification-literalness/jp-verification-literalness.vue
new file mode 100644
index 0000000..2ef9691
--- /dev/null
+++ b/uni_modules/jp-verification-literalness/components/jp-verification-literalness/jp-verification-literalness.vue
@@ -0,0 +1,170 @@
+<template>
+  <div :style="{height: (contentHeight+'px'),width: (contentWidth+'px')}">
+    <canvas
+	  v-if="canvasId"
+      @tap="drawTap"
+      :id="canvasId"
+	  :canvasId="canvasId"
+      :width="contentWidth"
+      :height="contentHeight"
+	  :style="{height: (contentHeight+'px'),width: (contentWidth+'px')}"
+    ></canvas>
+  </div>
+</template>
+<!-- jp-verification-literalness  -->
+<script>
+export default {
+  name: "jp-verification-literalness",
+  props: {
+	securityCode:{
+		type: String,
+		default: '',
+	},
+	codeLength: { //验证码数量
+      type: Number,
+      default: 4,
+    },
+    contentWidth: {
+      type: Number,
+      default: 120,
+    },
+    contentHeight: {
+      type: Number,
+      default: 60,
+    },
+	lineLength: { //线条数
+      type: Number,
+      default: 8,
+    },
+	backgroundColor:{ // 画板背景
+		type: String,
+		default: 'rgb(238,226,224)',
+	},
+	lineColorList:{
+		type: Array,
+		default () {
+			return ['rgba(238,0,0,.5)','rgba(0, 170, 255,.5)','rgba(0, 170, 0,.5)','rgba(0, 0, 0,.5)','rgba(153, 146, 255,.5)']
+		},
+	},
+	colorList:{
+		type: Array,
+		default () {
+			return ['rgb(238,0,0)','rgb(0, 170, 255)','rgb(0, 170, 0)','rgb(0, 0, 0)','rgb(153, 146, 255)']
+		},
+	}
+  },
+  computed:{
+	 canvasId() {
+	 	// #ifdef VUE2
+	 	return `lime-signature${this._uid}`
+	 	// #endif
+	 	// #ifdef VUE3
+	 	return `lime-signature${this._.uid}`
+	 	// #endif
+	 },
+  },
+  data() {
+    return {
+      identifyCode: '',
+    };
+  },
+  watch:{
+	securityCode() {
+		this.drawPic();
+	}
+  },
+  methods: {
+    verification(code) {
+      return this.identifyCode.toLowerCase() === code.toLowerCase();
+    },
+    randomNum(min, max) {
+      return Math.floor(Math.random() * (max - min) + min);
+    },
+    getcheckCode() {
+      let code = '';
+      const codeLength = this.codeLength
+      const random = [
+        1, 2, 3, 4, 5, 6, 7, 8, 9, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+        'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+        'X', 'Y', 'Z',
+      ];
+      for (let i = 0; i < codeLength; i++) {
+        let index = Math.floor(Math.random() * 34);
+        code += random[index];
+      }
+      this.identifyCode = code;
+    },
+	drawTap(){
+		if(this.securityCode){
+			this.$emit('getCode')
+		}else{
+			this.drawPic();
+		}
+	},
+    drawPic() {
+		if(this.securityCode){
+			this.identifyCode = this.securityCode
+		}else{
+			this.getcheckCode();
+		}
+
+      let context = uni.createCanvasContext(this.canvasId, this);
+
+      context.setTextBaseline('bottom');
+
+      context.setFillStyle(this.backgroundColor);
+
+      context.fillRect(0, 0, this.contentWidth, this.contentHeight);
+      for (let i = 0; i < this.identifyCode.length; i++) {
+        this.drawText(context, this.identifyCode[i], i);
+      }
+
+      this.drawLine(context);
+
+      context.draw();
+    },
+    drawText(context, txt, i) {
+
+	  let a =  Math.floor(Math.random()*this.colorList.length)
+      context.setFillStyle(this.colorList[a]);
+
+	  let fontSize = Math.trunc((this.contentWidth/this.identifyCode.length))
+	  console.log(fontSize)
+      context.setFontSize(
+          this.randomNum(fontSize, fontSize) + 'px'
+      );
+
+      let x = (i) * (this.contentWidth / (this.identifyCode.length + 1)) + Math.trunc(fontSize/2);
+      let y = this.randomNum(fontSize, this.contentHeight - 5);
+      var deg = this.randomNum(-10, 10);
+
+      context.translate(x, y);
+      context.rotate((deg * Math.PI) / 180);
+      context.fillText(txt, 0, 0);
+
+      context.rotate((-deg * Math.PI) / 180);
+      context.translate(-x, -y);
+    },
+    drawLine(context) {
+       for (let i = 0; i < this.lineLength; i++) {
+		  let a = Math.floor(Math.random() * this.lineColorList.length)
+          context.setStrokeStyle(this.lineColorList[a]);
+          context.beginPath();
+          let startX = this.randomNum(0, this.contentWidth);
+          let startY = this.randomNum(0, this.contentHeight);
+          let endX = this.randomNum(0, this.contentWidth);
+          let endY = this.randomNum(0, this.contentHeight);
+          context.moveTo(startX, startY);
+          context.lineTo(endX, endY);
+          context.stroke();
+        }
+    },
+  },
+  mounted() {
+    this.drawPic();
+  },
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/uni_modules/jp-verification-literalness/package.json b/uni_modules/jp-verification-literalness/package.json
new file mode 100644
index 0000000..bd910f3
--- /dev/null
+++ b/uni_modules/jp-verification-literalness/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "jp-verification-literalness",
+  "displayName": "验证码 canvas绘制验证码图片 登录验证 图形验证码组件",
+  "version": "1.1.0",
+  "description": "用于验证，可以由前端自动生成验证码，或通过接口获取验证码，用法简单",
+  "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": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/jp-verification-literalness/pages/index/index.vue b/uni_modules/jp-verification-literalness/pages/index/index.vue
new file mode 100644
index 0000000..c0fcbf3
--- /dev/null
+++ b/uni_modules/jp-verification-literalness/pages/index/index.vue
@@ -0,0 +1,38 @@
+<template>
+  <view class="content">
+	<view class="hader">基础用法</view>
+	<jp-verification-literalness></jp-verification-literalness>
+	<view class="hader">通过接口获取验证码</view>
+	<jp-verification-literalness @getCode="getCode" :securityCode="securityCode"></jp-verification-literalness>
+	<view class="hader"> 自定义验证码数量 - 自定义颜色</view>
+	<jp-verification-literalness backgroundColor="#a7c3ff"  :colorList="colorList" :lineColorList="lineColorList"  :codeLength="6" ></jp-verification-literalness> 
+    <view class="hader"> 验证码大小 - 干扰线数量</view>
+    <jp-verification-literalness :contentHeight="100" :contentWidth="200" :lineLength="60"></jp-verification-literalness>
+  </view>
+</template>
+<script>
+export default {
+  data() {
+    return {
+		val:'',
+		securityCode:'我是获取的',
+		lineColorList: ['rgba(0, 85, 255, 0.5)','rgba(85, 255, 0, 0.5)','rgba(255, 255, 0, 0.5)'],
+		colorList:['rgb(255, 0, 0)','rgb(255, 0, 127)','rgb(255, 0, 255)']
+    };
+  },
+  methods:{
+	  getCode(){
+		this.securityCode = '重新获取了'  
+	  }
+  }
+};
+</script>
+<style scoped lang="scss">
+	.content {
+		padding: 0 20px;
+		.hader {
+			line-height: 80rpx;
+			font-weight: 800;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/jp-verification-literalness/readme.md b/uni_modules/jp-verification-literalness/readme.md
new file mode 100644
index 0000000..a57c6f2
--- /dev/null
+++ b/uni_modules/jp-verification-literalness/readme.md
@@ -0,0 +1,79 @@
+# 
+#  # 欢迎使用 layout jp-verification-literalness組件
+**jp-verification-literalness組件，是验证码组件。
+用于登录验证，获取其他需要验证的地方，可以起前端自动生成验证码，或通过接口调用验证码，自定义验证框颜色。用法简单
+
+### 安装方式
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+##有项目需要开发的请联系 QQ:371524845
+###开发不易，如果帮助到你的，请支持 有问题请留言，作者会积极更新
+
+###项目实例请查看 @/jp-layout/pages/index/index.vue
+
+#使用方法
+##### layout基础用法
+```html
+<template>
+  <view class="content">
+	<view class="hader">基础用法</view>
+	<jp-verification-literalness></jp-verification-literalness>
+	<view class="hader">通过接口获取验证码</view>
+	<jp-verification-literalness @getCode="getCode" :securityCode="securityCode"></jp-verification-literalness>
+	<view class="hader"> 自定义验证码数量 - 自定义颜色</view>
+	<jp-verification-literalness backgroundColor="#a7c3ff"  :colorList="colorList" :lineColorList="lineColorList"  :codeLength="6" ></jp-verification-literalness> 
+    <view class="hader"> 验证码大小 - 干扰线数量</view>
+    <jp-verification-literalness :contentHeight="100" :contentWidth="200" :lineLength="60"></jp-verification-literalness>
+  </view>
+</template>
+<script>
+export default {
+  data() {
+    return {
+		val:'',
+		securityCode:'我是获取的',
+		lineColorList: ['rgba(0, 85, 255, 0.5)','rgba(85, 255, 0, 0.5)','rgba(255, 255, 0, 0.5)'],
+		colorList:['rgb(255, 0, 0)','rgb(255, 0, 127)','rgb(255, 0, 255)']
+    };
+  },
+  methods:{
+	  getCode(){
+		this.securityCode = '重新获取了'  
+	  }
+  }
+};
+</script>
+<style scoped lang="scss">
+	.content {
+		padding: 0 20px;
+		.hader {
+			line-height: 80rpx;
+			font-weight: 800;
+		}
+	}
+</style>
+```
+
+###方法介绍 
+####参数
+| 参数名        | 类型   |  默认值  | 说明  |
+| --------   |  -------- |  --------| --------|
+|   securityCode   |  securityCode  |   ''    |  验证码值，如果是通过接口调用的验证码需要在这里传入，不传入则自动生成验证码     |
+|   codeLength   | Number  |   4    |  自动生成验证码数量 |
+|   contentWidth   | Number  |   120    |   画板宽度（px)    |
+| contentHeight        |   Number   |  60   |  画板高度（px)       |
+| lineLength        |    Number    |  8 | 干扰线数量 |
+| backgroundColor        |    String    |  'rgb(238,226,224)' |  触底加载触发距离 |
+| lineColorList        |  Array     |  ['rgba(238,0,0,.5)','rgba(0, 170, 255,.5)','rgba(0, 170, 0,.5)','rgba(0, 0, 0,.5)','rgba(153, 146, 255,.5)']  | 干扰线可选颜色组（颜色会随机选择这些颜色，需要固定颜色传一种颜色即可）  |
+| colorList        |    Array    |  ['rgb(238,0,0)','rgb(0, 170, 255)','rgb(0, 170, 0)','rgb(0, 0, 0)','rgb(153, 146, 255)'] |  文字可选颜色组（颜色会随机选择这些颜色，需要固定颜色传一种颜色即可） |
+
+####方法
+| 方法名        |   返回值 | 说明  |
+| --------   |  --------|--------|
+|  verification  | function（）   | 验证验证码是否正确，正确返回true   | 
+
+####事件
+| 方法名        |   返回值 | 说明  |
+| --------   |  --------|--------|
+|   @getCode  | function（）   |当传入securityCode时点击会回调该方法，用户可以在这里通过接口获取验证码   | 
+
diff --git a/uni_modules/lime-clipper/changelog.md b/uni_modules/lime-clipper/changelog.md
new file mode 100644
index 0000000..1fa8ac2
--- /dev/null
+++ b/uni_modules/lime-clipper/changelog.md
@@ -0,0 +1,56 @@
+## 1.0.1（2023-06-12）
+- fix: 修复vue3 QQ小程序无法生成问题
+## 1.0.0（2023-06-01）
+- feat: 支持 vue3 并把 `stylus` 改成 `scss`
+## 0.9.0（2022-12-12）
+- chore: 更新文档
+- feat: 当缩放为1时 旋转自适应裁剪框
+## 0.8.0（2022-11-02）
+- fix: 修复 正方形图片 不充满裁剪框的BUG
+## 0.7.0（2021-07-10）
+- chore: 统一css3 变量 命名规范
+- chore: 更新文档
+## 0.6.9（2021-07-09）
+- chore: 统一命名规范，无须主动引入组件
+- fix: 修复第一次传入图片路径无自适应问题
+- fix: 修复安卓方向导致无法正确得到尺寸问题
+## 0.6.8（2021-06-26）
+- fix: 修复 钉钉小程序 返回图片为 `null` 问题
+## 0.6.7（2021-06-19）
+- fix: 修复`@touchstart`书写错误
+## 0.6.6（2021-06-19）
+- fix: 修复支付宝引用图标的错误
+## 0.6.5（2021-06-14）
+- fix: 修复锁定比例失效问题
+## 0.6.4（2021-04-16）
+- 修复因mode引起的高度异常
+## 0.6.3（2021-04-13）
+- 测试到微信小程序无法进第二次`draw`，故更新使用`v-model`的方式，显示隐藏组件。
+- 原先使用v-if显示隐藏组件依然可以使用，若发现无法二次`draw`请使用`v-model`
+```html
+<l-clipper v-model="show" />
+```
+```js
+data: () => ({
+	show: false
+})
+```
+## 0.6.2（2021-03-26）
+1、修复图片初始化BUG
+2、增加`fileType`属性，默认值为`png`
+## 0.6.1（2021-03-10）
+- 给事件添加阻止冒泡
+## 0.6.0（2021-03-06）
+增加`source`属性，`Object`类型，key为图片来源类型，value为选项说明。<br>
+```js
+// source 默认值 
+{
+	album: '从相册中选择',
+	camera: '拍照',
+	// #ifdef MP-WEIXIN
+	message: '从微信中选择'
+	// #endif
+}
+```
+## 0.5.0（2021-02-26）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/lime-clipper/components/l-clipper/index.scss b/uni_modules/lime-clipper/components/l-clipper/index.scss
new file mode 100644
index 0000000..8c4a78e
--- /dev/null
+++ b/uni_modules/lime-clipper/components/l-clipper/index.scss
@@ -0,0 +1,184 @@
+$clipper-edge-border-width: 6rpx !default;
+$clipper-confirm-color: #07c160 !default;
+
+.flex-auto {
+	flex:auto
+}
+	
+.bg-transparent {
+	background-color: rgba(0, 0, 0, 0.9);
+	transition-duration: 0.35s;
+}
+
+.lime-clipper {
+	width: 100vw;
+	height: calc( 100vh - var(--window-top));
+	background-color: rgba(0, 0, 0, 0.9);
+	position: fixed;
+	top: var(--window-top);
+	left: 300vw;
+	z-index: 1;
+	&.open {
+		left: 0;
+	}	
+	&-mask {
+		position: relative;
+		z-index: 2;
+		pointer-events: none;
+	}
+	&__content {
+		pointer-events: none;
+		position: absolute;
+		border: 1rpx solid rgba(255,255,255,.3);
+		box-sizing: border-box;
+		box-shadow: rgba(0, 0, 0, 0.5) 0 0 0 80vh;
+		background: transparent;	
+		// transition-duration 0.35s
+		// transition-property left,top
+		&::before,&::after {
+			content: '';
+			position: absolute;
+			border: 1rpx dashed rgba(255,255,255,.3);
+		}
+			
+		&::before {
+			width: 100%;
+			top: 33.33%;
+			height: 33.33%;
+			border-left: none;
+			border-right: none;
+		}
+			
+		&::after {
+			width: 33.33%;
+			left: 33.33%;
+			height: 100%;
+			border-top:none;
+			border-bottom: none;
+		}
+			
+	}
+		
+	&__edge {
+		position: absolute;
+		// left 6rpx
+		width: 34rpx;
+		height: 34rpx;
+		border: $clipper-edge-border-width solid #ffffff;
+		pointer-events: auto;
+		&::before {
+			content: '';
+			position: absolute;
+			width: 40rpx;
+			height: 40rpx;
+			background-color: transparent;
+		}
+			
+		&:nth-child(1) {
+			left: - $clipper-edge-border-width;
+			top: - $clipper-edge-border-width;
+			border-bottom-width: 0 !important;
+			border-right-width: 0 !important;
+			&:before {
+				top: -50%;
+				left: -50%;
+			}
+		}
+			
+		&:nth-child(2) {
+			right: - $clipper-edge-border-width;
+			top: - $clipper-edge-border-width;
+			border-bottom-width: 0 !important;
+			border-left-width: 0 !important;
+			&:before {
+				top: -50%;
+				left: 50%;
+			}
+				
+		}
+			
+		&:nth-child(3) {
+			left: - $clipper-edge-border-width;
+			bottom: - $clipper-edge-border-width;
+			border-top-width: 0 !important;
+			border-right-width: 0 !important;
+			&:before {
+				bottom: -50%;
+				left: -50%;
+			}
+		}
+			
+		&:nth-child(4) {
+			right: - $clipper-edge-border-width;
+			bottom: - $clipper-edge-border-width;
+			border-top-width: 0 !important;
+			border-left-width: 0 !important;
+			&:before {
+				bottom: -50%;
+				left: 50%;
+			}
+		}
+			
+	}
+		
+	&-image {
+		width: 100%;
+		max-width: inherit;
+		border-style: none;
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: 1;
+		-webkit-backface-visibility: hidden;
+		backface-visibility: hidden;
+		transform-origin: center;
+	}
+		
+	&-canvas {
+		position: fixed;
+		z-index: 10;
+		left: -200vw;
+		top: -200vw;
+		pointer-events: none;
+	}
+		
+	&-tools {
+		position: absolute;
+		left: 0;
+		bottom: 10px;
+		width: 100%;
+		z-index: 99;
+		color: #fff;
+		&__btns {
+			font-weight: bold;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			padding: 20rpx 40rpx;
+			box-sizing: border-box;
+			.cancel {
+				width: 112rpx;
+				height: 60rpx;
+				text-align: center;
+				line-height: 60rpx;
+			}
+				
+			.confirm {
+				width: 112rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				background: var(--lime-clipper-confirm-color, $clipper-confirm-color);
+				border-radius: 6rpx;
+				text-align: center;
+			}
+				
+			image {
+				display: block;
+				width: 60rpx;
+				height: 60rpx;
+			}
+		}	
+	}		
+}
+	
diff --git a/uni_modules/lime-clipper/components/l-clipper/l-clipper.vue b/uni_modules/lime-clipper/components/l-clipper/l-clipper.vue
new file mode 100644
index 0000000..114c285
--- /dev/null
+++ b/uni_modules/lime-clipper/components/l-clipper/l-clipper.vue
@@ -0,0 +1,840 @@
+<template>
+	<view class="lime-clipper" :class="{open: value}" disable-scroll :style="'z-index: ' + zIndex + ';' + customStyle">
+		<view class="lime-clipper-mask" 
+			@touchstart.stop.prevent="clipTouchStart" 
+			@touchmove.stop.prevent="clipTouchMove" 
+			@touchend.stop.prevent="clipTouchEnd">
+			<view class="lime-clipper__content" :style="clipStyle"><view class="lime-clipper__edge" v-for="(item, index) in [0, 0, 0, 0]" :key="index"></view></view>
+		</view>
+		<image
+			class="lime-clipper-image"
+			@error="imageLoad"
+			@load="imageLoad"
+			@touchstart="imageTouchStart"
+			@touchmove="imageTouchMove"
+			@touchend="imageTouchEnd"
+			:src="image"
+			:mode="imageWidth == 'auto' ? 'widthFix' : 'scaleToFill'"
+			v-if="image"
+			:style="imageStyle"
+		/>
+		<canvas
+			canvas-id="lime-clipper"
+			id="lime-clipper"
+			disable-scroll
+			:style="'width: ' + canvasWidth * scaleRatio + 'px; height:' + canvasHeight * scaleRatio + 'px;'"
+			class="lime-clipper-canvas"
+		></canvas>
+		<view class="lime-clipper-tools">
+			<view class="lime-clipper-tools__btns">
+				<view v-if="isShowCancelBtn" @tap="cancel">
+					<slot name="cancel" v-if="$slots.cancel" />
+					<view v-else class="cancel">取消</view>
+				</view>
+				<view v-if="isShowPhotoBtn" @tap="uploadImage">
+					<slot name="photo" v-if="$slots.photo" />
+					<image v-else src="/uni_modules/lime-clipper/static/photo.svg" />
+				</view>
+				<view v-if="isShowRotateBtn" @tap="rotate">
+					<slot name="rotate" v-if="$slots.rotate" />
+					<image v-else src="/uni_modules/lime-clipper/static/rotate.svg" data-type="inverse" />
+				</view>
+				<view v-if="isShowConfirmBtn" @tap="confirm" >
+					<slot name="confirm" v-if="$slots.confirm" />
+					<view v-else class="confirm">确定</view>
+				</view>
+			</view>
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+import { 
+	determineDirection, 
+	calcImageOffset, 
+	calcImageScale, 
+	calcImageSize, 
+	calcPythagoreanTheorem, 
+	clipTouchMoveOfCalculate, 
+	imageTouchMoveOfCalcOffset,
+	} from './utils';
+const cache = {}
+export default {
+	name: 'lime-clipper',
+	props: {
+		value: {
+			type: Boolean,
+			default: true
+		},
+		// #ifdef MP-WEIXIN
+		type: {
+			type: String,
+			default: '2d'
+		},
+		// #endif
+		customStyle: {
+			type: String,
+		},
+		zIndex: {
+			type: Number,
+			default: 99
+		},
+		imageUrl: {
+			type: String
+		},
+		fileType: {
+			type: String,
+			default: 'png'
+		},
+		quality: {
+			type: Number,
+			default: 1
+		},
+		width: {
+			type: Number,
+			default: 400
+		},
+		height: {
+			type: Number,
+			default: 400
+		},
+		minWidth: {
+			type: Number,
+			default: 200
+		},
+		maxWidth: {
+			type: Number,
+			default: 600
+		},
+		destWidth: Number,
+		destHeight: Number,
+		minHeight: {
+			type: Number,
+			default: 200
+		},
+		maxHeight: {
+			type: Number,
+			default: 600
+		},
+		isLockWidth: {
+			type: Boolean,
+			default: false
+		},
+		isLockHeight: {
+			type: Boolean,
+			default: false
+		},
+		isLockRatio: {
+			type: Boolean,
+			default: true
+		},
+		scaleRatio: {
+			type: Number,
+			default: 1
+		},
+		minRatio: {
+			type: Number,
+			default: 0.5
+		},
+		maxRatio: {
+			type: Number,
+			default: 2
+		},
+		isDisableScale: {
+			type: Boolean,
+			default: false
+		},
+		isDisableRotate: {
+			type: Boolean,
+			default: false
+		},
+		isLimitMove: {
+			type: Boolean,
+			default: false
+		},
+		isShowPhotoBtn: {
+			type: Boolean,
+			default: true
+		},
+		isShowRotateBtn: {
+			type: Boolean,
+			default: true
+		},
+		isShowConfirmBtn: {
+			type: Boolean,
+			default: true
+		},
+		isShowCancelBtn: {
+			type: Boolean,
+			default: true
+		},
+		rotateAngle: {
+			type: Number,
+			default: 90
+		},
+		source: {
+			type: Object,
+			default: () => ({
+					album: '从相册中选择',
+					camera: '拍照',
+					// #ifdef MP-WEIXIN
+					message: '从微信中选择'
+					// #endif
+				})
+		}
+	},
+	data() {
+		return {
+			canvasWidth: 0,
+			canvasHeight: 0,
+			clipX: 0,
+			clipY: 0,
+			clipWidth: 0,
+			clipHeight: 0,
+			animation: false,
+			imageWidth: 0,
+			imageHeight: 0,
+			imageTop: 0,
+			imageLeft: 0,
+			scale: 1,
+			angle: 0,
+			image: '',
+			imageInit: false,
+			sysinfo: {},
+			throttleTimer: null,
+			throttleFlag: true,
+			timeClipCenter: null,
+			flagClipTouch: false,
+			flagEndTouch: false,
+			clipStart: {},
+			animationTimer: null,
+			touchRelative: [{x: 0,y: 0}],
+			hypotenuseLength: 0,
+			ctx: null,
+			canvasId: 'lime-clipper'
+		};
+	},
+	computed: {
+		// canvasId() {
+		// 	return `l-clipper-${this._ ? this._.uid : this._uid}`
+		// },
+		clipStyle() {
+			const {clipWidth, clipHeight, clipY, clipX, animation} = this
+			return  `
+			width: ${clipWidth}px;
+			height:${clipHeight}px;
+			transition-property: ${animation ? '' : 'background'};
+			left: ${clipX}px;
+			top: ${clipY}px
+			`
+		},
+		imageStyle() {
+			const {imageWidth, imageHeight, imageLeft, imageTop, animation, scale, angle} = this
+			return `
+				width: ${imageWidth ? imageWidth + 'px' : 'auto'};
+				height: ${imageHeight ? imageHeight + 'px' : 'auto'};
+				transform: translate3d(${imageLeft - imageWidth / 2}px, ${imageTop - imageHeight / 2}px, 0) scale(${scale}) rotate(${angle}deg);
+				transition-duration: ${animation ? 0.35 : 0}s
+			`
+		},
+		clipSize() {
+			const { clipWidth, clipHeight } = this;
+			return { clipWidth, clipHeight };
+		},
+		clipPoint() {
+			const { clipY, clipX } = this;
+			return { clipY, clipX };
+		}
+	},
+	watch: {
+		value(val) {
+			if(!val) {
+				this.animation = 0
+				this.angle = 0
+			} else {
+				if(this.imageUrl) {
+					const {imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight, path} = cache?.[this.imageUrl] || {}
+					if(path != this.image) {
+						this.image = this.imageUrl;
+					} else {
+						this.setDiffData({imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight})
+					}
+					
+				}
+				
+			}
+		},
+		imageUrl(url) {
+			this.image = url
+		},
+		image:{
+			handler: async function(url) {
+				this.getImageInfo(url)
+			},
+			// immediate: true,
+		},
+		clipSize({ widthVal, heightVal }) {
+			let { minWidth, minHeight } = this;
+			minWidth = minWidth / 2;
+			minHeight = minHeight / 2;
+			if (widthVal < minWidth) {
+				this.setDiffData({clipWidth: minWidth})
+			}
+			if (heightVal < minHeight) {
+				this.setDiffData({clipHeight: minHeight})
+			}
+			this.calcClipSize();
+		},
+		angle(val) {
+			this.animation = this.imageInit;
+			this.moveStop();
+			const { isLimitMove } = this;
+			if (isLimitMove && val % 90) {
+				this.setDiffData({
+					angle: Math.round(val / 90) * 90
+				})
+			}
+			this.imgMarginDetectionScale();
+		},
+		animation(val) {
+			clearTimeout(this.animationTimer);
+			if (val) {
+				let animationTimer = setTimeout(() => {
+					this.setDiffData({
+						animation: false
+					})
+				}, 260);
+				this.setDiffData({animationTimer})
+				this.animationTimer = animationTimer;
+			}
+		},
+		isLimitMove(val) {
+			if (val) {
+				if (this.angle % 90) {
+					this.setDiffData({
+						angle : Math.round(this.angle / 90) * 90
+					})
+				}
+				this.imgMarginDetectionScale();
+			}
+		},
+		clipPoint() {
+			this.cutDetectionPosition();
+		},
+		width(width, oWidth) {
+			if (width !== oWidth) {
+				this.setDiffData({
+					clipWidth:  uni.upx2px(width) //width / 2
+				})
+			}
+		},
+		height(height, oHeight) {
+			if (height !== oHeight) {
+				this.setDiffData({
+					clipHeight: uni.upx2px(height) //height / 2
+				})
+			}
+		}
+	},
+	mounted() {
+		const sysinfo = uni.getSystemInfoSync();
+		this.sysinfo = sysinfo;
+		this.setClipInfo();
+		this.image = this.imageUrl||this.image
+		this.setClipCenter();
+		this.calcClipSize();
+		this.cutDetectionPosition();
+	},
+	methods: {
+		setDiffData(data) {
+			Object.keys(data).forEach(key => {
+			  if (this[key] !== data[key]) {
+				this[key] = data[key];
+			  }
+			});
+		},
+		getImageInfo(url) {
+			if (!url) return;
+			if(this.value) {
+				uni.showLoading({
+					title: '请稍候...',
+					mask: true
+				});
+			}
+			this.imageInit = false
+			uni.getImageInfo({
+				src: url,
+				success: res => {
+					if(['right', 'left'].includes(res.orientation)) {
+						this.imgComputeSize(res.height, res.width);
+					} else {
+						this.imgComputeSize(res.width, res.height);
+					}
+					this.image = res.path;
+					if (this.isLimitMove) {
+						this.imgMarginDetectionScale();
+						this.$emit('ready', res);
+					}
+					const {imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight} = this
+					cache[url] = Object.assign(res, {imageWidth, imageHeight, imageLeft, imageTop, scale, clipX, clipY, clipWidth, clipHeight});
+				},
+				fail: (err) => {
+					this.imgComputeSize();
+					if (this.isLimitMove) {
+						this.imgMarginDetectionScale();
+					}
+				}
+			});
+			
+		},
+		setClipInfo() {
+			const { width, height, sysinfo, canvasId } = this;
+			const clipWidth = width / 2;
+			const clipHeight = height / 2;
+			const clipY = (sysinfo.windowHeight - clipHeight) / 2;
+			const clipX = (sysinfo.windowWidth - clipWidth) / 2;
+			const imageLeft = sysinfo.windowWidth / 2;
+			const imageTop = sysinfo.windowHeight / 2;
+			this.ctx = uni.createCanvasContext(canvasId, this);
+			this.clipWidth = clipWidth;
+			this.clipHeight = clipHeight;
+			this.clipX = clipX;
+			this.clipY = clipY;
+			this.canvasHeight = clipHeight;
+			this.canvasWidth = clipWidth;
+			this.imageLeft = imageLeft;
+			this.imageTop = imageTop;
+		},
+		setClipCenter() {
+			const { sysInfo, clipHeight, clipWidth, imageTop, imageLeft } = this;
+			let sys = sysInfo || uni.getSystemInfoSync();
+			let clipY = (sys.windowHeight - clipHeight) * 0.5;
+			let clipX = (sys.windowWidth - clipWidth) * 0.5;
+			this.imageTop = imageTop - this.clipY + clipY;
+			this.imageLeft = imageLeft - this.clipX + clipX;
+			this.clipY = clipY;
+			this.clipX = clipX;
+		},
+		calcClipSize() {
+			const { clipHeight, clipWidth, sysinfo, clipX, clipY } = this;
+			if (clipWidth > sysinfo.windowWidth) {
+				this.setDiffData({
+					clipWidth:  sysinfo.windowWidth
+				})
+			} else if (clipWidth + clipX > sysinfo.windowWidth) {
+				this.setDiffData({
+					clipX: sysinfo.windowWidth - clipX
+				})
+			}
+			if (clipHeight > sysinfo.windowHeight) {
+				this.setDiffData({
+					clipHeight: sysinfo.windowHeight
+				})
+			} else if (clipHeight + clipY > sysinfo.windowHeight) {
+				this.clipY = sysinfo.windowHeight - clipY;
+				this.setDiffData({
+					clipY: sysinfo.windowHeight - clipY
+				})
+			}
+		},
+		cutDetectionPosition() {
+			const { clipX, clipY, sysinfo, clipHeight, clipWidth } = this;
+			let cutDetectionPositionTop = () => {
+					if (clipY < 0) {
+						this.setDiffData({clipY: 0})
+					}
+					if (clipY > sysinfo.windowHeight - clipHeight) {
+						this.setDiffData({clipY: sysinfo.windowHeight - clipHeight})
+					}
+				},
+				cutDetectionPositionLeft = () => {
+					if (clipX < 0) {
+						this.setDiffData({clipX: 0})
+					}
+					if (clipX > sysinfo.windowWidth - clipWidth) {
+						this.setDiffData({clipX: sysinfo.windowWidth - clipWidth})
+					}
+				};
+			if (clipY === null && clipX === null) {
+				let newClipY = (sysinfo.windowHeight - clipHeight) * 0.5;
+				let newClipX = (sysinfo.windowWidth - clipWidth) * 0.5;
+				this.setDiffData({
+					clipX: newClipX,
+					clipY: newClipY
+				})
+			} else if (clipY !== null && clipX !== null) {
+				cutDetectionPositionTop();
+				cutDetectionPositionLeft();
+			} else if (clipY !== null && clipX === null) {
+				cutDetectionPositionTop();
+				this.setDiffData({
+					clipX: (sysinfo.windowWidth - clipWidth) / 2
+				})
+			} else if (clipY === null && clipX !== null) {
+				cutDetectionPositionLeft();
+				this.setDiffData({
+					clipY: (sysinfo.windowHeight - clipHeight) / 2
+				})
+			}
+		},
+		imgComputeSize(width, height) {
+			const { imageWidth, imageHeight } = calcImageSize(width, height, this);
+			this.imageWidth = imageWidth;
+			this.imageHeight = imageHeight;
+		},
+		imgMarginDetectionScale(scale) {
+			if (!this.isLimitMove) return;
+			const currentScale = calcImageScale(this, scale);
+			this.imgMarginDetectionPosition(currentScale);
+		},
+		imgMarginDetectionPosition(scale) {
+			if (!this.isLimitMove) return;
+			const { scale: currentScale, left, top } = calcImageOffset(this, scale);
+			this.setDiffData({
+				imageLeft: left,
+				imageTop: top,
+				scale: currentScale
+			})
+		},
+		throttle() {
+			this.setDiffData({
+				throttleFlag: true
+			})
+		},
+		moveDuring() {
+			clearTimeout(this.timeClipCenter);
+		},
+		moveStop() {
+			clearTimeout(this.timeClipCenter);
+			const timeClipCenter = setTimeout(() => {
+				if (!this.animation) {
+					this.setDiffData({
+						imageInit: true,
+						animation: true,
+					})
+				}
+				this.setClipCenter();
+			}, 800);
+			this.setDiffData({timeClipCenter})
+		},
+		clipTouchStart(event) {
+			// #ifdef H5
+			event.preventDefault()
+			// #endif
+			if (!this.image) {
+				uni.showToast({
+					title: '请选择图片',
+					icon: 'none'
+				});
+				return;
+			}
+			const currentX = event.touches[0].clientX;
+			const currentY = event.touches[0].clientY;
+			const { clipX, clipY, clipWidth, clipHeight } = this;
+			const corner = determineDirection(clipX, clipY, clipWidth, clipHeight, currentX, currentY);
+			this.moveDuring();
+			if(!corner) {return}
+			this.clipStart = {
+				width: clipWidth,
+				height: clipHeight,
+				x: currentX,
+				y: currentY,
+				clipY,
+				clipX,
+				corner
+			};
+			this.flagClipTouch = true;
+			this.flagEndTouch = true;
+		},
+		clipTouchMove(event) {
+			// #ifdef H5
+			event.stopPropagation()
+			event.preventDefault()
+			// #endif
+			if (!this.image) {
+				uni.showToast({
+					title: '请选择图片',
+					icon: 'none'
+				});
+				return;
+			}
+			// 只针对单指点击做处理
+			if (event.touches.length !== 1) {
+				return;
+				
+			}
+			const { flagClipTouch, throttleFlag } = this;
+			if (flagClipTouch && throttleFlag) {
+				const { isLockRatio, isLockHeight, isLockWidth } = this;
+				if (isLockRatio && (isLockWidth || isLockHeight)) return;
+				this.setDiffData({
+					throttleFlag: false
+				})
+				this.throttle();
+				const clipData = clipTouchMoveOfCalculate(this, event);
+				if(clipData) {
+					const { width, height, clipX, clipY } = clipData;
+					if (!isLockWidth && !isLockHeight) {
+						this.setDiffData({
+							clipWidth: width,
+							clipHeight: height,
+							clipX,
+							clipY
+						})
+					} else if (!isLockWidth) {
+						this.setDiffData({
+							clipWidth: width,
+							clipX
+						})
+					} else if (!isLockHeight) {
+						this.setDiffData({
+							clipHeight: height,
+							clipY
+						})
+					}
+					this.imgMarginDetectionScale();
+				}
+
+			}
+		},
+		clipTouchEnd() {
+			this.moveStop();
+			this.flagClipTouch = false;
+		},
+		imageTouchStart(e) {
+			// #ifdef H5
+			event.preventDefault()
+			// #endif
+			this.flagEndTouch = false;
+			const { imageLeft, imageTop } = this;
+			const clientXForLeft = e.touches[0].clientX;
+			const clientYForLeft = e.touches[0].clientY;
+
+			let touchRelative = [];
+			if (e.touches.length === 1) {
+				touchRelative[0] = {
+					x: clientXForLeft - imageLeft,
+					y: clientYForLeft - imageTop
+				};
+				this.touchRelative = touchRelative;
+			} else {
+				const clientXForRight = e.touches[1].clientX;
+				const clientYForRight = e.touches[1].clientY;
+				let width = Math.abs(clientXForLeft - clientXForRight);
+				let height = Math.abs(clientYForLeft - clientYForRight);
+				const hypotenuseLength = calcPythagoreanTheorem(width, height);
+
+				touchRelative = [
+					{
+						x: clientXForLeft - imageLeft,
+						y: clientYForLeft - imageTop
+					},
+					{
+						x: clientXForRight - imageLeft,
+						y: clientYForRight - imageTop
+					}
+				];
+				this.touchRelative = touchRelative;
+				this.hypotenuseLength = hypotenuseLength;
+			}
+		},
+		imageTouchMove(e) {
+			// #ifdef H5
+			event.preventDefault()
+			// #endif
+			const { flagEndTouch, throttleFlag } = this;
+			if (flagEndTouch || !throttleFlag) return;
+			const clientXForLeft = e.touches[0].clientX;
+			const clientYForLeft = e.touches[0].clientY;
+			this.setDiffData({throttleFlag: false})
+			this.throttle();
+			this.moveDuring();
+			if (e.touches.length === 1) {
+				const { left: imageLeft, top:  imageTop} = imageTouchMoveOfCalcOffset(this, clientXForLeft, clientYForLeft);
+				this.setDiffData({
+					imageLeft,
+					imageTop
+				})
+				this.imgMarginDetectionPosition();
+			} else {
+				const clientXForRight = e.touches[1].clientX;
+				const clientYForRight = e.touches[1].clientY;
+				let width = Math.abs(clientXForLeft - clientXForRight),
+					height = Math.abs(clientYForLeft - clientYForRight),
+					hypotenuse = calcPythagoreanTheorem(width, height),
+					scale = this.scale * (hypotenuse / this.hypotenuseLength);
+				if (this.isDisableScale) {
+
+					scale = 1;
+				} else {
+					scale = scale <= this.minRatio ? this.minRatio : scale;
+					scale = scale >= this.maxRatio ? this.maxRatio : scale;
+					this.$emit('change', {
+						width: this.imageWidth * scale,
+						height: this.imageHeight * scale
+					});
+				}
+				
+				this.imgMarginDetectionScale(scale);
+				this.hypotenuseLength = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2));
+				this.scale = scale;
+			}
+		},
+		imageTouchEnd() {
+			this.setDiffData({
+				flagEndTouch: true
+			})
+			this.moveStop();
+		},
+		uploadImage() {
+			const itemList = Object.entries(this.source)
+			const sizeType = ['original', 'compressed']
+			const success = ({tempFilePaths:a, tempFiles: b}) => {
+				this.image = a ? a[0] : b[0].path
+			};
+			const _uploadImage = (type) => {
+				if(type !== 'message') {
+					uni.chooseImage({
+						count: 1,
+						sizeType,
+						sourceType: [type],
+						success
+					});
+				}
+				// #ifdef MP-WEIXIN
+				if(type == 'message') {
+					wx.chooseMessageFile({
+					  count: 1,
+					  type: 'image',
+					  success
+					})
+				}
+				// #endif
+			}
+			if(itemList.length > 1) {
+				uni.showActionSheet({
+					itemList: itemList.map(v => v[1]),
+					success: ({tapIndex: i}) => {
+						_uploadImage(itemList[i][0])
+					}
+				})
+			} else {
+				_uploadImage(itemList[0][0])
+			}
+		},
+		imageReset() {
+			const sys = this.sysinfo || uni.getSystemInfoSync();
+			this.moveStop()
+			this.scale = 1;
+			this.angle = 0;
+			
+			this.imageTop = sys.windowHeight / 2;
+			this.imageLeft = sys.windowWidth / 2;
+		},
+		imageLoad(e) {
+			this.imageReset();
+			uni.hideLoading();
+			this.$emit('ready', e.detail);
+		},
+		rotate(event) {
+			if (this.isDisableRotate) return;
+			if (!this.image) {
+				uni.showToast({
+					title: '请选择图片',
+					icon: 'none'
+				});
+				return;
+			}
+			const { rotateAngle } = this;
+			const originAngle = this.angle
+			const type = event.currentTarget.dataset.type;
+			if (type === 'along') {
+				this.angle = originAngle + rotateAngle
+			} else {
+				this.angle = originAngle - rotateAngle
+			}
+			this.$emit('rotate', this.angle);
+		},
+		confirm() {
+			if (!this.image) {
+				uni.showToast({
+					title: '请选择图片',
+					icon: 'none'
+				});
+				return;
+			}
+			uni.showLoading({
+				title: '加载中'
+			});
+			const { canvasHeight, canvasWidth, clipHeight, clipWidth, scale, ctx, imageLeft, imageTop, clipX, clipY, angle, scaleRatio: dpr, image, quality, fileType, type: imageType, canvasId } = this;
+			const draw = () => {
+				const imageWidth = this.imageWidth * scale * dpr;
+				const imageHeight = this.imageHeight * scale * dpr;
+				const xpos = imageLeft - clipX;
+				const ypos = imageTop - clipY;
+				// const ctx = uni.createCanvasContext(canvasId, this);
+				ctx.translate(xpos * dpr, ypos * dpr);
+				ctx.rotate((angle * Math.PI) / 180);
+				ctx.drawImage(image, -imageWidth / 2, -imageHeight / 2, imageWidth, imageHeight);
+				ctx.draw(false, () => {
+					const width = clipWidth * dpr
+					const height = clipHeight * dpr
+					let params = {
+						x: 0,
+						y: 0,
+						width,
+						height,
+						destWidth: this.destWidth || width,
+						destHeight: this.destHeight || height,
+						canvasId,
+						fileType,
+						quality,
+						success: (res) => {
+							// 钉钉小程序
+							data.url = res.tempFilePath || res.filePath;
+							uni.hideLoading();
+							this.$emit('success', data);
+							this.$emit('input', false)
+						},
+						fail: (error) => {
+							console.error('error', error)
+							this.$emit('fail', error);
+							this.$emit('input', false)
+						}
+					};
+				
+					let data = {
+						url: '',
+						width,
+						height
+					};
+					uni.canvasToTempFilePath(params, this)
+				});
+				
+			};
+
+			if (canvasWidth !== clipWidth || canvasHeight !== clipHeight) {
+				this.canvasWidth = clipWidth;
+				this.canvasHeight = clipHeight;
+				ctx.draw();
+				this.$nextTick(() => {
+					setTimeout(() => {
+						draw();
+					}, 100);
+				})
+			} else {
+				draw();
+			}
+		},
+		cancel() {
+			this.$emit('cancel', false)
+			this.$emit('input', false)
+		},
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	@import './index';
+</style>
diff --git a/uni_modules/lime-clipper/components/l-clipper/utils.js b/uni_modules/lime-clipper/components/l-clipper/utils.js
new file mode 100644
index 0000000..3d4d30e
--- /dev/null
+++ b/uni_modules/lime-clipper/components/l-clipper/utils.js
@@ -0,0 +1,248 @@
+/**
+ * 判断手指触摸位置
+ */
+export function determineDirection(clipX, clipY, clipWidth, clipHeight, currentX, currentY) {
+	/*
+	 * (右下>>1 右上>>2 左上>>3 左下>>4)
+	 */
+	let corner;
+	/**
+	 * 思路：（利用直角坐标系）
+	 *  1.找出裁剪框中心点
+	 *  2.如点击坐标在上方点与左方点区域内，则点击为左上角
+	 *  3.如点击坐标在下方点与右方点区域内，则点击为右下角
+	 *  4.其他角同理
+	 */
+	const mainPoint = [clipX + clipWidth / 2, clipY + clipHeight / 2]; // 中心点
+	const currentPoint = [currentX, currentY]; // 触摸点
+
+	if (currentPoint[0] <= mainPoint[0] && currentPoint[1] <= mainPoint[1]) {
+		corner = 3; // 左上
+	} else if (currentPoint[0] >= mainPoint[0] && currentPoint[1] <= mainPoint[1]) {
+		corner = 2; // 右上
+	} else if (currentPoint[0] <= mainPoint[0] && currentPoint[1] >= mainPoint[1]) {
+		corner = 4; // 左下
+	} else if (currentPoint[0] >= mainPoint[0] && currentPoint[1] >= mainPoint[1]) {
+		corner = 1; // 右下
+	}
+
+	return corner;
+}
+
+/**
+ * 图片边缘检测检测时，计算图片偏移量
+ */
+export function calcImageOffset(data, scale) {
+	let left = data.imageLeft;
+	let top = data.imageTop;
+	scale = scale || data.scale;
+	
+	let imageWidth = data.imageWidth;
+	  let imageHeight = data.imageHeight;
+	  if ((data.angle / 90) % 2) {
+	    imageWidth = data.imageHeight;
+	    imageHeight = data.imageWidth;
+	  }
+	  const {
+	      clipX,
+	      clipWidth,
+	      clipY,
+	      clipHeight
+	    } = data;
+
+	// 当前图片宽度/高度
+	const currentImageSize = (size) => (size * scale) / 2;
+	const currentImageWidth = currentImageSize(imageWidth);
+	const currentImageHeight = currentImageSize(imageHeight);
+
+	left = clipX + currentImageWidth >= left ? left : clipX + currentImageWidth;
+	left = clipX + clipWidth - currentImageWidth <= left ? left : clipX + clipWidth - currentImageWidth;
+	top = clipY + currentImageHeight >= top ? top : clipY + currentImageHeight;
+	top = clipY + clipHeight - currentImageHeight <= top ? top : clipY + clipHeight - currentImageHeight;
+	return {
+		left,
+		top,
+		scale
+	};
+}
+
+/**
+ * 图片边缘检测时，计算图片缩放比例
+ */
+export function calcImageScale(data, scale) {
+	scale = scale || data.scale;
+	let {
+		imageWidth,
+		imageHeight,
+		clipWidth,
+		clipHeight,
+		angle
+	} = data
+	if ((angle / 90) % 2) {
+		[imageWidth, imageHeight] = [imageHeight, imageWidth]
+	}
+	if(angle !== 0 && scale == Math.max(clipWidth / imageHeight ,  clipHeight / imageWidth )) {
+		return Math.max(clipWidth / imageWidth ,  clipHeight / imageHeight )
+	}
+	if (imageWidth * scale < clipWidth) {
+		scale = clipWidth / imageWidth;
+	}
+	if (imageHeight * scale < clipHeight) {
+		scale = Math.max(scale, clipHeight / imageHeight);
+	}
+	return scale
+}
+
+/**
+ * 计算图片尺寸
+ */
+export function calcImageSize(width, height, data) {
+	let imageWidth = width,
+		imageHeight = height;
+	let {
+		clipWidth,
+		clipHeight,
+		sysinfo,
+		width: originWidth,
+		height: originHeight
+	} = data
+	const cw = clipWidth || originWidth
+	const ch = clipHeight || originHeight
+	if (imageWidth && imageHeight) {
+		if (imageWidth / imageHeight > cw / ch) {
+			imageHeight = clipHeight || originHeight;
+			imageWidth = (width / height) * imageHeight;
+		} else {
+			imageWidth = cw;
+			imageHeight = (height / width) * imageWidth;
+		}
+	} else {
+		let sys = sysinfo || uni.getSystemInfoSync();
+		imageWidth = sys.windowWidth;
+		imageHeight = 0;
+	}
+	return {
+		imageWidth,
+		imageHeight
+	};
+}
+
+/**
+ * 勾股定理求斜边
+ */
+export function calcPythagoreanTheorem(width, height) {
+	return Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2));
+}
+
+/**
+ * 拖动裁剪框时计算
+ */
+export function clipTouchMoveOfCalculate(data, event) {
+	const clientX = event.touches[0].clientX;
+	const clientY = event.touches[0].clientY;
+
+	let {
+		clipWidth,
+		clipHeight,
+		clipY: oldClipY,
+		clipX: oldClipX,
+		clipStart,
+		isLockRatio,
+		maxWidth,
+		minWidth,
+		maxHeight,
+		minHeight
+	} = data;
+	maxWidth = uni.upx2px(maxWidth) // maxWidth / 2;
+	minWidth = uni.upx2px(minWidth) // minWidth / 2;
+	minHeight = uni.upx2px(minHeight) // minHeight / 2;
+	maxHeight = uni.upx2px(maxHeight) // maxHeight / 2;
+
+	let width = clipWidth,
+		height = clipHeight,
+		clipY = oldClipY,
+		clipX = oldClipX,
+		// 获取裁剪框实际宽度/高度
+		// 如果大于最大值则使用最大值
+		// 如果小于最小值则使用最小值
+		sizecorrect = () => {
+			width = width <= maxWidth ? (width >= minWidth ? width : minWidth) : maxWidth;
+			height = height <= maxHeight ? (height >= minHeight ? height : minHeight) : maxHeight;
+		},
+		sizeinspect = () => {
+			
+			if ((width > maxWidth || width < minWidth || height > maxHeight || height < minHeight) && isLockRatio) {
+				sizecorrect();
+				return false;
+			} else {
+				sizecorrect();
+				return true;
+			}
+		};
+	//if (clipStart.corner) {
+	height = clipStart.height + (clipStart.corner > 1 && clipStart.corner < 4 ? 1 : -1) * (clipStart.y - clientY);
+	//}
+	switch (clipStart.corner) {
+		case 1:
+			width = clipStart.width - clipStart.x + clientX;
+			if (isLockRatio) {
+				height = width / (clipWidth / clipHeight);
+			}
+			if (!sizeinspect()) return;
+			break;
+		case 2:
+			width = clipStart.width - clipStart.x + clientX;
+			if (isLockRatio) {
+				height = width / (clipWidth / clipHeight);
+			}
+			if (!sizeinspect()) {
+				return;
+			} else {
+				clipY = clipStart.clipY - (height - clipStart.height);
+			}
+
+			break;
+		case 3:
+			width = clipStart.width + clipStart.x - clientX;
+			if (isLockRatio) {
+				height = width / (clipWidth / clipHeight);
+			}
+			if (!sizeinspect()) {
+				return;
+			} else {
+				clipY = clipStart.clipY - (height - clipStart.height);
+				clipX = clipStart.clipX - (width - clipStart.width);
+			}
+
+			break;
+		case 4:
+			width = clipStart.width + clipStart.x - clientX;
+			if (isLockRatio) {
+				height = width / (clipWidth / clipHeight);
+			}
+			if (!sizeinspect()) {
+				return;
+			} else {
+				clipX = clipStart.clipX - (width - clipStart.width);
+			}
+			break;
+		default:
+			break;
+	}
+	return {
+		width,
+		height,
+		clipX,
+		clipY
+	};
+}
+
+/**
+ * 单指拖动图片计算偏移
+ */
+export function imageTouchMoveOfCalcOffset(data, clientXForLeft, clientYForLeft) {
+	return {
+		left: clientXForLeft - data.touchRelative[0].x,
+		top: clientYForLeft - data.touchRelative[0].y
+	};
+}
diff --git a/uni_modules/lime-clipper/components/lime-clipper/lime-clipper.vue b/uni_modules/lime-clipper/components/lime-clipper/lime-clipper.vue
new file mode 100644
index 0000000..5fd80d6
--- /dev/null
+++ b/uni_modules/lime-clipper/components/lime-clipper/lime-clipper.vue
@@ -0,0 +1,21 @@
+<template>
+	<view>
+		<image :src="url" v-if="url" mode="widthFix"></image>
+		<l-clipper v-if="show" @success="url = $event.url; show = false" @cancel="show = false"  />
+		<button @tap="show = true">裁剪</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url: '',
+				show: false
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-clipper/package.json b/uni_modules/lime-clipper/package.json
new file mode 100644
index 0000000..eec34ed
--- /dev/null
+++ b/uni_modules/lime-clipper/package.json
@@ -0,0 +1,76 @@
+{
+  "id": "lime-clipper",
+  "displayName": "图片剪刀-LimeUI",
+  "version": "1.0.1",
+  "description": "一款自我感觉良好的图片裁剪插件",
+  "keywords": [
+    "图片裁剪",
+    "缩放",
+    "旋转",
+    "拖动"
+],
+  "repository": "https://gitee.com/liangei/lime-clipper",
+  "engines": {
+    "HBuilderX": "^3.6.4"
+  },
+"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"
+      },
+      "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": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/lime-clipper/readme.md b/uni_modules/lime-clipper/readme.md
new file mode 100644
index 0000000..dcc2462
--- /dev/null
+++ b/uni_modules/lime-clipper/readme.md
@@ -0,0 +1,239 @@
+# Clipper 图片裁剪
+> uniapp 图片裁剪，可用于图片头像等裁剪处理  
+> [查看更多 站点1](https://limeui.qcoon.cn/#/clipper) <br>
+> [查看更多 站点2](http://liangei.gitee.io/limeui/#/clipper) <br>
+> Q群：1169785031
+
+
+## 平台兼容
+
+| H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 头条小程序 | QQ 小程序 | App |
+| --- | ---------- | ------------ | ---------- | ---------- | --------- | --- |
+| √   | √          | √         | 未测       | √          | √      | √   |
+
+## 安装
+在市场导入**[图片剪刀](https://ext.dcloud.net.cn/plugin?id=3594)uni_modules**版本的即可，无需`import`
+
+
+
+## 代码演示
+### 基本用法
+`@success` 事件点击 👉 **确定** 后会返回生成的图片信息，包含 `url`、`width`、`height`
+
+```html
+<image :src="url" v-if="url" mode="widthFix"></image>
+<l-clipper v-if="show" @success="url = $event.url; show = false" @cancel="show = false"  />
+<button @tap="show = true">裁剪</button>
+```
+
+```js
+export default {
+    data() {
+        return {
+            show: false,
+			url: '',
+        }
+    }
+}
+```
+
+
+### 传入图片
+`image-url`可传入**相对路径**、**临时路径**、**本地路径**、**网络图片**<br>
+
+* **当为网络地址时**
+* H5：👉 需要解决跨域问题。 <br>
+* 小程序：👉 需要配置 downloadFile 域名 <br>
+
+
+```html
+<image :src="url" v-if="url" mode="widthFix"></image>
+<l-clipper v-if="show" :image-url="imageUrl"  @success="url = $event.url; show = false" @cancel="show = false"  />
+<button @tap="show = true">裁剪</button>
+```
+
+```js
+export default {
+    data() {
+        return {
+			imageUrl: 'https://img12.360buyimg.com/pop/s1180x940_jfs/t1/97205/26/1142/87801/5dbac55aEf795d962/48a4d7a63ff80b8b.jpg',
+            show: false,
+			url: '',
+        }
+    }
+}
+```
+
+
+### 确定按钮颜色
+样式变量名：`--clipper_confirm_color`, `nvue` 无效, `nvue`需要通过挂载全局样式表实现。
+可放到全局样式的 `page` 里或节点的 `style`
+```html
+<l-clipper class="clipper" style="--clipper_confirm_color: linear-gradient(to right, #ff6034, #ee0a24)"  />
+```
+```css
+// css 中为组件设置 CSS 变量
+.clipper {
+	--clipper_confirm_color: linear-gradient(to right, #ff6034, #ee0a24)
+}
+// 全局
+page {
+	--clipper_confirm_color: linear-gradient(to right, #ff6034, #ee0a24)
+}
+```
+
+
+### 使用插槽
+共五个插槽 `cancel` 取消按钮、 `photo` 选择图片按钮、 `rotate` 旋转按钮、 `confirm` 确定按钮和默认插槽。
+
+```html
+<image :src="url" v-if="url" mode="widthFix"></image>
+<l-clipper 
+	v-if="show" 
+	:isLockWidth="isLockWidth"
+	:isLockHeight="isLockHeight"
+	:isLockRatio="isLockRatio"
+	:isLimitMove="isLimitMove"
+	:isDisableScale="isDisableScale"
+	:isDisableRotate="isDisableRotate"
+	:isShowCancelBtn="isShowCancelBtn"
+	:isShowPhotoBtn="isShowPhotoBtn"
+	:isShowRotateBtn="isShowRotateBtn"
+	:isShowConfirmBtn="isShowConfirmBtn"
+	@success="url = $event.url; show = false" 
+	@cancel="show = false" >
+	<!-- 四个基本按钮插槽 -->
+	<view slot="cancel">取消</view>
+	<view slot="photo">选择图片</view>
+	<view slot="rotate">旋转</view>
+	<view slot="confirm">确定</view>
+	<!-- 默认插槽 -->
+	<view class="tools">
+		<view>显示取消按钮
+			<switch :checked="isShowCancelBtn" @change="isShowCancelBtn = $event.target.value" />
+		</view>
+		<view>显示选择图片按钮
+			<switch :checked="isShowPhotoBtn" @change="isShowPhotoBtn = $event.target.value" />
+		</view>
+		<view>显示旋转按钮
+			<switch :checked="isShowRotateBtn" @change="isShowRotateBtn = $event.target.value" />
+		</view>
+		<view>显示确定按钮
+			<switch :checked="isShowConfirmBtn" @change="isShowConfirmBtn = $event.target.value" />
+		</view>
+		<view>锁定裁剪框宽度
+			<switch :checked="isLockWidth" @change="isLockWidth = $event.target.value" />
+		</view>
+		<view>锁定裁剪框高度
+			<switch :checked="isLockHeight" @change="isLockHeight = $event.target.value" />
+		</view>
+		<view>锁定裁剪框比例
+			<switch :checked="isLockRatio" @change="isLockRatio = $event.target.value" />
+		</view>
+		<view>限制移动范围
+			<switch :checked="isLimitMove" @change="isLimitMove = $event.target.value" />
+		</view>
+		<view>禁止缩放
+			<switch :checked="isDisableScale" @change="isDisableScale = $event.target.value" />
+		</view>
+		<view>禁止旋转
+			<switch :checked="isDisableRotate" @change="isDisableRotate = $event.target.value" />
+		</view>
+	</view>
+</l-clipper>
+<button @tap="show = true">裁剪</button>
+```
+
+```js
+export default {
+
+    data() {
+        return {
+            show: false,
+            url: '',
+            isLockWidth: false,
+            isLockHeight: false,
+            isLockRatio: true,
+            isLimitMove: false,
+            isDisableScale: false,
+            isDisableRotate: false,
+            isShowCancelBtn: true,
+            isShowPhotoBtn: true,
+            isShowRotateBtn: true,
+            isShowConfirmBtn: true
+        }
+    }
+}
+```
+
+### 查看示例
+- 导入后直接使用这个标签查看演示效果
+
+```html
+<!-- // 代码位于 uni_modules/lime-clipper/compoents/lime-clipper -->
+<lime-clipper />
+```
+
+
+### 插件标签
+- 默认 l-clipper 为 component
+- 默认 lime-clipper 为 demo
+
+
+
+
+## API
+
+### Props
+
+| 参数           | 说明         | 类型             | 默认值       |
+| ------------- | ------------ | ---------------- | ------------ |
+| image-url     | 图片路径     | <em>string</em>   |              |
+| quality       | 图片的质量，取值范围为 [0, 1]，不在范围内时当作1处理   | <em>number</em>  |    `1`      |
+| source       | `{album: '从相册中选择'}`key为图片来源类型，value为选项说明   | <em>Object</em>  |         |
+| width | 裁剪框宽度，单位为 `rpx` | <em>number</em> | `400`      |
+| height | 裁剪框高度 | <em>number</em> | `400`      |
+| min-width | 裁剪框最小宽度 | <em>number</em> | `200`      |
+| min-height |裁剪框最小高度 | <em>number</em> | `200`  |
+| max-width | 裁剪框最大宽度 | <em>number</em> | `600`  |
+| max-height | 裁剪框最大宽度 | <em>number</em> | `600`  |
+| min-ratio | 图片最小缩放比 | <em>number</em> | `0.5`  |
+| max-ratio | 图片最大缩放比 | <em>number</em> | `2`  |
+| rotate-angle | 旋转按钮每次旋转的角度 | <em>number</em> | `90`  |
+| scale-ratio | 生成图片相对于裁剪框的比例， **比例越高生成图片越清晰**	 | <em>number</em> | `1`  |
+| is-lock-width | 是否锁定裁剪框宽度 | <em>boolean</em> | `false`  |
+| is-lock-height | 是否锁定裁剪框高度上 | <em>boolean</em> | `false`  |
+| is-lock-ratio | 是否锁定裁剪框比例 | <em>boolean</em> | `true`  |
+| is-disable-scale | 是否禁止缩放 | <em>boolean</em> | `false`  |
+| is-disable-rotate | 是否禁止旋转 | <em>boolean</em> | `false`  |
+| is-limit-move | 是否限制移动范围 | <em>boolean</em> | `false`  |
+| is-show-photo-btn | 是否显示选择图片按钮 | <em>boolean</em> | `true`  |
+| is-show-rotate-btn | 是否显示转按钮 | <em>boolean</em> | `true`  |
+| is-show-confirm-btn | 是否显示确定按钮 | <em>boolean</em> | `true`  |
+| is-show-cancel-btn | 是否显示关闭按钮 | <em>boolean</em> | `true`  |
+
+
+
+### 事件 Events
+
+| 事件名  | 说明         | 回调           |
+| ------- | ------------ | -------------- |
+| success | 生成图片成功 | {`width`, `height`, `url`} |
+| fail | 生成图片失败 | `error` |
+| cancel | 关闭 | `false` |
+| ready   | 图片加载完成 | {`width`, `height`, `path`, `orientation`, `type`} |
+| change | 图片大小改变时触发 | {`width`, `height`} |
+| rotate | 图片旋转时触发 | `angle` |
+
+## 常见问题
+- 1、H5端使用网络图片需要解决跨域问题。
+- 2、小程序使用网络图片需要去公众平台增加下载白名单！二级域名也需要配！
+- 3、H5端生成图片是base64，有时显示只有一半可以使用原生标签`<IMG/>`
+- 4、IOS APP 请勿使用HBX2.9.3.20201014的版本！这个版本无法生成图片。
+- 5、APP端无成功反馈、也无失败反馈时，请更新基座和HBX。
+
+
+## 打赏
+如果你觉得本插件，解决了你的问题，赠人玫瑰，手留余香。  
+![](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/lime-clipper/static/photo.svg b/uni_modules/lime-clipper/static/photo.svg
new file mode 100644
index 0000000..7b4b590
--- /dev/null
+++ b/uni_modules/lime-clipper/static/photo.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#606060;}
+	.st1{fill:none;stroke:#FFFFFF;stroke-width:2.4306;stroke-miterlimit:10;}
+	.st2{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st2" d="M11.6,11c0.4,0.4,0.6,0.9,0.6,1.5c0,0.6-0.2,1.1-0.6,1.4c-0.4,0.4-0.9,0.6-1.5,0.6c-0.6,0-1.1-0.2-1.5-0.6
+		c-0.4-0.4-0.6-0.9-0.6-1.4s0.2-1.1,0.6-1.5c0.4-0.4,0.9-0.6,1.5-0.6C10.8,10.4,11.2,10.6,11.6,11z M24.6,18.4V6.7H5.4v12l1.8-1.8
+		c0.3-0.3,0.6-0.4,1-0.4c0.4,0,0.7,0.1,1,0.4l1.8,1.8l5.8-7c0.3-0.3,0.6-0.5,1.1-0.5c0.4,0,0.8,0.2,1.1,0.5
+		C18.8,11.6,24.6,18.4,24.6,18.4z M25.6,5.7C25.9,6,26,6.3,26,6.7v16.1c0,0.4-0.1,0.7-0.4,1c-0.3,0.3-0.6,0.4-1,0.4H5.4
+		c-0.4,0-0.7-0.1-1-0.4c-0.3-0.3-0.4-0.6-0.4-1V6.7c0-0.4,0.1-0.7,0.4-1c0.3-0.3,0.6-0.4,1-0.4h19.3C25,5.3,25.3,5.4,25.6,5.7z"/>
+	<path class="st1" d="M24.3,21.5H5.7c-0.2,0-0.3-0.2-0.3-0.3V7c0-0.2,0.2-0.3,0.3-0.3h18.6c0.2,0,0.3,0.2,0.3,0.3v14.2
+		C24.6,21.3,24.5,21.5,24.3,21.5z"/>
+</g>
+</svg>
diff --git a/uni_modules/lime-clipper/static/rotate.svg b/uni_modules/lime-clipper/static/rotate.svg
new file mode 100644
index 0000000..0143706
--- /dev/null
+++ b/uni_modules/lime-clipper/static/rotate.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="30px" height="30px" viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#FFFFFF;stroke-width:2.4306;stroke-miterlimit:10;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M17.1,24.2h-12c-0.2,0-0.3-0.2-0.3-0.3v-9.3c0-0.2,0.2-0.3,0.3-0.3h12c0.2,0,0.3,0.2,0.3,0.3v9.3
+		C17.5,24.1,17.3,24.2,17.1,24.2z"/>
+	<path class="st0" d="M16.6,5.4c4.8,0,8.7,3.9,8.7,8.7"/>
+	<polyline class="st0" points="19.3,10.1 14.9,5.6 19.3,1.2 	"/>
+</g>
+</svg>
diff --git a/uni_modules/lime-painter/changelog.md b/uni_modules/lime-painter/changelog.md
new file mode 100644
index 0000000..588fa02
--- /dev/null
+++ b/uni_modules/lime-painter/changelog.md
@@ -0,0 +1,225 @@
+## 1.9.6.6（2024-09-25）
+- fix: 修复background-position无效的问题
+## 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..a8e3483
--- /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)}function O(t){return/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(rpx|px)$/.test(t)}var T=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},L=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=R(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=R(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 R(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 F(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function A(){return A=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},A.apply(this,arguments)}function j(t,e){return j=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},j(t,e)}function E(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 C(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 E(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)?E(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 D(t){return"auto"===t||null===t}function $(t){return/%$/.test(t)}var Y=p,U=u,N=d,X=g,_=y,q=w,G=m;function V(t){return t.replace(/-([a-z])/g,(function(t,e){return e.toUpperCase()}))}function J(t,e){var i,n,o=function(t){var e=t.match(/([a-z]+)/)[1];return[e,V(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 Q(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(Q(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 Z,K=0,et=function(){function t(){F(this,"elements",[]),F(this,"afterElements",[]),F(this,"beforeElements",[]),F(this,"ids",[]),F(this,"width",0),F(this,"height",0),F(this,"top",0),F(this,"left",0),F(this,"pre",null),F(this,"offsetX",0),F(this,"offsetY",0),K++,this.id=K}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=Q(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}(),it=((Z={})[h]={width:"width",contentWidth:"width",lineMaxWidth:"lineMaxWidth",left:"left",top:"top",height:"height",lineMaxHeight:"lineMaxHeight",marginLeft:"marginLeft"},Z[c]={width:"height",contentWidth:"height",lineMaxWidth:"lineMaxWidth",left:"top",top:"left",height:"width",lineMaxHeight:"lineMaxHeight",marginLeft:"marginTop"},Z),nt=function(t){var e,i;function n(){var e;return F(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,j(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=it[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==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}(et),rt=p,ot=u,st=d,at=v,ht=y,ct=b,ft=w,lt=m,dt=0,ut={left:null,top:null,width:null,height:null},pt=new Map,gt=function(){function t(t,e,i,n){var o=this;F(this,"id",dt++),F(this,"style",{left:null,top:null,width:null,height:null}),F(this,"computedStyle",{}),F(this,"originStyle",{}),F(this,"children",{}),F(this,"layoutBox",A({},ut)),F(this,"contentSize",A({},ut)),F(this,"clientSize",A({},ut)),F(this,"borderSize",A({},ut)),F(this,"offsetSize",A({},ut)),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?N:o,a=t.styles,h=void 0===a?{}:a,c=(e||{}).computedStyle,f=Object.assign({},S);if([U,Y,X].includes(s)&&!h.display&&(f.display=_),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=V(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(/^backgroundPosition$/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]]=D(w)?0:w,i[x[1]]=B(m)||D(m)?m:w,i[x[2]]=D(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&&D(a)||$(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&&!$(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,G].includes(h.position)?f[t]=0:f[t]=/^-?[\d\.]+(px|rpx|vw|vh)?$/.test(a)?W(a):/em$/.test(a)&&s==U?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==ft,this.isFixed=s.position==lt,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:A({},this.contentSize),clientSize:A({},this.clientSize),borderSize:A({},this.borderSize),offsetSize:A({},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,$=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+($?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+($?-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+($?-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+($?-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=A({},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=C(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=C(e.elements);!(u=p()).done;){var g=u.value,v=A({},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=C(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==at},e.isFlex=function(t){return void 0===t&&(t=this),t&&t.style.display==ct},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!==ct)||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,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,H=void 0===C?j:C,Y=i.borderLeft,U=(Y=void 0===Y?{}:Y).borderLeftWidth,N=void 0===U?j:U,X=o.contentSize&&o.contentSize.width,_=o.contentSize&&o.contentSize.height;if($(g)&&X&&(g=W(g,X)),$(g)&&!X&&(g=null),$(m)&&_&&(m=W(m,_)),$(m)&&!_&&(m=null),$(v)&&X&&(v=W(v,X)),$(y)&&X&&(y=W(y,X)),$(x)&&_&&(x=W(x,_)),$(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-H||0;R.marginLeft==R.marginRight?R.marginLeft=R.marginRight=Z/2:D(R.marginLeft)?R.marginLeft=Z:R.marginRight=Z}else R.marginLeft=R.marginRight=0;var K=R.marginRight,tt=void 0===K?0:K,it=R.marginLeft,at={width:g,height:m,left:0,top:0},ht=Q+V+N+H+(void 0===it?0:it)+tt;if(this.offsetWidth=ht,e==ot&&!this.attributes.widths){var ct=n.text||"";s.save(),s.setFonts({fontFamily:I,fontSize:S,fontWeight:z,fontStyle:M}),ct.length,"\n"==ct&&(ct="",this.isBr=!0),(""+ct).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==rt&&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==ot&&null==g){var ut=this.attributes.widths,gt=Math.max.apply(Math,ut.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==ot&&(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==rt&&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==ot&&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)&&([st,ot].includes(e)&&this.isFlex()||e==st&&this.isBlock(this)&&this.isInFlow())&&(at.width=this.contrastSize(X-(o.isFlexCalc?0:ht),v,y),this.layoutBoxUpdate(at,i)),g&&!$(g)&&(at.width=this.contrastSize(g,v,y),this.layoutBoxUpdate(at,i,0)),m&&!$(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 et).bind(e)),wt=e}else e.inFlexBox()?t.line&&(t.line.canIEnter(e)||"nowrap"==i.flexWrap)?t.line.add(e):(new nt).bind(e):e.isFixed?t.root.fixedLine?t.root.fixedLine.fixedAdd(e):(new et).fixedBind(e):t.fixedLine?t.fixedLine.fixedAdd(e):(new et).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==ft?X:this.root.width,Mt=It-($(c)?W(c,It):c)-($(u)?W(u,It):u);St=i.left?Mt:this.lineMaxWidth}if(!m&&(null!=l?l:this.isAbsolute||this.isFixed&&_)){var kt=k==ft?_:this.root.height,Bt=kt-($(l)?W(l,kt):l)-($(d)?W(d,kt):d);zt=i.top?Bt:0}if(g&&!$(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}(),vt=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!")}}}}(),yt=p,xt=u,bt=g,wt=d,mt=f.TOP,St=f.MIDDLE,zt=f.BOTTOM,It=l.LEFT,Mt=l.CENTER,kt=l.RIGHT,Bt=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?T(t)?L(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,$=l||{},Y=$.borderLeftWidth,U=void 0===Y?v:Y,N=$.borderLeftStyle,X=void 0===N?y:N,_=$.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,B,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=O(u)?W(u,e.width):(e.width-f)*(P(u)?W(u,1):{left:0,center:.5,right:1}[u||"center"]),v=O(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)},B=function(){e.restore(),L.drawView(r,o,!1,!0,!1),h(1)},T=function(t){k(t),B()},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?St: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!=xt),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(St),o.setTextAlign(S),O?this.setBackground(k,f,l,h,c):o.setFillStyle(p),S){case It:break;case Mt:h+=.5*f;break;case kt:h+=f}var C=n.lines*g,H=Math.ceil((l-C)/2);switch(H<0&&(H=0),M){case mt:break;case St:c+=H;break;case zt:c+=2*H}var D=(g-R)/2,$=g/2,Y=function(t){var e=o.measureText(t),i=e.actualBoundingBoxDescent,n=void 0===i?0:i,r=e.actualBoundingBoxAscent;return M==mt?{fix:E?void 0===r?0:r:$-D/2,lineY:E?0:D-D/2}:M==St?{fix:E?$+n/4:$,lineY:E?0:D}:M==zt?{fix:E?g-n:$+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 It:r+=i;break;case Mt:r=(t-=i/2)+i;break;case kt: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=Y(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=Y(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=Y(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=wt,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=J(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==yt||y==bt)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==yt,c=[xt,bt].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==wt&&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!=wt?[2]:(this.lifecycle("onEffectFail",t(t({},I),{src:y})),[3,4]);case 4:if(this.count+=1,M=new gt(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!==wt?[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===yt&&f?[4,this.drawImage(o,e,r,!1)]:[3,9];case 8:return i.sent(),[3,10];case 9:s===xt?this.drawText(l,e,r,o):s===bt&&vt.api&&vt.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=Bt);export{Bt as Painter,Bt 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..a6038b9
--- /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)}function O(t){return/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(rpx|px)$/.test(t)}var T=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},L=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=R(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=R(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 R(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 F(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function A(){return A=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},A.apply(this,arguments)}function j(t,e){return j=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},j(t,e)}function E(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 H(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 E(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)?E(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 D(t){return"auto"===t||null===t}function $(t){return/%$/.test(t)}var Y=p,U=u,N=f,X=g,_=y,q=w,G=m;function V(t){return t.replace(/-([a-z])/g,(function(t,e){return e.toUpperCase()}))}function J(t,e){var i,n,o=function(t){var e=t.match(/([a-z]+)/)[1];return[e,V(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 Q(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(Q(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 Z,K=0,et=function(){function t(){F(this,"elements",[]),F(this,"afterElements",[]),F(this,"beforeElements",[]),F(this,"ids",[]),F(this,"width",0),F(this,"height",0),F(this,"top",0),F(this,"left",0),F(this,"pre",null),F(this,"offsetX",0),F(this,"offsetY",0),K++,this.id=K}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=Q(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}(),it=((Z={})[a]={width:"width",contentWidth:"width",lineMaxWidth:"lineMaxWidth",left:"left",top:"top",height:"height",lineMaxHeight:"lineMaxHeight",marginLeft:"marginLeft"},Z[l]={width:"height",contentWidth:"height",lineMaxWidth:"lineMaxWidth",left:"top",top:"left",height:"width",lineMaxHeight:"lineMaxHeight",marginLeft:"marginTop"},Z),nt=function(t){var e,i;function n(){var e;return F(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,j(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=it[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==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}(et),rt=p,ot=u,st=f,ht=v,at=y,lt=b,dt=w,ct=m,ft=0,ut={left:null,top:null,width:null,height:null},pt=new Map,gt=function(){function t(t,e,i,n){var o=this;F(this,"id",ft++),F(this,"style",{left:null,top:null,width:null,height:null}),F(this,"computedStyle",{}),F(this,"originStyle",{}),F(this,"children",{}),F(this,"layoutBox",A({},ut)),F(this,"contentSize",A({},ut)),F(this,"clientSize",A({},ut)),F(this,"borderSize",A({},ut)),F(this,"offsetSize",A({},ut)),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?N:o,h=t.styles,a=void 0===h?{}:h,l=(e||{}).computedStyle,d=Object.assign({},S);if([U,Y,X].includes(s)&&!a.display&&(d.display=_),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=V(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(/^backgroundPosition$/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]]=D(w)?0:w,i[x[1]]=W(m)||D(m)?m:w,i[x[2]]=D(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&&D(h)||$(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&&!$(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,G].includes(a.position)?d[t]=0:d[t]=/^-?[\d\.]+(px|rpx|vw|vh)?$/.test(h)?k(h):/em$/.test(h)&&s==U?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==dt,this.isFixed=s.position==ct,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:A({},this.contentSize),clientSize:A({},this.clientSize),borderSize:A({},this.borderSize),offsetSize:A({},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,$=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+($?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+($?-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+($?-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+($?-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=A({},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=H(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=H(e.elements);!(u=p()).done;){var g=u.value,v=A({},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=H(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==ht},e.isFlex=function(t){return void 0===t&&(t=this),t&&t.style.display==lt},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!==lt)||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,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,C=void 0===H?j:H,Y=i.borderLeft,U=(Y=void 0===Y?{}:Y).borderLeftWidth,N=void 0===U?j:U,X=o.contentSize&&o.contentSize.width,_=o.contentSize&&o.contentSize.height;if($(g)&&X&&(g=k(g,X)),$(g)&&!X&&(g=null),$(m)&&_&&(m=k(m,_)),$(m)&&!_&&(m=null),$(v)&&X&&(v=k(v,X)),$(y)&&X&&(y=k(y,X)),$(x)&&_&&(x=k(x,_)),$(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-C||0;R.marginLeft==R.marginRight?R.marginLeft=R.marginRight=Z/2:D(R.marginLeft)?R.marginLeft=Z:R.marginRight=Z}else R.marginLeft=R.marginRight=0;var K=R.marginRight,tt=void 0===K?0:K,it=R.marginLeft,ht={width:g,height:m,left:0,top:0},at=Q+V+N+C+(void 0===it?0:it)+tt;if(this.offsetWidth=at,e==ot&&!this.attributes.widths){var lt=n.text||"";s.save(),s.setFonts({fontFamily:I,fontSize:S,fontWeight:z,fontStyle:M}),lt.length,"\n"==lt&&(lt="",this.isBr=!0),(""+lt).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==rt&&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==ot&&null==g){var ut=this.attributes.widths,gt=Math.max.apply(Math,ut.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==ot&&(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==rt&&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==ot&&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)&&([st,ot].includes(e)&&this.isFlex()||e==st&&this.isBlock(this)&&this.isInFlow())&&(ht.width=this.contrastSize(X-(o.isFlexCalc?0:at),v,y),this.layoutBoxUpdate(ht,i)),g&&!$(g)&&(ht.width=this.contrastSize(g,v,y),this.layoutBoxUpdate(ht,i,0)),m&&!$(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 et).bind(e)),wt=e}else e.inFlexBox()?t.line&&(t.line.canIEnter(e)||"nowrap"==i.flexWrap)?t.line.add(e):(new nt).bind(e):e.isFixed?t.root.fixedLine?t.root.fixedLine.fixedAdd(e):(new et).fixedBind(e):t.fixedLine?t.fixedLine.fixedAdd(e):(new et).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==dt?X:this.root.width,Mt=It-($(l)?k(l,It):l)-($(u)?k(u,It):u);St=i.left?Mt:this.lineMaxWidth}if(!m&&(null!=c?c:this.isAbsolute||this.isFixed&&_)){var Bt=B==dt?_:this.root.height,Wt=Bt-($(c)?k(c,Bt):c)-($(f)?k(f,Bt):f);zt=i.top?Wt:0}if(g&&!$(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}(),vt=p,yt=u,xt=g,bt=f,wt=d.TOP,mt=d.MIDDLE,St=d.BOTTOM,zt=c.LEFT,It=c.CENTER,Mt=c.RIGHT,Bt=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?T(t)?L(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,$=c||{},Y=$.borderLeftWidth,U=void 0===Y?v:Y,N=$.borderLeftStyle,X=void 0===N?y:N,_=$.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,W,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=O(u)?k(u,e.width):(e.width-d)*(P(u)?k(u,1):{left:0,center:.5,right:1}[u||"center"]),v=O(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)},W=function(){e.restore(),L.drawView(r,o,!1,!0,!1),a(1)},T=function(t){B(t),W()},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?mt: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!=yt),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(mt),o.setTextAlign(S),O?this.setBackground(B,d,c,a,l):o.setFillStyle(p),S){case zt:break;case It:a+=.5*d;break;case Mt:a+=d}var H=n.lines*g,C=Math.ceil((c-H)/2);switch(C<0&&(C=0),M){case wt:break;case mt:l+=C;break;case St:l+=2*C}var D=(g-R)/2,$=g/2,Y=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:$-D/2,lineY:E?0:D-D/2}:M==mt?{fix:E?$+n/4:$,lineY:E?0:D}:M==St?{fix:E?g-n:$+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<=h.width){var X=Y(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=Y(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=Y(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=bt,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=J(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==vt||u==xt)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==vt,h=[yt,xt].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==bt&&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!=bt?[2]:(this.lifecycle("onEffectFail",t(t({},m),{src:p})),[3,4]);case 4:if(this.count+=1,S=new gt(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!==bt?[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===vt&&d?[4,this.drawImage(o,e,r,!1)]:[3,9];case 8:return i.sent(),[3,10];case 9:s===yt?this.drawText(c,e,r,o):s===xt&&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=Bt);export{Bt as Painter,Bt 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..f3b614b
--- /dev/null
+++ b/uni_modules/lime-painter/components/lime-painter/lime-painter.vue
@@ -0,0 +1,235 @@
+<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..de93edb
--- /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 $(t){return/^-?\d+(\.\d+)?$/.test(t)}function Y(t,e,i){if($(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*Y(e)/100;else if("em"===r&&e)o=t*Y(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)}function N(t){return/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(rpx|px)$/.test(t)}var _=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},X=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=q(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=q(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 q(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 G(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function V(){return V=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},V.apply(this,arguments)}function J(t,e){return J=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},J(t,e)}function Q(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 Z(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 Q(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)?Q(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 K(t){return"number"==typeof t}function et(t){return"auto"===t||null===t}function it(t){return/%$/.test(t)}var nt=I,rt=z,ot=S,st=M,at=B,ht=O,ct=T;function ft(t){return t.replace(/-([a-z])/g,(function(t,e){return e.toUpperCase()}))}function dt(t,e){var i,n,r=function(t){var e=t.match(/([a-z]+)/)[1];return[e,ft(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 lt(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(lt(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 ut,pt=0,gt=function(){function t(){G(this,"elements",[]),G(this,"afterElements",[]),G(this,"beforeElements",[]),G(this,"ids",[]),G(this,"width",0),G(this,"height",0),G(this,"top",0),G(this,"left",0),G(this,"pre",null),G(this,"offsetX",0),G(this,"offsetY",0),pt++,this.id=pt}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=lt(n.replace(new RegExp(/-?[0-9]+(\.[0-9]+)?(rpx|px|%)/,"g"),Y));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}(),vt="lineMaxHeight",yt="lineMaxWidth",bt=((ut={})[b]={width:o,contentWidth:o,lineMaxWidth:yt,left:l,top:p,height:s,lineMaxHeight:vt,marginLeft:"marginLeft"},ut[x]={width:s,contentWidth:s,lineMaxWidth:yt,left:p,top:l,height:o,lineMaxHeight:vt,marginLeft:"marginTop"},ut),xt=function(t){var e,i;function n(){var e;return G(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,J(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=bt[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;K(e)?this.flexTotal+=e:K(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);K(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}(gt),wt=I,mt=z,St=S,zt=k,It=B,Mt=P,kt=O,Bt=T,Wt=0,Pt={left:null,top:null,width:null,height:null},Ot=new Map,Tt=function(){function t(t,e,i,n){var r=this;G(this,"id",Wt++),G(this,"style",{left:null,top:null,width:null,height:null}),G(this,"computedStyle",{}),G(this,"originStyle",{}),G(this,"children",{}),G(this,"layoutBox",V({},Pt)),G(this,"contentSize",V({},Pt)),G(this,"clientSize",V({},Pt)),G(this,"borderSize",V({},Pt)),G(this,"offsetSize",V({},Pt)),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?ot:r,s=t.styles,h=void 0===s?{}:s,c=(e||{}).computedStyle,f=Object.assign({},F);if([rt,nt,st].includes(o)&&!h.display&&(f.display=at),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=ft(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 Y(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)?Y(t,""):t}));return f[l]||(f[l]={}),1==p.length&&u?f[l][l+u[0]]=p[0]:f[l]=((e={})[l+"Width"]=$(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(/^backgroundPosition$/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)?Y(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]]=et(m)?0:m,i[x[1]]=$(S)||et(S)?S:m,i[x[2]]=et($(z)?z:m)?0:$(z)?z:m,i[x[3]]=$(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&&et(s)||it(s)?s:Y(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&&!it(e)?Y(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:Y(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)?Y(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)&&![ht,ct].includes(h.position)?f[t]=0:f[t]=/^-?[\d\.]+(px|rpx|vw|vh)?$/.test(s)?Y(s):/em$/.test(s)&&o==rt?Y(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==kt,this.isFixed=o.position==Bt,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:V({},this.contentSize),clientSize:V({},this.clientSize),borderSize:V({},this.borderSize),offsetSize:V({},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]&&!$(t.originStyle[r])?t.style[r]=e[i[n]]-t.offsetSize[i[n]]-Y(t.style[n],e[i[n]]):t.style[n]=Y(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,$=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+($?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+($?-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+($?-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+($?-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=V({},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=Z(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=Z(e.elements);!(u=p()).done;){var g=u.value,v=V({},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=Z(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==zt},e.isFlex=function(t){return void 0===t&&(t=this),t&&t.style.display==Mt},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!==Mt)||void 0))},e.isInline=function(t){return void 0===t&&(t=this),t&&t.style.display==It},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,$=void 0===D?A:D,U=o.contentSize&&o.contentSize.width,N=o.contentSize&&o.contentSize.height;if(it(g)&&U&&(g=Y(g,U)),it(g)&&!U&&(g=null),it(m)&&N&&(m=Y(m,N)),it(m)&&!N&&(m=null),it(v)&&U&&(v=Y(v,U)),it(y)&&U&&(y=Y(y,U)),it(b)&&N&&(b=Y(b,N)),it(x)&&N&&(x=Y(x,N)),i.padding&&U)for(var _ in i.padding)Object.hasOwnProperty.call(O,_)&&(O[_]=Y(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-$-C||0;L.marginLeft==L.marginRight?L.marginLeft=L.marginRight=J/2:et(L.marginLeft)?L.marginLeft=J:L.marginRight=J}else L.marginLeft=L.marginRight=0;var Q=L.marginRight,Z=void 0===Q?0:Q,K=L.marginLeft,tt={width:g,height:m,left:0,top:0},nt=V+q+$+C+(void 0===K?0:K)+Z;if(this.offsetWidth=nt,e==mt&&!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=Ot.get(i);if(n)return{width:n,text:e};var r=t.measureText(e,S).width;return Ot.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==wt&&null==g){var ot=n.width,st=n.height;tt.width=this.contrastSize(Math.round(ot*m/st)||0,v,y),this.layoutBoxUpdate(tt,i,0)}if(e==mt&&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;tt.width=this.contrastSize(ht,v,y),this.layoutBoxUpdate(tt,i,0)}if(e==mt&&(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>tt.width?(ct++,e.width):t+e.width}),0)})),ct=B&&ct>B?B:ct,this.attributes.lines=ct}if(e==wt&&null==m){var ft=n.width,dt=n.height;n.text,tt.height=this.contrastSize(Y(tt.width*dt/ft)||0,b,x),this.layoutBoxUpdate(tt,i,1)}e==mt&&null==m&&(W=Y(W,S),tt.height=this.contrastSize(Y(this.attributes.lines*W),b,x),this.layoutBoxUpdate(tt,i,1,!0)),!g&&o&&o.children&&U&&(!this.isFlex(o)||o.isFlexCalc)&&([St,mt].includes(e)&&this.isFlex()||e==St&&this.isBlock(this)&&this.isInFlow())&&(tt.width=this.contrastSize(U-(o.isFlexCalc?0:nt),v,y),this.layoutBoxUpdate(tt,i)),g&&!it(g)&&(tt.width=this.contrastSize(g,v,y),this.layoutBoxUpdate(tt,i,0)),m&&!it(m)&&(tt.height=this.contrastSize(tt.height,b,x),this.layoutBoxUpdate(tt,i,1));var lt=0;if(a.length){var ut=null,pt=!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 pt=!0;t.line&&t.line.canIEnter(e)&&!o&&!pt?t.line.add(e):(pt=!1,(new gt).bind(e)),ut=e}else e.inFlexBox()?t.line&&(t.line.canIEnter(e)||"nowrap"==i.flexWrap)?t.line.add(e):(new xt).bind(e):e.isFixed?t.root.fixedLine?t.root.fixedLine.fixedAdd(e):(new gt).fixedBind(e):t.fixedLine?t.fixedLine.fixedAdd(e):(new gt).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 bt=k==kt?U:this.root.width,zt=bt-(it(c)?Y(c,bt):c)-(it(u)?Y(u,bt):u);vt=i.left?zt:this.lineMaxWidth}if(!m&&(null!=d?d:this.isAbsolute||this.isFixed&&N)){var It=k==kt?N:this.root.height,Mt=It-(it(d)?Y(d,It):d)-(it(l)?Y(l,It):l);yt=i.top?Mt:0}if(g&&!it(g)||tt.width||(tt.width=vt||this.contrastSize((this.isBlock(this)&&!this.isInFlow()?U||o.lineMaxWidth:this.lineMaxWidth)||this.lineMaxWidth,v,y),this.layoutBoxUpdate(tt,i,0)),m||!lt&&!yt||(tt.height=yt||this.contrastSize(lt,b,x),this.layoutBoxUpdate(tt,i)),i.borderRadius&&this.borderSize&&this.borderSize.width)for(var _ in i.borderRadius)Object.hasOwnProperty.call(i.borderRadius,_)&&(i.borderRadius[_]=Y(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}(),Lt=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!")}}}}(),Rt=I,Ft=z,At=M,Et=S,jt=w.TOP,Ct=w.MIDDLE,Ht=w.BOTTOM,Dt=m.LEFT,$t=m.CENTER,Yt=m.RIGHT,Ut=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[Y(s,i)+t,Y(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=Y(d,S)||0,u=Y(u,z)||0;var I=Y("0%",1),M=Y("50%",1),k=Y("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=Y(e,1)/(/px|rpx$/.test(e)?$(t.x)?z:S:1);return $(t.x)?Object.assign(t,{y:i}):Object.assign(t,{x:i})}return $(W[e])&&!$(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?_(t)?X(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,$=d||{},Y=$.borderLeftWidth,U=void 0===Y?v:Y,N=$.borderLeftStyle,_=void 0===N?y:N,X=$.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=N(u)?Y(u,e.width):(e.width-f)*(U(u)?Y(u,1):{left:0,center:.5,right:1}[u||"center"]),v=N(p)?Y(p,e.height):(e.height-d)*(U(p)?Y(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?Ct:I,k=i.backgroundColor,B=i.lineClamp,W=i.backgroundClip,P=i.textShadow,O=i.textDecoration;if(m=$(m)?m:0,this.drawView(e,i,W!=Ft),g=Y(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(Ct),o.setTextAlign(S),W?this.setBackground(k,f,d,h,c):o.setFillStyle(p),S){case Dt:break;case $t: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 jt:break;case Ct:c+=j;break;case Ht: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==jt?{fix:A?void 0===r?0:r:H-C/2,lineY:A?0:C-C/2}:M==Ct?{fix:A?H+n/4:H,lineY:A?0:C}:M==Ht?{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 Dt:r+=i;break;case $t: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=Et,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=dt(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==Rt||y==At)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==Rt,c=[Ft,At].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==Et&&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!=Et?[2]:(this.lifecycle("onEffectFail",e(e({},z),{src:y})),[3,4]);case 4:if(this.count+=1,I=new Tt(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!==Et?[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===Rt&&f?[4,this.drawImage(o,i,r,!1)]:[3,9];case 8:return n.sent(),[3,10];case 9:s===Ft?this.drawText(d,i,r,o):s===At&&Lt.api&&Lt.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=Ut),t.Painter=Ut,t.default=Ut,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..4c253e0
--- /dev/null
+++ b/uni_modules/lime-painter/package.json
@@ -0,0 +1,93 @@
+{
+  "id": "lime-painter",
+  "displayName": "海报画板",
+  "version": "1.9.6.6",
+  "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..b05000c
--- /dev/null
+++ b/uni_modules/lime-painter/readme.md
@@ -0,0 +1,961 @@
+# Painter 画板 测试版
+
+> uniapp 海报画板，更优雅的海报生成方案  
+> [查看更多](https://limeui.qcoon.cn/#/painter)  
+
+## 平台兼容
+
+| 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/sp-editor/changelog.md b/uni_modules/sp-editor/changelog.md
new file mode 100644
index 0000000..443334b
--- /dev/null
+++ b/uni_modules/sp-editor/changelog.md
@@ -0,0 +1,109 @@
+## 1.4.0（2024-05-31）
+1. 更新示例工程
+## 1.3.9（2024-05-31）
+1. 修复调色板无法正常选色的问题
+## 1.3.8（2024-05-13）
+1. 更新示例三（微信小程序上使用setContents造成聚焦滚动的处理）
+## 1.3.7（2024-05-10）
+1. 修复添加超链接后，不触发input更新当前最新内容的bug
+## 1.3.6（2024-05-09）
+1. 文档迁移
+## 1.3.5（2024-05-09）
+1. 所有事件携带编辑器id参数，以便循环时能区分处理
+2. 更新示例工程
+## 1.3.4（2024-05-08）
+1. 更新示例工程
+2. 新增editorId参数
+## 1.3.3（2024-03-22）
+1. 修复微信小程序长按无法粘贴的问题
+## 1.3.2（2024-03-14）
+1. 更新了toolbar样式与配置，见文档
+2. 更新示例工程，媒体查询响应式写法
+3. 优化了只读模式效果，开启只读模式后，文章内容的超链接可正常点击并跳转
+## 1.3.1（2024-03-14）
+1. 优化了只读功能，开启只读后自动隐藏工具栏
+2. 更新示例工程
+## 1.3.0（2024-03-07）
+1. 新增addLink的emit事件
+## 1.2.9（2024-02-23）
+1. 更新文档
+## 1.2.8（2024-02-23）
+1. 新增了添加超链接的工具，toolbar中link字段，默认开启
+2. 优化了部分逻辑
+3. 更新文档、更新示例工程
+## 1.2.7（2024-02-23）
+1. 更新文档，更新示例工程
+2. 添加toolbar中图标字体大小可配置项
+## 1.2.6（2024-02-22）
+1. 添加导出工具按钮，可将当前已编辑的html导出至页面解析
+2. 超链接工具按钮正在尝试开发中(貌似目前官方不支持)
+## 1.2.5（2024-02-19）
+1. 更新示例工程(吸顶写法)
+2. 完善调色板功能
+## 1.2.4（2024-02-18）
+1. 修复工具栏颜色按钮底色动态切换问题
+## 1.2.3（2024-02-18）
+1. 更新示例工程
+## 1.2.2（2024-02-18）
+1. 删除log调试打印
+## 1.2.1（2024-02-18）
+1. 修复了颜色图标不会动态切换的问题
+## 1.2.0（2024-02-18）
+1. 修复选择颜色时会将所选文字删除的bug
+## 1.1.9（2024-02-04）
+1. 更新示例工程
+## 1.1.8（2024-02-04）
+1. 文档修改
+## 1.1.7（2024-02-04）
+1. 新增toolbar配置项，可自由配置工具栏工具列表
+2. 移除组件内原templates属性，默认初始化编辑器内容请看文档使用方式示例
+3. 更新文档
+## 1.1.6（2024-01-31）
+1. 更好的兼容vue2了，修复在vue2下高度可能超出的问题
+2. 示例工程兼容vue2
+## 1.1.5（2024-01-30）
+1. 修复工具栏字体按钮无效的问题
+## 1.1.4（2024-01-30）
+1. 解决默认初始化内容时前缀空格或缩进无效的问题
+2. 解决点击工具栏高亮状态后输入内容时便失去高亮的bug
+3. 更新示例工程
+## 1.1.3（2024-01-23）
+1. 重写高度动态计算逻辑，现在对不同屏幕尺寸的适应性更强了
+## 1.1.2（2024-01-17）
+1. 修复分割线会生成多条的问题
+## 1.1.1（2024-01-15）
+1. 更新文档
+## 1.1.0（2024-01-15）
+1. insertText方法在插入内容的时候会移动光标聚焦，导致焦点回滚到视口处
+2. 更新示例工程
+## 1.0.9（2024-01-04）
+1. 更新文档
+## 1.0.8（2024-01-04）
+1. 修复h5端官方cdn请求失败的问题，详见问答贴：https://ask.dcloud.net.cn/article/40900
+## 1.0.7（2024-01-03）
+1.  移除v-bind="$attrs"，该写法在微信小程序不支持
+## 1.0.6（2023-12-29）
+1. 更新文档
+## 1.0.5（2023-12-29）
+1. 更新了init方法，可以使用返回的editor实例尽情自定义
+2. 组件在<editor>上添加v-bind="$attrs"属性穿透，可以使用原editor参数，官方文档：https://uniapp.dcloud.net.cn/component/editor.html
+## 1.0.4（2023-12-29）
+1. 优化了切换文字和背景颜色是，可能会导致切换后不生效的问题
+2. 修复在部分设备上的微信小程序中可能会存在颜色版无法正常滑动的问题
+3. 更友好的交互体验：添加图标悬停字样描述、添加格式化文本弹窗确认
+4. 有插入视频的需求，暂时可能无法实现，官方给予的回复是：目前各端的eidtor组件都不能直接插入视频，编辑时可以采用视频封面占位，并在图片中保存视频信息，在预览时再还原为视频。
+## 1.0.3（2023-10-13）
+	1. 更新readme文档
+	2. 更新调整组件示例项目，添加插件代码中部分注释
+## 1.0.2（2023-10-13）
+	1. 更新uni_modules规范，可一键导入组件
+	2. 更新组件示例项目（包括使用uniCloud.uploadFile多选上传图片示例方法）
+## 1.0.1（2023-10-12）
+	1. 修复小程序中自动聚焦滚动到富文本组件区域的bug
+	2. 略微调整了富文本上方toolbar工具栏中按钮的大小尺寸
+## 1.0.0（2023-9-19）
+	1. 新增字体与背景颜色板
+	2. 可自定义预设内容模板
+	3. 解决官方样例在小程序和app部分报错不兼容的问题
+	4. 可配合云存储上传富文本中插入的图片 本质上是基于官方内置富文本editor组件改版封装，所以官方有的功能都有，官方能兼容的也都兼容
+
diff --git a/uni_modules/sp-editor/components/sp-editor/color-picker.vue b/uni_modules/sp-editor/components/sp-editor/color-picker.vue
new file mode 100644
index 0000000..6f3e77d
--- /dev/null
+++ b/uni_modules/sp-editor/components/sp-editor/color-picker.vue
@@ -0,0 +1,825 @@
+<template>
+  <view v-if="show" class="t-wrapper" @touchmove.stop.prevent="moveHandle">
+    <view class="t-mask" :class="{ active: active }" @click.stop="close"></view>
+    <view class="t-box" :class="{ active: active }">
+      <view class="t-header">
+        <view class="t-header-button" @click="close">取消</view>
+        <view class="t-header-button" @click="confirm">确认</view>
+      </view>
+      <view class="t-color__box" :style="{ background: 'rgb(' + bgcolor.r + ',' + bgcolor.g + ',' + bgcolor.b + ')' }">
+        <view
+          class="t-background boxs"
+          @touchstart="touchstart($event, 0)"
+          @touchmove="touchmove($event, 0)"
+          @touchend="touchend($event, 0)"
+        >
+          <view class="t-color-mask"></view>
+          <view class="t-pointer" :style="{ top: site[0].top - 8 + 'px', left: site[0].left - 8 + 'px' }"></view>
+        </view>
+      </view>
+      <view class="t-control__box">
+        <view class="t-control__color">
+          <view
+            class="t-control__color-content"
+            :style="{ background: 'rgba(' + rgba.r + ',' + rgba.g + ',' + rgba.b + ',' + rgba.a + ')' }"
+          ></view>
+        </view>
+        <view class="t-control-box__item">
+          <view
+            class="t-controller boxs"
+            @touchstart="touchstart($event, 1)"
+            @touchmove="touchmove($event, 1)"
+            @touchend="touchend($event, 1)"
+          >
+            <view class="t-hue">
+              <view class="t-circle" :style="{ left: site[1].left - 12 + 'px' }"></view>
+            </view>
+          </view>
+          <view
+            class="t-controller boxs"
+            @touchstart="touchstart($event, 2)"
+            @touchmove="touchmove($event, 2)"
+            @touchend="touchend($event, 2)"
+          >
+            <view class="t-transparency">
+              <view class="t-circle" :style="{ left: site[2].left - 12 + 'px' }"></view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="t-result__box">
+        <view v-if="mode" class="t-result__item">
+          <view class="t-result__box-input">{{ hex }}</view>
+          <view class="t-result__box-text">HEX</view>
+        </view>
+        <template v-else>
+          <view class="t-result__item">
+            <view class="t-result__box-input">{{ rgba.r }}</view>
+            <view class="t-result__box-text">R</view>
+          </view>
+          <view class="t-result__item">
+            <view class="t-result__box-input">{{ rgba.g }}</view>
+            <view class="t-result__box-text">G</view>
+          </view>
+          <view class="t-result__item">
+            <view class="t-result__box-input">{{ rgba.b }}</view>
+            <view class="t-result__box-text">B</view>
+          </view>
+          <view class="t-result__item">
+            <view class="t-result__box-input">{{ rgba.a }}</view>
+            <view class="t-result__box-text">A</view>
+          </view>
+        </template>
+
+        <view class="t-result__item t-select" @click="select">
+          <view class="t-result__box-input">
+            <view>切换</view>
+            <view>模式</view>
+          </view>
+        </view>
+      </view>
+      <view class="t-alternative">
+        <view class="t-alternative__item" v-for="(item, index) in colorList" :key="index">
+          <view
+            class="t-alternative__item-content"
+            :style="{ background: 'rgba(' + item.r + ',' + item.g + ',' + item.b + ',' + item.a + ')' }"
+            @click="selectColor(item)"
+          ></view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    color: {
+      type: Object,
+      default: () => {
+        return {
+          r: 0,
+          g: 0,
+          b: 0,
+          a: 0
+        }
+      }
+    },
+    spareColor: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      show: false,
+      active: false,
+      // rgba 颜色
+      rgba: {
+        r: 0,
+        g: 0,
+        b: 0,
+        a: 1
+      },
+      // hsb 颜色
+      hsb: {
+        h: 0,
+        s: 0,
+        b: 0
+      },
+      site: [
+        {
+          top: 0,
+          left: 0
+        },
+        {
+          left: 0
+        },
+        {
+          left: 0
+        }
+      ],
+      index: 0,
+      bgcolor: {
+        r: 255,
+        g: 0,
+        b: 0,
+        a: 1
+      },
+      hex: '#000000',
+      mode: true,
+      colorList: [
+        {
+          r: 244,
+          g: 67,
+          b: 54,
+          a: 1
+        },
+        {
+          r: 233,
+          g: 30,
+          b: 99,
+          a: 1
+        },
+        {
+          r: 156,
+          g: 39,
+          b: 176,
+          a: 1
+        },
+        {
+          r: 103,
+          g: 58,
+          b: 183,
+          a: 1
+        },
+        {
+          r: 63,
+          g: 81,
+          b: 181,
+          a: 1
+        },
+        {
+          r: 33,
+          g: 150,
+          b: 243,
+          a: 1
+        },
+        {
+          r: 3,
+          g: 169,
+          b: 244,
+          a: 1
+        },
+        {
+          r: 0,
+          g: 188,
+          b: 212,
+          a: 1
+        },
+        {
+          r: 0,
+          g: 150,
+          b: 136,
+          a: 1
+        },
+        {
+          r: 76,
+          g: 175,
+          b: 80,
+          a: 1
+        },
+        {
+          r: 139,
+          g: 195,
+          b: 74,
+          a: 1
+        },
+        {
+          r: 205,
+          g: 220,
+          b: 57,
+          a: 1
+        },
+        {
+          r: 255,
+          g: 235,
+          b: 59,
+          a: 1
+        },
+        {
+          r: 255,
+          g: 193,
+          b: 7,
+          a: 1
+        },
+        {
+          r: 255,
+          g: 152,
+          b: 0,
+          a: 1
+        },
+        {
+          r: 255,
+          g: 87,
+          b: 34,
+          a: 1
+        },
+        {
+          r: 121,
+          g: 85,
+          b: 72,
+          a: 1
+        },
+        {
+          r: 158,
+          g: 158,
+          b: 158,
+          a: 1
+        },
+        {
+          r: 0,
+          g: 0,
+          b: 0,
+          a: 0.5
+        },
+        {
+          r: 0,
+          g: 0,
+          b: 0,
+          a: 0
+        }
+      ]
+    }
+  },
+  created() {
+    this.ready()
+  },
+  methods: {
+    ready() {
+      this.rgba = this.color
+      if (this.spareColor.length !== 0) {
+        this.colorList = this.spareColor
+      }
+    },
+    /**
+     * 初始化
+     */
+    init() {
+      // hsb 颜色
+      this.hsb = this.rgbToHex(this.rgba)
+      // this.setColor();
+      this.setValue(this.rgba)
+    },
+    moveHandle() {},
+    open() {
+      this.show = true
+      this.$nextTick(() => {
+        this.init()
+        setTimeout(() => {
+          this.active = true
+          setTimeout(() => {
+            this.getSelectorQuery()
+          }, 350)
+        }, 50)
+      })
+    },
+    close() {
+      this.active = false
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.show = false
+        }, 500)
+      })
+    },
+    confirm() {
+      this.close()
+      this.$emit('confirm', {
+        rgba: this.rgba,
+        hex: this.hex
+      })
+    },
+    // 选择模式
+    select() {
+      this.mode = !this.mode
+    },
+    // 常用颜色选择
+    selectColor(item) {
+      this.setColorBySelect(item)
+    },
+    touchstart(e, index) {
+      const { pageX, pageY, clientX, clientY } = e.touches[0]
+      // 部分机型可能没有pageX或clientX，因此此处需要做兼容
+      this.moveX = clientX || pageX
+      this.moveY = clientY || pageY
+      this.setPosition(this.moveX, this.moveY, index)
+    },
+    touchmove(e, index) {
+      const { pageX, pageY, clientX, clientY } = e.touches[0]
+      this.moveX = clientX || pageX
+      this.moveY = clientY || pageY
+      this.setPosition(this.moveX, this.moveY, index)
+    },
+    touchend(e, index) {},
+    /**
+     * 设置位置
+     */
+    setPosition(x, y, index) {
+      this.index = index
+      const { top, left, width, height } = this.position[index]
+      // 设置最大最小值
+
+      this.site[index].left = Math.max(0, Math.min(parseInt(x - left), width))
+      if (index === 0) {
+        this.site[index].top = Math.max(0, Math.min(parseInt(y - top), height))
+        // 设置颜色
+        this.hsb.s = parseInt((100 * this.site[index].left) / width)
+        this.hsb.b = parseInt(100 - (100 * this.site[index].top) / height)
+        this.setColor()
+        this.setValue(this.rgba)
+      } else {
+        this.setControl(index, this.site[index].left)
+      }
+    },
+    /**
+     * 设置 rgb 颜色
+     */
+    setColor() {
+      const rgb = this.HSBToRGB(this.hsb)
+      this.rgba.r = rgb.r
+      this.rgba.g = rgb.g
+      this.rgba.b = rgb.b
+    },
+    /**
+     * 设置二进制颜色
+     * @param {Object} rgb
+     */
+    setValue(rgb) {
+      this.hex = '#' + this.rgbToHex(rgb)
+    },
+    setControl(index, x) {
+      const { top, left, width, height } = this.position[index]
+
+      if (index === 1) {
+        this.hsb.h = parseInt((360 * x) / width)
+        this.bgcolor = this.HSBToRGB({
+          h: this.hsb.h,
+          s: 100,
+          b: 100
+        })
+        this.setColor()
+      } else {
+        this.rgba.a = (x / width).toFixed(1)
+      }
+      this.setValue(this.rgba)
+    },
+    /**
+     * rgb 转 二进制 hex
+     * @param {Object} rgb
+     */
+    rgbToHex(rgb) {
+      let hex = [rgb.r.toString(16), rgb.g.toString(16), rgb.b.toString(16)]
+      hex.map(function (str, i) {
+        if (str.length == 1) {
+          hex[i] = '0' + str
+        }
+      })
+      return hex.join('')
+    },
+    setColorBySelect(getrgb) {
+      const { r, g, b, a } = getrgb
+      let rgb = {}
+      rgb = {
+        r: r ? parseInt(r) : 0,
+        g: g ? parseInt(g) : 0,
+        b: b ? parseInt(b) : 0,
+        a: a ? a : 0
+      }
+      this.rgba = rgb
+      this.hsb = this.rgbToHsb(rgb)
+      this.changeViewByHsb()
+    },
+    changeViewByHsb() {
+      const [a, b, c] = this.position
+      this.site[0].left = parseInt((this.hsb.s * a.width) / 100)
+      this.site[0].top = parseInt(((100 - this.hsb.b) * a.height) / 100)
+      this.setColor(this.hsb.h)
+      this.setValue(this.rgba)
+      this.bgcolor = this.HSBToRGB({
+        h: this.hsb.h,
+        s: 100,
+        b: 100
+      })
+
+      this.site[1].left = (this.hsb.h / 360) * b.width
+      this.site[2].left = this.rgba.a * c.width
+    },
+    /**
+     * hsb 转 rgb
+     * @param {Object} 颜色模式  H(hues)表示色相，S(saturation)表示饱和度，B（brightness）表示亮度
+     */
+    HSBToRGB(hsb) {
+      let rgb = {}
+      let h = Math.round(hsb.h)
+      let s = Math.round((hsb.s * 255) / 100)
+      let v = Math.round((hsb.b * 255) / 100)
+      if (s == 0) {
+        rgb.r = rgb.g = rgb.b = v
+      } else {
+        let t1 = v
+        let t2 = ((255 - s) * v) / 255
+        let t3 = ((t1 - t2) * (h % 60)) / 60
+        if (h == 360) h = 0
+        if (h < 60) {
+          rgb.r = t1
+          rgb.b = t2
+          rgb.g = t2 + t3
+        } else if (h < 120) {
+          rgb.g = t1
+          rgb.b = t2
+          rgb.r = t1 - t3
+        } else if (h < 180) {
+          rgb.g = t1
+          rgb.r = t2
+          rgb.b = t2 + t3
+        } else if (h < 240) {
+          rgb.b = t1
+          rgb.r = t2
+          rgb.g = t1 - t3
+        } else if (h < 300) {
+          rgb.b = t1
+          rgb.g = t2
+          rgb.r = t2 + t3
+        } else if (h < 360) {
+          rgb.r = t1
+          rgb.g = t2
+          rgb.b = t1 - t3
+        } else {
+          rgb.r = 0
+          rgb.g = 0
+          rgb.b = 0
+        }
+      }
+      return {
+        r: Math.round(rgb.r),
+        g: Math.round(rgb.g),
+        b: Math.round(rgb.b)
+      }
+    },
+    rgbToHsb(rgb) {
+      let hsb = {
+        h: 0,
+        s: 0,
+        b: 0
+      }
+      let min = Math.min(rgb.r, rgb.g, rgb.b)
+      let max = Math.max(rgb.r, rgb.g, rgb.b)
+      let delta = max - min
+      hsb.b = max
+      hsb.s = max != 0 ? (255 * delta) / max : 0
+      if (hsb.s != 0) {
+        if (rgb.r == max) hsb.h = (rgb.g - rgb.b) / delta
+        else if (rgb.g == max) hsb.h = 2 + (rgb.b - rgb.r) / delta
+        else hsb.h = 4 + (rgb.r - rgb.g) / delta
+      } else hsb.h = -1
+      hsb.h *= 60
+      if (hsb.h < 0) hsb.h = 0
+      hsb.s *= 100 / 255
+      hsb.b *= 100 / 255
+      return hsb
+    },
+    getSelectorQuery() {
+      const views = uni.createSelectorQuery().in(this)
+      views
+        .selectAll('.boxs')
+        .boundingClientRect((data) => {
+          if (!data || data.length === 0) {
+            setTimeout(() => this.getSelectorQuery(), 20)
+            return
+          }
+          this.position = data
+          // this.site[0].top = data[0].height;
+          // this.site[0].left = 0;
+          // this.site[1].left = data[1].width;
+          // this.site[2].left = data[2].width;
+          this.setColorBySelect(this.rgba)
+        })
+        .exec()
+    },
+    hex2Rgb(hexColor, alpha = 1) {
+      const color = hexColor.slice(1)
+      const r = parseInt(color.slice(0, 2), 16)
+      const g = parseInt(color.slice(2, 4), 16)
+      const b = parseInt(color.slice(4, 6), 16)
+      return {
+        r: r,
+        g: g,
+        b: b,
+        a: alpha
+      }
+    }
+  },
+  watch: {
+    spareColor(newVal) {
+      this.colorList = newVal
+    },
+    color(newVal) {
+      this.ready()
+    }
+  }
+}
+</script>
+
+<style>
+.t-wrapper {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  box-sizing: border-box;
+  z-index: 9999;
+}
+
+.t-box {
+  width: 100%;
+  position: absolute;
+  bottom: 0;
+  padding: 30upx 0;
+  padding-top: 0;
+  background: #fff;
+  transition: all 0.3s;
+  transform: translateY(100%);
+}
+
+.t-box.active {
+  transform: translateY(0%);
+}
+
+.t-header {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  height: 100upx;
+  border-bottom: 1px #eee solid;
+  box-shadow: 1px 0 2px rgba(0, 0, 0, 0.1);
+  background: #fff;
+}
+
+.t-header-button {
+  display: flex;
+  align-items: center;
+  width: 150upx;
+  height: 100upx;
+  font-size: 30upx;
+  color: #666;
+  padding-left: 20upx;
+}
+
+.t-header-button:last-child {
+  justify-content: flex-end;
+  padding-right: 20upx;
+}
+
+.t-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: -1;
+  transition: all 0.3s;
+  opacity: 0;
+}
+
+.t-mask.active {
+  opacity: 1;
+}
+
+.t-color__box {
+  position: relative;
+  height: 400upx;
+  background: rgb(255, 0, 0);
+  overflow: hidden;
+  box-sizing: border-box;
+  margin: 0 20upx;
+  margin-top: 20upx;
+  box-sizing: border-box;
+}
+
+.t-background {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: linear-gradient(to right, #fff, rgba(255, 255, 255, 0));
+}
+
+.t-color-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: 400upx;
+  background: linear-gradient(to top, #000, rgba(0, 0, 0, 0));
+}
+
+.t-pointer {
+  position: absolute;
+  bottom: -8px;
+  left: -8px;
+  z-index: 2;
+  width: 15px;
+  height: 15px;
+  border: 1px #fff solid;
+  border-radius: 50%;
+}
+
+.t-show-color {
+  width: 100upx;
+  height: 50upx;
+}
+
+.t-control__box {
+  margin-top: 50upx;
+  width: 100%;
+  display: flex;
+  padding-left: 20upx;
+  box-sizing: border-box;
+}
+
+.t-control__color {
+  flex-shrink: 0;
+  width: 100upx;
+  height: 100upx;
+  border-radius: 50%;
+  background-color: #fff;
+  background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee),
+    linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+  background-size: 36upx 36upx;
+  background-position: 0 0, 18upx 18upx;
+  border: 1px #eee solid;
+  overflow: hidden;
+}
+
+.t-control__color-content {
+  width: 100%;
+  height: 100%;
+}
+
+.t-control-box__item {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  width: 100%;
+  padding: 0 30upx;
+}
+
+.t-controller {
+  position: relative;
+  width: 100%;
+  height: 16px;
+  background-color: #fff;
+  background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee),
+    linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+  background-size: 32upx 32upx;
+  background-position: 0 0, 16upx 16upx;
+}
+
+.t-hue {
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(to right, #f00 0%, #ff0 17%, #0f0 33%, #0ff 50%, #00f 67%, #f0f 83%, #f00 100%);
+}
+
+.t-transparency {
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(to right, rgba(0, 0, 0, 0) 0%, rgb(0, 0, 0));
+}
+
+.t-circle {
+  position: absolute;
+  /* right: -10px; */
+  top: -2px;
+  width: 20px;
+  height: 20px;
+  box-sizing: border-box;
+  border-radius: 50%;
+  background: #fff;
+  box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
+}
+
+.t-result__box {
+  margin-top: 20upx;
+  padding: 10upx;
+  width: 100%;
+  display: flex;
+  box-sizing: border-box;
+}
+
+.t-result__item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 10upx;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.t-result__box-input {
+  padding: 10upx 0;
+  width: 100%;
+  font-size: 28upx;
+  box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.1);
+  color: #999;
+  text-align: center;
+  background: #fff;
+}
+
+.t-result__box-text {
+  margin-top: 10upx;
+  font-size: 28upx;
+  line-height: 2;
+}
+
+.t-select {
+  flex-shrink: 0;
+  width: 150upx;
+  padding: 0 30upx;
+}
+
+.t-select .t-result__box-input {
+  border-radius: 10upx;
+  border: none;
+  color: #999;
+  box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.1);
+  background: #fff;
+}
+
+.t-select .t-result__box-input:active {
+  box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.1);
+}
+
+.t-alternative {
+  display: flex;
+  flex-wrap: wrap;
+  /* justify-content: space-between; */
+  width: 100%;
+  padding-right: 10upx;
+  box-sizing: border-box;
+}
+
+.t-alternative__item {
+  margin-left: 12upx;
+  margin-top: 10upx;
+  width: 50upx;
+  height: 50upx;
+  border-radius: 10upx;
+  background-color: #fff;
+  background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee),
+    linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
+  background-size: 36upx 36upx;
+  background-position: 0 0, 18upx 18upx;
+  border: 1px #eee solid;
+  overflow: hidden;
+}
+
+.t-alternative__item-content {
+  width: 50upx;
+  height: 50upx;
+  background: rgba(255, 0, 0, 0.5);
+}
+
+.t-alternative__item:active {
+  transition: all 0.3s;
+  transform: scale(1.1);
+}
+</style>
diff --git a/uni_modules/sp-editor/components/sp-editor/link-edit.vue b/uni_modules/sp-editor/components/sp-editor/link-edit.vue
new file mode 100644
index 0000000..1fd45cd
--- /dev/null
+++ b/uni_modules/sp-editor/components/sp-editor/link-edit.vue
@@ -0,0 +1,152 @@
+<template>
+  <view class="link-edit-container" v-if="showPopup">
+    <view class="link-edit">
+      <view class="title">添加链接</view>
+      <view class="edit">
+        <view class="description">
+          链接描述：
+          <input v-model="descVal" type="text" class="input" placeholder="请输入链接描述" />
+        </view>
+        <view class="address">
+          链接地址：
+          <input v-model="addrVal" type="text" class="input" placeholder="请输入链接地址" />
+        </view>
+      </view>
+      <view class="control">
+        <view class="cancel" @click="close">取消</view>
+        <view class="confirm" @click="onConfirm">确认</view>
+      </view>
+    </view>
+    <view class="mask"></view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      showPopup: false,
+      descVal: '',
+      addrVal: ''
+    }
+  },
+  methods: {
+    open() {
+      this.showPopup = true
+      this.$emit('open')
+    },
+    close() {
+      this.showPopup = false
+      this.descVal = ''
+      this.addrVal = ''
+      this.$emit('close')
+    },
+    onConfirm() {
+      if (!this.descVal) {
+        uni.showToast({
+          title: '请输入链接描述',
+          icon: 'none'
+        })
+        return
+      }
+      if (!this.addrVal) {
+        uni.showToast({
+          title: '请输入链接地址',
+          icon: 'none'
+        })
+        return
+      }
+      this.$emit('confirm', {
+        text: this.descVal,
+        href: this.addrVal
+      })
+      this.close()
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.link-edit-container {
+  .link-edit {
+    width: 80%;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    background-color: #ffffff;
+    box-shadow: -2px -2px 4px rgba(0, 0, 0, 0.05), 2px 2px 4px rgba(0, 0, 0, 0.05);
+    border-radius: 12rpx;
+    box-sizing: border-box;
+    z-index: 999;
+    font-size: 14px;
+
+    .title {
+      height: 80rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    .edit {
+      padding: 24rpx;
+      border-top: 1px solid #eeeeee;
+      border-bottom: 1px solid #eeeeee;
+      box-sizing: border-box;
+
+      .input {
+        flex: 1;
+        padding: 4px;
+        font-size: 14px;
+        border: 1px solid #eeeeee;
+        border-radius: 8rpx;
+
+        .uni-input-placeholder {
+          color: #dddddd;
+        }
+      }
+
+      .description {
+        display: flex;
+        align-items: center;
+      }
+      .address {
+        display: flex;
+        align-items: center;
+        margin-top: 24rpx;
+      }
+    }
+
+    .control {
+      height: 80rpx;
+      display: flex;
+      cursor: pointer;
+
+      .cancel {
+        flex: 1;
+        color: #dd524d;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      .confirm {
+        border-left: 1px solid #eeeeee;
+        flex: 1;
+        color: #007aff;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+  }
+  .mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.05);
+    z-index: 998;
+  }
+}
+</style>
diff --git a/uni_modules/sp-editor/components/sp-editor/sp-editor.vue b/uni_modules/sp-editor/components/sp-editor/sp-editor.vue
new file mode 100644
index 0000000..b1e7731
--- /dev/null
+++ b/uni_modules/sp-editor/components/sp-editor/sp-editor.vue
@@ -0,0 +1,518 @@
+<template>
+	<view class="sp-editor" :style="{ '--icon-size': iconSize, '--icon-columns': iconColumns }">
+		<view class="sp-editor-toolbar" v-if="!readOnly" @tap="format">
+			<view v-if="toolbarList.includes('header')" :class="formats.header === 1 ? 'ql-active' : ''"
+				class="iconfont icon-format-header-1" title="标题" data-name="header" :data-value="1"></view>
+			<view v-if="toolbarList.includes('bold')" :class="formats.bold ? 'ql-active' : ''"
+				class="iconfont icon-zitijiacu" title="加粗" data-name="bold"></view>
+			<view v-if="toolbarList.includes('italic')" :class="formats.italic ? 'ql-active' : ''"
+				class="iconfont icon-zitixieti" title="斜体" data-name="italic"></view>
+			<view v-if="toolbarList.includes('underline')" :class="formats.underline ? 'ql-active' : ''"
+				class="iconfont icon-zitixiahuaxian" title="下划线" data-name="underline"></view>
+			<view v-if="toolbarList.includes('strike')" :class="formats.strike ? 'ql-active' : ''"
+				class="iconfont icon-zitishanchuxian" title="删除线" data-name="strike"></view>
+			<!-- #ifndef MP-BAIDU -->
+			<view v-if="toolbarList.includes('alignLeft')" :class="formats.align === 'left' ? 'ql-active' : ''"
+				class="iconfont icon-zuoduiqi" title="左对齐" data-name="align" data-value="left"></view>
+			<!-- #endif -->
+			<view v-if="toolbarList.includes('alignCenter')" :class="formats.align === 'center' ? 'ql-active' : ''"
+				class="iconfont icon-juzhongduiqi" title="居中对齐" data-name="align" data-value="center"></view>
+			<view v-if="toolbarList.includes('alignRight')" :class="formats.align === 'right' ? 'ql-active' : ''"
+				class="iconfont icon-youduiqi" title="右对齐" data-name="align" data-value="right"></view>
+			<view v-if="toolbarList.includes('alignJustify')" :class="formats.align === 'justify' ? 'ql-active' : ''"
+				class="iconfont icon-zuoyouduiqi" title="两端对齐" data-name="align" data-value="justify"></view>
+			<!-- #ifndef MP-BAIDU -->
+			<view v-if="toolbarList.includes('lineHeight')" :class="formats.lineHeight ? 'ql-active' : ''"
+				class="iconfont icon-line-height" title="行间距" data-name="lineHeight" data-value="2"></view>
+			<view v-if="toolbarList.includes('letterSpacing')" :class="formats.letterSpacing ? 'ql-active' : ''"
+				class="iconfont icon-Character-Spacing" title="字间距" data-name="letterSpacing" data-value="2em"></view>
+			<view v-if="toolbarList.includes('marginTop')" :class="formats.marginTop ? 'ql-active' : ''"
+				class="iconfont icon-722bianjiqi_duanqianju" title="段前距" data-name="marginTop" data-value="20px"></view>
+			<view v-if="toolbarList.includes('marginBottom')" :class="formats.marginBottom ? 'ql-active' : ''"
+				class="iconfont icon-723bianjiqi_duanhouju" title="段后距" data-name="marginBottom" data-value="20px">
+			</view>
+			<!-- #endif -->
+			<!-- #ifndef MP-BAIDU -->
+			<view v-if="toolbarList.includes('fontSize')" :class="formats.fontFamily ? 'ql-active' : ''"
+				class="iconfont icon-font" title="字体" data-name="fontFamily" data-value="宋体"></view>
+			<view v-if="toolbarList.includes('fontSize')" :class="formats.fontSize === '24px' ? 'ql-active' : ''"
+				class="iconfont icon-fontsize" title="字号" data-name="fontSize" data-value="24px"></view>
+			<!-- #endif -->
+			<view v-if="toolbarList.includes('color')" :style="{ color: formats.color ? textColor : 'initial' }"
+				class="iconfont icon-text_color" title="文字颜色" data-name="color" :data-value="textColor"></view>
+			<view v-if="toolbarList.includes('backgroundColor')"
+				:style="{ color: formats.backgroundColor ? backgroundColor : 'initial' }"
+				class="iconfont icon-fontbgcolor" title="背景颜色" data-name="backgroundColor"
+				:data-value="backgroundColor"></view>
+			<view v-if="toolbarList.includes('date')" class="iconfont icon-date" title="日期" @tap="insertDate"></view>
+			<view v-if="toolbarList.includes('listCheck')" class="iconfont icon--checklist" title="待办" data-name="list"
+				data-value="check"></view>
+			<view v-if="toolbarList.includes('listOrdered')" :class="formats.list === 'ordered' ? 'ql-active' : ''"
+				class="iconfont icon-youxupailie" title="有序列表" data-name="list" data-value="ordered"></view>
+			<view v-if="toolbarList.includes('listBullet')" :class="formats.list === 'bullet' ? 'ql-active' : ''"
+				class="iconfont icon-wuxupailie" title="无序列表" data-name="list" data-value="bullet"></view>
+			<view v-if="toolbarList.includes('divider')" class="iconfont icon-fengexian" title="分割线"
+				@click="insertDivider"></view>
+			<view v-if="toolbarList.includes('indentDec')" class="iconfont icon-outdent" title="减少缩进" data-name="indent"
+				data-value="-1"></view>
+			<view v-if="toolbarList.includes('indentInc')" class="iconfont icon-indent" title="增加缩进" data-name="indent"
+				data-value="+1"></view>
+			<view v-if="toolbarList.includes('scriptSub')" :class="formats.script === 'sub' ? 'ql-active' : ''"
+				class="iconfont icon-zitixiabiao" title="下标" data-name="script" data-value="sub"></view>
+			<view v-if="toolbarList.includes('scriptSuper')" :class="formats.script === 'super' ? 'ql-active' : ''"
+				class="iconfont icon-zitishangbiao" title="上标" data-name="script" data-value="super"></view>
+			<view v-if="toolbarList.includes('direction')" :class="formats.direction === 'rtl' ? 'ql-active' : ''"
+				class="iconfont icon-direction-rtl" title="文本方向" data-name="direction" data-value="rtl"></view>
+			<view v-if="toolbarList.includes('image')" class="iconfont icon-charutupian" title="图片" @tap="insertImage">
+			</view>
+			<view v-if="toolbarList.includes('link')" class="iconfont icon-charulianjie" title="超链接" @tap="insertLink">
+			</view>
+			<view v-if="toolbarList.includes('undo')" class="iconfont icon-undo" title="撤销" @tap="undo"></view>
+			<view v-if="toolbarList.includes('redo')" class="iconfont icon-redo" title="重做" @tap="redo"></view>
+			<view v-if="toolbarList.includes('removeFormat')" class="iconfont icon-clearedformat" title="清除格式"
+				@tap="removeFormat"></view>
+			<view v-if="toolbarList.includes('clear')" class="iconfont icon-shanchu" title="清空" @tap="clear"></view>
+			<view v-if="toolbarList.includes('export')" class="iconfont icon-baocun" title="导出" @tap="exportHtml">
+			</view>
+		</view>
+
+		<!-- 自定义功能组件 -->
+		<!-- 调色板 -->
+		<color-picker v-if="toolbarList.includes('color') || toolbarList.includes('backgroundColor')"
+			ref="colorPickerRef" :color="defaultColor" @confirm="confirmColor"></color-picker>
+		<!-- 添加链接的操作弹窗 -->
+		<link-edit v-if="toolbarList.includes('link') && !readOnly" ref="linkEditRef"
+			@confirm="confirmLink"></link-edit>
+
+		<view class="sp-editor-wrapper" @longpress="eLongpress">
+			<editor :id="editorId" class="ql-editor editor-container" :class="{ 'ql-image-overlay-none': readOnly }"
+				show-img-size show-img-toolbar show-img-resize :placeholder="placeholder" :read-only="readOnly"
+				@statuschange="onStatusChange" @ready="onEditorReady" @input="onEditorInput"></editor>
+		</view>
+	</view>
+</template>
+
+<script>
+	import ColorPicker from './color-picker.vue'
+	import LinkEdit from './link-edit.vue'
+	import {
+		addLink,
+		linkFlag
+	} from '../../utils'
+
+	export default {
+		components: {
+			ColorPicker,
+			LinkEdit
+		},
+		props: {
+			// 编辑器id可传入，以便循环组件使用，防止id重复
+			editorId: {
+				type: String,
+				default: 'editor'
+			},
+			placeholder: {
+				type: String,
+				default: '写点什么吧 ~'
+			},
+			// 是否只读
+			readOnly: {
+				type: Boolean,
+				default: false
+			},
+			// 最大字数限制，-1不限
+			maxlength: {
+				type: Number,
+				default: -1
+			},
+			// 工具栏配置
+			toolbarConfig: {
+				type: Object,
+				default: () => {
+					return {
+						keys: [], // 要显示的工具，优先级最大
+						excludeKeys: [], // 除这些指定的工具外，其他都显示
+						iconSize: '18px', // 工具栏字体大小
+						iconColumns: 10 // 工具栏列数
+					}
+				}
+			}
+		},
+		watch: {
+			toolbarConfig: {
+				deep: true,
+				immediate: true,
+				handler(newToolbar) {
+					/**
+					 * 若工具栏配置中keys存在，则以keys为准
+					 * 否则以excludeKeys向toolbarAllList中排查
+					 * 若keys与excludeKeys皆为空，则以toolbarAllList为准
+					 */
+					if (newToolbar.keys?.length > 0) {
+						this.toolbarList = newToolbar.keys
+					} else {
+						this.toolbarList =
+							newToolbar.excludeKeys?.length > 0 ?
+							this.toolbarAllList.filter((item) => !newToolbar.excludeKeys.includes(item)) :
+							this.toolbarAllList
+					}
+					this.iconSize = newToolbar.iconSize || '18px'
+					this.iconColumns = newToolbar.iconColumns || 10
+				}
+			}
+		},
+		data() {
+			return {
+				formats: {},
+				textColor: '',
+				backgroundColor: '',
+				curColor: '',
+				defaultColor: {
+					r: 0,
+					g: 0,
+					b: 0,
+					a: 1
+				}, // 调色板默认颜色
+				iconSize: '20px', // 工具栏图标字体大小
+				iconColumns: 10, // 工具栏列数
+				toolbarList: [],
+				toolbarAllList: [
+					'bold', // 加粗
+					'italic', // 斜体
+					'underline', // 下划线
+					'strike', // 删除线
+					'alignLeft', // 左对齐
+					'alignCenter', // 居中对齐
+					'alignRight', // 右对齐
+					'alignJustify', // 两端对齐
+					'lineHeight', // 行间距
+					'letterSpacing', // 字间距
+					'marginTop', // 段前距
+					'marginBottom', // 段后距
+					'fontFamily', // 字体
+					'fontSize', // 字号
+					'color', // 文字颜色
+					'backgroundColor', // 背景颜色
+					'date', // 日期
+					'listCheck', // 待办
+					'listOrdered', // 有序列表
+					'listBullet', // 无序列表
+					'indentInc', // 增加缩进
+					'indentDec', // 减少缩进
+					'divider', // 分割线
+					'header', // 标题
+					'scriptSub', // 下标
+					'scriptSuper', // 上标
+					'direction', // 文本方向
+					'image', // 图片
+					'link', // 超链接
+					'undo', // 撤销
+					'redo', // 重做
+					'removeFormat', // 清除格式
+					'clear', // 清空
+					'export' // 导出
+				]
+			}
+		},
+		methods: {
+			onEditorReady() {
+				// #ifdef MP-BAIDU
+				this.editorCtx = requireDynamicLib('editorLib').createEditorContext(this.editorId)
+				// #endif
+
+				// #ifdef APP || MP-WEIXIN || H5
+				uni
+					.createSelectorQuery()
+					.in(this)
+					.select('#' + this.editorId)
+					.context((res) => {
+						this.editorCtx = res.context
+						this.$emit('init', this.editorCtx, this.editorId)
+					})
+					.exec()
+				// #endif
+			},
+			undo() {
+				this.editorCtx.undo()
+			},
+			redo() {
+				this.editorCtx.redo()
+			},
+			format(e) {
+				let {
+					name,
+					value
+				} = e.target.dataset
+				if (!name) return
+				switch (name) {
+					case 'color':
+					case 'backgroundColor':
+						this.curColor = name
+						this.showPicker()
+						break
+					default:
+						this.editorCtx.format(name, value)
+						break
+				}
+			},
+			showPicker() {
+				switch (this.curColor) {
+					case 'color':
+						this.defaultColor = this.textColor ?
+							this.$refs.colorPickerRef.hex2Rgb(this.textColor) : {
+								r: 0,
+								g: 0,
+								b: 0,
+								a: 1
+							}
+						break
+					case 'backgroundColor':
+						this.defaultColor = this.backgroundColor ?
+							this.$refs.colorPickerRef.hex2Rgb(this.backgroundColor) : {
+								r: 0,
+								g: 0,
+								b: 0,
+								a: 0
+							}
+						break
+				}
+				this.$refs.colorPickerRef.open()
+			},
+			confirmColor(e) {
+				switch (this.curColor) {
+					case 'color':
+						this.textColor = e.hex
+						this.editorCtx.format('color', this.textColor)
+						break
+					case 'backgroundColor':
+						this.backgroundColor = e.hex
+						this.editorCtx.format('backgroundColor', this.backgroundColor)
+						break
+				}
+			},
+			onStatusChange(e) {
+				if (e.detail.color) {
+					this.textColor = e.detail.color
+				}
+				if (e.detail.backgroundColor) {
+					this.backgroundColor = e.detail.backgroundColor
+				}
+				this.formats = e.detail
+			},
+			insertDivider() {
+				this.editorCtx.insertDivider()
+			},
+			clear() {
+				uni.showModal({
+					title: '清空编辑器',
+					content: '确定清空编辑器吗？',
+					success: ({
+						confirm
+					}) => {
+						if (confirm) {
+							this.editorCtx.clear()
+						}
+					}
+				})
+			},
+			removeFormat() {
+				uni.showModal({
+					title: '文本格式化',
+					content: '确定要清除所选择部分文本块格式吗？',
+					showCancel: true,
+					success: ({
+						confirm
+					}) => {
+						if (confirm) {
+							this.editorCtx.removeFormat()
+						}
+					}
+				})
+			},
+			insertDate() {
+				const date = new Date()
+				const formatDate = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
+				this.editorCtx.insertText({
+					text: formatDate
+				})
+			},
+			insertLink() {
+				this.$refs.linkEditRef.open()
+			},
+			/**
+			 * 确认添加链接
+			 * @param {Object} e { text: '链接描述', href: '链接地址' }
+			 */
+			confirmLink(e) {
+				this.$refs.linkEditRef.close()
+				addLink(this.editorCtx, e)
+				this.$emit('addLink', e, this.editorId)
+				// 修复添加超链接后，不触发input更新当前最新内容的bug，这里做一下手动更新
+				this.editorCtx.getContents({
+					success: (res) => {
+						this.$emit('input', {
+							html: res.html,
+							text: res.text
+						}, this.editorId)
+					}
+				})
+			},
+			insertImage() {
+				// #ifdef APP-PLUS || H5
+				uni.chooseImage({
+					// count: 1, // 默认9
+					success: (res) => {
+						const {
+							tempFiles
+						} = res
+						// 将文件和编辑器示例抛出，由开发者自行上传和插入图片
+						this.$emit('upinImage', tempFiles, this.editorCtx, this.editorId)
+					},
+					fail() {
+						uni.showToast({
+							title: '未授权访问相册权限，请授权后使用',
+							icon: 'none'
+						})
+					}
+				})
+				// #endif
+
+				// #ifdef MP-WEIXIN
+				// 微信小程序从基础库 2.21.0 开始， wx.chooseImage 停止维护，请使用 uni.chooseMedia 代替。
+				uni.chooseMedia({
+					// count: 1, // 默认9
+					success: (res) => {
+						// 同上chooseImage处理
+						const {
+							tempFiles
+						} = res
+						this.$emit('upinImage', tempFiles, this.editorCtx, this.editorId)
+					},
+					fail() {
+						uni.showToast({
+							title: '未授权访问相册权限，请授权后使用',
+							icon: 'none'
+						})
+					}
+				})
+				// #endif
+			},
+			onEditorInput(e) {
+				// 注意不要使用getContents获取html和text，会导致重复触发onStatusChange从而失去toolbar工具的高亮状态
+				// 复制粘贴的时候detail会为空，此时应当直接return
+				if (Object.keys(e.detail).length <= 0) return
+				const {
+					html,
+					text
+				} = e.detail
+				// 识别到标识立即return
+				if (text.indexOf(linkFlag) !== -1) return
+
+				const maxlength = parseInt(this.maxlength)
+				const textStr = text.replace(/[ \t\r\n]/g, '')
+				if (textStr.length > maxlength && maxlength != -1) {
+					uni.showModal({
+						content: `超过${maxlength}字数啦~`,
+						confirmText: '确定',
+						showCancel: false,
+						success: () => {
+							this.$emit('overMax', {
+								html,
+								text
+							}, this.editorId)
+						}
+					})
+				} else {
+					this.$emit('input', {
+						html,
+						text
+					}, this.editorId)
+				}
+			},
+			// 导出
+			exportHtml() {
+				this.editorCtx.getContents({
+					success: (res) => {
+						this.$emit('exportHtml', res.html, this.editorId)
+					}
+				})
+			},
+			eLongpress() {
+				/**
+				 * 微信小程序官方editor的长按事件有bug，需要重写覆盖，不需做任何逻辑，可见下面小程序社区问题链接
+				 * @tutorial https://developers.weixin.qq.com/community/develop/doc/000c04b3e1c1006f660065e4f61000
+				 */
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/uni_modules/sp-editor/icons/editor-icon.css';
+
+	.sp-editor {
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+	}
+
+	.sp-editor-toolbar {
+		box-sizing: border-box;
+		padding: calc(var(--icon-size) / 4) 0;
+		border-bottom: 1px solid #e4e4e4;
+		font-family: 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
+		display: grid;
+		grid-template-columns: repeat(var(--icon-columns), 1fr);
+		position: fixed;
+		width: 95%;
+		z-index: 100;
+		background: #fff;
+	}
+
+	.iconfont {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: calc(var(--icon-size) * 1.8);
+		cursor: pointer;
+		font-size: var(--icon-size);
+	}
+
+	.sp-editor-wrapper {
+		flex: 1;
+		overflow: hidden;
+		position: relative;
+		margin-top: 245rpx;
+	}
+
+	.editor-container {
+		padding: 8rpx 16rpx;
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		font-size: 16px;
+		line-height: 1.5;
+	}
+
+	.ql-image-overlay-none {
+		::v-deep .ql-image-overlay {
+			pointer-events: none;
+			opacity: 0;
+		}
+	}
+
+	::v-deep .ql-editor.ql-blank::before {
+		font-style: normal;
+		color: #cccccc;
+	}
+
+	::v-deep .ql-container {
+		min-height: unset;
+	}
+
+	.ql-active {
+		color: #66ccff;
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/sp-editor/icons/editor-icon.css b/uni_modules/sp-editor/icons/editor-icon.css
new file mode 100644
index 0000000..e8f0345
--- /dev/null
+++ b/uni_modules/sp-editor/icons/editor-icon.css
@@ -0,0 +1,238 @@
+@font-face {
+    font-family: 'iconfont';
+    src: url('data:font/truetype;charset=utf-8;base64,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AAsAJgFuAAoAQwByAGUAYQB0AGUAZAAgAGIAeQAgAGkAYwBvAG4AZgBvAG4AdAAKAAAKQ3JlYXRlZCBieSBpY29uZm9udAoAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAFIAZQBnAHUAbABhAHIAAFJlZ3VsYXIAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAFYAZQByAHMAaQBvAG4AIAAxAC4AMAAAVmVyc2lvbiAxLjAAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAAcwB2AGcAMgB0AHQAZgAgAGYAcgBvAG0AIABGAG8AbgB0AGUAbABsAG8AIABwAHIAbwBqAGUAYwB0AC4AAEdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC4AAGgAdAB0AHAAOgAvAC8AZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AAGh0dHA6Ly9mb250ZWxsby5jb20AAAIAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAEAAgECAQMBBAEFAQYBBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkEcmVkbwlzZWxlY3RhbGwHcHJldmlldwR1bmRvBGRhdGUHY2xlYXJ1cBU3MjNiaWFuamlxaV9kdWFuaG91anUWNzIyYmlhbmppcWlfZHVhbnFpYW5qdQotY2hlY2tsaXN0DWRpcmVjdGlvbi1sdHINZGlyZWN0aW9uLXJ0bAtmb250Ymdjb2xvcg1jbGVhcmVkZm9ybWF0BGZvbnQHb3V0ZGVudAhmb250c2l6ZQp0ZXh0X2NvbG9yD2Zvcm1hdC1oZWFkZXItMg9mb3JtYXQtaGVhZGVyLTMLbGluZS1oZWlnaHQPZm9ybWF0LWhlYWRlci0xD2Zvcm1hdC1oZWFkZXItNA9mb3JtYXQtaGVhZGVyLTUPZm9ybWF0LWhlYWRlci02EUNoYXJhY3Rlci1TcGFjaW5nBmluZGVudAZiYW9jdW4IcXVhbnBpbmcFZnV6aGkHc2hhbmNodQxiaWFuamlzZWt1YWkJZmVuZ2V4aWFuB2RpYW56YW4MY2hhcnVsaWFuamllC2NoYXJ1dHVwaWFuCnd1eHVwYWlsaWUManV6aG9uZ2R1aXFpB3lpbnlvbmcLeW91eHVwYWlsaWUIeW91ZHVpcWkJeml0aWRhaW1hCHhpYW9saWFuCXppdGlqaWFjdQ96aXRpc2hhbmNodXhpYW4Neml0aXNoYW5nYmlhbwp6aXRpYmlhb3RpDnppdGl4aWFodWF4aWFuCXppdGl4aWV0aQl6aXRpeWFuc2UIenVvZHVpcWkJeml0aXl1bGFuC3ppdGl4aWFiaWFvC3p1b3lvdWR1aXFpB2R1aWdvdXgGZ3VhbmJpDnNoZW5neWluX3NoaXRpAAAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwA6AAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAANhk6GIAAAAA2GToYg==') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-redo:before {
+  content: "\e627";
+}
+
+.icon-undo:before {
+  content: "\e633";
+}
+
+.icon-indent:before {
+  content: "\eb28";
+}
+
+.icon-outdent:before {
+  content: "\e6e8";
+}
+
+.icon-fontsize:before {
+  content: "\e6fd";
+}
+
+.icon-format-header-1:before {
+  content: "\e860";
+}
+
+.icon-format-header-4:before {
+  content: "\e863";
+}
+
+.icon-format-header-5:before {
+  content: "\e864";
+}
+
+.icon-format-header-6:before {
+  content: "\e865";
+}
+
+.icon-clearup:before {
+  content: "\e64d";
+}
+
+.icon-preview:before {
+  content: "\e631";
+}
+
+.icon-date:before {
+  content: "\e63e";
+}
+
+.icon-fontbgcolor:before {
+  content: "\e678";
+}
+
+.icon-clearedformat:before {
+  content: "\e67e";
+}
+
+.icon-font:before {
+  content: "\e684";
+}
+
+.icon-723bianjiqi_duanhouju:before {
+  content: "\e65f";
+}
+
+.icon-722bianjiqi_duanqianju:before {
+  content: "\e660";
+}
+
+.icon-text_color:before {
+  content: "\e72c";
+}
+
+.icon-format-header-2:before {
+  content: "\e75c";
+}
+
+.icon-format-header-3:before {
+  content: "\e75d";
+}
+
+.icon--checklist:before {
+  content: "\e664";
+}
+
+.icon-baocun:before {
+  content: "\ec09";
+}
+
+.icon-line-height:before {
+  content: "\e7f8";
+}
+
+.icon-quanping:before {
+  content: "\ec13";
+}
+
+.icon-direction-rtl:before {
+  content: "\e66e";
+}
+
+.icon-direction-ltr:before {
+  content: "\e66d";
+}
+
+.icon-selectall:before {
+  content: "\e62b";
+}
+
+.icon-fuzhi:before {
+  content: "\ec7a";
+}
+
+.icon-shanchu:before {
+  content: "\ec7b";
+}
+
+.icon-bianjisekuai:before {
+  content: "\ec7c";
+}
+
+.icon-fengexian:before {
+  content: "\ec7f";
+}
+
+.icon-dianzan:before {
+  content: "\ec80";
+}
+
+.icon-charulianjie:before {
+  content: "\ec81";
+}
+
+.icon-charutupian:before {
+  content: "\ec82";
+}
+
+.icon-wuxupailie:before {
+  content: "\ec83";
+}
+
+.icon-juzhongduiqi:before {
+  content: "\ec84";
+}
+
+.icon-yinyong:before {
+  content: "\ec85";
+}
+
+.icon-youxupailie:before {
+  content: "\ec86";
+}
+
+.icon-youduiqi:before {
+  content: "\ec87";
+}
+
+.icon-zitidaima:before {
+  content: "\ec88";
+}
+
+.icon-xiaolian:before {
+  content: "\ec89";
+}
+
+.icon-zitijiacu:before {
+  content: "\ec8a";
+}
+
+.icon-zitishanchuxian:before {
+  content: "\ec8b";
+}
+
+.icon-zitishangbiao:before {
+  content: "\ec8c";
+}
+
+.icon-zitibiaoti:before {
+  content: "\ec8d";
+}
+
+.icon-zitixiahuaxian:before {
+  content: "\ec8e";
+}
+
+.icon-zitixieti:before {
+  content: "\ec8f";
+}
+
+.icon-zitiyanse:before {
+  content: "\ec90";
+}
+
+.icon-zuoduiqi:before {
+  content: "\ec91";
+}
+
+.icon-zitiyulan:before {
+  content: "\ec92";
+}
+
+.icon-zitixiabiao:before {
+  content: "\ec93";
+}
+
+.icon-zuoyouduiqi:before {
+  content: "\ec94";
+}
+
+.icon-duigoux:before {
+  content: "\ec9e";
+}
+
+.icon-guanbi:before {
+  content: "\eca0";
+}
+
+.icon-shengyin_shiti:before {
+  content: "\eca5";
+}
+
+.icon-Character-Spacing:before {
+  content: "\e964";
+}
diff --git a/uni_modules/sp-editor/icons/iconfont.ttf b/uni_modules/sp-editor/icons/iconfont.ttf
new file mode 100644
index 0000000..8ade3a4
Binary files /dev/null and b/uni_modules/sp-editor/icons/iconfont.ttf differ
diff --git a/uni_modules/sp-editor/package.json b/uni_modules/sp-editor/package.json
new file mode 100644
index 0000000..c66b21c
--- /dev/null
+++ b/uni_modules/sp-editor/package.json
@@ -0,0 +1,83 @@
+{
+	"id": "sp-editor",
+	"displayName": "官方富文本编辑器editor组件改良扩展优化版",
+	"version": "1.4.0",
+	"description": "基于官方的富文本编辑器editor组件，进行改良扩展优化版，添加了调色板，添加超链接等功能，可自定义扩展工具，快来试试吧~",
+	"keywords": [
+        "富文本",
+        "editor",
+        "编辑器"
+    ],
+	"repository": "",
+    "engines": {
+	},
+	"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",
+                "alipay": "n"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "u",
+					"百度": "y",
+					"字节跳动": "u",
+					"QQ": "u",
+					"钉钉": "u",
+					"快手": "u",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/sp-editor/readme.md b/uni_modules/sp-editor/readme.md
new file mode 100644
index 0000000..8fd5107
--- /dev/null
+++ b/uni_modules/sp-editor/readme.md
@@ -0,0 +1,11 @@
+# sp-editor
+
+### 文档迁移
+
+> 防止文档失效，提供下列五个地址，内容一致
+
+- [地址一](https://sonvee.github.io/sv-app-docs/docs-github/src/plugins/sp-editor/sp-editor.html)
+- [地址二](https://sv-app-docs.pages.dev/src/plugins/sp-editor/sp-editor.html)
+- [地址三](https://sv-app-docs.4everland.app/src/plugins/sp-editor/sp-editor.html)
+- [地址四](https://sv-app-docs.vercel.app/src/plugins/sp-editor/sp-editor.html) (需要梯子)
+- [地址五](https://static-mp-74bfcbac-6ba6-4f39-8513-8831390ff75a.next.bspapp.com/docs-uni/src/plugins/sp-editor/sp-editor.html) (有IP限制)
diff --git a/uni_modules/sp-editor/static/image-resize.min.js b/uni_modules/sp-editor/static/image-resize.min.js
new file mode 100644
index 0000000..7c788a5
--- /dev/null
+++ b/uni_modules/sp-editor/static/image-resize.min.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ImageResize=e():t.ImageResize=e()}(this,function(){return function(t){function e(o){if(n[o])return n[o].exports;var r=n[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,e),r.l=!0,r.exports}var n={};return e.m=t,e.c=n,e.i=function(t){return t},e.d=function(t,n,o){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:o})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=39)}([function(t,e){function n(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}t.exports=n},function(t,e,n){var o=n(22),r="object"==typeof self&&self&&self.Object===Object&&self,i=o||r||Function("return this")();t.exports=i},function(t,e){function n(t){return null!=t&&"object"==typeof t}t.exports=n},function(t,e,n){function o(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var o=t[e];this.set(o[0],o[1])}}var r=n(76),i=n(77),u=n(78),c=n(79),a=n(80);o.prototype.clear=r,o.prototype.delete=i,o.prototype.get=u,o.prototype.has=c,o.prototype.set=a,t.exports=o},function(t,e,n){function o(t,e){for(var n=t.length;n--;)if(r(t[n][0],e))return n;return-1}var r=n(8);t.exports=o},function(t,e,n){function o(t){return null==t?void 0===t?a:c:s&&s in Object(t)?i(t):u(t)}var r=n(16),i=n(65),u=n(88),c="[object Null]",a="[object Undefined]",s=r?r.toStringTag:void 0;t.exports=o},function(t,e,n){function o(t,e){var n=t.__data__;return r(e)?n["string"==typeof e?"string":"hash"]:n.map}var r=n(74);t.exports=o},function(t,e,n){var o=n(11),r=o(Object,"create");t.exports=r},function(t,e){function n(t,e){return t===e||t!==t&&e!==e}t.exports=n},function(t,e,n){"use strict";function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}n.d(e,"a",function(){return r});var r=function t(e){o(this,t),this.onCreate=function(){},this.onDestroy=function(){},this.onUpdate=function(){},this.overlay=e.overlay,this.img=e.img,this.options=e.options,this.requestUpdate=e.onUpdate}},function(t,e,n){function o(t,e,n){"__proto__"==e&&r?r(t,e,{configurable:!0,enumerable:!0,value:n,writable:!0}):t[e]=n}var r=n(21);t.exports=o},function(t,e,n){function o(t,e){var n=i(t,e);return r(n)?n:void 0}var r=n(49),i=n(66);t.exports=o},function(t,e,n){function o(t){return null!=t&&i(t.length)&&!r(t)}var r=n(13),i=n(31);t.exports=o},function(t,e,n){function o(t){if(!i(t))return!1;var e=r(t);return e==c||e==a||e==u||e==s}var r=n(5),i=n(0),u="[object AsyncFunction]",c="[object Function]",a="[object GeneratorFunction]",s="[object Proxy]";t.exports=o},function(t,e){t.exports=function(t){return t.webpackPolyfill||(t.deprecate=function(){},t.paths=[],t.children||(t.children=[]),Object.defineProperty(t,"loaded",{enumerable:!0,get:function(){return t.l}}),Object.defineProperty(t,"id",{enumerable:!0,get:function(){return t.i}}),t.webpackPolyfill=1),t}},function(t,e,n){var o=n(11),r=n(1),i=o(r,"Map");t.exports=i},function(t,e,n){var o=n(1),r=o.Symbol;t.exports=r},function(t,e){function n(t,e,n){switch(n.length){case 0:return t.call(e);case 1:return t.call(e,n[0]);case 2:return t.call(e,n[0],n[1]);case 3:return t.call(e,n[0],n[1],n[2])}return t.apply(e,n)}t.exports=n},function(t,e,n){function o(t,e,n){(void 0===n||i(t[e],n))&&(void 0!==n||e in t)||r(t,e,n)}var r=n(10),i=n(8);t.exports=o},function(t,e,n){function o(t,e,n,p,l){t!==e&&u(e,function(u,s){if(l||(l=new r),a(u))c(t,e,s,n,o,p,l);else{var d=p?p(f(t,s),u,s+"",t,e,l):void 0;void 0===d&&(d=u),i(t,s,d)}},s)}var r=n(42),i=n(18),u=n(47),c=n(52),a=n(0),s=n(33),f=n(26);t.exports=o},function(t,e,n){function o(t,e){return u(i(t,e,r),t+"")}var r=n(27),i=n(90),u=n(91);t.exports=o},function(t,e,n){var o=n(11),r=function(){try{var t=o(Object,"defineProperty");return t({},"",{}),t}catch(t){}}();t.exports=r},function(t,e,n){(function(e){var n="object"==typeof e&&e&&e.Object===Object&&e;t.exports=n}).call(e,n(105))},function(t,e,n){var o=n(89),r=o(Object.getPrototypeOf,Object);t.exports=r},function(t,e){function n(t,e){var n=typeof t;return!!(e=null==e?o:e)&&("number"==n||"symbol"!=n&&r.test(t))&&t>-1&&t%1==0&&t<e}var o=9007199254740991,r=/^(?:0|[1-9]\d*)$/;t.exports=n},function(t,e){function n(t){var e=t&&t.constructor;return t===("function"==typeof e&&e.prototype||o)}var o=Object.prototype;t.exports=n},function(t,e){function n(t,e){if(("constructor"!==e||"function"!=typeof t[e])&&"__proto__"!=e)return t[e]}t.exports=n},function(t,e){function n(t){return t}t.exports=n},function(t,e,n){var o=n(48),r=n(2),i=Object.prototype,u=i.hasOwnProperty,c=i.propertyIsEnumerable,a=o(function(){return arguments}())?o:function(t){return r(t)&&u.call(t,"callee")&&!c.call(t,"callee")};t.exports=a},function(t,e){var n=Array.isArray;t.exports=n},function(t,e,n){(function(t){var o=n(1),r=n(103),i="object"==typeof e&&e&&!e.nodeType&&e,u=i&&"object"==typeof t&&t&&!t.nodeType&&t,c=u&&u.exports===i,a=c?o.Buffer:void 0,s=a?a.isBuffer:void 0,f=s||r;t.exports=f}).call(e,n(14)(t))},function(t,e){function n(t){return"number"==typeof t&&t>-1&&t%1==0&&t<=o}var o=9007199254740991;t.exports=n},function(t,e,n){var o=n(50),r=n(55),i=n(87),u=i&&i.isTypedArray,c=u?r(u):o;t.exports=c},function(t,e,n){function o(t){return u(t)?r(t,!0):i(t)}var r=n(44),i=n(51),u=n(12);t.exports=o},function(t,e,n){"use strict";e.a={modules:["DisplaySize","Toolbar","Resize"]}},function(t,e,n){"use strict";function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function r(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}n.d(e,"a",function(){return c});var u=n(9),c=function(t){function e(){var t,n,i,u;o(this,e);for(var c=arguments.length,a=Array(c),s=0;s<c;s++)a[s]=arguments[s];return n=i=r(this,(t=e.__proto__||Object.getPrototypeOf(e)).call.apply(t,[this].concat(a))),i.onCreate=function(){i.display=document.createElement("div"),i.display.classList.add("ql-image-size"),i.overlay.appendChild(i.display)},i.onDestroy=function(){},i.onUpdate=function(){if(i.display&&i.img){var t=i.getCurrentSize();i.display.innerHTML=t.join(" &times; "),Object.assign(i.display.style,{right:"4px",top:"4px",left:"auto"})}},i.getCurrentSize=function(){return[i.img.width,Math.round(i.img.width/i.img.naturalWidth*i.img.naturalHeight)]},u=n,r(i,u)}return i(e,t),e}(u.a)},function(t,e,n){"use strict";function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function r(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}n.d(e,"a",function(){return f});var u=n(9),c=navigator.maxTouchPoints,a=!1;try{var s=Object.defineProperty({},"passive",{get:function(){a={passive:!1}}});window.addEventListener("test",null,s)}catch(t){}var f=function(t){function e(){var t,n,i,u;o(this,e);for(var s=arguments.length,f=Array(s),p=0;p<s;p++)f[p]=arguments[p];return n=i=r(this,(t=e.__proto__||Object.getPrototypeOf(e)).call.apply(t,[this].concat(f))),i.onCreate=function(){i.boxes=[],i.addBox("nwse-resize"),i.addBox("nesw-resize"),i.addBox("nwse-resize"),i.addBox("nesw-resize"),i.positionBoxes()},i.onDestroy=function(){i.setCursor("")},i.positionBoxes=function(){[{left:"-6px",top:"-6px"},{right:"-6px",top:"-6px"},{right:"-6px",bottom:"-6px"},{left:"-6px",bottom:"-6px"}].forEach(function(t,e){Object.assign(i.boxes[e].style,t)})},i.addBox=function(t){var e=document.createElement("div");e.classList.add("ql-image-handle"),e.style.cursor=t,e.addEventListener(c?"touchstart":"mousedown",i.handleMousedown,!1),i.overlay.appendChild(e),i.boxes.push(e)},i.handleMousedown=function(t){i.dragBox=t.target;var e=c?t.changedTouches[0]:t;i.dragStartX=e.clientX,i.preDragWidth=i.img.width||i.img.naturalWidth,i.setCursor(i.dragBox.style.cursor),document.addEventListener(c?"touchmove":"mousemove",i.handleDrag,a),document.addEventListener(c?"touchend":"mouseup",i.handleMouseup,!1)},i.handleMouseup=function(){i.setCursor(""),document.removeEventListener(c?"touchmove":"mousemove",i.handleDrag),document.removeEventListener(c?"touchend":"mouseup",i.handleMouseup)},i.handleDrag=function(t){if(i.img){var e=c?t.changedTouches[0]:t,n=e.clientX-i.dragStartX;i.dragBox===i.boxes[0]||i.dragBox===i.boxes[3]?i.img.width=Math.round(i.preDragWidth-n):i.img.width=Math.round(i.preDragWidth+n),i.requestUpdate(),t.preventDefault()}},i.setCursor=function(t){[document.body,i.img].forEach(function(e){e.style.cursor=t})},u=n,r(i,u)}return i(e,t),e}(u.a)},function(t,e,n){"use strict";function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function r(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}n.d(e,"a",function(){return c});var u=n(9),c=function(t){function e(){var t,n,i,u;o(this,e);for(var c=arguments.length,a=Array(c),s=0;s<c;s++)a[s]=arguments[s];return n=i=r(this,(t=e.__proto__||Object.getPrototypeOf(e)).call.apply(t,[this].concat(a))),i.onCreate=function(){i.toolbar=document.createElement("div"),i.toolbar.classList.add("ql-image-toolbar"),i.overlay.appendChild(i.toolbar),i._addToolbarButtons()},i.onDestroy=function(){},i.onUpdate=function(){},i._addToolbarButtons=function(){var t=document.createElement("span");t.classList.add("triangle-up"),i.toolbar.appendChild(t);var e=document.createElement("span");e.innerText="删除",e.addEventListener("click",function(){var t=new CustomEvent("keyup");t.keyCode=46,document.dispatchEvent(t)}),i.toolbar.appendChild(e)},u=n,r(i,u)}return i(e,t),e}(u.a)},function(t,e,n){var o=n(17),r=n(20),i=n(64),u=n(102),c=r(function(t){return t.push(void 0,i),o(u,void 0,t)});t.exports=c},function(t,e,n){"use strict";function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var r=n(38),i=n.n(r),u=n(34),c=n(35),a=n(37),s=n(36),f={DisplaySize:c.a,Toolbar:a.a,Resize:s.a},p=function t(e){var n=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};o(this,t),this.initializeModules=function(){n.removeModules(),n.modules=n.moduleClasses.map(function(t){return new(f[t]||t)(n)}),n.modules.forEach(function(t){t.onCreate()}),n.onUpdate()},this.onUpdate=function(){n.repositionElements(),n.modules.forEach(function(t){t.onUpdate()})},this.removeModules=function(){n.modules.forEach(function(t){t.onDestroy()}),n.modules=[]},this.handleClick=function(t){if(t.target&&t.target.tagName&&"IMG"===t.target.tagName.toUpperCase()){if(n.img===t.target)return;n.img&&n.hide(),n.show(t.target)}else n.img&&n.hide()},this.show=function(t){n.img=t,n.showOverlay(),n.initializeModules()},this.showOverlay=function(){n.overlay&&n.hideOverlay(),n.quill.setSelection(null),n.setUserSelect("none"),document.addEventListener("keyup",n.checkImage,!0),n.quill.root.addEventListener("input",n.checkImage,!0),n.overlay=document.createElement("div"),n.overlay.classList.add("ql-image-overlay"),n.quill.root.parentNode.appendChild(n.overlay),n.repositionElements()},this.hideOverlay=function(){n.overlay&&(n.quill.root.parentNode.removeChild(n.overlay),n.overlay=void 0,document.removeEventListener("keyup",n.checkImage),n.quill.root.removeEventListener("input",n.checkImage),n.setUserSelect(""))},this.repositionElements=function(){if(n.overlay&&n.img){var t=n.quill.root.parentNode,e=n.img.getBoundingClientRect(),o=t.getBoundingClientRect();Object.assign(n.overlay.style,{left:e.left-o.left-1+t.scrollLeft+"px",top:e.top-o.top+t.scrollTop+"px",width:e.width+"px",height:e.height+"px"})}},this.hide=function(){n.hideOverlay(),n.removeModules(),n.img=void 0},this.setUserSelect=function(t){["userSelect","mozUserSelect","webkitUserSelect","msUserSelect"].forEach(function(e){n.quill.root.style[e]=t,document.documentElement.style[e]=t})},this.checkImage=function(t){n.img&&(46!=t.keyCode&&8!=t.keyCode||window.Quill.find(n.img).deleteAt(0),n.hide())},this.quill=e;var c=!1;r.modules&&(c=r.modules.slice()),this.options=i()({},r,u.a),!1!==c&&(this.options.modules=c),document.execCommand("enableObjectResizing",!1,"false"),this.quill.root.addEventListener("click",this.handleClick,!1),this.quill.root.parentNode.style.position=this.quill.root.parentNode.style.position||"relative",this.moduleClasses=this.options.modules,this.modules=[]};e.default=p,window.Quill&&window.Quill.register("modules/imageResize",p)},function(t,e,n){function o(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var o=t[e];this.set(o[0],o[1])}}var r=n(67),i=n(68),u=n(69),c=n(70),a=n(71);o.prototype.clear=r,o.prototype.delete=i,o.prototype.get=u,o.prototype.has=c,o.prototype.set=a,t.exports=o},function(t,e,n){function o(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var o=t[e];this.set(o[0],o[1])}}var r=n(81),i=n(82),u=n(83),c=n(84),a=n(85);o.prototype.clear=r,o.prototype.delete=i,o.prototype.get=u,o.prototype.has=c,o.prototype.set=a,t.exports=o},function(t,e,n){function o(t){var e=this.__data__=new r(t);this.size=e.size}var r=n(3),i=n(93),u=n(94),c=n(95),a=n(96),s=n(97);o.prototype.clear=i,o.prototype.delete=u,o.prototype.get=c,o.prototype.has=a,o.prototype.set=s,t.exports=o},function(t,e,n){var o=n(1),r=o.Uint8Array;t.exports=r},function(t,e,n){function o(t,e){var n=u(t),o=!n&&i(t),f=!n&&!o&&c(t),l=!n&&!o&&!f&&s(t),d=n||o||f||l,h=d?r(t.length,String):[],v=h.length;for(var y in t)!e&&!p.call(t,y)||d&&("length"==y||f&&("offset"==y||"parent"==y)||l&&("buffer"==y||"byteLength"==y||"byteOffset"==y)||a(y,v))||h.push(y);return h}var r=n(54),i=n(28),u=n(29),c=n(30),a=n(24),s=n(32),f=Object.prototype,p=f.hasOwnProperty;t.exports=o},function(t,e,n){function o(t,e,n){var o=t[e];c.call(t,e)&&i(o,n)&&(void 0!==n||e in t)||r(t,e,n)}var r=n(10),i=n(8),u=Object.prototype,c=u.hasOwnProperty;t.exports=o},function(t,e,n){var o=n(0),r=Object.create,i=function(){function t(){}return function(e){if(!o(e))return{};if(r)return r(e);t.prototype=e;var n=new t;return t.prototype=void 0,n}}();t.exports=i},function(t,e,n){var o=n(63),r=o();t.exports=r},function(t,e,n){function o(t){return i(t)&&r(t)==u}var r=n(5),i=n(2),u="[object Arguments]";t.exports=o},function(t,e,n){function o(t){return!(!u(t)||i(t))&&(r(t)?h:s).test(c(t))}var r=n(13),i=n(75),u=n(0),c=n(98),a=/[\\^$.*+?()[\]{}|]/g,s=/^\[object .+?Constructor\]$/,f=Function.prototype,p=Object.prototype,l=f.toString,d=p.hasOwnProperty,h=RegExp("^"+l.call(d).replace(a,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");t.exports=o},function(t,e,n){function o(t){return u(t)&&i(t.length)&&!!c[r(t)]}var r=n(5),i=n(31),u=n(2),c={};c["[object Float32Array]"]=c["[object Float64Array]"]=c["[object Int8Array]"]=c["[object Int16Array]"]=c["[object Int32Array]"]=c["[object Uint8Array]"]=c["[object Uint8ClampedArray]"]=c["[object Uint16Array]"]=c["[object Uint32Array]"]=!0,c["[object Arguments]"]=c["[object Array]"]=c["[object ArrayBuffer]"]=c["[object Boolean]"]=c["[object DataView]"]=c["[object Date]"]=c["[object Error]"]=c["[object Function]"]=c["[object Map]"]=c["[object Number]"]=c["[object Object]"]=c["[object RegExp]"]=c["[object Set]"]=c["[object String]"]=c["[object WeakMap]"]=!1,t.exports=o},function(t,e,n){function o(t){if(!r(t))return u(t);var e=i(t),n=[];for(var o in t)("constructor"!=o||!e&&a.call(t,o))&&n.push(o);return n}var r=n(0),i=n(25),u=n(86),c=Object.prototype,a=c.hasOwnProperty;t.exports=o},function(t,e,n){function o(t,e,n,o,g,_,m){var j=b(t,n),w=b(e,n),O=m.get(w);if(O)return void r(t,n,O);var E=_?_(j,w,n+"",t,e,m):void 0,z=void 0===E;if(z){var C=f(w),P=!C&&l(w),S=!C&&!P&&y(w);E=w,C||P||S?f(j)?E=j:p(j)?E=c(j):P?(z=!1,E=i(w,!0)):S?(z=!1,E=u(w,!0)):E=[]:v(w)||s(w)?(E=j,s(j)?E=x(j):h(j)&&!d(j)||(E=a(w))):z=!1}z&&(m.set(w,E),g(E,w,o,_,m),m.delete(w)),r(t,n,E)}var r=n(18),i=n(57),u=n(58),c=n(59),a=n(72),s=n(28),f=n(29),p=n(100),l=n(30),d=n(13),h=n(0),v=n(101),y=n(32),b=n(26),x=n(104);t.exports=o},function(t,e,n){var o=n(99),r=n(21),i=n(27),u=r?function(t,e){return r(t,"toString",{configurable:!0,enumerable:!1,value:o(e),writable:!0})}:i;t.exports=u},function(t,e){function n(t,e){for(var n=-1,o=Array(t);++n<t;)o[n]=e(n);return o}t.exports=n},function(t,e){function n(t){return function(e){return t(e)}}t.exports=n},function(t,e,n){function o(t){var e=new t.constructor(t.byteLength);return new r(e).set(new r(t)),e}var r=n(43);t.exports=o},function(t,e,n){(function(t){function o(t,e){if(e)return t.slice();var n=t.length,o=s?s(n):new t.constructor(n);return t.copy(o),o}var r=n(1),i="object"==typeof e&&e&&!e.nodeType&&e,u=i&&"object"==typeof t&&t&&!t.nodeType&&t,c=u&&u.exports===i,a=c?r.Buffer:void 0,s=a?a.allocUnsafe:void 0;t.exports=o}).call(e,n(14)(t))},function(t,e,n){function o(t,e){var n=e?r(t.buffer):t.buffer;return new t.constructor(n,t.byteOffset,t.length)}var r=n(56);t.exports=o},function(t,e){function n(t,e){var n=-1,o=t.length;for(e||(e=Array(o));++n<o;)e[n]=t[n];return e}t.exports=n},function(t,e,n){function o(t,e,n,o){var u=!n;n||(n={});for(var c=-1,a=e.length;++c<a;){var s=e[c],f=o?o(n[s],t[s],s,n,t):void 0;void 0===f&&(f=t[s]),u?i(n,s,f):r(n,s,f)}return n}var r=n(45),i=n(10);t.exports=o},function(t,e,n){var o=n(1),r=o["__core-js_shared__"];t.exports=r},function(t,e,n){function o(t){return r(function(e,n){var o=-1,r=n.length,u=r>1?n[r-1]:void 0,c=r>2?n[2]:void 0;for(u=t.length>3&&"function"==typeof u?(r--,u):void 0,c&&i(n[0],n[1],c)&&(u=r<3?void 0:u,r=1),e=Object(e);++o<r;){var a=n[o];a&&t(e,a,o,u)}return e})}var r=n(20),i=n(73);t.exports=o},function(t,e){function n(t){return function(e,n,o){for(var r=-1,i=Object(e),u=o(e),c=u.length;c--;){var a=u[t?c:++r];if(!1===n(i[a],a,i))break}return e}}t.exports=n},function(t,e,n){function o(t,e,n,u,c,a){return i(t)&&i(e)&&(a.set(e,t),r(t,e,void 0,o,a),a.delete(e)),t}var r=n(19),i=n(0);t.exports=o},function(t,e,n){function o(t){var e=u.call(t,a),n=t[a];try{t[a]=void 0;var o=!0}catch(t){}var r=c.call(t);return o&&(e?t[a]=n:delete t[a]),r}var r=n(16),i=Object.prototype,u=i.hasOwnProperty,c=i.toString,a=r?r.toStringTag:void 0;t.exports=o},function(t,e){function n(t,e){return null==t?void 0:t[e]}t.exports=n},function(t,e,n){function o(){this.__data__=r?r(null):{},this.size=0}var r=n(7);t.exports=o},function(t,e){function n(t){var e=this.has(t)&&delete this.__data__[t];return this.size-=e?1:0,e}t.exports=n},function(t,e,n){function o(t){var e=this.__data__;if(r){var n=e[t];return n===i?void 0:n}return c.call(e,t)?e[t]:void 0}var r=n(7),i="__lodash_hash_undefined__",u=Object.prototype,c=u.hasOwnProperty;t.exports=o},function(t,e,n){function o(t){var e=this.__data__;return r?void 0!==e[t]:u.call(e,t)}var r=n(7),i=Object.prototype,u=i.hasOwnProperty;t.exports=o},function(t,e,n){function o(t,e){var n=this.__data__;return this.size+=this.has(t)?0:1,n[t]=r&&void 0===e?i:e,this}var r=n(7),i="__lodash_hash_undefined__";t.exports=o},function(t,e,n){function o(t){return"function"!=typeof t.constructor||u(t)?{}:r(i(t))}var r=n(46),i=n(23),u=n(25);t.exports=o},function(t,e,n){function o(t,e,n){if(!c(n))return!1;var o=typeof e;return!!("number"==o?i(n)&&u(e,n.length):"string"==o&&e in n)&&r(n[e],t)}var r=n(8),i=n(12),u=n(24),c=n(0);t.exports=o},function(t,e){function n(t){var e=typeof t;return"string"==e||"number"==e||"symbol"==e||"boolean"==e?"__proto__"!==t:null===t}t.exports=n},function(t,e,n){function o(t){return!!i&&i in t}var r=n(61),i=function(){var t=/[^.]+$/.exec(r&&r.keys&&r.keys.IE_PROTO||"");return t?"Symbol(src)_1."+t:""}();t.exports=o},function(t,e){function n(){this.__data__=[],this.size=0}t.exports=n},function(t,e,n){function o(t){var e=this.__data__,n=r(e,t);return!(n<0)&&(n==e.length-1?e.pop():u.call(e,n,1),--this.size,!0)}var r=n(4),i=Array.prototype,u=i.splice;t.exports=o},function(t,e,n){function o(t){var e=this.__data__,n=r(e,t);return n<0?void 0:e[n][1]}var r=n(4);t.exports=o},function(t,e,n){function o(t){return r(this.__data__,t)>-1}var r=n(4);t.exports=o},function(t,e,n){function o(t,e){var n=this.__data__,o=r(n,t);return o<0?(++this.size,n.push([t,e])):n[o][1]=e,this}var r=n(4);t.exports=o},function(t,e,n){function o(){this.size=0,this.__data__={hash:new r,map:new(u||i),string:new r}}var r=n(40),i=n(3),u=n(15);t.exports=o},function(t,e,n){function o(t){var e=r(this,t).delete(t);return this.size-=e?1:0,e}var r=n(6);t.exports=o},function(t,e,n){function o(t){return r(this,t).get(t)}var r=n(6);t.exports=o},function(t,e,n){function o(t){return r(this,t).has(t)}var r=n(6);t.exports=o},function(t,e,n){function o(t,e){var n=r(this,t),o=n.size;return n.set(t,e),this.size+=n.size==o?0:1,this}var r=n(6);t.exports=o},function(t,e){function n(t){var e=[];if(null!=t)for(var n in Object(t))e.push(n);return e}t.exports=n},function(t,e,n){(function(t){var o=n(22),r="object"==typeof e&&e&&!e.nodeType&&e,i=r&&"object"==typeof t&&t&&!t.nodeType&&t,u=i&&i.exports===r,c=u&&o.process,a=function(){try{var t=i&&i.require&&i.require("util").types;return t||c&&c.binding&&c.binding("util")}catch(t){}}();t.exports=a}).call(e,n(14)(t))},function(t,e){function n(t){return r.call(t)}var o=Object.prototype,r=o.toString;t.exports=n},function(t,e){function n(t,e){return function(n){return t(e(n))}}t.exports=n},function(t,e,n){function o(t,e,n){return e=i(void 0===e?t.length-1:e,0),function(){for(var o=arguments,u=-1,c=i(o.length-e,0),a=Array(c);++u<c;)a[u]=o[e+u];u=-1;for(var s=Array(e+1);++u<e;)s[u]=o[u];return s[e]=n(a),r(t,this,s)}}var r=n(17),i=Math.max;t.exports=o},function(t,e,n){var o=n(53),r=n(92),i=r(o);t.exports=i},function(t,e){function n(t){var e=0,n=0;return function(){var u=i(),c=r-(u-n);if(n=u,c>0){if(++e>=o)return arguments[0]}else e=0;return t.apply(void 0,arguments)}}var o=800,r=16,i=Date.now;t.exports=n},function(t,e,n){function o(){this.__data__=new r,this.size=0}var r=n(3);t.exports=o},function(t,e){function n(t){var e=this.__data__,n=e.delete(t);return this.size=e.size,n}t.exports=n},function(t,e){function n(t){return this.__data__.get(t)}t.exports=n},function(t,e){function n(t){return this.__data__.has(t)}t.exports=n},function(t,e,n){function o(t,e){var n=this.__data__;if(n instanceof r){var o=n.__data__;if(!i||o.length<c-1)return o.push([t,e]),this.size=++n.size,this;n=this.__data__=new u(o)}return n.set(t,e),this.size=n.size,this}var r=n(3),i=n(15),u=n(41),c=200;t.exports=o},function(t,e){function n(t){if(null!=t){try{return r.call(t)}catch(t){}try{return t+""}catch(t){}}return""}var o=Function.prototype,r=o.toString;t.exports=n},function(t,e){function n(t){return function(){return t}}t.exports=n},function(t,e,n){function o(t){return i(t)&&r(t)}var r=n(12),i=n(2);t.exports=o},function(t,e,n){function o(t){if(!u(t)||r(t)!=c)return!1;var e=i(t);if(null===e)return!0;var n=p.call(e,"constructor")&&e.constructor;return"function"==typeof n&&n instanceof n&&f.call(n)==l}var r=n(5),i=n(23),u=n(2),c="[object Object]",a=Function.prototype,s=Object.prototype,f=a.toString,p=s.hasOwnProperty,l=f.call(Object);t.exports=o},function(t,e,n){var o=n(19),r=n(62),i=r(function(t,e,n,r){o(t,e,n,r)});t.exports=i},function(t,e){function n(){return!1}t.exports=n},function(t,e,n){function o(t){return r(t,i(t))}var r=n(60),i=n(33);t.exports=o},function(t,e){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(t){"object"==typeof window&&(n=window)}t.exports=n}])});
\ No newline at end of file
diff --git a/uni_modules/sp-editor/static/quill.min.js b/uni_modules/sp-editor/static/quill.min.js
new file mode 100644
index 0000000..d9f46b8
--- /dev/null
+++ b/uni_modules/sp-editor/static/quill.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Quill Editor v1.3.7
+ * https://quilljs.com/
+ * Copyright (c) 2014, Jason Chen
+ * Copyright (c) 2013, salesforce.com
+ */
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Quill=e():t.Quill=e()}("undefined"!=typeof self?self:this,function(){return function(t){function e(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,e),o.l=!0,o.exports}var n={};return e.m=t,e.c=n,e.d=function(t,n,r){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:r})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=45)}([function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(17),o=n(18),i=n(19),l=n(48),a=n(49),s=n(50),u=n(51),c=n(52),f=n(11),h=n(29),p=n(30),d=n(28),y=n(1),v={Scope:y.Scope,create:y.create,find:y.find,query:y.query,register:y.register,Container:r.default,Format:o.default,Leaf:i.default,Embed:u.default,Scroll:l.default,Block:s.default,Inline:a.default,Text:c.default,Attributor:{Attribute:f.default,Class:h.default,Style:p.default,Store:d.default}};e.default=v},function(t,e,n){"use strict";function r(t,e){var n=i(t);if(null==n)throw new s("Unable to create "+t+" blot");var r=n;return new r(t instanceof Node||t.nodeType===Node.TEXT_NODE?t:r.create(e),e)}function o(t,n){return void 0===n&&(n=!1),null==t?null:null!=t[e.DATA_KEY]?t[e.DATA_KEY].blot:n?o(t.parentNode,n):null}function i(t,e){void 0===e&&(e=p.ANY);var n;if("string"==typeof t)n=h[t]||u[t];else if(t instanceof Text||t.nodeType===Node.TEXT_NODE)n=h.text;else if("number"==typeof t)t&p.LEVEL&p.BLOCK?n=h.block:t&p.LEVEL&p.INLINE&&(n=h.inline);else if(t instanceof HTMLElement){var r=(t.getAttribute("class")||"").split(/\s+/);for(var o in r)if(n=c[r[o]])break;n=n||f[t.tagName]}return null==n?null:e&p.LEVEL&n.scope&&e&p.TYPE&n.scope?n:null}function l(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];if(t.length>1)return t.map(function(t){return l(t)});var n=t[0];if("string"!=typeof n.blotName&&"string"!=typeof n.attrName)throw new s("Invalid definition");if("abstract"===n.blotName)throw new s("Cannot register abstract class");if(h[n.blotName||n.attrName]=n,"string"==typeof n.keyName)u[n.keyName]=n;else if(null!=n.className&&(c[n.className]=n),null!=n.tagName){Array.isArray(n.tagName)?n.tagName=n.tagName.map(function(t){return t.toUpperCase()}):n.tagName=n.tagName.toUpperCase();var r=Array.isArray(n.tagName)?n.tagName:[n.tagName];r.forEach(function(t){null!=f[t]&&null!=n.className||(f[t]=n)})}return n}var a=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var s=function(t){function e(e){var n=this;return e="[Parchment] "+e,n=t.call(this,e)||this,n.message=e,n.name=n.constructor.name,n}return a(e,t),e}(Error);e.ParchmentError=s;var u={},c={},f={},h={};e.DATA_KEY="__blot";var p;!function(t){t[t.TYPE=3]="TYPE",t[t.LEVEL=12]="LEVEL",t[t.ATTRIBUTE=13]="ATTRIBUTE",t[t.BLOT=14]="BLOT",t[t.INLINE=7]="INLINE",t[t.BLOCK=11]="BLOCK",t[t.BLOCK_BLOT=10]="BLOCK_BLOT",t[t.INLINE_BLOT=6]="INLINE_BLOT",t[t.BLOCK_ATTRIBUTE=9]="BLOCK_ATTRIBUTE",t[t.INLINE_ATTRIBUTE=5]="INLINE_ATTRIBUTE",t[t.ANY=15]="ANY"}(p=e.Scope||(e.Scope={})),e.create=r,e.find=o,e.query=i,e.register=l},function(t,e){"use strict";var n=Object.prototype.hasOwnProperty,r=Object.prototype.toString,o=Object.defineProperty,i=Object.getOwnPropertyDescriptor,l=function(t){return"function"==typeof Array.isArray?Array.isArray(t):"[object Array]"===r.call(t)},a=function(t){if(!t||"[object Object]"!==r.call(t))return!1;var e=n.call(t,"constructor"),o=t.constructor&&t.constructor.prototype&&n.call(t.constructor.prototype,"isPrototypeOf");if(t.constructor&&!e&&!o)return!1;var i;for(i in t);return void 0===i||n.call(t,i)},s=function(t,e){o&&"__proto__"===e.name?o(t,e.name,{enumerable:!0,configurable:!0,value:e.newValue,writable:!0}):t[e.name]=e.newValue},u=function(t,e){if("__proto__"===e){if(!n.call(t,e))return;if(i)return i(t,e).value}return t[e]};t.exports=function t(){var e,n,r,o,i,c,f=arguments[0],h=1,p=arguments.length,d=!1;for("boolean"==typeof f&&(d=f,f=arguments[1]||{},h=2),(null==f||"object"!=typeof f&&"function"!=typeof f)&&(f={});h<p;++h)if(null!=(e=arguments[h]))for(n in e)r=u(f,n),o=u(e,n),f!==o&&(d&&o&&(a(o)||(i=l(o)))?(i?(i=!1,c=r&&l(r)?r:[]):c=r&&a(r)?r:{},s(f,{name:n,newValue:t(d,c,o)})):void 0!==o&&s(f,{name:n,newValue:o}));return f}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function a(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return null==t?e:("function"==typeof t.formats&&(e=(0,f.default)(e,t.formats())),null==t.parent||"scroll"==t.parent.blotName||t.parent.statics.scope!==t.statics.scope?e:a(t.parent,e))}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.BlockEmbed=e.bubbleFormats=void 0;var s=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),u=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},c=n(2),f=r(c),h=n(4),p=r(h),d=n(0),y=r(d),v=n(14),b=r(v),g=n(5),m=r(g),_=n(8),O=r(_),w=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),s(e,[{key:"attach",value:function(){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"attach",this).call(this),this.attributes=new y.default.Attributor.Store(this.domNode)}},{key:"delta",value:function(){return(new p.default).insert(this.value(),(0,f.default)(this.formats(),this.attributes.values()))}},{key:"format",value:function(t,e){var n=y.default.query(t,y.default.Scope.BLOCK_ATTRIBUTE);null!=n&&this.attributes.attribute(n,e)}},{key:"formatAt",value:function(t,e,n,r){this.format(n,r)}},{key:"insertAt",value:function(t,n,r){if("string"==typeof n&&n.endsWith("\n")){var o=y.default.create(x.blotName);this.parent.insertBefore(o,0===t?this:this.next),o.insertAt(0,n.slice(0,-1))}else u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertAt",this).call(this,t,n,r)}}]),e}(y.default.Embed);w.scope=y.default.Scope.BLOCK_BLOT;var x=function(t){function e(t){o(this,e);var n=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return n.cache={},n}return l(e,t),s(e,[{key:"delta",value:function(){return null==this.cache.delta&&(this.cache.delta=this.descendants(y.default.Leaf).reduce(function(t,e){return 0===e.length()?t:t.insert(e.value(),a(e))},new p.default).insert("\n",a(this))),this.cache.delta}},{key:"deleteAt",value:function(t,n){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"deleteAt",this).call(this,t,n),this.cache={}}},{key:"formatAt",value:function(t,n,r,o){n<=0||(y.default.query(r,y.default.Scope.BLOCK)?t+n===this.length()&&this.format(r,o):u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"formatAt",this).call(this,t,Math.min(n,this.length()-t-1),r,o),this.cache={})}},{key:"insertAt",value:function(t,n,r){if(null!=r)return u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertAt",this).call(this,t,n,r);if(0!==n.length){var o=n.split("\n"),i=o.shift();i.length>0&&(t<this.length()-1||null==this.children.tail?u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertAt",this).call(this,Math.min(t,this.length()-1),i):this.children.tail.insertAt(this.children.tail.length(),i),this.cache={});var l=this;o.reduce(function(t,e){return l=l.split(t,!0),l.insertAt(0,e),e.length},t+i.length)}}},{key:"insertBefore",value:function(t,n){var r=this.children.head;u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertBefore",this).call(this,t,n),r instanceof b.default&&r.remove(),this.cache={}}},{key:"length",value:function(){return null==this.cache.length&&(this.cache.length=u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"length",this).call(this)+1),this.cache.length}},{key:"moveChildren",value:function(t,n){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"moveChildren",this).call(this,t,n),this.cache={}}},{key:"optimize",value:function(t){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t),this.cache={}}},{key:"path",value:function(t){return u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"path",this).call(this,t,!0)}},{key:"removeChild",value:function(t){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"removeChild",this).call(this,t),this.cache={}}},{key:"split",value:function(t){var n=arguments.length>1&&void 0!==arguments[1]&&arguments[1];if(n&&(0===t||t>=this.length()-1)){var r=this.clone();return 0===t?(this.parent.insertBefore(r,this),this):(this.parent.insertBefore(r,this.next),r)}var o=u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"split",this).call(this,t,n);return this.cache={},o}}]),e}(y.default.Block);x.blotName="block",x.tagName="P",x.defaultChild="break",x.allowedChildren=[m.default,y.default.Embed,O.default],e.bubbleFormats=a,e.BlockEmbed=w,e.default=x},function(t,e,n){var r=n(54),o=n(12),i=n(2),l=n(20),a=String.fromCharCode(0),s=function(t){Array.isArray(t)?this.ops=t:null!=t&&Array.isArray(t.ops)?this.ops=t.ops:this.ops=[]};s.prototype.insert=function(t,e){var n={};return 0===t.length?this:(n.insert=t,null!=e&&"object"==typeof e&&Object.keys(e).length>0&&(n.attributes=e),this.push(n))},s.prototype.delete=function(t){return t<=0?this:this.push({delete:t})},s.prototype.retain=function(t,e){if(t<=0)return this;var n={retain:t};return null!=e&&"object"==typeof e&&Object.keys(e).length>0&&(n.attributes=e),this.push(n)},s.prototype.push=function(t){var e=this.ops.length,n=this.ops[e-1];if(t=i(!0,{},t),"object"==typeof n){if("number"==typeof t.delete&&"number"==typeof n.delete)return this.ops[e-1]={delete:n.delete+t.delete},this;if("number"==typeof n.delete&&null!=t.insert&&(e-=1,"object"!=typeof(n=this.ops[e-1])))return this.ops.unshift(t),this;if(o(t.attributes,n.attributes)){if("string"==typeof t.insert&&"string"==typeof n.insert)return this.ops[e-1]={insert:n.insert+t.insert},"object"==typeof t.attributes&&(this.ops[e-1].attributes=t.attributes),this;if("number"==typeof t.retain&&"number"==typeof n.retain)return this.ops[e-1]={retain:n.retain+t.retain},"object"==typeof t.attributes&&(this.ops[e-1].attributes=t.attributes),this}}return e===this.ops.length?this.ops.push(t):this.ops.splice(e,0,t),this},s.prototype.chop=function(){var t=this.ops[this.ops.length-1];return t&&t.retain&&!t.attributes&&this.ops.pop(),this},s.prototype.filter=function(t){return this.ops.filter(t)},s.prototype.forEach=function(t){this.ops.forEach(t)},s.prototype.map=function(t){return this.ops.map(t)},s.prototype.partition=function(t){var e=[],n=[];return this.forEach(function(r){(t(r)?e:n).push(r)}),[e,n]},s.prototype.reduce=function(t,e){return this.ops.reduce(t,e)},s.prototype.changeLength=function(){return this.reduce(function(t,e){return e.insert?t+l.length(e):e.delete?t-e.delete:t},0)},s.prototype.length=function(){return this.reduce(function(t,e){return t+l.length(e)},0)},s.prototype.slice=function(t,e){t=t||0,"number"!=typeof e&&(e=1/0);for(var n=[],r=l.iterator(this.ops),o=0;o<e&&r.hasNext();){var i;o<t?i=r.next(t-o):(i=r.next(e-o),n.push(i)),o+=l.length(i)}return new s(n)},s.prototype.compose=function(t){var e=l.iterator(this.ops),n=l.iterator(t.ops),r=[],i=n.peek();if(null!=i&&"number"==typeof i.retain&&null==i.attributes){for(var a=i.retain;"insert"===e.peekType()&&e.peekLength()<=a;)a-=e.peekLength(),r.push(e.next());i.retain-a>0&&n.next(i.retain-a)}for(var u=new s(r);e.hasNext()||n.hasNext();)if("insert"===n.peekType())u.push(n.next());else if("delete"===e.peekType())u.push(e.next());else{var c=Math.min(e.peekLength(),n.peekLength()),f=e.next(c),h=n.next(c);if("number"==typeof h.retain){var p={};"number"==typeof f.retain?p.retain=c:p.insert=f.insert;var d=l.attributes.compose(f.attributes,h.attributes,"number"==typeof f.retain);if(d&&(p.attributes=d),u.push(p),!n.hasNext()&&o(u.ops[u.ops.length-1],p)){var y=new s(e.rest());return u.concat(y).chop()}}else"number"==typeof h.delete&&"number"==typeof f.retain&&u.push(h)}return u.chop()},s.prototype.concat=function(t){var e=new s(this.ops.slice());return t.ops.length>0&&(e.push(t.ops[0]),e.ops=e.ops.concat(t.ops.slice(1))),e},s.prototype.diff=function(t,e){if(this.ops===t.ops)return new s;var n=[this,t].map(function(e){return e.map(function(n){if(null!=n.insert)return"string"==typeof n.insert?n.insert:a;var r=e===t?"on":"with";throw new Error("diff() called "+r+" non-document")}).join("")}),i=new s,u=r(n[0],n[1],e),c=l.iterator(this.ops),f=l.iterator(t.ops);return u.forEach(function(t){for(var e=t[1].length;e>0;){var n=0;switch(t[0]){case r.INSERT:n=Math.min(f.peekLength(),e),i.push(f.next(n));break;case r.DELETE:n=Math.min(e,c.peekLength()),c.next(n),i.delete(n);break;case r.EQUAL:n=Math.min(c.peekLength(),f.peekLength(),e);var a=c.next(n),s=f.next(n);o(a.insert,s.insert)?i.retain(n,l.attributes.diff(a.attributes,s.attributes)):i.push(s).delete(n)}e-=n}}),i.chop()},s.prototype.eachLine=function(t,e){e=e||"\n";for(var n=l.iterator(this.ops),r=new s,o=0;n.hasNext();){if("insert"!==n.peekType())return;var i=n.peek(),a=l.length(i)-n.peekLength(),u="string"==typeof i.insert?i.insert.indexOf(e,a)-a:-1;if(u<0)r.push(n.next());else if(u>0)r.push(n.next(u));else{if(!1===t(r,n.next(1).attributes||{},o))return;o+=1,r=new s}}r.length()>0&&t(r,{},o)},s.prototype.transform=function(t,e){if(e=!!e,"number"==typeof t)return this.transformPosition(t,e);for(var n=l.iterator(this.ops),r=l.iterator(t.ops),o=new s;n.hasNext()||r.hasNext();)if("insert"!==n.peekType()||!e&&"insert"===r.peekType())if("insert"===r.peekType())o.push(r.next());else{var i=Math.min(n.peekLength(),r.peekLength()),a=n.next(i),u=r.next(i);if(a.delete)continue;u.delete?o.push(u):o.retain(i,l.attributes.transform(a.attributes,u.attributes,e))}else o.retain(l.length(n.next()));return o.chop()},s.prototype.transformPosition=function(t,e){e=!!e;for(var n=l.iterator(this.ops),r=0;n.hasNext()&&r<=t;){var o=n.peekLength(),i=n.peekType();n.next(),"delete"!==i?("insert"===i&&(r<t||!e)&&(t+=o),r+=o):t-=Math.min(o,t-r)}return t},t.exports=s},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(8),c=r(u),f=n(0),h=r(f),p=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),a(e,[{key:"formatAt",value:function(t,n,r,o){if(e.compare(this.statics.blotName,r)<0&&h.default.query(r,h.default.Scope.BLOT)){var i=this.isolate(t,n);o&&i.wrap(r,o)}else s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"formatAt",this).call(this,t,n,r,o)}},{key:"optimize",value:function(t){if(s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t),this.parent instanceof e&&e.compare(this.statics.blotName,this.parent.statics.blotName)>0){var n=this.parent.isolate(this.offset(),this.length());this.moveChildren(n),n.wrap(this)}}}],[{key:"compare",value:function(t,n){var r=e.order.indexOf(t),o=e.order.indexOf(n);return r>=0||o>=0?r-o:t===n?0:t<n?-1:1}}]),e}(h.default.Inline);p.allowedChildren=[p,h.default.Embed,c.default],p.order=["cursor","inline","underline","strike","italic","bold","script","link","code"],e.default=p},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){if(e=(0,N.default)(!0,{container:t,modules:{clipboard:!0,keyboard:!0,history:!0}},e),e.theme&&e.theme!==S.DEFAULTS.theme){if(e.theme=S.import("themes/"+e.theme),null==e.theme)throw new Error("Invalid theme "+e.theme+". Did you register it?")}else e.theme=T.default;var n=(0,N.default)(!0,{},e.theme.DEFAULTS);[n,e].forEach(function(t){t.modules=t.modules||{},Object.keys(t.modules).forEach(function(e){!0===t.modules[e]&&(t.modules[e]={})})});var r=Object.keys(n.modules).concat(Object.keys(e.modules)),o=r.reduce(function(t,e){var n=S.import("modules/"+e);return null==n?P.error("Cannot load "+e+" module. Are you sure you registered it?"):t[e]=n.DEFAULTS||{},t},{});return null!=e.modules&&e.modules.toolbar&&e.modules.toolbar.constructor!==Object&&(e.modules.toolbar={container:e.modules.toolbar}),e=(0,N.default)(!0,{},S.DEFAULTS,{modules:o},n,e),["bounds","container","scrollingContainer"].forEach(function(t){"string"==typeof e[t]&&(e[t]=document.querySelector(e[t]))}),e.modules=Object.keys(e.modules).reduce(function(t,n){return e.modules[n]&&(t[n]=e.modules[n]),t},{}),e}function a(t,e,n,r){if(this.options.strict&&!this.isEnabled()&&e===g.default.sources.USER)return new d.default;var o=null==n?null:this.getSelection(),i=this.editor.delta,l=t();if(null!=o&&(!0===n&&(n=o.index),null==r?o=u(o,l,e):0!==r&&(o=u(o,n,r,e)),this.setSelection(o,g.default.sources.SILENT)),l.length()>0){var a,s=[g.default.events.TEXT_CHANGE,l,i,e];if((a=this.emitter).emit.apply(a,[g.default.events.EDITOR_CHANGE].concat(s)),e!==g.default.sources.SILENT){var c;(c=this.emitter).emit.apply(c,s)}}return l}function s(t,e,n,r,o){var i={};return"number"==typeof t.index&&"number"==typeof t.length?"number"!=typeof e?(o=r,r=n,n=e,e=t.length,t=t.index):(e=t.length,t=t.index):"number"!=typeof e&&(o=r,r=n,n=e,e=0),"object"===(void 0===n?"undefined":c(n))?(i=n,o=r):"string"==typeof n&&(null!=r?i[n]=r:o=n),o=o||g.default.sources.API,[t,e,i,o]}function u(t,e,n,r){if(null==t)return null;var o=void 0,i=void 0;if(e instanceof d.default){var l=[t.index,t.index+t.length].map(function(t){return e.transformPosition(t,r!==g.default.sources.USER)}),a=f(l,2);o=a[0],i=a[1]}else{var s=[t.index,t.index+t.length].map(function(t){return t<e||t===e&&r===g.default.sources.USER?t:n>=0?t+n:Math.max(e,t+n)}),u=f(s,2);o=u[0],i=u[1]}return new x.Range(o,i-o)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.overload=e.expandConfig=void 0;var c="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},f=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),h=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}();n(53);var p=n(4),d=r(p),y=n(57),v=r(y),b=n(9),g=r(b),m=n(7),_=r(m),O=n(0),w=r(O),x=n(22),k=r(x),E=n(2),N=r(E),j=n(10),A=r(j),q=n(32),T=r(q),P=(0,A.default)("quill"),S=function(){function t(e){var n=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(i(this,t),this.options=l(e,r),this.container=this.options.container,null==this.container)return P.error("Invalid Quill container",e);this.options.debug&&t.debug(this.options.debug);var o=this.container.innerHTML.trim();this.container.classList.add("ql-container"),this.container.innerHTML="",this.container.__quill=this,this.root=this.addContainer("ql-editor"),this.root.classList.add("ql-blank"),this.root.setAttribute("data-gramm",!1),this.scrollingContainer=this.options.scrollingContainer||this.root,this.emitter=new g.default,this.scroll=w.default.create(this.root,{emitter:this.emitter,whitelist:this.options.formats}),this.editor=new v.default(this.scroll),this.selection=new k.default(this.scroll,this.emitter),this.theme=new this.options.theme(this,this.options),this.keyboard=this.theme.addModule("keyboard"),this.clipboard=this.theme.addModule("clipboard"),this.history=this.theme.addModule("history"),this.theme.init(),this.emitter.on(g.default.events.EDITOR_CHANGE,function(t){t===g.default.events.TEXT_CHANGE&&n.root.classList.toggle("ql-blank",n.editor.isBlank())}),this.emitter.on(g.default.events.SCROLL_UPDATE,function(t,e){var r=n.selection.lastRange,o=r&&0===r.length?r.index:void 0;a.call(n,function(){return n.editor.update(null,e,o)},t)});var s=this.clipboard.convert("<div class='ql-editor' style=\"white-space: normal;\">"+o+"<p><br></p></div>");this.setContents(s),this.history.clear(),this.options.placeholder&&this.root.setAttribute("data-placeholder",this.options.placeholder),this.options.readOnly&&this.disable()}return h(t,null,[{key:"debug",value:function(t){!0===t&&(t="log"),A.default.level(t)}},{key:"find",value:function(t){return t.__quill||w.default.find(t)}},{key:"import",value:function(t){return null==this.imports[t]&&P.error("Cannot import "+t+". Are you sure it was registered?"),this.imports[t]}},{key:"register",value:function(t,e){var n=this,r=arguments.length>2&&void 0!==arguments[2]&&arguments[2];if("string"!=typeof t){var o=t.attrName||t.blotName;"string"==typeof o?this.register("formats/"+o,t,e):Object.keys(t).forEach(function(r){n.register(r,t[r],e)})}else null==this.imports[t]||r||P.warn("Overwriting "+t+" with",e),this.imports[t]=e,(t.startsWith("blots/")||t.startsWith("formats/"))&&"abstract"!==e.blotName?w.default.register(e):t.startsWith("modules")&&"function"==typeof e.register&&e.register()}}]),h(t,[{key:"addContainer",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;if("string"==typeof t){var n=t;t=document.createElement("div"),t.classList.add(n)}return this.container.insertBefore(t,e),t}},{key:"blur",value:function(){this.selection.setRange(null)}},{key:"deleteText",value:function(t,e,n){var r=this,o=s(t,e,n),i=f(o,4);return t=i[0],e=i[1],n=i[3],a.call(this,function(){return r.editor.deleteText(t,e)},n,t,-1*e)}},{key:"disable",value:function(){this.enable(!1)}},{key:"enable",value:function(){var t=!(arguments.length>0&&void 0!==arguments[0])||arguments[0];this.scroll.enable(t),this.container.classList.toggle("ql-disabled",!t)}},{key:"focus",value:function(){var t=this.scrollingContainer.scrollTop;this.selection.focus(),this.scrollingContainer.scrollTop=t,this.scrollIntoView()}},{key:"format",value:function(t,e){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:g.default.sources.API;return a.call(this,function(){var r=n.getSelection(!0),i=new d.default;if(null==r)return i;if(w.default.query(t,w.default.Scope.BLOCK))i=n.editor.formatLine(r.index,r.length,o({},t,e));else{if(0===r.length)return n.selection.format(t,e),i;i=n.editor.formatText(r.index,r.length,o({},t,e))}return n.setSelection(r,g.default.sources.SILENT),i},r)}},{key:"formatLine",value:function(t,e,n,r,o){var i=this,l=void 0,u=s(t,e,n,r,o),c=f(u,4);return t=c[0],e=c[1],l=c[2],o=c[3],a.call(this,function(){return i.editor.formatLine(t,e,l)},o,t,0)}},{key:"formatText",value:function(t,e,n,r,o){var i=this,l=void 0,u=s(t,e,n,r,o),c=f(u,4);return t=c[0],e=c[1],l=c[2],o=c[3],a.call(this,function(){return i.editor.formatText(t,e,l)},o,t,0)}},{key:"getBounds",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=void 0;n="number"==typeof t?this.selection.getBounds(t,e):this.selection.getBounds(t.index,t.length);var r=this.container.getBoundingClientRect();return{bottom:n.bottom-r.top,height:n.height,left:n.left-r.left,right:n.right-r.left,top:n.top-r.top,width:n.width}}},{key:"getContents",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:this.getLength()-t,n=s(t,e),r=f(n,2);return t=r[0],e=r[1],this.editor.getContents(t,e)}},{key:"getFormat",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:this.getSelection(!0),e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;return"number"==typeof t?this.editor.getFormat(t,e):this.editor.getFormat(t.index,t.length)}},{key:"getIndex",value:function(t){return t.offset(this.scroll)}},{key:"getLength",value:function(){return this.scroll.length()}},{key:"getLeaf",value:function(t){return this.scroll.leaf(t)}},{key:"getLine",value:function(t){return this.scroll.line(t)}},{key:"getLines",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Number.MAX_VALUE;return"number"!=typeof t?this.scroll.lines(t.index,t.length):this.scroll.lines(t,e)}},{key:"getModule",value:function(t){return this.theme.modules[t]}},{key:"getSelection",value:function(){return arguments.length>0&&void 0!==arguments[0]&&arguments[0]&&this.focus(),this.update(),this.selection.getRange()[0]}},{key:"getText",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:this.getLength()-t,n=s(t,e),r=f(n,2);return t=r[0],e=r[1],this.editor.getText(t,e)}},{key:"hasFocus",value:function(){return this.selection.hasFocus()}},{key:"insertEmbed",value:function(e,n,r){var o=this,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:t.sources.API;return a.call(this,function(){return o.editor.insertEmbed(e,n,r)},i,e)}},{key:"insertText",value:function(t,e,n,r,o){var i=this,l=void 0,u=s(t,0,n,r,o),c=f(u,4);return t=c[0],l=c[2],o=c[3],a.call(this,function(){return i.editor.insertText(t,e,l)},o,t,e.length)}},{key:"isEnabled",value:function(){return!this.container.classList.contains("ql-disabled")}},{key:"off",value:function(){return this.emitter.off.apply(this.emitter,arguments)}},{key:"on",value:function(){return this.emitter.on.apply(this.emitter,arguments)}},{key:"once",value:function(){return this.emitter.once.apply(this.emitter,arguments)}},{key:"pasteHTML",value:function(t,e,n){this.clipboard.dangerouslyPasteHTML(t,e,n)}},{key:"removeFormat",value:function(t,e,n){var r=this,o=s(t,e,n),i=f(o,4);return t=i[0],e=i[1],n=i[3],a.call(this,function(){return r.editor.removeFormat(t,e)},n,t)}},{key:"scrollIntoView",value:function(){this.selection.scrollIntoView(this.scrollingContainer)}},{key:"setContents",value:function(t){var e=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:g.default.sources.API;return a.call(this,function(){t=new d.default(t);var n=e.getLength(),r=e.editor.deleteText(0,n),o=e.editor.applyDelta(t),i=o.ops[o.ops.length-1];return null!=i&&"string"==typeof i.insert&&"\n"===i.insert[i.insert.length-1]&&(e.editor.deleteText(e.getLength()-1,1),o.delete(1)),r.compose(o)},n)}},{key:"setSelection",value:function(e,n,r){if(null==e)this.selection.setRange(null,n||t.sources.API);else{var o=s(e,n,r),i=f(o,4);e=i[0],n=i[1],r=i[3],this.selection.setRange(new x.Range(e,n),r),r!==g.default.sources.SILENT&&this.selection.scrollIntoView(this.scrollingContainer)}}},{key:"setText",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:g.default.sources.API,n=(new d.default).insert(t);return this.setContents(n,e)}},{key:"update",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:g.default.sources.USER,e=this.scroll.update(t);return this.selection.update(t),e}},{key:"updateContents",value:function(t){var e=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:g.default.sources.API;return a.call(this,function(){return t=new d.default(t),e.editor.applyDelta(t,n)},n,!0)}}]),t}();S.DEFAULTS={bounds:null,formats:null,modules:{},placeholder:"",readOnly:!1,scrollingContainer:null,strict:!0,theme:"default"},S.events=g.default.events,S.sources=g.default.sources,S.version="1.3.7",S.imports={delta:d.default,parchment:w.default,"core/module":_.default,"core/theme":T.default},e.expandConfig=l,e.overload=s,e.default=S},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=function t(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};r(this,t),this.quill=e,this.options=n};o.DEFAULTS={},e.default=o},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=n(0),a=function(t){return t&&t.__esModule?t:{default:t}}(l),s=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),e}(a.default.Text);e.default=s},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(58),c=r(u),f=n(10),h=r(f),p=(0,h.default)("quill:events");["selectionchange","mousedown","mouseup","click"].forEach(function(t){document.addEventListener(t,function(){for(var t=arguments.length,e=Array(t),n=0;n<t;n++)e[n]=arguments[n];[].slice.call(document.querySelectorAll(".ql-container")).forEach(function(t){if(t.__quill&&t.__quill.emitter){var n;(n=t.__quill.emitter).handleDOM.apply(n,e)}})})});var d=function(t){function e(){o(this,e);var t=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this));return t.listeners={},t.on("error",p.error),t}return l(e,t),a(e,[{key:"emit",value:function(){p.log.apply(p,arguments),s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"emit",this).apply(this,arguments)}},{key:"handleDOM",value:function(t){for(var e=arguments.length,n=Array(e>1?e-1:0),r=1;r<e;r++)n[r-1]=arguments[r];(this.listeners[t.type]||[]).forEach(function(e){var r=e.node,o=e.handler;(t.target===r||r.contains(t.target))&&o.apply(void 0,[t].concat(n))})}},{key:"listenDOM",value:function(t,e,n){this.listeners[t]||(this.listeners[t]=[]),this.listeners[t].push({node:e,handler:n})}}]),e}(c.default);d.events={EDITOR_CHANGE:"editor-change",SCROLL_BEFORE_UPDATE:"scroll-before-update",SCROLL_OPTIMIZE:"scroll-optimize",SCROLL_UPDATE:"scroll-update",SELECTION_CHANGE:"selection-change",TEXT_CHANGE:"text-change"},d.sources={API:"api",SILENT:"silent",USER:"user"},e.default=d},function(t,e,n){"use strict";function r(t){if(i.indexOf(t)<=i.indexOf(l)){for(var e,n=arguments.length,r=Array(n>1?n-1:0),o=1;o<n;o++)r[o-1]=arguments[o];(e=console)[t].apply(e,r)}}function o(t){return i.reduce(function(e,n){return e[n]=r.bind(console,n,t),e},{})}Object.defineProperty(e,"__esModule",{value:!0});var i=["error","warn","log","info"],l="warn";r.level=o.level=function(t){l=t},e.default=o},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(1),o=function(){function t(t,e,n){void 0===n&&(n={}),this.attrName=t,this.keyName=e;var o=r.Scope.TYPE&r.Scope.ATTRIBUTE;null!=n.scope?this.scope=n.scope&r.Scope.LEVEL|o:this.scope=r.Scope.ATTRIBUTE,null!=n.whitelist&&(this.whitelist=n.whitelist)}return t.keys=function(t){return[].map.call(t.attributes,function(t){return t.name})},t.prototype.add=function(t,e){return!!this.canAdd(t,e)&&(t.setAttribute(this.keyName,e),!0)},t.prototype.canAdd=function(t,e){return null!=r.query(t,r.Scope.BLOT&(this.scope|r.Scope.TYPE))&&(null==this.whitelist||("string"==typeof e?this.whitelist.indexOf(e.replace(/["']/g,""))>-1:this.whitelist.indexOf(e)>-1))},t.prototype.remove=function(t){t.removeAttribute(this.keyName)},t.prototype.value=function(t){var e=t.getAttribute(this.keyName);return this.canAdd(t,e)&&e?e:""},t}();e.default=o},function(t,e,n){function r(t){return null===t||void 0===t}function o(t){return!(!t||"object"!=typeof t||"number"!=typeof t.length)&&("function"==typeof t.copy&&"function"==typeof t.slice&&!(t.length>0&&"number"!=typeof t[0]))}function i(t,e,n){var i,c;if(r(t)||r(e))return!1;if(t.prototype!==e.prototype)return!1;if(s(t))return!!s(e)&&(t=l.call(t),e=l.call(e),u(t,e,n));if(o(t)){if(!o(e))return!1;if(t.length!==e.length)return!1;for(i=0;i<t.length;i++)if(t[i]!==e[i])return!1;return!0}try{var f=a(t),h=a(e)}catch(t){return!1}if(f.length!=h.length)return!1;for(f.sort(),h.sort(),i=f.length-1;i>=0;i--)if(f[i]!=h[i])return!1;for(i=f.length-1;i>=0;i--)if(c=f[i],!u(t[c],e[c],n))return!1;return typeof t==typeof e}var l=Array.prototype.slice,a=n(55),s=n(56),u=t.exports=function(t,e,n){return n||(n={}),t===e||(t instanceof Date&&e instanceof Date?t.getTime()===e.getTime():!t||!e||"object"!=typeof t&&"object"!=typeof e?n.strict?t===e:t==e:i(t,e,n))}},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Code=void 0;var a=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),s=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),u=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},c=n(4),f=r(c),h=n(0),p=r(h),d=n(3),y=r(d),v=n(5),b=r(v),g=n(8),m=r(g),_=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),e}(b.default);_.blotName="code",_.tagName="CODE";var O=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),s(e,[{key:"delta",value:function(){var t=this,e=this.domNode.textContent;return e.endsWith("\n")&&(e=e.slice(0,-1)),e.split("\n").reduce(function(e,n){return e.insert(n).insert("\n",t.formats())},new f.default)}},{key:"format",value:function(t,n){if(t!==this.statics.blotName||!n){var r=this.descendant(m.default,this.length()-1),o=a(r,1),i=o[0];null!=i&&i.deleteAt(i.length()-1,1),u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n)}}},{key:"formatAt",value:function(t,n,r,o){if(0!==n&&null!=p.default.query(r,p.default.Scope.BLOCK)&&(r!==this.statics.blotName||o!==this.statics.formats(this.domNode))){var i=this.newlineIndex(t);if(!(i<0||i>=t+n)){var l=this.newlineIndex(t,!0)+1,a=i-l+1,s=this.isolate(l,a),u=s.next;s.format(r,o),u instanceof e&&u.formatAt(0,t-l+n-a,r,o)}}}},{key:"insertAt",value:function(t,e,n){if(null==n){var r=this.descendant(m.default,t),o=a(r,2),i=o[0],l=o[1];i.insertAt(l,e)}}},{key:"length",value:function(){var t=this.domNode.textContent.length;return this.domNode.textContent.endsWith("\n")?t:t+1}},{key:"newlineIndex",value:function(t){if(arguments.length>1&&void 0!==arguments[1]&&arguments[1])return this.domNode.textContent.slice(0,t).lastIndexOf("\n");var e=this.domNode.textContent.slice(t).indexOf("\n");return e>-1?t+e:-1}},{key:"optimize",value:function(t){this.domNode.textContent.endsWith("\n")||this.appendChild(p.default.create("text","\n")),u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t);var n=this.next;null!=n&&n.prev===this&&n.statics.blotName===this.statics.blotName&&this.statics.formats(this.domNode)===n.statics.formats(n.domNode)&&(n.optimize(t),n.moveChildren(this),n.remove())}},{key:"replace",value:function(t){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"replace",this).call(this,t),[].slice.call(this.domNode.querySelectorAll("*")).forEach(function(t){var e=p.default.find(t);null==e?t.parentNode.removeChild(t):e instanceof p.default.Embed?e.remove():e.unwrap()})}}],[{key:"create",value:function(t){var n=u(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t);return n.setAttribute("spellcheck",!1),n}},{key:"formats",value:function(){return!0}}]),e}(y.default);O.blotName="code-block",O.tagName="PRE",O.TAB="  ",e.Code=_,e.default=O},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(0),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"insertInto",value:function(t,n){0===t.children.length?a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertInto",this).call(this,t,n):this.remove()}},{key:"length",value:function(){return 0}},{key:"value",value:function(){return""}}],[{key:"value",value:function(){}}]),e}(u.default.Embed);c.blotName="break",c.tagName="BR",e.default=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function l(t,e){var n=document.createElement("a");n.href=t;var r=n.href.slice(0,n.href.indexOf(":"));return e.indexOf(r)>-1}Object.defineProperty(e,"__esModule",{value:!0}),e.sanitize=e.default=void 0;var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(5),c=function(t){return t&&t.__esModule?t:{default:t}}(u),f=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),a(e,[{key:"format",value:function(t,n){if(t!==this.statics.blotName||!n)return s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n);n=this.constructor.sanitize(n),this.domNode.setAttribute("href",n)}}],[{key:"create",value:function(t){var n=s(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t);return t=this.sanitize(t),n.setAttribute("href",t),n.setAttribute("rel","noopener noreferrer"),n.setAttribute("target","_blank"),n}},{key:"formats",value:function(t){return t.getAttribute("href")}},{key:"sanitize",value:function(t){return l(t,this.PROTOCOL_WHITELIST)?t:this.SANITIZED_URL}}]),e}(c.default);f.blotName="link",f.tagName="A",f.SANITIZED_URL="about:blank",f.PROTOCOL_WHITELIST=["http","https","mailto","tel"],e.default=f,e.sanitize=l},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){t.setAttribute(e,!("true"===t.getAttribute(e)))}Object.defineProperty(e,"__esModule",{value:!0});var l="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=n(25),u=r(s),c=n(106),f=r(c),h=0,p=function(){function t(e){var n=this;o(this,t),this.select=e,this.container=document.createElement("span"),this.buildPicker(),this.select.style.display="none",this.select.parentNode.insertBefore(this.container,this.select),this.label.addEventListener("mousedown",function(){n.togglePicker()}),this.label.addEventListener("keydown",function(t){switch(t.keyCode){case u.default.keys.ENTER:n.togglePicker();break;case u.default.keys.ESCAPE:n.escape(),t.preventDefault()}}),this.select.addEventListener("change",this.update.bind(this))}return a(t,[{key:"togglePicker",value:function(){this.container.classList.toggle("ql-expanded"),i(this.label,"aria-expanded"),i(this.options,"aria-hidden")}},{key:"buildItem",value:function(t){var e=this,n=document.createElement("span");return n.tabIndex="0",n.setAttribute("role","button"),n.classList.add("ql-picker-item"),t.hasAttribute("value")&&n.setAttribute("data-value",t.getAttribute("value")),t.textContent&&n.setAttribute("data-label",t.textContent),n.addEventListener("click",function(){e.selectItem(n,!0)}),n.addEventListener("keydown",function(t){switch(t.keyCode){case u.default.keys.ENTER:e.selectItem(n,!0),t.preventDefault();break;case u.default.keys.ESCAPE:e.escape(),t.preventDefault()}}),n}},{key:"buildLabel",value:function(){var t=document.createElement("span");return t.classList.add("ql-picker-label"),t.innerHTML=f.default,t.tabIndex="0",t.setAttribute("role","button"),t.setAttribute("aria-expanded","false"),this.container.appendChild(t),t}},{key:"buildOptions",value:function(){var t=this,e=document.createElement("span");e.classList.add("ql-picker-options"),e.setAttribute("aria-hidden","true"),e.tabIndex="-1",e.id="ql-picker-options-"+h,h+=1,this.label.setAttribute("aria-controls",e.id),this.options=e,[].slice.call(this.select.options).forEach(function(n){var r=t.buildItem(n);e.appendChild(r),!0===n.selected&&t.selectItem(r)}),this.container.appendChild(e)}},{key:"buildPicker",value:function(){var t=this;[].slice.call(this.select.attributes).forEach(function(e){t.container.setAttribute(e.name,e.value)}),this.container.classList.add("ql-picker"),this.label=this.buildLabel(),this.buildOptions()}},{key:"escape",value:function(){var t=this;this.close(),setTimeout(function(){return t.label.focus()},1)}},{key:"close",value:function(){this.container.classList.remove("ql-expanded"),this.label.setAttribute("aria-expanded","false"),this.options.setAttribute("aria-hidden","true")}},{key:"selectItem",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=this.container.querySelector(".ql-selected");if(t!==n&&(null!=n&&n.classList.remove("ql-selected"),null!=t&&(t.classList.add("ql-selected"),this.select.selectedIndex=[].indexOf.call(t.parentNode.children,t),t.hasAttribute("data-value")?this.label.setAttribute("data-value",t.getAttribute("data-value")):this.label.removeAttribute("data-value"),t.hasAttribute("data-label")?this.label.setAttribute("data-label",t.getAttribute("data-label")):this.label.removeAttribute("data-label"),e))){if("function"==typeof Event)this.select.dispatchEvent(new Event("change"));else if("object"===("undefined"==typeof Event?"undefined":l(Event))){var r=document.createEvent("Event");r.initEvent("change",!0,!0),this.select.dispatchEvent(r)}this.close()}}},{key:"update",value:function(){var t=void 0;if(this.select.selectedIndex>-1){var e=this.container.querySelector(".ql-picker-options").children[this.select.selectedIndex];t=this.select.options[this.select.selectedIndex],this.selectItem(e)}else this.selectItem(null);var n=null!=t&&t!==this.select.querySelector("option[selected]");this.label.classList.toggle("ql-active",n)}}]),t}();e.default=p},function(t,e,n){"use strict";function r(t){var e=a.find(t);if(null==e)try{e=a.create(t)}catch(n){e=a.create(a.Scope.INLINE),[].slice.call(t.childNodes).forEach(function(t){e.domNode.appendChild(t)}),t.parentNode&&t.parentNode.replaceChild(e.domNode,t),e.attach()}return e}var o=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var i=n(47),l=n(27),a=n(1),s=function(t){function e(e){var n=t.call(this,e)||this;return n.build(),n}return o(e,t),e.prototype.appendChild=function(t){this.insertBefore(t)},e.prototype.attach=function(){t.prototype.attach.call(this),this.children.forEach(function(t){t.attach()})},e.prototype.build=function(){var t=this;this.children=new i.default,[].slice.call(this.domNode.childNodes).reverse().forEach(function(e){try{var n=r(e);t.insertBefore(n,t.children.head||void 0)}catch(t){if(t instanceof a.ParchmentError)return;throw t}})},e.prototype.deleteAt=function(t,e){if(0===t&&e===this.length())return this.remove();this.children.forEachAt(t,e,function(t,e,n){t.deleteAt(e,n)})},e.prototype.descendant=function(t,n){var r=this.children.find(n),o=r[0],i=r[1];return null==t.blotName&&t(o)||null!=t.blotName&&o instanceof t?[o,i]:o instanceof e?o.descendant(t,i):[null,-1]},e.prototype.descendants=function(t,n,r){void 0===n&&(n=0),void 0===r&&(r=Number.MAX_VALUE);var o=[],i=r;return this.children.forEachAt(n,r,function(n,r,l){(null==t.blotName&&t(n)||null!=t.blotName&&n instanceof t)&&o.push(n),n instanceof e&&(o=o.concat(n.descendants(t,r,i))),i-=l}),o},e.prototype.detach=function(){this.children.forEach(function(t){t.detach()}),t.prototype.detach.call(this)},e.prototype.formatAt=function(t,e,n,r){this.children.forEachAt(t,e,function(t,e,o){t.formatAt(e,o,n,r)})},e.prototype.insertAt=function(t,e,n){var r=this.children.find(t),o=r[0],i=r[1];if(o)o.insertAt(i,e,n);else{var l=null==n?a.create("text",e):a.create(e,n);this.appendChild(l)}},e.prototype.insertBefore=function(t,e){if(null!=this.statics.allowedChildren&&!this.statics.allowedChildren.some(function(e){return t instanceof e}))throw new a.ParchmentError("Cannot insert "+t.statics.blotName+" into "+this.statics.blotName);t.insertInto(this,e)},e.prototype.length=function(){return this.children.reduce(function(t,e){return t+e.length()},0)},e.prototype.moveChildren=function(t,e){this.children.forEach(function(n){t.insertBefore(n,e)})},e.prototype.optimize=function(e){if(t.prototype.optimize.call(this,e),0===this.children.length)if(null!=this.statics.defaultChild){var n=a.create(this.statics.defaultChild);this.appendChild(n),n.optimize(e)}else this.remove()},e.prototype.path=function(t,n){void 0===n&&(n=!1);var r=this.children.find(t,n),o=r[0],i=r[1],l=[[this,t]];return o instanceof e?l.concat(o.path(i,n)):(null!=o&&l.push([o,i]),l)},e.prototype.removeChild=function(t){this.children.remove(t)},e.prototype.replace=function(n){n instanceof e&&n.moveChildren(this),t.prototype.replace.call(this,n)},e.prototype.split=function(t,e){if(void 0===e&&(e=!1),!e){if(0===t)return this;if(t===this.length())return this.next}var n=this.clone();return this.parent.insertBefore(n,this.next),this.children.forEachAt(t,this.length(),function(t,r,o){t=t.split(r,e),n.appendChild(t)}),n},e.prototype.unwrap=function(){this.moveChildren(this.parent,this.next),this.remove()},e.prototype.update=function(t,e){var n=this,o=[],i=[];t.forEach(function(t){t.target===n.domNode&&"childList"===t.type&&(o.push.apply(o,t.addedNodes),i.push.apply(i,t.removedNodes))}),i.forEach(function(t){if(!(null!=t.parentNode&&"IFRAME"!==t.tagName&&document.body.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_CONTAINED_BY)){var e=a.find(t);null!=e&&(null!=e.domNode.parentNode&&e.domNode.parentNode!==n.domNode||e.detach())}}),o.filter(function(t){return t.parentNode==n.domNode}).sort(function(t,e){return t===e?0:t.compareDocumentPosition(e)&Node.DOCUMENT_POSITION_FOLLOWING?1:-1}).forEach(function(t){var e=null;null!=t.nextSibling&&(e=a.find(t.nextSibling));var o=r(t);o.next==e&&null!=o.next||(null!=o.parent&&o.parent.removeChild(n),n.insertBefore(o,e||void 0))})},e}(l.default);e.default=s},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(11),i=n(28),l=n(17),a=n(1),s=function(t){function e(e){var n=t.call(this,e)||this;return n.attributes=new i.default(n.domNode),n}return r(e,t),e.formats=function(t){return"string"==typeof this.tagName||(Array.isArray(this.tagName)?t.tagName.toLowerCase():void 0)},e.prototype.format=function(t,e){var n=a.query(t);n instanceof o.default?this.attributes.attribute(n,e):e&&(null==n||t===this.statics.blotName&&this.formats()[t]===e||this.replaceWith(t,e))},e.prototype.formats=function(){var t=this.attributes.values(),e=this.statics.formats(this.domNode);return null!=e&&(t[this.statics.blotName]=e),t},e.prototype.replaceWith=function(e,n){var r=t.prototype.replaceWith.call(this,e,n);return this.attributes.copy(r),r},e.prototype.update=function(e,n){var r=this;t.prototype.update.call(this,e,n),e.some(function(t){return t.target===r.domNode&&"attributes"===t.type})&&this.attributes.build()},e.prototype.wrap=function(n,r){var o=t.prototype.wrap.call(this,n,r);return o instanceof e&&o.statics.scope===this.statics.scope&&this.attributes.move(o),o},e}(l.default);e.default=s},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(27),i=n(1),l=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return r(e,t),e.value=function(t){return!0},e.prototype.index=function(t,e){return this.domNode===t||this.domNode.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_CONTAINED_BY?Math.min(e,1):-1},e.prototype.position=function(t,e){var n=[].indexOf.call(this.parent.domNode.childNodes,this.domNode);return t>0&&(n+=1),[this.parent.domNode,n]},e.prototype.value=function(){var t;return t={},t[this.statics.blotName]=this.statics.value(this.domNode)||!0,t},e.scope=i.Scope.INLINE_BLOT,e}(o.default);e.default=l},function(t,e,n){function r(t){this.ops=t,this.index=0,this.offset=0}var o=n(12),i=n(2),l={attributes:{compose:function(t,e,n){"object"!=typeof t&&(t={}),"object"!=typeof e&&(e={});var r=i(!0,{},e);n||(r=Object.keys(r).reduce(function(t,e){return null!=r[e]&&(t[e]=r[e]),t},{}));for(var o in t)void 0!==t[o]&&void 0===e[o]&&(r[o]=t[o]);return Object.keys(r).length>0?r:void 0},diff:function(t,e){"object"!=typeof t&&(t={}),"object"!=typeof e&&(e={});var n=Object.keys(t).concat(Object.keys(e)).reduce(function(n,r){return o(t[r],e[r])||(n[r]=void 0===e[r]?null:e[r]),n},{});return Object.keys(n).length>0?n:void 0},transform:function(t,e,n){if("object"!=typeof t)return e;if("object"==typeof e){if(!n)return e;var r=Object.keys(e).reduce(function(n,r){return void 0===t[r]&&(n[r]=e[r]),n},{});return Object.keys(r).length>0?r:void 0}}},iterator:function(t){return new r(t)},length:function(t){return"number"==typeof t.delete?t.delete:"number"==typeof t.retain?t.retain:"string"==typeof t.insert?t.insert.length:1}};r.prototype.hasNext=function(){return this.peekLength()<1/0},r.prototype.next=function(t){t||(t=1/0);var e=this.ops[this.index];if(e){var n=this.offset,r=l.length(e);if(t>=r-n?(t=r-n,this.index+=1,this.offset=0):this.offset+=t,"number"==typeof e.delete)return{delete:t};var o={};return e.attributes&&(o.attributes=e.attributes),"number"==typeof e.retain?o.retain=t:"string"==typeof e.insert?o.insert=e.insert.substr(n,t):o.insert=e.insert,o}return{retain:1/0}},r.prototype.peek=function(){return this.ops[this.index]},r.prototype.peekLength=function(){return this.ops[this.index]?l.length(this.ops[this.index])-this.offset:1/0},r.prototype.peekType=function(){return this.ops[this.index]?"number"==typeof this.ops[this.index].delete?"delete":"number"==typeof this.ops[this.index].retain?"retain":"insert":"retain"},r.prototype.rest=function(){if(this.hasNext()){if(0===this.offset)return this.ops.slice(this.index);var t=this.offset,e=this.index,n=this.next(),r=this.ops.slice(this.index);return this.offset=t,this.index=e,[n].concat(r)}return[]},t.exports=l},function(t,e){var n=function(){"use strict";function t(t,e){return null!=e&&t instanceof e}function e(n,r,o,i,c){function f(n,o){if(null===n)return null;if(0===o)return n;var y,v;if("object"!=typeof n)return n;if(t(n,a))y=new a;else if(t(n,s))y=new s;else if(t(n,u))y=new u(function(t,e){n.then(function(e){t(f(e,o-1))},function(t){e(f(t,o-1))})});else if(e.__isArray(n))y=[];else if(e.__isRegExp(n))y=new RegExp(n.source,l(n)),n.lastIndex&&(y.lastIndex=n.lastIndex);else if(e.__isDate(n))y=new Date(n.getTime());else{if(d&&Buffer.isBuffer(n))return y=Buffer.allocUnsafe?Buffer.allocUnsafe(n.length):new Buffer(n.length),n.copy(y),y;t(n,Error)?y=Object.create(n):void 0===i?(v=Object.getPrototypeOf(n),y=Object.create(v)):(y=Object.create(i),v=i)}if(r){var b=h.indexOf(n);if(-1!=b)return p[b];h.push(n),p.push(y)}t(n,a)&&n.forEach(function(t,e){var n=f(e,o-1),r=f(t,o-1);y.set(n,r)}),t(n,s)&&n.forEach(function(t){var e=f(t,o-1);y.add(e)});for(var g in n){var m;v&&(m=Object.getOwnPropertyDescriptor(v,g)),m&&null==m.set||(y[g]=f(n[g],o-1))}if(Object.getOwnPropertySymbols)for(var _=Object.getOwnPropertySymbols(n),g=0;g<_.length;g++){var O=_[g],w=Object.getOwnPropertyDescriptor(n,O);(!w||w.enumerable||c)&&(y[O]=f(n[O],o-1),w.enumerable||Object.defineProperty(y,O,{enumerable:!1}))}if(c)for(var x=Object.getOwnPropertyNames(n),g=0;g<x.length;g++){var k=x[g],w=Object.getOwnPropertyDescriptor(n,k);w&&w.enumerable||(y[k]=f(n[k],o-1),Object.defineProperty(y,k,{enumerable:!1}))}return y}"object"==typeof r&&(o=r.depth,i=r.prototype,c=r.includeNonEnumerable,r=r.circular);var h=[],p=[],d="undefined"!=typeof Buffer;return void 0===r&&(r=!0),void 0===o&&(o=1/0),f(n,o)}function n(t){return Object.prototype.toString.call(t)}function r(t){return"object"==typeof t&&"[object Date]"===n(t)}function o(t){return"object"==typeof t&&"[object Array]"===n(t)}function i(t){return"object"==typeof t&&"[object RegExp]"===n(t)}function l(t){var e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),e}var a;try{a=Map}catch(t){a=function(){}}var s;try{s=Set}catch(t){s=function(){}}var u;try{u=Promise}catch(t){u=function(){}}return e.clonePrototype=function(t){if(null===t)return null;var e=function(){};return e.prototype=t,new e},e.__objToStr=n,e.__isDate=r,e.__isArray=o,e.__isRegExp=i,e.__getRegExpFlags=l,e}();"object"==typeof t&&t.exports&&(t.exports=n)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t){if(Array.isArray(t)){for(var e=0,n=Array(t.length);e<t.length;e++)n[e]=t[e];return n}return Array.from(t)}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){try{e.parentNode}catch(t){return!1}return e instanceof Text&&(e=e.parentNode),t.contains(e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.Range=void 0;var a=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),s=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),u=n(0),c=r(u),f=n(21),h=r(f),p=n(12),d=r(p),y=n(9),v=r(y),b=n(10),g=r(b),m=(0,g.default)("quill:selection"),_=function t(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;i(this,t),this.index=e,this.length=n},O=function(){function t(e,n){var r=this;i(this,t),this.emitter=n,this.scroll=e,this.composing=!1,this.mouseDown=!1,this.root=this.scroll.domNode,this.cursor=c.default.create("cursor",this),this.lastRange=this.savedRange=new _(0,0),this.handleComposition(),this.handleDragging(),this.emitter.listenDOM("selectionchange",document,function(){r.mouseDown||setTimeout(r.update.bind(r,v.default.sources.USER),1)}),this.emitter.on(v.default.events.EDITOR_CHANGE,function(t,e){t===v.default.events.TEXT_CHANGE&&e.length()>0&&r.update(v.default.sources.SILENT)}),this.emitter.on(v.default.events.SCROLL_BEFORE_UPDATE,function(){if(r.hasFocus()){var t=r.getNativeRange();null!=t&&t.start.node!==r.cursor.textNode&&r.emitter.once(v.default.events.SCROLL_UPDATE,function(){try{r.setNativeRange(t.start.node,t.start.offset,t.end.node,t.end.offset)}catch(t){}})}}),this.emitter.on(v.default.events.SCROLL_OPTIMIZE,function(t,e){if(e.range){var n=e.range,o=n.startNode,i=n.startOffset,l=n.endNode,a=n.endOffset;r.setNativeRange(o,i,l,a)}}),this.update(v.default.sources.SILENT)}return s(t,[{key:"handleComposition",value:function(){var t=this;this.root.addEventListener("compositionstart",function(){t.composing=!0}),this.root.addEventListener("compositionend",function(){if(t.composing=!1,t.cursor.parent){var e=t.cursor.restore();if(!e)return;setTimeout(function(){t.setNativeRange(e.startNode,e.startOffset,e.endNode,e.endOffset)},1)}})}},{key:"handleDragging",value:function(){var t=this;this.emitter.listenDOM("mousedown",document.body,function(){t.mouseDown=!0}),this.emitter.listenDOM("mouseup",document.body,function(){t.mouseDown=!1,t.update(v.default.sources.USER)})}},{key:"focus",value:function(){this.hasFocus()||(this.root.focus(),this.setRange(this.savedRange))}},{key:"format",value:function(t,e){if(null==this.scroll.whitelist||this.scroll.whitelist[t]){this.scroll.update();var n=this.getNativeRange();if(null!=n&&n.native.collapsed&&!c.default.query(t,c.default.Scope.BLOCK)){if(n.start.node!==this.cursor.textNode){var r=c.default.find(n.start.node,!1);if(null==r)return;if(r instanceof c.default.Leaf){var o=r.split(n.start.offset);r.parent.insertBefore(this.cursor,o)}else r.insertBefore(this.cursor,n.start.node);this.cursor.attach()}this.cursor.format(t,e),this.scroll.optimize(),this.setNativeRange(this.cursor.textNode,this.cursor.textNode.data.length),this.update()}}}},{key:"getBounds",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=this.scroll.length();t=Math.min(t,n-1),e=Math.min(t+e,n-1)-t;var r=void 0,o=this.scroll.leaf(t),i=a(o,2),l=i[0],s=i[1];if(null==l)return null;var u=l.position(s,!0),c=a(u,2);r=c[0],s=c[1];var f=document.createRange();if(e>0){f.setStart(r,s);var h=this.scroll.leaf(t+e),p=a(h,2);if(l=p[0],s=p[1],null==l)return null;var d=l.position(s,!0),y=a(d,2);return r=y[0],s=y[1],f.setEnd(r,s),f.getBoundingClientRect()}var v="left",b=void 0;return r instanceof Text?(s<r.data.length?(f.setStart(r,s),f.setEnd(r,s+1)):(f.setStart(r,s-1),f.setEnd(r,s),v="right"),b=f.getBoundingClientRect()):(b=l.domNode.getBoundingClientRect(),s>0&&(v="right")),{bottom:b.top+b.height,height:b.height,left:b[v],right:b[v],top:b.top,width:0}}},{key:"getNativeRange",value:function(){var t=document.getSelection();if(null==t||t.rangeCount<=0)return null;var e=t.getRangeAt(0);if(null==e)return null;var n=this.normalizeNative(e);return m.info("getNativeRange",n),n}},{key:"getRange",value:function(){var t=this.getNativeRange();return null==t?[null,null]:[this.normalizedToRange(t),t]}},{key:"hasFocus",value:function(){return document.activeElement===this.root}},{key:"normalizedToRange",value:function(t){var e=this,n=[[t.start.node,t.start.offset]];t.native.collapsed||n.push([t.end.node,t.end.offset]);var r=n.map(function(t){var n=a(t,2),r=n[0],o=n[1],i=c.default.find(r,!0),l=i.offset(e.scroll);return 0===o?l:i instanceof c.default.Container?l+i.length():l+i.index(r,o)}),i=Math.min(Math.max.apply(Math,o(r)),this.scroll.length()-1),l=Math.min.apply(Math,[i].concat(o(r)));return new _(l,i-l)}},{key:"normalizeNative",value:function(t){if(!l(this.root,t.startContainer)||!t.collapsed&&!l(this.root,t.endContainer))return null;var e={start:{node:t.startContainer,offset:t.startOffset},end:{node:t.endContainer,offset:t.endOffset},native:t};return[e.start,e.end].forEach(function(t){for(var e=t.node,n=t.offset;!(e instanceof Text)&&e.childNodes.length>0;)if(e.childNodes.length>n)e=e.childNodes[n],n=0;else{if(e.childNodes.length!==n)break;e=e.lastChild,n=e instanceof Text?e.data.length:e.childNodes.length+1}t.node=e,t.offset=n}),e}},{key:"rangeToNative",value:function(t){var e=this,n=t.collapsed?[t.index]:[t.index,t.index+t.length],r=[],o=this.scroll.length();return n.forEach(function(t,n){t=Math.min(o-1,t);var i=void 0,l=e.scroll.leaf(t),s=a(l,2),u=s[0],c=s[1],f=u.position(c,0!==n),h=a(f,2);i=h[0],c=h[1],r.push(i,c)}),r.length<2&&(r=r.concat(r)),r}},{key:"scrollIntoView",value:function(t){var e=this.lastRange;if(null!=e){var n=this.getBounds(e.index,e.length);if(null!=n){var r=this.scroll.length()-1,o=this.scroll.line(Math.min(e.index,r)),i=a(o,1),l=i[0],s=l;if(e.length>0){var u=this.scroll.line(Math.min(e.index+e.length,r));s=a(u,1)[0]}if(null!=l&&null!=s){var c=t.getBoundingClientRect();n.top<c.top?t.scrollTop-=c.top-n.top:n.bottom>c.bottom&&(t.scrollTop+=n.bottom-c.bottom)}}}}},{key:"setNativeRange",value:function(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:t,r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:e,o=arguments.length>4&&void 0!==arguments[4]&&arguments[4];if(m.info("setNativeRange",t,e,n,r),null==t||null!=this.root.parentNode&&null!=t.parentNode&&null!=n.parentNode){var i=document.getSelection();if(null!=i)if(null!=t){this.hasFocus()||this.root.focus();var l=(this.getNativeRange()||{}).native;if(null==l||o||t!==l.startContainer||e!==l.startOffset||n!==l.endContainer||r!==l.endOffset){"BR"==t.tagName&&(e=[].indexOf.call(t.parentNode.childNodes,t),t=t.parentNode),"BR"==n.tagName&&(r=[].indexOf.call(n.parentNode.childNodes,n),n=n.parentNode);var a=document.createRange();a.setStart(t,e),a.setEnd(n,r),i.removeAllRanges(),i.addRange(a)}}else i.removeAllRanges(),this.root.blur(),document.body.focus()}}},{key:"setRange",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:v.default.sources.API;if("string"==typeof e&&(n=e,e=!1),m.info("setRange",t),null!=t){var r=this.rangeToNative(t);this.setNativeRange.apply(this,o(r).concat([e]))}else this.setNativeRange(null);this.update(n)}},{key:"update",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:v.default.sources.USER,e=this.lastRange,n=this.getRange(),r=a(n,2),o=r[0],i=r[1];if(this.lastRange=o,null!=this.lastRange&&(this.savedRange=this.lastRange),!(0,d.default)(e,this.lastRange)){var l;!this.composing&&null!=i&&i.native.collapsed&&i.start.node!==this.cursor.textNode&&this.cursor.restore();var s=[v.default.events.SELECTION_CHANGE,(0,h.default)(this.lastRange),(0,h.default)(e),t];if((l=this.emitter).emit.apply(l,[v.default.events.EDITOR_CHANGE].concat(s)),t!==v.default.sources.SILENT){var u;(u=this.emitter).emit.apply(u,s)}}}}]),t}();e.Range=_,e.default=O},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=n(0),s=r(a),u=n(3),c=r(u),f=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),e}(s.default.Container);f.allowedChildren=[c.default,u.BlockEmbed,f],e.default=f},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.ColorStyle=e.ColorClass=e.ColorAttributor=void 0;var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(0),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"value",value:function(t){var n=a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"value",this).call(this,t);return n.startsWith("rgb(")?(n=n.replace(/^[^\d]+/,"").replace(/[^\d]+$/,""),"#"+n.split(",").map(function(t){return("00"+parseInt(t).toString(16)).slice(-2)}).join("")):n}}]),e}(u.default.Attributor.Style),f=new u.default.Attributor.Class("color","ql-color",{scope:u.default.Scope.INLINE}),h=new c("color","color",{scope:u.default.Scope.INLINE});e.ColorAttributor=c,e.ColorClass=f,e.ColorStyle=h},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function a(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e){var n,r=t===D.keys.LEFT?"prefix":"suffix";return n={key:t,shiftKey:e,altKey:null},o(n,r,/^$/),o(n,"handler",function(n){var r=n.index;t===D.keys.RIGHT&&(r+=n.length+1);var o=this.quill.getLeaf(r);return!(b(o,1)[0]instanceof T.default.Embed)||(t===D.keys.LEFT?e?this.quill.setSelection(n.index-1,n.length+1,S.default.sources.USER):this.quill.setSelection(n.index-1,S.default.sources.USER):e?this.quill.setSelection(n.index,n.length+1,S.default.sources.USER):this.quill.setSelection(n.index+n.length+1,S.default.sources.USER),!1)}),n}function u(t,e){if(!(0===t.index||this.quill.getLength()<=1)){var n=this.quill.getLine(t.index),r=b(n,1),o=r[0],i={};if(0===e.offset){var l=this.quill.getLine(t.index-1),a=b(l,1),s=a[0];if(null!=s&&s.length()>1){var u=o.formats(),c=this.quill.getFormat(t.index-1,1);i=A.default.attributes.diff(u,c)||{}}}var f=/[\uD800-\uDBFF][\uDC00-\uDFFF]$/.test(e.prefix)?2:1;this.quill.deleteText(t.index-f,f,S.default.sources.USER),Object.keys(i).length>0&&this.quill.formatLine(t.index-f,f,i,S.default.sources.USER),this.quill.focus()}}function c(t,e){var n=/^[\uD800-\uDBFF][\uDC00-\uDFFF]/.test(e.suffix)?2:1;if(!(t.index>=this.quill.getLength()-n)){var r={},o=0,i=this.quill.getLine(t.index),l=b(i,1),a=l[0];if(e.offset>=a.length()-1){var s=this.quill.getLine(t.index+1),u=b(s,1),c=u[0];if(c){var f=a.formats(),h=this.quill.getFormat(t.index,1);r=A.default.attributes.diff(f,h)||{},o=c.length()}}this.quill.deleteText(t.index,n,S.default.sources.USER),Object.keys(r).length>0&&this.quill.formatLine(t.index+o-1,n,r,S.default.sources.USER)}}function f(t){var e=this.quill.getLines(t),n={};if(e.length>1){var r=e[0].formats(),o=e[e.length-1].formats();n=A.default.attributes.diff(o,r)||{}}this.quill.deleteText(t,S.default.sources.USER),Object.keys(n).length>0&&this.quill.formatLine(t.index,1,n,S.default.sources.USER),this.quill.setSelection(t.index,S.default.sources.SILENT),this.quill.focus()}function h(t,e){var n=this;t.length>0&&this.quill.scroll.deleteAt(t.index,t.length);var r=Object.keys(e.format).reduce(function(t,n){return T.default.query(n,T.default.Scope.BLOCK)&&!Array.isArray(e.format[n])&&(t[n]=e.format[n]),t},{});this.quill.insertText(t.index,"\n",r,S.default.sources.USER),this.quill.setSelection(t.index+1,S.default.sources.SILENT),this.quill.focus(),Object.keys(e.format).forEach(function(t){null==r[t]&&(Array.isArray(e.format[t])||"link"!==t&&n.quill.format(t,e.format[t],S.default.sources.USER))})}function p(t){return{key:D.keys.TAB,shiftKey:!t,format:{"code-block":!0},handler:function(e){var n=T.default.query("code-block"),r=e.index,o=e.length,i=this.quill.scroll.descendant(n,r),l=b(i,2),a=l[0],s=l[1];if(null!=a){var u=this.quill.getIndex(a),c=a.newlineIndex(s,!0)+1,f=a.newlineIndex(u+s+o),h=a.domNode.textContent.slice(c,f).split("\n");s=0,h.forEach(function(e,i){t?(a.insertAt(c+s,n.TAB),s+=n.TAB.length,0===i?r+=n.TAB.length:o+=n.TAB.length):e.startsWith(n.TAB)&&(a.deleteAt(c+s,n.TAB.length),s-=n.TAB.length,0===i?r-=n.TAB.length:o-=n.TAB.length),s+=e.length+1}),this.quill.update(S.default.sources.USER),this.quill.setSelection(r,o,S.default.sources.SILENT)}}}}function d(t){return{key:t[0].toUpperCase(),shortKey:!0,handler:function(e,n){this.quill.format(t,!n.format[t],S.default.sources.USER)}}}function y(t){if("string"==typeof t||"number"==typeof t)return y({key:t});if("object"===(void 0===t?"undefined":v(t))&&(t=(0,_.default)(t,!1)),"string"==typeof t.key)if(null!=D.keys[t.key.toUpperCase()])t.key=D.keys[t.key.toUpperCase()];else{if(1!==t.key.length)return null;t.key=t.key.toUpperCase().charCodeAt(0)}return t.shortKey&&(t[B]=t.shortKey,delete t.shortKey),t}Object.defineProperty(e,"__esModule",{value:!0}),e.SHORTKEY=e.default=void 0;var v="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},b=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),g=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),m=n(21),_=r(m),O=n(12),w=r(O),x=n(2),k=r(x),E=n(4),N=r(E),j=n(20),A=r(j),q=n(0),T=r(q),P=n(6),S=r(P),C=n(10),L=r(C),M=n(7),R=r(M),I=(0,L.default)("quill:keyboard"),B=/Mac/i.test(navigator.platform)?"metaKey":"ctrlKey",D=function(t){function e(t,n){i(this,e);var r=l(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.bindings={},Object.keys(r.options.bindings).forEach(function(e){("list autofill"!==e||null==t.scroll.whitelist||t.scroll.whitelist.list)&&r.options.bindings[e]&&r.addBinding(r.options.bindings[e])}),r.addBinding({key:e.keys.ENTER,shiftKey:null},h),r.addBinding({key:e.keys.ENTER,metaKey:null,ctrlKey:null,altKey:null},function(){}),/Firefox/i.test(navigator.userAgent)?(r.addBinding({key:e.keys.BACKSPACE},{collapsed:!0},u),r.addBinding({key:e.keys.DELETE},{collapsed:!0},c)):(r.addBinding({key:e.keys.BACKSPACE},{collapsed:!0,prefix:/^.?$/},u),r.addBinding({key:e.keys.DELETE},{collapsed:!0,suffix:/^.?$/},c)),r.addBinding({key:e.keys.BACKSPACE},{collapsed:!1},f),r.addBinding({key:e.keys.DELETE},{collapsed:!1},f),r.addBinding({key:e.keys.BACKSPACE,altKey:null,ctrlKey:null,metaKey:null,shiftKey:null},{collapsed:!0,offset:0},u),r.listen(),r}return a(e,t),g(e,null,[{key:"match",value:function(t,e){return e=y(e),!["altKey","ctrlKey","metaKey","shiftKey"].some(function(n){return!!e[n]!==t[n]&&null!==e[n]})&&e.key===(t.which||t.keyCode)}}]),g(e,[{key:"addBinding",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=y(t);if(null==r||null==r.key)return I.warn("Attempted to add invalid keyboard binding",r);"function"==typeof e&&(e={handler:e}),"function"==typeof n&&(n={handler:n}),r=(0,k.default)(r,e,n),this.bindings[r.key]=this.bindings[r.key]||[],this.bindings[r.key].push(r)}},{key:"listen",value:function(){var t=this;this.quill.root.addEventListener("keydown",function(n){if(!n.defaultPrevented){var r=n.which||n.keyCode,o=(t.bindings[r]||[]).filter(function(t){return e.match(n,t)});if(0!==o.length){var i=t.quill.getSelection();if(null!=i&&t.quill.hasFocus()){var l=t.quill.getLine(i.index),a=b(l,2),s=a[0],u=a[1],c=t.quill.getLeaf(i.index),f=b(c,2),h=f[0],p=f[1],d=0===i.length?[h,p]:t.quill.getLeaf(i.index+i.length),y=b(d,2),g=y[0],m=y[1],_=h instanceof T.default.Text?h.value().slice(0,p):"",O=g instanceof T.default.Text?g.value().slice(m):"",x={collapsed:0===i.length,empty:0===i.length&&s.length()<=1,format:t.quill.getFormat(i),offset:u,prefix:_,suffix:O};o.some(function(e){if(null!=e.collapsed&&e.collapsed!==x.collapsed)return!1;if(null!=e.empty&&e.empty!==x.empty)return!1;if(null!=e.offset&&e.offset!==x.offset)return!1;if(Array.isArray(e.format)){if(e.format.every(function(t){return null==x.format[t]}))return!1}else if("object"===v(e.format)&&!Object.keys(e.format).every(function(t){return!0===e.format[t]?null!=x.format[t]:!1===e.format[t]?null==x.format[t]:(0,w.default)(e.format[t],x.format[t])}))return!1;return!(null!=e.prefix&&!e.prefix.test(x.prefix))&&(!(null!=e.suffix&&!e.suffix.test(x.suffix))&&!0!==e.handler.call(t,i,x))})&&n.preventDefault()}}}})}}]),e}(R.default);D.keys={BACKSPACE:8,TAB:9,ENTER:13,ESCAPE:27,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46},D.DEFAULTS={bindings:{bold:d("bold"),italic:d("italic"),underline:d("underline"),indent:{key:D.keys.TAB,format:["blockquote","indent","list"],handler:function(t,e){if(e.collapsed&&0!==e.offset)return!0;this.quill.format("indent","+1",S.default.sources.USER)}},outdent:{key:D.keys.TAB,shiftKey:!0,format:["blockquote","indent","list"],handler:function(t,e){if(e.collapsed&&0!==e.offset)return!0;this.quill.format("indent","-1",S.default.sources.USER)}},"outdent backspace":{key:D.keys.BACKSPACE,collapsed:!0,shiftKey:null,metaKey:null,ctrlKey:null,altKey:null,format:["indent","list"],offset:0,handler:function(t,e){null!=e.format.indent?this.quill.format("indent","-1",S.default.sources.USER):null!=e.format.list&&this.quill.format("list",!1,S.default.sources.USER)}},"indent code-block":p(!0),"outdent code-block":p(!1),"remove tab":{key:D.keys.TAB,shiftKey:!0,collapsed:!0,prefix:/\t$/,handler:function(t){this.quill.deleteText(t.index-1,1,S.default.sources.USER)}},tab:{key:D.keys.TAB,handler:function(t){this.quill.history.cutoff();var e=(new N.default).retain(t.index).delete(t.length).insert("\t");this.quill.updateContents(e,S.default.sources.USER),this.quill.history.cutoff(),this.quill.setSelection(t.index+1,S.default.sources.SILENT)}},"list empty enter":{key:D.keys.ENTER,collapsed:!0,format:["list"],empty:!0,handler:function(t,e){this.quill.format("list",!1,S.default.sources.USER),e.format.indent&&this.quill.format("indent",!1,S.default.sources.USER)}},"checklist enter":{key:D.keys.ENTER,collapsed:!0,format:{list:"checked"},handler:function(t){var e=this.quill.getLine(t.index),n=b(e,2),r=n[0],o=n[1],i=(0,k.default)({},r.formats(),{list:"checked"}),l=(new N.default).retain(t.index).insert("\n",i).retain(r.length()-o-1).retain(1,{list:"unchecked"});this.quill.updateContents(l,S.default.sources.USER),this.quill.setSelection(t.index+1,S.default.sources.SILENT),this.quill.scrollIntoView()}},"header enter":{key:D.keys.ENTER,collapsed:!0,format:["header"],suffix:/^$/,handler:function(t,e){var n=this.quill.getLine(t.index),r=b(n,2),o=r[0],i=r[1],l=(new N.default).retain(t.index).insert("\n",e.format).retain(o.length()-i-1).retain(1,{header:null});this.quill.updateContents(l,S.default.sources.USER),this.quill.setSelection(t.index+1,S.default.sources.SILENT),this.quill.scrollIntoView()}},"list autofill":{key:" ",collapsed:!0,format:{list:!1},prefix:/^\s*?(\d+\.|-|\*|\[ ?\]|\[x\])$/,handler:function(t,e){var n=e.prefix.length,r=this.quill.getLine(t.index),o=b(r,2),i=o[0],l=o[1];if(l>n)return!0;var a=void 0;switch(e.prefix.trim()){case"[]":case"[ ]":a="unchecked";break;case"[x]":a="checked";break;case"-":case"*":a="bullet";break;default:a="ordered"}this.quill.insertText(t.index," ",S.default.sources.USER),this.quill.history.cutoff();var s=(new N.default).retain(t.index-l).delete(n+1).retain(i.length()-2-l).retain(1,{list:a});this.quill.updateContents(s,S.default.sources.USER),this.quill.history.cutoff(),this.quill.setSelection(t.index-n,S.default.sources.SILENT)}},"code exit":{key:D.keys.ENTER,collapsed:!0,format:["code-block"],prefix:/\n\n$/,suffix:/^\s+$/,handler:function(t){var e=this.quill.getLine(t.index),n=b(e,2),r=n[0],o=n[1],i=(new N.default).retain(t.index+r.length()-o-2).retain(1,{"code-block":null}).delete(1);this.quill.updateContents(i,S.default.sources.USER)}},"embed left":s(D.keys.LEFT,!1),"embed left shift":s(D.keys.LEFT,!0),"embed right":s(D.keys.RIGHT,!1),"embed right shift":s(D.keys.RIGHT,!0)}},e.default=D,e.SHORTKEY=B},function(t,e,n){"use strict";t.exports={align:{"":n(75),center:n(76),right:n(77),justify:n(78)},background:n(79),blockquote:n(80),bold:n(81),clean:n(82),code:n(40),"code-block":n(40),color:n(83),direction:{"":n(84),rtl:n(85)},float:{center:n(86),full:n(87),left:n(88),right:n(89)},formula:n(90),header:{1:n(91),2:n(92)},italic:n(93),image:n(94),indent:{"+1":n(95),"-1":n(96)},link:n(97),list:{ordered:n(98),bullet:n(99),check:n(100)},script:{sub:n(101),super:n(102)},strike:n(103),underline:n(104),video:n(105)}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(1),o=function(){function t(t){this.domNode=t,this.domNode[r.DATA_KEY]={blot:this}}return Object.defineProperty(t.prototype,"statics",{get:function(){return this.constructor},enumerable:!0,configurable:!0}),t.create=function(t){if(null==this.tagName)throw new r.ParchmentError("Blot definition missing tagName");var e;return Array.isArray(this.tagName)?("string"==typeof t&&(t=t.toUpperCase(),parseInt(t).toString()===t&&(t=parseInt(t))),e="number"==typeof t?document.createElement(this.tagName[t-1]):this.tagName.indexOf(t)>-1?document.createElement(t):document.createElement(this.tagName[0])):e=document.createElement(this.tagName),this.className&&e.classList.add(this.className),e},t.prototype.attach=function(){null!=this.parent&&(this.scroll=this.parent.scroll)},t.prototype.clone=function(){var t=this.domNode.cloneNode(!1);return r.create(t)},t.prototype.detach=function(){null!=this.parent&&this.parent.removeChild(this),delete this.domNode[r.DATA_KEY]},t.prototype.deleteAt=function(t,e){this.isolate(t,e).remove()},t.prototype.formatAt=function(t,e,n,o){var i=this.isolate(t,e);if(null!=r.query(n,r.Scope.BLOT)&&o)i.wrap(n,o);else if(null!=r.query(n,r.Scope.ATTRIBUTE)){var l=r.create(this.statics.scope);i.wrap(l),l.format(n,o)}},t.prototype.insertAt=function(t,e,n){var o=null==n?r.create("text",e):r.create(e,n),i=this.split(t);this.parent.insertBefore(o,i)},t.prototype.insertInto=function(t,e){void 0===e&&(e=null),null!=this.parent&&this.parent.children.remove(this);var n=null;t.children.insertBefore(this,e),null!=e&&(n=e.domNode),this.domNode.parentNode==t.domNode&&this.domNode.nextSibling==n||t.domNode.insertBefore(this.domNode,n),this.parent=t,this.attach()},t.prototype.isolate=function(t,e){var n=this.split(t);return n.split(e),n},t.prototype.length=function(){return 1},t.prototype.offset=function(t){return void 0===t&&(t=this.parent),null==this.parent||this==t?0:this.parent.children.offset(this)+this.parent.offset(t)},t.prototype.optimize=function(t){null!=this.domNode[r.DATA_KEY]&&delete this.domNode[r.DATA_KEY].mutations},t.prototype.remove=function(){null!=this.domNode.parentNode&&this.domNode.parentNode.removeChild(this.domNode),this.detach()},t.prototype.replace=function(t){null!=t.parent&&(t.parent.insertBefore(this,t.next),t.remove())},t.prototype.replaceWith=function(t,e){var n="string"==typeof t?r.create(t,e):t;return n.replace(this),n},t.prototype.split=function(t,e){return 0===t?this:this.next},t.prototype.update=function(t,e){},t.prototype.wrap=function(t,e){var n="string"==typeof t?r.create(t,e):t;return null!=this.parent&&this.parent.insertBefore(n,this.next),n.appendChild(this),n},t.blotName="abstract",t}();e.default=o},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(11),o=n(29),i=n(30),l=n(1),a=function(){function t(t){this.attributes={},this.domNode=t,this.build()}return t.prototype.attribute=function(t,e){e?t.add(this.domNode,e)&&(null!=t.value(this.domNode)?this.attributes[t.attrName]=t:delete this.attributes[t.attrName]):(t.remove(this.domNode),delete this.attributes[t.attrName])},t.prototype.build=function(){var t=this;this.attributes={};var e=r.default.keys(this.domNode),n=o.default.keys(this.domNode),a=i.default.keys(this.domNode);e.concat(n).concat(a).forEach(function(e){var n=l.query(e,l.Scope.ATTRIBUTE);n instanceof r.default&&(t.attributes[n.attrName]=n)})},t.prototype.copy=function(t){var e=this;Object.keys(this.attributes).forEach(function(n){var r=e.attributes[n].value(e.domNode);t.format(n,r)})},t.prototype.move=function(t){var e=this;this.copy(t),Object.keys(this.attributes).forEach(function(t){e.attributes[t].remove(e.domNode)}),this.attributes={}},t.prototype.values=function(){var t=this;return Object.keys(this.attributes).reduce(function(e,n){return e[n]=t.attributes[n].value(t.domNode),e},{})},t}();e.default=a},function(t,e,n){"use strict";function r(t,e){return(t.getAttribute("class")||"").split(/\s+/).filter(function(t){return 0===t.indexOf(e+"-")})}var o=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var i=n(11),l=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return o(e,t),e.keys=function(t){return(t.getAttribute("class")||"").split(/\s+/).map(function(t){return t.split("-").slice(0,-1).join("-")})},e.prototype.add=function(t,e){return!!this.canAdd(t,e)&&(this.remove(t),t.classList.add(this.keyName+"-"+e),!0)},e.prototype.remove=function(t){r(t,this.keyName).forEach(function(e){t.classList.remove(e)}),0===t.classList.length&&t.removeAttribute("class")},e.prototype.value=function(t){var e=r(t,this.keyName)[0]||"",n=e.slice(this.keyName.length+1);return this.canAdd(t,n)?n:""},e}(i.default);e.default=l},function(t,e,n){"use strict";function r(t){var e=t.split("-"),n=e.slice(1).map(function(t){return t[0].toUpperCase()+t.slice(1)}).join("");return e[0]+n}var o=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var i=n(11),l=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return o(e,t),e.keys=function(t){return(t.getAttribute("style")||"").split(";").map(function(t){return t.split(":")[0].trim()})},e.prototype.add=function(t,e){return!!this.canAdd(t,e)&&(t.style[r(this.keyName)]=e,!0)},e.prototype.remove=function(t){t.style[r(this.keyName)]="",t.getAttribute("style")||t.removeAttribute("style")},e.prototype.value=function(t){var e=t.style[r(this.keyName)];return this.canAdd(t,e)?e:""},e}(i.default);e.default=l},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),c=n(0),f=r(c),h=n(8),p=r(h),d=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return r.selection=n,r.textNode=document.createTextNode(e.CONTENTS),r.domNode.appendChild(r.textNode),r._length=0,r}return l(e,t),u(e,null,[{key:"value",value:function(){}}]),u(e,[{key:"detach",value:function(){null!=this.parent&&this.parent.removeChild(this)}},{key:"format",value:function(t,n){if(0!==this._length)return s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n);for(var r=this,o=0;null!=r&&r.statics.scope!==f.default.Scope.BLOCK_BLOT;)o+=r.offset(r.parent),r=r.parent;null!=r&&(this._length=e.CONTENTS.length,r.optimize(),r.formatAt(o,e.CONTENTS.length,t,n),this._length=0)}},{key:"index",value:function(t,n){return t===this.textNode?0:s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"index",this).call(this,t,n)}},{key:"length",value:function(){return this._length}},{key:"position",value:function(){return[this.textNode,this.textNode.data.length]}},{key:"remove",value:function(){s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"remove",this).call(this),this.parent=null}},{key:"restore",value:function(){if(!this.selection.composing&&null!=this.parent){var t=this.textNode,n=this.selection.getNativeRange(),r=void 0,o=void 0,i=void 0;if(null!=n&&n.start.node===t&&n.end.node===t){var l=[t,n.start.offset,n.end.offset];r=l[0],o=l[1],i=l[2]}for(;null!=this.domNode.lastChild&&this.domNode.lastChild!==this.textNode;)this.domNode.parentNode.insertBefore(this.domNode.lastChild,this.domNode);if(this.textNode.data!==e.CONTENTS){var s=this.textNode.data.split(e.CONTENTS).join("");this.next instanceof p.default?(r=this.next.domNode,this.next.insertAt(0,s),this.textNode.data=e.CONTENTS):(this.textNode.data=s,this.parent.insertBefore(f.default.create(this.textNode),this),this.textNode=document.createTextNode(e.CONTENTS),this.domNode.appendChild(this.textNode))}if(this.remove(),null!=o){var u=[o,i].map(function(t){return Math.max(0,Math.min(r.data.length,t-1))}),c=a(u,2);return o=c[0],i=c[1],{startNode:r,startOffset:o,endNode:r,endOffset:i}}}}},{key:"update",value:function(t,e){var n=this;if(t.some(function(t){return"characterData"===t.type&&t.target===n.textNode})){var r=this.restore();r&&(e.range=r)}}},{key:"value",value:function(){return""}}]),e}(f.default.Embed);d.blotName="cursor",d.className="ql-cursor",d.tagName="span",d.CONTENTS="\ufeff",e.default=d},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),i=function(){function t(e,n){r(this,t),this.quill=e,this.options=n,this.modules={}}return o(t,[{key:"init",value:function(){var t=this;Object.keys(this.options.modules).forEach(function(e){null==t.modules[e]&&t.addModule(e)})}},{key:"addModule",value:function(t){var e=this.quill.constructor.import("modules/"+t);return this.modules[t]=new e(this.quill,this.options.modules[t]||{}),this.modules[t]}}]),t}();i.DEFAULTS={modules:{}},i.themes={default:i},e.default=i},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(0),c=r(u),f=n(8),h=r(f),p="\ufeff",d=function(t){function e(t){o(this,e);var n=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return n.contentNode=document.createElement("span"),n.contentNode.setAttribute("contenteditable",!1),[].slice.call(n.domNode.childNodes).forEach(function(t){n.contentNode.appendChild(t)}),n.leftGuard=document.createTextNode(p),n.rightGuard=document.createTextNode(p),n.domNode.appendChild(n.leftGuard),n.domNode.appendChild(n.contentNode),n.domNode.appendChild(n.rightGuard),n}return l(e,t),a(e,[{key:"index",value:function(t,n){return t===this.leftGuard?0:t===this.rightGuard?1:s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"index",this).call(this,t,n)}},{key:"restore",value:function(t){var e=void 0,n=void 0,r=t.data.split(p).join("");if(t===this.leftGuard)if(this.prev instanceof h.default){var o=this.prev.length();this.prev.insertAt(o,r),e={startNode:this.prev.domNode,startOffset:o+r.length}}else n=document.createTextNode(r),this.parent.insertBefore(c.default.create(n),this),e={startNode:n,startOffset:r.length};else t===this.rightGuard&&(this.next instanceof h.default?(this.next.insertAt(0,r),e={startNode:this.next.domNode,startOffset:r.length}):(n=document.createTextNode(r),this.parent.insertBefore(c.default.create(n),this.next),e={startNode:n,startOffset:r.length}));return t.data=p,e}},{key:"update",value:function(t,e){var n=this;t.forEach(function(t){if("characterData"===t.type&&(t.target===n.leftGuard||t.target===n.rightGuard)){var r=n.restore(t.target);r&&(e.range=r)}})}}]),e}(c.default.Embed);e.default=d},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.AlignStyle=e.AlignClass=e.AlignAttribute=void 0;var r=n(0),o=function(t){return t&&t.__esModule?t:{default:t}}(r),i={scope:o.default.Scope.BLOCK,whitelist:["right","center","justify"]},l=new o.default.Attributor.Attribute("align","align",i),a=new o.default.Attributor.Class("align","ql-align",i),s=new o.default.Attributor.Style("align","text-align",i);e.AlignAttribute=l,e.AlignClass=a,e.AlignStyle=s},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.BackgroundStyle=e.BackgroundClass=void 0;var r=n(0),o=function(t){return t&&t.__esModule?t:{default:t}}(r),i=n(24),l=new o.default.Attributor.Class("background","ql-bg",{scope:o.default.Scope.INLINE}),a=new i.ColorAttributor("background","background-color",{scope:o.default.Scope.INLINE});e.BackgroundClass=l,e.BackgroundStyle=a},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.DirectionStyle=e.DirectionClass=e.DirectionAttribute=void 0;var r=n(0),o=function(t){return t&&t.__esModule?t:{default:t}}(r),i={scope:o.default.Scope.BLOCK,whitelist:["rtl"]},l=new o.default.Attributor.Attribute("direction","dir",i),a=new o.default.Attributor.Class("direction","ql-direction",i),s=new o.default.Attributor.Style("direction","direction",i);e.DirectionAttribute=l,e.DirectionClass=a,e.DirectionStyle=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.FontClass=e.FontStyle=void 0;var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(0),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c={scope:u.default.Scope.INLINE,whitelist:["serif","monospace"]},f=new u.default.Attributor.Class("font","ql-font",c),h=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"value",value:function(t){return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"value",this).call(this,t).replace(/["']/g,"")}}]),e}(u.default.Attributor.Style),p=new h("font","font-family",c);e.FontStyle=p,e.FontClass=f},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.SizeStyle=e.SizeClass=void 0;var r=n(0),o=function(t){return t&&t.__esModule?t:{default:t}}(r),i=new o.default.Attributor.Class("size","ql-size",{scope:o.default.Scope.INLINE,whitelist:["small","large","huge"]}),l=new o.default.Attributor.Style("size","font-size",{scope:o.default.Scope.INLINE,whitelist:["10px","18px","32px"]});e.SizeClass=i,e.SizeStyle=l},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(5),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"optimize",value:function(t){a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t),this.domNode.tagName!==this.statics.tagName[0]&&this.replaceWith(this.statics.blotName)}}],[{key:"create",value:function(){return a(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this)}},{key:"formats",value:function(){return!0}}]),e}(u.default);c.blotName="bold",c.tagName=["STRONG","B"],e.default=c},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <polyline class="ql-even ql-stroke" points="5 7 3 9 5 11"></polyline> <polyline class="ql-even ql-stroke" points="13 7 15 9 13 11"></polyline> <line class=ql-stroke x1=10 x2=8 y1=5 y2=13></line> </svg>'},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(16),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(t,n){r(this,e);var i=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return i.label.innerHTML=n,i.container.classList.add("ql-color-picker"),[].slice.call(i.container.querySelectorAll(".ql-picker-item"),0,7).forEach(function(t){t.classList.add("ql-primary")}),i}return i(e,t),l(e,[{key:"buildItem",value:function(t){var n=a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"buildItem",this).call(this,t);return n.style.backgroundColor=t.getAttribute("value")||"",n}},{key:"selectItem",value:function(t,n){a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"selectItem",this).call(this,t,n);var r=this.label.querySelector(".ql-color-label"),o=t?t.getAttribute("data-value")||"":"";r&&("line"===r.tagName?r.style.stroke=o:r.style.fill=o)}}]),e}(u.default);e.default=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(16),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(t,n){r(this,e);var i=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return i.container.classList.add("ql-icon-picker"),[].forEach.call(i.container.querySelectorAll(".ql-picker-item"),function(t){t.innerHTML=n[t.getAttribute("data-value")||""]}),i.defaultItem=i.container.querySelector(".ql-selected"),i.selectItem(i.defaultItem),i}return i(e,t),l(e,[{key:"selectItem",value:function(t,n){a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"selectItem",this).call(this,t,n),t=t||this.defaultItem,this.label.innerHTML=t.innerHTML}}]),e}(u.default);e.default=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),i=function(){function t(e,n){var o=this;r(this,t),this.quill=e,this.boundsContainer=n||document.body,this.root=e.addContainer("ql-tooltip"),this.root.innerHTML=this.constructor.TEMPLATE,this.quill.root===this.quill.scrollingContainer&&this.quill.root.addEventListener("scroll",function(){o.root.style.marginTop=-1*o.quill.root.scrollTop+"px"}),this.hide()}return o(t,[{key:"hide",value:function(){this.root.classList.add("ql-hidden")}},{key:"position",value:function(t){var e=t.left+t.width/2-this.root.offsetWidth/2,n=t.bottom+this.quill.root.scrollTop;this.root.style.left=e+"px",this.root.style.top=n+"px",this.root.classList.remove("ql-flip");var r=this.boundsContainer.getBoundingClientRect(),o=this.root.getBoundingClientRect(),i=0;if(o.right>r.right&&(i=r.right-o.right,this.root.style.left=e+i+"px"),o.left<r.left&&(i=r.left-o.left,this.root.style.left=e+i+"px"),o.bottom>r.bottom){var l=o.bottom-o.top,a=t.bottom-t.top+l;this.root.style.top=n-a+"px",this.root.classList.add("ql-flip")}return i}},{key:"show",value:function(){this.root.classList.remove("ql-editing"),this.root.classList.remove("ql-hidden")}}]),t}();e.default=i},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function a(t){var e=t.match(/^(?:(https?):\/\/)?(?:(?:www|m)\.)?youtube\.com\/watch.*v=([a-zA-Z0-9_-]+)/)||t.match(/^(?:(https?):\/\/)?(?:(?:www|m)\.)?youtu\.be\/([a-zA-Z0-9_-]+)/);return e?(e[1]||"https")+"://www.youtube.com/embed/"+e[2]+"?showinfo=0":(e=t.match(/^(?:(https?):\/\/)?(?:www\.)?vimeo\.com\/(\d+)/))?(e[1]||"https")+"://player.vimeo.com/video/"+e[2]+"/":t}function s(t,e){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2];e.forEach(function(e){var r=document.createElement("option");e===n?r.setAttribute("selected","selected"):r.setAttribute("value",e),t.appendChild(r)})}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.BaseTooltip=void 0;var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),c=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},f=n(2),h=r(f),p=n(4),d=r(p),y=n(9),v=r(y),b=n(25),g=r(b),m=n(32),_=r(m),O=n(41),w=r(O),x=n(42),k=r(x),E=n(16),N=r(E),j=n(43),A=r(j),q=[!1,"center","right","justify"],T=["#000000","#e60000","#ff9900","#ffff00","#008a00","#0066cc","#9933ff","#ffffff","#facccc","#ffebcc","#ffffcc","#cce8cc","#cce0f5","#ebd6ff","#bbbbbb","#f06666","#ffc266","#ffff66","#66b966","#66a3e0","#c285ff","#888888","#a10000","#b26b00","#b2b200","#006100","#0047b2","#6b24b2","#444444","#5c0000","#663d00","#666600","#003700","#002966","#3d1466"],P=[!1,"serif","monospace"],S=["1","2","3",!1],C=["small",!1,"large","huge"],L=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n)),l=function e(n){if(!document.body.contains(t.root))return document.body.removeEventListener("click",e);null==r.tooltip||r.tooltip.root.contains(n.target)||document.activeElement===r.tooltip.textbox||r.quill.hasFocus()||r.tooltip.hide(),null!=r.pickers&&r.pickers.forEach(function(t){t.container.contains(n.target)||t.close()})};return t.emitter.listenDOM("click",document.body,l),r}return l(e,t),u(e,[{key:"addModule",value:function(t){var n=c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"addModule",this).call(this,t);return"toolbar"===t&&this.extendToolbar(n),n}},{key:"buildButtons",value:function(t,e){t.forEach(function(t){(t.getAttribute("class")||"").split(/\s+/).forEach(function(n){if(n.startsWith("ql-")&&(n=n.slice("ql-".length),null!=e[n]))if("direction"===n)t.innerHTML=e[n][""]+e[n].rtl;else if("string"==typeof e[n])t.innerHTML=e[n];else{var r=t.value||"";null!=r&&e[n][r]&&(t.innerHTML=e[n][r])}})})}},{key:"buildPickers",value:function(t,e){var n=this;this.pickers=t.map(function(t){if(t.classList.contains("ql-align"))return null==t.querySelector("option")&&s(t,q),new k.default(t,e.align);if(t.classList.contains("ql-background")||t.classList.contains("ql-color")){var n=t.classList.contains("ql-background")?"background":"color";return null==t.querySelector("option")&&s(t,T,"background"===n?"#ffffff":"#000000"),new w.default(t,e[n])}return null==t.querySelector("option")&&(t.classList.contains("ql-font")?s(t,P):t.classList.contains("ql-header")?s(t,S):t.classList.contains("ql-size")&&s(t,C)),new N.default(t)});var r=function(){n.pickers.forEach(function(t){t.update()})};this.quill.on(v.default.events.EDITOR_CHANGE,r)}}]),e}(_.default);L.DEFAULTS=(0,h.default)(!0,{},_.default.DEFAULTS,{modules:{toolbar:{handlers:{formula:function(){this.quill.theme.tooltip.edit("formula")},image:function(){var t=this,e=this.container.querySelector("input.ql-image[type=file]");null==e&&(e=document.createElement("input"),e.setAttribute("type","file"),e.setAttribute("accept","image/png, image/gif, image/jpeg, image/bmp, image/x-icon"),e.classList.add("ql-image"),e.addEventListener("change",function(){if(null!=e.files&&null!=e.files[0]){var n=new FileReader;n.onload=function(n){var r=t.quill.getSelection(!0);t.quill.updateContents((new d.default).retain(r.index).delete(r.length).insert({image:n.target.result}),v.default.sources.USER),t.quill.setSelection(r.index+1,v.default.sources.SILENT),e.value=""},n.readAsDataURL(e.files[0])}}),this.container.appendChild(e)),e.click()},video:function(){this.quill.theme.tooltip.edit("video")}}}}});var M=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.textbox=r.root.querySelector('input[type="text"]'),r.listen(),r}return l(e,t),u(e,[{key:"listen",value:function(){var t=this;this.textbox.addEventListener("keydown",function(e){g.default.match(e,"enter")?(t.save(),e.preventDefault()):g.default.match(e,"escape")&&(t.cancel(),e.preventDefault())})}},{key:"cancel",value:function(){this.hide()}},{key:"edit",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"link",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;this.root.classList.remove("ql-hidden"),this.root.classList.add("ql-editing"),null!=e?this.textbox.value=e:t!==this.root.getAttribute("data-mode")&&(this.textbox.value=""),this.position(this.quill.getBounds(this.quill.selection.savedRange)),this.textbox.select(),this.textbox.setAttribute("placeholder",this.textbox.getAttribute("data-"+t)||""),this.root.setAttribute("data-mode",t)}},{key:"restoreFocus",value:function(){var t=this.quill.scrollingContainer.scrollTop;this.quill.focus(),this.quill.scrollingContainer.scrollTop=t}},{key:"save",value:function(){var t=this.textbox.value;switch(this.root.getAttribute("data-mode")){case"link":var e=this.quill.root.scrollTop;this.linkRange?(this.quill.formatText(this.linkRange,"link",t,v.default.sources.USER),delete this.linkRange):(this.restoreFocus(),this.quill.format("link",t,v.default.sources.USER)),this.quill.root.scrollTop=e;break;case"video":t=a(t);case"formula":if(!t)break;var n=this.quill.getSelection(!0);if(null!=n){var r=n.index+n.length;this.quill.insertEmbed(r,this.root.getAttribute("data-mode"),t,v.default.sources.USER),"formula"===this.root.getAttribute("data-mode")&&this.quill.insertText(r+1," ",v.default.sources.USER),this.quill.setSelection(r+2,v.default.sources.USER)}}this.textbox.value="",this.hide()}}]),e}(A.default);e.BaseTooltip=M,e.default=L},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var o=n(46),i=r(o),l=n(34),a=n(36),s=n(62),u=n(63),c=r(u),f=n(64),h=r(f),p=n(65),d=r(p),y=n(35),v=n(24),b=n(37),g=n(38),m=n(39),_=r(m),O=n(66),w=r(O),x=n(15),k=r(x),E=n(67),N=r(E),j=n(68),A=r(j),q=n(69),T=r(q),P=n(70),S=r(P),C=n(71),L=r(C),M=n(13),R=r(M),I=n(72),B=r(I),D=n(73),U=r(D),F=n(74),H=r(F),K=n(26),z=r(K),V=n(16),Z=r(V),W=n(41),G=r(W),Y=n(42),X=r(Y),$=n(43),Q=r($),J=n(107),tt=r(J),et=n(108),nt=r(et);i.default.register({"attributors/attribute/direction":a.DirectionAttribute,"attributors/class/align":l.AlignClass,"attributors/class/background":y.BackgroundClass,"attributors/class/color":v.ColorClass,"attributors/class/direction":a.DirectionClass,"attributors/class/font":b.FontClass,"attributors/class/size":g.SizeClass,"attributors/style/align":l.AlignStyle,"attributors/style/background":y.BackgroundStyle,"attributors/style/color":v.ColorStyle,"attributors/style/direction":a.DirectionStyle,"attributors/style/font":b.FontStyle,"attributors/style/size":g.SizeStyle},!0),i.default.register({"formats/align":l.AlignClass,"formats/direction":a.DirectionClass,"formats/indent":s.IndentClass,"formats/background":y.BackgroundStyle,"formats/color":v.ColorStyle,"formats/font":b.FontClass,"formats/size":g.SizeClass,"formats/blockquote":c.default,"formats/code-block":R.default,"formats/header":h.default,"formats/list":d.default,"formats/bold":_.default,"formats/code":M.Code,"formats/italic":w.default,"formats/link":k.default,"formats/script":N.default,"formats/strike":A.default,"formats/underline":T.default,"formats/image":S.default,"formats/video":L.default,"formats/list/item":p.ListItem,"modules/formula":B.default,"modules/syntax":U.default,"modules/toolbar":H.default,"themes/bubble":tt.default,"themes/snow":nt.default,"ui/icons":z.default,"ui/picker":Z.default,"ui/icon-picker":X.default,"ui/color-picker":G.default,"ui/tooltip":Q.default},!0),e.default=i.default},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var o=n(0),i=r(o),l=n(6),a=r(l),s=n(3),u=r(s),c=n(14),f=r(c),h=n(23),p=r(h),d=n(31),y=r(d),v=n(33),b=r(v),g=n(5),m=r(g),_=n(59),O=r(_),w=n(8),x=r(w),k=n(60),E=r(k),N=n(61),j=r(N),A=n(25),q=r(A);a.default.register({"blots/block":u.default,"blots/block/embed":s.BlockEmbed,"blots/break":f.default,"blots/container":p.default,"blots/cursor":y.default,"blots/embed":b.default,"blots/inline":m.default,"blots/scroll":O.default,"blots/text":x.default,"modules/clipboard":E.default,"modules/history":j.default,"modules/keyboard":q.default}),i.default.register(u.default,f.default,y.default,m.default,O.default,x.default),e.default=a.default},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=function(){function t(){this.head=this.tail=null,this.length=0}return t.prototype.append=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];this.insertBefore(t[0],null),t.length>1&&this.append.apply(this,t.slice(1))},t.prototype.contains=function(t){for(var e,n=this.iterator();e=n();)if(e===t)return!0;return!1},t.prototype.insertBefore=function(t,e){t&&(t.next=e,null!=e?(t.prev=e.prev,null!=e.prev&&(e.prev.next=t),e.prev=t,e===this.head&&(this.head=t)):null!=this.tail?(this.tail.next=t,t.prev=this.tail,this.tail=t):(t.prev=null,this.head=this.tail=t),this.length+=1)},t.prototype.offset=function(t){for(var e=0,n=this.head;null!=n;){if(n===t)return e;e+=n.length(),n=n.next}return-1},t.prototype.remove=function(t){this.contains(t)&&(null!=t.prev&&(t.prev.next=t.next),null!=t.next&&(t.next.prev=t.prev),t===this.head&&(this.head=t.next),t===this.tail&&(this.tail=t.prev),this.length-=1)},t.prototype.iterator=function(t){return void 0===t&&(t=this.head),function(){var e=t;return null!=t&&(t=t.next),e}},t.prototype.find=function(t,e){void 0===e&&(e=!1);for(var n,r=this.iterator();n=r();){var o=n.length();if(t<o||e&&t===o&&(null==n.next||0!==n.next.length()))return[n,t];t-=o}return[null,0]},t.prototype.forEach=function(t){for(var e,n=this.iterator();e=n();)t(e)},t.prototype.forEachAt=function(t,e,n){if(!(e<=0))for(var r,o=this.find(t),i=o[0],l=o[1],a=t-l,s=this.iterator(i);(r=s())&&a<t+e;){var u=r.length();t>a?n(r,t-a,Math.min(e,a+u-t)):n(r,0,Math.min(u,t+e-a)),a+=u}},t.prototype.map=function(t){return this.reduce(function(e,n){return e.push(t(n)),e},[])},t.prototype.reduce=function(t,e){for(var n,r=this.iterator();n=r();)e=t(e,n);return e},t}();e.default=r},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(17),i=n(1),l={attributes:!0,characterData:!0,characterDataOldValue:!0,childList:!0,subtree:!0},a=function(t){function e(e){var n=t.call(this,e)||this;return n.scroll=n,n.observer=new MutationObserver(function(t){n.update(t)}),n.observer.observe(n.domNode,l),n.attach(),n}return r(e,t),e.prototype.detach=function(){t.prototype.detach.call(this),this.observer.disconnect()},e.prototype.deleteAt=function(e,n){this.update(),0===e&&n===this.length()?this.children.forEach(function(t){t.remove()}):t.prototype.deleteAt.call(this,e,n)},e.prototype.formatAt=function(e,n,r,o){this.update(),t.prototype.formatAt.call(this,e,n,r,o)},e.prototype.insertAt=function(e,n,r){this.update(),t.prototype.insertAt.call(this,e,n,r)},e.prototype.optimize=function(e,n){var r=this;void 0===e&&(e=[]),void 0===n&&(n={}),t.prototype.optimize.call(this,n);for(var l=[].slice.call(this.observer.takeRecords());l.length>0;)e.push(l.pop());for(var a=function(t,e){void 0===e&&(e=!0),null!=t&&t!==r&&null!=t.domNode.parentNode&&(null==t.domNode[i.DATA_KEY].mutations&&(t.domNode[i.DATA_KEY].mutations=[]),e&&a(t.parent))},s=function(t){null!=t.domNode[i.DATA_KEY]&&null!=t.domNode[i.DATA_KEY].mutations&&(t instanceof o.default&&t.children.forEach(s),t.optimize(n))},u=e,c=0;u.length>0;c+=1){if(c>=100)throw new Error("[Parchment] Maximum optimize iterations reached");for(u.forEach(function(t){var e=i.find(t.target,!0);null!=e&&(e.domNode===t.target&&("childList"===t.type?(a(i.find(t.previousSibling,!1)),[].forEach.call(t.addedNodes,function(t){var e=i.find(t,!1);a(e,!1),e instanceof o.default&&e.children.forEach(function(t){a(t,!1)})})):"attributes"===t.type&&a(e.prev)),a(e))}),this.children.forEach(s),u=[].slice.call(this.observer.takeRecords()),l=u.slice();l.length>0;)e.push(l.pop())}},e.prototype.update=function(e,n){var r=this;void 0===n&&(n={}),e=e||this.observer.takeRecords(),e.map(function(t){var e=i.find(t.target,!0);return null==e?null:null==e.domNode[i.DATA_KEY].mutations?(e.domNode[i.DATA_KEY].mutations=[t],e):(e.domNode[i.DATA_KEY].mutations.push(t),null)}).forEach(function(t){null!=t&&t!==r&&null!=t.domNode[i.DATA_KEY]&&t.update(t.domNode[i.DATA_KEY].mutations||[],n)}),null!=this.domNode[i.DATA_KEY].mutations&&t.prototype.update.call(this,this.domNode[i.DATA_KEY].mutations,n),this.optimize(e,n)},e.blotName="scroll",e.defaultChild="block",e.scope=i.Scope.BLOCK_BLOT,e.tagName="DIV",e}(o.default);e.default=a},function(t,e,n){"use strict";function r(t,e){if(Object.keys(t).length!==Object.keys(e).length)return!1;for(var n in t)if(t[n]!==e[n])return!1;return!0}var o=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var i=n(18),l=n(1),a=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return o(e,t),e.formats=function(n){if(n.tagName!==e.tagName)return t.formats.call(this,n)},e.prototype.format=function(n,r){var o=this;n!==this.statics.blotName||r?t.prototype.format.call(this,n,r):(this.children.forEach(function(t){t instanceof i.default||(t=t.wrap(e.blotName,!0)),o.attributes.copy(t)}),this.unwrap())},e.prototype.formatAt=function(e,n,r,o){if(null!=this.formats()[r]||l.query(r,l.Scope.ATTRIBUTE)){this.isolate(e,n).format(r,o)}else t.prototype.formatAt.call(this,e,n,r,o)},e.prototype.optimize=function(n){t.prototype.optimize.call(this,n);var o=this.formats();if(0===Object.keys(o).length)return this.unwrap();var i=this.next;i instanceof e&&i.prev===this&&r(o,i.formats())&&(i.moveChildren(this),i.remove())},e.blotName="inline",e.scope=l.Scope.INLINE_BLOT,e.tagName="SPAN",e}(i.default);e.default=a},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(18),i=n(1),l=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return r(e,t),e.formats=function(n){var r=i.query(e.blotName).tagName;if(n.tagName!==r)return t.formats.call(this,n)},e.prototype.format=function(n,r){null!=i.query(n,i.Scope.BLOCK)&&(n!==this.statics.blotName||r?t.prototype.format.call(this,n,r):this.replaceWith(e.blotName))},e.prototype.formatAt=function(e,n,r,o){null!=i.query(r,i.Scope.BLOCK)?this.format(r,o):t.prototype.formatAt.call(this,e,n,r,o)},e.prototype.insertAt=function(e,n,r){if(null==r||null!=i.query(n,i.Scope.INLINE))t.prototype.insertAt.call(this,e,n,r);else{var o=this.split(e),l=i.create(n,r);o.parent.insertBefore(l,o)}},e.prototype.update=function(e,n){navigator.userAgent.match(/Trident/)?this.build():t.prototype.update.call(this,e,n)},e.blotName="block",e.scope=i.Scope.BLOCK_BLOT,e.tagName="P",e}(o.default);e.default=l},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(19),i=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return r(e,t),e.formats=function(t){},e.prototype.format=function(e,n){t.prototype.formatAt.call(this,0,this.length(),e,n)},e.prototype.formatAt=function(e,n,r,o){0===e&&n===this.length()?this.format(r,o):t.prototype.formatAt.call(this,e,n,r,o)},e.prototype.formats=function(){return this.statics.formats(this.domNode)},e}(o.default);e.default=i},function(t,e,n){"use strict";var r=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])};return function(e,n){function r(){this.constructor=e}t(e,n),e.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}();Object.defineProperty(e,"__esModule",{value:!0});var o=n(19),i=n(1),l=function(t){function e(e){var n=t.call(this,e)||this;return n.text=n.statics.value(n.domNode),n}return r(e,t),e.create=function(t){return document.createTextNode(t)},e.value=function(t){var e=t.data;return e.normalize&&(e=e.normalize()),e},e.prototype.deleteAt=function(t,e){this.domNode.data=this.text=this.text.slice(0,t)+this.text.slice(t+e)},e.prototype.index=function(t,e){return this.domNode===t?e:-1},e.prototype.insertAt=function(e,n,r){null==r?(this.text=this.text.slice(0,e)+n+this.text.slice(e),this.domNode.data=this.text):t.prototype.insertAt.call(this,e,n,r)},e.prototype.length=function(){return this.text.length},e.prototype.optimize=function(n){t.prototype.optimize.call(this,n),this.text=this.statics.value(this.domNode),0===this.text.length?this.remove():this.next instanceof e&&this.next.prev===this&&(this.insertAt(this.length(),this.next.value()),this.next.remove())},e.prototype.position=function(t,e){return void 0===e&&(e=!1),[this.domNode,t]},e.prototype.split=function(t,e){if(void 0===e&&(e=!1),!e){if(0===t)return this;if(t===this.length())return this.next}var n=i.create(this.domNode.splitText(t));return this.parent.insertBefore(n,this.next),this.text=this.statics.value(this.domNode),n},e.prototype.update=function(t,e){var n=this;t.some(function(t){return"characterData"===t.type&&t.target===n.domNode})&&(this.text=this.statics.value(this.domNode))},e.prototype.value=function(){return this.text},e.blotName="text",e.scope=i.Scope.INLINE_BLOT,e}(o.default);e.default=l},function(t,e,n){"use strict";var r=document.createElement("div");if(r.classList.toggle("test-class",!1),r.classList.contains("test-class")){var o=DOMTokenList.prototype.toggle;DOMTokenList.prototype.toggle=function(t,e){return arguments.length>1&&!this.contains(t)==!e?e:o.call(this,t)}}String.prototype.startsWith||(String.prototype.startsWith=function(t,e){return e=e||0,this.substr(e,t.length)===t}),String.prototype.endsWith||(String.prototype.endsWith=function(t,e){var n=this.toString();("number"!=typeof e||!isFinite(e)||Math.floor(e)!==e||e>n.length)&&(e=n.length),e-=t.length;var r=n.indexOf(t,e);return-1!==r&&r===e}),Array.prototype.find||Object.defineProperty(Array.prototype,"find",{value:function(t){if(null===this)throw new TypeError("Array.prototype.find called on null or undefined");if("function"!=typeof t)throw new TypeError("predicate must be a function");for(var e,n=Object(this),r=n.length>>>0,o=arguments[1],i=0;i<r;i++)if(e=n[i],t.call(o,e,i,n))return e}}),document.addEventListener("DOMContentLoaded",function(){document.execCommand("enableObjectResizing",!1,!1),document.execCommand("autoUrlDetect",!1,!1)})},function(t,e){function n(t,e,n){if(t==e)return t?[[v,t]]:[];(n<0||t.length<n)&&(n=null);var o=l(t,e),i=t.substring(0,o);t=t.substring(o),e=e.substring(o),o=a(t,e);var s=t.substring(t.length-o);t=t.substring(0,t.length-o),e=e.substring(0,e.length-o);var c=r(t,e);return i&&c.unshift([v,i]),s&&c.push([v,s]),u(c),null!=n&&(c=f(c,n)),c=h(c)}function r(t,e){var r;if(!t)return[[y,e]];if(!e)return[[d,t]];var i=t.length>e.length?t:e,l=t.length>e.length?e:t,a=i.indexOf(l);if(-1!=a)return r=[[y,i.substring(0,a)],[v,l],[y,i.substring(a+l.length)]],t.length>e.length&&(r[0][0]=r[2][0]=d),r;if(1==l.length)return[[d,t],[y,e]];var u=s(t,e);if(u){var c=u[0],f=u[1],h=u[2],p=u[3],b=u[4],g=n(c,h),m=n(f,p);return g.concat([[v,b]],m)}return o(t,e)}function o(t,e){for(var n=t.length,r=e.length,o=Math.ceil((n+r)/2),l=o,a=2*o,s=new Array(a),u=new Array(a),c=0;c<a;c++)s[c]=-1,u[c]=-1;s[l+1]=0,u[l+1]=0;for(var f=n-r,h=f%2!=0,p=0,v=0,b=0,g=0,m=0;m<o;m++){for(var _=-m+p;_<=m-v;_+=2){var O,w=l+_;O=_==-m||_!=m&&s[w-1]<s[w+1]?s[w+1]:s[w-1]+1;for(var x=O-_;O<n&&x<r&&t.charAt(O)==e.charAt(x);)O++,x++;if(s[w]=O,O>n)v+=2;else if(x>r)p+=2;else if(h){var k=l+f-_;if(k>=0&&k<a&&-1!=u[k]){var E=n-u[k];if(O>=E)return i(t,e,O,x)}}}for(var N=-m+b;N<=m-g;N+=2){var E,k=l+N;E=N==-m||N!=m&&u[k-1]<u[k+1]?u[k+1]:u[k-1]+1;for(var j=E-N;E<n&&j<r&&t.charAt(n-E-1)==e.charAt(r-j-1);)E++,j++;if(u[k]=E,E>n)g+=2;else if(j>r)b+=2;else if(!h){var w=l+f-N;if(w>=0&&w<a&&-1!=s[w]){var O=s[w],x=l+O-w;if(E=n-E,O>=E)return i(t,e,O,x)}}}}return[[d,t],[y,e]]}function i(t,e,r,o){var i=t.substring(0,r),l=e.substring(0,o),a=t.substring(r),s=e.substring(o),u=n(i,l),c=n(a,s);return u.concat(c)}function l(t,e){if(!t||!e||t.charAt(0)!=e.charAt(0))return 0;for(var n=0,r=Math.min(t.length,e.length),o=r,i=0;n<o;)t.substring(i,o)==e.substring(i,o)?(n=o,i=n):r=o,o=Math.floor((r-n)/2+n);return o}function a(t,e){if(!t||!e||t.charAt(t.length-1)!=e.charAt(e.length-1))return 0;for(var n=0,r=Math.min(t.length,e.length),o=r,i=0;n<o;)t.substring(t.length-o,t.length-i)==e.substring(e.length-o,e.length-i)?(n=o,i=n):r=o,o=Math.floor((r-n)/2+n);return o}function s(t,e){function n(t,e,n){for(var r,o,i,s,u=t.substring(n,n+Math.floor(t.length/4)),c=-1,f="";-1!=(c=e.indexOf(u,c+1));){var h=l(t.substring(n),e.substring(c)),p=a(t.substring(0,n),e.substring(0,c));f.length<p+h&&(f=e.substring(c-p,c)+e.substring(c,c+h),r=t.substring(0,n-p),o=t.substring(n+h),i=e.substring(0,c-p),s=e.substring(c+h))}return 2*f.length>=t.length?[r,o,i,s,f]:null}var r=t.length>e.length?t:e,o=t.length>e.length?e:t;if(r.length<4||2*o.length<r.length)return null;var i,s=n(r,o,Math.ceil(r.length/4)),u=n(r,o,Math.ceil(r.length/2));if(!s&&!u)return null;i=u?s&&s[4].length>u[4].length?s:u:s;var c,f,h,p;return t.length>e.length?(c=i[0],f=i[1],h=i[2],p=i[3]):(h=i[0],p=i[1],c=i[2],f=i[3]),[c,f,h,p,i[4]]}function u(t){t.push([v,""]);for(var e,n=0,r=0,o=0,i="",s="";n<t.length;)switch(t[n][0]){case y:o++,s+=t[n][1],n++;break;case d:r++,i+=t[n][1],n++;break;case v:r+o>1?(0!==r&&0!==o&&(e=l(s,i),0!==e&&(n-r-o>0&&t[n-r-o-1][0]==v?t[n-r-o-1][1]+=s.substring(0,e):(t.splice(0,0,[v,s.substring(0,e)]),n++),s=s.substring(e),i=i.substring(e)),0!==(e=a(s,i))&&(t[n][1]=s.substring(s.length-e)+t[n][1],s=s.substring(0,s.length-e),i=i.substring(0,i.length-e))),0===r?t.splice(n-o,r+o,[y,s]):0===o?t.splice(n-r,r+o,[d,i]):t.splice(n-r-o,r+o,[d,i],[y,s]),n=n-r-o+(r?1:0)+(o?1:0)+1):0!==n&&t[n-1][0]==v?(t[n-1][1]+=t[n][1],t.splice(n,1)):n++,o=0,r=0,i="",s=""}""===t[t.length-1][1]&&t.pop();var c=!1;for(n=1;n<t.length-1;)t[n-1][0]==v&&t[n+1][0]==v&&(t[n][1].substring(t[n][1].length-t[n-1][1].length)==t[n-1][1]?(t[n][1]=t[n-1][1]+t[n][1].substring(0,t[n][1].length-t[n-1][1].length),t[n+1][1]=t[n-1][1]+t[n+1][1],t.splice(n-1,1),c=!0):t[n][1].substring(0,t[n+1][1].length)==t[n+1][1]&&(t[n-1][1]+=t[n+1][1],t[n][1]=t[n][1].substring(t[n+1][1].length)+t[n+1][1],t.splice(n+1,1),c=!0)),n++;c&&u(t)}function c(t,e){if(0===e)return[v,t];for(var n=0,r=0;r<t.length;r++){var o=t[r];if(o[0]===d||o[0]===v){var i=n+o[1].length;if(e===i)return[r+1,t];if(e<i){t=t.slice();var l=e-n,a=[o[0],o[1].slice(0,l)],s=[o[0],o[1].slice(l)];return t.splice(r,1,a,s),[r+1,t]}n=i}}throw new Error("cursor_pos is out of bounds!")}function f(t,e){var n=c(t,e),r=n[1],o=n[0],i=r[o],l=r[o+1];if(null==i)return t;if(i[0]!==v)return t;if(null!=l&&i[1]+l[1]===l[1]+i[1])return r.splice(o,2,l,i),p(r,o,2);if(null!=l&&0===l[1].indexOf(i[1])){r.splice(o,2,[l[0],i[1]],[0,i[1]]);var a=l[1].slice(i[1].length);return a.length>0&&r.splice(o+2,0,[l[0],a]),p(r,o,3)}return t}function h(t){for(var e=!1,n=function(t){return t.charCodeAt(0)>=56320&&t.charCodeAt(0)<=57343},r=2;r<t.length;r+=1)t[r-2][0]===v&&function(t){return t.charCodeAt(t.length-1)>=55296&&t.charCodeAt(t.length-1)<=56319}(t[r-2][1])&&t[r-1][0]===d&&n(t[r-1][1])&&t[r][0]===y&&n(t[r][1])&&(e=!0,t[r-1][1]=t[r-2][1].slice(-1)+t[r-1][1],t[r][1]=t[r-2][1].slice(-1)+t[r][1],t[r-2][1]=t[r-2][1].slice(0,-1));if(!e)return t;for(var o=[],r=0;r<t.length;r+=1)t[r][1].length>0&&o.push(t[r]);return o}function p(t,e,n){for(var r=e+n-1;r>=0&&r>=e-1;r--)if(r+1<t.length){var o=t[r],i=t[r+1];o[0]===i[1]&&t.splice(r,2,[o[0],o[1]+i[1]])}return t}var d=-1,y=1,v=0,b=n;b.INSERT=y,b.DELETE=d,b.EQUAL=v,t.exports=b},function(t,e){function n(t){var e=[];for(var n in t)e.push(n);return e}e=t.exports="function"==typeof Object.keys?Object.keys:n,e.shim=n},function(t,e){function n(t){return"[object Arguments]"==Object.prototype.toString.call(t)}function r(t){return t&&"object"==typeof t&&"number"==typeof t.length&&Object.prototype.hasOwnProperty.call(t,"callee")&&!Object.prototype.propertyIsEnumerable.call(t,"callee")||!1}var o="[object Arguments]"==function(){return Object.prototype.toString.call(arguments)}();e=t.exports=o?n:r,e.supported=n,e.unsupported=r},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){return Object.keys(e).reduce(function(n,r){return null==t[r]?n:(e[r]===t[r]?n[r]=e[r]:Array.isArray(e[r])?e[r].indexOf(t[r])<0&&(n[r]=e[r].concat([t[r]])):n[r]=[e[r],t[r]],n)},{})}function a(t){return t.reduce(function(t,e){if(1===e.insert){var n=(0,N.default)(e.attributes);return delete n.image,t.insert({image:e.attributes.image},n)}if(null==e.attributes||!0!==e.attributes.list&&!0!==e.attributes.bullet||(e=(0,N.default)(e),e.attributes.list?e.attributes.list="ordered":(e.attributes.list="bullet",delete e.attributes.bullet)),"string"==typeof e.insert){var r=e.insert.replace(/\r\n/g,"\n").replace(/\r/g,"\n");return t.insert(r,e.attributes)}return t.push(e)},new h.default)}Object.defineProperty(e,"__esModule",{value:!0});var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},u=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),c=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),f=n(4),h=r(f),p=n(20),d=r(p),y=n(0),v=r(y),b=n(13),g=r(b),m=n(31),_=r(m),O=n(3),w=r(O),x=n(14),k=r(x),E=n(21),N=r(E),j=n(12),A=r(j),q=n(2),T=r(q),P=/^[ -~]*$/,S=function(){function t(e){i(this,t),this.scroll=e,this.delta=this.getDelta()}return c(t,[{key:"applyDelta",value:function(t){var e=this,n=!1;this.scroll.update();var r=this.scroll.length();return this.scroll.batchStart(),t=a(t),t.reduce(function(t,o){var i=o.retain||o.delete||o.insert.length||1,l=o.attributes||{};if(null!=o.insert){if("string"==typeof o.insert){var a=o.insert;a.endsWith("\n")&&n&&(n=!1,a=a.slice(0,-1)),t>=r&&!a.endsWith("\n")&&(n=!0),e.scroll.insertAt(t,a);var c=e.scroll.line(t),f=u(c,2),h=f[0],p=f[1],y=(0,T.default)({},(0,O.bubbleFormats)(h));if(h instanceof w.default){var b=h.descendant(v.default.Leaf,p),g=u(b,1),m=g[0];y=(0,T.default)(y,(0,O.bubbleFormats)(m))}l=d.default.attributes.diff(y,l)||{}}else if("object"===s(o.insert)){var _=Object.keys(o.insert)[0];if(null==_)return t;e.scroll.insertAt(t,_,o.insert[_])}r+=i}return Object.keys(l).forEach(function(n){e.scroll.formatAt(t,i,n,l[n])}),t+i},0),t.reduce(function(t,n){return"number"==typeof n.delete?(e.scroll.deleteAt(t,n.delete),t):t+(n.retain||n.insert.length||1)},0),this.scroll.batchEnd(),this.update(t)}},{key:"deleteText",value:function(t,e){return this.scroll.deleteAt(t,e),this.update((new h.default).retain(t).delete(e))}},{key:"formatLine",value:function(t,e){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return this.scroll.update(),Object.keys(r).forEach(function(o){if(null==n.scroll.whitelist||n.scroll.whitelist[o]){var i=n.scroll.lines(t,Math.max(e,1)),l=e;i.forEach(function(e){var i=e.length();if(e instanceof g.default){var a=t-e.offset(n.scroll),s=e.newlineIndex(a+l)-a+1;e.formatAt(a,s,o,r[o])}else e.format(o,r[o]);l-=i})}}),this.scroll.optimize(),this.update((new h.default).retain(t).retain(e,(0,N.default)(r)))}},{key:"formatText",value:function(t,e){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return Object.keys(r).forEach(function(o){n.scroll.formatAt(t,e,o,r[o])}),this.update((new h.default).retain(t).retain(e,(0,N.default)(r)))}},{key:"getContents",value:function(t,e){return this.delta.slice(t,t+e)}},{key:"getDelta",value:function(){return this.scroll.lines().reduce(function(t,e){return t.concat(e.delta())},new h.default)}},{key:"getFormat",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=[],r=[];0===e?this.scroll.path(t).forEach(function(t){var e=u(t,1),o=e[0];o instanceof w.default?n.push(o):o instanceof v.default.Leaf&&r.push(o)}):(n=this.scroll.lines(t,e),r=this.scroll.descendants(v.default.Leaf,t,e));var o=[n,r].map(function(t){if(0===t.length)return{};for(var e=(0,O.bubbleFormats)(t.shift());Object.keys(e).length>0;){var n=t.shift();if(null==n)return e;e=l((0,O.bubbleFormats)(n),e)}return e});return T.default.apply(T.default,o)}},{key:"getText",value:function(t,e){return this.getContents(t,e).filter(function(t){return"string"==typeof t.insert}).map(function(t){return t.insert}).join("")}},{key:"insertEmbed",value:function(t,e,n){return this.scroll.insertAt(t,e,n),this.update((new h.default).retain(t).insert(o({},e,n)))}},{key:"insertText",value:function(t,e){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};return e=e.replace(/\r\n/g,"\n").replace(/\r/g,"\n"),this.scroll.insertAt(t,e),Object.keys(r).forEach(function(o){n.scroll.formatAt(t,e.length,o,r[o])}),this.update((new h.default).retain(t).insert(e,(0,N.default)(r)))}},{key:"isBlank",value:function(){if(0==this.scroll.children.length)return!0;if(this.scroll.children.length>1)return!1;var t=this.scroll.children.head;return t.statics.blotName===w.default.blotName&&(!(t.children.length>1)&&t.children.head instanceof k.default)}},{key:"removeFormat",value:function(t,e){var n=this.getText(t,e),r=this.scroll.line(t+e),o=u(r,2),i=o[0],l=o[1],a=0,s=new h.default;null!=i&&(a=i instanceof g.default?i.newlineIndex(l)-l+1:i.length()-l,s=i.delta().slice(l,l+a-1).insert("\n"));var c=this.getContents(t,e+a),f=c.diff((new h.default).insert(n).concat(s)),p=(new h.default).retain(t).concat(f);return this.applyDelta(p)}},{key:"update",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:void 0,r=this.delta;if(1===e.length&&"characterData"===e[0].type&&e[0].target.data.match(P)&&v.default.find(e[0].target)){var o=v.default.find(e[0].target),i=(0,O.bubbleFormats)(o),l=o.offset(this.scroll),a=e[0].oldValue.replace(_.default.CONTENTS,""),s=(new h.default).insert(a),u=(new h.default).insert(o.value());t=(new h.default).retain(l).concat(s.diff(u,n)).reduce(function(t,e){return e.insert?t.insert(e.insert,i):t.push(e)},new h.default),this.delta=r.compose(t)}else this.delta=this.getDelta(),t&&(0,A.default)(r.compose(t),this.delta)||(t=r.diff(this.delta,n));return t}}]),t}();e.default=S},function(t,e){"use strict";function n(){}function r(t,e,n){this.fn=t,this.context=e,this.once=n||!1}function o(){this._events=new n,this._eventsCount=0}var i=Object.prototype.hasOwnProperty,l="~";Object.create&&(n.prototype=Object.create(null),(new n).__proto__||(l=!1)),o.prototype.eventNames=function(){var t,e,n=[];if(0===this._eventsCount)return n;for(e in t=this._events)i.call(t,e)&&n.push(l?e.slice(1):e);return Object.getOwnPropertySymbols?n.concat(Object.getOwnPropertySymbols(t)):n},o.prototype.listeners=function(t,e){var n=l?l+t:t,r=this._events[n];if(e)return!!r;if(!r)return[];if(r.fn)return[r.fn];for(var o=0,i=r.length,a=new Array(i);o<i;o++)a[o]=r[o].fn;return a},o.prototype.emit=function(t,e,n,r,o,i){var a=l?l+t:t;if(!this._events[a])return!1;var s,u,c=this._events[a],f=arguments.length;if(c.fn){switch(c.once&&this.removeListener(t,c.fn,void 0,!0),f){case 1:return c.fn.call(c.context),!0;case 2:return c.fn.call(c.context,e),!0;case 3:return c.fn.call(c.context,e,n),!0;case 4:return c.fn.call(c.context,e,n,r),!0;case 5:return c.fn.call(c.context,e,n,r,o),!0;case 6:return c.fn.call(c.context,e,n,r,o,i),!0}for(u=1,s=new Array(f-1);u<f;u++)s[u-1]=arguments[u];c.fn.apply(c.context,s)}else{var h,p=c.length;for(u=0;u<p;u++)switch(c[u].once&&this.removeListener(t,c[u].fn,void 0,!0),f){case 1:c[u].fn.call(c[u].context);break;case 2:c[u].fn.call(c[u].context,e);break;case 3:c[u].fn.call(c[u].context,e,n);break;case 4:c[u].fn.call(c[u].context,e,n,r);break;default:if(!s)for(h=1,s=new Array(f-1);h<f;h++)s[h-1]=arguments[h];c[u].fn.apply(c[u].context,s)}}return!0},o.prototype.on=function(t,e,n){var o=new r(e,n||this),i=l?l+t:t;return this._events[i]?this._events[i].fn?this._events[i]=[this._events[i],o]:this._events[i].push(o):(this._events[i]=o,this._eventsCount++),this},o.prototype.once=function(t,e,n){var o=new r(e,n||this,!0),i=l?l+t:t;return this._events[i]?this._events[i].fn?this._events[i]=[this._events[i],o]:this._events[i].push(o):(this._events[i]=o,this._eventsCount++),this},o.prototype.removeListener=function(t,e,r,o){var i=l?l+t:t;if(!this._events[i])return this;if(!e)return 0==--this._eventsCount?this._events=new n:delete this._events[i],this;var a=this._events[i];if(a.fn)a.fn!==e||o&&!a.once||r&&a.context!==r||(0==--this._eventsCount?this._events=new n:delete this._events[i]);else{for(var s=0,u=[],c=a.length;s<c;s++)(a[s].fn!==e||o&&!a[s].once||r&&a[s].context!==r)&&u.push(a[s]);u.length?this._events[i]=1===u.length?u[0]:u:0==--this._eventsCount?this._events=new n:delete this._events[i]}return this},o.prototype.removeAllListeners=function(t){var e;return t?(e=l?l+t:t,this._events[e]&&(0==--this._eventsCount?this._events=new n:delete this._events[e])):(this._events=new n,this._eventsCount=0),this},o.prototype.off=o.prototype.removeListener,o.prototype.addListener=o.prototype.on,o.prototype.setMaxListeners=function(){return this},o.prefixed=l,o.EventEmitter=o,void 0!==t&&(t.exports=o)},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function a(t){return t instanceof v.default||t instanceof y.BlockEmbed}Object.defineProperty(e,"__esModule",{value:!0});var s=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),c=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},f=n(0),h=r(f),p=n(9),d=r(p),y=n(3),v=r(y),b=n(14),g=r(b),m=n(13),_=r(m),O=n(23),w=r(O),x=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return r.emitter=n.emitter,Array.isArray(n.whitelist)&&(r.whitelist=n.whitelist.reduce(function(t,e){return t[e]=!0,t},{})),r.domNode.addEventListener("DOMNodeInserted",function(){}),r.optimize(),r.enable(),r}return l(e,t),u(e,[{key:"batchStart",value:function(){this.batch=!0}},{key:"batchEnd",value:function(){this.batch=!1,this.optimize()}},{key:"deleteAt",value:function(t,n){var r=this.line(t),o=s(r,2),i=o[0],l=o[1],a=this.line(t+n),u=s(a,1),f=u[0];if(c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"deleteAt",this).call(this,t,n),null!=f&&i!==f&&l>0){if(i instanceof y.BlockEmbed||f instanceof y.BlockEmbed)return void this.optimize();if(i instanceof _.default){var h=i.newlineIndex(i.length(),!0);if(h>-1&&(i=i.split(h+1))===f)return void this.optimize()}else if(f instanceof _.default){var p=f.newlineIndex(0);p>-1&&f.split(p+1)}var d=f.children.head instanceof g.default?null:f.children.head;i.moveChildren(f,d),i.remove()}this.optimize()}},{key:"enable",value:function(){var t=!(arguments.length>0&&void 0!==arguments[0])||arguments[0];this.domNode.setAttribute("contenteditable",t)}},{key:"formatAt",value:function(t,n,r,o){(null==this.whitelist||this.whitelist[r])&&(c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"formatAt",this).call(this,t,n,r,o),this.optimize())}},{key:"insertAt",value:function(t,n,r){if(null==r||null==this.whitelist||this.whitelist[n]){if(t>=this.length())if(null==r||null==h.default.query(n,h.default.Scope.BLOCK)){var o=h.default.create(this.statics.defaultChild);this.appendChild(o),null==r&&n.endsWith("\n")&&(n=n.slice(0,-1)),o.insertAt(0,n,r)}else{var i=h.default.create(n,r);this.appendChild(i)}else c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertAt",this).call(this,t,n,r);this.optimize()}}},{key:"insertBefore",value:function(t,n){if(t.statics.scope===h.default.Scope.INLINE_BLOT){var r=h.default.create(this.statics.defaultChild);r.appendChild(t),t=r}c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertBefore",this).call(this,t,n)}},{key:"leaf",value:function(t){return this.path(t).pop()||[null,-1]}},{key:"line",value:function(t){return t===this.length()?this.line(t-1):this.descendant(a,t)}},{key:"lines",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:Number.MAX_VALUE;return function t(e,n,r){var o=[],i=r;return e.children.forEachAt(n,r,function(e,n,r){a(e)?o.push(e):e instanceof h.default.Container&&(o=o.concat(t(e,n,i))),i-=r}),o}(this,t,e)}},{key:"optimize",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:[],n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};!0!==this.batch&&(c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t,n),t.length>0&&this.emitter.emit(d.default.events.SCROLL_OPTIMIZE,t,n))}},{key:"path",value:function(t){return c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"path",this).call(this,t).slice(1)}},{key:"update",value:function(t){if(!0!==this.batch){var n=d.default.sources.USER;"string"==typeof t&&(n=t),Array.isArray(t)||(t=this.observer.takeRecords()),t.length>0&&this.emitter.emit(d.default.events.SCROLL_BEFORE_UPDATE,n,t),c(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"update",this).call(this,t.concat([])),t.length>0&&this.emitter.emit(d.default.events.SCROLL_UPDATE,n,t)}}}]),e}(h.default.Scroll);x.blotName="scroll",x.className="ql-editor",x.tagName="DIV",x.defaultChild="block",x.allowedChildren=[v.default,y.BlockEmbed,w.default],e.default=x},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function a(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e,n){return"object"===(void 0===e?"undefined":x(e))?Object.keys(e).reduce(function(t,n){return s(t,n,e[n])},t):t.reduce(function(t,r){return r.attributes&&r.attributes[e]?t.push(r):t.insert(r.insert,(0,j.default)({},o({},e,n),r.attributes))},new q.default)}function u(t){if(t.nodeType!==Node.ELEMENT_NODE)return{};return t["__ql-computed-style"]||(t["__ql-computed-style"]=window.getComputedStyle(t))}function c(t,e){for(var n="",r=t.ops.length-1;r>=0&&n.length<e.length;--r){var o=t.ops[r];if("string"!=typeof o.insert)break;n=o.insert+n}return n.slice(-1*e.length)===e}function f(t){return 0!==t.childNodes.length&&["block","list-item"].indexOf(u(t).display)>-1}function h(t,e,n){return t.nodeType===t.TEXT_NODE?n.reduce(function(e,n){return n(t,e)},new q.default):t.nodeType===t.ELEMENT_NODE?[].reduce.call(t.childNodes||[],function(r,o){var i=h(o,e,n);return o.nodeType===t.ELEMENT_NODE&&(i=e.reduce(function(t,e){return e(o,t)},i),i=(o[W]||[]).reduce(function(t,e){return e(o,t)},i)),r.concat(i)},new q.default):new q.default}function p(t,e,n){return s(n,t,!0)}function d(t,e){var n=P.default.Attributor.Attribute.keys(t),r=P.default.Attributor.Class.keys(t),o=P.default.Attributor.Style.keys(t),i={};return n.concat(r).concat(o).forEach(function(e){var n=P.default.query(e,P.default.Scope.ATTRIBUTE);null!=n&&(i[n.attrName]=n.value(t),i[n.attrName])||(n=Y[e],null==n||n.attrName!==e&&n.keyName!==e||(i[n.attrName]=n.value(t)||void 0),null==(n=X[e])||n.attrName!==e&&n.keyName!==e||(n=X[e],i[n.attrName]=n.value(t)||void 0))}),Object.keys(i).length>0&&(e=s(e,i)),e}function y(t,e){var n=P.default.query(t);if(null==n)return e;if(n.prototype instanceof P.default.Embed){var r={},o=n.value(t);null!=o&&(r[n.blotName]=o,e=(new q.default).insert(r,n.formats(t)))}else"function"==typeof n.formats&&(e=s(e,n.blotName,n.formats(t)));return e}function v(t,e){return c(e,"\n")||e.insert("\n"),e}function b(){return new q.default}function g(t,e){var n=P.default.query(t);if(null==n||"list-item"!==n.blotName||!c(e,"\n"))return e;for(var r=-1,o=t.parentNode;!o.classList.contains("ql-clipboard");)"list"===(P.default.query(o)||{}).blotName&&(r+=1),o=o.parentNode;return r<=0?e:e.compose((new q.default).retain(e.length()-1).retain(1,{indent:r}))}function m(t,e){return c(e,"\n")||(f(t)||e.length()>0&&t.nextSibling&&f(t.nextSibling))&&e.insert("\n"),e}function _(t,e){if(f(t)&&null!=t.nextElementSibling&&!c(e,"\n\n")){var n=t.offsetHeight+parseFloat(u(t).marginTop)+parseFloat(u(t).marginBottom);t.nextElementSibling.offsetTop>t.offsetTop+1.5*n&&e.insert("\n")}return e}function O(t,e){var n={},r=t.style||{};return r.fontStyle&&"italic"===u(t).fontStyle&&(n.italic=!0),r.fontWeight&&(u(t).fontWeight.startsWith("bold")||parseInt(u(t).fontWeight)>=700)&&(n.bold=!0),Object.keys(n).length>0&&(e=s(e,n)),parseFloat(r.textIndent||0)>0&&(e=(new q.default).insert("\t").concat(e)),e}function w(t,e){var n=t.data;if("O:P"===t.parentNode.tagName)return e.insert(n.trim());if(0===n.trim().length&&t.parentNode.classList.contains("ql-clipboard"))return e;if(!u(t.parentNode).whiteSpace.startsWith("pre")){var r=function(t,e){return e=e.replace(/[^\u00a0]/g,""),e.length<1&&t?" ":e};n=n.replace(/\r\n/g," ").replace(/\n/g," "),n=n.replace(/\s\s+/g,r.bind(r,!0)),(null==t.previousSibling&&f(t.parentNode)||null!=t.previousSibling&&f(t.previousSibling))&&(n=n.replace(/^\s+/,r.bind(r,!1))),(null==t.nextSibling&&f(t.parentNode)||null!=t.nextSibling&&f(t.nextSibling))&&(n=n.replace(/\s+$/,r.bind(r,!1)))}return e.insert(n)}Object.defineProperty(e,"__esModule",{value:!0}),e.matchText=e.matchSpacing=e.matchNewline=e.matchBlot=e.matchAttributor=e.default=void 0;var x="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},k=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),E=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),N=n(2),j=r(N),A=n(4),q=r(A),T=n(0),P=r(T),S=n(6),C=r(S),L=n(10),M=r(L),R=n(7),I=r(R),B=n(34),D=n(35),U=n(13),F=r(U),H=n(24),K=n(36),z=n(37),V=n(38),Z=(0,M.default)("quill:clipboard"),W="__ql-matcher",G=[[Node.TEXT_NODE,w],[Node.TEXT_NODE,m],["br",v],[Node.ELEMENT_NODE,m],[Node.ELEMENT_NODE,y],[Node.ELEMENT_NODE,_],[Node.ELEMENT_NODE,d],[Node.ELEMENT_NODE,O],["li",g],["b",p.bind(p,"bold")],["i",p.bind(p,"italic")],["style",b]],Y=[B.AlignAttribute,K.DirectionAttribute].reduce(function(t,e){return t[e.keyName]=e,t},{}),X=[B.AlignStyle,D.BackgroundStyle,H.ColorStyle,K.DirectionStyle,z.FontStyle,V.SizeStyle].reduce(function(t,e){return t[e.keyName]=e,t},{}),$=function(t){function e(t,n){i(this,e);var r=l(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.quill.root.addEventListener("paste",r.onPaste.bind(r)),r.container=r.quill.addContainer("ql-clipboard"),r.container.setAttribute("contenteditable",!0),r.container.setAttribute("tabindex",-1),r.matchers=[],G.concat(r.options.matchers).forEach(function(t){var e=k(t,2),o=e[0],i=e[1];(n.matchVisual||i!==_)&&r.addMatcher(o,i)}),r}return a(e,t),E(e,[{key:"addMatcher",value:function(t,e){this.matchers.push([t,e])}},{key:"convert",value:function(t){if("string"==typeof t)return this.container.innerHTML=t.replace(/\>\r?\n +\</g,"><"),this.convert();var e=this.quill.getFormat(this.quill.selection.savedRange.index);if(e[F.default.blotName]){var n=this.container.innerText;return this.container.innerHTML="",(new q.default).insert(n,o({},F.default.blotName,e[F.default.blotName]))}var r=this.prepareMatching(),i=k(r,2),l=i[0],a=i[1],s=h(this.container,l,a);return c(s,"\n")&&null==s.ops[s.ops.length-1].attributes&&(s=s.compose((new q.default).retain(s.length()-1).delete(1))),Z.log("convert",this.container.innerHTML,s),this.container.innerHTML="",s}},{key:"dangerouslyPasteHTML",value:function(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:C.default.sources.API;if("string"==typeof t)this.quill.setContents(this.convert(t),e),this.quill.setSelection(0,C.default.sources.SILENT);else{var r=this.convert(e);this.quill.updateContents((new q.default).retain(t).concat(r),n),this.quill.setSelection(t+r.length(),C.default.sources.SILENT)}}},{key:"onPaste",value:function(t){var e=this;if(!t.defaultPrevented&&this.quill.isEnabled()){var n=this.quill.getSelection(),r=(new q.default).retain(n.index),o=this.quill.scrollingContainer.scrollTop;this.container.focus(),this.quill.selection.update(C.default.sources.SILENT),setTimeout(function(){r=r.concat(e.convert()).delete(n.length),e.quill.updateContents(r,C.default.sources.USER),e.quill.setSelection(r.length()-n.length,C.default.sources.SILENT),e.quill.scrollingContainer.scrollTop=o,e.quill.focus()},1)}}},{key:"prepareMatching",value:function(){var t=this,e=[],n=[];return this.matchers.forEach(function(r){var o=k(r,2),i=o[0],l=o[1];switch(i){case Node.TEXT_NODE:n.push(l);break;case Node.ELEMENT_NODE:e.push(l);break;default:[].forEach.call(t.container.querySelectorAll(i),function(t){t[W]=t[W]||[],t[W].push(l)})}}),[e,n]}}]),e}(I.default);$.DEFAULTS={matchers:[],matchVisual:!0},e.default=$,e.matchAttributor=d,e.matchBlot=y,e.matchNewline=m,e.matchSpacing=_,e.matchText=w},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function a(t){var e=t.ops[t.ops.length-1];return null!=e&&(null!=e.insert?"string"==typeof e.insert&&e.insert.endsWith("\n"):null!=e.attributes&&Object.keys(e.attributes).some(function(t){return null!=f.default.query(t,f.default.Scope.BLOCK)}))}function s(t){var e=t.reduce(function(t,e){return t+=e.delete||0},0),n=t.length()-e;return a(t)&&(n-=1),n}Object.defineProperty(e,"__esModule",{value:!0}),e.getLastChangeIndex=e.default=void 0;var u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),c=n(0),f=r(c),h=n(6),p=r(h),d=n(7),y=r(d),v=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.lastRecorded=0,r.ignoreChange=!1,r.clear(),r.quill.on(p.default.events.EDITOR_CHANGE,function(t,e,n,o){t!==p.default.events.TEXT_CHANGE||r.ignoreChange||(r.options.userOnly&&o!==p.default.sources.USER?r.transform(e):r.record(e,n))}),r.quill.keyboard.addBinding({key:"Z",shortKey:!0},r.undo.bind(r)),r.quill.keyboard.addBinding({key:"Z",shortKey:!0,shiftKey:!0},r.redo.bind(r)),/Win/i.test(navigator.platform)&&r.quill.keyboard.addBinding({key:"Y",shortKey:!0},r.redo.bind(r)),r}return l(e,t),u(e,[{key:"change",value:function(t,e){if(0!==this.stack[t].length){var n=this.stack[t].pop();this.stack[e].push(n),this.lastRecorded=0,this.ignoreChange=!0,this.quill.updateContents(n[t],p.default.sources.USER),this.ignoreChange=!1;var r=s(n[t]);this.quill.setSelection(r)}}},{key:"clear",value:function(){this.stack={undo:[],redo:[]}}},{key:"cutoff",value:function(){this.lastRecorded=0}},{key:"record",value:function(t,e){if(0!==t.ops.length){this.stack.redo=[];var n=this.quill.getContents().diff(e),r=Date.now();if(this.lastRecorded+this.options.delay>r&&this.stack.undo.length>0){var o=this.stack.undo.pop();n=n.compose(o.undo),t=o.redo.compose(t)}else this.lastRecorded=r;this.stack.undo.push({redo:t,undo:n}),this.stack.undo.length>this.options.maxStack&&this.stack.undo.shift()}}},{key:"redo",value:function(){this.change("redo","undo")}},{key:"transform",value:function(t){this.stack.undo.forEach(function(e){e.undo=t.transform(e.undo,!0),e.redo=t.transform(e.redo,!0)}),this.stack.redo.forEach(function(e){e.undo=t.transform(e.undo,!0),e.redo=t.transform(e.redo,!0)})}},{key:"undo",value:function(){this.change("undo","redo")}}]),e}(y.default);v.DEFAULTS={delay:1e3,maxStack:100,userOnly:!1},e.default=v,e.getLastChangeIndex=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.IndentClass=void 0;var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(0),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"add",value:function(t,n){if("+1"===n||"-1"===n){var r=this.value(t)||0;n="+1"===n?r+1:r-1}return 0===n?(this.remove(t),!0):a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"add",this).call(this,t,n)}},{key:"canAdd",value:function(t,n){return a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"canAdd",this).call(this,t,n)||a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"canAdd",this).call(this,t,parseInt(n))}},{key:"value",value:function(t){return parseInt(a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"value",this).call(this,t))||void 0}}]),e}(u.default.Attributor.Class),f=new c("indent","ql-indent",{scope:u.default.Scope.BLOCK,whitelist:[1,2,3,4,5,6,7,8]});e.IndentClass=f},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=n(3),a=function(t){return t&&t.__esModule?t:{default:t}}(l),s=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),e}(a.default);s.blotName="blockquote",s.tagName="blockquote",e.default=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=n(3),s=function(t){return t&&t.__esModule?t:{default:t}}(a),u=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,null,[{key:"formats",value:function(t){return this.tagName.indexOf(t.tagName)+1}}]),e}(s.default);u.blotName="header",u.tagName=["H1","H2","H3","H4","H5","H6"],e.default=u},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function a(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.ListItem=void 0;var s=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),u=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},c=n(0),f=r(c),h=n(3),p=r(h),d=n(23),y=r(d),v=function(t){function e(){return i(this,e),l(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return a(e,t),s(e,[{key:"format",value:function(t,n){t!==b.blotName||n?u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n):this.replaceWith(f.default.create(this.statics.scope))}},{key:"remove",value:function(){null==this.prev&&null==this.next?this.parent.remove():u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"remove",this).call(this)}},{key:"replaceWith",value:function(t,n){return this.parent.isolate(this.offset(this.parent),this.length()),t===this.parent.statics.blotName?(this.parent.replaceWith(t,n),this):(this.parent.unwrap(),u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"replaceWith",this).call(this,t,n))}}],[{key:"formats",value:function(t){return t.tagName===this.tagName?void 0:u(e.__proto__||Object.getPrototypeOf(e),"formats",this).call(this,t)}}]),e}(p.default);v.blotName="list-item",v.tagName="LI";var b=function(t){function e(t){i(this,e);var n=l(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t)),r=function(e){if(e.target.parentNode===t){var r=n.statics.formats(t),o=f.default.find(e.target);"checked"===r?o.format("list","unchecked"):"unchecked"===r&&o.format("list","checked")}};return t.addEventListener("touchstart",r),t.addEventListener("mousedown",r),n}return a(e,t),s(e,null,[{key:"create",value:function(t){var n="ordered"===t?"OL":"UL",r=u(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,n);return"checked"!==t&&"unchecked"!==t||r.setAttribute("data-checked","checked"===t),r}},{key:"formats",value:function(t){return"OL"===t.tagName?"ordered":"UL"===t.tagName?t.hasAttribute("data-checked")?"true"===t.getAttribute("data-checked")?"checked":"unchecked":"bullet":void 0}}]),s(e,[{key:"format",value:function(t,e){this.children.length>0&&this.children.tail.format(t,e)}},{key:"formats",value:function(){return o({},this.statics.blotName,this.statics.formats(this.domNode))}},{key:"insertBefore",value:function(t,n){if(t instanceof v)u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"insertBefore",this).call(this,t,n);else{var r=null==n?this.length():n.offset(this),o=this.split(r);o.parent.insertBefore(t,o)}}},{key:"optimize",value:function(t){u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"optimize",this).call(this,t);var n=this.next;null!=n&&n.prev===this&&n.statics.blotName===this.statics.blotName&&n.domNode.tagName===this.domNode.tagName&&n.domNode.getAttribute("data-checked")===this.domNode.getAttribute("data-checked")&&(n.moveChildren(this),n.remove())}},{key:"replace",value:function(t){if(t.statics.blotName!==this.statics.blotName){var n=f.default.create(this.statics.defaultChild);t.moveChildren(n),this.appendChild(n)}u(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"replace",this).call(this,t)}}]),e}(y.default);b.blotName="list",b.scope=f.default.Scope.BLOCK_BLOT,b.tagName=["OL","UL"],b.defaultChild="list-item",b.allowedChildren=[v],e.ListItem=v,e.default=b},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=n(39),a=function(t){return t&&t.__esModule?t:{default:t}}(l),s=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),e}(a.default);s.blotName="italic",s.tagName=["EM","I"],e.default=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(5),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,null,[{key:"create",value:function(t){return"super"===t?document.createElement("sup"):"sub"===t?document.createElement("sub"):a(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t)}},{key:"formats",value:function(t){return"SUB"===t.tagName?"sub":"SUP"===t.tagName?"super":void 0}}]),e}(u.default);c.blotName="script",c.tagName=["SUB","SUP"],e.default=c},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=n(5),a=function(t){return t&&t.__esModule?t:{default:t}}(l),s=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),e}(a.default);s.blotName="strike",s.tagName="S",e.default=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=n(5),a=function(t){return t&&t.__esModule?t:{default:t}}(l),s=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),e}(a.default);s.blotName="underline",s.tagName="U",e.default=s},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(0),u=function(t){return t&&t.__esModule?t:{default:t}}(s),c=n(15),f=["alt","height","width"],h=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"format",value:function(t,n){f.indexOf(t)>-1?n?this.domNode.setAttribute(t,n):this.domNode.removeAttribute(t):a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n)}}],[{key:"create",value:function(t){var n=a(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t);return"string"==typeof t&&n.setAttribute("src",this.sanitize(t)),n}},{key:"formats",value:function(t){return f.reduce(function(e,n){return t.hasAttribute(n)&&(e[n]=t.getAttribute(n)),e},{})}},{key:"match",value:function(t){return/\.(jpe?g|gif|png)$/.test(t)||/^data:image\/.+;base64/.test(t)}},{key:"sanitize",value:function(t){return(0,c.sanitize)(t,["http","https","data"])?t:"//:0"}},{key:"value",value:function(t){return t.getAttribute("src")}}]),e}(u.default.Embed);h.blotName="image",h.tagName="IMG",e.default=h},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var l=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=n(3),u=n(15),c=function(t){return t&&t.__esModule?t:{default:t}}(u),f=["height","width"],h=function(t){function e(){return r(this,e),o(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return i(e,t),l(e,[{key:"format",value:function(t,n){f.indexOf(t)>-1?n?this.domNode.setAttribute(t,n):this.domNode.removeAttribute(t):a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"format",this).call(this,t,n)}}],[{key:"create",value:function(t){var n=a(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t);return n.setAttribute("frameborder","0"),n.setAttribute("allowfullscreen",!0),n.setAttribute("src",this.sanitize(t)),n}},{key:"formats",value:function(t){return f.reduce(function(e,n){return t.hasAttribute(n)&&(e[n]=t.getAttribute(n)),e},{})}},{key:"sanitize",value:function(t){return c.default.sanitize(t)}},{key:"value",value:function(t){return t.getAttribute("src")}}]),e}(s.BlockEmbed);h.blotName="video",h.className="ql-video",h.tagName="IFRAME",e.default=h},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.FormulaBlot=void 0;var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(33),c=r(u),f=n(6),h=r(f),p=n(7),d=r(p),y=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),a(e,null,[{key:"create",value:function(t){var n=s(e.__proto__||Object.getPrototypeOf(e),"create",this).call(this,t);return"string"==typeof t&&(window.katex.render(t,n,{throwOnError:!1,errorColor:"#f00"}),n.setAttribute("data-value",t)),n}},{key:"value",value:function(t){return t.getAttribute("data-value")}}]),e}(c.default);y.blotName="formula",y.className="ql-formula",y.tagName="SPAN";var v=function(t){function e(){o(this,e);var t=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this));if(null==window.katex)throw new Error("Formula module requires KaTeX.");return t}return l(e,t),a(e,null,[{key:"register",value:function(){h.default.register(y,!0)}}]),e}(d.default);e.FormulaBlot=y,e.default=v},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.CodeToken=e.CodeBlock=void 0;var a=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=n(0),c=r(u),f=n(6),h=r(f),p=n(7),d=r(p),y=n(13),v=r(y),b=function(t){function e(){return o(this,e),i(this,(e.__proto__||Object.getPrototypeOf(e)).apply(this,arguments))}return l(e,t),a(e,[{key:"replaceWith",value:function(t){this.domNode.textContent=this.domNode.textContent,this.attach(),s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"replaceWith",this).call(this,t)}},{key:"highlight",value:function(t){var e=this.domNode.textContent;this.cachedText!==e&&((e.trim().length>0||null==this.cachedText)&&(this.domNode.innerHTML=t(e),this.domNode.normalize(),this.attach()),this.cachedText=e)}}]),e}(v.default);b.className="ql-syntax";var g=new c.default.Attributor.Class("token","hljs",{scope:c.default.Scope.INLINE}),m=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));if("function"!=typeof r.options.highlight)throw new Error("Syntax module requires highlight.js. Please include the library on the page before Quill.");var l=null;return r.quill.on(h.default.events.SCROLL_OPTIMIZE,function(){clearTimeout(l),l=setTimeout(function(){r.highlight(),l=null},r.options.interval)}),r.highlight(),r}return l(e,t),a(e,null,[{key:"register",value:function(){h.default.register(g,!0),h.default.register(b,!0)}}]),a(e,[{key:"highlight",value:function(){var t=this;if(!this.quill.selection.composing){this.quill.update(h.default.sources.USER);var e=this.quill.getSelection();this.quill.scroll.descendants(b).forEach(function(e){e.highlight(t.options.highlight)}),this.quill.update(h.default.sources.SILENT),null!=e&&this.quill.setSelection(e,h.default.sources.SILENT)}}}]),e}(d.default);m.DEFAULTS={highlight:function(){return null==window.hljs?null:function(t){return window.hljs.highlightAuto(t).value}}(),interval:1e3},e.CodeBlock=b,e.CodeToken=g,e.default=m},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function a(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function s(t,e,n){var r=document.createElement("button");r.setAttribute("type","button"),r.classList.add("ql-"+e),null!=n&&(r.value=n),t.appendChild(r)}function u(t,e){Array.isArray(e[0])||(e=[e]),e.forEach(function(e){var n=document.createElement("span");n.classList.add("ql-formats"),e.forEach(function(t){if("string"==typeof t)s(n,t);else{var e=Object.keys(t)[0],r=t[e];Array.isArray(r)?c(n,e,r):s(n,e,r)}}),t.appendChild(n)})}function c(t,e,n){var r=document.createElement("select");r.classList.add("ql-"+e),n.forEach(function(t){var e=document.createElement("option");!1!==t?e.setAttribute("value",t):e.setAttribute("selected","selected"),r.appendChild(e)}),t.appendChild(r)}Object.defineProperty(e,"__esModule",{value:!0}),e.addControls=e.default=void 0;var f=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),h=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),p=n(4),d=r(p),y=n(0),v=r(y),b=n(6),g=r(b),m=n(10),_=r(m),O=n(7),w=r(O),x=(0,_.default)("quill:toolbar"),k=function(t){function e(t,n){i(this,e);var r=l(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));if(Array.isArray(r.options.container)){var o=document.createElement("div");u(o,r.options.container),t.container.parentNode.insertBefore(o,t.container),r.container=o}else"string"==typeof r.options.container?r.container=document.querySelector(r.options.container):r.container=r.options.container;if(!(r.container instanceof HTMLElement)){var a;return a=x.error("Container required for toolbar",r.options),l(r,a)}return r.container.classList.add("ql-toolbar"),r.controls=[],r.handlers={},Object.keys(r.options.handlers).forEach(function(t){r.addHandler(t,r.options.handlers[t])}),[].forEach.call(r.container.querySelectorAll("button, select"),function(t){r.attach(t)}),r.quill.on(g.default.events.EDITOR_CHANGE,function(t,e){t===g.default.events.SELECTION_CHANGE&&r.update(e)}),r.quill.on(g.default.events.SCROLL_OPTIMIZE,function(){var t=r.quill.selection.getRange(),e=f(t,1),n=e[0];r.update(n)}),r}return a(e,t),h(e,[{key:"addHandler",value:function(t,e){this.handlers[t]=e}},{key:"attach",value:function(t){var e=this,n=[].find.call(t.classList,function(t){return 0===t.indexOf("ql-")});if(n){if(n=n.slice("ql-".length),"BUTTON"===t.tagName&&t.setAttribute("type","button"),null==this.handlers[n]){if(null!=this.quill.scroll.whitelist&&null==this.quill.scroll.whitelist[n])return void x.warn("ignoring attaching to disabled format",n,t);if(null==v.default.query(n))return void x.warn("ignoring attaching to nonexistent format",n,t)}var r="SELECT"===t.tagName?"change":"click";t.addEventListener(r,function(r){var i=void 0;if("SELECT"===t.tagName){if(t.selectedIndex<0)return;var l=t.options[t.selectedIndex];i=!l.hasAttribute("selected")&&(l.value||!1)}else i=!t.classList.contains("ql-active")&&(t.value||!t.hasAttribute("value")),r.preventDefault();e.quill.focus();var a=e.quill.selection.getRange(),s=f(a,1),u=s[0];if(null!=e.handlers[n])e.handlers[n].call(e,i);else if(v.default.query(n).prototype instanceof v.default.Embed){if(!(i=prompt("Enter "+n)))return;e.quill.updateContents((new d.default).retain(u.index).delete(u.length).insert(o({},n,i)),g.default.sources.USER)}else e.quill.format(n,i,g.default.sources.USER);e.update(u)}),this.controls.push([n,t])}}},{key:"update",value:function(t){var e=null==t?{}:this.quill.getFormat(t);this.controls.forEach(function(n){var r=f(n,2),o=r[0],i=r[1];if("SELECT"===i.tagName){var l=void 0;if(null==t)l=null;else if(null==e[o])l=i.querySelector("option[selected]");else if(!Array.isArray(e[o])){var a=e[o];"string"==typeof a&&(a=a.replace(/\"/g,'\\"')),l=i.querySelector('option[value="'+a+'"]')}null==l?(i.value="",i.selectedIndex=-1):l.selected=!0}else if(null==t)i.classList.remove("ql-active");else if(i.hasAttribute("value")){var s=e[o]===i.getAttribute("value")||null!=e[o]&&e[o].toString()===i.getAttribute("value")||null==e[o]&&!i.getAttribute("value");i.classList.toggle("ql-active",s)}else i.classList.toggle("ql-active",null!=e[o])})}}]),e}(w.default);k.DEFAULTS={},k.DEFAULTS={container:null,handlers:{clean:function(){var t=this,e=this.quill.getSelection();if(null!=e)if(0==e.length){var n=this.quill.getFormat();Object.keys(n).forEach(function(e){null!=v.default.query(e,v.default.Scope.INLINE)&&t.quill.format(e,!1)})}else this.quill.removeFormat(e,g.default.sources.USER)},direction:function(t){var e=this.quill.getFormat().align;"rtl"===t&&null==e?this.quill.format("align","right",g.default.sources.USER):t||"right"!==e||this.quill.format("align",!1,g.default.sources.USER),this.quill.format("direction",t,g.default.sources.USER)},indent:function(t){var e=this.quill.getSelection(),n=this.quill.getFormat(e),r=parseInt(n.indent||0);if("+1"===t||"-1"===t){var o="+1"===t?1:-1;"rtl"===n.direction&&(o*=-1),this.quill.format("indent",r+o,g.default.sources.USER)}},link:function(t){!0===t&&(t=prompt("Enter link URL:")),this.quill.format("link",t,g.default.sources.USER)},list:function(t){var e=this.quill.getSelection(),n=this.quill.getFormat(e);"check"===t?"checked"===n.list||"unchecked"===n.list?this.quill.format("list",!1,g.default.sources.USER):this.quill.format("list","unchecked",g.default.sources.USER):this.quill.format("list",t,g.default.sources.USER)}}},e.default=k,e.addControls=u},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=3 x2=15 y1=9 y2=9></line> <line class=ql-stroke x1=3 x2=13 y1=14 y2=14></line> <line class=ql-stroke x1=3 x2=9 y1=4 y2=4></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=15 x2=3 y1=9 y2=9></line> <line class=ql-stroke x1=14 x2=4 y1=14 y2=14></line> <line class=ql-stroke x1=12 x2=6 y1=4 y2=4></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=15 x2=3 y1=9 y2=9></line> <line class=ql-stroke x1=15 x2=5 y1=14 y2=14></line> <line class=ql-stroke x1=15 x2=9 y1=4 y2=4></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=15 x2=3 y1=9 y2=9></line> <line class=ql-stroke x1=15 x2=3 y1=14 y2=14></line> <line class=ql-stroke x1=15 x2=3 y1=4 y2=4></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <g class="ql-fill ql-color-label"> <polygon points="6 6.868 6 6 5 6 5 7 5.942 7 6 6.868"></polygon> <rect height=1 width=1 x=4 y=4></rect> <polygon points="6.817 5 6 5 6 6 6.38 6 6.817 5"></polygon> <rect height=1 width=1 x=2 y=6></rect> <rect height=1 width=1 x=3 y=5></rect> <rect height=1 width=1 x=4 y=7></rect> <polygon points="4 11.439 4 11 3 11 3 12 3.755 12 4 11.439"></polygon> <rect height=1 width=1 x=2 y=12></rect> <rect height=1 width=1 x=2 y=9></rect> <rect height=1 width=1 x=2 y=15></rect> <polygon points="4.63 10 4 10 4 11 4.192 11 4.63 10"></polygon> <rect height=1 width=1 x=3 y=8></rect> <path d=M10.832,4.2L11,4.582V4H10.708A1.948,1.948,0,0,1,10.832,4.2Z></path> <path d=M7,4.582L7.168,4.2A1.929,1.929,0,0,1,7.292,4H7V4.582Z></path> <path d=M8,13H7.683l-0.351.8a1.933,1.933,0,0,1-.124.2H8V13Z></path> <rect height=1 width=1 x=12 y=2></rect> <rect height=1 width=1 x=11 y=3></rect> <path d=M9,3H8V3.282A1.985,1.985,0,0,1,9,3Z></path> <rect height=1 width=1 x=2 y=3></rect> <rect height=1 width=1 x=6 y=2></rect> <rect height=1 width=1 x=3 y=2></rect> <rect height=1 width=1 x=5 y=3></rect> <rect height=1 width=1 x=9 y=2></rect> <rect height=1 width=1 x=15 y=14></rect> <polygon points="13.447 10.174 13.469 10.225 13.472 10.232 13.808 11 14 11 14 10 13.37 10 13.447 10.174"></polygon> <rect height=1 width=1 x=13 y=7></rect> <rect height=1 width=1 x=15 y=5></rect> <rect height=1 width=1 x=14 y=6></rect> <rect height=1 width=1 x=15 y=8></rect> <rect height=1 width=1 x=14 y=9></rect> <path d=M3.775,14H3v1H4V14.314A1.97,1.97,0,0,1,3.775,14Z></path> <rect height=1 width=1 x=14 y=3></rect> <polygon points="12 6.868 12 6 11.62 6 12 6.868"></polygon> <rect height=1 width=1 x=15 y=2></rect> <rect height=1 width=1 x=12 y=5></rect> <rect height=1 width=1 x=13 y=4></rect> <polygon points="12.933 9 13 9 13 8 12.495 8 12.933 9"></polygon> <rect height=1 width=1 x=9 y=14></rect> <rect height=1 width=1 x=8 y=15></rect> <path d=M6,14.926V15H7V14.316A1.993,1.993,0,0,1,6,14.926Z></path> <rect height=1 width=1 x=5 y=15></rect> <path d=M10.668,13.8L10.317,13H10v1h0.792A1.947,1.947,0,0,1,10.668,13.8Z></path> <rect height=1 width=1 x=11 y=15></rect> <path d=M14.332,12.2a1.99,1.99,0,0,1,.166.8H15V12H14.245Z></path> <rect height=1 width=1 x=14 y=15></rect> <rect height=1 width=1 x=15 y=11></rect> </g> <polyline class=ql-stroke points="5.5 13 9 5 12.5 13"></polyline> <line class=ql-stroke x1=11.63 x2=6.38 y1=11 y2=11></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <rect class="ql-fill ql-stroke" height=3 width=3 x=4 y=5></rect> <rect class="ql-fill ql-stroke" height=3 width=3 x=11 y=5></rect> <path class="ql-even ql-fill ql-stroke" d=M7,8c0,4.031-3,5-3,5></path> <path class="ql-even ql-fill ql-stroke" d=M14,8c0,4.031-3,5-3,5></path> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-stroke d=M5,4H9.5A2.5,2.5,0,0,1,12,6.5v0A2.5,2.5,0,0,1,9.5,9H5A0,0,0,0,1,5,9V4A0,0,0,0,1,5,4Z></path> <path class=ql-stroke d=M5,9h5.5A2.5,2.5,0,0,1,13,11.5v0A2.5,2.5,0,0,1,10.5,14H5a0,0,0,0,1,0,0V9A0,0,0,0,1,5,9Z></path> </svg>'},function(t,e){t.exports='<svg class="" viewbox="0 0 18 18"> <line class=ql-stroke x1=5 x2=13 y1=3 y2=3></line> <line class=ql-stroke x1=6 x2=9.35 y1=12 y2=3></line> <line class=ql-stroke x1=11 x2=15 y1=11 y2=15></line> <line class=ql-stroke x1=15 x2=11 y1=11 y2=15></line> <rect class=ql-fill height=1 rx=0.5 ry=0.5 width=7 x=2 y=14></rect> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class="ql-color-label ql-stroke ql-transparent" x1=3 x2=15 y1=15 y2=15></line> <polyline class=ql-stroke points="5.5 11 9 3 12.5 11"></polyline> <line class=ql-stroke x1=11.63 x2=6.38 y1=9 y2=9></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <polygon class="ql-stroke ql-fill" points="3 11 5 9 3 7 3 11"></polygon> <line class="ql-stroke ql-fill" x1=15 x2=11 y1=4 y2=4></line> <path class=ql-fill d=M11,3a3,3,0,0,0,0,6h1V3H11Z></path> <rect class=ql-fill height=11 width=1 x=11 y=4></rect> <rect class=ql-fill height=11 width=1 x=13 y=4></rect> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <polygon class="ql-stroke ql-fill" points="15 12 13 10 15 8 15 12"></polygon> <line class="ql-stroke ql-fill" x1=9 x2=5 y1=4 y2=4></line> <path class=ql-fill d=M5,3A3,3,0,0,0,5,9H6V3H5Z></path> <rect class=ql-fill height=11 width=1 x=5 y=4></rect> <rect class=ql-fill height=11 width=1 x=7 y=4></rect> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M14,16H4a1,1,0,0,1,0-2H14A1,1,0,0,1,14,16Z /> <path class=ql-fill d=M14,4H4A1,1,0,0,1,4,2H14A1,1,0,0,1,14,4Z /> <rect class=ql-fill x=3 y=6 width=12 height=6 rx=1 ry=1 /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M13,16H5a1,1,0,0,1,0-2h8A1,1,0,0,1,13,16Z /> <path class=ql-fill d=M13,4H5A1,1,0,0,1,5,2h8A1,1,0,0,1,13,4Z /> <rect class=ql-fill x=2 y=6 width=14 height=6 rx=1 ry=1 /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M15,8H13a1,1,0,0,1,0-2h2A1,1,0,0,1,15,8Z /> <path class=ql-fill d=M15,12H13a1,1,0,0,1,0-2h2A1,1,0,0,1,15,12Z /> <path class=ql-fill d=M15,16H5a1,1,0,0,1,0-2H15A1,1,0,0,1,15,16Z /> <path class=ql-fill d=M15,4H5A1,1,0,0,1,5,2H15A1,1,0,0,1,15,4Z /> <rect class=ql-fill x=2 y=6 width=8 height=6 rx=1 ry=1 /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M5,8H3A1,1,0,0,1,3,6H5A1,1,0,0,1,5,8Z /> <path class=ql-fill d=M5,12H3a1,1,0,0,1,0-2H5A1,1,0,0,1,5,12Z /> <path class=ql-fill d=M13,16H3a1,1,0,0,1,0-2H13A1,1,0,0,1,13,16Z /> <path class=ql-fill d=M13,4H3A1,1,0,0,1,3,2H13A1,1,0,0,1,13,4Z /> <rect class=ql-fill x=8 y=6 width=8 height=6 rx=1 ry=1 transform="translate(24 18) rotate(-180)"/> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M11.759,2.482a2.561,2.561,0,0,0-3.53.607A7.656,7.656,0,0,0,6.8,6.2C6.109,9.188,5.275,14.677,4.15,14.927a1.545,1.545,0,0,0-1.3-.933A0.922,0.922,0,0,0,2,15.036S1.954,16,4.119,16s3.091-2.691,3.7-5.553c0.177-.826.36-1.726,0.554-2.6L8.775,6.2c0.381-1.421.807-2.521,1.306-2.676a1.014,1.014,0,0,0,1.02.56A0.966,0.966,0,0,0,11.759,2.482Z></path> <rect class=ql-fill height=1.6 rx=0.8 ry=0.8 width=5 x=5.15 y=6.2></rect> <path class=ql-fill d=M13.663,12.027a1.662,1.662,0,0,1,.266-0.276q0.193,0.069.456,0.138a2.1,2.1,0,0,0,.535.069,1.075,1.075,0,0,0,.767-0.3,1.044,1.044,0,0,0,.314-0.8,0.84,0.84,0,0,0-.238-0.619,0.8,0.8,0,0,0-.594-0.239,1.154,1.154,0,0,0-.781.3,4.607,4.607,0,0,0-.781,1q-0.091.15-.218,0.346l-0.246.38c-0.068-.288-0.137-0.582-0.212-0.885-0.459-1.847-2.494-.984-2.941-0.8-0.482.2-.353,0.647-0.094,0.529a0.869,0.869,0,0,1,1.281.585c0.217,0.751.377,1.436,0.527,2.038a5.688,5.688,0,0,1-.362.467,2.69,2.69,0,0,1-.264.271q-0.221-.08-0.471-0.147a2.029,2.029,0,0,0-.522-0.066,1.079,1.079,0,0,0-.768.3A1.058,1.058,0,0,0,9,15.131a0.82,0.82,0,0,0,.832.852,1.134,1.134,0,0,0,.787-0.3,5.11,5.11,0,0,0,.776-0.993q0.141-.219.215-0.34c0.046-.076.122-0.194,0.223-0.346a2.786,2.786,0,0,0,.918,1.726,2.582,2.582,0,0,0,2.376-.185c0.317-.181.212-0.565,0-0.494A0.807,0.807,0,0,1,14.176,15a5.159,5.159,0,0,1-.913-2.446l0,0Q13.487,12.24,13.663,12.027Z></path> </svg>'},function(t,e){t.exports='<svg viewBox="0 0 18 18"> <path class=ql-fill d=M10,4V14a1,1,0,0,1-2,0V10H3v4a1,1,0,0,1-2,0V4A1,1,0,0,1,3,4V8H8V4a1,1,0,0,1,2,0Zm6.06787,9.209H14.98975V7.59863a.54085.54085,0,0,0-.605-.60547h-.62744a1.01119,1.01119,0,0,0-.748.29688L11.645,8.56641a.5435.5435,0,0,0-.022.8584l.28613.30762a.53861.53861,0,0,0,.84717.0332l.09912-.08789a1.2137,1.2137,0,0,0,.2417-.35254h.02246s-.01123.30859-.01123.60547V13.209H12.041a.54085.54085,0,0,0-.605.60547v.43945a.54085.54085,0,0,0,.605.60547h4.02686a.54085.54085,0,0,0,.605-.60547v-.43945A.54085.54085,0,0,0,16.06787,13.209Z /> </svg>'},function(t,e){t.exports='<svg viewBox="0 0 18 18"> <path class=ql-fill d=M16.73975,13.81445v.43945a.54085.54085,0,0,1-.605.60547H11.855a.58392.58392,0,0,1-.64893-.60547V14.0127c0-2.90527,3.39941-3.42187,3.39941-4.55469a.77675.77675,0,0,0-.84717-.78125,1.17684,1.17684,0,0,0-.83594.38477c-.2749.26367-.561.374-.85791.13184l-.4292-.34082c-.30811-.24219-.38525-.51758-.1543-.81445a2.97155,2.97155,0,0,1,2.45361-1.17676,2.45393,2.45393,0,0,1,2.68408,2.40918c0,2.45312-3.1792,2.92676-3.27832,3.93848h2.79443A.54085.54085,0,0,1,16.73975,13.81445ZM9,3A.99974.99974,0,0,0,8,4V8H3V4A1,1,0,0,0,1,4V14a1,1,0,0,0,2,0V10H8v4a1,1,0,0,0,2,0V4A.99974.99974,0,0,0,9,3Z /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=7 x2=13 y1=4 y2=4></line> <line class=ql-stroke x1=5 x2=11 y1=14 y2=14></line> <line class=ql-stroke x1=8 x2=10 y1=14 y2=4></line> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <rect class=ql-stroke height=10 width=12 x=3 y=4></rect> <circle class=ql-fill cx=6 cy=7 r=1></circle> <polyline class="ql-even ql-fill" points="5 12 5 11 7 9 8 10 11 7 13 9 13 12 5 12"></polyline> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=3 x2=15 y1=14 y2=14></line> <line class=ql-stroke x1=3 x2=15 y1=4 y2=4></line> <line class=ql-stroke x1=9 x2=15 y1=9 y2=9></line> <polyline class="ql-fill ql-stroke" points="3 7 3 11 5 9 3 7"></polyline> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=3 x2=15 y1=14 y2=14></line> <line class=ql-stroke x1=3 x2=15 y1=4 y2=4></line> <line class=ql-stroke x1=9 x2=15 y1=9 y2=9></line> <polyline class=ql-stroke points="5 7 5 11 3 9 5 7"></polyline> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=7 x2=11 y1=7 y2=11></line> <path class="ql-even ql-stroke" d=M8.9,4.577a3.476,3.476,0,0,1,.36,4.679A3.476,3.476,0,0,1,4.577,8.9C3.185,7.5,2.035,6.4,4.217,4.217S7.5,3.185,8.9,4.577Z></path> <path class="ql-even ql-stroke" d=M13.423,9.1a3.476,3.476,0,0,0-4.679-.36,3.476,3.476,0,0,0,.36,4.679c1.392,1.392,2.5,2.542,4.679.36S14.815,10.5,13.423,9.1Z></path> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=7 x2=15 y1=4 y2=4></line> <line class=ql-stroke x1=7 x2=15 y1=9 y2=9></line> <line class=ql-stroke x1=7 x2=15 y1=14 y2=14></line> <line class="ql-stroke ql-thin" x1=2.5 x2=4.5 y1=5.5 y2=5.5></line> <path class=ql-fill d=M3.5,6A0.5,0.5,0,0,1,3,5.5V3.085l-0.276.138A0.5,0.5,0,0,1,2.053,3c-0.124-.247-0.023-0.324.224-0.447l1-.5A0.5,0.5,0,0,1,4,2.5v3A0.5,0.5,0,0,1,3.5,6Z></path> <path class="ql-stroke ql-thin" d=M4.5,10.5h-2c0-.234,1.85-1.076,1.85-2.234A0.959,0.959,0,0,0,2.5,8.156></path> <path class="ql-stroke ql-thin" d=M2.5,14.846a0.959,0.959,0,0,0,1.85-.109A0.7,0.7,0,0,0,3.75,14a0.688,0.688,0,0,0,.6-0.736,0.959,0.959,0,0,0-1.85-.109></path> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class=ql-stroke x1=6 x2=15 y1=4 y2=4></line> <line class=ql-stroke x1=6 x2=15 y1=9 y2=9></line> <line class=ql-stroke x1=6 x2=15 y1=14 y2=14></line> <line class=ql-stroke x1=3 x2=3 y1=4 y2=4></line> <line class=ql-stroke x1=3 x2=3 y1=9 y2=9></line> <line class=ql-stroke x1=3 x2=3 y1=14 y2=14></line> </svg>'},function(t,e){t.exports='<svg class="" viewbox="0 0 18 18"> <line class=ql-stroke x1=9 x2=15 y1=4 y2=4></line> <polyline class=ql-stroke points="3 4 4 5 6 3"></polyline> <line class=ql-stroke x1=9 x2=15 y1=14 y2=14></line> <polyline class=ql-stroke points="3 14 4 15 6 13"></polyline> <line class=ql-stroke x1=9 x2=15 y1=9 y2=9></line> <polyline class=ql-stroke points="3 9 4 10 6 8"></polyline> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M15.5,15H13.861a3.858,3.858,0,0,0,1.914-2.975,1.8,1.8,0,0,0-1.6-1.751A1.921,1.921,0,0,0,12.021,11.7a0.50013,0.50013,0,1,0,.957.291h0a0.914,0.914,0,0,1,1.053-.725,0.81,0.81,0,0,1,.744.762c0,1.076-1.16971,1.86982-1.93971,2.43082A1.45639,1.45639,0,0,0,12,15.5a0.5,0.5,0,0,0,.5.5h3A0.5,0.5,0,0,0,15.5,15Z /> <path class=ql-fill d=M9.65,5.241a1,1,0,0,0-1.409.108L6,7.964,3.759,5.349A1,1,0,0,0,2.192,6.59178Q2.21541,6.6213,2.241,6.649L4.684,9.5,2.241,12.35A1,1,0,0,0,3.71,13.70722q0.02557-.02768.049-0.05722L6,11.036,8.241,13.65a1,1,0,1,0,1.567-1.24277Q9.78459,12.3777,9.759,12.35L7.316,9.5,9.759,6.651A1,1,0,0,0,9.65,5.241Z /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-fill d=M15.5,7H13.861a4.015,4.015,0,0,0,1.914-2.975,1.8,1.8,0,0,0-1.6-1.751A1.922,1.922,0,0,0,12.021,3.7a0.5,0.5,0,1,0,.957.291,0.917,0.917,0,0,1,1.053-.725,0.81,0.81,0,0,1,.744.762c0,1.077-1.164,1.925-1.934,2.486A1.423,1.423,0,0,0,12,7.5a0.5,0.5,0,0,0,.5.5h3A0.5,0.5,0,0,0,15.5,7Z /> <path class=ql-fill d=M9.651,5.241a1,1,0,0,0-1.41.108L6,7.964,3.759,5.349a1,1,0,1,0-1.519,1.3L4.683,9.5,2.241,12.35a1,1,0,1,0,1.519,1.3L6,11.036,8.241,13.65a1,1,0,0,0,1.519-1.3L7.317,9.5,9.759,6.651A1,1,0,0,0,9.651,5.241Z /> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <line class="ql-stroke ql-thin" x1=15.5 x2=2.5 y1=8.5 y2=9.5></line> <path class=ql-fill d=M9.007,8C6.542,7.791,6,7.519,6,6.5,6,5.792,7.283,5,9,5c1.571,0,2.765.679,2.969,1.309a1,1,0,0,0,1.9-.617C13.356,4.106,11.354,3,9,3,6.2,3,4,4.538,4,6.5a3.2,3.2,0,0,0,.5,1.843Z></path> <path class=ql-fill d=M8.984,10C11.457,10.208,12,10.479,12,11.5c0,0.708-1.283,1.5-3,1.5-1.571,0-2.765-.679-2.969-1.309a1,1,0,1,0-1.9.617C4.644,13.894,6.646,15,9,15c2.8,0,5-1.538,5-3.5a3.2,3.2,0,0,0-.5-1.843Z></path> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <path class=ql-stroke d=M5,3V9a4.012,4.012,0,0,0,4,4H9a4.012,4.012,0,0,0,4-4V3></path> <rect class=ql-fill height=1 rx=0.5 ry=0.5 width=12 x=3 y=15></rect> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <rect class=ql-stroke height=12 width=12 x=3 y=3></rect> <rect class=ql-fill height=12 width=1 x=5 y=3></rect> <rect class=ql-fill height=12 width=1 x=12 y=3></rect> <rect class=ql-fill height=2 width=8 x=5 y=8></rect> <rect class=ql-fill height=1 width=3 x=3 y=5></rect> <rect class=ql-fill height=1 width=3 x=3 y=7></rect> <rect class=ql-fill height=1 width=3 x=3 y=10></rect> <rect class=ql-fill height=1 width=3 x=3 y=12></rect> <rect class=ql-fill height=1 width=3 x=12 y=5></rect> <rect class=ql-fill height=1 width=3 x=12 y=7></rect> <rect class=ql-fill height=1 width=3 x=12 y=10></rect> <rect class=ql-fill height=1 width=3 x=12 y=12></rect> </svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18"> <polygon class=ql-stroke points="7 11 9 13 11 11 7 11"></polygon> <polygon class=ql-stroke points="7 7 9 5 11 7 7 7"></polygon> </svg>'},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0}),e.default=e.BubbleTooltip=void 0;var a=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},s=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),u=n(2),c=r(u),f=n(9),h=r(f),p=n(44),d=r(p),y=n(22),v=n(26),b=r(v),g=[["bold","italic","link"],[{header:1},{header:2},"blockquote"]],m=function(t){function e(t,n){o(this,e),null!=n.modules.toolbar&&null==n.modules.toolbar.container&&(n.modules.toolbar.container=g);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.quill.container.classList.add("ql-bubble"),r}return l(e,t),s(e,[{key:"extendToolbar",value:function(t){this.tooltip=new _(this.quill,this.options.bounds),this.tooltip.root.appendChild(t.container),this.buildButtons([].slice.call(t.container.querySelectorAll("button")),b.default),this.buildPickers([].slice.call(t.container.querySelectorAll("select")),b.default)}}]),e}(d.default);m.DEFAULTS=(0,c.default)(!0,{},d.default.DEFAULTS,{modules:{toolbar:{handlers:{link:function(t){t?this.quill.theme.tooltip.edit():this.quill.format("link",!1)}}}}});var _=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.quill.on(h.default.events.EDITOR_CHANGE,function(t,e,n,o){if(t===h.default.events.SELECTION_CHANGE)if(null!=e&&e.length>0&&o===h.default.sources.USER){r.show(),r.root.style.left="0px",r.root.style.width="",r.root.style.width=r.root.offsetWidth+"px";var i=r.quill.getLines(e.index,e.length);if(1===i.length)r.position(r.quill.getBounds(e));else{var l=i[i.length-1],a=r.quill.getIndex(l),s=Math.min(l.length()-1,e.index+e.length-a),u=r.quill.getBounds(new y.Range(a,s));r.position(u)}}else document.activeElement!==r.textbox&&r.quill.hasFocus()&&r.hide()}),r}return l(e,t),s(e,[{key:"listen",value:function(){var t=this;a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"listen",this).call(this),this.root.querySelector(".ql-close").addEventListener("click",function(){t.root.classList.remove("ql-editing")}),this.quill.on(h.default.events.SCROLL_OPTIMIZE,function(){setTimeout(function(){if(!t.root.classList.contains("ql-hidden")){var e=t.quill.getSelection();null!=e&&t.position(t.quill.getBounds(e))}},1)})}},{key:"cancel",value:function(){this.show()}},{key:"position",value:function(t){var n=a(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"position",this).call(this,t),r=this.root.querySelector(".ql-tooltip-arrow");if(r.style.marginLeft="",0===n)return n;r.style.marginLeft=-1*n-r.offsetWidth/2+"px"}}]),e}(p.BaseTooltip);_.TEMPLATE=['<span class="ql-tooltip-arrow"></span>','<div class="ql-tooltip-editor">','<input type="text" data-formula="e=mc^2" data-link="https://quilljs.com" data-video="Embed URL">','<a class="ql-close"></a>',"</div>"].join(""),e.BubbleTooltip=_,e.default=m},function(t,e,n){"use strict";function r(t){return t&&t.__esModule?t:{default:t}}function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function l(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){var n=[],r=!0,o=!1,i=void 0;try{for(var l,a=t[Symbol.iterator]();!(r=(l=a.next()).done)&&(n.push(l.value),!e||n.length!==e);r=!0);}catch(t){o=!0,i=t}finally{try{!r&&a.return&&a.return()}finally{if(o)throw i}}return n}return function(e,n){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),s=function t(e,n,r){null===e&&(e=Function.prototype);var o=Object.getOwnPropertyDescriptor(e,n);if(void 0===o){var i=Object.getPrototypeOf(e);return null===i?void 0:t(i,n,r)}if("value"in o)return o.value;var l=o.get;if(void 0!==l)return l.call(r)},u=function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}(),c=n(2),f=r(c),h=n(9),p=r(h),d=n(44),y=r(d),v=n(15),b=r(v),g=n(22),m=n(26),_=r(m),O=[[{header:["1","2","3",!1]}],["bold","italic","underline","link"],[{list:"ordered"},{list:"bullet"}],["clean"]],w=function(t){function e(t,n){o(this,e),null!=n.modules.toolbar&&null==n.modules.toolbar.container&&(n.modules.toolbar.container=O);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.quill.container.classList.add("ql-snow"),r}return l(e,t),u(e,[{key:"extendToolbar",value:function(t){t.container.classList.add("ql-snow"),this.buildButtons([].slice.call(t.container.querySelectorAll("button")),_.default),this.buildPickers([].slice.call(t.container.querySelectorAll("select")),_.default),this.tooltip=new x(this.quill,this.options.bounds),t.container.querySelector(".ql-link")&&this.quill.keyboard.addBinding({key:"K",shortKey:!0},function(e,n){t.handlers.link.call(t,!n.format.link)})}}]),e}(y.default);w.DEFAULTS=(0,f.default)(!0,{},y.default.DEFAULTS,{modules:{toolbar:{handlers:{link:function(t){if(t){var e=this.quill.getSelection();if(null==e||0==e.length)return;var n=this.quill.getText(e);/^\S+@\S+\.\S+$/.test(n)&&0!==n.indexOf("mailto:")&&(n="mailto:"+n);this.quill.theme.tooltip.edit("link",n)}else this.quill.format("link",!1)}}}}});var x=function(t){function e(t,n){o(this,e);var r=i(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t,n));return r.preview=r.root.querySelector("a.ql-preview"),r}return l(e,t),u(e,[{key:"listen",value:function(){var t=this;s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"listen",this).call(this),this.root.querySelector("a.ql-action").addEventListener("click",function(e){t.root.classList.contains("ql-editing")?t.save():t.edit("link",t.preview.textContent),e.preventDefault()}),this.root.querySelector("a.ql-remove").addEventListener("click",function(e){if(null!=t.linkRange){var n=t.linkRange;t.restoreFocus(),t.quill.formatText(n,"link",!1,p.default.sources.USER),delete t.linkRange}e.preventDefault(),t.hide()}),this.quill.on(p.default.events.SELECTION_CHANGE,function(e,n,r){if(null!=e){if(0===e.length&&r===p.default.sources.USER){var o=t.quill.scroll.descendant(b.default,e.index),i=a(o,2),l=i[0],s=i[1];if(null!=l){t.linkRange=new g.Range(e.index-s,l.length());var u=b.default.formats(l.domNode);return t.preview.textContent=u,t.preview.setAttribute("href",u),t.show(),void t.position(t.quill.getBounds(t.linkRange))}}else delete t.linkRange;t.hide()}})}},{key:"show",value:function(){s(e.prototype.__proto__||Object.getPrototypeOf(e.prototype),"show",this).call(this),this.root.removeAttribute("data-mode")}}]),e}(d.BaseTooltip);x.TEMPLATE=['<a class="ql-preview" rel="noopener noreferrer" target="_blank" href="about:blank"></a>','<input type="text" data-formula="e=mc^2" data-link="https://quilljs.com" data-video="Embed URL">','<a class="ql-action"></a>','<a class="ql-remove"></a>'].join(""),e.default=w}]).default});
+//# sourceMappingURL=quill.min.js.map
\ No newline at end of file
diff --git a/uni_modules/sp-editor/utils/index.js b/uni_modules/sp-editor/utils/index.js
new file mode 100644
index 0000000..f430a51
--- /dev/null
+++ b/uni_modules/sp-editor/utils/index.js
@@ -0,0 +1,68 @@
+// 标识必须独一无二 - 标识是为了使用insertText插入标识文本后，查找到标识所在delta位置的索引
+export const linkFlag = '#-*=*-*=*-*=*@-link超链接标识link-@*=*-*=*-*=*-#'
+
+export function addLink(editorCtx, attr) {
+  // 先插入一段文本内容
+  editorCtx.insertText({
+    text: linkFlag
+  })
+  // 获取全文delta内容
+  editorCtx.getContents({
+    success(res) {
+      let options = res.delta.ops
+      const findex = options.findIndex(item => {
+        return item.insert && typeof item.insert !== 'object' && item.insert?.indexOf(linkFlag) !== -1
+      })
+      // 根据标识查找到插入的位置
+      if (findex > -1) {
+        const findOption = options[findex]
+        const findAttributes = findOption.attributes
+        // 将该findOption分成三部分：前内容 要插入的link 后内容
+        const [prefix, suffix] = findOption.insert.split(linkFlag);
+        const handleOps = []
+        // 前内容
+        if (prefix) {
+          const prefixOps = findAttributes ? {
+            insert: prefix,
+            attributes: findAttributes
+          } : {
+            insert: prefix
+          }
+          handleOps.push(prefixOps)
+        }
+        // 插入的link
+        const linkOps = {
+          insert: attr.text,
+          attributes: {
+            link: attr.href,
+            textDecoration: attr.textDecoration || 'none', // 下划线
+            color: attr.color || '#007aff'
+          }
+        }
+        handleOps.push(linkOps)
+        // 后内容
+        if (suffix) {
+          const suffixOps = findAttributes ? {
+            insert: suffix,
+            attributes: findAttributes
+          } : {
+            insert: suffix
+          }
+          handleOps.push(suffixOps)
+        }
+        // 删除原options[findex]并在findex位置插入上述三个ops
+        options.splice(findex, 1);
+        options.splice(findex, 0, ...handleOps);
+        // 最后重新初始化内容，注意该方法会导致光标重置到最开始位置
+        editorCtx.setContents({
+          delta: {
+            ops: options
+          }
+        })
+        // 所以最后建议使富文本光标失焦，让用户手动聚焦光标
+        editorCtx.blur()
+      }
+    }
+  })
+
+}
\ No newline at end of file
diff --git a/util/api.js b/util/api.js
new file mode 100644
index 0000000..0834db7
--- /dev/null
+++ b/util/api.js
@@ -0,0 +1,96 @@
+import request from '@/util/request';
+export const newsGoryList = data => request.post('/move/news/gory', data, false);
+export const newsList = data => request.post('/move/news/index', data, false);
+export const activityList = data => request.post('/move/activity/list', data, false);
+export const activityIndex = data => request.post('/move/activity/index', data, false);
+export const associationIndex = data => request.post('/move/association/index', data, false);
+export const newsInfo = data => request.post('/move/news/find', data, false);
+export const eventInfo = data => request.post('/move/activity/find', data, false);
+export const associationInfo = data => request.post('/move/association/find', data, false);
+export const architectureList = data => request.post('/move/address/architecture', data, false);
+export const positionList = data => request.post('/position', data, false);
+export const IndustryList = data => request.post('/industry', data, false);
+export const IndustryNewList = data => request.post('/move/Industrynew', data, false);
+
+export const loginAdd = data => request.post('/move/login/add', data, false);
+
+export const loginDo = data => request.post('/move/login/login', data, false);
+export const addressList = data => request.post('/move/address', data, false);
+export const newIndustryIndex = data => request.post('/move/industry/index', data, false);
+export const getUserIndex = data => request.post('/move/member/find', data, false);
+export const UserApplication = data => request.post('/move/application', data, false);
+export const applicationAdd = data => request.post('/move/application/add', data, false);
+export const messageAdd = data => request.post('/move/message/add', data, false);
+
+export const UserLogin = data => request.post('/move/login/wxlogin', data, false);
+
+export const carouselIndex = data => request.post('/move/carousel', data, false);
+
+export const setMaillogAdd = data => request.post('/move/maillog/add', data, false);
+export const MaillogIndex = data => request.post('/move/maillog/index', data, false);
+export const MaillogUpdate = data => request.post('/move/maillog/update', data, false);
+
+export const MaillogUpdateState = data => request.post('/move/maillog/updatestate', data, false);
+
+export const questionnaireFind = data => request.post('/move/questionnaire/questionnairefind', data, false);
+export const questionnaireAdd = data => request.post('/move/questionnaire/appAdd', data, false);
+export const moneyLogAdd = data => request.post('/move/money_log/add', data, false);
+export const Mailcoent = data => request.post('/move/Maillog/mailcoent', data, false);
+export const MemberList = data => request.post('/move/association/memberList', data, false);
+export const getQrcode = data => request.post('/move/login/getUnlimitedQRCode', data, false);
+//getSerachIndex
+export const getSerachIndex = data => request.post('/move/index/index', data, false);
+
+export const setUserEdit = data => request.post('/move/member_log/add', data, false);
+export const businessCard = data => request.post('/move/member/businessCard', data, false);
+
+export const getPosition = data => request.post('/move/position', data, false);
+
+export const getArticlePolicy = data => request.post('/move/Article/gory', data, false);
+export const getArticlePolicyList = data => request.post('/move/Article/index', data, false);
+export const getArticlePolicyInfo = data => request.post('/move/Article/find', data, false);
+export const getRegion = data => request.post('/move/region', data, false);
+
+export const getAuditing = data => request.post('/move/auditing', data, false);
+
+export const getAuditingFind = data => request.post('/move/auditing/find', data, false);
+
+export const auditingUpadte = data => request.post('/move/auditing/auditing', data, false);
+
+export const activityAdd = data => request.post('/move/activity/activityAdd', data, false);
+
+export const wxphoneLogin = data => request.post('/move/login/wxphone', data, false);
+
+export const activitySign = data => request.post('/move/activity_sign/index', data, false);
+
+export const businesstypeList = data => request.post('/move/business/businesstypeList', data, false);
+
+export const businessList = data => request.post('/move/business/businessList', data, false);
+
+export const businessFind = data => request.post('/move/business/businessFind', data, false);
+
+export const clerkListByBusiness = data => request.post('/move/business/getClerkListByBusinessId', data, false);
+
+export const addClerk = data => request.post('/move/business/addClerk', data, false);
+
+export const businessListByMember = data => request.post('/move/business/getBusinessListByMemberId', data, false);
+
+export const deleteClerk = data => request.post('/move/business/deleteClerk', data, false);
+
+export const handleMembercode = data => request.post('/move/Membercode/handleMembercode', data, false);
+
+export const ifRightToExamine = data => request.post('/move/Writeoff/ifRightToExamine', data, false);
+
+export const addWriteoff = data => request.post('/move/Writeoff/addWriteoff', data, false);
+
+export const getNoticeList = data => request.post('/move/notice', data, false);
+
+export const getNoticeInfo = data => request.post('/move/notice/find', data, false);
+
+export const getNwwbList = data => request.post('/move/nwwb', data, false);
+
+export const getNwwbAdd = data => request.post('/move/nwwb/add', data, false);
+
+export const getNwwbInfo = data => request.post('/move/nwwb/find', data, false);
+
+export const getNwwbUser = data => request.post('/move/nwwb/memberfind', data, false);
\ No newline at end of file
diff --git a/util/jwexin.js b/util/jwexin.js
new file mode 100644
index 0000000..6e6980b
--- /dev/null
+++ b/util/jwexin.js
@@ -0,0 +1,65 @@
+import store from "../store/index.js" //引入vuex
+
+//#ifdef H5
+const jweixin = require('jweixin-module')
+// H5分享
+export const wxshare = options => {
+	uni.request({
+		// url: 'http://ysh.0rui.cn/index.php',
+		url: 'https://ysx.0rui.cn/index.php',
+		method: 'POST',
+		data: options.data || '',
+		header: { //配置请求头
+			'content-type': 'application/x-www-form-urlencoded',
+		},
+		success: res => {
+			// console.log('res.data', res.data.data)
+			jweixin.config({
+				debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+				appId: res.data.appId, // 必填，公众号的唯一标识
+				timestamp: res.data.timestamp, // 必填，生成签名的时间戳
+				nonceStr: res.data.nonceStr, // 必填，生成签名的随机串
+				signature: res.data.signature, // 必填，签名
+				// surl: res.data.surl, //自己添加的，debug为true的时候可以网页打印出对应的URL是否正确
+				jsApiList: ['updateAppMessageShareData', 'updateTimelineShareData',
+					'openLocation'
+				]
+			})
+			setTimeout(() => {
+				jweixin.ready(() => {
+					//自定义“分享给朋友”及“分享到QQ”按钮的分享内容（1.4.0）
+					jweixin.updateAppMessageShareData({
+						title: options.share_data.title || '洛阳市青年户外协会掌上云册', // 分享标题
+						desc: options.share_data.desc || '洛阳市青年户外协会掌上云册', // 分享描述
+						link: options.share_data.link, // 分享链接
+						// imgUrl: options.share_data.imgUrl ||
+						// 	'http://ysh.0rui.cn/static/ser.png', // 分享图标
+						imgUrl: options.share_data.imgUrl ||
+							'https://ysx.0rui.cn/static/ser.png',
+						success: res => {},
+						cancel: function() {}
+					})
+					//自定义“分享到朋友圈”及“分享到QQ空间”按钮的分享内容（1.4.0）
+					jweixin.updateTimelineShareData({
+						title: options.share_data.title || '洛阳市青年户外协会掌上云册', // 分享标题
+						link: options.share_data.link, // 分享链接
+						// imgUrl: options.share_data.imgUrl ||
+						// 	'http://ysh.0rui.cn/static/ser.png', // 分享图标
+						imgUrl: options.share_data.imgUrl ||
+							'https://ysx.0rui.cn/static/ser.png', 
+						success: res => {},
+						cancel: function() {}
+					})
+				})
+			}, 500)
+
+		},
+		fail: err => {
+			uni.showToast({
+				title: '请求失败',
+				icon: 'error'
+			})
+		}
+	})
+}
+//#endif
\ No newline at end of file
diff --git a/util/request.js b/util/request.js
new file mode 100644
index 0000000..79506d3
--- /dev/null
+++ b/util/request.js
@@ -0,0 +1,71 @@
+import {
+	toast,
+	clearStorageSync,
+	getStorageSync,
+	useRouter
+} from './utils'
+import store from '@/store/index.js'
+import RequestManager from '@/util/requestManager.js'
+
+let BASE_URL = store.state.apiUrl;
+//let BASE_URL = 'http://192.168.10.176/api';
+// // #ifdef H5
+// let BASE_URL = process.env.NODE_ENV === 'production' ? BASE_URL : '/api';
+// // #endif
+const manager = new RequestManager()
+
+const baseRequest = async (url, method, data = {}, loading = true) => {
+
+	const u = getStorageSync('u');
+	// let requestId = manager.generateId(method, url, data)
+	// if (!requestId) {
+	// 	console.log('重复请求')
+	// }
+	// if (!requestId) return false;
+	// var openid = uni.getStorageSync('openid');
+	// if (openid) {
+	// 	data.openid = openid;
+	// }
+	data.openid = 'adewewc112323';
+	return new Promise((reslove, reject) => {
+		loading && uni.showLoading({
+			title: '加载中...'
+		})
+		uni.request({
+			url: BASE_URL + url,
+			method: method || 'GET',
+			// dataType: 'jsonp',
+			header: {
+				'token': u.token || '',
+				'content-type': 'application/json'
+			},
+			timeout: 10000,
+			data: data || {},
+			complete: () => {
+				uni.hideLoading()
+				//manager.deleteById(requestId)
+			},
+			success: (successData) => {
+				const res = successData.data;
+				if (successData.statusCode == 200) {
+					reslove(res)
+				} else {
+					toast('网络连接失败，请稍后重试')
+					reject(res)
+				}
+			},
+			fail: (msg) => {
+				toast('网络连接失败，请稍后重试')
+				reject(msg)
+			}
+		})
+	})
+}
+
+const request = {};
+
+['options', 'get', 'post', 'put', 'head', 'delete', 'trace', 'connect'].forEach((method) => {
+	request[method] = (api, data, loading) => baseRequest(api, method, data, loading)
+})
+
+export default request
\ No newline at end of file
diff --git a/util/requestManager.js b/util/requestManager.js
new file mode 100644
index 0000000..56dff20
--- /dev/null
+++ b/util/requestManager.js
@@ -0,0 +1,66 @@
+class RequestManager {
+    constructor() {
+        this.idMap = new Map()
+    }
+    /**
+     * 生成唯一ID，并将ID和请求信息存储到map对象中
+     * @param {string} method - 请求方法
+     * @param {string} url - 请求URL
+     * @param {object} params - 请求参数
+     * @returns {string|boolean} - 生成的唯一ID，如果存在相同请求则返回false
+     */
+    generateId(method, url, params) {
+        const id = this.generateUniqueId(method, url, params)
+        if (this.idMap.has(id)) {
+            return false
+        }
+        this.idMap.set(id, { method, url, params })
+        return id
+    }
+
+    /**
+     * 根据ID删除map对象中的请求信息
+     * @param {string} id - 要删除的唯一ID
+     */
+    deleteById(id) {
+        this.idMap.delete(id)
+    }
+
+    /**
+     * 生成唯一ID的方法
+     * @param {string} method - 请求方法
+     * @param {string} url - 请求URL
+     * @param {object} params - 请求参数
+     * @returns {string} - 生成的唯一ID
+     */
+    generateUniqueId(method, url, params) {
+        const idString = `${method}-${url}-${this.serializeObject(params)}`
+        let id = 0;
+        for (let i = 0; i < idString.length; i++) {
+            id = ((id << 5) - id) + idString.charCodeAt(i)
+            id |= 0;
+        }
+        return id.toString()
+    }
+
+    /**
+     * 序列化对象为字符串
+     * @param {object} obj - 要序列化的对象
+     * @returns {string} - 序列化后的字符串
+     */
+    serializeObject(obj) {
+        const keys = Object.keys(obj).sort()
+        const serializedObj = {}
+        for (let key of keys) {
+            const value = obj[key]
+            if (value !== null && typeof value === 'object') {
+                serializedObj[key] = this.serializeObject(value)
+            } else {
+                serializedObj[key] = value
+            }
+        }
+        return JSON.stringify(serializedObj)
+    }
+}
+
+export default RequestManager
\ No newline at end of file
diff --git a/util/utils.js b/util/utils.js
new file mode 100644
index 0000000..7ca8ccb
--- /dev/null
+++ b/util/utils.js
@@ -0,0 +1,136 @@
+/**
+ * 提示方法
+ * @param {String} title 提示文字
+ * @param {String}  icon icon图片
+ * @param {Number}  duration 提示时间
+ */
+export function toast(title, icon = 'none', duration = 1500) {
+	if(title) {
+		uni.showToast({
+		    title,
+		    icon,
+		    duration
+		})
+	}
+}
+
+/**
+ * 设置缓存
+ * @param {String} key 键名
+ * @param {String} data 值
+ */
+export function setStorageSync(key, data) {
+    uni.setStorageSync(key, data)
+}
+
+/**
+ * 获取缓存
+ * @param {String} key 键名
+ */
+export function getStorageSync(key) {
+    return uni.getStorageSync(key)
+}
+
+/**
+ * 删除缓存
+ * @param {String} key 键名
+ */
+export function removeStorageSync(key) {
+    return uni.removeStorageSync(key)
+}
+
+/**
+ * 清空缓存
+ * @param {String} key 键名
+ */
+export function clearStorageSync() {
+    return uni.clearStorageSync()
+}
+
+
+/**
+ * 页面跳转
+ * @param {'navigateTo' | 'redirectTo' | 'reLaunch' | 'switchTab' | 'navigateBack' | number } url  转跳路径
+ * @param {String} params 跳转时携带的参数
+ * @param {String} type 转跳方式
+ **/
+export function useRouter(url, params = {}, type = 'navigateTo') {
+    try {
+        if (Object.keys(params).length) url = `${url}?data=${encodeURIComponent(JSON.stringify(params))}`
+        if (type === 'navigateBack') {
+            uni[type]({ delta: url })
+        } else {
+            uni[type]({ url })
+        }
+    } catch (error) {
+        console.error(error)
+    }
+}
+
+/**
+ * 预览图片
+ * @param {Array} urls 图片链接
+ */
+export function previewImage(urls, itemList = ['发送给朋友', '保存图片', '收藏']) {
+    uni.previewImage({
+        urls,
+        longPressActions: {
+            itemList,
+            fail: function (error) {
+                console.error(error,'===previewImage')
+            }
+        }
+    })
+}
+
+/**
+ * 保存图片到本地
+ * @param {String} filePath 图片临时路径
+ **/
+export function saveImage(filePath) {
+    if (!filePath) return false
+    uni.saveImageToPhotosAlbum({
+        filePath,
+        success: (res) => {
+            toast('图片保存成功', 'success')
+        },
+        fail: (err) => {
+            if (err.errMsg === 'saveImageToPhotosAlbum:fail:auth denied' || err.errMsg === 'saveImageToPhotosAlbum:fail auth deny') {
+                uni.showModal({
+                    title: '提示',
+                    content: '需要您授权保存相册',
+                    showCancel: false,
+                    success: (modalSuccess) => {
+                        uni.openSetting({
+                            success(settingdata) {
+                                if (settingdata.authSetting['scope.writePhotosAlbum']) {
+                                    uni.showModal({
+                                        title: '提示',
+                                        content: '获取权限成功,再次点击图片即可保存',
+                                        showCancel: false
+                                    })
+                                } else {
+                                    uni.showModal({
+                                        title: '提示',
+                                        content: '获取权限失败，将无法保存到相册哦~',
+                                        showCancel: false
+                                    })
+                                }
+                            },
+                            fail(failData) {
+                                console.log('failData', failData)
+                            }
+                        })
+                    }
+                })
+            }
+        }
+    })
+}
+
+/**
+ * 深拷贝
+ * @param {Object} data
+ **/
+export const clone = (data) => JSON.parse(JSON.stringify(data))
+
diff --git a/util/wx-sdk.js b/util/wx-sdk.js
new file mode 100644
index 0000000..56f0796
--- /dev/null
+++ b/util/wx-sdk.js
@@ -0,0 +1,94 @@
+// 引入 jweixin-module
+const jweixin = require('jweixin-module');
+
+// 通过export 暴露常用的方法
+export default {
+	//判断是否在微信中    
+	isWechat: function() {
+		var ua = window.navigator.userAgent.toLowerCase();
+		if (ua.match(/micromessenger/i) == 'micromessenger') {
+			//console.log('是微信客户端')  
+			return true;
+		} else {
+			//console.log('不是微信客户端')  
+			return false;
+		}
+	},
+
+	// 初始化WXSDK
+	initJssdk: async function(callback) {
+		/* ****************************************
+		 * 获取当前url然后传递给后台获取授权和签名信息
+		 # TODO: 后台返回签名
+		 *************************************** */
+		// let uri = encodeURIComponent(window.location.href.split('#')[0]);
+		let uri = window.location.href.split('#')[0];
+		console.log(uri); // 这
+		// 获取后台返回的签名
+		// 这里需要换成开发者自己的接口。
+		// 此处我对uni.request进行了封装，
+		// 直接采用uni.request方法然后在成功的回调里面完成SDK初始化也是可行的，根据实际情况处理
+		let res = await this.GetSignature(uri);
+		console.log(res); // 这里输出你的签名结果
+		//注入config权限配置  
+		let wxConf = {
+			debug: true, // 是否开启调试，第一次尝试，建议开启，后续可关闭
+			appId: res.data.appId, // 必填，公众号的唯一标识
+			timestamp: res.data.timestamp, // 必填，生成签名的时间戳
+			nonceStr: res.data.nonceStr, // 必填，生成签名的随机串
+			signature: res.data.signature, // 必填，签名
+			jsApiList: [ //这里是需要用到的接口名称  
+				'updateAppMessageShareData', //分享接口  
+				'updateTimelineShareData'
+			]
+		};
+		jweixin.config(wxConf); //完成微信配置
+	},
+	async GetSignature(uri) {
+		try {
+			const response = await uni.request({
+				// url: 'http://ysh.0rui.cn/index.php',
+				url: 'https://ysx.0rui.cn/index.php',
+				data: {
+					url: uri
+				},
+				method: 'POST',
+				header: {
+					'content-type': 'application/x-www-form-urlencoded',
+				}
+			});
+			console.log(response); // 这里输出你的签名结果
+			// 在这里可以添加你的其他逻辑，处理获取到的签名数据
+			return response[1]; // 如果需要在函数外部使用签名数据，可以将其返回
+		} catch (error) {
+			console.error('Error in GetSignature:', error);
+			// 在这里处理错误情况，或者抛出异常
+			throw error;
+		}
+	},
+	/* ***************************************
+	 *
+	 *   微信SDK功能实例：调用微信扫码
+	 *  若没有初始化需要先调用initJssdk完成初始化
+	 *  若当前页面已经完成initJssdk初始化，调用扫码功能是可以直接调用 jweixin.scanQRCode
+	 * 
+	 * **************************************/
+	scanCode: function(callback, needResult = 1) {
+		if (!this.isWechat()) {
+			console.log('不是微信客户端')
+			return;
+		}
+		this.initJssdk(function(res) {
+			jweixin.ready(function() {
+				jweixin.scanQRCode({
+					needResult: needResult, // 0扫码结果由微信处理， 1是直接返回结果，由开发者处理
+					scanType: ["qrCode", "barCode"],
+					success: function(rs) {
+						console.log(rs);
+						callback(rs)
+					}
+				})
+			});
+		});
+	}
+}
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
new file mode 100644
index 0000000..238c3d5
--- /dev/null
+++ b/vue.config.js
@@ -0,0 +1,16 @@
+// 跨域配置
+
+// vue.config.js
+module.exports = {
+	   // devServer: {
+	   //      proxy: {
+	   //          '/api': {
+	   //              target: 'https://ysx.0rui.cn',
+	   //              changeOrigin: true,
+	   //              pathRewrite: {
+	   //                  '^/api': ''
+	   //              }
+	   //          }
+	   //      }
+	   //  }
+}
\ No newline at end of file